September 2019 - Wine-commits

Francois Gouget : ddraw/tests: Spelling fixes in ok() messages.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: ed75c597f92af58d20c9e320bf49f93a7d375fd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed75c597f92af58d20c9e320… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 8 06:20:12 2019 +0200 ddraw/tests: Spelling fixes in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index cc22802..a23e76e1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2745,7 +2745,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); expect_messages = exclusive_focus_restore_messages; @@ -2758,7 +2758,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width - && devmode.dmPelsHeight == param.ddraw_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 595157b..2156bd5 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2856,7 +2856,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); expect_messages = exclusive_focus_restore_messages; @@ -2869,7 +2869,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width - && devmode.dmPelsHeight == param.ddraw_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 567a8f3..fdcf6df 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3010,7 +3010,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); expect_messages = exclusive_focus_restore_messages; @@ -3023,7 +3023,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width - && devmode.dmPelsHeight == param.ddraw_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 116e34a..279263f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2684,7 +2684,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); expect_messages = exclusive_focus_restore_messages; @@ -2697,7 +2697,7 @@ static void test_coop_level_mode_set(void) ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width - && devmode.dmPelsHeight == param.ddraw_height, "Got unexpect screen size %ux%u.\n", + && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);

1 0

Francois Gouget : ddrawex: Tweak the createDD() name to make CodeSpell happy.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: b035f5c74c9f8ff2fee8c9f6bc41967d0afd99f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b035f5c74c9f8ff2fee8c9f6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 8 06:23:50 2019 +0200 ddrawex: Tweak the createDD() name to make CodeSpell happy. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddrawex/tests/ddrawex.c | 4 ++-- dlls/ddrawex/tests/surface.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddrawex/tests/ddrawex.c b/dlls/ddrawex/tests/ddrawex.c index 7134a04..60d84fe 100644 --- a/dlls/ddrawex/tests/ddrawex.c +++ b/dlls/ddrawex/tests/ddrawex.c @@ -27,7 +27,7 @@ static IDirectDrawFactory *factory; static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); -static IDirectDraw *createDD(void) +static IDirectDraw *createDDraw(void) { HRESULT hr; IDirectDraw *dd; @@ -46,7 +46,7 @@ static ULONG get_ref(IUnknown *o) static void RefCountTest(void) { - IDirectDraw *dd1 = createDD(); + IDirectDraw *dd1 = createDDraw(); IDirectDraw2 *dd2; IDirectDraw3 *dd3; IDirectDraw4 *dd4; diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index c6c02a8..3081cfe 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -29,7 +29,7 @@ static IDirectDrawFactory *factory; static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); -static IDirectDraw *createDD(void) +static IDirectDraw *createDDraw(void) { HRESULT hr; IDirectDraw *dd; @@ -74,7 +74,7 @@ static void GetDCTest_main(DDSURFACEDESC *ddsd, DDSURFACEDESC2 *ddsd2, void (*te IDirectDrawSurface2 *surf3; IDirectDrawSurface4 *surf4; HRESULT hr; - IDirectDraw *dd1 = createDD(); + IDirectDraw *dd1 = createDDraw(); IDirectDraw2 *dd2; IDirectDraw3 *dd3; IDirectDraw4 *dd4; @@ -156,7 +156,7 @@ static void GetDCTest(void) static void CapsTest(void) { DDSURFACEDESC ddsd; - IDirectDraw *dd1 = createDD(); + IDirectDraw *dd1 = createDDraw(); IDirectDrawSurface *surf; HRESULT hr; @@ -247,7 +247,7 @@ static void test_surface_from_dc3(void) HRESULT hr; HDC dc; - dd1 = createDD(); + dd1 = createDDraw(); hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw3, (void **)&dd3); ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed, hr %#x.\n", hr); IDirectDraw_Release(dd1); @@ -314,7 +314,7 @@ static void test_surface_from_dc4(void) HRESULT hr; HDC dc; - dd1 = createDD(); + dd1 = createDDraw(); hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **)&dd4); if (hr == E_NOINTERFACE) { win_skip("DirectDraw4 is not supported\n");

1 0

Francois Gouget : winemac.drv: Avoid an unneeded lstrlenW() call.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 98b1d68aac8d4195821ff69f6b8f49baadddd8f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98b1d68aac8d4195821ff69f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 8 06:24:49 2019 +0200 winemac.drv: Avoid an unneeded lstrlenW() call. Note that since tiptext is a buffer it cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/systray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index a2c32b2..75bca5e 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -123,7 +123,7 @@ static BOOL modify_icon(struct tray_icon *icon, NOTIFYICONDATAW *nid) if (icon->image) update_image = TRUE; - if (lstrlenW(icon->tiptext)) + if (*icon->tiptext) update_tooltip = TRUE; } else

1 0

Marcus Meissner : iphlpapi: Fixed size to MultiByteToWideChar.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: e7007ee81471e59d265f59fbe0ddbb9017ecb5c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7007ee81471e59d265f59fb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 8 17:43:19 2019 +0200 iphlpapi: Fixed size to MultiByteToWideChar. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d4b1100..1b0bc93 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2331,7 +2331,7 @@ static void test_ParseNetworkString(void) for (i = 0; i < ARRAY_SIZE(ipv4_address_tests); i++) { MultiByteToWideChar(CP_ACP, 0, ipv4_address_tests[i].str, sizeof(ipv4_address_tests[i].str), - wstr, sizeof(wstr)); + wstr, ARRAY_SIZE(wstr)); memset(&info, 0x99, sizeof(info)); port = 0x9999; prefix_len = 0x99; @@ -2357,7 +2357,7 @@ static void test_ParseNetworkString(void) for (i = 0; i < ARRAY_SIZE(ipv4_service_tests); i++) { MultiByteToWideChar(CP_ACP, 0, ipv4_service_tests[i].str, sizeof(ipv4_service_tests[i].str), - wstr, sizeof(wstr)); + wstr, ARRAY_SIZE(wstr)); memset(&info, 0x99, sizeof(info)); port = 0x9999; prefix_len = 0x99;

1 0

Alexandre Julliard : kernel32: Move interlocked functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: c683e7e5a1a1bc1846ccf666e44a5869609b230f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c683e7e5a1a1bc1846ccf666… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 13:17:48 2019 +0200 kernel32: Move interlocked functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +-- dlls/kernel32/sync.c | 29 ------------- dlls/kernelbase/kernelbase.spec | 16 ++++---- dlls/kernelbase/sync.c | 90 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b562c74..0b0129f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -940,9 +940,9 @@ @ stdcall IdnToNameprepUnicode(long wstr long ptr long) @ stdcall IdnToUnicode(long wstr long ptr long) @ stdcall InitAtomTable(long) -@ stdcall InitOnceBeginInitialize(ptr long ptr ptr) -@ stdcall InitOnceComplete(ptr long ptr) -@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) +@ stdcall InitOnceBeginInitialize(ptr long ptr ptr) kernelbase.InitOnceBeginInitialize +@ stdcall InitOnceComplete(ptr long ptr) kernelbase.InitOnceComplete +@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) kernelbase.InitOnceExecuteOnce @ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize @ stdcall InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable # @ stub InitializeContext diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index a510657..9c2d29f 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1071,35 +1071,6 @@ BOOL WINAPI QueryMemoryResourceNotification(HANDLE handle, PBOOL state) return FALSE; } -/*********************************************************************** - * InitOnceBeginInitialize (KERNEL32.@) - */ -BOOL WINAPI InitOnceBeginInitialize( INIT_ONCE *once, DWORD flags, BOOL *pending, void **context ) -{ - NTSTATUS status = RtlRunOnceBeginInitialize( once, flags, context ); - if (status >= 0) *pending = (status == STATUS_PENDING); - else SetLastError( RtlNtStatusToDosError(status) ); - return status >= 0; -} - -/*********************************************************************** - * InitOnceComplete (KERNEL32.@) - */ -BOOL WINAPI InitOnceComplete( INIT_ONCE *once, DWORD flags, void *context ) -{ - NTSTATUS status = RtlRunOnceComplete( once, flags, context ); - if (status != STATUS_SUCCESS) SetLastError( RtlNtStatusToDosError(status) ); - return !status; -} - -/*********************************************************************** - * InitOnceExecuteOnce (KERNEL32.@) - */ -BOOL WINAPI InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, void *param, void **context ) -{ - return !RtlRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); -} - #ifdef __i386__ /*********************************************************************** diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7dff3ed..f554a0f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -794,9 +794,9 @@ @ stdcall ImpersonateNamedPipeClient(long) @ stdcall ImpersonateSelf(long) # @ stub IncrementPackageStatusVersion -@ stdcall InitOnceBeginInitialize(ptr long ptr ptr) kernel32.InitOnceBeginInitialize -@ stdcall InitOnceComplete(ptr long ptr) kernel32.InitOnceComplete -@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) kernel32.InitOnceExecuteOnce +@ stdcall InitOnceBeginInitialize(ptr long ptr ptr) +@ stdcall InitOnceComplete(ptr long ptr) +@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) @ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize @ stdcall InitializeAcl(ptr long long) @ stdcall InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable @@ -813,13 +813,13 @@ @ stdcall InitializeSid(ptr ptr long) # @ stub InitializeSynchronizationBarrier # @ stub InstallELAMCertificateInfo -@ stdcall -arch=i386 InterlockedCompareExchange(ptr long long) kernel32.InterlockedCompareExchange +@ stdcall -arch=i386 InterlockedCompareExchange(ptr long long) @ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr int64 int64) ntdll.RtlInterlockedCompareExchange64 -@ stdcall -arch=i386 InterlockedDecrement(ptr) kernel32.InterlockedDecrement -@ stdcall -arch=i386 InterlockedExchange(ptr long) kernel32.InterlockedExchange -@ stdcall -arch=i386 InterlockedExchangeAdd(ptr long ) kernel32.InterlockedExchangeAdd +@ stdcall -arch=i386 InterlockedDecrement(ptr) +@ stdcall -arch=i386 InterlockedExchange(ptr long) +@ stdcall -arch=i386 InterlockedExchangeAdd(ptr long ) @ stdcall InterlockedFlushSList(ptr) ntdll.RtlInterlockedFlushSList -@ stdcall -arch=i386 InterlockedIncrement(ptr) kernel32.InterlockedIncrement +@ stdcall -arch=i386 InterlockedIncrement(ptr) @ stdcall InterlockedPopEntrySList(ptr) ntdll.RtlInterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList @ stdcall -fastcall InterlockedPushListSList(ptr ptr ptr long) ntdll.RtlInterlockedPushListSList diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 31df6c7..51763c1 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -1383,3 +1383,93 @@ BOOL WINAPI DECLSPEC_HOTPATCH WaitNamedPipeW( LPCWSTR name, DWORD timeout ) NtClose( pipe_dev ); return set_ntstatus( status ); } + + + +/*********************************************************************** + * Interlocked functions + ***********************************************************************/ + + +/*********************************************************************** + * InitOnceBeginInitialize (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH InitOnceBeginInitialize( INIT_ONCE *once, DWORD flags, + BOOL *pending, void **context ) +{ + NTSTATUS status = RtlRunOnceBeginInitialize( once, flags, context ); + if (status >= 0) *pending = (status == STATUS_PENDING); + else SetLastError( RtlNtStatusToDosError(status) ); + return status >= 0; +} + + +/*********************************************************************** + * InitOnceComplete (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH InitOnceComplete( INIT_ONCE *once, DWORD flags, void *context ) +{ + return set_ntstatus( RtlRunOnceComplete( once, flags, context )); +} + + +/*********************************************************************** + * InitOnceExecuteOnce (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, + void *param, void **context ) +{ + return !RtlRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); +} + +#ifdef __i386__ + +/*********************************************************************** + * InterlockedCompareExchange (kernelbase.@) + */ +__ASM_STDCALL_FUNC(InterlockedCompareExchange, 12, + "movl 12(%esp),%eax\n\t" + "movl 8(%esp),%ecx\n\t" + "movl 4(%esp),%edx\n\t" + "lock; cmpxchgl %ecx,(%edx)\n\t" + "ret $12") + +/*********************************************************************** + * InterlockedExchange (kernelbase.@) + */ +__ASM_STDCALL_FUNC(InterlockedExchange, 8, + "movl 8(%esp),%eax\n\t" + "movl 4(%esp),%edx\n\t" + "lock; xchgl %eax,(%edx)\n\t" + "ret $8") + +/*********************************************************************** + * InterlockedExchangeAdd (kernelbase.@) + */ +__ASM_STDCALL_FUNC(InterlockedExchangeAdd, 8, + "movl 8(%esp),%eax\n\t" + "movl 4(%esp),%edx\n\t" + "lock; xaddl %eax,(%edx)\n\t" + "ret $8") + +/*********************************************************************** + * InterlockedIncrement (kernelbase.@) + */ +__ASM_STDCALL_FUNC(InterlockedIncrement, 4, + "movl 4(%esp),%edx\n\t" + "movl $1,%eax\n\t" + "lock; xaddl %eax,(%edx)\n\t" + "incl %eax\n\t" + "ret $4") + +/*********************************************************************** + * InterlockedDecrement (kernelbase.@) + */ +__ASM_STDCALL_FUNC(InterlockedDecrement, 4, + "movl 4(%esp),%edx\n\t" + "movl $-1,%eax\n\t" + "lock; xaddl %eax,(%edx)\n\t" + "decl %eax\n\t" + "ret $4") + +#endif /* __i386__ */

1 0

Alexandre Julliard : kernel32: Move file change notification functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 0b5c0bc769f9e58eef0cb49ac6d70358005f92ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b5c0bc769f9e58eef0cb49a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 13:31:35 2019 +0200 kernel32: Move file change notification functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/change.c | 208 ---------------------------------------- dlls/kernel32/kernel32.spec | 10 +- dlls/kernelbase/file.c | 136 ++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 10 +- 5 files changed, 146 insertions(+), 219 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b5c0bc769f9e58eef0c…

1 0

Alexandre Julliard : kernel32: Move virtual memory functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 61516e2223da79234216b9a47d2d860bb627bfca URL: https://source.winehq.org/git/wine.git/?a=commit;h=61516e2223da79234216b9a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 14:13:32 2019 +0200 kernel32: Move virtual memory functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 40 ++-- dlls/kernel32/process.c | 24 --- dlls/kernel32/virtual.c | 420 ---------------------------------------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 40 ++-- dlls/kernelbase/memory.c | 293 ++++++++++++++++++++++++++++ 6 files changed, 334 insertions(+), 484 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61516e2223da79234216…

1 0

Alexandre Julliard : kernel32: Move heap functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: cad0f61808cf6eba8109b40a19cacd96389cd139 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad0f61808cf6eba8109b40a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 14:48:13 2019 +0200 kernel32: Move heap functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 94 ----------------------------------------- dlls/kernel32/kernel32.spec | 16 +++---- dlls/kernelbase/kernelbase.spec | 20 ++++----- dlls/kernelbase/memory.c | 91 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 112 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 80e1152..8e0f8d4 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -171,85 +171,6 @@ BOOL WINAPI HeapDestroy( HANDLE heap /* [in] Handle of heap */ ) } -/*********************************************************************** - * HeapCompact (KERNEL32.@) - */ -SIZE_T WINAPI HeapCompact( HANDLE heap, DWORD flags ) -{ - return RtlCompactHeap( heap, flags ); -} - - -/*********************************************************************** - * HeapValidate (KERNEL32.@) - * Validates a specified heap. - * - * NOTES - * Flags is ignored. - * - * RETURNS - * TRUE: Success - * FALSE: Failure - */ -BOOL WINAPI HeapValidate( - HANDLE heap, /* [in] Handle to the heap */ - DWORD flags, /* [in] Bit flags that control access during operation */ - LPCVOID block /* [in] Optional pointer to memory block to validate */ -) { - return RtlValidateHeap( heap, flags, block ); -} - - -/*********************************************************************** - * HeapWalk (KERNEL32.@) - * Enumerates the memory blocks in a specified heap. - * - * TODO - * - handling of PROCESS_HEAP_ENTRY_MOVEABLE and - * PROCESS_HEAP_ENTRY_DDESHARE (needs heap.c support) - * - * RETURNS - * TRUE: Success - * FALSE: Failure - */ -BOOL WINAPI HeapWalk( - HANDLE heap, /* [in] Handle to heap to enumerate */ - LPPROCESS_HEAP_ENTRY entry /* [out] Pointer to structure of enumeration info */ -) { - NTSTATUS ret = RtlWalkHeap( heap, entry ); - if (ret) SetLastError( RtlNtStatusToDosError(ret) ); - return !ret; -} - - -/*********************************************************************** - * HeapLock (KERNEL32.@) - * Attempts to acquire the critical section object for a specified heap. - * - * RETURNS - * TRUE: Success - * FALSE: Failure - */ -BOOL WINAPI HeapLock( - HANDLE heap /* [in] Handle of heap to lock for exclusive access */ -) { - return RtlLockHeap( heap ); -} - - -/*********************************************************************** - * HeapUnlock (KERNEL32.@) - * Releases ownership of the critical section object. - * - * RETURNS - * TRUE: Success - * FALSE: Failure - */ -BOOL WINAPI HeapUnlock( - HANDLE heap /* [in] Handle to the heap to unlock */ -) { - return RtlUnlockHeap( heap ); -} @@ -278,21 +199,6 @@ SIZE_T WINAPI HeapSize( HANDLE heap, DWORD flags, LPCVOID ptr ) return RtlSizeHeap( heap, flags, ptr ); } -BOOL WINAPI HeapQueryInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class, - PVOID info, SIZE_T size_in, PSIZE_T size_out) -{ - NTSTATUS ret = RtlQueryHeapInformation( heap, info_class, info, size_in, size_out ); - if (ret) SetLastError( RtlNtStatusToDosError(ret) ); - return !ret; -} - -BOOL WINAPI HeapSetInformation( HANDLE heap, HEAP_INFORMATION_CLASS infoclass, PVOID info, SIZE_T size) -{ - NTSTATUS ret = RtlSetHeapInformation( heap, infoclass, info, size ); - if (ret) SetLastError( RtlNtStatusToDosError(ret) ); - return !ret; -} - /* * Win32 Global heap functions (GlobalXXX). * These functions included in Win32 for compatibility with 16 bit Windows diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9d5e9eb..f856597 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -918,24 +918,24 @@ @ stub Heap32ListNext @ stub Heap32Next @ stdcall HeapAlloc(long long long) ntdll.RtlAllocateHeap -@ stdcall HeapCompact(long long) +@ stdcall -import HeapCompact(long long) @ stdcall HeapCreate(long long long) @ stub HeapCreateTagsW @ stdcall HeapDestroy(long) @ stub HeapExtend -@ stdcall HeapFree(long long ptr) ntdll.RtlFreeHeap -@ stdcall HeapLock(long) -@ stdcall HeapQueryInformation(long long ptr long ptr) +@ stdcall HeapFree(long long ptr) +@ stdcall -import HeapLock(long) +@ stdcall -import HeapQueryInformation(long long ptr long ptr) @ stub HeapQueryTagW @ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap @ stub HeapSetFlags -@ stdcall HeapSetInformation(ptr long ptr long) +@ stdcall -import HeapSetInformation(ptr long ptr long) @ stdcall HeapSize(long long ptr) ntdll.RtlSizeHeap @ stub HeapSummary -@ stdcall HeapUnlock(long) +@ stdcall -import HeapUnlock(long) @ stub HeapUsage -@ stdcall HeapValidate(long long ptr) -@ stdcall HeapWalk(long ptr) +@ stdcall -import HeapValidate(long long ptr) +@ stdcall -import HeapWalk(long ptr) @ stdcall IdnToAscii(long wstr long ptr long) @ stdcall IdnToNameprepUnicode(long wstr long ptr long) @ stdcall IdnToUnicode(long wstr long ptr long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 8889638..4d5e644 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -773,19 +773,19 @@ # @ stub HasPolicyForegroundProcessingCompletedInternal @ stdcall HashData(ptr long ptr long) @ stdcall HeapAlloc(long long long) ntdll.RtlAllocateHeap -@ stdcall HeapCompact(long long) kernel32.HeapCompact -@ stdcall HeapCreate(long long long) kernel32.HeapCreate -@ stdcall HeapDestroy(long) kernel32.HeapDestroy -@ stdcall HeapFree(long long ptr) ntdll.RtlFreeHeap -@ stdcall HeapLock(long) kernel32.HeapLock -@ stdcall HeapQueryInformation(long long ptr long ptr) kernel32.HeapQueryInformation +@ stdcall HeapCompact(long long) +@ stdcall HeapCreate(long long long) +@ stdcall HeapDestroy(long) +@ stdcall HeapFree(long long ptr) +@ stdcall HeapLock(long) +@ stdcall HeapQueryInformation(long long ptr long ptr) @ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap -@ stdcall HeapSetInformation(ptr long ptr long) kernel32.HeapSetInformation +@ stdcall HeapSetInformation(ptr long ptr long) @ stdcall HeapSize(long long ptr) ntdll.RtlSizeHeap @ stub HeapSummary -@ stdcall HeapUnlock(long) kernel32.HeapUnlock -@ stdcall HeapValidate(long long ptr) kernel32.HeapValidate -@ stdcall HeapWalk(long ptr) kernel32.HeapWalk +@ stdcall HeapUnlock(long) +@ stdcall HeapValidate(long long ptr) +@ stdcall HeapWalk(long ptr) @ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii @ stdcall IdnToNameprepUnicode(long wstr long ptr long) kernel32.IdnToNameprepUnicode @ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 55e03df..ec9eace 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -291,3 +291,94 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteProcessMemory( HANDLE process, void *addr, co { return set_ntstatus( NtWriteVirtualMemory( process, addr, buffer, size, bytes_written )); } + + +/*********************************************************************** + * Heap functions + ***********************************************************************/ + + +/*********************************************************************** + * HeapCompact (kernelbase.@) + */ +SIZE_T WINAPI DECLSPEC_HOTPATCH HeapCompact( HANDLE heap, DWORD flags ) +{ + return RtlCompactHeap( heap, flags ); +} + + +/*********************************************************************** + * HeapCreate (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH HeapCreate( DWORD flags, SIZE_T init_size, SIZE_T max_size ) +{ + HANDLE ret = RtlCreateHeap( flags, NULL, max_size, init_size, NULL, NULL ); + if (!ret) SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return ret; +} + + +/*********************************************************************** + * HeapDestroy (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH HeapDestroy( HANDLE heap ) +{ + if (!RtlDestroyHeap( heap )) return TRUE; + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; +} + + +/*********************************************************************** + * HeapLock (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH HeapLock( HANDLE heap ) +{ + return RtlLockHeap( heap ); +} + + +/*********************************************************************** + * HeapQueryInformation (kernelbase.@) + */ +BOOL WINAPI HeapQueryInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class, + PVOID info, SIZE_T size, PSIZE_T size_out ) +{ + return set_ntstatus( RtlQueryHeapInformation( heap, info_class, info, size, size_out )); +} + + +/*********************************************************************** + * HeapSetInformation (kernelbase.@) + */ +BOOL WINAPI HeapSetInformation( HANDLE heap, HEAP_INFORMATION_CLASS infoclass, PVOID info, SIZE_T size ) +{ + return set_ntstatus( RtlSetHeapInformation( heap, infoclass, info, size )); +} + + +/*********************************************************************** + * HeapUnlock (kernelbase.@) + */ +BOOL WINAPI HeapUnlock( HANDLE heap ) +{ + return RtlUnlockHeap( heap ); +} + + +/*********************************************************************** + * HeapValidate (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH HeapValidate( HANDLE heap, DWORD flags, LPCVOID ptr ) +{ + return RtlValidateHeap( heap, flags, ptr ); +} + + +/*********************************************************************** + * HeapWalk (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH HeapWalk( HANDLE heap, PROCESS_HEAP_ENTRY *entry ) +{ + return set_ntstatus( RtlWalkHeap( heap, entry )); +}

1 0

Alexandre Julliard : kernel32: Move memory resource functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 67a9700267f05da6425f52b6e68111c785b5019e URL: https://source.winehq.org/git/wine.git/?a=commit;h=67a9700267f05da6425f52b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 15:03:17 2019 +0200 kernel32: Move memory resource functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +-- dlls/kernel32/sync.c | 62 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 4 +-- dlls/kernelbase/memory.c | 57 +++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 66 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f856597..33c97fd 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -298,7 +298,7 @@ @ stub CreateKernelThread @ stdcall CreateMailslotA(str long long ptr) @ stdcall CreateMailslotW(wstr long long ptr) -@ stdcall CreateMemoryResourceNotification(long) +@ stdcall -import CreateMemoryResourceNotification(long) @ stdcall -import CreateMutexA(ptr long str) @ stdcall -import CreateMutexExA(ptr str long long) @ stdcall -import CreateMutexExW(ptr wstr long long) @@ -1166,7 +1166,7 @@ # @ stub QueryIdleProcessorCycleTime # @ stub QueryIdleProcessorCycleTimeEx @ stdcall QueryInformationJobObject(long long ptr long ptr) -@ stdcall QueryMemoryResourceNotification(ptr ptr) +@ stdcall -import QueryMemoryResourceNotification(ptr ptr) @ stub QueryNumberOfEventLogRecords @ stub QueryOldestEventLogRecord @ stdcall QueryPerformanceCounter(ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 9c2d29f..054b8c2 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1009,68 +1009,6 @@ BOOL WINAPI BindIoCompletionCallback( HANDLE FileHandle, LPOVERLAPPED_COMPLETION } -/*********************************************************************** - * CreateMemoryResourceNotification (KERNEL32.@) - */ -HANDLE WINAPI CreateMemoryResourceNotification(MEMORY_RESOURCE_NOTIFICATION_TYPE type) -{ - static const WCHAR lowmemW[] = - {'\\','K','e','r','n','e','l','O','b','j','e','c','t','s', - '\\','L','o','w','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n',0}; - static const WCHAR highmemW[] = - {'\\','K','e','r','n','e','l','O','b','j','e','c','t','s', - '\\','H','i','g','h','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n',0}; - HANDLE ret; - UNICODE_STRING nameW; - OBJECT_ATTRIBUTES attr; - NTSTATUS status; - - switch (type) - { - case LowMemoryResourceNotification: - RtlInitUnicodeString( &nameW, lowmemW ); - break; - case HighMemoryResourceNotification: - RtlInitUnicodeString( &nameW, highmemW ); - break; - default: - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - status = NtOpenEvent( &ret, EVENT_ALL_ACCESS, &attr ); - if (status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return 0; - } - return ret; -} - -/*********************************************************************** - * QueryMemoryResourceNotification (KERNEL32.@) - */ -BOOL WINAPI QueryMemoryResourceNotification(HANDLE handle, PBOOL state) -{ - switch (WaitForSingleObject( handle, 0 )) - { - case WAIT_OBJECT_0: - *state = TRUE; - return TRUE; - case WAIT_TIMEOUT: - *state = FALSE; - return TRUE; - } - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; -} - #ifdef __i386__ /*********************************************************************** diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 4d5e644..e4125a4 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -194,7 +194,7 @@ @ stdcall CreateHardLinkA(str str ptr) kernel32.CreateHardLinkA @ stdcall CreateHardLinkW(wstr wstr ptr) kernel32.CreateHardLinkW @ stdcall CreateIoCompletionPort(long long long long) -@ stdcall CreateMemoryResourceNotification(long) kernel32.CreateMemoryResourceNotification +@ stdcall CreateMemoryResourceNotification(long) @ stdcall CreateMutexA(ptr long str) @ stdcall CreateMutexExA(ptr str long long) @ stdcall CreateMutexExW(ptr wstr long long) @@ -1202,7 +1202,7 @@ # @ stub QueryIdleProcessorCycleTimeEx # @ stub QueryInterruptTime # @ stub QueryInterruptTimePrecise -@ stdcall QueryMemoryResourceNotification(ptr ptr) kernel32.QueryMemoryResourceNotification +@ stdcall QueryMemoryResourceNotification(ptr ptr) # @ stub QueryOptionalDelayLoadedAPI @ stdcall QueryPerformanceCounter(ptr) kernel32.QueryPerformanceCounter @ stdcall QueryPerformanceFrequency(ptr) kernel32.QueryPerformanceFrequency diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index ec9eace..aa834a3 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -382,3 +382,60 @@ BOOL WINAPI DECLSPEC_HOTPATCH HeapWalk( HANDLE heap, PROCESS_HEAP_ENTRY *entry ) { return set_ntstatus( RtlWalkHeap( heap, entry )); } + + +/*********************************************************************** + * Memory resource functions + ***********************************************************************/ + + +/*********************************************************************** + * CreateMemoryResourceNotification (kernelbase.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH CreateMemoryResourceNotification( MEMORY_RESOURCE_NOTIFICATION_TYPE type ) +{ + static const WCHAR lowmemW[] = + {'\\','K','e','r','n','e','l','O','b','j','e','c','t','s', + '\\','L','o','w','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n',0}; + static const WCHAR highmemW[] = + {'\\','K','e','r','n','e','l','O','b','j','e','c','t','s', + '\\','H','i','g','h','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n',0}; + HANDLE ret; + UNICODE_STRING nameW; + OBJECT_ATTRIBUTES attr; + + switch (type) + { + case LowMemoryResourceNotification: + RtlInitUnicodeString( &nameW, lowmemW ); + break; + case HighMemoryResourceNotification: + RtlInitUnicodeString( &nameW, highmemW ); + break; + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); + if (!set_ntstatus( NtOpenEvent( &ret, EVENT_ALL_ACCESS, &attr ))) return 0; + return ret; +} + +/*********************************************************************** + * QueryMemoryResourceNotification (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH QueryMemoryResourceNotification( HANDLE handle, BOOL *state ) +{ + switch (WaitForSingleObject( handle, 0 )) + { + case WAIT_OBJECT_0: + *state = TRUE; + return TRUE; + case WAIT_TIMEOUT: + *state = FALSE; + return TRUE; + } + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; +}

1 0

Alexandre Julliard : kernel32: Move global/ local memory functions to kernelbase.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: d38a5ba4e6ec05afe6f085b9999fc7e2073a4924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d38a5ba4e6ec05afe6f085b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 8 21:20:21 2019 +0200 kernel32: Move global/local memory functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 459 +--------------------------------------- dlls/kernel32/kernel32.spec | 14 +- dlls/kernelbase/kernelbase.spec | 14 +- dlls/kernelbase/memory.c | 351 +++++++++++++++++++++++++++++- 4 files changed, 369 insertions(+), 469 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d38a5ba4e6ec05afe6f0…

1 0