December 2011 - Wine-commits

Henri Verbeet : ddraw: Handle the special DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW combination .
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: 3e6313050bff97a720026735ca2f267575edeb26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6313050bff97a720026735c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 22 21:51:21 2011 +0100 ddraw: Handle the special DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW combination. --- dlls/ddraw/ddraw.c | 42 ++++++++++++++++++++++++++++++------------ dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 5 files changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 364e74f..21107f9 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -788,21 +788,20 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, } /* Handle those levels first which set various hwnds */ - if(cooplevel & DDSCL_SETFOCUSWINDOW) + if ((cooplevel & DDSCL_SETFOCUSWINDOW) && !(cooplevel & DDSCL_CREATEDEVICEWINDOW)) { /* This isn't compatible with a lot of flags */ - if(cooplevel & ( DDSCL_MULTITHREADED | - DDSCL_CREATEDEVICEWINDOW | - DDSCL_FPUSETUP | - DDSCL_FPUPRESERVE | - DDSCL_ALLOWREBOOT | - DDSCL_ALLOWMODEX | - DDSCL_SETDEVICEWINDOW | - DDSCL_NORMAL | - DDSCL_EXCLUSIVE | - DDSCL_FULLSCREEN ) ) + if (cooplevel & (DDSCL_MULTITHREADED + | DDSCL_FPUSETUP + | DDSCL_FPUPRESERVE + | DDSCL_ALLOWREBOOT + | DDSCL_ALLOWMODEX + | DDSCL_SETDEVICEWINDOW + | DDSCL_NORMAL + | DDSCL_EXCLUSIVE + | DDSCL_FULLSCREEN)) { - TRACE("Called with incompatible flags, returning DDERR_INVALIDPARAMS\n"); + WARN("Called with incompatible flags, returning DDERR_INVALIDPARAMS.\n"); wined3d_mutex_unlock(); return DDERR_INVALIDPARAMS; } @@ -845,7 +844,26 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, ShowWindow(device_window, SW_SHOW); TRACE("Created a device window %p.\n", device_window); + /* Native apparently leaks the created device window if setting the + * focus window below fails. */ + This->cooperative_level |= DDSCL_CREATEDEVICEWINDOW; This->devicewindow = device_window; + + if (cooplevel & DDSCL_SETFOCUSWINDOW) + { + if (!hwnd) + { + wined3d_mutex_unlock(); + return DDERR_NOHWND; + } + + if (FAILED(hr = ddraw_set_focus_window(This, hwnd))) + { + wined3d_mutex_unlock(); + return hr; + } + } + hwnd = device_window; } } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9640bf0..b2f3394 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -89,7 +89,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n"); @@ -99,7 +99,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw_SetCooperativeLevel(ddraw, focus_window, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n"); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e3e9e86..824250a 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -96,7 +96,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n"); @@ -106,7 +106,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw2_SetCooperativeLevel(ddraw, focus_window, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n"); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 48f5768..ead2aa3 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -392,7 +392,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n"); @@ -402,7 +402,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw4_SetCooperativeLevel(ddraw, focus_window, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n"); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 6448ea6..7c400ea 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -385,7 +385,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n"); @@ -395,7 +395,7 @@ static void test_coop_level_create_device_window(void) ok(!device_window, "Unexpected device window found.\n"); hr = IDirectDraw7_SetCooperativeLevel(ddraw, focus_window, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - todo_wine ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); todo_wine ok(!!device_window, "Device window not found.\n");

1 0

Henri Verbeet : ddraw: Fix the title and class name for the auto ddraw device window.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: 387a5f632cde39a15428285c53e4c063cc2121f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387a5f632cde39a15428285c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 22 21:51:22 2011 +0100 ddraw: Fix the title and class name for the auto ddraw device window. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/tests/ddraw1.c | 6 +++--- dlls/ddraw/tests/ddraw2.c | 6 +++--- dlls/ddraw/tests/ddraw4.c | 6 +++--- dlls/ddraw/tests/ddraw7.c | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 21107f9..28122f8 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -831,7 +831,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, return DDERR_NOFOCUSWINDOW; } - device_window = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "DDraw device window", + device_window = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "DirectDrawDeviceWnd", WS_POPUP, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), NULL, NULL, NULL, NULL); if (!device_window) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 5d27703..df96402 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -120,7 +120,7 @@ struct IDirectDrawImpl UINT numConvertedDecls, declArraySize; }; -#define DDRAW_WINDOW_CLASS_NAME "ddraw_wc" +#define DDRAW_WINDOW_CLASS_NAME "DirectDrawDeviceWnd" HRESULT ddraw_init(IDirectDrawImpl *ddraw, enum wined3d_device_type device_type) DECLSPEC_HIDDEN; void ddraw_destroy_swapchain(IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b2f3394..54a1569 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -91,7 +91,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -101,7 +101,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -118,7 +118,7 @@ static void test_coop_level_create_device_window(void) hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); IDirectDraw_Release(ddraw); DestroyWindow(focus_window); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 824250a..1af341e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -98,7 +98,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -108,7 +108,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -125,7 +125,7 @@ static void test_coop_level_create_device_window(void) hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); IDirectDraw2_Release(ddraw); DestroyWindow(focus_window); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ead2aa3..680c6ac 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -394,7 +394,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -404,7 +404,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -421,7 +421,7 @@ static void test_coop_level_create_device_window(void) hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); IDirectDraw4_Release(ddraw); DestroyWindow(focus_window); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7c400ea..89974e9 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -387,7 +387,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DDERR_NOHWND, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -397,7 +397,7 @@ static void test_coop_level_create_device_window(void) | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -414,7 +414,7 @@ static void test_coop_level_create_device_window(void) hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); device_window = FindWindowA("DirectDrawDeviceWnd", "DirectDrawDeviceWnd"); - todo_wine ok(!!device_window, "Device window not found.\n"); + ok(!!device_window, "Device window not found.\n"); IDirectDraw7_Release(ddraw); DestroyWindow(focus_window);

