January 2020 - Wine-devel - list.winehq.org

[PATCH 8/8] ntdll: Fix some spec file entries
by André Hentschel 19 Jan '20

19 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/ntdll.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index fe36235bdad..920b996bffc 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -93,7 +93,7 @@ @ stdcall LdrGetProcedureAddress(ptr ptr long ptr) # @ stub LdrHotPatchRoutine @ stub LdrInitShimEngineDynamic -@ stdcall LdrInitializeThunk(ptr long long long) +@ stdcall LdrInitializeThunk(ptr ptr long long) @ stub LdrLoadAlternateResourceModule @ stdcall LdrLoadDll(wstr long ptr ptr) @ stdcall LdrLockLoaderLock(long ptr ptr) @@ -220,7 +220,7 @@ @ stdcall -norelay NtGetContextThread(long ptr) @ stdcall NtGetCurrentProcessorNumber() # @ stub NtGetDevicePowerState -@ stdcall NtGetNlsSectionPtr(long long long ptr ptr) +@ stdcall NtGetNlsSectionPtr(long long ptr ptr ptr) @ stub NtGetPlugPlayEvent @ stdcall NtGetTickCount() @ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr) @@ -579,7 +579,7 @@ @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange -@ stdcall RtlDeleteRegistryValue(long ptr ptr) +@ stdcall RtlDeleteRegistryValue(long wstr wstr) @ stdcall RtlDeleteResource(ptr) @ stdcall RtlDeleteSecurityObject(ptr) @ stdcall RtlDeleteTimer(ptr ptr ptr) @@ -872,7 +872,7 @@ @ stub RtlQueryProperties @ stub RtlQueryPropertyNames @ stub RtlQueryPropertySet -@ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) +@ stdcall RtlQueryRegistryValues(long wstr ptr ptr ptr) @ stub RtlQuerySecurityObject @ stub RtlQueryTagHeap @ stdcall RtlQueryTimeZoneInformation(ptr) @@ -1037,7 +1037,7 @@ @ stdcall -arch=x86_64 RtlWow64GetThreadContext(long ptr) @ stdcall -arch=x86_64 RtlWow64SetThreadContext(long ptr) @ stub RtlWriteMemoryStream -@ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) +@ stdcall RtlWriteRegistryValue(long wstr wstr long ptr long) @ stub RtlZeroHeap @ stdcall RtlZeroMemory(ptr long) @ stdcall RtlZombifyActivationContext(ptr) @@ -1184,7 +1184,7 @@ @ stdcall -private -norelay ZwGetContextThread(long ptr) NtGetContextThread @ stdcall -private ZwGetCurrentProcessorNumber() NtGetCurrentProcessorNumber # @ stub ZwGetDevicePowerState -@ stdcall -private ZwGetNlsSectionPtr(long long long ptr ptr) NtGetNlsSectionPtr +@ stdcall -private ZwGetNlsSectionPtr(long long ptr ptr ptr) NtGetNlsSectionPtr @ stub ZwGetPlugPlayEvent @ stdcall -private ZwGetTickCount() NtGetTickCount @ stdcall -private ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch @@ -1400,7 +1400,7 @@ @ cdecl -private -arch=i386 _CIpow() NTDLL__CIpow @ cdecl -private -arch=i386 _CIsin() NTDLL__CIsin @ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) +@ stdcall -arch=x86_64 __C_specific_handler(ptr ptr ptr ptr) @ stdcall -private -arch=arm,x86_64 -norelay __chkstk() @ cdecl __isascii(long) NTDLL___isascii @ cdecl __iscsym(long) NTDLL___iscsym -- 2.17.1

2 1

[PATCH 6/8] oleaut32: Fix some spec file entries
by André Hentschel 19 Jan '20

