wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Detlef Riekenberg : cmd: Add CHOICE builtin with DOS6 to XP commandline parameter.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 7045e478a8bc8a1aeea5306aac47ee80a5b1f0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7045e478a8bc8a1aeea5306aa… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Dec 19 23:13:32 2010 +0100 cmd: Add CHOICE builtin with DOS6 to XP commandline parameter. --- programs/cmd/En.rc | 5 ++ programs/cmd/builtins.c | 168 +++++++++++++++++++++++++++++++++++++++++++++++ programs/cmd/wcmd.h | 4 +- programs/cmd/wcmdmain.c | 4 + 4 files changed, 180 insertions(+), 1 deletions(-) diff --git a/programs/cmd/En.rc b/programs/cmd/En.rc index 2e32c1c..87b0780 100644 --- a/programs/cmd/En.rc +++ b/programs/cmd/En.rc @@ -211,6 +211,10 @@ PUSHD.\n" WCMD_MORE, "MORE displays output of files or piped input in pages.\n" + WCMD_CHOICE, "CHOICE displays a text and waits, until the User\n\ +press an allowed Key from a selectable list.\n\ +CHOICE is mainly used to build a menu selection in a batch file.\n" + WCMD_EXIT, "EXIT terminates the current command session and returns\n\ to the operating system or shell from which you invoked cmd.\n" @@ -219,6 +223,7 @@ to the operating system or shell from which you invoked cmd.\n" ATTRIB\t\tShow or change DOS file attributes\n\ CALL\t\tInvoke a batch file from inside another\n\ CD (CHDIR)\tChange current default directory\n\ +CHOICE\t\tWait for an keypress from a selectable list\n\ CLS\t\tClear the console screen\n\ COPY\t\tCopy file\n\ CTTY\t\tChange input/output device\n\ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8c3f727..7c35e6a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -160,6 +160,174 @@ void WCMD_change_tty (void) { } /**************************************************************************** + * WCMD_choice + * + */ + +void WCMD_choice (WCHAR * command) { + + static const WCHAR bellW[] = {7,0}; + static const WCHAR commaW[] = {',',0}; + static const WCHAR bracket_open[] = {'[',0}; + static const WCHAR bracket_close[] = {']','?',0}; + WCHAR answer[16]; + WCHAR buffer[16]; + WCHAR *ptr = NULL; + WCHAR *opt_c = NULL; + WCHAR *my_command = NULL; + WCHAR opt_default = 0; + DWORD opt_timeout = 0; + DWORD count; + DWORD oldmode; + DWORD have_console; + BOOL opt_n = FALSE; + BOOL opt_s = FALSE; + + have_console = GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &oldmode); + errorlevel = 0; + + my_command = WCMD_strdupW(WCMD_strtrim_leading_spaces(command)); + if (!my_command) + return; + + ptr = WCMD_strtrim_leading_spaces(my_command); + while (*ptr == '/') { + switch (toupperW(ptr[1])) { + case 'C': + ptr += 2; + /* the colon is optional */ + if (*ptr == ':') + ptr++; + + if (!*ptr || isspaceW(*ptr)) { + WINE_FIXME("bad parameter %s for /C\n", wine_dbgstr_w(ptr)); + HeapFree(GetProcessHeap(), 0, my_command); + return; + } + + /* remember the allowed keys (overwrite previous /C option) */ + opt_c = ptr; + while (*ptr && (!isspaceW(*ptr))) + ptr++; + + if (*ptr) { + /* terminate allowed chars */ + *ptr = 0; + ptr = WCMD_strtrim_leading_spaces(&ptr[1]); + } + WINE_TRACE("answer-list: %s\n", wine_dbgstr_w(opt_c)); + break; + + case 'N': + opt_n = TRUE; + ptr = WCMD_strtrim_leading_spaces(&ptr[2]); + break; + + case 'S': + opt_s = TRUE; + ptr = WCMD_strtrim_leading_spaces(&ptr[2]); + break; + + case 'T': + ptr = &ptr[2]; + /* the colon is optional */ + if (*ptr == ':') + ptr++; + + opt_default = *ptr++; + + if (!opt_default || (*ptr != ',')) { + WINE_FIXME("bad option %s for /T\n", opt_default ? wine_dbgstr_w(ptr) : ""); + HeapFree(GetProcessHeap(), 0, my_command); + return; + } + ptr++; + + count = 0; + while (((answer[count] = *ptr)) && isdigitW(*ptr) && (count < 15)) { + count++; + ptr++; + } + + answer[count] = 0; + opt_timeout = atoiW(answer); + + ptr = WCMD_strtrim_leading_spaces(ptr); + break; + + default: + WINE_FIXME("bad parameter: %s\n", wine_dbgstr_w(ptr)); + HeapFree(GetProcessHeap(), 0, my_command); + return; + } + } + + if (opt_timeout) + WINE_FIXME("timeout not supported: %c,%d\n", opt_default, opt_timeout); + + if (have_console) + SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), 0); + + /* use default keys, when needed: localized versions of "Y"es and "No" */ + if (!opt_c) { + LoadStringW(hinst, WCMD_YES, buffer, sizeof(buffer)/sizeof(WCHAR)); + LoadStringW(hinst, WCMD_NO, buffer + 1, sizeof(buffer)/sizeof(WCHAR) - 1); + opt_c = buffer; + buffer[2] = 0; + } + + /* print the question, when needed */ + if (*ptr) + WCMD_output_asis(ptr); + + if (!opt_s) { + struprW(opt_c); + WINE_TRACE("case insensitive answer-list: %s\n", wine_dbgstr_w(opt_c)); + } + + if (!opt_n) { + /* print a list of all allowed answers inside brackets */ + WCMD_output_asis(bracket_open); + ptr = opt_c; + answer[1] = 0; + while ((answer[0] = *ptr++)) { + WCMD_output_asis(answer); + if (*ptr) + WCMD_output_asis(commaW); + } + WCMD_output_asis(bracket_close); + } + + while (TRUE) { + + /* FIXME: Add support for option /T */ + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count, NULL); + + if (!opt_s) + answer[0] = toupperW(answer[0]); + + ptr = strchrW(opt_c, answer[0]); + if (ptr) { + WCMD_output_asis(answer); + WCMD_output(newline); + if (have_console) + SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), oldmode); + + errorlevel = (ptr - opt_c) + 1; + WINE_TRACE("answer: %d\n", errorlevel); + HeapFree(GetProcessHeap(), 0, my_command); + return; + } + else + { + /* key not allowed: play the bell */ + WINE_TRACE("key not allowed: %s\n", wine_dbgstr_w(answer)); + WCMD_output_asis(bellW); + } + } +} + +/**************************************************************************** * WCMD_copy * * Copy a file or wildcarded set. diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 2fde678..ce4c2da 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -52,6 +52,7 @@ void WCMD_assoc (WCHAR *, BOOL); void WCMD_batch (WCHAR *, WCHAR *, int, WCHAR *, HANDLE); void WCMD_call (WCHAR *command); void WCMD_change_tty (void); +void WCMD_choice (WCHAR *); void WCMD_clear_screen (void); void WCMD_color (void); void WCMD_copy (void); @@ -202,9 +203,10 @@ typedef struct _DIRECTORY_STACK #define WCMD_COLOR 41 #define WCMD_FTYPE 42 #define WCMD_MORE 43 +#define WCMD_CHOICE 44 /* Must be last in list */ -#define WCMD_EXIT 44 +#define WCMD_EXIT 45 /* Some standard messages */ extern const WCHAR newline[]; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 85f78b8..7b7ce8f 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -76,6 +76,7 @@ const WCHAR inbuilt[][10] = { {'C','O','L','O','R','\0'}, {'F','T','Y','P','E','\0'}, {'M','O','R','E','\0'}, + {'C','H','O','I','C','E','\0'}, {'E','X','I','T','\0'} }; @@ -1543,6 +1544,9 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, case WCMD_MORE: WCMD_more(p); break; + case WCMD_CHOICE: + WCMD_choice(p); + break; case WCMD_EXIT: WCMD_exit (cmdList); break;

