February 2018 - Wine-commits

Alex Henrie : gameux/tests: Drop game stats test workarounds for Windows < = 2000.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: ef08793472b4889d539cc6147a46908c1ca4398e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef08793472b4889d539cc614… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 1 23:51:58 2018 -0700 gameux/tests: Drop game stats test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/Makefile.in | 2 +- dlls/gameux/tests/gamestatistics.c | 29 +---------------------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/dlls/gameux/tests/Makefile.in b/dlls/gameux/tests/Makefile.in index c90132d..7b3f2f9 100644 --- a/dlls/gameux/tests/Makefile.in +++ b/dlls/gameux/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = gameux.dll -IMPORTS = uuid shlwapi oleaut32 ole32 advapi32 +IMPORTS = uuid shlwapi oleaut32 ole32 advapi32 shell32 C_SRCS = \ gameexplorer.c \ diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index dd9bd37..ff247fc 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -32,25 +32,6 @@ */ static WCHAR sExeName[MAX_PATH] = {0}; static GUID gameInstanceId; -static HRESULT WINAPI (*pSHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR); -/******************************************************************************* - *_loadDynamicRoutines - * - * Helper function, prepares pointers to system procedures which may be not - * available on older operating systems. - * - * Returns: - * TRUE procedures were loaded successfully - * FALSE procedures were not loaded successfully - */ -static BOOL _loadDynamicRoutines(void) -{ - HMODULE hModule = LoadLibraryA( "shell32.dll" ); - - pSHGetFolderPathW = (LPVOID)GetProcAddress(hModule, "SHGetFolderPathW"); - if (!pSHGetFolderPathW) return FALSE; - return TRUE; -} /******************************************************************************* * Registers test suite executable as game in Games Explorer. Required to test @@ -117,7 +98,7 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta HRESULT hr; WCHAR sGuid[49], sPath[MAX_PATH]; - hr = pSHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sPath); + hr = SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sPath); if(SUCCEEDED(hr)) hr = (StringFromGUID2(guidApplicationId, sGuid, sizeof(sGuid) / sizeof(sGuid[0])) != 0 ? S_OK : E_FAIL); @@ -396,14 +377,6 @@ START_TEST(gamestatistics) IGameStatisticsMgr* gsm; IGameExplorer *ge; - if (!_loadDynamicRoutines()) - { - /* this is not a failure, because a procedure loaded by address - * is always available on systems which has gameux.dll */ - win_skip("too old system, cannot load required dynamic procedures\n"); - return; - } - hr = CoInitialize( NULL ); ok(hr == S_OK, "failed to init COM\n");

1 0

Andrey Gusev : api-ms-win-core-shutdown-l1-1-0: Add dll.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: b65ea16159cb1b6d5614d9e007bb7ad4d5d14248 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b65ea16159cb1b6d5614d9e0… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Feb 2 12:08:49 2018 +0200 api-ms-win-core-shutdown-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-shutdown-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-shutdown-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index 3818f68..b891454 100755 --- a/configure +++ b/configure @@ -979,6 +979,7 @@ enable_api_ms_win_core_rtlsupport_l1_2_0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_shlwapi_obsolete_l1_1_0 enable_api_ms_win_core_shlwapi_obsolete_l1_2_0 +enable_api_ms_win_core_shutdown_l1_1_0 enable_api_ms_win_core_sidebyside_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_string_l2_1_0 @@ -18408,6 +18409,7 @@ wine_fn_config_dll api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtls wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-shlwapi-obsolete-l1-1-0 enable_api_ms_win_core_shlwapi_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-shlwapi-obsolete-l1-2-0 enable_api_ms_win_core_shlwapi_obsolete_l1_2_0 +wine_fn_config_dll api-ms-win-core-shutdown-l1-1-0 enable_api_ms_win_core_shutdown_l1_1_0 wine_fn_config_dll api-ms-win-core-sidebyside-l1-1-0 enable_api_ms_win_core_sidebyside_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 diff --git a/configure.ac b/configure.ac index 2d2b7be..8b48d2e 100644 --- a/configure.ac +++ b/configure.ac @@ -2892,6 +2892,7 @@ WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-shutdown-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-sidebyside-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0) diff --git a/dlls/api-ms-win-core-shutdown-l1-1-0/Makefile.in b/dlls/api-ms-win-core-shutdown-l1-1-0/Makefile.in new file mode 100644 index 0000000..f51a519 --- /dev/null +++ b/dlls/api-ms-win-core-shutdown-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-shutdown-l1-1-0.dll diff --git a/dlls/api-ms-win-core-shutdown-l1-1-0/api-ms-win-core-shutdown-l1-1-0.spec b/dlls/api-ms-win-core-shutdown-l1-1-0/api-ms-win-core-shutdown-l1-1-0.spec new file mode 100644 index 0000000..3f353e5 --- /dev/null +++ b/dlls/api-ms-win-core-shutdown-l1-1-0/api-ms-win-core-shutdown-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall AbortSystemShutdownW(ptr) advapi32.AbortSystemShutdownW +@ stdcall InitiateSystemShutdownExW(wstr wstr long long long long) advapi32.InitiateSystemShutdownExW diff --git a/tools/make_specfiles b/tools/make_specfiles index 417cf50..4dae97f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -116,6 +116,7 @@ my @dll_groups = "api-ms-win-security-base-l1-1-0", "api-ms-win-core-registry-l1-1-0", "api-ms-win-core-registry-l2-1-0", + "api-ms-win-core-shutdown-l1-1-0", "api-ms-win-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-consumer-l1-1-0", "api-ms-win-eventing-controller-l1-1-0",