19 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/oleaut32/oleaut32.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index cc18a04befe..82f6ea76642 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -15,8 +15,8 @@ 16 stdcall SafeArrayDestroy(ptr) 17 stdcall SafeArrayGetDim(ptr) 18 stdcall SafeArrayGetElemsize(ptr) -19 stdcall SafeArrayGetUBound(ptr long long) -20 stdcall SafeArrayGetLBound(ptr long long) +19 stdcall SafeArrayGetUBound(ptr long ptr) +20 stdcall SafeArrayGetLBound(ptr long ptr) 21 stdcall SafeArrayLock(ptr) 22 stdcall SafeArrayUnlock(ptr) 23 stdcall SafeArrayAccessData(ptr ptr) @@ -320,18 +320,18 @@ 330 stdcall VarDateFromUdate(ptr long ptr) 331 stdcall VarUdateFromDate(double long ptr) 332 stdcall GetAltMonthNames(long ptr) -333 stdcall VarI8FromUI1(long long) -334 stdcall VarI8FromI2(long long) -335 stdcall VarI8FromR4(float long) -336 stdcall VarI8FromR8(double long) +333 stdcall VarI8FromUI1(long ptr) +334 stdcall VarI8FromI2(long ptr) +335 stdcall VarI8FromR4(float ptr) +336 stdcall VarI8FromR8(double ptr) 337 stdcall VarI8FromCy(int64 ptr) -338 stdcall VarI8FromDate(double long) +338 stdcall VarI8FromDate(double ptr) 339 stdcall VarI8FromStr(wstr long long ptr) 340 stdcall VarI8FromDisp(ptr long ptr) -341 stdcall VarI8FromBool(long long) -342 stdcall VarI8FromI1(long long) -343 stdcall VarI8FromUI2(long long) -344 stdcall VarI8FromUI4(long long) +341 stdcall VarI8FromBool(long ptr) +342 stdcall VarI8FromI1(long ptr) +343 stdcall VarI8FromUI2(long ptr) +344 stdcall VarI8FromUI4(long ptr) 345 stdcall VarI8FromDec(ptr ptr) 346 stdcall VarI2FromI8(int64 ptr) 347 stdcall VarI2FromUI8(int64 ptr) @@ -409,7 +409,7 @@ 438 stdcall VarUI8FromI1(long ptr) 439 stdcall VarUI8FromUI2(long ptr) 440 stdcall VarUI8FromUI4(long ptr) -441 stdcall VarUI8FromDec(long ptr) +441 stdcall VarUI8FromDec(ptr ptr) 442 stdcall RegisterTypeLibForUser(ptr wstr wstr) 443 stdcall UnRegisterTypeLibForUser(ptr long long long long) -- 2.17.1

2 1

[PATCH 5/8] advapi32: Fix some spec file entries
by André Hentschel 19 Jan '20

19 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/advapi32/advapi32.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 5a4344852ee..d9bdccc69ed 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -91,7 +91,7 @@ # @ stub CancelOverlappedAccess @ stdcall ChangeServiceConfig2A(long long ptr) @ stdcall ChangeServiceConfig2W(long long ptr) -@ stdcall ChangeServiceConfigA(long long long long wstr str ptr str str str str) +@ stdcall ChangeServiceConfigA(long long long long str str ptr str str str str) @ stdcall ChangeServiceConfigW(long long long long wstr wstr ptr wstr wstr wstr wstr) # @ stub CheckForHiberboot @ stdcall -import CheckTokenMembership(long ptr ptr) @@ -129,8 +129,8 @@ # @ stub ConvertStringSDToSDRootDomainW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorA(str long ptr ptr) @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) -@ stdcall ConvertStringSidToSidA(ptr ptr) -@ stdcall ConvertStringSidToSidW(ptr ptr) +@ stdcall ConvertStringSidToSidA(str ptr) +@ stdcall ConvertStringSidToSidW(wstr ptr) @ stdcall -import ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) @ stdcall -import CopySid(long ptr ptr) # @ stub CreateCodeAuthzLevel @@ -429,16 +429,16 @@ @ stdcall LogonUserW(wstr wstr wstr long long ptr) @ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) -@ stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidA(str ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) -@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidW(wstr ptr ptr ptr ptr ptr ptr) @ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) @ stdcall LookupPrivilegeNameA(str ptr ptr ptr) @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) -@ stdcall LookupPrivilegeValueA(ptr ptr ptr) -@ stdcall LookupPrivilegeValueW(ptr ptr ptr) +@ stdcall LookupPrivilegeValueA(str str ptr) +@ stdcall LookupPrivilegeValueW(wstr wstr ptr) @ stdcall LookupSecurityDescriptorPartsA(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LookupSecurityDescriptorPartsW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LsaAddAccountRights(ptr ptr ptr long) @@ -478,7 +478,7 @@ # @ stub LsaManageSidNameMapping @ stdcall LsaNtStatusToWinError(long) @ stub LsaOpenAccount -@ stdcall LsaOpenPolicy(long ptr long long) +@ stdcall LsaOpenPolicy(ptr ptr long long) # @ stub LsaOpenPolicySce @ stub LsaOpenSecret @ stub LsaOpenTrustedDomain @@ -681,17 +681,17 @@ @ stdcall RegReplaceKeyW(long wstr wstr wstr) @ stdcall -import RegRestoreKeyA(long str long) @ stdcall -import RegRestoreKeyW(long wstr long) -@ stdcall RegSaveKeyA(long ptr ptr) +@ stdcall RegSaveKeyA(long str ptr) @ stdcall -import RegSaveKeyExA(long str ptr long) @ stdcall -import RegSaveKeyExW(long wstr ptr long) -@ stdcall RegSaveKeyW(long ptr ptr) +@ stdcall RegSaveKeyW(long wstr ptr) @ stdcall -import RegSetKeySecurity(long long ptr) @ stdcall -import RegSetKeyValueA(long str str long ptr long) @ stdcall -import RegSetKeyValueW(long wstr wstr long ptr long) -@ stdcall RegSetValueA(long str long ptr long) +@ stdcall RegSetValueA(long str long str long) @ stdcall -import RegSetValueExA(long str long long ptr long) @ stdcall -import RegSetValueExW(long wstr long long ptr long) -@ stdcall RegSetValueW(long wstr long ptr long) +@ stdcall RegSetValueW(long wstr long wstr long) @ stdcall -import RegUnLoadKeyA(long str) @ stdcall -import RegUnLoadKeyW(long wstr) @ stdcall RegisterEventSourceA(str str) -- 2.17.1

