May 2019 - Wine-Commits - list.winehq.org

Akihiro Sagawa : advapi32/tests: Add more RegLoadMUIString tests.
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: 90f79099a45437b9a3a0127eaf5d45f8b49b2fec URL: https://source.winehq.org/git/wine.git/?a=commit;h=90f79099a45437b9a3a0127e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 26 21:15:01 2019 +0900 advapi32/tests: Add more RegLoadMUIString tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/Makefile.in | 2 ++ dlls/advapi32/tests/registry.c | 79 ++++++++++++++++++++++++++++++++++++++++- dlls/advapi32/tests/rsrc.rc | 22 ++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in index 36ce031..12583e5 100644 --- a/dlls/advapi32/tests/Makefile.in +++ b/dlls/advapi32/tests/Makefile.in @@ -13,3 +13,5 @@ C_SRCS = \ registry.c \ security.c \ service.c + +RC_SRCS = rsrc.rc diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c178e39..911186f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3836,17 +3836,42 @@ todo_wine static void test_RegLoadMUIString(void) { - HMODULE hUser32, hResDll; + HMODULE hUser32, hResDll, hFile; int (WINAPI *pLoadStringW)(HMODULE, UINT, WCHAR *, int); LONG ret; HKEY hkey; DWORD type, size, text_size; UINT i; char buf[64], *p, sysdir[MAX_PATH]; + char with_env_var[128], filename[MAX_PATH], tmp_path[MAX_PATH]; WCHAR textW[64], bufW[64]; WCHAR curdirW[MAX_PATH], sysdirW[MAX_PATH]; const static char tz_value[] = "MUI_Std"; const static WCHAR tz_valueW[] = {'M','U','I','_','S','t','d', 0}; + struct { + const char* value; + DWORD type; + BOOL use_sysdir; + DWORD expected; + DWORD broken_ret; + BOOL todo; + } test_case[] = { + /* 0 */ + { "", REG_SZ, FALSE, ERROR_INVALID_DATA, 0, TRUE }, + { "not a MUI string", REG_SZ, FALSE, ERROR_INVALID_DATA, 0, TRUE }, + { "@unknown.dll", REG_SZ, TRUE, ERROR_INVALID_DATA, 0, TRUE }, + { "@unknown.dll,-10", REG_SZ, TRUE, ERROR_FILE_NOT_FOUND }, + /* 4 */ + { with_env_var, REG_SZ, FALSE, ERROR_SUCCESS, 0, TRUE }, + { with_env_var, REG_EXPAND_SZ, FALSE, ERROR_SUCCESS }, + { "%WineMuiTest1%", REG_EXPAND_SZ, TRUE, ERROR_INVALID_DATA, 0, TRUE }, + { "@%WineMuiTest2%", REG_EXPAND_SZ, TRUE, ERROR_SUCCESS }, + /* 8 */ + { "@%WineMuiExe%,a", REG_SZ, FALSE, ERROR_INVALID_DATA, 0, TRUE }, + { "@%WineMuiExe%,-4", REG_SZ, FALSE, ERROR_NOT_FOUND, ERROR_FILE_NOT_FOUND, TRUE }, + { "@%WineMuiExe%,-39", REG_SZ, FALSE, ERROR_RESOURCE_NAME_NOT_FOUND, 0, TRUE }, + { "@%WineMuiDat%,-16", REG_EXPAND_SZ, FALSE, ERROR_BAD_EXE_FORMAT, ERROR_FILE_NOT_FOUND, TRUE }, + }; if (!pRegLoadMUIStringA || !pRegLoadMUIStringW) { @@ -3869,6 +3894,13 @@ static void test_RegLoadMUIString(void) ok(ret == ERROR_SUCCESS, "got %d\n", ret); ok(buf[0] == '@', "got %s\n", buf); + /* setup MUI string for tests */ + strcpy(with_env_var, "@%windir%\\system32\\"); + strcat(with_env_var, &buf[1]); + SetEnvironmentVariableA("WineMuiTest1", buf); + SetEnvironmentVariableA("WineMuiTest2", &buf[1]); + + /* load expecting text */ p = strrchr(buf, ','); *p = '\0'; i = atoi(p + 2); /* skip ',-' */ @@ -3955,7 +3987,52 @@ static void test_RegLoadMUIString(void) ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); RegCloseKey(hkey); + + GetModuleFileNameA(NULL, filename, ARRAY_SIZE(filename)); + SetEnvironmentVariableA("WineMuiExe", filename); + + GetTempPathA(ARRAY_SIZE(tmp_path), tmp_path); + GetTempFileNameA(tmp_path, "mui", 0, filename); + SetEnvironmentVariableA("WineMuiDat", filename); + + /* write dummy data to the file, i.e. it's not a PE file. */ + hFile = CreateFileA(filename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(hFile != INVALID_HANDLE_VALUE, "can't open %s\n", filename); + WriteFile(hFile, filename, strlen(filename), &size, NULL); + CloseHandle(hFile); + + for (i = 0; i < ARRAY_SIZE(test_case); i++) + { + size = test_case[i].value ? strlen(test_case[i].value) + 1 : 0; + ret = RegSetValueExA(hkey_main, tz_value, 0, test_case[i].type, + (const BYTE *)test_case[i].value, size); + ok(ret == ERROR_SUCCESS, "[%2u] got %d\n", i, ret); + + size = 0xdeadbeef; + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey_main, tz_valueW, bufW, ARRAY_SIZE(bufW), + &size, 0, + test_case[i].use_sysdir ? sysdirW : NULL); + todo_wine_if(test_case[i].todo) + ok(ret == test_case[i].expected || + broken(test_case[i].value[0] == '%' && ret == ERROR_SUCCESS /* vista */) || + broken(test_case[i].broken_ret && ret == test_case[i].broken_ret /* vista */), + "[%2u] expected %d, got %d\n", i, test_case[i].expected, ret); + if (ret == ERROR_SUCCESS && test_case[i].expected == ERROR_SUCCESS) + { + ok(size == text_size, "[%2u] got %u, expected %u\n", i, size, text_size); + ok(!memcmp(bufW, textW, size), "[%2u] got %s, expected %s\n", i, + wine_dbgstr_wn(bufW, size/sizeof(WCHAR)), + wine_dbgstr_wn(textW, text_size/sizeof(WCHAR))); + } + } + SetCurrentDirectoryW(curdirW); + DeleteFileA(filename); + SetEnvironmentVariableA("WineMuiTest1", NULL); + SetEnvironmentVariableA("WineMuiTest2", NULL); + SetEnvironmentVariableA("WineMuiExe", NULL); + SetEnvironmentVariableA("WineMuiDat", NULL); } START_TEST(registry) diff --git a/dlls/advapi32/tests/rsrc.rc b/dlls/advapi32/tests/rsrc.rc new file mode 100644 index 0000000..35b6171 --- /dev/null +++ b/dlls/advapi32/tests/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Copyright 2019 Akihiro Sagawa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +STRINGTABLE +{ + 1 "dummy" +}

