October 2015 - Wine-commits

Józef Kucia : d3d10core/tests: Port test_device_interfaces() from d3d11.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 33127703bf6f0a2d159e73dd84427f164471ab27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33127703bf6f0a2d159e73dd8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 22 01:52:25 2015 +0200 d3d10core/tests: Port test_device_interfaces() from d3d11. 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/d3d10core/tests/device.c | 57 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index de9eee1..38e9e9c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -202,6 +202,62 @@ static void test_feature_level(void) ID3D10Device_Release(device10); } +static void test_device_interfaces(void) +{ + IDXGIAdapter *dxgi_adapter; + IDXGIDevice *dxgi_device; + ID3D10Device *device; + IUnknown *iface; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D10Device_QueryInterface(device, &IID_IUnknown, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IUnknown interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D10Device_QueryInterface(device, &IID_IDXGIObject, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IDXGIObject interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Device should implement IDXGIDevice.\n"); + hr = IDXGIDevice_GetParent(dxgi_device, &IID_IDXGIAdapter, (void **)&dxgi_adapter); + ok(SUCCEEDED(hr), "Device parent should implement IDXGIAdapter.\n"); + hr = IDXGIAdapter_GetParent(dxgi_adapter, &IID_IDXGIFactory, (void **)&iface); + ok(SUCCEEDED(hr), "Adapter parent should implement IDXGIFactory.\n"); + IUnknown_Release(iface); + IUnknown_Release(dxgi_adapter); + hr = IDXGIDevice_GetParent(dxgi_device, &IID_IDXGIAdapter1, (void **)&dxgi_adapter); + ok(SUCCEEDED(hr), "Device parent should implement IDXGIAdapter1.\n"); + hr = IDXGIAdapter_GetParent(dxgi_adapter, &IID_IDXGIFactory1, (void **)&iface); + ok(hr == E_NOINTERFACE, "Adapter parent should not implement IDXGIFactory1.\n"); + IUnknown_Release(dxgi_adapter); + IUnknown_Release(dxgi_device); + + hr = ID3D10Device_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement ID3D10Multithread interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D10Device_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Device should implement ID3D10Device1 interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + hr = ID3D10Device_QueryInterface(device, &IID_ID3D11Device, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Device should implement ID3D11Device interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_texture2d(void) { ULONG refcount, expected_refcount; @@ -4215,6 +4271,7 @@ static void test_update_subresource(void) START_TEST(device) { test_feature_level(); + test_device_interfaces(); test_create_texture2d(); test_texture2d_interfaces(); test_create_texture3d();

1 0

Józef Kucia : d3d10_1/tests: Port test_device_interfaces() from d3d11.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: ef6c1636f3dc5b8c420f5cac1b39e8e2964363b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6c1636f3dc5b8c420f5cac1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 22 01:52:26 2015 +0200 d3d10_1/tests: Port test_device_interfaces() from d3d11. 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/d3d10_1/tests/d3d10_1.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 534689c..fd865a3 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -22,6 +22,15 @@ #include "d3d11.h" #include "wine/test.h" +static const D3D10_FEATURE_LEVEL1 d3d10_feature_levels[] = +{ + D3D10_FEATURE_LEVEL_10_1, + D3D10_FEATURE_LEVEL_10_0, + D3D10_FEATURE_LEVEL_9_3, + D3D10_FEATURE_LEVEL_9_2, + D3D10_FEATURE_LEVEL_9_1 +}; + static ULONG get_refcount(IUnknown *iface) { IUnknown_AddRef(iface); @@ -45,6 +54,66 @@ static ID3D10Device1 *create_device(D3D10_FEATURE_LEVEL1 feature_level) return NULL; } +static void test_device_interfaces(void) +{ + IDXGIAdapter *dxgi_adapter; + IDXGIDevice *dxgi_device; + ID3D10Device1 *device; + IUnknown *iface; + ULONG refcount; + unsigned int i; + HRESULT hr; + + for (i = 0; i < sizeof(d3d10_feature_levels) / sizeof(*d3d10_feature_levels); ++i) + { + if (!(device = create_device(d3d10_feature_levels[i]))) + { + skip("Failed to create device for feature level %#x.\n", d3d10_feature_levels[i]); + continue; + } + + hr = ID3D10Device1_QueryInterface(device, &IID_IUnknown, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IUnknown interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIObject, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IDXGIObject interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Device should implement IDXGIDevice.\n"); + hr = IDXGIDevice_GetParent(dxgi_device, &IID_IDXGIAdapter, (void **)&dxgi_adapter); + ok(SUCCEEDED(hr), "Device parent should implement IDXGIAdapter.\n"); + hr = IDXGIAdapter_GetParent(dxgi_adapter, &IID_IDXGIFactory, (void **)&iface); + ok(SUCCEEDED(hr), "Adapter parent should implement IDXGIFactory.\n"); + IUnknown_Release(iface); + IDXGIAdapter_Release(dxgi_adapter); + hr = IDXGIDevice_GetParent(dxgi_device, &IID_IDXGIAdapter1, (void **)&dxgi_adapter); + ok(SUCCEEDED(hr), "Device parent should implement IDXGIAdapter1.\n"); + hr = IDXGIAdapter_GetParent(dxgi_adapter, &IID_IDXGIFactory1, (void **)&iface); + ok(hr == E_NOINTERFACE, "Adapter parent should not implement IDXGIFactory1.\n"); + IDXGIAdapter_Release(dxgi_adapter); + IDXGIDevice_Release(dxgi_device); + + hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Device should implement ID3D10Multithread interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10Device, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement ID3D10Device interface, hr %#x.\n", hr); + IUnknown_Release(iface); + + hr = ID3D10Device1_QueryInterface(device, &IID_ID3D11Device, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Device should implement ID3D11Device interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D10Device1_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } +} + static void test_create_shader_resource_view(void) { D3D10_SHADER_RESOURCE_VIEW_DESC1 srv_desc; @@ -379,6 +448,7 @@ static void test_create_blend_state(void) START_TEST(d3d10_1) { + test_device_interfaces(); test_create_shader_resource_view(); test_create_blend_state(); }

1 0

Józef Kucia : dxgi/tests: Remove test_device_interfaces().
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 6a508f26d10c228ab7cc83080358284909c257fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a508f26d10c228ab7cc83080… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 22 01:52:27 2015 +0200 dxgi/tests: Remove test_device_interfaces(). This test duplicates test_device_interfaces() in d3d10/tests. 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/tests/device.c | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index ea4e7b3..9e676b9 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -54,53 +54,6 @@ success: return dxgi_device; } -static void test_device_interfaces(void) -{ - IDXGIDevice *device; - IUnknown *iface; - ULONG refcount; - HRESULT hr; - - if (!(device = create_device())) - { - skip("Failed to create device, skipping tests.\n"); - return; - } - - hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to query IUnknown interface, hr %#x.\n", hr); - IUnknown_Release(iface); - - hr = IDXGIDevice_QueryInterface(device, &IID_IDXGIObject, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to query IDXGIObject interface, hr %#x.\n", hr); - IUnknown_Release(iface); - - hr = IDXGIDevice_QueryInterface(device, &IID_IDXGIDevice, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to query IDXGIDevice interface, hr %#x.\n", hr); - IUnknown_Release(iface); - - hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to query ID3D10Device interface, hr %#x.\n", hr); - IUnknown_Release(iface); - - hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to query ID3D10Multithread interface, hr %#x.\n", hr); - IUnknown_Release(iface); - - if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface))) - IUnknown_Release(iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Failed to query ID3D10Device1 interface, hr %#x.\n", hr); - - if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_ID3D11Device, (void **)&iface))) - IUnknown_Release(iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Failed to query ID3D11Device interface, hr %#x.\n", hr); - - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); -} - static void test_adapter_desc(void) { DXGI_ADAPTER_DESC1 desc1; @@ -1270,7 +1223,6 @@ START_TEST(device) test_adapter_desc(); test_check_interface_support(); - test_device_interfaces(); test_create_surface(); test_parents(); test_output();

1 0

Jacek Caban : winerror.h: Added DNS_REQUEST_PENDING error code.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: f38829921f19e0c2a3e4b294e8d775c3be399bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38829921f19e0c2a3e4b294e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 22 11:27:39 2015 +0200 winerror.h: Added DNS_REQUEST_PENDING error code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winerror.h b/include/winerror.h index 87419d1..c524798 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1778,6 +1778,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define DNS_ERROR_NO_PACKET 9503 #define DNS_ERROR_RCODE 9504 #define DNS_ERROR_UNSECURE_PACKET 9505 +#define DNS_REQUEST_PENDING 9506 #define DNS_ERROR_INVALID_TYPE 9551 #define DNS_ERROR_INVALID_IP_ADDRESS 9552 #define DNS_ERROR_INVALID_PROPERTY 9553

1 0

Nikolay Sivov : dxdiagn: Properly set VT_BOOL values (PVS-Studio).
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 5c170dc9bd380aa2b92acb2f4538b482d2f99e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c170dc9bd380aa2b92acb2f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 14:48:09 2015 +0300 dxdiagn: Properly set VT_BOOL values (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 3b5fcab..2890c61 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -335,7 +335,7 @@ static inline HRESULT add_bool_property(IDxDiagContainerImpl_Container *node, co return E_OUTOFMEMORY; V_VT(&prop->vProp) = VT_BOOL; - V_BOOL(&prop->vProp) = data; + V_BOOL(&prop->vProp) = data ? VARIANT_TRUE : VARIANT_FALSE; list_add_tail(&node->properties, &prop->entry); ++node->nProperties;

1 0

Nikolay Sivov : msi: Use VARIANT_BOOL values consistently for VT_BOOL type (PVS-Studio).
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 2257928a7af1de0c1702b252ebb7f1dd9647b1f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2257928a7af1de0c1702b252e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 21 14:59:49 2015 +0300 msi: Use VARIANT_BOOL values consistently for VT_BOOL type (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/automation.c | 4 ++-- dlls/msi/tests/automation.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 56823ee..c3d2c67 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1437,7 +1437,7 @@ static HRESULT session_invoke( hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; V_VT(pVarResult) = VT_BOOL; - V_BOOL(pVarResult) = MsiGetMode(This->msiHandle, V_I4(&varg0)); + V_BOOL(pVarResult) = MsiGetMode(This->msiHandle, V_I4(&varg0)) ? VARIANT_TRUE : VARIANT_FALSE; } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; @@ -2053,7 +2053,7 @@ static HRESULT InstallerImpl_RegistryValue(WORD wFlags, /* Return VT_BOOL clarifying whether registry key exists or not. */ case VT_EMPTY: V_VT(pVarResult) = VT_BOOL; - V_BOOL(pVarResult) = (ret == ERROR_SUCCESS); + V_BOOL(pVarResult) = (ret == ERROR_SUCCESS) ? VARIANT_TRUE : VARIANT_FALSE; break; /* Return the value of specified key if it exists. */ diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index e31527f..a1df3f1 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1204,7 +1204,7 @@ static HRESULT Session_LanguageGet(IDispatch *pSession, UINT *pLangId) return hr; } -static HRESULT Session_ModeGet(IDispatch *pSession, int iFlag, BOOL *pMode) +static HRESULT Session_ModeGet(IDispatch *pSession, int iFlag, VARIANT_BOOL *mode) { VARIANT varresult; VARIANTARG vararg[1]; @@ -1216,12 +1216,12 @@ static HRESULT Session_ModeGet(IDispatch *pSession, int iFlag, BOOL *pMode) V_I4(&vararg[0]) = iFlag; hr = invoke(pSession, "Mode", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_BOOL); - *pMode = V_BOOL(&varresult); + *mode = V_BOOL(&varresult); VariantClear(&varresult); return hr; } -static HRESULT Session_ModePut(IDispatch *pSession, int iFlag, BOOL bMode) +static HRESULT Session_ModePut(IDispatch *pSession, int iFlag, VARIANT_BOOL mode) { VARIANT varresult; VARIANTARG vararg[2]; @@ -1233,7 +1233,7 @@ static HRESULT Session_ModePut(IDispatch *pSession, int iFlag, BOOL bMode) V_I4(&vararg[1]) = iFlag; VariantInit(&vararg[0]); V_VT(&vararg[0]) = VT_BOOL; - V_BOOL(&vararg[0]) = bMode; + V_BOOL(&vararg[0]) = mode; return invoke(pSession, "Mode", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY); } @@ -1876,7 +1876,7 @@ static void test_Session(IDispatch *pSession) WCHAR stringw[MAX_PATH]; CHAR string[MAX_PATH]; UINT len; - BOOL bool; + VARIANT_BOOL bool; int myint; IDispatch *pDatabase = NULL, *pInst = NULL, *record = NULL; ULONG refs_before, refs_after; @@ -1944,15 +1944,15 @@ static void test_Session(IDispatch *pSession) ok(!bool, "Maintenance mode is %d\n", bool); /* Session::Mode, put */ - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, TRUE); + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, VARIANT_TRUE); ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool); ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); ok(bool, "Reboot at end session mode is %d, expected 1\n", bool); - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, FALSE); /* set it again so we don't reboot */ + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, VARIANT_FALSE); /* set it again so we don't reboot */ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, TRUE); + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, VARIANT_TRUE); ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); ok_exception(hr, szModeFlag); @@ -1960,11 +1960,11 @@ static void test_Session(IDispatch *pSession) ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); ok(bool, "Reboot now mode is %d, expected 1\n", bool); - hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, FALSE); /* set it again so we don't reboot */ + hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, VARIANT_FALSE); /* set it again so we don't reboot */ ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); ok_exception(hr, szModeFlag); - hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, TRUE); + hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, VARIANT_TRUE); ok(hr == DISP_E_EXCEPTION, "Session_ModePut failed, hresult 0x%08x\n", hr); ok_exception(hr, szModeFlag);

