October 2013 - Wine-Commits

Hans Leidekker : ws2_32: Always clear res on error in getaddrinfo/ GetAddrInfoW.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 14a092a3369fefb3657237a2828b99d4f7845a20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a092a3369fefb3657237a28… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 2 16:05:15 2013 +0200 ws2_32: Always clear res on error in getaddrinfo/GetAddrInfoW. --- dlls/ws2_32/socket.c | 8 ++++---- dlls/ws2_32/tests/sock.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bd5a476..a14f624 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5397,6 +5397,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr char *hostname = NULL; const char *node; + *res = NULL; if (!nodename && !servname) return WSAHOST_NOT_FOUND; if (!nodename) @@ -5479,16 +5480,14 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr xuai = xuai->ai_next; } freeaddrinfo(unixaires); - } else { + } else result = convert_eai_u2w(result); - *res = NULL; - } + return result; outofmem: if (*res) WS_freeaddrinfo(*res); if (unixaires) freeaddrinfo(unixaires); - *res = NULL; return WSA_NOT_ENOUGH_MEMORY; #else FIXME("getaddrinfo() failed, not found during buildtime.\n"); @@ -5595,6 +5594,7 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin char *nodenameA = NULL, *servnameA = NULL; struct WS_addrinfo *resA, *hintsA = NULL; + *res = NULL; if (nodename) { len = WideCharToMultiByte(CP_ACP, 0, nodename, -1, NULL, 0, NULL, NULL); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index fddb820..a4c94312 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5092,6 +5092,8 @@ static void test_GetAddrInfoW(void) static const WCHAR port[] = {'8','0',0}; static const WCHAR empty[] = {0}; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; + static const WCHAR nxdomain[] = + {'n','x','d','o','m','a','i','n','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; static const WCHAR zero[] = {'0',0}; int ret; ADDRINFOW *result, hint; @@ -5103,8 +5105,10 @@ static void test_GetAddrInfoW(void) } memset(&hint, 0, sizeof(ADDRINFOW)); + result = (ADDRINFOW *)0xdeadbeef; ret = pGetAddrInfoW(NULL, NULL, NULL, &result); ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); result = NULL; ret = pGetAddrInfoW(empty, NULL, NULL, &result); @@ -5145,9 +5149,24 @@ static void test_GetAddrInfoW(void) pFreeAddrInfoW(result); result = NULL; + ret = pGetAddrInfoW(localhost, NULL, &hint, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + pFreeAddrInfoW(result); + + result = NULL; ret = pGetAddrInfoW(localhost, port, &hint, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result); + + result = (ADDRINFOW *)0xdeadbeef; + ret = pGetAddrInfoW(NULL, NULL, NULL, &result); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); + + result = (ADDRINFOW *)0xdeadbeef; + ret = pGetAddrInfoW(nxdomain, NULL, NULL, &result); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); } static void test_getaddrinfo(void) @@ -5162,8 +5181,10 @@ static void test_getaddrinfo(void) } memset(&hint, 0, sizeof(ADDRINFOA)); + result = (ADDRINFOA *)0xdeadbeef; ret = pgetaddrinfo(NULL, NULL, NULL, &result); ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); result = NULL; ret = pgetaddrinfo("", NULL, NULL, &result); @@ -5204,9 +5225,19 @@ static void test_getaddrinfo(void) pfreeaddrinfo(result); result = NULL; + ret = pgetaddrinfo("localhost", NULL, &hint, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + pfreeaddrinfo(result); + + result = NULL; ret = pgetaddrinfo("localhost", "80", &hint, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); pfreeaddrinfo(result); + + result = (ADDRINFOA *)0xdeadbeef; + ret = pgetaddrinfo("nxdomain.codeweavers.com", NULL, NULL, &result); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); } static void test_ConnectEx(void)

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: aead747fa5696924f6e836a583649fdab79362b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aead747fa5696924f6e836a58… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Oct 2 20:42:39 2013 +0900 po: Update Japanese translation. --- po/ja.po | 45 +++++++++++---------------------------------- 1 files changed, 11 insertions(+), 34 deletions(-) diff --git a/po/ja.po b/po/ja.po index 744380f..c5087df 100644 --- a/po/ja.po +++ b/po/ja.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: 2013-07-03 23:54+0900\n" +"PO-Revision-Date: 2013-10-02 19:45+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" @@ -8516,16 +8516,11 @@ msgstr "" "直して下さい。" #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" -"MIDIマッパの設定がシステムに装着されていないデバイスを参照しています。設定を" -"変更するにはコントロールパネルの「MIDIマッパ」アプレットを使用して下さい。" +"MIDI マッパーの設定がシステムに装着されていないデバイスを参照しています。" #: winmm.rc:53 msgid "" @@ -9348,10 +9343,6 @@ msgstr "" "し元に引き継がれます。\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" @@ -9360,8 +9351,6 @@ msgstr "" "を変更します。\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" msgstr "CHDIR <ディレクトリ> は現在のデフォルトディレクトリを変更します。\n" @@ -9414,11 +9403,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <ファイル名> はファイルやファイル群を削除します。\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9426,10 +9410,12 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"FOR コマンドはそれぞれのファイルに対してコマンドを実行する\n" -"場合に使用します。\n" +"FOR コマンドはそれぞれのファイルに対してコマンドを実行する場合に\n" +"使用します。\n" "\n" -"構文: FOR %変数 IN (セット) DO コマンド\n" +"使い方: FOR %変数 IN (セット) DO コマンド\n" +"\n" +"バッチファイルで FOR を利用するとき、% 記号は二重にする必要があります。\n" #: cmd.rc:80 msgid "" @@ -9616,17 +9602,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <ファイル名> はファイルを変名します。\n" #: cmd.rc:158 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "" -"RD <ディレクトリ> は RMDIR の短縮版です。サブディレクトリを削除します。\n" +msgstr "RD <ディレクトリ> は RMDIR の短縮版です。ディレクトリを削除します。\n" #: cmd.rc:159 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <ディレクトリ> はサブディレクトリを削除します。\n" +msgstr "RMDIR <ディレクトリ> はディレクトリを削除します。\n" #: cmd.rc:203 msgid "" @@ -9799,16 +9780,12 @@ msgstr "" "まで保持されます。終了時点で以前の環境設定が復元されます。\n" #: cmd.rc:245 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <ディレクトリ名> はカレントディレクトリをスタック上に保存し、カ\n" -"レントディレクトリを指定されたディレクトリに変更します。\n" +"PUSHD <ディレクトリ> はカレントディレクトリをスタック上に保存し、\n" +"カレントディレクトリを指定されたディレクトリに変更します。\n" #: cmd.rc:247 msgid "POPD changes current directory to the last one saved with PUSHD.\n"