2 1

[PATCH 4/8] shell32: Fix some spec file entries
by André Hentschel 19 Jan '20

19 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/shell32/shell32.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 96251a87ca9..68c0f43cdd9 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -46,7 +46,7 @@ 48 stdcall -noname PathSetDlgItemPath(long long ptr) PathSetDlgItemPathAW 49 stdcall -ordinal PathQualify(ptr) PathQualifyAW 50 stdcall -noname PathStripToRoot(ptr) PathStripToRootAW - 51 stdcall PathResolve(str long long) PathResolveAW + 51 stdcall PathResolve(str ptr long) PathResolveAW 52 stdcall -noname PathGetArgs(str) PathGetArgsAW 53 stdcall DoEnvironmentSubst(ptr long) DoEnvironmentSubstAW 54 stub LogoffWindowsDialog @@ -108,7 +108,7 @@ 113 stdcall -noname FileMenu_ReplaceUsingPidl(long long ptr long ptr) 114 stdcall -noname FileMenu_Create(long long long long long) 115 stdcall -noname FileMenu_AppendItem(long ptr long long long long) FileMenu_AppendItemAW - 116 stdcall -noname FileMenu_TrackPopupMenuEx(long long long long long long) + 116 stdcall -noname FileMenu_TrackPopupMenuEx(long long long long long ptr) 117 stdcall -noname FileMenu_DeleteItemByCmd(long long) 118 stdcall -noname FileMenu_Destroy(long) 119 stdcall -ordinal IsLFNDrive(ptr) IsLFNDriveAW @@ -160,11 +160,11 @@ 168 stdcall -ordinal SHCreatePropSheetExtArray(long wstr long) 169 stdcall -ordinal SHDestroyPropSheetExtArray(long) 170 stdcall -ordinal SHReplaceFromPropSheetExtArray(long long ptr long) - 171 stdcall -ordinal PathCleanupSpec(ptr ptr) + 171 stdcall -ordinal PathCleanupSpec(wstr ptr) 172 stdcall -noname SHCreateLinks(long str ptr long ptr) 173 stdcall -ordinal SHValidateUNC(long wstr long) 174 stdcall -ordinal SHCreateShellFolderViewEx(ptr ptr) - 175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathAW + 175 stdcall -noname SHGetSpecialFolderPath(long ptr long long) SHGetSpecialFolderPathAW 176 stdcall -ordinal SHSetInstanceExplorer(ptr) shcore.SetProcessReference 177 stub DAD_SetDragImageFromListView 178 stdcall -ordinal SHObjectProperties(long long wstr wstr) @@ -217,11 +217,11 @@ #300 stub Shl3216_ThunkData32 505 stdcall SHRegCloseKey (long) - 506 stdcall SHRegOpenKeyA (long str long) - 507 stdcall SHRegOpenKeyW (long wstr long) + 506 stdcall SHRegOpenKeyA (long str ptr) + 507 stdcall SHRegOpenKeyW (long wstr ptr) 508 stdcall SHRegQueryValueA(long str ptr ptr) 509 stdcall SHRegQueryValueExA(long str ptr ptr ptr ptr) - 510 stdcall SHRegQueryValueW (long long long long) + 510 stdcall SHRegQueryValueW (long wstr ptr ptr) 511 stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr) 512 stdcall SHRegDeleteKeyW (long wstr) @@ -247,7 +247,7 @@ 651 stdcall -noname @(ptr long) ReadCabinetState # OldReadCabinetState 652 stdcall -noname WriteCabinetState(ptr) - 653 stdcall -noname PathProcessCommand(long long long long) PathProcessCommandAW + 653 stdcall -noname PathProcessCommand(ptr ptr long long) PathProcessCommandAW 654 stdcall ReadCabinetState(ptr long) 660 stdcall -noname FileIconInit(long) @@ -431,9 +431,9 @@ @ stub SheFullPathA @ stub SheFullPathW @ stub SheGetCurDrive -@ stdcall SheGetDirA(long long) +@ stdcall SheGetDirA(long ptr) @ stub SheGetDirExW -@ stdcall SheGetDirW (long long) +@ stdcall SheGetDirW (long ptr) @ stub SheGetPathOffsetW @ stub SheRemoveQuotesA @ stub SheRemoveQuotesW @@ -446,9 +446,9 @@ @ stdcall ShellExec_RunDLLA(long long str long) @ stdcall ShellExec_RunDLLW(long long wstr long) @ stdcall ShellExecuteA(long str str str str long) -@ stdcall ShellExecuteEx (long) ShellExecuteExA -@ stdcall ShellExecuteExA (long) -@ stdcall ShellExecuteExW (long) +@ stdcall ShellExecuteEx (ptr) ShellExecuteExA +@ stdcall ShellExecuteExA (ptr) +@ stdcall ShellExecuteExW (ptr) @ stdcall ShellExecuteW (long wstr wstr wstr wstr long) @ stdcall ShellHookProc(long long long) @ stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA -- 2.17.1

