September 2010 - Wine-commits

Hans Leidekker : shell32: Add support for CSIDL_PROGRAM_FILESX86 and CSIDL_PROGRAM_FILES_COMMONX86.
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 02e38f3066e75a43ac0b3ff1018781ecd82197b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e38f3066e75a43ac0b3ff10… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 10 17:30:23 2010 +0200 shell32: Add support for CSIDL_PROGRAM_FILESX86 and CSIDL_PROGRAM_FILES_COMMONX86. --- dlls/shell32/shell32_En.rc | 2 ++ dlls/shell32/shellpath.c | 14 ++++++++------ dlls/shell32/shresdef.h | 2 ++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index d8cd66d..ce7d63d 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -274,8 +274,10 @@ STRINGTABLE IDS_COOKIES "Cookies" IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" + IDS_PROGRAM_FILESX86 "Program Files (x86)" IDS_MYPICTURES "My Pictures" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_PROGRAM_FILES_COMMONX86 "Program Files (x86)\\Common Files" IDS_COMMON_DOCUMENTS "Documents" IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" IDS_COMMON_MUSIC "Music" diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 6083b45..8daa875 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -767,6 +767,7 @@ static const WCHAR Common_DesktopW[] = {'C','o','m','m','o','n',' ','D','e','s', static const WCHAR Common_DocumentsW[] = {'C','o','m','m','o','n',' ','D','o','c','u','m','e','n','t','s','\0'}; static const WCHAR Common_FavoritesW[] = {'C','o','m','m','o','n',' ','F','a','v','o','r','i','t','e','s','\0'}; static const WCHAR CommonFilesDirW[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r','\0'}; +static const WCHAR CommonFilesDirX86W[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',' ','(','x','8','6',')','\0'}; static const WCHAR CommonMusicW[] = {'C','o','m','m','o','n','M','u','s','i','c','\0'}; static const WCHAR CommonPicturesW[] = {'C','o','m','m','o','n','P','i','c','t','u','r','e','s','\0'}; static const WCHAR Common_ProgramsW[] = {'C','o','m','m','o','n',' ','P','r','o','g','r','a','m','s','\0'}; @@ -787,6 +788,7 @@ static const WCHAR NetHoodW[] = {'N','e','t','H','o','o','d','\0'}; static const WCHAR PersonalW[] = {'P','e','r','s','o','n','a','l','\0'}; static const WCHAR PrintHoodW[] = {'P','r','i','n','t','H','o','o','d','\0'}; static const WCHAR ProgramFilesDirW[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r','\0'}; +static const WCHAR ProgramFilesDirX86W[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',' ','(','x','8','6',')','\0'}; static const WCHAR ProgramsW[] = {'P','r','o','g','r','a','m','s','\0'}; static const WCHAR RecentW[] = {'R','e','c','e','n','t','\0'}; static const WCHAR ResourcesW[] = {'R','e','s','o','u','r','c','e','s','\0'}; @@ -1037,9 +1039,9 @@ static const CSIDL_DATA CSIDL_Data[] = NULL }, { /* 0x2a - CSIDL_PROGRAM_FILESX86 */ - CSIDL_Type_NonExistent, - NULL, - NULL + CSIDL_Type_CurrVer, + ProgramFilesDirX86W, + MAKEINTRESOURCEW(IDS_PROGRAM_FILESX86) }, { /* 0x2b - CSIDL_PROGRAM_FILES_COMMON */ CSIDL_Type_CurrVer, @@ -1047,9 +1049,9 @@ static const CSIDL_DATA CSIDL_Data[] = MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMON) }, { /* 0x2c - CSIDL_PROGRAM_FILES_COMMONX86 */ - CSIDL_Type_NonExistent, - NULL, - NULL + CSIDL_Type_CurrVer, + CommonFilesDirX86W, + MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMONX86) }, { /* 0x2d - CSIDL_COMMON_TEMPLATES */ CSIDL_Type_AllUsers, diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index b8a456b..9261fe3 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -90,6 +90,8 @@ #define IDS_COMMON_PICTURES 69 #define IDS_COMMON_VIDEO 70 #define IDS_CDBURN_AREA 71 +#define IDS_PROGRAM_FILESX86 72 +#define IDS_PROGRAM_FILES_COMMONX86 73 #define IDS_CREATEFOLDER_DENIED 128 #define IDS_CREATEFOLDER_CAPTION 129

1 0

Hans Leidekker : wine.inf: Create 32-bit program files and common files directories in 64-bit prefixes .
by Alexandre Julliard 13 Sep '10

13 Sep '10

Module: wine Branch: master Commit: 6fd6175df70b9a787ccb8aea174ecccbd7d65ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd6175df70b9a787ccb8aea1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 10 17:30:43 2010 +0200 wine.inf: Create 32-bit program files and common files directories in 64-bit prefixes. --- tools/wine.inf.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 0623047..429934e 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -89,6 +89,7 @@ AddReg=\ ContentIndex,\ ControlClass,\ CurrentVersion,\ + CurrentVersionWow64,\ Debugger,\ Desktop,\ Dotnet,\ @@ -474,6 +475,10 @@ HKLM,%CurrentVersionNT%\Ports,,16 HKLM,%CurrentVersionNT%\Print,,16 HKLM,%CurrentVersionNT%\ProfileList,,16 +[CurrentVersionWow64] +HKLM,%CurrentVersion%,"ProgramFilesDir (x86)",,"%16426%" +HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%" + [Debugger] HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" HKLM,%CurrentVersionNT%\AeDebug,"Auto",2,"1"

1 0

Luca Bennati : winecfg: Update Italian translation.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: d0e33d4ca30d11fffbca9032698b4363f079a871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e33d4ca30d11fffbca90326… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 9 16:04:25 2010 +0200 winecfg: Update Italian translation. --- programs/winecfg/It.rc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 35e8308..78f60d4 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -59,7 +59,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Impostazioni delle applicazioni",IDC_STATIC, 8,4,244,210 - LTEXT "Wine può simulare diverse versioni e stili di Windows per ogni applicazione", + LTEXT "Wine può simulare diverse versioni e stili di Windows per ogni applicazione. Questo tab è collegato ai tab Librerie e Grafica per permetterti di cambiare le impostazioni a livello di sistema o per applicazione pure in quelle tab.", IDC_STATIC,15,20,227,30 CONTROL "Applicazioni",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,50,230,120 @@ -100,13 +100,13 @@ IDD_DLLCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " DLL Overrides ",IDC_STATIC,8,4,244,210 + GROUPBOX " Sostituzioni di DLL ",IDC_STATIC,8,4,244,210 LTEXT "Le Dynamic Link Libraries possono essere specificate individualmente per essere builtin (fornite da Wine) o native (prese da Windows o fornite dall'applicazione)." ,IDC_STATIC,16,16,220,32 - LTEXT "&Nuovo override per la libreria:",IDC_STATIC,16,48,100,8 + LTEXT "&Nuova sostituzione per la libreria:",IDC_STATIC,16,48,100,8 COMBOBOX IDC_DLLCOMBO,16,58,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE PUSHBUTTON "&Aggiungi",IDC_DLLS_ADDDLL, 164,58,82,13 - LTEXT "&Override esistenti:",IDC_STATIC,16,76,100,8 + LTEXT "&Sostituzioni esistenti:",IDC_STATIC,16,76,100,8 LISTBOX IDC_DLLS_LIST,16,86,140,122,WS_BORDER | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Modifica...",IDC_DLLS_EDITDLL,164,86,82,14 PUSHBUTTON "&Rimuovi",IDC_DLLS_REMOVEDLL,164,104,82,14 @@ -114,14 +114,14 @@ END IDD_LOADORDER DIALOG 80, 90, 110, 92 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Modifica Override" +CAPTION "Modifica sostituzione" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Carica l'ordine ",IDC_STATIC,8,4,94,66 CONTROL "&Builtin (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,16,14,75,10 - CONTROL "&Native (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,16,24,75,10 - CONTROL "B&uiltin poi Native",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,75,10 - CONTROL "N&ative poi Builtin",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,75,10 + CONTROL "&Nativa (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,16,24,75,10 + CONTROL "B&uiltin poi Nativa",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,75,10 + CONTROL "N&ativa poi Builtin",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,75,10 CONTROL "&Disabilita",IDC_RAD_DISABLE,"Button", BS_AUTORADIOBUTTON,16,54,75,10 DEFPUSHBUTTON "OK",IDOK,8,74,45,14,WS_GROUP PUSHBUTTON "Annulla",IDCANCEL,57,74,45,14,WS_GROUP @@ -158,7 +158,7 @@ BEGIN COMBOBOX IDC_COMBO_TYPE,51,136,97,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Mostra controlli &avanzati",IDC_BUTTON_SHOW_HIDE_ADVANCED,154,135,92,13 - LTEXT "De&vice:",IDC_STATIC_DEVICE,15,153,26,9 + LTEXT "&Unità:",IDC_STATIC_DEVICE,15,153,26,9 EDITTEXT IDC_EDIT_DEVICE,51,150,150,13,ES_AUTOHSCROLL | WS_TABSTOP PUSHBUTTON "Na&viga...",IDC_BUTTON_BROWSE_DEVICE,206,150,40,13

1 0

Luca Bennati : wldap32: Update Italian translation.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 1f30199d29e15268e0021c2fcffe2b39ed8f9e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f30199d29e15268e0021c2fc… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 9 15:46:24 2010 +0200 wldap32: Update Italian translation. --- dlls/wldap32/wldap32_It.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wldap32/wldap32_It.rc b/dlls/wldap32/wldap32_It.rc index c88c0f4..59c3d13 100644 --- a/dlls/wldap32/wldap32_It.rc +++ b/dlls/wldap32/wldap32_It.rc @@ -36,8 +36,8 @@ STRINGTABLE 6 "Compara vero" 7 "Metodo di autenticazione non supportato" 8 "Autenticazione forte richiesta" - 9 "Referral (v2)" - 10 "Referral" + 9 "Rinvio (v2)" + 10 "Rinvio" 11 "Superato il limite di amministrazione" 12 "Estensione critica non disponibile" 13 "Richiesta confidenzialità" @@ -112,7 +112,7 @@ STRINGTABLE 82 "Errore locale" 83 "Errore di codifica" 84 "Errore di decodifica" - 85 "Timeout" + 85 "Tempo scaduto" 86 "Autenticazione sconosciuta" 87 "Errore del filtro" 88 "Utente eliminato" @@ -121,8 +121,8 @@ STRINGTABLE 91 "Impossibile connettersi al server LDAP" 92 "Operazione non supportata da questa versione del protocollo LDAP" 93 "Il controllo specificato non è stato trovato nel messaggio" - 94 "Nessun rislutato presente nel messaggio" + 94 "Nessun risultato presente nel messaggio" 95 "Più risultati ricevuti" - 96 "Loop nel gestire i referral" - 97 "Ecceduto il limite di salti di referral" + 96 "Loop nel gestire i rinvii" + 97 "Ecceduto il limite di salti di rinvio" }

1 0

Luca Bennati : cmd: Update Italian translation.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 242599957358a3802a22dacd7f3919bc0bf858ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=242599957358a3802a22dacd7… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 9 15:51:31 2010 +0200 cmd: Update Italian translation. --- programs/cmd/It.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/cmd/It.rc b/programs/cmd/It.rc index 2a9fcad..7648f24 100644 --- a/programs/cmd/It.rc +++ b/programs/cmd/It.rc @@ -31,9 +31,9 @@ STRINGTABLE { WCMD_ATTRIB, "Aiuto su ATTRIB\n" WCMD_CALL, -"CALL <batchfilename> si usa all'interno di un file batch per eseguire comandi\n\ -da un altro file batch. Quando il file batch esiste, il controllo torna al\n\ -file che l'ha chiamato. Il comando CALL può passare parametri alla\n\ +"CALL <nomedelfilebatch> si usa all'interno di un file batch per eseguire\n\ +comandi da un altro file batch. Quando il file batch esiste, il controllo\n\ +torna al file che l'ha chiamato. Il comando CALL può passare parametri alla\n\ procedura chiamata.\n\ \n\ Cambiamenti alla cartella predefinita, alle variabili d'ambiente etc fatti dentro una\n\ @@ -189,9 +189,9 @@ se chiamato dalla linea di comando.\n" se rediretto). Nessun controllo è fatto se il file sia testo leggibile.\n" WCMD_VERIFY, -"VERIFY è usato per settare, pulire o verificare la flag di verify. Forme valide sono:\n\ +"VERIFY è usato per impostare, pulire o verificare la flag di verify. Forme valide sono:\n\ \n\ -VERIFY ON Setta la flag\n\ +VERIFY ON Imposta la flag\n\ VERIFY OFF Pulisce la flag\n\ VERIFY Mostra ON o OFF a seconda dei casi.\n\ \n\ @@ -248,7 +248,7 @@ Inserisci HELP <comando> per maggiori informazioni su ciascuno dei comandi sopra WCMD_YES, "S" WCMD_NO, "N" WCMD_NOASSOC, "Associazione di file mancante per l'estensione %s\n" - WCMD_NOFTYPE, "Nessun comando open associato con il tipo di file '%s'\n" + WCMD_NOFTYPE, "Nessun comando di apertura associato con il tipo di file '%s'\n" WCMD_OVERWRITE, "Sovrascrivere %s" WCMD_MORESTR, "Di più..." WCMD_TRUNCATEDLINE, "Linea nell'elaborazione Batch probabilmente troncata. Uso:\n" @@ -265,7 +265,7 @@ Inserisci HELP <comando> per maggiori informazioni su ciascuno dei comandi sopra WCMD_MISSINGENV, "Variabile d'ambiente %s non definita\n" WCMD_READFAIL, "Impossibile aprire '%s'\n" WCMD_CALLINSCRIPT, "Impossibile chiamare un'etichetta batch fuori da uno script batch\n" - WCMD_ALL, "A" + WCMD_ALL, "T" WCMD_DELPROMPT, "%s, Cancella" WCMD_ECHOPROMPT, "Echo è %s\n" WCMD_VERIFYPROMPT, "Verify è %s\n"

1 0

Luca Bennati : devenum: Update Italian translation.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: e9f35788547e8ff14ac04e1d51332cf7c22e698f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f35788547e8ff14ac04e1d5… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 9 15:29:16 2010 +0200 devenum: Update Italian translation. --- dlls/devenum/It.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/devenum/It.rc b/dlls/devenum/It.rc index efcf99b..b3ef360 100644 --- a/dlls/devenum/It.rc +++ b/dlls/devenum/It.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE { - IDS_DEVENUM_DSDEFAULT "DirectSound di Default" - IDS_DEVENUM_DS "DirectSound: %s" - IDS_DEVENUM_WODEFAULT "Dispositivo WaveOut di Default" - IDS_DEVENUM_MIDEFAULT "Dispositivo MidiOut di Default" + IDS_DEVENUM_DSDEFAULT "DirectSound predefinito" + IDS_DEVENUM_DS "DirectSound : %s" + IDS_DEVENUM_WODEFAULT "Dispositivo WaveOut predefinito" + IDS_DEVENUM_MIDEFAULT "Dispositivo MidiOut predefinito" }

1 0

Aric Stewart : usp10: Implement handling fMergeNeutralItems.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: facc7b03065fca13f226fc667ca025ace54e875e URL: http://source.winehq.org/git/wine.git/?a=commit;h=facc7b03065fca13f226fc667… Author: Aric Stewart <aricstewart(a)gmail.com> Date: Thu Sep 9 11:47:04 2010 -0500 usp10: Implement handling fMergeNeutralItems. --- dlls/usp10/bidi.c | 35 +++++++++++++++ dlls/usp10/tests/usp10.c | 97 ++++++++++++++++++++++++++++--------------- dlls/usp10/usp10.c | 31 +++++++++++--- dlls/usp10/usp10_internal.h | 3 +- 4 files changed, 125 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=facc7b03065fca13f226f…

1 0

Aurimas Fišeras : ipconfig: Update Lithuanian translation.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 2c4b08176bf43c1a7a3dd922432e6efae33168cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c4b08176bf43c1a7a3dd9224… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Sep 9 20:19:10 2010 +0300 ipconfig: Update Lithuanian translation. --- programs/ipconfig/Lt.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Lt.rc b/programs/ipconfig/Lt.rc index eeaac6b..3afefa1 100644 --- a/programs/ipconfig/Lt.rc +++ b/programs/ipconfig/Lt.rc @@ -45,4 +45,6 @@ STRINGTABLE STRING_DESCRIPTION, "Aprašas" STRING_PHYS_ADDR, "Fizinis adresas" STRING_DHCP_ENABLED, "DHCP įjungta" + STRING_YES, "Taip" + STRING_NO, "Ne" }

1 0

Mariusz Pluciński : gameux: Add storing Description registry value.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 9b7347b619c85c5028f193352f7bb6f2625c385e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7347b619c85c5028f193352… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Sep 7 16:08:06 2010 +0200 gameux: Add storing Description registry value. --- dlls/gameux/gameexplorer.c | 14 ++++++++++++++ dlls/gameux/gameux_private.h | 1 + dlls/gameux/tests/gameexplorer.c | 2 +- 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index f792333..deb6475 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -52,6 +52,7 @@ void GAMEUX_initGameData(struct GAMEUX_GAME_DATA *GameData) GameData->sGDFBinaryPath = NULL; GameData->sGameInstallDirectory = NULL; GameData->bstrName = NULL; + GameData->bstrDescription = NULL; } /******************************************************************************* * GAMEUX_uninitGameData @@ -63,6 +64,7 @@ void GAMEUX_uninitGameData(struct GAMEUX_GAME_DATA *GameData) HeapFree(GetProcessHeap(), 0, GameData->sGDFBinaryPath); HeapFree(GetProcessHeap(), 0, GameData->sGameInstallDirectory); SysFreeString(GameData->bstrName); + SysFreeString(GameData->bstrDescription); } /******************************************************************************* * GAMEUX_buildGameRegistryPath @@ -211,6 +213,8 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) {'C','o','n','f','i','g','G','D','F','B','i','n','a','r','y','P','a','t','h',0}; static const WCHAR sTitle[] = {'T','i','t','l','e',0}; + static const WCHAR sDescription[] = + {'D','e','s','c','r','i','p','t','i','o','n',0}; HRESULT hr, hr2; LPWSTR lpRegistryKey; @@ -251,6 +255,11 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData) REG_SZ, (LPBYTE)(GameData->bstrName), (lstrlenW(GameData->bstrName)+1)*sizeof(WCHAR))); + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, sDescription, 0, + REG_SZ, (LPBYTE)(GameData->bstrDescription ? GameData->bstrDescription : GameData->bstrName), + (lstrlenW(GameData->bstrDescription ? GameData->bstrDescription : GameData->bstrName)+1)*sizeof(WCHAR))); + RegCloseKey(hKey); if(FAILED(hr)) @@ -283,6 +292,8 @@ static HRESULT GAMEUX_ProcessGameDefinitionElement( { static const WCHAR sName[] = {'N','a','m','e',0}; + static const WCHAR sDescription[] = + {'D','e','s','c','r','i','p','t','i','o','n',0}; HRESULT hr; BSTR bstrElementName; @@ -296,6 +307,9 @@ static HRESULT GAMEUX_ProcessGameDefinitionElement( if(lstrcmpW(bstrElementName, sName) == 0) hr = IXMLDOMElement_get_text(element, &GameData->bstrName); + else if(lstrcmpW(bstrElementName, sDescription) == 0) + hr = IXMLDOMElement_get_text(element, &GameData->bstrDescription); + else FIXME("entry %s in Game Definition File not yet supported\n", debugstr_w(bstrElementName)); diff --git a/dlls/gameux/gameux_private.h b/dlls/gameux/gameux_private.h index 5b6e80d..97826f0 100644 --- a/dlls/gameux/gameux_private.h +++ b/dlls/gameux/gameux_private.h @@ -43,6 +43,7 @@ struct GAMEUX_GAME_DATA GUID guidInstanceId; /* game installation instance identifier */ GUID guidApplicationId; /* game's application identifier */ BSTR bstrName; /* game's title */ + BSTR bstrDescription; /* game's description */ }; /******************************************************************************* * GAMEUX_initGameData diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index a538d35..d01783d 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -305,7 +305,7 @@ static void _validateGameRegistryValues(int line, /* this value exists up from Win7 */ hr = _validateRegistryValue(hKey, keyPath, sDescription, RRF_RT_REG_SZ, sGameDescription); - todo_wine ok_(__FILE__, line)(hr==S_OK || broken(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), "failed while checking registry value (error 0x%x)\n", hr); + ok_(__FILE__, line)(hr==S_OK || broken(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), "failed while checking registry value (error 0x%x)\n", hr); } /******************************************************************************* * _validateGameKey

1 0

Mariusz Pluciński : gameux: IGameExplorer:: RemoveGame implementation.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: bb9a6ea2b05e79319ae4ed563f9147c7a27bbc22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9a6ea2b05e79319ae4ed563… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Sep 7 16:08:39 2010 +0200 gameux: IGameExplorer::RemoveGame implementation. --- dlls/gameux/gameexplorer.c | 33 +++++++++++++++++++++++++++++++-- dlls/gameux/tests/gameexplorer.c | 8 ++++---- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index deb6475..aabadcd 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -480,6 +480,36 @@ static HRESULT GAMEUX_ParseGDFBinary(struct GAMEUX_GAME_DATA *GameData) return hr; } +/******************************************************************* + * GAMEUX_RemoveRegistryRecord + * + * Helper function, removes registry key associated with given game instance + */ +static HRESULT GAMEUX_RemoveRegistryRecord(GUID* pInstanceID) +{ + HRESULT hr; + LPWSTR lpRegistryPath = NULL; + TRACE("(%s)\n", debugstr_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)); + + HeapFree(GetProcessHeap(), 0, lpRegistryPath); + + /* if not, check current user */ + if(FAILED(hr)) + { + hr = GAMEUX_buildGameRegistryPath(GIS_CURRENT_USER, pInstanceID, &lpRegistryPath); + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegDeleteKeyExW(HKEY_LOCAL_MACHINE, lpRegistryPath, 0, 0)); + + HeapFree(GetProcessHeap(), 0, lpRegistryPath); + } + + return hr; +} /******************************************************************************* * GAMEUX_RegisterGame * @@ -628,8 +658,7 @@ static HRESULT WINAPI GameExplorerImpl_RemoveGame( GameExplorerImpl *This = impl_from_IGameExplorer(iface); TRACE("(%p, %s)\n", This, debugstr_guid(&instanceID)); - FIXME("stub\n"); - return E_NOTIMPL; + return GAMEUX_RemoveRegistryRecord(&instanceID); } static HRESULT WINAPI GameExplorerImpl_UpdateGame( diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index d01783d..3e86239 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -446,10 +446,10 @@ static void test_add_remove_game(void) _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, TRUE); hr = IGameExplorer_RemoveGame(ge, guid); - todo_wine ok(SUCCEEDED(hr), "IGameExplorer::RemoveGame failed (error 0x%08x)\n", hr); + ok(SUCCEEDED(hr), "IGameExplorer::RemoveGame failed (error 0x%08x)\n", hr); } - todo_wine _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, FALSE); + _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, FALSE); /* try to register game with empty guid */ @@ -464,10 +464,10 @@ static void test_add_remove_game(void) _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, TRUE); hr = IGameExplorer_RemoveGame(ge, guid); - todo_wine ok(SUCCEEDED(hr), "IGameExplorer::RemoveGame failed (error 0x%08x)\n", hr); + ok(SUCCEEDED(hr), "IGameExplorer::RemoveGame failed (error 0x%08x)\n", hr); } - todo_wine _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, FALSE); + _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, &applicationId, sExePath, sExeName, FALSE); } /* free allocated resources */

1 0