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

diff --git a/CHANGES b/CHANGES
index 9bce07a8e6772e29752ac23b0b915071d9d6d7ac..874414e61267e5af7d792b87fe0d0a7091d24711 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2792.  [port]          win32: 32/64 bit cleanups. [RT #128244]
+
 2690.  [bug]           win32: fix isc_thread_key_getspecific() prototype.
                        [RT #20315]
 

diff --git a/bin/win32/BINDInstall/AccountInfo.cpp b/bin/win32/BINDInstall/AccountInfo.cpp
index 5b28a2362d8e235f36eaf8b57d99c867378d5dc7..f52172338700f38b9e85e01d9d0deba7c12a822a 100644 (file)
--- a/bin/win32/BINDInstall/AccountInfo.cpp
+++ b/bin/win32/BINDInstall/AccountInfo.cpp
@@ -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.8.128.1 2009/09/29 05:09:43 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;

diff --git a/bin/win32/BINDInstall/BINDInstall.cpp b/bin/win32/BINDInstall/BINDInstall.cpp
index f9dc5bcac1bbf4a57cb92d7409d144bbcbbe9721..ab7d9d96e953a9994b6d466235c47db78adbd33e 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstall.cpp
+++ b/bin/win32/BINDInstall/BINDInstall.cpp
@@ -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.7.128.1 2009/09/29 05:09:43 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

diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index c836a11d01bf082d092620957aa639c222a93e33..72a3a8ddd1942587464259ebec65e2e539982c3f 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: BINDInstallDlg.cpp,v 1.37.24.4 2009/09/02 00:30:44 marka Exp $ */
+/* $Id: BINDInstallDlg.cpp,v 1.37.24.5 2009/09/29 05:09:43 marka Exp $ */
 
 /*
  * Copyright (c) 1999-2000 by Nortel Networks Corporation
@@ -229,7 +229,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);
@@ -961,7 +961,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. */

diff --git a/lib/isc/win32/include/isc/thread.h b/lib/isc/win32/include/isc/thread.h
index bd6703cbac892ea19dda46af4b7bc3d79a101eb3..be09b732c037a1b764943afeae0986471f5c0d33 100644 (file)
--- a/lib/isc/win32/include/isc/thread.h
+++ b/lib/isc/win32/include/isc/thread.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: thread.h,v 1.22.128.2 2009/09/25 23:46:54 tbox Exp $ */
+/* $Id: thread.h,v 1.22.128.3 2009/09/29 05:09:43 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;

diff --git a/lib/isc/win32/ntgroups.c b/lib/isc/win32/ntgroups.c
index 351adc5e74b92d84d80c396bb0fa5a8b1a087a67..a212cba7527cc6d7f5e8fd445fe209fc5ab74649 100644 (file)
--- a/lib/isc/win32/ntgroups.c
+++ b/lib/isc/win32/ntgroups.c
@@ -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.10.128.1 2009/09/29 05:09:43 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);