March 2016 - Wine-Commits - list.winehq.org

Henri Verbeet : d3dx9: "param" should never be NULL in free_parameter().
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: 20f7abf66753895881dea46050e368210fa4aacc URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f7abf66753895881dea4605… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 11 16:01:40 2016 +0100 d3dx9: "param" should never be NULL in free_parameter(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e42cf86..fef0245 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -540,9 +540,6 @@ static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL chil TRACE("Free parameter %p, name %s, type %s, child %s\n", param, param->name, debug_d3dxparameter_type(param->type), child ? "yes" : "no"); - if (!param) - return; - if (param->annotations) { for (i = 0; i < param->annotation_count; ++i)

1 0

Józef Kucia : wined3d: Limit amount of video memory for older Windows versions.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: 565a5715468fa990cf9e7cbfe38ac59ddcde1e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=565a5715468fa990cf9e7cbfe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 11 13:28:03 2016 +0100 wined3d: Limit amount of video memory for older Windows versions. This should affect only 32-bit applications when the emulated Windows version is set to "Windows 2003" or older. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 60fb5ac..1aea568 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1510,6 +1510,18 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, driver = DRIVER_UNKNOWN; } + /** + * Diablo 2 crashes when the amount of video memory is greater than 0x7fffffff. + * In order to avoid this application bug we limit the amount of video memory + * to LONG_MAX for older Windows versions. + */ + if (os_version.dwMajorVersion <= 5 && os_version.dwMinorVersion <= 2 + && driver_info->vram_bytes > LONG_MAX) + { + TRACE("Limiting amount of video memory to %#lx bytes for OS version older than Vista.\n", LONG_MAX); + driver_info->vram_bytes = LONG_MAX; + } + if (wined3d_settings.emulated_textureram) { TRACE("Overriding amount of video memory with 0x%s bytes.\n",

1 0

Henri Verbeet : d3dx9/tests: Get rid of a redundant NULL check in test_effect_states().
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: d708f309c8048a69b701d926b6ef80f0b7971614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d708f309c8048a69b701d926b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 11 16:01:41 2016 +0100 d3dx9/tests: Get rid of a redundant NULL check in test_effect_states(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index a785f4d..e43bbdc 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3001,8 +3001,7 @@ static void test_effect_states(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_BLENDOP, 3); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); - if (effect) - effect->lpVtbl->Release(effect); + effect->lpVtbl->Release(effect); hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr);

1 0

Henri Verbeet : wined3d: "render_targets" is never NULL in context_find_fbo_entry().
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: f8c1c1778a6faaf5de5662a39ae6174bc5fba3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c1c1778a6faaf5de5662a39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 11 16:01:38 2016 +0100 wined3d: "render_targets" is never NULL in context_find_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 415eedf..37c0fe0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -472,7 +472,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, UINT object_count = gl_info->limits.buffers + 1; unsigned int i; - if (depth_stencil && render_targets && render_targets[0]) + if (depth_stencil && render_targets[0]) { if (depth_stencil->resource.width < render_targets[0]->resource.width || depth_stencil->resource.height < render_targets[0]->resource.height)

1 0

Henri Verbeet : ddraw/tests: Skip initialising "quad" and "indices" in test_specular_lighting() if a 3D device can't be created.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: 0bdae1a0b8ba87cf46f72a82fa96be4807f555b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bdae1a0b8ba87cf46f72a82f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 11 16:01:39 2016 +0100 ddraw/tests: Skip initialising "quad" and "indices" in test_specular_lighting() if a 3D device can't be created. This also happens to avoid leaking them in that case. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 22 +++++++++++----------- dlls/ddraw/tests/ddraw4.c | 18 +++++++++--------- dlls/ddraw/tests/ddraw7.c | 18 +++++++++--------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 75bdc84..b26478d 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6959,6 +6959,17 @@ static void test_specular_lighting(void) D3DVERTEX *quad; WORD *indices; + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + quad = HeapAlloc(GetProcessHeap(), 0, vertices_side * vertices_side * sizeof(*quad)); indices = HeapAlloc(GetProcessHeap(), 0, indices_count * sizeof(*indices)); for (i = 0, y = 0; y < vertices_side; ++y) @@ -6988,17 +6999,6 @@ static void test_specular_lighting(void) } } - window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); - ddraw = create_ddraw(); - ok(!!ddraw, "Failed to create a ddraw object.\n"); - if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) - { - skip("Failed to create a 3D device, skipping test.\n"); - DestroyWindow(window); - return; - } - hr = IDirect3DDevice2_GetDirect3D(device, &d3d); ok(SUCCEEDED(hr), "Failed to get D3D interface, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index a092787..8ff08cb 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4230,6 +4230,15 @@ static void test_specular_lighting(void) } *quad; WORD *indices; + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + quad = HeapAlloc(GetProcessHeap(), 0, vertices_side * vertices_side * sizeof(*quad)); indices = HeapAlloc(GetProcessHeap(), 0, indices_count * sizeof(*indices)); for (i = 0, y = 0; y < vertices_side; ++y) @@ -4257,15 +4266,6 @@ static void test_specular_lighting(void) } } - window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); - if (!(device = create_device(window, DDSCL_NORMAL))) - { - skip("Failed to create a 3D device, skipping test.\n"); - DestroyWindow(window); - return; - } - hr = IDirect3DDevice3_GetDirect3D(device, &d3d); ok(SUCCEEDED(hr), "Failed to get D3D interface, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d7589a8..306e6d3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3941,6 +3941,15 @@ static void test_specular_lighting(void) } *quad; WORD *indices; + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + quad = HeapAlloc(GetProcessHeap(), 0, vertices_side * vertices_side * sizeof(*quad)); indices = HeapAlloc(GetProcessHeap(), 0, indices_count * sizeof(*indices)); for (i = 0, y = 0; y < vertices_side; ++y) @@ -3968,15 +3977,6 @@ static void test_specular_lighting(void) } } - window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); - if (!(device = create_device(window, DDSCL_NORMAL))) - { - skip("Failed to create a 3D device, skipping test.\n"); - DestroyWindow(window); - return; - } - hr = IDirect3DDevice7_GetRenderTarget(device, &rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);

