February 2012 - Wine-Commits

Jörg Höhle : winmm: Make midiStream* messages asynchronous to avoid deadlocks.
by Alexandre Julliard Feb. 17, 2012

Feb. 17, 2012

Module: wine Branch: master Commit: 21e47e905e2d1f1206344a83e303610d4992be05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e47e905e2d1f1206344a83e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 7 23:10:03 2012 +0100 winmm: Make midiStream* messages asynchronous to avoid deadlocks. --- dlls/winmm/winmm.c | 46 ++++++++++++++++++++-------------------------- 1 files changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index cb6292a..714a84e 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1013,14 +1013,15 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI for (;;) { switch (msg->message) { case WM_QUIT: - SetEvent(lpMidiStrm->hEvent); return FALSE; case WINE_MSM_STOP: TRACE("STOP\n"); /* this is not quite what MS doc says... */ midiOutReset(lpMidiStrm->hDevice); /* empty list of already submitted buffers */ - for (lpMidiHdr = lpMidiStrm->lpMidiHdr; lpMidiHdr; ) { + lpMidiHdr = lpMidiStrm->lpMidiHdr; + lpMidiStrm->lpMidiHdr = NULL; + while (lpMidiHdr) { LPMIDIHDR lphdr = lpMidiHdr; lpMidiHdr = lpMidiHdr->lpNext; lphdr->dwFlags |= MHDR_DONE; @@ -1030,18 +1031,14 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI (HDRVR)lpMidiStrm->hDevice, MM_MOM_DONE, lpwm->mod.dwInstance, (DWORD_PTR)lphdr, 0); } - lpMidiStrm->lpMidiHdr = 0; - SetEvent(lpMidiStrm->hEvent); return TRUE; case WINE_MSM_RESUME: /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ lpMidiStrm->dwStartTicks = GetTickCount() - lpMidiStrm->dwPositionMS; - SetEvent(lpMidiStrm->hEvent); return TRUE; case WINE_MSM_PAUSE: /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ paused = TRUE; - SetEvent(lpMidiStrm->hEvent); break; /* FIXME(EPP): "I don't understand the content of the first MIDIHDR sent * by native mcimidi, it doesn't look like a correct one". @@ -1248,25 +1245,12 @@ the_end: } /************************************************************************** - * MMSYSTEM_MidiStream_PostMessage [internal] - */ -static BOOL MMSYSTEM_MidiStream_PostMessage(WINE_MIDIStream* lpMidiStrm, WORD msg, DWORD pmt1, DWORD pmt2) -{ - if (PostThreadMessageA(lpMidiStrm->dwThreadID, msg, pmt1, pmt2)) { - MsgWaitForMultipleObjects( 1, &lpMidiStrm->hEvent, FALSE, INFINITE, 0 ); - } else { - ERR("bad PostThreadMessageA\n"); - return FALSE; - } - return TRUE; -} - -/************************************************************************** * midiStreamClose [WINMM.@] */ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) { WINE_MIDIStream* lpMidiStrm; + MMRESULT ret = 0; TRACE("(%p)!\n", hMidiStrm); @@ -1274,9 +1258,19 @@ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) return MMSYSERR_INVALHANDLE; midiStreamStop(hMidiStrm); - MMSYSTEM_MidiStream_PostMessage(lpMidiStrm, WM_QUIT, 0, 0); + PostThreadMessageA(lpMidiStrm->dwThreadID, WM_QUIT, 0, 0); CloseHandle(lpMidiStrm->hEvent); - HeapFree(GetProcessHeap(), 0, lpMidiStrm); + if (lpMidiStrm->hThread) { + if (GetCurrentThreadId() != lpMidiStrm->dwThreadID) + WaitForSingleObject(lpMidiStrm->hThread, INFINITE); + else { + FIXME("leak from call within function callback\n"); + ret = MMSYSERR_HANDLEBUSY; /* yet don't signal it to app */ + } + CloseHandle(lpMidiStrm->hThread); + } + if(!ret) + HeapFree(GetProcessHeap(), 0, lpMidiStrm); return midiOutClose((HMIDIOUT)hMidiStrm); } @@ -1347,7 +1341,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, /* wait for thread to have started, and for its queue to be created */ WaitForSingleObject(lpMidiStrm->hEvent, INFINITE); - MMSYSTEM_MidiStream_PostMessage(lpMidiStrm, WINE_MSM_PAUSE, 0, 0); + PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_PAUSE, 0, 0); TRACE("=> (%u/%d) hMidi=%p ret=%d lpMidiStrm=%p\n", *lpuDeviceID, lpwm->mld.uDeviceID, *lphMidiStrm, ret, lpMidiStrm); @@ -1405,7 +1399,7 @@ MMRESULT WINAPI midiStreamPause(HMIDISTRM hMidiStrm) if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) return MMSYSERR_INVALHANDLE; - MMSYSTEM_MidiStream_PostMessage(lpMidiStrm, WINE_MSM_PAUSE, 0, 0); + PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_PAUSE, 0, 0); return ret; } @@ -1501,7 +1495,7 @@ MMRESULT WINAPI midiStreamRestart(HMIDISTRM hMidiStrm) if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) return MMSYSERR_INVALHANDLE; - MMSYSTEM_MidiStream_PostMessage(lpMidiStrm, WINE_MSM_RESUME, 0, 0); + PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_RESUME, 0, 0); return ret; } @@ -1517,7 +1511,7 @@ MMRESULT WINAPI midiStreamStop(HMIDISTRM hMidiStrm) if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) return MMSYSERR_INVALHANDLE; - MMSYSTEM_MidiStream_PostMessage(lpMidiStrm, WINE_MSM_STOP, 0, 0); + PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_STOP, 0, 0); return ret; }

1 0

Francois Gouget : po: Remove some invalid shell folder path translations from the Dutch translation .
by Alexandre Julliard Feb. 17, 2012

Feb. 17, 2012

Module: wine Branch: master Commit: d2f49c331997204c9085e3170b2212b56debc738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f49c331997204c9085e3170… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 17 08:33:02 2012 +0100 po: Remove some invalid shell folder path translations from the Dutch translation. --- po/nl.po | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/po/nl.po b/po/nl.po index def27c3..12f0073 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7942,19 +7942,22 @@ msgstr "Documenten" #: shell32.rc:217 #, fuzzy msgid "Administrative Tools" -msgstr "Start Menu\\Programma's\\Administratieve Tools" +msgstr "Administratieve Tools" #: shell32.rc:218 +#, fuzzy msgid "Music" -msgstr "Documenten\\Mijn Muziek" +msgstr "Mijn Muziek" #: shell32.rc:219 +#, fuzzy msgid "Pictures" -msgstr "Documenten\\Mijn Afbeeldingen" +msgstr "Mijn Afbeeldingen" #: shell32.rc:220 +#, fuzzy msgid "Videos" -msgstr "Documenten\\Mijn Videos" +msgstr "Mijn Videos" #: shell32.rc:213 msgid "Program Files (x86)" @@ -7971,12 +7974,12 @@ msgstr "Links" #: shell32.rc:223 #, fuzzy msgid "Slide Shows" -msgstr "Afbeeldingen\\Diashows" +msgstr "Diashows" #: shell32.rc:224 #, fuzzy msgid "Playlists" -msgstr "Muziek\\Afspeellijsten" +msgstr "Afspeellijsten" #: shell32.rc:148 taskmgr.rc:326 msgid "Status" @@ -7993,22 +7996,22 @@ msgstr "Model" #: shell32.rc:225 #, fuzzy msgid "Sample Music" -msgstr "Muziek\\Voorbeelden van muziek" +msgstr "Voorbeelden van muziek" #: shell32.rc:226 #, fuzzy msgid "Sample Pictures" -msgstr "Afbeeldingen\\Voorbeelden van afbeeldingen" +msgstr "Voorbeelden van afbeeldingen" #: shell32.rc:227 #, fuzzy msgid "Sample Playlists" -msgstr "Muziek\\Voorbeelden van afspeellijsten" +msgstr "Voorbeelden van afspeellijsten" #: shell32.rc:228 #, fuzzy msgid "Sample Videos" -msgstr "Video's\\Voorbeelden van video's" +msgstr "Voorbeelden van video's" #: shell32.rc:229 msgid "Saved Games"

