July 2011 - Wine-commits - list.winehq.org

Jacek Caban : ieframe: Moved dialog resources to ieframe.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: 932cc2678c15d9297ae899e699e6d3e41aaeb752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=932cc2678c15d9297ae899e69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 27 14:45:34 2011 +0200 ieframe: Moved dialog resources to ieframe. --- dlls/{shdocvw => ieframe}/De.rc | 0 dlls/{shdocvw => ieframe}/En.rc | 0 dlls/{shdocvw => ieframe}/Es.rc | 0 dlls/{shdocvw => ieframe}/Fr.rc | 0 dlls/{shdocvw => ieframe}/He.rc | 0 dlls/{shdocvw => ieframe}/It.rc | 0 dlls/{shdocvw => ieframe}/Ja.rc | 0 dlls/{shdocvw => ieframe}/Ko.rc | 0 dlls/{shdocvw => ieframe}/Lt.rc | 0 dlls/ieframe/Makefile.in | 18 ++++++++++++++++++ dlls/{shdocvw => ieframe}/Nl.rc | 0 dlls/{shdocvw => ieframe}/Pl.rc | 0 dlls/{shdocvw => ieframe}/Pt.rc | 0 dlls/{shdocvw => ieframe}/Ro.rc | 0 dlls/{shdocvw => ieframe}/Ru.rc | 0 dlls/{shdocvw => ieframe}/Si.rc | 0 dlls/{shdocvw => ieframe}/Sr.rc | 0 dlls/{shdocvw => ieframe}/Sv.rc | 0 dlls/{shdocvw => ieframe}/Uk.rc | 0 dlls/{shdocvw/En.rc => ieframe/resource.h} | 20 ++++++-------------- dlls/shdocvw/Makefile.in | 18 ------------------ dlls/shdocvw/iexplore.c | 2 +- 22 files changed, 25 insertions(+), 33 deletions(-) diff --git a/dlls/shdocvw/De.rc b/dlls/ieframe/De.rc similarity index 100% rename from dlls/shdocvw/De.rc rename to dlls/ieframe/De.rc diff --git a/dlls/shdocvw/En.rc b/dlls/ieframe/En.rc similarity index 100% copy from dlls/shdocvw/En.rc copy to dlls/ieframe/En.rc diff --git a/dlls/shdocvw/Es.rc b/dlls/ieframe/Es.rc similarity index 100% rename from dlls/shdocvw/Es.rc rename to dlls/ieframe/Es.rc diff --git a/dlls/shdocvw/Fr.rc b/dlls/ieframe/Fr.rc similarity index 100% rename from dlls/shdocvw/Fr.rc rename to dlls/ieframe/Fr.rc diff --git a/dlls/shdocvw/He.rc b/dlls/ieframe/He.rc similarity index 100% rename from dlls/shdocvw/He.rc rename to dlls/ieframe/He.rc diff --git a/dlls/shdocvw/It.rc b/dlls/ieframe/It.rc similarity index 100% rename from dlls/shdocvw/It.rc rename to dlls/ieframe/It.rc diff --git a/dlls/shdocvw/Ja.rc b/dlls/ieframe/Ja.rc similarity index 100% rename from dlls/shdocvw/Ja.rc rename to dlls/ieframe/Ja.rc diff --git a/dlls/shdocvw/Ko.rc b/dlls/ieframe/Ko.rc similarity index 100% rename from dlls/shdocvw/Ko.rc rename to dlls/ieframe/Ko.rc diff --git a/dlls/shdocvw/Lt.rc b/dlls/ieframe/Lt.rc similarity index 100% rename from dlls/shdocvw/Lt.rc rename to dlls/ieframe/Lt.rc diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index 4e2f58a..3a0f688 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -9,6 +9,24 @@ C_SRCS = \ urlhist.c RC_SRCS = \ + De.rc \ + En.rc \ + Es.rc \ + Fr.rc \ + He.rc \ + It.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Sr.rc \ + Sv.rc \ + Uk.rc \ ieframe.rc @MAKE_DLL_RULES@ diff --git a/dlls/shdocvw/Nl.rc b/dlls/ieframe/Nl.rc similarity index 100% rename from dlls/shdocvw/Nl.rc rename to dlls/ieframe/Nl.rc diff --git a/dlls/shdocvw/Pl.rc b/dlls/ieframe/Pl.rc similarity index 100% rename from dlls/shdocvw/Pl.rc rename to dlls/ieframe/Pl.rc diff --git a/dlls/shdocvw/Pt.rc b/dlls/ieframe/Pt.rc similarity index 100% rename from dlls/shdocvw/Pt.rc rename to dlls/ieframe/Pt.rc diff --git a/dlls/shdocvw/Ro.rc b/dlls/ieframe/Ro.rc similarity index 100% rename from dlls/shdocvw/Ro.rc rename to dlls/ieframe/Ro.rc diff --git a/dlls/shdocvw/Ru.rc b/dlls/ieframe/Ru.rc similarity index 100% rename from dlls/shdocvw/Ru.rc rename to dlls/ieframe/Ru.rc diff --git a/dlls/shdocvw/Si.rc b/dlls/ieframe/Si.rc similarity index 100% rename from dlls/shdocvw/Si.rc rename to dlls/ieframe/Si.rc diff --git a/dlls/shdocvw/Sr.rc b/dlls/ieframe/Sr.rc similarity index 100% rename from dlls/shdocvw/Sr.rc rename to dlls/ieframe/Sr.rc diff --git a/dlls/shdocvw/Sv.rc b/dlls/ieframe/Sv.rc similarity index 100% rename from dlls/shdocvw/Sv.rc rename to dlls/ieframe/Sv.rc diff --git a/dlls/shdocvw/Uk.rc b/dlls/ieframe/Uk.rc similarity index 100% rename from dlls/shdocvw/Uk.rc rename to dlls/ieframe/Uk.rc diff --git a/dlls/shdocvw/En.rc b/dlls/ieframe/resource.h similarity index 64% rename from dlls/shdocvw/En.rc rename to dlls/ieframe/resource.h index e685b15..ba82f52 100644 --- a/dlls/shdocvw/En.rc +++ b/dlls/ieframe/resource.h @@ -1,4 +1,6 @@ /* + * Resource identifiers for ieframe.dll + * * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or @@ -16,18 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +#include <windef.h> +#include <winuser.h> -IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 -STYLE DS_MODALFRAME | WS_CAPTION -CAPTION "Open URL" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Specify the URL you wish to open in Internet Explorer",-1,25, 5, 150,15 - LTEXT "Open:", -1, 2, 32, 20, 15 - EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 - DEFPUSHBUTTON "&OK", IDOK, 25, 50, 50, 15 - PUSHBUTTON "&Cancel", IDCANCEL, 85, 50, 50, 15 -} +#define IDD_BROWSE_OPEN 1001 +#define IDC_BROWSE_OPEN_URL 1002 diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index b3c3156..41a8a76 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -23,24 +23,6 @@ C_SRCS = \ webbrowser.c RC_SRCS = \ - De.rc \ - En.rc \ - Es.rc \ - Fr.rc \ - He.rc \ - It.rc \ - Ja.rc \ - Ko.rc \ - Lt.rc \ - Nl.rc \ - Pl.rc \ - Pt.rc \ - Ro.rc \ - Ru.rc \ - Si.rc \ - Sr.rc \ - Sv.rc \ - Uk.rc \ shdocvw.rc PO_SRCS = shdocvw.rc diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 0ad1e89..815b7d1 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -566,7 +566,7 @@ static LRESULT iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT msg, WPAR switch(LOWORD(wparam)) { case ID_BROWSE_OPEN: - DialogBoxParamW(shdocvw_hinstance, MAKEINTRESOURCEW(IDD_BROWSE_OPEN), hwnd, ie_dialog_open_proc, (LPARAM)This); + DialogBoxParamW(get_ieframe_instance(), MAKEINTRESOURCEW(IDD_BROWSE_OPEN), hwnd, ie_dialog_open_proc, (LPARAM)This); break; case ID_BROWSE_PRINT:

1 0

Alexandre Julliard : widl: Don't set base types to 0 on proxy entry.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: ca22457d7bc88036029f03e70c0732a37e5759d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca22457d7bc88036029f03e70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 16:16:08 2011 +0200 widl: Don't set base types to 0 on proxy entry. --- tools/widl/proxy.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 5129971..699e073 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -111,12 +111,14 @@ static void clear_output_vars( const var_list_t *args ) if (!args) return; LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) { - if (is_attr(arg->attrs, ATTR_OUT) && !is_attr(arg->attrs, ATTR_IN)) { - print_proxy( "if(%s)\n", arg->name ); - indent++; - print_proxy( "MIDL_memset( %s, 0, sizeof( *%s ));\n", arg->name, arg->name ); - indent--; - } + if (is_attr(arg->attrs, ATTR_IN)) continue; + if (!is_attr(arg->attrs, ATTR_OUT)) continue; + if (is_ptr(arg->type)) + { + if (type_get_type(type_pointer_get_ref(arg->type)) == TYPE_BASIC) continue; + if (type_get_type(type_pointer_get_ref(arg->type)) == TYPE_ENUM) continue; + } + print_proxy( "if (%s) MIDL_memset( %s, 0, sizeof( *%s ));\n", arg->name, arg->name, arg->name ); } }

1 0

André Hentschel : view: Merge 3 C source files and a header file into one file.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: c243e19075631158b70a6d803750bbf651ce76c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c243e19075631158b70a6d803… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 25 23:52:01 2011 +0200 view: Merge 3 C source files and a header file into one file. --- programs/view/Makefile.in | 4 +- programs/view/globals.h | 53 ---------------- programs/view/init.c | 100 ------------------------------ programs/view/view.c | 148 ++++++++++++++++++++++++++++++++++++++++++--- programs/view/winmain.c | 67 -------------------- 5 files changed, 140 insertions(+), 232 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c243e19075631158b70a6…

1 0

André Hentschel : view: Add support for enhanced metafiles.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: 8286bfee71fc3ed92cb3dd2b552e5fa544e7a141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8286bfee71fc3ed92cb3dd2b5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 25 23:52:50 2011 +0200 view: Add support for enhanced metafiles. --- programs/view/view.c | 39 +++++++++++++++++++++++++++++++++++---- 1 files changed, 35 insertions(+), 4 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index e266209..917784d 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -27,9 +27,10 @@ static char szAppName[5] = "View"; static char szTitle[80]; static HMETAFILE hmf; +static HENHMETAFILE enhmf; static int deltax = 0, deltay = 0; static int width = 0, height = 0; -static BOOL isAldus; +static BOOL isAldus, isEnhanced; #include "pshpack1.h" typedef struct @@ -52,7 +53,7 @@ static BOOL FileOpen(HWND hWnd, char *fn, int fnsz) 0, 0, NULL, NULL, 0, 0, NULL, fnsz, NULL, 0, NULL, NULL, OFN_SHOWHELP, 0, 0, NULL, 0, NULL }; - ofn.lpstrFilter = "Metafiles\0*.wmf\0"; + ofn.lpstrFilter = "Metafiles\0*.wmf;*.emf\0"; ofn.hwndOwner = hWnd; ofn.lpstrFile = fn; if( fnsz < 1 ) @@ -61,6 +62,25 @@ static BOOL FileOpen(HWND hWnd, char *fn, int fnsz) return GetOpenFileName(&ofn); } +static BOOL FileIsEnhanced( LPCSTR szFileName ) +{ + HFILE hInFile; + ENHMETAHEADER enh; + + if( (hInFile = _lopen( szFileName, OF_READ ) ) == HFILE_ERROR ) + return FALSE; + + if( _lread( hInFile, &enh, sizeof(ENHMETAHEADER) ) != sizeof(ENHMETAHEADER) ) + { + _lclose( hInFile ); + return FALSE; + } + _lclose( hInFile ); + + /* Is it enhanced? */ + return (enh.dSignature == ENHMETA_SIGNATURE); +} + static BOOL FileIsPlaceable( LPCSTR szFileName ) { HFILE hInFile; @@ -154,7 +174,14 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM SetWindowExtEx(ps.hdc, width, height, NULL); SetViewportExtEx(ps.hdc, width, height, NULL); SetViewportOrgEx(ps.hdc, deltax, deltay, NULL); - if(hmf) PlayMetaFile(ps.hdc, hmf); + if (isEnhanced && enhmf) + { + RECT r; + GetClientRect(hwnd, &r); + PlayEnhMetaFile(ps.hdc, enhmf, &r); + } + else if (hmf) + PlayMetaFile(ps.hdc, hmf); EndPaint(hwnd, &ps); } break; @@ -171,7 +198,11 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM hmf = GetPlaceableMetaFile(hwnd, filename); } else { RECT r; - hmf = GetMetaFile(filename); + isEnhanced = FileIsEnhanced(filename); + if (isEnhanced) + enhmf = GetEnhMetaFile(filename); + else + hmf = GetMetaFile(filename); GetClientRect(hwnd, &r); width = r.right - r.left; height = r.bottom - r.top;

1 0

Bernhard Loos : ntdll/tests: Add a number of named pipe tests using the nt api and ioctls.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: e0f54d1b203113a08512af2c03e666c568952267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f54d1b203113a08512af2c0… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Tue Jul 26 23:40:48 2011 +0200 ntdll/tests: Add a number of named pipe tests using the nt api and ioctls. --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/pipe.c | 430 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 431 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0f54d1b203113a08512a…

1 0

Frédéric Delanoy : programs: Assorted spelling fixes.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: 1b6eed8a99e8519e2dcfdbcd945632a992cda17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b6eed8a99e8519e2dcfdbcd9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 27 11:46:59 2011 +0200 programs: Assorted spelling fixes. --- programs/taskmgr/graphctl.c | 8 ++++---- programs/winebrowser/main.c | 2 +- programs/winecfg/libraries.c | 2 +- programs/wineconsole/curses.c | 2 +- programs/wineconsole/user.c | 2 +- programs/winhlp32/hlpfile.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index c5395d5..8984784 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -57,7 +57,7 @@ static void GraphCtrl_Init(TGraphCtrl* this) * we need a starting point (i.e. a "previous" point) * use 0.0 as the default first point. * these are public member variables, and can be changed outside - * (after construction). Therefore m_perviousPosition could be set to + * (after construction). Therefore m_dPreviousPosition could be set to * a more appropriate value prior to the first call to SetPosition. */ this->m_dPreviousPosition[0] = 0.0; @@ -69,8 +69,8 @@ static void GraphCtrl_Init(TGraphCtrl* this) this->m_nYDecimals = 3; /* set some initial values for the scaling until "SetRange" is called. - * these are protected varaibles and must be set with SetRange - * in order to ensure that m_dRange is updated accordingly + * these are protected variables and must be set with SetRange + * in order to ensure that m_dRange is updated accordingly */ /* m_dLowerLimit = -10.0; */ /* m_dUpperLimit = 10.0; */ @@ -401,7 +401,7 @@ static void GraphCtrl_DrawPoint(TGraphCtrl* this) SRCCOPY); /* establish a rectangle over the right side of plot */ - /* which now needs to be cleaned up proir to adding the new point */ + /* which now needs to be cleaned up prior to adding the new point */ rectCleanUp = this->m_rectPlot; rectCleanUp.left = rectCleanUp.right - this->m_nShiftPixels; diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index f5ffe05..8635ad2 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -22,7 +22,7 @@ * Winebrowser is a winelib application that will start the appropriate * native browser or mail client for a wine installation that lacks a * windows browser/mail client. For example, you will be able to open - * urls via native mozilla if no browser has yet been installed in wine. + * URLs via native mozilla if no browser has yet been installed in wine. * * The application to launch is chosen from a default set or, if set, * taken from a registry key. diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index e402b4e..aa11b46 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -229,7 +229,7 @@ static int show_dll_in_list( const char *name ) static void set_controls_from_selection(HWND dialog) { - /* FIXME: display/update some information about the selected dll (purpose, recommended loadorder) maybe? */ + /* FIXME: display/update some information about the selected dll (purpose, recommended load order) maybe? */ } static void clear_settings(HWND dialog) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 00e5039..013a062 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -668,7 +668,7 @@ static unsigned WCCURSES_FillMouse(INPUT_RECORD* ir) WINE_TRACE("[%u]: (%d, %d) %08lx\n", mevt.id, mevt.x, mevt.y, (unsigned long)mevt.bstate); - /* macros to ease mapping ncurse button numbering to windows's one */ + /* macros to ease mapping ncurse button numbering to windows' one */ #define BTN1_BIT FROM_LEFT_1ST_BUTTON_PRESSED #define BTN2_BIT RIGHTMOST_BUTTON_PRESSED #define BTN3_BIT FROM_LEFT_2ND_BUTTON_PRESSED diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 22f33b1..dafab16 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -447,7 +447,7 @@ HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf, * - the width of all characters in the font * This isn't true in Wine. As a temporary workaround, we get as the width of the * cell, the width of the first character in the font, after checking that all - * characters in the font have the same width (I hear paranoïa coming) + * characters in the font have the same width (I hear paranoia coming) * when this gets fixed, the code should be using tm.tmAveCharWidth * or tm.tmMaxCharWidth as the cell width. */ diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index cf7bcdc..2f97a02 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1585,7 +1585,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, case 0x8C: if (!HLPFILE_RtfAddControl(rd, "\\_")) goto done; - /* FIXME: it could be that hypen is also in input stream !! */ + /* FIXME: it could be that hyphen is also in input stream !! */ format += 1; rd->char_pos++; break;

