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

Thomas Faber : imagehlp: Do not pass NULL to WriteFile as lpNumberOfBytesWritten.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: fd181c4937634c59502e548d1d65008b7c937e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd181c4937634c59502e548d1… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Jun 20 23:48:44 2012 +0200 imagehlp: Do not pass NULL to WriteFile as lpNumberOfBytesWritten. --- dlls/imagehlp/integrity.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index c6d490c..d86ec11 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -461,7 +461,7 @@ BOOL WINAPI ImageAddCertificate( char null[8]; ZeroMemory(null, 8); - WriteFile(FileHandle, null, 8 - (Certificate->dwLength % 8), NULL, NULL); + WriteFile(FileHandle, null, 8 - (Certificate->dwLength % 8), &count, NULL); size += 8 - (Certificate->dwLength % 8); }

1 0

Julian Rüger : ntprint/tests: Fix some typos.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 132937a4e86dc349b6cc505f564e0685dcb8084b URL: http://source.winehq.org/git/wine.git/?a=commit;h=132937a4e86dc349b6cc505f5… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jun 21 00:01:19 2012 +0200 ntprint/tests: Fix some typos. --- dlls/ntprint/tests/ntprint.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c index 7e1ab58..e0bc01e 100644 --- a/dlls/ntprint/tests/ntprint.c +++ b/dlls/ntprint/tests/ntprint.c @@ -71,7 +71,7 @@ static void test_PSetupCreateMonitorInfo(VOID) SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { - win_skip("The Service 'Spooler' is required for many test\n"); + win_skip("The service 'Spooler' is required for many tests\n"); return; } ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); @@ -101,7 +101,7 @@ static void test_PSetupDestroyMonitorInfo(VOID) SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { - win_skip("The Service 'Spooler' is required for many test\n"); + win_skip("The service 'Spooler' is required for many tests\n"); return; } ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); @@ -113,7 +113,7 @@ static void test_PSetupDestroyMonitorInfo(VOID) /* lasterror is returned */ trace("returned with %u\n", GetLastError()); - /* Try to destroy the handle twice crash with native ntprint.dll */ + /* Trying to destroy the handle twice crashes with native ntprint.dll */ if (0) { SetLastError(0xdeadbeef); pPSetupDestroyMonitorInfo(mi);

1 0

Francois Gouget : oleaut32: Use the CSTR_XXX macros instead of numeric literals.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 4d22dc440b57d8b3183e23eb4e29129c76631e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d22dc440b57d8b3183e23eb4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 20 23:41:13 2012 +0200 oleaut32: Use the CSTR_XXX macros instead of numeric literals. --- dlls/oleaut32/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 9810d35..2d27f9d 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7017,7 +7017,7 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl } hres = CompareStringW(lcid, dwFlags, pbstrLeft, lenLeft, - pbstrRight, lenRight) - 1; + pbstrRight, lenRight) - CSTR_LESS_THAN; TRACE("%d\n", hres); return hres; }

1 0

