January 2019 - Wine-Commits

Michael Stefaniuc : shell32: Avoid FALSE : TRUE conditional expressions.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: 84459ba94b9de2fc32499154aa4591f10d746947 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84459ba94b9de2fc32499154… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jan 31 20:56:28 2019 +0100 shell32: Avoid FALSE : TRUE conditional expressions. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 90036e7..36b0c5d 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -508,14 +508,14 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, /* Return FALSE if we need to hide the listbox */ WCHAR **str = ac->enum_strs; UINT start, end; - if (!str) return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; + if (!str) return !(ac->options & ACO_AUTOSUGGEST); /* Windows seems to disable autoappend if ACO_NOPREFIXFILTERING is set */ if (!(ac->options & ACO_NOPREFIXFILTERING) && len) { start = find_matching_enum_str(ac, 0, text, len, pfx_filter, -1); if (start == ~0) - return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; + return !(ac->options & ACO_AUTOSUGGEST); if (flag == autoappend_flag_yes) autoappend_str(ac, text, len, filter_str_prefix(str[start], pfx_filter), hwnd);

1 0

Michael Stefaniuc : mshtml: Print the debug string and not the pointer to it.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: 6f9f57e85fa7916c9e3dfbebbd7e5b8c9be6333d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9f57e85fa7916c9e3dfbeb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jan 31 20:56:27 2019 +0100 mshtml: Print the debug string and not the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index cab39d6..9fa258c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2121,7 +2121,7 @@ static HRESULT WINAPI DOMCustomEvent_initCustomEvent(IDOMCustomEvent *iface, BST DOMCustomEvent *This = impl_from_IDOMCustomEvent(iface); HRESULT hres; - TRACE("(%p)->(%s %x %x %p)\n", This, debugstr_w(type), can_bubble, cancelable, debugstr_variant(detail)); + TRACE("(%p)->(%s %x %x %s)\n", This, debugstr_w(type), can_bubble, cancelable, debugstr_variant(detail)); hres = IDOMEvent_initEvent(&This->event.IDOMEvent_iface, type, can_bubble, cancelable); if(FAILED(hres))

1 0

Jacek Caban : ntoskrnl.exe: Add __C_specific_handler entry.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: 496447f03b8dc92ea1d2af8bea6e63680e6bcc7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=496447f03b8dc92ea1d2af8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 16:12:39 2019 +0100 ntoskrnl.exe: Add __C_specific_handler entry. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3f57f7d..a5da0e8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1407,6 +1407,7 @@ @ stdcall ZwWaitForSingleObject(long long ptr) NtWaitForSingleObject @ stdcall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwYieldExecution() NtYieldExecution +@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) @ stdcall -private -arch=arm,x86_64 -norelay __chkstk() @ cdecl -private -arch=i386 _CIcos() msvcrt._CIcos @ cdecl -private -arch=i386 _CIsin() msvcrt._CIsin

1 0

Jacek Caban : ntoskrnl.exe: Add KeEnterGuardedRegion and KeLeaveGuardedRegion stubs.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: 80c23190f809c542350e8b015dcfa97dc067631d URL: https://source.winehq.org/git/wine.git/?a=commit;h=80c23190f809c542350e8b01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 31 16:12:50 2019 +0100 ntoskrnl.exe: Add KeEnterGuardedRegion and KeLeaveGuardedRegion stubs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 16 ++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 18 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 25d9eb7..298247b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3940,3 +3940,19 @@ NTSTATUS WINAPI MmCopyVirtualMemory(PEPROCESS fromprocess, PVOID fromaddress, PE FIXME("stub: %p %p %p %p %lu %d %p\n", fromprocess, fromaddress, toprocess, toaddress, bufsize, mode, copied); return STATUS_NOT_IMPLEMENTED; } + +/********************************************************************* + * KeEnterGuardedRegion (NTOSKRNL.@) + */ +void WINAPI KeEnterGuardedRegion(void) +{ + FIXME("\n"); +} + +/********************************************************************* + * KeLeaveGuardedRegion (NTOSKRNL.@) + */ +void WINAPI KeLeaveGuardedRegion(void) +{ + FIXME("\n"); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a5da0e8..df2f15b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -43,6 +43,8 @@ @ stdcall -norelay IofCompleteRequest(ptr long) @ stdcall -arch=arm,arm64,x86_64 KeAcquireInStackQueuedSpinLock(ptr ptr) @ stdcall -norelay KeAcquireInStackQueuedSpinLockAtDpcLevel(ptr ptr) +@ stdcall KeEnterGuardedRegion() +@ stdcall KeLeaveGuardedRegion() @ stdcall -arch=arm,arm64,x86_64 KeReleaseInStackQueuedSpinLock(ptr) @ stdcall -norelay KeReleaseInStackQueuedSpinLockFromDpcLevel(ptr) @ stub KeSetTimeUpdateNotifyRoutine

1 0

Matteo Bruni : d3d9/tests: Use a D3DUSAGE_WRITEONLY buffer in test_vb_lock_flags().
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: 06b1d7f6f25a5da2ed590620aad7ecdfe583fc55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06b1d7f6f25a5da2ed590620… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 31 13:17:24 2019 +0100 d3d9/tests: Use a D3DUSAGE_WRITEONLY buffer in test_vb_lock_flags(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 77bba06..859ca47 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5625,7 +5625,8 @@ static void test_vb_lock_flags(void) return; } - hr = IDirect3DDevice9_CreateVertexBuffer(device, 1024, D3DUSAGE_DYNAMIC, 0, D3DPOOL_DEFAULT, &buffer, NULL); + hr = IDirect3DDevice9_CreateVertexBuffer(device, 1024, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, + 0, D3DPOOL_DEFAULT, &buffer, NULL); ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(test_data); ++i)