1 0

Stefan Leichter : wimgapi: Add new stub dll.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: c21575d7014ac514d7bbbd37437f3c8fa298ee1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21575d7014ac514d7bbbd374… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Thu Oct 15 22:57:31 2015 +0200 wimgapi: Add new stub dll. Signed-off-by: Stefan Leichter <Stefan.Leichter(a)camLine.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/wimgapi/Makefile.in | 4 ++++ dlls/wimgapi/main.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wimgapi/wimgapi.spec | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+) diff --git a/configure b/configure index 533bf15..6689b65 100755 --- a/configure +++ b/configure @@ -1327,6 +1327,7 @@ enable_webservices enable_wer enable_wevtapi enable_wiaservc +enable_wimgapi enable_windowscodecs enable_windowscodecsext enable_winealsa_drv @@ -17878,6 +17879,7 @@ wine_fn_config_test dlls/wer/tests wer_test wine_fn_config_dll wevtapi enable_wevtapi wine_fn_config_dll wiaservc enable_wiaservc clean wine_fn_config_test dlls/wiaservc/tests wiaservc_test +wine_fn_config_dll wimgapi enable_wimgapi wine_fn_config_dll win32s16.dll16 enable_win16 wine_fn_config_dll win87em.dll16 enable_win16 wine_fn_config_dll winaspi.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 5ab2d69..030aa32 100644 --- a/configure.ac +++ b/configure.ac @@ -3389,6 +3389,7 @@ WINE_CONFIG_TEST(dlls/wer/tests) WINE_CONFIG_DLL(wevtapi) WINE_CONFIG_DLL(wiaservc,,[clean]) WINE_CONFIG_TEST(dlls/wiaservc/tests) +WINE_CONFIG_DLL(wimgapi) WINE_CONFIG_DLL(win32s16.dll16,enable_win16) WINE_CONFIG_DLL(win87em.dll16,enable_win16) WINE_CONFIG_DLL(winaspi.dll16,enable_win16) diff --git a/dlls/wimgapi/Makefile.in b/dlls/wimgapi/Makefile.in new file mode 100644 index 0000000..7fa2db8 --- /dev/null +++ b/dlls/wimgapi/Makefile.in @@ -0,0 +1,4 @@ +MODULE = wimgapi.dll + +C_SRCS = \ + main.c diff --git a/dlls/wimgapi/main.c b/dlls/wimgapi/main.c new file mode 100644 index 0000000..5ac8a66 --- /dev/null +++ b/dlls/wimgapi/main.c @@ -0,0 +1,46 @@ +/* + * + * wimgapi implementation + * + * Copyright 2015 Stefan Leichter + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wimgapi); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(0x%p, %d, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/wimgapi/wimgapi.spec b/dlls/wimgapi/wimgapi.spec new file mode 100644 index 0000000..b467989 --- /dev/null +++ b/dlls/wimgapi/wimgapi.spec @@ -0,0 +1,42 @@ +@ stub -private DllCanUnloadNow +@ stdcall -private DllMain(long long ptr) +@ stub WIMApplyImage +@ stub WIMCaptureImage +@ stub WIMCloseHandle +@ stub WIMCommitImageHandle +@ stub WIMCopyFile +@ stub WIMCreateFile +@ stub WIMCreateImageFile +@ stub WIMDeleteImage +@ stub WIMDeleteImageMounts +@ stub WIMEnumImageFiles +@ stub WIMExportImage +@ stub WIMExtractImagePath +@ stub WIMFindFirstImageFile +@ stub WIMFindNextImageFile +@ stub WIMGetAttributes +@ stub WIMGetImageCount +@ stub WIMGetImageInformation +@ stub WIMGetMessageCallbackCount +@ stub WIMGetMountedImageHandle +@ stub WIMGetMountedImageInfo +@ stub WIMGetMountedImageInfoFromFile +@ stub WIMGetMountedImages +@ stub WIMInitFileIOCallbacks +@ stub WIMLoadImage +@ stub WIMMountImage +@ stub WIMMountImageHandle +@ stub WIMReadImageFile +@ stub WIMRegisterLogFile +@ stub WIMRegisterMessageCallback +@ stub WIMRemountImage +@ stub WIMSetBootImage +@ stub WIMSetFileIOCallbackTemporaryPath +@ stub WIMSetImageInformation +@ stub WIMSetReferenceFile +@ stub WIMSetTemporaryFile +@ stub WIMSplitFile +@ stub WIMUmountImage +@ stub WIMUmountImageHandle +@ stub WIMUnregisterLogFile +@ stub WIMUnregisterMessageCallback

1 0

Huw Davies : ole32: Set the release interface to NULL before calls to GetDataHere.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: cc1b2879e489587e56bce171aa4a2dd4555cccec URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1b2879e489587e56bce171a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 21 13:30:19 2015 +0100 ole32: Set the release interface to NULL before calls to GetDataHere. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2impl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index cdc54be..ccf31fa 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -113,6 +113,7 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf, BOOL init_fmtetc(&fmt, embedded_object_clipboard_format, TYMED_ISTORAGE); med.tymed = TYMED_ISTORAGE; med.u.pstg = stg; + med.pUnkForRelease = NULL; hr = IDataObject_GetDataHere(data, &fmt, &med); if(SUCCEEDED(hr)) { @@ -124,6 +125,7 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf, BOOL init_fmtetc(&fmt, embed_source_clipboard_format, TYMED_ISTORAGE); med.tymed = TYMED_ISTORAGE; med.u.pstg = stg; + med.pUnkForRelease = NULL; hr = IDataObject_GetDataHere(data, &fmt, &med); if(SUCCEEDED(hr)) {

1 0

Matteo Bruni : wined3d: Use non-deprecated texture sample builtins also in the fragment pipeline replacement shaders.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 245e06d9e33474a0b2b205ad4e75dffba6965287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=245e06d9e33474a0b2b205ad4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 21 00:24:04 2015 +0200 wined3d: Use non-deprecated texture sample builtins also in the fragment pipeline replacement shaders. 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/glsl_shader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 34abe5e..4a95e44 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6477,6 +6477,9 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * proj = TRUE; } + if (settings->op[stage].tex_type == WINED3D_GL_RES_TYPE_TEX_CUBE) + proj = FALSE; + switch (settings->op[stage].tex_type) { case WINED3D_GL_RES_TYPE_TEX_1D: @@ -6537,6 +6540,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * coord_mask = "xyzw"; break; } + if (!needs_legacy_glsl_syntax(gl_info)) + texture_function = proj ? "textureProj" : "texture"; if (stage > 0 && (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP

1 0

Matteo Bruni : wined3d: Set GL_DEPTH_TEXTURE_MODE_ARB to GL_INTENSITY.
by Alexandre Julliard 21 Oct '15

21 Oct '15

Module: wine Branch: master Commit: 41bf97e58a61f8aca430a55c9dbf16b155e72ca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41bf97e58a61f8aca430a55c9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 21 00:24:05 2015 +0200 wined3d: Set GL_DEPTH_TEXTURE_MODE_ARB to GL_INTENSITY. 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/surface.c | 1 - dlls/wined3d/texture.c | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4be666e..320f269 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3745,7 +3745,6 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co gl_info->gl_ops.gl.p_glTexParameteri(bind_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); gl_info->gl_ops.gl.p_glTexParameteri(bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); gl_info->gl_ops.gl.p_glTexParameteri(bind_target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(bind_target, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); gl_info->gl_ops.gl.p_glBindTexture(bind_target, old_binding); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7aa723e..02cb9b9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -253,6 +253,9 @@ void wined3d_texture_bind(struct wined3d_texture *texture, gl_tex->sampler_desc.min_filter = WINED3D_TEXF_POINT; gl_tex->sampler_desc.mip_filter = WINED3D_TEXF_NONE; } + + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY); } /* Context activation is done by the caller. */ @@ -362,14 +365,9 @@ void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, if (!sampler_desc->compare != !gl_tex->sampler_desc.compare) { if (sampler_desc->compare) - { - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_COMPARE_MODE_ARB, GL_COMPARE_R_TO_TEXTURE_ARB); - } else - { gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_COMPARE_MODE_ARB, GL_NONE); - } gl_tex->sampler_desc.compare = sampler_desc->compare; }

1 0