1 0

Jörg Höhle : winmm: Avoid using SuspendThread, it can hang Wine.
by Alexandre Julliard Feb. 17, 2012

Feb. 17, 2012

Module: wine Branch: master Commit: 1b1157600539b1d0e263f707b34b3c4d7e58d99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1157600539b1d0e263f707b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Feb 6 18:13:16 2012 +0100 winmm: Avoid using SuspendThread, it can hang Wine. --- dlls/winmm/winmm.c | 215 ++++++++++++++++++++++++--------------------------- 1 files changed, 101 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b1157600539b1d0e263f…

1 0

Huw Davies : oleaut32: Zero-init [out] only parameters.
by Alexandre Julliard Feb. 17, 2012

Feb. 17, 2012

Module: wine Branch: master Commit: be4d45cacb119f7f84bc6f82dceced703b42d79d URL: http://source.winehq.org/git/wine.git/?a=commit;h=be4d45cacb119f7f84bc6f82d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 17 13:02:17 2012 +0000 oleaut32: Zero-init [out] only parameters. --- dlls/oleaut32/tests/tmarshal.c | 2 +- dlls/oleaut32/tmarshal.c | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index b491e53..cb626d3 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1118,7 +1118,7 @@ static void test_typelibmarshal(void) VariantClear(&varresult); /* call get_Name (direct) */ - bstr = NULL; + bstr = (void *)0xdeadbeef; hr = IWidget_get_Name(pWidget, &bstr); ok_ole_success(hr, IWidget_get_Name); ok(!lstrcmpW(bstr, szCat), "IWidget_get_Name should have returned string \"Cat\" instead of %s\n", wine_dbgstr_w(bstr)); diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 44a6d44..b69634f 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -723,7 +723,7 @@ serialize_param( return S_OK; } case VT_BSTR: { - if (debugout) { + if (writeit && debugout) { if (*arg) TRACE_(olerelay)("%s",relaystr((WCHAR*)*arg)); else @@ -1402,11 +1402,20 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) TRACE_(olerelay)("%s=",relaystr(names[i+1])); } /* No need to marshal other data than FIN and any VT_PTR. */ - if (!is_in_elem(elem) && (elem->tdesc.vt != VT_PTR)) { - xargs+=_argsize(&elem->tdesc, tinfo); - if (relaydeb) TRACE_(olerelay)("[out]"); - continue; - } + if (!is_in_elem(elem)) + { + if (elem->tdesc.vt != VT_PTR) + { + xargs+=_argsize(&elem->tdesc, tinfo); + if (relaydeb) TRACE_(olerelay)("[out]"); + continue; + } + else + { + memset( *(void **)xargs, 0, _xsize( elem->tdesc.u.lptdesc, tinfo ) ); + } + } + hres = serialize_param( tinfo, is_in_elem(elem),

1 0

Francois Gouget : po: Fix some typography issues in the Dutch translation.
by Alexandre Julliard Feb. 17, 2012

Feb. 17, 2012

Module: wine Branch: master Commit: 234f331dc898b065a78a3d1cf18bf7f040310406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=234f331dc898b065a78a3d1cf… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 16 23:30:39 2012 +0100 po: Fix some typography issues in the Dutch translation. --- po/nl.po | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/po/nl.po b/po/nl.po index f40ba99..def27c3 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2015,7 +2015,7 @@ msgstr "Certificaatbeleid" #: cryptdlg.rc:28 msgid "Policy Identifier: " -msgstr "Autoriteits Sleutel Identificatie nummer:" +msgstr "Autoriteits Sleutel Identificatie nummer: " #: cryptdlg.rc:29 msgid "Policy Qualifier Info" @@ -2312,6 +2312,7 @@ msgstr "" "authenticatie en om berichten te ondertekenen. Een certificaatkluis bevat " "een verzameling van certificaten, lijsten van herroepen certificaten en " "lijsten van vertrouwde certificaten.\n" +"\n" "Klik Volgende om verder te gaan." #: cryptui.rc:381 @@ -8388,9 +8389,8 @@ msgid "The specified device handle is invalid." msgstr "De gespecificeerde apparaatverwijzing is ongeldig." #: winmm.rc:34 -#, fuzzy msgid "There is no driver installed on your system!" -msgstr "Er is geen driver geïnstalleerd op uw systeem !\n" +msgstr "Er is geen driver geïnstalleerd op uw systeem!" #: winmm.rc:35 winmm.rc:61 msgid "" @@ -9235,7 +9235,7 @@ msgstr "" #: attrib.rc:28 cmd.rc:318 msgid "%1: File Not Found\n" -msgstr "%1 : Bestand niet gevonden\n" +msgstr "%1: Bestand niet gevonden\n" #: attrib.rc:47 msgid "" @@ -9460,9 +9460,9 @@ msgid "" msgstr "" "IF wordt gebruikt om een opdracht voorwaardelijk uit te voeren.\n" "\n" -"Syntax:\tIF [NOT] EXIST bestandsnaam opdracht\n" -"IF [NOT] tekenreeks1==tekenreeks2 opdracht\n" -"IF [NOT] ERRORLEVEL getal opdracht\n" +"Syntax: IF [NOT] EXIST bestandsnaam opdracht\n" +" IF [NOT] tekenreeks1==tekenreeks2 opdracht\n" +" IF [NOT] ERRORLEVEL getal opdracht\n" "\n" "In de tweede vorm van de opdracht moeten tekenreeks1 en tekenreeks2 tussen\n" "dubbele aanhalingstekens staan. De vergelijking is niet gevoelig voor het\n" @@ -9543,7 +9543,8 @@ msgstr "" "toets in te drukken.\n" "\n" "Dit is vooral handig in batchbestanden om de gebruiker in staat te stellen " -"om de uitvoer van een voorafgaande opdracht te bekijken, voordat het van het " +"om\n" +"de uitvoer van een voorafgaande opdracht te bekijken, voordat het van het\n" "scherm schuift.\n" #: cmd.rc:149 @@ -9761,7 +9762,7 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file\n" "which were introduced by a preceding SETLOCAL.\n" msgstr "" -"ENDLOCAL beëindigt de localisatie van omgevingswijzigingen in een " +"ENDLOCAL beëindigt de localisatie van omgevingswijzigingen in een\n" "batchbestand die werd begonnen door een voorafgaande SETLOCAL opdracht.\n" #: cmd.rc:233 @@ -9845,8 +9846,7 @@ msgstr "" #: cmd.rc:259 msgid "MORE displays output of files or piped input in pages.\n" msgstr "" -"MORE toont de uitvoer van programma's of herleidde invoer\n" -"per bladzijde.\n" +"MORE toont de uitvoer van programma's of herleidde invoer per bladzijde.\n" #: cmd.rc:263 msgid "" @@ -12937,7 +12937,7 @@ msgstr "Standaardinstellingen" #: winecfg.rc:59 msgid "Wine Programs (*.exe; *.exe.so)" -msgstr "Wine toepassingen (*.exe, *.exe.so)" +msgstr "Wine toepassingen (*.exe; *.exe.so)" #: winecfg.rc:60 msgid "Use global settings" @@ -13348,9 +13348,9 @@ msgid "" msgstr "" " --backend={user|curses} Kiezen voor user zal een nieuw window doen " "verschijnen,\n" -" curses zal proberen de huidige terminal om te " +" curses zal proberen de huidige terminal om te " "zetten\n" -" in een Wine console.\n" +" in een Wine console.\n" #: wineconsole.rc:50 msgid " <command> The Wine program to launch in the console.\n"

1 0

