February 2018 - Wine-Commits

Nikolay Sivov : comctl32/button: Use allocated structure to keep control data.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 6e5507357457fd5835f24bdbeaae620918100c08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e5507357457fd5835f24bdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 15 11:00:09 2018 +0300 comctl32/button: Use allocated structure to keep control data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 354 +++++++++++++++++++++---------------------- dlls/comctl32/tests/button.c | 4 + 2 files changed, 175 insertions(+), 183 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e5507357457fd5835f2…

1 0

Nikolay Sivov : comctl32/combo: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 887836cc6d5a2cb76f6cd413b26bd9d14222667c URL: https://source.winehq.org/git/wine.git/?a=commit;h=887836cc6d5a2cb76f6cd413… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 15 11:00:07 2018 +0300 comctl32/combo: Use the global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 43b4cb4..7401a7e 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -38,6 +38,7 @@ #include "commctrl.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "comctl32.h" @@ -124,9 +125,9 @@ static BOOL COMBO_Init(void) */ static LRESULT COMBO_NCCreate(HWND hwnd, LONG style) { - LPHEADCOMBO lphc; + HEADCOMBO *lphc; - if (COMBO_Init() && (lphc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HEADCOMBO))) ) + if (COMBO_Init() && (lphc = heap_alloc_zero(sizeof(*lphc)))) { lphc->self = hwnd; SetWindowLongPtrW( hwnd, 0, (LONG_PTR)lphc ); @@ -157,20 +158,20 @@ static LRESULT COMBO_NCCreate(HWND hwnd, LONG style) /*********************************************************************** * COMBO_NCDestroy */ -static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc ) +static LRESULT COMBO_NCDestroy( HEADCOMBO *lphc ) { + if (lphc) + { + TRACE("[%p]: freeing storage\n", lphc->self); - if( lphc ) - { - TRACE("[%p]: freeing storage\n", lphc->self); + if ( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox ) + DestroyWindow( lphc->hWndLBox ); - if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox ) - DestroyWindow( lphc->hWndLBox ); + SetWindowLongPtrW( lphc->self, 0, 0 ); + heap_free( lphc ); + } - SetWindowLongPtrW( lphc->self, 0, 0 ); - HeapFree( GetProcessHeap(), 0, lphc ); - } - return 0; + return 0; } /*********************************************************************** @@ -670,7 +671,7 @@ static void CBPaintText(HEADCOMBO *lphc, HDC hdc_paint) size = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, id, 0); if (size == LB_ERR) FIXME("LB_ERR probably not handled yet\n"); - if( (pText = HeapAlloc( GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR))) ) + if ((pText = heap_alloc((size + 1) * sizeof(WCHAR)))) { /* size from LB_GETTEXTLEN may be too large, from LB_GETTEXT is accurate */ size=SendMessageW(lphc->hWndLBox, LB_GETTEXT, id, (LPARAM)pText); @@ -768,7 +769,8 @@ static void CBPaintText(HEADCOMBO *lphc, HDC hdc_paint) if( !hdc_paint ) ReleaseDC( lphc->self, hdc ); } - HeapFree( GetProcessHeap(), 0, pText ); + + heap_free(pText); } /*********************************************************************** @@ -891,8 +893,8 @@ static INT CBUpdateLBox( LPHEADCOMBO lphc, BOOL bSelect ) idx = LB_ERR; length = SendMessageW( lphc->hWndEdit, WM_GETTEXTLENGTH, 0, 0 ); - if( length > 0 ) - pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR)); + if (length > 0) + pText = heap_alloc((length + 1) * sizeof(WCHAR)); TRACE("\t edit text length %i\n", length ); @@ -900,7 +902,7 @@ static INT CBUpdateLBox( LPHEADCOMBO lphc, BOOL bSelect ) { GetWindowTextW( lphc->hWndEdit, pText, length + 1); idx = SendMessageW(lphc->hWndLBox, LB_FINDSTRING, -1, (LPARAM)pText); - HeapFree( GetProcessHeap(), 0, pText ); + heap_free( pText ); } SendMessageW(lphc->hWndLBox, LB_SETCURSEL, bSelect ? idx : -1, 0); @@ -930,10 +932,8 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) length = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, index, 0); if( length != LB_ERR) { - if( (pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR))) ) - { + if ((pText = heap_alloc((length + 1) * sizeof(WCHAR)))) SendMessageW(lphc->hWndLBox, LB_GETTEXT, index, (LPARAM)pText); - } } } @@ -947,7 +947,7 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); - HeapFree( GetProcessHeap(), 0, pText ); + heap_free( pText ); } /*********************************************************************** @@ -1367,7 +1367,7 @@ static LRESULT COMBO_GetText( HEADCOMBO *lphc, INT count, LPWSTR buf ) /* 'length' is without the terminating character */ if (length >= count) { - LPWSTR lpBuffer = HeapAlloc(GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR)); + WCHAR *lpBuffer = heap_alloc((length + 1) * sizeof(WCHAR)); if (!lpBuffer) goto error; length = SendMessageW(lphc->hWndLBox, LB_GETTEXT, idx, (LPARAM)lpBuffer); @@ -1377,7 +1377,7 @@ static LRESULT COMBO_GetText( HEADCOMBO *lphc, INT count, LPWSTR buf ) lstrcpynW( buf, lpBuffer, count ); length = count; } - HeapFree( GetProcessHeap(), 0, lpBuffer ); + heap_free( lpBuffer ); } else length = SendMessageW(lphc->hWndLBox, LB_GETTEXT, idx, (LPARAM)buf);

1 0

