April 2008 - Wine-Commits - list.winehq.org

Alexandre Julliard : winex11: Allow mapping/ unmapping a window even while processing another event.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: f41e2339b73eb624e5d3136ef9b4fe6c38ed3843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41e2339b73eb624e5d3136ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 16:57:17 2008 +0200 winex11: Allow mapping/unmapping a window even while processing another event. --- dlls/winex11.drv/winpos.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index e858acf..912ddfb 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -388,14 +388,11 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, if (thread_data->current_event && thread_data->current_event->xany.window == data->whole_window) event_type = thread_data->current_event->type; - if (event_type == ConfigureNotify || event_type == PropertyNotify) - { - TRACE( "not changing window %p/%lx while processing event %u\n", - hwnd, data->whole_window, event_type ); - return; - } + if (event_type != ConfigureNotify && event_type != PropertyNotify) + event_type = 0; /* ignore other events */ - if (data->mapped && (!(new_style & WS_VISIBLE) || !X11DRV_is_window_rect_mapped( rectWindow ))) + if (data->mapped && (!(new_style & WS_VISIBLE) || + (!event_type && !X11DRV_is_window_rect_mapped( rectWindow )))) { TRACE( "unmapping win %p/%lx\n", hwnd, data->whole_window ); wait_for_withdrawn_state( display, data, FALSE ); @@ -408,7 +405,8 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, } /* don't change position if we are about to minimize or maximize a managed window */ - if (!(data->managed && (swp_flags & SWP_STATECHANGED) && (new_style & (WS_MINIMIZE|WS_MAXIMIZE)))) + if (!event_type && + !(data->managed && (swp_flags & SWP_STATECHANGED) && (new_style & (WS_MINIMIZE|WS_MAXIMIZE)))) X11DRV_sync_window_position( display, data, swp_flags, &old_client_rect, &old_whole_rect ); if ((new_style & WS_VISIBLE) &&

1 0

Rob Shearman : widl: Add a function to get the return type of a parsed function.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: a04b150839ea1351854b3ab8f8e288d515de93c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04b150839ea1351854b3ab8f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:55:34 2008 +0100 widl: Add a function to get the return type of a parsed function. This clarifies its use in code and makes it simpler to change the way functions are parsed into types. --- tools/widl/client.c | 24 +++++++++--------- tools/widl/header.c | 16 ++++++------ tools/widl/proxy.c | 22 ++++++++++------- tools/widl/server.c | 6 ++-- tools/widl/typegen.c | 61 ++++++++++++++++++++++++++-------------------- tools/widl/typegen.h | 2 +- tools/widl/widltypes.h | 5 ++++ tools/widl/write_msft.c | 2 +- 8 files changed, 77 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a04b150839ea1351854b3…

1 0

Alexandre Julliard : winex11: Rely on PropertyNotify events instead of Map/ UnmapNotify to detect iconification.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: a442d3b46db31fbaa8ee7aad64373bcb951bda7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a442d3b46db31fbaa8ee7aad6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 15:58:59 2008 +0200 winex11: Rely on PropertyNotify events instead of Map/UnmapNotify to detect iconification. --- dlls/winex11.drv/event.c | 55 ++++++++++++++++++++++++++++++++++++--- dlls/winex11.drv/winpos.c | 62 --------------------------------------------- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 50 insertions(+), 68 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 1bcec8c..c57d497 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -104,7 +104,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = /* VisibilityNotify */ /* CreateNotify */ { DestroyNotify, X11DRV_DestroyNotify }, - { UnmapNotify, X11DRV_UnmapNotify }, + /* UnmapNotify */ { MapNotify, X11DRV_MapNotify }, /* MapRequest */ /* ReparentNotify */ @@ -123,7 +123,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = { MappingNotify, X11DRV_MappingNotify }, }; -static int nb_event_handlers = 19; /* change this if you add handlers above */ +static int nb_event_handlers = 18; /* change this if you add handlers above */ /* return the name of an X event */ @@ -691,7 +691,8 @@ int get_window_wm_state( Display *display, struct x11drv_win_data *data ) * * Handle a PropertyNotify for WM_STATE. */ -static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent *event ) +static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent *event, + BOOL update_window ) { switch(event->state) { @@ -710,6 +711,50 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent } break; } + + if (!update_window || !data->managed || !data->mapped) return; + + if (data->iconic && data->wm_state == NormalState) /* restore window */ + { + int x, y; + unsigned int width, height, border, depth; + Window root, top; + WINDOWPLACEMENT wp; + RECT rect; + + /* FIXME: hack */ + wine_tsx11_lock(); + XGetGeometry( event->display, data->whole_window, &root, &x, &y, &width, &height, + &border, &depth ); + XTranslateCoordinates( event->display, data->whole_window, root, 0, 0, &x, &y, &top ); + wine_tsx11_unlock(); + rect.left = x; + rect.top = y; + rect.right = x + width; + rect.bottom = y + height; + OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); + X11DRV_X_to_window_rect( data, &rect ); + + wp.length = sizeof(wp); + GetWindowPlacement( data->hwnd, &wp ); + wp.flags = 0; + wp.showCmd = SW_RESTORE; + wp.rcNormalPosition = rect; + + TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); + data->iconic = FALSE; + data->lock_changes++; + SetWindowPlacement( data->hwnd, &wp ); + data->lock_changes--; + } + else if (!data->iconic && data->wm_state == IconicState) + { + TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); + data->iconic = TRUE; + data->lock_changes++; + ShowWindow( data->hwnd, SW_MINIMIZE ); + data->lock_changes--; + } } @@ -724,7 +769,7 @@ static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) if (!hwnd) return; if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (event->atom == x11drv_atom(WM_STATE)) handle_wm_state_notify( data, event ); + if (event->atom == x11drv_atom(WM_STATE)) handle_wm_state_notify( data, event, TRUE ); } @@ -762,7 +807,7 @@ void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, B else { wine_tsx11_unlock(); - handle_wm_state_notify( data, &event.xproperty ); + handle_wm_state_notify( data, &event.xproperty, FALSE ); wine_tsx11_lock(); } } diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 13ec6f1..e60d42a 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -437,7 +437,6 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { struct x11drv_win_data *data; - int state; if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->mapped) return; @@ -446,71 +445,10 @@ void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { HWND hwndFocus = GetFocus(); if (hwndFocus && IsChild( hwnd, hwndFocus )) X11DRV_SetFocus(hwndFocus); /* FIXME */ - return; } - if (!data->iconic) return; - - state = get_window_wm_state( event->xmap.display, data ); - if (state == NormalState) - { - int x, y; - unsigned int width, height, border, depth; - Window root, top; - WINDOWPLACEMENT wp; - RECT rect; - - /* FIXME: hack */ - wine_tsx11_lock(); - XGetGeometry( event->xmap.display, data->whole_window, &root, &x, &y, &width, &height, - &border, &depth ); - XTranslateCoordinates( event->xmap.display, data->whole_window, root, 0, 0, &x, &y, &top ); - wine_tsx11_unlock(); - rect.left = x; - rect.top = y; - rect.right = x + width; - rect.bottom = y + height; - OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - X11DRV_X_to_window_rect( data, &rect ); - - wp.length = sizeof(wp); - GetWindowPlacement( hwnd, &wp ); - wp.flags = 0; - wp.showCmd = SW_RESTORE; - wp.rcNormalPosition = rect; - - TRACE( "restoring win %p/%lx\n", hwnd, data->whole_window ); - data->iconic = FALSE; - data->lock_changes++; - SetWindowPlacement( hwnd, &wp ); - data->lock_changes--; - } - else TRACE( "win %p/%lx ignoring since state=%d\n", hwnd, data->whole_window, state ); } -/********************************************************************** - * X11DRV_UnmapNotify - */ -void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) -{ - struct x11drv_win_data *data; - int state; - - if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->managed || !data->mapped || data->iconic) return; - - state = get_window_wm_state( event->xunmap.display, data ); - if (state == IconicState) - { - TRACE( "minimizing win %p/%lx\n", hwnd, data->whole_window ); - data->iconic = TRUE; - data->lock_changes++; - ShowWindow( hwnd, SW_MINIMIZE ); - data->lock_changes--; - } - else TRACE( "win %p/%lx ignoring since state=%d\n", hwnd, data->whole_window, state ); -} - struct desktop_resize_data { RECT old_screen_rect; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 52670e8..fbf9ebc 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -630,7 +630,6 @@ extern void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ); extern void X11DRV_Expose( HWND hwnd, XEvent *event ); extern void X11DRV_DestroyNotify( HWND hwnd, XEvent *event ); extern void X11DRV_MapNotify( HWND hwnd, XEvent *event ); -extern void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ); extern void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event ); extern void X11DRV_SelectionRequest( HWND hWnd, XEvent *event ); extern void X11DRV_SelectionClear( HWND hWnd, XEvent *event );

