October 2012 - Wine-commits

Dmitry Timoshkov : gdiplus: Add more font transformation tests.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 8fd422499bb31eb0202e9b48904aa06158cffe9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd422499bb31eb0202e9b489… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 9 18:41:47 2012 +0900 gdiplus: Add more font transformation tests. --- dlls/gdiplus/tests/font.c | 177 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 176 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 0ac9558..d710a5b 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -26,7 +26,8 @@ #include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) -#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %f, got %f\n", expected, got) +#define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got)) +#define expectf(expected, got) expectf_((expected), (got), 0.001) static const WCHAR nonexistent[] = {'T','h','i','s','F','o','n','t','s','h','o','u','l','d','N','o','t','E','x','i','s','t','\0'}; static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; @@ -36,6 +37,14 @@ static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w',' static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; static const WCHAR LiberationSerif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; +static void set_rect_empty(RectF *rc) +{ + rc->X = 0.0; + rc->Y = 0.0; + rc->Width = 0.0; + rc->Height = 0.0; +} + static void test_createfont(void) { GpFontFamily* fontfamily = NULL, *fontfamily2; @@ -806,17 +815,30 @@ todo_wine static void test_font_transform(void) { + static const WCHAR string[] = { 'A',0 }; GpStatus status; HDC hdc; LOGFONT lf; GpFont *font; GpGraphics *graphics; GpMatrix *matrix; + GpStringFormat *format, *typographic; + PointF pos[1] = { { 0,0 } }; + REAL height; + RectF bounds, rect; hdc = CreateCompatibleDC(0); status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); + status = GdipSetPageUnit(graphics, UnitPixel); + expect(Ok, status); + + status = GdipCreateStringFormat(0, LANG_NEUTRAL, &format); + expect(Ok, status); + status = GdipStringFormatGetGenericTypographic(&typographic); + expect(Ok, status); + memset(&lf, 0, sizeof(lf)); lstrcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = -100; @@ -833,6 +855,34 @@ static void test_font_transform(void) expect(Ok, status); expect(-100, lf.lfHeight); expect(0, lf.lfWidth); + status = GdipGetFontHeight(font, graphics, &height); + expect(Ok, status); + expectf(120.703125, height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(133.203125, bounds.Height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(120.703125, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, NULL, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); +todo_wine + expectf_(-100.0, bounds.Y, 0.05); +todo_wine + expectf(120.703125, bounds.Height); /* scale matrix */ status = GdipScaleMatrix(matrix, 2.0, 3.0, MatrixOrderAppend); @@ -844,6 +894,34 @@ static void test_font_transform(void) todo_wine expect(-300, lf.lfHeight); expect(0, lf.lfWidth); + status = GdipGetFontHeight(font, graphics, &height); + expect(Ok, status); + expectf(120.703125, height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(133.203125, bounds.Height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(120.703125, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, NULL, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); +todo_wine + expectf_(-100.0, bounds.Y, 0.05); +todo_wine + expectf(120.703125, bounds.Height); /* scale + ratate matrix */ status = GdipRotateMatrix(matrix, 45.0, MatrixOrderAppend); @@ -855,6 +933,34 @@ todo_wine todo_wine expect(-300, lf.lfHeight); expect(0, lf.lfWidth); + status = GdipGetFontHeight(font, graphics, &height); + expect(Ok, status); + expectf(120.703125, height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(133.203125, bounds.Height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(120.703125, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, NULL, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); +todo_wine + expectf_(-100.0, bounds.Y, 0.05); +todo_wine + expectf(120.703125, bounds.Height); /* scale + ratate + shear matrix */ status = GdipShearMatrix(matrix, 4.0, 5.0, MatrixOrderAppend); @@ -866,10 +972,79 @@ todo_wine todo_wine expect(1032, lf.lfHeight); expect(0, lf.lfWidth); + status = GdipGetFontHeight(font, graphics, &height); + expect(Ok, status); + expectf(120.703125, height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(133.203125, bounds.Height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(120.703125, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, NULL, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); +todo_wine + expectf_(-100.0, bounds.Y, 0.05); +todo_wine + expectf(120.703125, bounds.Height); + + /* scale + ratate + shear + translate matrix */ + status = GdipTranslateMatrix(matrix, 10.0, 20.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipSetWorldTransform(graphics, matrix); + expect(Ok, status); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); +todo_wine + expect(1032, lf.lfHeight); + expect(0, lf.lfWidth); + status = GdipGetFontHeight(font, graphics, &height); + expect(Ok, status); + expectf(120.703125, height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(133.203125, bounds.Height); + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, typographic, &bounds, NULL, NULL); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); +todo_wine + expectf(120.703125, bounds.Height); + set_rect_empty(&bounds); + status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, + DriverStringOptionsCmapLookup, NULL, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); +todo_wine + expectf_(-100.0, bounds.Y, 0.05); +todo_wine + expectf(120.703125, bounds.Height); GdipDeleteMatrix(matrix); GdipDeleteFont(font); GdipDeleteGraphics(graphics); + GdipDeleteStringFormat(typographic); + GdipDeleteStringFormat(format); DeleteDC(hdc); }