Henri Verbeet : dxgi/tests: Introduce an ARRAY_SIZE macro.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 8a167d85132d083fe5c90e4444c2871d938d8a4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a167d85132d083fe5c90e44… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 15 09:53:19 2018 +0330 dxgi/tests: Introduce an ARRAY_SIZE macro. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 148cd73..8351a32 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -23,6 +23,10 @@ #include "d3d11.h" #include "wine/test.h" +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif + enum frame_latency { DEFAULT_FRAME_LATENCY = 3, @@ -1179,7 +1183,7 @@ static void test_create_swapchain(void) refcount = get_refcount((IUnknown *)factory); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); - for (i = 0; i < sizeof(refresh_list) / sizeof(*refresh_list); ++i) + for (i = 0; i < ARRAY_SIZE(refresh_list); ++i) { creation_desc.BufferDesc.RefreshRate.Numerator = refresh_list[i].numerator; creation_desc.BufferDesc.RefreshRate.Denominator = refresh_list[i].denominator; @@ -1275,7 +1279,7 @@ static void test_create_swapchain(void) creation_desc.Windowed = FALSE; - for (i = 0; i < sizeof(refresh_list) / sizeof(*refresh_list); ++i) + for (i = 0; i < ARRAY_SIZE(refresh_list); ++i) { creation_desc.BufferDesc.RefreshRate.Numerator = refresh_list[i].numerator; creation_desc.BufferDesc.RefreshRate.Denominator = refresh_list[i].denominator; @@ -1637,16 +1641,16 @@ static void test_get_containing_output(void) break; } - for (j = 0; j < sizeof(offsets) / sizeof(*offsets); ++j) + for (j = 0; j < ARRAY_SIZE(offsets); ++j) { - unsigned int idx = (sizeof(offsets) / sizeof(*offsets)) * i + j; - assert(idx < sizeof(points) / sizeof(*points)); + unsigned int idx = ARRAY_SIZE(offsets) * i + j; + assert(idx < ARRAY_SIZE(points)); points[idx].x = x + offsets[j].x; points[idx].y = y + offsets[j].y; } } - for (i = 0; i < sizeof(points) / sizeof(*points); ++i) + for (i = 0; i < ARRAY_SIZE(points); ++i) { ret = SetWindowPos(swapchain_desc.OutputWindow, 0, points[i].x, points[i].y, 0, 0, SWP_NOSIZE | SWP_NOZORDER); @@ -2089,7 +2093,7 @@ static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window, expected_state = *state; e = &expected_state.fullscreen_state; - for (i = 0; i < sizeof(sizes) / sizeof(*sizes); ++i) + for (i = 0; i < ARRAY_SIZE(sizes); ++i) { SetRect(&e->client_rect, 0, 0, sizes[i].width, sizes[i].height); e->window_rect = e->client_rect; @@ -2260,7 +2264,7 @@ static void test_resize_target(void) swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { swapchain_desc.Flags = tests[i].flags; swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, @@ -2425,7 +2429,7 @@ static void test_inexact_modes(void) check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); - for (i = 0; i < sizeof(sizes) / sizeof(*sizes); ++i) + for (i = 0; i < ARRAY_SIZE(sizes); ++i) { /* Test CreateSwapChain(). */ swapchain_desc.BufferDesc.Width = sizes[i].width; @@ -3190,7 +3194,7 @@ static void test_swapchain_parameters(void) hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { memset(&desc, 0, sizeof(desc)); desc.BufferDesc.Width = registry_mode.dmPelsWidth; @@ -3278,7 +3282,7 @@ static void test_swapchain_parameters(void) IDXGISwapChain_Release(swapchain); } - for (i = 0; i < sizeof(usage_tests) / sizeof(*usage_tests); ++i) + for (i = 0; i < ARRAY_SIZE(usage_tests); ++i) { usage = usage_tests[i];

1 0

Henri Verbeet : wined3d: Print a fixme for unimplemented swap effects during swapchain (re) creation.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 0cf21e85a531dbdda42b11207be337fc37138421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cf21e85a531dbdda42b1120… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 15 09:53:15 2018 +0330 wined3d: Print a fixme for unimplemented swap effects during swapchain (re)creation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 +++++ dlls/wined3d/swapchain.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e412272..89083fc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4797,6 +4797,11 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (swapchain_desc->backbuffer_usage != WINED3DUSAGE_RENDERTARGET) FIXME("Got unexpected backbuffer usage %#x.\n", swapchain_desc->backbuffer_usage); + if (swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_DISCARD + && swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_SEQUENTIAL + && swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_COPY) + FIXME("Unimplemented swap effect %#x.\n", swapchain_desc->swap_effect); + /* No special treatment of these parameters. Just store them */ swapchain->desc.swap_effect = swapchain_desc->swap_effect; swapchain->desc.enable_auto_depth_stencil = swapchain_desc->enable_auto_depth_stencil; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c20a692..2729df2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -777,6 +777,11 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 "Please configure the application to use double buffering (1 back buffer) if possible.\n"); } + if (desc->swap_effect != WINED3D_SWAP_EFFECT_DISCARD + && desc->swap_effect != WINED3D_SWAP_EFFECT_SEQUENTIAL + && desc->swap_effect != WINED3D_SWAP_EFFECT_COPY) + FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); + if (device->wined3d->flags & WINED3D_NO3D) swapchain->swapchain_ops = &swapchain_gdi_ops; else

1 0

