October 2013 - Wine-Commits

Stefan Dösinger : d3d8/tests: Remove the rtpatch test.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 672e3ee1b4bab50f792cf2e3f6a31805d97143c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=672e3ee1b4bab50f792cf2e3f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 24 14:43:40 2013 +0200 d3d8/tests: Remove the rtpatch test. --- dlls/d3d8/tests/device.c | 115 ---------------------------------------------- 1 files changed, 0 insertions(+), 115 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 7932a7f..9db5335 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4846,120 +4846,6 @@ static void test_swvp_buffer(void) DestroyWindow(window); } -static void test_rtpatch(void) -{ - IDirect3DDevice8 *device; - IDirect3D8 *d3d8; - UINT refcount; - HWND window; - HRESULT hr; - IDirect3DVertexBuffer8 *buffer; - DWORD shader; - static const unsigned int bufsize = 16; - struct - { - float x, y, z; - } *data; - D3DRECTPATCH_INFO patch; - static const float num_segs[] = {1.0f, 1.0f, 1.0f, 1.0f}; - UINT handle = 0x1234; - D3DCAPS8 caps; - - /* Position input, this generates tesselated positions, but do not generate normals - * or texture coordinates. The d3d documentation isn't clear on how to do this */ - static const DWORD decl[] = - { - D3DVSD_STREAM(0), - D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), /* D3DVSDE_POSITION, Register v0 */ - D3DVSD_END() - }; - - if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) - { - skip("Failed to create d3d8 object, skipping tests.\n"); - return; - } - - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); - if (!(device = create_device(d3d8, window, window, TRUE))) - { - skip("Failed to create a D3D device, skipping tests.\n"); - IDirect3D8_Release(d3d8); - DestroyWindow(window); - return; - } - - hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - if (caps.DevCaps & D3DDEVCAPS_RTPATCHES) - { - /* The draw methods return the same values, but the patch handle support - * is different on the refrast, which is the only d3d implementation - * known to support tri/rect patches */ - skip("Device supports patches, skipping unsupported patch test\n"); - IDirect3DDevice8_Release(device); - IDirect3D8_Release(d3d8); - DestroyWindow(window); - return; - } - - hr = IDirect3DDevice8_CreateVertexShader(device, decl, NULL, &shader, 0); - ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetVertexShader(device, shader); - ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); - - hr = IDirect3DDevice8_CreateVertexBuffer(device, bufsize * sizeof(*data), D3DUSAGE_RTPATCHES, 0, - D3DPOOL_MANAGED, &buffer); - ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); - hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, (BYTE **)&data, 0); - ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); - memset(data, 0, bufsize * sizeof(*data)); - hr = IDirect3DVertexBuffer8_Unlock(buffer); - ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); - - hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*data)); - ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - patch.StartVertexOffsetWidth = 0; - patch.StartVertexOffsetHeight = 0; - patch.Width = 4; - patch.Height = 4; - patch.Stride = 4; - patch.Basis = D3DBASIS_BEZIER; - patch.Order = D3DORDER_CUBIC; - hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, &patch); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawRectPatch(device, 0, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - hr = IDirect3DDevice8_DrawRectPatch(device, 0, num_segs, &patch); - ok(SUCCEEDED(hr), "Failed to draw rect patch outside scene, hr %#x.\n", hr); - - hr = IDirect3DDevice8_DeletePatch(device, handle); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - hr = IDirect3DDevice8_DeletePatch(device, 0); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - hr = IDirect3DDevice8_DeletePatch(device, 0x1235); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - - IDirect3DDevice8_DeleteVertexShader(device, shader); - IDirect3DVertexBuffer8_Release(buffer); - refcount = IDirect3DDevice8_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); - IDirect3D8_Release(d3d8); - DestroyWindow(window); -} - static void test_npot_textures(void) { IDirect3DDevice8 *device = NULL; @@ -5928,7 +5814,6 @@ START_TEST(device) test_surface_blocks(); test_set_palette(); test_swvp_buffer(); - test_rtpatch(); test_npot_textures(); test_volume_locking(); test_update_volumetexture();

1 0

Stefan Dösinger : d3d9/tests: Remove the rtpatch test.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 9c19266a247a2f4e1f88a3258026af33c6cd6efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c19266a247a2f4e1f88a3258… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 24 14:43:39 2013 +0200 d3d9/tests: Remove the rtpatch test. It segfaults on Win7 + Nvidia Kepler and apparently returns different return values on Windows 8. Since this functionality isn't supported on any HW I doubt games will care. --- dlls/d3d9/tests/device.c | 113 ---------------------------------------------- 1 files changed, 0 insertions(+), 113 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 02b4174..32fe8c7 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6357,118 +6357,6 @@ static void test_swvp_buffer(void) DestroyWindow(window); } -static void test_rtpatch(void) -{ - IDirect3DDevice9 *device; - IDirect3D9 *d3d9; - UINT refcount; - HWND window; - HRESULT hr; - IDirect3DVertexBuffer9 *buffer; - IDirect3DVertexDeclaration9 *decl; - static const unsigned int bufsize = 16; - struct - { - float x, y, z; - } *data; - D3DRECTPATCH_INFO patch; - static const float num_segs[] = {1.0f, 1.0f, 1.0f, 1.0f}; - UINT handle = 0x1234; - D3DCAPS9 caps; - - /* Position input, this generates tesselated positions, but do not generate normals - * or texture coordinates. The d3d documentation isn't clear on how to do this */ - static const D3DVERTEXELEMENT9 decl_elements[] = { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - D3DDECL_END() - }; - - if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) - { - skip("Failed to create IDirect3D9 object, skipping tests.\n"); - return; - } - - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); - if (!(device = create_device(d3d9, window, window, TRUE))) - { - skip("Failed to create a D3D device, skipping tests.\n"); - IDirect3D9_Release(d3d9); - DestroyWindow(window); - return; - } - - hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - if (caps.DevCaps & D3DDEVCAPS_RTPATCHES) - { - /* The draw methods return the same values, but the patch handle support - * is different on the refrast, which is the only d3d implementation - * known to support tri/rect patches */ - skip("Device supports patches, skipping unsupported patch test\n"); - IDirect3DDevice9_Release(device); - IDirect3D9_Release(d3d9); - DestroyWindow(window); - return; - } - - hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); - ok(SUCCEEDED(hr), "Failed to create vertex declaration, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); - ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); - - hr = IDirect3DDevice9_CreateVertexBuffer(device, bufsize * sizeof(*data), D3DUSAGE_RTPATCHES, 0, - D3DPOOL_MANAGED, &buffer, NULL); - ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); - hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, (void **)&data, 0); - ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); - memset(data, 0, bufsize * sizeof(*data)); - hr = IDirect3DVertexBuffer9_Unlock(buffer); - ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); - - hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(*data)); - ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - patch.StartVertexOffsetWidth = 0; - patch.StartVertexOffsetHeight = 0; - patch.Width = 4; - patch.Height = 4; - patch.Stride = 4; - patch.Basis = D3DBASIS_BEZIER; - patch.Degree = D3DDEGREE_CUBIC; - hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, &patch); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawRectPatch(device, 0, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - hr = IDirect3DDevice9_DrawRectPatch(device, 0, num_segs, &patch); - ok(SUCCEEDED(hr), "Failed to draw rect patch outside scene, hr %#x.\n", hr); - - hr = IDirect3DDevice9_DeletePatch(device, handle); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - hr = IDirect3DDevice9_DeletePatch(device, 0); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - hr = IDirect3DDevice9_DeletePatch(device, 0x1235); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - - IDirect3DVertexDeclaration9_Release(decl); - IDirect3DVertexBuffer9_Release(buffer); - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); - IDirect3D9_Release(d3d9); - DestroyWindow(window); -} - static void test_npot_textures(void) { IDirect3DDevice9 *device = NULL; @@ -7506,7 +7394,6 @@ START_TEST(device) test_surface_blocks(); test_set_palette(); test_swvp_buffer(); - test_rtpatch(); test_npot_textures(); test_vidmem_accounting(); test_volume_locking();

1 0

Alexandre Julliard : user32: Set the display device property on the desktop window as soon as it is created .
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: f5113d2d56ceee2502f65183512985a76569c5e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5113d2d56ceee2502f651835… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 24 17:41:28 2013 +0200 user32: Set the display device property on the desktop window as soon as it is created. --- dlls/user32/desktop.c | 33 +++++++++++++++++++++++++++++++-- programs/explorer/desktop.c | 22 ++++++++-------------- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index 563a214..bc91252 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -32,6 +32,7 @@ #include "wingdi.h" #include "winnls.h" #include "controls.h" +#include "wine/unicode.h" static HBRUSH hbrushPattern; static HBITMAP hbitmapWallPaper; @@ -97,8 +98,36 @@ static void init_wallpaper( const WCHAR *wallpaper ) */ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - if (message == WM_NCCREATE) return TRUE; - return 0; /* all other messages are ignored */ + static const WCHAR display_device_guid_propW[] = { + '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', + 'd','e','v','i','c','e','_','g','u','i','d',0 }; + static const WCHAR guid_formatW[] = { + '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x',0}; + + switch (message) + { + case WM_NCCREATE: + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; + const GUID *guid = cs->lpCreateParams; + + if (guid) + { + ATOM atom; + WCHAR buffer[37]; + + sprintfW( buffer, guid_formatW, guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + atom = GlobalAddAtomW( buffer ); + SetPropW( hwnd, display_device_guid_propW, ULongToHandle( atom ) ); + } + return TRUE; + } + default: + return 0; /* all other messages are ignored */ + } } /*********************************************************************** diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index d85483c..a3bfb5c 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -633,11 +633,8 @@ static BOOL get_default_desktop_size( const WCHAR *name, unsigned int *width, un return found; } -static void set_desktop_guid( HWND desktop, HMODULE driver ) +static void set_desktop_guid( HWND desktop, GUID *guid, HMODULE driver ) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; static const WCHAR device_keyW[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -646,18 +643,11 @@ static void set_desktop_guid( HWND desktop, HMODULE driver ) '{','%','s','}','\\','0','0','0','0',0}; static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; - GUID guid; RPC_WSTR guid_str; - ATOM guid_atom; HKEY hkey; WCHAR key[sizeof(device_keyW)/sizeof(WCHAR) + 39]; - UuidCreate( &guid ); - UuidToStringW( &guid, &guid_str ); - TRACE( "display guid %s\n", debugstr_w(guid_str) ); - - guid_atom = GlobalAddAtomW( guid_str ); - SetPropW( desktop, display_device_guid_propW, ULongToHandle(guid_atom) ); + UuidToStringW( guid, &guid_str ); sprintfW( key, device_keyW, guid_str ); RpcStringFreeW( &guid_str ); @@ -724,6 +714,7 @@ void manage_desktop( WCHAR *arg ) { static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; HDESK desktop = 0; + GUID guid; MSG msg; HDC hdc; HWND hwnd, msg_hwnd; @@ -766,9 +757,12 @@ void manage_desktop( WCHAR *arg ) SetThreadDesktop( desktop ); } + UuidCreate( &guid ); + TRACE( "display guid %s\n", debugstr_guid(&guid) ); + /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, NULL ); + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, &guid ); /* create the HWND_MESSAGE parent */ msg_hwnd = CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, @@ -785,7 +779,7 @@ void manage_desktop( WCHAR *arg ) ReleaseDC( hwnd, hdc ); SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); - set_desktop_guid( hwnd, graphics_driver ); + set_desktop_guid( hwnd, &guid, graphics_driver ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); SetWindowPos( hwnd, 0, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN),

1 0

Alexandre Julliard : user32: Register classes once the graphics driver has been loaded, except for the desktop class.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: fe441a0682ce21ba2d379c3c343efb00094f9ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe441a0682ce21ba2d379c3c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 24 17:40:37 2013 +0200 user32: Register classes once the graphics driver has been loaded, except for the desktop class. --- dlls/user32/class.c | 18 +++++++++++++----- dlls/user32/controls.h | 3 ++- dlls/user32/desktop.c | 2 +- dlls/user32/driver.c | 3 +++ dlls/user32/message.c | 2 +- dlls/user32/user_main.c | 2 ++ dlls/user32/win.c | 2 -- 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 333cb76..e03272f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -369,7 +369,7 @@ static void register_builtin( const struct builtin_class_descr *descr ) if (!(classPtr = CLASS_RegisterClass( descr->name, user32_module, FALSE, descr->style, 0, descr->extra ))) return; - classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); + if (descr->cursor) classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); classPtr->hbrBackground = descr->brush; classPtr->winproc = BUILTIN_WINPROC( descr->proc ); release_class_ptr( classPtr ); @@ -381,7 +381,6 @@ static void register_builtin( const struct builtin_class_descr *descr ) */ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **context ) { - register_builtin( &DESKTOP_builtin_class ); register_builtin( &BUTTON_builtin_class ); register_builtin( &COMBO_builtin_class ); register_builtin( &COMBOLBOX_builtin_class ); @@ -391,7 +390,6 @@ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **conte register_builtin( &LISTBOX_builtin_class ); register_builtin( &MDICLIENT_builtin_class ); register_builtin( &MENU_builtin_class ); - register_builtin( &MESSAGE_builtin_class ); register_builtin( &SCROLL_builtin_class ); register_builtin( &STATIC_builtin_class ); return TRUE; @@ -399,15 +397,25 @@ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **conte /*********************************************************************** - * CLASS_RegisterBuiltinClasses + * register_builtin_classes */ -void CLASS_RegisterBuiltinClasses(void) +void register_builtin_classes(void) { InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); } /*********************************************************************** + * register_desktop_class + */ +void register_desktop_class(void) +{ + register_builtin( &DESKTOP_builtin_class ); + register_builtin( &MESSAGE_builtin_class ); +} + + +/*********************************************************************** * get_class_winproc */ WNDPROC get_class_winproc( CLASS *class ) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 32e9815..3ce804f 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -139,7 +139,8 @@ extern ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param ) DECLSPEC_HIDDEN struct tagCLASS; /* opaque structure */ struct tagWND; extern ATOM get_int_atom_value( LPCWSTR name ) DECLSPEC_HIDDEN; -extern void CLASS_RegisterBuiltinClasses(void) DECLSPEC_HIDDEN; +extern void register_builtin_classes(void) DECLSPEC_HIDDEN; +extern void register_desktop_class(void) DECLSPEC_HIDDEN; extern WNDPROC get_class_winproc( struct tagCLASS *class ) DECLSPEC_HIDDEN; extern struct dce *get_class_dce( struct tagCLASS *class ) DECLSPEC_HIDDEN; extern struct dce *set_class_dce( struct tagCLASS *class, struct dce *dce ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index 2204b77..563a214 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -48,7 +48,7 @@ const struct builtin_class_descr DESKTOP_builtin_class = CS_DBLCLKS, /* style */ WINPROC_DESKTOP, /* proc */ 0, /* extra */ - IDC_ARROW, /* cursor */ + 0, /* cursor */ (HBRUSH)(COLOR_BACKGROUND+1) /* brush */ }; diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 18778cd..192eebe 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -28,6 +28,7 @@ #include "wine/gdi_driver.h" #include "user_private.h" +#include "controls.h" static USER_DRIVER null_driver, lazy_load_driver; @@ -119,6 +120,8 @@ static const USER_DRIVER *load_driver(void) } else LdrAddRefDll( 0, graphics_driver ); + register_builtin_classes(); + DeleteDC( hdc ); return driver; } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index d09e5dd..4fc87ad 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -290,7 +290,7 @@ const struct builtin_class_descr MESSAGE_builtin_class = 0, /* style */ WINPROC_MESSAGE, /* proc */ 0, /* extra */ - IDC_ARROW, /* cursor */ + 0, /* cursor */ 0 /* brush */ }; diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index e74ac19..d08a93c 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -262,6 +262,8 @@ static void winstation_init(void) if (handle) SetThreadDesktop( handle ); } HeapFree( GetProcessHeap(), 0, buffer ); + + register_desktop_class(); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d506fee..30a7c6f 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1391,8 +1391,6 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } } - CLASS_RegisterBuiltinClasses(); - /* Find the parent window */ parent = cs->hwndParent;

