February 2012 - Wine-Commits

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