wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Józef Kucia : tests: Add more test for clearing array textures.
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: vkd3d Branch: master Commit: 404a4591391590bd6dc3c6f87fb8adc350645986 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=404a4591391590bd6dc3c6f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 27 17:04:30 2018 +0100 tests: Add more test for clearing array 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> --- tests/d3d12.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index aa35315..09dc339 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3630,8 +3630,16 @@ static void test_clear_depth_stencil_view(void) static void test_clear_render_target_view(void) { + static const unsigned int array_expected_colors[] = {0xff0000ff, 0xff00ff00, 0xffff0000}; + static const struct vec4 array_colors[] = + { + {1.0f, 0.0f, 0.0f, 1.0f}, + {0.0f, 1.0f, 0.0f, 1.0f}, + {0.0f, 0.0f, 1.0f, 1.0f}, + }; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + ID3D12Resource *resource, *resolved_resource; ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle; D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; @@ -3644,11 +3652,13 @@ static void test_clear_render_target_view(void) struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; - ID3D12Resource *resource; ID3D12Device *device; + unsigned int i; D3D12_BOX box; HRESULT hr; + STATIC_ASSERT(ARRAY_SIZE(array_colors) == ARRAY_SIZE(array_expected_colors)); + memset(&desc, 0, sizeof(desc)); desc.no_render_target = true; if (!init_test_context(&context, &desc)) @@ -3687,7 +3697,7 @@ static void test_clear_render_target_view(void) &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); memset(&rtv_desc, 0, sizeof(rtv_desc)); rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -3720,12 +3730,88 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(resource, 0, queue, command_list, 0xbf95bc59, 2); + /* 2D array texture */ + ID3D12Resource_Release(resource); + resource_desc.DepthOrArraySize = ARRAY_SIZE(array_colors); + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + reset_command_list(command_list, context.allocator); + for (i = 0; i < ARRAY_SIZE(array_colors); ++i) + { + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DARRAY; + rtv_desc.Texture2DArray.FirstArraySlice = i; + rtv_desc.Texture2DArray.ArraySize = 1; + + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, &array_colors[i].x, 0, NULL); + } + + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + for (i = 0; i < ARRAY_SIZE(array_expected_colors); ++i) + { + check_sub_resource_uint(resource, i, queue, command_list, array_expected_colors[i], 2); + reset_command_list(command_list, context.allocator); + } + + /* 2D multisample array texture */ + ID3D12Resource_Release(resource); + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 4; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + resource_desc.DepthOrArraySize = 1; + resource_desc.SampleDesc.Count = 1; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_COPY_SOURCE, NULL, + &IID_ID3D12Resource, (void **)&resolved_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(array_colors); ++i) + { + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY; + rtv_desc.Texture2DMSArray.FirstArraySlice = i; + rtv_desc.Texture2DMSArray.ArraySize = 1; + + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, &array_colors[i].x, 0, NULL); + } + + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + for (i = 0; i < ARRAY_SIZE(array_expected_colors); ++i) + { + transition_resource_state(command_list, resolved_resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_ResolveSubresource(command_list, + resolved_resource, 0, resource, i, DXGI_FORMAT_R8G8B8A8_UNORM); + transition_resource_state(command_list, resolved_resource, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(resolved_resource, 0, queue, command_list, array_expected_colors[i], 2); + reset_command_list(command_list, context.allocator); + } + + ID3D12Resource_Release(resolved_resource); + /* 3D texture */ ID3D12Resource_Release(resource); resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D; resource_desc.DepthOrArraySize = 32; resource_desc.MipLevels = 1; - resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, @@ -3734,7 +3820,6 @@ static void test_clear_render_target_view(void) ID3D12Device_CreateRenderTargetView(device, resource, NULL, rtv_handle); - reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, color, 0, NULL); transition_resource_state(command_list, resource, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);

1 0

Francois Gouget : testbot: Provide the missions list to the Reconfig scripts.
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: tools Branch: master Commit: bf1f8e843d24b64132730b661c45512b94cf593c URL: https://source.winehq.org/git/tools.git/?a=commit;h=bf1f8e843d24b64132730b6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 27 16:35:40 2018 +0100 testbot: Provide the missions list to the Reconfig scripts. The scripts need it to know which builds to update. A Wine VM may only need to update the win32 build for instance, but may have to recreate wineprefixes for multiple locales. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index e7e5573..f61ee65 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -46,6 +46,7 @@ use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::Engine::Notify; @@ -345,7 +346,7 @@ my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". " git pull &&\n". - " ../bin/build/$Script\n". + " ../bin/build/$Script ". MergeMissionStatementTasks($Task->Missions) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n");

1 0

Francois Gouget : testbot/web: Fix deleting old files when Submit goes back to page 1.
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: tools Branch: master Commit: a74194205941e6236c8d672bc0b0519c1013c873 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a74194205941e6236c8d672… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 27 04:04:27 2018 +0100 testbot/web: Fix deleting old files when Submit goes back to page 1. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 67c1f9b..3b7da06 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -713,7 +713,7 @@ sub OnPage2Prev($) { my ($self) = @_; - my $FileName = $self->GetParam("File"); + my $FileName = $self->GetParam("FileName"); if ($FileName) { my $StagingFileName = $self->GetTmpStagingFullPath(basename($FileName));

1 0

Francois Gouget : testbot/web: Remove OnPrev() and OnNext() from Submit.
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: tools Branch: master Commit: 40e17bc1a26ff86948793a0c9bafffd139b382f7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=40e17bc1a26ff86948793a0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 27 04:04:32 2018 +0100 testbot/web: Remove OnPrev() and OnNext() from Submit. These one-liners add an unnecessary layer of indirection. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 85a12a0..67c1f9b 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -709,13 +709,6 @@ sub OnPage2Next($) return 1; } -sub OnNext($) -{ - my ($self) = @_; - - return $self->{Page} == 2 ? $self->OnPage2Next() : $self->OnPage1Next(); -} - sub OnPage2Prev($) { my ($self) = @_; @@ -741,12 +734,6 @@ sub OnPage3Prev($) return 1; } -sub OnPrev($) -{ - my ($self) = @_; - - return $self->{Page} == 3 ? $self->OnPage3Prev() : $self->OnPage2Prev(); -} sub SubmitJob($$$) { @@ -1018,11 +1005,11 @@ sub OnAction($$) if ($Action eq "Next >") { - return $self->OnNext(); + return $self->{Page} == 2 ? $self->OnPage2Next() : $self->OnPage1Next(); } elsif ($Action eq "< Prev") { - return $self->OnPrev(); + return $self->{Page} == 3 ? $self->OnPage3Prev() : $self->OnPage2Prev(); } elsif ($Action eq "Submit") {

1 0

Andrey Gusev : slc: Add SLGetLicensingStatusInformation stub.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 92f38bc8790cbfb31badf97a211ed890ac00c1db URL: https://source.winehq.org/git/wine.git/?a=commit;h=92f38bc8790cbfb31badf97a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 22 20:43:30 2018 +0200 slc: Add SLGetLicensingStatusInformation stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46172 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slc/slc.c | 8 ++++++++ dlls/slc/slc.spec | 2 +- include/slerror.h | 1 + include/slpublic.h | 22 ++++++++++++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index 7b7a6c6..ffecaa0 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -31,6 +31,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(slc); +HRESULT WINAPI SLGetLicensingStatusInformation(HSLC handle, const SLID *app, const SLID *product, + LPCWSTR name, UINT *count, SL_LICENSING_STATUS **status) +{ + FIXME("(%p %p %p %s %p %p) stub\n", handle, app, product, debugstr_w(name), count, status ); + + return SL_E_RIGHT_NOT_CONSUMED; +} + HRESULT WINAPI SLGetWindowsInformation(LPCWSTR name, SLDATATYPE *type, UINT *val, LPBYTE *size) { FIXME("(%s %p %p %p) stub\n", debugstr_w(name), type, val, size ); diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index e4289d3..57e5572 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -16,7 +16,7 @@ @ stub SLGetLicense @ stub SLGetLicenseFileId @ stub SLGetLicenseInformation -@ stub SLGetLicensingStatusInformation +@ stdcall SLGetLicensingStatusInformation(ptr ptr ptr wstr ptr ptr) @ stub SLGetPKeyId @ stub SLGetPKeyInformation @ stub SLGetPolicyInformation diff --git a/include/slerror.h b/include/slerror.h index 8b45d99..4980a96 100644 --- a/include/slerror.h +++ b/include/slerror.h @@ -19,6 +19,7 @@ #ifndef __WINE_SLERROR_H #define __WINE_SLERROR_H +#define SL_E_RIGHT_NOT_CONSUMED 0xC004F002 #define SL_E_VALUE_NOT_FOUND 0xC004F012 #define SL_E_RIGHT_NOT_GRANTED 0xC004F013 #define SL_E_DATATYPE_MISMATCHED 0xC004F01E diff --git a/include/slpublic.h b/include/slpublic.h index dc02f3c..97fa8c7 100644 --- a/include/slpublic.h +++ b/include/slpublic.h @@ -29,6 +29,8 @@ extern "C" { #define SLCAPI DECLSPEC_IMPORT #endif +typedef GUID SLID; + typedef PVOID HSLC; typedef enum _tagSLDATATYPE @@ -41,6 +43,26 @@ typedef enum _tagSLDATATYPE SL_DATA_SUM = 100, } SLDATATYPE; +typedef enum _tagSLLICENSINGSTATUS +{ + SL_LICENSING_STATUS_UNLICENSED, + SL_LICENSING_STATUS_LICENSED, + SL_LICENSING_STATUS_IN_GRACE_PERIOD, + SL_LICENSING_STATUS_NOTIFICATION, + SL_LICENSING_STATUS_LAST +} SLLICENSINGSTATUS; + +typedef struct _tagSL_LICENSING_STATUS +{ + SLID SkuId; + SLLICENSINGSTATUS eStatus; + DWORD dwGraceTime; + DWORD dwTotalGraceDays; + HRESULT hrReason; + UINT64 qwValidityExpiration; +} SL_LICENSING_STATUS; + +SLCAPI HRESULT WINAPI SLGetLicensingStatusInformation(HSLC, const SLID*, const SLID*, LPCWSTR, UINT*, SL_LICENSING_STATUS**); SLCAPI HRESULT WINAPI SLGetWindowsInformation(LPCWSTR, SLDATATYPE*, UINT*, LPBYTE*); SLCAPI HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR, LPDWORD); SLCAPI HRESULT WINAPI SLOpen(HSLC*);

1 0

Daniel Ansorregui : wined3d: Simplify "glsl_generate_ffp" texture projection.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 5a961e8de7f3b0ffb812f6f8e0972345084fce24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a961e8de7f3b0ffb812f6f8… Author: Daniel Ansorregui <mailszeros(a)gmail.com> Date: Sat Nov 24 20:13:32 2018 +0000 wined3d: Simplify "glsl_generate_ffp" texture projection. This is to simplify the code before adding the FETCH4 modifications. No change is intended in the shader generation. Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 63 ++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ad59e97..5f1a866 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9869,65 +9869,34 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * switch (settings->op[stage].tex_type) { case WINED3D_GL_RES_TYPE_TEX_1D: - if (proj) - { - texture_function = "texture1DProj"; - coord_mask = "xw"; - } - else - { - texture_function = "texture1D"; - coord_mask = "x"; - } + texture_function = "texture1D"; + coord_mask = "x"; break; case WINED3D_GL_RES_TYPE_TEX_2D: - if (proj) - { - texture_function = "texture2DProj"; - coord_mask = "xyw"; - } - else - { - texture_function = "texture2D"; - coord_mask = "xy"; - } + texture_function = "texture2D"; + coord_mask = "xy"; break; case WINED3D_GL_RES_TYPE_TEX_3D: - if (proj) - { - texture_function = "texture3DProj"; - coord_mask = "xyzw"; - } - else - { - texture_function = "texture3D"; - coord_mask = "xyz"; - } + texture_function = "texture3D"; + coord_mask = "xyz"; break; case WINED3D_GL_RES_TYPE_TEX_CUBE: texture_function = "textureCube"; coord_mask = "xyz"; break; case WINED3D_GL_RES_TYPE_TEX_RECT: - if (proj) - { - texture_function = "texture2DRectProj"; - coord_mask = "xyw"; - } - else - { - texture_function = "texture2DRect"; - coord_mask = "xy"; - } + texture_function = "texture2DRect"; + coord_mask = "xy"; break; default: FIXME("Unhandled texture type %#x.\n", settings->op[stage].tex_type); texture_function = ""; coord_mask = "xyzw"; + proj = FALSE; break; } if (!legacy_syntax) - texture_function = proj ? "textureProj" : "texture"; + texture_function = "texture"; if (stage > 0 && (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP @@ -9959,8 +9928,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_addline(buffer, "ret = ffp_texcoord[%u] + ret.xyxy;\n", stage); } - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ret.%s);\n", - stage, texture_function, stage, coord_mask); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ret.%s%s);\n", + stage, texture_function, proj ? "Proj" : "", stage, coord_mask, proj ? "w" : ""); if (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) shader_addline(buffer, "tex%u *= clamp(tex%u.z * bumpenv_lum_scale%u + bumpenv_lum_offset%u, 0.0, 1.0);\n", @@ -9968,13 +9937,13 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } else if (settings->op[stage].projected == WINED3D_PROJECTION_COUNT3) { - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].xyz);\n", - stage, texture_function, stage, stage); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ffp_texcoord[%u].xyz);\n", + stage, texture_function, proj ? "Proj" : "", stage, stage); } else { - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].%s);\n", - stage, texture_function, stage, stage, coord_mask); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ffp_texcoord[%u].%s%s);\n", + stage, texture_function, proj ? "Proj" : "", stage, stage, coord_mask, proj ? "w" : ""); } string_buffer_sprintf(tex_reg_name, "tex%u", stage);

