December 2012 - Wine-Commits

Francois Gouget : testbot/lib: Add parentheses to a LogMsg() call to make perl 5.10 happy.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: tools Branch: master Commit: da8a256602397b815c0ecdbc03fb894d339a5fc2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=da8a256602397b815c0ecdbc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 15:45:15 2012 +0100 testbot/lib: Add parentheses to a LogMsg() call to make perl 5.10 happy. --- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/lib/WineTestBot/VMs.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 79622de..fa53b07 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -125,7 +125,7 @@ sub Run delete $ENV{ENV}; exec("$BinDir/${ProjectName}$RunScript", $JobId, $StepNo, $self->No) or require WineTestBot::Log; - WineTestBot::Log::LogMsg "Unable to exec ${ProjectName}$RunScript: $!\n"; + WineTestBot::Log::LogMsg("Unable to exec ${ProjectName}$RunScript: $!\n"); exit(1); } diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2d1c1fd..f41453e 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -539,7 +539,7 @@ sub RunRevert WineTestBot::Log::SetupRedirects(); exec("$BinDir/RevertVM.pl", $self->GetKey()) or require WineTestBot::Log; - WineTestBot::Log::LogMsg "Unable to exec RevertVM.pl: $!\n"; + WineTestBot::Log::LogMsg("Unable to exec RevertVM.pl: $!\n"); exit(1); }

1 0

Francois Gouget : testbot/build: Log the Build.pl and Reconfig. pl scripts output.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: tools Branch: master Commit: 431982a0a3a6b9ace6fbac1ec7a3df12150f211f URL: http://source.winehq.org/git/tools.git/?a=commit;h=431982a0a3a6b9ace6fbac1e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 10:01:41 2012 +0100 testbot/build: Log the Build.pl and Reconfig.pl scripts output. This lets us capture Perl errors in case there are any. --- testbot/bin/WineRunBuild.pl | 14 ++++++-------- testbot/bin/WineRunReconfig.pl | 4 +++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index faf777e..4cc7c89 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -243,14 +243,12 @@ if (defined($ErrMessage)) FatalError "Can't copy patch to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -my $Script = "#!/bin/sh\n"; -$Script .= "../bin/build/Build.pl $FileName " . $Step->FileType . - " $BaseName 32"; -if ($Run64) -{ - $Script .= ",64"; -} -$Script .= "\n"; +my $Script = "#!/bin/sh\n" . + "rm -f Build.log\n" . + "../bin/build/Build.pl $FileName " . $Step->FileType . + " $BaseName 32"; +$Script .= ",64"if ($Run64); +$Script .= " >>Build.log 2>&1\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout); if (defined($ErrMessage)) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 4f86e10..fa38a5f 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -198,7 +198,9 @@ if (defined($ErrMessage)) FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -my $Script = "#!/bin/sh\n../bin/build/Reconfig.pl\n"; +my $Script = "#!/bin/sh\n" . + "rm -f Reconfig.log\n" . + "../bin/build/Reconfig.pl >>Reconfig.log 2>&1\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout); if (defined($ErrMessage)) {

1 0

Francois Gouget : testbot/WineRunTask: 'cls' is only needed on Win9x so remove it.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: tools Branch: master Commit: d5ffbdef47e94b714a0ab21bba306eac575b26fb URL: http://source.winehq.org/git/tools.git/?a=commit;h=d5ffbdef47e94b714a0ab21b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 10:02:23 2012 +0100 testbot/WineRunTask: 'cls' is only needed on Win9x so remove it. --- testbot/bin/WineRunTask.pl | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ccb2600..c6ca567 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -307,9 +307,6 @@ elsif ($Step->Type eq "suite") "$FileName -q -s $RptFileName\r\n"; } -# Needed to exit the command prompt on Win9x/WinMe -$Script .= "cls\r\n"; - $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout + 15); my $LogErrMessage = RetrieveLogFile $Job, $Step, $Task, $RptFileName, $FullLogFileName;

1 0

