September 2010 - Wine-Commits

Matej Spindler : shdocvw: Add Slovenian translation.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 29296a17aabc67f4e106f55e441d29f64ea461a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29296a17aabc67f4e106f55e4… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Mon Sep 13 10:31:29 2010 +0200 shdocvw: Add Slovenian translation. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/Si.rc | 87 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 0459c92..5741551 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -39,6 +39,7 @@ RC_SRCS = \ Nl.rc \ Pl.rc \ Ro.rc \ + Si.rc \ Sv.rc \ Uk.rc \ shdocvw.rc diff --git a/dlls/shdocvw/Si.rc b/dlls/shdocvw/Si.rc new file mode 100644 index 0000000..31def14 --- /dev/null +++ b/dlls/shdocvw/Si.rc @@ -0,0 +1,87 @@ +/* + * Copyright 2010 Matej Spindler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Open URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Vnesite interneti naslov dokumenta, ki ga bo Internet Explorer odpru.",-1,25, 5, 150,15 + LTEXT "Odpri:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "&V redu", IDOK, 25, 50, 50, 15 + PUSHBUTTON "&Prekliči", IDCANCEL, 85, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Datoteka" + { + POPUP "&Nov" + { + MENUITEM "&Okno" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Odpri...", ID_BROWSE_OPEN + MENUITEM "&Shrani", ID_BROWSE_SAVE + MENUITEM "Shrani &kot...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Nastavitve tiskanja...", ID_BROWSE_PRINT_FORMAT + MENUITEM "Na&tisni...", ID_BROWSE_PRINT + MENUITEM "Predo&gled tiskanja...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Lastnosti...", ID_BROWSE_PROPERTIES + } + POPUP "Pogl&ed" + { + POPUP "Oro&dne vrstice" + { + MENUITEM "&Statusna vrstica" ID_BROWSE_BAR_STD + MENUITEM "&Naslovna vrstica" ID_BROWSE_BAR_ADDR + } + } + POPUP "&Priljubljene" + { + MENUITEM "&Dodaj med priljubljene..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "&Pomoč" + { + MENUITEM "O programu Internet Explorer...", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "Nazaj" + IDS_TB_FORWARD "Naprej" + IDS_TB_STOP "Stop" + IDS_TB_REFRESH "Osveži" + IDS_TB_HOME "Domov" + IDS_TB_PRINT "Natisni" +} + +STRINGTABLE +{ + IDS_ADDRESS "Naslov" +}

1 0

Matej Spindler : mshtml: Update Slovenian translation.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: fd60c013ff89646ccdaf89730f46b6ac14e58fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd60c013ff89646ccdaf89730… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Mon Sep 13 09:19:00 2010 +0200 mshtml: Update Slovenian translation. --- dlls/mshtml/Si.rc | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/Si.rc b/dlls/mshtml/Si.rc index 0d6ee5f..7e40100 100644 --- a/dlls/mshtml/Si.rc +++ b/dlls/mshtml/Si.rc @@ -24,24 +24,31 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT STRINGTABLE { + IDS_STATUS_DONE "Končano" + IDS_STATUS_DOWNLOADINGFROM "Prenašam iz %s..." +} + +STRINGTABLE +{ IDS_HTMLDISABLED "Prikazovanje HTML dokumentov je trenutno onemogočeno." IDS_HTMLDOCUMENT "HTML dokument" IDS_DOWNLOADING "Nalagam ..." IDS_INSTALLING "Nameščam ..." } -ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +ID_DWL_DIALOG DIALOG 0, 0, 260, 105 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Namestitev Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine ni našel paketa Gecko, ki ga aplikacije, ki uporabljajo HTML potrebujejo," \ + "da delujejo pravilno. Wine ga lahko avtomatsko prenese in namesti.\n\n" \ + "Opomba: priporočljivo je uporabiti Gecko paket od distribucije. Poglej\n "\ + "http://wiki.winehq.org/Gecko za podrobnost.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT - CONTROL "Napredek", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 - DEFPUSHBUTTON "&Namesti", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Prekliči", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP + CONTROL "Napredek", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 60, 240, 12 + DEFPUSHBUTTON "&Namesti", ID_DWL_INSTALL, 200, 80, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Prekliči", IDCANCEL, 140, 80, 50, 15, WS_GROUP | WS_TABSTOP } IDD_HYPERLINK DIALOG 0, 0, 250, 65

1 0

Luca Bennati : shell32: Update Italian translation.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 1be7bbf538c8fc25a174e4573c7a0fcff6901538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be7bbf538c8fc25a174e4573… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Sep 10 19:57:54 2010 +0200 shell32: Update Italian translation. --- dlls/shell32/shell32_It.rc | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shell32_It.rc b/dlls/shell32/shell32_It.rc index 2252fc8..a4db90a 100644 --- a/dlls/shell32/shell32_It.rc +++ b/dlls/shell32/shell32_It.rc @@ -83,15 +83,15 @@ MENU_SHV_FILE MENU BEGIN POPUP "" BEGIN - MENUITEM "&Select" FCIDM_SHVIEW_OPEN - MENUITEM "E&splora", FCIDM_SHVIEW_EXPLORE + MENUITEM "&Seleziona" FCIDM_SHVIEW_OPEN + MENUITEM "&Esplora", FCIDM_SHVIEW_EXPLORE MENUITEM "&Apri", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR MENUITEM "&Taglia", FCIDM_SHVIEW_CUT MENUITEM "&Copia", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR MENUITEM "Crea Co&llegamento", FCIDM_SHVIEW_CREATELINK - MENUITEM "&Cancella", FCIDM_SHVIEW_DELETE + MENUITEM "Ca&ncella", FCIDM_SHVIEW_DELETE MENUITEM "&Rinomina", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR MENUITEM "&Proprietà", FCIDM_SHVIEW_PROPERTIES @@ -270,7 +270,9 @@ STRINGTABLE IDS_LOCAL_APPDATA "Settaggi Locali\\Applicazioni" IDS_CDBURN_AREA "Settaggi Locali\\Applicazioni\\Microsoft\\CD Burning" IDS_PROGRAM_FILES "Programmi" + IDS_PROGRAM_FILESX86 "Programmi (x86)" IDS_PROGRAM_FILES_COMMON "Programmi\\File Comuni" + IDS_PROGRAM_FILES_COMMONX86 "Programmi (x86)\\File Comuni" IDS_COMMON_DOCUMENTS "Documenti" IDS_COMMON_MUSIC "Documenti\\Musica" IDS_COMMON_PICTURES "Documenti\\Immagini" @@ -281,13 +283,13 @@ STRINGTABLE IDS_MYPICTURES "Immagini" IDS_FAVORITES "Favoriti" IDS_RECENT "Recenti" - IDS_SENDTO "SendTo" + IDS_SENDTO "Invia A" IDS_DESKTOPDIRECTORY "Desktop" - IDS_NETHOOD "NetHood" + IDS_NETHOOD "Reti condivise" IDS_TEMPLATES "Modelli" IDS_APPDATA "Applicazioni" - IDS_PRINTHOOD "PrintHood" - IDS_COOKIES "Cookies" + IDS_PRINTHOOD "Stampanti condivise" + IDS_COOKIES "Cookie" IDS_NEWFOLDER "Nuova cartella"

1 0

Aurimas Fišeras : shell32: Update Lithuanian translation.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 099cf92a7122bbeae3fb13e9db0bf1deb0d8b417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099cf92a7122bbeae3fb13e9d… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Sep 14 19:31:34 2010 +0300 shell32: Update Lithuanian translation. --- dlls/shell32/shell32_Lt.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Lt.rc b/dlls/shell32/shell32_Lt.rc index f74e67e..504a39f 100644 --- a/dlls/shell32/shell32_Lt.rc +++ b/dlls/shell32/shell32_Lt.rc @@ -277,8 +277,10 @@ STRINGTABLE IDS_COOKIES "Slapukai" IDS_HISTORY "Vietinės nuostatos\\Istorija" IDS_PROGRAM_FILES "Programų failai" + IDS_PROGRAM_FILESX86 "Programų failai (x86)" IDS_MYPICTURES "Paveikslai" IDS_PROGRAM_FILES_COMMON "Programų failai\\Bendrieji failai" + IDS_PROGRAM_FILES_COMMONX86 "Programų failai (x86)\\Bendrieji failai" IDS_COMMON_DOCUMENTS "Dokumentai" IDS_ADMINTOOLS "Pradžios meniu\\Programos\\Administravimo įrankiai" IDS_COMMON_MUSIC "Dokumentai\\Muzika"

1 0

André Hentschel : shell32: Update German translation.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 20acd72643f5631763ed2a743758454578c1ed4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=20acd72643f5631763ed2a743… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 14 20:20:48 2010 +0200 shell32: Update German translation. --- dlls/shell32/shell32_De.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index a52992e..018b977 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -1,6 +1,7 @@ /* * Copyright 1998 Juergen Schmied * Copyright 2004 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 @@ -276,8 +277,10 @@ STRINGTABLE IDS_COOKIES "Cookies" IDS_HISTORY "Lokale Einstellungen\\Verlauf" IDS_PROGRAM_FILES "Programme" + IDS_PROGRAM_FILESX86 "Programme (x86)" IDS_MYPICTURES "Eigene Bilder" IDS_PROGRAM_FILES_COMMON "Programme\\Gemeinsame Dateien" + IDS_PROGRAM_FILES_COMMONX86 "Programme (x86)\\Gemeinsame Dateien" IDS_COMMON_DOCUMENTS "Dokumente" IDS_ADMINTOOLS "Startmenü\\Programme\\Verwaltung" IDS_COMMON_MUSIC "Musik"

1 0

Matej Spindler : shell32: Update Slovenian translation.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 9977b50475d3eff832eec9f98d29babe9fdda2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9977b50475d3eff832eec9f98… Author: Matej Spindler <spindler.matej(a)gmail.com> Date: Tue Sep 14 18:28:26 2010 +0200 shell32: Update Slovenian translation. --- dlls/shell32/shell32_Si.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Si.rc b/dlls/shell32/shell32_Si.rc index aaa8d2d..2b37c6d 100644 --- a/dlls/shell32/shell32_Si.rc +++ b/dlls/shell32/shell32_Si.rc @@ -275,8 +275,10 @@ STRINGTABLE IDS_COOKIES "Piškotki" IDS_HISTORY "Lokalne nastavitve\\Zgodovina" IDS_PROGRAM_FILES "Programi" + IDS_PROGRAM_FILESX86 "Programi (x86)" IDS_MYPICTURES "Slike" IDS_PROGRAM_FILES_COMMON "Programi\\Skupne datoteke" + IDS_PROGRAM_FILES_COMMONX86 "Programi (x86)\\Skupne datoteke" IDS_COMMON_DOCUMENTS "Dokumenti" IDS_ADMINTOOLS "Meni start\\Programi\\Administrativna orodja" IDS_COMMON_MUSIC "Dokumenti\\Glasba"

1 0

Aurimas Fišeras : shdocvw: Update Lithuanian translation.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 18200565a93f528db34e320a8905cad1274341a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18200565a93f528db34e320a8… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Sep 14 19:29:29 2010 +0300 shdocvw: Update Lithuanian translation. --- dlls/shdocvw/Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Lt.rc b/dlls/shdocvw/Lt.rc index d2a5640..b9c0b04 100644 --- a/dlls/shdocvw/Lt.rc +++ b/dlls/shdocvw/Lt.rc @@ -52,6 +52,7 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "Spaudinio pe&ržiūra...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR MENUITEM "&Savybės...", ID_BROWSE_PROPERTIES + MENUITEM "&Užverti", ID_BROWSE_QUIT } POPUP "&Rodymas" {

1 0

André Hentschel : winedbg: Only add ContextFlags which are defined.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: ab873c0d25576f89e3e1deb4371aac711b78010b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab873c0d25576f89e3e1deb43… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 8 21:55:37 2010 +0200 winedbg: Only add ContextFlags which are defined. --- programs/winedbg/tgt_active.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 5434624..eb25329 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -92,7 +92,10 @@ BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe) static unsigned dbg_fetch_context(void) { dbg_context.ContextFlags = CONTEXT_CONTROL - | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT + | CONTEXT_INTEGER +#ifdef CONTEXT_FLOATING_POINT + | CONTEXT_FLOATING_POINT +#endif #ifdef CONTEXT_SEGMENTS | CONTEXT_SEGMENTS #endif

1 0

Hans Leidekker : shell32: Implement SHGetFolderPathEx.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: 859a1d0d44e33b9705dc8578d78b13b270d70708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859a1d0d44e33b9705dc8578d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 14 17:01:44 2010 +0200 shell32: Implement SHGetFolderPathEx. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellpath.c | 26 ++++++++++++++++++++ dlls/shell32/tests/shellpath.c | 51 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 961e1af..034f640 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -356,6 +356,7 @@ @ stdcall SHGetFileInfoW(ptr long ptr long long) @ stdcall SHGetFolderLocation(long long long long ptr) @ stdcall SHGetFolderPathA(long long long long ptr) +@ stdcall SHGetFolderPathEx(ptr long ptr ptr long) @ stdcall SHGetFolderPathAndSubDirA(long long long long str ptr) @ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) @ stdcall SHGetFolderPathW(long long long long ptr) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 0eafdc1..ec66699 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2937,3 +2937,29 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t } return hr; } + +/************************************************************************* + * SHGetFolderPathEx [SHELL32.@] + */ +HRESULT WINAPI SHGetFolderPathEx(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, LPWSTR path, DWORD len) +{ + HRESULT hr; + WCHAR *buffer; + + TRACE("%s, 0x%08x, %p, %p, %u\n", debugstr_guid(rfid), flags, token, path, len); + + if (!path || !len) return E_INVALIDARG; + + hr = SHGetKnownFolderPath( rfid, flags, token, &buffer ); + if (SUCCEEDED( hr )) + { + if (strlenW( buffer ) + 1 > len) + { + CoTaskMemFree( buffer ); + return HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER ); + } + strcpyW( path, buffer ); + CoTaskMemFree( buffer ); + } + return hr; +} diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index b874b5a..2a86eac 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -31,6 +31,7 @@ #include "shlobj.h" #include "shlwapi.h" #include "initguid.h" +#include "knownfolders.h" #include "wine/test.h" /* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want @@ -93,6 +94,9 @@ static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); static int (WINAPI *pSHFileOperationA)(LPSHFILEOPSTRUCTA); static HRESULT (WINAPI *pSHGetMalloc)(LPMALLOC *); static UINT (WINAPI *pGetSystemWow64DirectoryA)(LPSTR,UINT); +static HRESULT (WINAPI *pSHGetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR *); +static HRESULT (WINAPI *pSHGetFolderPathEx)(REFKNOWNFOLDERID, DWORD, HANDLE, LPWSTR, DWORD); + static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; static const BYTE guidType[] = { PT_GUID }; @@ -187,7 +191,9 @@ static void loadShell32(void) GET_PROC(DllGetVersion) GET_PROC(SHGetFolderPathA) + GET_PROC(SHGetFolderPathEx) GET_PROC(SHGetFolderLocation) + GET_PROC(SHGetKnownFolderPath) GET_PROC(SHGetSpecialFolderPathA) GET_PROC(SHGetSpecialFolderLocation) GET_PROC(ILFindLastID) @@ -833,6 +839,50 @@ static void test_NonExistentPath(void) else skip("RegOpenKeyExA(HKEY_CURRENT_USER, %s, ...) failed\n", userShellFolders); } +static void test_SHGetFolderPathEx(void) +{ + HRESULT hr; + WCHAR buffer[MAX_PATH], *path; + DWORD len; + + if (!pSHGetKnownFolderPath || !pSHGetFolderPathEx) + { + win_skip("SHGetKnownFolderPath or SHGetFolderPathEx not available\n"); + return; + } + +if (0) { /* crashes */ + hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); +} + path = NULL; + hr = pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, &path); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path != NULL, "expected path != NULL\n"); + + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, MAX_PATH); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(!lstrcmpiW(path, buffer), "expected equal paths\n"); + len = lstrlenW(buffer); + CoTaskMemFree(path); + + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, 0); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); + +if (0) { /* crashes */ + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, NULL, len + 1); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); + + hr = pSHGetFolderPathEx(NULL, 0, NULL, buffer, MAX_PATH); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); +} + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, len); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "expected 0x8007007a, got 0x%08x\n", hr); + + hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, len + 1); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); +} + START_TEST(shellpath) { if (!init()) return; @@ -858,5 +908,6 @@ START_TEST(shellpath) testWinDir(); testSystemDir(); test_NonExistentPath(); + test_SHGetFolderPathEx(); } }

