June 2012 - Wine-commits - list.winehq.org

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetDisplayMode().
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: e109754b1eef0d9f2218ddf6dafe08e94aae2aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e109754b1eef0d9f2218ddf6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 20 17:45:16 2012 +0200 ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetDisplayMode(). --- dlls/ddraw/ddraw.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f38734b..6424492 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1421,10 +1421,7 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 return DDERR_INVALIDPARAMS; } - /* The necessary members of LPDDSURFACEDESC and LPDDSURFACEDESC2 are equal, - * so one method can be used for all versions (Hopefully) */ - hr = wined3d_device_get_display_mode(ddraw->wined3d_device, 0, &mode); - if (FAILED(hr)) + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) { ERR("Failed to get display mode, hr %#x.\n", hr); wined3d_mutex_unlock();

1 0

Aric Stewart : usp10: Add ShapeCharGlyphProp_Hebrew.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 91f161c8b1681fa4985a59671abddcfc0a6ddd9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f161c8b1681fa4985a59671… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 19 13:57:26 2012 -0500 usp10: Add ShapeCharGlyphProp_Hebrew. --- dlls/usp10/shape.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index c654b07..a99614e 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -65,6 +65,7 @@ typedef VOID (*ShapeCharGlyphPropProc)( HDC , ScriptCache*, SCRIPT_ANALYSIS*, co static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD* pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP* pGlyphProp); static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); +static void ShapeCharGlyphProp_Hebrew( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); @@ -398,7 +399,7 @@ static const ScriptShapeData ShapingData[] = {{ latin_features, 2}, NULL, 0, NULL, NULL}, {{ arabic_features, 6}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ arabic_features, 6}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, - {{ hebrew_features, 1}, NULL, 0, ContextualShape_Hebrew, NULL}, + {{ hebrew_features, 1}, NULL, 0, ContextualShape_Hebrew, ShapeCharGlyphProp_Hebrew}, {{ syriac_features, 4}, required_syriac_features, 0, ContextualShape_Syriac, ShapeCharGlyphProp_None}, {{ arabic_features, 6}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ NULL, 0}, NULL, 0, ContextualShape_Thaana, ShapeCharGlyphProp_None}, @@ -2836,6 +2837,36 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI HeapFree(GetProcessHeap(),0,spaces); } +static void ShapeCharGlyphProp_Hebrew( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) +{ + int i,k; + + for (i = 0; i < cGlyphs; i++) + { + int char_index[20]; + int char_count = 0; + + k = USP10_FindGlyphInLogClust(pwLogClust, cChars, i); + if (k>=0) + { + for (; k < cChars && pwLogClust[k] == i; k++) + char_index[char_count++] = k; + } + + if (char_count == 0) + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; + else + { + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; + if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */ + pCharProp[char_index[0]].fCanGlyphAlone = 1; + } + } + + OpenType_GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); + UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); +} + static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { int i;

1 0

Francois Gouget : kernel32/tests: Add line-wrapping tests for FormatMessage ().
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 58d7011133f4774c22372587b970e87dc74c4db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d7011133f4774c22372587b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 20 00:51:39 2012 +0200 kernel32/tests: Add line-wrapping tests for FormatMessage(). --- dlls/kernel32/tests/format_msg.c | 127 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 127 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 1f56440..50e13f4 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -997,6 +997,132 @@ static void test_message_ignore_inserts_wide(void) ok(!lstrcmpW(s_2sp, out), "Expected output string \" \", got %s\n", wine_dbgstr_w(out)); } +static void test_message_wrap(void) +{ + DWORD ret; + int i; + CHAR in[300], out[300], ref[300]; + + /* No need for wrapping */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 20, + "short long line", 0, 0, out, sizeof(out), NULL); + ok(ret == 15, "Expected FormatMessageW to return 15, got %d\n", ret); + ok(!strcmp("short long line", out),"failed out=[%s]\n",out); + + /* Wrap the last word */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, + "short long line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); + todo_wine ok(!strcmp("short long\r\nline", out),"failed out=[%s]\n",out); + + /* Strictly less than 10 characters per line! */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 10, + "short long line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); + todo_wine ok(!strcmp("short\r\nlong line", out),"failed out=[%s]\n",out); + + /* Word longer than the line */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 8, + "shortlongline", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 15, "Expected FormatMessageW to return 15, got %d\n", ret); + todo_wine ok(!strcmp("shortlon\r\ngline", out),"failed out=[%s]\n",out); + + /* Wrap the line multiple times */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 7, + "short long line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 17, "Expected FormatMessageW to return 17, got %d\n", ret); + todo_wine ok(!strcmp("short\r\nlong\r\nline", out),"failed out=[%s]\n",out); + + /* '\n's in the source are ignored */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, + "short\nlong line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); + todo_wine ok(!strcmp("short long\r\nline", out),"failed out=[%s]\n",out); + + /* '%n's are converted into line feeds */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, + "short%n%nlong line", 0, 0, out, sizeof(out), NULL); + ok(ret == 18, "Expected FormatMessageW to return 18, got %d\n", ret); + ok(!strcmp("short\r\n\r\nlong line", out),"failed out=[%s]\n",out); + + /* '%n's count as starting a new line and combine with line wrapping */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 10, + "short%nlong line", 0, 0, out, sizeof(out), NULL); + ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); + ok(!strcmp("short\r\nlong line", out),"failed out=[%s]\n",out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 8, + "short%nlong line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 17, "Expected FormatMessageW to return 17, got %d\n", ret); + todo_wine ok(!strcmp("short\r\nlong\r\nline", out),"failed out=[%s]\n",out); + + /* '%r's also count as starting a new line and all */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 10, + "short%rlong line", 0, 0, out, sizeof(out), NULL); + ok(ret == 15, "Expected FormatMessageW to return 15, got %d\n", ret); + ok(!strcmp("short\rlong line", out),"failed out=[%s]\n",out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 8, + "short%rlong line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); + todo_wine ok(!strcmp("short\rlong\r\nline", out),"failed out=[%s]\n",out); + + /* IGNORE_INSERTS does not prevent line wrapping or disable '%n' */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS | 8, + "short%nlong line%1", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 19, "Expected FormatMessageW to return 19, got %d\n", ret); + todo_wine ok(!strcmp("short\r\nlong\r\nline%1", out),"failed out=[%s]\n",out); + + /* MAX_WIDTH_MASK is the same as specifying an infinite line width */ + strcpy(in, "first line%n"); + strcpy(ref, "first line\r\n"); + for (i=0; i < 26; i++) + { + strcat(in, "123456789 "); + strcat(ref, "123456789 "); + } + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, + in, 0, 0, out, sizeof(out), NULL); + ok(ret == 272, "Expected FormatMessageW to return 272, got %d\n", ret); + ok(!strcmp(ref, out),"failed out=[%s]\n",out); + + /* Wrapping and non-space characters */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, + "short long\tline", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); + todo_wine ok(!strcmp("short\r\nlong\tline", out),"failed out=[%s]\n",out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, + "short long-line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); + todo_wine ok(!strcmp("short\r\nlong-line", out),"failed out=[%s]\n",out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, + "short long_line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); + todo_wine ok(!strcmp("short\r\nlong_line", out),"failed out=[%s]\n",out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, + "short long.line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); + todo_wine ok(!strcmp("short\r\nlong.line", out),"failed out=[%s]\n",out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, + "short long,line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); + todo_wine ok(!strcmp("short\r\nlong,line", out),"failed out=[%s]\n",out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, + "short long!line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); + todo_wine ok(!strcmp("short\r\nlong!line", out),"failed out=[%s]\n",out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, + "short long?line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); + todo_wine ok(!strcmp("short\r\nlong?line", out),"failed out=[%s]\n",out); +} + static void test_message_insufficient_buffer(void) { static const char init_buf[] = {'x', 'x', 'x', 'x', 'x'}; @@ -1593,6 +1719,7 @@ START_TEST(format_msg) test_message_from_string(); test_message_ignore_inserts(); + test_message_wrap(); test_message_insufficient_buffer(); test_message_null_buffer(); test_message_allocate_buffer();

1 0

Francois Gouget : comctl32: Fix lstrncmpiW() so its return value is standard and use the CSTR_XXX macros.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: bede13b335566a5aaf5c8ebf2f48a691068b25f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bede13b335566a5aaf5c8ebf2… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 20 00:53:56 2012 +0200 comctl32: Fix lstrncmpiW() so its return value is standard and use the CSTR_XXX macros. --- dlls/comctl32/listview.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 27b2fd0..e1b9a71 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -559,11 +559,8 @@ static inline int textcmpWT(LPCWSTR aw, LPCWSTR bt, BOOL isW) static inline int lstrncmpiW(LPCWSTR s1, LPCWSTR s2, int n) { - int res; - n = min(min(n, lstrlenW(s1)), lstrlenW(s2)); - res = CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, s1, n, s2, n); - return res ? res - sizeof(WCHAR) : res; + return CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, s1, n, s2, n) - CSTR_EQUAL; } /******** Debugging functions *****************************************/

