Commit 1e733ffc authored by Mark Andrews's avatar Mark Andrews
Browse files

2792. [port] win32: 32/64 bit cleanups. [RT #128244]

parent 242ba127
2792. [port] win32: 32/64 bit cleanups. [RT #128244]
2691. [func] dnssec-signzone: retain the existing NSEC or NSEC3
chain when re-signing a previously-signed zone.
Use -u to modify NSEC3 parameters or switch
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: AccountInfo.cpp,v 1.8 2007/06/19 23:47:07 tbox Exp $ */
/* $Id: AccountInfo.cpp,v 1.9 2009/09/29 04:37:08 marka Exp $ */
#ifndef UNICODE
#define UNICODE
......@@ -183,8 +183,8 @@ CreateServiceAccount(char *name, char *password) {
DWORD dwError = 0;
NET_API_STATUS nStatus;
unsigned int namelen = strlen(name);
unsigned int passwdlen = strlen(password);
size_t namelen = strlen(name);
size_t passwdlen = strlen(password);
wchar_t AccountName[MAX_NAME_LENGTH];
wchar_t AccountPassword[MAX_NAME_LENGTH];
......@@ -251,7 +251,7 @@ AddPrivilegeToAcccount(LPTSTR name, LPWSTR PrivilegeName) {
void
InitLsaString(PLSA_UNICODE_STRING LsaString, LPWSTR String){
DWORD StringLength;
size_t StringLength;
if (String == NULL) {
LsaString->Buffer = NULL;
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: BINDInstall.cpp,v 1.7 2007/06/19 23:47:07 tbox Exp $ */
/* $Id: BINDInstall.cpp,v 1.8 2009/09/29 04:37:08 marka Exp $ */
/*
* Copyright (c) 1999-2000 by Nortel Networks Corporation
......@@ -88,7 +88,7 @@ BOOL CBINDInstallApp::InitInstance()
CBINDInstallDlg dlg;
m_pMainWnd = &dlg;
int nResponse = dlg.DoModal();
INT_PTR nResponse = dlg.DoModal();
if (nResponse == IDOK)
{
// TODO: Place code here to handle when the dialog is
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: BINDInstallDlg.cpp,v 1.44 2009/09/01 06:51:47 marka Exp $ */
/* $Id: BINDInstallDlg.cpp,v 1.45 2009/09/29 04:37:08 marka Exp $ */
/*
* Copyright (c) 1999-2000 by Nortel Networks Corporation
......@@ -238,7 +238,7 @@ BOOL CBINDInstallDlg::OnInitDialog() {
char *fptr = &filename[0];
GetModuleFileName(NULL, filename, MAX_PATH);
char *dptr = strrchr(filename,'\\');
int index = dptr - fptr;
size_t index = dptr - fptr;
strncpy(dirname, filename, index);
dirname[index] = '\0';
CString Dirname(dirname);
......@@ -970,7 +970,7 @@ void CBINDInstallDlg::RegisterMessages() {
/* Add the Event-ID message-file name to the subkey. */
if (RegSetValueEx(hKey, "EventMessageFile", 0, REG_EXPAND_SZ,
(LPBYTE)pszMsgDLL, strlen(pszMsgDLL) + 1) != ERROR_SUCCESS)
(LPBYTE)pszMsgDLL, (DWORD)(strlen(pszMsgDLL) + 1)) != ERROR_SUCCESS)
throw(Exception(IDS_ERR_SET_VALUE, GetErrMessage()));
/* Set the supported types flags and addit to the subkey. */
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: thread.h,v 1.24 2009/09/25 23:48:13 tbox Exp $ */
/* $Id: thread.h,v 1.25 2009/09/29 04:37:08 marka Exp $ */
#ifndef ISC_THREAD_H
#define ISC_THREAD_H 1
......@@ -65,7 +65,7 @@ inline DWORD WaitAbandonedIndex( DWORD dwWaitResult) {
typedef HANDLE isc_thread_t;
typedef unsigned int isc_threadresult_t;
typedef DWORD isc_threadresult_t;
typedef void * isc_threadarg_t;
typedef isc_threadresult_t (WINAPI *isc_threadfunc_t)(isc_threadarg_t);
typedef DWORD isc_thread_key_t;
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: ntgroups.c,v 1.10 2007/06/19 23:47:19 tbox Exp $ */
/* $Id: ntgroups.c,v 1.11 2009/09/29 04:37:08 marka Exp $ */
/*
* The NT Groups have two groups that are not well documented and are
......@@ -63,7 +63,7 @@ isc_ntsecurity_getaccountgroups(char *username, char **GroupList,
DWORD dwTotalEntries = 0;
NET_API_STATUS nStatus;
DWORD dwTotalCount = 0;
int retlen;
size_t retlen;
wchar_t user[MAX_NAME_LENGTH];
retlen = mbstowcs(user, username, MAX_NAME_LENGTH);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment