December 2013 - Wine-commits

Stefan Dösinger : d3d9/tests: Test user memory and getdc interaction.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 03fe6f3e0781b09073541ca65b9ffcc0bb2f5cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fe6f3e0781b09073541ca65… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 22:30:43 2013 +0100 d3d9/tests: Test user memory and getdc interaction. --- dlls/d3d9/tests/Makefile.in | 2 +- dlls/d3d9/tests/d3d9ex.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/Makefile.in b/dlls/d3d9/tests/Makefile.in index 380d105..7b205be 100644 --- a/dlls/d3d9/tests/Makefile.in +++ b/dlls/d3d9/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3d9.dll -IMPORTS = user32 +IMPORTS = user32 gdi32 C_SRCS = \ d3d9ex.c \ diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 7f39d70..7ac8bb3 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1151,6 +1151,50 @@ done: DestroyWindow(window); } +static void test_user_memory_getdc(void) +{ + IDirect3DDevice9Ex *device; + HWND window; + HRESULT hr; + ULONG ref; + IDirect3DSurface9 *surface; + DWORD *data; + HDC dc; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) * 16 * 16); + memset(data, 0xaa, sizeof(*data) * 16 * 16); + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, 16, 16, + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surface, (HANDLE *)&data); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + hr = IDirect3DSurface9_GetDC(surface, &dc); + ok(SUCCEEDED(hr), "Failed to get dc, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 16, 8, NULL, 0, 0, WHITENESS); + BitBlt(dc, 0, 8, 16, 8, NULL, 0, 0, BLACKNESS); + hr = IDirect3DSurface9_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release dc, hr %#x.\n", hr); + + ok(data[0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0]); + ok(data[8 * 16] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[8 * 16]); + + IDirect3DSurface9_Release(surface); + HeapFree(GetProcessHeap(), 0, data); + + ref = IDirect3DDevice9_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + +done: + DestroyWindow(window); +} + START_TEST(d3d9ex) { d3d9_handle = LoadLibraryA("d3d9.dll"); @@ -1180,4 +1224,5 @@ START_TEST(d3d9ex) test_reset(); test_reset_resources(); test_vidmem_accounting(); + test_user_memory_getdc(); }

1 0