1 0

André Hentschel : sane.ds: Fix translation of microsecond.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 2f30e3e464f65ffc808337d5296867a6bd5dcdc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f30e3e464f65ffc808337d52… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 19 19:48:07 2010 +0100 sane.ds: Fix translation of microsecond. --- dlls/sane.ds/sane_Da.rc | 2 +- dlls/sane.ds/sane_De.rc | 3 ++- dlls/sane.ds/sane_En.rc | 2 +- dlls/sane.ds/sane_Es.rc | 2 +- dlls/sane.ds/sane_Fi.rc | 2 +- dlls/sane.ds/sane_Fr.rc | 2 +- dlls/sane.ds/sane_Hu.rc | 2 +- dlls/sane.ds/sane_It.rc | 2 +- dlls/sane.ds/sane_Ja.rc | 2 +- dlls/sane.ds/sane_Ko.rc | 2 +- dlls/sane.ds/sane_Lt.rc | 2 +- dlls/sane.ds/sane_Nl.rc | 2 +- dlls/sane.ds/sane_No.rc | 2 +- dlls/sane.ds/sane_Pl.rc | 2 +- dlls/sane.ds/sane_Pt.rc | 2 +- dlls/sane.ds/sane_Ro.rc | 2 +- dlls/sane.ds/sane_Si.rc | 2 +- dlls/sane.ds/sane_Sr.rc | 4 ++-- dlls/sane.ds/sane_Sv.rc | 2 +- dlls/sane.ds/sane_Uk.rc | 2 +- dlls/sane.ds/sane_Zh.rc | 4 ++-- 21 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/sane.ds/sane_Da.rc b/dlls/sane.ds/sane_Da.rc index 77b6640..3cfb199 100644 --- a/dlls/sane.ds/sane_Da.rc +++ b/dlls/sane.ds/sane_Da.rc @@ -38,5 +38,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_De.rc b/dlls/sane.ds/sane_De.rc index 537666b..29eafec 100644 --- a/dlls/sane.ds/sane_De.rc +++ b/dlls/sane.ds/sane_De.rc @@ -2,6 +2,7 @@ * German resources for Twain * * Copyright 2006 Henning Gerhardt + * Copyright 2010 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,5 +41,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_En.rc b/dlls/sane.ds/sane_En.rc index 9e4bee8..f899758 100644 --- a/dlls/sane.ds/sane_En.rc +++ b/dlls/sane.ds/sane_En.rc @@ -38,5 +38,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Es.rc b/dlls/sane.ds/sane_Es.rc index 7f5e8c2..6ac520c 100644 --- a/dlls/sane.ds/sane_Es.rc +++ b/dlls/sane.ds/sane_Es.rc @@ -40,5 +40,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Fi.rc b/dlls/sane.ds/sane_Fi.rc index 9c8dd04..0f9869e 100644 --- a/dlls/sane.ds/sane_Fi.rc +++ b/dlls/sane.ds/sane_Fi.rc @@ -38,5 +38,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Fr.rc b/dlls/sane.ds/sane_Fr.rc index bd3017d..d63f348 100644 --- a/dlls/sane.ds/sane_Fr.rc +++ b/dlls/sane.ds/sane_Fr.rc @@ -38,5 +38,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Hu.rc b/dlls/sane.ds/sane_Hu.rc index 9b778b8..9491d2c 100644 --- a/dlls/sane.ds/sane_Hu.rc +++ b/dlls/sane.ds/sane_Hu.rc @@ -41,5 +41,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_It.rc b/dlls/sane.ds/sane_It.rc index 076188c..d18e90b 100644 --- a/dlls/sane.ds/sane_It.rc +++ b/dlls/sane.ds/sane_It.rc @@ -42,5 +42,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Ja.rc b/dlls/sane.ds/sane_Ja.rc index 34883d7..636b050 100644 --- a/dlls/sane.ds/sane_Ja.rc +++ b/dlls/sane.ds/sane_Ja.rc @@ -41,5 +41,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Ko.rc b/dlls/sane.ds/sane_Ko.rc index 59f65f6..87caca4 100644 --- a/dlls/sane.ds/sane_Ko.rc +++ b/dlls/sane.ds/sane_Ko.rc @@ -41,5 +41,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Lt.rc b/dlls/sane.ds/sane_Lt.rc index 18ade7a..a116ced 100644 --- a/dlls/sane.ds/sane_Lt.rc +++ b/dlls/sane.ds/sane_Lt.rc @@ -41,5 +41,5 @@ STRINGTABLE 3 "mm" 4 "tašk./col." 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Nl.rc b/dlls/sane.ds/sane_Nl.rc index 31f506f..4171637 100644 --- a/dlls/sane.ds/sane_Nl.rc +++ b/dlls/sane.ds/sane_Nl.rc @@ -38,5 +38,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_No.rc b/dlls/sane.ds/sane_No.rc index 0baf618..18a2030 100644 --- a/dlls/sane.ds/sane_No.rc +++ b/dlls/sane.ds/sane_No.rc @@ -40,5 +40,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Pl.rc b/dlls/sane.ds/sane_Pl.rc index 11ffe0f..66ed348 100644 --- a/dlls/sane.ds/sane_Pl.rc +++ b/dlls/sane.ds/sane_Pl.rc @@ -41,5 +41,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Pt.rc b/dlls/sane.ds/sane_Pt.rc index ea50ab4..cc7a98b 100644 --- a/dlls/sane.ds/sane_Pt.rc +++ b/dlls/sane.ds/sane_Pt.rc @@ -52,5 +52,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Ro.rc b/dlls/sane.ds/sane_Ro.rc index 276ef6b..fc1b94f 100644 --- a/dlls/sane.ds/sane_Ro.rc +++ b/dlls/sane.ds/sane_Ro.rc @@ -39,5 +39,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Si.rc b/dlls/sane.ds/sane_Si.rc index 538a1dc..e67676a 100644 --- a/dlls/sane.ds/sane_Si.rc +++ b/dlls/sane.ds/sane_Si.rc @@ -40,5 +40,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Sr.rc b/dlls/sane.ds/sane_Sr.rc index 5657c13..c1738cc 100644 --- a/dlls/sane.ds/sane_Sr.rc +++ b/dlls/sane.ds/sane_Sr.rc @@ -41,7 +41,7 @@ STRINGTABLE 3 "мм" 4 "тпи" 5 "%" - 6 "нс" + 6 "µс" } LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN @@ -62,5 +62,5 @@ STRINGTABLE 3 "mm" 4 "tpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Sv.rc b/dlls/sane.ds/sane_Sv.rc index a0ee5e7..853ab28 100644 --- a/dlls/sane.ds/sane_Sv.rc +++ b/dlls/sane.ds/sane_Sv.rc @@ -40,5 +40,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Uk.rc b/dlls/sane.ds/sane_Uk.rc index 02d8a09..53e0f99 100644 --- a/dlls/sane.ds/sane_Uk.rc +++ b/dlls/sane.ds/sane_Uk.rc @@ -42,5 +42,5 @@ STRINGTABLE 3 "мм" 4 "точок на дюйм" 5 "%" - 6 "ns" + 6 "µs" } diff --git a/dlls/sane.ds/sane_Zh.rc b/dlls/sane.ds/sane_Zh.rc index 7050a4a..19dba3b 100644 --- a/dlls/sane.ds/sane_Zh.rc +++ b/dlls/sane.ds/sane_Zh.rc @@ -41,7 +41,7 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" } LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL @@ -62,5 +62,5 @@ STRINGTABLE 3 "mm" 4 "dpi" 5 "%" - 6 "ns" + 6 "µs" }