1 0

Henri Verbeet : wined3d: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE on the cursor texture.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 74931f9217869f8cad6b0b686ea1085f048e9c9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=74931f9217869f8cad6b0b68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 26 22:28:14 2018 +0330 wined3d: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE on the cursor texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 +-- dlls/wined3d/texture.c | 6 ------ include/wine/wined3d.h | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7cb32a6..6d6f530 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4563,8 +4563,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined desc.depth = 1; desc.size = 0; - hr = wined3d_texture_create(device, &desc, 1, 1, WINED3D_TEXTURE_CREATE_MAPPABLE, - &data, NULL, &wined3d_null_parent_ops, &texture); + hr = wined3d_texture_create(device, &desc, 1, 1, 0, &data, NULL, &wined3d_null_parent_ops, &texture); wined3d_resource_unmap(&cursor_image->resource, sub_resource_idx); if (FAILED(hr)) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index dbc256f..5b41d4a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2906,10 +2906,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3DERR_INVALIDCALL; } - if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) && !((desc->usage & WINED3DUSAGE_DYNAMIC) - || (desc->bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)))) - WARN("Creating a mappable texture that doesn't specify dynamic usage.\n"); - pow2_width = desc->width; pow2_height = desc->height; if (((desc->width & (desc->width - 1)) || (desc->height & (desc->height - 1)) || (desc->depth & (desc->depth - 1))) @@ -3010,8 +3006,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return hr; } wined3d_resource_update_draw_binding(&texture->resource); - if (flags & WINED3D_TEXTURE_CREATE_MAPPABLE) - texture->resource.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; texture->texture_ops = texture_ops; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 40553f7..b0b1abc 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1562,7 +1562,6 @@ enum wined3d_shader_type #define WINED3D_PALETTE_ALLOW_256 0x00000002 #define WINED3D_PALETTE_ALPHA 0x00000004 -#define WINED3D_TEXTURE_CREATE_MAPPABLE 0x00000001 #define WINED3D_TEXTURE_CREATE_DISCARD 0x00000002 #define WINED3D_TEXTURE_CREATE_GET_DC_LENIENT 0x00000004 #define WINED3D_TEXTURE_CREATE_GET_DC 0x00000008