Stefan Dösinger : ddraw: SetSurfaceDesc does not work on primaries.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 0fdb1aaff6acb55c6500852dd30d0749e4bfdd40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fdb1aaff6acb55c6500852dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 22:30:44 2013 +0100 ddraw: SetSurfaceDesc does not work on primaries. --- dlls/ddraw/surface.c | 5 +++-- dlls/ddraw/tests/ddraw2.c | 23 ++++++++++++++--------- dlls/ddraw/tests/ddraw4.c | 23 ++++++++++++++--------- dlls/ddraw/tests/ddraw7.c | 23 ++++++++++++++--------- 4 files changed, 45 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 09dbb9c..e6ae93f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4293,8 +4293,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, WARN("Flags is %x, returning DDERR_INVALIDPARAMS\n", Flags); return DDERR_INVALIDPARAMS; } - if (!(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) || - This->surface_desc.ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) + if (!(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) + || This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE + || This->surface_desc.ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { WARN("Surface is not in system memory, returning DDERR_INVALIDSURFACETYPE.\n"); return DDERR_INVALIDSURFACETYPE; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ccf228e..b6b50c1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4580,6 +4580,7 @@ static void test_set_surface_desc(void) { {DDSCAPS_VIDEOMEMORY, FALSE, "videomemory plain"}, {DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY, TRUE, "systemmemory texture"}, + {DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY, FALSE, "systemmemory primary"}, }; if (!(ddraw = create_ddraw())) @@ -4810,16 +4811,20 @@ static void test_set_surface_desc(void) for (i = 0; i < sizeof(invalid_caps_tests) / sizeof(*invalid_caps_tests); i++) { reset_ddsd(&ddsd); - ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; - ddsd.dwWidth = 8; - ddsd.dwHeight = 8; - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); - ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; - U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; - U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; - U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = invalid_caps_tests[i].caps; + if (!(invalid_caps_tests[i].caps & DDSCAPS_PRIMARYSURFACE)) + { + ddsd.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + } hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr) || hr == DDERR_NODIRECTDRAWHW, "Failed to create surface, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1689562..fb9f8fe 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5185,6 +5185,7 @@ static void test_set_surface_desc(void) {DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY, 0, TRUE, "systemmemory texture"}, {DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, FALSE, "managed texture"}, {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, FALSE, "managed texture"}, + {DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY, 0, FALSE, "systemmemory primary"}, }; if (!(ddraw = create_ddraw())) @@ -5414,17 +5415,21 @@ static void test_set_surface_desc(void) for (i = 0; i < sizeof(invalid_caps_tests) / sizeof(*invalid_caps_tests); i++) { reset_ddsd(&ddsd); - ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; - ddsd.dwWidth = 8; - ddsd.dwHeight = 8; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; + ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = invalid_caps_tests[i].caps; ddsd.ddsCaps.dwCaps2 = invalid_caps_tests[i].caps2; + if (!(invalid_caps_tests[i].caps & DDSCAPS_PRIMARYSURFACE)) + { + ddsd.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; + } hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr) || hr == DDERR_NODIRECTDRAWHW, "Failed to create surface, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 41f1b9b..4f0d9af 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5072,6 +5072,7 @@ static void test_set_surface_desc(void) {DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY, 0, TRUE, "systemmemory texture"}, {DDSCAPS_TEXTURE, DDSCAPS2_D3DTEXTUREMANAGE, FALSE, "managed texture"}, {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, FALSE, "managed texture"}, + {DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY, 0, FALSE, "systemmemory primary"}, }; if (!(ddraw = create_ddraw())) @@ -5302,17 +5303,21 @@ static void test_set_surface_desc(void) for (i = 0; i < sizeof(invalid_caps_tests) / sizeof(*invalid_caps_tests); i++) { reset_ddsd(&ddsd); - ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; - ddsd.dwWidth = 8; - ddsd.dwHeight = 8; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; + ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = invalid_caps_tests[i].caps; ddsd.ddsCaps.dwCaps2 = invalid_caps_tests[i].caps2; + if (!(invalid_caps_tests[i].caps & DDSCAPS_PRIMARYSURFACE)) + { + ddsd.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; + } hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr) || hr == DDERR_NODIRECTDRAWHW, "Failed to create surface, hr %#x.\n", hr);

1 0