Henri Verbeet : d3d9: Explicitly translate swap effects.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: 5057df1f3e066897cc5978ec3e9f3b594886e862 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5057df1f3e066897cc5978ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 15 09:53:17 2018 +0330 d3d9: Explicitly translate swap effects. Note that previously D3DSWAPEFFECT_OVERLAY would get mapped to WINED3D_SWAP_EFFECT_COPY_VSYNC. That didn't matter so much because neither is currently implemented. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- include/wine/wined3d.h | 10 ++++++---- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4c1006c..ff95bef 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -186,6 +186,26 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static D3DSWAPEFFECT d3dswapeffect_from_wined3dswapeffect(enum wined3d_swap_effect effect) +{ + switch (effect) + { + case WINED3D_SWAP_EFFECT_DISCARD: + return D3DSWAPEFFECT_DISCARD; + case WINED3D_SWAP_EFFECT_SEQUENTIAL: + return D3DSWAPEFFECT_FLIP; + case WINED3D_SWAP_EFFECT_COPY: + return D3DSWAPEFFECT_COPY; + case WINED3D_SWAP_EFFECT_OVERLAY: + return D3DSWAPEFFECT_OVERLAY; + case WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL: + return D3DSWAPEFFECT_FLIPEX; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return D3DSWAPEFFECT_FLIP; + } +} + void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc) { @@ -195,7 +215,7 @@ void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *prese present_parameters->BackBufferCount = swapchain_desc->backbuffer_count; present_parameters->MultiSampleType = swapchain_desc->multisample_type; present_parameters->MultiSampleQuality = swapchain_desc->multisample_quality; - present_parameters->SwapEffect = swapchain_desc->swap_effect; + present_parameters->SwapEffect = d3dswapeffect_from_wined3dswapeffect(swapchain_desc->swap_effect); present_parameters->hDeviceWindow = swapchain_desc->device_window; present_parameters->Windowed = swapchain_desc->windowed; present_parameters->EnableAutoDepthStencil = swapchain_desc->enable_auto_depth_stencil; @@ -206,6 +226,26 @@ void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *prese present_parameters->PresentationInterval = swapchain_desc->swap_interval; } +static enum wined3d_swap_effect wined3dswapeffect_from_d3dswapeffect(D3DSWAPEFFECT effect) +{ + switch (effect) + { + case D3DSWAPEFFECT_DISCARD: + return WINED3D_SWAP_EFFECT_DISCARD; + case D3DSWAPEFFECT_FLIP: + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + case D3DSWAPEFFECT_COPY: + return WINED3D_SWAP_EFFECT_COPY; + case D3DSWAPEFFECT_OVERLAY: + return WINED3D_SWAP_EFFECT_OVERLAY; + case D3DSWAPEFFECT_FLIPEX: + return WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + } +} + static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters, BOOL extended) { @@ -232,7 +272,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->backbuffer_usage = WINED3DUSAGE_RENDERTARGET; swapchain_desc->multisample_type = present_parameters->MultiSampleType; swapchain_desc->multisample_quality = present_parameters->MultiSampleQuality; - swapchain_desc->swap_effect = present_parameters->SwapEffect; + swapchain_desc->swap_effect = wined3dswapeffect_from_d3dswapeffect(present_parameters->SwapEffect); swapchain_desc->device_window = present_parameters->hDeviceWindow; swapchain_desc->windowed = present_parameters->Windowed; swapchain_desc->enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cca4476..22bb2d8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -505,10 +505,12 @@ enum wined3d_patch_edge_style enum wined3d_swap_effect { - WINED3D_SWAP_EFFECT_DISCARD = 1, - WINED3D_SWAP_EFFECT_SEQUENTIAL = 2, - WINED3D_SWAP_EFFECT_COPY = 3, - WINED3D_SWAP_EFFECT_COPY_VSYNC = 4, + WINED3D_SWAP_EFFECT_DISCARD, + WINED3D_SWAP_EFFECT_SEQUENTIAL, + WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL, + WINED3D_SWAP_EFFECT_COPY, + WINED3D_SWAP_EFFECT_COPY_VSYNC, + WINED3D_SWAP_EFFECT_OVERLAY, }; enum wined3d_sampler_state

1 0