1 0

Piotr Caban : msvcp60: Added missing 64-bit exports.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: e920be279f850f96cf00693b632540992c20b4a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e920be279f850f96cf00693b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 9 13:06:34 2012 +0200 msvcp60: Added missing 64-bit exports. --- dlls/msvcp60/msvcp60.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 22a3da8..561fc64 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2280,7 +2280,7 @@ @ cdecl -arch=win32 ?_Init(a)locale@std@@CAPAV_Locimp(a)12@XZ() locale__Init @ cdecl -arch=win64 ?_Init(a)locale@std@@CAPEAV_Locimp(a)12@XZ() locale__Init @ thiscall -arch=win32 ?_Init(a)strstreambuf@std@@IAEXHPAD0H(a)Z(ptr long ptr ptr long) strstreambuf__Init -@ stub -arch=win64 ?_Init(a)strstreambuf@std@@IEAAXHPEAD0H(a)Z +@ cdecl -arch=win64 ?_Init(a)strstreambuf@std@@IEAAXHPEAD0H(a)Z(ptr long ptr ptr long) strstreambuf__Init @ extern ?_Init_cnt(a)Init@ios_base(a)std@@0HA ios_base_Init__Init_cnt @ extern ?_Init_cnt(a)_Winit@std@@0HA _Winit__Init_cnt @ stub -arch=win32 ?_Initcvt@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@IAEXXZ @@ -3638,7 +3638,7 @@ @ thiscall -arch=win32 ?pptr@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IBEPAGXZ(ptr) basic_streambuf_wchar_pptr @ cdecl -arch=win64 ?pptr@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEBAPEAGXZ(ptr) basic_streambuf_wchar_pptr @ thiscall -arch=win32 ?precision(a)ios_base@std@@QAEHH(a)Z(ptr long) ios_base_precision_set -@ stub -arch=win64 ?precision(a)ios_base@std@@QEAA_JH(a)Z +@ cdecl -arch=win64 ?precision(a)ios_base@std@@QEAA_JH(a)Z(ptr long) ios_base_precision_set @ thiscall -arch=win32 ?precision(a)ios_base@std@@QBEHXZ(ptr) ios_base_precision_get @ cdecl -arch=win64 ?precision(a)ios_base@std@@QEBA_JXZ(ptr) ios_base_precision_get @ thiscall -arch=win32 ?pubimbue@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AVlocale(a)2@ABV32@@Z(ptr ptr ptr) basic_streambuf_char_pubimbue @@ -4003,9 +4003,9 @@ @ thiscall -arch=win32 ?sgetn@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAEHPAGH(a)Z(ptr ptr long) basic_streambuf_wchar_sgetn @ cdecl -arch=win64 ?sgetn@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA_JPEAG_J(a)Z(ptr ptr long) basic_streambuf_wchar_sgetn @ thiscall -arch=win32 ?showmanyc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_showmanyc -@ stub -arch=win64 ?showmanyc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ +@ cdecl -arch=win64 ?showmanyc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_showmanyc @ thiscall -arch=win32 ?showmanyc@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MAEHXZ(ptr) basic_streambuf_wchar_showmanyc -@ stub -arch=win64 ?showmanyc@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAHXZ +@ cdecl -arch=win64 ?showmanyc@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAHXZ(ptr) basic_streambuf_wchar_showmanyc @ cdecl ?signaling_NaN@?$numeric_limits(a)C@std@@SACXZ() msvcp90.?signaling_NaN@?$numeric_limits(a)C@std@@SACXZ @ cdecl ?signaling_NaN@?$numeric_limits(a)D@std@@SADXZ() msvcp90.?signaling_NaN@?$numeric_limits(a)D@std@@SADXZ @ cdecl ?signaling_NaN@?$numeric_limits(a)E@std@@SAEXZ() msvcp90.?signaling_NaN@?$numeric_limits(a)E@std@@SAEXZ