1 0

André Hentschel : gameux: Fix Path for the statistics.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 9eda42fe94d3d0fc98cb529147a84e053f1ac3eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eda42fe94d3d0fc98cb52914… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 19 20:11:15 2010 +0100 gameux: Fix Path for the statistics. --- dlls/gameux/gamestatistics.c | 2 +- dlls/gameux/tests/gamestatistics.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 97a8f13..5650c94 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -323,7 +323,7 @@ static HRESULT GAMEUX_buildStatisticsFilePath( static const WCHAR sStatisticsDir[] = {'\\','M','i','c','r','o','s','o','f','t', '\\','W','i','n','d','o','w','s','\\','G','a','m','e','E','x','p', 'l','o','r','e','r','\\','G','a','m','e','S','t','a','t','i','s', - 't','i','c','s',0}; + 't','i','c','s','\\',0}; static const WCHAR sDotGamestats[] = {'.','g','a','m','e','s','t','a','t','s',0}; HRESULT hr; diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 7eb9864..c49e693 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -128,7 +128,7 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta static const WCHAR sStatisticsDir[] = {'\\','M','i','c','r','o','s','o','f','t', '\\','W','i','n','d','o','w','s','\\','G','a','m','e','E','x','p', 'l','o','r','e','r','\\','G','a','m','e','S','t','a','t','i','s', - 't','i','c','s',0}; + 't','i','c','s','\\',0}; static const WCHAR sDotGamestats[] = {'.','g','a','m','e','s','t','a','t','s',0}; static const DWORD dwGuidLength = 49;