Stefan Dösinger : ddraw: Sysmem overlays are not allowed.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: f53d83cf26293b9b9b1e671da7a2c41691c7f5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53d83cf26293b9b9b1e671da… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 22:30:45 2013 +0100 ddraw: Sysmem overlays are not allowed. --- dlls/ddraw/surface.c | 8 ++++++++ dlls/ddraw/tests/ddraw1.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 41 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 173 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e6ae93f..96f6950 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5857,6 +5857,14 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } } + if ((desc->ddsCaps.dwCaps & (DDSCAPS_OVERLAY | DDSCAPS_SYSTEMMEMORY)) + == (DDSCAPS_OVERLAY | DDSCAPS_SYSTEMMEMORY)) + { + WARN("System memory overlays are not allowed.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_NOOVERLAYHW; + } + if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) { wined3d_desc.pool = WINED3D_POOL_SYSTEM_MEM; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d447fb7..56a74d4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3872,6 +3872,47 @@ static void test_flip(void) DestroyWindow(window); } +static void test_sysmem_overlay(void) +{ + IDirectDraw *ddraw; + HWND window; + HRESULT hr; + DDSURFACEDESC ddsd; + IDirectDrawSurface *surface; + ULONG ref; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OVERLAY; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DDERR_NOOVERLAYHW, "Got unexpected hr %#x.\n", hr); + + ref = IDirectDraw_Release(ddraw); + ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); + DestroyWindow(window); +} + START_TEST(ddraw1) { test_coop_level_create_device_window(); @@ -3901,4 +3942,5 @@ START_TEST(ddraw1) test_surface_lock(); test_surface_discard(); test_flip(); + test_sysmem_overlay(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index b6b50c1..528bada 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4932,6 +4932,46 @@ static void test_user_memory_getdc(void) DestroyWindow(window); } +static void test_sysmem_overlay(void) +{ + IDirectDraw2 *ddraw; + HWND window; + HRESULT hr; + DDSURFACEDESC ddsd; + IDirectDrawSurface *surface; + ULONG ref; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OVERLAY; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DDERR_NOOVERLAYHW, "Got unexpected hr %#x.\n", hr); + + ref = IDirectDraw2_Release(ddraw); + ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); + DestroyWindow(window); +} + START_TEST(ddraw2) { test_coop_level_create_device_window(); @@ -4967,4 +5007,5 @@ START_TEST(ddraw2) test_flip(); test_set_surface_desc(); test_user_memory_getdc(); + test_sysmem_overlay(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index fb9f8fe..a4981c9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5529,6 +5529,46 @@ static void test_user_memory_getdc(void) DestroyWindow(window); } +static void test_sysmem_overlay(void) +{ + IDirectDraw4 *ddraw; + HWND window; + HRESULT hr; + DDSURFACEDESC2 ddsd; + IDirectDrawSurface4 *surface; + ULONG ref; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OVERLAY; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DDERR_NOOVERLAYHW, "Got unexpected hr %#x.\n", hr); + + ref = IDirectDraw4_Release(ddraw); + ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); + DestroyWindow(window); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -5569,4 +5609,5 @@ START_TEST(ddraw4) test_flip(); test_set_surface_desc(); test_user_memory_getdc(); + test_sysmem_overlay(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 4f0d9af..d253ebf 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5417,6 +5417,46 @@ static void test_user_memory_getdc(void) DestroyWindow(window); } +static void test_sysmem_overlay(void) +{ + IDirectDraw7 *ddraw; + HWND window; + HRESULT hr; + DDSURFACEDESC2 ddsd; + IDirectDrawSurface7 *surface; + ULONG ref; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OVERLAY; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == DDERR_NOOVERLAYHW, "Got unexpected hr %#x.\n", hr); + + ref = IDirectDraw7_Release(ddraw); + ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -5465,4 +5505,5 @@ START_TEST(ddraw7) test_flip(); test_set_surface_desc(); test_user_memory_getdc(); + test_sysmem_overlay(); }

1 0

Stefan Dösinger : ddraw/tests: Use correct ddraw COM macros.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: cc978c90d425950efd2f7c6c948c490a5c0537f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc978c90d425950efd2f7c6c9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 22:30:46 2013 +0100 ddraw/tests: Use correct ddraw COM macros. --- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 528bada..d6d38c8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4607,7 +4607,7 @@ static void test_set_surface_desc(void) U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; - hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **)&surface3); @@ -4826,7 +4826,7 @@ static void test_set_surface_desc(void) U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; } - hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr) || hr == DDERR_NODIRECTDRAWHW, "Failed to create surface, hr %#x.\n", hr); if (FAILED(hr)) { diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index a4981c9..6f9160c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5197,7 +5197,7 @@ static void test_set_surface_desc(void) window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); - hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); reset_ddsd(&ddsd); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d253ebf..819f4d0 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5084,7 +5084,7 @@ static void test_set_surface_desc(void) window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); - hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); reset_ddsd(&ddsd);

1 0