Alexander Kochetkov : gdi32: Fix text baseline calculation in compatible mode.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: 86de76b9e177af98ea93721e8775dc533f80bf97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86de76b9e177af98ea93721e8… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Fri Feb 25 15:19:55 2011 +0300 gdi32: Fix text baseline calculation in compatible mode. --- dlls/gdi32/font.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e17dd44..1dc87b1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2155,6 +2155,12 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if(!(tm.tmPitchAndFamily & TMPF_VECTOR)) /* Non-scalable fonts shouldn't be rotated */ lf.lfEscapement = 0; + if ((dc->GraphicsMode == GM_COMPATIBLE) && + (dc->vport2WorldValid && dc->xformWorld2Vport.eM11 * dc->xformWorld2Vport.eM22 < 0)) + { + lf.lfEscapement = -lf.lfEscapement; + } + if(lf.lfEscapement != 0) { cosEsc = cos(lf.lfEscapement * M_PI / 1800); @@ -2262,7 +2268,18 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, LPtoDP(hdc, desired, 2); desired[1].x -= desired[0].x; desired[1].y -= desired[0].y; - if (layout & LAYOUT_RTL) desired[1].x = -desired[1].x; + + if (dc->GraphicsMode == GM_COMPATIBLE) + { + if (dc->vport2WorldValid && dc->xformWorld2Vport.eM11 < 0) + desired[1].x = -desired[1].x; + if (dc->vport2WorldValid && dc->xformWorld2Vport.eM22 < 0) + desired[1].y = -desired[1].y; + } + else + { + if (layout & LAYOUT_RTL) desired[1].x = -desired[1].x; + } deltas[i].x = desired[1].x - width.x; deltas[i].y = desired[1].y - width.y;

1 0

Francois Gouget : po: Remove a few English strings from the Hebrew translations.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: 095e4b24e682bc69a5bc7f441bdf6032df690dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=095e4b24e682bc69a5bc7f441… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 16 01:17:12 2012 +0100 po: Remove a few English strings from the Hebrew translations. --- po/he.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/he.po b/po/he.po index 95b3165..bf14669 100644 --- a/po/he.po +++ b/po/he.po @@ -13452,15 +13452,15 @@ msgstr "" #: winedbg.rc:35 msgid "Wine program crash" -msgstr "Wine program crash" +msgstr "" #: winedbg.rc:36 msgid "Internal errors - invalid parameters received" -msgstr "Internal errors - invalid parameters received" +msgstr "" #: winedbg.rc:37 msgid "(unidentified)" -msgstr "(unidentified)" +msgstr "" #: winedbg.rc:40 #, fuzzy

1 0

Francois Gouget : po: Remove English strings from the Italian shell folder translations.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: fe36501a05a9dec4fd81726c6efb00313ffcf63a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe36501a05a9dec4fd81726c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 16 01:18:33 2012 +0100 po: Remove English strings from the Italian shell folder translations. --- po/it.po | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/po/it.po b/po/it.po index 06c1aa0..0304246 100644 --- a/po/it.po +++ b/po/it.po @@ -7917,16 +7917,19 @@ msgid "Administrative Tools" msgstr "Strumenti di amministrazione" #: shell32.rc:218 +#, fuzzy msgid "Music" -msgstr "Documenti\\Musica" +msgstr "Musica" #: shell32.rc:219 +#, fuzzy msgid "Pictures" -msgstr "Documenti\\Immagini" +msgstr "Immagini" #: shell32.rc:220 +#, fuzzy msgid "Videos" -msgstr "Documenti\\Video" +msgstr "Video" #: shell32.rc:213 msgid "Program Files (x86)" @@ -7962,19 +7965,19 @@ msgstr "Modello" #: shell32.rc:225 msgid "Sample Music" -msgstr "Sample Music" +msgstr "" #: shell32.rc:226 msgid "Sample Pictures" -msgstr "Sample Pictures" +msgstr "" #: shell32.rc:227 msgid "Sample Playlists" -msgstr "Sample Playlists" +msgstr "" #: shell32.rc:228 msgid "Sample Videos" -msgstr "Sample Videos" +msgstr "" #: shell32.rc:229 msgid "Saved Games"

1 0

Francois Gouget : po: Fix some typography issues in the Hungarian translation.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: 39449fae74eca03a39a30bc417a777078429a0c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39449fae74eca03a39a30bc41… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 16 01:20:44 2012 +0100 po: Fix some typography issues in the Hungarian translation. --- po/hu.po | 40 ++++++++++++++++------------------------ 1 files changed, 16 insertions(+), 24 deletions(-) diff --git a/po/hu.po b/po/hu.po index a9dd8e8..7dad446 100644 --- a/po/hu.po +++ b/po/hu.po @@ -2224,8 +2224,9 @@ msgid "&File name:" msgstr "&Fájlnév:" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 +#, fuzzy msgid "B&rowse..." -msgstr "Tallózás" +msgstr "Tallózás..." #: cryptui.rc:294 msgid "" @@ -2286,20 +2287,12 @@ msgstr "" #: cryptui.rc:341 #, fuzzy msgid "&Import..." -msgstr "" -"#-#-#-#-# hu.po (Wine) #-#-#-#-#\n" -"&Betűtípus...\n" -"#-#-#-#-# hu.po (Wine) #-#-#-#-#\n" -"&Font..." +msgstr "&Betűtípus...\n" #: cryptui.rc:342 regedit.rc:109 #, fuzzy msgid "&Export..." -msgstr "" -"#-#-#-#-# hu.po (Wine) #-#-#-#-#\n" -"&Betűtípus...\n" -"#-#-#-#-# hu.po (Wine) #-#-#-#-#\n" -"&Font..." +msgstr "&Betűtípus...\n" #: cryptui.rc:344 #, fuzzy @@ -10385,8 +10378,9 @@ msgid "&Wrap long lines" msgstr "&Hosszú sorok tördelése" #: notepad.rc:53 +#, fuzzy msgid "&Search...\tCtrl+F" -msgstr "&Keresés..." +msgstr "&Keresés...\tCtrl+F" #: notepad.rc:54 msgid "&Search next\tF3" @@ -10492,7 +10486,7 @@ msgstr "" #: notepad.rc:66 msgid "Page &p" -msgstr "Oldalszám: &p." +msgstr "Oldalszám &p" #: notepad.rc:68 msgid "Notepad" @@ -10516,10 +10510,9 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"A megadott '%s'\n" -"fájl nem létezik!\n" +"A megadott '%s' fájl nem létezik.\n" "\n" -" Kíván létrehozni új fájlt?" +"Kíván létrehozni új fájlt?" #: notepad.rc:79 msgid "" @@ -10527,14 +10520,13 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"'%s' fájl\n" -"módosult\n" +"'%s' fájl módosult.\n" "\n" -" Szeretné menteni a változásokat?" +"Szeretné menteni a változásokat?" #: notepad.rc:80 msgid "'%s' could not be found." -msgstr "'%s' nem található!" +msgstr "'%s' nem található." #: notepad.rc:82 msgid "Unicode (UTF-16)" @@ -11145,7 +11137,7 @@ msgstr "Ismeretlen jellemző a következőben: %s" #: progman.rc:76 msgid "File `%s' exists. Not overwritten." -msgstr "`%s' fájl létezik, ezért nem felülírható!" +msgstr "`%s' fájl létezik, ezért nem felülírható." #: progman.rc:77 msgid "Save group as `%s to prevent overwriting original files." @@ -12532,7 +12524,7 @@ msgstr "" "Az eltávolítási parancs '%s' végrehajtása sikertelen, feltehetőleg a hiányzó " "futtatható állomány miatt.\n" "El szeretné távolítani az eltávolítási bejegyzést a regisztrációs " -"adatbázisból ?" +"adatbázisból?" #: view.rc:33 msgid "&Pan" @@ -12698,7 +12690,7 @@ msgstr "Létező felülbírálások:" #: winecfg.rc:190 msgid "&Edit..." -msgstr "Sz&erkesztés" +msgstr "Sz&erkesztés..." #: winecfg.rc:196 msgid "Edit Override" @@ -12751,7 +12743,7 @@ msgstr "Hozzá&ad..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "Auto&felism..." +msgstr "Auto&felism" #: winecfg.rc:232 msgid "&Path:"

1 0

Francois Gouget : po: Fix some typography issues in the Italian translation .
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: 27f809e718b7ee3ede64d182f6e9fcd205338762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f809e718b7ee3ede64d182f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 16 01:19:55 2012 +0100 po: Fix some typography issues in the Italian translation. --- po/it.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/it.po b/po/it.po index 0304246..5bb9940 100644 --- a/po/it.po +++ b/po/it.po @@ -1186,7 +1186,7 @@ msgstr "" "incorrettamente.\n" "\n" "Premere il tasto Caps Lock sulla tua tastiera per spegnere Caps Lock prima\n" -" di immettere la tua password." +"di immettere la tua password." #: credui.rc:31 msgid "Caps Lock is On" @@ -2927,7 +2927,7 @@ msgstr "DirectSound predefinito" #: devenum.rc:33 msgid "DirectSound: %s" -msgstr "DirectSound : %s" +msgstr "DirectSound: %s" #: devenum.rc:34 msgid "Default WaveOut Device" @@ -9201,7 +9201,7 @@ msgstr "" #: attrib.rc:28 cmd.rc:318 msgid "%1: File Not Found\n" -msgstr "%1 : File non trovato\n" +msgstr "%1: File non trovato\n" #: attrib.rc:47 msgid "" @@ -11018,11 +11018,11 @@ msgstr "Informazioni" #: progman.rc:65 msgid "Delete group `%s'?" -msgstr "Eliminare il gruppo `%s' ?" +msgstr "Eliminare il gruppo `%s'?" #: progman.rc:66 msgid "Delete program `%s'?" -msgstr "Eliminare `%s' ?" +msgstr "Eliminare `%s'?" #: progman.rc:67 msgid "Not implemented"

1 0

Nikolay Sivov : msxml3: Fix structured error callback implementation when no message data available .
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: d73cfb92b3371602f18d32ad63237b8c75cabf2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73cfb92b3371602f18d32ad6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 16 20:02:45 2012 +0300 msxml3: Fix structured error callback implementation when no message data available. --- dlls/msxml3/main.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index e01d331..93b5b10 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -96,7 +96,12 @@ void wineXmlCallbackError(char const* caller, xmlErrorPtr err) case XML_ERR_WARNING: dbcl = __WINE_DBCL_WARN; break; default: dbcl = __WINE_DBCL_ERR; break; } - wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "%s", debugstr_a(err->message)); + + wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "error code %d", err->code); + if (err->message) + wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, ": %s", err->message); + else + wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "\n"); } /* Support for loading xml files from a Wine Windows drive */