1 0

Alexandre Julliard : winex11: Replace the lock_changes flag by a check on the event currently being processed .
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 86675edfeeb12deae0bbdd610e4ddb4d5188f76c URL: http://source.winehq.org/git/wine.git/?a=commit;h=86675edfeeb12deae0bbdd610… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 16:43:49 2008 +0200 winex11: Replace the lock_changes flag by a check on the event currently being processed. --- dlls/winex11.drv/event.c | 4 ---- dlls/winex11.drv/winpos.c | 20 ++++++++++++++++---- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index c57d497..8fd9b20 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -743,17 +743,13 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = FALSE; - data->lock_changes++; SetWindowPlacement( data->hwnd, &wp ); - data->lock_changes--; } else if (!data->iconic && data->wm_state == IconicState) { TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = TRUE; - data->lock_changes++; ShowWindow( data->hwnd, SW_MINIMIZE ); - data->lock_changes--; } } diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index e60d42a..e858acf 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -300,10 +300,12 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *rectWindow, const RECT *rectClient, const RECT *visible_rect, const RECT *valid_rects ) { - Display *display = thread_display(); + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + Display *display = thread_data->display; struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); DWORD new_style = GetWindowLongW( hwnd, GWL_STYLE ); RECT old_window_rect, old_whole_rect, old_client_rect; + int event_type; if (!data) { @@ -379,7 +381,19 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, X11DRV_sync_client_position( display, data, swp_flags, &old_client_rect, &old_whole_rect ); - if (!data->whole_window || data->lock_changes) return; /* nothing more to do */ + if (!data->whole_window) return; + + /* check if we are currently processing an event relevant to this window */ + event_type = 0; + if (thread_data->current_event && thread_data->current_event->xany.window == data->whole_window) + event_type = thread_data->current_event->type; + + if (event_type == ConfigureNotify || event_type == PropertyNotify) + { + TRACE( "not changing window %p/%lx while processing event %u\n", + hwnd, data->whole_window, event_type ); + return; + } if (data->mapped && (!(new_style & WS_VISIBLE) || !X11DRV_is_window_rect_mapped( rectWindow ))) { @@ -578,9 +592,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) TRACE( "%p resizing from (%dx%d) to (%dx%d)\n", hwnd, rect.right - rect.left, rect.bottom - rect.top, cx, cy ); - data->lock_changes++; SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); - data->lock_changes--; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index fbf9ebc..ab5ff76 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -678,7 +678,6 @@ struct x11drv_win_data BOOL iconic : 1; /* is window in iconic state? */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ - unsigned int lock_changes; /* lock count for X11 change requests */ HBITMAP hWMIconBitmap; HBITMAP hWMIconMask; };