Alexandre Julliard : make_xftmpl: Report errors in standard format.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 31ad5fe6a2cdd738a13b30d279c8b7ee6c53f655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ad5fe6a2cdd738a13b30d27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 20:44:45 2013 +0100 make_xftmpl: Report errors in standard format. --- tools/make_xftmpl.c | 89 ++++++++++++++++++++++---------------------------- 1 files changed, 39 insertions(+), 50 deletions(-) diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c index b5751ce..0409453 100644 --- a/tools/make_xftmpl.c +++ b/tools/make_xftmpl.c @@ -22,6 +22,7 @@ #include "wine/port.h" #include <signal.h> +#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #ifdef HAVE_GETOPT_H @@ -75,7 +76,6 @@ struct parser int line_no; UINT bytes_output; BOOL(*write_bytes)(struct parser *parser, const BYTE *data, DWORD size); - BOOL error; }; struct keyword @@ -102,16 +102,41 @@ static const struct keyword reserved_words[] = { }; static char *program_name; +static const char *infile_name; + +#ifndef __GNUC__ +#define __attribute__(x) +#endif + +static void fatal_error( struct parser *parser, const char *msg, ... ) __attribute__ ((__format__ (__printf__, 2, 3))); + +static void fatal_error( struct parser *parser, const char *msg, ... ) +{ + va_list valist; + va_start( valist, msg ); + if (infile_name) + { + fprintf( stderr, "%s:%d:", infile_name, parser->line_no ); + fprintf( stderr, " error: " ); + } + else fprintf( stderr, "%s: error: ", program_name ); + vfprintf( stderr, msg, valist ); + va_end( valist ); + exit( 1 ); +} + static inline BOOL read_byte(struct parser *parser, char *byte) { int c = fgetc(parser->infile); *byte = c; + if (c == '\n') parser->line_no++; return c != EOF; } static inline BOOL unread_byte(struct parser *parser, char last_byte) { + if (last_byte == '\n') parser->line_no--; return ungetc(last_byte, parser->infile) != EOF; } @@ -183,21 +208,11 @@ static BOOL parse_guid(struct parser *parser) static const char *guidfmt = "<%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X>"; buf[0] = '<'; - if (!read_bytes(parser, buf + 1, 37)) { - fprintf(stderr, "%s: Truncated GUID (line %d)\n", - program_name, parser->line_no); - parser->error = TRUE; - return FALSE; - } + if (!read_bytes(parser, buf + 1, 37)) fatal_error( parser, "truncated GUID\n" ); buf[38] = 0; ret = sscanf(buf, guidfmt, &guid.Data1, tab, tab+1, tab+2, tab+3, tab+4, tab+5, tab+6, tab+7, tab+8, tab+9); - if (ret != 11) { - fprintf(stderr, "%s: Invalid GUID '%s' (line %d)\n", - program_name, buf, parser->line_no); - parser->error = TRUE; - return FALSE; - } + if (ret != 11) fatal_error( parser, "invalid GUID '%s'\n", buf ); guid.Data2 = tab[0]; guid.Data3 = tab[1]; @@ -260,25 +275,15 @@ static BOOL parse_number(struct parser *parser) if (dot) { float value; ret = sscanf(buffer, "%f", &value); - if (!ret) { - fprintf(stderr, "%s: Invalid float token (line %d).\n", - program_name, parser->line_no); - parser->error = TRUE; - } else { - ret = write_word(parser, TOKEN_FLOAT) && - write_bytes(parser, &value, sizeof(value)); - } + if (!ret) fatal_error( parser, "invalid float token\n" ); + ret = write_word(parser, TOKEN_FLOAT) && + write_bytes(parser, &value, sizeof(value)); } else { int value; ret = sscanf(buffer, "%d", &value); - if (!ret) { - fprintf(stderr, "%s: Invalid integer token (line %d).\n", - program_name, parser->line_no); - parser->error = TRUE; - } else { - ret = write_word(parser, TOKEN_INTEGER) && - write_dword(parser, value); - } + if (!ret) fatal_error( parser, "invalid integer token\n" ); + ret = write_word(parser, TOKEN_INTEGER) && + write_dword(parser, value); } return ret; @@ -294,8 +299,6 @@ static BOOL parse_token(struct parser *parser) switch (c) { case '\n': - parser->line_no++; - /* fall through */ case '\r': case ' ': case '\t': @@ -312,12 +315,8 @@ static BOOL parse_token(struct parser *parser) case '.': return write_word(parser, TOKEN_DOT); case '/': - if (!read_byte(parser, &c) || c != '/') { - fprintf(stderr, "%s: Invalid single '/' comment token (line %d).\n", - program_name, parser->line_no); - parser->error = TRUE; - return FALSE; - } + if (!read_byte(parser, &c) || c != '/') + fatal_error( parser, "invalid single '/' comment token\n" ); /* fall through */ case '#': while (read_byte(parser, &c) && c != '\n'); @@ -336,12 +335,7 @@ static BOOL parse_token(struct parser *parser) if (len + 1 < sizeof(buffer)) buffer[len++] = c; } - if (c != '"') { - fprintf(stderr, "%s: Unterminated string (line %d).\n", - program_name, parser->line_no); - parser->error = TRUE; - return FALSE; - } + if (c != '"') fatal_error( parser, "unterminated string\n" ); return write_word(parser, TOKEN_STRING) && write_dword(parser, len) && write_bytes(parser, buffer, len); @@ -353,10 +347,7 @@ static BOOL parse_token(struct parser *parser) return parse_number(parser); if (isalpha(c) || c == '_') return parse_name(parser); - fprintf(stderr, "%s: Invalid character (%d) to start token (line %d).\n", - program_name, c, parser->line_no); - parser->error = TRUE; - return FALSE; + fatal_error( parser, "invalid character '%c' to start token\n", c ); } return TRUE; @@ -415,7 +406,6 @@ static char **parse_options(int argc, char **argv) int main(int argc, char **argv) { - const char *infile_name; char header[16]; struct parser parser; char **args; @@ -433,7 +423,6 @@ int main(int argc, char **argv) parser.infile = stdin; parser.outfile = NULL; - parser.error = FALSE; if (!strcmp(infile_name, "-")) { infile_name = "stdin"; @@ -533,7 +522,7 @@ int main(int argc, char **argv) parser.line_no = 1; while (parse_token(&parser)); - if (parser.error || ferror(parser.outfile) || ferror(parser.infile)) + if (ferror(parser.outfile) || ferror(parser.infile)) goto error; if (option_inc_var_name)