1 0

Henri Verbeet : wined3d: IWineD3DBuffer_GetDesc() should never fail.
by Alexandre Julliard Sept. 14, 2010

Sept. 14, 2010

Module: wine Branch: master Commit: fd7c1cbf052b428e694d9b49c7a4f60f0ea08b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7c1cbf052b428e694d9b49c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 14 13:38:38 2010 +0200 wined3d: IWineD3DBuffer_GetDesc() should never fail. --- dlls/d3d8/buffer.c | 38 +++++++++++++++----------------------- dlls/d3d9/buffer.c | 38 +++++++++++++++----------------------- dlls/ddraw/device.c | 7 +++---- dlls/ddraw/vertexbuffer.c | 19 +++---------------- dlls/wined3d/buffer.c | 4 +--- include/wine/wined3d.idl | 2 +- 6 files changed, 38 insertions(+), 70 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 513c655..f7dc12d 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -212,25 +212,21 @@ static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, D { IDirect3DVertexBuffer8Impl *buffer = (IDirect3DVertexBuffer8Impl *)iface; WINED3DBUFFER_DESC wined3d_desc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDesc(buffer->wineD3DVertexBuffer, &wined3d_desc); + IWineD3DBuffer_GetDesc(buffer->wineD3DVertexBuffer, &wined3d_desc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - desc->Type = D3DRTYPE_VERTEXBUFFER; - desc->Usage = wined3d_desc.Usage; - desc->Pool = wined3d_desc.Pool; - desc->Size = wined3d_desc.Size; - desc->FVF = buffer->fvf; - desc->Format = D3DFMT_VERTEXDATA; - } + desc->Type = D3DRTYPE_VERTEXBUFFER; + desc->Usage = wined3d_desc.Usage; + desc->Pool = wined3d_desc.Pool; + desc->Size = wined3d_desc.Size; + desc->FVF = buffer->fvf; + desc->Format = D3DFMT_VERTEXDATA; - return hr; + return D3D_OK; } static const IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl = @@ -479,25 +475,21 @@ static HRESULT WINAPI d3d8_indexbuffer_Unlock(IDirect3DIndexBuffer8 *iface) static HRESULT WINAPI d3d8_indexbuffer_GetDesc(IDirect3DIndexBuffer8 *iface, D3DINDEXBUFFER_DESC *desc) { IDirect3DIndexBuffer8Impl *buffer = (IDirect3DIndexBuffer8Impl *)iface; - HRESULT hr; WINED3DBUFFER_DESC wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDesc(buffer->wineD3DIndexBuffer, &wined3d_desc); + IWineD3DBuffer_GetDesc(buffer->wineD3DIndexBuffer, &wined3d_desc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - desc->Format = d3dformat_from_wined3dformat(buffer->format); - desc->Type = D3DRTYPE_INDEXBUFFER; - desc->Usage = wined3d_desc.Usage; - desc->Pool = wined3d_desc.Pool; - desc->Size = wined3d_desc.Size; - } + desc->Format = d3dformat_from_wined3dformat(buffer->format); + desc->Type = D3DRTYPE_INDEXBUFFER; + desc->Usage = wined3d_desc.Usage; + desc->Pool = wined3d_desc.Pool; + desc->Size = wined3d_desc.Size; - return hr; + return D3D_OK; } static const IDirect3DIndexBuffer8Vtbl d3d8_indexbuffer_vtbl = diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index c70aae9..ac8c244 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -214,25 +214,21 @@ static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, D { IDirect3DVertexBuffer9Impl *buffer = (IDirect3DVertexBuffer9Impl *)iface; WINED3DBUFFER_DESC wined3d_desc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDesc(buffer->wineD3DVertexBuffer, &wined3d_desc); + IWineD3DBuffer_GetDesc(buffer->wineD3DVertexBuffer, &wined3d_desc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - desc->Format = D3DFMT_VERTEXDATA; - desc->Usage = wined3d_desc.Usage; - desc->Pool = wined3d_desc.Pool; - desc->Size = wined3d_desc.Size; - desc->Type = D3DRTYPE_VERTEXBUFFER; - desc->FVF = buffer->fvf; - } + desc->Format = D3DFMT_VERTEXDATA; + desc->Usage = wined3d_desc.Usage; + desc->Pool = wined3d_desc.Pool; + desc->Size = wined3d_desc.Size; + desc->Type = D3DRTYPE_VERTEXBUFFER; + desc->FVF = buffer->fvf; - return hr; + return D3D_OK; } static const IDirect3DVertexBuffer9Vtbl d3d9_vertexbuffer_vtbl = @@ -482,24 +478,20 @@ static HRESULT WINAPI d3d9_indexbuffer_GetDesc(IDirect3DIndexBuffer9 *iface, D3D { IDirect3DIndexBuffer9Impl *buffer = (IDirect3DIndexBuffer9Impl *)iface; WINED3DBUFFER_DESC wined3d_desc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDesc(buffer->wineD3DIndexBuffer, &wined3d_desc); + IWineD3DBuffer_GetDesc(buffer->wineD3DIndexBuffer, &wined3d_desc); wined3d_mutex_unlock(); - if (SUCCEEDED(hr)) - { - desc->Format = d3dformat_from_wined3dformat(buffer->format); - desc->Usage = wined3d_desc.Usage; - desc->Pool = wined3d_desc.Pool; - desc->Size = wined3d_desc.Size; - desc->Type = D3DRTYPE_INDEXBUFFER; - } + desc->Format = d3dformat_from_wined3dformat(buffer->format); + desc->Usage = wined3d_desc.Usage; + desc->Pool = wined3d_desc.Pool; + desc->Size = wined3d_desc.Size; + desc->Type = D3DRTYPE_INDEXBUFFER; - return hr; + return D3D_OK; } static const IDirect3DIndexBuffer9Vtbl d3d9_indexbuffer_vtbl = diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 95526bd..8e25543 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4345,10 +4345,9 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, } /* check that the buffer is large enough to hold the indices, - * reallocate if necessary. - */ - hr = IWineD3DBuffer_GetDesc(This->indexbuffer, &desc); - if(desc.Size < IndexCount * sizeof(WORD)) + * reallocate if necessary. */ + IWineD3DBuffer_GetDesc(This->indexbuffer, &desc); + if (desc.Size < IndexCount * sizeof(WORD)) { UINT size = max(desc.Size * 2, IndexCount * sizeof(WORD)); IWineD3DBuffer *buffer; diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index b40faa2..36087f2 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -232,13 +232,7 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, if(Size) { /* Get the size, for returning it, and for locking */ - hr = IWineD3DBuffer_GetDesc(This->wineD3DVertexBuffer, &Desc); - if(hr != D3D_OK) - { - ERR("(%p) IWineD3DBuffer::GetDesc failed with hr=%08x\n", This, hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } + IWineD3DBuffer_GetDesc(This->wineD3DVertexBuffer, &Desc); *Size = Desc.Size; } @@ -425,26 +419,19 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface, { IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface; WINED3DBUFFER_DESC WDesc; - HRESULT hr; TRACE("iface %p, desc %p.\n", iface, Desc); if(!Desc) return DDERR_INVALIDPARAMS; EnterCriticalSection(&ddraw_cs); - hr = IWineD3DBuffer_GetDesc(This->wineD3DVertexBuffer, &WDesc); - if(hr != D3D_OK) - { - ERR("(%p) IWineD3DBuffer::GetDesc failed with hr=%08x\n", This, hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } + IWineD3DBuffer_GetDesc(This->wineD3DVertexBuffer, &WDesc); + LeaveCriticalSection(&ddraw_cs); /* Now fill the Desc structure */ Desc->dwCaps = This->Caps; Desc->dwFVF = This->fvf; Desc->dwNumVertices = WDesc.Size / get_flexible_vertex_size(This->fvf); - LeaveCriticalSection(&ddraw_cs); return D3D_OK; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 166508a..e9b2172 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1413,7 +1413,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) return WINED3D_OK; } -static HRESULT STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBUFFER_DESC *desc) +static void STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBUFFER_DESC *desc) { struct wined3d_buffer *This = (struct wined3d_buffer *)iface; @@ -1423,8 +1423,6 @@ static HRESULT STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBU desc->Usage = This->resource.usage; desc->Pool = This->resource.pool; desc->Size = This->resource.size; - - return WINED3D_OK; } static const struct IWineD3DBufferVtbl wined3d_buffer_vtbl = diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 80dabac..53bfeae 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2736,7 +2736,7 @@ interface IWineD3DBuffer : IWineD3DResource ); HRESULT Unmap( ); - HRESULT GetDesc( + void GetDesc( [out] WINED3DBUFFER_DESC *desc ); }

1 0