wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

Henri Verbeet : dxgi: Properly check if the output array is large enough in dxgi_output_GetDisplayModeList ().
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 852c61c5959e4d92dc9a45166cb4b3a78df678d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=852c61c5959e4d92dc9a45166… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 10 10:37:57 2014 +0100 dxgi: Properly check if the output array is large enough in dxgi_output_GetDisplayModeList(). --- dlls/dxgi/output.c | 9 ++++++++- dlls/dxgi/tests/device.c | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index ec9d01b..580a8b4 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -155,7 +155,14 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa return S_OK; } - *mode_count = min(*mode_count,max_count); + if (max_count > *mode_count) + { + wined3d_decref(wined3d); + LeaveCriticalSection(&dxgi_cs); + return DXGI_ERROR_MORE_DATA; + } + + *mode_count = max_count; for (i = 0; i < *mode_count; ++i) { diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index d648dc7..f44e831 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -315,7 +315,7 @@ static void test_output(void) mode_count = 0; hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); - todo_wine ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); ok(!modes[0].Height, "No output was expected.\n"); mode_count = mode_count_comp; @@ -340,7 +340,7 @@ static void test_output(void) mode_count = mode_count_comp - 1; hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); - todo_wine ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); ok(mode_count == mode_count_comp - 1, "Got unexpected mode_count %u, expected %u.\n", mode_count, mode_count_comp - 1); }

1 0

Henri Verbeet : dxgi: Return DXGI_ERROR_INVALID_CALL when given a NULL mode_count in dxgi_output_GetDisplayModeList ().
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: d9570c3935f66d91583b75fb5865707c066ef6fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9570c3935f66d91583b75fb5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 10 10:37:56 2014 +0100 dxgi: Return DXGI_ERROR_INVALID_CALL when given a NULL mode_count in dxgi_output_GetDisplayModeList(). --- dlls/dxgi/output.c | 4 +--- dlls/dxgi/tests/device.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 4cdd06b..ec9d01b 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -132,9 +132,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa iface, debug_dxgi_format(format), flags, mode_count, desc); if (!mode_count) - { - return S_OK; - } + return DXGI_ERROR_INVALID_CALL; if (format == DXGI_FORMAT_UNKNOWN) { diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index b907a23..d648dc7 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -279,7 +279,7 @@ static void test_output(void) ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL, NULL); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); ok(SUCCEEDED(hr) @@ -309,7 +309,7 @@ static void test_output(void) hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, NULL, modes); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); ok(!modes[0].Height, "No output was expected.\n"); mode_count = 0;

1 0