1 0

Nikolay Sivov : msxml3: IXSL* implementations do not depend on libxml2.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: 70fe8d5266163517e0934129ad50238418a72307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70fe8d5266163517e0934129a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 23 01:57:12 2011 +0300 msxml3: IXSL* implementations do not depend on libxml2. --- dlls/msxml3/stylesheet.c | 35 ++++++++++++----------------------- 1 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 716ebba..5ee71af 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -40,9 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); -#ifdef HAVE_LIBXML2 - -typedef struct _xsltemplate +typedef struct { DispatchEx dispex; IXSLTemplate IXSLTemplate_iface; @@ -51,7 +49,7 @@ typedef struct _xsltemplate IXMLDOMNode *node; } xsltemplate; -typedef struct _xslprocessor +typedef struct { DispatchEx dispex; IXSLProcessor IXSLProcessor_iface; @@ -115,15 +113,17 @@ static HRESULT WINAPI xsltemplate_QueryInterface( static ULONG WINAPI xsltemplate_AddRef( IXSLTemplate *iface ) { xsltemplate *This = impl_from_IXSLTemplate( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xsltemplate_Release( IXSLTemplate *iface ) { xsltemplate *This = impl_from_IXSLTemplate( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { if (This->node) IXMLDOMNode_Release( This->node ); @@ -220,7 +220,6 @@ static const struct IXSLTemplateVtbl XSLTemplateVtbl = xsltemplate_GetTypeInfo, xsltemplate_GetIDsOfNames, xsltemplate_Invoke, - xsltemplate_putref_stylesheet, xsltemplate_get_stylesheet, xsltemplate_createProcessor @@ -295,15 +294,17 @@ static HRESULT WINAPI xslprocessor_QueryInterface( static ULONG WINAPI xslprocessor_AddRef( IXSLProcessor *iface ) { xslprocessor *This = impl_from_IXSLProcessor( iface ); - return InterlockedIncrement( &This->ref ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface ) { xslprocessor *This = impl_from_IXSLProcessor( iface ); - ULONG ref; + ULONG ref = InterlockedDecrement( &This->ref ); - ref = InterlockedDecrement( &This->ref ); + TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { if (This->input) IXMLDOMNode_Release(This->input); @@ -591,7 +592,6 @@ static const struct IXSLProcessorVtbl XSLProcessorVtbl = xslprocessor_GetTypeInfo, xslprocessor_GetIDsOfNames, xslprocessor_Invoke, - xslprocessor_put_input, xslprocessor_get_input, xslprocessor_get_ownerTemplate, @@ -645,14 +645,3 @@ HRESULT XSLProcessor_create(xsltemplate *template, IXSLProcessor **ppObj) return S_OK; } - -#else - -HRESULT XSLTemplate_create(IUnknown *pUnkOuter, void **ppObj) -{ - MESSAGE("This program tried to use a XSLTemplate object, but\n" - "libxml2 support was not present at compile time.\n"); - return E_NOTIMPL; -} - -#endif

1 0

