wine-commits February 2012

wine-commits@winehq.org

2 participants
442 discussions

Frédéric Delanoy : taskmgr: Debug classes names are not translatable.
by Alexandre Julliard 08 Feb '12

08 Feb '12

Module: wine Branch: master Commit: d463243754a179b3a0389a09e5b91bd5f4d7b1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d463243754a179b3a0389a09e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 8 19:34:29 2012 +0100 taskmgr: Debug classes names are not translatable. --- po/ar.po | 196 +++++++++++++++++++----------------------- po/bg.po | 196 +++++++++++++++++++----------------------- po/ca.po | 196 +++++++++++++++++++----------------------- po/cs.po | 196 +++++++++++++++++++----------------------- po/da.po | 196 +++++++++++++++++++----------------------- po/de.po | 196 +++++++++++++++++++----------------------- po/el.po | 196 +++++++++++++++++++----------------------- po/en.po | 196 +++++++++++++++++++----------------------- po/en_US.po | 196 +++++++++++++++++++----------------------- po/eo.po | 196 +++++++++++++++++++----------------------- po/es.po | 201 ++++++++++++++++++++----------------------- po/fa.po | 196 +++++++++++++++++++----------------------- po/fi.po | 199 +++++++++++++++++++----------------------- po/fr.po | 196 +++++++++++++++++++----------------------- po/he.po | 196 +++++++++++++++++++----------------------- po/hi.po | 196 +++++++++++++++++++----------------------- po/hu.po | 197 +++++++++++++++++++----------------------- po/it.po | 196 +++++++++++++++++++----------------------- po/ja.po | 196 +++++++++++++++++++----------------------- po/ko.po | 196 +++++++++++++++++++----------------------- po/lt.po | 196 +++++++++++++++++++----------------------- po/ml.po | 196 +++++++++++++++++++----------------------- po/nb_NO.po | 196 +++++++++++++++++++----------------------- po/nl.po | 196 +++++++++++++++++++----------------------- po/or.po | 196 +++++++++++++++++++----------------------- po/pa.po | 196 +++++++++++++++++++----------------------- po/pl.po | 196 +++++++++++++++++++----------------------- po/pt_BR.po | 196 +++++++++++++++++++----------------------- po/pt_PT.po | 196 +++++++++++++++++++----------------------- po/rm.po | 196 +++++++++++++++++++----------------------- po/ro.po | 196 +++++++++++++++++++----------------------- po/ru.po | 196 +++++++++++++++++++----------------------- po/sk.po | 196 +++++++++++++++++++----------------------- po/sl.po | 196 +++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 197 +++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 197 +++++++++++++++++++----------------------- po/sv.po | 196 +++++++++++++++++++----------------------- po/te.po | 196 +++++++++++++++++++----------------------- po/th.po | 196 +++++++++++++++++++----------------------- po/tr.po | 196 +++++++++++++++++++----------------------- po/uk.po | 196 +++++++++++++++++++----------------------- po/wa.po | 196 +++++++++++++++++++----------------------- po/wine.pot | 196 +++++++++++++++++++----------------------- po/zh_CN.po | 197 +++++++++++++++++++----------------------- po/zh_TW.po | 197 +++++++++++++++++++----------------------- programs/taskmgr/dbgchnl.c | 13 +-- programs/taskmgr/resource.h | 4 - programs/taskmgr/taskmgr.rc | 4 - 48 files changed, 4057 insertions(+), 4797 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d463243754a179b3a0389…

1 0

Frédéric Delanoy : po: Remove untranslated English strings from the Danish translation.
by Alexandre Julliard 08 Feb '12

08 Feb '12