Henri Verbeet : d3d8: Explicitly translate swap effects.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: f0970916704114c2c5e75b589e7c51d2e4ae27ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0970916704114c2c5e75b58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 15 09:53:16 2018 +0330 d3d8: Explicitly translate swap effects. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 615f8c7..a6363d2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -167,6 +167,24 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static D3DSWAPEFFECT d3dswapeffect_from_wined3dswapeffect(enum wined3d_swap_effect effect) +{ + switch (effect) + { + case WINED3D_SWAP_EFFECT_DISCARD: + return D3DSWAPEFFECT_DISCARD; + case WINED3D_SWAP_EFFECT_SEQUENTIAL: + return D3DSWAPEFFECT_FLIP; + case WINED3D_SWAP_EFFECT_COPY: + return D3DSWAPEFFECT_COPY; + case WINED3D_SWAP_EFFECT_COPY_VSYNC: + return D3DSWAPEFFECT_COPY_VSYNC; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return D3DSWAPEFFECT_FLIP; + } +} + static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc) { @@ -175,7 +193,7 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc->backbuffer_format); present_parameters->BackBufferCount = swapchain_desc->backbuffer_count; present_parameters->MultiSampleType = swapchain_desc->multisample_type; - present_parameters->SwapEffect = swapchain_desc->swap_effect; + present_parameters->SwapEffect = d3dswapeffect_from_wined3dswapeffect(swapchain_desc->swap_effect); present_parameters->hDeviceWindow = swapchain_desc->device_window; present_parameters->Windowed = swapchain_desc->windowed; present_parameters->EnableAutoDepthStencil = swapchain_desc->enable_auto_depth_stencil; @@ -186,6 +204,24 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS present_parameters->FullScreen_PresentationInterval = swapchain_desc->swap_interval; } +static enum wined3d_swap_effect wined3dswapeffect_from_d3dswapeffect(D3DSWAPEFFECT effect) +{ + switch (effect) + { + case D3DSWAPEFFECT_DISCARD: + return WINED3D_SWAP_EFFECT_DISCARD; + case D3DSWAPEFFECT_FLIP: + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + case D3DSWAPEFFECT_COPY: + return WINED3D_SWAP_EFFECT_COPY; + case D3DSWAPEFFECT_COPY_VSYNC: + return WINED3D_SWAP_EFFECT_COPY_VSYNC; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + } +} + static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters) { @@ -210,7 +246,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->backbuffer_usage = WINED3DUSAGE_RENDERTARGET; swapchain_desc->multisample_type = present_parameters->MultiSampleType; swapchain_desc->multisample_quality = 0; /* d3d9 only */ - swapchain_desc->swap_effect = present_parameters->SwapEffect; + swapchain_desc->swap_effect = wined3dswapeffect_from_d3dswapeffect(present_parameters->SwapEffect); swapchain_desc->device_window = present_parameters->hDeviceWindow; swapchain_desc->windowed = present_parameters->Windowed; swapchain_desc->enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil;

1 0

Henri Verbeet : dxgi: Translate swap effects in dxgi_factory_CreateSwapChainForHwnd().
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: wine Branch: master Commit: d612495a72a4368d9c28acf5dd3b7d0845115257 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d612495a72a4368d9c28acf5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 15 09:53:18 2018 +0330 dxgi: Translate swap effects in dxgi_factory_CreateSwapChainForHwnd(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 13 ++++++++++--- dlls/wined3d/swapchain.c | 3 ++- include/wine/wined3d.h | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 00ca122..7fc3279 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -275,12 +275,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa switch (swapchain_desc->SwapEffect) { case DXGI_SWAP_EFFECT_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; + min_buffer_count = 1; + break; + case DXGI_SWAP_EFFECT_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_SEQUENTIAL; min_buffer_count = 1; break; case DXGI_SWAP_EFFECT_FLIP_DISCARD: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_DISCARD; + min_buffer_count = 2; + break; + case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: + wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL; min_buffer_count = 2; break; @@ -303,8 +313,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); - if (swapchain_desc->SwapEffect) - FIXME("Ignoring swap effect %#x.\n", swapchain_desc->SwapEffect); if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) @@ -319,7 +327,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IWineDXGIFa wined3d_desc.backbuffer_usage = wined3d_usage_from_dxgi_usage(swapchain_desc->BufferUsage); wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); - wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; wined3d_desc.device_window = window; wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; wined3d_desc.enable_auto_depth_stencil = FALSE; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2729df2..0d76b67 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -505,7 +505,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, * The FLIP swap effect is not implemented yet. We could mark WINED3D_LOCATION_DRAWABLE * up to date and hope WGL flipped front and back buffers and read this data into * the FBO. Don't bother about this for now. */ - if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD) + if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD + || swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP_DISCARD) wined3d_texture_validate_location(swapchain->back_buffers[swapchain->desc.backbuffer_count - 1], 0, WINED3D_LOCATION_DISCARDED); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 22bb2d8..1e3c08b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -507,6 +507,7 @@ enum wined3d_swap_effect { WINED3D_SWAP_EFFECT_DISCARD, WINED3D_SWAP_EFFECT_SEQUENTIAL, + WINED3D_SWAP_EFFECT_FLIP_DISCARD, WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL, WINED3D_SWAP_EFFECT_COPY, WINED3D_SWAP_EFFECT_COPY_VSYNC,

1 0