2 1

[PATCH] winedump: Add a default case to numeric_leaf().
by Gerald Pfeifer 19 Jan '20

19 Jan '20

This addresses two warnings issues by GCC 10 (currently in development stage 4, so this is unlikely to change): msc.c:687:9: warning: 'value' may be used uninitialized in this function msc.c:301:13: warning: 'value' may be used uninitialized in this function Gerald --- tools/winedump/msc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index fbe7f9e541..6843f899b1 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -206,6 +206,7 @@ static int numeric_leaf(int* value, const unsigned short int* leaf) { case fv_integer: *value = fv.v.i; break; case fv_longlong: *value = (unsigned)fv.v.llu; printf("bad conversion\n"); break; + default: assert( 0 ); *value = 0; } return len; } -- 2.24.0

1 0

[PATCH 7/8] shlwapi: Fix some spec file entries
by André Hentschel 19 Jan '20

19 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/shlwapi/shlwapi.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 9b4b6357c65..0dffb519651 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -219,7 +219,7 @@ 219 stdcall -import QISearch(ptr ptr ptr ptr) 220 stdcall -noname SHSetDefaultDialogFont(ptr long) 221 stdcall -noname SHRemoveDefaultDialogFont(ptr) -222 stdcall -noname SHGlobalCounterCreate(long) +222 stdcall -noname SHGlobalCounterCreate(ptr) 223 stdcall -noname SHGlobalCounterGetValue(long) 224 stdcall -noname SHGlobalCounterIncrement(long) 225 stdcall -ordinal SHStripMneumonicW(wstr) @@ -257,15 +257,15 @@ 257 stdcall -noname SHCreateWorkerWindowA(ptr ptr long long ptr long) 258 stub -noname SHRegisterWaitForSingleObject 259 stub -noname SHUnregisterWait -260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) +260 stdcall -noname SHQueueUserWorkItem(ptr ptr long long ptr str long) 261 stub -noname SHCreateTimerQueue 262 stub -noname SHDeleteTimerQueue 263 stdcall -noname SHSetTimerQueueTimer(long ptr ptr long long str long) 264 stub -noname SHChangeTimerQueueTimer 265 stub -noname SHCancelTimerQueueTimer 266 stdcall -noname SHRestrictionLookup(long wstr ptr ptr) -267 stdcall -noname SHWeakQueryInterface(long long long long) -268 stdcall -noname SHWeakReleaseInterface(long long) +267 stdcall -noname SHWeakQueryInterface(ptr ptr ptr ptr) +268 stdcall -noname SHWeakReleaseInterface(ptr ptr) 269 stdcall -noname GUIDFromStringA(str ptr) 270 stdcall -noname GUIDFromStringW(wstr ptr) 271 stdcall -noname SHGetRestriction(wstr wstr wstr) @@ -280,7 +280,7 @@ 280 stdcall -ordinal SHRegGetIntW(ptr wstr long) shcore.SHRegGetIntW 281 stdcall -noname SHPackDispParamsV(ptr ptr long ptr) 282 varargs -noname SHPackDispParams(ptr ptr long) -283 stdcall -noname IConnectionPoint_InvokeWithCancel(ptr long long long long) +283 stdcall -noname IConnectionPoint_InvokeWithCancel(ptr long ptr long long) 284 stdcall -noname IConnectionPoint_SimpleInvoke(ptr long ptr) 285 stdcall -noname IConnectionPoint_OnChanged(ptr long) 286 varargs -noname IUnknown_CPContainerInvokeParam(ptr ptr long ptr long) @@ -354,7 +354,7 @@ 354 stdcall -ordinal SHFormatDateTimeW(ptr ptr wstr long) 355 stdcall -noname IUnknown_EnableModeless(ptr long) 356 stdcall -noname CreateAllAccessSecurityAttributes(ptr ptr long) -357 stdcall -noname SHGetNewLinkInfoWrapW(wstr wstr wstr long long) +357 stdcall -noname SHGetNewLinkInfoWrapW(wstr wstr wstr ptr long) 358 stdcall -noname SHDefExtractIconWrapW(wstr long long ptr ptr long) 359 stdcall -noname OpenEventWrapW(long long wstr) kernel32.OpenEventW 360 stdcall -noname RemoveDirectoryWrapW(wstr) kernel32.RemoveDirectoryW @@ -481,14 +481,14 @@ 481 stdcall -noname IUnknown_HasFocusIO(ptr) 482 stub -noname SHMessageBoxHelpA 483 stub -noname SHMessageBoxHelpW -484 stdcall -noname IUnknown_QueryServiceExec(ptr ptr ptr long long long ptr) +484 stdcall -noname IUnknown_QueryServiceExec(ptr ptr ptr long long ptr ptr) 485 stub -noname MapWin32ErrorToSTG 486 stub -noname ModeToCreateFileFlags 487 stdcall -ordinal SHLoadIndirectString(wstr ptr long ptr) 488 stub -noname SHConvertGraphicsFile 489 stdcall -noname GlobalAddAtomWrapW(wstr) kernel32.GlobalAddAtomW 490 stdcall -noname GlobalFindAtomWrapW(wstr) kernel32.GlobalFindAtomW -491 stdcall -noname SHGetShellKey(long long long) +491 stdcall -noname SHGetShellKey(long wstr long) 492 stub -noname PrettifyFileDescriptionW 493 stub -noname SHPropertyBag_ReadType 494 stub -noname SHPropertyBag_ReadStr @@ -663,8 +663,8 @@ @ stdcall -import PathRenameExtensionW(wstr wstr) @ stdcall -import PathSearchAndQualifyA(str ptr long) @ stdcall -import PathSearchAndQualifyW(wstr ptr long) -@ stdcall PathSetDlgItemPathA (long long ptr) -@ stdcall PathSetDlgItemPathW (long long ptr) +@ stdcall PathSetDlgItemPathA (long long str) +@ stdcall PathSetDlgItemPathW (long long wstr) @ stdcall -import PathSkipRootA(str) @ stdcall -import PathSkipRootW(wstr) @ stdcall -import PathStripPathA(str) -- 2.17.1