Module: wine Branch: master Commit: 534f931cc7834b2a1d28ed3992116b058d66190d URL: http://source.winehq.org/git/wine.git/?a=commit;h=534f931cc7834b2a1d28ed399… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 8 18:52:18 2012 +0100 po: Remove untranslated English strings from the Danish translation. --- po/da.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/po/da.po b/po/da.po index fa832ee..4b2fb1c 100644 --- a/po/da.po +++ b/po/da.po @@ -484,7 +484,7 @@ msgstr "&Standardprinter" #: comdlg32.rc:223 msgid "[none]" -msgstr "[none]" +msgstr "" #: comdlg32.rc:224 msgid "Specific &Printer" @@ -608,7 +608,7 @@ msgstr "&Definer selvvalgt farve >>" #: comdlg32.rc:310 regedit.rc:223 regedit.rc:233 msgid "Find" -msgstr "Find" +msgstr "" #: comdlg32.rc:313 comdlg32.rc:332 msgid "Fi&nd What:" @@ -891,7 +891,7 @@ msgstr "Oliven" #: comdlg32.rc:121 wordpad.rc:118 msgid "Navy" -msgstr "Navy" +msgstr "" #: comdlg32.rc:122 wordpad.rc:119 msgid "Purple" @@ -4571,7 +4571,7 @@ msgstr "Service login mislykkedes\n" #: winerror.mc:1226 msgid "Service start-hang\n" -msgstr "Service start-hang\n" +msgstr "" #: winerror.mc:1231 msgid "Invalid service lock\n" @@ -6293,7 +6293,7 @@ msgstr "Kan ikke få fat i kald handle\n" #: winerror.mc:3311 msgid "Null reference pointer\n" -msgstr "Null reference pointer\n" +msgstr "" #: winerror.mc:3316 msgid "Enumeration value out of range\n" @@ -7427,7 +7427,7 @@ msgstr "Kopierer filer..." #: setupapi.rc:42 msgid "Destination:" -msgstr "Destination:" +msgstr "" #: setupapi.rc:49 msgid "Files Needed" @@ -10141,7 +10141,7 @@ msgstr "Tryk Return for at fortsætte: " #: cmd.rc:321 msgid "Wine Command Prompt" -msgstr "Wine Command Prompt" +msgstr "" #: cmd.rc:322 #, fuzzy @@ -11387,7 +11387,7 @@ msgstr "&Markeret del:" #: regedit.rc:226 msgid "Find:" -msgstr "Find:" +msgstr "" #: regedit.rc:228 msgid "Find in:" @@ -12879,7 +12879,7 @@ msgstr "Vis &advanceret" #: winecfg.rc:240 msgid "De&vice:" -msgstr "De&vice:" +msgstr "" #: winecfg.rc:242 msgid "Bro&wse..." @@ -12887,7 +12887,7 @@ msgstr "G&ennemse..." #: winecfg.rc:244 msgid "&Label:" -msgstr "&Label:" +msgstr "" #: winecfg.rc:246 msgid "S&erial:"

1 0

Lauri Kenttä : po: Correct Finnish translation.
by Alexandre Julliard 08 Feb '12

08 Feb '12

Module: wine Branch: master Commit: 5840f886c6b93476d3ee99fffa792edb86a059d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5840f886c6b93476d3ee99fff… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Feb 8 03:27:13 2012 +0200 po: Correct Finnish translation. --- po/fi.po | 212 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 107 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5840f886c6b93476d3ee9…

1 0

Frédéric Delanoy : po: Remove untranslated English strings from the Polish translation.
by Alexandre Julliard 08 Feb '12

08 Feb '12

Module: wine Branch: master Commit: e55bde601a9c91c71a2fabdfa688ffd394578cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55bde601a9c91c71a2fabdfa… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 23:57:27 2012 +0100 po: Remove untranslated English strings from the Polish translation. --- po/pl.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/pl.po b/po/pl.po index 708dccc..ebbf2c8 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3063,7 +3063,7 @@ msgstr "Skopiuj wybrane" #: gphoto2.rc:32 msgid "Preview" -msgstr "Preview" +msgstr "" #: gphoto2.rc:33 msgid "Import All" @@ -3071,7 +3071,7 @@ msgstr "Skopiuj wszystkie" #: gphoto2.rc:34 msgid "Skip This Dialog" -msgstr "Skip This Dialog" +msgstr "" #: gphoto2.rc:35 msgid "Exit" @@ -7984,15 +7984,15 @@ msgstr "Przykładowe wideo" #: shell32.rc:229 msgid "Saved Games" -msgstr "Saved Games" +msgstr "" #: shell32.rc:230 msgid "Searches" -msgstr "Searches" +msgstr "" #: shell32.rc:231 msgid "Users" -msgstr "Users" +msgstr "" #: shell32.rc:233 msgid "Downloads" @@ -10926,7 +10926,7 @@ msgstr "Zmień &ikonę..." #: progman.rc:189 msgid "Change Icon" -msgstr "Change Icon" +msgstr "" #: progman.rc:191 msgid "&Filename:"

1 0

Frédéric Delanoy : po: Remove untranslated English strings from the Portuguese (Portugal) translation.
by Alexandre Julliard 08 Feb '12

08 Feb '12

