April 2014 - Wine-commits - list.winehq.org

Matteo Bruni : d3dx9: Copy the entire vector at once if there is no need of type conversions.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: 96b0b917524ff90c21669be498f3abd0a61f87a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b0b917524ff90c21669be49… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 16 18:14:49 2014 +0200 d3dx9: Copy the entire vector at once if there is no need of type conversions. --- dlls/d3dx9_36/effect.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f136fb7..a2a8e9f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1792,6 +1792,12 @@ static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, *(INT *)param->data = tmp; return D3D_OK; } + if (param->type == D3DXPT_FLOAT) + { + memcpy(param->data, vector, param->columns * sizeof(float)); + return D3D_OK; + } + set_vector(param, vector); return D3D_OK; @@ -1866,6 +1872,17 @@ static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base switch (param->class) { case D3DXPC_VECTOR: + if (param->type == D3DXPT_FLOAT) + { + if (param->columns == 4) + memcpy(param->data, vector, count * 4 * sizeof(float)); + else + for (i = 0; i < count; ++i) + memcpy((float *)param->data + param->columns * i, vector + i, + param->columns * sizeof(float)); + return D3D_OK; + } + for (i = 0; i < count; ++i) { set_vector(&param->members[i], &vector[i]);

1 0

Matteo Bruni : d3dx9: Skip the AddRef/ Release calls if the new texture is the same as the old one.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: b3c5d2ccda28b3163cd04baf36e285ff2b1b0057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c5d2ccda28b3163cd04baf3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 16 18:14:50 2014 +0200 d3dx9: Skip the AddRef/Release calls if the new texture is the same as the old one. --- dlls/d3dx9_36/effect.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a2a8e9f..8e2f850 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2409,6 +2409,9 @@ static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, { struct IDirect3DBaseTexture9 *oltexture = *(struct IDirect3DBaseTexture9 **)param->data; + if (texture == oltexture) + return D3D_OK; + if (texture) IDirect3DBaseTexture9_AddRef(texture); if (oltexture) IDirect3DBaseTexture9_Release(oltexture);

1 0

Henri Verbeet : d3d8/tests: Use a separate device for depth_buffer_test().
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: 8cd5f7fdca2915fa53af12aba0c77d59a99c8ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cd5f7fdca2915fa53af12aba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 17 08:21:22 2014 +0200 d3d8/tests: Use a separate device for depth_buffer_test(). --- dlls/d3d8/tests/visual.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 06faa6c..f390ea7 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2570,8 +2570,19 @@ static void depth_clamp_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); } -static void depth_buffer_test(IDirect3DDevice8 *device) +static void depth_buffer_test(void) { + IDirect3DSurface8 *backbuffer, *rt1, *rt2, *rt3; + IDirect3DSurface8 *depth_stencil; + IDirect3DDevice8 *device; + unsigned int i, j; + D3DVIEWPORT8 vp; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + static const struct vertex quad1[] = { { -1.0, 1.0, 0.33f, 0xff00ff00}, @@ -2601,12 +2612,15 @@ static void depth_buffer_test(IDirect3DDevice8 *device) {0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000}, }; - IDirect3DSurface8 *backbuffer, *rt1, *rt2, *rt3; - IDirect3DSurface8 *depth_stencil; - unsigned int i, j; - D3DVIEWPORT8 vp; - D3DCOLOR color; - HRESULT hr; + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } vp.X = 0; vp.Y = 0; @@ -2702,6 +2716,11 @@ static void depth_buffer_test(IDirect3DDevice8 *device) IDirect3DSurface8_Release(rt3); IDirect3DSurface8_Release(rt2); IDirect3DSurface8_Release(rt1); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } /* Test that partial depth copies work the way they're supposed to. The clear @@ -4841,7 +4860,6 @@ START_TEST(visual) p8_texture_test(device_ptr); texop_test(device_ptr); - depth_buffer_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4849,6 +4867,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + depth_buffer_test(); depth_buffer2_test(); intz_test(); shadow_test();

1 0

Henri Verbeet : d3d8/tests: Use a separate device for texop_test().
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: f719ef385872649fc53c745713ba54e6869ccde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f719ef385872649fc53c74571… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 17 08:21:23 2014 +0200 d3d8/tests: Use a separate device for texop_test(). --- dlls/d3d8/tests/visual.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index f390ea7..a731fa0 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2287,14 +2287,18 @@ out: IDirect3D8_Release(d3d); } -static void texop_test(IDirect3DDevice8 *device) +static void texop_test(void) { - IDirect3DTexture8 *texture = NULL; + IDirect3DTexture8 *texture; D3DLOCKED_RECT locked_rect; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + unsigned int i; D3DCOLOR color; + ULONG refcount; D3DCAPS8 caps; + HWND window; HRESULT hr; - unsigned int i; static const struct { float x, y, z; @@ -2340,6 +2344,16 @@ static void texop_test(IDirect3DDevice8 *device) {D3DTOP_LERP, "LERP", D3DTEXOPCAPS_LERP, D3DCOLOR_ARGB(0x00, 0x00, 0x33, 0x33)}, }; + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "GetDeviceCaps failed with 0x%08x\n", hr); @@ -2408,9 +2422,12 @@ static void texop_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "IDirect3DDevice9_Clear failed with 0x%08x\n", hr); } - hr = IDirect3DDevice8_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "SetTexture failed with 0x%08x\n", hr); - if (texture) IDirect3DTexture8_Release(texture); + IDirect3DTexture8_Release(texture); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } /* This test tests depth clamping / clipping behaviour: @@ -4859,7 +4876,6 @@ START_TEST(visual) } p8_texture_test(device_ptr); - texop_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4867,6 +4883,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + texop_test(); depth_buffer_test(); depth_buffer2_test(); intz_test();

1 0

Dmitry Timoshkov : ole32/tests: Fix crashes in PropVariantClear tests under win2000 and XP.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: ccefbee73b5357e6e95ec5454c5261d8debaf0e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccefbee73b5357e6e95ec5454… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 17 15:56:40 2014 +0900 ole32/tests: Fix crashes in PropVariantClear tests under win2000 and XP. --- dlls/ole32/tests/propvariant.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index d8d027f..bef0881 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -196,7 +196,10 @@ static void test_validtypes(void) VARTYPE vt; memset(&propvar, 0x55, sizeof(propvar)); - U(propvar).pszVal = NULL; + if (i == VT_RECORD || i == VT_BLOB || i == VT_BLOB_OBJECT) + U(propvar).uhVal.QuadPart = 0; + else + U(propvar).pszVal = NULL; vt = propvar.vt = i; hr = PropVariantClear(&propvar); expect(hr, vt); @@ -214,7 +217,8 @@ static void test_validtypes(void) i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); memset(&propvar, 0x55, sizeof(propvar)); - U(propvar).pszVal = NULL; + U(propvar).caub.cElems = 0; + U(propvar).caub.pElems = NULL; vt = propvar.vt = i | VT_VECTOR; hr = PropVariantClear(&propvar); expect(hr, vt);

1 0

Marcus Meissner : winhttp: Avoid leaking authinfo on error (Coverity).
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: 0fe44e1be6f20e4f64a70c68b4f3252e031aa62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe44e1be6f20e4f64a70c68b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Apr 17 08:43:14 2014 +0200 winhttp: Avoid leaking authinfo on error (Coverity). --- dlls/winhttp/request.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ed3430a..374051a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1628,7 +1628,11 @@ static BOOL do_authorization( request_t *request, DWORD target, DWORD scheme_fla { int len = strlenW( ++p ); in.cbBuffer = decode_base64( p, len, NULL ); - if (!(in.pvBuffer = heap_alloc( in.cbBuffer ))) return FALSE; + if (!(in.pvBuffer = heap_alloc( in.cbBuffer ))) { + destroy_authinfo( authinfo ); + *auth_ptr = NULL; + return FALSE; + } decode_base64( p, len, in.pvBuffer ); } out.BufferType = SECBUFFER_TOKEN; @@ -1636,6 +1640,8 @@ static BOOL do_authorization( request_t *request, DWORD target, DWORD scheme_fla if (!(out.pvBuffer = heap_alloc( authinfo->max_token ))) { heap_free( in.pvBuffer ); + destroy_authinfo( authinfo ); + *auth_ptr = NULL; return FALSE; } out_desc.ulVersion = 0;

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: ab0619e96fa5b952f01d6705e8fce264d595383c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab0619e96fa5b952f01d6705e… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Apr 17 03:07:02 2014 +0200 po: Update German translation. --- po/de.po | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/po/de.po b/po/de.po index ec866b0..8842c93 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-03-29 15:03+0100\n" +"PO-Revision-Date: 2014-04-17 03:01+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -11744,37 +11744,18 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Exportiert den ausgewählten Zweig der Registry in eine Textdatei" #: regsvr32.rc:32 -#, fuzzy -#| msgid "" -#| "Wine DLL Registration Server\n" -#| "\n" -#| "Provides DLL registration services.\n" -#| "\n" msgid "" "Wine DLL Registration Utility\n" "\n" "Provides DLL registration services.\n" "\n" msgstr "" -"Wine DLL-Registrierungsserver\n" +"Wine DLL-Registrierungswerkzeug\n" "\n" "Stellt Dienste zur DLL-Registrierung bereit.\n" "\n" #: regsvr32.rc:40 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regsvr32 [/u] [/s] [/n] [/i[:cmdline]] DllName\n" -#| "\n" -#| "Options:\n" -#| " [/u] Unregister a module from the server.\n" -#| " [/s] Silent mode (no messages will be displayed).\n" -#| " [/i] Call DllInstall, passing an optional [cmdline].\n" -#| "\tWhen used with [/u], regsvr32 also calls DLL Uninstall.\n" -#| " [/n] Do not call DllRegisterServer. This option must be used with [/" -#| "i].\n" -#| "\n" msgid "" "Usage:\n" " regsvr32 [/u] [/s] [/n] [/i[:cmdline]] DllName\n" @@ -11791,10 +11772,10 @@ msgstr "" " regsvr32 [/u] [/s] [/n] [/i[:Befehlszeile]] DllName\n" "\n" "Optionen:\n" -" [/u] Registrierung eines Moduls vom Server aufheben.\n" +" [/u] Registrierung eines Servers aufheben.\n" " [/s] Stiller Modus (es werden keine Meldungen angezeigt).\n" " [/i] DllInstall mit einer optionalen [Befehlszeile] aufrufen.\n" -"\tBei Angabe von [/u], ruft regsvr32 auch DLL Uninstall auf.\n" +"\tBei Angabe von [/u] wird DLLInstall im Uninstall-Modus aufgerufen.\n" " [/n] DllRegisterServer nicht aufrufen. Muss in Verbindung mit [/i]\n" "\tbenutzt werden.\n" "\n"

1 0

Erich E. Hoover : kernel32/tests: Add a variety of tests for CompareStringEx.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: 4b949510fbed87b9af997a280010392b45bc9d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b949510fbed87b9af997a280… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Apr 16 13:54:58 2014 -0600 kernel32/tests: Add a variety of tests for CompareStringEx. --- dlls/kernel32/tests/locale.c | 200 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9abe53e..fc071a7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -88,6 +88,8 @@ static INT (WINAPI *pIdnToUnicode)(DWORD, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pGetLocaleInfoEx)(LPCWSTR, LCTYPE, LPWSTR, INT); static BOOL (WINAPI *pIsValidLocaleName)(LPCWSTR); static INT (WINAPI *pCompareStringOrdinal)(const WCHAR *, INT, const WCHAR *, INT, BOOL); +static INT (WINAPI *pCompareStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT, + LPNLSVERSIONINFO, LPVOID, LPARAM); static void InitFunctionPointers(void) { @@ -108,6 +110,7 @@ static void InitFunctionPointers(void) pGetLocaleInfoEx = (void*)GetProcAddress(hKernel32, "GetLocaleInfoEx"); pIsValidLocaleName = (void*)GetProcAddress(hKernel32, "IsValidLocaleName"); pCompareStringOrdinal = (void*)GetProcAddress(hKernel32, "CompareStringOrdinal"); + pCompareStringEx = (void*)GetProcAddress(hKernel32, "CompareStringEx"); } #define eq(received, expected, label, type) \ @@ -1472,6 +1475,202 @@ static void test_CompareStringA(void) "ret %d, error %d, expected value %d\n", ret, GetLastError(), CSTR_EQUAL); } +struct comparestringex_test { + const char *locale; + DWORD flags; + const WCHAR first[2]; + const WCHAR second[2]; + INT ret; + INT broken; + BOOL todo; +}; + +static const struct comparestringex_test comparestringex_tests[] = { + /* default behavior */ + { /* 0 */ + "tr-TR", 0, + {'i',0}, {'I',0}, CSTR_LESS_THAN, -1, FALSE + }, + { /* 1 */ + "tr-TR", 0, + {'i',0}, {0x130,0}, CSTR_LESS_THAN, -1, FALSE + }, + { /* 2 */ + "tr-TR", 0, + {'i',0}, {0x131,0}, CSTR_LESS_THAN, -1, FALSE + }, + { /* 3 */ + "tr-TR", 0, + {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + }, + { /* 4 */ + "tr-TR", 0, + {'I',0}, {0x131,0}, CSTR_LESS_THAN, -1, FALSE + }, + { /* 5 */ + "tr-TR", 0, + {0x130,0}, {0x131,0}, CSTR_GREATER_THAN, -1, TRUE + }, + /* with NORM_IGNORECASE */ + { /* 6 */ + "tr-TR", NORM_IGNORECASE, + {'i',0}, {'I',0}, CSTR_EQUAL, -1, FALSE + }, + { /* 7 */ + "tr-TR", NORM_IGNORECASE, + {'i',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + }, + { /* 8 */ + "tr-TR", NORM_IGNORECASE, + {'i',0}, {0x131,0}, CSTR_LESS_THAN, -1, FALSE + }, + { /* 9 */ + "tr-TR", NORM_IGNORECASE, + {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + }, + { /* 10 */ + "tr-TR", NORM_IGNORECASE, + {'I',0}, {0x131,0}, CSTR_LESS_THAN, -1, FALSE + }, + { /* 11 */ + "tr-TR", NORM_IGNORECASE, + {0x130,0}, {0x131,0}, CSTR_GREATER_THAN, -1, TRUE + }, + /* with NORM_LINGUISTIC_CASING */ + { /* 12 */ + "tr-TR", NORM_LINGUISTIC_CASING, + {'i',0}, {'I',0}, CSTR_GREATER_THAN, CSTR_LESS_THAN, TRUE + }, + { /* 13 */ + "tr-TR", NORM_LINGUISTIC_CASING, + {'i',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + }, + { /* 14 */ + "tr-TR", NORM_LINGUISTIC_CASING, + {'i',0}, {0x131,0}, CSTR_GREATER_THAN, CSTR_LESS_THAN, TRUE + }, + { /* 15 */ + "tr-TR", NORM_LINGUISTIC_CASING, + {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + }, + { /* 16 */ + "tr-TR", NORM_LINGUISTIC_CASING, + {'I',0}, {0x131,0}, CSTR_GREATER_THAN, CSTR_LESS_THAN, TRUE + }, + { /* 17 */ + "tr-TR", NORM_LINGUISTIC_CASING, + {0x130,0}, {0x131,0}, CSTR_GREATER_THAN, -1, TRUE + }, + /* with LINGUISTIC_IGNORECASE */ + { /* 18 */ + "tr-TR", LINGUISTIC_IGNORECASE, + {'i',0}, {'I',0}, CSTR_EQUAL, -1, TRUE + }, + { /* 19 */ + "tr-TR", LINGUISTIC_IGNORECASE, + {'i',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + }, + { /* 20 */ + "tr-TR", LINGUISTIC_IGNORECASE, + {'i',0}, {0x131,0}, CSTR_LESS_THAN, -1, TRUE + }, + { /* 21 */ + "tr-TR", LINGUISTIC_IGNORECASE, + {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + }, + { /* 22 */ + "tr-TR", LINGUISTIC_IGNORECASE, + {'I',0}, {0x131,0}, CSTR_LESS_THAN, -1, TRUE + }, + { /* 23 */ + "tr-TR", LINGUISTIC_IGNORECASE, + {0x130,0}, {0x131,0}, CSTR_GREATER_THAN, -1, TRUE + }, + /* with NORM_LINGUISTIC_CASING | NORM_IGNORECASE */ + { /* 24 */ + "tr-TR", NORM_LINGUISTIC_CASING | NORM_IGNORECASE, + {'i',0}, {'I',0}, CSTR_GREATER_THAN, CSTR_EQUAL, TRUE + }, + { /* 25 */ + "tr-TR", NORM_LINGUISTIC_CASING | NORM_IGNORECASE, + {'i',0}, {0x130,0}, CSTR_EQUAL, CSTR_LESS_THAN, TRUE + }, + { /* 26 */ + "tr-TR", NORM_LINGUISTIC_CASING | NORM_IGNORECASE, + {'i',0}, {0x131,0}, CSTR_GREATER_THAN, CSTR_LESS_THAN, TRUE + }, + { /* 27 */ + "tr-TR", NORM_LINGUISTIC_CASING | NORM_IGNORECASE, + {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + }, + { /* 28 */ + "tr-TR", NORM_LINGUISTIC_CASING | NORM_IGNORECASE, + {'I',0}, {0x131,0}, CSTR_EQUAL, CSTR_LESS_THAN, TRUE + }, + { /* 29 */ + "tr-TR", NORM_LINGUISTIC_CASING | NORM_IGNORECASE, + {0x130,0}, {0x131,0}, CSTR_GREATER_THAN, -1, TRUE + }, + /* with NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE */ + { /* 30 */ + "tr-TR", NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE, + {'i',0}, {'I',0}, CSTR_GREATER_THAN, CSTR_EQUAL, TRUE + }, + { /* 31 */ + "tr-TR", NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE, + {'i',0}, {0x130,0}, CSTR_EQUAL, CSTR_LESS_THAN, TRUE + }, + { /* 32 */ + "tr-TR", NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE, + {'i',0}, {0x131,0}, CSTR_GREATER_THAN, CSTR_LESS_THAN, TRUE + }, + { /* 33 */ + "tr-TR", NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE, + {'I',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + }, + { /* 34 */ + "tr-TR", NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE, + {'I',0}, {0x131,0}, CSTR_EQUAL, CSTR_LESS_THAN, TRUE + }, + { /* 35 */ + "tr-TR", NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE, + {0x130,0}, {0x131,0}, CSTR_GREATER_THAN, CSTR_LESS_THAN, TRUE + } +}; + +static void test_CompareStringEx(void) +{ + const char *op[] = {"ERROR", "CSTR_LESS_THAN", "CSTR_EQUAL", "CSTR_GREATER_THAN"}; + WCHAR locale[6]; + INT ret, i; + + /* CompareStringEx is only available on Vista+ */ + if (!pCompareStringEx) + { + win_skip("CompareStringEx not supported\n"); + return; + } + + for (i = 0; i < sizeof(comparestringex_tests)/sizeof(comparestringex_tests[0]); i++) + { + const struct comparestringex_test *e = &comparestringex_tests[i]; + + MultiByteToWideChar(CP_ACP, 0, e->locale, -1, locale, sizeof(locale)/sizeof(WCHAR)); + ret = pCompareStringEx(locale, e->flags, e->first, -1, e->second, -1, NULL, NULL, 0); + if (e->todo) + { + todo_wine ok(ret == e->ret || broken(ret == e->broken), + "%d: got %s, expected %s\n", i, op[ret], op[e->ret]); + } + else + { + ok(ret == e->ret || broken(ret == e->broken), + "%d: got %s, expected %s\n", i, op[ret], op[e->ret]); + } + } + +} + static void test_LCMapStringA(void) { int ret, ret2; @@ -3642,6 +3841,7 @@ START_TEST(locale) test_GetCurrencyFormatA(); /* Also tests the W version */ test_GetNumberFormatA(); /* Also tests the W version */ test_CompareStringA(); + test_CompareStringEx(); test_LCMapStringA(); test_LCMapStringW(); test_LCMapStringEx();

1 0

Erich E. Hoover : kernel32: Allow CompareStringEx NORM_LINGUISTIC_CASING flag.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: b0935ab8111323a01fdc837a274deeda93263f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0935ab8111323a01fdc837a2… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Apr 16 13:55:13 2014 -0600 kernel32: Allow CompareStringEx NORM_LINGUISTIC_CASING flag. --- dlls/kernel32/locale.c | 12 +++++++----- dlls/kernel32/tests/locale.c | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index c1d89b7..9597895 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2985,6 +2985,10 @@ INT WINAPI CompareStringW(LCID lcid, DWORD flags, INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1, LPCWSTR str2, INT len2, LPNLSVERSIONINFO version, LPVOID reserved, LPARAM lParam) { + DWORD supported_flags = NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS|SORT_STRINGSORT + |NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP; + DWORD semistub_flags = NORM_LINGUISTIC_CASING|0x10000000; + /* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */ INT ret; if (version) FIXME("unexpected version parameter\n"); @@ -2997,16 +3001,14 @@ INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1, return 0; } - if( flags & ~(NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS| - SORT_STRINGSORT|NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP|0x10000000) ) + if (flags & ~(supported_flags|semistub_flags)) { SetLastError(ERROR_INVALID_FLAGS); return 0; } - /* this style is related to diacritics in Arabic, Japanese, and Hebrew */ - if (flags & 0x10000000) - WARN("Ignoring unknown flags 0x10000000\n"); + if (flags & semistub_flags) + FIXME("semi-stub behavor for flag(s) 0x%x\n", flags & semistub_flags); if (len1 < 0) len1 = strlenW(str1); if (len2 < 0) len2 = strlenW(str2); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index fc071a7..d3c77d0 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1543,7 +1543,7 @@ static const struct comparestringex_test comparestringex_tests[] = { }, { /* 13 */ "tr-TR", NORM_LINGUISTIC_CASING, - {'i',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + {'i',0}, {0x130,0}, CSTR_LESS_THAN, -1, FALSE }, { /* 14 */ "tr-TR", NORM_LINGUISTIC_CASING, @@ -1593,7 +1593,7 @@ static const struct comparestringex_test comparestringex_tests[] = { }, { /* 25 */ "tr-TR", NORM_LINGUISTIC_CASING | NORM_IGNORECASE, - {'i',0}, {0x130,0}, CSTR_EQUAL, CSTR_LESS_THAN, TRUE + {'i',0}, {0x130,0}, CSTR_EQUAL, CSTR_LESS_THAN, FALSE }, { /* 26 */ "tr-TR", NORM_LINGUISTIC_CASING | NORM_IGNORECASE,

1 0

Erich E. Hoover : kernel32: Allow CompareStringEx LINGUISTIC_IGNORECASE flag.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: 32da6626f562146c0fd1d8550c60995359b2a0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=32da6626f562146c0fd1d8550… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Apr 16 13:55:24 2014 -0600 kernel32: Allow CompareStringEx LINGUISTIC_IGNORECASE flag. --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/tests/locale.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 9597895..eca0e39 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2987,7 +2987,7 @@ INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1, { DWORD supported_flags = NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS|SORT_STRINGSORT |NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP; - DWORD semistub_flags = NORM_LINGUISTIC_CASING|0x10000000; + DWORD semistub_flags = NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000; /* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */ INT ret; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d3c77d0..597de37 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1568,11 +1568,11 @@ static const struct comparestringex_test comparestringex_tests[] = { }, { /* 19 */ "tr-TR", LINGUISTIC_IGNORECASE, - {'i',0}, {0x130,0}, CSTR_LESS_THAN, -1, TRUE + {'i',0}, {0x130,0}, CSTR_LESS_THAN, -1, FALSE }, { /* 20 */ "tr-TR", LINGUISTIC_IGNORECASE, - {'i',0}, {0x131,0}, CSTR_LESS_THAN, -1, TRUE + {'i',0}, {0x131,0}, CSTR_LESS_THAN, -1, FALSE }, { /* 21 */ "tr-TR", LINGUISTIC_IGNORECASE, @@ -1580,7 +1580,7 @@ static const struct comparestringex_test comparestringex_tests[] = { }, { /* 22 */ "tr-TR", LINGUISTIC_IGNORECASE, - {'I',0}, {0x131,0}, CSTR_LESS_THAN, -1, TRUE + {'I',0}, {0x131,0}, CSTR_LESS_THAN, -1, FALSE }, { /* 23 */ "tr-TR", LINGUISTIC_IGNORECASE,

1 0