Henri Verbeet : dxgi/tests: Don't reuse the device.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 4d7bd4ce4a02d59bf79f3b9af3f37edecfb95bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7bd4ce4a02d59bf79f3b9af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 10 10:37:55 2014 +0100 dxgi/tests: Don't reuse the device. --- dlls/dxgi/tests/device.c | 98 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 74 insertions(+), 24 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index e8d2827..b907a23 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -44,11 +44,19 @@ success: return dxgi_device; } -static void test_device_interfaces(IDXGIDevice *device) +static void test_device_interfaces(void) { + IDXGIDevice *device; + ULONG refcount; IUnknown *obj; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&obj))) IUnknown_Release(obj); ok(SUCCEEDED(hr), "IDXGIDevice does not implement IUnknown\n"); @@ -64,16 +72,27 @@ static void test_device_interfaces(IDXGIDevice *device) if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device, (void **)&obj))) IUnknown_Release(obj); ok(SUCCEEDED(hr), "IDXGIDevice does not implement ID3D10Device\n"); + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_adapter_desc(IDXGIDevice *device) +static void test_adapter_desc(void) { DXGI_ADAPTER_DESC1 desc1; IDXGIAdapter1 *adapter1; DXGI_ADAPTER_DESC desc; IDXGIAdapter *adapter; + IDXGIDevice *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); @@ -123,15 +142,25 @@ static void test_adapter_desc(IDXGIDevice *device) done: IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_surface(IDXGIDevice *device) +static void test_create_surface(void) { ID3D10Texture2D *texture; IDXGISurface *surface; DXGI_SURFACE_DESC desc; + IDXGIDevice *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + desc.Width = 512; desc.Height = 512; desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -146,18 +175,28 @@ static void test_create_surface(IDXGIDevice *device) if (SUCCEEDED(hr)) ID3D10Texture2D_Release(texture); IDXGISurface_Release(surface); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_parents(IDXGIDevice *device) +static void test_parents(void) { DXGI_SURFACE_DESC surface_desc; IDXGISurface *surface; IDXGIFactory *factory; IDXGIAdapter *adapter; + IDXGIDevice *device; IDXGIOutput *output; IUnknown *parent; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + surface_desc.Width = 512; surface_desc.Height = 512; surface_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -206,16 +245,26 @@ static void test_parents(IDXGIDevice *device) IUnknown_Release(parent); IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_output(IDXGIDevice *device) +static void test_output(void) { IDXGIAdapter *adapter; + IDXGIDevice *device; HRESULT hr; IDXGIOutput *output; + ULONG refcount; UINT mode_count, mode_count_comp, i; DXGI_MODE_DESC *modes; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); @@ -224,6 +273,7 @@ static void test_output(IDXGIDevice *device) { skip("Adapter doesn't have any outputs, skipping tests.\n"); IDXGIAdapter_Release(adapter); + IDXGIDevice_Release(device); return; } ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr); @@ -240,6 +290,7 @@ static void test_output(IDXGIDevice *device) skip("GetDisplayModeList() not supported, skipping tests.\n"); IDXGIOutput_Release(output); IDXGIAdapter_Release(adapter); + IDXGIDevice_Release(device); return; } mode_count_comp = mode_count; @@ -301,6 +352,8 @@ static void test_output(IDXGIDevice *device) HeapFree(GetProcessHeap(), 0, modes); IDXGIOutput_Release(output); IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } struct refresh_rates @@ -311,11 +364,13 @@ struct refresh_rates BOOL denominator_should_pass; }; -static void test_createswapchain(IDXGIDevice *device) +static void test_createswapchain(void) { IUnknown *obj; IDXGIAdapter *adapter; IDXGIFactory *factory; + IDXGIDevice *device; + ULONG refcount; IDXGISwapChain *swapchain; DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; HRESULT hr; @@ -331,6 +386,11 @@ static void test_createswapchain(IDXGIDevice *device) { 0, 0, TRUE, FALSE}, }; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } wc.lpfnWndProc = DefWindowProcA; wc.lpszClassName = "dxgi_test_wc"; @@ -435,26 +495,16 @@ static void test_createswapchain(IDXGIDevice *device) IDXGIFactory_Release(factory); IDXGIAdapter_Release(adapter); IUnknown_Release(obj); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } START_TEST(device) { - IDXGIDevice *device; - ULONG refcount; - - if (!(device = create_device())) - { - skip("Failed to create device, skipping tests\n"); - return; - } - - test_adapter_desc(device); - test_device_interfaces(device); - test_create_surface(device); - test_parents(device); - test_output(device); - test_createswapchain(device); - - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left\n", refcount); + test_adapter_desc(); + test_device_interfaces(); + test_create_surface(); + test_parents(); + test_output(); + test_createswapchain(); }

1 0

Henri Verbeet : dxgi/tests: Use D3D10CreateDevice() to create a device.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: f97d599eb212c76b345a7d308e066287e19b1daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f97d599eb212c76b345a7d308… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 10 10:37:54 2014 +0100 dxgi/tests: Use D3D10CreateDevice() to create a device. At some point DXGID3D10CreateDevice() started always returning E_NOTIMPL. My guess would be that that was with the introduction of d3d11. --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/device.c | 82 +++++++++++++------------------------------ 2 files changed, 25 insertions(+), 59 deletions(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index c624fec..d706f16 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dxgi.dll -IMPORTS = dxgi user32 +IMPORTS = d3d10 dxgi user32 C_SRCS = \ device.c diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index ba1a29f..e8d2827 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -21,58 +21,25 @@ #include "d3d10.h" #include "wine/test.h" -HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, - IDXGIAdapter *adapter, UINT flags, void *unknown0, void **device); - -static IDXGIDevice *create_device(HMODULE d3d10core) +static IDXGIDevice *create_device(void) { - IDXGIDevice *dxgi_device = NULL; - IDXGIFactory *factory = NULL; - IDXGIAdapter *adapter = NULL; - IUnknown *device = NULL; + IDXGIDevice *dxgi_device; + ID3D10Device *device; HRESULT hr; - hr = CreateDXGIFactory(&IID_IDXGIFactory, (void *)&factory); - if (FAILED(hr)) goto cleanup; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) + goto success; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + goto success; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) + goto success; - hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); - if (SUCCEEDED(hr)) - { - hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, NULL, (void **)&device); - } + return NULL; - if (FAILED(hr)) - { - HMODULE d3d10ref; - - trace("Failed to create a HW device, trying REF\n"); - if (adapter) IDXGIAdapter_Release(adapter); - adapter = NULL; - - d3d10ref = LoadLibraryA("d3d10ref.dll"); - if (!d3d10ref) - { - trace("d3d10ref.dll not available, unable to create a REF device\n"); - goto cleanup; - } - - hr = IDXGIFactory_CreateSoftwareAdapter(factory, d3d10ref, &adapter); - FreeLibrary(d3d10ref); - ok(SUCCEEDED(hr), "CreateSoftwareAdapter failed, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; - - hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, NULL, (void **)&device); - ok(SUCCEEDED(hr), "Failed to create a REF device, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; - } - - hr = IUnknown_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); +success: + hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); ok(SUCCEEDED(hr), "Created device does not implement IDXGIDevice\n"); - IUnknown_Release(device); - -cleanup: - if (adapter) IDXGIAdapter_Release(adapter); - if (factory) IDXGIFactory_Release(factory); + ID3D10Device_Release(device); return dxgi_device; } @@ -265,7 +232,16 @@ static void test_output(IDXGIDevice *device) todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(SUCCEEDED(hr) + || broken(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE), /* Remote Desktop Services / Win 7 testbot */ + "Failed to list modes, hr %#x.\n", hr); + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) + { + skip("GetDisplayModeList() not supported, skipping tests.\n"); + IDXGIOutput_Release(output); + IDXGIAdapter_Release(adapter); + return; + } mode_count_comp = mode_count; hr = IDXGIOutput_GetDisplayModeList(output, 0, 0, &mode_count, NULL); @@ -463,21 +439,12 @@ static void test_createswapchain(IDXGIDevice *device) START_TEST(device) { - HMODULE d3d10core = LoadLibraryA("d3d10core.dll"); IDXGIDevice *device; ULONG refcount; - if (!d3d10core) - { - win_skip("d3d10core.dll not available, skipping tests\n"); - return; - } - - device = create_device(d3d10core); - if (!device) + if (!(device = create_device())) { skip("Failed to create device, skipping tests\n"); - FreeLibrary(d3d10core); return; } @@ -490,5 +457,4 @@ START_TEST(device) refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left\n", refcount); - FreeLibrary(d3d10core); }

1 0

Henri Verbeet : dxgi/tests: Cleanup test_output().
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 19f204437529d42f579581d427655655369c46f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f204437529d42f579581d42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 10 10:37:53 2014 +0100 dxgi/tests: Cleanup test_output(). In particular, actually test the return codes for most calls. --- dlls/dxgi/tests/device.c | 54 +++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index b8e7b33..ba1a29f 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -255,44 +255,47 @@ static void test_output(IDXGIDevice *device) hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) { - skip("Adapter has not outputs, skipping output tests.\n"); + skip("Adapter doesn't have any outputs, skipping tests.\n"); IDXGIAdapter_Release(adapter); return; } - ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr); - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL, NULL); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); mode_count_comp = mode_count; - IDXGIOutput_GetDisplayModeList(output, 0, 0, &mode_count, NULL); + hr = IDXGIOutput_GetDisplayModeList(output, 0, 0, &mode_count, NULL); ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); - ok(!mode_count, "Expected 0 got %d\n", mode_count); + ok(!mode_count, "Got unexpected mode_count %u.\n", mode_count); - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, NULL); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_ENUM_MODES_SCALING, &mode_count, NULL); ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); - ok(mode_count >= mode_count_comp, "Flag implies trying to enumerate more modes\n"); + ok(mode_count >= mode_count_comp, "Got unexpected mode_count %u, expected >= %u.\n", mode_count, mode_count_comp); mode_count_comp = mode_count; - modes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DXGI_MODE_DESC) * mode_count+10); + modes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*modes) * (mode_count + 10)); - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, NULL, modes); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); - ok(!modes[0].Height, "No output was expected\n"); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_ENUM_MODES_SCALING, NULL, modes); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(!modes[0].Height, "No output was expected.\n"); mode_count = 0; - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); - ok(!modes[0].Height, "No output was expected\n"); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_ENUM_MODES_SCALING, &mode_count, modes); + todo_wine ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(!modes[0].Height, "No output was expected.\n"); mode_count = mode_count_comp; - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_ENUM_MODES_SCALING, &mode_count, modes); ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); - ok(mode_count == mode_count_comp, "Expected %d, got %d\n", mode_count_comp, mode_count); + ok(mode_count == mode_count_comp, "Got unexpected mode_count %u, expected %u.\n", mode_count, mode_count_comp); for (i = 0; i < mode_count; i++) { @@ -300,20 +303,23 @@ static void test_output(IDXGIDevice *device) } mode_count += 5; - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_ENUM_MODES_SCALING, &mode_count, modes); ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); - ok(mode_count == mode_count_comp, "Expected %d, got %d\n", mode_count_comp, mode_count); + ok(mode_count == mode_count_comp, "Got unexpected mode_count %u, expected %u.\n", mode_count, mode_count_comp); if (mode_count_comp) { mode_count = mode_count_comp - 1; - IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); - ok(mode_count == mode_count_comp -1, "Expected %d, got %d\n", mode_count_comp, mode_count); + hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_ENUM_MODES_SCALING, &mode_count, modes); + todo_wine ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(mode_count == mode_count_comp - 1, "Got unexpected mode_count %u, expected %u.\n", + mode_count, mode_count_comp - 1); } else { - skip("Not enough modes for test, skipping\n"); + skip("Not enough modes for test, skipping.\n"); } HeapFree(GetProcessHeap(), 0, modes);