Francois Gouget : testbot/WineRunTask: Don't force Windows VMs to have a c: \winetest directory.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: tools Branch: master Commit: 56ce6a39cc8808b75a8b6cfb52ea8158082fa8de URL: http://source.winehq.org/git/tools.git/?a=commit;h=56ce6a39cc8808b75a8b6cfb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 10:02:18 2012 +0100 testbot/WineRunTask: Don't force Windows VMs to have a c:\winetest directory. --- testbot/bin/WineRunTask.pl | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 8e7aeff..ccb2600 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -248,8 +248,7 @@ if ($FileType ne "exe32" && $FileType ne "exe64") $FullErrFileName, $Job, $Step, $Task; } my $FileName = $Step->FileName; -$ErrMessage = $VM->CopyFileFromHostToGuest("$StepDir/$FileName", - "C:\\winetest\\$FileName"); +$ErrMessage = $VM->CopyFileFromHostToGuest("$StepDir/$FileName", $FileName); if (defined($ErrMessage)) { FatalError "Can't copy exe to VM: $ErrMessage\n", @@ -259,20 +258,20 @@ my $TestLauncher = "TestLauncher" . ($FileType eq "exe64" ? "64" : "32") . ".exe"; $ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/windows/$TestLauncher", - "C:\\winetest\\$TestLauncher"); + $TestLauncher); if (defined($ErrMessage)) { FatalError "Can't copy TestLauncher to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } $ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/windows/GenFixEnv.exe", - "C:\\winetest\\GenFixEnv.exe"); + "GenFixEnv.exe"); if (defined($ErrMessage)) { FatalError "Can't copy GenFixEnv to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -my $Script = "\@echo off\r\ncd \\winetest\r\nset WINETEST_DEBUG=" . $Step->DebugLevel . +my $Script = "\@echo off\r\nset WINETEST_DEBUG=" . $Step->DebugLevel . "\r\n"; if ($Step->ReportSuccessfulTests) { @@ -313,8 +312,7 @@ $Script .= "cls\r\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout + 15); my $LogErrMessage = RetrieveLogFile $Job, $Step, $Task, - "C:\\winetest\\$RptFileName", - $FullLogFileName; + $RptFileName, $FullLogFileName; TakeScreenshot $VM, $FullScreenshotFileName; if (defined($ErrMessage)) {

1 0

Francois Gouget : d3dx9_36/tests: Use software vertex processing so the tests can run on Intel GM950 graphics cards .
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 7b2d297d3eaef68192dc61f0d38605339590f51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b2d297d3eaef68192dc61f0d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 14 11:55:40 2012 +0100 d3dx9_36/tests: Use software vertex processing so the tests can run on Intel GM950 graphics cards. --- dlls/d3dx9_36/tests/core.c | 2 +- dlls/d3dx9_36/tests/effect.c | 2 +- dlls/d3dx9_36/tests/line.c | 2 +- dlls/d3dx9_36/tests/mesh.c | 18 +++++++++--------- dlls/d3dx9_36/tests/shader.c | 2 +- dlls/d3dx9_36/tests/surface.c | 2 +- dlls/d3dx9_36/tests/texture.c | 2 +- dlls/d3dx9_36/tests/volume.c | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index ba0f065..e25a5d3 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1240,7 +1240,7 @@ START_TEST(core) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if(FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8e12b74..7f238be 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2686,7 +2686,7 @@ START_TEST(effect) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index b9eacee..89e4fc6 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -138,7 +138,7 @@ START_TEST(line) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 35e38e4..0218000 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -129,7 +129,7 @@ static struct test_context *new_test_context(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, - D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Couldn't create IDirect3DDevice9 object %#x\n", hr); @@ -1183,7 +1183,7 @@ static void D3DXCreateMeshTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -1390,7 +1390,7 @@ static void D3DXCreateMeshFVFTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -2263,7 +2263,7 @@ static void D3DXLoadMeshTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -2462,7 +2462,7 @@ static void D3DXCreateBoxTest(void) memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -2760,7 +2760,7 @@ static void D3DXCreateSphereTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -3004,7 +3004,7 @@ static void D3DXCreateCylinderTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -4004,7 +4004,7 @@ static void D3DXCreateTextTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -4298,7 +4298,7 @@ static void D3DXGenerateAdjacencyTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 75139b1..223bebf 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1370,7 +1370,7 @@ static void test_setting_constants(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 84a70cf..7ae7df9 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1230,7 +1230,7 @@ START_TEST(surface) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if(FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 3277577..ebaf385 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1820,7 +1820,7 @@ START_TEST(texture) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index 35cd509..f3976c0 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -284,7 +284,7 @@ START_TEST(volume) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if(FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr);

1 0

Alexandre Julliard : gdi32: Support wrongly ordered rectangles in RectVisible.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 5215895a11a582df775f4c794a14ad6d4629a7c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5215895a11a582df775f4c794… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 16:56:28 2012 +0100 gdi32: Support wrongly ordered rectangles in RectVisible. --- dlls/gdi32/clipping.c | 1 + dlls/gdi32/tests/clipping.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index ee7873e..572287e 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -392,6 +392,7 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) tmpRect = *rect; LPtoDP( hdc, (POINT *)&tmpRect, 2 ); + order_rect( &tmpRect ); update_dc( dc ); ret = (!get_dc_device_rect( dc, &visrect ) || intersect_rect( &visrect, &visrect, &tmpRect )); diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 04b2785..0247bbb 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -401,6 +401,14 @@ static void test_memory_dc_clipping(void) ok(rc.left == 0 && rc.top == 0 && rc.right == 100 && rc.bottom == 100, "expected 0,0-100,100, got %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom); + SetRect( &rc, 10, 10, 20, 20 ); + ret = RectVisible( hdc, &rc ); + ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom ); + + SetRect( &rc, 20, 20, 10, 10 ); + ret = RectVisible( hdc, &rc ); + ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom ); + DeleteDC(hdc); DeleteObject(hrgn); DeleteObject(hrgn_empty); @@ -446,6 +454,14 @@ static void test_window_dc_clipping(void) "expected 0,0-%d,%d, got %d,%d-%d,%d\n", screen_width, screen_height, rc.left, rc.top, rc.right, rc.bottom); + SetRect( &rc, 10, 10, 20, 20 ); + ret = RectVisible( hdc, &rc ); + ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom ); + + SetRect( &rc, 20, 20, 10, 10 ); + ret = RectVisible( hdc, &rc ); + ok( ret, "RectVisible failed for %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom ); + ret = ExtSelectClipRgn(hdc, 0, RGN_COPY); ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1), "expected SIMPLEREGION, got %d\n", ret);

1 0

Andrew Eikum : winealsa.drv: Be less strict about wValidBitsPerSample.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 4f32f8e185949f2cb7bcee4f218f4724d5b823d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f32f8e185949f2cb7bcee4f2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 14 08:47:11 2012 -0600 winealsa.drv: Be less strict about wValidBitsPerSample. --- dlls/winealsa.drv/mmdevdrv.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6d86f55..416f1ba 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -976,10 +976,8 @@ static snd_pcm_format_t alsa_format(const WAVEFORMATEX *fmt) fmt->wBitsPerSample != fmtex->Samples.wValidBitsPerSample){ if(fmtex->Samples.wValidBitsPerSample == 20 && fmt->wBitsPerSample == 24) format = SND_PCM_FORMAT_S20_3LE; - else{ + else WARN("Unsupported ValidBits: %u\n", fmtex->Samples.wValidBitsPerSample); - format = SND_PCM_FORMAT_UNKNOWN; - } } }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE &&

