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

Andrew Talbot : hhctrl.ocx: Remove unused variable.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 7f395710b4f58429d32b1e7e3339ba08d0af2c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f395710b4f58429d32b1e7e3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Apr 17 17:39:42 2008 +0100 hhctrl.ocx: Remove unused variable. --- dlls/hhctrl.ocx/chm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index f02866f..699fa04 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -363,14 +363,13 @@ IStream *GetChmStream(CHMInfo *info, LPCWSTR parent_chm, ChmPath *chm_file) CHMInfo *OpenCHM(LPCWSTR szFile) { WCHAR file[MAX_PATH] = {0}; - DWORD res; HRESULT hres; static const WCHAR wszSTRINGS[] = {'#','S','T','R','I','N','G','S',0}; CHMInfo *ret = heap_alloc_zero(sizeof(CHMInfo)); - res = GetFullPathNameW(szFile, sizeof(file)/sizeof(file[0]), file, NULL); + GetFullPathNameW(szFile, sizeof(file)/sizeof(file[0]), file, NULL); ret->szFile = strdupW(file); hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER,

1 0

Alexander Morozov : setupapi: Add a test for SetupDiGetDeviceRegistryProperty and SetupDiSetDeviceRegistryProperty .
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 68f12e32a8690c2db1319cd486c2fe7ec8e719a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f12e32a8690c2db1319cd48… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Apr 17 20:28:04 2008 +0400 setupapi: Add a test for SetupDiGetDeviceRegistryProperty and SetupDiSetDeviceRegistryProperty. --- dlls/setupapi/tests/devinst.c | 204 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 204 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68f12e32a8690c2db1319…

1 0

Alexandre Julliard : user32: Added support for WS_EX_RIGHT in the edit control.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: f4136deecb50643af02c520fa3f80f2473de61d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4136deecb50643af02c520fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 17 19:26:39 2008 +0200 user32: Added support for WS_EX_RIGHT in the edit control. --- dlls/user32/edit.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index a5265e9..0866533 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4813,6 +4813,9 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs, BOOL unicode) if (es->style & ES_COMBO) es->hwndListBox = GetDlgItem(es->hwndParent, ID_CB_LISTBOX); + /* FIXME: should we handle changes to WS_EX_RIGHT style after creation? */ + if (lpcs->dwExStyle & WS_EX_RIGHT) es->style |= ES_RIGHT; + /* Number overrides lowercase overrides uppercase (at least it * does in Win95). However I'll bet that ES_NUMBER would be * invalid under Win 3.1.

1 0

Alexandre Julliard : user32: Added support for WS_EX_RIGHT in the static control.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 5cc82b07b344d8c0cf11f1f6efa4a4c8e52f3df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc82b07b344d8c0cf11f1f6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 17 19:26:43 2008 +0200 user32: Added support for WS_EX_RIGHT in the static control. --- dlls/user32/static.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index df19875..ca83a76 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -688,6 +688,9 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) return; } + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_RIGHT) + wFormat = DT_RIGHT | (wFormat & ~(DT_LEFT | DT_CENTER)); + if (style & SS_NOPREFIX) wFormat |= DT_NOPREFIX;

1 0

Alexandre Julliard : quartz: Avoid sizeof in traces.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: df75bde180f8b38cd857f24764d36c2c387522f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df75bde180f8b38cd857f2476… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 17 20:17:03 2008 +0200 quartz: Avoid sizeof in traces. --- dlls/quartz/avisplit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 61d4d76..89c02d4 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -614,7 +614,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE if (pIndex->cb < sizeof(AVISUPERINDEX) - sizeof(RIFFCHUNK)) { - FIXME("%u < %u?!\n", pIndex->cb, sizeof(AVISUPERINDEX) - sizeof(RIFFCHUNK)); + FIXME("size %u\n", pIndex->cb); break; } @@ -704,7 +704,7 @@ static HRESULT AVISplitter_ProcessODML(AVISplitterImpl * This, const BYTE * pDat TRACE("processing extension header\n"); if (pExtHdr->cb != sizeof(AVIEXTHEADER) - sizeof(RIFFCHUNK)) { - FIXME("Size: %u, other size: %u\n", pExtHdr->cb, sizeof(AVIEXTHEADER) - sizeof(RIFFCHUNK)); + FIXME("Size: %u\n", pExtHdr->cb); break; } TRACE("dwGrandFrames: %u\n", pExtHdr->dwGrandFrames);

1 0

Alexandre Julliard : winex11: Moved the MapNotify handler to event.c.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 64e812840998ad0cb1a90f805063a4e52dd3023e URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e812840998ad0cb1a90f805… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 17 16:13:12 2008 +0200 winex11: Moved the MapNotify handler to event.c. --- dlls/winex11.drv/event.c | 19 +++++++++++++++++++ dlls/winex11.drv/winpos.c | 18 ------------------ dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index fc126c2..adbf585 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -76,6 +76,7 @@ extern BOOL ximInComposeMode; static void X11DRV_FocusIn( HWND hwnd, XEvent *event ); static void X11DRV_FocusOut( HWND hwnd, XEvent *event ); static void X11DRV_Expose( HWND hwnd, XEvent *event ); +static void X11DRV_MapNotify( HWND hwnd, XEvent *event ); static void X11DRV_PropertyNotify( HWND hwnd, XEvent *event ); static void X11DRV_ClientMessage( HWND hwnd, XEvent *event ); @@ -711,6 +712,24 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) } +/********************************************************************** + * X11DRV_MapNotify + */ +static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) +{ + struct x11drv_win_data *data; + + if (!(data = X11DRV_get_win_data( hwnd ))) return; + if (!data->mapped) return; + + if (!data->managed) + { + HWND hwndFocus = GetFocus(); + if (hwndFocus && IsChild( hwnd, hwndFocus )) X11DRV_SetFocus(hwndFocus); /* FIXME */ + } +} + + /*********************************************************************** * get_window_wm_state */ diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 8c904ad..43d388a 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -478,24 +478,6 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, } -/********************************************************************** - * X11DRV_MapNotify - */ -void X11DRV_MapNotify( HWND hwnd, XEvent *event ) -{ - struct x11drv_win_data *data; - - if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->mapped) return; - - if (!data->managed) - { - HWND hwndFocus = GetFocus(); - if (hwndFocus && IsChild( hwnd, hwndFocus )) X11DRV_SetFocus(hwndFocus); /* FIXME */ - } -} - - struct desktop_resize_data { RECT old_screen_rect; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index b040e05..30b339e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -642,7 +642,6 @@ extern void X11DRV_EnterNotify( HWND hwnd, XEvent *event ); extern void X11DRV_KeyEvent( HWND hwnd, XEvent *event ); extern void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ); extern void X11DRV_DestroyNotify( HWND hwnd, XEvent *event ); -extern void X11DRV_MapNotify( 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: Moved the WM_SYSCOMMAND handling to window.c.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 24dbaa0856a229e1ed64e9ce778e05fd3375ac95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24dbaa0856a229e1ed64e9ce7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 17 16:13:34 2008 +0200 winex11: Moved the WM_SYSCOMMAND handling to window.c. --- dlls/winex11.drv/window.c | 134 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winpos.c | 134 --------------------------------------------- 2 files changed, 134 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24dbaa0856a229e1ed64e…

1 0

Alexandre Julliard : user32: Added support for WS_EX_RIGHT in the button control.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: bbd9e229e3c2676e9db7ce64d6a87bb75f506e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd9e229e3c2676e9db7ce64d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 17 19:26:34 2008 +0200 user32: Added support for WS_EX_RIGHT in the button control. --- dlls/user32/button.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 27f10b7..d1ba2c1 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -567,9 +567,8 @@ static LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARA /********************************************************************** * Convert button styles to flags used by DrawText. - * TODO: handle WS_EX_RIGHT extended style. */ -static UINT BUTTON_BStoDT(DWORD style) +static UINT BUTTON_BStoDT( DWORD style, DWORD ex_style ) { UINT dtStyle = DT_NOCLIP; /* We use SelectClipRgn to limit output */ @@ -593,6 +592,8 @@ static UINT BUTTON_BStoDT(DWORD style) /* all other flavours have left aligned text */ } + if (ex_style & WS_EX_RIGHT) dtStyle = DT_RIGHT | (dtStyle & ~(DT_LEFT | DT_CENTER)); + /* DrawText ignores vertical alignment for multiline text, * but we use these flags to align label manually. */ @@ -626,10 +627,11 @@ static UINT BUTTON_BStoDT(DWORD style) static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc) { LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); WCHAR *text; ICONINFO iconInfo; BITMAP bm; - UINT dtStyle = BUTTON_BStoDT(style); + UINT dtStyle = BUTTON_BStoDT( style, ex_style ); RECT r = *rc; INT n;