1 0

Francois Gouget : po: Remove English strings from the Esperanto shell folder translations.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: cff34d530eba5423e55186d92df6924f3e18d831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cff34d530eba5423e55186d92… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 16 01:16:44 2012 +0100 po: Remove English strings from the Esperanto shell folder translations. --- po/eo.po | 46 +++++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/po/eo.po b/po/eo.po index e9b5778..dbb7396 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7969,7 +7969,7 @@ msgstr "Miaj Dokumentoj" #: shell32.rc:202 msgid "Favorites" -msgstr "Favorites" +msgstr "" #: shell32.rc:203 msgid "StartUp" @@ -7977,15 +7977,17 @@ msgstr "" #: shell32.rc:204 msgid "Start Menu" -msgstr "Start Menu" +msgstr "" #: shell32.rc:205 +#, fuzzy msgid "My Music" -msgstr "Miaj Dokumentoj\\Muziko" +msgstr "Muziko" #: shell32.rc:206 +#, fuzzy msgid "My Videos" -msgstr "Miai Dokumentoj\\Video" +msgstr "Video" #: shell32.rc:207 #, fuzzy @@ -7995,27 +7997,28 @@ msgstr "Desktop" #: shell32.rc:208 msgid "NetHood" -msgstr "NetHood" +msgstr "" #: shell32.rc:209 msgid "Templates" -msgstr "Templates" +msgstr "" #: shell32.rc:210 msgid "PrintHood" -msgstr "PrintHood" +msgstr "" #: shell32.rc:211 winhlp32.rc:45 msgid "History" -msgstr "History" +msgstr "" #: shell32.rc:212 msgid "Program Files" -msgstr "Program Files" +msgstr "" #: shell32.rc:214 +#, fuzzy msgid "My Pictures" -msgstr "Maj Documentoj\\Bildoj" +msgstr "Bildoj" #: shell32.rc:215 #, fuzzy @@ -8024,29 +8027,30 @@ msgstr "Plenume dosierkopiadon..." #: shell32.rc:216 shell32.rc:147 shell32.rc:232 msgid "Documents" -msgstr "Documents" +msgstr "" #: shell32.rc:217 -#, fuzzy msgid "Administrative Tools" -msgstr "Start Menu\\Programs\\Administrative Tools" +msgstr "" #: shell32.rc:218 +#, fuzzy msgid "Music" -msgstr "Documents\\Musiko" +msgstr "Musiko" #: shell32.rc:219 +#, fuzzy msgid "Pictures" -msgstr "Documents\\Bildoj" +msgstr "Bildoj" #: shell32.rc:220 +#, fuzzy msgid "Videos" -msgstr "Documents\\Video" +msgstr "Video" #: shell32.rc:213 -#, fuzzy msgid "Program Files (x86)" -msgstr "Program Files" +msgstr "" #: shell32.rc:221 #, fuzzy @@ -8086,7 +8090,7 @@ msgstr "Ekzemplo" #: shell32.rc:226 #, fuzzy msgid "Sample Pictures" -msgstr "Documents\\Bildoj" +msgstr "Bildoj" #: shell32.rc:227 msgid "Sample Playlists" @@ -8095,7 +8099,7 @@ msgstr "" #: shell32.rc:228 #, fuzzy msgid "Sample Videos" -msgstr "Miai Dokumentoj\\Video" +msgstr "Video" #: shell32.rc:229 #, fuzzy @@ -13445,7 +13449,7 @@ msgstr "Æiam &supre" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "&Pri..." +msgstr "" #: winhlp32.rc:64 #, fuzzy

1 0

Alexandre Julliard : gdi32: Fix font orientation when mirroring in compatible mode.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: 691c37ca9f910a80f32cc3bff78ae7920cfce411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=691c37ca9f910a80f32cc3bff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 16 13:22:02 2012 +0100 gdi32: Fix font orientation when mirroring in compatible mode. Inspired by a patch from Alexander Kochetkov. --- dlls/gdi32/freetype.c | 26 +++++++++++++++++--------- dlls/winex11.drv/xrender.c | 3 +++ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8d99d64..ea0da85 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3946,21 +3946,29 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) lf.lfEscapement); if(dc->GraphicsMode == GM_ADVANCED) + { memcpy(&dcmat, &dc->xformWorld2Vport, sizeof(FMAT2)); + /* Try to avoid not necessary glyph transformations */ + if (dcmat.eM21 == 0.0 && dcmat.eM12 == 0.0 && dcmat.eM11 == dcmat.eM22) + { + lf.lfHeight *= fabs(dcmat.eM11); + lf.lfWidth *= fabs(dcmat.eM11); + dcmat.eM11 = dcmat.eM22 = 1.0; + } + } else { /* Windows 3.1 compatibility mode GM_COMPATIBLE has only limited font scaling abilities. */ - dcmat.eM11 = dcmat.eM22 = dc->vport2WorldValid ? fabs(dc->xformWorld2Vport.eM22) : 1.0; - dcmat.eM21 = dcmat.eM12 = 0; - } - - /* Try to avoid not necessary glyph transformations */ - if (dcmat.eM21 == 0.0 && dcmat.eM12 == 0.0 && dcmat.eM11 == dcmat.eM22) - { - lf.lfHeight *= fabs(dcmat.eM11); - lf.lfWidth *= fabs(dcmat.eM11); dcmat.eM11 = dcmat.eM22 = 1.0; + dcmat.eM21 = dcmat.eM12 = 0; + if (dc->vport2WorldValid) + { + if (dc->xformWorld2Vport.eM11 * dc->xformWorld2Vport.eM22 < 0) + lf.lfOrientation = -lf.lfOrientation; + lf.lfHeight *= fabs(dc->xformWorld2Vport.eM22); + lf.lfWidth *= fabs(dc->xformWorld2Vport.eM22); + } } TRACE("DC transform %f %f %f %f\n", dcmat.eM11, dcmat.eM12, diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ca76770..7c763fc 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1132,6 +1132,9 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont ) TRACE("font transform %f %f %f %f\n", lfsz.xform.eM11, lfsz.xform.eM12, lfsz.xform.eM21, lfsz.xform.eM22); + if (GetGraphicsMode( dev->hdc ) == GM_COMPATIBLE && lfsz.xform.eM11 * lfsz.xform.eM22 < 0) + lfsz.lf.lfOrientation = -lfsz.lf.lfOrientation; + /* Not used fields, would break hashing */ lfsz.xform.eDx = lfsz.xform.eDy = 0;

