April 2014 - Wine-commits - list.winehq.org

Francois Gouget : testbot/TestAgent: Verify that only one command is specified on the command line.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: 0730c9b0632456cd5c6a36a75044c04529ba8de3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0730c9b0632456cd5c6a36a7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:54 2014 +0200 testbot/TestAgent: Verify that only one command is specified on the command line. --- testbot/scripts/TestAgent | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 4fa8f4f..e238967 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -59,6 +59,17 @@ my $RunFlags = 0; my ($Port, $ConnectTimeout, $Timeout, $Keepalive, $TunnelOpt); my $Usage; +sub set_cmd($) +{ + my ($Value) = @_; + if (defined $Cmd) + { + error("the '$Cmd' and '$Value' commands are mutually exclusive\n"); + $Usage = 2; + } + $Cmd = $Value; +} + sub check_opt_val($$) { my ($option, $val) = @_; @@ -138,7 +149,7 @@ while (@ARGV) } elsif ($arg eq "sendfile") { - $Cmd = $arg; + set_cmd($arg); $LocalFilename = check_opt_val($arg, $LocalFilename); if (!$Usage) { @@ -155,7 +166,7 @@ while (@ARGV) } elsif ($arg eq "getfile") { - $Cmd = $arg; + set_cmd($arg); $ServerFilename = check_opt_val($arg, $ServerFilename); if (!$Usage) { @@ -172,28 +183,28 @@ while (@ARGV) } elsif ($arg eq "run") { + set_cmd($arg); @Run = @ARGV; - $Cmd = $arg; last; } elsif ($arg eq "wait") { - $Cmd = $arg; + set_cmd($arg); $WaitPid = check_opt_val($arg, $WaitPid); } elsif ($arg eq "rm") { - $Cmd = $arg; + set_cmd($arg); @Rm = @ARGV; last; } elsif ($arg eq "getversion") { - $Cmd = $arg; + set_cmd($arg); } elsif ($arg eq "ping" or $arg eq "settime") { - $Cmd = $arg; + set_cmd($arg); } else {

1 0

Francois Gouget : testbot/TestAgent: Add getproperty and upgrade commands.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: tools Branch: master Commit: 893a3bc6b4f5358f98bba7b196ab8739b5de966a URL: http://source.winehq.org/git/tools.git/?a=commit;h=893a3bc6b4f5358f98bba7b1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:59 2014 +0200 testbot/TestAgent: Add getproperty and upgrade commands. --- testbot/scripts/TestAgent | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index e238967..ac2c914 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -52,7 +52,7 @@ sub error(@) print STDERR "$name0:error: ", @_; } -my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, @Rm); +my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, $PropName, @Rm); my (@Run, $RunIn, $RunOut, $RunErr, $WaitPid); my $SendFlags = 0; my $RunFlags = 0; @@ -206,6 +206,16 @@ while (@ARGV) { set_cmd($arg); } + elsif ($arg eq "getproperty") + { + set_cmd($arg); + $PropName = @ARGV ? check_opt_val($arg, $PropName) : '*'; + } + elsif ($arg eq "upgrade") + { + set_cmd($arg); + $LocalFilename = check_opt_val($arg, $LocalFilename); + } else { error("unknown command '$arg'\n"); @@ -309,8 +319,13 @@ if (defined $Usage) print " wait Waits for the specified child process on the server.\n"; print " settime Set the system time of the remote host.\n"; print " rm Deletes the specified files on the server.\n"; - print " getversion Returns the version of the server.\n"; + print " getversion Returns the protocol version.\n"; + print " getproperty <name> Retrieves and prints the specified server property, for\n"; + print " instance its architecture, 'server.arch'. One can print all the\n"; + print " properties at once by omitting the name or setting it to '*'.\n"; print " ping Makes sure the server is still alive.\n"; + print " upgrade Replaces the server executable with the specified file and\n"; + print " restarts it.\n"; print " <hostname> Is the hostname of the server.\n"; print " --port <port> Use the specified port number instead of the default one.\n"; print " --connect-timeout <timeout> Use the specified timeout (in seconds) when\n"; @@ -395,6 +410,28 @@ elsif ($Cmd eq "settime") { $Result = $TA->SetTime(); } +elsif ($Cmd eq "getproperty") +{ + $Result = $TA->GetProperties(); + if (defined $Result) + { + if ($PropName eq '*') + { + foreach my $Name (sort keys %$Result) + { + print "$Name=$Result->{$Name}\n"; + } + } + else + { + print "$Result->{$PropName}\n" if (defined $Result->{$PropName}); + } + } +} +elsif ($Cmd eq "upgrade") +{ + $Result = $TA->Upgrade($LocalFilename); +} elsif ($Cmd eq "getversion") { $Result = $TA->GetVersion();

1 0

André Hentschel : Add WWN 367
by Jeremy Newman 11 Apr '14

11 Apr '14

Module: website Branch: master Commit: 081b1334d9aec45f022d2a871fe574bea095af67 URL: http://source.winehq.org/git/website.git/?a=commit;h=081b1334d9aec45f022d2a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 11 21:15:02 2014 +0200 Add WWN 367 --- news/de/2014041101.xml | 11 + news/en/2014041101.xml | 11 + wwn/en/wn20140411_367.xml | 686 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 708 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=081b1334d9aec45f02…

1 0

Ryan Turner : wined3d: Add NVIDIA Geforce GTX 750 to device list.
by Alexandre Julliard 11 Apr '14

11 Apr '14

Module: wine Branch: master Commit: a69c488f087b5a09599b841c929ec2531888d279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a69c488f087b5a09599b841c9… Author: Ryan Turner <zdbiohazard2(a)gmail.com> Date: Thu Apr 10 11:47:41 2014 -0700 wined3d: Add NVIDIA Geforce GTX 750 to device list. --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1f3ed4c..62ad4c8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1261,6 +1261,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE6, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750TI, "NVIDIA GeForce GTX 750 Ti", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX760, "NVIDIA Geforce GTX 760", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX765M, "NVIDIA GeForce GTX 765M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE6, 3072}, @@ -1675,6 +1677,8 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ {"GTX 765M", CARD_NVIDIA_GEFORCE_GTX765M}, /* Geforce 700 - midend high mobile */ {"GTX 760", CARD_NVIDIA_GEFORCE_GTX760}, /* Geforce 700 - midend high */ + {"GTX 750 Ti", CARD_NVIDIA_GEFORCE_GTX750TI}, /* Geforce 700 - midend */ + {"GTX 750", CARD_NVIDIA_GEFORCE_GTX750}, /* Geforce 700 - midend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ @@ -2168,6 +2172,8 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i } cards[] = { + /* Maxwell */ + {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 40494bf..dd49f43 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1474,6 +1474,8 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GTX750 = 0x1381, + CARD_NVIDIA_GEFORCE_GTX750TI = 0x1380, CARD_NVIDIA_GEFORCE_GTX760 = 0x1187, CARD_NVIDIA_GEFORCE_GTX765M = 0x11e2, CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0,

1 0

Nikolay Sivov : winhlp32: Remove unused assignments (Coverity).
by Alexandre Julliard 11 Apr '14

11 Apr '14

Module: wine Branch: master Commit: 6c1d5f0bac0ddc1fe03104f49a5b67cbf5412708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1d5f0bac0ddc1fe03104f49… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 11 16:48:22 2014 +0400 winhlp32: Remove unused assignments (Coverity). --- programs/winhlp32/winhelp.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index cb1ac55..195a23f 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1131,7 +1131,6 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara win->hHistoryWnd = hWnd; break; case WM_CREATE: - win = (WINHELP_WINDOW*) GetWindowLongPtrW(hWnd, 0); hDc = GetDC(hWnd); GetTextMetricsW(hDc, &tm); GetWindowRect(hWnd, &r); @@ -1146,7 +1145,6 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara ReleaseDC(hWnd, hDc); break; case WM_LBUTTONDOWN: - win = (WINHELP_WINDOW*) GetWindowLongPtrW(hWnd, 0); hDc = GetDC(hWnd); GetTextMetricsW(hDc, &tm); i = HIWORD(lParam) / tm.tmHeight; @@ -1156,7 +1154,6 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara break; case WM_PAINT: hDc = BeginPaint(hWnd, &ps); - win = (WINHELP_WINDOW*) GetWindowLongPtrW(hWnd, 0); GetTextMetricsW(hDc, &tm); for (i = 0; i < Globals.history.index; i++)

1 0

Austin English : gdi32/tests: Skip some tests if Times New Roman is not installed.
by Alexandre Julliard 11 Apr '14

11 Apr '14

Module: wine Branch: master Commit: d0fa8cbc743559e31d36305dac8d46acc353f656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0fa8cbc743559e31d36305da… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 10 21:45:59 2014 -0700 gdi32/tests: Skip some tests if Times New Roman is not installed. --- dlls/gdi32/tests/font.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a205ac7..fa3b420 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2254,6 +2254,12 @@ static void test_SetTextJustification(void) GetClientRect( hwnd, &clientArea ); hdc = GetDC( hwnd ); + if (!is_font_installed("Times New Roman")) + { + skip("Times New Roman is not installed\n"); + return; + } + memset(&lf, 0, sizeof lf); lf.lfCharSet = ANSI_CHARSET; lf.lfClipPrecision = CLIP_DEFAULT_PRECIS;

1 0

Austin English : wine.inf: Add HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management\PagingFiles key.
by Alexandre Julliard 11 Apr '14

11 Apr '14

Module: wine Branch: master Commit: 946b80a56739a2530698c237c4c0adc77de1361d URL: http://source.winehq.org/git/wine.git/?a=commit;h=946b80a56739a2530698c237c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 9 20:17:45 2014 -0700 wine.inf: Add HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management\PagingFiles key. --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1f08d2e..802b0cf 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -545,6 +545,7 @@ HKLM,%Control%\Session Manager\Environment,"TEMP",0x00020002,"%10%\temp" HKLM,%Control%\Session Manager\Environment,"TMP",0x00020002,"%10%\temp" HKLM,%Control%\Session Manager\Environment,"windir",0x00020000,"%10%" HKLM,%Control%\Session Manager\Environment,"winsysdir",,"%11%" +HKLM,%Control%\Session Manager\Memory Management,PagingFiles,,"%24%\pagefile.sys 27 77" HKLM,%Control%\Session Manager\Memory Management,WriteWatch,0x00040002,1 [Fonts]

1 0

Austin English : wmp: Add HKLM\\Software\\Microsoft\\Multimedia\\WMPlayer\\Extensions key.
by Alexandre Julliard 11 Apr '14

11 Apr '14

Module: wine Branch: master Commit: d8ca8c275dc8b8269f0e4abe478e616645100c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ca8c275dc8b8269f0e4abe4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 8 23:26:55 2014 -0700 wmp: Add HKLM\\Software\\Microsoft\\Multimedia\\WMPlayer\\Extensions key. --- dlls/wmp/wmp.rgs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wmp/wmp.rgs b/dlls/wmp/wmp.rgs index fa40fa7..216b964 100644 --- a/dlls/wmp/wmp.rgs +++ b/dlls/wmp/wmp.rgs @@ -18,3 +18,20 @@ HKCR Insertable } } + +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Multimedia + { + WMPlayer + { + Extensions + } + } + } + } +}

