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

Zhiyi Zhang : gdi32/tests: Add D3DKMTCheckVidPnExclusiveOwnership tests.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: af7f3ecd3b03103a0a2f0002e2925af3a2ac93e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af7f3ecd3b03103a0a2f0002… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 24 09:23:31 2019 +0100 gdi32/tests: Add D3DKMTCheckVidPnExclusiveOwnership tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 345 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 345 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af7f3ecd3b03103a0a2f…

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTSetVidPnSourceOwner tests.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: bf3e32b5b0a604041a5b9d31267a5b7de96db6f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf3e32b5b0a604041a5b9d31… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 24 09:23:32 2019 +0100 gdi32/tests: Add D3DKMTSetVidPnSourceOwner tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index ef9a7ae..d8ae0f8 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -590,6 +590,22 @@ static void test_D3DKMTCheckVidPnExclusiveOwnership(void) ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTSetVidPnSourceOwner(void) +{ + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc = {0}; + NTSTATUS status; + + if (!pD3DKMTSetVidPnSourceOwner || pD3DKMTSetVidPnSourceOwner(&set_owner_desc) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -608,4 +624,5 @@ START_TEST(driver) test_D3DKMTCreateDevice(); test_D3DKMTDestroyDevice(); test_D3DKMTCheckVidPnExclusiveOwnership(); + test_D3DKMTSetVidPnSourceOwner(); }

1 0

Nikolay Sivov : kernelbase: Add remaining URL functions.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 88ffcd5db4686bf9e285e384339ab48ac7c08604 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88ffcd5db4686bf9e285e384… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 16:05:01 2019 +0300 kernelbase: Add remaining URL functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 12 +- dlls/kernelbase/path.c | 403 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 409 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=88ffcd5db4686bf9e285…

1 0

Nikolay Sivov : kernelbase: Add SHLoadIndirectString().
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: d361fa79a1888d252b7b2840a66e040205454d22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d361fa79a1888d252b7b2840… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 16:05:02 2019 +0300 kernelbase: Add SHLoadIndirectString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/string.c | 48 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7f48169..b721d8f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1354,7 +1354,7 @@ # @ stub SHCoCreateInstance @ stdcall SHExpandEnvironmentStringsA(str ptr long) kernel32.ExpandEnvironmentStringsA @ stdcall SHExpandEnvironmentStringsW(wstr ptr long) kernel32.ExpandEnvironmentStringsW -@ stdcall SHLoadIndirectString(wstr ptr long ptr) shlwapi.SHLoadIndirectString +@ stdcall SHLoadIndirectString(wstr ptr long ptr) # @ stub SHLoadIndirectStringInternal @ stdcall SHRegCloseUSKey(ptr) shlwapi.SHRegCloseUSKey @ stdcall SHRegCreateUSKeyA(str long long ptr long) shlwapi.SHRegCreateUSKeyA diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 4c18acf..bd495bd 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -1426,3 +1426,51 @@ DWORD WINAPI SHTruncateString(char *str, DWORD size) return size; } + +HRESULT WINAPI SHLoadIndirectString(const WCHAR *src, WCHAR *dst, UINT dst_len, void **reserved) +{ + WCHAR *dllname = NULL; + HMODULE hmod = NULL; + HRESULT hr = E_FAIL; + + TRACE("%s, %p, %#x, %p\n", debugstr_w(src), dst, dst_len, reserved); + + if (src[0] == '@') + { + WCHAR *index_str; + int index; + + dst[0] = 0; + dllname = StrDupW(src + 1); + index_str = strchrW(dllname, ','); + + if(!index_str) goto end; + + *index_str = 0; + index_str++; + index = atoiW(index_str); + + hmod = LoadLibraryW(dllname); + if (!hmod) goto end; + + if (index < 0) + { + if (LoadStringW(hmod, -index, dst, dst_len)) + hr = S_OK; + } + else + FIXME("can't handle non-negative indices (%d)\n", index); + } + else + { + if (dst != src) + lstrcpynW(dst, src, dst_len); + hr = S_OK; + } + + TRACE("returning %s\n", debugstr_w(dst)); +end: + if (hmod) FreeLibrary(hmod); + LocalFree(dllname); + return hr; +}

1 0

Nikolay Sivov : kernelbase: Add some registry helpers from shlwapi.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 110656072c127425f7e5e1733e4b006f7cb8beb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=110656072c127425f7e5e173… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 16:05:03 2019 +0300 kernelbase: Add some registry helpers from shlwapi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 38 ++-- dlls/kernelbase/registry.c | 477 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 497 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=110656072c127425f7e5…

1 0

Alexandre Julliard : makefiles: Add install dependency for PE builtins.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 0fc2f6384eda4ff21fac6a5e9b41d76455a1de1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc2f6384eda4ff21fac6a5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 18:01:19 2019 +0200 makefiles: Add install dependency for PE builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 23b3389..2c5c503 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2406,6 +2406,7 @@ static void output_install_rules( struct makefile *make, enum install_rules rule const char *file = files.str[i]; switch (*files.str[i + 1]) { + case 'c': /* cross-compiled program */ case 'd': /* data file */ case 'p': /* program file */ case 's': /* script */

1 0

Akihiro Sagawa : kernel32: Add traces to time zone functions.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 4ef37887d62e29e9ce16aa2067eef1eabc85cc29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ef37887d62e29e9ce16aa20… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 24 22:32:27 2019 +0900 kernel32: Add traces to time zone functions. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 3affb72..00fcc6b 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -610,6 +610,7 @@ DWORD WINAPI GetTimeZoneInformation( LPTIME_ZONE_INFORMATION ret ) DYNAMIC_TIME_ZONE_INFORMATION tzinfo; DWORD time_zone_id; + TRACE("(%p)\n", ret); time_zone_id = GetDynamicTimeZoneInformation( &tzinfo ); memcpy( ret, &tzinfo, sizeof(*ret) ); return time_zone_id; @@ -623,6 +624,7 @@ BOOL WINAPI GetTimeZoneInformationForYear( USHORT wYear, { DYNAMIC_TIME_ZONE_INFORMATION local_dtzi, result; + TRACE("(%u,%p)\n", wYear, ptzi); if (!pdtzi) { if (GetDynamicTimeZoneInformation(&local_dtzi) == TIME_ZONE_ID_INVALID) @@ -654,6 +656,8 @@ BOOL WINAPI GetTimeZoneInformationForYear( USHORT wYear, BOOL WINAPI SetTimeZoneInformation( const TIME_ZONE_INFORMATION *tzinfo ) { NTSTATUS status; + + TRACE("(%p)\n", tzinfo); status = RtlSetTimeZoneInformation( (const RTL_TIME_ZONE_INFORMATION *)tzinfo ); if ( status != STATUS_SUCCESS ) SetLastError( RtlNtStatusToDosError(status) ); @@ -1312,6 +1316,8 @@ VOID WINAPI GetSystemTime(LPSYSTEMTIME systime) BOOL WINAPI GetDaylightFlag(void) { TIME_ZONE_INFORMATION tzinfo; + + TRACE("()\n"); RtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); return (TIME_ZoneID(&tzinfo) == TIME_ZONE_ID_DAYLIGHT); } @@ -1462,6 +1468,7 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo NTSTATUS status; HANDLE time_zone_key; + TRACE("(%p)\n", tzinfo); status = RtlQueryDynamicTimeZoneInformation( (RTL_DYNAMIC_TIME_ZONE_INFORMATION*)tzinfo ); if ( status != STATUS_SUCCESS ) {

1 0

Akihiro Sagawa : advapi32/tests: Add RegLoadMUIString tests with REG_MUI_STRING_TRUNCATE flag.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 1ca4ecadeccee704345d358a3f69131884d33b0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ca4ecadeccee704345d358a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 24 22:32:29 2019 +0900 advapi32/tests: Add RegLoadMUIString tests with REG_MUI_STRING_TRUNCATE flag. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index b8974f2..ab8655a 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3907,6 +3907,22 @@ static void test_RegLoadMUIString(void) "got %u, expected %u\n", size, text_size); todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, &size, REG_MUI_STRING_TRUNCATE, NULL); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); + todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, NULL, 0xdeadbeef, NULL); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); + todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, NULL, REG_MUI_STRING_TRUNCATE, NULL); + ok(ret == ERROR_SUCCESS, "got %d, expected ERROR_SUCCESS\n", ret); + ok(bufW[0] == textW[0], "got 0x%04x, expected 0x%04x\n", bufW[0], textW[0]); + ok(bufW[1] == 0, "got 0x%04x, expected nul\n", bufW[1]); + size = 0xdeadbeef; memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, NULL);

1 0

Akihiro Sagawa : advapi32: Factor out load_mui_string().
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: ed165737957df146d8dabc274d6c4c58fe0fc275 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed165737957df146d8dabc27… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 24 22:32:31 2019 +0900 advapi32: Factor out load_mui_string(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 81 ++++++++++++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 30 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 7cf9ed1..b779def 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3112,7 +3112,7 @@ LSTATUS WINAPI RegOpenUserClassesRoot( * avoid importing user32, which is higher level than advapi32. Helper for * RegLoadMUIString. */ -static LONG load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars, UINT *reqChars) +static INT load_string(HINSTANCE hModule, UINT resId, LPWSTR *pResString) { HGLOBAL hMemory; HRSRC hResource; @@ -3125,27 +3125,61 @@ static LONG load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cM /* Load the resource into memory and get a pointer to it. */ hResource = FindResourceW(hModule, MAKEINTRESOURCEW(LOWORD(resId >> 4) + 1), (LPWSTR)RT_STRING); - if (!hResource) return ERROR_FILE_NOT_FOUND; + if (!hResource) return 0; hMemory = LoadResource(hModule, hResource); - if (!hMemory) return ERROR_FILE_NOT_FOUND; + if (!hMemory) return 0; pString = LockResource(hMemory); /* Strings are length-prefixed. Lowest nibble of resId is an index. */ idxString = resId & 0xf; while (idxString--) pString += *pString + 1; - *reqChars = *pString + 1; - /* If no buffer is given, return here. */ - if (!pwszBuffer) return ERROR_MORE_DATA; + *pResString = pString + 1; + return *pString; +} + +static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, INT max_chars, INT *req_chars) +{ + HMODULE hModule = NULL; + WCHAR *string; + int size; + LONG result; + + /* Verify the file existence. i.e. We don't rely on PATH variable */ + if (GetFileAttributesW(file_name) == INVALID_FILE_ATTRIBUTES) + return ERROR_FILE_NOT_FOUND; + + /* Load the file */ + hModule = LoadLibraryExW(file_name, NULL, + LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); + if (!hModule) + return ERROR_BADKEY; + + size = load_string(hModule, res_id, &string); + if (!size) { + result = ERROR_FILE_NOT_FOUND; + goto cleanup; + } + *req_chars = size + 1; + + /* If no buffer is given, skip copying. */ + if (!buffer) { + result = ERROR_MORE_DATA; + goto cleanup; + } /* Else copy over the string, respecting the buffer size. */ - cMaxChars = (*pString < cMaxChars) ? *pString : (cMaxChars - 1); - if (cMaxChars >= 0) { - memcpy(pwszBuffer, pString+1, cMaxChars * sizeof(WCHAR)); - pwszBuffer[cMaxChars] = '\0'; + max_chars = (size < max_chars) ? size : (max_chars - 1); + if (max_chars >= 0) { + memcpy(buffer, string, max_chars * sizeof(WCHAR)); + buffer[max_chars] = '\0'; } - return ERROR_SUCCESS; + result = ERROR_SUCCESS; + +cleanup: + if (hModule) FreeLibrary(hModule); + return result; } /****************************************************************************** @@ -3229,7 +3263,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer const WCHAR backslashW[] = {'\\',0}; UINT uiStringId; DWORD baseDirLen; - HMODULE hModule; + int reqChars; /* Format of the expanded value is 'path_to_dll,-resId' */ if (!pComma || pComma[1] != '-') { @@ -3257,24 +3291,11 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer } strcatW(pwszTempBuffer, pwszExpandedBuffer + 1); - /* Verify the file existence. i.e. We don't rely on PATH variable */ - if (GetFileAttributesW(pwszTempBuffer) == INVALID_FILE_ATTRIBUTES) { - result = ERROR_FILE_NOT_FOUND; - goto cleanup; - } - - /* Load the file */ - hModule = LoadLibraryExW(pwszTempBuffer, NULL, - LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); - if (hModule) { - DWORD reqChars; - result = load_string(hModule, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR), &reqChars); - if (pcbData && (result == ERROR_SUCCESS || result == ERROR_MORE_DATA)) - *pcbData = reqChars * sizeof(WCHAR); - FreeLibrary(hModule); - } - else - result = ERROR_BADKEY; + /* Load specified string from the file */ + reqChars = 0; + result = load_mui_string(pwszTempBuffer, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR), &reqChars); + if (pcbData && (result == ERROR_SUCCESS || result == ERROR_MORE_DATA)) + *pcbData = reqChars * sizeof(WCHAR); } cleanup:

1 0

Akihiro Sagawa : advapi32: Implement REG_MUI_STRING_TRUNCATE flag.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 3c1359af10448a4e1f9ac49aeb01ef3a4dda3ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c1359af10448a4e1f9ac49a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 24 22:32:33 2019 +0900 advapi32: Implement REG_MUI_STRING_TRUNCATE flag. 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 | 12 ++++++------ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index b779def..f889d3b 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3138,7 +3138,7 @@ static INT load_string(HINSTANCE hModule, UINT resId, LPWSTR *pResString) return *pString; } -static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, INT max_chars, INT *req_chars) +static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, INT max_chars, INT *req_chars, DWORD flags) { HMODULE hModule = NULL; WCHAR *string; @@ -3169,7 +3169,16 @@ static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, } /* Else copy over the string, respecting the buffer size. */ - max_chars = (size < max_chars) ? size : (max_chars - 1); + if (size < max_chars) + max_chars = size; + else { + if (flags & REG_MUI_STRING_TRUNCATE) + max_chars--; + else { + result = ERROR_MORE_DATA; + goto cleanup; + } + } if (max_chars >= 0) { memcpy(buffer, string, max_chars * sizeof(WCHAR)); buffer[max_chars] = '\0'; @@ -3195,7 +3204,7 @@ cleanup: * pszBuffer [O] Buffer to store the localized string in. * cbBuffer [I] Size of the destination buffer in bytes. * pcbData [O] Number of bytes written to pszBuffer (optional, may be NULL). - * dwFlags [I] None supported yet. + * dwFlags [I] Truncate output to fit the buffer if REG_MUI_STRING_TRUNCATE. * pszBaseDir [I] Base directory of loading path. If NULL, use the current directory. * * RETURNS @@ -3218,7 +3227,9 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer cbBuffer, pcbData, dwFlags, debugstr_w(pwszBaseDir)); /* Parameter sanity checks. */ - if (!hKey || (!pwszBuffer && cbBuffer) || (cbBuffer % sizeof(WCHAR))) + if (!hKey || (!pwszBuffer && cbBuffer) || (cbBuffer % sizeof(WCHAR)) + || ((dwFlags & REG_MUI_STRING_TRUNCATE) && pcbData) + || (dwFlags & ~REG_MUI_STRING_TRUNCATE)) return ERROR_INVALID_PARAMETER; /* Check for value existence and correctness of its type, allocate a buffer and load it. */ @@ -3293,7 +3304,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer /* Load specified string from the file */ reqChars = 0; - result = load_mui_string(pwszTempBuffer, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR), &reqChars); + result = load_mui_string(pwszTempBuffer, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR), &reqChars, dwFlags); if (pcbData && (result == ERROR_SUCCESS || result == ERROR_MORE_DATA)) *pcbData = reqChars * sizeof(WCHAR); } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index ab8655a..c178e39 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3902,20 +3902,20 @@ static void test_RegLoadMUIString(void) size = 0xdeadbeef; memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, &size, 0, NULL); - todo_wine ok(ret == ERROR_MORE_DATA, "got %d, expected ERROR_MORE_DATA\n", ret); + ok(ret == ERROR_MORE_DATA, "got %d, expected ERROR_MORE_DATA\n", ret); ok(size == text_size || broken(size == text_size + sizeof(WCHAR) /* vista */), "got %u, expected %u\n", size, text_size); - todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, &size, REG_MUI_STRING_TRUNCATE, NULL); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); - todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); + ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, NULL, 0xdeadbeef, NULL); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); - todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); + ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); memset(bufW, 0xff, sizeof(bufW)); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, NULL, REG_MUI_STRING_TRUNCATE, NULL);

1 0