1 0

Alexandre Julliard : user32: Don' t use SWP_SHOWWINDOW when the WS_VISIBLE style was already toggled manually .
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: b9c847a426ab234c6e1ae5901b3f172b5adaed57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c847a426ab234c6e1ae5901… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 09:45:09 2012 +0200 user32: Don't use SWP_SHOWWINDOW when the WS_VISIBLE style was already toggled manually. --- dlls/user32/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index ee5fac9..905648e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -769,7 +769,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) RECT window_rect, client_rect; WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_SHOWWINDOW, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, &window_rect, &client_rect, NULL ); } @@ -2492,7 +2492,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B RECT window_rect, client_rect; WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_SHOWWINDOW, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, &window_rect, &client_rect, NULL ); } SendMessageW( hwnd, WM_STYLECHANGED, offset, (LPARAM)&style );

1 0

Alexandre Julliard : user32: Add a helper function to update the window visible state.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 6eea257fd1a95b3e8752650019da14865bcac274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eea257fd1a95b3e875265001… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 09:48:11 2012 +0200 user32: Add a helper function to update the window visible state. --- dlls/user32/win.c | 49 +++++++++++++++++++++++-------------------------- 1 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 905648e..a8882c3 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -431,6 +431,21 @@ static void send_parent_notify( HWND hwnd, UINT msg ) /******************************************************************* + * update_window_state + * + * Trigger an update of the window's driver state and surface. + */ +static void update_window_state( HWND hwnd ) +{ + RECT window_rect, client_rect; + + WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); + set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, &window_rect, &client_rect, NULL ); +} + + +/******************************************************************* * get_server_window_text * * Retrieve the window text from the server. @@ -718,7 +733,7 @@ HWND WIN_SetOwner( HWND hwnd, HWND owner ) */ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) { - BOOL ok, needs_show = FALSE; + BOOL ok, made_visible = FALSE; STYLESTRUCT style; WND *win = WIN_GetPtr( hwnd ); @@ -756,7 +771,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) /* Some apps try to make their window visible through WM_SETREDRAW. * Only do that if the window was never explicitly hidden, * because Steam messes with WM_SETREDRAW after hiding its windows. */ - needs_show = !(win->flags & WIN_HIDDEN) && (style.styleNew & WS_VISIBLE); + made_visible = !(win->flags & WIN_HIDDEN) && (style.styleNew & WS_VISIBLE); invalidate_dce( win, NULL ); } WIN_ReleasePtr( win ); @@ -764,14 +779,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) if (!ok) return 0; USER_Driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); - if (needs_show) - { - RECT window_rect, client_rect; - WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); - set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, - &window_rect, &client_rect, NULL ); - } + if (made_visible) update_window_state( hwnd ); return style.styleOld; } @@ -2272,7 +2280,7 @@ static LONG_PTR WIN_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicod LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, BOOL unicode ) { STYLESTRUCT style; - BOOL ok, needs_show = FALSE; + BOOL ok, made_visible = FALSE; LONG_PTR retval = 0; WND *wndPtr; @@ -2475,7 +2483,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B if ((offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) || (offset == GWL_EXSTYLE && ((style.styleOld ^ style.styleNew) & WS_EX_LAYERED))) { - needs_show = !(wndPtr->flags & WIN_HIDDEN) && (wndPtr->dwStyle & WS_VISIBLE); + made_visible = !(wndPtr->flags & WIN_HIDDEN) && (wndPtr->dwStyle & WS_VISIBLE); invalidate_dce( wndPtr, NULL ); } WIN_ReleasePtr( wndPtr ); @@ -2487,14 +2495,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B style.styleOld = retval; style.styleNew = newval; USER_Driver->pSetWindowStyle( hwnd, offset, &style ); - if (needs_show) - { - RECT window_rect, client_rect; - WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); - set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, - &window_rect, &client_rect, NULL ); - } + if (made_visible) update_window_state( hwnd ); SendMessageW( hwnd, WM_STYLECHANGED, offset, (LPARAM)&style ); } @@ -3598,12 +3599,8 @@ BOOL WINAPI SwitchDesktop( HDESK hDesktop) */ BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format ) { - RECT window_rect, client_rect; - - WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); - return set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, - &window_rect, &client_rect, NULL ); + update_window_state( hwnd ); + return TRUE; }