1 0

Alexandre Julliard : makefiles: Add makefile variables for the winegcc parameters.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 658057ae0b7ec0230c179616ac2d7228e5a7eeae URL: http://source.winehq.org/git/wine.git/?a=commit;h=658057ae0b7ec0230c179616a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 10 10:57:53 2014 +0100 makefiles: Add makefile variables for the winegcc parameters. --- Make.vars.in | 2 ++ tools/winegcc/Makefile.in | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 684d673..ee8ee39 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -18,6 +18,8 @@ SHELL = /bin/sh RM = rm -f MV = mv CC = @CC@ +CXX = @CXX@ +CPPBIN = @CPPBIN@ CROSSCC = @CROSSCC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index bb7e4a2..3975ca5 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -14,8 +14,8 @@ winegcc_EXTRADEFS = \ -DDLLDIR="\"${dlldir}\"" \ -DLIBDIR="\"${libdir}\"" \ -DCC="\"$(CC)\"" \ - -DCPP="\"@CPPBIN@\"" \ - -DCXX="\"@CXX@\"" \ + -DCPP="\"$(CPPBIN)\"" \ + -DCXX="\"$(CXX)\"" \ -DPRELINK="\"$(PRELINK)\"" winegcc$(EXEEXT): winegcc.o utils.o