1 0

Francois Gouget : msvcp90: Use the CSTR_XXX macros instead of numeric literals.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 5adf447d7b679ac6bead2ed1751c1c3ac7bdfa69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5adf447d7b679ac6bead2ed17… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 20 00:54:01 2012 +0200 msvcp90: Use the CSTR_XXX macros instead of numeric literals. --- dlls/msvcp90/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5ca0148..e415807 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -784,7 +784,7 @@ int __cdecl _Strcoll(const char *first1, const char *last1, const char *first2, lcid = coll->handle; else lcid = ___lc_handle_func()[LC_COLLATE]; - return CompareStringA(lcid, 0, first1, last1-first1, first2, last2-first2)-2; + return CompareStringA(lcid, 0, first1, last1-first1, first2, last2-first2)-CSTR_EQUAL; } /* ?do_compare@?$collate(a)D@std@@MBEHPBD000(a)Z */ @@ -1045,7 +1045,7 @@ int __cdecl _Wcscoll(const wchar_t *first1, const wchar_t *last1, const wchar_t lcid = coll->handle; else lcid = ___lc_handle_func()[LC_COLLATE]; - return CompareStringW(lcid, 0, first1, last1-first1, first2, last2-first2)-2; + return CompareStringW(lcid, 0, first1, last1-first1, first2, last2-first2)-CSTR_EQUAL; } /* ?do_compare@?$collate(a)_W@std@@MBEHPB_W000(a)Z */