1 0

Francois Gouget : po: Fix some typography issues in the Spanish translation .
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: 76e28194f33972cea74798f9ca2424e41c85323d URL: http://source.winehq.org/git/wine.git/?a=commit;h=76e28194f33972cea74798f9c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 16 01:23:38 2012 +0100 po: Fix some typography issues in the Spanish translation. --- po/es.po | 51 +++++++++++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/po/es.po b/po/es.po index 5a2ddf3..dd8b22d 100644 --- a/po/es.po +++ b/po/es.po @@ -477,7 +477,7 @@ msgstr "Configuración de impresión" #: comdlg32.rc:221 comdlg32.rc:357 comdlg32.rc:396 msgid "Printer" -msgstr "Impresora:" +msgstr "Impresora" #: comdlg32.rc:222 msgid "&Default Printer" @@ -489,7 +489,7 @@ msgstr "[ninguna]" #: comdlg32.rc:224 msgid "Specific &Printer" -msgstr "Impresora &específica:" +msgstr "Impresora &específica" #: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31 msgid "Orientation" @@ -513,7 +513,7 @@ msgstr "&Tamaño" #: comdlg32.rc:236 msgid "&Source" -msgstr "O&rigen:" +msgstr "O&rigen" #: comdlg32.rc:244 wineconsole.rc:81 msgid "Font" @@ -950,7 +950,7 @@ msgid "" "Please enter a value between %1!d! and %2!d!." msgstr "" "Este valor no concuerda con el rango de la página.\n" -" Por favor, introduzca un valor entre %d y %d." +"Por favor, introduzca un valor entre %d y %d." #: comdlg32.rc:56 msgid "The 'from' entry cannot exceed the 'to' entry." @@ -1198,7 +1198,7 @@ msgstr "" "El Bloq Mayus activado puede hacer que entre su contraseña incorrectamente.\n" "\n" "Pulse la tecla Bloq Mayus de su teclado para desactivar Bloq Mayus antes\n" -" de introducir su contraseña." +"de introducir su contraseña." #: credui.rc:31 msgid "Caps Lock is On" @@ -2213,7 +2213,7 @@ msgstr "&Nombre de archivo:" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 msgid "B&rowse..." -msgstr "E&xplorar" +msgstr "E&xplorar..." #: cryptui.rc:294 msgid "" @@ -7064,7 +7064,7 @@ msgstr "C&onfigurar..." #: msvfw32.rc:40 msgid "&About" -msgstr "&Acerca de..." +msgstr "&Acerca de" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -8124,7 +8124,7 @@ msgstr "&Abrir:" #: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:132 msgid "&Browse..." -msgstr "&Examinar" +msgstr "&Examinar..." #: shell32.rc:135 shell32.rc:139 winefile.rc:107 msgid "Size" @@ -9597,7 +9597,7 @@ msgstr "" #: attrib.rc:28 cmd.rc:318 #, fuzzy msgid "%1: File Not Found\n" -msgstr "%s : Archivo no encontrado\n" +msgstr "%1: Archivo no encontrado\n" #: attrib.rc:47 msgid "" @@ -9631,7 +9631,7 @@ msgstr "&Digital" #: clock.rc:32 notepad.rc:50 winecfg.rc:289 winefile.rc:60 wordpad.rc:81 msgid "&Font..." -msgstr "&Fuente" +msgstr "&Fuente..." #: clock.rc:34 msgid "&Without Titlebar" @@ -9691,7 +9691,7 @@ msgstr "Ayuda sobre CHDIR\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" -msgstr "CLS limpia la pantalla de la consola\n" +msgstr "CLS limpia la pantalla de la consola.\n" #: cmd.rc:45 #, fuzzy @@ -10094,8 +10094,8 @@ msgstr "" "VERIFY se usa para poner, quitar o probar la etiqueta de verificación.\n" "Las formas válidas son:\n" "\n" -"VERIFY ON\tPoner la bandera\n" -"VERIFY OFF\tQuitar la bandera\n" +"VERIFY ON\tPoner la bandera.\n" +"VERIFY OFF\tQuitar la bandera.\n" "VERIFY\t\tMuestra ON u OFF como corresponda.\n" "\n" "La bandera de verificación no tiene funcionalidad en Wine.\n" @@ -10846,10 +10846,9 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"El archivo '%s'\n" -"no existe\n" +"El archivo '%s' no existe.\n" "\n" -" ¿Desea crear un nuevo archivo?" +"¿Desea crear un nuevo archivo?" #: notepad.rc:79 msgid "" @@ -10857,9 +10856,9 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"El texto en el archivo '%s' ha cambiado\n" +"El texto en el archivo '%s' ha cambiado.\n" "\n" -" ¿Desea guardar los cambios?" +"¿Desea guardar los cambios?" #: notepad.rc:80 msgid "'%s' could not be found." @@ -11622,7 +11621,7 @@ msgstr "" #: regedit.rc:74 msgid "&Remove Favorite..." -msgstr "&Eliminar favorito" +msgstr "&Eliminar favorito..." #: regedit.rc:79 msgid "&About Registry Editor" @@ -11788,11 +11787,11 @@ msgstr "Sale del editor de registro" #: regedit.rc:161 msgid "Adds keys to the favorites list" -msgstr "Añade claves a la lista de favoritos..." +msgstr "Añade claves a la lista de favoritos" #: regedit.rc:162 msgid "Removes keys from the favorites list" -msgstr "Elimina claves de la lista de favoritos..." +msgstr "Elimina claves de la lista de favoritos" #: regedit.rc:163 msgid "Shows or hides the status bar" @@ -13000,7 +12999,7 @@ msgstr "&Añadir aplicación..." #: winecfg.rc:151 msgid "&Remove application" -msgstr "&Eliminar aplicación..." +msgstr "&Eliminar aplicación" #: winecfg.rc:152 msgid "&Windows Version:" @@ -13069,7 +13068,7 @@ msgstr "&Reemplazos existentes:" #: winecfg.rc:190 msgid "&Edit..." -msgstr "&Editar" +msgstr "&Editar..." #: winecfg.rc:196 msgid "Edit Override" @@ -13123,7 +13122,7 @@ msgstr "&Añadir..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "Auto&detectar..." +msgstr "Auto&detectar" #: winecfg.rc:232 msgid "&Path:" @@ -14097,7 +14096,7 @@ msgstr "&Experto" #: winemine.rc:42 msgid "&Custom..." -msgstr "P&ersonalizado" +msgstr "P&ersonalizado..." #: winemine.rc:44 #, fuzzy @@ -14210,7 +14209,7 @@ msgstr "&Siempre visible" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "&Info..." +msgstr "" #: winhlp32.rc:64 #, fuzzy

1 0

Alexandre Julliard : shell32: Define our own structure for control panel info, with more space for strings.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: 2b7d8311dac62a4b3495c2dc91cc0c9908738b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b7d8311dac62a4b3495c2dc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 16 12:37:27 2012 +0100 shell32: Define our own structure for control panel info, with more space for strings. --- dlls/shell32/control.c | 81 ++++++++++++++++++------------------------ dlls/shell32/cpanel.h | 13 ++++++- dlls/shell32/cpanelfolder.c | 4 +- 3 files changed, 48 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b7d8311dac62a4b3495c…