1 0

Akihiro Sagawa : gdi32: Fix the B spacing value of empty glyph.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 042b39a82b118481325fedb529057ffd0eef5b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042b39a82b118481325fedb52… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Oct 2 20:42:35 2013 +0900 gdi32: Fix the B spacing value of empty glyph. --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 15f401a..ca9e18f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6525,7 +6525,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, lpgm->gmptGlyphOrigin.x = origin_x >> 6; lpgm->gmptGlyphOrigin.y = origin_y >> 6; abc->abcA = left >> 6; - abc->abcB = width; + abc->abcB = lpgm->gmBlackBoxX; abc->abcC = adv - abc->abcA - abc->abcB; TRACE("%u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f6e4d07..031b86a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1298,11 +1298,22 @@ static void test_GetCharABCWidths(void) DeleteObject(hfont); } - ReleaseDC(NULL, hdc); - memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = 20; + hfont = CreateFontIndirectA(&lf); + + /* test empty glyph's metrics */ + hfont = SelectObject(hdc, hfont); + ret = pGetCharABCWidthsFloatW(hdc, ' ', ' ', abcf); + ok(ret, "GetCharABCWidthsFloatW should have succeeded\n"); + ok(abcf[0].abcfB == 1.0, "got %f\n", abcf[0].abcfB); + ret = pGetCharABCWidthsW(hdc, ' ', ' ', abcw); + ok(ret, "GetCharABCWidthsW should have succeeded\n"); + ok(abcw[0].abcB == 1, "got %u\n", abcw[0].abcB); + + DeleteObject(SelectObject(hdc, hfont)); + ReleaseDC(NULL, hdc); trace("ABC sign test for a variety of transforms:\n"); hfont = CreateFontIndirectA(&lf); @@ -1318,7 +1329,7 @@ static void test_GetCharABCWidths(void) ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc); ok(ret, "GetCharABCWidthsI should have succeeded\n"); ret = pGetCharABCWidthsW(hdc, 'i', 'i', abcw); - ok(ret, "GetCharABCWidthsI should have succeeded\n"); + ok(ret, "GetCharABCWidthsW should have succeeded\n"); ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); ok(ret, "GetCharABCWidthsFloatW should have succeeded\n");

1 0

Sebastian Lackner : wined3d: Ensure that wined3d_cs_st_require_space allocates the required space.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: af759e30c901ac72cc9c889d7637fac8395295b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af759e30c901ac72cc9c889d7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 1 19:58:54 2013 +0200 wined3d: Ensure that wined3d_cs_st_require_space allocates the required space. --- dlls/wined3d/cs.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index cdb49ce..6919e91 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -374,10 +374,11 @@ static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) { void *new_data; - if (!(new_data = HeapReAlloc(GetProcessHeap(), 0, cs->data, cs->data_size * 2))) + size = max( size, cs->data_size * 2 ); + if (!(new_data = HeapReAlloc(GetProcessHeap(), 0, cs->data, size))) return NULL; - cs->data_size *= 2; + cs->data_size = size; cs->data = new_data; }