1 0

Alexandre Julliard : aclui: Build with msvcrt.
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: 420e6cb244763e9067372e52e5101275da42603d URL: https://source.winehq.org/git/wine.git/?a=commit;h=420e6cb244763e9067372e52… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 15:49:19 2019 +0200 aclui: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/Makefile.in | 2 ++ dlls/aclui/aclui_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in index f5b401c..83bd379 100644 --- a/dlls/aclui/Makefile.in +++ b/dlls/aclui/Makefile.in @@ -1,4 +1,6 @@ MODULE = aclui.dll IMPORTLIB = aclui +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = aclui_main.c diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 808f1f0..033a471 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "initguid.h"

1 0

Andrey Gusev : ext-ms-win-shell-shell32-l1-2-0: Add dll.
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: 48505cad0564570edb6a6dd277431e250df52a2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=48505cad0564570edb6a6dd2… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat May 25 16:55:44 2019 +0300 ext-ms-win-shell-shell32-l1-2-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/ext-ms-win-shell-shell32-l1-2-0/Makefile.in | 1 + .../ext-ms-win-shell-shell32-l1-2-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index dea836b..90c8e1a 100755 --- a/configure +++ b/configure @@ -1317,6 +1317,7 @@ enable_ext_ms_win_security_credui_l1_1_0 enable_ext_ms_win_security_cryptui_l1_1_0 enable_ext_ms_win_shell_comctl32_init_l1_1_0 enable_ext_ms_win_shell_comdlg32_l1_1_0 +enable_ext_ms_win_shell_shell32_l1_2_0 enable_ext_ms_win_uxtheme_themes_l1_1_0 enable_faultrep enable_feclient @@ -20182,6 +20183,7 @@ wine_fn_config_makefile dlls/ext-ms-win-security-credui-l1-1-0 enable_ext_ms_win wine_fn_config_makefile dlls/ext-ms-win-security-cryptui-l1-1-0 enable_ext_ms_win_security_cryptui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-shell-comctl32-init-l1-1-0 enable_ext_ms_win_shell_comctl32_init_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-shell-comdlg32-l1-1-0 enable_ext_ms_win_shell_comdlg32_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-shell-shell32-l1-2-0 enable_ext_ms_win_shell_shell32_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-uxtheme-themes-l1-1-0 enable_ext_ms_win_uxtheme_themes_l1_1_0 wine_fn_config_makefile dlls/faultrep enable_faultrep wine_fn_config_makefile dlls/faultrep/tests enable_tests diff --git a/configure.ac b/configure.ac index 941d64f..ef7af70 100644 --- a/configure.ac +++ b/configure.ac @@ -3253,6 +3253,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comctl32-init-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comdlg32-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-shell32-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/faultrep) WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) diff --git a/dlls/ext-ms-win-shell-shell32-l1-2-0/Makefile.in b/dlls/ext-ms-win-shell-shell32-l1-2-0/Makefile.in new file mode 100644 index 0000000..2d8bcf9 --- /dev/null +++ b/dlls/ext-ms-win-shell-shell32-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-shell-shell32-l1-2-0.dll diff --git a/dlls/ext-ms-win-shell-shell32-l1-2-0/ext-ms-win-shell-shell32-l1-2-0.spec b/dlls/ext-ms-win-shell-shell32-l1-2-0/ext-ms-win-shell-shell32-l1-2-0.spec new file mode 100644 index 0000000..8b8739a --- /dev/null +++ b/dlls/ext-ms-win-shell-shell32-l1-2-0/ext-ms-win-shell-shell32-l1-2-0.spec @@ -0,0 +1 @@ +@ stdcall ShellExecuteW(long wstr wstr wstr wstr long) shell32.ShellExecuteW diff --git a/tools/make_specfiles b/tools/make_specfiles index 9449c22..c2fa929 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -352,6 +352,7 @@ my @dll_groups = "api-ms-win-downlevel-shell32-l1-1-0", "api-ms-win-shell-shellcom-l1-1-0", "api-ms-win-shell-shellfolders-l1-1-0", + "ext-ms-win-shell-shell32-l1-2-0", ], [ "shlwapi",

1 0

Andrey Gusev : ext-ms-win-shell-comdlg32-l1-1-0: Add dll.
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: f40c21c3c307c9bce1dafcdedf85918a3a471cc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f40c21c3c307c9bce1dafcde… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat May 25 16:55:27 2019 +0300 ext-ms-win-shell-comdlg32-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/ext-ms-win-shell-comdlg32-l1-1-0/Makefile.in | 1 + .../ext-ms-win-shell-comdlg32-l1-1-0.spec | 3 +++ tools/make_specfiles | 4 ++++ 5 files changed, 11 insertions(+) diff --git a/configure b/configure index 396ca9e..dea836b 100755 --- a/configure +++ b/configure @@ -1316,6 +1316,7 @@ enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_ext_ms_win_security_credui_l1_1_0 enable_ext_ms_win_security_cryptui_l1_1_0 enable_ext_ms_win_shell_comctl32_init_l1_1_0 +enable_ext_ms_win_shell_comdlg32_l1_1_0 enable_ext_ms_win_uxtheme_themes_l1_1_0 enable_faultrep enable_feclient @@ -20180,6 +20181,7 @@ wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ex wine_fn_config_makefile dlls/ext-ms-win-security-credui-l1-1-0 enable_ext_ms_win_security_credui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-security-cryptui-l1-1-0 enable_ext_ms_win_security_cryptui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-shell-comctl32-init-l1-1-0 enable_ext_ms_win_shell_comctl32_init_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-shell-comdlg32-l1-1-0 enable_ext_ms_win_shell_comdlg32_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-uxtheme-themes-l1-1-0 enable_ext_ms_win_uxtheme_themes_l1_1_0 wine_fn_config_makefile dlls/faultrep enable_faultrep wine_fn_config_makefile dlls/faultrep/tests enable_tests diff --git a/configure.ac b/configure.ac index 01b26f2..941d64f 100644 --- a/configure.ac +++ b/configure.ac @@ -3252,6 +3252,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comctl32-init-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comdlg32-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/faultrep) WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) diff --git a/dlls/ext-ms-win-shell-comdlg32-l1-1-0/Makefile.in b/dlls/ext-ms-win-shell-comdlg32-l1-1-0/Makefile.in new file mode 100644 index 0000000..da2014d --- /dev/null +++ b/dlls/ext-ms-win-shell-comdlg32-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-shell-comdlg32-l1-1-0.dll diff --git a/dlls/ext-ms-win-shell-comdlg32-l1-1-0/ext-ms-win-shell-comdlg32-l1-1-0.spec b/dlls/ext-ms-win-shell-comdlg32-l1-1-0/ext-ms-win-shell-comdlg32-l1-1-0.spec new file mode 100644 index 0000000..1fd45c3 --- /dev/null +++ b/dlls/ext-ms-win-shell-comdlg32-l1-1-0/ext-ms-win-shell-comdlg32-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stdcall CommDlgExtendedError() comdlg32.CommDlgExtendedError +@ stdcall GetOpenFileNameW(ptr) comdlg32.GetOpenFileNameW +@ stdcall GetSaveFileNameW(ptr) comdlg32.GetSaveFileNameW diff --git a/tools/make_specfiles b/tools/make_specfiles index 1678e17..9449c22 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -157,6 +157,10 @@ my @dll_groups = "ext-ms-win-shell-comctl32-init-l1-1-0", ], [ + "comdlg32", + "ext-ms-win-shell-comdlg32-l1-1-0", + ], + [ "credui", "ext-ms-win-security-credui-l1-1-0", ],