1 0

Jörg Höhle : winmm: Allow new sounds to interrupt previous PlaySound invocations.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: 197607db2e06f28b666da9ce88b69c9994c1bb65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197607db2e06f28b666da9ce8… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 14 19:27:30 2012 +0100 winmm: Allow new sounds to interrupt previous PlaySound invocations. --- dlls/winmm/playsound.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 02e24e8..e5b820b 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -44,10 +44,10 @@ typedef struct tagWINE_PLAYSOUND LPCWSTR pszSound; HMODULE hMod; DWORD fdwSound; - struct tagWINE_PLAYSOUND* lpNext; + HWAVEOUT hWave; } WINE_PLAYSOUND; -static WINE_PLAYSOUND *PlaySoundList; +static WINE_PLAYSOUND *PlaySoundCurrent; static BOOL bPlaySoundStop; static HMMIO get_mmioFromFile(LPCWSTR lpszName) @@ -206,12 +206,9 @@ static BOOL PlaySound_IsString(DWORD fdwSound, const void* psz) static void PlaySound_Free(WINE_PLAYSOUND* wps) { - WINE_PLAYSOUND** p; - EnterCriticalSection(&WINMM_cs); - for (p = &PlaySoundList; *p && *p != wps; p = &((*p)->lpNext)); - if (*p) *p = (*p)->lpNext; - if (PlaySoundList == NULL) SetEvent(psLastEvent); + PlaySoundCurrent = NULL; + SetEvent(psLastEvent); LeaveCriticalSection(&WINMM_cs); if (wps->bAlloc) HeapFree(GetProcessHeap(), 0, (void*)wps->pszSound); HeapFree(GetProcessHeap(), 0, wps); @@ -399,7 +396,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (!s.hEvent) + if (!s.hEvent || bPlaySoundStop) goto errCleanUp; if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, @@ -423,6 +420,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) goto errCleanUp; } + wps->hWave = hWave; s.dwEventCount = 1L; /* for first buffer */ index = 0; @@ -434,7 +432,6 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) { if (bPlaySoundStop) { - waveOutReset(hWave); wps->bLoop = FALSE; break; } @@ -464,7 +461,15 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) errCleanUp: TRACE("Done playing=%s => %s!\n", debugstr_w(wps->pszSound), bRet ? "ok" : "ko"); HeapFree(GetProcessHeap(), 0, lpWaveFormat); - if (hWave) while (waveOutClose(hWave) == WAVERR_STILLPLAYING) Sleep(100); + if (hWave) + { + EnterCriticalSection(&WINMM_cs); + /* the CS prevents a concurrent waveOutReset */ + wps->hWave = 0; + LeaveCriticalSection(&WINMM_cs); + while (waveOutClose(hWave) == WAVERR_STILLPLAYING) + Sleep(100); + } CloseHandle(s.hEvent); HeapFree(GetProcessHeap(), 0, waveHdr); if (hmmio) mmioClose(hmmio, 0); @@ -482,7 +487,7 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo pszSound, hmod, fdwSound); /* SND_NOWAIT is ignored in w95/2k/xp. */ - if ((fdwSound & SND_NOSTOP) && PlaySoundList != NULL) + if ((fdwSound & SND_NOSTOP) && PlaySoundCurrent != NULL) return FALSE; /* alloc internal structure, if we need to play something */ @@ -496,12 +501,14 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo /* since several threads can enter PlaySound in parallel, we're not * sure, at this point, that another thread didn't start a new playsound */ - while (PlaySoundList != NULL) + while (PlaySoundCurrent != NULL) { ResetEvent(psLastEvent); /* FIXME: doc says we have to stop all instances of pszSound if it's non * NULL... as of today, we stop all playing instances */ bPlaySoundStop = TRUE; + if(PlaySoundCurrent->hWave) + waveOutReset(PlaySoundCurrent->hWave); LeaveCriticalSection(&WINMM_cs); WaitForSingleObject(psLastEvent, INFINITE); @@ -510,8 +517,7 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo bPlaySoundStop = FALSE; } - if (wps) wps->lpNext = PlaySoundList; - PlaySoundList = wps; + PlaySoundCurrent = wps; LeaveCriticalSection(&WINMM_cs); if (!wps) return TRUE;

1 0

Francois Gouget : po: Add a couple of Finnish translations.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: cf8c077a4b19f0f10f1d23031ec6d66de1978543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8c077a4b19f0f10f1d23031… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 16 16:11:46 2012 +0100 po: Add a couple of Finnish translations. --- po/fi.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fi.po b/po/fi.po index 372bf98..799fbdb 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1926,11 +1926,11 @@ msgstr "" #: crypt32.rc:219 cryptui.rc:163 oleaut32.rc:29 wininet.rc:80 ipconfig.rc:44 msgid "Yes" -msgstr "" +msgstr "Kyllä" #: crypt32.rc:220 cryptui.rc:164 oleaut32.rc:30 wininet.rc:81 ipconfig.rc:45 msgid "No" -msgstr "" +msgstr "Ei" #: crypt32.rc:221 msgid "Digital Signature"

1 0

Francois Gouget : po: Fix a typography issue in the Finnish translation.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: e7cd6802d97bc9ec766effc9439e105930a8e44c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7cd6802d97bc9ec766effc94… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 16 16:12:13 2012 +0100 po: Fix a typography issue in the Finnish translation. --- po/fi.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fi.po b/po/fi.po index 799fbdb..77ed34f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9499,8 +9499,8 @@ msgstr "" "VERIFY-komennolla voi asettaa, poistaa tai tarkistaa verify-lipun.\n" "Kelvolliset muodot:\n" "\n" -"VERIFY ON\tAsettaa lipun\n" -"VERIFY OFF\tPoistaa lipun\n" +"VERIFY ON\tAsettaa lipun.\n" +"VERIFY OFF\tPoistaa lipun.\n" "VERIFY\t\tNäyttää tilanteen mukaan ON tai OFF.\n" "\n" "Verify-lippu ei tee mitään Winessä.\n"

1 0

Nikolay Sivov : msxml3: Use static buffer when tracing libxml2 error messages.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: 1dab61125ee0ffaac14c142828ec06310050fa89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dab61125ee0ffaac14c14282… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 16 20:01:07 2012 +0300 msxml3: Use static buffer when tracing libxml2 error messages. --- dlls/msxml3/main.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 464ef90..e01d331 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -62,9 +62,11 @@ HINSTANCE MSXML_hInstance = NULL; void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap) { - char* buf = NULL; - int len = 32, needed; - enum __wine_debug_class dbcl = __WINE_DBCL_ERR; + static const int max_size = 200; + enum __wine_debug_class dbcl; + char buff[max_size]; + int len; + switch (lvl) { case XML_ERR_NONE: @@ -74,25 +76,14 @@ void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, dbcl = __WINE_DBCL_WARN; break; default: + dbcl = __WINE_DBCL_ERR; break; } - do - { - heap_free(buf); - buf = heap_alloc(len); - needed = vsnprintf(buf, len, msg, ap); - if (needed == -1) - len *= 2; - else if (needed >= len) - len = needed + 1; - else - needed = 0; - } - while (needed); + len = vsnprintf(buff, max_size, msg, ap); + if (len == -1 || len >= max_size) buff[max_size-1] = 0; - wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "%s", buf); - heap_free(buf); + wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "%s", buff); } void wineXmlCallbackError(char const* caller, xmlErrorPtr err)

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: f07317febddb8487f7c6d67bf89d220778b9e408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f07317febddb8487f7c6d67bf… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Feb 16 17:11:07 2012 +0100 po: Update German translation. With kind help from André Hentschel. --- po/de.po | 107 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 55 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f07317febddb8487f7c6d…

1 0

