September 2010 - Wine-commits

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

21 Sep '10

Module: wine Branch: master Commit: 003cf5c4341829b815fd94b84a1ee6885ac604df URL: http://source.winehq.org/git/wine.git/?a=commit;h=003cf5c4341829b815fd94b84… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 20 23:50:56 2010 +0200 winecfg: Update Italian translation. --- programs/winecfg/It.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 34f71e9..f4d8b87 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. 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.", + LTEXT "Wine può simulare diverse versioni e stili di Windows per ogni applicazione. Questa scheda è collegato a quelle Librerie e Grafica per permetterti di cambiare le impostazioni a livello di sistema o per applicazione pure in quelle schede.", IDC_STATIC,15,15,235,33 CONTROL "Applicazioni",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,50,230,120 @@ -224,7 +224,7 @@ BEGIN IDS_CHOOSE_PATH "Seleziona la cartella Unix desiderata, prego." IDS_HIDE_ADVANCED "Nascondi controlli &avanzati" IDS_SHOW_ADVANCED "Mostra controlli &avanzati" - IDS_NOTHEME "(Nessun Tema)" + IDS_NOTHEME "(Nessun tema)" IDS_TAB_GRAPHICS "Grafica" IDS_TAB_DESKTOP_INTEGRATION "Integrazione del desktop" IDS_TAB_AUDIO "Audio" @@ -306,7 +306,7 @@ BEGIN IDC_SYSPARAMS_DESKTOP "Scrivania" IDC_SYSPARAMS_MENU "Menu - Sfondo" IDC_SYSPARAMS_MENU_TEXT "Menu - Testo" - IDC_SYSPARAMS_SCROLLBAR "Barra Di Scorrimento" + IDC_SYSPARAMS_SCROLLBAR "Barra di scorrimento" IDC_SYSPARAMS_SELECTION "Selezione - Sfondo" IDC_SYSPARAMS_SELECTION_TEXT "Selezione - Testo" IDC_SYSPARAMS_TOOLTIP "ToolTip - Sfondo" @@ -317,7 +317,7 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Titolo attivo - Testo" IDC_SYSPARAMS_INACTIVE_TITLE "Titolo inattivo - Barra" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Titolo inattivo - Testo" - IDC_SYSPARAMS_MSGBOX_TEXT "Testo della Casella Di Messaggio" + IDC_SYSPARAMS_MSGBOX_TEXT "Testo della casella di Messaggio" IDC_SYSPARAMS_APPWORKSPACE "Spazio di lavoro dell'applicazione" IDC_SYSPARAMS_WINDOW_FRAME "Frame della finestra" IDC_SYSPARAMS_ACTIVE_BORDER "Bordo attivo"

1 0