1 0

Alistair Leslie-Hughes : amstream: Leave critical section on success ( Coverity).
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: 623085d550dae23eb057681f58f276cb8c38eb80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=623085d550dae23eb057681f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun May 26 22:49:20 2019 +0000 amstream: Leave critical section on success (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastreamfilter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 2daffea..48dfc85 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -367,6 +367,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter *iface, c { CoTaskMemFree(ret_id); *out = pin; + LeaveCriticalSection(&filter->cs); return S_OK; } CoTaskMemFree(ret_id);

1 0

Michael Stefaniuc : ntoskrnl: Add a macro to declare a static CRITICAL_SECTION.
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: 94e958c61a3cd2d20dc2bc118de695615f24f9d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94e958c61a3cd2d20dc2bc11… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon May 27 13:39:25 2019 +0200 ntoskrnl: Add a macro to declare a static CRITICAL_SECTION. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 27 +++------------------------ dlls/ntoskrnl.exe/ntoskrnl_private.h | 7 +++++++ dlls/ntoskrnl.exe/sync.c | 9 +-------- 3 files changed, 11 insertions(+), 32 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index acfbec8..c26e411 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -133,14 +133,7 @@ static int interface_rb_compare( const void *key, const struct wine_rb_entry *en static struct wine_rb_tree device_interfaces = { interface_rb_compare }; -static CRITICAL_SECTION drivers_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &drivers_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": drivers_cs") } -}; -static CRITICAL_SECTION drivers_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +DECLARE_CRITICAL_SECTION(drivers_cs); static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) { @@ -286,14 +279,7 @@ void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG r return header + 1; } -static CRITICAL_SECTION obref_cs; -static CRITICAL_SECTION_DEBUG obref_critsect_debug = -{ - 0, 0, &obref_cs, - { &obref_critsect_debug.ProcessLocksList, &obref_critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": obref_cs") } -}; -static CRITICAL_SECTION obref_cs = { &obref_critsect_debug, -1, 0, 0, 0, 0 }; +DECLARE_CRITICAL_SECTION(obref_cs); /*********************************************************************** * ObDereferenceObject (NTOSKRNL.EXE.@) @@ -384,14 +370,7 @@ static const POBJECT_TYPE *known_types[] = &SeTokenObjectType }; -static CRITICAL_SECTION handle_map_cs; -static CRITICAL_SECTION_DEBUG handle_map_critsect_debug = -{ - 0, 0, &handle_map_cs, - { &handle_map_critsect_debug.ProcessLocksList, &handle_map_critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": handle_map_cs") } -}; -static CRITICAL_SECTION handle_map_cs = { &handle_map_critsect_debug, -1, 0, 0, 0, 0 }; +DECLARE_CRITICAL_SECTION(handle_map_cs); NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) { diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 864a060..c003788 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -60,4 +60,11 @@ extern POBJECT_TYPE PsProcessType; extern POBJECT_TYPE PsThreadType; extern POBJECT_TYPE SeTokenObjectType; +#define DECLARE_CRITICAL_SECTION(cs) \ + static CRITICAL_SECTION cs; \ + static CRITICAL_SECTION_DEBUG cs##_debug = \ + { 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \ + 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ + static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 }; + #endif diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 07673f1..8b71126 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -49,14 +49,7 @@ enum object_type TYPE_AUTO_TIMER = 9, }; -static CRITICAL_SECTION sync_cs; -static CRITICAL_SECTION_DEBUG sync_cs_debug = -{ - 0, 0, &sync_cs, - { &sync_cs_debug.ProcessLocksList, &sync_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": sync_cs") } -}; -static CRITICAL_SECTION sync_cs = { &sync_cs_debug, -1, 0, 0, 0, 0 }; +DECLARE_CRITICAL_SECTION(sync_cs); /*********************************************************************** * KeWaitForMultipleObjects (NTOSKRNL.EXE.@)

1 0

Sven Baars : kernel32/tests: Open and close the right file handle ( Coverity).
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: c34089014646c8ac203bd7bdf509b9a1431078c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c34089014646c8ac203bd7bd… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun May 26 16:07:46 2019 +0200 kernel32/tests: Open and close the right file handle (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 9bf80f6..b22ae19 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3735,13 +3735,13 @@ static void test_ReplaceFileA(void) /* replace file while replacement is opened */ ret = GetTempFileNameA(temp_path, prefix, 0, replacement); ok(ret != 0, "GetTempFileNameA error (replacement) %d\n", GetLastError()); - CreateFileA(replacement, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + hReplacementFile = CreateFileA(replacement, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); ok(hReplacementFile != INVALID_HANDLE_VALUE, "unexpected error, replacement file should be able to be opened %d\n", GetLastError()); ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); ok(!ret, "expect failure\n"); ok(GetLastError() == ERROR_SHARING_VIOLATION, "expect ERROR_SHARING_VIOLATION, got %#x.\n", GetLastError()); - CloseHandle(hReplacedFile); + CloseHandle(hReplacementFile); /* replacement file still exists, make pass w/o "replaced" */ ret = DeleteFileA(replaced);

