June 2013 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Defer minimizing hidden windows until they are shown.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: b285c5706efd0678376fcc11619f4aa8536d4370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b285c5706efd0678376fcc116… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 4 04:59:42 2013 -0500 winemac: Defer minimizing hidden windows until they are shown. Minimizing invisible windows causes weird phantoms to appear in Exposé, the Window menu, and the Dock. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index e1af247..0f7e084 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -29,6 +29,7 @@ BOOL disabled; BOOL noActivate; BOOL floating; + BOOL pendingMinimize; WineWindow* latentParentWindow; void* hwnd; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 2da8a08..035576e 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -636,10 +636,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } [self setCollectionBehavior:behavior]; + pendingMinimize = FALSE; if (state->minimized && ![self isMiniaturized]) { - ignore_windowMiniaturize = TRUE; - [self miniaturize:nil]; + if ([self isVisible]) + { + ignore_windowMiniaturize = TRUE; + [self miniaturize:nil]; + } + else + pendingMinimize = TRUE; } else if (!state->minimized && [self isMiniaturized]) { @@ -754,6 +760,13 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (needAdjustWindowLevels) [controller adjustWindowLevels]; + if (pendingMinimize) + { + ignore_windowMiniaturize = TRUE; + [self miniaturize:nil]; + pendingMinimize = FALSE; + } + NSEnableScreenUpdates(); /* Cocoa may adjust the frame when the window is ordered onto the screen. @@ -770,6 +783,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) doOrderOut { + if ([self isMiniaturized]) + pendingMinimize = TRUE; self.latentParentWindow = [self parentWindow]; [latentParentWindow removeChildWindow:self]; [self orderOut:nil]; @@ -948,6 +963,13 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self orderFront:nil]; [controller adjustWindowLevels]; + if (pendingMinimize) + { + ignore_windowMiniaturize = TRUE; + [self miniaturize:nil]; + pendingMinimize = FALSE; + } + NSEnableScreenUpdates(); causing_becomeKeyWindow = TRUE; @@ -1057,6 +1079,13 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self setLevel:[front level]]; [self orderFront:nil]; [controller adjustWindowLevels]; + + if (pendingMinimize) + { + ignore_windowMiniaturize = TRUE; + [self miniaturize:nil]; + pendingMinimize = FALSE; + } } - (void) sendEvent:(NSEvent*)event

1 0

Ken Thomases : winemac: Keep old window surface for minimized windows to allow redrawing.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: f57db8a3deafd5613232736c00fefd6e541b6a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57db8a3deafd5613232736c0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 4 04:59:45 2013 -0500 winemac: Keep old window surface for minimized windows to allow redrawing. This improves the animation of the window unminimizing from the Dock in some cases. The window would often be blank or, for shaped windows, invisible during that animation. --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/window.c | 25 ++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 8e0b0f8..085f786 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -135,6 +135,7 @@ struct macdrv_win_data BOOL per_pixel_alpha : 1; /* is window using per-pixel alpha? */ BOOL minimized : 1; /* is window minimized? */ struct window_surface *surface; + struct window_surface *unminimized_surface; }; extern struct macdrv_win_data *get_win_data(HWND hwnd) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 3353749..77d2ea0 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -535,6 +535,8 @@ static void destroy_cocoa_window(struct macdrv_win_data *data) data->color_key = CLR_INVALID; if (data->surface) window_surface_release(data->surface); data->surface = NULL; + if (data->unminimized_surface) window_surface_release(data->unminimized_surface); + data->unminimized_surface = NULL; } @@ -1108,6 +1110,11 @@ BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO * set_window_surface(data->cocoa_window, data->surface); if (surface) window_surface_release(surface); surface = data->surface; + if (data->unminimized_surface) + { + window_surface_release(data->unminimized_surface); + data->unminimized_surface = NULL; + } } else set_surface_use_alpha(surface, TRUE); @@ -1333,7 +1340,23 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, if (!data->ulw_layered) { if (surface) window_surface_add_ref(surface); - set_window_surface(data->cocoa_window, surface); + if (new_style & WS_MINIMIZE) + { + if (!data->unminimized_surface && data->surface) + { + data->unminimized_surface = data->surface; + window_surface_add_ref(data->unminimized_surface); + } + } + else + { + set_window_surface(data->cocoa_window, surface); + if (data->unminimized_surface) + { + window_surface_release(data->unminimized_surface); + data->unminimized_surface = NULL; + } + } if (data->surface) window_surface_release(data->surface); data->surface = surface; }