Luca Bennati : comdlg32: Update Italian translation.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 91b0518b7ababbf83d44fd93190c1bea52a4cc30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b0518b7ababbf83d44fd931… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 20 22:33:25 2010 +0200 comdlg32: Update Italian translation. --- dlls/comdlg32/cdlg_It.rc | 52 +++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/comdlg32/cdlg_It.rc b/dlls/comdlg32/cdlg_It.rc index e8bb6d4..be10927 100644 --- a/dlls/comdlg32/cdlg_It.rc +++ b/dlls/comdlg32/cdlg_It.rc @@ -91,9 +91,9 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Configura", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "&Da:", 1090, 60, 80, 30, 9 LTEXT "&A:", 1091, 120, 80, 30, 9 - LTEXT "&Qualità di Stampa:", 1092, 6, 100, 76, 9 + LTEXT "&Qualità di stampa:", 1092, 6, 100, 76, 9 COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "Stampa su Fi&le", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Stampa su fi&le", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Condensato", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -104,9 +104,9 @@ CAPTION "Configurazione Stampante" FONT 8, "MS Shell Dlg" { GROUPBOX "Stampante", 1072, 6, 10, 180, 72, BS_GROUPBOX - RADIOBUTTON "Stampante &Preferita", 1056, 16, 20, 78, 12 - LTEXT "[none]", 1088, 35, 35, 120, 9 - RADIOBUTTON "Stampante &Specifica", 1057, 16, 50, 78, 12 + RADIOBUTTON "Stampante &preferita", 1056, 16, 20, 78, 12 + LTEXT "[nessuna]", 1088, 35, 35, 120, 9 + RADIOBUTTON "Stampante &specifica", 1057, 16, 50, 78, 12 COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annulla", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP @@ -244,13 +244,13 @@ FONT 8, "MS Shell Dlg" LTEXT "&Nome:", stc6, 16, 20, 36,8 COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stato:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Stato fittizio", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Tipo:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Tipo fittizio", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Su:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Locazione fittizia", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Commento:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Commento fittizio", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Copie", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Numero di &copie:",stc5,168,108,140,8 @@ -283,13 +283,13 @@ BEGIN LTEXT "&Nome:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP LTEXT "Stato:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Stato fittizio", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Tipo:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Tipo fittizio", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Su:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Locazione fittizia", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "Commento:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "Dummy Remark", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Commento fittizio", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "Carta", grp2, 8, 92, 164,56, WS_GROUP LTEXT "Di&mensione:", stc2, 13,108, 38, 8 @@ -359,26 +359,26 @@ FONT 8, "MS Shell Dlg" STRINGTABLE { - IDS_ABOUTBOX "&Informazioni sul Test FolderPicker" - IDS_DOCUMENTFOLDERS "Cartelle Documenti" + IDS_ABOUTBOX "&Informazioni sul test FolderPicker" + IDS_DOCUMENTFOLDERS "Cartelle dei documenti" IDS_PERSONAL "Documenti" IDS_FAVORITES "Preferiti" - IDS_PATH "Percorso di Sistema" + IDS_PATH "Percorso di sistema" IDS_DESKTOP "Desktop" IDS_FONTS "Carattere" - IDS_MYCOMPUTER "Risorse del Computer" + IDS_MYCOMPUTER "Risorse del computer" } STRINGTABLE { - IDS_SYSTEMFOLDERS "Cartelle di Sistema" - IDS_LOCALHARDRIVES "Dischi Rigidi Locali" + IDS_SYSTEMFOLDERS "Cartelle di sistema" + IDS_LOCALHARDRIVES "Dischi rigidi locali" IDS_FILENOTFOUND "File non trovato" IDS_VERIFYFILE "Controllare che il nome del file fornito sia corretto" IDS_CREATEFILE "Il file non esiste\nCreare il file" IDS_OVERWRITEFILE "Il file esiste già.\nSovrascriverlo?" IDS_INVALID_FILENAME_TITLE "Caratteri invalidi nel percorso" - IDS_INVALID_FILENAME "Il nome di un file non può contenere i seguenrti caratteri:\n / : < > |" + IDS_INVALID_FILENAME "Il nome di un file non può contenere i seguenti caratteri:\n / : < > |" IDS_PATHNOTEXISTING "Il percorso specificato non esiste" IDS_FILENOTEXISTING "Il file non esiste" } @@ -386,10 +386,10 @@ STRINGTABLE STRINGTABLE { IDS_UPFOLDER "Su di un livello" - IDS_NEWFOLDER "Crea nuova directory" + IDS_NEWFOLDER "Crea nuova cartella" IDS_LISTVIEW "Lista" IDS_REPORTVIEW "Dettagli" - IDS_TODESKTOP "Vai al Desktop" + IDS_TODESKTOP "Vai al desktop" } STRINGTABLE @@ -441,7 +441,7 @@ STRINGTABLE PD32_PRINTER_STATUS_OUT_OF_MEMORY "Memoria esaurita; " PD32_PRINTER_STATUS_DOOR_OPEN "La porta stampante è aperta; " PD32_PRINTER_STATUS_SERVER_UNKNOWN "Server di stampa sconosciuto; " - PD32_PRINTER_STATUS_POWER_SAVE "Modalitè risparmio energetico; " + PD32_PRINTER_STATUS_POWER_SAVE "Modalità risparmio energetico; " } STRINGTABLE /* Font styles */ @@ -449,7 +449,7 @@ STRINGTABLE /* Font styles */ IDS_FONT_REGULAR "Regolare" IDS_FONT_BOLD "Grassetto" IDS_FONT_ITALIC "Corsivo" - IDS_FONT_BOLD_ITALIC "Grassetto Corsivo" + IDS_FONT_BOLD_ITALIC "Grassetto corsivo" } STRINGTABLE /* Color names */ @@ -468,13 +468,13 @@ STRINGTABLE /* Color names */ IDS_COLOR_YELLOW "Giallo" IDS_COLOR_BLUE "Blu" IDS_COLOR_FUCHSIA "Fucsia" - IDS_COLOR_AQUA "Aqua" + IDS_COLOR_AQUA "Acqua" IDS_COLOR_WHITE "Bianco" } STRINGTABLE { -IDS_FONT_SIZE "Scegli la dimesione del carattere tra %d e %d punti." +IDS_FONT_SIZE "Scegli la dimensione del carattere tra %d e %d punti." IDS_SAVE_BUTTON "Salva" IDS_SAVE_IN "Salva &in:" IDS_SAVE "Salva"