1 0

Alexandre Julliard : user32: Store the pixel format in the window structure .
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: cf799f585246767bad892d6975752b05ca09bfdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf799f585246767bad892d697… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 09:51:29 2012 +0200 user32: Store the pixel format in the window structure. --- dlls/user32/win.c | 10 ++++++++++ dlls/user32/win.h | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a8882c3..7da4972 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3599,6 +3599,16 @@ BOOL WINAPI SwitchDesktop( HDESK hDesktop) */ BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format ) { + WND *win = WIN_GetPtr( hwnd ); + + if (!win || win == WND_DESKTOP || win == WND_OTHER_PROCESS) + { + WARN( "setting format %d on win %p not supported\n", format, hwnd ); + return FALSE; + } + win->pixel_format = format; + WIN_ReleasePtr( win ); + update_window_state( hwnd ); return TRUE; } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index b35fc00..a19ebe9 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -62,6 +62,7 @@ typedef struct tagWND HICON hIconSmall; /* window's small icon */ struct window_surface *surface; /* Window surface if any */ struct tagDIALOGINFO *dlgInfo;/* Dialog additional info (dialogs only) */ + int pixel_format; /* Pixel format set by the graphics driver */ int cbWndExtra; /* class cbWndExtra at window creation */ DWORD_PTR userdata; /* User private data */ DWORD wExtra[1]; /* Window extra bytes */

1 0

Francois Gouget : testbot/bin: Make the wine-patches script names more descriptive and consistent.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: tools Branch: master Commit: 2b03eba4f6f21d1752f116198627da89b77620f6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2b03eba4f6f21d1752f11619… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 11:15:58 2012 +0200 testbot/bin: Make the wine-patches script names more descriptive and consistent. Prefix them with 'WinePatches' in reference to both the Wine project and the wine-patches they relate to. The 'WinePatchesML' script deals directly with the wine-patches Mailing List . The Submit script submits the patch directly. The 'WinePatchesWeb' scripts deal with Wine's Patch web site. Specifically the Notify script informs the WineTestBot when new patches are available and the Get script grabs and submits them for testing. --- testbot/bin/Engine.pl | 32 ++++++++++---------- ...inePatchesHandler.pl => WinePatchesMLSubmit.pl} | 2 +- .../{RetrievePatches.pl => WinePatchesWebGet.pl} | 18 +++++----- ...ificationHandler.pl => WinePatchesWebNotify.pl} | 2 +- testbot/doc/INSTALL.txt | 16 +++++----- testbot/lib/WineTestBot/Engine/Notify.pm | 16 +++++----- 6 files changed, 43 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=2b03eba4f6f21d1752f1…

1 0