Detlef Riekenberg : winspool/tests: Fix failures when the spooler service is not running.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 1034ae37e23824eb88ee43169c91e860a3dcc53a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1034ae37e23824eb88ee43169… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jun 20 22:24:11 2012 +0200 winspool/tests: Fix failures when the spooler service is not running. --- dlls/winspool.drv/tests/info.c | 53 +++++++++++++++++++++++++-------------- 1 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 3aab0e2..1cbb07d 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1534,18 +1534,22 @@ static void test_GetPrinterDriverDirectory(void) SetLastError(MAGIC_DEAD); res = GetPrinterDriverDirectoryA( NULL, NULL, 1, buffer, cbBuf, NULL); - ok( (!res && RPC_X_NULL_REF_POINTER == GetLastError()) || res, - "expected either result == 0 and " - "last error == RPC_X_NULL_REF_POINTER or result != 0 " - "got result %d and last error == %d\n", res, GetLastError()); + /* w7 with deactivated spooler: ERROR_INVALID_PARAMETER, + NT: RPC_X_NULL_REF_POINTER */ + ok( res || (GetLastError() == RPC_X_NULL_REF_POINTER) || + (GetLastError() == ERROR_INVALID_PARAMETER), + "returned %d with %d (expected '!=0' or '0' with RPC_X_NULL_REF_POINTER " + "or '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); SetLastError(MAGIC_DEAD); res = GetPrinterDriverDirectoryA( NULL, NULL, 1, NULL, cbBuf, NULL); - ok(res || (GetLastError() == RPC_X_NULL_REF_POINTER), - "returned %d with %d (expected '!=0' or '0' with " - "RPC_X_NULL_REF_POINTER)\n", res, GetLastError()); - - + /* w7 with deactivated spooler: ERROR_INVALID_PARAMETER, + NT: RPC_X_NULL_REF_POINTER */ + ok( res || (GetLastError() == RPC_X_NULL_REF_POINTER) || + (GetLastError() == ERROR_INVALID_PARAMETER), + "returned %d with %d (expected '!=0' or '0' with RPC_X_NULL_REF_POINTER " + "or '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + /* with a valid buffer, but level is too large */ buffer[0] = '\0'; SetLastError(MAGIC_DEAD); @@ -1679,20 +1683,22 @@ static void test_GetPrintProcessorDirectory(void) buffer[0] = '\0'; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA( NULL, NULL, 1, buffer, cbBuf, NULL); - /* NT: RPC_X_NULL_REF_POINTER, 9x: res != 0 */ - ok( (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) || - broken(res), - "returned %d with %d (expected '0' with RPC_X_NULL_REF_POINTER)\n", - res, GetLastError()); + /* w7 with deactivated spooler: ERROR_INVALID_PARAMETER, + NT: RPC_X_NULL_REF_POINTER, 9x: res != 0 */ + ok( !res && ((GetLastError() == RPC_X_NULL_REF_POINTER) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "returned %d with %d (expected '0' with RPC_X_NULL_REF_POINTER " + "or with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); buffer[0] = '\0'; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA( NULL, NULL, 1, NULL, cbBuf, NULL); - /* NT: RPC_X_NULL_REF_POINTER, 9x: res != 0 */ - ok( (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) || - broken(res), - "returned %d with %d (expected '0' with RPC_X_NULL_REF_POINTER)\n", - res, GetLastError()); + /* w7 with deactivated spooler: ERROR_INVALID_PARAMETER, + NT: RPC_X_NULL_REF_POINTER, 9x: res != 0 */ + ok( !res && ((GetLastError() == RPC_X_NULL_REF_POINTER) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "returned %d with %d (expected '0' with RPC_X_NULL_REF_POINTER " + "or with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); /* with a valid buffer, but level is invalid */ buffer[0] = '\0'; @@ -1992,6 +1998,14 @@ static void test_SetDefaultPrinter(void) WriteProfileStringA("windows", "device", NULL); SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(""); + if ((res == 0) && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { + if (!deactivated_spooler_reported) { + deactivated_spooler_reported++; + skip("The Service 'Spooler' is required for many test\n"); + } + goto restore_old_printer; + } + /* we get ERROR_INVALID_PRINTER_NAME when no printer is installed */ ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), "returned %d with %d (expected '!=0' or '0' with " @@ -2013,6 +2027,7 @@ static void test_SetDefaultPrinter(void) "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); /* restore the original value */ +restore_old_printer: res = pSetDefaultPrinterA(default_printer); /* the nice way */ ok(res, "SetDefaultPrinter error %d\n", GetLastError()); WriteProfileStringA("windows", "device", org_value); /* the old way */

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 9217526be963163d276447ca54f63d416365beea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9217526be963163d276447ca5… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jun 20 23:37:51 2012 +0300 po: Update Finnish translation. --- po/fi.po | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/po/fi.po b/po/fi.po index 11f2d07..644f85e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3443,7 +3443,7 @@ msgstr "Testaa joystickia" #: joy.rc:50 msgid "Buttons" -msgstr "" +msgstr "Painikkeet" #: joy.rc:58 msgid "Test Force Feedback" @@ -13605,22 +13605,16 @@ msgid "Help topics: " msgstr "Ohjeen otsikot: " #: wmic.rc:25 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "Error: Command line not supported\n" -msgstr "Virhe: Viallisia komentoriviparametreja\n" +msgstr "Virhe: Komentoriviä ei tueta\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" -msgstr "Ominaisuusjoukkoa ei löytynyt.\n" +msgstr "Virhe: Aliasta ei löydy\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid query\n" -msgstr "Virhe: Viallinen avaimen nimi\n" +msgstr "Virhe: Viallinen kysely\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N"

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: e215f28a451997108d394e2de4223d557e44cfec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e215f28a451997108d394e2de… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jun 20 23:55:30 2012 +0200 po: Update German translation. --- po/de.po | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/po/de.po b/po/de.po index 72aa218..5d58fea 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: 2012-06-13 22:52+0200\n" +"PO-Revision-Date: 2012-06-20 21:55+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -13707,34 +13707,28 @@ msgstr "Hilfe-Dateien (*.hlp)" #: winhlp32.rc:89 msgid "Cannot find '%s'. Do you want to find this file yourself?" msgstr "" -"'%s' konnte nicht gefunden werden. Wollen Sie selber nach dieser Datei " +"'%s' konnte nicht gefunden werden. Möchten Sie selbst nach dieser Datei " "suchen?" #: winhlp32.rc:90 msgid "Cannot find a richedit implementation... Aborting" -msgstr "Die Richedit Implementation konnte nicht gefunden werden... Breche ab" +msgstr "Es konnte keine Richedit-Implementierung gefunden werden... Abbruch" #: winhlp32.rc:91 msgid "Help topics: " msgstr "Hilfethemen: " #: wmic.rc:25 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "Error: Command line not supported\n" -msgstr "Fehler: Ungültige Befehlszeilenargumente\n" +msgstr "Fehler: Befehlszeile nicht unterstützt\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" -msgstr "Eigenschaften nicht gefunden.\n" +msgstr "Fehler: Alias nicht gefunden\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid query\n" -msgstr "Fehler: Ungültiger Schlüssel\n" +msgstr "Fehler: Ungültige Anfrage\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N"

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 04c7ccd240cfc14e72e14d4a5540e2e0c0946fea URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c7ccd240cfc14e72e14d4a5… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jun 20 23:37:52 2012 +0300 po: Update Swedish translation. --- po/sv.po | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/po/sv.po b/po/sv.po index dfaa5c6..5251c0c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2057,7 +2057,7 @@ msgstr "Meddelandenummer=" #: cryptdlg.rc:37 msgid "Notice Text=" -msgstr "Meddelandetext" +msgstr "Meddelandetext=" #: cryptui.rc:177 cryptui.rc:232 inetcpl.rc:43 msgid "General" @@ -3438,7 +3438,7 @@ msgstr "Testa joysticken" #: joy.rc:50 msgid "Buttons" -msgstr "" +msgstr "Knappar" #: joy.rc:58 msgid "Test Force Feedback" @@ -3506,15 +3506,15 @@ msgstr "Oterminerad strängkonstant" #: jscript.rc:39 msgid "Can't have 'break' outside of loop" -msgstr "" +msgstr "Går ej att ha 'break' utanför loop" #: jscript.rc:40 msgid "Can't have 'continue' outside of loop" -msgstr "" +msgstr "Går ej att ha 'continue' utanför loop" #: jscript.rc:41 msgid "Label redefined" -msgstr "" +msgstr "Etiketten är redan definierat" #: jscript.rc:42 msgid "Label not found" @@ -11013,11 +11013,11 @@ msgstr "Operation slutfördes utan problem\n" #: reg.rc:32 msgid "Error: Invalid key name\n" -msgstr "Fel: ogiltigt nyckelnamn\n" +msgstr "Fel: Ogiltigt nyckelnamn\n" #: reg.rc:33 msgid "Error: Invalid command line parameters\n" -msgstr "Fel: ogiltiga kommandoradsparametrar\n" +msgstr "Fel: Ogiltiga kommandoradsparametrar\n" #: reg.rc:34 msgid "Error: Unable to add keys to remote machine\n" @@ -13555,22 +13555,16 @@ msgid "Help topics: " msgstr "Hjälprubriker: " #: wmic.rc:25 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "Error: Command line not supported\n" -msgstr "Fel: ogiltiga kommandoradsparametrar\n" +msgstr "Fel: Kommandoraden stöds inte\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" -msgstr "Egenskapsmängden hittades inte.\n" +msgstr "Fel: Aliaset hittades inte\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid query\n" -msgstr "Fel: ogiltigt nyckelnamn\n" +msgstr "Fel: Ogiltig fråga\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N"

1 0

Francois Gouget : comctl32: Simplify the string comparison functions a bit and use the CSTR_XXX macros .
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: ac323a20ba226cd778fd87c65fae085082000762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac323a20ba226cd778fd87c65… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 20 23:40:13 2012 +0200 comctl32: Simplify the string comparison functions a bit and use the CSTR_XXX macros. --- dlls/comctl32/string.c | 46 ++++++++++++++++------------------------------ 1 files changed, 16 insertions(+), 30 deletions(-) diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index 7fead7c..a9544fa 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -77,7 +77,7 @@ static BOOL COMCTL32_ChrCmpHelperA(WORD ch1, WORD ch2, DWORD dwFlags) else str2[1] = '\0'; - return CompareStringA(GetThreadLocale(), dwFlags, str1, -1, str2, -1) - 2; + return CompareStringA(GetThreadLocale(), dwFlags, str1, -1, str2, -1) - CSTR_EQUAL; } /************************************************************************* @@ -117,7 +117,7 @@ static BOOL COMCTL32_ChrCmpIA(WORD ch1, WORD ch2) */ static inline BOOL COMCTL32_ChrCmpIW(WCHAR ch1, WCHAR ch2) { - return CompareStringW(GetThreadLocale(), NORM_IGNORECASE, &ch1, 1, &ch2, 1) - 2; + return CompareStringW(GetThreadLocale(), NORM_IGNORECASE, &ch1, 1, &ch2, 1) - CSTR_EQUAL; } /************************************************************************** @@ -299,12 +299,8 @@ LPSTR WINAPI StrChrA(LPCSTR lpszStr, WORD ch) */ INT WINAPI StrCmpNIA(LPCSTR lpszStr, LPCSTR lpszComp, INT iLen) { - INT iRet; - TRACE("(%s,%s,%i)\n", debugstr_a(lpszStr), debugstr_a(lpszComp), iLen); - - iRet = CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen); - return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; + return CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen) - CSTR_EQUAL; } /************************************************************************* @@ -314,12 +310,8 @@ INT WINAPI StrCmpNIA(LPCSTR lpszStr, LPCSTR lpszComp, INT iLen) */ INT WINAPI StrCmpNIW(LPCWSTR lpszStr, LPCWSTR lpszComp, INT iLen) { - INT iRet; - TRACE("(%s,%s,%i)\n", debugstr_w(lpszStr), debugstr_w(lpszComp), iLen); - - iRet = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen); - return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; + return CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen) - CSTR_EQUAL; } /************************************************************************* @@ -496,12 +488,8 @@ LPWSTR WINAPI StrChrW(LPCWSTR lpszStr, WCHAR ch) */ INT WINAPI StrCmpNA(LPCSTR lpszStr, LPCSTR lpszComp, INT iLen) { - INT iRet; - TRACE("(%s,%s,%i)\n", debugstr_a(lpszStr), debugstr_a(lpszComp), iLen); - - iRet = CompareStringA(GetThreadLocale(), 0, lpszStr, iLen, lpszComp, iLen); - return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; + return CompareStringA(GetThreadLocale(), 0, lpszStr, iLen, lpszComp, iLen) - CSTR_EQUAL; } /************************************************************************** @@ -511,12 +499,8 @@ INT WINAPI StrCmpNA(LPCSTR lpszStr, LPCSTR lpszComp, INT iLen) */ INT WINAPI StrCmpNW(LPCWSTR lpszStr, LPCWSTR lpszComp, INT iLen) { - INT iRet; - TRACE("(%s,%s,%i)\n", debugstr_w(lpszStr), debugstr_w(lpszComp), iLen); - - iRet = CompareStringW(GetThreadLocale(), 0, lpszStr, iLen, lpszComp, iLen); - return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; + return CompareStringW(GetThreadLocale(), 0, lpszStr, iLen, lpszComp, iLen) - CSTR_EQUAL; } /************************************************************************** @@ -877,10 +861,11 @@ BOOL WINAPI IntlStrEqWorkerA(BOOL bCase, LPCSTR lpszStr, LPCSTR lpszComp, TRACE("(%d,%s,%s,%d)\n", bCase, debugstr_a(lpszStr), debugstr_a(lpszComp), iLen); - /* FIXME: These flags are undocumented and unknown by our CompareString. - * We need defines for them. + /* FIXME: This flag is undocumented and unknown by our CompareString. + * We need a define for it. */ - dwFlags |= bCase ? 0x10000000 : 0x10000001; + dwFlags = 0x10000000; + if (!bCase) dwFlags |= NORM_IGNORECASE; iRet = CompareStringA(GetThreadLocale(), dwFlags, lpszStr, iLen, lpszComp, iLen); @@ -888,7 +873,7 @@ BOOL WINAPI IntlStrEqWorkerA(BOOL bCase, LPCSTR lpszStr, LPCSTR lpszComp, if (!iRet) iRet = CompareStringA(2048, dwFlags, lpszStr, iLen, lpszComp, iLen); - return iRet == 2 ? TRUE : FALSE; + return iRet == CSTR_EQUAL; } /************************************************************************* @@ -905,10 +890,11 @@ BOOL WINAPI IntlStrEqWorkerW(BOOL bCase, LPCWSTR lpszStr, LPCWSTR lpszComp, TRACE("(%d,%s,%s,%d)\n", bCase, debugstr_w(lpszStr),debugstr_w(lpszComp), iLen); - /* FIXME: These flags are undocumented and unknown by our CompareString. - * We need defines for them. + /* FIXME: This flag is undocumented and unknown by our CompareString. + * We need a define for it. */ - dwFlags = bCase ? 0x10000000 : 0x10000001; + dwFlags = 0x10000000; + if (!bCase) dwFlags |= NORM_IGNORECASE; iRet = CompareStringW(GetThreadLocale(), dwFlags, lpszStr, iLen, lpszComp, iLen); @@ -916,5 +902,5 @@ BOOL WINAPI IntlStrEqWorkerW(BOOL bCase, LPCWSTR lpszStr, LPCWSTR lpszComp, if (!iRet) iRet = CompareStringW(2048, dwFlags, lpszStr, iLen, lpszComp, iLen); - return iRet == 2 ? TRUE : FALSE; + return iRet == CSTR_EQUAL; }

