May 2010 - Wine-Commits - list.winehq.org

André Hentschel : winapi: Init preprocessor_condition.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: 9eda2de2b81df96617867c5feb900cc3d1212a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eda2de2b81df96617867c5fe… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 28 21:30:36 2010 +0200 winapi: Init preprocessor_condition. --- tools/winapi/c_parser.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index e927fb9..189f780 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -720,7 +720,7 @@ sub parse_c_file($$$$) my $previous_line = 0; my $previous_column = -1; - my $preprocessor_condition; + my $preprocessor_condition = ""; my $if = 0; my $if0 = 0; my $extern_c = 0;

1 0

Alexandre Julliard : Wine release 1.2-rc2
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: website Branch: master Commit: 661f8bab0e1f2bdcb0978b86bcefa6578dff01ad URL: http://source.winehq.org/git/website.git/?a=commit;h=661f8bab0e1f2bdcb0978b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 19:48:47 2010 +0200 Wine release 1.2-rc2 --- news/en/2010052801.xml | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/news/en/2010052801.xml b/news/en/2010052801.xml new file mode 100644 index 0000000..29bc493 --- /dev/null +++ b/news/en/2010052801.xml @@ -0,0 +1,9 @@ +<news> +<date>May 28, 2010</date> +<title>Wine 1.2-rc2 Released</title> +<body> + The Wine development release 1.2-rc2 is now available. + There are no new features in this release, only bug fixes, since we are in code freeze. If you find a new feature that's a bug. +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.2-rc2.
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: 64da36b61ade768d4a0e16d9121e3690ff80fe4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=64da36b61ade768d4a0e16d91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 19:39:36 2010 +0200 Release 1.2-rc2. --- ANNOUNCE | 942 ++++++++++++++++++++----------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 320 insertions(+), 642 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64da36b61ade768d4a0e1…

1 0

Tag wine-1.2-rc2 : Alexandre Julliard : Release 1.2-rc2
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: refs/tags/wine-1.2-rc2 Tag: 28ae50aa4ff98c3f26249089f6aa408f81599c77 URL: http://source.winehq.org/git/wine.git/?a=tag;h=28ae50aa4ff98c3f26249089f6aa… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 19:39:36 2010 +0200 Release 1.2-rc2

1 0

