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

Ken Thomases : winemac: Don' t unminimize a window on first activation during start-up.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 4c651e39e4721166ef4024380ad09e8ecd4ad754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c651e39e4721166ef4024380… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 4 04:59:37 2013 -0500 winemac: Don't unminimize a window on first activation during start-up. --- dlls/winemac.drv/cocoa_app.h | 2 ++ dlls/winemac.drv/cocoa_app.m | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 681ef52..1338137 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -81,6 +81,8 @@ enum { NSTimeInterval lastEventTapEventTime; NSImage* applicationIcon; + + BOOL beenActive; } @property (nonatomic) CGEventSourceKeyboardType keyboardType; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 4a54f66..9984114 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1707,7 +1707,7 @@ int macdrv_err_on; [self adjustWindowLevels:YES]; - if (![self frontWineWindow]) + if (beenActive && ![self frontWineWindow]) { for (WineWindow* window in [NSApp windows]) { @@ -1718,6 +1718,7 @@ int macdrv_err_on; } } } + beenActive = TRUE; // If a Wine process terminates abruptly while it has the display captured // and switched to a different resolution, Mac OS X will uncapture the

1 0

Ken Thomases : winemac: Don' t accidentally unminimize a window when trying to change z-order.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 841f158d81ab3555f67c24a824df2de618c139ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=841f158d81ab3555f67c24a82… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 4 04:59:39 2013 -0500 winemac: Don't accidentally unminimize a window when trying to change z-order. --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 5ee1aac..2da8a08 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -708,7 +708,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { WineApplicationController* controller = [WineApplicationController sharedController]; BOOL on_screen = frame_intersects_screens([self frame], [NSScreen screens]); - if (on_screen) + if (on_screen && ![self isMiniaturized]) { BOOL needAdjustWindowLevels = FALSE;

1 0

Ken Thomases : winemac: Defer minimizing hidden windows until they are shown.
by Alexandre Julliard June 4, 2013

June 4, 2013

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 June 4, 2013

June 4, 2013

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: Make windows key after unminimizing, if allowed.
by Alexandre Julliard June 4, 2013

June 4, 2013

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

Jason Edmeades : cmd: Fix tilda parameter expansion when arg is empty.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: 2b9649d9db1f4b769f6a80407ae2ea6dc364aaeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9649d9db1f4b769f6a80407… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Jun 2 21:29:58 2013 +0100 cmd: Fix tilda parameter expansion when arg is empty. --- programs/cmd/batch.c | 12 +++++++----- programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 09081f4..294a153 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -514,11 +514,13 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* After this, we need full information on the file, which is valid not to exist. */ if (!skipFileParsing) { - if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, NULL) == 0) - return; - - exists = GetFileAttributesExW(fullfilename, GetFileExInfoStandard, - &fileInfo); + if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, NULL) == 0) { + exists = FALSE; + fullfilename[0] = 0x00; + } else { + exists = GetFileAttributesExW(fullfilename, GetFileExInfoStandard, + &fileInfo); + } /* 2. Handle 'a' : Output attributes (File doesn't have to exist) */ if (memchrW(firstModifier, 'a', modifierLen) != NULL) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f3aa1a9..45617cf 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -363,6 +363,7 @@ for %%i in ("d e" f) do echo %%~dpi for %%i in ("g h" i) do echo %%~sdi for %%i in ("g h" i) do echo %%~dsi for %%i in ("j k" l.eh) do echo '%%~xsi' +for %%i in ("") do echo '%%~i,%%~fi,%%~di,%%~pi,%%~ni,%%~xi,%%~si,%%~ai,%%~ti,%%~zi' echo --- in parameters for %%i in ("A B" C) do call :echoFun %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index dd6ccb5..99ed738 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -319,6 +319,7 @@ N @drive@ '' '.eh' +',,,,,,,,,' --- in parameters "A B" C

1 0