1 0

Alexandre Julliard : winex11: Moved the ExposeEvent handler to event.c.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 585da9296d7559784c5a72474be4c9eb58ebc1c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=585da9296d7559784c5a72474… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 17 16:07:06 2008 +0200 winex11: Moved the ExposeEvent handler to event.c. Use consistent naming for all event handlers. --- dlls/winex11.drv/event.c | 85 ++++++++++++++++++++++++++++++++++++-------- dlls/winex11.drv/winpos.c | 51 --------------------------- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 69 insertions(+), 68 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 377e8f4..fc126c2 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -51,6 +51,7 @@ #include "shlobj.h" /* DROPFILES */ #include "shellapi.h" +#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(event); @@ -72,10 +73,11 @@ extern BOOL ximInComposeMode; #define DndURL 128 /* KDE drag&drop */ /* Event handlers */ -static void EVENT_FocusIn( HWND hwnd, XEvent *event ); -static void EVENT_FocusOut( HWND hwnd, XEvent *event ); -static void EVENT_PropertyNotify( HWND hwnd, XEvent *event ); -static void EVENT_ClientMessage( HWND hwnd, XEvent *event ); +static void X11DRV_FocusIn( HWND hwnd, XEvent *event ); +static void X11DRV_FocusOut( HWND hwnd, XEvent *event ); +static void X11DRV_Expose( HWND hwnd, XEvent *event ); +static void X11DRV_PropertyNotify( HWND hwnd, XEvent *event ); +static void X11DRV_ClientMessage( HWND hwnd, XEvent *event ); struct event_handler { @@ -95,8 +97,8 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = { MotionNotify, X11DRV_MotionNotify }, { EnterNotify, X11DRV_EnterNotify }, /* LeaveNotify */ - { FocusIn, EVENT_FocusIn }, - { FocusOut, EVENT_FocusOut }, + { FocusIn, X11DRV_FocusIn }, + { FocusOut, X11DRV_FocusOut }, { KeymapNotify, X11DRV_KeymapNotify }, { Expose, X11DRV_Expose }, /* GraphicsExpose */ @@ -114,12 +116,12 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = /* ResizeRequest */ /* CirculateNotify */ /* CirculateRequest */ - { PropertyNotify, EVENT_PropertyNotify }, + { PropertyNotify, X11DRV_PropertyNotify }, { SelectionClear, X11DRV_SelectionClear }, { SelectionRequest, X11DRV_SelectionRequest }, /* SelectionNotify */ /* ColormapNotify */ - { ClientMessage, EVENT_ClientMessage }, + { ClientMessage, X11DRV_ClientMessage }, { MappingNotify, X11DRV_MappingNotify }, }; @@ -568,9 +570,9 @@ static const char * const focus_details[] = }; /********************************************************************** - * EVENT_FocusIn + * X11DRV_FocusIn */ -static void EVENT_FocusIn( HWND hwnd, XEvent *xev ) +static void X11DRV_FocusIn( HWND hwnd, XEvent *xev ) { XFocusChangeEvent *event = &xev->xfocus; XIC xic; @@ -602,11 +604,11 @@ static void EVENT_FocusIn( HWND hwnd, XEvent *xev ) /********************************************************************** - * EVENT_FocusOut + * X11DRV_FocusOut * * Note: only top-level windows get FocusOut events. */ -static void EVENT_FocusOut( HWND hwnd, XEvent *xev ) +static void X11DRV_FocusOut( HWND hwnd, XEvent *xev ) { XFocusChangeEvent *event = &xev->xfocus; HWND hwnd_tmp; @@ -659,6 +661,57 @@ static void EVENT_FocusOut( HWND hwnd, XEvent *xev ) /*********************************************************************** + * X11DRV_Expose + */ +static void X11DRV_Expose( HWND hwnd, XEvent *xev ) +{ + XExposeEvent *event = &xev->xexpose; + RECT rect; + struct x11drv_win_data *data; + int flags = RDW_INVALIDATE | RDW_ERASE; + + TRACE( "win %p (%lx) %d,%d %dx%d\n", + hwnd, event->window, event->x, event->y, event->width, event->height ); + + if (!(data = X11DRV_get_win_data( hwnd ))) return; + + if (event->window == data->whole_window) + { + rect.left = data->whole_rect.left + event->x; + rect.top = data->whole_rect.top + event->y; + flags |= RDW_FRAME; + } + else + { + rect.left = data->client_rect.left + event->x; + rect.top = data->client_rect.top + event->y; + } + rect.right = rect.left + event->width; + rect.bottom = rect.top + event->height; + + if (event->window != root_window) + { + SERVER_START_REQ( update_window_zorder ) + { + req->window = hwnd; + req->rect.left = rect.left; + req->rect.top = rect.top; + req->rect.right = rect.right; + req->rect.bottom = rect.bottom; + wine_server_call( req ); + } + SERVER_END_REQ; + + /* make position relative to client area instead of parent */ + OffsetRect( &rect, -data->client_rect.left, -data->client_rect.top ); + flags |= RDW_ALLCHILDREN; + } + + RedrawWindow( hwnd, &rect, 0, flags ); +} + + +/*********************************************************************** * get_window_wm_state */ int get_window_wm_state( Display *display, struct x11drv_win_data *data ) @@ -755,9 +808,9 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent /*********************************************************************** - * EVENT_PropertyNotify + * X11DRV_PropertyNotify */ -static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) +static void X11DRV_PropertyNotify( HWND hwnd, XEvent *xev ) { XPropertyEvent *event = &xev->xproperty; struct x11drv_win_data *data; @@ -1130,9 +1183,9 @@ static const struct client_message_handler client_messages[] = /********************************************************************** - * EVENT_ClientMessage + * X11DRV_ClientMessage */ -static void EVENT_ClientMessage( HWND hwnd, XEvent *xev ) +static void X11DRV_ClientMessage( HWND hwnd, XEvent *xev ) { XClientMessageEvent *event = &xev->xclient; unsigned int i; diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index f6b75d6..8c904ad 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -61,57 +61,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); static const char managed_prop[] = "__wine_x11_managed"; /*********************************************************************** - * X11DRV_Expose - */ -void X11DRV_Expose( HWND hwnd, XEvent *xev ) -{ - XExposeEvent *event = &xev->xexpose; - RECT rect; - struct x11drv_win_data *data; - int flags = RDW_INVALIDATE | RDW_ERASE; - - TRACE( "win %p (%lx) %d,%d %dx%d\n", - hwnd, event->window, event->x, event->y, event->width, event->height ); - - if (!(data = X11DRV_get_win_data( hwnd ))) return; - - if (event->window == data->whole_window) - { - rect.left = data->whole_rect.left + event->x; - rect.top = data->whole_rect.top + event->y; - flags |= RDW_FRAME; - } - else - { - rect.left = data->client_rect.left + event->x; - rect.top = data->client_rect.top + event->y; - } - rect.right = rect.left + event->width; - rect.bottom = rect.top + event->height; - - if (event->window != root_window) - { - SERVER_START_REQ( update_window_zorder ) - { - req->window = hwnd; - req->rect.left = rect.left; - req->rect.top = rect.top; - req->rect.right = rect.right; - req->rect.bottom = rect.bottom; - wine_server_call( req ); - } - SERVER_END_REQ; - - /* make position relative to client area instead of parent */ - OffsetRect( &rect, -data->client_rect.left, -data->client_rect.top ); - flags |= RDW_ALLCHILDREN; - } - - RedrawWindow( hwnd, &rect, 0, flags ); -} - - -/*********************************************************************** * update_net_wm_states */ static void update_net_wm_states( Display *display, struct x11drv_win_data *data ) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e682f07..b040e05 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -641,7 +641,6 @@ extern void X11DRV_MotionNotify( HWND hwnd, XEvent *event ); extern void X11DRV_EnterNotify( HWND hwnd, XEvent *event ); extern void X11DRV_KeyEvent( HWND hwnd, XEvent *event ); 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_ConfigureNotify( HWND hwnd, XEvent *event );