Francois Gouget : po: Fix some typography issues in the Esperanto translation.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: 5c461aa3ab0eed1909522365c4df39619e7311c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c461aa3ab0eed1909522365c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 16 01:00:18 2012 +0100 po: Fix some typography issues in the Esperanto translation. --- po/eo.po | 59 +++++++++++++++++++++++++++++++---------------------------- 1 files changed, 31 insertions(+), 28 deletions(-) diff --git a/po/eo.po b/po/eo.po index a3f8fca..e9b5778 100644 --- a/po/eo.po +++ b/po/eo.po @@ -177,7 +177,7 @@ msgid "" "entry for this program from the registry?" msgstr "" "Malinstalad-komando '%s' malsukcesis, eble æar mankas programo.\n" -"Æu vi volas forigi la malinstalada 'entry' de la registro ?" +"Æu vi volas forigi la malinstalada 'entry' de la registro?" #: appwiz.rc:33 msgid "Not specified" @@ -357,7 +357,7 @@ msgstr "<- &Forigu" #: comctl32.rc:90 msgid "&Toolbar buttons:" -msgstr "Butonoj por stango de la &iloj" +msgstr "Butonoj por stango de la &iloj:" #: comctl32.rc:39 msgid "Separator" @@ -566,31 +566,31 @@ msgstr "Sol&idkoloro" #: comdlg32.rc:282 msgid "&Red:" -msgstr "&Ruøo" +msgstr "&Ruøo:" #: comdlg32.rc:284 msgid "&Green:" -msgstr "&Verdo" +msgstr "&Verdo:" #: comdlg32.rc:286 msgid "&Blue:" -msgstr "&Bluo" +msgstr "&Bluo:" #: comdlg32.rc:288 msgid "&Hue:" -msgstr "&Farbo" +msgstr "&Farbo:" #: comdlg32.rc:290 #, fuzzy msgctxt "Saturation" msgid "&Sat:" -msgstr "&Saturo" +msgstr "&Saturo:" #: comdlg32.rc:292 #, fuzzy msgctxt "Luminance" msgid "&Lum:" -msgstr "&Helo" +msgstr "&Helo:" #: comdlg32.rc:302 msgid "&Add to Custom Colors" @@ -755,7 +755,7 @@ msgstr "Su&ba:" #: comdlg32.rc:448 msgid "P&rinter..." -msgstr "&Printilo.." +msgstr "&Printilo..." #: comdlg32.rc:456 msgid "Look &in:" @@ -797,7 +797,7 @@ msgstr "Dosiero ne estis trovita" #: comdlg32.rc:30 msgid "Please verify that the correct file name was given" -msgstr "Kontrolu la øustecon je havigita dosiernomo." +msgstr "Kontrolu la øustecon je havigita dosiernomo" #: comdlg32.rc:31 msgid "" @@ -825,7 +825,7 @@ msgid "" " / : < > |" msgstr "" "La dosiernomo ne povas enhavi la jenajn tipojn:\n" -" / : < > |" +" / : < > |" #: comdlg32.rc:35 msgid "Path does not exist" @@ -3204,17 +3204,17 @@ msgstr "&Malfermu" #: ieframe.rc:33 notepad.rc:30 wordpad.rc:31 msgid "Save &as..." -msgstr "Konservu &kiel" +msgstr "Konservu &kiel..." #: ieframe.rc:35 #, fuzzy msgid "Print &format..." -msgstr "&Presu" +msgstr "&Presu..." #: ieframe.rc:36 #, fuzzy msgid "Pr&int..." -msgstr "&Presu" +msgstr "&Presu..." #: ieframe.rc:37 wordpad.rc:34 #, fuzzy @@ -10002,24 +10002,28 @@ msgid "&New\tCtrl+N" msgstr "&Nova\tCtrl+N" #: notepad.rc:28 wordpad.rc:29 +#, fuzzy msgid "&Open...\tCtrl+O" -msgstr "Malfermu\tCtrl+O" +msgstr "Malfermu...\tCtrl+O" #: notepad.rc:29 wordpad.rc:30 msgid "&Save\tCtrl+S" msgstr "Kon&servu\tCtrl+S" #: notepad.rc:32 regedit.rc:36 wordpad.rc:33 +#, fuzzy msgid "&Print...\tCtrl+P" -msgstr "Presu\tCtrl+P" +msgstr "Presu...\tCtrl+P" #: notepad.rc:33 wordpad.rc:35 +#, fuzzy msgid "Page Se&tup..." -msgstr "Impozu paøon" +msgstr "Impozu paøon..." #: notepad.rc:34 +#, fuzzy msgid "P&rinter Setup..." -msgstr "Impozu Printilon" +msgstr "Impozu Printilon..." #: notepad.rc:38 regedit.rc:40 wineconsole.rc:25 winhlp32.rc:36 wordpad.rc:39 #, fuzzy @@ -10064,8 +10068,9 @@ msgid "&Wrap long lines" msgstr "&Alineu aýtomate" #: notepad.rc:53 +#, fuzzy msgid "&Search...\tCtrl+F" -msgstr "Seræu\tCtrl+F" +msgstr "Seræu...\tCtrl+F" #: notepad.rc:54 msgid "&Search next\tF3" @@ -10199,10 +10204,9 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"La dosiero '%s'\n" -"ne eksistas\n" +"La dosiero '%s' ne eksistas\n" "\n" -" Æu mi devas krei novan dosieron?" +"Æu mi devas krei novan dosieron?" #: notepad.rc:79 msgid "" @@ -10210,10 +10214,9 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"La dosiero'%s'\n" -" estis þanøita\n" +"La dosiero'%s' estis þanøita\n" "\n" -" Æu vi volas konservi la þanøojn?" +"Æu vi volas konservi la þanøojn?" #: notepad.rc:80 msgid "'%s' could not be found." @@ -10916,7 +10919,7 @@ msgstr "" #: regedit.rc:60 regedit.rc:112 wordpad.rc:50 #, fuzzy msgid "&Find...\tCtrl+F" -msgstr "Presu\tCtrl+P" +msgstr "Presu...\tCtrl+P" #: regedit.rc:61 msgid "Find Ne&xt\tF3" @@ -12155,7 +12158,7 @@ msgid "" "Do you want to remove the uninstall entry from the registry?" msgstr "" "Malinstalad-komando '%s' malsukcesis, eble æar mankas programo.\n" -"Æu vi volas forigi la malinstalada 'entry' de la registro ?" +"Æu vi volas forigi la malinstalada 'entry' de la registro?" #: view.rc:33 msgid "&Pan" @@ -13499,7 +13502,7 @@ msgstr "" #: wordpad.rc:28 #, fuzzy msgid "&New...\tCtrl+N" -msgstr "&Nova\tCtrl+N" +msgstr "&Nova...\tCtrl+N" #: wordpad.rc:42 #, fuzzy

1 0