1 0

Luca Bennati : iccvid: Update Italian translation.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 1d0658ee6ec22b27574dfa147a940e446fb080e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0658ee6ec22b27574dfa147… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 20 22:54:56 2010 +0200 iccvid: Update Italian translation. --- dlls/iccvid/iccvid_It.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iccvid/iccvid_It.rc b/dlls/iccvid/iccvid_It.rc index acc06e5..2e6af32 100644 --- a/dlls/iccvid/iccvid_It.rc +++ b/dlls/iccvid/iccvid_It.rc @@ -25,6 +25,6 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE { - IDS_NAME "Cinepak Video codec" - IDS_DESCRIPTION "Cinepak Video codec" + IDS_NAME "Codec video Cinepak" + IDS_DESCRIPTION "Codec video Cinepak" }

1 0

Alexandre Julliard : configure: Make sure the rules files are rebuilt when doing make depend.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 4e9e38ee4f9e4b8fb3d35743d941c2ecf56789fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9e38ee4f9e4b8fb3d35743d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 20 20:23:25 2010 +0200 configure: Make sure the rules files are rebuilt when doing make depend. --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index b48296f..af6b03c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -175,7 +175,7 @@ $[1]/Makefile: $[1]/Makefile.in Make.vars.in config.status $[2] @./config.status --file $[1]/Makefile:Make.vars.in:$[1]/Makefile.in && cd $[1] && \$(MAKE) depend depend: $[1]/__depend__ .PHONY: $[1]/__depend__ -$[1]/__depend__: \$(MAKEDEP) dummy +$[1]/__depend__: $[2] dummy @./config.status --file $[1]/Makefile:Make.vars.in:$[1]/Makefile.in && cd $[1] && \$(MAKE) depend" } diff --git a/configure b/configure index dcca4e6..58093b5 100755 --- a/configure +++ b/configure @@ -14131,7 +14131,7 @@ $1/Makefile: $1/Makefile.in Make.vars.in config.status $2 @./config.status --file $1/Makefile:Make.vars.in:$1/Makefile.in && cd $1 && \$(MAKE) depend depend: $1/__depend__ .PHONY: $1/__depend__ -$1/__depend__: \$(MAKEDEP) dummy +$1/__depend__: $2 dummy @./config.status --file $1/Makefile:Make.vars.in:$1/Makefile.in && cd $1 && \$(MAKE) depend" }

1 0