1 0

André Hentschel : gameux: Fix test failures on Wine wow64.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 9b97fa1a604660b8adfc28615daab2166af02c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b97fa1a604660b8adfc28615… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 19 20:35:38 2010 +0100 gameux: Fix test failures on Wine wow64. --- dlls/gameux/gameexplorer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index bddc131..ea9307b 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -217,7 +217,7 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegCreateKeyExW(HKEY_LOCAL_MACHINE, lpRegistryKey, - 0, NULL, 0, KEY_ALL_ACCESS, NULL, + 0, NULL, 0, KEY_ALL_ACCESS | KEY_WOW64_64KEY, NULL, &hKey, NULL)); if(SUCCEEDED(hr)) @@ -252,7 +252,7 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) if(FAILED(hr)) { /* if something failed, remove whole key */ - hr2 = RegDeleteKeyExW(HKEY_LOCAL_MACHINE, lpRegistryKey, 0, 0); + hr2 = RegDeleteKeyExW(HKEY_LOCAL_MACHINE, lpRegistryKey, KEY_WOW64_64KEY, 0); /* do not overwrite old failure code with new success code */ if(FAILED(hr2)) hr = hr2; @@ -481,7 +481,7 @@ static HRESULT GAMEUX_RemoveRegistryRecord(GUID* pInstanceID) /* first, check is game installed for all users */ hr = GAMEUX_buildGameRegistryPath(GIS_ALL_USERS, pInstanceID, &lpRegistryPath); if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegDeleteKeyExW(HKEY_LOCAL_MACHINE, lpRegistryPath, 0, 0)); + hr = HRESULT_FROM_WIN32(RegDeleteKeyExW(HKEY_LOCAL_MACHINE, lpRegistryPath, KEY_WOW64_64KEY, 0)); HeapFree(GetProcessHeap(), 0, lpRegistryPath); @@ -490,7 +490,7 @@ static HRESULT GAMEUX_RemoveRegistryRecord(GUID* pInstanceID) { hr = GAMEUX_buildGameRegistryPath(GIS_CURRENT_USER, pInstanceID, &lpRegistryPath); if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegDeleteKeyExW(HKEY_LOCAL_MACHINE, lpRegistryPath, 0, 0)); + hr = HRESULT_FROM_WIN32(RegDeleteKeyExW(HKEY_LOCAL_MACHINE, lpRegistryPath, KEY_WOW64_64KEY, 0)); HeapFree(GetProcessHeap(), 0, lpRegistryPath); }