1 0

Zebediah Figura : winegstreamer/gstdemux: Use BaseFilterImpl_Release().
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: 42699ad1ad2a7e5fb31255df5d899d2ba76d1fd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42699ad1ad2a7e5fb31255df… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 25 15:21:24 2019 -0500 winegstreamer/gstdemux: Use BaseFilterImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 92 +++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 51 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6d3d2a0..64b8dcf 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1213,8 +1213,48 @@ static IPin *gstdemux_get_pin(BaseFilter *base, unsigned int index) return pin; } +static void gstdemux_destroy(BaseFilter *iface) +{ + GSTImpl *filter = impl_from_IBaseFilter(&iface->IBaseFilter_iface); + IPin *connected = NULL; + ULONG pinref; + HRESULT hr; + + CloseHandle(filter->no_more_pads_event); + CloseHandle(filter->push_event); + + /* Don't need to clean up output pins, disconnecting input pin will do that */ + IPin_ConnectedTo((IPin *)&filter->pInputPin, &connected); + if (connected) + { + hr = IPin_Disconnect(connected); + assert(hr == S_OK); + IPin_Release(connected); + hr = IPin_Disconnect(&filter->pInputPin.pin.IPin_iface); + assert(hr == S_OK); + } + pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); + if (pinref) + { + /* Valgrind could find this, if I kill it here */ + ERR("pinref should be null, is %u, destroying anyway\n", pinref); + assert((LONG)pinref > 0); + + while (pinref) + pinref = IPin_Release(&filter->pInputPin.pin.IPin_iface); + } + if (filter->bus) + { + gst_bus_set_sync_handler(filter->bus, NULL, NULL, NULL); + gst_object_unref(filter->bus); + } + strmbase_filter_cleanup(&filter->filter); + CoTaskMemFree(filter); +} + static const BaseFilterFuncTable BaseFuncTable = { .filter_get_pin = gstdemux_get_pin, + .filter_destroy = gstdemux_destroy, }; IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) @@ -1267,43 +1307,6 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) return obj; } -static void GST_Destroy(GSTImpl *This) -{ - IPin *connected = NULL; - ULONG pinref; - HRESULT hr; - - TRACE("Destroying %p\n", This); - - CloseHandle(This->no_more_pads_event); - CloseHandle(This->push_event); - - /* Don't need to clean up output pins, disconnecting input pin will do that */ - IPin_ConnectedTo((IPin *)&This->pInputPin, &connected); - if (connected) { - hr = IPin_Disconnect(connected); - assert(hr == S_OK); - IPin_Release(connected); - hr = IPin_Disconnect(&This->pInputPin.pin.IPin_iface); - assert(hr == S_OK); - } - pinref = IPin_Release(&This->pInputPin.pin.IPin_iface); - if (pinref) { - /* Valgrind could find this, if I kill it here */ - ERR("pinref should be null, is %u, destroying anyway\n", pinref); - assert((LONG)pinref > 0); - - while (pinref) - pinref = IPin_Release(&This->pInputPin.pin.IPin_iface); - } - if (This->bus) { - gst_bus_set_sync_handler(This->bus, NULL, NULL, NULL); - gst_object_unref(This->bus); - } - strmbase_filter_cleanup(&This->filter); - CoTaskMemFree(This); -} - static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv) { GSTImpl *This = impl_from_IBaseFilter(iface); @@ -1332,19 +1335,6 @@ static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID return E_NOINTERFACE; } -static ULONG WINAPI GST_Release(IBaseFilter *iface) -{ - GSTImpl *This = impl_from_IBaseFilter(iface); - ULONG refCount = InterlockedDecrement(&This->filter.refCount); - - TRACE("(%p)->() Release from %d\n", This, refCount + 1); - - if (!refCount) - GST_Destroy(This); - - return refCount; -} - static HRESULT WINAPI GST_Stop(IBaseFilter *iface) { GSTImpl *This = impl_from_IBaseFilter(iface); @@ -1468,7 +1458,7 @@ static HRESULT WINAPI GST_GetState(IBaseFilter *iface, DWORD dwMilliSecsTimeout, static const IBaseFilterVtbl GST_Vtbl = { GST_QueryInterface, BaseFilterImpl_AddRef, - GST_Release, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, GST_Stop, GST_Pause,

1 0

Zebediah Figura : setupapi: Process the .Services subsection in SetupDiInstallDevice().
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: b2adecd5e429d0e651da123aa7e7bcbe204d0419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2adecd5e429d0e651da123a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 24 23:33:55 2019 -0500 setupapi: Process the .Services subsection in SetupDiInstallDevice(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9bedb73..0279d10 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4688,6 +4688,8 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR infsectionW[] = {'I','n','f','S','e','c','t','i','o','n',0}; static const WCHAR infsectionextW[] = {'I','n','f','S','e','c','t','i','o','n','E','x','t',0}; static const WCHAR dothwW[] = {'.','H','W',0}; + static const WCHAR dotservicesW[] = {'.','S','e','r','v','i','c','e','s',0}; + static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0}; WCHAR section[LINE_LEN], section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; UINT install_flags = SPINST_ALL; HKEY driver_key, device_key; @@ -4747,6 +4749,26 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) SetupInstallFromInfSectionW(NULL, hinf, subsection, install_flags, device_key, NULL, SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + strcpyW(subsection, section_ext); + strcatW(subsection, dotservicesW); + SetupInstallServicesFromInfSectionW(hinf, subsection, 0); + + if (SetupFindFirstLineW(hinf, subsection, addserviceW, &ctx)) + { + do + { + INT flags; + + if (SetupGetIntField(&ctx, 2, &flags) && (flags & SPSVCINST_ASSOCSERVICE)) + { + WCHAR svc_name[LINE_LEN]; + if (SetupGetStringFieldW(&ctx, 1, svc_name, ARRAY_SIZE(svc_name), NULL) && svc_name[0]) + RegSetValueExW(device->key, Service, 0, REG_SZ, (BYTE *)svc_name, strlenW(svc_name) * sizeof(WCHAR)); + break; + } + } while (SetupFindNextMatchLineW(&ctx, addserviceW, &ctx)); + } + SetupTermDefaultQueueCallback(callback_ctx); SetupCloseInfFile(hinf);

1 0

Louis Lenders : gdiplus: Add version resource.
by Alexandre Julliard May 27, 2019

May 27, 2019

Module: wine Branch: master Commit: 89c1f511512809b834c5635bf9d1bd6099af8125 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89c1f511512809b834c5635b… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu May 23 17:23:56 2019 +0200 gdiplus: Add version resource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47137 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.rc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/gdiplus/gdiplus.rc b/dlls/gdiplus/gdiplus.rc index 5c7e2cf..6191c1a 100644 --- a/dlls/gdiplus/gdiplus.rc +++ b/dlls/gdiplus/gdiplus.rc @@ -18,6 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINE_FILEDESCRIPTION_STR "Wine gdiplus" +#define WINE_FILENAME_STR "gdiplus.dll" +#define WINE_FILEVERSION 6,1,7601,17514 +#define WINE_FILEVERSION_STR "6.1.7601.17514" +#define WINE_PRODUCTVERSION 6,1,7601,17514 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17514" + +#include "wine/wine_common_ver.rc" + /* @makedep: gdiplus.manifest */ WINE_MANIFEST 24 gdiplus.manifest

1 0