Sven Baars : winefile: Fix Dutch translation.
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: dd09205984c83fba935c47b8916a8b33b7bfcf4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd09205984c83fba935c47b89… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 28 16:15:01 2010 +0200 winefile: Fix Dutch translation. --- programs/winefile/Nl.rc | 50 ++++++++++++++++++++++++---------------------- 1 files changed, 26 insertions(+), 24 deletions(-) diff --git a/programs/winefile/Nl.rc b/programs/winefile/Nl.rc index e6ea1db..cd7b955 100644 --- a/programs/winefile/Nl.rc +++ b/programs/winefile/Nl.rc @@ -22,6 +22,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + /* Menu */ IDM_WINEFILE MENU FIXED IMPURE @@ -29,8 +31,8 @@ IDM_WINEFILE MENU FIXED IMPURE POPUP "&Bestand" { MENUITEM "&Openen\tEnter", ID_ACTIVATE MENUITEM "&Verplaatsen...\tF7", ID_FILE_MOVE - MENUITEM "&Kopi�ren...\tF8", ID_FILE_COPY - MENUITEM "Naar &klembord...\tF9", 118 + MENUITEM "&Kopiëren...\tF8", ID_FILE_COPY + MENUITEM "Naar klem&bord...\tF9", 118 MENUITEM "Ver&wijderen\tDel", ID_FILE_DELETE MENUITEM "&Naam wijzigen...", 109 MENUITEM "&Eigenschappen...\tAlt+Enter",ID_EDIT_PROPERTIES @@ -44,22 +46,22 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM SEPARATOR MENUITEM "Nieuwe &map...", 111 MENUITEM "&Zoeken...", 104 - MENUITEM "Bestanden &selecteren...", 116 + MENUITEM "Bestanden s&electeren...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS - MENUITEM "A&fsluiten\tAlt+X", ID_FILE_EXIT + MENUITEM "&Afsluiten\tAlt+X", ID_FILE_EXIT #else - MENUITEM "A&fsluiten", ID_FILE_EXIT + MENUITEM "&Afsluiten", ID_FILE_EXIT #endif } POPUP "&Disk" { - MENUITEM "Disk &kopi�ren...", 201 - MENUITEM "Disklabel maken...", 202 + MENUITEM "Schijf &kopiëren...", 201 + MENUITEM "Schijflabel maken...", 202 MENUITEM SEPARATOR - MENUITEM "Disk &formatteren...", ID_FORMAT_DISK + MENUITEM "Schijf &formatteren...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "Systeemdisk maken...", -1 /*TODO*/ + MENUITEM "Systeemschijf maken...", -1 /*TODO*/ #endif MENUITEM SEPARATOR MENUITEM "Verbinding &maken met netwerkchijf",ID_CONNECT_NETWORK_DRIVE @@ -81,8 +83,8 @@ IDM_WINEFILE MENU FIXED IMPURE } POPUP "&Beeld" { - MENUITEM "&Hierarchie en mapinhoud", 413 - MENUITEM "&Alleen hierarchie", 411 + MENUITEM "&Hiërarchie en mapinhoud", 413 + MENUITEM "Alleen h&iërarchie", 411 MENUITEM "Alleen &mapinhoud", 412 MENUITEM SEPARATOR MENUITEM "Sp&litsen", ID_VIEW_SPLIT @@ -91,7 +93,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Alle details", ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "&Gedeeltelijke details...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "Sorteer op &naam", ID_VIEW_SORT_NAME + MENUITEM "&Sorteer op naam", ID_VIEW_SORT_NAME MENUITEM "Sorteer op &type", ID_VIEW_SORT_TYPE MENUITEM "Sorteer op &grootte", ID_VIEW_SORT_SIZE MENUITEM "Sorteer op &datum", ID_VIEW_SORT_DATE @@ -102,10 +104,10 @@ IDM_WINEFILE MENU FIXED IMPURE POPUP "&Opties" { MENUITEM "&Bevestiging...", 501 MENUITEM "&Lettertype...", ID_SELECT_FONT - MENUITEM "Gereedschappenbalk &aanpassen...", 512 + MENUITEM "Gereedschapsbalk &aanpassen...", 512 MENUITEM SEPARATOR - MENUITEM "&Gereedschappenbalk", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Schijvenbalk", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Gereedschapsbalk", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Schijfbalk", ID_VIEW_DRIVE_BAR, CHECKED MENUITEM "S&tatusbalk", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS MENUITEM "&Volledig scherm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN @@ -123,7 +125,7 @@ IDM_WINEFILE MENU FIXED IMPURE } POPUP "&Venster" { - MENUITEM "Nieuw &venster", ID_WINDOW_NEW + MENUITEM "&Nieuw venster", ID_WINDOW_NEW MENUITEM "Trapsgewijs\tCtrl+F5", ID_WINDOW_CASCADE MENUITEM "&Boven elkaar", ID_WINDOW_TILE_HORZ MENUITEM "&Naast elkaar\tCtrl+F4", ID_WINDOW_TILE_VERT @@ -164,15 +166,15 @@ BEGIN LTEXT "&Naam:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL GROUPBOX "Bestandstype",-1,7,23,87,56 - CONTROL "&Directories",IDC_VIEW_TYPE_DIRECTORIES,"Button", + CONTROL "&Mappen",IDC_VIEW_TYPE_DIRECTORIES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 CONTROL "&Programma's",IDC_VIEW_TYPE_PROGRAMS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 - CONTROL "Docu&menten",IDC_VIEW_TYPE_DOCUMENTS,"Button", + CONTROL "Do&cumenten",IDC_VIEW_TYPE_DOCUMENTS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 CONTROL "&Overige bestanden",IDC_VIEW_TYPE_OTHERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 - CONTROL "Toon Verborgen/&Systeem Bestanden",IDC_VIEW_TYPE_HIDDEN, + CONTROL "Toon verborgen/&systeembestanden",IDC_VIEW_TYPE_HIDDEN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 DEFPUSHBUTTON "OK",IDOK,104,7,50,14 PUSHBUTTON "Annuleren",IDCANCEL,104,24,50,14 @@ -187,9 +189,9 @@ BEGIN PUSHBUTTON "Annuleren",IDCANCEL,191,29,50,14 LTEXT "&Bestandsnaam:",-1,7,7,59,9 EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Volledig &Pad:",-1,7,18,59,9 + LTEXT "Volledig &pad:",-1,7,18,59,9 EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Laatste Wijziging:",-1,7,29,59,9 + LTEXT "Laatste wijziging:",-1,7,29,59,9 EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Versie:",-1,7,40,59,9 EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP @@ -198,12 +200,12 @@ BEGIN LTEXT "Grootte:",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP GROUPBOX "Attributen",-1,7,79,158,46 - CONTROL "A&lleen Lezen",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "A&lleen-lezen",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 CONTROL "V&erborgen",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 CONTROL "&Archiveren",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 CONTROL "&Systeem",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 CONTROL "Ge&comprimeerd",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 - GROUPBOX "&Versie Informatie",-1,7,129,234,79 + GROUPBOX "&Versie-informatie",-1,7,129,234,79 LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL END @@ -225,7 +227,7 @@ STRINGTABLE IDS_SHELL "Shell" IDS_TITLEFMT "%s - %s" IDS_NO_IMPL "Nog niet geimplementeerd" - IDS_WINE_FILE "Wine File" + IDS_WINE_FILE "Winefile" } STRINGTABLE

1 0

Henri Verbeet : d3d9/tests: Remove an invalid point size test.
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: c3cda92cf4207d060579efdee0728a1ec427c7c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3cda92cf4207d060579efdee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 28 16:06:41 2010 +0200 d3d9/tests: Remove an invalid point size test. This test tests point size clamping behaviour when POINTSIZE_MAX < POINTSIZE_MIN, but that behaviour isn't consistent between D3D drivers. --- dlls/d3d9/tests/visual.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a619574..b749494 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8813,7 +8813,6 @@ static void pointsize_test(IDirect3DDevice9 *device) 384, 64, 0.1, 448, 64, 0.1, 512, 64, 0.1, - 576, 64, 0.1, }; /* Transforms the coordinate system [-1.0;1.0]x[-1.0;1.0] to [0.0;0.0]x[640.0;480.0]. Z is untouched */ @@ -8902,17 +8901,6 @@ static void pointsize_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, &vertices[18], sizeof(float) * 3); ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%08x\n", hr); - /* What happens if POINTSIZE_MAX < POINTSIZE_MIN? - * ptsize = 3.0, ptsize_max = 1.0, ptsize_min = 15.0 */ - ptsize = 3.0; - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSIZE, *((DWORD *) (&ptsize))); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed, hr=%08x\n", hr); - ptsize = 15.0; - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSIZE_MIN, *((DWORD *) (&ptsize))); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed, hr=%08x\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, &vertices[21], sizeof(float) * 3); - ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSIZE_MAX, *((DWORD *) (&ptsizemax_orig))); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed, hr=%08x\n", hr); @@ -8924,7 +8912,7 @@ static void pointsize_test(IDirect3DDevice9 *device) ptsize = 15.0; hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSIZE_MIN, *((DWORD *) (&ptsize))); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed, hr=%08x\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, &vertices[24], sizeof(float) * 3); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, &vertices[21], sizeof(float) * 3); ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSIZE_MIN, *((DWORD *) (&ptsizemin_orig))); @@ -8947,10 +8935,8 @@ static void pointsize_test(IDirect3DDevice9 *device) ok(point_match(device, 320, 64, 0), "point_match(320, 64, 0) failed, expected point size 1.\n"); /* ptsize = 15, ptsize_max = 1 --> point has size 1 */ ok(point_match(device, 448, 64, 0), "point_match(448, 64, 0) failed, expected point size 1.\n"); - /* ptsize = 4, ptsize_max = 1, ptsize_min = 15 --> point has size 1 */ - ok(point_match(device, 512, 64, 0), "point_match(512, 64, 0) failed, expected point size 1.\n"); /* ptsize = 1, ptsize_max = default(64), ptsize_min = 15 --> point has size 15 */ - ok(point_match(device, 576, 64, 7), "point_match(576, 64, 7) failed, expected point size 15.\n"); + ok(point_match(device, 512, 64, 7), "point_match(512, 64, 7) failed, expected point size 15.\n"); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Robert Wilhelm : msvcrt: Support system(NULL).
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: 620af69d888bc5d0fa2179f06423aa1fb290b11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=620af69d888bc5d0fa2179f06… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu May 27 18:45:06 2010 +0200 msvcrt: Support system(NULL). --- dlls/msvcrt/process.c | 19 ++++++++++++++++++- dlls/msvcrt/tests/environ.c | 11 +++++++++++ 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 564c100..b4c39c1 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1168,7 +1168,21 @@ int CDECL _wsystem(const MSVCRT_wchar_t* cmd) unsigned int len; static const MSVCRT_wchar_t flag[] = {' ','/','c',' ',0}; - if (!(comspec = msvcrt_get_comspec())) return -1; + comspec = msvcrt_get_comspec(); + + if (cmd == NULL) + { + if (comspec == NULL) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return 0; + } + return 1; + } + + if ( comspec == NULL) + return -1; + len = strlenW(comspec) + strlenW(flag) + strlenW(cmd) + 1; if (!(fullcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(MSVCRT_wchar_t)))) @@ -1195,6 +1209,9 @@ int CDECL MSVCRT_system(const char* cmd) int res = -1; MSVCRT_wchar_t *cmdW; + if (cmd == NULL) + return _wsystem(NULL); + if ((cmdW = msvcrt_wstrdupa(cmd))) { res = _wsystem(cmdW); diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 6175e14..336238c 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -42,6 +42,15 @@ static const char *a_very_long_env_string = "/usr/lib/mingw32/3.4.2/;" "/usr/lib/"; +static void test_system(void) +{ + int ret = system(NULL); + ok(ret == 1, "Expected system to return 1, got %d\n", ret); + + ret = system("echo OK"); + ok(ret == 0, "Expected system to return 0, got %d\n", ret); +} + START_TEST(environ) { ok( _putenv("cat=") == 0, "_putenv failed on deletion of nonexistent environment variable\n" ); @@ -54,4 +63,6 @@ START_TEST(environ) ok( _putenv(a_very_long_env_string) == 0, "_putenv failed for long environment string\n"); ok( getenv("nonexistent") == NULL, "getenv should fail with nonexistent var name\n" ); + + test_system(); }

1 0

Henri Verbeet : d3d9/tests: Don' t depend so much on point rasterization rules in pointsize_test().
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: 8c92f805f6779431718bf06e67c55e6283dc8d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c92f805f6779431718bf06e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 28 16:06:39 2010 +0200 d3d9/tests: Don't depend so much on point rasterization rules in pointsize_test(). We can create a separate test for point rasterization if we really care about that, but I doubt we do. --- dlls/d3d9/tests/visual.c | 122 +++++++++++++++++++++------------------------- 1 files changed, 55 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c92f805f6779431718bf…

1 0

Henri Verbeet : d3d9/test: Introduce point_match() to simplify testing point sizes.
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: 1c12ba44a70b268d02217d1735ea8e45b9d313c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c12ba44a70b268d02217d173… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 28 16:06:40 2010 +0200 d3d9/test: Introduce point_match() to simplify testing point sizes. --- dlls/d3d9/tests/visual.c | 103 +++++++++++++-------------------------------- 1 files changed, 30 insertions(+), 73 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1bc1a50..a619574 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8769,6 +8769,26 @@ static void vpos_register_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(backbuffer); } +static BOOL point_match(IDirect3DDevice9 *device, UINT x, UINT y, UINT r) +{ + D3DCOLOR color; + + color = D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff); + if (!color_match(getPixelColor(device, x + r, y), color, 1)) return FALSE; + if (!color_match(getPixelColor(device, x - r, y), color, 1)) return FALSE; + if (!color_match(getPixelColor(device, x, y + r), color, 1)) return FALSE; + if (!color_match(getPixelColor(device, x, y - r), color, 1)) return FALSE; + + ++r; + color = D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0xff); + if (!color_match(getPixelColor(device, x + r, y), color, 1)) return FALSE; + if (!color_match(getPixelColor(device, x - r, y), color, 1)) return FALSE; + if (!color_match(getPixelColor(device, x, y + r), color, 1)) return FALSE; + if (!color_match(getPixelColor(device, x, y - r), color, 1)) return FALSE; + + return TRUE; +} + static void pointsize_test(IDirect3DDevice9 *device) { HRESULT hr; @@ -8914,86 +8934,23 @@ static void pointsize_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed hr=%08x\n", hr); } - color = getPixelColor(device, 64-7, 64-7); - ok(color == 0x00ffffff, "pSize: Pixel (64-7),(64-7) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 64+7, 64+7); - ok(color == 0x00ffffff, "pSize: Pixel (64+7),(64+7) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 64-8, 64-8); - ok(color == 0x000000ff, "pSize: Pixel (64-8),(64-8) has color 0x%08x, expected 0x000000ff\n", color); - color = getPixelColor(device, 64+8, 64+8); - ok(color == 0x000000ff, "pSize: Pixel (64+8),(64+8) has color 0x%08x, expected 0x000000ff\n", color); - - color = getPixelColor(device, 128-15, 64-15); - ok(color == 0x00ffffff, "pSize: Pixel (128-15),(64-15) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 128+15, 64+15); - ok(color == 0x00ffffff, "pSize: Pixel (128+15),(64+15) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 128-16, 64-16); - ok(color == 0x000000ff, "pSize: Pixel (128-16),(64-16) has color 0x%08x, expected 0x000000ff\n", color); - color = getPixelColor(device, 128+16, 64+16); - ok(color == 0x000000ff, "pSize: Pixel (128+16),(64+16) has color 0x%08x, expected 0x000000ff\n", color); - - color = getPixelColor(device, 192-15, 64-15); - ok(color == 0x00ffffff, "pSize: Pixel (192-15),(64-15) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 192+15, 64+15); - ok(color == 0x00ffffff, "pSize: Pixel (192+15),(64+15) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 192-16, 64-16); - ok(color == 0x000000ff, "pSize: Pixel (192-16),(64-16) has color 0x%08x, expected 0x000000ff\n", color); - color = getPixelColor(device, 192+16, 64+16); - ok(color == 0x000000ff, "pSize: Pixel (192+16),(64+16) has color 0x%08x, expected 0x000000ff\n", color); + ok(point_match(device, 64, 64, 7), "point_match(64, 64, 7) failed, expected point size 15.\n"); + ok(point_match(device, 128, 64, 15), "point_match(128, 64, 15) failed, expected point size 31.\n"); + ok(point_match(device, 192, 64, 15), "point_match(192, 64, 15) failed, expected point size 31.\n"); if (caps.MaxPointSize >= 63.0) { - color = getPixelColor(device, 256-31, 64-31); - ok(color == 0x00ffffff, "pSize: Pixel (256-31),(64-31) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 256+31, 64+31); - ok(color == 0x00ffffff, "pSize: Pixel (256+31),(64+31) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 256-32, 64-32); - ok(color == 0x000000ff, "pSize: Pixel (256-32),(64-32) has color 0x%08x, expected 0x000000ff\n", color); - color = getPixelColor(device, 256+32, 64+32); - ok(color == 0x000000ff, "pSize: Pixel (256+32),(64+32) has color 0x%08x, expected 0x000000ff\n", color); - - color = getPixelColor(device, 384-31, 64-31); - ok(color == 0x00ffffff, "pSize: Pixel (384-31),(64-31) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 384+31, 64+31); - ok(color == 0x00ffffff, "pSize: Pixel (384+31),(64+31) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 384-32, 64-32); - ok(color == 0x000000ff, "pSize: Pixel (384-32),(64-32) has color 0x%08x, expected 0x000000ff\n", color); - color = getPixelColor(device, 384+32, 64+32); - ok(color == 0x000000ff, "pSize: Pixel (384+32),(64+32) has color 0x%08x, expected 0x000000ff\n", color); - } - - color = getPixelColor(device, 320-0, 64-0); - ok(color == 0x00ffffff, "pSize: Pixel (320-0),(64-0) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 320-1, 64-1); - ok(color == 0x000000ff, "pSize: Pixel (320-1),(64-1) has color 0x%08x, expected 0x000000ff\n", color); - color = getPixelColor(device, 320+1, 64+1); - ok(color == 0x000000ff, "pSize: Pixel (320+1),(64+1) has color 0x%08x, expected 0x000000ff\n", color); + ok(point_match(device, 256, 64, 31), "point_match(256, 64, 31) failed, expected point size 63.\n"); + ok(point_match(device, 384, 64, 31), "point_match(384, 64, 31) failed, expected point size 63.\n"); + } + ok(point_match(device, 320, 64, 0), "point_match(320, 64, 0) failed, expected point size 1.\n"); /* ptsize = 15, ptsize_max = 1 --> point has size 1 */ - color = getPixelColor(device, 448-0, 64-0); - ok(color == 0x00ffffff, "pSize: Pixel (448-0),(64-0) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 448-1, 64-1); - ok(color == 0x000000ff, "pSize: Pixel (448-1),(64-1) has color 0x%08x, expected 0x000000ff\n", color); - color = getPixelColor(device, 448+1, 64+1); - ok(color == 0x000000ff, "pSize: Pixel (448+1),(64+1) has color 0x%08x, expected 0x000000ff\n", color); - + ok(point_match(device, 448, 64, 0), "point_match(448, 64, 0) failed, expected point size 1.\n"); /* ptsize = 4, ptsize_max = 1, ptsize_min = 15 --> point has size 1 */ - color = getPixelColor(device, 512-0, 64-0); - ok(color == 0x00ffffff, "pSize: Pixel (512-0),(64-0) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 512-1, 64-1); - ok(color == 0x000000ff, "pSize: Pixel (512-1),(64-1) has color 0x%08x, expected 0x000000ff\n", color); - color = getPixelColor(device, 512+1, 64+1); - ok(color == 0x000000ff, "pSize: Pixel (512+1),(64+1) has color 0x%08x, expected 0x000000ff\n", color); - + ok(point_match(device, 512, 64, 0), "point_match(512, 64, 0) failed, expected point size 1.\n"); /* ptsize = 1, ptsize_max = default(64), ptsize_min = 15 --> point has size 15 */ - color = getPixelColor(device, 576-7, 64-7); - ok(color == 0x00ffffff, "pSize: Pixel (576-7),(64-7) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 576+7, 64+7); - ok(color == 0x00ffffff, "pSize: Pixel (576+7),(64+7) has color 0x%08x, expected 0x00ffffff\n", color); - color = getPixelColor(device, 576-8, 64-8); - ok(color == 0x000000ff, "pSize: Pixel (576-8),(64-8) has color 0x%08x, expected 0x000000ff\n", color); - color = getPixelColor(device, 576+8, 64+8); - ok(color == 0x000000ff, "pSize: Pixel (576+8),(64+8) has color 0x%08x, expected 0x000000ff\n", color); + ok(point_match(device, 576, 64, 7), "point_match(576, 64, 7) failed, expected point size 15.\n"); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Alexandre Julliard : user32: Only skip redraws on MDI child unmaximize if the new child is maximized.
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: d815e582cf327dca33cf84c3cc27701c2eef98ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d815e582cf327dca33cf84c3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 15:01:25 2010 +0200 user32: Only skip redraws on MDI child unmaximize if the new child is maximized. --- dlls/user32/win.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 74ea0b3..6800abd 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1148,9 +1148,14 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, if((cs->style & WS_VISIBLE) && IsZoomed(top_child)) { TRACE("Restoring current maximized child %p\n", top_child); - SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); - ShowWindow( top_child, SW_SHOWNORMAL ); - SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + if (cs->style & WS_MAXIMIZE) + { + /* if the new window is maximized don't bother repainting */ + SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); + ShowWindow( top_child, SW_SHOWNORMAL ); + SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + } + else ShowWindow( top_child, SW_SHOWNORMAL ); } } }

1 0