February 2012 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLDocument2::get_frames implementation.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: 976a3d5e08d595795ec3c9b7b9f9ca75fbac9e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=976a3d5e08d595795ec3c9b7b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 8 15:58:21 2012 +0100 mshtml: Added IHTMLDocument2::get_frames implementation. --- dlls/mshtml/htmldoc.c | 6 ++++-- dlls/mshtml/tests/dom.c | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 039893e..46838d6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -471,8 +471,10 @@ static HRESULT WINAPI HTMLDocument_get_readyState(IHTMLDocument2 *iface, BSTR *p static HRESULT WINAPI HTMLDocument_get_frames(IHTMLDocument2 *iface, IHTMLFramesCollection2 **p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLWindow2_get_frames(&This->window->IHTMLWindow2_iface, p); } static HRESULT WINAPI HTMLDocument_get_embeds(IHTMLDocument2 *iface, IHTMLElementCollection **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6ceb9ea..8df47cc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5913,6 +5913,14 @@ static void test_frameset(IHTMLDocument2 *doc) test_frames_collection(frames, "fr1"); IHTMLFramesCollection2_Release(frames); + hres = IHTMLDocument2_get_frames(doc, &frames); + ok(hres == S_OK, "IHTMLDocument2_get_frames failed: 0x%08x\n", hres); + if(FAILED(hres)) + return; + + test_frames_collection(frames, "fr1"); + IHTMLFramesCollection2_Release(frames); + /* test using IHTMLWindow2 inheritance */ test_frames_collection((IHTMLFramesCollection2*)window, "fr2");

1 0

Akihiro Sagawa : gdi32/tests: Add tests for East Asian font selection.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

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

Akihiro Sagawa : gdi32: Consider whether the logical font face is vertical when selecting.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

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

Alexandre Julliard : user32: Draw the mask with SRCCOPY in DrawIcon when the image isn't being drawn.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: 8ab65c222e39e4c5cb6ce8ae943c982f93910487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab65c222e39e4c5cb6ce8ae9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 8 11:00:51 2012 -0600 user32: Draw the mask with SRCCOPY in DrawIcon when the image isn't being drawn. --- dlls/user32/cursoricon.c | 3 ++- dlls/user32/tests/cursoricon.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 3a23a47..6002bbb 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2317,9 +2317,10 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (flags & DI_MASK) { + DWORD rop = (flags & DI_IMAGE) ? SRCAND : SRCCOPY; SelectObject( hMemDC, frame->mask ); StretchBlt( hdc_dest, x, y, cxWidth, cyWidth, - hMemDC, 0, 0, frame->width, frame->height, SRCAND ); + hMemDC, 0, 0, frame->width, frame->height, rop ); } if (flags & DI_IMAGE) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 4a570ae..61937e8 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1926,8 +1926,8 @@ static void test_DrawIconEx(void) check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, 0, 0x00102030, 0x00102030, 0x00102030, __LINE__); check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, 0, 0x00102030, 0x00102030, 0x00102030, __LINE__); - check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_MASK, 0x00FFFFFF, 0x00000000, 0x00000000, __LINE__); - check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_MASK, 0x00FFFFFF, 0x00FFFFFF, 0x00FFFFFF, __LINE__); + check_DrawIconEx(hdcDst, FALSE, 0x80A0B0C0, 32, DI_MASK, 0x00123456, 0x00000000, 0x00000000, __LINE__); + check_DrawIconEx(hdcDst, TRUE, 0x80A0B0C0, 32, DI_MASK, 0x00123456, 0x00FFFFFF, 0x00FFFFFF, __LINE__); check_DrawIconEx(hdcDst, FALSE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__); check_DrawIconEx(hdcDst, TRUE, 0x00A0B0C0, 32, DI_IMAGE, 0x00FFFFFF, 0x00C0B0A0, 0x00C0B0A0, __LINE__);

1 0

