wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Akihiro Sagawa : advapi32: Fix the error code on load failure.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 62f52103646c20e81fe7bb76e51dee1813a82edf URL: https://source.winehq.org/git/wine.git/?a=commit;h=62f52103646c20e81fe7bb76… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 26 21:15:09 2019 +0900 advapi32: Fix the error code on load failure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 12 ++++++------ dlls/advapi32/tests/registry.c | 8 +++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index f18e34f..8596aea 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3133,6 +3133,10 @@ static INT load_string(HINSTANCE hModule, UINT resId, LPWSTR *pResString) /* Strings are length-prefixed. Lowest nibble of resId is an index. */ idxString = resId & 0xf; while (idxString--) pString += *pString + 1; + if (!*pString) { + SetLastError(ERROR_NOT_FOUND); + return 0; + } *pResString = pString + 1; return *pString; @@ -3153,11 +3157,11 @@ static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, hModule = LoadLibraryExW(file_name, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); if (!hModule) - return ERROR_BADKEY; + return GetLastError(); size = load_string(hModule, res_id, &string); if (!size) { - result = ERROR_FILE_NOT_FOUND; + result = GetLastError(); goto cleanup; } *req_chars = size + 1; @@ -3210,10 +3214,6 @@ cleanup: * RETURNS * Success: ERROR_SUCCESS, * Failure: nonzero error code from winerror.h - * - * NOTES - * This is an API of Windows Vista, which wasn't available at the time this code - * was written. We have to check for the correct behaviour once it's available. */ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer, DWORD cbBuffer, LPDWORD pcbData, DWORD dwFlags, LPCWSTR pwszBaseDir) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 0f4e196..8a2fb3b 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3854,7 +3854,6 @@ static void test_RegLoadMUIString(void) BOOL use_sysdir; DWORD expected; DWORD broken_ret; - BOOL todo; } test_case[] = { /* 0 */ { "", REG_SZ, FALSE, ERROR_INVALID_DATA }, @@ -3868,9 +3867,9 @@ static void test_RegLoadMUIString(void) { "@%WineMuiTest2%", REG_EXPAND_SZ, TRUE, ERROR_SUCCESS }, /* 8 */ { "@%WineMuiExe%,a", REG_SZ, FALSE, ERROR_INVALID_DATA }, - { "@%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 }, + { "@%WineMuiExe%,-4", REG_SZ, FALSE, ERROR_NOT_FOUND, ERROR_FILE_NOT_FOUND }, + { "@%WineMuiExe%,-39", REG_SZ, FALSE, ERROR_RESOURCE_NAME_NOT_FOUND }, + { "@%WineMuiDat%,-16", REG_EXPAND_SZ, FALSE, ERROR_BAD_EXE_FORMAT, ERROR_FILE_NOT_FOUND }, }; if (!pRegLoadMUIStringA || !pRegLoadMUIStringW) @@ -4013,7 +4012,6 @@ static void test_RegLoadMUIString(void) 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 */),

1 0

