February 2012 - Wine-commits

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

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

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

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

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

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

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

Joerg Schiermeier : Update for the url to the webpage of ' Software Freedom Conservancy'
by Jeremy Newman 08 Feb '12

08 Feb '12

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

Andrew Eikum : wineoss.drv: Downgrade most ERRs to WARNs.
by Alexandre Julliard 07 Feb '12

07 Feb '12

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

Andrew Eikum : winmm: Downgrade most ERRs to WARNs.
by Alexandre Julliard 07 Feb '12

07 Feb '12

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