December 2013 - Wine-Commits

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

Dec. 12, 2013

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: SetSurfaceDesc does not work on primaries.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

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

Frédéric Delanoy : krnl386.exe16: Use BOOL type where appropriate.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

Module: wine Branch: master Commit: 8a10493e6bd91df632ec145dcc797b7661ad60c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a10493e6bd91df632ec145dc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 11 20:57:15 2013 +0100 krnl386.exe16: Use BOOL type where appropriate. --- dlls/krnl386.exe16/dosexe.h | 2 +- dlls/krnl386.exe16/int16.c | 6 ++-- dlls/krnl386.exe16/int21.c | 51 ++++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.h b/dlls/krnl386.exe16/dosexe.h index 0b813e1..f9df172 100644 --- a/dlls/krnl386.exe16/dosexe.h +++ b/dlls/krnl386.exe16/dosexe.h @@ -404,7 +404,7 @@ extern void WINAPI DOSVM_Int15Handler(CONTEXT*); /* int16.c */ extern void WINAPI DOSVM_Int16Handler(CONTEXT*); extern BOOL DOSVM_Int16ReadChar( BYTE *, BYTE *, CONTEXT * ); -extern int DOSVM_Int16AddChar(BYTE ascii,BYTE scan); +extern BOOL DOSVM_Int16AddChar(BYTE ascii, BYTE scan); /* int21.c */ extern void WINAPI DOSVM_Int21Handler(CONTEXT*); diff --git a/dlls/krnl386.exe16/int16.c b/dlls/krnl386.exe16/int16.c index 5d84a0b..c731472 100644 --- a/dlls/krnl386.exe16/int16.c +++ b/dlls/krnl386.exe16/int16.c @@ -195,7 +195,7 @@ BOOL DOSVM_Int16ReadChar(BYTE *ascii, BYTE *scan, CONTEXT *waitctx) return TRUE; } -int DOSVM_Int16AddChar(BYTE ascii,BYTE scan) +BOOL DOSVM_Int16AddChar(BYTE ascii,BYTE scan) { BIOSDATA *data = DOSVM_BiosData(); WORD CurOfs = data->FirstKbdCharPtr; @@ -204,12 +204,12 @@ int DOSVM_Int16AddChar(BYTE ascii,BYTE scan) TRACE("(%02x,%02x)\n",ascii,scan); if (NextOfs >= data->KbdBufferEnd) NextOfs = data->KbdBufferStart; /* check if buffer is full */ - if (NextOfs == data->NextKbdCharPtr) return 0; + if (NextOfs == data->NextKbdCharPtr) return FALSE; /* okay, insert character in ring buffer */ ((BYTE*)data)[CurOfs] = ascii; ((BYTE*)data)[CurOfs+1] = scan; data->FirstKbdCharPtr = NextOfs; - return 1; + return TRUE; } diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 3652054..53b6537 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -3437,7 +3437,7 @@ static int INT21_GetDiskSerialNumber( CONTEXT *context ) * INT21_SetDiskSerialNumber * */ -static int INT21_SetDiskSerialNumber( CONTEXT *context ) +static BOOL INT21_SetDiskSerialNumber( CONTEXT *context ) { #if 0 BYTE *dataptr = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); @@ -3446,15 +3446,15 @@ static int INT21_SetDiskSerialNumber( CONTEXT *context ) if (!is_valid_drive(drive)) { SetLastError( ERROR_INVALID_DRIVE ); - return 0; + return FALSE; } DRIVE_SetSerialNumber( drive, *(DWORD *)(dataptr + 2) ); - return 1; + return TRUE; #else FIXME("Setting drive serial number is no longer supported\n"); SetLastError( ERROR_NOT_SUPPORTED ); - return 0; + return FALSE; #endif } @@ -3463,7 +3463,7 @@ static int INT21_SetDiskSerialNumber( CONTEXT *context ) * INT21_GetFreeDiskSpace * */ -static int INT21_GetFreeDiskSpace( CONTEXT *context ) +static BOOL INT21_GetFreeDiskSpace( CONTEXT *context ) { DWORD cluster_sectors, sector_bytes, free_clusters, total_clusters; WCHAR root[] = {'A',':','\\',0}; @@ -3473,7 +3473,8 @@ static int INT21_GetFreeDiskSpace( CONTEXT *context ) root[0] += INT21_MapDrive(DL_reg(context)); if (!GetDiskFreeSpaceW( root, &cluster_sectors, &sector_bytes, - &free_clusters, &total_clusters )) return 0; + &free_clusters, &total_clusters )) + return FALSE; /* Some old win31 apps (Lotus SmartSuite 5.1) crap out if there's too * much disk space, so Windows XP seems to apply the following limits: @@ -3530,19 +3531,19 @@ static int INT21_GetFreeDiskSpace( CONTEXT *context ) SET_BX( context, free_clusters ); SET_CX( context, sector_bytes ); SET_DX( context, total_clusters ); - return 1; + return TRUE; } /****************************************************************** * INT21_GetDriveAllocInfo * */ -static int INT21_GetDriveAllocInfo( CONTEXT *context, BYTE drive ) +static BOOL INT21_GetDriveAllocInfo( CONTEXT *context, BYTE drive ) { INT21_DPB *dpb; drive = INT21_MapDrive( drive ); - if (!INT21_FillDrivePB( drive )) return 0; + if (!INT21_FillDrivePB( drive )) return FALSE; dpb = &(INT21_GetHeapPointer()->misc_dpb_list[drive]); SET_AL( context, dpb->cluster_sectors + 1 ); SET_CX( context, dpb->sector_bytes ); @@ -3550,7 +3551,7 @@ static int INT21_GetDriveAllocInfo( CONTEXT *context, BYTE drive ) context->SegDs = INT21_GetHeapSelector( context ); SET_BX( context, offsetof( INT21_HEAP, misc_dpb_list[drive].media_ID ) ); - return 1; + return TRUE; } /*********************************************************************** @@ -3800,7 +3801,7 @@ static const WCHAR *INT21_FindPath; /* will point to current dta->fullPath searc /****************************************************************** * INT21_FindFirst */ -static int INT21_FindFirst( CONTEXT *context ) +static BOOL INT21_FindFirst( CONTEXT *context ) { WCHAR *p, *q; const char *path; @@ -3829,7 +3830,7 @@ static int INT21_FindFirst( CONTEXT *context ) SetLastError( ERROR_FILE_NOT_FOUND ); SET_AX( context, ERROR_FILE_NOT_FOUND ); SET_CFLAG(context); - return 0; + return FALSE; } WideCharToMultiByte(CP_OEMCP, 0, maskW, 12, dta->mask, sizeof(dta->mask), NULL, NULL); @@ -3842,7 +3843,7 @@ static int INT21_FindFirst( CONTEXT *context ) dta->drive = toupperW(dta->fullPath[0]) - 'A'; dta->count = 0; dta->search_attr = CL_reg(context); - return 1; + return TRUE; } /****************************************************************** @@ -3930,14 +3931,14 @@ static unsigned INT21_FindHelper(LPCWSTR fullPath, unsigned drive, unsigned coun /****************************************************************** * INT21_FindNext */ -static int INT21_FindNext( CONTEXT *context ) +static BOOL INT21_FindNext( CONTEXT *context ) { FINDFILE_DTA *dta = (FINDFILE_DTA *)INT21_GetCurrentDTA(context); DWORD attr = dta->search_attr | FA_UNUSED | FA_ARCHIVE | FA_RDONLY; WIN32_FIND_DATAW entry; int n; - if (!dta->fullPath) return 0; + if (!dta->fullPath) return FALSE; n = INT21_FindHelper(dta->fullPath, dta->drive, dta->count, dta->mask, attr, &entry); @@ -3962,11 +3963,11 @@ static int INT21_FindNext( CONTEXT *context ) INT21_FindPath = dta->fullPath = NULL; } dta->count = n; - return 1; + return TRUE; } HeapFree( GetProcessHeap(), 0, dta->fullPath ); INT21_FindPath = dta->fullPath = NULL; - return 0; + return FALSE; } /* microsoft's programmers should be shot for using CP/M style int21 @@ -3976,7 +3977,7 @@ static int INT21_FindNext( CONTEXT *context ) * INT21_FindFirstFCB * */ -static int INT21_FindFirstFCB( CONTEXT *context ) +static BOOL INT21_FindFirstFCB( CONTEXT *context ) { BYTE *fcb = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); FINDFILE_FCB *pFCB; @@ -3986,21 +3987,21 @@ static int INT21_FindFirstFCB( CONTEXT *context ) if (*fcb == 0xff) pFCB = (FINDFILE_FCB *)(fcb + 7); else pFCB = (FINDFILE_FCB *)fcb; drive = INT21_MapDrive( pFCB->drive ); - if (drive == MAX_DOS_DRIVES) return 0; + if (drive == MAX_DOS_DRIVES) return FALSE; p[0] = 'A' + drive; pFCB->fullPath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); - if (!pFCB->fullPath) return 0; + if (!pFCB->fullPath) return FALSE; GetLongPathNameW(p, pFCB->fullPath, MAX_PATH); pFCB->count = 0; - return 1; + return TRUE; } /****************************************************************** * INT21_FindNextFCB * */ -static int INT21_FindNextFCB( CONTEXT *context ) +static BOOL INT21_FindNextFCB( CONTEXT *context ) { BYTE *fcb = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); FINDFILE_FCB *pFCB; @@ -4022,14 +4023,14 @@ static int INT21_FindNextFCB( CONTEXT *context ) pFCB = (FINDFILE_FCB *)fcb; } - if (!pFCB->fullPath) return 0; + if (!pFCB->fullPath) return FALSE; n = INT21_FindHelper(pFCB->fullPath, INT21_MapDrive( pFCB->drive ), pFCB->count, pFCB->filename, attr, &entry); if (!n) { HeapFree( GetProcessHeap(), 0, pFCB->fullPath ); INT21_FindPath = pFCB->fullPath = NULL; - return 0; + return FALSE; } pFCB->count += n; @@ -4055,7 +4056,7 @@ static int INT21_FindNextFCB( CONTEXT *context ) else INT21_ToDosFCBFormat( entry.cFileName, nameW ); WideCharToMultiByte(CP_OEMCP, 0, nameW, 11, ddl->filename, 11, NULL, NULL); - return 1; + return TRUE; }

1 0

Alexandre Bique : cmd: Update the string of the ver command.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

1 0

Alexandre Julliard : makefiles: Add separate clean targets even in the non-recursive case.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

Module: wine Branch: master Commit: e0d5010f404da77b881c552ac5618b9aa62f79bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d5010f404da77b881c552ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 17:25:51 2013 +0100 makefiles: Add separate clean targets even in the non-recursive case. --- aclocal.m4 | 8 ++++++-- configure | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f186ce1..e09045f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -315,7 +315,9 @@ $ac_dir/clean: $ac_dir/Makefile \$(RM) $ac_dir/Makefile" else wine_fn_append_rule \ -"clean:: +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_dir/Makefile" fi } @@ -325,7 +327,9 @@ wine_fn_disabled_rules () ac_clean=$[@] wine_fn_append_rule \ -"clean:: +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_dir/Makefile" } diff --git a/configure b/configure index 95058cf..1b160db 100755 --- a/configure +++ b/configure @@ -16312,7 +16312,9 @@ $ac_dir/clean: $ac_dir/Makefile \$(RM) $ac_dir/Makefile" else wine_fn_append_rule \ -"clean:: +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_dir/Makefile" fi } @@ -16322,7 +16324,9 @@ wine_fn_disabled_rules () ac_clean=$@ wine_fn_append_rule \ -"clean:: +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_dir/Makefile" }