1 0

Alexandre Julliard : make_xftmpl: Allow the C define names to be specified in the source file with pragmas.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 166ad9696c6b671936c0929bfcda683704d6f471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=166ad9696c6b671936c0929bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 21:13:40 2013 +0100 make_xftmpl: Allow the C define names to be specified in the source file with pragmas. --- include/Makefile.in | 2 +- include/rmxftmpl.x | 3 + tools/make_xftmpl.c | 115 +++++++++++++++++++++++++++++++------------------- 3 files changed, 75 insertions(+), 45 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 1f25159..e250444 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -643,7 +643,7 @@ OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) $(XTEMPLATE_SRCS:.x=.h) all: $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) $(XTEMPLATE_SRCS:.x=.h) rmxftmpl.h: rmxftmpl.x $(MAKEXFTMPL) - $(MAKEXFTMPL) -i D3DRM_XTEMPLATES -s D3DRM_XTEMPLATE_BYTES -o $@ $(srcdir)/rmxftmpl.x + $(MAKEXFTMPL) -H -o $@ $(srcdir)/rmxftmpl.x install install-dev:: $(OBJDIR_INCLUDES) $(INSTALLDIRS) for f in $(SRCDIR_INCLUDES); do case $$f in \ diff --git a/include/rmxftmpl.x b/include/rmxftmpl.x index e7144b0..61b9516 100644 --- a/include/rmxftmpl.x +++ b/include/rmxftmpl.x @@ -15,6 +15,9 @@ xof 0302txt 0064 // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +#pragma xftmpl name D3DRM_XTEMPLATES +#pragma xftmpl size D3DRM_XTEMPLATE_BYTES + template Header { <3D82AB43-62DA-11CF-AB39-0020AF71E433> diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c index 0409453..1d83498 100644 --- a/tools/make_xftmpl.c +++ b/tools/make_xftmpl.c @@ -74,8 +74,6 @@ struct parser FILE *infile; FILE *outfile; int line_no; - UINT bytes_output; - BOOL(*write_bytes)(struct parser *parser, const BYTE *data, DWORD size); }; struct keyword @@ -101,8 +99,14 @@ static const struct keyword reserved_words[] = { {"WORD", TOKEN_WORD} }; +static BOOL option_header; +static char *option_inc_var_name = NULL; +static char *option_inc_size_name = NULL; +static const char *option_outfile_name = "-"; static char *program_name; static const char *infile_name; +static BYTE *output_data; +static UINT output_pos, output_size; #ifndef __GNUC__ #define __attribute__(x) @@ -145,26 +149,34 @@ static inline BOOL read_bytes(struct parser *parser, void *data, DWORD size) return fread(data, size, 1, parser->infile) > 0; } -static BOOL write_c_hex_bytes(struct parser *parser, const BYTE *data, DWORD size) +static BOOL write_c_hex_bytes(struct parser *parser) { - while (size--) + UINT i; + for (i = 0; i < output_pos; i++) { - if (parser->bytes_output % 12 == 0) + if (i % 12 == 0) fprintf(parser->outfile, "\n "); - fprintf(parser->outfile, " 0x%02x,", *data++); - parser->bytes_output++; + fprintf(parser->outfile, " 0x%02x,", output_data[i]); } return TRUE; } -static BOOL write_raw_bytes(struct parser *parser, const BYTE *data, DWORD size) +static BOOL write_raw_bytes(struct parser *parser) { - return fwrite(data, size, 1, parser->outfile) > 0; + return fwrite(output_data, output_pos, 1, parser->outfile) > 0; } static inline BOOL write_bytes(struct parser *parser, const void *data, DWORD size) { - return parser->write_bytes(parser, data, size); + if (output_pos + size > output_size) + { + output_size = max( output_size * 2, size ); + output_data = realloc( output_data, output_size ); + if (!output_data) return FALSE; + } + memcpy( output_data + output_pos, data, size ); + output_pos += size; + return TRUE; } static inline BOOL write_byte(struct parser *parser, BYTE value) @@ -292,6 +304,8 @@ static BOOL parse_number(struct parser *parser) static BOOL parse_token(struct parser *parser) { char c; + int len; + char *tok, buffer[512]; if (!read_byte(parser, &c)) return FALSE; @@ -317,18 +331,38 @@ static BOOL parse_token(struct parser *parser) case '/': if (!read_byte(parser, &c) || c != '/') fatal_error( parser, "invalid single '/' comment token\n" ); - /* fall through */ - case '#': while (read_byte(parser, &c) && c != '\n'); return c == '\n'; + case '#': + len = 0; + while (read_byte(parser, &c) && c != '\n') + if (len + 1 < sizeof(buffer)) buffer[len++] = c; + if (c != '\n') fatal_error( parser, "line too long\n" ); + buffer[len] = 0; + tok = strtok( buffer, " \t" ); + if (!tok || strcmp( tok, "pragma" )) return TRUE; + tok = strtok( NULL, " \t" ); + if (!tok || strcmp( tok, "xftmpl" )) return TRUE; + tok = strtok( NULL, " \t" ); + if (!tok) return TRUE; + if (!strcmp( tok, "name" )) + { + tok = strtok( NULL, " \t" ); + if (tok && !option_inc_var_name) option_inc_var_name = strdup( tok ); + } + else if (!strcmp( tok, "size" )) + { + tok = strtok( NULL, " \t" ); + if (tok && !option_inc_size_name) option_inc_size_name = strdup( tok ); + } + return TRUE; + case '<': return parse_guid(parser); case '"': - { - int len = 0; - char buffer[512]; + len = 0; /* FIXME: Handle '\' (e.g. "valid\"string") */ while (read_byte(parser, &c) && c != '"') { @@ -339,7 +373,6 @@ static BOOL parse_token(struct parser *parser) return write_word(parser, TOKEN_STRING) && write_dword(parser, len) && write_bytes(parser, buffer, len); - } default: unread_byte(parser, c); @@ -369,28 +402,29 @@ static void usage(void) { fprintf(stderr, "Usage: %s [OPTIONS] INFILE\n" "Options:\n" + " -H Output to a c header file instead of a binary file\n" " -i NAME Output to a c header file, data in variable NAME\n" " -s NAME In a c header file, define NAME to be the data size\n" " -o FILE Write output to FILE\n", program_name); } -static char *option_inc_var_name = NULL; -static char *option_inc_size_name = NULL; -static const char *option_outfile_name = "-"; - static char **parse_options(int argc, char **argv) { int optc; - while ((optc = getopt(argc, argv, "hi:o:s:")) != -1) + while ((optc = getopt(argc, argv, "hHi:o:s:")) != -1) { switch (optc) { case 'h': usage(); exit(0); + case 'H': + option_header = TRUE; + break; case 'i': + option_header = TRUE; option_inc_var_name = strdup(optarg); break; case 'o': @@ -475,10 +509,22 @@ int main(int argc, char **argv) } } - if (option_inc_var_name) + if (!write_bytes(&parser, "xof 0302bin 0064", 16)) + goto error; + + parser.line_no = 1; + while (parse_token(&parser)); + + if (ferror(parser.outfile) || ferror(parser.infile)) + goto error; + + if (option_header) { char *str_ptr; + if (!option_inc_var_name) + fatal_error( &parser, "variable name must be specified with -i or #pragma name\n" ); + header_name = strrchr(option_outfile_name, '/'); if (header_name) header_name = strdup(header_name + 1); @@ -506,34 +552,15 @@ int main(int argc, char **argv) "\n" "unsigned char %s[] = {", infile_name, header_name, header_name, option_inc_var_name); - - if (ferror(parser.outfile)) - goto error; - - parser.write_bytes = &write_c_hex_bytes; - } else { - parser.write_bytes = &write_raw_bytes; - } - - parser.bytes_output = 0; - if (!write_bytes(&parser, "xof 0302bin 0064", 16)) - goto error; - - parser.line_no = 1; - while (parse_token(&parser)); - - if (ferror(parser.outfile) || ferror(parser.infile)) - goto error; - - if (option_inc_var_name) - { + write_c_hex_bytes( &parser ); fprintf(parser.outfile, "\n};\n\n"); if (option_inc_size_name) - fprintf(parser.outfile, "#define %s %u\n\n", option_inc_size_name, parser.bytes_output); + fprintf(parser.outfile, "#define %s %u\n\n", option_inc_size_name, output_pos); fprintf(parser.outfile, "#endif /* __WINE_%s */\n", header_name); if (ferror(parser.outfile)) goto error; } + else write_raw_bytes( &parser ); fclose(parser.infile); fclose(parser.outfile);