1 0

[PATCH 3/8] kernelbase: Fix some spec file entries
by André Hentschel 19 Jan '20

19 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernelbase/kernelbase.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f36d4d525c9..8793e69ac53 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -211,7 +211,7 @@ @ stdcall CreateProcessInternalA(long str str ptr ptr long long ptr str ptr ptr ptr) @ stdcall CreateProcessInternalW(long wstr wstr ptr ptr long long ptr wstr ptr ptr ptr) @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) -@ stdcall CreateRemoteThread(long ptr long ptr long long ptr) +@ stdcall CreateRemoteThread(long ptr long ptr ptr long ptr) @ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) @ stdcall CreateSemaphoreExW(ptr long long wstr long long) @@ -222,7 +222,7 @@ # @ stub CreateStateLock # @ stub CreateStateSubcontainer @ stdcall CreateSymbolicLinkW(wstr wstr long) kernel32.CreateSymbolicLinkW -@ stdcall CreateThread(ptr long ptr long long ptr) +@ stdcall CreateThread(ptr long ptr ptr long ptr) @ stdcall CreateThreadpool(ptr) @ stdcall CreateThreadpoolCleanupGroup() @ stdcall CreateThreadpoolIo(ptr ptr ptr ptr) @@ -372,7 +372,7 @@ @ stdcall FindNextVolumeW(long ptr long) kernel32.FindNextVolumeW # @ stub FindPackagesByPackageFamily @ stdcall FindResourceExW(long wstr wstr long) -@ stdcall FindResourceW(long wstr wstr) +@ stdcall FindResourceW(ptr wstr wstr) @ stdcall FindStringOrdinal(long wstr long wstr long long) @ stdcall FindVolumeClose(ptr) kernel32.FindVolumeClose @ stdcall FlsAlloc(ptr) @@ -381,7 +381,7 @@ @ stdcall FlsSetValue(long ptr) @ stdcall FlushConsoleInputBuffer(long) kernel32.FlushConsoleInputBuffer @ stdcall FlushFileBuffers(long) -@ stdcall FlushInstructionCache(long long long) +@ stdcall FlushInstructionCache(long ptr long) @ stdcall FlushProcessWriteBuffers() kernel32.FlushProcessWriteBuffers @ stdcall FlushViewOfFile(ptr long) @ stdcall FoldStringW(long wstr long ptr long) @@ -394,7 +394,7 @@ @ stdcall FreeEnvironmentStringsW(ptr) # @ stub FreeGPOListInternalA # @ stub FreeGPOListInternalW -@ stdcall FreeLibrary(long) +@ stdcall FreeLibrary(ptr) @ stdcall FreeLibraryAndExitThread(long long) @ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) ntdll.TpCallbackUnloadDllOnCompletion @ stdcall FreeResource(long) @@ -435,8 +435,8 @@ @ stdcall GetCommTimeouts(long ptr) @ stdcall GetCommandLineA() @ stdcall GetCommandLineW() -@ stdcall GetCompressedFileSizeA(long ptr) -@ stdcall GetCompressedFileSizeW(long ptr) +@ stdcall GetCompressedFileSizeA(str ptr) +@ stdcall GetCompressedFileSizeW(wstr ptr) @ stdcall GetComputerNameExA(long ptr ptr) @ stdcall GetComputerNameExW(long ptr ptr) @ stdcall GetConsoleCP() @@ -766,7 +766,7 @@ # @ stub GetWsChangesEx # @ stub GetXStateFeaturesMask @ stdcall GlobalAlloc(long long) -@ stdcall GlobalFree(long) +@ stdcall GlobalFree(ptr) @ stdcall GlobalMemoryStatusEx(ptr) # @ stub GuardCheckLongJumpTarget # @ stub HasPolicyForegroundProcessingCompletedInternal @@ -927,7 +927,7 @@ @ stdcall LoadLibraryExW(wstr long long) @ stdcall LoadLibraryW(wstr) # @ stub LoadPackagedLibrary -@ stdcall LoadResource(long long) +@ stdcall LoadResource(ptr long) @ stdcall LoadStringA(long long ptr long) @ stub LoadStringBaseExW @ stub LoadStringByReference @@ -1383,8 +1383,8 @@ @ stdcall SHTruncateString(str long) # @ stub SaveAlternatePackageRootPath # @ stub SaveStateRootFolderPath -@ stdcall ScrollConsoleScreenBufferA(long ptr ptr ptr ptr) -@ stdcall ScrollConsoleScreenBufferW(long ptr ptr ptr ptr) +@ stdcall ScrollConsoleScreenBufferA(long ptr ptr long ptr) +@ stdcall ScrollConsoleScreenBufferW(long ptr ptr long ptr) @ stdcall SearchPathA(str str str long ptr ptr) @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) @ stdcall SetAclInformation(ptr ptr long long) @@ -1509,7 +1509,7 @@ @ stdcall SetupComm(long long long) # @ stub SharedLocalIsEnabled @ stdcall SignalObjectAndWait(long long long long) -@ stdcall SizeofResource(long long) +@ stdcall SizeofResource(ptr long) @ stdcall Sleep(long) @ stdcall SleepConditionVariableCS(ptr ptr long) @ stdcall SleepConditionVariableSRW(ptr ptr long long) -- 2.17.1

