August 2020 - Wine-Commits - list.winehq.org

Sven Baars : setupapi: Make sure the class name is always set on success in SetupDiGetINFClassW (Valgrind).
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: d5d6d71e426fda1dafd312d6628d2717fef2187e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5d6d71e426fda1dafd312d6… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Apr 17 20:20:12 2020 +0200 setupapi: Make sure the class name is always set on success in SetupDiGetINFClassW (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dcc6a143e96ce7b500af2746834943ec346fe6b6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/devinst.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 8969abd8ee..ddff3367f3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4161,7 +4161,11 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, have_name = 0 < dret; if (dret >= MAX_PATH -1) FIXME("buffer might be too small\n"); - if (have_guid && !have_name) FIXME("class name lookup via guid not implemented\n"); + if (have_guid && !have_name) + { + class_name[0] = '\0'; + FIXME("class name lookup via guid not implemented\n"); + } if (have_name) {

1 0

Sven Baars : setupapi: Fix a memory leak (Valgrind).
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: e393f2d3ee37b5ea5c0c7b4c8a1a479223bb9437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e393f2d3ee37b5ea5c0c7b4c… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Apr 17 20:20:09 2020 +0200 setupapi: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 75e878346a61945c893ff989a3b0e4e4b1c6daf4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/devinst.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index f3546e6d96..b2bdc4b4d9 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -734,6 +734,7 @@ static void delete_device(struct device *device) RegCloseKey(device->key); heap_free(device->instanceId); + heap_free(device->drivers); LIST_FOR_EACH_ENTRY_SAFE(iface, next, &device->interfaces, struct device_iface, entry)

1 0

Brendan Shanks : dinput: Fix crash in dump_DIEFFECT() when lpvTypeSpecificParams is unexpectedly NULL.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 997f5e63044650db9d6871d19dbc9949b779ce0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=997f5e63044650db9d6871d1… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 23 22:31:12 2020 -0700 dinput: Fix crash in dump_DIEFFECT() when lpvTypeSpecificParams is unexpectedly NULL. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cf40880c69a3095c0c7f0e8a30b72e53ccbb5648) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 19dd9ad736..2eab4d3a33 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -241,34 +241,42 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) if (type == DIEFT_CONSTANTFORCE) { if (eff->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) { WARN("Effect claims to be a constant force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DICONSTANTFORCE(eff->lpvTypeSpecificParams); } } else if (type == DIEFT_PERIODIC) { if (eff->cbTypeSpecificParams != sizeof(DIPERIODIC)) { WARN("Effect claims to be a periodic force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DIPERIODIC(eff->lpvTypeSpecificParams); } } else if (type == DIEFT_RAMPFORCE) { if (eff->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) { WARN("Effect claims to be a ramp force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DIRAMPFORCE(eff->lpvTypeSpecificParams); } } else if (type == DIEFT_CONDITION) { - if (eff->cbTypeSpecificParams == sizeof(DICONDITION)) { + if (eff->cbTypeSpecificParams == sizeof(DICONDITION) && eff->lpvTypeSpecificParams) { _dump_DICONDITION(eff->lpvTypeSpecificParams); - } else if (eff->cbTypeSpecificParams == 2 * sizeof(DICONDITION)) { + } else if (eff->cbTypeSpecificParams == 2 * sizeof(DICONDITION) && eff->lpvTypeSpecificParams) { DICONDITION *condition = eff->lpvTypeSpecificParams; _dump_DICONDITION(&condition[0]); _dump_DICONDITION(&condition[1]); } else { - WARN("Effect claims to be a condition but the type-specific params are the wrong size!\n"); + WARN("Effect claims to be a condition but the type-specific params are the wrong size or NULL!\n"); } } else if (type == DIEFT_CUSTOMFORCE) { if (eff->cbTypeSpecificParams != sizeof(DICUSTOMFORCE)) { WARN("Effect claims to be a custom force but the type-specific params are the wrong size!\n"); + } else if (!eff->lpvTypeSpecificParams) { + WARN("Size of type-specific params is correct but pointer is NULL!\n"); } else { _dump_DICUSTOMFORCE(eff->lpvTypeSpecificParams); }

1 0

Zhiyi Zhang : kernelbase: Check NULL canonicalized_len parameter in UrlCanonicalizeW().
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 07c2630b48a8164e5cfe238d1d2cccf1f690174a URL: https://source.winehq.org/git/wine.git/?a=commit;h=07c2630b48a8164e5cfe238d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 18 09:52:03 2020 +0800 kernelbase: Check NULL canonicalized_len parameter in UrlCanonicalizeW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49175 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3cbd9cda195be6afc4290202b6676417812e536b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 9b016a882e..e94904723d 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -3544,7 +3544,7 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR TRACE("%s, %p, %p, %#x\n", wine_dbgstr_w(src_url), canonicalized, canonicalized_len, flags); - if (!src_url || !canonicalized || !canonicalized || !*canonicalized_len) + if (!src_url || !canonicalized || !canonicalized_len || !*canonicalized_len) return E_INVALIDARG; if (!*src_url)

1 0

Alexandre Julliard : wininet/tests: Update for new WineHQ certificate.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: fa1ec750b95b2da2ad5c95c16f9be7e6fa2d8364 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa1ec750b95b2da2ad5c95c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 19:23:42 2020 +0200 wininet/tests: Update for new WineHQ certificate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ccd6b205fa99360e7437f1c5bc63e0075f8e6760) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/tests/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index e0ea78cfb4..c07d60d2a9 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6079,13 +6079,12 @@ typedef struct { static const cert_struct_test_t test_winehq_org_cert = { "US\r\n" "55114\r\n" - "MN\r\n" + "Minnesota\r\n" "Saint Paul\r\n" "Ste 120\r\n" "700 Raymond Ave\r\n" "CodeWeavers\r\n" "IT\r\n" - "Secure Link SSL Wildcard\r\n" "*.winehq.org", "US\r\n"

1 0

Vladimir Panteleev : kernelbase: Don't return ERROR_INSUFFICIENT_BUFFER from GetEnvironmentVariableW.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 796a392f7f9f63b36a7243f45808d82df5279afd URL: https://source.winehq.org/git/wine.git/?a=commit;h=796a392f7f9f63b36a7243f4… Author: Vladimir Panteleev <git(a)vladimir.panteleev.md> Date: Thu May 14 23:12:25 2020 +0200 kernelbase: Don't return ERROR_INSUFFICIENT_BUFFER from GetEnvironmentVariableW. Windows doesn't do this (except XP, and then only for empty variables, where it returns ERROR_MORE_DATA). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48471 Signed-off-by: Vladimir Panteleev <git(a)vladimir.panteleev.md> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4c06599c1ff3767cc8d70d7de9269c424900c3a4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/environ.c | 6 ++++++ dlls/kernelbase/process.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 561fc71c4c..ff822d0349 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -104,9 +104,12 @@ static void test_GetSetEnvironmentVariableA(void) GetLastError()); /* Try to retrieve the environment variable we just set */ + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(name, NULL, 0); ok(ret_size == strlen(value) + 1, "should return length with terminating 0 ret_size=%d\n", ret_size); + ok(GetLastError() == 0xdeadbeef, + "should not fail with zero size but GetLastError=%d\n", GetLastError()); lstrcpyA(buf, "foo"); ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value)); @@ -206,10 +209,13 @@ static void test_GetSetEnvironmentVariableW(void) GetLastError()); /* Try to retrieve the environment variable we just set */ + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(name, NULL, 0); ok(ret_size == lstrlenW(value) + 1, "should return length with terminating 0 ret_size=%d\n", ret_size); + ok(GetLastError() == 0xdeadbeef, + "should not fail with zero size but GetLastError=%d\n", GetLastError()); lstrcpyW(buf, fooW); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value)); diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 76fe699b8a..ec8b6eabab 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1282,7 +1282,8 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetEnvironmentVariableW( LPCWSTR name, LPWSTR val status = RtlQueryEnvironmentVariable_U( NULL, &us_name, &us_value ); len = us_value.Length / sizeof(WCHAR); - if (!set_ntstatus( status )) return (status == STATUS_BUFFER_TOO_SMALL) ? len + 1 : 0; + if (status == STATUS_BUFFER_TOO_SMALL) return len + 1; + if (!set_ntstatus( status )) return 0; if (size) val[len] = 0; return len; }

1 0

Gijs Vermeulen : ucrtbase: Add more _o forwards.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: f6ae7c842f9920d9bf43728174ec0f0ca22a377a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ae7c842f9920d9bf437281… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 15 17:35:26 2020 +0200 ucrtbase: Add more _o forwards. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49146 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8119865d479fe54bac27f996f153091b479735bf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 502 ++++++++++---------- dlls/ucrtbase/ucrtbase.spec | 504 ++++++++++----------- 2 files changed, 503 insertions(+), 503 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6ae7c842f9920d9bf43…

1 0

Markus Engel : user32: Force undefined bits in GetKeyState() and GetKeyboardState() to zero.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 6d695ef5e994314dc4f4e349928fde7154e701f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d695ef5e994314dc4f4e349… Author: Markus Engel <markus_wine(a)familie-engel.online> Date: Mon May 18 18:35:58 2020 +0200 user32: Force undefined bits in GetKeyState() and GetKeyboardState() to zero. Only the highest and lowest bits in the return values of these functions have a meaning, the others are undefined. While the other bits are always cleared in Windows, wine stores information there. Some programs expect these undefined bits to be zero, though, so make sure they are not set. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30814 Signed-off-by: Markus Engel <markus_wine(a)familie-engel.online> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d9855df17f905da97b4bd92227427c4f899babf1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/input.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 0325e2ce3d..ac90c12c60 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -555,7 +555,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetKeyState(INT vkey) { req->tid = GetCurrentThreadId(); req->key = vkey; - if (!wine_server_call( req )) retval = (signed char)reply->state; + if (!wine_server_call( req )) retval = (signed char)(reply->state & 0x81); } SERVER_END_REQ; TRACE("key (0x%x) -> %x\n", vkey, retval); @@ -569,6 +569,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetKeyState(INT vkey) BOOL WINAPI DECLSPEC_HOTPATCH GetKeyboardState( LPBYTE state ) { BOOL ret; + UINT i; TRACE("(%p)\n", state); @@ -579,6 +580,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetKeyboardState( LPBYTE state ) req->key = -1; wine_server_set_reply( req, state, 256 ); ret = !wine_server_call_err( req ); + for (i = 0; i < 256; i++) state[i] &= 0x81; } SERVER_END_REQ; return ret;

1 0

Vladimir Panteleev : kernelbase: Preserve last error when GetEnvironmentVariableA succeeds.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: fdb4fb83ab8bea459f030c79f3bf081ef3e52a4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdb4fb83ab8bea459f030c79… Author: Vladimir Panteleev <git(a)vladimir.panteleev.md> Date: Thu May 14 23:12:24 2020 +0200 kernelbase: Preserve last error when GetEnvironmentVariableA succeeds. Avoid clobbering last error with NO_ERROR when GetEnvironmentVariableA succeeds, matching the behavior of GetEnvironmentVariableW and Windows. Instead of naively saving and restoring the last error, call RtlQueryEnvironmentVariable_U directly to avoid unnecessarily setting it in the first place. Signed-off-by: Vladimir Panteleev <git(a)vladimir.panteleev.md> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7ad5e1bc8ac7f83128c2fd7a6c8554d8f2b9c82f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/tests/security.c | 2 ++ dlls/kernel32/tests/environ.c | 8 ++++---- dlls/kernelbase/process.c | 30 +++++++++++++++++++----------- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6d73300c1d..85dd1a0a17 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5099,6 +5099,7 @@ static void test_GetUserNameA(void) ok(buffer_len == required_len || broken(buffer_len == required_len / sizeof(WCHAR)), /* XP+ */ "Outputted buffer length was %u\n", buffer_len); + ok(GetLastError() == 0xdeadbeef, "Last error was %u\n", GetLastError()); /* Use the reported buffer size from the last GetUserNameA call and pass * a length that is one less than the required value. */ @@ -5168,6 +5169,7 @@ static void test_GetUserNameW(void) ok(ret == TRUE, "GetUserNameW returned %d, last error %u\n", ret, GetLastError()); ok(memcmp(buffer, filler, sizeof(filler)) != 0, "Output buffer was untouched\n"); ok(buffer_len == required_len, "Outputted buffer length was %u\n", buffer_len); + ok(GetLastError() == 0xdeadbeef, "Last error was %u\n", GetLastError()); /* GetUserNameW on XP and newer writes a truncated portion of the username string to the buffer. */ SetLastError(0xdeadbeef); diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 128a5fdbe5..561fc71c4c 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -155,10 +155,10 @@ static void test_GetSetEnvironmentVariableA(void) "should not fail with empty value but GetLastError=%d\n", GetLastError()); lstrcpyA(buf, "foo"); - SetLastError(0); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableA(name, buf, lstrlenA(value) + 1); ok(ret_size == 0 && - ((GetLastError() == 0 && lstrcmpA(buf, "") == 0) || + ((GetLastError() == 0xdeadbeef && lstrcmpA(buf, "") == 0) || (GetLastError() == ERROR_ENVVAR_NOT_FOUND)), "%s should be set to \"\" (NT) or removed (Win9x) but ret_size=%d GetLastError=%d and buf=%s\n", name, ret_size, GetLastError(), buf); @@ -260,10 +260,10 @@ static void test_GetSetEnvironmentVariableW(void) ok(ret == TRUE, "should not fail with empty value but GetLastError=%d\n", GetLastError()); lstrcpyW(buf, fooW); - SetLastError(0); + SetLastError(0xdeadbeef); ret_size = GetEnvironmentVariableW(name, buf, lstrlenW(value) + 1); ok(ret_size == 0 && - ((GetLastError() == 0 && lstrcmpW(buf, empty_strW) == 0) || + ((GetLastError() == 0xdeadbeef && lstrcmpW(buf, empty_strW) == 0) || (GetLastError() == ERROR_ENVVAR_NOT_FOUND)), "should be set to \"\" (NT) or removed (Win9x) but ret_size=%d GetLastError=%d\n", ret_size, GetLastError()); diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index a07dddb1fc..76fe699b8a 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1232,24 +1232,32 @@ LPWSTR WINAPI DECLSPEC_HOTPATCH GetEnvironmentStringsW(void) */ DWORD WINAPI DECLSPEC_HOTPATCH GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size ) { - UNICODE_STRING us_name; + UNICODE_STRING us_name, us_value; PWSTR valueW; - DWORD ret; + NTSTATUS status; + DWORD len, ret; /* limit the size to sane values */ size = min( size, 32767 ); if (!(valueW = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) return 0; RtlCreateUnicodeStringFromAsciiz( &us_name, name ); - SetLastError( 0 ); - ret = GetEnvironmentVariableW( us_name.Buffer, valueW, size); - if (ret && ret < size) WideCharToMultiByte( CP_ACP, 0, valueW, ret + 1, value, size, NULL, NULL ); - - /* this is needed to tell, with 0 as a return value, the difference between: - * - an error (GetLastError() != 0) - * - returning an empty string (in this case, we need to update the buffer) - */ - if (ret == 0 && size && GetLastError() == 0) value[0] = 0; + us_value.Length = 0; + us_value.MaximumLength = (size ? size - 1 : 0) * sizeof(WCHAR); + us_value.Buffer = valueW; + + status = RtlQueryEnvironmentVariable_U( NULL, &us_name, &us_value ); + len = us_value.Length / sizeof(WCHAR); + if (status == STATUS_BUFFER_TOO_SMALL) ret = len + 1; + else if (!set_ntstatus( status )) ret = 0; + else if (!size) ret = len + 1; + else + { + if (len) WideCharToMultiByte( CP_ACP, 0, valueW, len + 1, value, size, NULL, NULL ); + value[len] = 0; + ret = len; + } + RtlFreeUnicodeString( &us_name ); HeapFree( GetProcessHeap(), 0, valueW ); return ret;

1 0

Emilio Cobos Álvarez : widl: Use DECLSPEC_ALIGN in MSVC compatible way for return types too.
by Alexandre Julliard Aug. 7, 2020

Aug. 7, 2020

Module: wine Branch: stable Commit: 95daac2bc175394730c97266480dd6526e570abf URL: https://source.winehq.org/git/wine.git/?a=commit;h=95daac2bc175394730c97266… Author: Emilio Cobos Álvarez <emilio(a)crisal.io> Date: Sun May 17 01:02:04 2020 +0200 widl: Use DECLSPEC_ALIGN in MSVC compatible way for return types too. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49173 Signed-off-by: Emilio Cobos Álvarez <emilio(a)crisal.io> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b1084ff910864a44d6fd0e0bda6b2b6c64987b2e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/typegen.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a1db88a7c0..04280cbb72 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4813,20 +4813,21 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun if (is_array( arg->declspec.type ) || is_ptr( arg->declspec.type )) align = pointer_size; else type_memsize_and_alignment( arg->declspec.type, &align ); - if (align >= pointer_size) - fprintf( file, "%s;\n", arg->name ); - else - fprintf( file, "DECLSPEC_ALIGN(%u) %s;\n", pointer_size, arg->name ); + if (align < pointer_size) + fprintf( file, "DECLSPEC_ALIGN(%u) ", pointer_size ); + fprintf( file, "%s;\n", arg->name ); } if (add_retval && !is_void( retval->declspec.type )) { print_file(file, 2, "%s", ""); - write_type_decl( file, &retval->declspec, retval->name ); - if (is_array( retval->declspec.type ) || is_ptr( retval->declspec.type ) || - type_memsize( retval->declspec.type ) == pointer_size) - fprintf( file, ";\n" ); - else - fprintf( file, " DECLSPEC_ALIGN(%u);\n", pointer_size ); + write_type_left( file, &retval->declspec, NAME_DEFAULT, TRUE, TRUE ); + if (needs_space_after( retval->declspec.type )) fputc( ' ', file ); + if (!is_array( retval->declspec.type ) && !is_ptr( retval->declspec.type ) && + type_memsize( retval->declspec.type ) != pointer_size) + { + fprintf( file, "DECLSPEC_ALIGN(%u) ", pointer_size ); + } + fprintf( file, "%s;\n", retval->name ); } print_file(file, 1, "} %s;\n", var_decl ); if (needs_packing) print_file( file, 0, "#include <poppack.h>\n" );

1 0