1 0

Andrey Gusev : api-ms-win-security-lsalookup-l2-1-0: Add dll.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 636d6a60e838ee190eeea9b63b081fedc66519ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=636d6a60e838ee190eeea9b6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Feb 2 12:09:12 2018 +0200 api-ms-win-security-lsalookup-l2-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-lsalookup-l2-1-0/Makefile.in | 1 + .../api-ms-win-security-lsalookup-l2-1-0.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) diff --git a/configure b/configure index b891454..3e7feec 100755 --- a/configure +++ b/configure @@ -1067,6 +1067,7 @@ enable_api_ms_win_security_credentials_l1_1_0 enable_api_ms_win_security_grouppolicy_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_1 +enable_api_ms_win_security_lsalookup_l2_1_0 enable_api_ms_win_security_lsalookup_l2_1_1 enable_api_ms_win_security_lsapolicy_l1_1_0 enable_api_ms_win_security_provider_l1_1_0 @@ -18497,6 +18498,7 @@ wine_fn_config_dll api-ms-win-security-credentials-l1-1-0 enable_api_ms_win_secu wine_fn_config_dll api-ms-win-security-grouppolicy-l1-1-0 enable_api_ms_win_security_grouppolicy_l1_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 +wine_fn_config_dll api-ms-win-security-lsalookup-l2-1-0 enable_api_ms_win_security_lsalookup_l2_1_0 wine_fn_config_dll api-ms-win-security-lsalookup-l2-1-1 enable_api_ms_win_security_lsalookup_l2_1_1 wine_fn_config_dll api-ms-win-security-lsapolicy-l1-1-0 enable_api_ms_win_security_lsapolicy_l1_1_0 wine_fn_config_dll api-ms-win-security-provider-l1-1-0 enable_api_ms_win_security_provider_l1_1_0 diff --git a/configure.ac b/configure.ac index 8b48d2e..23f297b 100644 --- a/configure.ac +++ b/configure.ac @@ -2980,6 +2980,7 @@ WINE_CONFIG_DLL(api-ms-win-security-credentials-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-grouppolicy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l2-1-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l2-1-1) WINE_CONFIG_DLL(api-ms-win-security-lsapolicy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-provider-l1-1-0) diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-0/Makefile.in b/dlls/api-ms-win-security-lsalookup-l2-1-0/Makefile.in new file mode 100644 index 0000000..cf41467 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsalookup-l2-1-0.dll diff --git a/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec new file mode 100644 index 0000000..25b2939 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l2-1-0/api-ms-win-security-lsalookup-l2-1-0.spec @@ -0,0 +1,6 @@ +@ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) advapi32.LookupAccountNameW +@ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidW +@ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) advapi32.LookupPrivilegeDisplayNameW +@ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) advapi32.LookupPrivilegeNameW +@ stdcall LookupPrivilegeValueW(ptr ptr ptr) advapi32.LookupPrivilegeValueW +@ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) advapi32.LsaEnumerateTrustedDomains diff --git a/tools/make_specfiles b/tools/make_specfiles index 4dae97f..e5b2617 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -129,6 +129,7 @@ my @dll_groups = "api-ms-win-security-credentials-l1-1-0", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-lsalookup-l1-1-1", + "api-ms-win-security-lsalookup-l2-1-0", "api-ms-win-security-lsalookup-l2-1-1", "api-ms-win-security-lsapolicy-l1-1-0", "api-ms-win-security-provider-l1-1-0",