Module: wine Branch: master Commit: 64f77f22edcbe2fadf643fbfa173d23124c6bf16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f77f22edcbe2fadf643fbfa… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 23:57:26 2012 +0100 po: Remove untranslated English strings from the Portuguese (Portugal) translation. --- po/pt_PT.po | 54 +++++++++++++++++++++++++++--------------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index d6db7c0..017f5d3 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -557,7 +557,7 @@ msgstr "Exemplo" #: comdlg32.rc:268 msgid "Scr&ipt:" -msgstr "Scr&ipt:" +msgstr "" #: comdlg32.rc:276 msgid "Color" @@ -674,7 +674,7 @@ msgstr "&Nome:" #: comdlg32.rc:362 comdlg32.rc:400 msgid "Status:" -msgstr "Status:" +msgstr "" #: comdlg32.rc:364 comdlg32.rc:402 msgid "Type:" @@ -1170,7 +1170,7 @@ msgstr "" #: credui.rc:45 cryptui.rc:394 msgid "&Password:" -msgstr "&Password:" +msgstr "" #: credui.rc:47 msgid "&Remember my password" @@ -1374,7 +1374,7 @@ msgstr "URL Política CA Netscape" #: crypt32.rc:66 msgid "Netscape SSL ServerName" -msgstr "Netscape SSL ServerName" +msgstr "" #: crypt32.rc:67 msgid "Netscape Comment" @@ -1592,7 +1592,7 @@ msgstr "" #: crypt32.rc:119 msgid "Dummy Signer" -msgstr "Dummy Signer" +msgstr "" #: crypt32.rc:120 msgid "Encrypted Private Key" @@ -1612,11 +1612,11 @@ msgstr "Id da transacção" #: crypt32.rc:124 msgid "Sender Nonce" -msgstr "Sender Nonce" +msgstr "" #: crypt32.rc:125 msgid "Recipient Nonce" -msgstr "Recipient Nonce" +msgstr "" #: crypt32.rc:126 msgid "Reg Info" @@ -1802,7 +1802,7 @@ msgstr "Recuperação de Ficheiros" #: crypt32.rc:159 cryptui.rc:134 msgid "Root List Signer" -msgstr "Root List Signer" +msgstr "" #: crypt32.rc:160 msgid "All application policies" @@ -1865,7 +1865,7 @@ msgstr "Certificados Desconfiáveis" #: crypt32.rc:179 msgid "KeyID=" -msgstr "KeyID=" +msgstr "" #: crypt32.rc:180 msgid "Certificate Issuer" @@ -2099,11 +2099,11 @@ msgstr "Assinatura" #: crypt32.rc:235 msgid "SSL CA" -msgstr "SSL CA" +msgstr "" #: crypt32.rc:236 msgid "S/MIME CA" -msgstr "S/MIME CA" +msgstr "" #: crypt32.rc:237 msgid "Signature CA" @@ -2614,7 +2614,7 @@ msgstr "%s (%d bits)" #: cryptui.rc:59 msgid "SHA1 hash" -msgstr "SHA1 hash" +msgstr "" #: cryptui.rc:60 msgid "Enhanced key usage (property)" @@ -7036,7 +7036,7 @@ msgstr "barra de scroll" #: oleacc.rc:31 msgid "grip" -msgstr "grip" +msgstr "" #: oleacc.rc:32 msgid "sound" @@ -7044,11 +7044,11 @@ msgstr "som" #: oleacc.rc:33 msgid "cursor" -msgstr "cursor" +msgstr "" #: oleacc.rc:34 msgid "caret" -msgstr "caret" +msgstr "" #: oleacc.rc:35 msgid "alert" @@ -7064,7 +7064,7 @@ msgstr "cliente" #: oleacc.rc:38 msgid "popup menu" -msgstr "popup menu" +msgstr "" #: oleacc.rc:39 msgid "menu item" @@ -8570,7 +8570,7 @@ msgstr "Duplex:" #: wininet.rc:39 wininet.rc:59 msgid "Realm" -msgstr "Realm" +msgstr "" #: wininet.rc:46 wininet.rc:66 msgid "&Save this password (insecure)" @@ -10247,7 +10247,7 @@ msgstr "" #: cmd.rc:321 msgid "Wine Command Prompt" -msgstr "Wine Command Prompt" +msgstr "" #: cmd.rc:322 #, fuzzy @@ -10716,7 +10716,7 @@ msgstr "Página &p" #: notepad.rc:68 msgid "Notepad" -msgstr "Notepad" +msgstr "" #: notepad.rc:69 progman.rc:61 winhlp32.rc:79 msgid "ERROR" @@ -12121,11 +12121,11 @@ msgstr "Memória kernel (K)" #: taskmgr.rc:382 taskmgr.rc:290 msgid "Handles" -msgstr "Handles" +msgstr "" #: taskmgr.rc:383 taskmgr.rc:291 msgid "Threads" -msgstr "Threads" +msgstr "" #: taskmgr.rc:384 taskmgr.rc:263 msgid "Processes" @@ -12137,11 +12137,11 @@ msgstr "Total" #: taskmgr.rc:392 msgid "Limit" -msgstr "Limit" +msgstr "" #: taskmgr.rc:393 msgid "Peak" -msgstr "Peak" +msgstr "" #: taskmgr.rc:402 msgid "System Cache" @@ -12664,15 +12664,15 @@ msgstr "Tamanho da VM" #: taskmgr.rc:287 msgid "Paged Pool" -msgstr "Paged Pool" +msgstr "" #: taskmgr.rc:288 msgid "NP Pool" -msgstr "NP Pool" +msgstr "" #: taskmgr.rc:289 msgid "Base Pri" -msgstr "Base Pri" +msgstr "" #: taskmgr.rc:301 msgid "Task Manager Warning" @@ -14440,7 +14440,7 @@ msgstr "in" #: wordpad.rc:174 msgid "inch" -msgstr "inch" +msgstr "" #: wordpad.rc:175 #, fuzzy

