December 2011 - Wine-Commits

Piotr Caban : services: Check process status to determine if service has terminated.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: b9797b5caa5a9ec03574fbd3552d31250cb74a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9797b5caa5a9ec03574fbd35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 12 11:04:07 2011 +0100 services: Check process status to determine if service has terminated. --- programs/services/services.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 4a4aeb8..f2c5d26 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -807,7 +807,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * if (err != ERROR_SUCCESS) return err; - if (service->control_pipe != INVALID_HANDLE_VALUE) + if (WaitForSingleObject(service->process, 0) == WAIT_TIMEOUT) { scmdatabase_unlock_startup(service->db); return ERROR_SERVICE_ALREADY_RUNNING;

1 0

Alexandre Julliard : gdi32: Pass the correct depth to PutImage for SetBitmapBits on a DIB.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 70d8341a674582d2c1b9e99b7ea25c7d1110d8e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d8341a674582d2c1b9e99b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 14:34:48 2011 +0100 gdi32: Pass the correct depth to PutImage for SetBitmapBits on a DIB. --- dlls/gdi32/bitmap.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index af9012b..0d637ec 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -481,7 +481,7 @@ LONG WINAPI SetBitmapBits( /* query the color info */ info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; + info->bmiHeader.biBitCount = bmp->dib ? bmp->dib->dsBmih.biBitCount : bmp->bitmap.bmBitsPixel; info->bmiHeader.biCompression = BI_RGB; info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; @@ -494,11 +494,9 @@ LONG WINAPI SetBitmapBits( if (!err || err == ERROR_BAD_FORMAT) { - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; - info->bmiHeader.biWidth = bmp->bitmap.bmWidth; - info->bmiHeader.biHeight = -dst.height; - info->bmiHeader.biSizeImage = dst.height * dst_stride; + info->bmiHeader.biWidth = bmp->bitmap.bmWidth; + info->bmiHeader.biHeight = -dst.height; + info->bmiHeader.biSizeImage = dst.height * dst_stride; err = funcs->pPutImage( NULL, hbitmap, clip, info, &src_bits, &src, &dst, SRCCOPY ); } if (err) count = 0;

1 0

Alexandre Julliard : gdi32: Store the default color tables as static data.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 3a9cabb8c4a72cf9e1247dfbf29d070b573d3eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9cabb8c4a72cf9e1247dfbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 17:03:28 2011 +0100 gdi32: Store the default color tables as static data. --- dlls/gdi32/dib.c | 150 ++++++++++++++++++++++++++++------------------ dlls/gdi32/gdi_private.h | 1 + 2 files changed, 93 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a9cabb8c4a72cf9e1247…

1 0

Alexandre Julliard : gdi32: GetCharABCWidthsFloatW must succeed with non-TrueType fonts.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 27eb63b0829d5d38ed4b0ed99d240db872620d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27eb63b0829d5d38ed4b0ed99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 11:14:09 2011 +0100 gdi32: GetCharABCWidthsFloatW must succeed with non-TrueType fonts. --- dlls/gdi32/font.c | 9 +++++++++ dlls/gdi32/freetype.c | 3 --- dlls/gdi32/tests/font.c | 14 +++++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0d308b0..d2dfd44 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2656,6 +2656,7 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, PHYSDEV dev; unsigned int i; BOOL ret; + TEXTMETRICW tm; if (!dc) return FALSE; @@ -2665,6 +2666,14 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, return FALSE; } + /* unlike GetCharABCWidthsFloatW, this one is supposed to fail on non-TrueType fonts */ + dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); + if (!dev->funcs->pGetTextMetrics( dev, &tm ) || !(tm.tmPitchAndFamily & TMPF_TRUETYPE)) + { + release_dc_ptr( dc ); + return FALSE; + } + dev = GET_DC_PHYSDEV( dc, pGetCharABCWidths ); ret = dev->funcs->pGetCharABCWidths( dev, firstChar, lastChar, abc ); if (ret) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3a1ae99..959f4aa 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6416,9 +6416,6 @@ static BOOL freetype_GetCharABCWidths( PHYSDEV dev, UINT firstChar, UINT lastCha TRACE("%p, %d, %d, %p\n", physdev->font, firstChar, lastChar, buffer); - if(!FT_IS_SCALABLE(physdev->font->ft_face)) - return FALSE; - GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 30296a5..cc34fed 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -41,6 +41,7 @@ static DWORD (WINAPI *pGdiGetCodePage)(HDC hdc); static BOOL (WINAPI *pGetCharABCWidthsI)(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPABC abc); static BOOL (WINAPI *pGetCharABCWidthsA)(HDC hdc, UINT first, UINT last, LPABC abc); static BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); +static BOOL (WINAPI *pGetCharABCWidthsFloatW)(HDC hdc, UINT first, UINT last, LPABCFLOAT abc); static DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); static DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); @@ -63,6 +64,7 @@ static void init(void) pGetCharABCWidthsI = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsI"); pGetCharABCWidthsA = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsA"); pGetCharABCWidthsW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsW"); + pGetCharABCWidthsFloatW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsFloatW"); pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW"); @@ -936,6 +938,7 @@ static void test_GetCharABCWidths(void) LOGFONTA lf; HFONT hfont; ABC abc[1]; + ABCFLOAT abcf[1]; WORD glyphs[1]; DWORD nb; static const struct @@ -973,7 +976,7 @@ static void test_GetCharABCWidths(void) }; UINT i; - if (!pGetCharABCWidthsA || !pGetCharABCWidthsW || !pGetCharABCWidthsI) + if (!pGetCharABCWidthsA || !pGetCharABCWidthsW || !pGetCharABCWidthsFloatW || !pGetCharABCWidthsI) { win_skip("GetCharABCWidthsA/W/I not available on this platform\n"); return; @@ -1008,6 +1011,15 @@ static void test_GetCharABCWidths(void) ret = pGetCharABCWidthsW(hdc, 'a', 'a', abc); ok(!ret, "GetCharABCWidthsW should have failed\n"); + ret = pGetCharABCWidthsFloatW(NULL, 'a', 'a', abcf); + ok(!ret, "GetCharABCWidthsFloatW should have failed\n"); + + ret = pGetCharABCWidthsFloatW(hdc, 'a', 'a', NULL); + ok(!ret, "GetCharABCWidthsFloatW should have failed\n"); + + ret = pGetCharABCWidthsFloatW(hdc, 'a', 'a', abcf); + ok(ret, "GetCharABCWidthsFloatW should have succeeded\n"); + hfont = SelectObject(hdc, hfont); DeleteObject(hfont);