1 0

Zebediah Figura : user32: Kill focus before minimizing a window.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 9b2dd2db6ac44ed02cbe04673646ace15fda758a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b2dd2db6ac44ed02cbe0467… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 30 19:56:24 2018 -0600 user32: Kill focus before minimizing a window. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 31 ++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 8 ++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 9cf4ed3..7be83571 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3113,7 +3113,6 @@ todo_wine ShowWindow(hwnd, SW_SHOWMINIMIZED); ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); ok( GetFocus() != child, "Focus should not be on child %p\n", child ); -todo_wine ok( GetFocus() != hwnd, "Focus should not be on parent %p\n", hwnd ); old_wnd_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)set_focus_on_activate_proc); ShowWindow(hwnd, SW_RESTORE); @@ -10072,6 +10071,13 @@ static void test_minimize_window(HWND hwndMain) ShowWindow(hwnd2, SW_RESTORE); check_active_state(hwnd2, hwnd2, hwnd2); + /* try SW_SHOWMINIMIZED */ + ShowWindow(hwnd2, SW_SHOWMINIMIZED); + check_active_state(hwnd2, hwnd2, 0); + + ShowWindow(hwnd2, SW_RESTORE); + check_active_state(hwnd2, hwnd2, hwnd2); + /* hide a non-active window */ ShowWindow(hwnd, SW_MINIMIZE); check_active_state(hwnd2, hwnd2, hwnd2); @@ -10115,6 +10121,11 @@ static void test_minimize_window(HWND hwndMain) todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd3, hwnd3, 0); + /* hide an owner window */ ShowWindow(hwnd, SW_RESTORE); ShowWindow(hwnd2, SW_RESTORE); @@ -10124,6 +10135,24 @@ static void test_minimize_window(HWND hwndMain) check_active_state(hwnd2, hwnd2, hwnd2); DestroyWindow(hwnd3); + + /* test a child window - focus should be yielded back to the parent */ + ShowWindow(hwnd, SW_RESTORE); + hwnd3 = CreateWindowExA(0, "MainWindowClass", "Child window 3", WS_CHILD|WS_VISIBLE, + 100, 100, 200, 200, hwnd, 0, GetModuleHandleA(NULL), NULL); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_MINIMIZE); + check_active_state(hwnd, hwnd, hwnd); + + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd, hwnd, hwnd); + + DestroyWindow(hwnd3); DestroyWindow(hwnd2); DestroyWindow(hwnd); } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 10f0fd0..c1b55b5 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -983,6 +983,14 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) if (IsZoomed( hwnd )) win_set_flags( hwnd, WIN_RESTORE_MAX, 0 ); else win_set_flags( hwnd, 0, WIN_RESTORE_MAX ); + if (GetFocus() == hwnd) + { + if (GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) + SetFocus(GetAncestor(hwnd, GA_PARENT)); + else + SetFocus(0); + } + old_style = WIN_SetStyle( hwnd, WS_MINIMIZE, WS_MAXIMIZE ); wpl.ptMinPosition = WINPOS_FindIconPos( hwnd, wpl.ptMinPosition );

1 0