1 0

André Hentschel : msi/tests: Remove superfluous check.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 0e5c2f346d5ac1becb0a33f91d06cc3d36295af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5c2f346d5ac1becb0a33f91… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 20 01:48:13 2010 +0100 msi/tests: Remove superfluous check. --- dlls/msi/tests/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 0032222..1db7845 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -3420,7 +3420,7 @@ static void test_publish(void) ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - if (is_64bit && !is_wow64) + if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0

Greg Geldorp : rsaenh/tests: CryptGetKeyParam doesn't fail on Win7/Win2K8R2 .
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: ad8ce8388b199474db47edc8eb5c00590670708c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad8ce8388b199474db47edc8e… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Mon Dec 20 00:32:18 2010 +0100 rsaenh/tests: CryptGetKeyParam doesn't fail on Win7/Win2K8R2. --- dlls/rsaenh/tests/rsaenh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 8f46a09..7892f1a 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -947,8 +947,8 @@ static void test_aes(int keylen) /* AES provider doesn't support salt */ result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); - ok(!result && (GetLastError() == NTE_BAD_KEY || GetLastError() == ERROR_NO_TOKEN /* Win7 */), - "expected NTE_BAD_KEY or ERROR_NO_TOKEN, got %08x\n", GetLastError()); + ok((!result && GetLastError() == NTE_BAD_KEY) || result /* Win7 */, + "expected NTE_BAD_KEY, got %08x\n", GetLastError()); dwLen = 13; result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16);