1 0

[PATCH 2/8] gdi32: Fix some spec file entries
by André Hentschel 19 Jan '20

19 Jan '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/gdi32/gdi32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 8faa2978f49..2282f05d119 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -1,5 +1,5 @@ # ordinal exports -100 stdcall @(long long str str str) GDI_CallDevInstall16 +100 stdcall @(ptr long str str str) GDI_CallDevInstall16 101 stdcall @(long str str ptr) GDI_CallExtDeviceModePropSheet16 102 stdcall @(long ptr str str ptr str long) GDI_CallExtDeviceMode16 103 stdcall @(long str ptr ptr) GDI_CallAdvancedSetupDialog16 -- 2.17.1

1 0

Wine staging 5.0 rc6 release
by Alistair Leslie-Hughes 18 Jan '20

18 Jan '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.0 rc6 (864 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * dinput: Support default DIPROP_BUFFERSIZE buffer size * setupapi: Add support for IDF_CHECKFIRST flag in SetupPromptForDiskW. * setupapi/tests: Add test for IDF_CHECKFIRST and SetupPromptForDiskA/W. * setupapi/tests: Determine path to system32 directory at runtime. Added: * None Updated: * winebuild-Fake_Dlls Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] add: SetEnvironmentStringsW
by Frank Uhlig 18 Jan '20