Józef Kucia : include: Move D3D_PRIMITIVE_TOPOLOGY to d3dcommon.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: vkd3d Branch: master Commit: 4c35737940c0487a358160355a2192dea29d8d6d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4c35737940c0487a3581603… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:50 2018 +0100 include: Move D3D_PRIMITIVE_TOPOLOGY to d3dcommon. 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> --- include/vkd3d_d3d12.idl | 10 ---------- include/vkd3d_d3dcommon.idl | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 2ccfa22..5bfc767 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -66,16 +66,6 @@ const UINT D3D12_SHADER_COMPONENT_MAPPING_SHIFT = 3; const UINT D3D12_SHADER_COMPONENT_MAPPING_ALWAYS_SET_BIT_AVOIDING_ZEROMEM_MISTAKES = 1 << (D3D12_SHADER_COMPONENT_MAPPING_SHIFT * 4); -typedef enum D3D_PRIMITIVE_TOPOLOGY -{ - D3D_PRIMITIVE_TOPOLOGY_UNDEFINED = 0, - D3D_PRIMITIVE_TOPOLOGY_POINTLIST = 1, - D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2, - D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3, - D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4, - D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, -} D3D_PRIMITIVE_TOPOLOGY; - typedef enum D3D12_SHADER_MIN_PRECISION_SUPPORT { D3D12_SHADER_MIN_PRECISION_SUPPORT_NONE = 0x0, diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl index 1ddfce3..a874b6c 100644 --- a/include/vkd3d_d3dcommon.idl +++ b/include/vkd3d_d3dcommon.idl @@ -20,6 +20,16 @@ import "vkd3d_windows.h"; #include "vkd3d_unknown.idl" +typedef enum D3D_PRIMITIVE_TOPOLOGY +{ + D3D_PRIMITIVE_TOPOLOGY_UNDEFINED = 0, + D3D_PRIMITIVE_TOPOLOGY_POINTLIST = 1, + D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2, + D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, +} D3D_PRIMITIVE_TOPOLOGY; + typedef enum D3D_FEATURE_LEVEL { D3D_FEATURE_LEVEL_9_1 = 0x9100,

1 0

Józef Kucia : libs/vkd3d-shader: Avoid UINT.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: vkd3d Branch: master Commit: 5ea8cad967e4bf4d19488bc7840296b5ad9032e2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5ea8cad967e4bf4d19488bc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:53 2018 +0100 libs/vkd3d-shader: Avoid UINT. 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> --- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b3e81a4..9c43a46 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -607,7 +607,7 @@ enum vkd3d_decl_usage struct vkd3d_shader_semantic { enum vkd3d_decl_usage usage; - UINT usage_idx; + unsigned int usage_idx; enum vkd3d_shader_resource_type resource_type; enum vkd3d_data_type resource_data_type; struct vkd3d_shader_dst_param reg;

1 0

Józef Kucia : libs/vkd3d-shader: Translate control point count declarations.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: vkd3d Branch: master Commit: 1fe62703070c98717186000e3b30862c78d93d95 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1fe62703070c98717186000… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:54 2018 +0100 libs/vkd3d-shader: Translate control point count declarations. 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> --- libs/vkd3d-shader/spirv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5d04b58..89b1187 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5686,6 +5686,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_emit_dcl_stream(compiler, instruction); break; case VKD3DSIH_DCL_VERTICES_OUT: + case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT: vkd3d_dxbc_compiler_emit_dcl_vertices_out(compiler, instruction); break; case VKD3DSIH_DCL_INPUT_PRIMITIVE: @@ -5876,7 +5877,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_CUT_STREAM: vkd3d_dxbc_compiler_emit_cut_stream(compiler, instruction); break; + case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: case VKD3DSIH_NOP: + /* nothing to do */ break; default: FIXME("Unhandled instruction %#x.\n", instruction->handler_idx);

1 0

Józef Kucia : libs/vkd3d-shader: Remove dependency on D3D12 headers.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: vkd3d Branch: master Commit: fddf86e6ea034837566e2d81ca7f8f0f0f50f70b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fddf86e6ea034837566e2d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:51 2018 +0100 libs/vkd3d-shader: Remove dependency on D3D12 headers. We would like to allow building libvkd3d-shader as a standalone library without our Direct3D translation layers. In the long term, it should be possible to build and use libvkd3d-shader without Win32 data types, Vulkan headers and libs. 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> --- include/vkd3d_shader.h | 183 +++++++++++++++++++++++++- libs/vkd3d-shader/dxbc.c | 238 +++++++++++++++++----------------- libs/vkd3d-shader/vkd3d_shader_main.c | 14 +- libs/vkd3d/state.c | 14 +- libs/vkd3d/vkd3d_main.c | 15 ++- 5 files changed, 325 insertions(+), 139 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=fddf86e6ea034837566…

1 0

Józef Kucia : libs/vkd3d-shader: Avoid Windows data types in public API.
by Alexandre Julliard Feb. 15, 2018

Feb. 15, 2018

Module: vkd3d Branch: master Commit: 844c83a83734984fbe0374eaf2fe4bb226df9bbd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=844c83a83734984fbe0374e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:52 2018 +0100 libs/vkd3d-shader: Avoid Windows data types in public API. 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> --- include/vkd3d_shader.h | 26 ++- libs/vkd3d-shader/dxbc.c | 313 +++++++++++++++---------------- libs/vkd3d-shader/spirv.c | 6 +- libs/vkd3d-shader/vkd3d_shader_main.c | 46 +++-- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +- libs/vkd3d/state.c | 35 ++-- libs/vkd3d/utils.c | 20 ++ libs/vkd3d/vkd3d_main.c | 17 +- libs/vkd3d/vkd3d_private.h | 1 + 9 files changed, 252 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=844c83a83734984fbe0…

1 0

Jeremy Newman : change width of tabs
by Jeremy Newman Feb. 15, 2018

Feb. 15, 2018

Module: website Branch: master Commit: 50939cab24b6ce5a8a61e0322cae6c217c543e7e URL: https://source.winehq.org/git/website.git/?a=commit;h=50939cab24b6ce5a8a61e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Feb 15 11:22:29 2018 -0600 change width of tabs some translations wrap (KO) due to longer strings --- css/styles.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/css/styles.css b/css/styles.css index ae2481b..e0ff353 100644 --- a/css/styles.css +++ b/css/styles.css @@ -335,7 +335,6 @@ hr } #whq-tabs LI { float: left; - width: 112px; height: 28px; margin: 0px 2px 0px 2px; padding: 0px; @@ -349,9 +348,9 @@ hr #whq-tabs LI:hover { background-color: #832c2c; } #whq-tabs LI A { display: block; - width: 108px; + min-width: 110px; height: 23px; - padding-top: 3px; + padding: 3px 5px 3px 5px; font-size: 16px; color: white; text-decoration: none; }

1 0

Matteo Bruni : d3d9/tests: Extend test_mipmap_gen().
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 457617d545708d08974616d6267898e7f034a0d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=457617d545708d08974616d6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 13 01:00:45 2018 +0100 d3d9/tests: Extend test_mipmap_gen(). 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 | 68 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 4b6d60e..0ffc1ae 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7065,12 +7065,12 @@ static void test_mipmap_gen(void) IDirect3DTexture9 *texture; IDirect3DSurface9 *surface; IDirect3DDevice9 *device; + unsigned int i, count; D3DSURFACE_DESC desc; D3DLOCKED_RECT lr; IDirect3D9 *d3d; BOOL renderable; ULONG refcount; - unsigned int i; DWORD levels; HWND window; HRESULT hr; @@ -7170,8 +7170,74 @@ static void test_mipmap_gen(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); levels = IDirect3DTexture9_GetLevelCount(texture); ok(levels == 1, "Got unexpected levels %u.\n", levels); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(desc.Usage == D3DUSAGE_AUTOGENMIPMAP, "Got unexpected usage %#x.\n", desc.Usage); IDirect3DTexture9_Release(texture); + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, + D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, 0); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, formats[i]); + if (SUCCEEDED(hr)) + { + /* i.e. there is no difference between the D3D_OK and the + * D3DOK_NOAUTOGEN cases. */ + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, + formats[i], D3DPOOL_DEFAULT, &texture, 0); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + count = IDirect3DTexture9_GetLevelCount(texture); + ok(count == 1, "Unexpected level count %u.\n", count); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(desc.Usage == D3DUSAGE_AUTOGENMIPMAP, "Got unexpected usage %#x.\n", desc.Usage); + filter_type = IDirect3DTexture9_GetAutoGenFilterType(texture); + ok(filter_type == D3DTEXF_LINEAR, "Got unexpected filter_type %#x.\n", filter_type); + hr = IDirect3DTexture9_SetAutoGenFilterType(texture, D3DTEXF_ANISOTROPIC); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + filter_type = IDirect3DTexture9_GetAutoGenFilterType(texture); + ok(filter_type == D3DTEXF_ANISOTROPIC, "Got unexpected filter_type %#x.\n", filter_type); + IDirect3DTexture9_Release(texture); + } + } + + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_WRAPANDMIP, D3DRTYPE_TEXTURE, D3DFMT_D16); + if (hr == D3D_OK) + { + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, 0, + D3DFMT_D16, D3DPOOL_DEFAULT, &texture, 0); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + count = IDirect3DTexture9_GetLevelCount(texture); + ok(count == 7, "Unexpected level count %u.\n", count); + IDirect3DTexture9_Release(texture); + + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_D16); + ok(hr == D3DOK_NOAUTOGEN, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, + D3DFMT_D16, D3DPOOL_DEFAULT, &texture, 0); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + count = IDirect3DTexture9_GetLevelCount(texture); + ok(count == 1, "Unexpected level count %u.\n", count); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(desc.Usage == D3DUSAGE_AUTOGENMIPMAP, "Got unexpected usage %#x.\n", desc.Usage); + IDirect3DTexture9_Release(texture); + } + else + { + skip("Mipmapping not supported for D3DFMT_D16, skipping test.\n"); + } + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 64, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, (IDirect3DVolumeTexture9 **)&texture, 0); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d);

