March 2007 - Wine-commits - list.winehq.org

Joris Huizer : winedump: sign-compare fixes.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: 4bfd7059f2c2094f8f7fab0d4c7b079b9fbd09be URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfd7059f2c2094f8f7fab0d4… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Sat Mar 3 05:30:32 2007 -0800 winedump: sign-compare fixes. --- tools/winedump/minidump.c | 2 +- tools/winedump/msc.c | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 2c61a7c..07108b8 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -44,7 +44,7 @@ static void dump_mdmp_string(DWORD rva) printf("<<?>>"); } -static const MINIDUMP_DIRECTORY* get_mdmp_dir(const MINIDUMP_HEADER* hdr, int str_idx) +static const MINIDUMP_DIRECTORY* get_mdmp_dir(const MINIDUMP_HEADER* hdr, unsigned int str_idx) { const MINIDUMP_DIRECTORY* dir; unsigned int i; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 4ef3387..e7e1100 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -511,6 +511,7 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type { const union codeview_reftype* reftype = (const union codeview_reftype*)type; int i, leaf_len, value; + unsigned int j; const char* str; switch (type->generic.id) @@ -663,9 +664,9 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type case LF_ARGLIST_V2: printf("\t%x => Arglist V2(#%u):", curr_type, reftype->arglist_v2.num); - for (i = 0; i < reftype->arglist_v2.num; i++) + for (j = 0; j < reftype->arglist_v2.num; j++) { - printf("\t %x", reftype->arglist_v2.args[i]); + printf("\t %x", reftype->arglist_v2.args[j]); } printf("\t\n"); break; @@ -786,9 +787,9 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type case LF_DERIVED_V2: printf("\t%x => Derived V2(#%u):", curr_type, reftype->derived_v2.num); - for (i = 0; i < reftype->derived_v2.num; i++) + for (j = 0; j < reftype->derived_v2.num; j++) { - printf(" %x", reftype->derived_v2.drvdcls[i]); + printf(" %x", reftype->derived_v2.drvdcls[j]); } printf("\n"); break; @@ -832,9 +833,10 @@ int codeview_dump_types_from_block(const void* table, unsigned long len) int codeview_dump_symbols(const void* root, unsigned long size) { - int i, length; - char* curr_func = NULL; - int nest_block = 0; + unsigned int i; + int length; + char* curr_func = NULL; + int nest_block = 0; /* * Loop over the different types of records and whenever we * find something we are interested in, record it and move on.

1 0

Rob Shearman : msi: Set the Date, Time and VersionDatabase properties.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: 95f38b75fbf7f25c317d1b18762aa982904d7ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f38b75fbf7f25c317d1b187… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 5 12:03:20 2007 +0000 msi: Set the Date, Time and VersionDatabase properties. Add tests for these properties. Update the todo list of properties to set. --- dlls/msi/package.c | 28 +++++++++++++++++++++++++--- dlls/msi/tests/package.c | 20 ++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index b78910d..74d18cb 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -182,6 +182,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) LPWSTR check; HKEY hkey; LONG res; + SYSTEM_INFO sys_info; + SYSTEMTIME systemtime; static const WCHAR cszbs[]={'\\',0}; static const WCHAR CFF[] = @@ -242,6 +244,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szSix[] = {'6',0 }; static const WCHAR szVersionMsi[] = { 'V','e','r','s','i','o','n','M','s','i',0 }; + static const WCHAR szVersionDatabase[] = { 'V','e','r','s','i','o','n','D','a','t','a','b','a','s','e',0 }; static const WCHAR szPhysicalMemory[] = { 'P','h','y','s','i','c','a','l','M','e','m','o','r','y',0 }; static const WCHAR szFormat2[] = {'%','l','i','.','%','l','i',0}; /* Screen properties */ @@ -263,15 +266,16 @@ static VOID set_installer_properties(MSIPACKAGE *package) }; static const WCHAR szUSERNAME[] = {'U','S','E','R','N','A','M','E',0}; static const WCHAR szCOMPANYNAME[] = {'C','O','M','P','A','N','Y','N','A','M','E',0}; - SYSTEM_INFO sys_info; + static const WCHAR szDate[] = {'D','a','t','e',0}; + static const WCHAR szTime[] = {'T','i','m','e',0}; /* * Other things that probably should be set: * * SystemLanguageID ComputerName UserLanguageID LogonUser VirtualMemory - * Intel ShellAdvSupport DefaultUIFont VersionDatabase PackagecodeChanging + * ShellAdvSupport DefaultUIFont PackagecodeChanging * ProductState CaptionHeight BorderTop BorderSide TextHeight - * RedirectedDllSupport Time Date Privileged + * RedirectedDllSupport */ SHGetFolderPathW(NULL,CSIDL_PROGRAM_FILES_COMMON,NULL,0,pth); @@ -389,6 +393,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) sprintfW( bufstr, szFormat2, MSI_MAJORVERSION, MSI_MINORVERSION); MSI_SetPropertyW( package, szVersionMsi, bufstr ); + sprintfW( bufstr, szFormat, MSI_MAJORVERSION * 100); + MSI_SetPropertyW( package, szVersionDatabase, bufstr ); GetSystemInfo( &sys_info ); if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) @@ -433,6 +439,22 @@ static VOID set_installer_properties(MSIPACKAGE *package) if ( set_user_sid_prop( package ) != ERROR_SUCCESS) ERR("Failed to set the UserSID property\n"); + /* Date and time properties */ + GetSystemTime( &systemtime ); + if (GetDateFormatW( LOCALE_USER_DEFAULT, DATE_SHORTDATE, &systemtime, + NULL, bufstr, sizeof(bufstr)/sizeof(bufstr[0]) )) + MSI_SetPropertyW( package, szDate, bufstr ); + else + ERR("Couldn't set Date property: GetDateFormat failed with error %d\n", GetLastError()); + + if (GetTimeFormatW( LOCALE_USER_DEFAULT, + TIME_FORCE24HOURFORMAT | TIME_NOTIMEMARKER, + &systemtime, NULL, bufstr, + sizeof(bufstr)/sizeof(bufstr[0]) )) + MSI_SetPropertyW( package, szTime, bufstr ); + else + ERR("Couldn't set Time property: GetTimeFormat failed with error %d\n", GetLastError()); + msi_free( check ); CloseHandle( hkey ); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 233b472..536fa1e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2998,6 +2998,26 @@ static void test_installprops(void) ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); + size = MAX_PATH; + r = MsiGetProperty(hpkg, "VersionDatabase", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + trace("VersionDatabase = %s\n", buf); + + size = MAX_PATH; + r = MsiGetProperty(hpkg, "VersionMsi", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + trace("VersionMsi = %s\n", buf); + + size = MAX_PATH; + r = MsiGetProperty(hpkg, "Date", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + trace("Date = %s\n", buf); + + size = MAX_PATH; + r = MsiGetProperty(hpkg, "Time", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + trace("Time = %s\n", buf); + CloseHandle(hkey); MsiCloseHandle(hpkg); DeleteFile(msifile);

1 0

Stefan Dösinger : wined3d: Use the scissor test when clearing the full surface too.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: 7126b63645747fe035aaa1167f0dcda8cb38be01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7126b63645747fe035aaa1167… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 2 09:25:02 2007 +0100 wined3d: Use the scissor test when clearing the full surface too. It was incorrect to disable the scissor test for full surfaces in my clear patch. With back buffer offscreen rendering the viewport does not seem to restrict clearing, and with different sizes of depth stencil and color buffer the final fantasy XI demo seems to expect the clear to be restricted. --- dlls/wined3d/device.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0ad2c47..af28e96 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4138,14 +4138,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun ENTER_GL(); - if(pRects) { - glEnable(GL_SCISSOR_TEST); - checkGLcall("glEnable GL_SCISSOR_TEST"); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); - } else { - glDisable(GL_SCISSOR_TEST); - checkGLcall("glEnable GL_SCISSOR_TEST"); - } + glEnable(GL_SCISSOR_TEST); + checkGLcall("glEnable GL_SCISSOR_TEST"); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); if (Count > 0 && pRects) { @@ -4184,6 +4179,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun } if (!curRect) { + glScissor(This->stateBlock->viewport.X, + (((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Height - + (This->stateBlock->viewport.Y + This->stateBlock->viewport.Height)), + This->stateBlock->viewport.Width, + This->stateBlock->viewport.Height); + checkGLcall("glScissor"); glClear(glMask); checkGLcall("glClear"); } else { @@ -5246,10 +5247,20 @@ static void WINAPI IWineD3DDeviceImpl_SetCursorPosition(IWineD3DDevice* ifa static BOOL WINAPI IWineD3DDeviceImpl_ShowCursor(IWineD3DDevice* iface, BOOL bShow) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; BOOL oldVisible = This->bCursorVisible; + POINT pt; + TRACE("(%p) : visible(%d)\n", This, bShow); if(This->cursorTexture) This->bCursorVisible = bShow; + /* + * When ShowCursor is first called it should make the cursor appear at the OS's last + * known cursor position. Because of this, some applications just repetitively call + * ShowCursor in order to update the cursor's position. This behavior is undocumented. + */ + GetCursorPos(&pt); + This->xScreenSpace = pt.x; + This->yScreenSpace = pt.y; return oldVisible; }

1 0

lostwages/ news/2007030501.xml wwn/wn20070305_ ...
by WineHQ 05 Mar '07

05 Mar '07

ChangeSet ID: 30942 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/03/05 11:18:21 Added files: news : 2007030501.xml wwn : wn20070305_324.xml Log message: WWN #324 Patch: http://cvs.winehq.org/patch.py?id=30942 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2007030501.xml Added 1.1 +0 -0 lostwages/wwn/wn20070305_324.xml

1 0

Jason Edmeades : cmd.exe: Fix stdio redirects.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: 9e518dc79d914062628791b623a1691256374ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e518dc79d914062628791b62… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 4 22:39:22 2007 +0000 cmd.exe: Fix stdio redirects. --- programs/cmd/wcmdmain.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index bb805e6..1bea185 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -47,7 +47,6 @@ const char version_string[] = "CMD Version " PACKAGE_VERSION "\n\n"; const char anykey[] = "Press Return key to continue: "; char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; BATCH_CONTEXT *context = NULL; -static HANDLE old_stdin = INVALID_HANDLE_VALUE, old_stdout = INVALID_HANDLE_VALUE; extern struct env_stack *pushd_directories; static char *WCMD_expand_envvar(char *start); @@ -314,6 +313,8 @@ void WCMD_process_command (char *command) char *whichcmd; SECURITY_ATTRIBUTES sa; char *new_cmd; + HANDLE old_stdin = INVALID_HANDLE_VALUE; + HANDLE old_stdout = INVALID_HANDLE_VALUE; /* Move copy of the command onto the heap so it can be expanded */ new_cmd = HeapAlloc( GetProcessHeap(), 0, MAXSTRING ); @@ -587,12 +588,10 @@ void WCMD_process_command (char *command) if (old_stdin != INVALID_HANDLE_VALUE) { CloseHandle (GetStdHandle (STD_INPUT_HANDLE)); SetStdHandle (STD_INPUT_HANDLE, old_stdin); - old_stdin = INVALID_HANDLE_VALUE; } if (old_stdout != INVALID_HANDLE_VALUE) { CloseHandle (GetStdHandle (STD_OUTPUT_HANDLE)); SetStdHandle (STD_OUTPUT_HANDLE, old_stdout); - old_stdout = INVALID_HANDLE_VALUE; } } @@ -606,8 +605,7 @@ static void init_msvcrt_io_block(STARTUPINFO* st) GetStartupInfo(&st_p); st->cbReserved2 = st_p.cbReserved2; st->lpReserved2 = st_p.lpReserved2; - if (st_p.cbReserved2 && st_p.lpReserved2 && - (old_stdin != INVALID_HANDLE_VALUE || old_stdout != INVALID_HANDLE_VALUE)) + if (st_p.cbReserved2 && st_p.lpReserved2) { /* Override the entries for fd 0,1,2 if we happened * to change those std handles (this depends on the way wcmd sets

1 0

Jason Edmeades : kernel32/tests: Show wrong behaviour with current directory.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: 9d00aeafd7a0e4dc9a2df5410fb433a0be1e3ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d00aeafd7a0e4dc9a2df5410… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 4 22:37:38 2007 +0000 kernel32/tests: Show wrong behaviour with current directory. --- dlls/kernel32/tests/file.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 96fe96e..89cf0a2 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1795,6 +1795,31 @@ static void test_overlapped(void) ok( r == TRUE, "close handle failed\n"); } +static void test_RemoveDirectory(void) +{ + int rc; + char directory[] = "removeme"; + + rc = CreateDirectory(directory, NULL); + ok( rc, "Createdirectory failed, gle=%d\n", GetLastError() ); + + rc = SetCurrentDirectory(directory); + ok( rc, "SetCurrentDirectory failed, gle=%d\n", GetLastError() ); + + rc = RemoveDirectory("."); + todo_wine { + ok( !rc, "RemoveDirectory unexpectedly worked\n" ); + } + + rc = SetCurrentDirectory(".."); + ok( rc, "SetCurrentDirectory failed, gle=%d\n", GetLastError() ); + + rc = RemoveDirectory(directory); + todo_wine { + ok( rc, "RemoveDirectory failed, gle=%d\n", GetLastError() ); + } +} + START_TEST(file) { test__hread( ); @@ -1825,4 +1850,5 @@ START_TEST(file) test_read_write(); test_OpenFile(); test_overlapped(); + test_RemoveDirectory(); }

1 0

Chris Robinson : quartz: Report the previous refcount of a PullPin object.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: 7f9becf8547e1e6ff3f02c56619c9d5ee176af3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9becf8547e1e6ff3f02c566… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Mar 4 20:46:04 2007 -0800 quartz: Report the previous refcount of a PullPin object. --- dlls/quartz/pin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 5bc84bf..9cc05da 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1125,7 +1125,7 @@ ULONG WINAPI PullPin_Release(IPin * iface) PullPin *This = (PullPin *)iface; ULONG refCount = InterlockedDecrement(&This->pin.refCount); - TRACE("(%p/%p)->()\n", This, iface); + TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (!refCount) {

1 0

Chris Robinson : quartz: Don' t AddRef an object we just created and are handing back to the caller.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: efe156ae8ec4163da2a51511297dee2f6a5d0235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe156ae8ec4163da2a515112… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Mar 5 00:12:29 2007 -0800 quartz: Don't AddRef an object we just created and are handing back to the caller. --- dlls/quartz/filesource.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 691413d..01b9955 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -928,7 +928,6 @@ static HRESULT WINAPI FileAsyncReader_RequestAllocator(IAsyncReader * iface, IMe /* FIXME: check we are still aligned */ if (SUCCEEDED(hr)) { - IMemAllocator_AddRef(pPreferred); *ppActual = pPreferred; TRACE("FileAsyncReader_RequestAllocator -- %x\n", hr); return S_OK;

1 0

Jason Edmeades : cmd.exe: Additional PROMPT options.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: 00ba810dbf30265bca5fbd4e158314108cef0f27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ba810dbf30265bca5fbd4e1… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 4 22:33:51 2007 +0000 cmd.exe: Additional PROMPT options. --- programs/cmd/wcmdmain.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index f0331c5..4253f31 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -878,9 +878,15 @@ void WCMD_show_prompt (void) { case '$': *q++ = '$'; break; + case 'A': + *q++ = '&'; + break; case 'B': *q++ = '|'; break; + case 'C': + *q++ = '('; + break; case 'D': GetDateFormat (LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, q, MAX_PATH); while (*q) q++; @@ -888,9 +894,15 @@ void WCMD_show_prompt (void) { case 'E': *q++ = '\E'; break; + case 'F': + *q++ = ')'; + break; case 'G': *q++ = '>'; break; + case 'H': + *q++ = '\b'; + break; case 'L': *q++ = '<'; break; @@ -910,13 +922,16 @@ void WCMD_show_prompt (void) { case 'Q': *q++ = '='; break; + case 'S': + *q++ = ' '; + break; case 'T': GetTimeFormat (LOCALE_USER_DEFAULT, 0, NULL, NULL, q, MAX_PATH); while (*q) q++; break; - case 'V': - lstrcat (q, version_string); - while (*q) q++; + case 'V': + lstrcat (q, version_string); + while (*q) q++; break; case '_': *q++ = '\n';

1 0

Jason Edmeades : cmd.exe: Support rd dir1 dir2.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: 0efa91de15c393dc403994049292c1fa9313146f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0efa91de15c393dc403994049… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 4 22:33:27 2007 +0000 cmd.exe: Support rd dir1 dir2. --- programs/cmd/builtins.c | 74 +++++++++++++++++++++++++++++------------------ programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 48 insertions(+), 30 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 243a589..3aeac71 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -36,6 +36,9 @@ #include "wcmd.h" #include <shellapi.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cmd); void WCMD_execute (char *orig_command, char *parameter, char *substitution); @@ -752,44 +755,59 @@ void WCMD_pause (void) { * Delete a directory. */ -void WCMD_remove_dir (void) { +void WCMD_remove_dir (char *command) { - if (param1[0] == 0x00) { - WCMD_output ("Argument missing\n"); - return; - } + int argno = 0; + int argsProcessed = 0; + char *argN = command; - /* If subdirectory search not supplied, just try to remove - and report error if it fails (eg if it contains a file) */ - if (strstr (quals, "/S") == NULL) { - if (!RemoveDirectory (param1)) WCMD_print_error (); + /* Loop through all args */ + while (argN) { + char *thisArg = WCMD_parameter (command, argno++, &argN); + if (argN && argN[0] != '/') { + WINE_TRACE("rd: Processing arg %s (quals:%s)\n", thisArg, quals); + argsProcessed++; - /* Otherwise use ShFileOp to recursively remove a directory */ - } else { + /* If subdirectory search not supplied, just try to remove + and report error if it fails (eg if it contains a file) */ + if (strstr (quals, "/S") == NULL) { + if (!RemoveDirectory (thisArg)) WCMD_print_error (); - SHFILEOPSTRUCT lpDir; + /* Otherwise use ShFileOp to recursively remove a directory */ + } else { - /* Ask first */ - if (strstr (quals, "/Q") == NULL) { - BOOL ok; - char question[MAXSTRING]; + SHFILEOPSTRUCT lpDir; - /* Ask for confirmation */ - sprintf(question, "%s, ", param1); - ok = WCMD_ask_confirm(question, TRUE); + /* Ask first */ + if (strstr (quals, "/Q") == NULL) { + BOOL ok; + char question[MAXSTRING]; - /* Abort if answer is 'N' */ - if (!ok) return; + /* Ask for confirmation */ + sprintf(question, "%s, ", thisArg); + ok = WCMD_ask_confirm(question, TRUE); + + /* Abort if answer is 'N' */ + if (!ok) return; + } + + /* Do the delete */ + lpDir.hwnd = NULL; + lpDir.pTo = NULL; + lpDir.pFrom = thisArg; + lpDir.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI; + lpDir.wFunc = FO_DELETE; + if (SHFileOperationA(&lpDir)) WCMD_print_error (); + } } + } - /* Do the delete */ - lpDir.hwnd = NULL; - lpDir.pTo = NULL; - lpDir.pFrom = param1; - lpDir.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI; - lpDir.wFunc = FO_DELETE; - if (SHFileOperationA(&lpDir)) WCMD_print_error (); + /* Handle no valid args */ + if (argsProcessed == 0) { + WCMD_output ("Argument missing\n"); + return; } + } /**************************************************************************** diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d6357f0..61e3044 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -55,7 +55,7 @@ void WCMD_print_error (void); void WCMD_process_command (char *command); void WCMD_pushd (void); int WCMD_read_console (char *string, int str_len); -void WCMD_remove_dir (void); +void WCMD_remove_dir (char *command); void WCMD_rename (void); void WCMD_run_program (char *command, int called); void WCMD_setlocal (const char *command); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 40dad28..f0331c5 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -530,7 +530,7 @@ void WCMD_process_command (char *command) break; case WCMD_RD: case WCMD_RMDIR: - WCMD_remove_dir (); + WCMD_remove_dir (p); break; case WCMD_SETLOCAL: WCMD_setlocal(p);

1 0