June 2009 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/rebar: Use proper structure size in tests and parameter checks.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: 9ee5f26570ebd25aa1b5d6a27a043fef3334e2b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee5f26570ebd25aa1b5d6a27… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 29 20:00:16 2009 +0400 comctl32/rebar: Use proper structure size in tests and parameter checks. --- dlls/comctl32/rebar.c | 14 +++++++------- dlls/comctl32/tests/rebar.c | 18 +++++++++--------- include/commctrl.h | 3 +++ 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 8e18e22..e11d974 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1699,11 +1699,11 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan if( (lprbbi->fMask & RBBIM_CHILDSIZE) && ( (lpBand->cxMinChild != lprbbi->cxMinChild) || (lpBand->cyMinChild != lprbbi->cyMinChild ) || - ( (lprbbi->cbSize >= sizeof (REBARBANDINFOA) && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) && + ( (lprbbi->cbSize >= REBARBANDINFOA_V6_SIZE && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) && ( (lpBand->cyChild != lprbbi->cyChild ) || (lpBand->cyMaxChild != lprbbi->cyMaxChild ) || (lpBand->cyIntegral != lprbbi->cyIntegral ) ) ) || - ( (lprbbi->cbSize < sizeof (REBARBANDINFOA)) && + ( (lprbbi->cbSize < REBARBANDINFOA_V6_SIZE) && ( (lpBand->cyChild || lpBand->cyMaxChild || lpBand->cyIntegral ) ) ) ) ) @@ -1711,7 +1711,7 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan lpBand->cxMinChild = lprbbi->cxMinChild; lpBand->cyMinChild = lprbbi->cyMinChild; /* These fields where added in WIN32_IE == 0x400 and are set only for RBBS_VARIABLEHEIGHT bands */ - if (lprbbi->cbSize >= sizeof (REBARBANDINFOA) && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { + if (lprbbi->cbSize >= REBARBANDINFOA_V6_SIZE && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { lpBand->cyMaxChild = lprbbi->cyMaxChild; lpBand->cyIntegral = lprbbi->cyIntegral; @@ -1747,7 +1747,7 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan } /* check for additional data */ - if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) { + if (lprbbi->cbSize >= REBARBANDINFOA_V6_SIZE) { if( (lprbbi->fMask & RBBIM_IDEALSIZE) && ( lpBand->cxIdeal != lprbbi->cxIdeal ) ) { @@ -2167,7 +2167,7 @@ REBAR_GetBandInfoT(const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL lprbbi->cyMinChild = lpBand->cyMinChild; /* to make tests pass we follow Windows behaviour and allow to read these fields only * for RBBS_VARIABLEHEIGHTS bands */ - if (lprbbi->cbSize >= sizeof (REBARBANDINFOA) && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { + if (lprbbi->cbSize >= REBARBANDINFOW_V6_SIZE && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { lprbbi->cyChild = lpBand->cyChild; lprbbi->cyMaxChild = lpBand->cyMaxChild; lprbbi->cyIntegral = lpBand->cyIntegral; @@ -2184,7 +2184,7 @@ REBAR_GetBandInfoT(const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL lprbbi->wID = lpBand->wID; /* check for additional data */ - if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) { + if (lprbbi->cbSize >= REBARBANDINFOW_V6_SIZE) { if (lprbbi->fMask & RBBIM_IDEALSIZE) lprbbi->cxIdeal = lpBand->cxIdeal; @@ -2424,7 +2424,7 @@ REBAR_InsertBandT(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnico REBAR_CommonSetupBand(infoPtr->hwndSelf, lprbbi, lpBand); /* Make sure the defaults for these are correct */ - if (lprbbi->cbSize < sizeof (REBARBANDINFOA) || !(lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { + if (lprbbi->cbSize < REBARBANDINFOA_V6_SIZE || !(lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { lpBand->cyChild = lpBand->cyMinChild; lpBand->cyMaxChild = 0x7fffffff; lpBand->cyIntegral = 0; diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index c819bc7..2af9ab1 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -150,7 +150,7 @@ static void dump_sizes(HWND hRebar) for (i=0; i<count; i++) { REBARBANDINFO rbi; - rbi.cbSize = sizeof(REBARBANDINFO); + rbi.cbSize = REBARBANDINFOA_V6_SIZE; rbi.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE; ok(SendMessageA(hRebar, RB_GETBANDINFOA, i, (LPARAM)&rbi), "RB_GETBANDINFO failed\n"); ok(SendMessageA(hRebar, RB_GETRECT, i, (LPARAM)&r), "RB_GETRECT failed\n"); @@ -313,7 +313,7 @@ static int rbsize_numtests = 0; ok(SendMessageA(hRebar, RB_GETRECT, i, (LPARAM)&rc) == 1, "RB_GETRECT\n"); \ if (!(res->bands[i].fStyle & RBBS_HIDDEN)) \ check_rect("band", rc, res->bands[i].rc); \ - rbi.cbSize = sizeof(REBARBANDINFO); \ + rbi.cbSize = REBARBANDINFOA_V6_SIZE; \ rbi.fMask = RBBIM_STYLE | RBBIM_SIZE; \ ok(SendMessageA(hRebar, RB_GETBANDINFO, i, (LPARAM)&rbi) == 1, "RB_GETBANDINFO\n"); \ compare(rbi.fStyle, res->bands[i].fStyle, "%x"); \ @@ -329,11 +329,11 @@ static int rbsize_numtests = 0; static void add_band_w(HWND hRebar, LPCSTR lpszText, int cxMinChild, int cx, int cxIdeal) { CHAR buffer[MAX_PATH]; - REBARBANDINFO rbi; + REBARBANDINFOA rbi; if (lpszText != NULL) strcpy(buffer, lpszText); - rbi.cbSize = sizeof(rbi); + rbi.cbSize = REBARBANDINFOA_V6_SIZE; rbi.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_TEXT; rbi.cx = cx; rbi.cxMinChild = cxMinChild; @@ -353,7 +353,7 @@ static void layout_test(void) rebuild_rebar(&hRebar); check_sizes(); - rbi.cbSize = sizeof(rbi); + rbi.cbSize = REBARBANDINFOA_V6_SIZE; rbi.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD; rbi.cx = 200; rbi.cxMinChild = 100; @@ -742,10 +742,10 @@ static void expect_band_content(UINT uBand, INT fStyle, COLORREF clrFore, INT cxHeader) { CHAR buf[MAX_PATH] = "abc"; - REBARBANDINFO rb; + REBARBANDINFOA rb; memset(&rb, 0xdd, sizeof(rb)); - rb.cbSize = sizeof(rb); + rb.cbSize = REBARBANDINFOA_V6_SIZE; rb.fMask = RBBIM_BACKGROUND | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_COLORS | RBBIM_HEADERSIZE | RBBIM_ID | RBBIM_IDEALSIZE | RBBIM_IMAGE | RBBIM_LPARAM | RBBIM_SIZE | RBBIM_STYLE | RBBIM_TEXT; @@ -779,7 +779,7 @@ static void bandinfo_test(void) CHAR szABCD[] = "ABCD"; rebuild_rebar(&hRebar); - rb.cbSize = sizeof(REBARBANDINFO); + rb.cbSize = REBARBANDINFOA_V6_SIZE; rb.fMask = 0; ok(SendMessageA(hRebar, RB_INSERTBANDA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 0, 0, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 0); @@ -798,7 +798,7 @@ static void bandinfo_test(void) ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 35); - rb.cbSize = sizeof(REBARBANDINFO); + rb.cbSize = REBARBANDINFOA_V6_SIZE; rb.fMask = 0; ok(SendMessageA(hRebar, RB_INSERTBANDA, 1, (LPARAM)&rb), "RB_INSERTBAND failed\n"); expect_band_content(1, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 0, 0, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 9); diff --git a/include/commctrl.h b/include/commctrl.h index beecb52..8673ba9 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2031,6 +2031,9 @@ typedef REBARBANDINFOW const *LPCREBARBANDINFOW; #define REBARBANDINFOA_V3_SIZE CCSIZEOF_STRUCT(REBARBANDINFOA, wID) #define REBARBANDINFOW_V3_SIZE CCSIZEOF_STRUCT(REBARBANDINFOW, wID) #define REBARBANDINFO_V3_SIZE CCSIZEOF_STRUCT(WINELIB_NAME_AW(REBARBANDINFO), wID) +#define REBARBANDINFOA_V6_SIZE CCSIZEOF_STRUCT(REBARBANDINFOA, cxHeader) +#define REBARBANDINFOW_V6_SIZE CCSIZEOF_STRUCT(REBARBANDINFOW, cxHeader) +#define REBARBANDINFO_V6_SIZE CCSIZEOF_STRUCT(WINELIB_NAME_AW(REBARBANDINFO), cxHeader) typedef struct tagNMREBARCHILDSIZE {

1 0

Vincent Povirk : gdiplus: Implement horizontal alignment in GdipDrawString.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: aa9602db10f337f39ab93bf17a9da3203d14376e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9602db10f337f39ab93bf17… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 29 16:36:11 2009 -0500 gdiplus: Implement horizontal alignment in GdipDrawString. --- dlls/gdiplus/graphics.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c052bc3..152d590 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2098,6 +2098,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string INT sum = 0, height = 0, offsety = 0, fit, fitcpy, save_state, i, j, lret, nwidth, nheight; SIZE size; + POINT drawbase; + UINT drawflags; RECT drawcoord; TRACE("(%p, %s, %i, %p, %s, %p, %p)\n", graphics, debugstr_wn(string, length), @@ -2207,17 +2209,35 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string length = j; + if (format->align == StringAlignmentNear) + { + drawbase.x = corners[0].x; + drawbase.y = corners[0].y; + drawflags = DT_NOCLIP | DT_EXPANDTABS; + } + else if (format->align == StringAlignmentCenter) + { + drawbase.x = (corners[0].x + corners[1].x)/2; + drawbase.y = (corners[0].y + corners[1].y)/2; + drawflags = DT_NOCLIP | DT_EXPANDTABS | DT_CENTER; + } + else /* (format->align == StringAlignmentFar) */ + { + drawbase.x = corners[1].x; + drawbase.y = corners[1].y; + drawflags = DT_NOCLIP | DT_EXPANDTABS | DT_RIGHT; + } + while(sum < length){ - drawcoord.left = corners[0].x + roundr(ang_sin * (REAL) height); - drawcoord.top = corners[0].y + roundr(ang_cos * (REAL) height); + drawcoord.left = drawcoord.right = drawbase.x + roundr(ang_sin * (REAL) height); + drawcoord.top = drawcoord.bottom = drawbase.y + roundr(ang_cos * (REAL) height); GetTextExtentExPointW(graphics->hdc, stringdup + sum, length - sum, nwidth, &fit, NULL, &size); fitcpy = fit; if(fit == 0){ - DrawTextW(graphics->hdc, stringdup + sum, 1, &drawcoord, DT_NOCLIP | - DT_EXPANDTABS); + DrawTextW(graphics->hdc, stringdup + sum, 1, &drawcoord, drawflags); break; } @@ -2246,7 +2266,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string } } DrawTextW(graphics->hdc, stringdup + sum, min(length - sum, fit), - &drawcoord, DT_NOCLIP | DT_EXPANDTABS); + &drawcoord, drawflags); sum += fit + (lret < fitcpy ? 1 : 0); height += size.cy;

1 0

Frédéric Delanoy : winedbg: Add French translation.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: af8348c5b7fdd8de8b1a7f24469656c9ff31b40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8348c5b7fdd8de8b1a7f244… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 29 23:53:23 2009 +0200 winedbg: Add French translation. --- programs/winedbg/rsrc.rc | 1 + programs/winedbg/rsrc_Fr.rc | 59 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/rsrc.rc b/programs/winedbg/rsrc.rc index 50c5efb..604c54d 100644 --- a/programs/winedbg/rsrc.rc +++ b/programs/winedbg/rsrc.rc @@ -25,6 +25,7 @@ #include "rsrc_De.rc" #include "rsrc_En.rc" +#include "rsrc_Fr.rc" #include "rsrc_Ko.rc" #include "rsrc_Lt.rc" #include "rsrc_Nl.rc" diff --git a/programs/winedbg/rsrc_Fr.rc b/programs/winedbg/rsrc_Fr.rc new file mode 100644 index 0000000..a483c29 --- /dev/null +++ b/programs/winedbg/rsrc_Fr.rc @@ -0,0 +1,59 @@ +/* + * French Language Support + * + * Copyright 2009 Frédéric Delanoy + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Déboguer", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Erreur du programme" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "Le programme %s a rencontré un problème sérieux et doit \ + être fermé. Nous somme désolés pour le désagrément subi.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Cela peut être causé par une erreur dans le programme ou un défaut dans Wine. \ + Vous pouvez consulter http://appdb.winehq.org pour obtenir des instructions sur \ + l'exécution de cette application.\n\n\ + Si ce problème ne se produit pas sous Windows et n'a pas déjà été rapporté, \ + vous pouvez le rapporter sur http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Fermer", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Plantage du programme Wine" + IDS_INVALID_PARAMS "Erreurs internes - paramètres invalides reçus" + IDS_UNIDENTIFIED "(non identifié)" +END + +#pragma code_page(default) +

1 0

Frédéric Delanoy : cryptui: Add French translation.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: 6628fb474f342ba0bf81c4a821aa09213d85d97a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6628fb474f342ba0bf81c4a82… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 29 19:28:54 2009 +0200 cryptui: Add French translation. --- dlls/cryptui/cryptui.rc | 1 + dlls/cryptui/cryptui_Fr.rc | 466 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 467 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6628fb474f342ba0bf81c…

1 0

Aurimas Fišeras : winefile: Add Lithuanian translation .
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: 73285f5c59c04b1d93f67c5ef0937aa1ad09dff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73285f5c59c04b1d93f67c5ef… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Jun 29 19:15:44 2009 +0300 winefile: Add Lithuanian translation. --- programs/winefile/Lt.rc | 263 +++++++++++++++++++++++++++++++++++++++++++++ programs/winefile/rsrc.rc | 1 + 2 files changed, 264 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73285f5c59c04b1d93f67…

1 0

Frédéric Delanoy : shell32: Updated French translation.
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: f4a625b3b3b859510dabcdecd831fd8d66496da5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a625b3b3b859510dabcdecd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 29 15:37:50 2009 +0200 shell32: Updated French translation. --- dlls/shell32/shell32_Fr.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index e4fc4bb..e1b95e6 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -98,13 +98,13 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "&Fichier" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "&Quitter", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "&Affichage" BEGIN MENUITEM "&Grandes icônes", FCIDM_SHVIEW_BIGICON MENUITEM "&Petites icônes", FCIDM_SHVIEW_SMALLICON @@ -112,9 +112,9 @@ BEGIN MENUITEM "&Détails", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "Ai&de" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "À &propos du panneau de configuration...", IDM_CPANEL_ABOUT END END @@ -239,7 +239,7 @@ STRINGTABLE IDS_OVERWRITEFILE_CAPTION "Confirmer l'écrasement du fichier" IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient déjà un dossier nommé « %1 ».\n\n"\ "Si des fichiers dans le dossier de destination ont le même nom que ceux dans le dossier\n"\ - "sélectionné, ils seront remplacés. Voulez-vous quand même déplacer ou copier\n"\ + "sélectionné, ils seront écrasés. Voulez-vous quand même déplacer ou copier\n"\ "le dossier ?" /* message box strings */ @@ -259,8 +259,8 @@ STRINGTABLE IDS_PERSONAL "Mes documents" IDS_FAVORITES "Favoris" IDS_STARTUP "Menu Démarrer\\Programmes\\Démarrage" - IDS_RECENT "Recent" - IDS_SENDTO "SendTo" + IDS_RECENT "Documents récents" + IDS_SENDTO "Envoyer vers" IDS_STARTMENU "Menu Démarrer" IDS_MYMUSIC "Ma musique" IDS_MYVIDEO "Mes vidéos" @@ -285,11 +285,11 @@ STRINGTABLE IDS_NEWFOLDER "Nouveau dossier" - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" + IDS_CPANEL_TITLE "Panneau de configuration de Wine" + IDS_CPANEL_NAME "Nom" IDS_CPANEL_DESCRIPTION "Description" - IDS_SHLEXEC_NOASSOC "Il n'y a aucun programme Windows configuré pour ouvrir ce type de fichier." + IDS_SHLEXEC_NOASSOC "Aucun programme Windows n'est configuré pour ouvrir ce type de fichier." } STRINGTABLE

1 0

Michael Stefaniuc : user32: Remove unreachable code: break after return ( Smatch).
by Alexandre Julliard June 30, 2009

June 30, 2009

Module: wine Branch: master Commit: e17af8082bb6ba6e12f068f29ff48f2196b7a59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e17af8082bb6ba6e12f068f29… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 01:15:43 2009 +0200 user32: Remove unreachable code: break after return (Smatch). --- dlls/user32/cursoricon.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 92446e1..48a1a59 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1630,7 +1630,6 @@ static BOOL bitmap_has_alpha_channel( int bpp, unsigned char *bitmapBits, if(bitmapBits[offset] != 0) { return TRUE; - break; } } }

1 0

Alexander Scott-Johns : rtutils: Add stub dll.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: a4689aaeeee907cb995391db39703c8ca32b221c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4689aaeeee907cb995391db3… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jun 26 23:12:21 2009 +0100 rtutils: Add stub dll. --- configure | 9 +++++++ configure.ac | 1 + dlls/Makefile.in | 5 ++++ dlls/rtutils/Makefile.in | 14 +++++++++++ dlls/rtutils/main.c | 47 +++++++++++++++++++++++++++++++++++++ dlls/rtutils/rtutils.spec | 56 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 132 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3ede4fc..51a5440 100755 --- a/configure +++ b/configure @@ -27151,6 +27151,14 @@ dlls/rsaenh/tests/Makefile: dlls/rsaenh/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/rsaenh/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/rtutils/Makefile" +test "x$enable_rtutils" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + rtutils" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/rtutils/Makefile: dlls/rtutils/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/rtutils/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/sane.ds/Makefile" test "x$enable_sane_ds" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ sane.ds" @@ -29682,6 +29690,7 @@ do "dlls/rsabase/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsabase/Makefile" ;; "dlls/rsaenh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/Makefile" ;; "dlls/rsaenh/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/tests/Makefile" ;; + "dlls/rtutils/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rtutils/Makefile" ;; "dlls/sane.ds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sane.ds/Makefile" ;; "dlls/sccbase/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sccbase/Makefile" ;; "dlls/schannel/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/schannel/Makefile" ;; diff --git a/configure.ac b/configure.ac index 6392039..2dafff3 100644 --- a/configure.ac +++ b/configure.ac @@ -2324,6 +2324,7 @@ WINE_CONFIG_MAKEFILE([dlls/rpcrt4/tests/Makefile],[dlls/Maketest.rules],[dlls],[ WINE_CONFIG_MAKEFILE([dlls/rsabase/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/rsaenh/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/rsaenh/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/rtutils/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/sane.ds/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/sccbase/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/schannel/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index a55d715..edb73cb 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -188,6 +188,7 @@ IMPORT_LIBS = \ riched20/libriched20.$(IMPLIBEXT) \ rpcrt4/librpcrt4.$(IMPLIBEXT) \ rsaenh/librsaenh.$(IMPLIBEXT) \ + rtutils/librtutils.$(IMPLIBEXT) \ secur32/libsecur32.$(IMPLIBEXT) \ sensapi/libsensapi.$(IMPLIBEXT) \ serialui/libserialui.$(IMPLIBEXT) \ @@ -332,6 +333,7 @@ CROSS_IMPLIBS = \ riched20/libriched20.a \ rpcrt4/librpcrt4.a \ rsaenh/librsaenh.a \ + rtutils/librtutils.a \ secur32/libsecur32.a \ sensapi/libsensapi.a \ serialui/libserialui.a \ @@ -682,6 +684,9 @@ rpcrt4/librpcrt4.def rpcrt4/librpcrt4.a: rpcrt4/rpcrt4.spec $(WINEBUILD) rsaenh/librsaenh.def rsaenh/librsaenh.a: rsaenh/rsaenh.spec $(WINEBUILD) @cd rsaenh && $(MAKE) `basename $@` +rtutils/librtutils.def rtutils/librtutils.a: rtutils/rtutils.spec $(WINEBUILD) + @cd rtutils && $(MAKE) `basename $@` + secur32/libsecur32.def secur32/libsecur32.a: secur32/secur32.spec $(WINEBUILD) @cd secur32 && $(MAKE) `basename $@` diff --git a/dlls/rtutils/Makefile.in b/dlls/rtutils/Makefile.in new file mode 100644 index 0000000..dfe9bbb --- /dev/null +++ b/dlls/rtutils/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = rtutils.dll +IMPORTLIB = rtutils +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/rtutils/main.c b/dlls/rtutils/main.c new file mode 100644 index 0000000..009101a --- /dev/null +++ b/dlls/rtutils/main.c @@ -0,0 +1,47 @@ +/* + * rtutils main + * + * Copyright 2009 Alexander Scott-Johns + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rtutils); + +/*********************************************************************** + * DllMain (RTUTILS.@) + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + + return TRUE; +} diff --git a/dlls/rtutils/rtutils.spec b/dlls/rtutils/rtutils.spec new file mode 100644 index 0000000..008009c --- /dev/null +++ b/dlls/rtutils/rtutils.spec @@ -0,0 +1,56 @@ +@ stub CreateWaitEvent +@ stub CreateWaitEventBinding +@ stub CreateWaitTimer +@ stub DeRegisterWaitEventBinding +@ stub DeRegisterWaitEventBindingSelf +@ stub DeRegisterWaitEventsTimers +@ stub DeRegisterWaitEventsTimersSelf +@ stub DebugPrintWaitWorkerThreads +@ stub LogErrorA +@ stub LogErrorW +@ stub LogEventA +@ stub LogEventW +@ stub MprSetupProtocolEnum +@ stub MprSetupProtocolFree +@ stub QueueWorkItem +@ stub RegisterWaitEventBinding +@ stub RegisterWaitEventsTimers +@ stub RouterAssert +@ stub RouterGetErrorStringA +@ stub RouterGetErrorStringW +@ stub RouterLogDeregisterA +@ stub RouterLogDeregisterW +@ stub RouterLogEventA +@ stub RouterLogEventDataA +@ stub RouterLogEventDataW +@ stub RouterLogEventExA +@ stub RouterLogEventExW +@ stub RouterLogEventStringA +@ stub RouterLogEventStringW +@ stub RouterLogEventValistExA +@ stub RouterLogEventValistExW +@ stub RouterLogEventW +@ stub RouterLogRegisterA +@ stub RouterLogRegisterW +@ stub SetIoCompletionProc +@ stub TraceDeregisterA +@ stub TraceDeregisterExA +@ stub TraceDeregisterExW +@ stub TraceDeregisterW +@ stub TraceDumpExA +@ stub TraceDumpExW +@ stub TraceGetConsoleA +@ stub TraceGetConsoleW +@ stub TracePrintfA +@ stub TracePrintfExA +@ stub TracePrintfExW +@ stub TracePrintfW +@ stub TracePutsExA +@ stub TracePutsExW +@ stub TraceRegisterExA +@ stub TraceRegisterExW +@ stub TraceVprintfExA +@ stub TraceVprintfExW +@ stub UpdateWaitTimer +@ stub WTFreeEvent +@ stub WTFreeTimer

1 0

Nikolay Sivov : comctl32/progress: Implement PBM_GETBKCOLOR.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 753407ef824b335210440863868d37646f39964a URL: http://source.winehq.org/git/wine.git/?a=commit;h=753407ef824b3352104408638… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 28 02:51:59 2009 +0400 comctl32/progress: Implement PBM_GETBKCOLOR. --- dlls/comctl32/progress.c | 4 +++- include/commctrl.h | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index a2c852e..56f40bb 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -31,7 +31,6 @@ * * Messages: * -- PBM_GETSTEP - * -- PBM_GETBKCOLOR * -- PBM_SETSTATE * -- PBM_GETSTATE * @@ -722,6 +721,9 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, InvalidateRect(hwnd, NULL, TRUE); return 0; + case PBM_GETBKCOLOR: + return infoPtr->ColorBk; + case PBM_SETMARQUEE: if(wParam != 0) { diff --git a/include/commctrl.h b/include/commctrl.h index 98e4010..2c887d0 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -484,6 +484,7 @@ static const WCHAR PROGRESS_CLASSW[] = { 'm','s','c','t','l','s','_', #define PBM_GETPOS (WM_USER+8) #define PBM_SETBARCOLOR (WM_USER+9) #define PBM_SETMARQUEE (WM_USER+10) +#define PBM_GETBKCOLOR (WM_USER+14) #define PBM_GETBARCOLOR (WM_USER+15) #define PBM_SETBKCOLOR CCM_SETBKCOLOR

1 0

Nikolay Sivov : comctl32/toolbar: Move parameter cast to WinProc level, some code cleanup.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: f6bdb637bf2cd0f7882dd66cccf97163ef2fc47b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bdb637bf2cd0f7882dd66cc… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 28 02:06:18 2009 +0400 comctl32/toolbar: Move parameter cast to WinProc level, some code cleanup. --- dlls/comctl32/toolbar.c | 487 ++++++++++++++++++++++------------------------- 1 files changed, 223 insertions(+), 264 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6bdb637bf2cd0f7882dd…

1 0