February 2012 - Wine-Commits

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