February 2007 - Wine-commits

James Hawkins : msi: Overwrite an existing read-only file when copying the install file.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: ba40c463d76235474249b92654d3f9caee5778b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba40c463d76235474249b9265… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 26 04:28:58 2007 -0600 msi: Overwrite an existing read-only file when copying the install file. --- dlls/msi/files.c | 28 +++++++++++--- dlls/msi/tests/install.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 6 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 61992a3..eb5e456 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -638,13 +638,9 @@ static void schedule_install_files(MSIPACKAGE *package) } } -static UINT copy_install_file(MSIFILE *file) +static UINT copy_file(MSIFILE *file) { BOOL ret; - UINT gle; - - TRACE("Copying %s to %s\n", debugstr_w(file->SourcePath), - debugstr_w(file->TargetPath)); ret = CopyFileW(file->SourcePath, file->TargetPath, FALSE); if (ret) @@ -653,7 +649,20 @@ static UINT copy_install_file(MSIFILE *file) return ERROR_SUCCESS; } - gle = GetLastError(); + return GetLastError(); +} + +static UINT copy_install_file(MSIFILE *file) +{ + UINT gle; + + TRACE("Copying %s to %s\n", debugstr_w(file->SourcePath), + debugstr_w(file->TargetPath)); + + gle = copy_file(file); + if (gle == ERROR_SUCCESS) + return gle; + if (gle == ERROR_ALREADY_EXISTS && file->state == msifs_overwrite) { TRACE("overwriting existing file\n"); @@ -665,6 +674,13 @@ static UINT copy_install_file(MSIFILE *file) TRACE("Source file not found\n"); gle = ERROR_SUCCESS; } + else if (gle == ERROR_ACCESS_DENIED) + { + SetFileAttributesW(file->TargetPath, FILE_ATTRIBUTE_NORMAL); + + gle = copy_file(file); + TRACE("Overwriting existing file: %d\n", gle); + } else if (!(file->Attributes & msidbFileAttributesVital)) { TRACE("Ignoring error for nonvital\n"); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3bea451..534a64a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -241,6 +241,31 @@ static const CHAR ui_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComm "CustomAction\tAction\n" "SetUIProperty\t51\tHASUIRUN\t1\t\n"; +static const CHAR rof_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "maximus\t\tMSITESTDIR\t0\t1\tmaximus\n"; + +static const CHAR rof_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "feature\t\t\t\t2\t1\tTARGETDIR\t0"; + +static const CHAR rof_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature\tmaximus"; + +static const CHAR rof_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "maximus\tmaximus\tmaximus\t500\t\t\t8192\t1"; + +static const CHAR rof_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t1\t\t\tDISK1\t\n"; + typedef struct _msi_table { const CHAR *filename; @@ -339,6 +364,18 @@ static const msi_table ui_tables[] = ADD_TABLE(property), }; +static const msi_table rof_tables[] = +{ + ADD_TABLE(rof_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -1120,6 +1157,56 @@ static void test_uiLevelFlags(void) DeleteFile(msifile); } +static BOOL file_matches(LPSTR path) +{ + CHAR buf[MAX_PATH]; + HANDLE file; + DWORD size; + + file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + + ZeroMemory(buf, MAX_PATH); + ReadFile(file, buf, 15, &size, NULL); + CloseHandle(file); + + return !lstrcmp(buf, "msitest\\maximus"); +} + +static void test_readonlyfile(void) +{ + UINT r; + DWORD size; + HANDLE file; + CHAR path[MAX_PATH]; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\maximus", 500); + create_database(msifile, rof_tables, sizeof(rof_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + lstrcpy(path, PROG_FILES_DIR); + lstrcat(path, "\\msitest"); + CreateDirectory(path, NULL); + + lstrcat(path, "\\maximus"); + file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); + if (file == INVALID_HANDLE_VALUE) printf("didnt work here: %d\n", GetLastError()); + + WriteFile(file, "readonlyfile", 20, &size, NULL); + CloseHandle(file); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(file_matches(path), "Expected file to be overwritten\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -1145,6 +1232,7 @@ START_TEST(install) test_mixedmedia(); test_samesequence(); test_uiLevelFlags(); + test_readonlyfile(); SetCurrentDirectoryA(prev_path); }

1 0

Jason Edmeades : cmd.exe: Add special SET modifiers.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 3ab449c96a281ec47ea9173b1a38687390311eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab449c96a281ec47ea9173b1… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Fri Feb 23 22:22:57 2007 +0000 cmd.exe: Add special SET modifiers. --- programs/cmd/wcmdmain.c | 225 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 207 insertions(+), 18 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2d5f805..b7845c7 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -46,6 +46,8 @@ 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; +static char *WCMD_expand_envvar(char *start); + /***************************************************************************** * Main entry point. This is a console application so we have a main() not a * winmain(). @@ -303,7 +305,7 @@ void WCMD_process_command (char *command) { char *cmd, *p, *s, *t; char temp[MAXSTRING]; - int status, i, len; + int status, i; DWORD count, creationDisposition; HANDLE h; char *whichcmd; @@ -410,25 +412,10 @@ void WCMD_process_command (char *command) strcat (p, s); } else { - p++; + p = WCMD_expand_envvar(p); } } - -/* - * Expand up environment variables. - * FIXME: Move this to above, without reallocating - */ - len = ExpandEnvironmentStrings (new_cmd, NULL, 0); - cmd = HeapAlloc( GetProcessHeap(), 0, len ); - status = ExpandEnvironmentStrings (new_cmd, cmd, len); - if (!status) { - WCMD_print_error (); - HeapFree( GetProcessHeap(), 0, cmd ); - HeapFree( GetProcessHeap(), 0, new_cmd ); - return; - } else { - HeapFree( GetProcessHeap(), 0, new_cmd ); - } + cmd = new_cmd; /* In a batch program, unknown variables are replace by nothing */ /* so remove any remaining %var% */ @@ -1135,3 +1122,205 @@ char temp_path[MAX_PATH], temp_file[MAX_PATH], temp_file2[MAX_PATH], temp_cmd[10 WCMD_process_command (temp_cmd); DeleteFile (temp_file); } + +/************************************************************************* + * WCMD_expand_envvar + * + * Expands environment variables, allowing for character substitution + */ +static char *WCMD_expand_envvar(char *start) { + char *endOfVar = NULL, *s; + char *colonpos = NULL; + char thisVar[MAXSTRING]; + char thisVarContents[MAXSTRING]; + char savedchar = 0x00; + int len; + + /* Find the end of the environment variable, and extract name */ + endOfVar = strchr(start+1, '%'); + if (endOfVar == NULL) { + /* FIXME: Some special conditions here depending opn whether + in batch, complex or not, and whether env var exists or not! */ + return start+1; + } + strncpy(thisVar, start, (endOfVar - start)+1); + thisVar[(endOfVar - start)+1] = 0x00; + colonpos = strchr(thisVar+1, ':'); + + /* If there's complex substitution, just need %var% for now + to get the expanded data to play with */ + if (colonpos) { + *colonpos = '%'; + savedchar = *(colonpos+1); + *(colonpos+1) = 0x00; + } + + /* Expand to contents, if unchanged, return */ + len = ExpandEnvironmentStrings(thisVar, thisVarContents, + sizeof(thisVarContents)); + if (len == 0) + return endOfVar+1; + + /* In a batch program, unknown env vars are replaced with nothing, + note syntax %garbage:1,3% results in anything after the ':' + except the % + From the command line, you just get back what you entered */ + if (lstrcmpi(thisVar, thisVarContents) == 0) { + + /* Restore the complex part after the compare */ + if (colonpos) { + *colonpos = ':'; + *(colonpos+1) = savedchar; + } + + s = strdup (endOfVar + 1); + + /* Command line - just ignore this */ + if (context == NULL) return endOfVar+1; + + /* Batch - replace unknown env var with nothing */ + if (colonpos == NULL) { + strcpy (start, s); + + } else { + len = strlen(thisVar); + thisVar[len-1] = 0x00; + /* If %:...% supplied, : is retained */ + if (colonpos == thisVar+1) { + strcpy (start, colonpos); + } else { + strcpy (start, colonpos+1); + } + strcat (start, s); + } + free (s); + return start; + + } + + /* See if we need to do complex substitution (any ':'s), if not + then our work here is done */ + if (colonpos == NULL) { + s = strdup (endOfVar + 1); + strcpy (start, thisVarContents); + strcat (start, s); + free(s); + return start; + } + + /* Restore complex bit */ + *colonpos = ':'; + *(colonpos+1) = savedchar; + + /* + Handle complex substitutions: + xxx=yyy (replace xxx with yyy) + *xxx=yyy (replace up to and including xxx with yyy) + ~x (from x chars in) + ~-x (from x chars from the end) + ~x,y (from x chars in for y characters) + ~x,-y (from x chars in until y characters from the end) + */ + + /* ~ is substring manipulation */ + if (savedchar == '~') { + + int substrposition, substrlength; + char *commapos = strchr(colonpos+2, ','); + char *startCopy; + + substrposition = atol(colonpos+2); + if (commapos) substrlength = atol(commapos+1); + + s = strdup (endOfVar + 1); + + /* Check bounds */ + if (substrposition >= 0) { + startCopy = &thisVarContents[min(substrposition, len)]; + } else { + startCopy = &thisVarContents[max(0, len+substrposition-1)]; + } + + if (commapos == NULL) { + strcpy (start, startCopy); /* Copy the lot */ + } else if (substrlength < 0) { + + int copybytes = (len+substrlength-1)-(startCopy-thisVarContents); + if (copybytes > len) copybytes = len; + else if (copybytes < 0) copybytes = 0; + strncpy (start, startCopy, copybytes); /* Copy the lot */ + start[copybytes] = 0x00; + } else { + strncpy (start, startCopy, substrlength); /* Copy the lot */ + start[substrlength] = 0x00; + } + + strcat (start, s); + free(s); + return start; + + /* search and replace manipulation */ + } else { + char *equalspos = strstr(colonpos, "="); + char *replacewith = equalspos+1; + char *found = NULL; + char *searchIn; + char *searchFor; + + s = strdup (endOfVar + 1); + if (equalspos == NULL) return start+1; + + /* Null terminate both strings */ + thisVar[strlen(thisVar)-1] = 0x00; + *equalspos = 0x00; + + /* Since we need to be case insensitive, copy the 2 buffers */ + searchIn = strdup(thisVarContents); + CharUpperBuff(searchIn, strlen(thisVarContents)); + searchFor = strdup(colonpos+1); + CharUpperBuff(searchFor, strlen(colonpos+1)); + + + /* Handle wildcard case */ + if (*(colonpos+1) == '*') { + /* Search for string to replace */ + found = strstr(searchIn, searchFor+1); + + if (found) { + /* Do replacement */ + strcpy(start, replacewith); + strcat(start, thisVarContents + (found-searchIn) + strlen(searchFor+1)); + strcat(start, s); + free(s); + } else { + /* Copy as it */ + strcpy(start, thisVarContents); + strcat(start, s); + } + + } else { + /* Loop replacing all instances */ + char *lastFound = searchIn; + char *outputposn = start; + + *start = 0x00; + while ((found = strstr(lastFound, searchFor))) { + strncpy(outputposn, + thisVarContents + (lastFound-searchIn), + (found - lastFound)); + outputposn = outputposn + (found - lastFound); + *outputposn = 0x00; + strcat(outputposn, replacewith); + outputposn = outputposn + strlen(replacewith); + lastFound = found + strlen(searchFor); + } + strcat(outputposn, + thisVarContents + (lastFound-searchIn)); + strcat(outputposn, s); + } + free(searchIn); + free(searchFor); + return start; + } + return start+1; +}

1 0

Vitaliy Margolen : wineshelllink: Fix menu entries with double spaces in their names.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 5f960781fcb9912cac22602c18be5c15b21bd1eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f960781fcb9912cac22602c1… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Feb 24 20:34:21 2007 -0700 wineshelllink: Fix menu entries with double spaces in their names. --- tools/wineshelllink | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wineshelllink b/tools/wineshelllink index 55a1942..e4c0fb2 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -153,8 +153,8 @@ BEGIN { RS="<" } # new item write_menu_file() { - menu=`echo $1 | sed 's!/!-!g'` - filename=`echo $2 | sed 's!/!-!g'` + menu=`echo "$1" | sed 's!/!-!g'` + filename=`echo "$2" | sed 's!/!-!g'` tmpfile=`mktemp /tmp/wine.XXXXXX` (

1 0

James Hawkins : msi: Free the custom action data after the thread function executes.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 747f19f01196cba5a24a1f60a306f815ef4763b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=747f19f01196cba5a24a1f60a… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Feb 24 23:06:54 2007 -0600 msi: Free the custom action data after the thread function executes. --- dlls/msi/custom.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index ba5c825..c6c07cf 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -452,9 +452,6 @@ static UINT wait_thread_handle( msi_custom_action_info *info ) else { TRACE("%s running in background\n", debugstr_w( info->action )); - - if (info->type & msidbCustomActionTypeContinue) - free_custom_action_data( info ); } return rc; @@ -529,6 +526,10 @@ static DWORD WINAPI ACTION_CallDllFunction( const LPGUID guid ) FreeLibrary(hModule); + if (info->type & msidbCustomActionTypeAsync && + info->type & msidbCustomActionTypeContinue) + free_custom_action_data( info ); + return r; }

1 0

James Hawkins : msi: Check for a NULL text entry, as it can be blank in the VolumeCostList control.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: d4a324940b3b92595dd26a92561cc80b01b0a3bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4a324940b3b92595dd26a925… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Feb 24 23:08:12 2007 -0600 msi: Check for a NULL text entry, as it can be blank in the VolumeCostList control. --- dlls/msi/dialog.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 28fb2e9..35a192c 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2448,6 +2448,8 @@ static void msi_dialog_vcl_add_columns( msi_dialog *dialog, msi_control *control static const WCHAR zero[] = {'0',0}; static const WCHAR negative[] = {'-',0}; + if (!text) return; + while ((begin = strchrW( begin, '{' )) && count < 5) { if (!(end = strchrW( begin, '}' )))

1 0

Alexander Nicolaysen Sørnes : wordpad: Add open file dialogue.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 7aa2e616f0c252a0fab5965abed43f38a21ed402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa2e616f0c252a0fab5965ab… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Feb 25 14:40:27 2007 +0100 wordpad: Add open file dialogue. --- programs/wordpad/En.rc | 7 ++++ programs/wordpad/No.rc | 7 ++++ programs/wordpad/resource.h | 4 ++ programs/wordpad/wordpad.c | 76 ++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 93 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index a78ab0e..bab4178 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -66,3 +66,10 @@ BEGIN END END END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "Rich text format (*.rtf)" + STRING_TEXT_FILES_TXT, "Text files (*.txt)" + STRING_ALL_FILES, "All documents (*.*)" +END diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 7021490..b13fb67 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -66,3 +66,10 @@ BEGIN END END END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "Rikt tekstformat (*.rtf)" + STRING_TEXT_FILES_TXT, "Tekstfiler (*.txt)" + STRING_ALL_FILES, "Alle filer (*.*)" +END diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index 72976f7..5e996d5 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -59,3 +59,7 @@ #define IDC_COMBO 2004 #define IDB_TOOLBAR 100 + +#define STRING_ALL_FILES 1400 +#define STRING_TEXT_FILES_TXT 1401 +#define STRING_RICHTEXT_FILES_RTF 1402 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 455f73f..0d45cb7 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -21,6 +21,8 @@ #define WIN32_LEAN_AND_MEAN #define _WIN32_IE 0x0400 +#define MAX_STRING_LEN 255 + #include <stdarg.h> #include <ctype.h> #include <stdio.h> @@ -29,10 +31,10 @@ #include <windows.h> #include <richedit.h> #include <commctrl.h> +#include <commdlg.h> #include "resource.h" - /* use LoadString */ static const WCHAR xszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; static const WCHAR xszMainMenu[] = {'M','A','I','N','M','E','N','U',0}; @@ -44,6 +46,32 @@ static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a', static HWND hMainWnd; static HWND hEditorWnd; +static char szFilter[MAX_STRING_LEN]; + +/* Load string resources */ +static void DoLoadStrings() +{ + LPSTR p = szFilter; + char files_rtf[] = "*.rtf"; + char files_txt[] = "*.txt"; + char files_all[] = "*.*"; + HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); + + LoadString(hInstance, STRING_RICHTEXT_FILES_RTF, p, MAX_STRING_LEN); + p += strlen(p) + 1; + lstrcpy(p, files_rtf); + p += strlen(p) + 1; + LoadString(hInstance, STRING_TEXT_FILES_TXT, p, MAX_STRING_LEN); + p += strlen(p) + 1; + lstrcpy(p, files_txt); + p += strlen(p) + 1; + LoadString(hInstance, STRING_ALL_FILES, p, MAX_STRING_LEN); + p += strlen(p) + 1; + lstrcpy(p, files_all); + p += strlen(p) + 1; + *p = '\0'; +} + static void AddButton(HWND hwndToolBar, int nImage, int nCommand) { TBBUTTON button; @@ -94,6 +122,10 @@ static void DoOpenFile(LPCWSTR szFileName) DWORD dwNumRead; EDITSTREAM es; + char szCaption[MAX_PATH]; + char szAppTitle[sizeof(wszAppTitle)]; + char szSeparator[] = " - "; + hFile = CreateFileW(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) @@ -133,6 +165,42 @@ static void DoOpenFile(LPCWSTR szFileName) HeapFree(GetProcessHeap(), 0, pTemp); SetFocus(hEditorWnd); + + WideCharToMultiByte(CP_ACP, 0, wszAppTitle, -1, szAppTitle, sizeof(wszAppTitle), NULL, NULL); + + WideCharToMultiByte(CP_ACP, 0, szFileName, -1, szCaption, MAX_PATH, NULL, NULL); + + lstrcat(szCaption, szSeparator); + lstrcat(szCaption, szAppTitle); + + SetWindowText(hMainWnd, szCaption); +} + +static void DialogOpenFile() +{ + OPENFILENAME ofn; + + char szFile[MAX_PATH] = ""; + char szDefExt[] = "rtf"; + + ZeroMemory(&ofn, sizeof(ofn)); + + ofn.lStructSize = sizeof(ofn); + ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; + ofn.hwndOwner = hMainWnd; + ofn.lpstrFilter = szFilter; + ofn.lpstrFile = szFile; + ofn.nMaxFile = MAX_PATH; + ofn.lpstrDefExt = szDefExt; + + if(GetOpenFileName(&ofn)) + { + WCHAR szOpenFile[MAX_PATH]; + + MultiByteToWideChar(CP_ACP, 0, ofn.lpstrFile, MAX_PATH, szOpenFile, sizeof(szOpenFile)/sizeof(szOpenFile[0])); + + DoOpenFile(szOpenFile); + } } static void HandleCommandLine(LPWSTR cmdline) @@ -263,6 +331,9 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) SetFocus(hEditorWnd); SendMessage(hEditorWnd, EM_SETEVENTMASK, 0, ENM_SELCHANGE); + + DoLoadStrings(); + return 0; } @@ -337,6 +408,9 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) break; case ID_FILE_OPEN: + DialogOpenFile(); + break; + case ID_FILE_SAVE: case ID_PRINT: case ID_PREVIEW:

1 0

Jason Edmeades : cmd.exe: Add pushd and popd.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 365f86fd7ec3013149d6167b4710656cea2c0f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=365f86fd7ec3013149d6167b4… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Fri Feb 23 22:17:28 2007 +0000 cmd.exe: Add pushd and popd. --- programs/cmd/En.rc | 8 +++++++ programs/cmd/builtins.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ programs/cmd/wcmd.h | 6 ++++- programs/cmd/wcmdmain.c | 8 ++++++- 4 files changed, 74 insertions(+), 2 deletions(-) diff --git a/programs/cmd/En.rc b/programs/cmd/En.rc index fda556e..1a8877d 100644 --- a/programs/cmd/En.rc +++ b/programs/cmd/En.rc @@ -196,6 +196,12 @@ The verify flag has no function in Wine.\n" WCMD_VOL, "Help about VOL\n" + WCMD_PUSHD, "PUSHD <directoryname> saves the current directory onto a\n\ +stack, and then changes the current directory to the supplied one.\n" + + WCMD_POPD, "POPD changes current directory to the last one saved with\n\ +PUSHD.\n" + WCMD_EXIT, "EXIT terminates the current command session and returns\n\ to the operating system or shell from which you invoked cmd.\n" @@ -215,7 +221,9 @@ HELP\t\tShow brief help details on a topic\n\ MD (MKDIR)\tCreate a subdirectory\n\ MOVE\t\tMove a file, set of files or directory tree\n\ PATH\t\tSet or show the search path\n\ +POPD\t\tRestores the directory to the last one saved with PUSHD\n\ PROMPT\t\tChange the command prompt\n\ +PUSHD\t\tChanges to a new directory, saving the current one\n\ REN (RENAME)\tRename a file\n\ RD (RMDIR)\tDelete a subdirectory\n\ SET\t\tSet or show environment variables\n\ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a81c90c..346591a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -45,6 +45,7 @@ struct env_stack }; struct env_stack *saved_environment; +struct env_stack *pushd_directories; extern HINSTANCE hinst; extern char *inbuilt[]; @@ -449,6 +450,59 @@ char string[MAX_PATH]; return; } +/***************************************************************************** + * WCMD_pushd + * + * Push a directory onto the stack + */ + +void WCMD_pushd (void) { + struct env_stack *curdir; + BOOL status; + WCHAR *thisdir; + + curdir = LocalAlloc (LMEM_FIXED, sizeof (struct env_stack)); + thisdir = LocalAlloc (LMEM_FIXED, 1024 * sizeof(WCHAR)); + if( !curdir || !thisdir ) { + LocalFree(curdir); + LocalFree(thisdir); + WCMD_output ("out of memory\n"); + return; + } + + GetCurrentDirectoryW (1024, thisdir); + status = SetCurrentDirectoryA (param1); + if (!status) { + WCMD_print_error (); + LocalFree(curdir); + LocalFree(thisdir); + return; + } else { + curdir -> next = pushd_directories; + curdir -> strings = thisdir; + pushd_directories = curdir; + } +} + + +/***************************************************************************** + * WCMD_popd + * + * Pop a directory from the stack + */ + +void WCMD_popd (void) { + struct env_stack *temp = pushd_directories; + + if (!pushd_directories) + return; + + /* pop the old environment from the stack, and make it the current dir */ + pushd_directories = temp->next; + SetCurrentDirectoryW(temp->strings); + LocalFree (temp->strings); + LocalFree (temp); +} /**************************************************************************** * WCMD_if diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 263412e..07d1649 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -49,8 +49,10 @@ void WCMD_output_asis (const char *message); void WCMD_parse (char *s, char *q, char *p1, char *p2); void WCMD_pause (void); void WCMD_pipe (char *command); +void WCMD_popd (void); 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_rename (void); @@ -137,9 +139,11 @@ typedef struct { #define WCMD_ENDLOCAL 36 #define WCMD_SETLOCAL 37 +#define WCMD_PUSHD 38 +#define WCMD_POPD 39 /* Must be last in list */ -#define WCMD_EXIT 38 +#define WCMD_EXIT 40 /* Some standard messages */ extern const char nyi[]; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0e58197..84d1c04 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -32,7 +32,7 @@ const char * const inbuilt[] = {"ATTRIB", "CALL", "CD", "CHDIR", "CLS", "COPY", "HELP", "IF", "LABEL", "MD", "MKDIR", "MOVE", "PATH", "PAUSE", "PROMPT", "REM", "REN", "RENAME", "RD", "RMDIR", "SET", "SHIFT", "TIME", "TITLE", "TYPE", "VERIFY", "VER", "VOL", - "ENDLOCAL", "SETLOCAL", "EXIT" }; + "ENDLOCAL", "SETLOCAL", "PUSHD", "POPD", "EXIT" }; HINSTANCE hinst; DWORD errorlevel; @@ -522,6 +522,12 @@ void WCMD_process_command (char *command) case WCMD_VOL: WCMD_volume (0, p); break; + case WCMD_PUSHD: + WCMD_pushd(); + break; + case WCMD_POPD: + WCMD_popd(); + break; case WCMD_EXIT: WCMD_exit (); break;

1 0

Jason Edmeades : cmd.exe: Add support for call :label and goto :label.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 327d7ef9e60446e7c421cab15baabee610421c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=327d7ef9e60446e7c421cab15… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Fri Feb 23 22:19:25 2007 +0000 cmd.exe: Add support for call :label and goto :label. --- programs/cmd/batch.c | 86 +++++++++++++++++++++++++++++++++++++--------- programs/cmd/builtins.c | 6 +++- programs/cmd/wcmd.h | 3 +- programs/cmd/wcmdmain.c | 12 +++--- 4 files changed, 82 insertions(+), 25 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 1a9d9e1..045046c 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -42,9 +42,12 @@ extern DWORD errorlevel; * * We need to handle recursion correctly, since one batch program might call another. * So parameters for this batch file are held in a BATCH_CONTEXT structure. + * + * To support call within the same batch program, another input parameter is + * a label to goto once opened. */ -void WCMD_batch (char *file, char *command, int called) { +void WCMD_batch (char *file, char *command, int called, char *startLabel, HANDLE pgmHandle) { #define WCMD_BATCH_EXT_SIZE 5 @@ -55,27 +58,33 @@ char extension_exe[WCMD_BATCH_EXT_SIZE] = ".exe"; unsigned int i; BATCH_CONTEXT *prev_context; - for(i=0; (i<(sizeof(extension_batch)/WCMD_BATCH_EXT_SIZE)) && - (h == INVALID_HANDLE_VALUE); i++) { - strcpy (string, file); - CharLower (string); - if (strstr (string, extension_batch[i]) == NULL) strcat (string, extension_batch[i]); - h = CreateFile (string, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - } - if (h == INVALID_HANDLE_VALUE) { + if (startLabel == NULL) { + for(i=0; (i<(sizeof(extension_batch)/WCMD_BATCH_EXT_SIZE)) && + (h == INVALID_HANDLE_VALUE); i++) { strcpy (string, file); CharLower (string); - if (strstr (string, extension_exe) == NULL) strcat (string, extension_exe); + if (strstr (string, extension_batch[i]) == NULL) strcat (string, extension_batch[i]); h = CreateFile (string, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (h != INVALID_HANDLE_VALUE) { - WCMD_run_program (command, 0); - } else { - SetLastError (ERROR_FILE_NOT_FOUND); - WCMD_print_error (); } - return; + if (h == INVALID_HANDLE_VALUE) { + strcpy (string, file); + CharLower (string); + if (strstr (string, extension_exe) == NULL) strcat (string, extension_exe); + h = CreateFile (string, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (h != INVALID_HANDLE_VALUE) { + WCMD_run_program (command, 0); + } else { + SetLastError (ERROR_FILE_NOT_FOUND); + WCMD_print_error (); + } + return; + } + } else { + DuplicateHandle(GetCurrentProcess(), pgmHandle, + GetCurrentProcess(), &h, + 0, FALSE, DUPLICATE_SAME_ACCESS); } /* @@ -90,6 +99,12 @@ BATCH_CONTEXT *prev_context; context -> prev_context = prev_context; context -> skip_rest = FALSE; + /* If processing a call :label, 'goto' the label in question */ + if (startLabel) { + strcpy(param1, startLabel); + WCMD_goto(); + } + /* * Work through the file line by line. Specific batch commands are processed here, * the rest are handled by the main command processor. @@ -695,3 +710,40 @@ void WCMD_HandleTildaModifiers(char **start, char *forVariable) { strcat(*start, pos); free(pos); } + +/******************************************************************* + * WCMD_call - processes a batch call statement + * + * If there is a leading ':', calls within this batch program + * otherwise launches another program. + */ +void WCMD_call (char *command) { + + /* Run other program if no leading ':' */ + if (*command != ':') { + WCMD_run_program(command, 1); + } else { + + char gotoLabel[MAX_PATH]; + + strcpy(gotoLabel, param1); + + if (context) { + + LARGE_INTEGER li; + + /* Save the current file position, call the same file, + restore position */ + li.QuadPart = 0; + li.LowPart = SetFilePointer(context -> h, li.LowPart, + &li.HighPart, FILE_CURRENT); + + WCMD_batch (param1, command, 1, gotoLabel, context->h); + + SetFilePointer(context -> h, li.LowPart, + &li.HighPart, FILE_BEGIN); + } else { + printf("Cannot call batch label outside of a batch script\n"); + } + } +} diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 346591a..9a8b513 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -434,6 +434,7 @@ char string[MAX_PATH]; return; } if (context != NULL) { + char *paramStart = param1; /* Handle special :EOF label */ if (lstrcmpi (":eof", param1) == 0) { @@ -441,9 +442,12 @@ char string[MAX_PATH]; return; } + /* Support goto :label as well as goto label */ + if (*paramStart == ':') paramStart++; + SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); while (WCMD_fgets (string, sizeof(string), context -> h)) { - if ((string[0] == ':') && (lstrcmpi (&string[1], param1) == 0)) return; + if ((string[0] == ':') && (lstrcmpi (&string[1], paramStart) == 0)) return; } WCMD_output ("Target to GOTO not found\n"); } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 07d1649..4391d7c 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -27,7 +27,8 @@ #include <stdio.h> #include <ctype.h> -void WCMD_batch (char *, char *, int); +void WCMD_batch (char *, char *, int, char *, HANDLE); +void WCMD_call (char *command); void WCMD_change_tty (void); void WCMD_clear_screen (void); void WCMD_copy (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 84d1c04..17b75f3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -265,7 +265,7 @@ int main (int argc, char *argv[]) if (h != INVALID_HANDLE_VALUE) { CloseHandle (h); #if 0 - WCMD_batch_command (string); + WCMD_batch ((char *)"\\autoexec.bat", (char *)"\\autoexec.bat", 0, NULL, INVALID_HANDLE_VALUE); #endif } @@ -422,7 +422,7 @@ void WCMD_process_command (char *command) WCMD_setshow_attrib (); break; case WCMD_CALL: - WCMD_run_program (p, 1); + WCMD_call (p); break; case WCMD_CD: case WCMD_CHDIR: @@ -628,14 +628,14 @@ char filetorun[MAX_PATH]; if (!ext || !strcasecmp( ext, ".bat")) { if (SearchPath (NULL, param1, ".bat", sizeof(filetorun), filetorun, NULL)) { - WCMD_batch (filetorun, command, called); + WCMD_batch (filetorun, command, called, NULL, INVALID_HANDLE_VALUE); return; } } if (!ext || !strcasecmp( ext, ".cmd")) { if (SearchPath (NULL, param1, ".cmd", sizeof(filetorun), filetorun, NULL)) { - WCMD_batch (filetorun, command, called); + WCMD_batch (filetorun, command, called, NULL, INVALID_HANDLE_VALUE); return; } } @@ -644,7 +644,7 @@ char filetorun[MAX_PATH]; char *ext = strrchr( param1, '.' ); if (ext && (!strcasecmp( ext, ".bat" ) || !strcasecmp( ext, ".cmd" ))) { - WCMD_batch (param1, command, called); + WCMD_batch (param1, command, called, NULL, INVALID_HANDLE_VALUE); return; } @@ -657,7 +657,7 @@ char filetorun[MAX_PATH]; NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h != INVALID_HANDLE_VALUE) { CloseHandle (h); - WCMD_batch (param1, command, called); + WCMD_batch (param1, command, called, NULL, INVALID_HANDLE_VALUE); return; } }

1 0

Jason Edmeades : cmd.exe: Unify parsing and expansion.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: 98ae8a69412f573930e1679fafe3d84e7aa0a74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=98ae8a69412f573930e1679fa… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Fri Feb 23 22:21:27 2007 +0000 cmd.exe: Unify parsing and expansion. --- programs/cmd/batch.c | 135 +---------------------------------------------- programs/cmd/wcmd.h | 5 ++ programs/cmd/wcmdmain.c | 134 +++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 125 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98ae8a69412f573930e16…

1 0

Jason Edmeades : cmd.exe: Add %random% special name support.
by Alexandre Julliard 26 Feb '07

26 Feb '07

Module: wine Branch: master Commit: e8fa5df394c70214a0c2a53b0ddd360b8dec2c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8fa5df394c70214a0c2a53b0… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Fri Feb 23 22:22:03 2007 +0000 cmd.exe: Add %random% special name support. --- programs/cmd/wcmdmain.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8380d18..2d5f805 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -318,8 +318,8 @@ void WCMD_process_command (char *command) /* Expand environment variables in a batch file %{0-9} first */ /* including support for any ~ modifiers */ /* Additionally: */ - /* Expand the DATE, TIME, CD and ERRORLEVEL special names */ - /* allowing environment variable overrides */ + /* Expand the DATE, TIME, CD, RANDOM and ERRORLEVEL special */ + /* names allowing environment variable overrides */ /* FIXME: Winnt would replace %1%fred%1 with first parm, then */ /* contents of fred, then the digit 1. Would need to remove */ @@ -399,6 +399,16 @@ void WCMD_process_command (char *command) strcpy (p, temp); strcat (p, s); + } else if ((CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + (p+1), 7, "RANDOM%", -1) == 2) && + (GetEnvironmentVariable("RANDOM", temp, 1) == 0) && + (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { + sprintf(temp, "%d", rand() % 32768); + s = strdup (p+8); + strcpy (p, temp); + strcat (p, s); + } else { p++; }

1 0