1 0

Alexandre Julliard : makedep: Generate rules for .x template files.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 52e19da50d6cee6389ecd4ccaa9a1428b0e292af URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e19da50d6cee6389ecd4cca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 21:18:53 2013 +0100 makedep: Generate rules for .x template files. --- Make.rules.in | 4 ++-- include/Makefile.in | 3 --- tools/makedep.c | 13 +++++++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 0617611..dff13b8 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -20,7 +20,7 @@ IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c -CLEAN_TARGETS = $(MODULE) $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) $(XTEMPLATE_SRCS:.x=.h) \ +CLEAN_TARGETS = $(MODULE) $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) \ $(TESTMODULE) $(TESTMODULE_STRIPPED) $(CROSSTESTMODULE) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(OBJC_SRCS:.m=.o) \ @@ -78,7 +78,7 @@ $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) $(IDL_R_SRCS) $(IDL_TLB_SRCS) \ - $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_OBJS) $(MANPAGES) + $(BISON_SRCS) $(LEX_SRCS) $(XTEMPLATE_SRCS) $(EXTRA_OBJS) $(MANPAGES) depend: dummy $(MAKEDEP) $(MAKEDEPFLAGS) -C$(srcdir) -S$(top_srcdir) -T$(top_builddir) $(PARENTSRC:%=-P%) $(EXTRAINCL) $(DEPEND_SRCS) diff --git a/include/Makefile.in b/include/Makefile.in index e250444..a6d149d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -642,9 +642,6 @@ OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) $(XTEMPLATE_SRCS:.x=.h) all: $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) $(XTEMPLATE_SRCS:.x=.h) -rmxftmpl.h: rmxftmpl.x $(MAKEXFTMPL) - $(MAKEXFTMPL) -H -o $@ $(srcdir)/rmxftmpl.x - install install-dev:: $(OBJDIR_INCLUDES) $(INSTALLDIRS) for f in $(SRCDIR_INCLUDES); do case $$f in \ wine/*) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/`expr $$f : 'wine/$.*$'` ;; \ diff --git a/tools/makedep.c b/tools/makedep.c index 1d99762..f8415c6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -990,8 +990,7 @@ static void parse_file( struct incl_file *source, int src ) FILE *file; /* don't try to open certain types of files */ - if (strendswith( source->name, ".tlb" ) || - strendswith( source->name, ".x" )) + if (strendswith( source->name, ".tlb" )) { source->filename = xstrdup( source->name ); return; @@ -1067,8 +1066,7 @@ static struct incl_file *add_src_file( const char *name ) if (strendswith( file->name, ".tlb" ) || strendswith( file->name, ".res" ) || - strendswith( file->name, ".pot" ) || - strendswith( file->name, ".x" )) + strendswith( file->name, ".pot" )) { file->filename = xstrdup( file->name ); return file; @@ -1207,6 +1205,13 @@ static void output_sources(void) column += output( "%s.tab.o:", obj ); free( header ); } + else if (!strcmp( ext, "x" )) /* template file */ + { + output( "%s.h: $(MAKEXFTMPL) %s\n", obj, source->filename ); + output( "\t$(MAKEXFTMPL) -H -o $@ %s\n", source->filename ); + strarray_add( &clean_files, strmake( "%s.h", obj )); + continue; + } else if (!strcmp( ext, "l" )) /* lex file */ { output( "%s.yy.c: %s\n", obj, source->filename );

1 0

Alexandre Julliard : user32: Don' t check for comctl32 class for integer atoms.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: fb4441df73dc0a1974515aa98831fdda3250dab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4441df73dc0a1974515aa98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 12:05:36 2013 +0100 user32: Don't check for comctl32 class for integer atoms. --- dlls/user32/class.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 349aedf..d40d22e 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -311,6 +311,8 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ + if (!name) return NULL; + for (;;) { USER_Lock(); @@ -324,7 +326,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) } else { - if (!name || strcmpiW( class->name, name )) continue; + if (strcmpiW( class->name, name )) continue; } if (!class->local || class->hInstance == hinstance) { @@ -334,6 +336,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) } USER_Unlock(); + if (atom) break; if (!is_comctl32_class( name )) break; if (GetModuleHandleW( comctl32W )) break; if (!LoadLibraryW( comctl32W )) break;