1 0

Frédéric Delanoy : kernel32: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 7ab78b4e03c5263ab4f3d258f419f66b5eb875d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab78b4e03c5263ab4f3d258f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 24 00:40:22 2013 +0200 kernel32: Use BOOL type where appropriate. --- dlls/kernel32/console.c | 26 +++++++++++++------------- dlls/kernel32/environ.c | 4 ++-- dlls/kernel32/except.c | 2 +- dlls/kernel32/sync.c | 4 ++-- dlls/kernel32/time.c | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 9f2f528..4f0ed09 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2272,7 +2272,7 @@ static int CONSOLE_WriteChars(HANDLE hCon, LPCWSTR lpBuffer, int nc, COORD* pos) * WriteConsoleOutput helper: handles passing to next line (+scrolling if necessary) * */ -static int next_line(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi) +static BOOL next_line(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi) { SMALL_RECT src; CHAR_INFO ci; @@ -2281,7 +2281,7 @@ static int next_line(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi) csbi->dwCursorPosition.X = 0; csbi->dwCursorPosition.Y++; - if (csbi->dwCursorPosition.Y < csbi->dwSize.Y) return 1; + if (csbi->dwCursorPosition.Y < csbi->dwSize.Y) return TRUE; src.Top = 1; src.Bottom = csbi->dwSize.Y - 1; @@ -2296,8 +2296,8 @@ static int next_line(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi) csbi->dwCursorPosition.Y--; if (!ScrollConsoleScreenBufferW(hCon, &src, NULL, dst, &ci)) - return 0; - return 1; + return FALSE; + return TRUE; } /****************************************************************** @@ -2308,13 +2308,13 @@ static int next_line(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi) * handled * */ -static int write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi, - DWORD mode, LPCWSTR ptr, int len) +static BOOL write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi, + DWORD mode, LPCWSTR ptr, int len) { int blk; /* number of chars to write on current line */ int done; /* number of chars already written */ - if (len <= 0) return 1; + if (len <= 0) return TRUE; if (mode & ENABLE_WRAP_AT_EOL_OUTPUT) /* writes remaining on next line */ { @@ -2323,9 +2323,9 @@ static int write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi, blk = min(len - done, csbi->dwSize.X - csbi->dwCursorPosition.X); if (CONSOLE_WriteChars(hCon, ptr + done, blk, &csbi->dwCursorPosition) != blk) - return 0; + return FALSE; if (csbi->dwCursorPosition.X == csbi->dwSize.X && !next_line(hCon, csbi)) - return 0; + return FALSE; } } else @@ -2342,11 +2342,11 @@ static int write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi, csbi->dwCursorPosition.X = pos; if (CONSOLE_WriteChars(hCon, ptr + done, blk, &csbi->dwCursorPosition) != blk) - return 0; + return FALSE; } } - return 1; + return TRUE; } /*********************************************************************** @@ -2491,7 +2491,7 @@ BOOL WINAPI WriteConsoleA(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = 0; xstring = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - if (!xstring) return 0; + if (!xstring) return FALSE; MultiByteToWideChar(GetConsoleOutputCP(), 0, lpBuffer, nNumberOfCharsToWrite, xstring, n); @@ -3009,7 +3009,7 @@ unsigned CONSOLE_GetNumHistoryEntries(void) */ BOOL CONSOLE_GetEditionMode(HANDLE hConIn, int* mode) { - unsigned ret = FALSE; + unsigned ret = 0; SERVER_START_REQ(get_console_input_info) { req->handle = console_handle_unmap(hConIn); diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index e6634a2..b6b3124 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -247,7 +247,7 @@ BOOL WINAPI SetEnvironmentVariableA( LPCSTR name, LPCSTR value ) if (!name) { SetLastError(ERROR_ENVVAR_NOT_FOUND); - return 0; + return FALSE; } RtlCreateUnicodeStringFromAsciiz( &us_name, name ); @@ -280,7 +280,7 @@ BOOL WINAPI SetEnvironmentVariableW( LPCWSTR name, LPCWSTR value ) if (!name) { SetLastError(ERROR_ENVVAR_NOT_FOUND); - return 0; + return FALSE; } RtlInitUnicodeString(&us_name, name); diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 49e5c25..77ec91d 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -346,7 +346,7 @@ EXIT: * * returns TRUE for the two first conditions, FALSE for the last */ -static int start_debugger_atomic(PEXCEPTION_POINTERS epointers) +static BOOL start_debugger_atomic(PEXCEPTION_POINTERS epointers) { static HANDLE hRunOnce /* = 0 */; diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index a0ccbb6..5b7f810 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(sync); /* check if current version is NT or Win95 */ -static inline int is_version_nt(void) +static inline BOOL is_version_nt(void) { return !(GetVersion() & 0x80000000); } @@ -1467,7 +1467,7 @@ BOOL WINAPI WaitNamedPipeA (LPCSTR name, DWORD nTimeOut) if (!MultiByteToWideChar( CP_ACP, 0, name, -1, buffer, MAX_PATH )) { SetLastError( ERROR_FILENAME_EXCED_RANGE ); - return 0; + return FALSE; } return WaitNamedPipeW( buffer, nTimeOut ); } diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index a1875f4..77c71cb 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -67,9 +67,9 @@ static const int MonthLengths[2][12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; -static inline int IsLeapYear(int Year) +static inline BOOL IsLeapYear(int Year) { - return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ? 1 : 0; + return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0); } /***********************************************************************

1 0

André Hentschel : rsaenh/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 4a8452dfdb8705d16d3f035fefb08c1bb668e4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8452dfdb8705d16d3f035fe… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 00:30:08 2013 +0200 rsaenh/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/rsaenh/tests/Makefile.in | 1 - dlls/rsaenh/tests/rsaenh.c | 166 ++++++++++++++++++++-------------------- 2 files changed, 83 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a8452dfdb8705d16d3f0…

1 0

André Hentschel : version/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: ae206d75178fcc97854556910bf1e3b2ce4858c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae206d75178fcc97854556910… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 00:30:01 2013 +0200 version/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/version/tests/Makefile.in | 1 - dlls/version/tests/info.c | 38 +++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/version/tests/Makefile.in b/dlls/version/tests/Makefile.in index 26f106a..2653299 100644 --- a/dlls/version/tests/Makefile.in +++ b/dlls/version/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = version.dll IMPORTS = version -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ info.c \ diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index f19b3d7..aa1982c 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -457,7 +457,7 @@ static void test_32bit_win(void) HeapFree( GetProcessHeap(), 0, pVersionInfoW); } -static void test_VerQueryValue(void) +static void test_VerQueryValueA(void) { static const char * const value_name[] = { "Product", "CompanyName", "FileDescription", "Internal", @@ -468,24 +468,24 @@ static void test_VerQueryValue(void) UINT len, ret, translation, i; char buf[MAX_PATH]; - ret = GetModuleFileName(NULL, buf, sizeof(buf)); + ret = GetModuleFileNameA(NULL, buf, sizeof(buf)); assert(ret); SetLastError(0xdeadbeef); - len = GetFileVersionInfoSize(buf, NULL); - ok(len, "GetFileVersionInfoSize(%s) error %u\n", buf, GetLastError()); + len = GetFileVersionInfoSizeA(buf, NULL); + ok(len, "GetFileVersionInfoSizeA(%s) error %u\n", buf, GetLastError()); ver = HeapAlloc(GetProcessHeap(), 0, len); assert(ver); SetLastError(0xdeadbeef); - ret = GetFileVersionInfo(buf, 0, len, ver); - ok(ret, "GetFileVersionInfo error %u\n", GetLastError()); + ret = GetFileVersionInfoA(buf, 0, len, ver); + ok(ret, "GetFileVersionInfoA error %u\n", GetLastError()); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "\\VarFileInfo\\Translation", (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, "\\VarFileInfo\\Translation", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); ok(len == 4, "VerQueryValue returned %u, expected 4\n", len); @@ -495,7 +495,7 @@ static void test_VerQueryValue(void) p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "String", (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, "String", (LPVOID*)&p, &len); ok(!ret, "VerQueryValue should fail\n"); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || GetLastError() == 0xdeadbeef /* NT4, W2K */, @@ -506,7 +506,7 @@ static void test_VerQueryValue(void) p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "StringFileInfo", (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, "StringFileInfo", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); @@ -514,7 +514,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "\\StringFileInfo", (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, "\\StringFileInfo", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); @@ -522,7 +522,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "\\\\StringFileInfo", (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, "\\\\StringFileInfo", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); @@ -530,7 +530,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, "\\StringFileInfo\\\\", (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, "\\StringFileInfo\\\\", (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); @@ -539,7 +539,7 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); + ret = VerQueryValueA(ver, buf, (LPVOID*)&p, &len); ok(ret, "VerQueryValue error %u\n", GetLastError()); todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); @@ -550,20 +550,20 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); - ok(ret, "VerQueryValue(%s) error %u\n", buf, GetLastError()); + ret = VerQueryValueA(ver, buf, (LPVOID*)&p, &len); + ok(ret, "VerQueryValueA(%s) error %u\n", buf, GetLastError()); ok(len == strlen(value_name[i]) + 1, "VerQueryValue returned %u\n", len); ok(!strcmp(value_name[i], p), "expected \"%s\", got \"%s\"\n", value_name[i], p); /* test partial value names */ - len = lstrlen(buf); + len = lstrlenA(buf); buf[len - 2] = 0; p = (char *)0xdeadbeef; len = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); - ok(!ret, "VerQueryValue(%s) succeeded\n", buf); + ret = VerQueryValueA(ver, buf, (LPVOID*)&p, &len); + ok(!ret, "VerQueryValueA(%s) succeeded\n", buf); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || GetLastError() == 0xdeadbeef /* NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); @@ -579,5 +579,5 @@ START_TEST(info) test_info_size(); test_info(); test_32bit_win(); - test_VerQueryValue(); + test_VerQueryValueA(); }

1 0

André Hentschel : imm32/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 33018d393ac3f38325afb4e2a3451ad5471e4cfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=33018d393ac3f38325afb4e2a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 00:29:35 2013 +0200 imm32/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/imm32/tests/Makefile.in | 1 - dlls/imm32/tests/imm32.c | 78 +++++++++++++++++++++--------------------- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/dlls/imm32/tests/Makefile.in b/dlls/imm32/tests/Makefile.in index 6991d94..6893521 100644 --- a/dlls/imm32/tests/Makefile.in +++ b/dlls/imm32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = imm32.dll IMPORTS = imm32 user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ imm32.c diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7b81965..a37190c 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -102,9 +102,9 @@ static LRESULT CALLBACK call_wnd_proc_filter(int nCode, WPARAM wParam, static void msg_spy_pump_msg_queue(void) { MSG msg; - while(PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { + while(PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } return; @@ -143,11 +143,11 @@ static imm_msgs* msg_spy_find_msg(UINT message) { static void msg_spy_init(HWND hwnd) { msg_spy.hwnd = hwnd; msg_spy.get_msg_hook = - SetWindowsHookEx(WH_GETMESSAGE, get_msg_filter, GetModuleHandle(0), - GetCurrentThreadId()); + SetWindowsHookExW(WH_GETMESSAGE, get_msg_filter, GetModuleHandleW(NULL), + GetCurrentThreadId()); msg_spy.call_wnd_proc_hook = - SetWindowsHookEx(WH_CALLWNDPROC, call_wnd_proc_filter, - GetModuleHandle(0), GetCurrentThreadId()); + SetWindowsHookExW(WH_CALLWNDPROC, call_wnd_proc_filter, + GetModuleHandleW(NULL), GetCurrentThreadId()); msg_spy.i_msg = 0; msg_spy_flush_msgs(); @@ -182,7 +182,7 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) } static BOOL init(void) { - WNDCLASSEX wc; + WNDCLASSEXA wc; HIMC imc; HMODULE hmod,huser; @@ -192,25 +192,25 @@ static BOOL init(void) { pImmIsUIMessageA = (void*)GetProcAddress(hmod, "ImmIsUIMessageA"); pSendInput = (void*)GetProcAddress(huser, "SendInput"); - wc.cbSize = sizeof(WNDCLASSEX); + wc.cbSize = sizeof(WNDCLASSEXA); wc.style = 0; wc.lpfnWndProc = wndProc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; - wc.hInstance = GetModuleHandle(0); - wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); - wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); wc.lpszMenuName = NULL; wc.lpszClassName = wndcls; - wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION); + wc.hIconSm = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); if (!RegisterClassExA(&wc)) return FALSE; - hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, - 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); if (!hwnd) return FALSE; @@ -234,7 +234,7 @@ static void cleanup(void) { msg_spy_cleanup(); if (hwnd) DestroyWindow(hwnd); - UnregisterClass(wndcls, GetModuleHandle(0)); + UnregisterClassA(wndcls, GetModuleHandleW(NULL)); } static void test_ImmNotifyIME(void) { @@ -254,14 +254,14 @@ static void test_ImmNotifyIME(void) { "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n"); - ImmSetCompositionString(imc, SCS_SETSTR, string, sizeof(string), NULL, 0); + ImmSetCompositionStringA(imc, SCS_SETSTR, string, sizeof(string), NULL, 0); msg_spy_flush_msgs(); ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0); msg_spy_flush_msgs(); /* behavior differs between win9x and NT */ - ret = ImmGetCompositionString(imc, GCS_COMPSTR, resstr, sizeof(resstr)); + ret = ImmGetCompositionStringA(imc, GCS_COMPSTR, resstr, sizeof(resstr)); ok(!ret, "After being cancelled the composition string is empty.\n"); msg_spy_flush_msgs(); @@ -426,9 +426,9 @@ static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) COMPOSITIONFORM cf; POINT pt; igc_threadinfo *info= (igc_threadinfo*)lpParam; - info->hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, - 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + info->hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); h1 = ImmGetContext(hwnd); todo_wine ok(info->himc == h1, "hwnd context changed in new thread\n"); @@ -437,9 +437,9 @@ static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) info->himc = h2; ImmReleaseContext(hwnd,h1); - hwnd2 = CreateWindowEx(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, - 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + hwnd2 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); h1 = ImmGetContext(hwnd2); ok(h1 == h2, "Windows in same thread should have same default context\n"); @@ -463,14 +463,14 @@ static void test_ImmThreads(void) HANDLE hThread; DWORD dwThreadId; BOOL rc; - LOGFONT lf; + LOGFONTA lf; COMPOSITIONFORM cf; CANDIDATEFORM cdf; DWORD status, sentence; POINT pt; himc = ImmGetContext(hwnd); - threadinfo.event = CreateEvent(NULL, TRUE, FALSE, NULL); + threadinfo.event = CreateEventA(NULL, TRUE, FALSE, NULL); threadinfo.himc = himc; hThread = CreateThread(NULL, 0, ImmGetContextThreadFunc, &threadinfo, 0, &dwThreadId ); WaitForSingleObject(threadinfo.event, INFINITE); @@ -510,14 +510,14 @@ static void test_ImmThreads(void) ok(rc == 0, "ImmGetOpenStatus failed\n"); /* CompositionFont */ - rc = ImmGetCompositionFont(himc, &lf); + rc = ImmGetCompositionFontA(himc, &lf); ok(rc != 0, "ImmGetCompositionFont failed\n"); - rc = ImmSetCompositionFont(himc, &lf); + rc = ImmSetCompositionFontA(himc, &lf); ok(rc != 0, "ImmSetCompositionFont failed\n"); - rc = ImmGetCompositionFont(otherHimc, &lf); + rc = ImmGetCompositionFontA(otherHimc, &lf); ok(rc != 0 || broken(rc == 0), "ImmGetCompositionFont failed\n"); - rc = ImmSetCompositionFont(otherHimc, &lf); + rc = ImmSetCompositionFontA(otherHimc, &lf); todo_wine ok(rc == 0, "ImmSetCompositionFont should fail\n"); /* CompositionWindow */ @@ -705,9 +705,9 @@ static void test_ImmDefaultHwnd(void) HWND def1, def3; HWND hwnd; - hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, - 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); ShowWindow(hwnd, SW_SHOWNORMAL); @@ -907,9 +907,9 @@ static void test_ImmMessages(void) HIMC imc; UINT idx = 0; - HWND hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, - 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + HWND hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleA(NULL), NULL); ShowWindow(hwnd, SW_SHOWNORMAL); defwnd = ImmGetDefaultIMEWnd(hwnd); @@ -917,7 +917,7 @@ static void test_ImmMessages(void) ImmSetOpenStatus(imc, TRUE); msg_spy_flush_msgs(); - SendMessage(defwnd, WM_IME_CONTROL, IMC_GETCANDIDATEPOS, (LPARAM)&cf ); + SendMessageA(defwnd, WM_IME_CONTROL, IMC_GETCANDIDATEPOS, (LPARAM)&cf ); do { msg = msg_spy_find_next_msg(WM_IME_CONTROL,&idx); @@ -952,8 +952,8 @@ static void test_ime_processkey(void) wclass.style = CS_HREDRAW | CS_VREDRAW; wclass.lpfnWndProc = processkey_wnd_proc; wclass.hInstance = hInstance; - wclass.hIcon = LoadIcon(0, IDI_APPLICATION); - wclass.hCursor = LoadCursor( NULL, IDC_ARROW); + wclass.hIcon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + wclass.hCursor = LoadCursorW( NULL, (LPCWSTR)IDC_ARROW); wclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wclass.lpszMenuName = 0; wclass.cbClsExtra = 0;

1 0

André Hentschel : msacm32/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 0a9531f9b8425c593985fa05018295f6b57b62da URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9531f9b8425c593985fa050… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 23 22:38:41 2013 +0200 msacm32/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/msacm32/tests/Makefile.in | 1 - dlls/msacm32/tests/msacm.c | 76 ++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/msacm32/tests/Makefile.in b/dlls/msacm32/tests/Makefile.in index 2f7707d..2206ba9 100644 --- a/dlls/msacm32/tests/Makefile.in +++ b/dlls/msacm32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = msacm32.dll IMPORTS = msacm32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ msacm.c diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index a961067..95ab578 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -33,7 +33,7 @@ #include "msacm.h" static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, - PACMFORMATTAGDETAILS paftd, + PACMFORMATTAGDETAILSA paftd, DWORD_PTR dwInstance, DWORD fdwSupport) { @@ -44,7 +44,7 @@ static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, } static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid, - LPACMFORMATDETAILS pafd, + LPACMFORMATDETAILSA pafd, DWORD_PTR dwInstance, DWORD fd) { @@ -59,7 +59,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, DWORD fdwSupport) { MMRESULT rc; - ACMDRIVERDETAILS dd; + ACMDRIVERDETAILSA dd; HACMDRIVER had; DWORD dwDriverPriority; @@ -79,48 +79,48 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, } /* try an invalid pointer */ - rc = acmDriverDetails(hadid, 0, 0); + rc = acmDriverDetailsA(hadid, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try an invalid structure size */ ZeroMemory(&dd, sizeof(dd)); - rc = acmDriverDetails(hadid, &dd, 0); + rc = acmDriverDetailsA(hadid, &dd, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* MSDN says this should fail but it doesn't in practice */ dd.cbStruct = 4; - rc = acmDriverDetails(hadid, &dd, 0); + rc = acmDriverDetailsA(hadid, &dd, 0); ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); /* try an invalid handle */ dd.cbStruct = sizeof(dd); - rc = acmDriverDetails((HACMDRIVERID)1, &dd, 0); + rc = acmDriverDetailsA((HACMDRIVERID)1, &dd, 0); ok(rc == MMSYSERR_INVALHANDLE, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALHANDLE); /* try an invalid handle and pointer */ - rc = acmDriverDetails((HACMDRIVERID)1, 0, 0); + rc = acmDriverDetailsA((HACMDRIVERID)1, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try invalid details */ - rc = acmDriverDetails(hadid, &dd, -1); + rc = acmDriverDetailsA(hadid, &dd, -1); ok(rc == MMSYSERR_INVALFLAG, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALFLAG); /* try valid parameters */ - rc = acmDriverDetails(hadid, &dd, 0); + rc = acmDriverDetailsA(hadid, &dd, 0); ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED, - "acmDriverDetails(): rc = %08x, should be %08x\n", + "acmDriverDetailsA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); /* cbStruct should contain size of returned data (at most sizeof(dd)) @@ -128,7 +128,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, */ if (rc == MMSYSERR_NOERROR) { ok(dd.cbStruct == sizeof(dd), - "acmDriverDetails(): cbStruct = %08x\n", dd.cbStruct); + "acmDriverDetailsA(): cbStruct = %08x\n", dd.cbStruct); } if (rc == MMSYSERR_NOERROR && winetest_interactive) { @@ -274,27 +274,27 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, "acmMetrics(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); if (rc == MMSYSERR_NOERROR) { - ACMFORMATDETAILS fd; + ACMFORMATDETAILSA fd; WAVEFORMATEX * pwfx; - ACMFORMATTAGDETAILS aftd; + ACMFORMATTAGDETAILSA aftd; /* try bad pointer */ - rc = acmFormatEnum(had, 0, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, 0, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try bad structure size */ ZeroMemory(&fd, sizeof(fd)); - rc = acmFormatEnum(had, &fd, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); fd.cbStruct = sizeof(fd) - 1; - rc = acmFormatEnum(had, &fd, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); if (dwSize < sizeof(WAVEFORMATEX)) @@ -311,43 +311,43 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, fd.dwFormatTag = WAVE_FORMAT_UNKNOWN; /* try valid parameters */ - rc = acmFormatEnum(had, &fd, FormatEnumProc, 0, 0); + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); ok(rc == MMSYSERR_NOERROR, - "acmFormatEnum(): rc = %08x, should be %08x\n", + "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); /* try bad pointer */ - rc = acmFormatTagEnum(had, 0, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, 0, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); /* try bad structure size */ ZeroMemory(&aftd, sizeof(aftd)); - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); aftd.cbStruct = sizeof(aftd) - 1; - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_INVALPARAM, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); aftd.cbStruct = sizeof(aftd); aftd.dwFormatTag = WAVE_FORMAT_UNKNOWN; /* try bad flag */ - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 1); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 1); ok(rc == MMSYSERR_INVALFLAG, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALFLAG); /* try valid parameters */ - rc = acmFormatTagEnum(had, &aftd, FormatTagEnumProc, 0, 0); + rc = acmFormatTagEnumA(had, &aftd, FormatTagEnumProc, 0, 0); ok(rc == MMSYSERR_NOERROR, - "acmFormatTagEnum(): rc = %08x, should be %08x\n", + "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); HeapFree(GetProcessHeap(), 0, pwfx);

1 0

Vincent Povirk : gdiplus: Implement GdipWidenPath for custom dashed lines.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 1c35dd6cb422c575a5cbfb3d2dd402a1cd9a1f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c35dd6cb422c575a5cbfb3d2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 23 13:05:50 2013 -0500 gdiplus: Implement GdipWidenPath for custom dashed lines. --- dlls/gdiplus/graphicspath.c | 142 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 127 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 62f8490..8fa3cc0 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1851,8 +1851,9 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, } } -static void widen_open_figure(GpPath *path, GpPen *pen, int start, int end, - path_list_node_t **last_point) +static void widen_open_figure(const GpPointF *points, GpPen *pen, int start, int end, + GpLineCap start_cap, GpCustomLineCap *start_custom, GpLineCap end_cap, + GpCustomLineCap *end_custom, path_list_node_t **last_point) { int i; path_list_node_t *prev_point; @@ -1862,22 +1863,22 @@ static void widen_open_figure(GpPath *path, GpPen *pen, int start, int end, prev_point = *last_point; - widen_cap(&path->pathdata.Points[start], &path->pathdata.Points[start+1], - pen, pen->startcap, pen->customstart, FALSE, TRUE, last_point); + widen_cap(&points[start], &points[start+1], + pen, start_cap, start_custom, FALSE, TRUE, last_point); for (i=start+1; i<end; i++) - widen_joint(&path->pathdata.Points[i-1], &path->pathdata.Points[i], - &path->pathdata.Points[i+1], pen, last_point); + widen_joint(&points[i-1], &points[i], + &points[i+1], pen, last_point); - widen_cap(&path->pathdata.Points[end], &path->pathdata.Points[end-1], - pen, pen->endcap, pen->customend, TRUE, TRUE, last_point); + widen_cap(&points[end], &points[end-1], + pen, end_cap, end_custom, TRUE, TRUE, last_point); for (i=end-1; i>start; i--) - widen_joint(&path->pathdata.Points[i+1], &path->pathdata.Points[i], - &path->pathdata.Points[i-1], pen, last_point); + widen_joint(&points[i+1], &points[i], + &points[i-1], pen, last_point); - widen_cap(&path->pathdata.Points[start], &path->pathdata.Points[start+1], - pen, pen->startcap, pen->customstart, TRUE, FALSE, last_point); + widen_cap(&points[start], &points[start+1], + pen, start_cap, start_custom, TRUE, FALSE, last_point); prev_point->next->type = PathPointTypeStart; (*last_point)->type |= PathPointTypeCloseSubpath; @@ -1925,6 +1926,111 @@ static void widen_closed_figure(GpPath *path, GpPen *pen, int start, int end, (*last_point)->type |= PathPointTypeCloseSubpath; } +static void widen_dashed_figure(GpPath *path, GpPen *pen, int start, int end, + int closed, path_list_node_t **last_point) +{ + int i, j; + REAL dash_pos=0.0; + int dash_index=0; + const REAL *dash_pattern; + int dash_count; + GpPointF *tmp_points; + REAL segment_dy; + REAL segment_dx; + REAL segment_length; + REAL segment_pos; + int num_tmp_points=0; + int draw_start_cap=0; + + if (end <= start) + return; + + dash_pattern = pen->dashes; + dash_count = pen->numdashes; + + tmp_points = GdipAlloc((end - start + 2) * sizeof(GpPoint)); + if (!tmp_points) return; /* FIXME */ + + if (!closed) + draw_start_cap = 1; + + for (j=start; j <= end; j++) + { + if (j == start) + { + if (closed) + i = end; + else + continue; + } + else + i = j-1; + + segment_dy = path->pathdata.Points[j].Y - path->pathdata.Points[i].Y; + segment_dx = path->pathdata.Points[j].X - path->pathdata.Points[i].X; + segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + segment_pos = 0.0; + + while (1) + { + if (dash_pos == 0.0) + { + if ((dash_index % 2) == 0) + { + /* start dash */ + num_tmp_points = 1; + tmp_points[0].X = path->pathdata.Points[i].X + segment_dx * segment_pos / segment_length; + tmp_points[0].Y = path->pathdata.Points[i].Y + segment_dy * segment_pos / segment_length; + } + else + { + /* end dash */ + tmp_points[num_tmp_points].X = path->pathdata.Points[i].X + segment_dx * segment_pos / segment_length; + tmp_points[num_tmp_points].Y = path->pathdata.Points[i].Y + segment_dy * segment_pos / segment_length; + + widen_open_figure(tmp_points, pen, 0, num_tmp_points, + draw_start_cap ? pen->startcap : LineCapFlat, pen->customstart, + LineCapFlat, NULL, last_point); + draw_start_cap = 0; + num_tmp_points = 0; + } + } + + if (dash_pattern[dash_index] - dash_pos > segment_length - segment_pos) + { + /* advance to next segment */ + if ((dash_index % 2) == 0) + { + tmp_points[num_tmp_points] = path->pathdata.Points[j]; + num_tmp_points++; + } + dash_pos += segment_length - segment_pos; + break; + } + else + { + /* advance to next dash in pattern */ + segment_pos += dash_pattern[dash_index] - dash_pos; + dash_pos = 0.0; + if (++dash_index == dash_count) + dash_index = 0; + continue; + } + } + } + + if (dash_index % 2 == 0 && num_tmp_points != 0) + { + /* last dash overflows last segment */ + tmp_points[num_tmp_points] = path->pathdata.Points[end]; + widen_open_figure(tmp_points, pen, 0, num_tmp_points, + draw_start_cap ? pen->startcap : LineCapFlat, pen->customstart, + closed ? LineCapFlat : pen->endcap, pen->customend, last_point); + } + + GdipFree(tmp_points); +} + GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, REAL flatness) { @@ -1966,7 +2072,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if (pen->join == LineJoinRound) FIXME("unimplemented line join %d\n", pen->join); - if (pen->dash != DashStyleSolid) + if (pen->dash != DashStyleSolid && pen->dash != DashStyleCustom) FIXME("unimplemented dash style %d\n", pen->dash); if (pen->align != PenAlignmentCenter) @@ -1981,12 +2087,18 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if ((type&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) { - widen_closed_figure(flat_path, pen, subpath_start, i, &last_point); + if (pen->dash == DashStyleCustom) + widen_dashed_figure(flat_path, pen, subpath_start, i, 1, &last_point); + else + widen_closed_figure(flat_path, pen, subpath_start, i, &last_point); } else if (i == flat_path->pathdata.Count-1 || (flat_path->pathdata.Types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart) { - widen_open_figure(flat_path, pen, subpath_start, i, &last_point); + if (pen->dash == DashStyleCustom) + widen_dashed_figure(flat_path, pen, subpath_start, i, 0, &last_point); + else + widen_open_figure(flat_path->pathdata.Points, pen, subpath_start, i, pen->startcap, pen->customstart, pen->endcap, pen->customend, &last_point); } }

1 0