Skip to content

[v5.0] Backport Windows API argument and boolean-return corrections #9201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dand-oss wants to merge 1 commit into
base: v5.0-release
Choose a base branch
from
+8 −8
Open

[v5.0] Backport Windows API argument and boolean-return corrections #9201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/auth/trusted/AuthSspi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ AuthSspi::AuthSspi()
{
TimeStamp timeOut;
hasCredentials = initEntries() && (fAcquireCredentialsHandle(0,
legacySSP ? NTLMSP_NAME_A : NEGOSSP_NAME_A,
const_cast<SEC_CHAR*>(legacySSP ? NTLMSP_NAME_A : NEGOSSP_NAME_A),
SECPKG_CRED_BOTH, 0, 0, 0, 0,
&secHndl, &timeOut) == SEC_E_OK);
}
Expand Down
8 changes: 4 additions & 4 deletions src/common/isc_sync.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2601,7 +2601,7 @@ bool SharedMemoryBase::remapFile(CheckStatusWrapper* statusVector,
!FlushViewOfFile(sh_mem_header, 0))
{
error(statusVector, "SetFilePointer", GetLastError());
return NULL;
return false;
}
}

Expand Down Expand Up @@ -2644,7 +2644,7 @@ bool SharedMemoryBase::remapFile(CheckStatusWrapper* statusVector,
if (file_obj == NULL)
{
error(statusVector, "CreateFileMapping", GetLastError());
return NULL;
return false;
}

MemoryHeader* const address = (MemoryHeader*) MapViewOfFile(file_obj, FILE_MAP_WRITE, 0, 0, 0);
Expand All @@ -2653,7 +2653,7 @@ bool SharedMemoryBase::remapFile(CheckStatusWrapper* statusVector,
{
error(statusVector, "MapViewOfFile", GetLastError());
CloseHandle(file_obj);
return NULL;
return false;
}

if (flag)
Expand All @@ -2672,7 +2672,7 @@ bool SharedMemoryBase::remapFile(CheckStatusWrapper* statusVector,
if (!sh_mem_length_mapped)
{
error(statusVector, "sh_mem_length_mapped is 0", 0);
return NULL;
return false;
}

return (address);
Expand Down
4 changes: 2 additions & 2 deletions src/utilities/install/install.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ USHORT IncrementSharedCount(const TEXT* filename, err_handler_t err_handler)

HKEY hkey;
LONG status = RegCreateKeyEx(HKEY_LOCAL_MACHINE, SHARED_KEY,
0, "", REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, 0, &hkey, 0);
0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, 0, &hkey, 0);
if (status != ERROR_SUCCESS)
return (*err_handler) (status, "RegCreateKeyEx");

Expand Down Expand Up @@ -714,7 +714,7 @@ USHORT DecrementSharedCount(const TEXT* filename, bool sw_force, err_handler_t e
HKEY hkey;
DWORD disp;
LONG status = RegCreateKeyEx(HKEY_LOCAL_MACHINE, SHARED_KEY,
0, "", REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, NULL, &hkey, &disp);
0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, NULL, &hkey, &disp);
if (status != ERROR_SUCCESS)
return (*err_handler) (status, "RegCreateKeyEx");

Expand Down
2 changes: 1 addition & 1 deletion src/utilities/install/registry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ USHORT REGISTRY_install(HKEY hkey_rootnode, const TEXT* directory, pfnRegError e
SLONG status = RegCreateKeyEx(hkey_rootnode,
REG_KEY_ROOT_INSTANCES,
0,
"",
NULL,
REG_OPTION_NON_VOLATILE,
KEY_WRITE,
NULL, &hkey_instances, &disp);
Expand Down
Loading