mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Andrews 2009-09-29 04:38:23 +00:00
parent 242ba12742
commit 1e733ffc11
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,3 +1,5 @@
2792. [port] win32: 32/64 bit cleanups. [RT #128244]
2691. [func] dnssec-signzone: retain the existing NSEC or NSEC3 2691. [func] dnssec-signzone: retain the existing NSEC or NSEC3
chain when re-signing a previously-signed zone. chain when re-signing a previously-signed zone.
Use -u to modify NSEC3 parameters or switch Use -u to modify NSEC3 parameters or switch

8
bin/win32/BINDInstall/AccountInfo.cpp
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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 #ifndef UNICODE
#define UNICODE #define UNICODE
@ -183,8 +183,8 @@ CreateServiceAccount(char *name, char *password) {
DWORD dwError = 0; DWORD dwError = 0;
NET_API_STATUS nStatus; NET_API_STATUS nStatus;
unsigned int namelen = strlen(name); size_t namelen = strlen(name);
unsigned int passwdlen = strlen(password); size_t passwdlen = strlen(password);
wchar_t AccountName[MAX_NAME_LENGTH]; wchar_t AccountName[MAX_NAME_LENGTH];
wchar_t AccountPassword[MAX_NAME_LENGTH]; wchar_t AccountPassword[MAX_NAME_LENGTH];
@ -251,7 +251,7 @@ AddPrivilegeToAcccount(LPTSTR name, LPWSTR PrivilegeName) {
void void
InitLsaString(PLSA_UNICODE_STRING LsaString, LPWSTR String){ InitLsaString(PLSA_UNICODE_STRING LsaString, LPWSTR String){
DWORD StringLength; size_t StringLength;
if (String == NULL) { if (String == NULL) {
LsaString->Buffer = NULL; LsaString->Buffer = NULL;

4
bin/win32/BINDInstall/BINDInstall.cpp
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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 * Copyright (c) 1999-2000 by Nortel Networks Corporation
@ -88,7 +88,7 @@ BOOL CBINDInstallApp::InitInstance()
CBINDInstallDlg dlg; CBINDInstallDlg dlg;
m_pMainWnd = &dlg; m_pMainWnd = &dlg;
int nResponse = dlg.DoModal(); INT_PTR nResponse = dlg.DoModal();
if (nResponse == IDOK) if (nResponse == IDOK)
{ {
// TODO: Place code here to handle when the dialog is // TODO: Place code here to handle when the dialog is

6
bin/win32/BINDInstall/BINDInstallDlg.cpp
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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 * Copyright (c) 1999-2000 by Nortel Networks Corporation
@ -238,7 +238,7 @@ BOOL CBINDInstallDlg::OnInitDialog() {
char *fptr = &filename[0]; char *fptr = &filename[0];
GetModuleFileName(NULL, filename, MAX_PATH); GetModuleFileName(NULL, filename, MAX_PATH);
char *dptr = strrchr(filename,'\\'); char *dptr = strrchr(filename,'\\');
int index = dptr - fptr; size_t index = dptr - fptr;
strncpy(dirname, filename, index); strncpy(dirname, filename, index);
dirname[index] = '\0'; dirname[index] = '\0';
CString Dirname(dirname); CString Dirname(dirname);
@ -970,7 +970,7 @@ void CBINDInstallDlg::RegisterMessages() {
/* Add the Event-ID message-file name to the subkey. */ /* Add the Event-ID message-file name to the subkey. */
if (RegSetValueEx(hKey, "EventMessageFile", 0, REG_EXPAND_SZ, 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())); throw(Exception(IDS_ERR_SET_VALUE, GetErrMessage()));
/* Set the supported types flags and addit to the subkey. */ /* Set the supported types flags and addit to the subkey. */

4
lib/isc/win32/include/isc/thread.h
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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 #ifndef ISC_THREAD_H
#define ISC_THREAD_H 1 #define ISC_THREAD_H 1
@ -65,7 +65,7 @@ inline DWORD WaitAbandonedIndex( DWORD dwWaitResult) {
typedef HANDLE isc_thread_t; typedef HANDLE isc_thread_t;
typedef unsigned int isc_threadresult_t; typedef DWORD isc_threadresult_t;
typedef void * isc_threadarg_t; typedef void * isc_threadarg_t;
typedef isc_threadresult_t (WINAPI *isc_threadfunc_t)(isc_threadarg_t); typedef isc_threadresult_t (WINAPI *isc_threadfunc_t)(isc_threadarg_t);
typedef DWORD isc_thread_key_t; typedef DWORD isc_thread_key_t;

4
lib/isc/win32/ntgroups.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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 * 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; DWORD dwTotalEntries = 0;
NET_API_STATUS nStatus; NET_API_STATUS nStatus;
DWORD dwTotalCount = 0; DWORD dwTotalCount = 0;
int retlen; size_t retlen;
wchar_t user[MAX_NAME_LENGTH]; wchar_t user[MAX_NAME_LENGTH];
retlen = mbstowcs(user, username, MAX_NAME_LENGTH); retlen = mbstowcs(user, username, MAX_NAME_LENGTH);