1 0

Matteo Bruni : wined3d: Update feature check for mipmap generation support.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: c7ebc8ec3229bbfd2a0d6e0f0c0c02c8ee87e98f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7ebc8ec3229bbfd2a0d6e0f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 13 01:00:43 2018 +0100 wined3d: Update feature check for mipmap generation support. 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/wined3d/directx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a1e679b..2139b65 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5296,7 +5296,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad const struct wined3d_gl_info *gl_info = &adapter->gl_info; const struct wined3d_format *adapter_format, *format; enum wined3d_gl_resource_type gl_type, gl_type_end; - BOOL mipmap_autogen_supported = TRUE; + BOOL mipmap_gen_supported = TRUE; DWORD format_flags = 0; DWORD allowed_usage; @@ -5440,10 +5440,10 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } if (!(format->flags[gl_type] & WINED3DFMT_FLAG_GEN_MIPMAP)) - mipmap_autogen_supported = FALSE; + mipmap_gen_supported = FALSE; } - if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !mipmap_autogen_supported) + if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !mipmap_gen_supported) { TRACE("No WINED3DUSAGE_AUTOGENMIPMAP support, returning WINED3DOK_NOAUTOGEN.\n"); return WINED3DOK_NOAUTOGEN; @@ -5618,7 +5618,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | WINED3DCAPS2_FULLSCREENGAMMA | WINED3DCAPS2_DYNAMICTEXTURES; - if (gl_info->supported[SGIS_GENERATE_MIPMAP]) + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_OBJECT]) caps->Caps2 |= WINED3DCAPS2_CANAUTOGENMIPMAP; caps->Caps3 = WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD |

1 0

Matteo Bruni : wined3d: Get rid of legacy mipmap autogeneration support.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 9a13d48e4eddff7708506e72ee3c737131b6a507 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a13d48e4eddff7708506e72… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 13 01:00:44 2018 +0100 wined3d: Get rid of legacy mipmap autogeneration support. 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/d3d11/device.c | 2 +- dlls/d3d9/d3d9_private.h | 2 +- dlls/wined3d/directx.c | 13 ++++----- dlls/wined3d/resource.c | 1 - dlls/wined3d/texture.c | 62 ------------------------------------------ dlls/wined3d/utils.c | 4 +-- dlls/wined3d/wined3d.spec | 2 -- dlls/wined3d/wined3d_gl.h | 2 -- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.h | 13 ++++----- 10 files changed, 14 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a13d48e4eddff770850…

1 0

