wine-commits February 2012

wine-commits@winehq.org

2 participants
442 discussions

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

16 Feb '12

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 16 Feb '12

16 Feb '12

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

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

16 Feb '12

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: Remove a few English strings from the Hebrew translations.
by Alexandre Julliard 16 Feb '12

16 Feb '12

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 Esperanto shell folder translations.
by Alexandre Julliard 16 Feb '12

16 Feb '12

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

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

16 Feb '12

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 16 Feb '12

16 Feb '12

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 16 Feb '12

16 Feb '12

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

William Panlener : kernel32: Add missing function entry.
by Alexandre Julliard 16 Feb '12

16 Feb '12

Module: wine Branch: master Commit: b21baaeb6e80cfa13ac5ed89119e5a9ede154403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21baaeb6e80cfa13ac5ed891… Author: William Panlener <wpanlener(a)gmail.com> Date: Sun Feb 12 23:17:02 2012 -0600 kernel32: Add missing function entry. --- dlls/kernel32/kernel32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 072cfa1..fb3f9c2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1019,6 +1019,7 @@ @ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory +@ cdecl -arch=x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory

1 0

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

16 Feb '12

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

← Newer
1
...
17
18
19
20
21
22
23
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2012