1 0

Henri Verbeet : d3d9/tests: Use a separate device for clear_test().
by Alexandre Julliard 11 Apr '14

11 Apr '14

Module: wine Branch: master Commit: 32919f40d00ae27b95f9e0c52430f1641fe7afdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=32919f40d00ae27b95f9e0c52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 11 07:53:18 2014 +0200 d3d9/tests: Use a separate device for clear_test(). --- dlls/d3d9/tests/visual.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 50d563a..cb9a132 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -470,7 +470,7 @@ static void lighting_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetMaterial returned %08x\n", hr); } -static void clear_test(IDirect3DDevice9 *device) +static void clear_test(void) { /* Tests the correctness of clearing parameters */ HRESULT hr; @@ -481,6 +481,20 @@ static void clear_test(IDirect3DDevice9 *device) RECT scissor; DWORD oldColorWrite; BOOL invalid_clear_failed = FALSE; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); @@ -717,6 +731,12 @@ static void clear_test(IDirect3DDevice9 *device) "Clear with count = 1, rect = NULL has color %08x\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void color_fill_test(void) @@ -16747,11 +16767,11 @@ START_TEST(visual) depth_clamp_test(device_ptr); stretchrect_test(device_ptr); lighting_test(device_ptr); - clear_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + clear_test(); color_fill_test(); fog_test(); test_cube_wrap();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for lighting_test().
by Alexandre Julliard 11 Apr '14