Nikolay Sivov : comctl32/button: Fix paint handler check when theming is on.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 389c3add0ad93f3b2180c636363b25f6c78757a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=389c3add0ad93f3b2180c636… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 14:05:15 2018 +0300 comctl32/button: Fix paint handler check when theming is on. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 7184d19..6458ba1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -393,7 +393,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L theme = GetWindowTheme( hWnd ); hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); - if (theme && btnPaintFunc[btn_type]) + if (theme && btnThemedPaintFunc[btn_type]) { ButtonState drawState; UINT dtflags;

1 0

Matteo Bruni : d3d9: Handle D3DUSAGE_AUTOGENMIPMAP textures entirely in d3d9.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 3d6eb8cf1dc1e509a74f85fd2356c6946372ecc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d6eb8cf1dc1e509a74f85fd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 13 01:00:42 2018 +0100 d3d9: Handle D3DUSAGE_AUTOGENMIPMAP textures entirely in d3d9. 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/d3d9_private.h | 25 ++++- dlls/d3d9/device.c | 75 +++++++++++++ dlls/d3d9/surface.c | 4 + dlls/d3d9/tests/device.c | 5 +- dlls/d3d9/texture.c | 270 ++++++++++++++++++++++++++++++++++++----------- 5 files changed, 313 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d6eb8cf1dc1e509a74f…

1 0

Józef Kucia : d3d12: Add dll.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 8d6f7ed292f051f541b8a53df2fd07477f41a082 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d6f7ed292f051f541b8a53d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:52 2018 +0100 d3d12: Add dll. 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> --- configure | 2 ++ configure.ac | 1 + dlls/d3d12/Makefile.in | 5 +++++ dlls/d3d12/d3d12.spec | 8 ++++++++ dlls/d3d12/d3d12_main.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+) diff --git a/configure b/configure index 57577da..126de30 100755 --- a/configure +++ b/configure @@ -1128,6 +1128,7 @@ enable_d3d10 enable_d3d10_1 enable_d3d10core enable_d3d11 +enable_d3d12 enable_d3d8 enable_d3d9 enable_d3dcompiler_33 @@ -18588,6 +18589,7 @@ wine_fn_config_dll d3d10core enable_d3d10core implib wine_fn_config_test dlls/d3d10core/tests d3d10core_test wine_fn_config_dll d3d11 enable_d3d11 implib wine_fn_config_test dlls/d3d11/tests d3d11_test +wine_fn_config_dll d3d12 enable_d3d12 implib wine_fn_config_dll d3d8 enable_d3d8 implib wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 implib diff --git a/configure.ac b/configure.ac index 58ce104..92c8952 100644 --- a/configure.ac +++ b/configure.ac @@ -3068,6 +3068,7 @@ WINE_CONFIG_DLL(d3d10core,,[implib]) WINE_CONFIG_TEST(dlls/d3d10core/tests) WINE_CONFIG_DLL(d3d11,,[implib]) WINE_CONFIG_TEST(dlls/d3d11/tests) +WINE_CONFIG_DLL(d3d12,,[implib]) WINE_CONFIG_DLL(d3d8,,[implib]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[implib]) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in new file mode 100644 index 0000000..d7ee1b5 --- /dev/null +++ b/dlls/d3d12/Makefile.in @@ -0,0 +1,5 @@ +MODULE = d3d12.dll +IMPORTLIB = d3d12 + +C_SRCS = \ + d3d12_main.c diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec new file mode 100644 index 0000000..613092b --- /dev/null +++ b/dlls/d3d12/d3d12.spec @@ -0,0 +1,8 @@ +100 stub GetBehaviorValue +101 stdcall D3D12CreateDevice(ptr long ptr ptr) +102 stdcall D3D12GetDebugInterface(ptr ptr) +103 stub D3D12CoreCreateLayeredDevice +104 stub D3D12CoreGetLayeredDeviceSize +105 stub D3D12CoreRegisterLayers +106 stub D3D12CreateRootSignatureDeserializer +107 stub D3D12SerializeRootSignature diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c new file mode 100644 index 0000000..c1598ca --- /dev/null +++ b/dlls/d3d12/d3d12_main.c @@ -0,0 +1,42 @@ +/* + * Copyright 2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "wine/debug.h" +#include "d3d12.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d12); + +HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) +{ + FIXME("iid %s, debug %p stub!\n", debugstr_guid(iid), debug); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, + REFIID iid, void **device) +{ + FIXME("adapter %p, minimum_feature_level %#x, iid %s, device %p stub!\n", + adapter, minimum_feature_level, debugstr_guid(iid), device); + + return E_NOTIMPL; +}

1 0

Józef Kucia : d3d12/tests: Add test for COM interfaces.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: d626aac6c0536517e14ba159ca2f27dfaccc9990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d626aac6c0536517e14ba159… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:53 2018 +0100 d3d12/tests: Add test for COM interfaces. 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> --- configure | 1 + configure.ac | 1 + dlls/d3d12/tests/Makefile.in | 5 ++ dlls/d3d12/tests/d3d12.c | 107 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+) diff --git a/configure b/configure index 126de30..06551fa 100755 --- a/configure +++ b/configure @@ -18590,6 +18590,7 @@ wine_fn_config_test dlls/d3d10core/tests d3d10core_test wine_fn_config_dll d3d11 enable_d3d11 implib wine_fn_config_test dlls/d3d11/tests d3d11_test wine_fn_config_dll d3d12 enable_d3d12 implib +wine_fn_config_test dlls/d3d12/tests d3d12_test wine_fn_config_dll d3d8 enable_d3d8 implib wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 implib diff --git a/configure.ac b/configure.ac index 92c8952..925def2 100644 --- a/configure.ac +++ b/configure.ac @@ -3069,6 +3069,7 @@ WINE_CONFIG_TEST(dlls/d3d10core/tests) WINE_CONFIG_DLL(d3d11,,[implib]) WINE_CONFIG_TEST(dlls/d3d11/tests) WINE_CONFIG_DLL(d3d12,,[implib]) +WINE_CONFIG_TEST(dlls/d3d12/tests) WINE_CONFIG_DLL(d3d8,,[implib]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[implib]) diff --git a/dlls/d3d12/tests/Makefile.in b/dlls/d3d12/tests/Makefile.in new file mode 100644 index 0000000..d055aba --- /dev/null +++ b/dlls/d3d12/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = d3d12.dll +IMPORTS = d3d12 + +C_SRCS = \ + d3d12.c diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c new file mode 100644 index 0000000..cc37a86 --- /dev/null +++ b/dlls/d3d12/tests/d3d12.c @@ -0,0 +1,107 @@ +/* + * Copyright 2017 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdlib.h> +#define COBJMACROS +#include "initguid.h" +#include "d3d12.h" +#include "dxgi1_6.h" +#include "wine/test.h" + +static ID3D12Device *create_device(void) +{ + ID3D12Device *device; + + if (FAILED(D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) + return NULL; + + return device; +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + D3D12_COMMAND_QUEUE_DESC desc; + ID3D12CommandQueue *queue; + ID3D12Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + check_interface(device, &IID_ID3D12Object, TRUE); + check_interface(device, &IID_ID3D12DeviceChild, FALSE); + check_interface(device, &IID_ID3D12Pageable, FALSE); + check_interface(device, &IID_ID3D12Device, TRUE); + + check_interface(device, &IID_IDXGIObject, FALSE); + check_interface(device, &IID_IDXGIDeviceSubObject, FALSE); + check_interface(device, &IID_IDXGIDevice, FALSE); + check_interface(device, &IID_IDXGIDevice1, FALSE); + check_interface(device, &IID_IDXGIDevice2, FALSE); + check_interface(device, &IID_IDXGIDevice3, FALSE); + check_interface(device, &IID_IDXGIDevice4, FALSE); + + desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; + desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; + desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; + desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandQueue(device, &desc, &IID_ID3D12CommandQueue, (void **)&queue); + ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + + check_interface(queue, &IID_ID3D12Object, TRUE); + check_interface(queue, &IID_ID3D12DeviceChild, TRUE); + check_interface(queue, &IID_ID3D12Pageable, TRUE); + check_interface(queue, &IID_ID3D12CommandQueue, TRUE); + + check_interface(queue, &IID_IDXGIObject, FALSE); + check_interface(queue, &IID_IDXGIDeviceSubObject, FALSE); + check_interface(queue, &IID_IDXGIDevice, FALSE); + check_interface(queue, &IID_IDXGIDevice1, FALSE); + check_interface(queue, &IID_IDXGIDevice2, FALSE); + check_interface(queue, &IID_IDXGIDevice3, FALSE); + check_interface(queue, &IID_IDXGIDevice4, FALSE); + + refcount = ID3D12CommandQueue_Release(queue); + ok(!refcount, "Command queue has %u references left.\n", refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + +START_TEST(d3d12) +{ + test_interfaces(); +}

1 0

Michael Müller : imm32: Add stub for ImmDisableLegacyIME.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 478c8b0eb1d51c52edd2f7b12aac1aa3853e1a43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=478c8b0eb1d51c52edd2f7b1… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 14 04:35:04 2018 +0000 imm32: Add stub for ImmDisableLegacyIME. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 9 +++++++++ dlls/imm32/imm32.spec | 1 + include/imm.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3f8ad18..377a277 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -3145,3 +3145,12 @@ BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl) FIXME("%x, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl); return FALSE; } + +/*********************************************************************** + * IMMDisableLegacyIME(IMM32.@) + */ +BOOL WINAPI ImmDisableLegacyIME(void) +{ + FIXME("stub\n"); + return TRUE; +} diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 2be5d92..4197bb8 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -11,6 +11,7 @@ @ stdcall ImmDestroySoftKeyboard(long) @ stdcall ImmDisableIME(long) @ stdcall ImmDisableIme(long) ImmDisableIME +@ stdcall ImmDisableLegacyIME() @ stdcall ImmDisableTextFrameService(long) @ stdcall ImmEnumInputContext(long ptr long) @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr) diff --git a/include/imm.h b/include/imm.h index aa2fa1d..500aea9 100644 --- a/include/imm.h +++ b/include/imm.h @@ -493,6 +493,7 @@ BOOL WINAPI ImmConfigureIMEW(HKL, HWND, DWORD, LPVOID); HIMC WINAPI ImmCreateContext(void); BOOL WINAPI ImmDestroyContext(HIMC hIMC); BOOL WINAPI ImmDisableIME(DWORD idThread); +BOOL WINAPI ImmDisableLegacyIME(void); BOOL WINAPI ImmEnumInputContext(DWORD, IMCENUMPROC, LPARAM); UINT WINAPI ImmEnumRegisterWordA(HKL, REGISTERWORDENUMPROCA, LPCSTR, DWORD, LPCSTR, LPVOID); UINT WINAPI ImmEnumRegisterWordW(HKL, REGISTERWORDENUMPROCW, LPCWSTR, DWORD, LPCWSTR, LPVOID);