Jason Edmeades : cmd: Fix handling of redundant information on goto/labels.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: dc4dd0cb97c55698bccf204db10e7b31901888a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4dd0cb97c55698bccf204db… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Jun 2 00:17:30 2013 +0100 cmd: Fix handling of redundant information on goto/labels. --- programs/cmd/builtins.c | 34 +++++++++++++----- programs/cmd/tests/test_builtins.cmd | 55 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 +++ programs/cmd/wcmdmain.c | 22 ++++++----- 4 files changed, 97 insertions(+), 20 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1d9fc15..3c06e13 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2501,7 +2501,8 @@ void WCMD_give_help (const WCHAR *args) void WCMD_goto (CMD_LIST **cmdList) { WCHAR string[MAX_PATH]; - WCHAR current[MAX_PATH]; + WCHAR *labelend = NULL; + const WCHAR labelEndsW[] = {'>','<','|','&',' ',':','\t','\0'}; /* Do not process any more parts of a processed multipart or multilines command */ if (cmdList) *cmdList = NULL; @@ -2521,25 +2522,38 @@ void WCMD_goto (CMD_LIST **cmdList) { return; } - /* Support goto :label as well as goto label */ + /* Support goto :label as well as goto label plus remove trailing chars */ if (*paramStart == ':') paramStart++; + labelend = strpbrkW(paramStart, labelEndsW); + if (labelend) *labelend = 0x00; + WINE_TRACE("goto label: '%s'\n", wine_dbgstr_w(paramStart)); SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); - while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { + while (*paramStart && + WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { str = string; - while (isspaceW (*str)) str++; + + /* Ignore leading whitespace or no-echo character */ + while (*str=='@' || isspaceW (*str)) str++; + + /* If the first real character is a : then this is a label */ if (*str == ':') { - DWORD index = 0; str++; - while (((current[index] = str[index])) && (!isspaceW (current[index]))) - index++; - /* ignore space at the end */ - current[index] = 0; - if (lstrcmpiW (current, paramStart) == 0) return; + /* Skip spaces between : and label */ + while (isspaceW (*str)) str++; + WINE_TRACE("str before brk %s\n", wine_dbgstr_w(str)); + + /* Label ends at whitespace or redirection characters */ + labelend = strpbrkW(str, labelEndsW); + if (labelend) *labelend = 0x00; + WINE_TRACE("comparing found label %s\n", wine_dbgstr_w(str)); + + if (lstrcmpiW (str, paramStart) == 0) return; } } WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOTARGET)); + context -> skip_rest = TRUE; } return; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 54070bc..f3aa1a9 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -2538,17 +2538,72 @@ echo %ErrorLevel% should still be 7 echo ------------ Testing GOTO ------------ if a==a goto dest1 +echo FAILURE at dest 1 :dest1 echo goto with no leading space worked +if a==a goto :dest1b +echo FAILURE at dest 1b +:dest1b +echo goto with colon and no leading space worked if b==b goto dest2 +echo FAILURE at dest 2 :dest2 echo goto with a leading space worked if c==c goto dest3 +echo FAILURE at dest 3 :dest3 echo goto with a leading tab worked if d==d goto dest4 +echo FAILURE at dest 4 :dest4(a)space@ echo goto with a following space worked +if e==e goto dest5 +echo FAILURE at dest 5 +:dest5&& echo FAILURE +echo goto with following amphersands worked + +del failure.txt >nul 2>&1 +if f==f goto dest6 +echo FAILURE at dest 6 +:dest6>FAILURE.TXT +if exist FAILURE.TXT echo FAILURE at dest 6 as file exists +echo goto with redirections worked +del FAILURE.TXT >nul 2>&1 + +:: some text that is ignored | dir >cmd_output | another test +if exist cmd_output echo FAILURE at dest 6 as file exists +echo Ignoring double colons worked +del cmd_output >nul 2>&1 + +rem goto a label which does not exist issues an error message and +rem acts the same as goto :EOF, and ensure ::label is never matched +del testgoto.bat >nul 2>&1 +echo goto :dest7 ^>nul 2^>^&1 >> testgoto.bat +echo echo FAILURE at dest 7 - Should have not found label and issued an error plus ended the batch>> testgoto.bat +echo ::dest7>> testgoto.bat +echo echo FAILURE at dest 7 - Incorrectly went to label >> testgoto.bat +call testgoto.bat +del testgoto.bat >nul 2>&1 + +del testgoto.bat >nul 2>&1 +echo goto ::dest8 ^>nul 2^>^&1 >> testgoto.bat +echo echo FAILURE at dest 8 - Should have not found label and issued an error plus ended the batch>> testgoto.bat +echo ::dest8>> testgoto.bat +echo echo FAILURE at dest 8 - Incorrectly went to label >> testgoto.bat +call testgoto.bat +del testgoto.bat >nul 2>&1 + +if g==g goto dest9 +echo FAILURE at dest 9 +:dest91 +echo FAILURE at dest 91 +@ : dest9>rubbish +echo label with mixed whitespace and no echo worked + +if h==h goto :dest10:this is ignored +echo FAILURE at dest 10 +:dest10:this is also ignored +echo Correctly ignored trailing information echo ------------ Testing PATH ------------ set WINE_backup_path=%path% diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index ebfe8cd..dd6ccb5 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1294,9 +1294,15 @@ errorlevel zero, good(a)or_broken@errorlevel nonzero, bad 7 should still be 7 ------------ Testing GOTO ------------ goto with no leading space worked +goto with colon and no leading space worked goto with a leading space worked goto with a leading tab worked goto with a following space worked +goto with following amphersands worked +goto with redirections worked +Ignoring double colons worked +label with mixed whitespace and no echo worked +Correctly ignored trailing information ------------ Testing PATH ------------ PATH=original PATH=try2 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 95f2995..876bbef 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1813,7 +1813,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE static const WCHAR forCmd[] = {'f','o','r'}; static const WCHAR ifCmd[] = {'i','f'}; static const WCHAR ifElse[] = {'e','l','s','e'}; - BOOL inRem = FALSE; + BOOL inOneLine = FALSE; BOOL inFor = FALSE; BOOL inIn = FALSE; BOOL inIf = FALSE; @@ -1910,9 +1910,10 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE if (curStringLen == 0 && curCopyTo == curString) { static const WCHAR forDO[] = {'d','o'}; - /* If command starts with 'rem ', ignore any &&, ( etc. */ - if (WCMD_keyword_ws_found(remCmd, sizeof(remCmd)/sizeof(remCmd[0]), curPos)) { - inRem = TRUE; + /* If command starts with 'rem ' or identifies a label, ignore any &&, ( etc. */ + if (WCMD_keyword_ws_found(remCmd, sizeof(remCmd)/sizeof(remCmd[0]), curPos) || + *curPos == ':') { + inOneLine = TRUE; } else if (WCMD_keyword_ws_found(forCmd, sizeof(forCmd)/sizeof(forCmd[0]), curPos)) { inFor = TRUE; @@ -1971,11 +1972,12 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } } - /* Nothing 'ends' a REM statement and &&, quotes etc are ineffective, - so just use the default processing ie skip character specific - matching below */ - if (!inRem) thisChar = *curPos; - else thisChar = 'X'; /* Character with no special processing */ + /* Nothing 'ends' a one line statement (e.g. REM or :labels mean + the &&, quotes and redirection etc are ineffective, so just force + the use of the default processing by skipping character specific + matching below) */ + if (!inOneLine) thisChar = *curPos; + else thisChar = 'X'; /* Character with no special processing */ lastWasWhiteSpace = FALSE; /* Will be reset below */ lastWasCaret = FALSE; @@ -2225,7 +2227,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE WCHAR *extraData; WINE_TRACE("Need to read more data as outstanding brackets or carets\n"); - inRem = FALSE; + inOneLine = FALSE; prevDelim = CMD_NONE; inQuotes = 0; memset(extraSpace, 0x00, (MAXSTRING+1) * sizeof(WCHAR));

1 0

Piotr Caban : msvcrt: Don't detect overflow in atoi implementation.
by Alexandre Julliard June 4, 2013

June 4, 2013

Module: wine Branch: master Commit: f3eb64ec7344e97067a4defa366896489cd1be20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3eb64ec7344e97067a4defa3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 4 15:52:10 2013 +0200 msvcrt: Don't detect overflow in atoi implementation. --- dlls/msvcr100/msvcr100.c | 5 +++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr100/tests/msvcr100.c | 20 ++++++++++++++++++++ dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/string.c | 22 +++++++++++++++++++++- dlls/msvcrt/tests/string.c | 18 ++++++++++++++++++ include/msvcrt/stdlib.h | 1 + 11 files changed, 71 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 149f132..d425455 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -484,6 +484,11 @@ size_t CDECL _aligned_msize(void *p, size_t alignment, size_t offset) return _msize(*alloc_ptr)-alignment-sizeof(void*); } +int CDECL MSVCR100_atoi(const char *str) +{ + return _atoi_l(str, NULL); +} + /********************************************************************* * DllMain (MSVCR100.@) */ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 370feb2..63a0caa 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1629,7 +1629,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) msvcrt.atan2f @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) MSVCR100_atoi @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 99834dd..7550eb9 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -75,6 +75,7 @@ static size_t (__cdecl *p_fread_s)(void*,size_t,size_t,size_t,FILE*); static void* (__cdecl *p__aligned_offset_malloc)(size_t, size_t, size_t); static void (__cdecl *p__aligned_free)(void*); static size_t (__cdecl *p__aligned_msize)(void*, size_t, size_t); +static int (__cdecl *p_atoi)(const char*); /* make sure we use the correct errno */ #undef errno @@ -104,6 +105,7 @@ static BOOL init(void) SET(p__aligned_offset_malloc, "_aligned_offset_malloc"); SET(p__aligned_free, "_aligned_free"); SET(p__aligned_msize, "_aligned_msize"); + SET(p_atoi, "atoi"); return TRUE; } @@ -358,6 +360,23 @@ static void test__aligned_msize(void) p__aligned_free(mem); } +static void test_atoi(void) +{ + int r; + + r = p_atoi("0"); + ok(r == 0, "atoi(0) = %d\n", r); + + r = p_atoi("-1"); + ok(r == -1, "atoi(-1) = %d\n", r); + + r = p_atoi("1"); + ok(r == 1, "atoi(1) = %d\n", r); + + r = p_atoi("4294967296"); + ok(r == 2147483647, "atoi(4294967296) = %d\n", r); +} + START_TEST(msvcr100) { if (!init()) @@ -367,4 +386,5 @@ START_TEST(msvcr100) test_wmemmove_s(); test_fread_s(); test__aligned_msize(); + test_atoi(); } diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c38763a..e82f100 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1991,7 +1991,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) msvcrt.atan2f @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi #don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 2ed25c2..1a33fbb 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -688,7 +688,7 @@ @ cdecl atan2(double double) msvcrt.atan2 @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi #don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl calloc(long long) msvcrt.calloc diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 0f985c7..afdab05 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -684,7 +684,7 @@ @ cdecl atan2(double double) msvcrt.atan2 @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi #don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl calloc(long long) msvcrt.calloc diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 47bf34f..521a69d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1310,7 +1310,7 @@ @ cdecl -arch=arm,x86_64 atan2f(float float) msvcrt.atan2f @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi #don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d76ab73..fd71ef4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1283,7 +1283,7 @@ @ cdecl -arch=arm,x86_64 atanf(float) msvcrt.atanf @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof -@ cdecl atoi(str) msvcrt.atoi +@ cdecl atoi(str) msvcr100.atoi ##don't forward to msvcrt @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 9ad4cef..f2d1e20 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -893,7 +893,27 @@ int __cdecl MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) */ int __cdecl MSVCRT_atoi(const char *str) { - return MSVCRT__atoi_l(str, NULL); + BOOL minus = FALSE; + int ret = 0; + + if(!str) + return 0; + + while(isspace(*str)) str++; + + if(*str == '+') { + str++; + }else if(*str == '-') { + minus = TRUE; + str++; + } + + while(*str>='0' && *str<='9') { + ret = ret*10+*str-'0'; + str++; + } + + return minus ? -ret : ret; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 31314fd..6115377 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2521,6 +2521,23 @@ static void test__wcstoi64(void) return; } +static void test_atoi(void) +{ + int r; + + r = atoi("0"); + ok(r == 0, "atoi(0) = %d\n", r); + + r = atoi("-1"); + ok(r == -1, "atoi(-1) = %d\n", r); + + r = atoi("1"); + ok(r == 1, "atoi(1) = %d\n", r); + + r = atoi("4294967296"); + ok(r == 0, "atoi(4294967296) = %d\n", r); +} + START_TEST(string) { char mem[100]; @@ -2620,4 +2637,5 @@ START_TEST(string) test__atodbl(); test__stricmp(); test__wcstoi64(); + test_atoi(); } diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index d4755f4..e88ffa3 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -182,6 +182,7 @@ int __cdecl abs(int); int __cdecl atexit(void (*)(void)); double __cdecl atof(const char*); int __cdecl atoi(const char*); +int __cdecl _atoi_l(const char*,_locale_t); __msvcrt_long __cdecl atol(const char*); void* __cdecl calloc(size_t,size_t); #ifndef __i386__

1 0

Hans Leidekker : wbemprox: Rewrite IWbemServices:: ExecMethod with low-level functions so we can reuse the object instance.
by Alexandre Julliard June 4, 2013

June 4, 2013

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: Optimize a common Win32_Directory query.
by Alexandre Julliard June 4, 2013

June 4, 2013

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