1 0

Henri Verbeet : wined3d: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE on the logo texture.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: e5a6861d3a4382835ed1176a8224934c73eee159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5a6861d3a4382835ed1176a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 26 22:28:13 2018 +0330 wined3d: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE on the logo texture. We never map it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a89a33d..7cb32a6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -582,8 +582,7 @@ static void device_load_logo(struct wined3d_device *device, const char *filename desc.height = bm.bmHeight; desc.depth = 1; desc.size = 0; - if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, - WINED3D_TEXTURE_CREATE_MAPPABLE | WINED3D_TEXTURE_CREATE_GET_DC, + if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, WINED3D_TEXTURE_CREATE_GET_DC, NULL, NULL, &wined3d_null_parent_ops, &device->logo_texture))) { ERR("Wine logo requested, but failed to create texture, hr %#x.\n", hr);

1 0

Alexandre Julliard : user32: Fix wraparound check to avoid gcc optimization.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 7507541a5bac5a42558610acebd1cf70c02cc7a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7507541a5bac5a42558610ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 20:17:30 2018 +0100 user32: Fix wraparound check to avoid gcc optimization. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 95f5ac7..dd6142d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1611,8 +1611,8 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, if (cy < 0) cy = 0; SetRect( &rect, cs->x, cs->y, cs->x + cx, cs->y + cy ); /* check for wraparound */ - if (cs->x + cx < cs->x) rect.right = 0x7fffffff; - if (cs->y + cy < cs->y) rect.bottom = 0x7fffffff; + if (cs->x > 0x7fffffff - cx) rect.right = 0x7fffffff; + if (cs->y > 0x7fffffff - cy) rect.bottom = 0x7fffffff; if (!set_window_pos( hwnd, 0, SWP_NOZORDER | SWP_NOACTIVATE, &rect, &rect, NULL )) goto failed; /* send WM_NCCREATE */

1 0

Jacek Caban : dsound: Wait on thread handle instead of dedicated event in DirectSoundDevice_Release.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: e8fd1c73b236b37cba8a9349d54c3ce3ee3aaacf URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8fd1c73b236b37cba8a9349… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 22 20:24:08 2018 +0100 dsound: Wait on thread handle instead of dedicated event in DirectSoundDevice_Release. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 4 +--- dlls/dsound/dsound_private.h | 1 - dlls/dsound/mixer.c | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 12f1e28..71ede7d 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -203,9 +203,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) SetEvent(device->sleepev); if (device->thread) { - WaitForSingleObject(device->thread_finished, INFINITE); + WaitForSingleObject(device->thread, INFINITE); CloseHandle(device->thread); - CloseHandle(device->thread_finished); } EnterCriticalSection(&DSOUND_renderers_lock); @@ -383,7 +382,6 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU ZeroMemory(&device->volpan, sizeof(device->volpan)); - device->thread_finished = CreateEventW(0, 0, 0, 0); device->thread = CreateThread(0, 0, DSOUND_mixthread, device, 0, 0); SetThreadPriority(device->thread, THREAD_PRIORITY_TIME_CRITICAL); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index c045b38..45a100e 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -106,7 +106,6 @@ struct DirectSoundDevice IAudioRenderClient *render; HANDLE sleepev, thread; - HANDLE thread_finished; struct list entry; }; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 9b3e730..32bde38 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -765,6 +765,5 @@ DWORD CALLBACK DSOUND_mixthread(void *p) DSOUND_PerformMix(dev); RtlReleaseResource(&(dev->buffer_list_lock)); } - SetEvent(dev->thread_finished); return 0; }

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2018