February 2007 - Wine-commits

Jason Edmeades : cmd.exe: Support del /a[:].
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: b822e73263c0f9ed3c6c8588b4dd6dc093aea27d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b822e73263c0f9ed3c6c8588b… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Feb 27 23:20:55 2007 +0000 cmd.exe: Support del /a[:]. --- programs/cmd/builtins.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 64 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 6b214e1..3c93231 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -224,6 +224,12 @@ void WCMD_create_dir (void) { * * Delete a file or wildcarded set. * + * Note on /A: + * - Testing shows /A is repeatable, eg. /a-r /ar matches all files + * - Each set is a pattern, eg /ahr /as-r means + * readonly+hidden OR nonreadonly system files + * - The '-' applies to a single field, ie /a:-hr means read only + * non-hidden files */ void WCMD_delete (int recurse) { @@ -292,9 +298,66 @@ char *p; else strcpy (fpath, fd.cFileName); if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { BOOL ok = TRUE; + char *nextA = strstr (quals, "/A"); + + /* Handle attribute matching (/A) */ + if (nextA != NULL) { + ok = FALSE; + while (nextA != NULL && !ok) { + + char *thisA = (nextA+2); + BOOL stillOK = TRUE; + + /* Skip optional : */ + if (*thisA == ':') thisA++; + + /* Parse each of the /A[:]xxx in turn */ + while (*thisA && *thisA != '/') { + BOOL negate = FALSE; + BOOL attribute = FALSE; + + /* Match negation of attribute first */ + if (*thisA == '-') { + negate=TRUE; + thisA++; + } + + /* Match attribute */ + switch (*thisA) { + case 'R': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_READONLY); + break; + case 'H': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN); + break; + case 'S': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM); + break; + case 'A': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE); + break; + default: + WCMD_output ("Syntax error\n"); + } + + /* Now check result, keeping a running boolean about whether it + matches all parsed attribues so far */ + if (attribute && !negate) { + stillOK = stillOK; + } else if (!attribute && negate) { + stillOK = stillOK; + } else { + stillOK = FALSE; + } + thisA++; + } + + /* Save the running total as the final result */ + ok = stillOK; + + /* Step on to next /A set */ + nextA = strstr (nextA+1, "/A"); + } + } /* /P means prompt for each file */ - if (strstr (quals, "/P") != NULL) { + if (ok && strstr (quals, "/P") != NULL) { char question[MAXSTRING]; /* Ask for confirmation */

1 0

Jason Edmeades : cmd.exe: Fix parameter parsing returns.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: a7c5906b626fd17de661dc8e12fab71e79c6e1ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c5906b626fd17de661dc8e1… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Feb 27 23:21:59 2007 +0000 cmd.exe: Fix parameter parsing returns. Only return valid values for the location of the parameter if it is the one requested. Currently returns address when ANY quoted or bracketed parameter found. --- programs/cmd/batch.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 5a854f7..bbc3f83 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -147,6 +147,7 @@ int i = 0; static char param[MAX_PATH]; char *p; + if (where != NULL) *where = NULL; p = param; while (TRUE) { switch (*s) { @@ -154,7 +155,7 @@ char *p; s++; break; case '"': - if (where != NULL) *where = s; + if (where != NULL && i==n) *where = s; s++; while ((*s != '\0') && (*s != '"')) { *p++ = *s++; @@ -169,7 +170,7 @@ char *p; p = param; break; case '(': - if (where != NULL) *where = s; + if (where != NULL && i==n) *where = s; s++; while ((*s != '\0') && (*s != ')')) { *p++ = *s++;

1 0

Jacek Caban : hhctrl.ocx: Fill content tree.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: e9654359664c105fc0c96813763aa1f8f903002d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9654359664c105fc0c968137… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 04:00:00 2007 +0100 hhctrl.ocx: Fill content tree. --- dlls/hhctrl.ocx/content.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index b646868..093e6cd 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -351,6 +351,34 @@ static ContentItem *parse_hhc(HHInfo *info, IStream *str, insert_type_t *insert_ return ret; } +static void insert_content_item(HWND hwnd, ContentItem *parent, ContentItem *item) +{ + TVINSERTSTRUCTW tvis; + + memset(&tvis, 0, sizeof(tvis)); + tvis.u.item.mask = TVIF_TEXT|TVIF_PARAM; + tvis.u.item.cchTextMax = strlenW(item->name)+1; + tvis.u.item.pszText = item->name; + tvis.u.item.lParam = (LPARAM)item; + tvis.hParent = parent ? parent->id : 0; + tvis.hInsertAfter = TVI_LAST; + + item->id = (HTREEITEM)SendMessageW(hwnd, TVM_INSERTITEMW, 0, (LPARAM)&tvis); +} + +static void fill_content_tree(HWND hwnd, ContentItem *parent, ContentItem *item) +{ + while(item) { + if(item->name) { + insert_content_item(hwnd, parent, item); + fill_content_tree(hwnd, item, item->child); + }else { + fill_content_tree(hwnd, parent, item->child); + } + item = item->next; + } +} + static void set_item_parents(ContentItem *parent, ContentItem *item) { while(item) { @@ -380,6 +408,7 @@ void InitContent(HHInfo *info) IStream_Release(stream); set_item_parents(NULL, info->content); + fill_content_tree(info->tabs[TAB_CONTENTS].hwnd, NULL, info->content); } static void free_content_item(ContentItem *item)

1 0

Jacek Caban : hhctrl.ocx: Added handling of topic selection.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: f1919c61068951c31ccca0027dff7071b6a87cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1919c61068951c31ccca0027… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 04:00:35 2007 +0100 hhctrl.ocx: Added handling of topic selection. --- dlls/hhctrl.ocx/help.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 4632d51..5d98181 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -2,6 +2,7 @@ * Help Viewer Implementation * * Copyright 2005 James Hawkins + * Copyright 2007 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -341,6 +342,29 @@ static LRESULT OnTabChange(HWND hwnd) return 0; } +static LRESULT OnTopicChange(HWND hwnd, ContentItem *item) +{ + HHInfo *info = (HHInfo*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + LPCWSTR chmfile = NULL; + ContentItem *iter = item; + + if(!item || !info) + return 0; + + TRACE("name %s loal %s\n", debugstr_w(item->name), debugstr_w(item->local)); + + while(iter) { + if(iter->merge.chm_file) { + chmfile = iter->merge.chm_file; + break; + } + iter = iter->parent; + } + + NavigateToChm(info, chmfile, item->local); + return 0; +} + static LRESULT CALLBACK Child_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) @@ -354,6 +378,8 @@ static LRESULT CALLBACK Child_WndProc(HWND hWnd, UINT message, WPARAM wParam, LP switch(nmhdr->code) { case TCN_SELCHANGE: return OnTabChange(hWnd); + case TVN_SELCHANGEDW: + return OnTopicChange(hWnd, (ContentItem*)((NMTREEVIEWW *)lParam)->itemNew.lParam); } break; }

1 0

Jason Edmeades : cmd.exe: Add prompt for rd /s.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: fda7229b50c06bb627761dbf6c76f54f641bfbb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda7229b50c06bb627761dbf6… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Feb 27 23:18:57 2007 +0000 cmd.exe: Add prompt for rd /s. --- programs/cmd/Cs.rc | 4 +++ programs/cmd/De.rc | 4 +++ programs/cmd/En.rc | 4 +++ programs/cmd/Es.rc | 4 +++ programs/cmd/Fr.rc | 4 +++ programs/cmd/Ja.rc | 4 +++ programs/cmd/Ko.rc | 4 +++ programs/cmd/Nl.rc | 4 +++ programs/cmd/No.rc | 4 +++ programs/cmd/Pl.rc | 4 +++ programs/cmd/Pt.rc | 4 +++ programs/cmd/Ru.rc | 4 +++ programs/cmd/Si.rc | 4 +++ programs/cmd/Tr.rc | 4 +++ programs/cmd/builtins.c | 58 +++++++++++++++++++++++++++++++++++++++++++++- programs/cmd/wcmd.h | 6 +++++ 16 files changed, 118 insertions(+), 2 deletions(-) diff --git a/programs/cmd/Cs.rc b/programs/cmd/Cs.rc index d452bd8..390d875 100644 --- a/programs/cmd/Cs.rc +++ b/programs/cmd/Cs.rc @@ -230,4 +230,8 @@ VER\t\tZobraz� verzi CMD\n\ VOL\t\tUk�e jmenovku disku\n\ EXIT\t\tUkon�� CMD\n\n\ Zadejte HELP <p��kaz> pro podrobn�j�� informace o n�kter�m z v��e uveden�ch p��kaz�\n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" } diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 4fd40c8..50a69bc 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -247,4 +247,8 @@ VOL\t\tZeigt die Bezeichnung eines Laufwerkes an\n\ EXIT\t\tBeendet den CMD\n\n\ Geben Sie HELP <Befehl> ein, damit Sie weitere Informationen f�r einen der\n\ obigen Befehle erhalten.\n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" } diff --git a/programs/cmd/En.rc b/programs/cmd/En.rc index 1a8877d..10891a5 100644 --- a/programs/cmd/En.rc +++ b/programs/cmd/En.rc @@ -234,4 +234,8 @@ VER\t\tShow the current version of CMD\n\ VOL\t\tShow the volume label of a disk device\n\ EXIT\t\tClose down CMD\n\n\ Enter HELP <command> for further information on any of the above commands\n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" } diff --git a/programs/cmd/Es.rc b/programs/cmd/Es.rc index 279ab71..4822007 100644 --- a/programs/cmd/Es.rc +++ b/programs/cmd/Es.rc @@ -242,4 +242,8 @@ VER\t\tMostrar la versi�n actual de CMD\n\ VOL\t\tMostrar la etiqueta de volumen de un dispositivo de disco\n\ EXIT\t\tConcluir CMD\n\n\ Introduzca HELP <comando> para m�s informaci�n sobre cualquiera de los comandos\nde arriba\n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" } diff --git a/programs/cmd/Fr.rc b/programs/cmd/Fr.rc index cc65abd..78f206d 100644 --- a/programs/cmd/Fr.rc +++ b/programs/cmd/Fr.rc @@ -224,4 +224,8 @@ VER\t\tAffiche la version de cmd actuellement en m�moire.\n\ VOL\t\tAffiche le nom de volume d'un lecteur de disque\n\ EXIT\t\tQuitte CMD\n\n\ Entrez HELP <commande> pour plus d'informations sur les commandes ci-dessus\n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" } diff --git a/programs/cmd/Ja.rc b/programs/cmd/Ja.rc index 3e4f629..1937480 100644 --- a/programs/cmd/Ja.rc +++ b/programs/cmd/Ja.rc @@ -228,4 +228,8 @@ VER\t\tCMD�̃o�[�W��\��\n\ VOL\t\t�f�B�X�N�f�o�C�X�̃{��[��x��\��\n\ EXIT\t\tCMD��I��\n\n\ ��L�̃R�}��h�Ɋւ��ڍׂ�\��ɂ� HELP <�R�}��h��> �Ɠ��͂��ĉ��B\n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" } diff --git a/programs/cmd/Ko.rc b/programs/cmd/Ko.rc index 32c6b51..fa6b83f 100644 --- a/programs/cmd/Ko.rc +++ b/programs/cmd/Ko.rc @@ -219,4 +219,8 @@ VER\t\tCMD �� ֱ�\n\ VOL\t\t��ũ ��ġ�� ҷ� �� ֱ�\n\ EXIT\t\tCMD �ݱ�\n\n\ HELP <��>�� ġ�� \n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" } diff --git a/programs/cmd/Nl.rc b/programs/cmd/Nl.rc index da09b09..8e8d1c4 100644 --- a/programs/cmd/Nl.rc +++ b/programs/cmd/Nl.rc @@ -227,4 +227,8 @@ VER\t\tToon de versie van CMD\n\ VOL\t\tToon het label van een schijf\n\ EXIT\t\tSluit CMD af\n\n\ type HELP <opdracht> voor meer informatie over bovengenoemde opdrachten\n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" } diff --git a/programs/cmd/No.rc b/programs/cmd/No.rc index 2b01c47..c98dd15 100644 --- a/programs/cmd/No.rc +++ b/programs/cmd/No.rc @@ -225,4 +225,8 @@ VER\t\tViser CMDs versjonnummer\n\ VOL\t\tViser volumnavnet til en stasjon\n\ EXIT\t\tAvslutter CMD\n\n\ Skriv �HELP <kommando>� for mer informasjon om kommandoene ovenfor\n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" } diff --git a/programs/cmd/Pl.rc b/programs/cmd/Pl.rc index b5a60eb..5b49433 100644 --- a/programs/cmd/Pl.rc +++ b/programs/cmd/Pl.rc @@ -221,4 +221,8 @@ VER\t\tWy�wietla wersj� CMD\n\ VOL\t\tWy�wietla etykiet� dysku\n\ EXIT\t\tWy��cza CMD\n\n\ Wpisz HELP <komenda> dla dok�adniejszych informacji o komendzie\n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" } diff --git a/programs/cmd/Pt.rc b/programs/cmd/Pt.rc index 480e3d9..13a9b4c 100644 --- a/programs/cmd/Pt.rc +++ b/programs/cmd/Pt.rc @@ -434,4 +434,8 @@ VER\t\tMostra a vers�o atual do CMD\n\ VOL\t\tMostra o r�tulo do volume de uma unidade de disco\n\ EXIT\t\tFecha o CMD\n\n\ Digite HELP <comando> para mais informa��es sobre alguns dos comandos acima\n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" } diff --git a/programs/cmd/Ru.rc b/programs/cmd/Ru.rc index 61ab8ef..4118102 100644 --- a/programs/cmd/Ru.rc +++ b/programs/cmd/Ru.rc @@ -225,4 +225,8 @@ VER\t\t�� WCMD\n\ VOL\t\t�� \n\ EXIT\t\t�� WCMD\n\n\ �� HELP <��> �� .\n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" } diff --git a/programs/cmd/Si.rc b/programs/cmd/Si.rc index a8fbb57..7623beb 100644 --- a/programs/cmd/Si.rc +++ b/programs/cmd/Si.rc @@ -226,4 +226,8 @@ VER\t\tShow the current version of CMD\n\ VOL\t\tShow the volume label of a disk device\n\ EXIT\t\tClose down CMD\n\n\ Enter HELP <command> for further information on any of the above commands\n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" } diff --git a/programs/cmd/Tr.rc b/programs/cmd/Tr.rc index 40c9fc2..bdecde3 100644 --- a/programs/cmd/Tr.rc +++ b/programs/cmd/Tr.rc @@ -228,4 +228,8 @@ VER\t\tGe�erli CMD s�r�m�n� g�ster\n\ VOL\t\tDisk ayg�t�n�n b�l�m etiketini g�ster\n\ EXIT\t\tCMD'yi kapat\n\n\ Yukar�daki komutlar hakk�nda daha fazla bilgi i�in HELP <komut> girin\n" + + WCMD_CONFIRM, "Are you sure" + WCMD_YES, "Y" + WCMD_NO, "N" } diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a1d1154..500c27e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -643,8 +643,22 @@ void WCMD_remove_dir (void) { /* Otherwise use ShFileOp to recursively remove a directory */ } else { - /* Do the delete */ SHFILEOPSTRUCT lpDir; + + /* Ask first */ + if (strstr (quals, "/Q") == NULL) { + BOOL ok; + char question[MAXSTRING]; + + /* Ask for confirmation */ + sprintf(question, "%s, ", param1); + ok = WCMD_ask_confirm(question); + + /* Abort if answer is 'N' */ + if (!ok) return; + } + + /* Do the delete */ lpDir.hwnd = NULL; lpDir.pTo = NULL; lpDir.pFrom = param1; @@ -786,7 +800,7 @@ void WCMD_endlocal (void) { } LocalFree (old); FreeEnvironmentStringsW (env); - + /* restore old environment */ env = temp->strings; len = 0; @@ -1260,3 +1274,43 @@ void WCMD_exit (void) { ExitProcess(rc); } } + +/************************************************************************** + * WCMD_ask_confirm + * + * Issue a message and ask 'Are you sure (Y/N)', waiting on a valid + * answer. + * + * Returns True if Y answer is selected + * + */ +BOOL WCMD_ask_confirm (char *message) { + + char msgbuffer[MAXSTRING]; + char Ybuffer[MAXSTRING]; + char Nbuffer[MAXSTRING]; + char answer[MAX_PATH] = ""; + DWORD count = 0; + + /* Load the translated 'Are you sure', plus valid answers */ + LoadString (hinst, WCMD_CONFIRM, msgbuffer, sizeof(msgbuffer)); + LoadString (hinst, WCMD_YES, Ybuffer, sizeof(Ybuffer)); + LoadString (hinst, WCMD_NO, Nbuffer, sizeof(Nbuffer)); + + /* Loop waiting on a Y or N */ + while (answer[0] != Ybuffer[0] && answer[0] != Nbuffer[0]) { + WCMD_output_asis (message); + WCMD_output_asis (msgbuffer); + WCMD_output_asis (" ("); + WCMD_output_asis (Ybuffer); + WCMD_output_asis ("/"); + WCMD_output_asis (Nbuffer); + WCMD_output_asis (")?"); + ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer), + &count, NULL); + answer[0] = toupper(answer[0]); + } + + /* Return the answer */ + return (answer[0] == Ybuffer[0]); +} diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d9127bf..f27824a 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -80,6 +80,7 @@ char *WCMD_strtrim_leading_spaces (char *string); void WCMD_strtrim_trailing_spaces (char *string); void WCMD_opt_s_strip_quotes(char *cmd); void WCMD_HandleTildaModifiers(char **start, char *forVariable); +BOOL WCMD_ask_confirm (char *message); /* Data structure to hold context when executing batch files */ @@ -154,5 +155,10 @@ extern const char newline[]; extern const char version_string[]; extern const char anykey[]; +/* Translated messages */ +#define WCMD_CONFIRM 1001 +#define WCMD_YES 1002 +#define WCMD_NO 1003 + /* msdn specified max for Win XP */ #define MAXSTRING 8192