1 0

David Hedberg : shell32: Add IShellItem2 stub to ShellItem implementation.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: d2091a8043a732d28cf3a1da425999d893349cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2091a8043a732d28cf3a1da4… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Dec 19 23:15:13 2010 +0100 shell32: Add IShellItem2 stub to ShellItem implementation. --- dlls/shell32/shellitem.c | 170 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 141 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2091a8043a732d28cf3a…

1 0

David Hedberg : shell32: IShellItem:: GetAttributes should also work on the desktop shellfolder.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 0d87e1f9fdfb96648ce03709e9c6bca285ec5c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d87e1f9fdfb96648ce03709e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Dec 19 23:15:12 2010 +0100 shell32: IShellItem::GetAttributes should also work on the desktop shellfolder. --- dlls/shell32/shellitem.c | 5 +++- dlls/shell32/tests/shlfolder.c | 44 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index d694503..fab7541 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -259,7 +259,10 @@ static HRESULT WINAPI ShellItem_GetAttributes(IShellItem *iface, SFGAOF sfgaoMas TRACE("(%p,%x,%p)\n", iface, sfgaoMask, psfgaoAttribs); - ret = ShellItem_get_parent_shellfolder(This, &parent_folder); + if (_ILIsDesktop(This->pidl)) + ret = SHGetDesktopFolder(&parent_folder); + else + ret = ShellItem_get_parent_shellfolder(This, &parent_folder); if (SUCCEEDED(ret)) { child_pidl = ILFindLastID(This->pidl); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c72eed2..0bf2ec7 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3670,6 +3670,49 @@ static void test_ShellItemBindToHandler(void) pILFree(pidl_desktop); } +void test_ShellItemGetAttributes(void) +{ + IShellItem *psi; + LPITEMIDLIST pidl_desktop; + SFGAOF sfgao; + HRESULT hr; + + if(!pSHCreateShellItem) + { + skip("SHCreateShellItem missing.\n"); + return; + } + + hr = pSHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = pSHCreateShellItem(NULL, NULL, pidl_desktop, &psi); + ok(hr == S_OK, "Got 0x%08x\n", hr); + pILFree(pidl_desktop); + } + if(FAILED(hr)) + { + skip("Skipping tests."); + return; + } + + if(0) + { + /* Crashes on native (Win 7) */ + hr = IShellItem_GetAttributes(psi, 0, NULL); + ok(hr == S_OK, "Got 0x%08x\n", hr); + } + + /* Test GetAttributes on the desktop folder. */ + sfgao = 0xdeadbeef; + hr = IShellItem_GetAttributes(psi, SFGAO_FOLDER, &sfgao); + ok(hr == S_OK || broken(hr == E_FAIL) /* <Vista */, "Got 0x%08x\n", hr); + ok(sfgao == SFGAO_FOLDER || broken(sfgao == 0) /* <Vista */, "Got 0x%08x\n", sfgao); + + IShellItem_Release(psi); +} + static void test_SHParseDisplayName(void) { LPITEMIDLIST pidl1, pidl2; @@ -4432,6 +4475,7 @@ START_TEST(shlfolder) test_ShellItemCompare(); test_SHChangeNotify(); test_ShellItemBindToHandler(); + test_ShellItemGetAttributes(); OleUninitialize(); }

1 0