Francois Gouget : testbot/scripts: Tweak CheckWineTestBot. pl so it returns 1 if it failed to restart WineTestBot.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: tools Branch: master Commit: 37209e6b133474ebadc64cb80edb7e2218771083 URL: http://source.winehq.org/git/tools.git/?a=commit;h=37209e6b133474ebadc64cb8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 11:16:13 2012 +0200 testbot/scripts: Tweak CheckWineTestBot.pl so it returns 1 if it failed to restart WineTestBot. --- testbot/scripts/CheckWineTestBot.pl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index 2793a17..f6f0666 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -34,6 +34,7 @@ use WineTestBot::Engine::Notify; $ENV{PATH} = "/sbin:/usr/sbin:/usr/bin:/bin"; delete $ENV{ENV}; +my $rc = 0; if (! PingEngine()) { system "service winetestbot restart > /dev/null"; @@ -53,6 +54,8 @@ EOF else { print SENDMAIL "Unable to restart the engine\n"; + $rc = 1; } close(SENDMAIL); } +exit($rc);

1 0

Francois Gouget : testbot/build: Tweak Reconfig. pl to automatically create the build-xxx directories.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: tools Branch: master Commit: 0a22e8ff8ef8e1bf7dc49b37783945d8a54b210d URL: http://source.winehq.org/git/tools.git/?a=commit;h=0a22e8ff8ef8e1bf7dc49b37… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 11:16:21 2012 +0200 testbot/build: Tweak Reconfig.pl to automatically create the build-xxx directories. --- testbot/bin/Reconfig.pl | 2 ++ testbot/doc/INSTALL.txt | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index f72ba6c..60018d9 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -65,6 +65,7 @@ sub GitPull sub BuildNative { + mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); system("cd $DataDir/build-native && " . "rm -rf * && " . "../wine-git/configure --enable-win64 --without-x --without-freetype " . @@ -86,6 +87,7 @@ sub BuildCross my $Bits = $_[0]; my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32"); + mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); system("cd $DataDir/build-mingw$Bits && " . "rm -rf * && " . "../wine-git/configure --host=$Host --with-wine-tools=../build-native " . diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 27c4053..d7c093e 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -141,6 +141,9 @@ Dependencies: mkdir $HOME/tools/testbot/var $HOME/tools/testbot/log chmod g+w $HOME/tools/testbot/var $HOME/tools/testbot/log - Clone the Wine git repository to $HOME/tools/testbot/var/wine-git. +- In the winetest account, run Reconfig.pl. + Check $HOME/tools/testbot/log/Reconfig.log to make sure it + succeeded. - Take a snapshot of the running VM. Make sure restoring this snapshot will result in a running build VM. - Register this VM as a build VM on the web site.

1 0

Francois Gouget : testbot/build: Use the standard MinGW compiler names in the Reconfig.pl script.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: tools Branch: master Commit: e7ee02677cc9621782f07b26e4df261dd6b30316 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e7ee02677cc9621782f07b26… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 5 11:16:26 2012 +0200 testbot/build: Use the standard MinGW compiler names in the Reconfig.pl script. --- testbot/bin/Reconfig.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index 60018d9..2a75e6f 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -86,7 +86,7 @@ sub BuildCross { my $Bits = $_[0]; - my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32"); + my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); system("cd $DataDir/build-mingw$Bits && " . "rm -rf * && " .

1 0

Jacek Caban : winegecko: Added 1.8 release.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: tools Branch: master Commit: 27665fefacef02a973640fd17660e5653771de0e URL: http://source.winehq.org/git/tools.git/?a=commit;h=27665fefacef02a973640fd1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 9 11:25:57 2012 +0200 winegecko: Added 1.8 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 08262f3..c311be7 100644 --- a/winegecko.php +++ b/winegecko.php @@ -68,7 +68,9 @@ $aFileSizes = array( '1.6-x86'=>16802816, '1.6-x86_64'=>17251328, '1.7-x86'=>16995328, - '1.7-x86_64'=>17438720 + '1.7-x86_64'=>17438720, + '1.8-x86'=>17774592, + '1.8-x86_64'=>18238976 ); // Exact size of the file:

1 0