1 0

Alexandre Julliard : makedep: Generate rules for .x template files.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

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

Dmitry Timoshkov : msiexec: Make sure that SERVICE_STOPPED status is really sent to SCM.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

Module: wine Branch: master Commit: 2fe08ed67fdba9922e79108176d55c6506818f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe08ed67fdba9922e7910817… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 12 14:39:56 2013 +0900 msiexec: Make sure that SERVICE_STOPPED status is really sent to SCM. --- programs/msiexec/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c index fdd29bd..59dfd0e 100644 --- a/programs/msiexec/service.c +++ b/programs/msiexec/service.c @@ -92,7 +92,7 @@ static void WINAPI ServiceCtrlHandler(DWORD code) UpdateSCMStatus(SERVICE_STOP_PENDING, NO_ERROR, 0); KillService(); state = SERVICE_STOPPED; - return; + break; default: fprintf(stderr, "Unhandled service control code: %d\n", code); break;

1 0

Ken Thomases : winemac: While a window is being dragged, suppress mouse events and disable cursor clipping and warping.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

Module: wine Branch: master Commit: b3cc34e5b0a3e40288e7b9888773dc6aeb6dd37d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3cc34e5b0a3e40288e7b9888… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 11 12:50:47 2013 -0600 winemac: While a window is being dragged, suppress mouse events and disable cursor clipping and warping. --- dlls/winemac.drv/cocoa_app.h | 2 ++ dlls/winemac.drv/cocoa_app.m | 39 +++++++++++++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 07a4bc8..cf168c1 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -89,6 +89,8 @@ enum { NSImage* applicationIcon; BOOL beenActive; + + NSMutableSet* windowsBeingDragged; } @property (nonatomic) CGEventSourceKeyboardType keyboardType; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index c9f51d6..857c019 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -154,6 +154,8 @@ int macdrv_err_on; warpRecords = [[NSMutableArray alloc] init]; + windowsBeingDragged = [[NSMutableSet alloc] init]; + if (!requests || !requestsManipQueue || !eventQueues || !eventQueuesLock || !keyWindows || !originalDisplayModes || !latentDisplayModes || !warpRecords) { @@ -173,6 +175,7 @@ int macdrv_err_on; - (void) dealloc { + [windowsBeingDragged release]; [cursor release]; [screenFrameCGRects release]; [applicationIcon release]; @@ -1258,7 +1261,9 @@ int macdrv_err_on; { BOOL ret; - if (clippingCursor) + if ([windowsBeingDragged count]) + ret = FALSE; + else if (clippingCursor) { [self clipCursorLocation:&pos]; @@ -1335,7 +1340,7 @@ int macdrv_err_on; - (void) updateCursorClippingState { - if (clippingCursor && [NSApp isActive]) + if (clippingCursor && [NSApp isActive] && ![windowsBeingDragged count]) [self activateCursorClipping]; else [self deactivateCursorClipping]; @@ -1395,7 +1400,9 @@ int macdrv_err_on; WineWindow* targetWindow; BOOL drag = [anEvent type] != NSMouseMoved; - if (mouseCaptureWindow) + if ([windowsBeingDragged count]) + targetWindow = nil; + else if (mouseCaptureWindow) targetWindow = mouseCaptureWindow; else if (drag) targetWindow = (WineWindow*)[anEvent window]; @@ -1620,7 +1627,9 @@ int macdrv_err_on; } } - if (mouseCaptureWindow) + if ([windowsBeingDragged count]) + window = nil; + else if (mouseCaptureWindow) window = mouseCaptureWindow; if ([window isKindOfClass:[WineWindow class]]) @@ -1861,6 +1870,26 @@ int macdrv_err_on; [window postKeyEvent:anEvent]; } } + else if (type == NSAppKitDefined) + { + short subtype = [anEvent subtype]; + + // These subtypes are not documented but they appear to mean + // "a window is being dragged" and "a window is no longer being + // dragged", respectively. + if (subtype == 20 || subtype == 21) + { + WineWindow* window = (WineWindow*)[anEvent window]; + if ([window isKindOfClass:[WineWindow class]]) + { + if (subtype == 20) + [windowsBeingDragged addObject:window]; + else + [windowsBeingDragged removeObject:window]; + [self updateCursorClippingState]; + } + } + } return ret; } @@ -1917,6 +1946,8 @@ int macdrv_err_on; [self updateFullscreenWindows]; }); } + [windowsBeingDragged removeObject:window]; + [self updateCursorClippingState]; }]; [nc addObserver:self

1 0

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

Dec. 12, 2013

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

Henri Verbeet : wined3d: Fix the source swizzle for WINED3DSIH_LOG and WINED3DSIH_LOGP.
by Alexandre Julliard Dec. 12, 2013

Dec. 12, 2013

Module: wine Branch: master Commit: 27dc41d0dc31f02476a008cbe1a517bc9a425a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27dc41d0dc31f02476a008cbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 12 10:23:29 2013 +0100 wined3d: Fix the source swizzle for WINED3DSIH_LOG and WINED3DSIH_LOGP. --- dlls/d3d8/tests/visual.c | 22 ++++++++-------------- dlls/wined3d/glsl_shader.c | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index f7afd74..7b6c178 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1774,16 +1774,15 @@ static void test_scalar_instructions(IDirect3DDevice8 *device) const char *name; const DWORD *byte_code; D3DCOLOR color; - BOOL todo; } test_data[] = { - {"rcp_test", rcp_test, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x80), FALSE}, - {"rsq_test", rsq_test, D3DCOLOR_ARGB(0x00, 0xb4, 0xb4, 0xb4), FALSE}, - {"exp_test", exp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), FALSE}, - {"expp_test", expp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), FALSE}, - {"log_test", log_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), TRUE}, - {"logp_test", logp_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), TRUE}, + {"rcp_test", rcp_test, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x80)}, + {"rsq_test", rsq_test, D3DCOLOR_ARGB(0x00, 0xb4, 0xb4, 0xb4)}, + {"exp_test", exp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40)}, + {"expp_test", expp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40)}, + {"log_test", log_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff)}, + {"logp_test", logp_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff)}, }; unsigned int i; DWORD shader; @@ -1808,13 +1807,8 @@ static void test_scalar_instructions(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "%s: Failed to end scene, hr %#x.\n", test_data[i].name, hr); color = getPixelColor(device, 320, 240); - if (test_data[i].todo) - todo_wine ok(color_match(color, test_data[i].color, 4), - "%s: Got unexpected color 0x%08x, expected 0x%08x.\n", - test_data[i].name, color, test_data[i].color); - else - ok(color_match(color, test_data[i].color, 4), "%s: Got unexpected color 0x%08x, expected 0x%08x.\n", - test_data[i].name, color, test_data[i].color); + ok(color_match(color, test_data[i].color, 4), "%s: Got unexpected color 0x%08x, expected 0x%08x.\n", + test_data[i].name, color, test_data[i].color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "%s: Failed to present, hr %#x.\n", test_data[i].name, hr); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f778217..8fdbb68 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2601,7 +2601,7 @@ static void shader_glsl_log(const struct wined3d_shader_instruction *ins) dst_write_mask = shader_glsl_append_dst(buffer, ins); dst_size = shader_glsl_get_write_mask_size(dst_write_mask); - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src0_param); if (dst_size > 1) {

1 0