1 0

Maarten Lankhorst : server: Make enum_desktop enumerate all the desktops on the window station with the DESKTOP_ENUMERATE right .
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 3fd1fc760046165e63146a2803b510079ee00035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd1fc760046165e63146a280… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 15 16:38:58 2008 -0700 server: Make enum_desktop enumerate all the desktops on the window station with the DESKTOP_ENUMERATE right. --- server/winstation.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/server/winstation.c b/server/winstation.c index cde4923..817fe77 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -659,28 +659,23 @@ DECL_HANDLER(enum_desktop) { struct winstation *winstation; struct desktop *desktop; - unsigned int index = req->index; - obj_handle_t handle; + unsigned int index = 0; if (!(winstation = (struct winstation *)get_handle_obj( current->process, req->winstation, WINSTA_ENUMDESKTOPS, &winstation_ops ))) return; - while ((handle = enumerate_handles( current->process, &desktop_ops, &index ))) + LIST_FOR_EACH_ENTRY( desktop, &winstation->desktops, struct desktop, entry ) { - if (!(desktop = get_desktop_obj( current->process, handle, DESKTOP_ENUMERATE ))) - continue; - - if (desktop->winstation == winstation) - { - set_reply_data_obj_name( &desktop->obj ); - release_object( desktop ); - release_object( winstation ); - clear_error(); - reply->next = index; - return; - } - release_object( desktop ); + unsigned int access = DESKTOP_ENUMERATE; + if (req->index > index++) continue; + if (!desktop->obj.name) continue; + if (!check_object_access( &desktop->obj, &access )) continue; + set_reply_data_obj_name( &desktop->obj ); + release_object( winstation ); + clear_error(); + reply->next = index; + return; } release_object( winstation );

1 0