Alexandre Julliard : comdlg32: Correctly initialize the item dialog structure.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 908fa3eb8d59af2249d144a7f1b8925f97ce8e30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=908fa3eb8d59af2249d144a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 15:40:36 2018 +0100 comdlg32: Correctly initialize the item dialog structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 3096017..8aaaa21 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -4597,7 +4597,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p if(pUnkOuter) return CLASS_E_NOAGGREGATION; - fdimpl = HeapAlloc(GetProcessHeap(), 0, sizeof(FileDialogImpl)); + fdimpl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FileDialogImpl)); if(!fdimpl) return E_OUTOFMEMORY; @@ -4628,27 +4628,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->custom_okbutton = StrDupW(buf); } - fdimpl->filterspecs = NULL; - fdimpl->filterspec_count = 0; - fdimpl->filetypeindex = 0; - - fdimpl->psia_selection = fdimpl->psia_results = NULL; - fdimpl->psi_setfolder = fdimpl->psi_folder = NULL; - list_init(&fdimpl->events_clients); - fdimpl->events_next_cookie = 0; - - fdimpl->dlg_hwnd = NULL; - fdimpl->peb = NULL; - - fdimpl->set_filename = NULL; - fdimpl->default_ext = NULL; - fdimpl->custom_cancelbutton = fdimpl->custom_filenamelabel = NULL; - - fdimpl->client_guid = GUID_NULL; - - fdimpl->hmenu_opendropdown = NULL; - fdimpl->hfont_opendropdown = NULL; /* FIXME: The default folder setting should be restored for the * application if it was previously set. */

1 0

Piotr Caban : msvcr100: Add _NonReentrantPPLLock@details class stub.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: a672732476ad237b9967b8a61ffb735c8609baa1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a672732476ad237b9967b8a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 2 16:36:12 2018 +0100 msvcr100: Add _NonReentrantPPLLock(a)details class stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 12 ++++++------ dlls/msvcr100/msvcr100.spec | 12 ++++++------ dlls/msvcr110/msvcr110.spec | 18 +++++++++--------- dlls/msvcr120/msvcr120.spec | 18 +++++++++--------- dlls/msvcr120_app/msvcr120_app.spec | 18 +++++++++--------- dlls/msvcrt/lock.c | 30 ++++++++++++++++++++++++++++++ 6 files changed, 69 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a672732476ad237b9967…

1 0

Piotr Caban : msvcr100: Use scoped_lock internal buffer when locking critical_section.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: f042c4ea4a3bcf211288fe69ed6014687995e1de URL: https://source.winehq.org/git/wine.git/?a=commit;h=f042c4ea4a3bcf211288fe69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 2 16:36:18 2018 +0100 msvcr100: Use scoped_lock internal buffer when locking critical_section. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 4b862b6..6bcd66a 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -358,32 +358,38 @@ static inline void cs_set_head(critical_section *cs, cs_queue *q) cs->head = &cs->unk_active; } -/* ?lock(a)critical_section@Concurrency@@QAEXXZ */ -/* ?lock(a)critical_section@Concurrency@@QEAAXXZ */ -DEFINE_THISCALL_WRAPPER(critical_section_lock, 4) -void __thiscall critical_section_lock(critical_section *this) +static inline void cs_lock(critical_section *cs, cs_queue *q) { - cs_queue q, *last; - - TRACE("(%p)\n", this); + cs_queue *last; - if(this->unk_thread_id == GetCurrentThreadId()) + if(cs->unk_thread_id == GetCurrentThreadId()) throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked"); - memset(&q, 0, sizeof(q)); - last = InterlockedExchangePointer(&this->tail, &q); + memset(q, 0, sizeof(*q)); + last = InterlockedExchangePointer(&cs->tail, q); if(last) { - last->next = &q; - NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + last->next = q; + NtWaitForKeyedEvent(keyed_event, q, 0, NULL); } - cs_set_head(this, &q); - if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) { - spin_wait_for_next_cs(&q); - this->unk_active.next = q.next; + cs_set_head(cs, q); + if(InterlockedCompareExchangePointer(&cs->tail, &cs->unk_active, q) != q) { + spin_wait_for_next_cs(q); + cs->unk_active.next = q->next; } } +/* ?lock(a)critical_section@Concurrency@@QAEXXZ */ +/* ?lock(a)critical_section@Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(critical_section_lock, 4) +void __thiscall critical_section_lock(critical_section *this) +{ + cs_queue q; + + TRACE("(%p)\n", this); + cs_lock(this, &q); +} + /* ?try_lock(a)critical_section@Concurrency@@QAE_NXZ */ /* ?try_lock(a)critical_section@Concurrency@@QEAA_NXZ */ DEFINE_THISCALL_WRAPPER(critical_section_try_lock, 4) @@ -503,8 +509,13 @@ MSVCRT_bool __thiscall critical_section_try_lock_for( typedef struct { critical_section *cs; - void *unknown[4]; - int unknown2[2]; + union { + cs_queue q; + struct { + void *unknown[4]; + int unknown2[2]; + } unknown; + } lock; } critical_section_scoped_lock; /* ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z */ @@ -515,7 +526,7 @@ critical_section_scoped_lock* __thiscall critical_section_scoped_lock_ctor( { TRACE("(%p %p)\n", this, cs); this->cs = cs; - critical_section_lock(this->cs); + cs_lock(this->cs, &this->lock.q); return this; }