1 0

Francois Gouget : msvcrt: Use the CSTR_XXX macros instead of numeric literals.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: d817bbd6f45a1e329ba339a2b8691261a7045239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d817bbd6f45a1e329ba339a2b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 20 23:40:33 2012 +0200 msvcrt: Use the CSTR_XXX macros instead of numeric literals. --- dlls/msvcrt/string.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index ad9e88b..6fe5aab 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -543,7 +543,7 @@ int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, MSVCRT__locale_t else locinfo = locale->locinfo; - return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, -1, str2, -1)-2; + return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, -1, str2, -1)-CSTR_EQUAL; } /********************************************************************* @@ -567,7 +567,7 @@ int CDECL MSVCRT__stricoll_l( const char* str1, const char* str2, MSVCRT__locale locinfo = locale->locinfo; return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE, - str1, -1, str2, -1)-2; + str1, -1, str2, -1)-CSTR_EQUAL; } /********************************************************************* @@ -590,7 +590,7 @@ int CDECL MSVCRT_strncoll_l( const char* str1, const char* str2, MSVCRT_size_t c else locinfo = locale->locinfo; - return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, count, str2, count)-2; + return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, count, str2, count)-CSTR_EQUAL; } /********************************************************************* @@ -614,7 +614,7 @@ int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, MSVCRT_size_t locinfo = locale->locinfo; return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE, - str1, count, str2, count)-2; + str1, count, str2, count)-CSTR_EQUAL; } /*********************************************************************

1 0

Francois Gouget : shlwapi: Simplify the string comparison functions a bit and use the CSTR_XXX macros .
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: de049ff1ed801aadd93d46e6be2d855da46f9768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de049ff1ed801aadd93d46e6b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 20 23:40:56 2012 +0200 shlwapi: Simplify the string comparison functions a bit and use the CSTR_XXX macros. --- dlls/shlwapi/string.c | 40 ++++++++-------------------------------- 1 files changed, 8 insertions(+), 32 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index e2f1cba..a919d8a 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -176,7 +176,7 @@ static BOOL SHLWAPI_ChrCmpHelperA(WORD ch1, WORD ch2, DWORD dwFlags) else str2[1] = '\0'; - return CompareStringA(GetThreadLocale(), dwFlags, str1, -1, str2, -1) - 2; + return CompareStringA(GetThreadLocale(), dwFlags, str1, -1, str2, -1) - CSTR_EQUAL; } /************************************************************************* @@ -216,7 +216,7 @@ BOOL WINAPI ChrCmpIA(WORD ch1, WORD ch2) */ BOOL WINAPI ChrCmpIW(WCHAR ch1, WCHAR ch2) { - return CompareStringW(GetThreadLocale(), NORM_IGNORECASE, &ch1, 1, &ch2, 1) - 2; + return CompareStringW(GetThreadLocale(), NORM_IGNORECASE, &ch1, 1, &ch2, 1) - CSTR_EQUAL; } /************************************************************************* @@ -352,12 +352,8 @@ LPWSTR WINAPI StrChrNW(LPCWSTR lpszStr, WCHAR ch, UINT cchMax) */ int WINAPI StrCmpIW(LPCWSTR lpszStr, LPCWSTR lpszComp) { - int iRet; - TRACE("(%s,%s)\n", debugstr_w(lpszStr),debugstr_w(lpszComp)); - - iRet = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpszStr, -1, lpszComp, -1); - return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; + return CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpszStr, -1, lpszComp, -1) - CSTR_EQUAL; } /************************************************************************* @@ -376,12 +372,8 @@ int WINAPI StrCmpIW(LPCWSTR lpszStr, LPCWSTR lpszComp) */ INT WINAPI StrCmpNA(LPCSTR lpszStr, LPCSTR lpszComp, INT iLen) { - INT iRet; - TRACE("(%s,%s,%i)\n", debugstr_a(lpszStr), debugstr_a(lpszComp), iLen); - - iRet = CompareStringA(GetThreadLocale(), 0, lpszStr, iLen, lpszComp, iLen); - return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; + return CompareStringA(GetThreadLocale(), 0, lpszStr, iLen, lpszComp, iLen) - CSTR_EQUAL; } /************************************************************************* @@ -391,12 +383,8 @@ INT WINAPI StrCmpNA(LPCSTR lpszStr, LPCSTR lpszComp, INT iLen) */ INT WINAPI StrCmpNW(LPCWSTR lpszStr, LPCWSTR lpszComp, INT iLen) { - INT iRet; - TRACE("(%s,%s,%i)\n", debugstr_w(lpszStr), debugstr_w(lpszComp), iLen); - - iRet = CompareStringW(GetThreadLocale(), 0, lpszStr, iLen, lpszComp, iLen); - return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; + return CompareStringW(GetThreadLocale(), 0, lpszStr, iLen, lpszComp, iLen) - CSTR_EQUAL; } /************************************************************************* @@ -415,12 +403,8 @@ INT WINAPI StrCmpNW(LPCWSTR lpszStr, LPCWSTR lpszComp, INT iLen) */ int WINAPI StrCmpNIA(LPCSTR lpszStr, LPCSTR lpszComp, int iLen) { - INT iRet; - TRACE("(%s,%s,%i)\n", debugstr_a(lpszStr), debugstr_a(lpszComp), iLen); - - iRet = CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen); - return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; + return CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen) - CSTR_EQUAL; } /************************************************************************* @@ -430,12 +414,8 @@ int WINAPI StrCmpNIA(LPCSTR lpszStr, LPCSTR lpszComp, int iLen) */ INT WINAPI StrCmpNIW(LPCWSTR lpszStr, LPCWSTR lpszComp, int iLen) { - INT iRet; - TRACE("(%s,%s,%i)\n", debugstr_w(lpszStr), debugstr_w(lpszComp), iLen); - - iRet = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen); - return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; + return CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen) - CSTR_EQUAL; } /************************************************************************* @@ -453,12 +433,8 @@ INT WINAPI StrCmpNIW(LPCWSTR lpszStr, LPCWSTR lpszComp, int iLen) */ int WINAPI StrCmpW(LPCWSTR lpszStr, LPCWSTR lpszComp) { - INT iRet; - TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszComp)); - - iRet = CompareStringW(GetThreadLocale(), 0, lpszStr, -1, lpszComp, -1); - return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0; + return CompareStringW(GetThreadLocale(), 0, lpszStr, -1, lpszComp, -1) - CSTR_EQUAL; } /*************************************************************************

1 0