1 0

Francois Gouget : kernel32/tests: Use the CSTR_XXX macros instead of numeric literals.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 4af794a5b4091cb93d8176fd82a6010b718d0859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4af794a5b4091cb93d8176fd8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 20 00:54:18 2012 +0200 kernel32/tests: Use the CSTR_XXX macros instead of numeric literals. --- dlls/kernel32/tests/locale.c | 46 +++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d8a842b..0114dc5 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1210,27 +1210,27 @@ static void test_CompareStringA(void) } ret = CompareStringA(lcid, NORM_IGNORECASE, "Salut", -1, "Salute", -1); - ok (ret== 1, "(Salut/Salute) Expected 1, got %d\n", ret); + ok (ret == CSTR_LESS_THAN, "(Salut/Salute) Expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(lcid, NORM_IGNORECASE, "Salut", -1, "SaLuT", -1); - ok (ret== 2, "(Salut/SaLuT) Expected 2, got %d\n", ret); + ok (ret == CSTR_EQUAL, "(Salut/SaLuT) Expected CSTR_EQUAL, got %d\n", ret); ret = CompareStringA(lcid, NORM_IGNORECASE, "Salut", -1, "hola", -1); - ok (ret== 3, "(Salut/hola) Expected 3, got %d\n", ret); + ok (ret == CSTR_GREATER_THAN, "(Salut/hola) Expected CSTR_GREATER_THAN, got %d\n", ret); ret = CompareStringA(lcid, NORM_IGNORECASE, "haha", -1, "hoho", -1); - ok (ret== 1, "(haha/hoho) Expected 1, got %d\n", ret); + ok (ret == CSTR_LESS_THAN, "(haha/hoho) Expected CSTR_LESS_THAN, got %d\n", ret); lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); ret = CompareStringA(lcid, NORM_IGNORECASE, "haha", -1, "hoho", -1); - ok (ret== 1, "(haha/hoho) Expected 1, got %d\n", ret); + ok (ret == CSTR_LESS_THAN, "(haha/hoho) Expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(lcid, NORM_IGNORECASE, "haha", -1, "hoho", 0); - ok (ret== 3, "(haha/hoho) Expected 3, got %d\n", ret); + ok (ret == CSTR_GREATER_THAN, "(haha/hoho) Expected CSTR_GREATER_THAN, got %d\n", ret); ret = CompareStringA(lcid, NORM_IGNORECASE, "Salut", 5, "saLuT", -1); - ok (ret == 2, "(Salut/saLuT) Expected 2, got %d\n", ret); + ok (ret == CSTR_EQUAL, "(Salut/saLuT) Expected CSTR_EQUAL, got %d\n", ret); /* test for CompareStringA flags */ SetLastError(0xdeadbeef); @@ -1260,52 +1260,52 @@ static void test_CompareStringA(void) if (0) { /* this requires collation table patch to make it MS compatible */ ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "'o", -1, "-o", -1 ); - ok(ret == 1, "'o vs -o expected 1, got %d\n", ret); + ok(ret == CSTR_LESS_THAN, "'o vs -o expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "'o", -1, "-o", -1 ); - ok(ret == 1, "'o vs -o expected 1, got %d\n", ret); + ok(ret == CSTR_LESS_THAN, "'o vs -o expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "'", -1, "-", -1 ); - ok(ret == 1, "' vs - expected 1, got %d\n", ret); + ok(ret == CSTR_LESS_THAN, "' vs - expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "'", -1, "-", -1 ); - ok(ret == 1, "' vs - expected 1, got %d\n", ret); + ok(ret == CSTR_LESS_THAN, "' vs - expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "`o", -1, "/m", -1 ); - ok(ret == 3, "`o vs /m expected 3, got %d\n", ret); + ok(ret == CSTR_GREATER_THAN, "`o vs /m CSTR_GREATER_THAN got %d\n", ret); ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "/m", -1, "`o", -1 ); - ok(ret == 1, "/m vs `o expected 1, got %d\n", ret); + ok(ret == CSTR_LESS_THAN, "/m vs `o expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "`o", -1, "/m", -1 ); - ok(ret == 3, "`o vs /m expected 3, got %d\n", ret); + ok(ret == CSTR_GREATER_THAN, "`o vs /m CSTR_GREATER_THAN got %d\n", ret); ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "/m", -1, "`o", -1 ); - ok(ret == 1, "/m vs `o expected 1, got %d\n", ret); + ok(ret == CSTR_LESS_THAN, "/m vs `o expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "`o", -1, "-m", -1 ); - ok(ret == 1, "`o vs -m expected 1, got %d\n", ret); + ok(ret == CSTR_LESS_THAN, "`o vs -m expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "-m", -1, "`o", -1 ); - ok(ret == 3, "-m vs `o expected 3, got %d\n", ret); + ok(ret == CSTR_GREATER_THAN, "-m vs `o CSTR_GREATER_THAN got %d\n", ret); ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "`o", -1, "-m", -1 ); - ok(ret == 3, "`o vs -m expected 3, got %d\n", ret); + ok(ret == CSTR_GREATER_THAN, "`o vs -m CSTR_GREATER_THAN got %d\n", ret); ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "-m", -1, "`o", -1 ); - ok(ret == 1, "-m vs `o expected 1, got %d\n", ret); + ok(ret == CSTR_LESS_THAN, "-m vs `o expected CSTR_LESS_THAN, got %d\n", ret); } /* WinXP handles embedded NULLs differently than earlier versions */ ret = CompareStringA(LOCALE_USER_DEFAULT, 0, "aLuZkUtZ", 8, "aLuZkUtZ\0A", 10); - ok(ret == 1 || ret == 2, "aLuZkUtZ vs aLuZkUtZ\\0A expected 1 or 2, got %d\n", ret); + ok(ret == CSTR_LESS_THAN || ret == CSTR_EQUAL, "aLuZkUtZ vs aLuZkUtZ\\0A expected CSTR_LESS_THAN or CSTR_EQUAL, got %d\n", ret); ret = CompareStringA(LOCALE_USER_DEFAULT, 0, "aLu\0ZkUtZ", 8, "aLu\0ZkUtZ\0A", 10); - ok(ret == 1 || ret == 2, "aLu\\0ZkUtZ vs aLu\\0ZkUtZ\\0A expected 1 or 2, got %d\n", ret); + ok(ret == CSTR_LESS_THAN || ret == CSTR_EQUAL, "aLu\\0ZkUtZ vs aLu\\0ZkUtZ\\0A expected CSTR_LESS_THAN or CSTR_EQUAL, got %d\n", ret); ret = CompareStringA(lcid, 0, "a\0b", -1, "a", -1); - ok(ret == 2, "a vs a expected 2, got %d\n", ret); + ok(ret == CSTR_EQUAL, "a vs a expected CSTR_EQUAL, got %d\n", ret); ret = CompareStringA(lcid, 0, "a\0b", 4, "a", 2); ok(ret == CSTR_EQUAL || /* win2k */ @@ -1313,7 +1313,7 @@ static void test_CompareStringA(void) "a\\0b vs a expected CSTR_EQUAL or CSTR_GREATER_THAN, got %d\n", ret); ret = CompareStringA(lcid, 0, "\2", 2, "\1", 2); - todo_wine ok(ret != 2, "\\2 vs \\1 expected unequal\n"); + todo_wine ok(ret != CSTR_EQUAL, "\\2 vs \\1 expected unequal\n"); ret = CompareStringA(lcid, NORM_IGNORECASE | LOCALE_USE_CP_ACP, "#", -1, ".", -1); todo_wine ok(ret == CSTR_LESS_THAN, "\"#\" vs \".\" expected CSTR_LESS_THAN, got %d\n", ret);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 24980e0fa04fab1e9c32f5906d11ffe296ee3ae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24980e0fa04fab1e9c32f5906… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jun 20 09:00:45 2012 +0300 po: Update Lithuanian translation. --- po/lt.po | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1ef573b..c813285 100644 --- a/po/lt.po +++ b/po/lt.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: 2012-06-08 21:40+0300\n" +"PO-Revision-Date: 2012-06-20 09:00+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -13653,22 +13653,16 @@ msgid "Help topics: " msgstr "Žinyno temos: " #: wmic.rc:25 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "Error: Command line not supported\n" -msgstr "Klaida: Netinkami komandos eilutės parametrai\n" +msgstr "Klaida: Komandos eilutė nepalaikoma\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" -msgstr "Savybių aibė nerasta.\n" +msgstr "Klaida: Alternatyvusis vardas nerastas.\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid query\n" -msgstr "Klaida: Netinkamas rakto vardas\n" +msgstr "Klaida: Netinkama užklausa\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N"

1 0

Damjan Jovanovic : shell32: Fix some return types.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: 74fe2989cb87276f9dc488a5ace51a3b398015ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=74fe2989cb87276f9dc488a5a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Jun 20 09:11:27 2012 +0200 shell32: Fix some return types. --- dlls/shell32/brsfolder.c | 2 +- dlls/shell32/control.c | 2 +- dlls/shell32/shlfileop.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 38195fe..589ba72 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -570,7 +570,7 @@ static HRESULT BrsFolder_Treeview_Changed( browse_info *info, NMTREEVIEWW *pnmtv browsefolder_callback( info->lpBrowseInfo, info->hWnd, BFFM_SELCHANGED, (LPARAM)info->pidlRet ); BrsFolder_CheckValidSelection( info, lptvid ); - return 0; + return S_OK; } static LRESULT BrsFolder_Treeview_Rename(browse_info *info, NMTVDISPINFOW *pnmtv) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index d8e4df1..505aff5 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -849,7 +849,7 @@ void WINAPI Control_RunDLLA(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdSh HRESULT WINAPI Control_FillCache_RunDLLW(HWND hWnd, HANDLE hModule, DWORD w, DWORD x) { FIXME("%p %p 0x%08x 0x%08x stub\n", hWnd, hModule, w, x); - return 0; + return S_OK; } /************************************************************************* diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 7ae20c1..5fa79a9 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1177,7 +1177,7 @@ static void create_dest_dirs(LPCWSTR szDestDir) } /* the FO_COPY operation */ -static HRESULT copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *flTo) +static DWORD copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *flTo) { DWORD i; const FILE_ENTRY *entryToCopy; @@ -1325,7 +1325,7 @@ static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, const FILE } /* the FO_DELETE operation */ -static HRESULT delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) +static DWORD delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) { const FILE_ENTRY *fileEntry; DWORD i; @@ -1425,7 +1425,7 @@ static void move_to_dir(LPSHFILEOPSTRUCTW lpFileOp, const FILE_ENTRY *feFrom, co } /* the FO_MOVE operation */ -static HRESULT move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) +static DWORD move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) { DWORD i; const FILE_ENTRY *entryToMove; @@ -1477,7 +1477,7 @@ static HRESULT move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, c } /* the FO_RENAME files */ -static HRESULT rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) +static DWORD rename_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) { const FILE_ENTRY *feFrom; const FILE_ENTRY *feTo;

1 0

Damjan Jovanovic : shell32: Fix some function prototypes.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: f6be79684f0c5a0a3a03103e8577995bfceb19dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6be79684f0c5a0a3a03103e8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Jun 20 09:12:23 2012 +0200 shell32: Fix some function prototypes. --- dlls/shell32/shell32.spec | 6 +++--- dlls/shell32/shellord.c | 23 ++++++++++++----------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 29685e8..6fcd5e8 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -95,7 +95,7 @@ 100 stdcall -ordinal SHRestricted(long) 102 stdcall -ordinal SHCoCreateInstance(wstr ptr long ptr ptr) - 103 stdcall -ordinal SignalFileOpen(long) + 103 stdcall -ordinal SignalFileOpen(ptr) 104 stdcall -noname FileMenu_DeleteAllItems(long) 105 stdcall -noname FileMenu_DrawItem(long ptr) 106 stdcall -noname FileMenu_FindSubMenuByPidl(long ptr) @@ -150,7 +150,7 @@ 158 stdcall -noname PathGetExtension(str long long) PathGetExtensionAW 159 stdcall -noname PathIsDirectory(ptr) PathIsDirectoryAW 160 stub SHNetConnectionDialog - 161 stdcall -noname SHRunControlPanel(long long) + 161 stdcall -noname SHRunControlPanel(wstr long) 162 stdcall -ordinal SHSimpleIDListFromPath(ptr) SHSimpleIDListFromPathAW 163 stdcall -noname StrToOleStr(wstr str) StrToOleStrAW 164 stdcall -ordinal Win32DeleteFile(str) Win32DeleteFileAW @@ -162,7 +162,7 @@ 170 stdcall -ordinal SHReplaceFromPropSheetExtArray(long long long long) 171 stdcall -ordinal PathCleanupSpec(ptr ptr) 172 stdcall -noname SHCreateLinks(long str ptr long ptr) - 173 stdcall -ordinal SHValidateUNC(long long long) + 173 stdcall -ordinal SHValidateUNC(long wstr long) 174 stdcall -ordinal SHCreateShellFolderViewEx(ptr ptr) 175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathAW 176 stdcall -ordinal SHSetInstanceExplorer(long) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 05105c5..7f329de 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -614,12 +614,12 @@ WORD WINAPI ArrangeWindows( * NOTES * exported by ordinal */ -DWORD WINAPI -SignalFileOpen (DWORD dwParam1) +BOOL WINAPI +SignalFileOpen (PCIDLIST_ABSOLUTE pidl) { - FIXME("(0x%08x):stub.\n", dwParam1); + FIXME("(%p):stub.\n", pidl); - return 0; + return FALSE; } /************************************************************************* @@ -1131,9 +1131,10 @@ HRESULT WINAPI SHWinHelp (DWORD v, DWORD w, DWORD x, DWORD z) * SHRunControlPanel [SHELL32.161] * */ -HRESULT WINAPI SHRunControlPanel (DWORD x, DWORD z) -{ FIXME("0x%08x 0x%08x stub\n",x,z); - return 0; +BOOL WINAPI SHRunControlPanel (LPCWSTR commandLine, HWND parent) +{ + FIXME("(%s, %p): stub\n", debugstr_w(commandLine), parent); + return FALSE; } static LPUNKNOWN SHELL32_IExplorerInterface=0; @@ -1499,7 +1500,7 @@ HRESULT WINAPI SHLoadOLE(LPARAM lParam) * DriveType [SHELL32.64] * */ -HRESULT WINAPI DriveType(DWORD u) +int WINAPI DriveType(int u) { FIXME("0x%04x stub\n",u); return 0; } @@ -1582,10 +1583,10 @@ DWORD WINAPI RLBuildListOfPaths (void) * SHValidateUNC [SHELL32.173] * */ -HRESULT WINAPI SHValidateUNC (DWORD x, DWORD y, DWORD z) +BOOL WINAPI SHValidateUNC (HWND hwndOwner, PWSTR pszFile, UINT fConnect) { - FIXME("0x%08x 0x%08x 0x%08x stub\n",x,y,z); - return 0; + FIXME("(%p, %s, 0x%08x): stub\n", hwndOwner, debugstr_w(pszFile), fConnect); + return FALSE; } /************************************************************************

1 0

Damjan Jovanovic : include/shlobj.h: Add some missing APIs.
by Alexandre Julliard 20 Jun '12

20 Jun '12

Module: wine Branch: master Commit: cc373eef2b4872c3873c1d2359dc770ed0056409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc373eef2b4872c3873c1d235… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Jun 20 09:07:48 2012 +0200 include/shlobj.h: Add some missing APIs. --- include/shlobj.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index 00b3422..103a1cf 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -74,6 +74,7 @@ HRESULT WINAPI SHPathPrepareForWriteW(HWND,IUnknown*,LPCWSTR,DWORD); #define SHPathPrepareForWrite WINELIB_NAME_AW(SHPathPrepareForWrite); UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA,UINT,LPFNADDPROPSHEETPAGE,LPARAM); LPITEMIDLIST WINAPI SHSimpleIDListFromPath(LPCWSTR); +BOOL WINAPI SHRunControlPanel(LPCWSTR, HWND); int WINAPI SHMapPIDLToSystemImageListIndex(IShellFolder*,LPCITEMIDLIST,int*); HRESULT WINAPI SHStartNetConnectionDialog(HWND,LPCSTR,DWORD); VOID WINAPI SHUpdateImageA(LPCSTR,INT,UINT,INT); @@ -81,9 +82,11 @@ VOID WINAPI SHUpdateImageW(LPCWSTR,INT,UINT,INT); #define SHUpdateImage WINELIB_NAME_AW(SHUpdateImage) int WINAPI RestartDialog(HWND,LPCWSTR,DWORD); int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD); +int WINAPI DriveType(int); BOOL WINAPI IsUserAnAdmin(void); UINT WINAPI Shell_MergeMenus(HMENU,HMENU,UINT,UINT,UINT,ULONG); BOOL WINAPI Shell_GetImageLists(HIMAGELIST*,HIMAGELIST*); +BOOL WINAPI SignalFileOpen(PCIDLIST_ABSOLUTE); BOOL WINAPI ImportPrivacySettings(LPCWSTR, BOOL*, BOOL*); #define KF_FLAG_SIMPLE_IDLIST 0x00000100

1 0