1 0

Caron Jensen : wined3d: Recognize Nvidia GT520 cards.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 86cb15b23504d02e6d0db7eb48c0f100a8c6ecd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86cb15b23504d02e6d0db7eb4… Author: Caron Jensen <caron(a)codeweavers.com> Date: Fri Dec 14 10:36:32 2012 -0600 wined3d: Recognize Nvidia GT520 cards. --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 15ac2ea..336c1e7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1085,6 +1085,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX465, "NVIDIA GeForce GTX 465", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT520, "NVIDIA GeForce GT 520", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT540M, "NVIDIA GeForce GT 540M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX550, "NVIDIA GeForce GTX 550 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT555M, "NVIDIA GeForce GT 555M", DRIVER_NVIDIA_GEFORCE6, 1024}, @@ -1505,6 +1506,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 555M", CARD_NVIDIA_GEFORCE_GT555M}, /* Geforce 500 - midend mobile */ {"GTX 550 Ti", CARD_NVIDIA_GEFORCE_GTX550}, /* Geforce 500 - midend */ {"GT 540M", CARD_NVIDIA_GEFORCE_GT540M}, /* Geforce 500 - midend mobile */ + {"GT 520", CARD_NVIDIA_GEFORCE_GT520}, /* Geforce 500 - lowend */ {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ {"GTX 470", CARD_NVIDIA_GEFORCE_GTX470}, /* Geforce 400 - midend high */ {"GTX 465", CARD_NVIDIA_GEFORCE_GTX465}, /* Geforce 400 - midend */ @@ -2019,6 +2021,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i /* Kepler */ {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* Fermi */ + {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0bb3f27..77d3e03 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1415,6 +1415,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX465 = 0x06c4, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0, + CARD_NVIDIA_GEFORCE_GT520 = 0x1040, CARD_NVIDIA_GEFORCE_GT540M = 0x0df4, CARD_NVIDIA_GEFORCE_GTX550 = 0x1244, CARD_NVIDIA_GEFORCE_GT555M = 0x04b8,