1 0

Alexandre Julliard : makefiles: Generate the testlist.c files at make depend time.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 3bae3c6514475b17ac884508c26363c6bfd28d0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bae3c6514475b17ac884508c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 10 10:55:18 2014 +0100 makefiles: Generate the testlist.c files at make depend time. --- aclocal.m4 | 4 +- configure | 4 +- tools/Makefile.in | 5 -- tools/make_ctests.c | 160 --------------------------------------------------- tools/makedep.c | 108 ++++++++++++++++++++++++++++------ 5 files changed, 97 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bae3c6514475b17ac884…

1 0

Dmitry Timoshkov : kernel32: Fix page protection to access mapping performed by CreateFileMapping.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: fd9c9a6d03d682f241d139c8ad6158fc45e0da1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9c9a6d03d682f241d139c8a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 7 12:44:10 2014 +0900 kernel32: Fix page protection to access mapping performed by CreateFileMapping. --- dlls/advapi32/tests/security.c | 2 -- dlls/kernel32/virtual.c | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ac98b49..7ee785f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4965,7 +4965,6 @@ static void test_filemap_security(void) } access = get_obj_access(mapping); -todo_wine ok(access == prot_map[i].mapped, "%d: expected %#x, got %#x\n", i, prot_map[i].mapped, access); CloseHandle(mapping); @@ -4976,7 +4975,6 @@ todo_wine ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); access = get_obj_access(mapping); -todo_wine ok(access == (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE), "expected STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE, got %#x\n", access); diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 0470073..2df19a7 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -353,17 +353,17 @@ HANDLE WINAPI CreateFileMappingW( HANDLE hFile, LPSECURITY_ATTRIBUTES sa, { case PAGE_READONLY: case PAGE_WRITECOPY: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE; + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ; break; case PAGE_READWRITE: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE; + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE; break; case PAGE_EXECUTE_READ: case PAGE_EXECUTE_WRITECOPY: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_MAP_EXECUTE_EXPLICIT; + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE; break; case PAGE_EXECUTE_READWRITE: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE | SECTION_MAP_EXECUTE_EXPLICIT; + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE; break; default: SetLastError( ERROR_INVALID_PARAMETER );

1 0

Dmitry Timoshkov : advapi32/tests: Add a test for page to access mapping performed by CreateFileMapping.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 162c2b7aa0cc1efccdb5f0686498e66bd1c9aed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=162c2b7aa0cc1efccdb5f0686… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 7 12:43:13 2014 +0900 advapi32/tests: Add a test for page to access mapping performed by CreateFileMapping. --- dlls/advapi32/tests/security.c | 75 ++++++++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f3cc85d..ac98b49 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4901,8 +4901,10 @@ todo_wine static void test_filemap_security(void) { + char temp_path[MAX_PATH]; + char file_name[MAX_PATH]; DWORD ret, i, access; - HANDLE mapping, dup; + HANDLE file, mapping, dup; static const struct { int generic, mapped; @@ -4914,27 +4916,70 @@ static void test_filemap_security(void) { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SECTION_MAP_EXECUTE }, { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS } }; + static const struct + { + int prot, mapped; + } prot_map[] = + { + { 0, 0 }, + { PAGE_NOACCESS, 0 }, + { PAGE_READONLY, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ }, + { PAGE_READWRITE, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE }, + { PAGE_WRITECOPY, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ }, + { PAGE_EXECUTE, 0 }, + { PAGE_EXECUTE_READ, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE }, + { PAGE_EXECUTE_READWRITE, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE }, + { PAGE_EXECUTE_WRITECOPY, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE } + }; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "tmp", 0, file_name); SetLastError(0xdeadbeef); - mapping = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_EXECUTE_READWRITE, 0, 4096, NULL); - if (mapping) - { - access = get_obj_access(mapping); -todo_wine - ok(access == (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE), - "expected STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE, got %#x\n", access); - } - else /* win2k fails to create EXECUTE mapping using system page file */ + file = CreateFileA(file_name, GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + SetFilePointer(file, 4096, NULL, FILE_BEGIN); + SetEndOfFile(file); + + for (i = 0; i < sizeof(prot_map)/sizeof(prot_map[0]); i++) { SetLastError(0xdeadbeef); - mapping = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, NULL); - ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); + mapping = CreateFileMappingW(file, NULL, prot_map[i].prot, 0, 4096, NULL); + if (prot_map[i].mapped) + { + if (!mapping) + { + if (prot_map[i].prot == PAGE_EXECUTE_READ || prot_map[i].prot == PAGE_EXECUTE_READWRITE || prot_map[i].prot == PAGE_EXECUTE_WRITECOPY) + { + win_skip("CreateFileMapping doesn't support PAGE_EXECUTE protection\n"); + continue; + } + } + ok(mapping != 0, "CreateFileMapping(%04x) error %d\n", prot_map[i].prot, GetLastError()); + } + else + { + ok(!mapping, "CreateFileMapping(%04x) error %d\n", prot_map[i].prot, GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + continue; + } access = get_obj_access(mapping); - ok(access == (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE), - "expected STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE, got %#x\n", access); +todo_wine + ok(access == prot_map[i].mapped, "%d: expected %#x, got %#x\n", i, prot_map[i].mapped, access); + + CloseHandle(mapping); } + SetLastError(0xdeadbeef); + mapping = CreateFileMappingW(file, NULL, PAGE_EXECUTE_READWRITE, 0, 4096, NULL); + ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError()); + + access = get_obj_access(mapping); +todo_wine + ok(access == (STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE), + "expected STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE, got %#x\n", access); + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) { SetLastError( 0xdeadbeef ); @@ -4949,6 +4994,8 @@ todo_wine } CloseHandle(mapping); + CloseHandle(file); + DeleteFileA(file_name); } static void test_thread_security(void)

1 0

Dmitry Timoshkov : cabinet/tests: Advance buffer by actually read bytes count.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 65562be420fd8f76a2ca6e9e1ad6ae0511d0801f URL: http://source.winehq.org/git/wine.git/?a=commit;h=65562be420fd8f76a2ca6e9e1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 10 15:10:29 2014 +0900 cabinet/tests: Advance buffer by actually read bytes count. --- dlls/cabinet/tests/fdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index afae707..4ed967a 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -721,7 +721,7 @@ static UINT CDECL fdi_mem_read(INT_PTR hf, void *pv, UINT cb) cb_read = (available >= cb) ? cb : available; memcpy(pv, data->base + data->pos, cb_read); - data->pos += cb; + data->pos += cb_read; /*trace("mem_read(%p,%p,%u) => %u\n", hf, pv, cb, cb_read);*/ return cb_read;

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2014