18 Jan '20

From: Frank Uhlig <fuulish(a)users.noreply.github.com> Signed-off-by: Frank Uhlig <uhlig.frank(a)gmail.com> --- ...ms-win-core-processenvironment-l1-1-0.spec | 2 +- ...ms-win-core-processenvironment-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/environ.c | 61 +++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 29 +++++++++ include/winbase.h | 1 + 7 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec b/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec index e3698d6efd..7a62b74390 100644 --- a/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec +++ b/dlls/api-ms-win-core-processenvironment-l1-1-0/api-ms-win-core-processenvironment-l1-1-0.spec @@ -15,7 +15,7 @@ @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) kernel32.SearchPathW @ stdcall SetCurrentDirectoryA(str) kernel32.SetCurrentDirectoryA @ stdcall SetCurrentDirectoryW(wstr) kernel32.SetCurrentDirectoryW -@ stub SetEnvironmentStringsW +@ stdcall SetEnvironmentStringsW(ptr) kernel32.SetEnvironmentStringsW @ stdcall SetEnvironmentVariableA(str str) kernel32.SetEnvironmentVariableA @ stdcall SetEnvironmentVariableW(wstr wstr) kernel32.SetEnvironmentVariableW @ stdcall SetStdHandle(long long) kernel32.SetStdHandle diff --git a/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec b/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec index 2c25ee1a07..c93d221c5e 100644 --- a/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec +++ b/dlls/api-ms-win-core-processenvironment-l1-2-0/api-ms-win-core-processenvironment-l1-2-0.spec @@ -17,7 +17,7 @@ @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) kernel32.SearchPathW @ stdcall SetCurrentDirectoryA(str) kernel32.SetCurrentDirectoryA @ stdcall SetCurrentDirectoryW(wstr) kernel32.SetCurrentDirectoryW -@ stub SetEnvironmentStringsW +@ stdcall SetEnvironmentStringsW(ptr) kernel32.SetEnvironmentStringsW @ stdcall SetEnvironmentVariableA(str str) kernel32.SetEnvironmentVariableA @ stdcall SetEnvironmentVariableW(wstr wstr) kernel32.SetEnvironmentVariableW @ stdcall SetStdHandle(long long) kernel32.SetStdHandle diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index be48ef1694..2b74a4182e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1387,7 +1387,7 @@ # @ stub SetDynamicTimeZoneInformation @ stdcall -import SetEndOfFile(long) # @ stub SetEnvironmentStringsA -# @ stub SetEnvironmentStringsW +@ stdcall -import SetEnvironmentStringsW (ptr) @ stdcall -import SetEnvironmentVariableA(str str) @ stdcall -import SetEnvironmentVariableW(wstr wstr) @ stdcall -import SetErrorMode(long) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 44a6a0cff0..44c29fd05f 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -579,6 +579,66 @@ static void test_GetEnvironmentStringsW(void) FreeEnvironmentStringsW(env2); } +static void test_SetEnvironmentStringsW(void) +{ + DWORD buf_len; + BOOL ret; + DWORD ret_size; + + static WCHAR buf[256]; + + static WCHAR name[] = {'N','a','m','e',0}; + static WCHAR value[] = {'V','a','l','u','e',0}; + static WCHAR env[] = {'N','a','m','e','=','V','a','l','u','e',0}; + + static WCHAR eman[] = {'e','m','a','N',0}; + static WCHAR eulav[] = {'e','u','l','a','V',0}; + static WCHAR vne[] = {'e','m','a','N','=','e','u','l','a','V',0}; + + static WCHAR var[] = {'V','a','r'}; + static WCHAR val[] = {'V','a','l'}; + static WCHAR rav[] = {'r','a','V'}; + static WCHAR lav[] = {'l','a','V'}; + static WCHAR mul[] = {'V','a','r','=','V','a','l',' ','r','a','V','=','l','a','V',0}; + + static WCHAR empty[] = {'V','a','r','=',0}; + + buf_len = sizeof(buf) / 2; + + ret = SetEnvironmentStringsW(env); + ok( ret, "Setting environment strings failed" ); + + ret_size = GetEnvironmentVariableW(name, buf, buf_len); + ok( ((0 != ret_size) && (0 == wcscmp(buf, value))), + "Environment String settings resulted in different value"); + + ret = SetEnvironmentStringsW(vne); + ok( ret, "Setting environment strings failed" ); + + ret_size = GetEnvironmentVariableW(eman, buf, buf_len); + ok( ((0 != ret_size) && (0 == wcscmp(buf, eulav))), + "Environment String settings resulted in different value"); + + ret = SetEnvironmentStringsW(mul); + ok( ret, "Setting environment strings failed" ); + + ret_size = GetEnvironmentVariableW(var, buf, buf_len); + ok( ((0 != ret_size) && (0 == wcscmp(buf, val))), + "Environment String settings resulted in different value"); + + ret_size = GetEnvironmentVariableW(rav, buf, buf_len); + ok( ((0 != ret_size) && (0 == wcscmp(buf, lav))), + "Environment String settings resulted in different value"); + + ret = SetEnvironmentStringsW(empty); + ok( ret, "Setting environment strings failed" ); + + ret_size = GetEnvironmentVariableW(var, buf, buf_len); + ok( (0 == ret_size), + "Environment String settings resulted in different value"); + +} + START_TEST(environ) { init_functionpointers(); @@ -591,4 +651,5 @@ START_TEST(environ) test_GetComputerNameExA(); test_GetComputerNameExW(); test_GetEnvironmentStringsW(); + test_SetEnvironmentStringsW(); } diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f36d4d525c..a5e30b938f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1422,7 +1422,7 @@ @ stdcall SetDefaultDllDirectories(long) # @ stub SetDynamicTimeZoneInformation @ stdcall SetEndOfFile(long) -@ stub SetEnvironmentStringsW +@ stdcall SetEnvironmentStringsW(ptr) @ stdcall SetEnvironmentVariableA(str str) @ stdcall SetEnvironmentVariableW(wstr wstr) @ stdcall SetErrorMode(long) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index a07dddb1fc..97b59b9548 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1345,6 +1345,35 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentVariableW( LPCWSTR name, LPCWSTR val } +/*********************************************************************** + * SetEnvironmentStringsW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetEnvironmentStringsW( LPWCH NewEnvironment ) +{ + + BOOL rc = FALSE; + WCHAR *var, *val; + const WCHAR delim[] = {' ','=','\n',0}; + + TRACE( "(%s)\n", debugstr_w(NewEnvironment)); + + if (NULL == NewEnvironment) + return rc; + + var = wcstok(NewEnvironment, delim); + val = wcstok(NULL, delim); + + while (var != NULL) { + if (FALSE == (rc = SetEnvironmentVariableW(var, val))) + break; + var = wcstok(NULL, delim); + val = wcstok(NULL, delim); + } + + return rc; +} + + /*********************************************************************** * Process/thread attribute lists ***********************************************************************/ diff --git a/include/winbase.h b/include/winbase.h index 655eb48f0f..0c1aa19b42 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2621,6 +2621,7 @@ WINBASEAPI BOOL WINAPI SetEndOfFile(HANDLE); WINBASEAPI BOOL WINAPI SetEnvironmentVariableA(LPCSTR,LPCSTR); WINBASEAPI BOOL WINAPI SetEnvironmentVariableW(LPCWSTR,LPCWSTR); #define SetEnvironmentVariable WINELIB_NAME_AW(SetEnvironmentVariable) +WINBASEAPI BOOL WINAPI SetEnvironmentStringsW(LPWCH); WINBASEAPI UINT WINAPI SetErrorMode(UINT); WINBASEAPI BOOL WINAPI SetEvent(HANDLE); WINBASEAPI VOID WINAPI SetFileApisToANSI(void); -- 2.24.1

2 1