David Hedberg : include: Add IShellItem2 interface declaration.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 7b67d4f5c66b5a435dd996bc67adf46c6bceffbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b67d4f5c66b5a435dd996bc6… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Dec 19 23:15:11 2010 +0100 include: Add IShellItem2 interface declaration. --- include/shobjidl.idl | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index fece0dd..176b63f 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -389,6 +389,75 @@ interface IShellItem : IUnknown [out] int *piOrder); } +/***************************************************************************** + * IShellItem2 interface + */ +[ + object, + uuid(7E9FB0D3-919F-4307-AB2E-9B1860310C93), + pointer_default(unique) +] +interface IShellItem2 : IShellItem +{ + HRESULT GetPropertyStore( + [in] GETPROPERTYSTOREFLAGS flags, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetPropertyStoreWithCreateObject( + [in] GETPROPERTYSTOREFLAGS flags, + [in] IUnknown *punkCreateObject, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetPropertyStoreForKeys( + [in, size_is(cKeys)] const PROPERTYKEY *rgKeys, + [in] UINT cKeys, + [in] GETPROPERTYSTOREFLAGS flags, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetPropertyDescriptionList( + [in] REFPROPERTYKEY keyType, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT Update( + [in, unique] IBindCtx *pbc); + + HRESULT GetProperty( + [in] REFPROPERTYKEY key, + [out] PROPVARIANT *ppropvar); + + HRESULT GetCLSID( + [in] REFPROPERTYKEY key, + [out] CLSID *pclsid); + + HRESULT GetFileTime ( + [in] REFPROPERTYKEY key, + [out] FILETIME *pft); + + HRESULT GetInt32( + [in] REFPROPERTYKEY key, + [out] int *pi); + + HRESULT GetString( + [in] REFPROPERTYKEY key, + [out, string] LPWSTR *ppsz); + + HRESULT GetUInt32( + [in] REFPROPERTYKEY key, + [out] ULONG *pui); + + HRESULT GetUInt64( + [in] REFPROPERTYKEY key, + [out] ULONGLONG *pull); + + HRESULT GetBool( + [in] REFPROPERTYKEY key, + [out] BOOL *pf); +} + typedef enum tagNWMF { NWMF_UNLOADING = 0x0001, NWMF_USERINITED = 0x0002,

1 0

David Hedberg : shell32: Return S_OK in ::SetPropertyBag.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: dfc2f20b892c565356529c199d78c18dcf944974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc2f20b892c565356529c199… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Dec 19 22:11:23 2010 +0100 shell32: Return S_OK in ::SetPropertyBag. --- dlls/shell32/ebrowser.c | 10 +++++++++- dlls/shell32/tests/ebrowser.c | 7 +++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index e6d1165..f781082 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -931,7 +931,15 @@ static HRESULT WINAPI IExplorerBrowser_fnSetPropertyBag(IExplorerBrowser *iface, ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; FIXME("stub, %p (%s)\n", This, debugstr_w(pszPropertyBag)); - return E_NOTIMPL; + if(!pszPropertyBag) + return E_INVALIDARG; + + /* FIXME: This method is currently useless as we don't save any + * settings anywhere, but at least one application breaks if we + * return E_NOTIMPL. + */ + + return S_OK; } static HRESULT WINAPI IExplorerBrowser_fnSetEmptyText(IExplorerBrowser *iface, diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 99368d0..15c2cb4 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -1037,6 +1037,7 @@ static void test_basics(void) HDWP hdwp; RECT rc; HRESULT hr; + static const WCHAR winetest[] = {'W','i','n','e','T','e','s','t',0}; ebrowser_instantiate(&peb); ebrowser_initialize(peb); @@ -1145,6 +1146,12 @@ static void test_basics(void) hr = IExplorerBrowser_SetFolderSettings(peb, &fs); todo_wine ok(hr == E_INVALIDARG, "got (0x%08x)\n", hr); + /* SetPropertyBag */ + hr = IExplorerBrowser_SetPropertyBag(peb, NULL); + ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); + hr = IExplorerBrowser_SetPropertyBag(peb, winetest); + ok(hr == S_OK, "Got 0x%08x\n", hr); + /* TODO: Test after browsing somewhere. */ IExplorerBrowser_Destroy(peb);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010