1 0

Alexandre Julliard : winex11: Move handling of WM_STATE changes to a separate function, and call it directly from wait_from_withdrawn_state.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: f89aa1282907bb5d1192fbdaa53becbb6a109150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89aa1282907bb5d1192fbdaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 15:55:25 2008 +0200 winex11: Move handling of WM_STATE changes to a separate function, and call it directly from wait_from_withdrawn_state. --- dlls/winex11.drv/event.c | 56 ++++++++++++++++++++++++++++++++------------- 1 files changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index cd6eaf6..1bcec8c 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -687,28 +687,19 @@ int get_window_wm_state( Display *display, struct x11drv_win_data *data ) /*********************************************************************** - * EVENT_PropertyNotify + * handle_wm_state_notify + * + * Handle a PropertyNotify for WM_STATE. */ -static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) +static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent *event ) { - XPropertyEvent *event = &xev->xproperty; - struct x11drv_win_data *data; - - if (!hwnd) return; - if (!(data = X11DRV_get_win_data( hwnd ))) return; - switch(event->state) { case PropertyDelete: - if (event->atom == x11drv_atom(WM_STATE)) - { - data->wm_state = WithdrawnState; - TRACE( "%p/%lx: WM_STATE deleted\n", data->hwnd, data->whole_window ); - } + data->wm_state = WithdrawnState; + TRACE( "%p/%lx: WM_STATE deleted\n", data->hwnd, data->whole_window ); break; - case PropertyNewValue: - if (event->atom == x11drv_atom(WM_STATE)) { int new_state = get_window_wm_state( event->display, data ); if (new_state != -1 && new_state != data->wm_state) @@ -722,6 +713,21 @@ static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) } +/*********************************************************************** + * EVENT_PropertyNotify + */ +static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) +{ + XPropertyEvent *event = &xev->xproperty; + struct x11drv_win_data *data; + + if (!hwnd) return; + if (!(data = X11DRV_get_win_data( hwnd ))) return; + + if (event->atom == x11drv_atom(WM_STATE)) handle_wm_state_notify( data, event ); +} + + /* event filter to wait for a WM_STATE change notification on a window */ static Bool is_wm_state_notify( Display *display, XEvent *event, XPointer arg ) { @@ -744,7 +750,25 @@ void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, B while (data->whole_window && ((data->wm_state == WithdrawnState) == !set)) { - if (!process_events( display, is_wm_state_notify, data->whole_window )) + XEvent event; + int count = 0; + + wine_tsx11_lock(); + while (XCheckIfEvent( display, &event, is_wm_state_notify, (char *)data->whole_window )) + { + count++; + if (XFilterEvent( &event, None )) continue; /* filtered, ignore it */ + if (event.type == DestroyNotify) call_event_handler( display, &event ); + else + { + wine_tsx11_unlock(); + handle_wm_state_notify( data, &event.xproperty ); + wine_tsx11_lock(); + } + } + wine_tsx11_unlock(); + + if (!count) { struct pollfd pfd; int timeout = end - GetTickCount();

1 0

Alexander Morozov : setupapi: Create DeviceInstance value in registry, delete todo_wine from test.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 997bea9b896fa748d6ec185c5462f11e0326904d URL: http://source.winehq.org/git/wine.git/?a=commit;h=997bea9b896fa748d6ec185c5… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Apr 1 14:25:10 2008 +0300 setupapi: Create DeviceInstance value in registry, delete todo_wine from test. --- dlls/setupapi/devinst.c | 31 +++++++++++++++++++++---------- dlls/setupapi/tests/devinst.c | 2 -- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ebfeee0..75cb38b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2650,20 +2650,31 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW( samDesired, NULL, &interfKey, NULL); if (!l) { - if (instancePath) - { - LONG l; + struct DeviceInfo *devInfo = + (struct DeviceInfo *)ifaceInfo->device->Reserved; - l = RegCreateKeyExW(interfKey, instancePath, 0, NULL, 0, - samDesired, NULL, &key, NULL); - if (l) + l = RegSetValueExW(interfKey, DeviceInstance, 0, REG_SZ, + (BYTE *)devInfo->instanceId, + (lstrlenW(devInfo->instanceId) + 1) * sizeof(WCHAR)); + if (!l) + { + if (instancePath) { - SetLastError(l); - key = INVALID_HANDLE_VALUE; + LONG l; + + l = RegCreateKeyExW(interfKey, instancePath, 0, NULL, 0, + samDesired, NULL, &key, NULL); + if (l) + { + SetLastError(l); + key = INVALID_HANDLE_VALUE; + } + else if (InfHandle) + FIXME("INF section installation unsupported\n"); } - else if (InfHandle) - FIXME("INF section installation unsupported\n"); } + else + SetLastError(l); RegCloseKey(interfKey); } else diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index af98eb2..7f63afc 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -816,7 +816,6 @@ static void testRegisterAndGetDetail(void) SetLastError(0xdeadbeef); ret = pSetupDiEnumDeviceInterfaces(set, NULL, &guid, 0, &interfaceData); - todo_wine ok(ret, "SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, NULL, 0, &dwSize, NULL); @@ -836,7 +835,6 @@ static void testRegisterAndGetDetail(void) ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, dwSize, &dwSize, NULL); ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %08x\n", GetLastError()); - todo_wine ok(!lstrcmpiA(path, detail->DevicePath), "Unexpected path %s\n", detail->DevicePath); HeapFree(GetProcessHeap(), 0, detail);

1 0

Alexander Morozov : setupapi: Create device interface keys in registry as in Windows XP.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 6a5c1ca25bd77fde9e825e31dca4d4cc0d1fea8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5c1ca25bd77fde9e825e31d… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Apr 1 14:25:01 2008 +0300 setupapi: Create device interface keys in registry as in Windows XP. --- dlls/setupapi/devinst.c | 43 +++++++++++++++++++++++++++++++++---------- 1 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index e9c8124..ebfeee0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2631,21 +2631,44 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW( struct InterfaceInfo *ifaceInfo = (struct InterfaceInfo *)DeviceInterfaceData->Reserved; PWSTR instancePath = SETUPDI_GetInstancePath(ifaceInfo); + PWSTR interfKeyName = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(ifaceInfo->symbolicLink) + 1) * sizeof(WCHAR)); + HKEY interfKey; + WCHAR *ptr; - if (instancePath) + lstrcpyW(interfKeyName, ifaceInfo->symbolicLink); + if (lstrlenW(ifaceInfo->symbolicLink) > 3) { - LONG l; - - l = RegCreateKeyExW(parent, instancePath, 0, NULL, 0, - samDesired, NULL, &key, NULL); - if (l) + interfKeyName[0] = '#'; + interfKeyName[1] = '#'; + interfKeyName[3] = '#'; + } + ptr = strchrW(interfKeyName, '\\'); + if (ptr) + *ptr = 0; + l = RegCreateKeyExW(parent, interfKeyName, 0, NULL, 0, + samDesired, NULL, &interfKey, NULL); + if (!l) + { + if (instancePath) { - SetLastError(l); - key = INVALID_HANDLE_VALUE; + LONG l; + + l = RegCreateKeyExW(interfKey, instancePath, 0, NULL, 0, + samDesired, NULL, &key, NULL); + if (l) + { + SetLastError(l); + key = INVALID_HANDLE_VALUE; + } + else if (InfHandle) + FIXME("INF section installation unsupported\n"); } - else if (InfHandle) - FIXME("INF section installation unsupported\n"); + RegCloseKey(interfKey); } + else + SetLastError(l); + HeapFree(GetProcessHeap(), 0, interfKeyName); HeapFree(GetProcessHeap(), 0, instancePath); RegCloseKey(parent); }

1 0

Alexander Morozov : setupapi: Added a test for registering device interface and getting device path.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: c4fb0f236eadadf0910e59e8bfd87b610774c09d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4fb0f236eadadf0910e59e8b… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Mar 28 20:38:46 2008 +0300 setupapi: Added a test for registering device interface and getting device path. --- dlls/setupapi/tests/devinst.c | 68 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 2704d31..af98eb2 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -49,6 +49,7 @@ static BOOL (WINAPI *pSetupDiGetDeviceInstanceIdA)(HDEVINFO, PSP_DEVINFO_DAT static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailA)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailW)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiRegisterDeviceInfo)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); +static HDEVINFO (WINAPI *pSetupDiGetClassDevsA)(CONST GUID *, LPCSTR, HWND, DWORD); static void init_function_pointers(void) { @@ -70,6 +71,7 @@ static void init_function_pointers(void) pSetupDiOpenDevRegKey = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenDevRegKey"); pSetupDiCreateDevRegKeyW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDevRegKeyW"); pSetupDiRegisterDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiRegisterDeviceInfo"); + pSetupDiGetClassDevsA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsA"); } /* RegDeleteTreeW from dlls/advapi32/registry.c */ @@ -779,6 +781,71 @@ static void testDevRegKey(void) devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, classKey); } +static void testRegisterAndGetDetail(void) +{ + HDEVINFO set; + BOOL ret; + GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, + 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; + SP_DEVINFO_DATA devInfo = { sizeof(SP_DEVINFO_DATA), { 0 } }; + SP_DEVICE_INTERFACE_DATA interfaceData = { sizeof(interfaceData), { 0 } }; + DWORD dwSize = 0; + + SetLastError(0xdeadbeef); + set = pSetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_ALLCLASSES); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsA failed: %08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, 0, + DICD_GENERATE_ID, &devInfo); + ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, &guid, NULL, 0, &interfaceData); + ok(ret, "SetupDiCreateDeviceInterfaceA failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); + ok(ret, "SetupDiRegisterDeviceInfo failed: %08x\n", GetLastError()); + + pSetupDiDestroyDeviceInfoList(set); + + SetLastError(0xdeadbeef); + set = pSetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_DEVICEINTERFACE); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsA failed: %08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetupDiEnumDeviceInterfaces(set, NULL, &guid, 0, &interfaceData); + todo_wine + ok(ret, "SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, NULL, 0, &dwSize, NULL); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %08x\n", GetLastError()); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + static const char path[] = + "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; + PSP_DEVICE_INTERFACE_DETAIL_DATA_A detail = NULL; + + detail = (PSP_DEVICE_INTERFACE_DETAIL_DATA_A)HeapAlloc(GetProcessHeap(), 0, dwSize); + if (detail) + { + detail->cbSize = offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(char); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, + detail, dwSize, &dwSize, NULL); + ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %08x\n", GetLastError()); + todo_wine + ok(!lstrcmpiA(path, detail->DevicePath), "Unexpected path %s\n", + detail->DevicePath); + HeapFree(GetProcessHeap(), 0, detail); + } + } + + pSetupDiDestroyDeviceInfoList(set); +} + START_TEST(devinst) { init_function_pointers(); @@ -799,4 +866,5 @@ START_TEST(devinst) testCreateDeviceInterface(); testGetDeviceInterfaceDetail(); testDevRegKey(); + testRegisterAndGetDetail(); }