Aric Stewart : usp10: Add currency scripts to match windows.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: 91e0f56c05dcff14d3c16d2b7c4b88babffb6fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e0f56c05dcff14d3c16d2b7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 22 13:05:11 2011 -0600 usp10: Add currency scripts to match windows. --- dlls/usp10/shape.c | 3 +++ dlls/usp10/usp10.c | 27 ++++++++++++++++++++++++++- dlls/usp10/usp10_internal.h | 4 ++++ 3 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 7f23296..91f706b 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -715,6 +715,9 @@ static const ScriptShapeData ShapingData[] = {{ no_features, 0}, NULL, "osma", "", NULL, NULL}, {{ no_features, 0}, NULL, "osma", "", NULL, NULL}, {{ no_features, 0}, NULL, "math", "", NULL, NULL}, + {{ hebrew_features, 1}, NULL, "hebr", "", NULL, NULL}, + {{ latin_features, 2}, NULL, "latn" , "", NULL, NULL}, + {{ thai_features, 1}, NULL, "thai", "", NULL, ShapeCharGlyphProp_Thai}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 14674a7..2e2efb5 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -624,6 +624,18 @@ static const scriptData scriptInformation[] = { {0, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','a','t','h'), {'C','a','m','b','r','i','a',' ','M','a','t','h'}}, + {{Script_Hebrew_Currency, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_HEBREW, 0, 1, 0, 0, HEBREW_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('h','e','b','r'), + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, + {{Script_Vietnamese_Currency, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_VIETNAMESE, 0, 0, 0, 0, VIETNAMESE_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('l','a','t','n'), + {0}}, + {{Script_Thai_Currency, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_THAI, 0, 1, 0, 0, THAI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('t','h','a','i'), + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -667,7 +679,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[72].props, &scriptInformation[73].props, &scriptInformation[74].props, &scriptInformation[75].props, &scriptInformation[76].props, &scriptInformation[77].props, - &scriptInformation[78].props + &scriptInformation[78].props, &scriptInformation[79].props, + &scriptInformation[80].props, &scriptInformation[81].props }; typedef struct { @@ -830,6 +843,18 @@ static WORD get_char_script( LPCWSTR str, INT index, INT end, INT *consumed) if (str[index] == 0x2212 || str[index] == 0x2044) return Script_Punctuation; + /* Currency Symboles by Unicode point */ + switch (str[index]) + { + case 0x09f2: + case 0x09f3: return Script_Bengali_Currency; + case 0x0af1: return Script_Gujarati_Currency; + case 0x0e3f: return Script_Thai_Currency; + case 0x20aa: return Script_Hebrew_Currency; + case 0x20ab: return Script_Vietnamese_Currency; + case 0xfb29: return Script_Hebrew_Currency; + } + GetStringTypeW(CT_CTYPE1, &str[index], 1, &type); if (type == 0) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 559a0bc..fb98377 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -115,6 +115,10 @@ #define Script_Osmanya_Numeric 77 /* Unicode Chapter 15 : Plane 1 */ #define Script_MathAlpha 78 +/* Additional Currency Scripts */ +#define Script_Hebrew_Currency 79 +#define Script_Vietnamese_Currency 80 +#define Script_Thai_Currency 81 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Erich Hoover : hhctrl.ocx: Fix HTML Help crashing on non-chm files.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: 4ce176af61596b7e18ef54b713a1306b1f49aa48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce176af61596b7e18ef54b71… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Dec 22 12:12:06 2011 -0700 hhctrl.ocx: Fix HTML Help crashing on non-chm files. --- dlls/hhctrl.ocx/index.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index f119bbc..aa73bc9 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -277,6 +277,7 @@ void ReleaseIndex(HHInfo *info) IndexItem *item = info->index, *next; int i; + if(!item) return; /* Note: item->merge is identical for all items, only free once */ heap_free(item->merge.chm_file); heap_free(item->merge.chm_index);

1 0

Hans Leidekker : msi: Fix changing media for normal files.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: ad4f747fa68fe185854e6fbbc6f0fec62e762e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4f747fa68fe185854e6fbbc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 23 13:53:34 2011 +0100 msi: Fix changing media for normal files. --- dlls/msi/files.c | 4 +- dlls/msi/media.c | 94 ++++++++++++++++++++++++---------------------------- dlls/msi/msipriv.h | 2 +- 3 files changed, 46 insertions(+), 54 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index c6282f7..f755d92 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -331,7 +331,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) if (!file->Component->Enabled) continue; if (file->state != msifs_hashmatch && - (rc = ready_media( package, file->Sequence, file->IsCompressed, mi ))) + (rc = ready_media( package, file->IsCompressed, mi ))) { ERR("Failed to ready media for %s\n", debugstr_w(file->File)); goto done; @@ -512,7 +512,7 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) { MSICABDATA data; - rc = ready_media( package, patch->Sequence, TRUE, mi ); + rc = ready_media( package, TRUE, mi ); if (rc != ERROR_SUCCESS) { ERR("Failed to ready media for %s\n", debugstr_w(file->File)); diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 9162c3b..f8ed27e 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -838,79 +838,71 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) return ERROR_FUNCTION_FAILED; } -UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, MSIMEDIAINFO *mi) +UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) { - UINT rc = ERROR_SUCCESS; - WCHAR *cabinet_file; + UINT rc; + WCHAR *cabinet_file = NULL; /* media info for continuous cabinet is already loaded */ - if (mi->is_continuous) - return ERROR_SUCCESS; - - /* cabinet is internal, no checks needed */ - if (!mi->cabinet || mi->cabinet[0] == '#') - return ERROR_SUCCESS; - - cabinet_file = get_cabinet_filename(mi); + if (mi->is_continuous) return ERROR_SUCCESS; - /* package should be downloaded */ - if (IsCompressed && - GetFileAttributesW(cabinet_file) == INVALID_FILE_ATTRIBUTES && - package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) + if (mi->cabinet) { - WCHAR temppath[MAX_PATH], *p; + /* cabinet is internal, no checks needed */ + if (mi->cabinet[0] == '#') return ERROR_SUCCESS; - rc = msi_download_file(cabinet_file, temppath); - if (rc != ERROR_SUCCESS) + if (!(cabinet_file = get_cabinet_filename( mi ))) return ERROR_OUTOFMEMORY; + + /* package should be downloaded */ + if (compressed && GetFileAttributesW( cabinet_file ) == INVALID_FILE_ATTRIBUTES && + package->BaseURL && UrlIsW( package->BaseURL, URLIS_URL )) { - ERR("Failed to download %s (%u)\n", debugstr_w(cabinet_file), rc); - msi_free(cabinet_file); - return rc; - } - if ((p = strrchrW(temppath, '\\'))) *p = 0; - strcpyW(mi->sourcedir, temppath); - PathAddBackslashW(mi->sourcedir); - msi_free(mi->cabinet); - mi->cabinet = strdupW(p + 1); + WCHAR temppath[MAX_PATH], *p; - msi_free(cabinet_file); - return ERROR_SUCCESS; + if ((rc = msi_download_file( cabinet_file, temppath )) != ERROR_SUCCESS) + { + ERR("failed to download %s (%u)\n", debugstr_w(cabinet_file), rc); + msi_free( cabinet_file ); + return rc; + } + if ((p = strrchrW( temppath, '\\' ))) *p = 0; + strcpyW( mi->sourcedir, temppath ); + PathAddBackslashW( mi->sourcedir ); + msi_free( mi->cabinet ); + mi->cabinet = strdupW( p + 1 ); + msi_free( cabinet_file ); + return ERROR_SUCCESS; + } } - /* check volume matches, change media if not */ - if (mi->volume_label && mi->disk_id > 1 && - strcmpW( mi->first_volume, mi->volume_label )) + if (mi->volume_label && mi->disk_id > 1 && strcmpW( mi->first_volume, mi->volume_label )) { - LPWSTR source = msi_dup_property(package->db, szSourceDir); - BOOL matches; - - matches = source_matches_volume(mi, source); - msi_free(source); + WCHAR *source = msi_dup_property( package->db, szSourceDir ); + BOOL match = source_matches_volume( mi, source ); + msi_free( source ); - if ((mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE) && !matches) + if (!match && (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE)) { - rc = msi_change_media(package, mi); - if (rc != ERROR_SUCCESS) + if ((rc = msi_change_media( package, mi )) != ERROR_SUCCESS) { - msi_free(cabinet_file); + msi_free( cabinet_file ); return rc; } } } - - if (IsCompressed && - GetFileAttributesW(cabinet_file) == INVALID_FILE_ATTRIBUTES) + if (mi->cabinet) { - rc = find_published_source(package, mi); - if (rc != ERROR_SUCCESS) + if (compressed && GetFileAttributesW( cabinet_file ) == INVALID_FILE_ATTRIBUTES) { - ERR("Cabinet not found: %s\n", debugstr_w(cabinet_file)); - msi_free(cabinet_file); - return ERROR_INSTALL_FAILURE; + if ((rc = find_published_source( package, mi )) != ERROR_SUCCESS) + { + ERR("cabinet not found: %s\n", debugstr_w(cabinet_file)); + msi_free( cabinet_file ); + return ERROR_INSTALL_FAILURE; + } } } - - msi_free(cabinet_file); + msi_free( cabinet_file ); return ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2ebac31..619cfcb 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1041,7 +1041,7 @@ typedef struct PVOID user; } MSICABDATA; -extern UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, MSIMEDIAINFO *mi) DECLSPEC_HIDDEN; +extern UINT ready_media(MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi) DECLSPEC_HIDDEN; extern UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) DECLSPEC_HIDDEN; extern void msi_free_media_info(MSIMEDIAINFO *mi) DECLSPEC_HIDDEN; extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Use a common function to validate a product ID.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: bde25b2cb4296540ea8378f45e06adcc40bebdfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde25b2cb4296540ea8378f45… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 23 13:53:54 2011 +0100 msi: Use a common function to validate a product ID. --- dlls/msi/action.c | 8 ++++++-- dlls/msi/events.c | 15 +-------------- dlls/msi/msipriv.h | 1 + 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 77749d8..8505507 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6871,7 +6871,7 @@ static UINT ACTION_RemoveEnvironmentStrings( MSIPACKAGE *package ) return rc; } -static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) +UINT msi_validate_product_id( MSIPACKAGE *package ) { LPWSTR key, template, id; UINT r = ERROR_SUCCESS; @@ -6884,7 +6884,6 @@ static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) } template = msi_dup_property( package->db, szPIDTemplate ); key = msi_dup_property( package->db, szPIDKEY ); - if (key && template) { FIXME( "partial stub: template %s key %s\n", debugstr_w(template), debugstr_w(key) ); @@ -6895,6 +6894,11 @@ static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) return r; } +static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) +{ + return msi_validate_product_id( package ); +} + static UINT ACTION_ScheduleReboot( MSIPACKAGE *package ) { TRACE("\n"); diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 2c0431d..785d98a 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -389,20 +389,7 @@ static UINT ControlEvent_Reinstall( MSIPACKAGE *package, LPCWSTR argument, static UINT ControlEvent_ValidateProductID(MSIPACKAGE *package, LPCWSTR argument, msi_dialog *dialog) { - LPWSTR key, template; - UINT ret = ERROR_SUCCESS; - - template = msi_dup_property( package->db, szPIDTemplate ); - key = msi_dup_property( package->db, szPIDKEY ); - - if (key && template) - { - FIXME( "partial stub: template %s key %s\n", debugstr_w(template), debugstr_w(key) ); - ret = msi_set_property( package->db, szProductID, key ); - } - msi_free( template ); - msi_free( key ); - return ret; + return msi_validate_product_id( package ); } static const WCHAR end_dialogW[] = {'E','n','d','D','i','a','l','o','g',0}; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 619cfcb..dd8bd82 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -786,6 +786,7 @@ extern INSTALLSTATE msi_get_component_action( MSIPACKAGE *package, MSICOMPONENT extern INSTALLSTATE msi_get_feature_action( MSIPACKAGE *package, MSIFEATURE *feature ) DECLSPEC_HIDDEN; extern UINT msi_load_all_components( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern UINT msi_load_all_features( MSIPACKAGE *package ) DECLSPEC_HIDDEN; +extern UINT msi_validate_product_id( MSIPACKAGE *package ) DECLSPEC_HIDDEN; /* record internals */ extern void MSI_CloseRecord( MSIOBJECTHDR * ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Recompute the brush masks on every use to support PALETTEINDEX colors.
by Alexandre Julliard 23 Dec '11

23 Dec '11

Module: wine Branch: master Commit: 43373c29effd217f76b1da86063b4e665a41f749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43373c29effd217f76b1da860… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 10:21:42 2011 +0100 gdi32: Recompute the brush masks on every use to support PALETTEINDEX colors. --- dlls/gdi32/dibdrv/dc.c | 1 - dlls/gdi32/dibdrv/dibdrv.h | 1 - dlls/gdi32/dibdrv/objects.c | 48 ++++++++++++++++++------------------------ 3 files changed, 21 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 571a070..a33c488 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -260,7 +260,6 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit static void update_fg_colors( dibdrv_physdev *pdev ) { pdev->pen_color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); - pdev->brush_color = get_pixel_color( pdev, pdev->brush_colorref, TRUE ); pdev->text_color = get_pixel_color( pdev, GetTextColor( pdev->dev.hdc ), TRUE ); } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 1bf9114..b0966af 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -94,7 +94,6 @@ typedef struct dibdrv_physdev UINT brush_hatch; INT brush_rop; /* PatBlt, for example, can override the DC's rop2 */ COLORREF brush_colorref; - DWORD brush_color, brush_and, brush_xor; dib_info brush_dib; void *brush_and_bits, *brush_xor_bits; const BITMAPINFO *brush_pattern_info; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 281642a..084d447 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -207,8 +207,10 @@ static inline void get_pen_bkgnd_masks(const dibdrv_physdev *pdev, DWORD *and, D } } -static inline void get_brush_bkgnd_masks(const dibdrv_physdev *pdev, DWORD *and, DWORD *xor) +static inline void get_brush_bkgnd_masks(dibdrv_physdev *pdev, DWORD *and, DWORD *xor) { + DWORD color; + if(GetBkMode(pdev->dev.hdc) == TRANSPARENT) { *and = pdev->bkgnd_and; @@ -216,15 +218,15 @@ static inline void get_brush_bkgnd_masks(const dibdrv_physdev *pdev, DWORD *and, } else { - DWORD color = pdev->bkgnd_color; - if(pdev->dib.bit_count == 1) { if(pdev->brush_colorref == GetBkColor(pdev->dev.hdc)) - color = pdev->brush_color; + color = get_pixel_color( pdev, pdev->brush_colorref, TRUE ); else - color = ~pdev->brush_color; + color = ~get_pixel_color( pdev, pdev->brush_colorref, TRUE ); } + else color = get_pixel_color( pdev, GetBkColor( pdev->dev.hdc ), FALSE ); + calc_and_xor_masks( pdev->brush_rop, color, and, xor ); } } @@ -1455,10 +1457,9 @@ void solid_rects( dib_info *dib, int num, const RECT *rects, const rop_mask *col static BOOL solid_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN region) { rop_mask brush_color; + DWORD color = get_pixel_color( pdev, pdev->brush_colorref, TRUE ); - brush_color.and = pdev->brush_and; - brush_color.xor = pdev->brush_xor; - + calc_and_xor_masks( pdev->brush_rop, color, &brush_color.and, &brush_color.xor ); solid_rects( dib, num, rects, &brush_color, region ); return TRUE; } @@ -1522,7 +1523,7 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev) dib_info hatch; rop_mask fg_mask, bg_mask; rop_mask_bits mask_bits; - DWORD size; + DWORD size, color; BOOL ret; assert(pdev->brush_and_bits == NULL); @@ -1556,8 +1557,9 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev) hatch.bits.free = hatch.bits.param = NULL; hatch.bits.is_copy = FALSE; - fg_mask.and = pdev->brush_and; - fg_mask.xor = pdev->brush_xor; + color = get_pixel_color( pdev, pdev->brush_colorref, TRUE ); + calc_and_xor_masks( pdev->brush_rop, color, &fg_mask.and, &fg_mask.xor ); + get_brush_bkgnd_masks( pdev, &bg_mask.and, &bg_mask.xor ); ret = pdev->brush_dib.funcs->create_rop_masks( &pdev->brush_dib, &hatch, &fg_mask, &bg_mask, &mask_bits ); @@ -1705,7 +1707,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE if (!clip) { dib->funcs->pattern_rects( dib, num, rects, &origin, &pdev->brush_dib, pdev->brush_and_bits, pdev->brush_xor_bits ); - return TRUE; + goto done; } for(i = 0; i < num; i++) @@ -1738,8 +1740,8 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE } release_wine_region( region ); +done: if (needs_reselect) free_pattern_brush( pdev ); - return TRUE; } @@ -1751,8 +1753,6 @@ static BOOL null_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RECT void update_brush_rop( dibdrv_physdev *pdev, INT rop ) { pdev->brush_rop = rop; - if(pdev->brush_style == BS_SOLID || pdev->brush_style == BS_HATCHED) - calc_and_xor_masks(rop, pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); free_pattern_brush_bits( pdev ); } @@ -1768,6 +1768,8 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, TRACE("(%p, %p)\n", dev, hbrush); + free_pattern_brush( pdev ); + if (bitmap || info) /* pattern brush */ { pdev->brush_rects = pattern_brush; @@ -1776,26 +1778,23 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, pdev->brush_pattern_bits = bits; pdev->brush_pattern_usage = usage; pdev->brush_pattern_bitmap = bitmap; - free_pattern_brush( pdev ); /* brush is actually selected only when it's used */ + /* brush is actually selected only when it's used */ return next->funcs->pSelectBrush( next, hbrush, bitmap, info, bits, usage ); } - if (!GetObjectW( hbrush, sizeof(logbrush), &logbrush )) return 0; + GetObjectW( hbrush, sizeof(logbrush), &logbrush ); if (hbrush == GetStockObject( DC_BRUSH )) logbrush.lbColor = GetDCBrushColor( dev->hdc ); pdev->brush_style = logbrush.lbStyle; - free_pattern_brush( pdev ); - switch(logbrush.lbStyle) { case BS_SOLID: pdev->brush_colorref = logbrush.lbColor; - pdev->brush_color = get_pixel_color( pdev, pdev->brush_colorref, TRUE ); - calc_and_xor_masks(GetROP2(dev->hdc), pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); + pdev->brush_rop = GetROP2( dev->hdc ); pdev->brush_rects = solid_brush; break; @@ -1807,8 +1806,7 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, if(logbrush.lbHatch > HS_DIAGCROSS) return 0; pdev->brush_hatch = logbrush.lbHatch; pdev->brush_colorref = logbrush.lbColor; - pdev->brush_color = get_pixel_color( pdev, pdev->brush_colorref, TRUE ); - calc_and_xor_masks(GetROP2(dev->hdc), pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); + pdev->brush_rop = GetROP2( dev->hdc ); pdev->brush_rects = pattern_brush; break; @@ -1828,11 +1826,7 @@ COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) dibdrv_physdev *pdev = get_dibdrv_pdev(dev); if (GetCurrentObject(dev->hdc, OBJ_BRUSH) == GetStockObject( DC_BRUSH )) - { pdev->brush_colorref = color; - pdev->brush_color = get_pixel_color( pdev, pdev->brush_colorref, TRUE ); - calc_and_xor_masks(GetROP2(dev->hdc), pdev->brush_color, &pdev->brush_and, &pdev->brush_xor); - } return next->funcs->pSetDCBrushColor( next, color ); }