1 0

Alexandre Julliard : winex11: Force unprotecting the DIB section bits in PutImage.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: 372ad442fcea463b671af6fb394f0da0936dcfba URL: http://source.winehq.org/git/wine.git/?a=commit;h=372ad442fcea463b671af6fb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 12:18:03 2011 +0200 winex11: Force unprotecting the DIB section bits in PutImage. --- dlls/winex11.drv/bitblt.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index ee60ef8..8d2383a 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1919,6 +1919,10 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info int height = dst->visrect.bottom - dst->visrect.top; image->data = dst_bits.ptr; + /* hack: make sure the bits are readable if we are reading from a DIB section */ + /* to be removed once we get rid of DIB access protections */ + if (!dst_bits.is_copy) IsBadReadPtr( dst_bits.ptr, height * image->bytes_per_line ); + if (bitmap) { RGNDATA *clip_data = NULL;

1 0

Austin English : gdi32/tests: Remove win9x hacks.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: c30c441ea7d6d6066a41e259d438f454b327a6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30c441ea7d6d6066a41e259d… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 26 18:01:07 2011 -0700 gdi32/tests: Remove win9x hacks. --- dlls/gdi32/tests/gdiobj.c | 6 +++--- dlls/gdi32/tests/palette.c | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index bc00b3d..c854311 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -221,7 +221,7 @@ static void test_GetCurrentObject(void) hobj = GetCurrentObject(hdc, OBJ_PEN); ok(hobj == hpen, "OBJ_PEN is wrong: %p\n", hobj); hobj = GetCurrentObject(hdc, OBJ_EXTPEN); - ok(hobj == hpen || broken(hobj == 0) /* win9x */, "OBJ_EXTPEN is wrong: %p\n", hobj); + ok(hobj == hpen, "OBJ_EXTPEN is wrong: %p\n", hobj); hbrush = CreateSolidBrush(RGB(10, 20, 30)); assert(hbrush != 0); @@ -257,7 +257,7 @@ static void test_GetCurrentObject(void) hobj = GetCurrentObject(hdc, OBJ_PEN); ok(hobj == hpen, "OBJ_PEN is wrong: %p\n", hobj); hobj = GetCurrentObject(hdc, OBJ_EXTPEN); - ok(hobj == hpen || broken(hobj == 0) /* win9x */, "OBJ_EXTPEN is wrong: %p\n", hobj); + ok(hobj == hpen, "OBJ_EXTPEN is wrong: %p\n", hobj); hcs = GetColorSpace(hdc); if (hcs) @@ -268,7 +268,7 @@ static void test_GetCurrentObject(void) ok(hcs != 0, "CreateColorSpace failed\n"); SelectObject(hdc, hcs); hobj = GetCurrentObject(hdc, OBJ_COLORSPACE); - ok(hobj == hcs || broken(hobj == 0) /* win9x */, "OBJ_COLORSPACE is wrong: %p\n", hobj); + ok(hobj == hcs, "OBJ_COLORSPACE is wrong: %p\n", hobj); } hrgn = CreateRectRgn(1, 1, 100, 100); diff --git a/dlls/gdi32/tests/palette.c b/dlls/gdi32/tests/palette.c index 851c321..c9455ca 100644 --- a/dlls/gdi32/tests/palette.c +++ b/dlls/gdi32/tests/palette.c @@ -110,9 +110,7 @@ static void test_DIB_PAL_COLORS(void) { SetPixel( memhdc, 0, 0, setColor ); chkColor = RGB( logpalettedata[3].peRed, logpalettedata[3].peGreen, logpalettedata[3].peBlue ); getColor = GetPixel( memhdc, 0, 0 ); - ok( getColor == chkColor || - broken(getColor == 0), /* win9x */ - "getColor=%08X\n", (UINT)getColor ); + ok( getColor == chkColor, "getColor=%08X\n", (UINT)getColor ); SelectPalette( memhdc, hpalOld, FALSE ); DeleteObject( hpal );

1 0

Austin English : wininet/tests: Remove win9x hacks.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: c13f29357a89be9d5df1eed274a4b0a18b7af384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13f29357a89be9d5df1eed27… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 26 19:19:14 2011 -0700 wininet/tests: Remove win9x hacks. --- dlls/wininet/tests/internet.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 0b5f6ea..3b801f3 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -41,16 +41,6 @@ static BOOL (WINAPI *pIsDomainLegalCookieDomainW)(LPCWSTR, LPCWSTR); static DWORD (WINAPI *pPrivacyGetZonePreferenceW)(DWORD, DWORD, LPDWORD, LPWSTR, LPDWORD); static DWORD (WINAPI *pPrivacySetZonePreferenceW)(DWORD, DWORD, DWORD, LPCWSTR); -/* Win9x and WinMe don't have lstrcmpW */ -static int strcmp_ww(const WCHAR *str1, const WCHAR *str2) -{ - DWORD len1 = lstrlenW(str1); - DWORD len2 = lstrlenW(str2); - - if (len1 != len2) return 1; - return memcmp(str1, str2, len1 * sizeof(WCHAR)); -} - /* ############################### */ static void test_InternetCanonicalizeUrlA(void) @@ -497,7 +487,7 @@ static void test_null(void) ok( sz == 1 + lstrlenW(buffer) || sz == lstrlenW(buffer), "sz wrong %d\n", sz); /* before XP SP2, buffer is "server; server" */ - ok( !strcmp_ww(szExpect, buffer) || !strcmp_ww(szServer, buffer), "cookie data wrong\n"); + ok( !lstrcmpW(szExpect, buffer) || !lstrcmpW(szServer, buffer), "cookie data wrong\n"); sz = sizeof(buffer); r = InternetQueryOptionA(NULL, INTERNET_OPTION_CONNECTED_STATE, buffer, &sz); @@ -995,7 +985,7 @@ static void test_Option_PerConnectionOption(void) ret = InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, &size); ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); - ok(!strcmp_ww(list.pOptions[0].Value.pszValue, proxy_srvW), + ok(!lstrcmpW(list.pOptions[0].Value.pszValue, proxy_srvW), "Retrieved proxy server should've been %s, was: %s\n", wine_dbgstr_w(proxy_srvW), wine_dbgstr_w(list.pOptions[0].Value.pszValue)); ok(list.pOptions[1].Value.dwValue == PROXY_TYPE_PROXY,

1 0

Frédéric Delanoy : dxdiag: Remove dead increment (Clang).
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: ffc35d027d558a670a203954d7b50009f1b2d61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc35d027d558a670a203954d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 27 02:53:31 2011 +0200 dxdiag: Remove dead increment (Clang). --- programs/dxdiag/output.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index 3fea90b..8470f50 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -91,7 +91,6 @@ static BOOL output_text_header(HANDLE hFile, const char *caption) ptr += len; memcpy(ptr, crlf, sizeof(crlf)); - ptr += sizeof(crlf); return WriteFile(hFile, output_buffer, total_len, NULL, NULL); }

1 0