1 0

Michael Stefaniuc : comctl32/tests: comctl32.dll is already loaded.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 37caf788b56297f0e016d44ded3734cc5b164866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37caf788b56297f0e016d44de… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 30 23:40:14 2013 +0200 comctl32/tests: comctl32.dll is already loaded. --- dlls/comctl32/tests/rebar.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 331af28..efa6b1e 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -578,7 +578,8 @@ static void test_layout(void) check_sizes(); /* an image will increase the band height */ - himl = ImageList_LoadImage(LoadLibrary("comctl32"), MAKEINTRESOURCE(121), 24, 2, CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); + himl = ImageList_LoadImageA(GetModuleHandleA("comctl32"), MAKEINTRESOURCEA(121), 24, 2, + CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); ri.cbSize = sizeof(ri); ri.fMask = RBIM_IMAGELIST; ri.himl = himl;

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 020456628c4e360de2e62c1e113eca6c54a93829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=020456628c4e360de2e62c1e1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 2 09:20:32 2013 +0200 po: Update French translation. --- po/fr.po | 38 ++++++++------------------------------ 1 files changed, 8 insertions(+), 30 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0b8c92b..7f851ba 100644 --- a/po/fr.po +++ b/po/fr.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: 2013-01-03 21:13+0100\n" +"PO-Revision-Date: 2013-10-01 21:13+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -8569,17 +8569,12 @@ msgstr "" "transmission, puis essayez à nouveau." #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" "La configuration actuelle du mappeur MIDI fait référence à un périphérique " -"MIDI non installé sur votre système. Utilisez le mappeur MIDI pour changer " -"la configuration." +"MIDI non installé sur votre système." #: winmm.rc:53 msgid "" @@ -9437,10 +9432,6 @@ msgstr "" "dans une procédure appelée sont transmis à l'appelant.\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" @@ -9448,8 +9439,6 @@ msgstr "" "CD <rép> est la version courte de CHDIR. Elle change le répertoire courant.\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" msgstr "CHDIR <rép> change le répertoire courant.\n" @@ -9502,11 +9491,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <fichier> efface un ou plusieurs fichiers.\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9514,10 +9498,12 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"La commande FOR sert à exécuter une commande pour chaque fichier d'une liste " +"L1 commande FOR sert à exécuter une commande pour chaque fichier d'une liste " "de fichiers.\n" "\n" -"Syntaxe : FOR %variable IN (liste) DO commande\n" +"Usage : FOR %variable IN (liste) DO commande\n" +"\n" +"Le signe % doit être doublé quand FOR est utilisé dans un fichier batch.\n" #: cmd.rc:80 msgid "" @@ -9716,14 +9702,10 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <fichier> renomme un fichier.\n" #: cmd.rc:158 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" msgstr "RD <rép> est la version courte de RMDIR. Elle efface un répertoire.\n" #: cmd.rc:159 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" msgstr "RMDIR <rép> efface un sous-répertoire.\n" @@ -9909,16 +9891,12 @@ msgstr "" "l'environnement sont restaurés.\n" #: cmd.rc:245 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <répertoire> enregistre le répertoire courant sur\n" -"une pile et remplace le répertoire courant par le répertoire spécifié.\n" +"PUSHD <rép> enregistre le répertoire courant sur une pile et \n" +"remplace le répertoire courant par le répertoire spécifié.\n" #: cmd.rc:247 msgid "POPD changes current directory to the last one saved with PUSHD.\n"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: f870cc7e7ca79e2e840acb3cdd5e1cd429cb7551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f870cc7e7ca79e2e840acb3cd… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Oct 2 08:43:48 2013 +0300 po: Update Lithuanian translation. --- po/lt.po | 43 +++++++++++-------------------------------- 1 files changed, 11 insertions(+), 32 deletions(-) diff --git a/po/lt.po b/po/lt.po index ff1e375..b334193 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: 2013-06-18 22:58+0300\n" +"PO-Revision-Date: 2013-10-02 08:42+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -2256,7 +2256,7 @@ msgstr "Liudijimai" #: cryptui.rc:337 msgid "I&ntended purpose:" -msgstr "&Numatytos paskirtys:" +msgstr "&Numatytosios paskirtys:" #: cryptui.rc:341 msgid "&Import..." @@ -2272,7 +2272,7 @@ msgstr "Išs&amiau..." #: cryptui.rc:345 msgid "Certificate intended purposes" -msgstr "Liudijimo numatytos paskirtys" +msgstr "Liudijimo numatytosios paskirtys" #: cryptui.rc:347 ieframe.rc:42 shell32.rc:40 shell32.rc:117 oleview.rc:56 #: oleview.rc:58 oleview.rc:82 regedit.rc:63 taskmgr.rc:52 winefile.rc:45 @@ -8532,16 +8532,12 @@ msgstr "" "ir mėginkite vėl." #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" -"Dabartinė MIDI atvaizdžio konfigūracija kreipiasi į MIDI įrenginį, kuris " -"nėra įdiegtas sistemoje. Naudokite MIDI Mapper konfigūracijai redaguoti." +"Dabartinė MIDI atvaizdžio konfigūracija rodo į MIDI įrenginį, kuris nėra " +"įdiegtas sistemoje." #: winmm.rc:53 msgid "" @@ -9363,22 +9359,16 @@ msgstr "" "iškviestoje procedūroje paveldimi kviečiančiosios procedūros.\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" "CD <katalogas> yra trumpa CHDIR versija. Pakeičia dabartinį\n" -"numatytą katalogą.\n" +"numatytąjį katalogą.\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" -msgstr "CHDIR <katalogas> pakeičia dabartinį numatytą katalogą.\n" +msgstr "CHDIR <katalogas> pakeičia dabartinį numatytąjį katalogą.\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" @@ -9429,11 +9419,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <failas> pašalina failą ar failų rinkinį.\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9444,6 +9429,8 @@ msgstr "" "FOR komanda naudojama įvykdyti komandą kiekvienam failų aibės elementui.\n" "\n" "Sintaksė: FOR %kintamasis IN (aibė) DO komanda\n" +"\n" +"Simbolis % privalo būti dubliuotas, kai FOR naudojamas komandų faile.\n" #: cmd.rc:80 msgid "" @@ -9607,7 +9594,7 @@ msgstr "" "$q Lygybės ženklas $t Dabartinis laikas $v cmd versija\n" "\n" "Pastebėkite, kad PROMPT komandos be raginimo eilutės įvedimas atkuria\n" -"numatytą raginimo reikšmę, kuri yra dabartinis kelias (įskaitant\n" +"numatytąją raginimo reikšmę, kuri yra dabartinis kelias (įskaitant\n" "dabartinio disko raidę) ir daugiau-už (>) simbolis.\n" "(Taip pat, kaip komanda PROMPT $p$g).\n" "\n" @@ -9632,14 +9619,10 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <failas> pervadina failą.\n" #: cmd.rc:158 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" msgstr "RD <katalogas> yra trumpa RMDIR versija. Pašalina katalogą.\n" #: cmd.rc:159 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" msgstr "RMDIR <katalogas> pašalina katalogą.\n" @@ -9812,10 +9795,6 @@ msgstr "" "pasitaiko pirmiau), tada atkuriami ankstesnės aplinkos nustatymai.\n" #: cmd.rc:245 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" @@ -13924,7 +13903,7 @@ msgstr "Rašmenų &formatas" #: wordpad.rc:61 msgid "&Def. char format" -msgstr "&Numatytas rašmenų formatas" +msgstr "&Numatytasis rašmenų formatas" #: wordpad.rc:62 msgid "Paragrap&h format"

