February 2020 - Wine-Commits

Francois Gouget : bcrypt: Make format_gnutls_signature() static.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: c9f9f836312a41b9754fc9ecbd49b046f0882b13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f9f836312a41b9754fc9ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 3 12:15:53 2020 +0100 bcrypt: Make format_gnutls_signature() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 868f898bbb..1d78b9f4d1 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1141,8 +1141,8 @@ static unsigned int get_signature_length( enum alg_id id ) } } -NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signature, UCHAR *output, - ULONG output_len, ULONG *ret_len ) +static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signature, + UCHAR *output, ULONG output_len, ULONG *ret_len ) { switch (type) {

1 0

Jacek Caban : jscript: Propagate Invoke error code using jsexcept_t.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 83fa76c25e89897766eb6abde3c266e129f1baa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83fa76c25e89897766eb6abd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 3 14:47:07 2020 +0100 jscript: Propagate Invoke error code using jsexcept_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index cdfbf9f57e..5b41f2702c 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1974,7 +1974,8 @@ static HRESULT disp_invoke(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD f if(hres == DISP_E_EXCEPTION) { TRACE("DISP_E_EXCEPTION: %08x %s %s\n", ei.scode, debugstr_w(ei.bstrSource), debugstr_w(ei.bstrDescription)); - hres = SUCCEEDED(ei.scode) ? E_FAIL : ei.scode; + reset_ei(ctx->ei); + ctx->ei->error = (SUCCEEDED(ei.scode) || ei.scode == DISP_E_EXCEPTION) ? E_FAIL : ei.scode; SysFreeString(ei.bstrSource); SysFreeString(ei.bstrDescription); SysFreeString(ei.bstrHelpFile);

1 0

Nikolay Sivov : shdocvw: Forward WhichPlatform() to shlwapi.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: cf4a78b3e50946c274b2a5c0a31b43a2a8af71ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4a78b3e50946c274b2a5c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:16:07 2020 +0300 shdocvw: Forward WhichPlatform() to shlwapi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 11 ----------- include/shlwapi.h | 8 +++++++- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 485d1608db..aa1b5e0c96 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -2,7 +2,7 @@ 101 stdcall -noname IEWinMain(str long) 102 stub -noname CreateShortcutInDirA 103 stub -noname CreateShortcutInDirW -104 stdcall -noname WhichPlatformFORWARD() +104 stdcall -noname WhichPlatform() shlwapi.WhichPlatform 105 stub -noname CreateShortcutInDirEx 106 stub HlinkFindFrame 107 stub SetShellOfflineState diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 98d0d2cde2..ac3913dd23 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -283,17 +283,6 @@ static void* fetch_shlwapi_ordinal(UINT_PTR ord) return (void*)GetProcAddress(h, (const char*)ord); } -/****************************************************************** - * WhichPlatformFORWARD (SHDOCVW.@) - */ -DWORD WINAPI WhichPlatformFORWARD(void) -{ - static DWORD (WINAPI *p)(void); - - if (p || (p = fetch_shlwapi_ordinal(276))) return p(); - return 1; /* not integrated, see shlwapi.WhichPlatform */ -} - /****************************************************************** * StopWatchModeFORWARD (SHDOCVW.@) */ diff --git a/include/shlwapi.h b/include/shlwapi.h index 8d6801a94d..2bfca0bc90 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1135,7 +1135,6 @@ BOOL WINAPI IsOS(DWORD); #define FDTF_RTLDATE 0x00000200 #define FDTF_NOAUTOREADINGORDER 0x00000400 - typedef struct { const IID *piid; @@ -1144,6 +1143,13 @@ typedef struct HRESULT WINAPI QISearch(void* base, const QITAB *pqit, REFIID riid, void **ppv); +#define PLATFORM_UNKNOWN 0 +#define PLATFORM_IE3 1 +#define PLATFORM_BROWSERONLY 1 +#define PLATFORM_INTEGRATED 2 + +UINT WINAPI WhichPlatform(void); + #include <poppack.h> #ifdef __cplusplus

1 0

Nikolay Sivov : include: Add some newer Edit messages.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 8e48e120b63e9c22368f4ede1484b27e4f2e3d65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e48e120b63e9c22368f4ede… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:20:07 2020 +0300 include: Add some newer Edit messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 700b335fbb..b503f9ef24 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5346,6 +5346,24 @@ typedef struct _tagEDITBALLOONTIP #define EM_GETHILITE (ECM_FIRST + 6) #define EM_NOSETFOCUS (ECM_FIRST + 7) #define EM_TAKEFOCUS (ECM_FIRST + 8) +#define EM_SETEXTENDEDSTYLE (ECM_FIRST + 10) +#define EM_GETEXTENDEDSTYLE (ECM_FIRST + 11) +#define EM_SETENDOFLINE (ECM_FIRST + 12) +#define EM_GETENDOFLINE (ECM_FIRST + 13) +#define EM_ENABLESEARCHWEB (ECM_FIRST + 14) +#define EM_SEARCHWEB (ECM_FIRST + 15) +#define EM_SETCARETINDEX (ECM_FIRST + 17) +#define EM_GETCARETINDEX (ECM_FIRST + 18) +#define EM_FILELINEFROMCHAR (ECM_FIRST + 19) +#define EM_FILELINEINDEX (ECM_FIRST + 20) +#define EM_FILELINELENGTH (ECM_FIRST + 21) +#define EM_GETFILELINE (ECM_FIRST + 22) +#define EM_GETFILELINECOUNT (ECM_FIRST + 23) + +#define EM_GETZOOM (WM_USER + 224) +#define EM_SETZOOM (WM_USER + 225) + +#define EN_SEARCHWEB (EN_FIRST) #define Edit_SetCueBannerText(hwnd, text) \ (BOOL)SNDMSG((hwnd), EM_SETCUEBANNER, 0, (LPARAM)(text))

1 0

Alexandre Julliard : ntdll: Add parameter checking in RtlNormalizeString().
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: dcd195e0f159ed7203d7073d81373d8e878e943b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcd195e0f159ed7203d7073d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 3 13:29:55 2020 +0100 ntdll: Add parameter checking in RtlNormalizeString(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 11 +++++++---- dlls/ntdll/locale.c | 15 ++++++++++++--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 751b508e83..ea591d851c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6184,12 +6184,14 @@ static void test_NormalizeString(void) case NormalizationKC: case NormalizationKD: case 13: /* Idn */ + todo_wine_if (i == 13) ok( dstlen > 0, "%d: wrong len %d\n", i, dstlen ); todo_wine ok( GetLastError() == ERROR_SUCCESS, "%d: got error %u\n", i, GetLastError()); break; default: - todo_wine ok( dstlen <= 0, "%d: wrong len %d\n", i, dstlen ); - todo_wine ok( GetLastError() == ERROR_INVALID_PARAMETER, "%d: got error %u\n", i, GetLastError()); + ok( dstlen <= 0, "%d: wrong len %d\n", i, dstlen ); + todo_wine_if (i) + ok( GetLastError() == ERROR_INVALID_PARAMETER, "%d: got error %u\n", i, GetLastError()); break; } if (pRtlNormalizeString) @@ -6199,17 +6201,18 @@ static void test_NormalizeString(void) switch (i) { case 0: - todo_wine ok( status == STATUS_INVALID_PARAMETER, "%d: failed %x\n", i, status ); + ok( status == STATUS_INVALID_PARAMETER, "%d: failed %x\n", i, status ); break; case NormalizationC: case NormalizationD: case NormalizationKC: case NormalizationKD: case 13: /* Idn */ + todo_wine_if (i == 13) ok( status == STATUS_SUCCESS, "%d: failed %x\n", i, status ); break; default: - todo_wine ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "%d: failed %x\n", i, status ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "%d: failed %x\n", i, status ); break; } } diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index dfd48eb0f8..f9d65e47fd 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1687,17 +1687,26 @@ NTSTATUS WINAPI RtlIsNormalizedString( ULONG form, const WCHAR *str, INT len, BO */ NTSTATUS WINAPI RtlNormalizeString( ULONG form, const WCHAR *src, INT src_len, WCHAR *dst, INT *dst_len ) { - int flags = 0, compose = 0; + int flags = 0, compose, compat; unsigned int res, buf_len; WCHAR *buf = NULL; NTSTATUS status = STATUS_SUCCESS; TRACE( "%x %s %d %p %d\n", form, debugstr_wn(src, src_len), src_len, dst, *dst_len ); + switch (form) + { + case NormalizationC: compose = 1; compat = 0; break; + case NormalizationD: compose = 0; compat = 0; break; + case NormalizationKC: compose = 1; compat = 1; break; + case NormalizationKD: compose = 0; compat = 1; break; + case 0: return STATUS_INVALID_PARAMETER; + default: return STATUS_OBJECT_NAME_NOT_FOUND; + } + if (src_len == -1) src_len = strlenW(src) + 1; - if (form == NormalizationKC || form == NormalizationKD) flags |= WINE_DECOMPOSE_COMPAT; - if (form == NormalizationC || form == NormalizationKC) compose = 1; + if (compat) flags |= WINE_DECOMPOSE_COMPAT; if (compose || *dst_len) flags |= WINE_DECOMPOSE_REORDER; if (!compose && *dst_len)

1 0

Alexandre Julliard : kernel32/tests: Add some NormalizeString() tests.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 77f58afd3baabdc82f4e699a549598b4abaeb806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f58afd3baabdc82f4e699a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 3 13:23:38 2020 +0100 kernel32/tests: Add some NormalizeString() tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 241 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 215 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77f58afd3baabdc82f4e…

1 0

Nikolay Sivov : shlwapi: Add header entries for SHIsLowMemoryMachine().
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: b84d56fb04712d71148c9d51e36dab29e06614c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b84d56fb04712d71148c9d51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:16:11 2020 +0300 shlwapi: Add header entries for SHIsLowMemoryMachine(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 18 ------------------ dlls/shlwapi/shlwapi_main.c | 10 ++++++++++ include/shlwapi.h | 4 ++++ 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 8767d0b579..8c9e324ae0 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3564,24 +3564,6 @@ HRESULT WINAPI SHGetInverseCMAP(LPDWORD dest, DWORD dwSize) return 0; } -/************************************************************************* - * SHIsLowMemoryMachine [SHLWAPI.@] - * - * Determine if the current computer has low memory. - * - * PARAMS - * x [I] FIXME - * - * RETURNS - * TRUE if the users machine has 16 Megabytes of memory or less, - * FALSE otherwise. - */ -BOOL WINAPI SHIsLowMemoryMachine (DWORD x) -{ - FIXME("(0x%08x) stub\n", x); - return FALSE; -} - /************************************************************************* * GetMenuPosFromID [SHLWAPI.@] * diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index 3717dfa712..04abf30ffc 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -166,3 +166,13 @@ HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bag_name return E_NOTIMPL; } + +/************************************************************************* + * SHIsLowMemoryMachine [SHLWAPI.@] + */ +BOOL WINAPI SHIsLowMemoryMachine(DWORD type) +{ + FIXME("%d stub\n", type); + + return FALSE; +} diff --git a/include/shlwapi.h b/include/shlwapi.h index 02517a944a..ca15bd2077 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1167,6 +1167,10 @@ UINT WINAPI WhichPlatform(void); HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bagname, DWORD flags, REFIID riid, void **ppv); +#define ILMM_IE4 0 + +BOOL WINAPI SHIsLowMemoryMachine(DWORD type); + #include <poppack.h> #ifdef __cplusplus

1 0

Nikolay Sivov : shlwapi: Use public definitions for WhichPlatform().
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 017c953d868b7313a16e465851fc3f46f62cd77d URL: https://source.winehq.org/git/wine.git/?a=commit;h=017c953d868b7313a16e4658… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:16:08 2020 +0300 shlwapi: Use public definitions for WhichPlatform(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 66 --------------------------------------------- dlls/shlwapi/shlwapi_main.c | 48 +++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 66 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index c5c4fa14ad..dd39366c80 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2291,72 +2291,6 @@ BOOL WINAPI GUIDFromStringW(LPCWSTR idstr, CLSID *id) return SUCCEEDED(CLSIDFromString((LPCOLESTR)idstr, id)); } -/************************************************************************* - * @ [SHLWAPI.276] - * - * Determine if the browser is integrated into the shell, and set a registry - * key accordingly. - * - * PARAMS - * None. - * - * RETURNS - * 1, If the browser is not integrated. - * 2, If the browser is integrated. - * - * NOTES - * The key "HKLM\Software\Microsoft\Internet Explorer\IntegratedBrowser" is - * either set to TRUE, or removed depending on whether the browser is deemed - * to be integrated. - */ -DWORD WINAPI WhichPlatform(void) -{ - static const char szIntegratedBrowser[] = "IntegratedBrowser"; - static DWORD dwState = 0; - HKEY hKey; - DWORD dwRet, dwData, dwSize; - HMODULE hshell32; - - if (dwState) - return dwState; - - /* If shell32 exports DllGetVersion(), the browser is integrated */ - dwState = 1; - hshell32 = LoadLibraryA("shell32.dll"); - if (hshell32) - { - FARPROC pDllGetVersion; - pDllGetVersion = GetProcAddress(hshell32, "DllGetVersion"); - dwState = pDllGetVersion ? 2 : 1; - FreeLibrary(hshell32); - } - - /* Set or delete the key accordingly */ - dwRet = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Internet Explorer", 0, - KEY_ALL_ACCESS, &hKey); - if (!dwRet) - { - dwRet = RegQueryValueExA(hKey, szIntegratedBrowser, 0, 0, - (LPBYTE)&dwData, &dwSize); - - if (!dwRet && dwState == 1) - { - /* Value exists but browser is not integrated */ - RegDeleteValueA(hKey, szIntegratedBrowser); - } - else if (dwRet && dwState == 2) - { - /* Browser is integrated but value does not exist */ - dwData = TRUE; - RegSetValueExA(hKey, szIntegratedBrowser, 0, REG_DWORD, - (LPBYTE)&dwData, sizeof(dwData)); - } - RegCloseKey(hKey); - } - return dwState; -} - /************************************************************************* * @ [SHLWAPI.278] * diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index fc1b6d6137..af79c33cb6 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -108,3 +108,51 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) WARN("pdvi->cbSize = %d, unhandled\n", pdvi2->info1.cbSize); return E_INVALIDARG; } + +/************************************************************************* + * WhichPlatform() [SHLWAPI.276] + */ +UINT WINAPI WhichPlatform(void) +{ + static const char szIntegratedBrowser[] = "IntegratedBrowser"; + static DWORD state = PLATFORM_UNKNOWN; + DWORD ret, data, size; + HMODULE hshell32; + HKEY hKey; + + if (state) + return state; + + /* If shell32 exports DllGetVersion(), the browser is integrated */ + state = PLATFORM_BROWSERONLY; + hshell32 = LoadLibraryA("shell32.dll"); + if (hshell32) + { + FARPROC pDllGetVersion; + pDllGetVersion = GetProcAddress(hshell32, "DllGetVersion"); + state = pDllGetVersion ? PLATFORM_INTEGRATED : PLATFORM_BROWSERONLY; + FreeLibrary(hshell32); + } + + /* Set or delete the key accordingly */ + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Internet Explorer", 0, KEY_ALL_ACCESS, &hKey); + if (!ret) + { + size = sizeof(data); + ret = RegQueryValueExA(hKey, szIntegratedBrowser, 0, 0, (BYTE *)&data, &size); + if (!ret && state == PLATFORM_BROWSERONLY) + { + /* Value exists but browser is not integrated */ + RegDeleteValueA(hKey, szIntegratedBrowser); + } + else if (ret && state == PLATFORM_INTEGRATED) + { + /* Browser is integrated but value does not exist */ + data = TRUE; + RegSetValueExA(hKey, szIntegratedBrowser, 0, REG_DWORD, (BYTE *)&data, sizeof(data)); + } + RegCloseKey(hKey); + } + + return state; +}

1 0

Alexandre Julliard : ntdll: Fix estimated buffer sizes in RtlNormalizeString().
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: a7cc191aa89fbcad05064eeb6f6c05226f496ad1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7cc191aa89fbcad05064eeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 3 16:30:56 2020 +0100 ntdll: Fix estimated buffer sizes in RtlNormalizeString(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 33 +++++++++--------- dlls/ntdll/locale.c | 81 ++++++++++++++++++++++---------------------- 2 files changed, 56 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7cc191aa89fbcad0506…

1 0

Alexandre Julliard : kernelbase: Fix NormalizeString() return value and last error.
by Alexandre Julliard Feb. 3, 2020

Feb. 3, 2020

Module: wine Branch: master Commit: 8d11c0871e1d1eafddc1505c7a11045083c37936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d11c0871e1d1eafddc1505c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 3 18:39:15 2020 +0100 kernelbase: Fix NormalizeString() return value and last error. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 23 +++++++++++------------ dlls/kernelbase/locale.c | 14 +++++++++++++- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 3ac3ee5de5..76a993e6c3 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6034,12 +6034,10 @@ static void test_NormalizeString(void) dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, NULL, 0 ); ok( dstlen > lstrlenW(ptest->str), "%s:%d: wrong len %d / %d\n", wine_dbgstr_w(ptest->str), i, dstlen, lstrlenW(ptest->str) ); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "%s:%d: got error %u\n", wine_dbgstr_w(ptest->str), i, GetLastError()); SetLastError(0xdeadbeef); dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, dst, dstlen ); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "%s:%d: got error %u\n", wine_dbgstr_w(ptest->str), i, GetLastError()); ok(dstlen == lstrlenW( dst )+1, "%s:%d: Copied length differed: was %d, should be %d\n", @@ -6086,33 +6084,33 @@ static void test_NormalizeString(void) SetLastError(0xdeadbeef); dstlen = pNormalizeString( NormalizationD, part0_str1, -1, dst, 1 ); - todo_wine ok( dstlen <= 0, "wrong len %d\n", dstlen ); + ok( dstlen <= 0, "wrong len %d\n", dstlen ); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); SetLastError(0xdeadbeef); dstlen = pNormalizeString( NormalizationC, part0_str2, -1, dst, 1 ); - todo_wine ok( dstlen <= 0, "wrong len %d\n", dstlen ); + ok( dstlen <= 0, "wrong len %d\n", dstlen ); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); SetLastError(0xdeadbeef); dstlen = pNormalizeString( NormalizationC, part0_str2, -1, NULL, 0 ); ok( dstlen == 12, "wrong len %d\n", dstlen ); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); SetLastError(0xdeadbeef); dstlen = pNormalizeString( NormalizationC, part0_str2, -1, dst, 3 ); ok( dstlen == 3, "wrong len %d\n", dstlen ); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); SetLastError(0xdeadbeef); dstlen = pNormalizeString( NormalizationC, part0_str2, 0, NULL, 0 ); ok( dstlen == 0, "wrong len %d\n", dstlen ); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); SetLastError(0xdeadbeef); dstlen = pNormalizeString( NormalizationC, part0_str2, 0, dst, 3 ); ok( dstlen == 0, "wrong len %d\n", dstlen ); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); /* size estimations */ @@ -6144,11 +6142,11 @@ static void test_NormalizeString(void) if (i == 0 || i == 2) { ok( dstlen == srclen, "%d: wrong len %d\n", i, dstlen ); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); } else { - todo_wine ok( dstlen < -expect, "%d: wrong len %d\n", i, dstlen ); + ok( dstlen < -expect, "%d: wrong len %d\n", i, dstlen ); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); } if (pRtlNormalizeString) @@ -6185,12 +6183,13 @@ static void test_NormalizeString(void) case NormalizationKD: case 13: /* Idn */ todo_wine_if (i == 13) + { ok( dstlen > 0, "%d: wrong len %d\n", i, dstlen ); - todo_wine ok( GetLastError() == ERROR_SUCCESS, "%d: got error %u\n", i, GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, "%d: got error %u\n", i, GetLastError()); + } break; default: ok( dstlen <= 0, "%d: wrong len %d\n", i, dstlen ); - todo_wine_if (i) ok( GetLastError() == ERROR_INVALID_PARAMETER, "%d: got error %u\n", i, GetLastError()); break; } diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c697da16eb..a2d4735c30 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -4923,7 +4923,19 @@ INT WINAPI DECLSPEC_HOTPATCH MultiByteToWideChar( UINT codepage, DWORD flags, co INT WINAPI DECLSPEC_HOTPATCH NormalizeString(NORM_FORM form, const WCHAR *src, INT src_len, WCHAR *dst, INT dst_len) { - set_ntstatus( RtlNormalizeString( form, src, src_len, dst, &dst_len )); + NTSTATUS status = RtlNormalizeString( form, src, src_len, dst, &dst_len ); + + switch (status) + { + case STATUS_OBJECT_NAME_NOT_FOUND: + status = STATUS_INVALID_PARAMETER; + break; + case STATUS_BUFFER_TOO_SMALL: + case STATUS_NO_UNICODE_TRANSLATION: + dst_len = -dst_len; + break; + } + SetLastError( RtlNtStatusToDosError( status )); return dst_len; }

1 0