Alexandre Julliard : winecoreaudio: Fix spec file parameters.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: 9ac28c8f3630b9da21e24f0cd0267ed64016f134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac28c8f3630b9da21e24f0cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 7 21:27:56 2012 -0600 winecoreaudio: Fix spec file parameters. --- dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec index 489fd77..0f208e9 100644 --- a/dlls/winecoreaudio.drv/winecoreaudio.drv.spec +++ b/dlls/winecoreaudio.drv/winecoreaudio.drv.spec @@ -5,6 +5,6 @@ # MMDevAPI driver functions @ stdcall -private GetPriority() AUDDRV_GetPriority -@ stdcall -private GetEndpointIDs(long ptr ptr ptr) AUDDRV_GetEndpointIDs -@ stdcall -private GetAudioEndpoint(str long ptr) AUDDRV_GetAudioEndpoint +@ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs +@ stdcall -private GetAudioEndpoint(str ptr long ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager

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 Feb. 8, 2012

Feb. 8, 2012

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

Alexandre Julliard : services: Don' t close the overlapped event when terminating a service.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

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

Frédéric Delanoy : po: Remove untranslated English strings from the Portuguese (Portugal) translation.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

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

Aric Stewart : gdi32: Allow font replacements to be specified either in localized name or English name .
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: f83762e678d9c9475bb4ed2912320d32c3c092ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83762e678d9c9475bb4ed291… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 8 08:18:27 2012 -0600 gdi32: Allow font replacements to be specified either in localized name or English name. --- dlls/gdi32/freetype.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2a99742..55c82ba 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -937,6 +937,21 @@ static Family *find_family_from_name(const WCHAR *name) return NULL; } +static Family *find_family_from_any_name(const WCHAR *name) +{ + Family *family; + + LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) + { + if(!strcmpiW(family->FamilyName, name)) + return family; + if(family->EnglishName && !strcmpiW(family->EnglishName, name)) + return family; + } + + return NULL; +} + static void DumpSubstList(void) { FontSubst *psub; @@ -1888,13 +1903,13 @@ static void LoadReplaceList(void) /* "NewName"="Oldname" */ WideCharToMultiByte(CP_ACP, 0, value, -1, familyA, sizeof(familyA), NULL, NULL); - if(!find_family_from_name(value)) + if(!find_family_from_any_name(value)) { /* Find the old family and hence all of the font files in that family */ LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - if(!strcmpiW(family->FamilyName, data)) { + if(!strcmpiW(family->FamilyName, data) || (family->EnglishName && !strcmpiW(family->EnglishName, data))) { LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); TRACE("mapping %s %s to %s\n", debugstr_w(family->FamilyName),

1 0

Huw Davies : shell32: Zero-init the out parameter and fix the error if the folder id is invalid.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

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

Lauri Kenttä : po: Correct Finnish translation.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

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

Nikolay Sivov : comctl32: Invalidate before item is removed.
by Alexandre Julliard Feb. 8, 2012

Feb. 8, 2012

Module: wine Branch: master Commit: b32b969eb6d13a60f59b9052807d372a8bd448f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32b969eb6d13a60f59b90528… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 12:05:45 2012 +0300 comctl32: Invalidate before item is removed. --- dlls/comctl32/tab.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index ad27b8a..f00ecd3 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2879,14 +2879,13 @@ static LRESULT TAB_DeleteItem (TAB_INFO *infoPtr, INT iItem) if (iItem < 0 || iItem >= infoPtr->uNumItem) return FALSE; + TAB_InvalidateTabArea(infoPtr); item = TAB_GetItem(infoPtr, iItem); Free(item->pszText); Free(item); infoPtr->uNumItem--; DPA_DeletePtr(infoPtr->items, iItem); - TAB_InvalidateTabArea(infoPtr); - if (infoPtr->uNumItem == 0) { if (infoPtr->iHotTracked >= 0)

1 0

Joerg Schiermeier : Update for the url to the webpage of ' Software Freedom Conservancy'
by Jeremy Newman Feb. 8, 2012

Feb. 8, 2012

Module: website Branch: master Commit: 39d0f513c53f08fd0a2fa338daedaf05f3656f59 URL: http://source.winehq.org/git/website.git/?a=commit;h=39d0f513c53f08fd0a2fa3… Author: Joerg Schiermeier <project(a)Schiermeier-Software.de> Date: Wed Feb 8 15:41:01 2012 -0600 Update for the url to the webpage of 'Software Freedom Conservancy' --- templates/de/contributing.template | 2 +- templates/he/contributing.template | 2 +- templates/pt/contributing.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/de/contributing.template b/templates/de/contributing.template index 18601bd..8ea94e5 100644 --- a/templates/de/contributing.template +++ b/templates/de/contributing.template @@ -339,7 +339,7 @@ Anerkennung der Wine Entwickler demonstrieren. Die Einnahmen werden für Entwickler-Treffen wie z.B. zukünftige Wine Konferenzen verwendet, oder in einigen Fällen, um Dokumentation zu kaufen. -Die Organisation <a href="http://conservancy.softwarefreedom.org/"> +Die Organisation <a href="http://www.sfconservancy.org/"> Software Freedom Conservancy (en)</a> verwaltet momentan unsere Spenden. Falls Du Fragen hast oder sonstige Hilfestellung brauchst, besuch bitte die SFC Website. diff --git a/templates/he/contributing.template b/templates/he/contributing.template index 2091c0f..1a99900 100644 --- a/templates/he/contributing.template +++ b/templates/he/contributing.template @@ -302,7 +302,7 @@ developers by collecting funds for developer meetings, such as Wine Conferences, or in some cases to purchase documentation. The organization that currently manages our donations is the -<a href="http://conservancy.softwarefreedom.org/">Software Freedom +<a href="http://www.sfconservancy.org/">Software Freedom Conservancy</a>. If you have any questions or are otherwise in need of further assistance please visit the SFC site. diff --git a/templates/pt/contributing.template b/templates/pt/contributing.template index 3c25e82..632ca94 100644 --- a/templates/pt/contributing.template +++ b/templates/pt/contributing.template @@ -324,7 +324,7 @@ ou em alguns casos para comprar documentação. A organização que regula actualmente as nossas doações é a -<a href="http://conservancy.softwarefreedom.org/">Software Freedom Conservancy</a>. +<a href="http://www.sfconservancy.org/">Software Freedom Conservancy</a>. Se tiver alguma questão ou precisar de mais esclarecimentos por favor visite o site da SFC.

1 0

Akihiro Sagawa : gdi32: Restore the vertical font flag from the cache.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: d53dc01143391d8524db37960cdd21bd99589524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53dc01143391d8524db37960… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 8 00:03:40 2012 +0900 gdi32: Restore the vertical font flag from the cache. --- dlls/gdi32/freetype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ce9556d..2a99742 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1197,6 +1197,7 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) face->StyleName = strdupW(face_name); face->family = family; + face->vertical = (family->FamilyName[0] == '@'); if(RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, NULL, &needed) == ERROR_SUCCESS) {

1 0

Andrew Eikum : winmm: TRACE unhandled messages.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 74d6990494af532c7611a2887b02fbdc75592231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d6990494af532c7611a2887… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 7 10:07:57 2012 -0600 winmm: TRACE unhandled messages. --- dlls/winmm/waveform.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 50c60ef..d7d2be6 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2799,6 +2799,8 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, return MMSYSERR_NOERROR; } + TRACE("Message not supported: %u\n", uMessage); + return MMSYSERR_NOTSUPPORTED; } @@ -3173,6 +3175,8 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, return MMSYSERR_NOERROR; } + TRACE("Message not supported: %u\n", uMessage); + return MMSYSERR_NOTSUPPORTED; }