1 0

Ken Thomases : winemac: Improve the debug tracing in macdrv_SetWindowStyle( ).
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: f010a930dff00e959dec37c520ce366e9ce88eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f010a930dff00e959dec37c52… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 4 04:59:47 2013 -0500 winemac: Improve the debug tracing in macdrv_SetWindowStyle(). --- dlls/winemac.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 77d2ea0..eacc0b6 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -962,7 +962,7 @@ void CDECL macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) { struct macdrv_win_data *data; - TRACE("%p, %d, %p\n", hwnd, offset, style); + TRACE("hwnd %p offset %d styleOld 0x%08x styleNew 0x%08x\n", hwnd, offset, style->styleOld, style->styleNew); if (hwnd == GetDesktopWindow()) return; if (!(data = get_win_data(hwnd))) return;

1 0

Ken Thomases : winemac: Allow Cocoa to make minimized windows key; it will unminimize them as necessary.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: b15f412e14ec3160ba2c9b2afe42102355f64a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15f412e14ec3160ba2c9b2af… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 4 04:59:49 2013 -0500 winemac: Allow Cocoa to make minimized windows key; it will unminimize them as necessary. --- dlls/winemac.drv/window.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index eacc0b6..a04f1e2 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -93,7 +93,6 @@ static inline BOOL can_activate_window(HWND hwnd) if (!(style & WS_VISIBLE)) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; - if (style & WS_MINIMIZE) return FALSE; if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_NOACTIVATE) return FALSE; if (hwnd == GetDesktopWindow()) return FALSE; if (GetWindowRect(hwnd, &rect) && IsRectEmpty(&rect)) return FALSE; @@ -1548,14 +1547,15 @@ void macdrv_window_frame_changed(HWND hwnd, CGRect frame) */ void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) { + LONG style = GetWindowLongW(hwnd, GWL_STYLE); + if (!hwnd) return; TRACE("win %p/%p serial %lu enabled %d visible %d style %08x focus %p active %p fg %p\n", hwnd, event->window, event->window_got_focus.serial, IsWindowEnabled(hwnd), - IsWindowVisible(hwnd), GetWindowLongW(hwnd, GWL_STYLE), GetFocus(), - GetActiveWindow(), GetForegroundWindow()); + IsWindowVisible(hwnd), style, GetFocus(), GetActiveWindow(), GetForegroundWindow()); - if (can_activate_window(hwnd)) + if (can_activate_window(hwnd) && !(style & WS_MINIMIZE)) { /* simulate a mouse click on the caption to find out * whether the window wants to be activated */

1 0

Ken Thomases : winemac: Make windows key after unminimizing, if allowed.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 62a1907c9e9f66c331370c654bb600f175a0cba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a1907c9e9f66c331370c654… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 4 04:59:51 2013 -0500 winemac: Make windows key after unminimizing, if allowed. We generally prevent Cocoa from making our windows key (focused) so that Wine can be in control. However, after unminimizing, Wine believes the window is already focused but Cocoa doesn't, so key presses just cause beeps. --- dlls/winemac.drv/cocoa_window.m | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 035576e..6fbd0db 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1202,6 +1202,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void)windowDidDeminiaturize:(NSNotification *)notification { + WineApplicationController* controller = [WineApplicationController sharedController]; + if (!ignore_windowDeminiaturize) { macdrv_event* event; @@ -1218,7 +1220,15 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) ignore_windowDeminiaturize = FALSE; - [[WineApplicationController sharedController] adjustWindowLevels]; + [controller adjustWindowLevels]; + + if (!self.disabled && !self.noActivate) + { + causing_becomeKeyWindow = TRUE; + [self makeKeyWindow]; + causing_becomeKeyWindow = FALSE; + [controller windowGotFocus:self]; + } } - (void) windowDidEndLiveResize:(NSNotification *)notification

1 0

Ken Thomases : winemac: Ignore window frame changes while minimized but check again when unminimized .
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: a6dc4906de8caa187deb38bd0e044e5aab442ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6dc4906de8caa187deb38bd0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 4 04:59:54 2013 -0500 winemac: Ignore window frame changes while minimized but check again when unminimized. --- dlls/winemac.drv/cocoa_window.m | 2 ++ dlls/winemac.drv/window.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 6fbd0db..9d8984c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1229,6 +1229,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) causing_becomeKeyWindow = FALSE; [controller windowGotFocus:self]; } + + [self windowDidResize:notification]; } - (void) windowDidEndLiveResize:(NSNotification *)notification diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index a04f1e2..7e0c60e 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1500,7 +1500,7 @@ void macdrv_window_frame_changed(HWND hwnd, CGRect frame) if (!hwnd) return; if (!(data = get_win_data(hwnd))) return; - if (!data->on_screen) + if (!data->on_screen || data->minimized) { release_win_data(data); return;

1 0

Hans Leidekker : wbemprox: Optimize a common Win32_Directory query.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 8e1aa4358a7eeef906a9255594f27f9e5910eb6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1aa4358a7eeef906a925559… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 4 13:26:32 2013 +0200 wbemprox: Optimize a common Win32_Directory query. --- dlls/wbemprox/builtin.c | 176 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 139 insertions(+), 37 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index fc77419..91bcb9e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -839,37 +839,6 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co return status; } -static WCHAR *get_filesystem( const WCHAR *root ) -{ - static const WCHAR ntfsW[] = {'N','T','F','S',0}; - WCHAR buffer[MAX_PATH + 1]; - - if (GetVolumeInformationW( root, NULL, 0, NULL, NULL, NULL, buffer, MAX_PATH + 1 )) - return heap_strdupW( buffer ); - return heap_strdupW( ntfsW ); -} - -static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) -{ - WCHAR root[] = {'\\','\\','.','\\','A',':',0}; - ULARGE_INTEGER free; - DISK_GEOMETRY_EX info; - HANDLE handle; - - free.QuadPart = 512 * 1024 * 1024; - GetDiskFreeSpaceExW( dir, NULL, NULL, &free ); - - root[4] = dir[0]; - handle = CreateFileW( root, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); - if (handle != INVALID_HANDLE_VALUE) - { - if (DeviceIoControl( handle, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &info, sizeof(info), NULL, NULL )) - *disksize = info.DiskSize.QuadPart; - CloseHandle( handle ); - } - return free.QuadPart; -} - struct dirstack { WCHAR **dirs; @@ -899,10 +868,16 @@ static struct dirstack *alloc_dirstack( UINT size ) return dirstack; } -static void free_dirstack( struct dirstack *dirstack ) +static void clear_dirstack( struct dirstack *dirstack ) { UINT i; for (i = 0; i < dirstack->num_dirs; i++) heap_free( dirstack->dirs[i] ); + dirstack->num_dirs = 0; +} + +static void free_dirstack( struct dirstack *dirstack ) +{ + clear_dirstack( dirstack ); heap_free( dirstack->dirs ); heap_free( dirstack->len_dirs ); heap_free( dirstack ); @@ -912,6 +887,8 @@ static BOOL push_dir( struct dirstack *dirstack, WCHAR *dir, UINT len ) { UINT size, i = dirstack->num_dirs; + if (!dir) return FALSE; + if (i == dirstack->num_allocated) { WCHAR **tmp; @@ -957,7 +934,7 @@ static WCHAR *build_glob( WCHAR drive, const WCHAR *path, UINT len ) ret[i++] = drive; ret[i++] = ':'; ret[i++] = '\\'; - if (path) + if (path && len) { memcpy( ret + i, path, len * sizeof(WCHAR) ); i += len; @@ -968,7 +945,7 @@ static WCHAR *build_glob( WCHAR drive, const WCHAR *path, UINT len ) return ret; } -static WCHAR *build_dirname( WCHAR drive, const WCHAR *path ) +static WCHAR *build_name( WCHAR drive, const WCHAR *path ) { UINT i = 0, len = 0; const WCHAR *p; @@ -997,6 +974,90 @@ static WCHAR *build_dirname( WCHAR drive, const WCHAR *path ) return ret; } +static WCHAR *build_dirname( const WCHAR *path, UINT *ret_len ) +{ + const WCHAR *p = path, *start; + UINT len, i; + WCHAR *ret; + + if (!isalphaW( p[0] ) || p[1] != ':' || p[2] != '\\' || p[3] != '\\' || !p[4]) return NULL; + start = path + 4; + len = strlenW( start ); + p = start + len - 1; + if (*p == '\\') return NULL; + + while (p >= start && *p != '\\') { len--; p--; }; + while (p >= start && *p == '\\') { len--; p--; }; + + if (!(ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; + for (i = 0, p = start; p < start + len; p++) + { + if (p[0] == '\\' && p[1] == '\\') + { + ret[i++] = '\\'; + p++; + } + else ret[i++] = *p; + } + ret[i] = 0; + *ret_len = i; + return ret; +} + +static BOOL seen_dir( struct dirstack *dirstack, const WCHAR *path ) +{ + UINT i; + for (i = 0; i < dirstack->num_dirs; i++) if (!strcmpW( dirstack->dirs[i], path )) return TRUE; + return FALSE; +} + +/* optimize queries of the form WHERE Name='...' [OR Name='...']* */ +static UINT seed_dirs( struct dirstack *dirstack, const struct expr *cond, WCHAR root, UINT *count ) +{ + const struct expr *left = cond->u.expr.left, *right = cond->u.expr.right; + + if (cond->type != EXPR_COMPLEX) return *count = 0; + if (cond->u.expr.op == OP_EQ) + { + UINT len; + WCHAR *path; + const WCHAR *str = NULL; + + if (left->type == EXPR_PROPVAL && right->type == EXPR_SVAL && + !strcmpW( left->u.propval->name, prop_nameW ) && + toupperW( right->u.sval[0] ) == toupperW( root )) + { + str = right->u.sval; + } + else if (left->type == EXPR_SVAL && right->type == EXPR_PROPVAL && + !strcmpW( right->u.propval->name, prop_nameW ) && + toupperW( left->u.sval[0] ) == toupperW( root )) + { + str = left->u.sval; + } + if (str && (path = build_dirname( str, &len ))) + { + if (seen_dir( dirstack, path )) + { + heap_free( path ); + return ++*count; + } + else if (push_dir( dirstack, path, len )) return ++*count; + heap_free( path ); + return *count = 0; + } + } + else if (cond->u.expr.op == OP_OR) + { + UINT left_count = 0, right_count = 0; + + if (!(seed_dirs( dirstack, left, root, &left_count ))) return *count = 0; + if (!(seed_dirs( dirstack, right, root, &right_count ))) return *count = 0; + return *count += left_count + right_count; + } + return *count = 0; +} + static WCHAR *append_path( const WCHAR *path, const WCHAR *segment, UINT *len ) { UINT len_path = 0, len_segment = strlenW( segment ); @@ -1005,7 +1066,7 @@ static WCHAR *append_path( const WCHAR *path, const WCHAR *segment, UINT *len ) *len = 0; if (path) len_path = strlenW( path ); if (!(ret = heap_alloc( (len_path + len_segment + 2) * sizeof(WCHAR) ))) return NULL; - if (path) + if (path && len_path) { memcpy( ret, path, len_path * sizeof(WCHAR) ); ret[len_path] = '\\'; @@ -1021,7 +1082,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * { static const WCHAR dotW[] = {'.',0}, dotdotW[] = {'.','.',0}; struct record_directory *rec; - UINT i, len, row = 0, offset = 0, count = 4; + UINT i, len, row = 0, offset = 0, count = 4, num_expected_rows; WCHAR *glob = NULL, *path = NULL, *new_path, root[] = {'A',':','\\',0}; DWORD drives = GetLogicalDrives(); WIN32_FIND_DATAW data; @@ -1038,6 +1099,9 @@ static enum fill_status fill_directory( struct table *table, const struct expr * root[0] = 'A' + i; if (GetDriveTypeW( root ) != DRIVE_FIXED) continue; + num_expected_rows = 0; + if (!seed_dirs( dirstack, cond, root[0], &num_expected_rows )) clear_dirstack( dirstack ); + for (;;) { path = pop_dir( dirstack, &len ); @@ -1074,12 +1138,19 @@ static enum fill_status fill_directory( struct table *table, const struct expr * } rec = (struct record_directory *)(table->data + offset); rec->accessmask = FILE_ALL_ACCESS; - rec->name = build_dirname( root[0], new_path ); + rec->name = build_name( root[0], new_path ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row ); continue; } + else if (num_expected_rows && row == num_expected_rows - 1) + { + row++; + FindClose( handle ); + status = FILL_STATUS_FILTERED; + goto done; + } offset += sizeof(*rec); row++; } @@ -1102,6 +1173,37 @@ done: return status; } +static WCHAR *get_filesystem( const WCHAR *root ) +{ + static const WCHAR ntfsW[] = {'N','T','F','S',0}; + WCHAR buffer[MAX_PATH + 1]; + + if (GetVolumeInformationW( root, NULL, 0, NULL, NULL, NULL, buffer, MAX_PATH + 1 )) + return heap_strdupW( buffer ); + return heap_strdupW( ntfsW ); +} + +static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) +{ + WCHAR root[] = {'\\','\\','.','\\','A',':',0}; + ULARGE_INTEGER free; + DISK_GEOMETRY_EX info; + HANDLE handle; + + free.QuadPart = 512 * 1024 * 1024; + GetDiskFreeSpaceExW( dir, NULL, NULL, &free ); + + root[4] = dir[0]; + handle = CreateFileW( root, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (handle != INVALID_HANDLE_VALUE) + { + if (DeviceIoControl( handle, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &info, sizeof(info), NULL, NULL )) + *disksize = info.DiskSize.QuadPart; + CloseHandle( handle ); + } + return free.QuadPart; +} + static enum fill_status fill_diskpartition( struct table *table, const struct expr *cond ) { static const WCHAR fmtW[] =

1 0

Hans Leidekker : wbemprox: Use the right allocator for BSTR values in get_owner.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 9a14d5d024ec4f95663b74a0e8a5c1e5a571f651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a14d5d024ec4f95663b74a0e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 4 13:27:08 2013 +0200 wbemprox: Use the right allocator for BSTR values in get_owner. --- dlls/wbemprox/process.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/process.c b/dlls/wbemprox/process.c index 918ba91..d3552b7 100644 --- a/dlls/wbemprox/process.c +++ b/dlls/wbemprox/process.c @@ -40,14 +40,14 @@ static HRESULT get_owner( VARIANT *user, VARIANT *domain, VARIANT *retval ) len = 0; GetUserNameW( NULL, &len ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) goto done; - if (!(V_BSTR( user ) = heap_alloc( len * sizeof(WCHAR) ))) goto done; + if (!(V_BSTR( user ) = SysAllocStringLen( NULL, len - 1 ))) goto done; if (!GetUserNameW( V_BSTR( user ), &len )) goto done; V_VT( user ) = VT_BSTR; len = 0; GetComputerNameW( NULL, &len ); if (GetLastError() != ERROR_BUFFER_OVERFLOW) goto done; - if (!(V_BSTR( domain ) = heap_alloc( len * sizeof(WCHAR) ))) goto done; + if (!(V_BSTR( domain ) = SysAllocStringLen( NULL, len - 1 ))) goto done; if (!GetComputerNameW( V_BSTR( domain ), &len )) goto done; V_VT( domain ) = VT_BSTR;

1 0

Hans Leidekker : wbemprox: Rewrite IWbemServices:: ExecMethod with low-level functions so we can reuse the object instance.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: f4da96bb29d38f67dae6d2868ff41f62af4ae1e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4da96bb29d38f67dae6d2868… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 4 13:27:48 2013 +0200 wbemprox: Rewrite IWbemServices::ExecMethod with low-level functions so we can reuse the object instance. --- dlls/wbemprox/query.c | 12 +++---- dlls/wbemprox/services.c | 70 +++++++++++++++++++++++++------------- dlls/wbemprox/wbemprox_private.h | 3 ++ 3 files changed, 54 insertions(+), 31 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index bff3f8e..e1a10a4 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -238,7 +238,7 @@ HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, return WBEM_E_INVALID_QUERY; } -static HRESULT execute_view( struct view *view ) +HRESULT execute_view( struct view *view ) { UINT i, j = 0, len; @@ -272,7 +272,7 @@ static HRESULT execute_view( struct view *view ) return S_OK; } -static struct query *create_query(void) +struct query *create_query(void) { struct query *query; @@ -282,15 +282,13 @@ static struct query *create_query(void) return query; } -static void free_query( struct query *query ) +void free_query( struct query *query ) { struct list *mem, *next; + if (!query) return; destroy_view( query->view ); - LIST_FOR_EACH_SAFE( mem, next, &query->mem ) - { - heap_free( mem ); - } + LIST_FOR_EACH_SAFE( mem, next, &query->mem ) { heap_free( mem ); } heap_free( query ); } diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 10036ae..ac5eb74 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -377,7 +377,7 @@ static void free_path( struct path *path ) heap_free( path ); } -static HRESULT create_instance_enum( const struct path *path, IEnumWbemClassObject **iter ) +static WCHAR *query_from_path( const struct path *path ) { static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','%','s',' ', @@ -385,22 +385,30 @@ static HRESULT create_instance_enum( const struct path *path, IEnumWbemClassObje static const WCHAR select_allW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; WCHAR *query; - HRESULT hr; UINT len; if (path->filter) { len = path->class_len + path->filter_len + SIZEOF(selectW); - if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return NULL; sprintfW( query, selectW, path->class, path->filter ); } else { len = path->class_len + SIZEOF(select_allW); - if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return NULL; strcpyW( query, select_allW ); strcatW( query, path->class ); } + return query; +} + +static HRESULT create_instance_enum( const struct path *path, IEnumWbemClassObject **iter ) +{ + WCHAR *query; + HRESULT hr; + + if (!(query = query_from_path( path ))) return E_OUTOFMEMORY; hr = exec_query( query, iter ); heap_free( query ); return hr; @@ -778,10 +786,12 @@ static HRESULT WINAPI wbem_services_ExecMethod( IWbemClassObject **ppOutParams, IWbemCallResult **ppCallResult ) { - IWbemClassObject *obj; - struct table *table; - class_method *func; + IEnumWbemClassObject *result = NULL; + IWbemClassObject *obj = NULL; + struct query *query = NULL; struct path *path; + WCHAR *str; + class_method *func; HRESULT hr; TRACE("%p, %s, %s, %08x, %p, %p, %p, %p\n", iface, debugstr_w(strObjectPath), @@ -789,28 +799,40 @@ static HRESULT WINAPI wbem_services_ExecMethod( if (lFlags) FIXME("flags %08x not supported\n", lFlags); - if ((hr = get_object( strObjectPath, &obj ))) return hr; - if ((hr = parse_path( strObjectPath, &path )) != S_OK) + if ((hr = parse_path( strObjectPath, &path )) != S_OK) return hr; + if (!(str = query_from_path( path ))) { - IWbemClassObject_Release( obj ); - return hr; - } - table = grab_table( path->class ); - free_path( path ); - if (!table) - { - IWbemClassObject_Release( obj ); - return WBEM_E_NOT_FOUND; + hr = E_OUTOFMEMORY; + goto done; } - hr = get_method( table, strMethodName, &func ); - release_table( table ); - if (hr != S_OK) + if (!(query = create_query())) { - IWbemClassObject_Release( obj ); - return hr; + hr = E_OUTOFMEMORY; + goto done; } + hr = parse_query( str, &query->view, &query->mem ); + if (hr != S_OK) goto done; + + hr = execute_view( query->view ); + if (hr != S_OK) goto done; + + hr = EnumWbemClassObject_create( NULL, query, (void **)&result ); + if (hr != S_OK) goto done; + + hr = create_class_object( query->view->table->name, result, 0, NULL, &obj ); + if (hr != S_OK) goto done; + + hr = get_method( query->view->table, strMethodName, &func ); + if (hr != S_OK) goto done; + hr = func( obj, pInParams, ppOutParams ); - IWbemClassObject_Release( obj ); + +done: + if (result) IEnumWbemClassObject_Release( result ); + if (obj) IWbemClassObject_Release( obj ); + free_query( query ); + free_path( path ); + heap_free( str ); return hr; } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 7c5ee89..e11cdff 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -163,6 +163,8 @@ struct query struct list mem; }; +struct query *create_query(void) DECLSPEC_HIDDEN; +void free_query( struct query * ) DECLSPEC_HIDDEN; struct query *addref_query( struct query * ) DECLSPEC_HIDDEN; void release_query( struct query *query ) DECLSPEC_HIDDEN; HRESULT exec_query( const WCHAR *, IEnumWbemClassObject ** ) DECLSPEC_HIDDEN; @@ -170,6 +172,7 @@ HRESULT parse_query( const WCHAR *, struct view **, struct list * ) DECLSPEC_HID HRESULT create_view( const struct property *, const WCHAR *, const struct expr *, struct view ** ) DECLSPEC_HIDDEN; void destroy_view( struct view * ) DECLSPEC_HIDDEN; +HRESULT execute_view( struct view * ) DECLSPEC_HIDDEN; void init_table_list( void ) DECLSPEC_HIDDEN; struct table *grab_table( const WCHAR * ) DECLSPEC_HIDDEN; struct table *addref_table( struct table * ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Add a function to resize a table.
by Alexandre Julliard 04 Jun '13

04 Jun '13

Module: wine Branch: master Commit: 0f8cbab1a9c99c63da4a880912abdb2d7280ce02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f8cbab1a9c99c63da4a88091… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 4 13:28:21 2013 +0200 wbemprox: Add a function to resize a table. --- dlls/wbemprox/builtin.c | 127 ++++++++++++++++++-------------------- dlls/wbemprox/class.c | 2 +- dlls/wbemprox/table.c | 20 +++--- dlls/wbemprox/wbemprox_private.h | 3 +- 4 files changed, 74 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f8cbab1a9c99c63da4a8…

1 0