1 0

Alexander Morozov : setupapi: Creating SymbolicLink value in registry as in Windows XP.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: b622101ef252071f6797368f0b4c0911ade2bd5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b622101ef252071f6797368f0… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Apr 1 14:24:50 2008 +0300 setupapi: Creating SymbolicLink value in registry as in Windows XP. --- dlls/setupapi/devinst.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 60da5e8..e9c8124 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -244,7 +244,7 @@ static LPWSTR SETUPDI_CreateSymbolicLinkPath(LPCWSTR instanceId, /* omit length of format specifiers, but include NULL terminator: */ len = lstrlenW(fmt) - 4 + 1; len += lstrlenW(instanceId) + lstrlenW(guidStr); - if (ReferenceString) + if (ReferenceString && *ReferenceString) { /* space for a hash between string and reference string: */ len += lstrlenW(ReferenceString) + 1; @@ -258,10 +258,10 @@ static LPWSTR SETUPDI_CreateSymbolicLinkPath(LPCWSTR instanceId, /* replace '\\' with '#' after the "\\\\?\\" beginning */ for (ptr = strchrW(ret + 4, '\\'); ptr; ptr = strchrW(ptr + 1, '\\')) *ptr = '#'; - if (ReferenceString) + if (ReferenceString && *ReferenceString) { - ret[printed - 1] = '\\'; - lstrcpyW(ret + printed, ReferenceString); + ret[printed] = '\\'; + lstrcpyW(ret + printed + 1, ReferenceString); } } return ret;

1 0

Mikołaj Zalewski : gdi32: Fix GetGlyphIndices to select properly the invalid char glyph for TrueType fonts .
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 4094ff025675a14e7572d975d4fd1bf7c11dc2e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4094ff025675a14e7572d975d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Mar 30 21:43:15 2008 +0200 gdi32: Fix GetGlyphIndices to select properly the invalid char glyph for TrueType fonts. --- dlls/gdi32/freetype.c | 21 ++++++++++++++------- dlls/gdi32/tests/font.c | 32 +++++++++++++++++++++++--------- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 04db3ae..6356c1f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4068,26 +4068,33 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) /************************************************************* * WineEngGetGlyphIndices * - * FIXME: add support for GGI_MARK_NONEXISTING_GLYPHS */ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags) { int i; - WCHAR default_char = 0; - TEXTMETRICW textm; + int default_char = -1; - if (flags & GGI_MARK_NONEXISTING_GLYPHS) default_char = 0x001f; /* Indicate non existence */ + if (flags & GGI_MARK_NONEXISTING_GLYPHS) default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */ for(i = 0; i < count; i++) { pgi[i] = get_glyph_index(font, lpstr[i]); if (pgi[i] == 0) { - if (!default_char) + if (default_char == -1) { - WineEngGetTextMetrics(font, &textm); - default_char = textm.tmDefaultChar; + if (FT_IS_SFNT(font->ft_face)) + { + TT_OS2 *pOS2 = pFT_Get_Sfnt_Table(font->ft_face, ft_sfnt_os2); + default_char = (pOS2->usDefaultChar ? get_glyph_index(font, pOS2->usDefaultChar) : 0); + } + else + { + TEXTMETRICW textm; + WineEngGetTextMetrics(font, &textm); + default_char = textm.tmDefaultChar; + } } pgi[i] = default_char; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ce34ab2..d85ab12 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -583,35 +583,49 @@ static void test_GetGlyphIndices(void) WCHAR testtext[] = {'T','e','s','t',0xffff,0}; WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRIC textm; + HFONT hOldFont; if (!pGetGlyphIndicesW) { skip("GetGlyphIndices not available on platform\n"); return; } - if(!is_font_installed("Symbol")) + hdc = GetDC(0); + + ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); + flags |= GGI_MARK_NONEXISTING_GLYPHS; + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); + ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]); + flags = 0; + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); + ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndices should have returned a %04x not %04x\n", + textm.tmDefaultChar, glyphs[4]); + + if(!is_font_installed("Tahoma")) { - skip("Symbol is not installed so skipping this test\n"); + skip("Tahoma is not installed so skipping this test\n"); return; } - memset(&lf, 0, sizeof(lf)); - strcpy(lf.lfFaceName, "Symbol"); + strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = 20; hfont = CreateFontIndirectA(&lf); - hdc = GetDC(0); - + hOldFont = SelectObject(hdc, hfont); ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); flags |= GGI_MARK_NONEXISTING_GLYPHS; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok((glyphs[4] == 0x001f || glyphs[4] == UNICODE_NOCHAR /* Vista */), "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]); + ok(glyphs[4] == 0xffff, "GetGlyphIndices should have returned 0xffff char not %04x\n", glyphs[4]); flags = 0; + testtext[0] = textm.tmDefaultChar; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndices should have returned a %04x not %04x\n", - textm.tmDefaultChar, glyphs[4]); + todo_wine ok(glyphs[0] == 0, "GetGlyphIndices for tmDefaultChar should be 0 not %04x\n", glyphs[0]); + ok(glyphs[4] == 0, "GetGlyphIndices should have returned 0 not %04x\n", glyphs[4]); + DeleteObject(SelectObject(hdc, hOldFont)); } static void test_GetKerningPairs(void)

1 0