1 0

Piotr Caban : msvcp90: Added ctype<wchar_t> constructors implementation.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: b4a93e46ccea70b69e9cd5d8452831c2bd17067a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a93e46ccea70b69e9cd5d84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 22 18:24:07 2011 +0100 msvcp90: Added ctype<wchar_t> constructors implementation. --- dlls/msvcp90/locale.c | 72 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 55 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ad72732..7474586 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1674,16 +1674,16 @@ extern const vtable_ptr MSVCP_ctype_short_vtable; /* ?_Id_func@?$ctype(a)_W@std@@SAAEAVid(a)locale@2(a)XZ */ locale_id* __cdecl ctype_wchar__Id_func(void) { - FIXME("() stub\n"); - return NULL; + TRACE("()\n"); + return &ctype_wchar_id; } /* ?_Id_func@?$ctype(a)G@std@@SAAAVid(a)locale@2(a)XZ */ /* ?_Id_func@?$ctype(a)G@std@@SAAEAVid(a)locale@2(a)XZ */ locale_id* __cdecl ctype_short__Id_func(void) { - FIXME("() stub\n"); - return NULL; + TRACE("()\n"); + return &ctype_short_id; } /* ?_Init@?$ctype(a)_W@std@@IAEXABV_Locinfo(a)2@@Z */ @@ -1693,7 +1693,9 @@ locale_id* __cdecl ctype_short__Id_func(void) DEFINE_THISCALL_WRAPPER(ctype_wchar__Init, 8) void __thiscall ctype_wchar__Init(ctype_wchar *this, _Locinfo *locinfo) { - FIXME("(%p %p) stub\n", this, locinfo); + TRACE("(%p %p)\n", this, locinfo); + this->ctype = _Locinfo__Getctype(locinfo); + this->cvt = _Locinfo__Getcvt(locinfo); } /* ??0?$ctype(a)_W@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -1702,9 +1704,11 @@ DEFINE_THISCALL_WRAPPER(ctype_wchar_ctor_locinfo, 12) ctype_wchar* __thiscall ctype_wchar_ctor_locinfo(ctype_wchar *this, _Locinfo *locinfo, MSVCP_size_t refs) { - FIXME("(%p %p %lu) stub\n", this, locinfo, refs); + TRACE("(%p %p %lu)\n", this, locinfo, refs); + ctype_base_ctor_refs(&this->base, refs); this->base.facet.vtable = &MSVCP_ctype_wchar_vtable; - return NULL; + ctype_wchar__Init(this, locinfo); + return this; } /* ??0?$ctype(a)G@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -1723,9 +1727,17 @@ ctype_wchar* __thiscall ctype_short_ctor_locinfo(ctype_wchar *this, DEFINE_THISCALL_WRAPPER(ctype_wchar_ctor_refs, 8) ctype_wchar* __thiscall ctype_wchar_ctor_refs(ctype_wchar *this, MSVCP_size_t refs) { - FIXME("(%p %lu) stub\n", this, refs); + _Locinfo locinfo; + + TRACE("(%p %lu)\n", this, refs); + + ctype_base_ctor_refs(&this->base, refs); this->base.facet.vtable = &MSVCP_ctype_wchar_vtable; - return NULL; + + _Locinfo_ctor(&locinfo); + ctype_wchar__Init(this, &locinfo); + _Locinfo_dtor(&locinfo); + return this; } /* ??0?$ctype(a)G@std@@QAE(a)I@Z */ @@ -1739,13 +1751,22 @@ ctype_wchar* __thiscall ctype_short_ctor_refs(ctype_wchar *this, MSVCP_size_t re } /* ??0?$ctype(a)G@std@@IAE(a)PBDI@Z */ +/* ??0?$ctype(a)G@std@@IEAA(a)PEBD_K@Z */ DEFINE_THISCALL_WRAPPER(ctype_short_ctor_name, 12) ctype_wchar* __thiscall ctype_short_ctor_name(ctype_wchar *this, const char *name, MSVCP_size_t refs) { - FIXME("(%p %s %lu) stub\n", this, debugstr_a(name), refs); + _Locinfo locinfo; + + TRACE("(%p %s %lu)\n", this, debugstr_a(name), refs); + + ctype_base_ctor_refs(&this->base, refs); this->base.facet.vtable = &MSVCP_ctype_short_vtable; - return NULL; + + _Locinfo_ctor_cstr(&locinfo, name); + ctype_wchar__Init(this, &locinfo); + _Locinfo_dtor(&locinfo); + return this; } /* ??_F?$ctype(a)_W@std@@QAEXXZ */ @@ -1753,9 +1774,8 @@ ctype_wchar* __thiscall ctype_short_ctor_name(ctype_wchar *this, DEFINE_THISCALL_WRAPPER(ctype_wchar_ctor, 4) ctype_wchar* __thiscall ctype_wchar_ctor(ctype_wchar *this) { - FIXME("(%p) stub\n", this); - this->base.facet.vtable = &MSVCP_ctype_wchar_vtable; - return NULL; + TRACE("(%p)\n", this); + return ctype_short_ctor_refs(this, 0); } /* ??_F?$ctype(a)G@std@@QAEXXZ */ @@ -1775,7 +1795,9 @@ ctype_wchar* __thiscall ctype_short_ctor(ctype_wchar *this) DEFINE_THISCALL_WRAPPER(ctype_wchar_dtor, 4) void __thiscall ctype_wchar_dtor(ctype_wchar *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + if(this->ctype.delfl) + free((void*)this->ctype.table); } DEFINE_THISCALL_WRAPPER(MSVCP_ctype_wchar_vector_dtor, 8) @@ -1972,8 +1994,24 @@ const char* __thiscall ctype_wchar__Widen_s(const ctype_wchar *this, /* ?_Getcat@?$ctype(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl ctype_wchar__Getcat(const locale_facet **facet, const locale *loc) { - FIXME("(%p %p) stub\n", facet, loc); - return 0; + TRACE("(%p %p)\n", facet, loc); + + if(facet && !*facet) { + _Locinfo locinfo; + + *facet = MSVCRT_operator_new(sizeof(ctype_wchar)); + if(!*facet) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return 0; + } + + _Locinfo_ctor_cstr(&locinfo, MSVCP_basic_string_char_c_str(&loc->ptr->name)); + ctype_wchar_ctor_locinfo((ctype_wchar*)*facet, &locinfo, 0); + _Locinfo_dtor(&locinfo); + } + + return LC_CTYPE; } /* ?do_tolower@?$ctype(a)_W@std@@MBE_W_W(a)Z */

1 0

Piotr Caban : msvcp90: Added ctype<wchar_t>:: narrow functions implementation.
by Alexandre Julliard 22 Dec '11

22 Dec '11

Module: wine Branch: master Commit: 138db092982df47d31dbf3361e55e7b26f77d7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138db092982df47d31dbf3361… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 22 18:24:21 2011 +0100 msvcp90: Added ctype<wchar_t>::narrow functions implementation. --- dlls/msvcp90/locale.c | 82 ++++++++++++++++++++++++++++++++++-------- dlls/msvcp90/msvcp90.h | 5 +++ dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/msvcp90_main.c | 5 +++ 4 files changed, 77 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 7474586..76e55ac 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -22,6 +22,8 @@ #include "msvcp90.h" #include "locale.h" +#include "errno.h" +#include "limits.h" #include "windef.h" #include "winbase.h" @@ -1826,6 +1828,38 @@ ctype_wchar* __thiscall MSVCP_ctype_short_vector_dtor(ctype_wchar *this, unsigne return MSVCP_ctype_wchar_vector_dtor(this, flags); } +/* _Wcrtomb */ +int __cdecl _Wcrtomb(char *s, wchar_t wch, int *state, const _Cvtvec *cvt) +{ + int cp, size; + BOOL def; + + TRACE("%p %d %p %p\n", s, wch, state, cvt); + + if(cvt) + cp = cvt->page; + else + cp = ___lc_codepage_func(); + + if(!cp) { + if(wch > 255) { + *_errno() = EILSEQ; + return -1; + } + + *s = wch & 255; + return 1; + } + + size = WideCharToMultiByte(cp, 0, &wch, 1, s, MB_LEN_MAX, NULL, &def); + if(!size || def) { + *_errno() = EILSEQ; + return -1; + } + + return size; +} + /* ?_Donarrow@?$ctype(a)_W@std@@IBED_WD(a)Z */ /* ?_Donarrow@?$ctype(a)_W@std@@IEBAD_WD(a)Z */ /* ?_Donarrow@?$ctype(a)G@std@@IBEDGD(a)Z */ @@ -1833,8 +1867,11 @@ ctype_wchar* __thiscall MSVCP_ctype_short_vector_dtor(ctype_wchar *this, unsigne DEFINE_THISCALL_WRAPPER(ctype_wchar__Donarrow, 12) char __thiscall ctype_wchar__Donarrow(const ctype_wchar *this, wchar_t ch, char dflt) { - FIXME("(%p %d %d) stub\n", this, ch, dflt); - return 0; + char buf[MB_LEN_MAX]; + + TRACE("(%p %d %d)\n", this, ch, dflt); + + return _Wcrtomb(buf, ch, NULL, &this->cvt)==1 ? buf[0] : dflt; } /* ?do_narrow@?$ctype(a)_W@std@@MBED_WD(a)Z */ @@ -1842,10 +1879,11 @@ char __thiscall ctype_wchar__Donarrow(const ctype_wchar *this, wchar_t ch, char /* ?do_narrow@?$ctype(a)G@std@@MBEDGD(a)Z */ /* ?do_narrow@?$ctype(a)G@std@@MEBADGD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_narrow_ch, 12) -wchar_t __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, char dflt) +#define call_ctype_wchar_do_narrow_ch(this, ch, dflt) CALL_VTBL_FUNC(this, 52, \ + char, (const ctype_wchar*, wchar_t, char), (this, ch, dflt)) +char __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, char dflt) { - FIXME("(%p %d %d) stub\n", this, ch, dflt); - return 0; + return ctype_wchar__Donarrow(this, ch, dflt); } /* ?do_narrow@?$ctype(a)_W@std@@MBEPB_WPB_W0DPAD(a)Z */ @@ -1853,11 +1891,16 @@ wchar_t __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, /* ?do_narrow@?$ctype(a)G@std@@MBEPBGPBG0DPAD(a)Z */ /* ?do_narrow@?$ctype(a)G@std@@MEBAPEBGPEBG0DPEAD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_narrow, 20) +#define call_ctype_wchar_do_narrow(this, first, last, dflt, dest) CALL_VTBL_FUNC(this, 48, \ + const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, char, char*), \ + (this, first, last, dflt, dest)) const wchar_t* __thiscall ctype_wchar_do_narrow(const ctype_wchar *this, const wchar_t *first, const wchar_t *last, char dflt, char *dest) { - FIXME("(%p %p %p %d %p) stub\n", this, first, last, dflt, dest); - return NULL; + TRACE("(%p %p %p %d %p)\n", this, first, last, dflt, dest); + for(; first<last; first++) + *dest++ = ctype_wchar__Donarrow(this, *first, dflt); + return last; } /* ?_Do_narrow_s@?$ctype(a)_W@std@@MBEPB_WPB_W0DPADI(a)Z */ @@ -1865,11 +1908,18 @@ const wchar_t* __thiscall ctype_wchar_do_narrow(const ctype_wchar *this, /* ?_Do_narrow_s@?$ctype(a)G@std@@MBEPBGPBG0DPADI(a)Z */ /* ?_Do_narrow_s@?$ctype(a)G@std@@MEBAPEBGPEBG0DPEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar__Do_narrow_s, 24) +#define call_ctype_wchar__Do_narrow_s(this, first, last, dflt, dest, size) CALL_VTBL_FUNC(this, 56, \ + const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, char, char*, MSVCP_size_t), \ + (this, first, last, dflt, dest, size)) const wchar_t* __thiscall ctype_wchar__Do_narrow_s(const ctype_wchar *this, const wchar_t *first, const wchar_t *last, char dflt, char *dest, MSVCP_size_t size) { - FIXME("(%p %p %p %d %p %lu) stub\n", this, first, last, dflt, dest, size); - return NULL; + TRACE("(%p %p %p %d %p %lu)\n", this, first, last, dflt, dest, size); + /* This function converts all multi-byte characters to dflt, + * thanks to it result size is known before converting */ + if(last-first > size) + ctype_base__Xran(); + return ctype_wchar_do_narrow(this, first, last, dflt, dest); } /* ?narrow@?$ctype(a)_W@std@@QBED_WD(a)Z */ @@ -1879,8 +1929,8 @@ const wchar_t* __thiscall ctype_wchar__Do_narrow_s(const ctype_wchar *this, DEFINE_THISCALL_WRAPPER(ctype_wchar_narrow_ch, 12) char __thiscall ctype_wchar_narrow_ch(const ctype_wchar *this, wchar_t ch, char dflt) { - FIXME("(%p %d %d) stub\n", this, ch, dflt); - return 0; + TRACE("(%p %d %d)\n", this, ch, dflt); + return call_ctype_wchar_do_narrow_ch(this, ch, dflt); } /* ?narrow@?$ctype(a)_W@std@@QBEPB_WPB_W0DPAD(a)Z */ @@ -1891,8 +1941,8 @@ DEFINE_THISCALL_WRAPPER(ctype_wchar_narrow, 20) const wchar_t* __thiscall ctype_wchar_narrow(const ctype_wchar *this, const wchar_t *first, const wchar_t *last, char dflt, char *dest) { - FIXME("(%p %p %p %d %p) stub\n", this, first, last, dflt, dest); - return NULL; + TRACE("(%p %p %p %d %p)\n", this, first, last, dflt, dest); + return call_ctype_wchar_do_narrow(this, first, last, dflt, dest); } /* ?_Narrow_s@?$ctype(a)_W@std@@QBEPB_WPB_W0DPADI(a)Z */ @@ -1901,10 +1951,10 @@ const wchar_t* __thiscall ctype_wchar_narrow(const ctype_wchar *this, /* ?_Narrow_s@?$ctype(a)G@std@@QEBAPEBGPEBG0DPEAD_K(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar__Narrow_s, 24) const wchar_t* __thiscall ctype_wchar__Narrow_s(const ctype_wchar *this, const wchar_t *first, - const wchar_t *last, char dflt, char *dest, unsigned int size) + const wchar_t *last, char dflt, char *dest, MSVCP_size_t size) { - FIXME("(%p %p %p %d %p %d) stub\n", this, first, last, dflt, dest, size); - return NULL; + TRACE("(%p %p %p %d %p %lu)\n", this, first, last, dflt, dest, size); + return call_ctype_wchar__Do_narrow_s(this, first, last, dflt, dest, size); } /* ?_Dowiden@?$ctype(a)_W@std@@IBE_WD(a)Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 61567e8..c34e1b9 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -145,6 +145,11 @@ extern void *vtbl_wrapper_28; extern void *vtbl_wrapper_32; extern void *vtbl_wrapper_36; extern void *vtbl_wrapper_40; +extern void *vtbl_wrapper_44; +extern void *vtbl_wrapper_48; +extern void *vtbl_wrapper_52; +extern void *vtbl_wrapper_56; +extern void *vtbl_wrapper_60; #else diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 976ab8f..bcf9087 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5802,7 +5802,7 @@ @ cdecl _Toupper(long ptr) @ stub _Towlower @ stub _Towupper -@ stub _Wcrtomb +@ cdecl _Wcrtomb(ptr long ptr ptr) @ cdecl _Wcscoll(ptr ptr ptr ptr ptr) @ stub _Wcsxfrm # extern _Xbig diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index ac29af9..fa9513f 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -49,6 +49,11 @@ DEFINE_VTBL_WRAPPER(28); DEFINE_VTBL_WRAPPER(32); DEFINE_VTBL_WRAPPER(36); DEFINE_VTBL_WRAPPER(40); +DEFINE_VTBL_WRAPPER(44); +DEFINE_VTBL_WRAPPER(48); +DEFINE_VTBL_WRAPPER(52); +DEFINE_VTBL_WRAPPER(56); +DEFINE_VTBL_WRAPPER(60); #endif

1 0