1 0

Józef Kucia : include: Add d3d12.idl.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: 6d202658f23e0150ba4c5433cac8ebfeeed84ea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d202658f23e0150ba4c5433… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:50 2018 +0100 include: Add d3d12.idl. 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> --- include/Makefile.in | 1 + include/d3d12.idl | 2177 +++++++++++++++++++++++++++++++++++++++++++++++++ include/d3dcommon.idl | 4 +- 3 files changed, 2181 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d202658f23e0150ba4c…

1 0

Józef Kucia : dxgi: Use assignment instead of memcpy( ).
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: d4daa14802b73705baf7919fe6c0d2cbfe8213c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4daa14802b73705baf7919f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 14 12:35:54 2018 +0100 dxgi: Use assignment instead of memcpy(). 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/dxgi/adapter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 7116f3f..b7d7a0a 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -184,7 +184,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, desc->DedicatedVideoMemory = adapter_id.video_memory; desc->DedicatedSystemMemory = 0; /* FIXME */ desc->SharedSystemMemory = 0; /* FIXME */ - memcpy(&desc->AdapterLuid, &adapter_id.adapter_luid, sizeof(desc->AdapterLuid)); + desc->AdapterLuid = adapter_id.adapter_luid; desc->Flags = 0; return hr;

1 0

Hans Leidekker : secur32: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: f0db56775e4231821404b416428b3865c24bd0de URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0db56775e4231821404b416… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 14 14:13:09 2018 +0100 secur32: Use the global memory allocation helpers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/dispatcher.c | 15 +- dlls/secur32/lsa.c | 50 ++--- dlls/secur32/negotiate.c | 48 ++--- dlls/secur32/ntlm.c | 460 +++++++++++++++++------------------------ dlls/secur32/schannel.c | 55 +++-- dlls/secur32/schannel_macosx.c | 6 +- dlls/secur32/secur32.c | 43 ++-- dlls/secur32/secur32_priv.h | 1 + dlls/secur32/thunks.c | 16 +- dlls/secur32/util.c | 12 +- dlls/secur32/wrapper.c | 10 +- 11 files changed, 311 insertions(+), 405 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0db56775e4231821404…

1 0

Hans Leidekker : kerberos: ISC_REQ_USE_DCE_STYLE is supported.
by Alexandre Julliard Feb. 14, 2018

Feb. 14, 2018

Module: wine Branch: master Commit: ab43b7cb2493cf57255a8f5c7d034676aaec6eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab43b7cb2493cf57255a8f5c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 14 14:13:06 2018 +0100 kerberos: ISC_REQ_USE_DCE_STYLE is supported. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 767a86e..ea9c687 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -902,8 +902,8 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, { #ifdef SONAME_LIBGSSAPI_KRB5 static const ULONG supported = ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY | ISC_REQ_SEQUENCE_DETECT | - ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH; - OM_uint32 ret, minor_status, ret_flags, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); + ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH | ISC_REQ_USE_DCE_STYLE; + OM_uint32 ret, minor_status, ret_flags = 0, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); gss_cred_id_t cred_handle; gss_ctx_id_t ctxt_handle; gss_buffer_desc input_token, output_token;

1 0