1 0

Matteo Bruni : wined3d: Replace WINED3DUSAGE_WRITEONLY with resource access flags.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: ac4f768e61e277c6152ab2cf54a6e03ab45747e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac4f768e61e277c6152ab2cf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 31 13:17:23 2019 +0100 wined3d: Replace WINED3DUSAGE_WRITEONLY with resource access flags. Always allow read and write mapping of ddraw buffers: test_vb_writeonly() depends on that. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ++-- dlls/d3d9/device.c | 4 ++-- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/executebuffer.c | 2 +- dlls/ddraw/vertexbuffer.c | 2 -- dlls/wined3d/resource.c | 13 ++++++------- dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 3 +-- 8 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0a7f477..d367f42 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2383,7 +2383,7 @@ static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UIN TRACE("Growing vertex buffer to %u bytes\n", size); desc.byte_width = size; - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.usage = WINED3DUSAGE_DYNAMIC; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; @@ -2478,7 +2478,7 @@ static HRESULT d3d8_device_prepare_index_buffer(struct d3d8_device *device, UINT TRACE("Growing index buffer to %u bytes\n", size); desc.byte_width = size; - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 49a86c0..98ada03 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2854,7 +2854,7 @@ static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UIN TRACE("Growing vertex buffer to %u bytes.\n", size); desc.byte_width = size; - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.usage = WINED3DUSAGE_DYNAMIC; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; @@ -2959,7 +2959,7 @@ static HRESULT d3d9_device_prepare_index_buffer(struct d3d9_device *device, UINT TRACE("Growing index buffer to %u bytes.\n", size); desc.byte_width = size; - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4b58b75..af9f28d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3469,7 +3469,7 @@ static HRESULT d3d_device_prepare_vertex_buffer(struct d3d_device *device, UINT TRACE("Growing vertex buffer to %u bytes\n", size); desc.byte_width = size; - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.usage = WINED3DUSAGE_DYNAMIC; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; @@ -3661,7 +3661,7 @@ static HRESULT d3d_device_prepare_index_buffer(struct d3d_device *device, UINT m TRACE("Growing index buffer to %u bytes\n", size); desc.byte_width = size; - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 4b4af63..f9082dc 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -129,7 +129,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct wined3d_buffer_desc desc; desc.byte_width = new_size * sizeof(*indices); - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 3ad8f7e..d2c2f8f 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -119,8 +119,6 @@ static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer desc.byte_width = buffer->size; desc.usage = WINED3DUSAGE_STATICDECL; - if (buffer->Caps & D3DVBCAPS_WRITEONLY) - desc.usage |= WINED3DUSAGE_WRITEONLY; if (dynamic) desc.usage |= WINED3DUSAGE_DYNAMIC; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 82e9019..90025e9 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -28,10 +28,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -static void resource_check_usage(DWORD usage) +static void resource_check_usage(DWORD usage, unsigned int access) { - static const DWORD handled = WINED3DUSAGE_WRITEONLY - | WINED3DUSAGE_DYNAMIC + static const DWORD handled = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL | WINED3DUSAGE_OVERLAY | WINED3DUSAGE_SCRATCH @@ -39,7 +38,7 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_LEGACY_CUBEMAP | ~WINED3DUSAGE_MASK; - /* WINED3DUSAGE_WRITEONLY is supposed to result in write-combined mappings + /* Write-only CPU access is supposed to result in write-combined mappings * being returned. OpenGL doesn't give us explicit control over that, but * the hints and access flags we set for typical access patterns on * dynamic resources should in theory have the same effect on the OpenGL @@ -47,8 +46,8 @@ static void resource_check_usage(DWORD usage) if (usage & ~handled) FIXME("Unhandled usage flags %#x.\n", usage & ~handled); - if ((usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY)) == WINED3DUSAGE_DYNAMIC) - WARN_(d3d_perf)("WINED3DUSAGE_DYNAMIC used without WINED3DUSAGE_WRITEONLY.\n"); + if (usage & WINED3DUSAGE_DYNAMIC && access & WINED3D_RESOURCE_ACCESS_MAP_R) + WARN_(d3d_perf)("WINED3DUSAGE_DYNAMIC used with WINED3D_RESOURCE_ACCESS_MAP_R.\n"); } HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, @@ -82,7 +81,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * {WINED3D_RTYPE_TEXTURE_3D, 0, WINED3D_GL_RES_TYPE_TEX_3D}, }; - resource_check_usage(usage); + resource_check_usage(usage, access); if (usage & WINED3DUSAGE_SCRATCH && access & WINED3D_RESOURCE_ACCESS_GPU) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dd70d3f..7b42202 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4515,7 +4515,6 @@ const char *debug_d3dusage(DWORD usage) init_debug_buffer(&buffer, "0"); #define WINED3DUSAGE_TO_STR(x) if (usage & x) { debug_append(&buffer, #x, " | "); usage &= ~x; } - WINED3DUSAGE_TO_STR(WINED3DUSAGE_WRITEONLY); WINED3DUSAGE_TO_STR(WINED3DUSAGE_SOFTWAREPROCESSING); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DONOTCLIP); WINED3DUSAGE_TO_STR(WINED3DUSAGE_POINTS); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 06f4f76..e09e4e1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -914,7 +914,6 @@ enum wined3d_shader_type #define WINED3D_BIND_DEPTH_STENCIL 0x00000040 #define WINED3D_BIND_UNORDERED_ACCESS 0x00000080 -#define WINED3DUSAGE_WRITEONLY 0x00000008 #define WINED3DUSAGE_SOFTWAREPROCESSING 0x00000010 #define WINED3DUSAGE_DONOTCLIP 0x00000020 #define WINED3DUSAGE_POINTS 0x00000040 @@ -926,7 +925,7 @@ enum wined3d_shader_type #define WINED3DUSAGE_RESTRICT_SHARED_RESOURCE 0x00002000 #define WINED3DUSAGE_DMAP 0x00004000 #define WINED3DUSAGE_TEXTAPI 0x10000000 -#define WINED3DUSAGE_MASK 0x10007bf8 +#define WINED3DUSAGE_MASK 0x10007bf0 #define WINED3DUSAGE_SCRATCH 0x00400000 #define WINED3DUSAGE_PRIVATE 0x00800000

1 0

Matteo Bruni : d3d9: Don' t allow map read access to D3DUSAGE_WRITEONLY buffers.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: 07c20ef0c9762f852001560b296643e5362ee1fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=07c20ef0c9762f852001560b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 31 13:17:21 2019 +0100 d3d9: Don't allow map read access to D3DUSAGE_WRITEONLY buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 6 ++---- dlls/d3d9/d3d9_private.h | 26 +++++++++++++++++++------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 83cf401..dcd7e28 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -310,8 +310,7 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * desc.byte_width = size; desc.usage = usage & WINED3DUSAGE_MASK; desc.bind_flags = 0; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -629,8 +628,7 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; desc.bind_flags = 0; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); desc.misc_flags = 0; desc.structure_byte_stride = 0; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index e520b60..1032f8e 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -325,23 +325,35 @@ static inline D3DPOOL d3dpool_from_wined3daccess(unsigned int access, unsigned i } } +static inline unsigned int map_access_from_usage(unsigned int usage) +{ + if (usage & D3DUSAGE_WRITEONLY) + return WINED3D_RESOURCE_ACCESS_MAP_W; + return WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; +} + static inline unsigned int wined3daccess_from_d3dpool(D3DPOOL pool, unsigned int usage) { + unsigned int access; + switch (pool) { case D3DPOOL_DEFAULT: - if (usage & D3DUSAGE_DYNAMIC) - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; - return WINED3D_RESOURCE_ACCESS_GPU; + access = WINED3D_RESOURCE_ACCESS_GPU; + break; case D3DPOOL_MANAGED: - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU; + break; case D3DPOOL_SYSTEMMEM: case D3DPOOL_SCRATCH: - return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + access = WINED3D_RESOURCE_ACCESS_CPU; + break; default: - return 0; + access = 0; } + if (pool != D3DPOOL_DEFAULT || usage & D3DUSAGE_DYNAMIC) + access |= map_access_from_usage(usage); + return access; } static inline unsigned int wined3d_bind_flags_from_d3d9_usage(DWORD usage)

1 0

Michael Stefaniuc : windowscodecs: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: 52066ee0922e460ff26bb1d05ffebd82d551babc URL: https://source.winehq.org/git/wine.git/?a=commit;h=52066ee0922e460ff26bb1d0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 29 20:38:04 2019 +0100 windowscodecs: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 8e0fb77..37b60fa 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -709,7 +709,7 @@ static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) ok(hr == S_OK, "GetCount error %#x\n", hr); ok(count != 0, "wrong count %u\n", count); - for (i = 0; i < sizeof(tag)/sizeof(tag[0]); i++) + for (i = 0; i < ARRAY_SIZE(tag); i++) { PropVariantInit(&id); PropVariantInit(&value);

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICPalette:: InitializeFromBitmap.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: d102d6e9f7c705970bb97feae03592e0ac702c60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d102d6e9f7c705970bb97fea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 31 09:55:58 2019 +0800 windowscodecs: Implement IWICPalette::InitializeFromBitmap. Based on median cut implementation created by Sebastian Lackner. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/palette.c | 279 ++++++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/palette.c | 21 +-- 2 files changed, 275 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d102d6e9f7c705970bb9…

1 0

Matteo Bruni : d3d8: Don' t allow map read access to D3DUSAGE_WRITEONLY buffers.
by Alexandre Julliard Jan. 31, 2019

Jan. 31, 2019

Module: wine Branch: master Commit: 10061d591e745c67fdd1f1ec47ccc98efd851e47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10061d591e745c67fdd1f1ec… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 31 13:17:22 2019 +0100 d3d8: Don't allow map read access to D3DUSAGE_WRITEONLY buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 6 ++---- dlls/d3d8/d3d8_private.h | 26 +++++++++++++++++++------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 5454d57..8aec654 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -303,8 +303,7 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device * desc.byte_width = size; desc.usage = usage & WINED3DUSAGE_MASK; desc.bind_flags = 0; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -618,8 +617,7 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; desc.bind_flags = 0; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); desc.misc_flags = 0; desc.structure_byte_stride = 0; diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 955de86..7c44f07 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -313,23 +313,35 @@ static inline D3DPOOL d3dpool_from_wined3daccess(unsigned int access, unsigned i } } +static inline unsigned int map_access_from_usage(unsigned int usage) +{ + if (usage & D3DUSAGE_WRITEONLY) + return WINED3D_RESOURCE_ACCESS_MAP_W; + return WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; +} + static inline unsigned int wined3daccess_from_d3dpool(D3DPOOL pool, unsigned int usage) { + unsigned int access; + switch (pool) { case D3DPOOL_DEFAULT: - if (usage & D3DUSAGE_DYNAMIC) - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; - return WINED3D_RESOURCE_ACCESS_GPU; + access = WINED3D_RESOURCE_ACCESS_GPU; + break; case D3DPOOL_MANAGED: - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU; + break; case D3DPOOL_SYSTEMMEM: case D3DPOOL_SCRATCH: - return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + access = WINED3D_RESOURCE_ACCESS_CPU; + break; default: - return 0; + access = 0; } + if (pool != D3DPOOL_DEFAULT || usage & D3DUSAGE_DYNAMIC) + access |= map_access_from_usage(usage); + return access; } static inline unsigned int wined3d_bind_flags_from_d3d8_usage(DWORD usage)

1 0