Akihiro Sagawa : advapi32: Fix the error code on parse failure.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: cb555215a95eded950cc1d566dff22fcbaf9acbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb555215a95eded950cc1d56… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 26 21:15:07 2019 +0900 advapi32: Fix the error code on parse failure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/registry.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 53b6459..f18e34f 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3273,7 +3273,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer /* Format of the expanded value is 'path_to_dll,-resId' */ if (!pComma || pComma[1] != '-') { - result = ERROR_BADKEY; + result = ERROR_INVALID_DATA; goto cleanup; } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 855f5a8..0f4e196 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3859,7 +3859,7 @@ static void test_RegLoadMUIString(void) /* 0 */ { "", REG_SZ, FALSE, ERROR_INVALID_DATA }, { "not a MUI string", REG_SZ, FALSE, ERROR_INVALID_DATA }, - { "@unknown.dll", REG_SZ, TRUE, ERROR_INVALID_DATA, 0, TRUE }, + { "@unknown.dll", REG_SZ, TRUE, ERROR_INVALID_DATA }, { "@unknown.dll,-10", REG_SZ, TRUE, ERROR_FILE_NOT_FOUND }, /* 4 */ { with_env_var, REG_SZ, FALSE, ERROR_SUCCESS }, @@ -3867,7 +3867,7 @@ static void test_RegLoadMUIString(void) { "%WineMuiTest1%", REG_EXPAND_SZ, TRUE, ERROR_INVALID_DATA }, { "@%WineMuiTest2%", REG_EXPAND_SZ, TRUE, ERROR_SUCCESS }, /* 8 */ - { "@%WineMuiExe%,a", REG_SZ, FALSE, ERROR_INVALID_DATA, 0, TRUE }, + { "@%WineMuiExe%,a", REG_SZ, FALSE, ERROR_INVALID_DATA }, { "@%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 },

1 0

Akihiro Sagawa : advapi32: Expand environment variables even if REG_SZ type is used.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: e798d25f255b205cb6d765f042eb6ca3dfcf566a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e798d25f255b205cb6d765f0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 26 21:15:05 2019 +0900 advapi32: Expand environment variables even if REG_SZ type is used. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 21 ++++++++------------- dlls/advapi32/tests/registry.c | 2 +- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index c3c2950..53b6459 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3253,20 +3253,15 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer goto cleanup; } - /* Expand environment variables, if appropriate, or copy the original string over. */ - if (dwValueType == REG_EXPAND_SZ) { - cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR); - if (!cbData) goto cleanup; - pwszExpandedBuffer = heap_alloc(cbData); - if (!pwszExpandedBuffer) { - result = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData / sizeof(WCHAR)); - } else { - pwszExpandedBuffer = heap_alloc(cbData); - memcpy(pwszExpandedBuffer, pwszTempBuffer, cbData); + /* Expand environment variables regardless of the type. */ + cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR); + if (!cbData) goto cleanup; + pwszExpandedBuffer = heap_alloc(cbData); + if (!pwszExpandedBuffer) { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; } + ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData / sizeof(WCHAR)); /* Parse the value and load the string. */ { diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index a1b9dd1..855f5a8 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3862,7 +3862,7 @@ static void test_RegLoadMUIString(void) { "@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_SZ, FALSE, ERROR_SUCCESS }, { with_env_var, REG_EXPAND_SZ, FALSE, ERROR_SUCCESS }, { "%WineMuiTest1%", REG_EXPAND_SZ, TRUE, ERROR_INVALID_DATA }, { "@%WineMuiTest2%", REG_EXPAND_SZ, TRUE, ERROR_SUCCESS },

1 0

Akihiro Sagawa : advapi32: RegLoadMUIString doesn' t accept a string without '@' prefix.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 1ed4c150a2d109c2795e280898fdcd3f69d4ff9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ed4c150a2d109c2795e2808… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 26 21:15:03 2019 +0900 advapi32: RegLoadMUIString doesn't accept a string without '@' prefix. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 16 ++++++++-------- dlls/advapi32/tests/registry.c | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index f889d3b..c3c2950 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3247,6 +3247,12 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer result = RegQueryValueExW(hKey, pwszValue, NULL, &dwValueType, (LPBYTE)pwszTempBuffer, &cbData); if (result != ERROR_SUCCESS) goto cleanup; + /* '@' is the prefix for resource based string entries. */ + if (*pwszTempBuffer != '@') { + result = ERROR_INVALID_DATA; + goto cleanup; + } + /* Expand environment variables, if appropriate, or copy the original string over. */ if (dwValueType == REG_EXPAND_SZ) { cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR); @@ -3262,14 +3268,8 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer memcpy(pwszExpandedBuffer, pwszTempBuffer, cbData); } - /* If the value references a resource based string, parse the value and load the string. - * Else just copy over the original value. */ - result = ERROR_SUCCESS; - if (*pwszExpandedBuffer != '@') { /* '@' is the prefix for resource based string entries. */ - lstrcpynW(pwszBuffer, pwszExpandedBuffer, cbBuffer / sizeof(WCHAR)); - if (pcbData) - *pcbData = (strlenW(pwszExpandedBuffer) + 1) * sizeof(WCHAR); - } else { + /* Parse the value and load the string. */ + { WCHAR *pComma = strrchrW(pwszExpandedBuffer, ','), *pNewBuffer; const WCHAR backslashW[] = {'\\',0}; UINT uiStringId; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 911186f..a1b9dd1 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3857,14 +3857,14 @@ static void test_RegLoadMUIString(void) 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 }, + { "", REG_SZ, FALSE, ERROR_INVALID_DATA }, + { "not a MUI string", REG_SZ, FALSE, ERROR_INVALID_DATA }, { "@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 }, + { "%WineMuiTest1%", REG_EXPAND_SZ, TRUE, ERROR_INVALID_DATA }, { "@%WineMuiTest2%", REG_EXPAND_SZ, TRUE, ERROR_SUCCESS }, /* 8 */ { "@%WineMuiExe%,a", REG_SZ, FALSE, ERROR_INVALID_DATA, 0, TRUE },

1 0

Akihiro Sagawa : advapi32/tests: Add more RegLoadMUIString tests.
by Alexandre Julliard 27 May '19

27 May '19

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

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

27 May '19

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

Jacek Caban : ntoskrnl.exe: Set irp context handle in dispatch_irp.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 72876116068fb9d0e21d6f8c6724049eb82f4f54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72876116068fb9d0e21d6f8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 27 13:39:15 2019 +0200 ntoskrnl.exe: Set irp context handle in dispatch_irp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c9b56b7..acfbec8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -587,6 +587,8 @@ static void dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_conte LARGE_INTEGER count; IoSetCompletionRoutine( irp, dispatch_irp_completion, context->handle, TRUE, TRUE, TRUE ); + context->handle = 0; + KeQueryTickCount( &count ); /* update the global KeTickCount */ device->CurrentIrp = irp; @@ -976,11 +978,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) case STATUS_SUCCESS: assert( context.params.type != IRP_CALL_NONE && context.params.type < ARRAY_SIZE(dispatch_funcs) ); status = dispatch_funcs[context.params.type]( &context ); - if (status == STATUS_SUCCESS) - { - context.handle = 0; /* status reported by IoCompleteRequest */ - if (!context.in_buff) context.in_size = 4096; - } + if (!context.in_buff) context.in_size = 4096; break; case STATUS_BUFFER_OVERFLOW: HeapFree( GetProcessHeap(), 0, context.in_buff );

1 0

Jacek Caban : ntoskrnl.exe: Reuse IRP input buffer if it wasn't used.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 0138da5025a117bc598f85b98b644ec0820255c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0138da5025a117bc598f85b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 27 13:38:59 2019 +0200 ntoskrnl.exe: Reuse IRP input buffer if it wasn't used. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c355c88..c9b56b7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -633,7 +633,6 @@ static NTSTATUS dispatch_create( struct dispatch_context *context ) irp->Flags |= IRP_CREATE_OPERATION; dispatch_irp( device, irp, context ); - HeapFree( GetProcessHeap(), 0, context->in_buff ); return STATUS_SUCCESS; } @@ -671,7 +670,6 @@ static NTSTATUS dispatch_close( struct dispatch_context *context ) irp->Flags |= IRP_CLOSE_OPERATION; dispatch_irp( device, irp, context ); - HeapFree( GetProcessHeap(), 0, context->in_buff ); return STATUS_SUCCESS; } @@ -714,7 +712,6 @@ static NTSTATUS dispatch_read( struct dispatch_context *context ) irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate out_buff */ dispatch_irp( device, irp, context ); - HeapFree( GetProcessHeap(), 0, context->in_buff ); return STATUS_SUCCESS; } @@ -738,6 +735,7 @@ static NTSTATUS dispatch_write( struct dispatch_context *context ) if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_WRITE, device, context->in_buff, context->in_size, &offset, NULL, NULL ))) return STATUS_NO_MEMORY; + context->in_buff = NULL; irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; @@ -779,7 +777,6 @@ static NTSTATUS dispatch_flush( struct dispatch_context *context ) dispatch_irp( device, irp, context ); - HeapFree( GetProcessHeap(), 0, context->in_buff ); return STATUS_SUCCESS; } @@ -841,6 +838,7 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; irp->AssociatedIrp.SystemBuffer = context->in_buff; + context->in_buff = NULL; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate in_buff */ dispatch_irp( device, irp, context ); @@ -981,8 +979,7 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) if (status == STATUS_SUCCESS) { context.handle = 0; /* status reported by IoCompleteRequest */ - context.in_size = 4096; - context.in_buff = NULL; + if (!context.in_buff) context.in_size = 4096; } break; case STATUS_BUFFER_OVERFLOW:

1 0

Jacek Caban : ntoskrnl.exe: Pass context as a structure to IRP dispatchers.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 6870bb74d4095fb0ee952d894a5e0b4342b9ef2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6870bb74d4095fb0ee952d89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 27 13:38:27 2019 +0200 ntoskrnl.exe: Pass context as a structure to IRP dispatchers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 164 +++++++++++++++++++++---------------------- 1 file changed, 82 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6870bb74d4095fb0ee95…

1 0

Jacek Caban : ntoskrnl.exe/tests: Always test DeviceIoControl result.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: e1d932a9e11f0dd5dc5189f4c5f8aa813c76aade URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1d932a9e11f0dd5dc5189f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 27 13:38:10 2019 +0200 ntoskrnl.exe/tests: Always test DeviceIoControl result. Spotted by Mathew Hodson. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 49490bb..d505643 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -233,6 +233,7 @@ static void test_overlapped(void) cancel_cnt = 0xdeadbeef; res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); todo_wine ok(cancel_cnt == 2, "cancel_cnt = %u\n", cancel_cnt);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019