1 0

Erich Hoover : advapi32: Support service objects in GetSecurityInfo.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 331b99cf191b39caf87db8c3902d680007317ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=331b99cf191b39caf87db8c39… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Dec 13 14:08:05 2012 -0700 advapi32: Support service objects in GetSecurityInfo. --- dlls/advapi32/advapi32_misc.h | 4 ++- dlls/advapi32/security.c | 31 ++++++++++++++++++++++++- dlls/advapi32/service.c | 31 ++++++++++++++++++++------ dlls/advapi32/tests/service.c | 48 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 101 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index e4ecfbb..3e58b04 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -21,6 +21,7 @@ #define __WINE_ADVAPI32MISC_H #include "ntsecapi.h" +#include "winsvc.h" const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; @@ -28,6 +29,7 @@ BOOL ADVAPI_GetComputerSid(PSID sid) DECLSPEC_HIDDEN; BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; -WCHAR *SERV_dup(const char *str); +WCHAR *SERV_dup(const char *str) DECLSPEC_HIDDEN; +NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; #endif /* __WINE_ADVAPI32MISC_H */ diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e000854..d857591 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3046,7 +3046,26 @@ DWORD WINAPI GetSecurityInfo( ULONG n1, n2; BOOL present, defaulted; - status = NtQuerySecurityObject(hObject, SecurityInfo, NULL, 0, &n1); + /* A NULL descriptor is allowed if any one of the other pointers is not NULL */ + if (!(ppsidOwner||ppsidGroup||ppDacl||ppSacl||ppSecurityDescriptor)) return ERROR_INVALID_PARAMETER; + + /* If no descriptor, we have to check that there's a pointer for the requested information */ + if( !ppSecurityDescriptor && ( + ((SecurityInfo & OWNER_SECURITY_INFORMATION) && !ppsidOwner) + || ((SecurityInfo & GROUP_SECURITY_INFORMATION) && !ppsidGroup) + || ((SecurityInfo & DACL_SECURITY_INFORMATION) && !ppDacl) + || ((SecurityInfo & SACL_SECURITY_INFORMATION) && !ppSacl) )) + return ERROR_INVALID_PARAMETER; + + switch (ObjectType) + { + case SE_SERVICE: + status = SERV_QueryServiceObjectSecurity(hObject, SecurityInfo, NULL, 0, &n1); + break; + default: + status = NtQuerySecurityObject(hObject, SecurityInfo, NULL, 0, &n1); + break; + } if (status != STATUS_BUFFER_TOO_SMALL && status != STATUS_SUCCESS) return RtlNtStatusToDosError(status); @@ -3054,7 +3073,15 @@ DWORD WINAPI GetSecurityInfo( if (!sd) return ERROR_NOT_ENOUGH_MEMORY; - status = NtQuerySecurityObject(hObject, SecurityInfo, sd, n1, &n2); + switch (ObjectType) + { + case SE_SERVICE: + status = SERV_QueryServiceObjectSecurity(hObject, SecurityInfo, sd, n1, &n2); + break; + default: + status = NtQuerySecurityObject(hObject, SecurityInfo, sd, n1, &n2); + break; + } if (status != STATUS_SUCCESS) { LocalFree(sd); diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 07b9e4b..fc98880 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -28,6 +28,8 @@ #include <time.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winsvc.h" @@ -2147,17 +2149,14 @@ BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, return err == ERROR_SUCCESS; } -/****************************************************************************** - * QueryServiceObjectSecurity [ADVAPI32.@] - */ -BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE hService, +NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE hService, SECURITY_INFORMATION dwSecurityInformation, PSECURITY_DESCRIPTOR lpSecurityDescriptor, DWORD cbBufSize, LPDWORD pcbBytesNeeded) { SECURITY_DESCRIPTOR descriptor; + NTSTATUS status; DWORD size; - BOOL succ; ACL acl; FIXME("%p %d %p %u %p - semi-stub\n", hService, dwSecurityInformation, @@ -2172,9 +2171,27 @@ BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE hService, SetSecurityDescriptorDacl(&descriptor, TRUE, &acl, TRUE); size = cbBufSize; - succ = MakeSelfRelativeSD(&descriptor, lpSecurityDescriptor, &size); + status = RtlMakeSelfRelativeSD(&descriptor, lpSecurityDescriptor, &size); *pcbBytesNeeded = size; - return succ; + return status; +} + +/****************************************************************************** + * QueryServiceObjectSecurity [ADVAPI32.@] + */ +BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE hService, + SECURITY_INFORMATION dwSecurityInformation, + PSECURITY_DESCRIPTOR lpSecurityDescriptor, + DWORD cbBufSize, LPDWORD pcbBytesNeeded) +{ + NTSTATUS status = SERV_QueryServiceObjectSecurity(hService, dwSecurityInformation, lpSecurityDescriptor, + cbBufSize, pcbBytesNeeded); + if (status != STATUS_SUCCESS) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + return TRUE; } /****************************************************************************** diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index b6aff26..5fcd4cb 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -48,6 +48,8 @@ static BOOL (WINAPI *pQueryServiceConfig2A)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD static BOOL (WINAPI *pQueryServiceConfig2W)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); static BOOL (WINAPI *pQueryServiceStatusEx)(SC_HANDLE, SC_STATUS_TYPE, LPBYTE, DWORD, LPDWORD); +static BOOL (WINAPI *pQueryServiceObjectSecurity)(SC_HANDLE, SECURITY_INFORMATION, + PSECURITY_DESCRIPTOR, DWORD, LPDWORD); static void init_function_pointers(void) { @@ -60,6 +62,7 @@ static void init_function_pointers(void) pQueryServiceConfig2A= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2A"); pQueryServiceConfig2W= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2W"); pQueryServiceStatusEx= (void*)GetProcAddress(hadvapi32, "QueryServiceStatusEx"); + pQueryServiceObjectSecurity = (void*)GetProcAddress(hadvapi32, "QueryServiceObjectSecurity"); } static void test_open_scm(void) @@ -1756,7 +1759,7 @@ static void test_close(void) static void test_sequence(void) { SC_HANDLE scm_handle, svc_handle; - BOOL ret; + BOOL ret, is_nt4; QUERY_SERVICE_CONFIGA *config; DWORD given, needed; static const CHAR servicename [] = "Winetest"; @@ -1780,6 +1783,9 @@ static void test_sequence(void) ok(scm_handle != NULL, "Could not get a handle to the manager: %d\n", GetLastError()); if (!scm_handle) return; + svc_handle = OpenServiceA(scm_handle, NULL, GENERIC_READ); + is_nt4=(svc_handle == NULL && GetLastError() == ERROR_INVALID_PARAMETER); + CloseServiceHandle(svc_handle); /* Create a dummy service */ SetLastError(0xdeadbeef); @@ -1817,8 +1823,44 @@ static void test_sequence(void) PSID sidOwner, sidGroup; PACL dacl, sacl; PSECURITY_DESCRIPTOR pSD; - HRESULT retval = pGetSecurityInfo(svc_handle,SE_SERVICE,DACL_SECURITY_INFORMATION,&sidOwner,&sidGroup,&dacl,&sacl,&pSD); - todo_wine ok(ERROR_SUCCESS == retval, "Expected GetSecurityInfo to succeed: result %d\n",retval); + DWORD error, n1, n2; + HRESULT retval; + BOOL bret; + + /* Test using GetSecurityInfo to obtain security information */ + retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, &sidOwner, + &sidGroup, &dacl, &sacl, &pSD); + LocalFree(pSD); + ok(retval == ERROR_SUCCESS, "Expected GetSecurityInfo to succeed: result %d\n", retval); + retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, NULL, + NULL, NULL, NULL, &pSD); + LocalFree(pSD); + ok(retval == ERROR_SUCCESS, "Expected GetSecurityInfo to succeed: result %d\n", retval); + if (!is_nt4) + { + retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, NULL, + NULL, &dacl, NULL, NULL); + ok(retval == ERROR_SUCCESS, "Expected GetSecurityInfo to succeed: result %d\n", retval); + SetLastError(0xdeadbeef); + retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, NULL, + NULL, NULL, NULL, NULL); + error = GetLastError(); + ok(retval == ERROR_INVALID_PARAMETER, "Expected GetSecurityInfo to fail: result %d\n", retval); + ok(error == 0xdeadbeef, "Unexpected last error %d\n", error); + } + else + win_skip("A NULL security descriptor in GetSecurityInfo results in an exception on NT4.\n"); + + /* Test using QueryServiceObjectSecurity to obtain security information */ + SetLastError(0xdeadbeef); + bret = pQueryServiceObjectSecurity(svc_handle, DACL_SECURITY_INFORMATION, pSD, 0, &n1); + error = GetLastError(); + ok(!bret, "Expected QueryServiceObjectSecurity to fail: result %d\n", bret); + ok(error == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", error); + pSD = LocalAlloc(0, n1); + bret = pQueryServiceObjectSecurity(svc_handle, DACL_SECURITY_INFORMATION, pSD, n1, &n2); + ok(bret, "Expected QueryServiceObjectSecurity to succeed: result %d\n", bret); + LocalFree(pSD); } }