Dan Kegel : gdiplus: Make GdipTranslateLineTransform stub lie and return Ok .
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: 8f073bf4c7f59a7c0164d46dc91386409d6bdc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f073bf4c7f59a7c0164d46dc… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Feb 11 15:29:56 2012 -0800 gdiplus: Make GdipTranslateLineTransform stub lie and return Ok. --- dlls/gdiplus/brush.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index d1af903..ee1fd39 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -2017,9 +2017,14 @@ GpStatus WINGDIPAPI GdipMultiplyLineTransform(GpLineGradient *brush, GpStatus WINGDIPAPI GdipTranslateLineTransform(GpLineGradient* brush, REAL dx, REAL dy, GpMatrixOrder order) { - FIXME("stub: %p %f %f %d\n", brush, dx, dy, order); + static int calls; - return NotImplemented; + TRACE("(%p,%f,%f,%d)\n", brush, dx, dy, order); + + if(!(calls++)) + FIXME("not implemented\n"); + + return Ok; } /******************************************************************************

1 0

William Panlener : ntdll: Use success return values for stubs.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: f6dae487aaa9cdcdf5dba944e2c6a329afb49a31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6dae487aaa9cdcdf5dba944e… Author: William Panlener <wpanlener(a)gmail.com> Date: Wed Feb 15 20:52:23 2012 -0600 ntdll: Use success return values for stubs. --- dlls/ntdll/signal_x86_64.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0fc53c7..baa22d3 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2511,7 +2511,7 @@ void signal_init_process(void) BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD64 addr ) { FIXME( "%p %u %lx: stub\n", table, count, addr ); - return FALSE; + return TRUE; } @@ -2521,7 +2521,7 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD64 BOOLEAN CDECL RtlDeleteFunctionTable( RUNTIME_FUNCTION *table ) { FIXME( "%p: stub\n", table ); - return FALSE; + return TRUE; }

1 0

Nikolay Sivov : comctl32: Fix TB_SETEXTENDEDSTYLE to use mask passed in wParam.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: 31b44fb6e845c1ef571ee261a1bdf44142c9d0d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b44fb6e845c1ef571ee261a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 16 12:59:16 2012 +0300 comctl32: Fix TB_SETEXTENDEDSTYLE to use mask passed in wParam. --- dlls/comctl32/tests/toolbar.c | 71 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 18 ++++++----- 2 files changed, 81 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 386511a..474e5ef 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1840,6 +1840,76 @@ static void test_create(void) DestroyWindow(hwnd); } +typedef struct { + DWORD mask; + DWORD style; + DWORD style_set; +} extended_style_t; + +static const extended_style_t extended_style_test[] = { + { + TBSTYLE_EX_DRAWDDARROWS | TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_DOUBLEBUFFER, + TBSTYLE_EX_DRAWDDARROWS | TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_DOUBLEBUFFER, + TBSTYLE_EX_DRAWDDARROWS | TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_DOUBLEBUFFER + }, + { + TBSTYLE_EX_MIXEDBUTTONS, TBSTYLE_EX_MIXEDBUTTONS, + TBSTYLE_EX_DRAWDDARROWS | TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_DOUBLEBUFFER | TBSTYLE_EX_MIXEDBUTTONS + }, + + { 0, TBSTYLE_EX_MIXEDBUTTONS, TBSTYLE_EX_MIXEDBUTTONS }, + { 0, 0, 0 }, + { 0, TBSTYLE_EX_DRAWDDARROWS, TBSTYLE_EX_DRAWDDARROWS }, + { 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS, TBSTYLE_EX_HIDECLIPPEDBUTTONS }, + + { 0, 0, 0 }, + { TBSTYLE_EX_HIDECLIPPEDBUTTONS, TBSTYLE_EX_MIXEDBUTTONS, 0 }, + { TBSTYLE_EX_MIXEDBUTTONS, TBSTYLE_EX_HIDECLIPPEDBUTTONS, 0 }, + { TBSTYLE_EX_DOUBLEBUFFER, TBSTYLE_EX_MIXEDBUTTONS, 0 }, + + { + TBSTYLE_EX_DOUBLEBUFFER | TBSTYLE_EX_MIXEDBUTTONS, + TBSTYLE_EX_MIXEDBUTTONS, TBSTYLE_EX_MIXEDBUTTONS + }, + { + TBSTYLE_EX_DOUBLEBUFFER | TBSTYLE_EX_MIXEDBUTTONS, + TBSTYLE_EX_DOUBLEBUFFER, TBSTYLE_EX_DOUBLEBUFFER + } +}; + +static void test_TB_GET_SET_EXTENDEDSTYLE(void) +{ + DWORD style, oldstyle, oldstyle2; + const extended_style_t *ptr; + HWND hwnd; + int i; + + rebuild_toolbar(&hwnd); + + SendMessageA(hwnd, TB_SETEXTENDEDSTYLE, TBSTYLE_EX_DOUBLEBUFFER, TBSTYLE_EX_MIXEDBUTTONS); + style = SendMessageA(hwnd, TB_GETEXTENDEDSTYLE, 0, 0); + if (style == TBSTYLE_EX_MIXEDBUTTONS) + { + win_skip("Some extended style bits are not supported\n"); + DestroyWindow(hwnd); + return; + } + + for (i = 0; i < sizeof(extended_style_test)/sizeof(extended_style_t); i++) + { + ptr = &extended_style_test[i]; + + oldstyle2 = SendMessageA(hwnd, TB_GETEXTENDEDSTYLE, 0, 0); + + oldstyle = SendMessageA(hwnd, TB_SETEXTENDEDSTYLE, ptr->mask, ptr->style); + ok(oldstyle == oldstyle2, "%d: got old style 0x%08x, expected 0x%08x\n", i, oldstyle, oldstyle2); + style = SendMessageA(hwnd, TB_GETEXTENDEDSTYLE, 0, 0); + ok(style == ptr->style_set, "%d: got style 0x%08x, expected 0x%08x\n", i, style, ptr->style_set); + } + + DestroyWindow(hwnd); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -1881,6 +1951,7 @@ START_TEST(toolbar) test_tooltip(); test_get_set_style(); test_create(); + test_TB_GET_SET_EXTENDEDSTYLE(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 7c1815c..7901f86 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4481,20 +4481,22 @@ TOOLBAR_SetDrawTextFlags (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) * (MSDN says that this parameter is reserved) */ static LRESULT -TOOLBAR_SetExtendedStyle (TOOLBAR_INFO *infoPtr, LPARAM lParam) +TOOLBAR_SetExtendedStyle (TOOLBAR_INFO *infoPtr, DWORD mask, DWORD style) { - DWORD dwOldStyle; + DWORD old_style = infoPtr->dwExStyle; - dwOldStyle = infoPtr->dwExStyle; - infoPtr->dwExStyle = (DWORD)lParam; + TRACE("mask=0x%08x, style=0x%08x\n", mask, style); - TRACE("new style 0x%08x\n", infoPtr->dwExStyle); + if (mask) + infoPtr->dwExStyle = (old_style & ~mask) | (style & mask); + else + infoPtr->dwExStyle = style; if (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL) FIXME("Unknown Toolbar Extended Style 0x%08x. Please report.\n", (infoPtr->dwExStyle & ~TBSTYLE_EX_ALL)); - if ((dwOldStyle ^ infoPtr->dwExStyle) & TBSTYLE_EX_MIXEDBUTTONS) + if ((old_style ^ infoPtr->dwExStyle) & TBSTYLE_EX_MIXEDBUTTONS) TOOLBAR_CalcToolbar(infoPtr); else TOOLBAR_LayoutToolbar(infoPtr); @@ -4502,7 +4504,7 @@ TOOLBAR_SetExtendedStyle (TOOLBAR_INFO *infoPtr, LPARAM lParam) TOOLBAR_AutoSize(infoPtr); InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); - return (LRESULT)dwOldStyle; + return old_style; } @@ -6629,7 +6631,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SetDrawTextFlags (infoPtr, wParam, lParam); case TB_SETEXTENDEDSTYLE: - return TOOLBAR_SetExtendedStyle (infoPtr, lParam); + return TOOLBAR_SetExtendedStyle (infoPtr, wParam, lParam); case TB_SETHOTIMAGELIST: return TOOLBAR_SetHotImageList (infoPtr, wParam, (HIMAGELIST)lParam);

1 0

Nikolay Sivov : menubuilder: Use va_start/va_end around vsnprintf() on every call.
by Alexandre Julliard Feb. 16, 2012

Feb. 16, 2012

Module: wine Branch: master Commit: 4db6d184b3c7b0980af8f7d7be194f69f9f51b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db6d184b3c7b0980af8f7d7b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 16 03:28:29 2012 +0300 menubuilder: Use va_start/va_end around vsnprintf() on every call. --- programs/winemenubuilder/winemenubuilder.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index c07507d..dc5fd29 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -236,13 +236,14 @@ static char* heap_printf(const char *format, ...) char *buffer, *ret; int n; - va_start(args, format); while (1) { buffer = HeapAlloc(GetProcessHeap(), 0, size); if (buffer == NULL) break; + va_start(args, format); n = vsnprintf(buffer, size, format, args); + va_end(args); if (n == -1) size *= 2; else if (n >= size) @@ -251,7 +252,7 @@ static char* heap_printf(const char *format, ...) break; HeapFree(GetProcessHeap(), 0, buffer); } - va_end(args); + if (!buffer) return NULL; ret = HeapReAlloc(GetProcessHeap(), 0, buffer, strlen(buffer) + 1 ); if (!ret) ret = buffer;

1 0