1 0

Ken Thomases : winemac: Don't change window order for SetFocus().
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: e3dd277586df23e1940b30a8c2b39ff496094fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3dd277586df23e1940b30a8c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 11 12:50:17 2013 -0600 winemac: Don't change window order for SetFocus(). This fixes a problem where some apps move their window to the front after the user switches away to another app. OS X prevents the background app from actually coming in front of the active app's front window, but the window gets ordered in second place, possibly obscuring other windows of the active app. --- dlls/winemac.drv/cocoa_window.m | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 6fa6ee8..06647d9 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1340,7 +1340,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) makeFocused:(BOOL)activate { - [self orderBelow:nil orAbove:nil activate:activate]; + if (activate) + { + [[WineApplicationController sharedController] transformProcessToForeground]; + [NSApp activateIgnoringOtherApps:YES]; + } causing_becomeKeyWindow = self; [self makeKeyWindow];

1 0

Ken Thomases : winemac: Consolidate the logic for deciding if cursor clipping should be active.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: cd10a0df5e1a67feebd06c980139241dfeea9658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd10a0df5e1a67feebd06c980… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 11 12:50:23 2013 -0600 winemac: Consolidate the logic for deciding if cursor clipping should be active. --- dlls/winemac.drv/cocoa_app.m | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 8ab8954..c9f51d6 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1316,7 +1316,7 @@ int macdrv_err_on; - (void) activateCursorClipping { - if (clippingCursor) + if (cursorClippingEventTap && !CGEventTapIsEnabled(cursorClippingEventTap)) { CGEventTapEnable(cursorClippingEventTap, TRUE); [self setCursorPosition:NSPointToCGPoint([self flippedMouseLocation:[NSEvent mouseLocation]])]; @@ -1325,7 +1325,7 @@ int macdrv_err_on; - (void) deactivateCursorClipping { - if (clippingCursor) + if (cursorClippingEventTap && CGEventTapIsEnabled(cursorClippingEventTap)) { CGEventTapEnable(cursorClippingEventTap, FALSE); [warpRecords removeAllObjects]; @@ -1333,6 +1333,14 @@ int macdrv_err_on; } } + - (void) updateCursorClippingState + { + if (clippingCursor && [NSApp isActive]) + [self activateCursorClipping]; + else + [self deactivateCursorClipping]; + } + - (BOOL) startClippingCursor:(CGRect)rect { CGError err; @@ -1346,8 +1354,7 @@ int macdrv_err_on; clippingCursor = TRUE; cursorClipRect = rect; - if ([NSApp isActive]) - [self activateCursorClipping]; + [self updateCursorClippingState]; return TRUE; } @@ -1358,8 +1365,8 @@ int macdrv_err_on; if (err != kCGErrorSuccess) return FALSE; - [self deactivateCursorClipping]; clippingCursor = FALSE; + [self updateCursorClippingState]; return TRUE; } @@ -2012,7 +2019,7 @@ int macdrv_err_on; } [latentDisplayModes removeAllObjects]; - [self activateCursorClipping]; + [self updateCursorClippingState]; [self updateFullscreenWindows]; [self adjustWindowLevels:YES]; @@ -2056,6 +2063,8 @@ int macdrv_err_on; macdrv_event* event; WineEventQueue* queue; + [self updateCursorClippingState]; + [self invalidateGotFocusEvents]; event = macdrv_create_event(APP_DEACTIVATED, nil); @@ -2123,8 +2132,6 @@ int macdrv_err_on; - (void)applicationWillResignActive:(NSNotification *)notification { - [self deactivateCursorClipping]; - [self adjustWindowLevels:NO]; }

1 0