1 0

Francois Gouget : winhttp/tests: Make some traces more explicit.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 3951cb660fdd82ed477c53c67a8ea79ae327022f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3951cb660fdd82ed477c53c67… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 14 11:54:52 2012 +0100 winhttp/tests: Make some traces more explicit. --- dlls/winhttp/tests/winhttp.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 0f237d9..5fcdef6 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2417,14 +2417,14 @@ static void test_IWinHttpRequest(void) status = 0; hr = IWinHttpRequest_get_Status( req, &status ); ok( hr == S_OK, "got %08x\n", hr ); - trace("%d\n", status); + trace("Status=%d\n", status); hr = IWinHttpRequest_get_StatusText( req, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); hr = IWinHttpRequest_get_StatusText( req, &status_text ); ok( hr == S_OK, "got %08x\n", hr ); - trace("%s\n", wine_dbgstr_w(status_text)); + trace("StatusText=%s\n", wine_dbgstr_w(status_text)); SysFreeString( status_text ); hr = IWinHttpRequest_get_ResponseBody( req, NULL ); @@ -2608,10 +2608,10 @@ static void test_WinHttpGetIEProxyConfigForCurrentUser(void) ret = WinHttpGetIEProxyConfigForCurrentUser( &cfg ); ok( ret, "expected success\n" ); - trace("%d\n", cfg.fAutoDetect); - trace("%s\n", wine_dbgstr_w(cfg.lpszAutoConfigUrl)); - trace("%s\n", wine_dbgstr_w(cfg.lpszProxy)); - trace("%s\n", wine_dbgstr_w(cfg.lpszProxyBypass)); + trace("IEProxy.AutoDetect=%d\n", cfg.fAutoDetect); + trace("IEProxy.AutoConfigUrl=%s\n", wine_dbgstr_w(cfg.lpszAutoConfigUrl)); + trace("IEProxy.Proxy=%s\n", wine_dbgstr_w(cfg.lpszProxy)); + trace("IEProxy.ProxyBypass=%s\n", wine_dbgstr_w(cfg.lpszProxyBypass)); GlobalFree( cfg.lpszAutoConfigUrl ); GlobalFree( cfg.lpszProxy ); GlobalFree( cfg.lpszProxyBypass ); @@ -2700,9 +2700,9 @@ static void test_WinHttpGetProxyForUrl(void) if (!ret) ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); else { - trace("%u\n", info.dwAccessType); - trace("%s\n", wine_dbgstr_w(info.lpszProxy)); - trace("%s\n", wine_dbgstr_w(info.lpszProxyBypass)); + trace("Proxy.AccessType=%u\n", info.dwAccessType); + trace("Proxy.Proxy=%s\n", wine_dbgstr_w(info.lpszProxy)); + trace("Proxy.ProxyBypass=%s\n", wine_dbgstr_w(info.lpszProxyBypass)); GlobalFree( info.lpszProxy ); GlobalFree( info.lpszProxyBypass ); } @@ -2718,9 +2718,9 @@ static void test_WinHttpGetProxyForUrl(void) if (!ret) ok( error == ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT, "got %u\n", error ); else { - trace("%u\n", info.dwAccessType); - trace("%s\n", wine_dbgstr_w(info.lpszProxy)); - trace("%s\n", wine_dbgstr_w(info.lpszProxyBypass)); + trace("Proxy.AccessType=%u\n", info.dwAccessType); + trace("Proxy.Proxy=%s\n", wine_dbgstr_w(info.lpszProxy)); + trace("Proxy.ProxyBypass=%s\n", wine_dbgstr_w(info.lpszProxyBypass)); GlobalFree( info.lpszProxy ); GlobalFree( info.lpszProxyBypass ); }

1 0