1 0

Akihiro Sagawa : gdi32: Consider whether the logical font face is vertical when selecting.
by Alexandre Julliard 08 Feb '12

08 Feb '12

Module: wine Branch: master Commit: 286854fb06aaf68ab43cc175555d927df96bc6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=286854fb06aaf68ab43cc1755… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Feb 9 01:33:00 2012 +0900 gdi32: Consider whether the logical font face is vertical when selecting. --- dlls/gdi32/freetype.c | 9 ++++++--- dlls/gdi32/tests/font.c | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 55c82ba..5e6a952 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3982,7 +3982,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) INT height, width = 0; unsigned int score = 0, new_score; signed int diff = 0, newdiff; - BOOL bd, it, can_use_bitmap; + BOOL bd, it, can_use_bitmap, want_vertical; LOGFONTW lf; CHARSETINFO csi; HFONTLIST *hflist; @@ -4163,6 +4163,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) lf.lfCharSet = csi.ciCharset; } + want_vertical = (lf.lfFaceName[0] == '@'); + /* Face families are in the top 4 bits of lfPitchAndFamily, so mask with 0xF0 before testing */ @@ -4192,7 +4194,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) family = LIST_ENTRY(family_elem_ptr, Family, entry); LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); - if(csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) { + if(face->vertical == want_vertical && + (csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0]))) { if(face->scalable) goto found; if(can_use_bitmap && !last_resort_family) @@ -4211,7 +4214,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) family = LIST_ENTRY(family_elem_ptr, Family, entry); LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); - if(face->scalable) { + if(face->scalable && face->vertical == want_vertical) { csi.fs.fsCsb[0] = 0; WARN("just using first face for now\n"); goto found; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 52a1873..307493b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4205,7 +4205,7 @@ static void test_east_asian_font_selection(void) hfont = SelectObject(hdc, hfont); memset(face_name, 0, sizeof face_name); ret = GetTextFaceA(hdc, sizeof face_name, face_name); - todo_wine ok(ret && face_name[0] != '@', + ok(ret && face_name[0] != '@', "expected non-vertical face for charset %u, got %s\n", charset[i], face_name); DeleteObject(SelectObject(hdc, hfont));

1 0

Akihiro Sagawa : gdi32/tests: Add tests for East Asian font selection.
by Alexandre Julliard 08 Feb '12

08 Feb '12

Module: wine Branch: master Commit: c683ad72b25443377f612548e3828744df0e64fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c683ad72b25443377f612548e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Feb 9 01:32:58 2012 +0900 gdi32/tests: Add tests for East Asian font selection. --- dlls/gdi32/tests/font.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 8d30cdb..52a1873 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4166,6 +4166,63 @@ static void test_vertical_font(void) DeleteFile(ttf_name); } +static INT CALLBACK has_vertical_font_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, + DWORD type, LPARAM lParam) +{ + if (lf->lfFaceName[0] == '@') { + return 0; + } + return 1; +} + +static void test_east_asian_font_selection(void) +{ + HDC hdc; + UINT charset[] = { SHIFTJIS_CHARSET, HANGEUL_CHARSET, JOHAB_CHARSET, + GB2312_CHARSET, CHINESEBIG5_CHARSET }; + size_t i; + + hdc = GetDC(NULL); + + for (i = 0; i < sizeof(charset)/sizeof(charset[0]); i++) + { + LOGFONTA lf; + HFONT hfont; + char face_name[LF_FACESIZE]; + int ret; + + memset(&lf, 0, sizeof lf); + lf.lfFaceName[0] = '\0'; + lf.lfCharSet = charset[i]; + + if (EnumFontFamiliesEx(hdc, &lf, has_vertical_font_proc, 0, 0)) + { + skip("Vertical font for charset %u is not installed\n", charset[i]); + continue; + } + + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + memset(face_name, 0, sizeof face_name); + ret = GetTextFaceA(hdc, sizeof face_name, face_name); + todo_wine ok(ret && face_name[0] != '@', + "expected non-vertical face for charset %u, got %s\n", charset[i], face_name); + DeleteObject(SelectObject(hdc, hfont)); + + memset(&lf, 0, sizeof lf); + strcpy(lf.lfFaceName, "@"); + lf.lfCharSet = charset[i]; + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + memset(face_name, 0, sizeof face_name); + ret = GetTextFaceA(hdc, sizeof face_name, face_name); + ok(ret && face_name[0] == '@', + "expected vertical face for charset %u, got %s\n", charset[i], face_name); + DeleteObject(SelectObject(hdc, hfont)); + } + ReleaseDC(NULL, hdc); +} + START_TEST(font) { init(); @@ -4220,6 +4277,7 @@ START_TEST(font) test_fullname(); test_vertical_font(); + test_east_asian_font_selection(); /* CreateScalableFontResource should be last test until RemoveFontResource * is properly implemented. */

1 0

Huw Davies : shell32: Don't try to check for the folder' s existence if we don't have a path.
by Alexandre Julliard 08 Feb '12

08 Feb '12

Module: wine Branch: master Commit: 9ae17687c0654e89b702c4b7bc7a2e93f85321d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae17687c0654e89b702c4b7b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 8 16:52:17 2012 +0000 shell32: Don't try to check for the folder's existence if we don't have a path. --- dlls/shell32/shellpath.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8c66646..16ca6a3 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3544,6 +3544,8 @@ static HRESULT get_known_folder_path_by_id( else hr = SHGetKnownFolderPath( folderId, dwFlags, NULL, ppszPath ); + if (FAILED(hr)) return hr; + /* check if known folder really exists */ dwAttributes = GetFileAttributesW(*ppszPath); if(dwAttributes == INVALID_FILE_ATTRIBUTES || !(dwAttributes & FILE_ATTRIBUTE_DIRECTORY) )

1 0

Huw Davies : shell32: Zero-init the out parameter and fix the error if the folder id is invalid.
by Alexandre Julliard 08 Feb '12

08 Feb '12

Module: wine Branch: master Commit: 8272045cd84c304c07ccc4273f1cd544cd20b209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8272045cd84c304c07ccc4273… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 8 16:52:16 2012 +0000 shell32: Zero-init the out parameter and fix the error if the folder id is invalid. --- dlls/shell32/shellpath.c | 4 +++- dlls/shell32/tests/shellpath.c | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8d1c70b..8c66646 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3041,8 +3041,10 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t TRACE("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, path); + *path = NULL; + if (index < 0) - return E_INVALIDARG; + return HRESULT_FROM_WIN32( ERROR_FILE_NOT_FOUND ); if (flags & KF_FLAG_CREATE) index |= CSIDL_FLAG_CREATE; diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 91e9f35..1798ada 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -860,6 +860,12 @@ if (0) { /* crashes */ hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); } + /* non-existent folder id */ + path = (void *)0xdeadbeef; + hr = pSHGetKnownFolderPath(&IID_IOleObject, 0, NULL, &path); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(path == NULL, "got %p\n", path); + path = NULL; hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, &path); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr);

1 0

Alexandre Julliard : services: Don' t close the overlapped event when terminating a service.
by Alexandre Julliard 08 Feb '12

08 Feb '12

Module: wine Branch: master Commit: 154aef98d88f16acbcc029d298cc21227b87d305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=154aef98d88f16acbcc029d29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 8 13:19:04 2012 -0600 services: Don't close the overlapped event when terminating a service. An overlapping I/O operation may still be in progress. --- programs/services/services.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 86d4d8c..5d8e40f 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -861,8 +861,6 @@ void service_terminate(struct service_entry *service) TerminateProcess(service->process, 0); CloseHandle(service->process); service->process = NULL; - CloseHandle(service->overlapped_event); - service->overlapped_event = NULL; CloseHandle(service->status_changed_event); service->status_changed_event = NULL; CloseHandle(service->control_mutex);

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2012