1 0

Francois Gouget : testbot/TestAgent: Harmonize _{Get, Send}StringOrFile(), {Get, Send}File() and Upgrade().
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: tools Branch: master Commit: e01a246870107c74b60db75bcd94224466cbcfd3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e01a246870107c74b60db75b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 14 00:24:30 2016 +0100 testbot/TestAgent: Harmonize _{Get,Send}StringOrFile(), {Get,Send}File() and Upgrade(). Match their RPC debug labels and make them a bit more specific. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 38c2184..1b2916f 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -462,7 +462,7 @@ sub _RecvFile($$$$) return undef if (!defined $self->{fd}); debug(" RecvFile('$Name', '$Filename')\n"); - my $Size = $self->_ExpectEntryHeader($Name, 'd'); + my $Size = $self->_ExpectEntryHeader("$Name/Size", 'd'); return undef if (!defined $Size); my $Success; @@ -784,7 +784,7 @@ sub _SendFile($$$$) local $SIG{ALRM} = sub { die "timeout" }; $self->_SetAlarm(); - return if (!$self->_SendEntryHeader($Name, 'd', $Size)); + return if (!$self->_SendEntryHeader("$Name/Size", 'd', $Size)); while ($Remaining) { my $Buffer; @@ -1070,8 +1070,8 @@ sub _SendStringOrFile($$$$$$) $self->_SendListSize('ArgC', 3) && $self->_SendString('ServerPathName', $ServerPathName) && $self->_SendUInt32('Flags', $Flags || 0) && - ($fh ? $self->_SendFile('FileData', $fh, $LocalPathName) : - $self->_SendString('Data', $Data, 'd')) && + ($fh ? $self->_SendFile('File', $fh, $LocalPathName) : + $self->_SendString('String', $Data, 'd')) && $self->_RecvList(''); } @@ -1098,18 +1098,17 @@ sub SendFileFromString($$$;$) return $self->_SendStringOrFile($Data, undef, undef, $ServerPathName, $Flags); } -sub _GetFileOrString($$$) +sub _GetStringOrFile($$$) { my ($self, $ServerPathName, $LocalPathName, $fh) = @_; # Send the RPC and get the reply - my $Success = $self->_StartRPC($RPC_GETFILE) && - $self->_SendListSize('ArgC', 1) && - $self->_SendString('ServerPathName', $ServerPathName) && - $self->_RecvList('.'); - return undef if (!$Success); - return $self->_RecvFile('FileData', $fh, $LocalPathName) if ($fh); - return $self->_RecvString('StringData', 'd'); + return $self->_StartRPC($RPC_GETFILE) && + $self->_SendListSize('ArgC', 1) && + $self->_SendString('ServerPathName', $ServerPathName) && + $self->_RecvList('.') && + ($fh ? $self->_RecvFile('File', $fh, $LocalPathName) : + $self->_RecvString('String', 'd')); } sub GetFile($$$) @@ -1119,7 +1118,7 @@ sub GetFile($$$) if (open(my $fh, ">", $LocalPathName)) { - my $Success = $self->_GetFileOrString($ServerPathName, $LocalPathName, $fh); + my $Success = $self->_GetStringOrFile($ServerPathName, $LocalPathName, $fh); close($fh); unlink $LocalPathName if (!$Success); return $Success; @@ -1133,7 +1132,7 @@ sub GetFileToString($$) my ($self, $ServerPathName) = @_; debug("GetFile $self->{agenthost} $ServerPathName -> String\n"); - return $self->_GetFileOrString($ServerPathName, undef, undef); + return $self->_GetStringOrFile($ServerPathName, undef, undef); } $RUN_DNT = 1; @@ -1368,7 +1367,7 @@ sub Upgrade($$) # Send the command if (!$self->_StartRPC($RPC_UPGRADE) or !$self->_SendListSize('ArgC', 1) or - !$self->_SendFile('FileData', $fh, $Filename)) + !$self->_SendFile('File', $fh, $Filename)) { close($fh); return undef;

1 0

Francois Gouget : testbot/TestAgent: Set the connection Step before entering the eval section.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: tools Branch: master Commit: 0f24742aa6f0e94e7994f769de8ed40dd633bbd3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0f24742aa6f0e94e7994f769… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 14 00:09:36 2016 +0100 testbot/TestAgent: Set the connection Step before entering the eval section. This is mostly useful in case there is a syntax error in the eval section. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 5d03a18..9d372ad 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -865,6 +865,7 @@ sub _Connect($) my $Step; foreach my $Dummy (1..$self->{cattempts}) { + my $Step = "initializing"; eval { local $SIG{ALRM} = sub { die "timeout" };

1 0

Francois Gouget : testbot/TestAgent: Improve TestAgent' s RPC diagnostic messages.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: tools Branch: master Commit: 2e1f2a07914b55351b2a54522c373c3c50817369 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2e1f2a07914b55351b2a5452… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 14 00:10:26 2016 +0100 testbot/TestAgent: Improve TestAgent's RPC diagnostic messages. If an error occurred while reconnecting for an RPC, the RPC name would not be mentioned in the error message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 9d372ad..38c2184 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -860,7 +860,7 @@ sub _Connect($) my ($self) = @_; my $OldRPC = $self->{rpc}; - $self->{rpc} = "Connect"; + $self->{rpc} = ($self->{rpc} ? "$self->{rpc}/" : "") ."connect"; my $Step; foreach my $Dummy (1..$self->{cattempts}) @@ -967,7 +967,7 @@ sub _Connect($) if (!$self->{fd}->exec($self->{nc})) { alarm(0); - $self->_SetError($FATAL, "Unable to start netcat: " . $self->_ssherror()); + $self->_SetError($FATAL, "Unable to start netcat ($self->{rpc}): " . $self->_ssherror()); return; # out of eval } }

1 0

Józef Kucia : wined3d: Advertise WINED3DFMT_BC{4, 5}_UNORM 3D textures as not supported.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 48d183dbc23390383c024625e898c2b50f9d2c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d183dbc23390383c024625e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 10 07:41:51 2016 +0100 wined3d: Advertise WINED3DFMT_BC{4, 5}_UNORM 3D textures as not supported. GL_ARB_texture_compression_rgtc does not support 3D textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c567380..5cd482e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3002,6 +3002,10 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_ATI2N); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = get_format_idx(WINED3DFMT_BC4_UNORM); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = get_format_idx(WINED3DFMT_BC5_UNORM); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } static BOOL init_format_vertex_info(struct wined3d_gl_info *gl_info)

1 0

Józef Kucia : d3d11/tests: Drop redundant feature level check.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: fa690f6be21ac9e25a234e3a9a048542d10c60cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa690f6be21ac9e25a234e3a9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 10 07:41:50 2016 +0100 d3d11/tests: Drop redundant feature level check. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c42286a..2238380 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3852,13 +3852,6 @@ static void test_multiple_render_targets(void) return; } - if (ID3D11Device_GetFeatureLevel(device) < D3D_FEATURE_LEVEL_9_3) - { - skip("Feature level 9_3 or higher is required.\n"); - ID3D11Device_Release(device); - return; - } - hr = ID3D11Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), vs_code, sizeof(vs_code), &input_layout); ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr);

1 0