11 Apr '14

Module: wine Branch: master Commit: a8f3708322f7290ab29677b7a66400bcb7dc8323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f3708322f7290ab29677b7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 11 07:53:19 2014 +0200 d3d9/tests: Use a separate device for lighting_test(). --- dlls/d3d9/tests/visual.c | 125 +++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 63 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cb9a132..35cc5c9 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -266,50 +266,71 @@ struct nvertex DWORD diffuse; }; -static void lighting_test(IDirect3DDevice9 *device) +static void lighting_test(void) { - HRESULT hr; - DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE; DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; - DWORD color; - D3DMATERIAL9 material, old_material; - DWORD cop, carg; - DWORD old_colorwrite; - - float mat[16] = { 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f }; + DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE; + IDirect3DDevice9 *device; + D3DMATERIAL9 material; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; - struct vertex unlitquad[] = + static const float mat[16] = { - {-1.0f, -1.0f, 0.1f, 0xffff0000}, - {-1.0f, 0.0f, 0.1f, 0xffff0000}, - { 0.0f, 0.0f, 0.1f, 0xffff0000}, - { 0.0f, -1.0f, 0.1f, 0xffff0000}, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }; + static const struct vertex unlitquad[] = + { + {-1.0f, -1.0f, 0.1f, 0xffff0000}, + {-1.0f, 0.0f, 0.1f, 0xffff0000}, + { 0.0f, 0.0f, 0.1f, 0xffff0000}, + { 0.0f, -1.0f, 0.1f, 0xffff0000}, + }; + static const struct vertex litquad[] = + { + {-1.0f, 0.0f, 0.1f, 0xff00ff00}, + {-1.0f, 1.0f, 0.1f, 0xff00ff00}, + { 0.0f, 1.0f, 0.1f, 0xff00ff00}, + { 0.0f, 0.0f, 0.1f, 0xff00ff00}, }; - struct vertex litquad[] = + static const struct vertex lighting_test[] = { - {-1.0f, 0.0f, 0.1f, 0xff00ff00}, - {-1.0f, 1.0f, 0.1f, 0xff00ff00}, - { 0.0f, 1.0f, 0.1f, 0xff00ff00}, - { 0.0f, 0.0f, 0.1f, 0xff00ff00}, + {-1.0f, -1.0f, 0.1f, 0x8000ff00}, + { 1.0f, -1.0f, 0.1f, 0x80000000}, + {-1.0f, 1.0f, 0.1f, 0x8000ff00}, + { 1.0f, 1.0f, 0.1f, 0x80000000}, }; - struct nvertex unlitnquad[] = + static const struct nvertex unlitnquad[] = { - { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, + { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, }; - struct nvertex litnquad[] = + static const struct nvertex litnquad[] = { - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + { 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, }; - WORD Indices[] = {0, 1, 2, 2, 3, 0}; + static const WORD Indices[] = {0, 1, 2, 2, 3, 0}; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); @@ -337,8 +358,6 @@ static void lighting_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %08x\n", hr); - hr = IDirect3DDevice9_GetRenderState(device, D3DRS_COLORWRITEENABLE, &old_colorwrite); - ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderState failed with %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %08x\n", hr); @@ -395,8 +414,6 @@ static void lighting_test(IDirect3DDevice9 *device) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - hr = IDirect3DDevice9_GetMaterial(device, &old_material); - ok(hr == D3D_OK, "IDirect3DDevice9_GetMaterial returned %08x\n", hr); memset(&material, 0, sizeof(material)); material.Diffuse.r = 0.0; material.Diffuse.g = 0.0; @@ -423,10 +440,6 @@ static void lighting_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SPECULARMATERIALSOURCE, D3DMCS_MATERIAL); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_GetTextureStageState(device, 0, D3DTSS_COLOROP, &cop); - ok(hr == D3D_OK, "IDirect3DDevice9_GetTextureStageState returned %08x\n", hr); - hr = IDirect3DDevice9_GetTextureStageState(device, 0, D3DTSS_COLORARG1, &carg); - ok(hr == D3D_OK, "IDirect3DDevice9_GetTextureStageState returned %08x\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState returned %08x\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE | D3DTA_ALPHAREPLICATE); @@ -434,13 +447,8 @@ static void lighting_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); - if(SUCCEEDED(hr)) { - struct vertex lighting_test[] = { - {-1.0, -1.0, 0.1, 0x8000ff00}, - { 1.0, -1.0, 0.1, 0x80000000}, - {-1.0, 1.0, 0.1, 0x8000ff00}, - { 1.0, 1.0, 0.1, 0x80000000} - }; + if (SUCCEEDED(hr)) + { hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed, hr=%08x\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, lighting_test, sizeof(lighting_test[0])); @@ -454,20 +462,11 @@ static void lighting_test(IDirect3DDevice9 *device) ok(color == 0x00ffffff, "Lit vertex alpha test returned color %08x, expected 0x00ffffff\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, cop); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_COLOR1); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SPECULARMATERIALSOURCE, D3DMCS_COLOR2); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_COLORWRITEENABLE, old_colorwrite); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, carg); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState returned %08x\n", hr); - hr = IDirect3DDevice9_SetMaterial(device, &old_material); - ok(hr == D3D_OK, "IDirect3DDevice9_SetMaterial returned %08x\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void clear_test(void) @@ -16766,11 +16765,11 @@ START_TEST(visual) /* Now execute the real tests */ depth_clamp_test(device_ptr); stretchrect_test(device_ptr); - lighting_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + lighting_test(); clear_test(); color_fill_test(); fog_test();

1 0