1 0

Andrew Eikum : wineoss.drv: Downgrade most ERRs to WARNs.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 67617c78a55d5e14df4759927f4f839e538f1853 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67617c78a55d5e14df4759927… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 7 10:07:38 2012 -0600 wineoss.drv: Downgrade most ERRs to WARNs. --- dlls/wineoss.drv/mmdevdrv.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 35ff7d7..5f8c4ac 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -491,7 +491,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(char *devnode, IMMDevice *dev, return E_INVALIDARG; } if(This->fd < 0){ - ERR("Unable to open device %s: %d (%s)\n", devnode, errno, + WARN("Unable to open device %s: %d (%s)\n", devnode, errno, strerror(errno)); HeapFree(GetProcessHeap(), 0, This); return AUDCLNT_E_DEVICE_INVALIDATED; @@ -501,7 +501,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(char *devnode, IMMDevice *dev, This->ai.dev = -1; if(ioctl(This->fd, SNDCTL_ENGINEINFO, &This->ai) < 0){ - ERR("Unable to get audio info for device %s: %d (%s)\n", devnode, + WARN("Unable to get audio info for device %s: %d (%s)\n", devnode, errno, strerror(errno)); close(This->fd); HeapFree(GetProcessHeap(), 0, This); @@ -1106,7 +1106,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, fd = open(This->devnode, O_RDONLY | O_NONBLOCK, 0); if(fd < 0){ - ERR("Unable to open device %s: %d (%s)\n", This->devnode, errno, + WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); return AUDCLNT_E_DEVICE_INVALIDATED; } @@ -1161,7 +1161,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->Format.wBitsPerSample = 24; fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; }else{ - ERR("Didn't recognize any available OSS formats: %x\n", formats); + WARN("Didn't recognize any available OSS formats: %x\n", formats); CoTaskMemFree(fmt); return E_FAIL; }

1 0

Austin English : kernel32: Add support for IOCTL_STORAGE_CHECK_VERIFY2.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 93ed8a062d659a06340864568865601efa80ca7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=93ed8a062d659a06340864568… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 7 11:42:42 2012 -0800 kernel32: Add support for IOCTL_STORAGE_CHECK_VERIFY2. --- dlls/ntdll/cdrom.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 2722998..802782b 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -182,6 +182,7 @@ X(IOCTL_SCSI_GET_INQUIRY_DATA) X(IOCTL_SCSI_PASS_THROUGH) X(IOCTL_SCSI_PASS_THROUGH_DIRECT) X(IOCTL_STORAGE_CHECK_VERIFY) +X(IOCTL_STORAGE_CHECK_VERIFY2) X(IOCTL_STORAGE_EJECTION_CONTROL) X(IOCTL_STORAGE_EJECT_MEDIA) X(IOCTL_STORAGE_GET_DEVICE_NUMBER) @@ -2857,9 +2858,10 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, switch (dwIoControlCode) { - case IOCTL_STORAGE_CHECK_VERIFY: case IOCTL_CDROM_CHECK_VERIFY: case IOCTL_DISK_CHECK_VERIFY: + case IOCTL_STORAGE_CHECK_VERIFY: + case IOCTL_STORAGE_CHECK_VERIFY2: sz = 0; CDROM_ClearCacheEntry(dev); if (lpInBuffer != NULL || nInBufferSize != 0 || lpOutBuffer != NULL || nOutBufferSize != 0)

1 0

Andrew Eikum : winmm: Downgrade most ERRs to WARNs.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: be7a93cf56e8a8a54d2ec08760e4e32d18ce04bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7a93cf56e8a8a54d2ec0876… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 7 10:07:49 2012 -0600 winmm: Downgrade most ERRs to WARNs. --- dlls/winmm/waveform.c | 86 ++++++++++++++++++++++++------------------------ 1 files changed, 43 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be7a93cf56e8a8a54d2ec…

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in the Slovenian translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: a91464b05d7334a96e1408c8960dbe729b779eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91464b05d7334a96e1408c89… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 10:30:03 2012 +0100 po: Fix some trailing ellipses errors in the Slovenian translation. --- po/sl.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/sl.po b/po/sl.po index 58be381..f7e2f25 100644 --- a/po/sl.po +++ b/po/sl.po @@ -6756,7 +6756,7 @@ msgstr "&Nastavi ..." #: msvfw32.rc:40 msgid "&About" -msgstr "&O ..." +msgstr "&O" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -12599,7 +12599,7 @@ msgstr "&Dodaj ..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "&Samodejno zaznaj ..." +msgstr "&Samodejno zaznaj" #: winecfg.rc:232 msgid "&Path:" @@ -13299,7 +13299,7 @@ msgstr "Preime&nuj ..." #: winefile.rc:31 msgid "Propert&ies\tAlt+Enter" -msgstr "&Lastnosti ...\tAlt+Enter" +msgstr "&Lastnosti\tAlt+Enter" #: winefile.rc:33 msgid "&Run..."

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Brazilian Portuguese translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 78ce1bd0c3e6f022f324eb517e753578128209e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ce1bd0c3e6f022f324eb517… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:10 2012 +0100 po: Fix some trailing ellipses errors in Brazilian Portuguese translation. --- po/pt_BR.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index dfcf031..cdee8a5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10818,7 +10818,7 @@ msgstr "&Copiar...\tF8" #: progman.rc:35 msgid "&Properties\tAlt+Enter" -msgstr "&Propriedades...\tAlt+Enter" +msgstr "&Propriedades\tAlt+Enter" #: progman.rc:37 msgid "&Execute..."

1 0

Huw Davies : ole32: Don't hold a ref to the drop target in the wrapper. Apps tend to destroy the target object without calling RevokeDragDrop.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 5c8edb0449f6c261b9d7d1756011a08decd4c081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8edb0449f6c261b9d7d1756… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 7 12:02:26 2012 +0000 ole32: Don't hold a ref to the drop target in the wrapper. Apps tend to destroy the target object without calling RevokeDragDrop. --- dlls/ole32/ole2.c | 72 +++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 53 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index b449a76..cb667c9 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -382,10 +382,12 @@ static HRESULT create_stream_from_map(HANDLE map, IStream **stream) * IDropTarget::QueryInterface(). Windows doesn't expose this because it * doesn't call CoMarshallInterface() in RegisterDragDrop(). * The wrapper is only used internally, and only exists for the life of - * the marshal. */ + * the marshal. We don't want to hold a ref on the app provided target + * as some apps destroy this prior to CoUninitialize without calling + * RevokeDragDrop. The only (long-term) ref is held by the window prop. */ typedef struct { IDropTarget IDropTarget_iface; - IDropTarget* inner; + HWND hwnd; LONG refs; } DropTargetWrapper; @@ -420,22 +422,34 @@ static ULONG WINAPI DropTargetWrapper_Release(IDropTarget* iface) { DropTargetWrapper* This = impl_from_IDropTarget(iface); ULONG refs = InterlockedDecrement(&This->refs); - if (!refs) - { - IDropTarget_Release(This->inner); - HeapFree(GetProcessHeap(), 0, This); - } + if (!refs) HeapFree(GetProcessHeap(), 0, This); return refs; } +static inline HRESULT get_target_from_wrapper( IDropTarget *wrapper, IDropTarget **target ) +{ + DropTargetWrapper* This = impl_from_IDropTarget( wrapper ); + *target = GetPropW( This->hwnd, prop_oledroptarget ); + if (!*target) return DRAGDROP_E_NOTREGISTERED; + IDropTarget_AddRef( *target ); + return S_OK; +} + static HRESULT WINAPI DropTargetWrapper_DragEnter(IDropTarget* iface, IDataObject* pDataObj, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect) { - DropTargetWrapper* This = impl_from_IDropTarget(iface); - return IDropTarget_DragEnter(This->inner, pDataObj, grfKeyState, pt, pdwEffect); + IDropTarget *target; + HRESULT r = get_target_from_wrapper( iface, &target ); + + if (SUCCEEDED( r )) + { + r = IDropTarget_DragEnter( target, pDataObj, grfKeyState, pt, pdwEffect ); + IDropTarget_Release( target ); + } + return r; } static HRESULT WINAPI DropTargetWrapper_DragOver(IDropTarget* iface, @@ -443,14 +457,28 @@ static HRESULT WINAPI DropTargetWrapper_DragOver(IDropTarget* iface, POINTL pt, DWORD* pdwEffect) { - DropTargetWrapper* This = impl_from_IDropTarget(iface); - return IDropTarget_DragOver(This->inner, grfKeyState, pt, pdwEffect); + IDropTarget *target; + HRESULT r = get_target_from_wrapper( iface, &target ); + + if (SUCCEEDED( r )) + { + r = IDropTarget_DragOver( target, grfKeyState, pt, pdwEffect ); + IDropTarget_Release( target ); + } + return r; } static HRESULT WINAPI DropTargetWrapper_DragLeave(IDropTarget* iface) { - DropTargetWrapper* This = impl_from_IDropTarget(iface); - return IDropTarget_DragLeave(This->inner); + IDropTarget *target; + HRESULT r = get_target_from_wrapper( iface, &target ); + + if (SUCCEEDED( r )) + { + r = IDropTarget_DragLeave( target ); + IDropTarget_Release( target ); + } + return r; } static HRESULT WINAPI DropTargetWrapper_Drop(IDropTarget* iface, @@ -459,8 +487,15 @@ static HRESULT WINAPI DropTargetWrapper_Drop(IDropTarget* iface, POINTL pt, DWORD* pdwEffect) { - DropTargetWrapper* This = impl_from_IDropTarget(iface); - return IDropTarget_Drop(This->inner, pDataObj, grfKeyState, pt, pdwEffect); + IDropTarget *target; + HRESULT r = get_target_from_wrapper( iface, &target ); + + if (SUCCEEDED( r )) + { + r = IDropTarget_Drop( target, pDataObj, grfKeyState, pt, pdwEffect ); + IDropTarget_Release( target ); + } + return r; } static const IDropTargetVtbl DropTargetWrapperVTbl = @@ -474,15 +509,14 @@ static const IDropTargetVtbl DropTargetWrapperVTbl = DropTargetWrapper_Drop }; -static IDropTarget* WrapDropTarget(IDropTarget* inner) +static IDropTarget* WrapDropTarget( HWND hwnd ) { DropTargetWrapper* This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (This) { - IDropTarget_AddRef(inner); This->IDropTarget_iface.lpVtbl = &DropTargetWrapperVTbl; - This->inner = inner; + This->hwnd = hwnd; This->refs = 1; } return &This->IDropTarget_iface; @@ -562,7 +596,7 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) if(FAILED(hr)) return hr; /* IDropTarget::QueryInterface() shouldn't be called, some (broken) apps depend on this. */ - wrapper = WrapDropTarget(pDropTarget); + wrapper = WrapDropTarget( hwnd ); if(!wrapper) { IStream_Release(stream);

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Russian translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: ed3c69091054505a199683d321940013cc7ba533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3c69091054505a199683d32… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:18 2012 +0100 po: Fix some trailing ellipses errors in Russian translation. --- po/ru.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ru.po b/po/ru.po index 4bc676f..61e20a3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6751,7 +6751,7 @@ msgstr "&Настройки..." #: msvfw32.rc:40 msgid "&About" -msgstr "&Информация..." +msgstr "&Информация" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -10765,7 +10765,7 @@ msgstr "&Создать..." #: progman.rc:31 msgid "O&pen\tEnter" -msgstr "О&ткрыть...\tEnter" +msgstr "О&ткрыть\tEnter" #: progman.rc:32 winefile.rc:27 msgid "&Move...\tF7"

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Italian translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 6900853f91c1e1da66f69156a88e813e1c2da600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6900853f91c1e1da66f69156a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:12 2012 +0100 po: Fix some trailing ellipses errors in Italian translation. --- po/it.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/it.po b/po/it.po index 8256063..088d8d4 100644 --- a/po/it.po +++ b/po/it.po @@ -10828,7 +10828,7 @@ msgstr "&Copia...\tF8" #: progman.rc:35 msgid "&Properties\tAlt+Enter" -msgstr "Propri&età...\tAlt+Invio" +msgstr "Propri&età\tAlt+Invio" #: progman.rc:37 msgid "&Execute..." @@ -13326,7 +13326,7 @@ msgstr "Ri&nomina..." #: winefile.rc:31 msgid "Propert&ies\tAlt+Enter" -msgstr "Propri&età...\tAlt+Invio" +msgstr "Propri&età\tAlt+Invio" #: winefile.rc:33 msgid "&Run..."

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Norwegian Bokmål translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: c6b237896ca9a834fcc9a951babb2b9ae641b31e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b237896ca9a834fcc9a951b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:15 2012 +0100 po: Fix some trailing ellipses errors in Norwegian Bokmål translation. --- po/nb_NO.po | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 60d146c..65a8874 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -2269,8 +2269,9 @@ msgid "&File name:" msgstr "&Filnavn:" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 +#, fuzzy msgid "B&rowse..." -msgstr "Bla" +msgstr "Bla..." #: cryptui.rc:294 #, fuzzy @@ -6983,7 +6984,7 @@ msgstr "&Oppsett..." #: msvfw32.rc:40 msgid "&About" -msgstr "O&m..." +msgstr "O&m" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -8028,7 +8029,7 @@ msgstr "&Åpne:" #: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:132 msgid "&Browse..." -msgstr "&Bla" +msgstr "&Bla..." #: shell32.rc:135 shell32.rc:139 winefile.rc:107 msgid "Size" @@ -9496,8 +9497,9 @@ msgid "Digi&tal" msgstr "Digi&tal" #: clock.rc:32 notepad.rc:50 winecfg.rc:289 winefile.rc:60 wordpad.rc:81 +#, fuzzy msgid "&Font..." -msgstr "Skrift" +msgstr "Skrift..." #: clock.rc:34 msgid "&Without Titlebar" @@ -12848,7 +12850,7 @@ msgstr "Gjeldende overstyringer:" #: winecfg.rc:190 msgid "&Edit..." -msgstr "R&ediger" +msgstr "R&ediger..." #: winecfg.rc:196 msgid "Edit Override" @@ -12902,7 +12904,7 @@ msgstr "&Legg til..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "&Automatisk..." +msgstr "&Automatisk" #: winecfg.rc:232 msgid "&Path:" @@ -13867,7 +13869,7 @@ msgstr "&Ekspert" #: winemine.rc:42 msgid "&Custom..." -msgstr "E&gendefinert" +msgstr "E&gendefinert..." #: winemine.rc:44 #, fuzzy @@ -13984,8 +13986,9 @@ msgid "Always on &top" msgstr "All&tid øverst" #: winhlp32.rc:56 +#, fuzzy msgid "&About Wine Help" -msgstr "&Informasjon..." +msgstr "&Informasjon" #: winhlp32.rc:64 msgid "Annotation..."

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Portuguese translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: a4c2d85b164ea531997893d9e58c1822e525b369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c2d85b164ea531997893d9e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:17 2012 +0100 po: Fix some trailing ellipses errors in Portuguese translation. --- po/pt_PT.po | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 566b5b4..d6db7c0 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -2281,7 +2281,7 @@ msgstr "&Nome do ficheiro:" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 msgid "B&rowse..." -msgstr "P&rocurar" +msgstr "P&rocurar..." #: cryptui.rc:294 #, fuzzy @@ -6991,7 +6991,7 @@ msgstr "Con&figurar..." #: msvfw32.rc:40 msgid "&About" -msgstr "&Sobre..." +msgstr "&Sobre" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -8039,7 +8039,7 @@ msgstr "&Abrir:" #: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:132 msgid "&Browse..." -msgstr "&Procurar" +msgstr "&Procurar..." #: shell32.rc:135 shell32.rc:139 winefile.rc:107 msgid "Size" @@ -9540,7 +9540,7 @@ msgstr "Digi&tal" #: clock.rc:32 notepad.rc:50 winecfg.rc:289 winefile.rc:60 wordpad.rc:81 msgid "&Font..." -msgstr "Tipo de &Letra" +msgstr "Tipo de &Letra..." #: clock.rc:34 msgid "&Without Titlebar" @@ -10511,7 +10511,7 @@ msgstr "Serviços dependentes estão a correr\n" #: notepad.rc:27 msgid "&New\tCtrl+N" -msgstr "&Novo..." +msgstr "&Novo\tCtrl+N" #: notepad.rc:28 wordpad.rc:29 #, fuzzy @@ -10624,7 +10624,7 @@ msgstr "&Conteúdo" #: notepad.rc:59 msgid "&About Notepad" -msgstr "&Acerca do Notepad..." +msgstr "&Acerca do Notepad" #: notepad.rc:97 msgid "Page Setup" @@ -11481,7 +11481,7 @@ msgstr "&Dividir" #: regedit.rc:74 msgid "&Remove Favorite..." -msgstr "&Remover Favorito" +msgstr "&Remover Favorito..." #: regedit.rc:79 msgid "&About Registry Editor" @@ -12945,7 +12945,7 @@ msgstr "Substituições E&xistentes:" #: winecfg.rc:190 msgid "&Edit..." -msgstr "&Editar" +msgstr "&Editar..." #: winecfg.rc:196 msgid "Edit Override" @@ -12999,7 +12999,7 @@ msgstr "&Adicionar..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "Auto&detectar..." +msgstr "Auto&detectar" #: winecfg.rc:232 msgid "&Path:" @@ -14083,6 +14083,7 @@ msgid "Always on &top" msgstr "Sempre &visível" #: winhlp32.rc:56 +#, fuzzy msgid "&About Wine Help" msgstr "&Informações..."

1 0