1 0

Frédéric Delanoy : wldap32: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 8610acde5cac236d9612b912ee24e60249770008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8610acde5cac236d9612b912e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 1 23:33:52 2013 +0200 wldap32: Use BOOL type where appropriate. --- dlls/wldap32/init.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index b5aed58..2c3ff7c 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -113,13 +113,12 @@ oom: } /* Determine if a URL starts with a known LDAP scheme */ -static int has_ldap_scheme( char *url ) +static BOOL has_ldap_scheme( char *url ) { - if (!strncasecmp( url, "ldap://", 7 ) || - !strncasecmp( url, "ldaps://", 8 ) || - !strncasecmp( url, "ldapi://", 8 ) || - !strncasecmp( url, "cldap://", 8 )) return 1; - return 0; + return !strncasecmp( url, "ldap://", 7 ) || + !strncasecmp( url, "ldaps://", 8 ) || + !strncasecmp( url, "ldapi://", 8 ) || + !strncasecmp( url, "cldap://", 8 ); } /* Flatten an array of hostnames into a space separated string of URLs.

1 0

Frédéric Delanoy : propsys: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 0ab0384047ecde32614110bcb909c1f07ba51fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab0384047ecde32614110bcb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 1 23:33:51 2013 +0200 propsys: Use BOOL type where appropriate. --- dlls/propsys/propsys_main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index ce9131b..8d05ad0 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -315,7 +315,7 @@ static BOOL string_to_guid(LPCWSTR s, LPGUID id) HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) { - int has_minus = 0, has_comma = 0; + BOOL has_minus = FALSE, has_comma = FALSE; TRACE("(%s, %p)\n", debugstr_w(pszString), pkey); @@ -341,7 +341,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) if (has_comma) return S_OK; else - has_comma = 1; + has_comma = TRUE; } pszString++; } @@ -357,7 +357,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) { if (*pszString == '-') { - has_minus = 1; + has_minus = TRUE; pszString++; } } @@ -372,7 +372,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) if (*pszString == '-') { - has_minus = 1; + has_minus = TRUE; pszString++; }

1 0

Michael Stefaniuc : windowscodecs/tests: Use the W version of GetObject().
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 2720e815041dcf389381c2c16d17510cfc80ff1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2720e815041dcf389381c2c16… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 1 23:22:27 2013 +0200 windowscodecs/tests: Use the W version of GetObject(). --- dlls/windowscodecs/tests/bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 3c79ce8..8de990a 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -152,7 +152,7 @@ static HBITMAP create_dib(int width, int height, int bpp, LOGPALETTE *pal, const hdib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, &bits, NULL, 0); ok(hdib != 0, "CreateDIBSection(%dx%d,%d bpp) failed\n", width, height, bpp); - GetObject(hdib, sizeof(bm), &bm); + GetObjectW(hdib, sizeof(bm), &bm); ok(bm.bmWidth == width, "expected %d, got %d\n", width, bm.bmWidth); ok(bm.bmHeight == height, "expected %d, got %d\n", height, bm.bmHeight); ok(bm.bmPlanes == 1, "expected 1, got %d\n", bm.bmPlanes);

1 0