wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Zebediah Figura : setupapi: Add a basic implementation of SetupDiInstallDevice().
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: dc9c4221bd08ddc398593bae5307c9761a750dca URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc9c4221bd08ddc398593bae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 24 23:33:52 2019 -0500 setupapi: Add a basic implementation of SetupDiInstallDevice(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 58 ++++++++++++++++++++++++++++++++++++++++++++- dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 864e6dd..f60fd53 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3684,8 +3684,9 @@ BOOL WINAPI SetupDiCallClassInstaller(DI_FUNCTION function, HDEVINFO devinfo, SP return SetupDiInstallDriverFiles(devinfo, device_data); case DIF_INSTALLINTERFACES: return SetupDiInstallDeviceInterfaces(devinfo, device_data); - case DIF_FINISHINSTALL_ACTION: case DIF_INSTALLDEVICE: + return SetupDiInstallDevice(devinfo, device_data); + case DIF_FINISHINSTALL_ACTION: case DIF_PROPERTYCHANGE: case DIF_SELECTDEVICE: case DIF_UNREMOVE: @@ -4677,3 +4678,58 @@ BOOL WINAPI SetupDiInstallDriverFiles(HDEVINFO devinfo, SP_DEVINFO_DATA *device_ SetupCloseInfFile(hinf); return TRUE; } + +/*********************************************************************** + * SetupDiInstallDevice (SETUPAPI.@) + */ +BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) +{ + WCHAR section[LINE_LEN], section_ext[LINE_LEN]; + UINT install_flags = SPINST_ALL; + struct device *device; + struct driver *driver; + void *callback_ctx; + HKEY driver_key; + INFCONTEXT ctx; + HINF hinf; + LONG l; + + TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!(driver = device->selected_driver)) + { + ERR("No driver selected for device %p.\n", devinfo); + SetLastError(ERROR_NO_DRIVER_SELECTED); + return FALSE; + } + + if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + SetupFindFirstLineW(hinf, driver->mfg_key, driver->description, &ctx); + SetupGetStringFieldW(&ctx, 1, section, ARRAY_SIZE(section), NULL); + SetupDiGetActualSectionToInstallW(hinf, section, section_ext, ARRAY_SIZE(section_ext), NULL, NULL); + + if ((l = create_driver_key(device, &driver_key))) + { + SetLastError(l); + SetupCloseInfFile(hinf); + return FALSE; + } + + if (device->params.Flags & DI_NOFILECOPY) + install_flags &= ~SPINST_FILES; + + callback_ctx = SetupInitDefaultQueueCallback(NULL); + + SetupInstallFromInfSectionW(NULL, hinf, section_ext, install_flags, driver_key, NULL, + SP_COPY_NEWER_ONLY, SetupDefaultQueueCallbackW, callback_ctx, NULL, NULL); + + SetupTermDefaultQueueCallback(callback_ctx); + SetupCloseInfFile(hinf); + RegCloseKey(driver_key); + return TRUE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 97347f5..81256a3 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -366,7 +366,7 @@ @ stub SetupDiInstallClassExA @ stub SetupDiInstallClassExW @ stdcall SetupDiInstallClassW(long wstr long ptr) -@ stub SetupDiInstallDevice +@ stdcall SetupDiInstallDevice(ptr ptr) @ stdcall SetupDiInstallDeviceInterfaces(ptr ptr) @ stdcall SetupDiInstallDriverFiles(ptr ptr) @ stdcall SetupDiLoadClassIcon(ptr ptr ptr)

1 0

Louis Lenders : gdiplus: Add version resource.
by Alexandre Julliard 27 May '19

27 May '19

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

Alexandre Julliard : Wine release 4.9
by Alexandre Julliard 24 May '19

24 May '19

Module: website Branch: master Commit: 121024804f1458e53461f344f50a9bfd2c704bd1 URL: https://source.winehq.org/git/website.git/?a=commit;h=121024804f1458e53461f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 22:46:51 2019 +0200 Wine release 4.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019052401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2019052401.xml b/news/en/2019052401.xml new file mode 100644 index 0000000..ce821e9 --- /dev/null +++ b/news/en/2019052401.xml @@ -0,0 +1,17 @@ +<news> +<date>May 24, 2019</date> +<title>Wine 4.9 Released</title> +<body> + The Wine development release 4.9 is now available. + <a href="{$root}/announce/4.9">What's new</a> in this release: +<ul> + <li>Initial support for installing Plug and Play drivers.</li> + <li>Support for building 16-bit modules in PE format.</li> + <li>A lot of code moved to the new KernelBase DLL.</li> + <li>Various game controller fixes.</li> + <li>Use higher performance system clocks if available.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.9.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-4.9 : Alexandre Julliard : Release 4.9
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: refs/tags/wine-4.9 Tag: aaad2d41795e85ea24498c870bb961b4c147349e URL: https://source.winehq.org/git/wine.git/?a=tag;h=aaad2d41795e85ea24498c870bb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 22:45:05 2019 +0200 Release 4.9

1 0

Alexandre Julliard : Release 4.9.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: fc8174a36483d9ddbcc1a82c1c7d1334b2efc702 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc8174a36483d9ddbcc1a82c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 24 22:45:04 2019 +0200 Release 4.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 909 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 487 insertions(+), 445 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc8174a36483d9ddbcc1…

1 0

Michael Stefaniuc : kernel32/tests: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 260e66ee8b46206ea5e684e2f40333c233d6fef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=260e66ee8b46206ea5e684e2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 24 19:53:47 2019 +0200 kernel32/tests: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 8f55083..f15cc09 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1922,7 +1922,7 @@ static void test_SearchPathA(void) ret = GetCurrentDirectoryA(MAX_PATH, curdirA); ok(ret, "failed to obtain working directory.\n"); sprintf(pathA, "%s\\%s", tmpdirA, kernel32A); - ret = SearchPathA(NULL, kernel32A, NULL, sizeof(path2A)/sizeof(CHAR), path2A, NULL); + ret = SearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(path2A), path2A, NULL); ok(ret && ret == strlen(path2A), "got %d\n", ret); bret = CopyFileA(path2A, pathA, FALSE); ok(bret != 0, "failed to copy test executable to temp directory, %u\n", GetLastError());

1 0

Nikolay Sivov : mfplat: Add timestamp support for system time source.
by Alexandre Julliard 24 May '19

24 May '19

Module: wine Branch: master Commit: 7b014ff049254fa3b382ee6776c25a67647bdde8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b014ff049254fa3b382ee67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 18:02:36 2019 +0300 mfplat: Add timestamp support for system time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 81 +++++++++++++++++++----- dlls/mfplat/tests/mfplat.c | 152 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b014ff049254fa3b382…

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

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/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

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