Alexandre Julliard : shell32: Map the x86 version of the folder to the appropriate path depending on Wow64 mode .
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: c15b376a159e174f4fe5a0069a40a2f6ca91ff79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15b376a159e174f4fe5a0069… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 21 13:36:17 2010 +0200 shell32: Map the x86 version of the folder to the appropriate path depending on Wow64 mode. --- dlls/shell32/shellpath.c | 39 ++++++++++++++++- dlls/shell32/tests/shlfolder.c | 91 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e0228ee..54d7efa 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -54,6 +54,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +static const BOOL is_win64 = sizeof(void *) > sizeof(int); + /* ########## Combining and Constructing paths ########## */ @@ -1634,6 +1636,25 @@ static HRESULT _SHGetDefaultValue(BYTE folder, LPWSTR pszPath) if (!pszPath) return E_INVALIDARG; + if (!is_win64) + { + BOOL is_wow64; + + switch (folder) + { + case CSIDL_PROGRAM_FILES: + case CSIDL_PROGRAM_FILESX86: + IsWow64Process( GetCurrentProcess(), &is_wow64 ); + folder = is_wow64 ? CSIDL_PROGRAM_FILESX86 : CSIDL_PROGRAM_FILES; + break; + case CSIDL_PROGRAM_FILES_COMMON: + case CSIDL_PROGRAM_FILES_COMMONX86: + IsWow64Process( GetCurrentProcess(), &is_wow64 ); + folder = is_wow64 ? CSIDL_PROGRAM_FILES_COMMONX86 : CSIDL_PROGRAM_FILES_COMMON; + break; + } + } + if (CSIDL_Data[folder].szDefaultPath && IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath)) { @@ -1719,8 +1740,22 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder, { hr = _SHGetDefaultValue(folder, pszPath); dwType = REG_EXPAND_SZ; - RegSetValueExW(hKey, CSIDL_Data[folder].szValueName, 0, dwType, - (LPBYTE)pszPath, (strlenW(pszPath)+1)*sizeof(WCHAR)); + switch (folder) + { + case CSIDL_PROGRAM_FILESX86: + case CSIDL_PROGRAM_FILES_COMMONX86: + /* these two should never be set on 32-bit setups */ + if (!is_win64) + { + BOOL is_wow64; + IsWow64Process( GetCurrentProcess(), &is_wow64 ); + if (!is_wow64) break; + } + /* fall through */ + default: + RegSetValueExW(hKey, CSIDL_Data[folder].szValueName, 0, dwType, + (LPBYTE)pszPath, (strlenW(pszPath)+1)*sizeof(WCHAR)); + } } else { diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index e766adf..639b092 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -68,6 +68,7 @@ static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetItemFromDataObject)(IDataObject*,DATAOBJ_GET_ITEM_FLAGS,REFIID,void**); static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); +static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static int strcmp_wa(LPCWSTR strw, const char *stra) { @@ -143,6 +144,8 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shlwapi.dll"); pStrRetToBufW = (void*)GetProcAddress(hmod, "StrRetToBufW"); + pIsWow64Process = (void*)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); + hr = SHGetMalloc(&ppM); ok(hr == S_OK, "SHGetMalloc failed %08x\n", hr); } @@ -1658,6 +1661,93 @@ static void test_ITEMIDLIST_format(void) { IShellFolder_Release(psfPersonal); } +static void test_SHGetFolderPathA(void) +{ + static const BOOL is_win64 = sizeof(void *) > sizeof(int); + BOOL is_wow64; + char path[MAX_PATH]; + char path_x86[MAX_PATH]; + char path_key[MAX_PATH]; + HRESULT hr; + HKEY key; + + if (!pSHGetFolderPathA) + { + win_skip("SHGetFolderPathA not present\n"); + return; + } + if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + + hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES, 0, SHGFP_TYPE_CURRENT, path ); + ok( !hr, "SHGetFolderPathA failed %x\n", hr ); + hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILESX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); + if (hr == E_FAIL) + { + win_skip( "Program Files (x86) not supported\n" ); + return; + } + ok( !hr, "SHGetFolderPathA failed %x\n", hr ); + if (is_win64) + { + ok( lstrcmpiA( path, path_x86 ), "paths are identical '%s'\n", path ); + ok( strstr( path, "x86" ) == NULL, "64-bit path '%s' contains x86\n", path ); + ok( strstr( path_x86, "x86" ) != NULL, "32-bit path '%s' doesn't contain x86\n", path_x86 ); + } + else + { + ok( !lstrcmpiA( path, path_x86 ), "paths differ '%s' != '%s'\n", path, path_x86 ); + if (is_wow64) + ok( strstr( path, "x86" ) != NULL, "32-bit path '%s' doesn't contain x86\n", path ); + else + ok( strstr( path, "x86" ) == NULL, "32-bit path '%s' contains x86\n", path ); + } + if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &key )) + { + DWORD type, count = sizeof(path_x86); + if (!RegQueryValueExA( key, "ProgramFilesDir (x86)", NULL, &type, (BYTE *)path_key, &count )) + { + ok( is_win64 || is_wow64, "ProgramFilesDir (x86) exists on 32-bit setup\n" ); + ok( !lstrcmpiA( path_key, path_x86 ), "paths differ '%s' != '%s'\n", path_key, path_x86 ); + } + else ok( !is_win64 && !is_wow64, "ProgramFilesDir (x86) should exist on 64-bit setup\n" ); + RegCloseKey( key ); + } + + hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMON, 0, SHGFP_TYPE_CURRENT, path ); + ok( !hr, "SHGetFolderPathA failed %x\n", hr ); + hr = pSHGetFolderPathA( 0, CSIDL_PROGRAM_FILES_COMMONX86, 0, SHGFP_TYPE_CURRENT, path_x86 ); + if (hr == E_FAIL) + { + win_skip( "Common Files (x86) not supported\n" ); + return; + } + ok( !hr, "SHGetFolderPathA failed %x\n", hr ); + if (is_win64) + { + ok( lstrcmpiA( path, path_x86 ), "paths are identical '%s'\n", path ); + ok( strstr( path, "x86" ) == NULL, "64-bit path '%s' contains x86\n", path ); + ok( strstr( path_x86, "x86" ) != NULL, "32-bit path '%s' doesn't contain x86\n", path_x86 ); + } + else + { + ok( !lstrcmpiA( path, path_x86 ), "paths differ '%s' != '%s'\n", path, path_x86 ); + if (is_wow64) + ok( strstr( path, "x86" ) != NULL, "32-bit path '%s' doesn't contain x86\n", path ); + else + ok( strstr( path, "x86" ) == NULL, "32-bit path '%s' contains x86\n", path ); + } + if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &key )) + { + DWORD type, count = sizeof(path_x86); + if (!RegQueryValueExA( key, "CommonFilesDir (x86)", NULL, &type, (BYTE *)path_key, &count )) + { + ok( is_win64 || is_wow64, "CommonFilesDir (x86) exists on 32-bit setup\n" ); + ok( !lstrcmpiA( path_key, path_x86 ), "paths differ '%s' != '%s'\n", path_key, path_x86 ); + } + else ok( !is_win64 && !is_wow64, "CommonFilesDir (x86) should exist on 64-bit setup\n" ); + } +} + static void test_SHGetFolderPathAndSubDirA(void) { HRESULT ret; @@ -4062,6 +4152,7 @@ START_TEST(shlfolder) test_CallForAttributes(); test_FolderShortcut(); test_ITEMIDLIST_format(); + test_SHGetFolderPathA(); test_SHGetFolderPathAndSubDirA(); test_LocalizedNames(); test_SHCreateShellItem();

1 0

Alexandre Julliard : wine.inf: Create the x86 program files key in Wow64 mode too.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 09be7dd83dd08361960375b771ba9ab55aeca716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09be7dd83dd08361960375b77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 21 14:13:42 2010 +0200 wine.inf: Create the x86 program files key in Wow64 mode too. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 429934e..44e36a7 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -114,6 +114,7 @@ WineFakeDlls=FakeDllsWin32,FakeDllsWow64 CopyFiles=(a)l_intl.nls AddReg=\ CurrentVersion,\ + CurrentVersionWow64,\ Debugger,\ DirectX,\ Dotnet,\

1 0

Henri Verbeet : d3d9/tests: Cleanup maxmip_test() a bit.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: d911622722af582f4e80e37122e41b382fec4ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d911622722af582f4e80e3712… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 20 19:41:21 2010 +0200 d3d9/tests: Cleanup maxmip_test() a bit. Having the failure message match the actual draw call in particular makes debugging failures a lot nicer. --- dlls/d3d9/tests/visual.c | 143 ++++++++++++++++++++++++++-------------------- 1 files changed, 81 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d911622722af582f4e80e…

1 0

Henri Verbeet : wined3d: Move stream state to wined3d_state.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 153d8d43aa475cd955599d07081e9b3a6c0ef1cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=153d8d43aa475cd955599d070… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 20 19:41:22 2010 +0200 wined3d: Move stream state to wined3d_state. --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 56 ++++++++++++++++++++------------------- dlls/wined3d/drawprim.c | 29 ++++++++++---------- dlls/wined3d/state.c | 16 +++++----- dlls/wined3d/stateblock.c | 40 +++++++++++++++------------- dlls/wined3d/wined3d_private.h | 6 +--- 6 files changed, 76 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=153d8d43aa475cd955599…

1 0

Henri Verbeet : wined3d: Move index buffer state to wined3d_state.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 902630efb594c8f0502bda9a21d130beb5b4effb URL: http://source.winehq.org/git/wine.git/?a=commit;h=902630efb594c8f0502bda9a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 20 19:41:23 2010 +0200 wined3d: Move index buffer state to wined3d_state. --- dlls/wined3d/device.c | 41 ++++++++++++++++++++------------------- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/state.c | 8 ++++-- dlls/wined3d/stateblock.c | 22 +++++++++++--------- dlls/wined3d/wined3d_private.h | 5 +-- 5 files changed, 42 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=902630efb594c8f0502bd…

1 0

Henri Verbeet : wined3d: Move base vertex state to wined3d_state.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 98a91e84bc8191260615d8e8dd79f0984f6e64e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a91e84bc8191260615d8e8d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 20 19:41:24 2010 +0200 wined3d: Move base vertex state to wined3d_state. --- dlls/wined3d/device.c | 33 ++++++++++++++++++--------------- dlls/wined3d/drawprim.c | 16 ++++++++-------- dlls/wined3d/state.c | 40 ++++++++++++++++++++-------------------- dlls/wined3d/stateblock.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 5 ++--- 5 files changed, 52 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98a91e84bc8191260615d…

1 0