1 0

Piotr Caban : msvcr100: Add _NonReentrantPPLLock class implementation.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 8d105ac7c27428fe9f599711c7061e369f515d5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d105ac7c27428fe9f599711… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 2 16:36:22 2018 +0100 msvcr100: Add _NonReentrantPPLLock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 6bcd66a..03b9aee 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -549,7 +549,9 @@ typedef struct DEFINE_THISCALL_WRAPPER(_NonReentrantPPLLock_ctor, 4) _NonReentrantPPLLock* __thiscall _NonReentrantPPLLock_ctor(_NonReentrantPPLLock *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + critical_section_ctor(&this->cs); return this; } @@ -558,7 +560,8 @@ _NonReentrantPPLLock* __thiscall _NonReentrantPPLLock_ctor(_NonReentrantPPLLock DEFINE_THISCALL_WRAPPER(_NonReentrantPPLLock__Acquire, 8) void __thiscall _NonReentrantPPLLock__Acquire(_NonReentrantPPLLock *this, cs_queue *q) { - FIXME("(%p %p) stub\n", this, q); + TRACE("(%p %p)\n", this, q); + cs_lock(&this->cs, q); } /* ?_Release(a)_NonReentrantPPLLock@details(a)Concurrency@@QAEXXZ */ @@ -566,7 +569,8 @@ void __thiscall _NonReentrantPPLLock__Acquire(_NonReentrantPPLLock *this, cs_que DEFINE_THISCALL_WRAPPER(_NonReentrantPPLLock__Release, 4) void __thiscall _NonReentrantPPLLock__Release(_NonReentrantPPLLock *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + critical_section_unlock(&this->cs); } /* ?_GetConcurrency(a)details@Concurrency@@YAIXZ */

1 0

Piotr Caban : msvcr100: Add _ReentrantPPLLock class implementation.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 7419eff0c21d912293e74aabbc87958a96e4f4ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=7419eff0c21d912293e74aab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 2 16:36:26 2018 +0100 msvcr100: Add _ReentrantPPLLock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 12 ++++----- dlls/msvcr100/msvcr100.spec | 12 ++++----- dlls/msvcr110/msvcr110.spec | 18 ++++++------- dlls/msvcr120/msvcr120.spec | 18 ++++++------- dlls/msvcr120_app/msvcr120_app.spec | 18 ++++++------- dlls/msvcrt/lock.c | 52 +++++++++++++++++++++++++++++++++++++ 6 files changed, 91 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7419eff0c21d912293e7…

1 0

Józef Kucia : d3d11/tests: Cleanup viewport offsets in test_fractional_viewports().
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 6ae0756eba258277900a39d3839c30a20a87f313 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ae0756eba258277900a39d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 2 14:35:17 2018 +0100 d3d11/tests: Cleanup viewport offsets in test_fractional_viewports(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 18b7f48..4fe8110 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -23010,8 +23010,8 @@ static void test_fractional_viewports(void) static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const float viewport_offsets[] = { - 0.0f, 0.5f, 0.25f, 0.125f, 0.0625f, 0.03125f, 0.015625f, 0.0078125f, 0.00390625f, - 1.0f / 128.0f, 63.0f / 128.0f, + 0.0f, 1.0f / 2.0f, 1.0f / 4.0f, 1.0f / 8.0f, 1.0f / 16.0f, 1.0f / 32.0f, + 1.0f / 64.0f, 1.0f / 128.0f, 1.0f / 256.0f, 63.0f / 128.0f, }; if (!init_test_context(&test_context, &feature_level))

1 0