1 0

Jason Edmeades : cmd.exe: Prompt during del *.* and del *.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 409368eb4c9be42ddb7c4299bfa0ae008e323408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=409368eb4c9be42ddb7c4299b… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Feb 27 23:19:24 2007 +0000 cmd.exe: Prompt during del *.* and del *. --- programs/cmd/batch.c | 6 +++--- programs/cmd/builtins.c | 29 +++++++++++++++++++++++++++++ programs/cmd/wcmd.h | 1 + 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 03ecdaf..5a854f7 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -230,8 +230,8 @@ char *p; return p; } -/* _splitpath - copied from winefile as no obvious way to use it otherwise */ -void _splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext) +/* WCMD_splitpath - copied from winefile as no obvious way to use it otherwise */ +void WCMD_splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext) { const CHAR* end; /* end of processed string */ const CHAR* p; /* search pointer */ @@ -528,7 +528,7 @@ void WCMD_HandleTildaModifiers(char **start, char *forVariable) { if (finaloutput[0] != 0x00) strcat(finaloutput, " "); /* Split into components */ - _splitpath(fullfilename, drive, dir, fname, ext); + WCMD_splitpath(fullfilename, drive, dir, fname, ext); /* 5. Handle 'd' : Drive Letter */ if (memchr(firstModifier, 'd', modifierLen) != NULL) { diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 500c27e..771bcbb 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -237,6 +237,35 @@ char *p; WCMD_output ("Argument missing\n"); return; } + + /* If filename part of parameter is * or *.*, prompt unless + /Q supplied. */ + if (strstr (quals, "/Q") == NULL) { + + char drive[10]; + char dir[MAX_PATH]; + char fname[MAX_PATH]; + char ext[MAX_PATH]; + + /* Convert path into actual directory spec */ + GetFullPathName (param1, sizeof(fpath), fpath, NULL); + WCMD_splitpath(fpath, drive, dir, fname, ext); + + /* Only prompt for * and *.*, not *a, a*, *.a* etc */ + if ((strcmp(fname, "*") == 0) && + (*ext == 0x00 || (strcmp(ext, ".*") == 0))) { + BOOL ok; + char question[MAXSTRING]; + + /* Ask for confirmation */ + sprintf(question, "%s, ", fpath); + ok = WCMD_ask_confirm(question); + + /* Abort if answer is 'N' */ + if (!ok) return; + } + } + hff = FindFirstFile (param1, &fd); if (hff == INVALID_HANDLE_VALUE) { WCMD_output ("%s :File Not Found\n",param1); diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index f27824a..75079f1 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -82,6 +82,7 @@ void WCMD_opt_s_strip_quotes(char *cmd); void WCMD_HandleTildaModifiers(char **start, char *forVariable); BOOL WCMD_ask_confirm (char *message); +void WCMD_splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext); /* Data structure to hold context when executing batch files */

1 0

Jacek Caban : hhctrl.ocx: Added HH_HELP_CONTEXT implementation.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 736ef403a92ae4d0598d571efdb25bbad9958391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=736ef403a92ae4d0598d571ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:55:39 2007 +0100 hhctrl.ocx: Added HH_HELP_CONTEXT implementation. --- dlls/hhctrl.ocx/chm.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/help.c | 29 +++++++++++++++++++++------ dlls/hhctrl.ocx/hhctrl.c | 30 +++++++++++++++++++++++++--- dlls/hhctrl.ocx/hhctrl.h | 2 + 4 files changed, 97 insertions(+), 11 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 8e9fcf8..7c3384e 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -146,6 +146,53 @@ static BOOL ReadChmSystem(CHMInfo *chm) return SUCCEEDED(hres); } +LPWSTR FindContextAlias(CHMInfo *chm, DWORD index) +{ + IStream *ivb_stream; + DWORD size, read, i; + DWORD *buf; + LPCSTR ret = NULL; + HRESULT hres; + + static const WCHAR wszIVB[] = {'#','I','V','B',0}; + + hres = IStorage_OpenStream(chm->pStorage, wszIVB, NULL, STGM_READ, 0, &ivb_stream); + if(FAILED(hres)) { + WARN("Could not open #IVB stream: %08x\n", hres); + return NULL; + } + + hres = IStream_Read(ivb_stream, &size, sizeof(size), &read); + if(FAILED(hres)) { + WARN("Read failed: %08x\n", hres); + IStream_Release(ivb_stream); + return NULL; + } + + buf = hhctrl_alloc(size); + hres = IStream_Read(ivb_stream, buf, size, &read); + IStream_Release(ivb_stream); + if(FAILED(hres)) { + WARN("Read failed: %08x\n", hres); + hhctrl_free(buf); + return NULL; + } + + size /= 2*sizeof(DWORD); + + for(i=0; i<size; i++) { + if(buf[2*i] == index) { + ret = GetChmString(chm, buf[2*i+1]); + break; + } + } + + hhctrl_free(buf); + + TRACE("returning %s\n", debugstr_a(ret)); + return strdupAtoW(ret); +} + /* Loads the HH_WINTYPE data from the CHM file * * FIXME: There may be more than one window type in the file, so diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index abbc0c5..baedf88 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -57,15 +57,32 @@ static LPWSTR HH_LoadString(DWORD dwID) return string; } +BOOL NavigateToUrl(HHInfo *info, LPCWSTR surl) +{ + VARIANT url; + HRESULT hres; + + V_VT(&url) = VT_BSTR; + V_BSTR(&url) = SysAllocString(surl); + + hres = IWebBrowser2_Navigate2(info->web_browser, &url, 0, 0, 0, 0); + + VariantClear(&url); + + return SUCCEEDED(hres); +} + BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) { WCHAR buf[INTERNET_MAX_URL_LENGTH]; WCHAR full_path[MAX_PATH]; - VARIANT url; + LPWSTR ptr; static const WCHAR url_format[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':','%','s',':',':','/','%','s',0}; + TRACE("%p %s %s\n", info, debugstr_w(file), debugstr_w(index)); + if (!info->web_browser) return FALSE; @@ -76,13 +93,11 @@ BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) wsprintfW(buf, url_format, full_path, index); - V_VT(&url) = VT_BSTR; - V_BSTR(&url) = SysAllocString(buf); - - IWebBrowser2_Navigate2(info->web_browser, &url, 0, 0, 0, 0); - VariantClear(&url); + /* FIXME: HACK */ + if((ptr = strchrW(buf, '#'))) + *ptr = 0; - return TRUE; + return NavigateToUrl(info, buf); } /* Size Bar */ diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index ec3cf74..de66a8a 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -2,6 +2,7 @@ * hhctrl implementation * * Copyright 2004 Krzysztof Foltman + * Copyright 2007 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); HINSTANCE hhctrl_hinstance; -BOOL hh_process; +BOOL hh_process = FALSE; BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID lpvReserved) { @@ -84,9 +85,11 @@ static const char *command_to_string(UINT command) #undef X } +/****************************************************************** + * HtmlHelpW (hhctrl.ocx.15) + */ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) { - TRACE("(%p, %s, command=%s, data=%d)\n", caller, debugstr_w( filename ), command_to_string( command ), data); @@ -95,8 +98,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) { case HH_DISPLAY_TOPIC: case HH_DISPLAY_TOC: - case HH_DISPLAY_SEARCH: - case HH_HELP_CONTEXT: { + case HH_DISPLAY_SEARCH:{ HHInfo *info; BOOL res; @@ -110,6 +112,23 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) return NULL; /* FIXME */ } + case HH_HELP_CONTEXT: { + HHInfo *info; + LPWSTR url; + + info = CreateHelpViewer(filename); + if(!info) + return NULL; + + url = FindContextAlias(info->pCHMInfo, data); + if(!url) + return NULL; + + NavigateToUrl(info, url); + hhctrl_free(url); + + return NULL; /* FIXME */ + } default: FIXME("HH case %s not handled.\n", command_to_string( command )); } @@ -117,6 +136,9 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) return 0; } +/****************************************************************** + * HtmlHelpA (hhctrl.ocx.14) + */ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD data) { WCHAR *wfile = NULL; diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 0de19e2..f9d21f4 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -79,9 +79,11 @@ void DoPageAction(HHInfo*,DWORD); CHMInfo *OpenCHM(LPCWSTR szFile); BOOL LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType); CHMInfo *CloseCHM(CHMInfo *pCHMInfo); +LPWSTR FindContextAlias(CHMInfo*,DWORD); HHInfo *CreateHelpViewer(LPCWSTR); void ReleaseHelpViewer(HHInfo*); +BOOL NavigateToUrl(HHInfo*,LPCWSTR); BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR); /* memory allocation functions */

1 0

Jacek Caban : hhctrl.ocx: Resize tab control in Child's WM_SIZE handler.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: c6774f75f5de35975868ad0a724858a057443ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6774f75f5de35975868ad0a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:56:33 2007 +0100 hhctrl.ocx: Resize tab control in Child's WM_SIZE handler. --- dlls/hhctrl.ocx/help.c | 43 +++++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index baedf88..c47f6dd 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -40,6 +40,9 @@ static LRESULT Help_OnSize(HWND hWnd); #define WINTYPE_DEFAULT_HEIGHT 640 #define WINTYPE_DEFAULT_NAVWIDTH 250 +#define TAB_TOP_PADDING 8 +#define TAB_RIGHT_PADDING 4 + static const WCHAR szEmpty[] = {0}; /* Loads a string from the resource file */ @@ -250,7 +253,7 @@ static const WCHAR szChildClass[] = { 'H','H',' ','C','h','i','l','d',0 }; -static void Child_OnPaint(HWND hWnd) +static LRESULT Child_OnPaint(HWND hWnd) { PAINTSTRUCT ps; HDC hdc; @@ -278,17 +281,35 @@ static void Child_OnPaint(HWND hWnd) } EndPaint(hWnd, &ps); + + return 0; +} + +static LRESULT Child_OnSize(HWND hwnd) +{ + HHInfo *info = (HHInfo*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + RECT rect; + + if(!info || hwnd != info->WinType.hwndNavigation) + return 0; + + GetClientRect(hwnd, &rect); + SetWindowPos(info->hwndTabCtrl, HWND_TOP, 0, 0, + rect.right - TAB_RIGHT_PADDING, + rect.bottom - TAB_TOP_PADDING, SWP_NOMOVE); + return 0; } static LRESULT CALLBACK Child_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { - case WM_PAINT: - Child_OnPaint(hWnd); - break; - default: - return DefWindowProcW(hWnd, message, wParam, lParam); + case WM_PAINT: + return Child_OnPaint(hWnd); + case WM_SIZE: + return Child_OnSize(hWnd); + default: + return DefWindowProcW(hWnd, message, wParam, lParam); } return 0; @@ -470,9 +491,6 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) /* Navigation Pane */ -#define TAB_TOP_PADDING 8 -#define TAB_RIGHT_PADDING 4 - static void NP_GetNavigationRect(HHInfo *pHHInfo, RECT *rc) { HWND hwndParent = pHHInfo->WinType.hwndHelp; @@ -524,6 +542,8 @@ static BOOL HH_AddNavigationPane(HHInfo *info) if (!hWnd) return FALSE; + SetWindowLongPtrW(hWnd, GWLP_USERDATA, (LONG_PTR)info); + hwndTabCtrl = CreateWindowExW(dwExStyles, WC_TABCONTROLW, szEmpty, dwStyles, 0, TAB_TOP_PADDING, rc.right - TAB_RIGHT_PADDING, @@ -612,11 +632,6 @@ static LRESULT Help_OnSize(HWND hWnd) SetWindowPos(pHHInfo->WinType.hwndNavigation, HWND_TOP, 0, 0, rc.right, rc.bottom, SWP_NOMOVE); - GetClientRect(pHHInfo->WinType.hwndNavigation, &rc); - SetWindowPos(pHHInfo->hwndTabCtrl, HWND_TOP, 0, 0, - rc.right - TAB_RIGHT_PADDING, - rc.bottom - TAB_TOP_PADDING, SWP_NOMOVE); - SB_GetSizeBarRect(pHHInfo, &rc); SetWindowPos(pHHInfo->hwndSizeBar, HWND_TOP, rc.left, rc.top, rc.right, rc.bottom, SWP_SHOWWINDOW);

1 0

Jacek Caban : hhctrl.ocx: Added code for handling tabs.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 0ecadffb9da610dd6466464a6a6c683b1fbb4008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ecadffb9da610dd6466464a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:57:12 2007 +0100 hhctrl.ocx: Added code for handling tabs. --- dlls/hhctrl.ocx/help.c | 67 ++++++++++++++++++++++++++++++++++++++++----- dlls/hhctrl.ocx/hhctrl.h | 12 ++++++++ 2 files changed, 71 insertions(+), 8 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index c47f6dd..5d4e750 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -42,6 +42,7 @@ static LRESULT Help_OnSize(HWND hWnd); #define TAB_TOP_PADDING 8 #define TAB_RIGHT_PADDING 4 +#define TAB_MARGIN 8 static const WCHAR szEmpty[] = {0}; @@ -285,6 +286,24 @@ static LRESULT Child_OnPaint(HWND hWnd) return 0; } +static void ResizeTabChild(HHInfo *info, HWND hwnd) +{ + RECT rect, tabrc; + DWORD cnt; + + GetClientRect(info->WinType.hwndNavigation, &rect); + SendMessageW(info->hwndTabCtrl, TCM_GETITEMRECT, 0, (LPARAM)&tabrc); + cnt = SendMessageW(info->hwndTabCtrl, TCM_GETROWCOUNT, 0, 0); + + rect.left = TAB_MARGIN; + rect.top = TAB_TOP_PADDING + cnt*(tabrc.bottom-tabrc.top) + TAB_MARGIN; + rect.right -= TAB_RIGHT_PADDING + TAB_MARGIN; + rect.bottom -= TAB_MARGIN; + + SetWindowPos(hwnd, NULL, rect.left, rect.top, rect.right-rect.left, + rect.bottom-rect.top, SWP_NOZORDER | SWP_NOACTIVATE); +} + static LRESULT Child_OnSize(HWND hwnd) { HHInfo *info = (HHInfo*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); @@ -297,6 +316,28 @@ static LRESULT Child_OnSize(HWND hwnd) SetWindowPos(info->hwndTabCtrl, HWND_TOP, 0, 0, rect.right - TAB_RIGHT_PADDING, rect.bottom - TAB_TOP_PADDING, SWP_NOMOVE); + + ResizeTabChild(info, info->tabs[TAB_CONTENTS].hwnd); + return 0; +} + +static LRESULT OnTabChange(HWND hwnd) +{ + HHInfo *info = (HHInfo*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + + TRACE("%p\n", hwnd); + + if (!info) + return 0; + + if(info->tabs[info->current_tab].hwnd) + ShowWindow(info->tabs[info->current_tab].hwnd, SW_HIDE); + + info->current_tab = SendMessageW(info->hwndTabCtrl, TCM_GETCURSEL, 0, 0); + + if(info->tabs[info->current_tab].hwnd) + ShowWindow(info->tabs[info->current_tab].hwnd, SW_SHOW); + return 0; } @@ -308,6 +349,14 @@ static LRESULT CALLBACK Child_WndProc(HWND hWnd, UINT message, WPARAM wParam, LP return Child_OnPaint(hWnd); case WM_SIZE: return Child_OnSize(hWnd); + case WM_NOTIFY: { + NMHDR *nmhdr = (NMHDR*)lParam; + switch(nmhdr->code) { + case TCN_SELCHANGE: + return OnTabChange(hWnd); + } + break; + } default: return DefWindowProcW(hWnd, message, wParam, lParam); } @@ -513,16 +562,19 @@ static void NP_GetNavigationRect(HHInfo *pHHInfo, RECT *rc) rc->right = pHHInfo->WinType.iNavWidth; } -static void NP_CreateTab(HINSTANCE hInstance, HWND hwndTabCtrl, DWORD dwStrID, DWORD dwIndex) +static DWORD NP_CreateTab(HINSTANCE hInstance, HWND hwndTabCtrl, DWORD index) { TCITEMW tie; - LPWSTR tabText = HH_LoadString(dwStrID); + LPWSTR tabText = HH_LoadString(index); + DWORD ret; tie.mask = TCIF_TEXT; tie.pszText = tabText; - SendMessageW( hwndTabCtrl, TCM_INSERTITEMW, dwIndex, (LPARAM)&tie ); + ret = SendMessageW( hwndTabCtrl, TCM_INSERTITEMW, index, (LPARAM)&tie ); + hhctrl_free(tabText); + return ret; } static BOOL HH_AddNavigationPane(HHInfo *info) @@ -531,7 +583,6 @@ static BOOL HH_AddNavigationPane(HHInfo *info) HWND hwndParent = info->WinType.hwndHelp; DWORD dwStyles = WS_CHILDWINDOW | WS_VISIBLE; DWORD dwExStyles = WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR; - DWORD dwIndex = 0; RECT rc; NP_GetNavigationRect(info, &rc); @@ -553,16 +604,16 @@ static BOOL HH_AddNavigationPane(HHInfo *info) return FALSE; if (*info->WinType.pszToc) - NP_CreateTab(hhctrl_hinstance, hwndTabCtrl, IDS_CONTENTS, dwIndex++); + info->tabs[TAB_CONTENTS].id = NP_CreateTab(hhctrl_hinstance, hwndTabCtrl, IDS_CONTENTS); if (*info->WinType.pszIndex) - NP_CreateTab(hhctrl_hinstance, hwndTabCtrl, IDS_INDEX, dwIndex++); + info->tabs[TAB_INDEX].id = NP_CreateTab(hhctrl_hinstance, hwndTabCtrl, IDS_INDEX); if (info->WinType.fsWinProperties & HHWIN_PROP_TAB_SEARCH) - NP_CreateTab(hhctrl_hinstance, hwndTabCtrl, IDS_SEARCH, dwIndex++); + info->tabs[TAB_SEARCH].id = NP_CreateTab(hhctrl_hinstance, hwndTabCtrl, IDS_SEARCH); if (info->WinType.fsWinProperties & HHWIN_PROP_TAB_FAVORITES) - NP_CreateTab(hhctrl_hinstance, hwndTabCtrl, IDS_FAVORITES, dwIndex++); + info->tabs[TAB_FAVORITES].id = NP_CreateTab(hhctrl_hinstance, hwndTabCtrl, IDS_FAVORITES); SendMessageW(hwndTabCtrl, WM_SETFONT, (WPARAM)info->hFont, TRUE); diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index f9d21f4..7505140 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -58,6 +58,15 @@ typedef struct CHMInfo DWORD strings_size; } CHMInfo; +#define TAB_CONTENTS 0 +#define TAB_INDEX 1 +#define TAB_SEARCH 2 +#define TAB_FAVORITES 3 + +typedef struct { + HWND hwnd; + DWORD id; +} HHTab; typedef struct { IOleClientSite *client_site; @@ -69,6 +78,9 @@ typedef struct { HWND hwndTabCtrl; HWND hwndSizeBar; HFONT hFont; + + HHTab tabs[TAB_FAVORITES+1]; + DWORD current_tab; } HHInfo; BOOL InitWebBrowser(HHInfo*,HWND);

1 0

Jacek Caban : hhctrl.ocx: Added content tab window.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 6b68e8d606883929a53a341a3c00af91659ad237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b68e8d606883929a53a341a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:58:18 2007 +0100 hhctrl.ocx: Added content tab window. --- dlls/hhctrl.ocx/help.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 5d4e750..3c629a9 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -668,6 +668,22 @@ static BOOL HH_AddHTMLPane(HHInfo *pHHInfo) return TRUE; } +static BOOL AddContentTab(HHInfo *info) +{ + info->tabs[TAB_CONTENTS].hwnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, + szEmpty, WS_CHILD | WS_BORDER | 0x25, 50, 50, 100, 100, + info->WinType.hwndNavigation, NULL, hhctrl_hinstance, NULL); + if(!info->tabs[TAB_CONTENTS].hwnd) { + ERR("Could not create treeview control\n"); + return FALSE; + } + + ResizeTabChild(info, info->tabs[TAB_CONTENTS].hwnd); + ShowWindow(info->tabs[TAB_CONTENTS].hwnd, SW_SHOW); + + return TRUE; +} + /* Viewer Window */ static LRESULT Help_OnSize(HWND hWnd) @@ -840,6 +856,9 @@ static BOOL CreateViewer(HHInfo *pHHInfo) if (!HH_AddHTMLPane(pHHInfo)) return FALSE; + if (!AddContentTab(pHHInfo)) + return FALSE; + return TRUE; }

1 0