1 0

Piotr Caban : services: Don' t close control_pipe when SERVICE_CONTROL_STOP is sent.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: bc866c899f8fd68bc5602401fb2fbc5348ede2a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc866c899f8fd68bc5602401f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 12 11:04:28 2011 +0100 services: Don't close control_pipe when SERVICE_CONTROL_STOP is sent. This prevents service_control_dispatcher from being stopped. Thanks to it the service may continue to work and do the clean up. --- programs/services/rpc.c | 18 ++++-------------- programs/services/services.c | 1 + 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 5fe8585..2337667 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1015,7 +1015,6 @@ DWORD __cdecl svcctl_ControlService( DWORD result; BOOL ret; HANDLE control_mutex; - HANDLE control_pipe; WINE_TRACE("(%p, %d, %p)\n", hService, dwControl, lpServiceStatus); @@ -1085,22 +1084,19 @@ DWORD __cdecl svcctl_ControlService( return ERROR_INVALID_SERVICE_CONTROL; } - /* prevent races by caching these variables and clearing them on - * stop here instead of outside the services lock */ + /* prevent races by caching control_mutex and clearing it on + * stop instead of outside the services lock */ control_mutex = service->service_entry->control_mutex; - control_pipe = service->service_entry->control_pipe; if (dwControl == SERVICE_CONTROL_STOP) - { service->service_entry->control_mutex = NULL; - service->service_entry->control_pipe = INVALID_HANDLE_VALUE; - } service_unlock(service->service_entry); ret = WaitForSingleObject(control_mutex, 30000); if (ret == WAIT_OBJECT_0) { - service_send_control(service->service_entry, control_pipe, dwControl, &result); + service_send_control(service->service_entry, service->service_entry->control_pipe, + dwControl, &result); if (lpServiceStatus) { @@ -1116,10 +1112,7 @@ DWORD __cdecl svcctl_ControlService( } if (dwControl == SERVICE_CONTROL_STOP) - { CloseHandle(control_mutex); - CloseHandle(control_pipe); - } else ReleaseMutex(control_mutex); @@ -1128,10 +1121,7 @@ DWORD __cdecl svcctl_ControlService( else { if (dwControl == SERVICE_CONTROL_STOP) - { CloseHandle(control_mutex); - CloseHandle(control_pipe); - } return ERROR_SERVICE_REQUEST_TIMEOUT; } } diff --git a/programs/services/services.c b/programs/services/services.c index f2c5d26..865cb55 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -813,6 +813,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * return ERROR_SERVICE_ALREADY_RUNNING; } + CloseHandle(service->control_pipe); service->control_mutex = CreateMutexW(NULL, TRUE, NULL); if (!service->status_changed_event)

1 0

Piotr Caban : services: Terminate service when its status is set to SERVICE_STOPPED.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: c21ede4474af3f2307bdc3178ae3cb5b0c26dbe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21ede4474af3f2307bdc3178… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 12 11:04:58 2011 +0100 services: Terminate service when its status is set to SERVICE_STOPPED. --- programs/services/rpc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 0de183a..579602a 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -697,7 +697,9 @@ DWORD __cdecl svcctl_SetServiceStatus( service->service_entry->status.dwWaitHint = lpServiceStatus->dwWaitHint; service_unlock(service->service_entry); - if (service->service_entry->status_changed_event) + if (lpServiceStatus->dwCurrentState == SERVICE_STOPPED) + service_terminate(service->service_entry); + else if (service->service_entry->status_changed_event) SetEvent(service->service_entry->status_changed_event); return ERROR_SUCCESS;

1 0

Alexandre Julliard : gdi32/tests: Add tests for 1-bpp DDB pattern brushes.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: f85a28faf6d7f2131c857b6ac9fe34d5437a6e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85a28faf6d7f2131c857b6ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 13:38:55 2011 +0100 gdi32/tests: Add tests for 1-bpp DDB pattern brushes. --- dlls/gdi32/tests/dib.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 909457d..5d1eb8b 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -101,6 +101,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "a78b28472bb7ff480ddedd06b9cf2daa775fa7ae", "5246ef357e7317b9d141a3294d300c195da76cb7", "87f6b6a19f021ca5912d285e14ce2ff9474d79f3", + "3d8244b665ecdb104087bad171b0b0f83545133c", "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", "8b66f14d51ecdeea12bc993302bb9b7d3ec085a1", "7da9dd3d40d44d92deb9883fb7110443c2d5769a", @@ -163,6 +164,7 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "a78b28472bb7ff480ddedd06b9cf2daa775fa7ae", "5246ef357e7317b9d141a3294d300c195da76cb7", "87f6b6a19f021ca5912d285e14ce2ff9474d79f3", + "3d8244b665ecdb104087bad171b0b0f83545133c", "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", "8b66f14d51ecdeea12bc993302bb9b7d3ec085a1", "7da9dd3d40d44d92deb9883fb7110443c2d5769a", @@ -225,6 +227,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "473a1fd07df800c87a5d3286b642ace10c61c6af", "10cd25a0ed5cd8f978d7d68236f81d949b938e84", "b8951d2b20518fd129e5113a5f429626893913bf", + "e81fc45962f861d53f420e29cb5d33faf5adbec8", "4851c5b7d5bc18590e787c0c218a592ef504e738", "9aa506e3df33e0d5298755aa4144e10eb4b5adcf", "abdf003699364fe45fab7dc61e67c606d0063b40", @@ -287,6 +290,7 @@ static const char *sha1_graphics_r10g10b10[] = "92cddcabf5365eef1e037f488af52b31669d987f", "2c9c4f27bade080a2cd6f9160422762e267c2f5f", "c7ce29d189dc06ba57e64f0cc32202f5a25ba48d", + "717778cc9ab30bcfc026a4344ea1bdef870bd247", "7ac4cb547c8f4ce5079c95afad9d0e2b0cd76a0e", "d578210815e27fe210eb678a71e6d22ba4b4c196", "c7a027c7079dfcc831ca8bc134a509958273073c", @@ -349,6 +353,7 @@ static const char *sha1_graphics_r6g6b6[] = "2128157e601ef0d6b3636b7387d3b28e876de728", "8bdcdcd463f0052279d070ac763757f4db975483", "9ea0ad22d7b61598fe36e9c942242e8e07e32edb", + "8b6452ebd1f6d189d10ee6647e7704821559cfcb", "c39a25a61c4eade48dea62a97c9fb8714c06a8af", "66b130f83381957cfc4763558c5f5cddf2e3b564", "d548135ce2320499277ce12b80bc35004f8a9787", @@ -411,6 +416,7 @@ static const char *sha1_graphics_24[] = "adc20832d8c43f1cf372d8392535492013cd2306", "45649794dcbcabda487f66f7a80fc1bec79047a1", "367c2dc1e91ff9ea0e984d6fb3000cfb4e0ae7e9", + "9c6afd47dd748a33c585e6655fd4ec1c28976a47", "b4df692ac70a5f9f303270df4641ab014c6cbf46", "8bc3128ba47891366fd7b02fde7ca19100e64b9f", "e649e00efe7fea1eb8b17f7867fe089e5270c44b", @@ -473,6 +479,7 @@ static const char *sha1_graphics_r5g5b5[] = "6daaf945a955928c5c124c880522ca4634fb2343", "12a288390d16e1efa99d4185301de48a4d433b14", "ea92af2538b76f41a3a03eaa11ac395c9b6197c4", + "1d3af561605fd61433035600d8962cb8d266fdd0", "3a50ce21b3563a604b4fc9f247a30f5a981f1ba6", "d7d97e28ed316f6596c737eb83baa5948d86b673", "ecc2991277d7314f55b00e0f284ae3703aeef81e", @@ -539,6 +546,7 @@ static const char *sha1_graphics_r4g4b4[] = "1d283aa4d2b2114f7809fe59357d590c7c779aa7", "29640e2ddd2d3016da14507c3ce9b2ce32f39bb4", "57ebf8becac1524543da120e88e9cc57ecfdec49", + "e68ef3ffd7401244cdea79781eab12d7a5e8ca18", "d591232bbc2592462c819a9486750f64180518fd", "0e183a4c30b3da345129cffe33fe0fc593d8666b", "f14d9a4bd8a365b7c8f068a0dad481b6eb2b178b", @@ -600,6 +608,7 @@ static const char *sha1_graphics_8_color[] = "940db409d4c3e5640275724f9e5f7c1a0d2e21b2", "242ce86967ea62fa69c1e6f597ccbcf2f0b1602c", "5092b22af85a08f10a2899888bb9d552f25f828e", + "f5dafef807237fe72c74c0bbd47c382ace45bfde", "e91973be2651eeef568700463652838d8cbba976", "1df851515ecf46df5c2d3279535c1763f72353dd", "b68922915ebc2797d58deecf983f7d0cf9a5efbd", @@ -671,6 +680,7 @@ static const char *sha1_graphics_8_grayscale[] = "15b991814d84d6aa252696dd0c6150ef88a8db3f", "1cb52f2a4d17b9b0d8375d016aa8cf0677fcd29a", "9a6cfd68523e40ea1d52847d7747da912cfe2ca9", + "b6785a410048bb85e7ea3f0492459972103c935e", "82e641ebe47d9f8cc229b82b8315e69e52f812b1", "15db343049e3a9b31addc5d2ffebc3fe91b39c51", "a895daf1f20371d4d1c3f93c070124cc13e341c3", @@ -739,6 +749,7 @@ static const char *sha1_graphics_8[] = "7262364067e03c7fa498af1d59d228d6c63b460e", "5241241a355a667ef0834049adf4218e8b3f16b8", "db22d666690948eb966f75b796c72c7150a5c4b9", + "af21fb2645b568b049549de375584c4aa3055143", "1f13ea0034db4b0ffa4ddcff9664fd892058f9cd", "3caf512cfddfd463d0750cfe3cadb58548eb2ae8", "4e5e7d5fd64818b2b3d3e793c88f603b699d2f0f", @@ -804,6 +815,7 @@ static const char *sha1_graphics_4[] = "eb38683e812fd13dca971ba8f4cfd2b6820d3524", "73bbc83f88f1aaa6df0158b63e70bb3165163163", "0dc2690a5c58a2907a8ab06693ebfab6698172eb", + "df5f0d6574bdf1781754b5b9f98232a77e439e33", "39c16648cf6c261be71a33cec41867f28e119b94", "26ad5116562e7b58c76a26eaf521e2e40899e944", "1bcc54eaf8e3c2b7c59ecccb23c240181d7ba8b8", @@ -865,6 +877,7 @@ static const char *sha1_graphics_4_grayscale[] = "b067f0421cb2c83b218b8ab6edbede2ff5723b57", "c8de76f9c0900e5f86c7584fe94d5749376b7b49", "43ee3e187dda14b86aef12371041ae70313b5a65", + "7fab79b7f1a5cb2ec31ed8eeaf213b3d8dcde4d8", "d4930552a7845111ffd9db57260be1ab97967c06", "afdf41fca7951c6dd6193320de1295f2c68fe52a", "f2f1f331fe6b1b31d7c9ddd37793b375fc01d3d4", @@ -939,6 +952,9 @@ static const char *sha1_graphics_1[] = "4d95c3d1e170f004c80aa8c52feafb8e0e90760e", "c14832e69ec3585c15987b3d69d5007236fa9814", "e44ea620b0c47125a34193537ab9d219a52ad028", + "ef2db9fb75a672f69bab88e5d08fe64f50ec2bc4", + "8819bf7a43295161fe045a42936000b3a51fe200", + "e08dbc26469c229f75ccbf1a38a133401f270b84", "d1e6091caa4482d3142df3b958606c41ebf4698e", "07c1116d8286fb665a1005de220eadc3d5999aaf", "4afb0649488f6e6f7d3a2b8bf438d82f2c88f4d1", @@ -1196,6 +1212,9 @@ static const DWORD four_by_four_data[16] = { 0x000000, 0xff0000, 0x00ff00, 0x000 0x000000, 0xff0000, 0x00ff00, 0x0000ff, 0xffffff, 0x00ffff, 0xff00ff, 0xffff00 }; +static const DWORD ddb_brush_bits[8] = { 0x11112222, 0x33334444, 0x55556666, 0x77778888, + 0xaaaaaaaa, 0x00000000, 0x98765432, 0xabcdef00 }; + static inline void solid_patblt( HDC hdc, int x, int y, int width, int height, COLORREF color ) { HBRUSH brush = CreateSolidBrush( color ); @@ -1222,6 +1241,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh BOOL ret, dib_is_1bpp = (bmi->bmiHeader.biBitCount == 1); BOOL dib_is_8bpp_gray = (bmi->bmiHeader.biBitCount == 8 && bmi->bmiColors[1].rgbRed == 1); BLENDFUNCTION blend; + COLORREF old_text, old_bkgnd; blend.BlendOp = AC_SRC_OVER; blend.BlendFlags = 0; @@ -1606,7 +1626,35 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); + DeleteObject(dib_brush); + + /* 1 bpp ddb pattern brush */ + + old_text = GetTextColor( hdc ); + old_bkgnd = GetBkColor( hdc ); + bmp = CreateBitmap( 16, 16, 1, 1, ddb_brush_bits ); + dib_brush = CreatePatternBrush( bmp ); + SelectObject(hdc, dib_brush); + for(i = 0, y = 10; i < 256; i++) + { + SetTextColor(hdc, RGB( i, 2*i, 255 - i ) ); + SetBkColor(hdc, RGB( 255 - i, i / 3, i ) ); + if(!rop_uses_src(rop3[i])) + { + ret = PatBlt(hdc, 10 + i, y, 100, 20, rop3[i]); + ok(ret, "got FALSE for %x\n", rop3[i]); + y += 25; + } + } + + compare_hash_broken_todo(bmi, bits, sha1, "1 bpp ddb brush patblt", dib_is_1bpp ? 2 : 0, dib_is_1bpp); + memset(bits, 0xcc, dib_size); + + DeleteObject(bmp); + SelectObject(hdc, orig_brush); SetBrushOrgEx(hdc, 0, 0, NULL); + SetTextColor(hdc, old_text); + SetBkColor(hdc, old_bkgnd); /* Rectangle */

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DPRIMITIVETYPE typedef.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: e6a4a866080dd5cd0800f991ceae0068ae99d552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a4a866080dd5cd0800f991c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 11 21:43:32 2011 +0100 wined3d: Get rid of the WINED3DPRIMITIVETYPE typedef. --- dlls/d3d10core/device.c | 4 +- dlls/wined3d/device.c | 50 ++++++++++++++++++++-------------------- dlls/wined3d/utils.c | 28 +++++++++++----------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 34 +++++++++++++------------- 5 files changed, 59 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6a4a866080dd5cd0800f…

1 0

Henri Verbeet : ddraw: Destroy the swapchain after the D3D device in DllMain().
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 9d55388156e5b95104d4c8566739ce6e9b81ba24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d55388156e5b95104d4c8566… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 11 21:43:28 2011 +0100 ddraw: Destroy the swapchain after the D3D device in DllMain(). --- dlls/ddraw/main.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 9d5bb53..1477913 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -941,9 +941,6 @@ DllMain(HINSTANCE hInstDLL, IDirectDraw4_AddRef(&ddraw->IDirectDraw4_iface); IDirectDraw7_AddRef(&ddraw->IDirectDraw7_iface); - if (ddraw->wined3d_swapchain) - ddraw_destroy_swapchain(ddraw); - /* Does a D3D device exist? Destroy it * TODO: Destroy all Vertex buffers, Lights, Materials * and execute buffers too @@ -954,6 +951,12 @@ DllMain(HINSTANCE hInstDLL, while(IDirect3DDevice7_Release(&ddraw->d3ddevice->IDirect3DDevice7_iface)); } + /* Destroy the swapchain after any 3D device. The 3D device + * cleanup code needs a swapchain. Specifically, it tries to + * set the current render target to the front buffer. */ + if (ddraw->wined3d_swapchain) + ddraw_destroy_swapchain(ddraw); + /* Try to release the objects * Do an EnumSurfaces to find any hanging surfaces */

1 0

Nikolay Sivov : msxml3: Use IXMLDOMDocument3 as a latest interface version.
by Alexandre Julliard Dec. 12, 2011

Dec. 12, 2011

Module: wine Branch: master Commit: 01ed475c7c277ac4068e942f925967e4b3469b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ed475c7c277ac4068e942f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 14:02:18 2011 +0300 msxml3: Use IXMLDOMDocument3 as a latest interface version. --- dlls/msxml3/attribute.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index aec1679..58be87d 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -432,17 +432,17 @@ static HRESULT WINAPI domattr_get_nodeTypedValue( hr = IXMLDOMAttribute_get_ownerDocument(iface, &doc); if (hr == S_OK) { - IXMLDOMDocument2 *doc2; + IXMLDOMDocument3 *doc3; - hr = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMDocument2, (void**)&doc2); + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMDocument3, (void**)&doc3); IXMLDOMDocument_Release(doc); if (hr == S_OK) { VARIANT schemas; - hr = IXMLDOMDocument2_get_schemas(doc2, &schemas); - IXMLDOMDocument2_Release(doc2); + hr = IXMLDOMDocument3_get_schemas(doc3, &schemas); + IXMLDOMDocument3_Release(doc3); if (hr != S_OK) return IXMLDOMAttribute_get_value(iface, value);

1 0