August 2010 - Wine-commits - list.winehq.org

Frédéric Delanoy : Fix French downloads page
by Jeremy Newman 23 Aug '10

23 Aug '10

Module: website Branch: master Commit: 2ba64b89ec62e9748c0e70a538b1b3563c9b7a88 URL: http://source.winehq.org/git/website.git/?a=commit;h=2ba64b89ec62e9748c0e70… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 23 22:46:22 2010 +0200 Fix French downloads page --- templates/fr/download.template | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/templates/fr/download.template b/templates/fr/download.template index f146264..61404ff 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -27,7 +27,7 @@ technique à ses utilisateurs. Tous les achats de CrossOver sont utilisés pour financer directement les développeurs travaillant sur Wine. Ainsi, CrossOver constitue à la fois un excellent moyen d'obtenir du support lors de l'utilisation de Wine, et un -soutien au projet Wine. CodeWeavers fournit des +soutien au projet Wine. CodeWeavers fournit des <a href="http://www.codeweavers.com/products/download_trial/">versions d'évaluation de CrossOver</a> entièrement fonctionnelles. </td> @@ -74,7 +74,7 @@ center;">Voyez la <td align=center><a href="{$root}/download/deblenny"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="{$root}/download/deblenny">paquets Debian</a> + <td> <a href="{$root}/download/deblenny">Paquets Debian</a> - .deb binaires pour Debian Lenny, Squeeze et Sid</td> <td><a href="mailto:repository(a)lamaresh.net">Maurilio Genovese</a> <a href="mailto:ben.klein(a)lamaresh.net">Ben Klein</a></td> </tr> @@ -100,7 +100,8 @@ center;">Voyez la <td> <a href="http://en.opensuse.org/Wine#Repositories">Paquets SUSE</a> - .rpm binaires et sources et instantanés quotidiens pour openSUSE 11.1, 11.2, 11.3 ainsi que SUSE Linux Enterprise 10 et 11. - Les anciens paquets sont disponibles sur <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> + Les anciens paquets sont disponibles sur +<a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a>. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> @@ -171,7 +172,7 @@ Spring. Téléchargez les paquets 2010.0 si votre Mandriva est la première vers Parfois, il arrive qu'une adaptation de Wine permette à une application de fonctionner correctement, mais qu'elle ne puisse être incorporée à Wine pour une raison quelconque. Pour pallier des imperfections actuelles de Wine, diverses -applications tierces pour utilisateurs finaux ont été conçues au cours des +applications tierces pour utilisateurs finals ont été conçues au cours des années. Les développeurs Wine ne supportent en aucun cas ces applications, mais il se peut que vous les trouviez utiles. Pour plus d'informations, voyez notre page wiki sur les <a @@ -193,7 +194,7 @@ href="http://wiki.winehq.org/ThirdPartyApplications">applications tierces</a>.</ <tr bgcolor="#ffffff"> <td> <a href="http://wiki.winehq.org/GitWine">source.winehq.org/git</a> </td> - <td> Pour la version de développement la plus récente. </td> + <td> Version de développement la plus récente. </td> </tr> <tr bgcolor="#ffffff">

1 0

Jörg Höhle : winmm/tests: Initial tests for CD audio with the MCI.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 70d8fce2228c883da6e4241af2f09fa7bea836a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d8fce2228c883da6e4241af… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Aug 19 16:05:12 2010 +0200 winmm/tests: Initial tests for CD audio with the MCI. --- dlls/winmm/tests/Makefile.in | 1 + dlls/winmm/tests/mcicda.c | 625 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 626 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70d8fce2228c883da6e42…

1 0

Mariusz Pluciński : gameux/tests: Check presence of GameExplorer registry keys.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 6cb7658377ac513e8acacd5b4eaeab4632afaadc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb7658377ac513e8acacd5b4… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Mon Aug 23 13:13:38 2010 +0200 gameux/tests: Check presence of GameExplorer registry keys. --- dlls/gameux/tests/Makefile.in | 2 +- dlls/gameux/tests/gameexplorer.c | 199 +++++++++++++++++++++++++++++++++++++- 2 files changed, 195 insertions(+), 6 deletions(-) diff --git a/dlls/gameux/tests/Makefile.in b/dlls/gameux/tests/Makefile.in index 542fc29..3127ec0 100644 --- a/dlls/gameux/tests/Makefile.in +++ b/dlls/gameux/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = gameux.dll -IMPORTS = uuid shlwapi oleaut32 ole32 +IMPORTS = uuid shlwapi oleaut32 ole32 advapi32 C_SRCS = \ gameexplorer.c \ diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 3decfa2..79349f5 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -25,6 +25,7 @@ #include "objsafe.h" #include "objbase.h" #include "shlwapi.h" +#include "sddl.h" #include "shobjidl.h" #include "initguid.h" @@ -32,7 +33,179 @@ #include "wine/test.h" +/******************************************************************************* + * Pointers used instead of direct calls. These procedures are not available on + * older system, which causes problem while loading test binary. + */ +static BOOL WINAPI (*_ConvertSidToStringSidW)(PSID,LPWSTR*); + +/******************************************************************************* + *_loadDynamicRoutines + * + * Helper function, prepares pointers to system procedures which may be not + * available on older operating systems. + * + * Returns: + * TRUE procedures were loaded successfunnly + * FALSE procedures were not loaded successfunnly + */ +static BOOL _loadDynamicRoutines(void) +{ + HMODULE hAdvapiModule = GetModuleHandleA( "advapi32.dll" ); + + _ConvertSidToStringSidW = (LPVOID)GetProcAddress(hAdvapiModule, "ConvertSidToStringSidW"); + if (!_ConvertSidToStringSidW) return FALSE; + return TRUE; +} + +/******************************************************************************* + * _buildGameRegistryPath + * + * Helper function, builds registry path to key, where game's data are stored + * + * Parameters: + * installScope [I] the scope which was used in AddGame/InstallGame call + * gameInstanceId [I] game instance GUID + * lpRegistryPath [O] pointer which will receive address to string + * containing expected registry path. Path + * is relative to HKLM registry key. It + * must be freed by calling CoTaskMemFree + */ +static HRESULT _buildGameRegistryPath(GAME_INSTALL_SCOPE installScope, + LPCGUID gameInstanceId, + LPWSTR* lpRegistryPath) +{ + static const WCHAR sGameUxRegistryPath[] = {'S','O','F','T','W','A','R','E','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','G','a','m','e','U','X',0}; + static const WCHAR sGames[] = {'G','a','m','e','s',0}; + static const WCHAR sBackslash[] = {'\\',0}; + + HRESULT hr = S_OK; + HANDLE hToken = NULL; + PTOKEN_USER pTokenUser = NULL; + DWORD dwLength; + LPWSTR lpSID = NULL; + WCHAR sInstanceId[40]; + WCHAR sRegistryPath[8192]; + + lstrcpyW(sRegistryPath, sGameUxRegistryPath); + lstrcatW(sRegistryPath, sBackslash); + + if(installScope == GIS_CURRENT_USER) + { + /* build registry path containing user's SID */ + if(!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + hr = HRESULT_FROM_WIN32(GetLastError()); + if(SUCCEEDED(hr)) + { + if(!GetTokenInformation(hToken, TokenUser, NULL, 0, &dwLength) && + GetLastError()!=ERROR_INSUFFICIENT_BUFFER) + hr = HRESULT_FROM_WIN32(GetLastError()); + + if(SUCCEEDED(hr)) + { + pTokenUser = CoTaskMemAlloc(dwLength); + if(!pTokenUser) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + if(!GetTokenInformation(hToken, TokenUser, (LPVOID)pTokenUser, dwLength, &dwLength)) + hr = HRESULT_FROM_WIN32(GetLastError()); + + if(SUCCEEDED(hr)) + if(!_ConvertSidToStringSidW(pTokenUser->User.Sid, &lpSID)) + hr = HRESULT_FROM_WIN32(GetLastError()); + + if(SUCCEEDED(hr)) + { + lstrcatW(sRegistryPath, lpSID); + LocalFree(lpSID); + } + + CoTaskMemFree(pTokenUser); + CloseHandle(hToken); + } + } + else if(installScope == GIS_ALL_USERS) + /* build registry path without SID */ + lstrcatW(sRegistryPath, sGames); + else + hr = E_INVALIDARG; + + /* put game's instance id on the end of path */ + if(SUCCEEDED(hr)) + hr = (StringFromGUID2(gameInstanceId, sInstanceId, sizeof(sInstanceId)/sizeof(sInstanceId[0])) ? S_OK : E_FAIL); + + if(SUCCEEDED(hr)) + { + lstrcatW(sRegistryPath, sBackslash); + lstrcatW(sRegistryPath, sInstanceId); + } + + if(SUCCEEDED(hr)) + { + *lpRegistryPath = CoTaskMemAlloc((lstrlenW(sRegistryPath)+1)*sizeof(WCHAR)); + if(!*lpRegistryPath) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + lstrcpyW(*lpRegistryPath, sRegistryPath); + + return hr; +} +/******************************************************************************* + * _validateGameKey + * + * Helper function, verifies current state of game's registry key with expected. + * + * Parameters: + * line [I] place of original call. Used only to display + * more useful message on test fail + * installScope [I] the scope which was used in AddGame/InstallGame call + * gameInstanceId [I] game instance identifier + * presenceExpected [I] is it expected that game should be currently + * registered or not. Should be TRUE if checking + * after using AddGame/InstallGame, and FALSE + * if checking after RemoveGame/UninstallGame + */ +static void _validateGameRegistryKey(int line, + GAME_INSTALL_SCOPE installScope, + LPCGUID gameInstanceId, + BOOL presenceExpected) +{ + HRESULT hr; + LPWSTR lpRegistryPath = NULL; + HKEY hKey; + + /* check key presence */ + hr = _buildGameRegistryPath(installScope, gameInstanceId, &lpRegistryPath); + + if(SUCCEEDED(hr)) + { + hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, lpRegistryPath, 0, + KEY_READ | KEY_WOW64_64KEY, &hKey)); + + if(presenceExpected) + ok_(__FILE__, line)(hr == S_OK, + "problem while trying to open registry key (HKLM): %s, error: 0x%x\n", wine_dbgstr_w(lpRegistryPath), hr); + else + ok_(__FILE__, line)(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "other than expected (FILE_NOT_FOUND) error while trying to open registry key (HKLM): %s, error: 0x%x\n", wine_dbgstr_w(lpRegistryPath), hr); + } + + if(SUCCEEDED(hr)) + RegCloseKey(hKey); + + CoTaskMemFree(lpRegistryPath); +} + +/******************************************************************************* + * Test routines + */ static void test_create(BOOL* gameExplorerAvailable) { HRESULT hr; @@ -106,10 +279,14 @@ static void test_add_remove_game(void) if(SUCCEEDED(hr)) { + todo_wine _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, TRUE); + hr = IGameExplorer_RemoveGame(ge, guid); todo_wine ok(SUCCEEDED(hr), "IGameExplorer::RemoveGame failed (error 0x%08x)\n", hr); } + _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, FALSE); + /* try to register game with empty guid */ memcpy(&guid, &GUID_NULL, sizeof (guid)); @@ -120,9 +297,13 @@ static void test_add_remove_game(void) if(SUCCEEDED(hr)) { + todo_wine _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, TRUE); + hr = IGameExplorer_RemoveGame(ge, guid); todo_wine ok(SUCCEEDED(hr), "IGameExplorer::RemoveGame failed (error 0x%08x)\n", hr); } + + _validateGameRegistryKey(__LINE__, GIS_CURRENT_USER, &guid, FALSE); } /* free allocated resources */ @@ -138,13 +319,21 @@ START_TEST(gameexplorer) HRESULT r; BOOL gameExplorerAvailable = FALSE; - r = CoInitialize( NULL ); - ok( r == S_OK, "failed to init COM\n"); + if(_loadDynamicRoutines()) + { + r = CoInitialize( NULL ); + ok( r == S_OK, "failed to init COM\n"); + + test_create(&gameExplorerAvailable); - test_create(&gameExplorerAvailable); + if(gameExplorerAvailable) + test_add_remove_game(); + } + else + /* this is not a failure, because both procedures loaded by address + * are always available on systems which has gameux.dll */ + win_skip("too old system, cannot load required dynamic procedures\n"); - if(gameExplorerAvailable) - test_add_remove_game(); CoUninitialize(); }

1 0

David Hedberg : shell32: Implement IExplorerBrowser:: SetOptions and IExplorerBrowser::GetOptions.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 9c0260f2cb3e8a73e83b3a2ebdf7decfa62a6a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c0260f2cb3e8a73e83b3a2eb… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Aug 23 12:55:17 2010 +0200 shell32: Implement IExplorerBrowser::SetOptions and IExplorerBrowser::GetOptions. --- dlls/shell32/ebrowser.c | 20 ++++++++++++++++---- dlls/shell32/tests/ebrowser.c | 26 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index b2c4497..20b5363 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -42,6 +42,8 @@ typedef struct _ExplorerBrowserImpl { BOOL destroyed; HWND hwnd_main; + + EXPLORER_BROWSER_OPTIONS eb_options; } ExplorerBrowserImpl; /************************************************************************** @@ -258,18 +260,28 @@ static HRESULT WINAPI IExplorerBrowser_fnSetOptions(IExplorerBrowser *iface, EXPLORER_BROWSER_OPTIONS dwFlag) { ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; - FIXME("stub, %p (0x%x)\n", This, dwFlag); + static const EXPLORER_BROWSER_OPTIONS unsupported_options = + EBO_SHOWFRAMES | EBO_ALWAYSNAVIGATE | EBO_NOWRAPPERWINDOW | EBO_HTMLSHAREPOINTVIEW; - return E_NOTIMPL; + TRACE("%p (0x%x)\n", This, dwFlag); + + if(dwFlag & unsupported_options) + FIXME("Flags 0x%08x contains unsupported options.\n", dwFlag); + + This->eb_options = dwFlag; + + return S_OK; } static HRESULT WINAPI IExplorerBrowser_fnGetOptions(IExplorerBrowser *iface, EXPLORER_BROWSER_OPTIONS *pdwFlag) { ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; - FIXME("stub, %p (%p)\n", This, pdwFlag); + TRACE("%p (%p)\n", This, pdwFlag); - return E_NOTIMPL; + *pdwFlag = This->eb_options; + + return S_OK; } static HRESULT WINAPI IExplorerBrowser_fnBrowseToIDList(IExplorerBrowser *iface, diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index be993dd..8486645 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -277,6 +277,7 @@ static void test_basics(void) IExplorerBrowser *peb; IShellBrowser *psb; ULONG lres; + DWORD flags; HDWP hdwp; RECT rc; HRESULT hr; @@ -332,6 +333,31 @@ static void test_basics(void) } IExplorerBrowser_Destroy(peb); + IExplorerBrowser_Release(peb); + + /* GetOptions/SetOptions*/ + ebrowser_instantiate(&peb); + + if(0) { + /* Crashes on Windows 7 */ + IExplorerBrowser_GetOptions(peb, NULL); + } + + hr = IExplorerBrowser_GetOptions(peb, &flags); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(flags == 0, "got (0x%08x)\n", flags); + + /* Settings preserved through Initialize. */ + hr = IExplorerBrowser_SetOptions(peb, 0xDEADBEEF); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + ebrowser_initialize(peb); + + hr = IExplorerBrowser_GetOptions(peb, &flags); + ok(flags == 0xDEADBEEF, "got (0x%08x)\n", flags); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + IExplorerBrowser_Destroy(peb); lres = IExplorerBrowser_Release(peb); ok(lres == 0, "Got %d\n", lres); }

1 0

David Hedberg : shell32: Add some basic support for hosting a shellview in the ExplorerBrowser.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: d17d78e44b8d7c39f89cddfb7b71613e79bffee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17d78e44b8d7c39f89cddfb7… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Aug 23 12:55:18 2010 +0200 shell32: Add some basic support for hosting a shellview in the ExplorerBrowser. --- dlls/shell32/ebrowser.c | 61 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 20b5363..2f77063 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -42,11 +42,35 @@ typedef struct _ExplorerBrowserImpl { BOOL destroyed; HWND hwnd_main; + HWND hwnd_sv; EXPLORER_BROWSER_OPTIONS eb_options; + + IShellView *psv; + RECT sv_rc; } ExplorerBrowserImpl; /************************************************************************** + * Helper functions + */ +static void update_layout(ExplorerBrowserImpl *This) +{ + RECT rc; + TRACE("%p\n", This); + + GetClientRect(This->hwnd_main, &rc); + CopyRect(&This->sv_rc, &rc); +} + +static void size_panes(ExplorerBrowserImpl *This) +{ + MoveWindow(This->hwnd_sv, + This->sv_rc.left, This->sv_rc.top, + This->sv_rc.right - This->sv_rc.left, This->sv_rc.bottom - This->sv_rc.top, + TRUE); +} + +/************************************************************************** * Main window related functions. */ static LRESULT main_on_wm_create(HWND hWnd, CREATESTRUCTW *crs) @@ -60,11 +84,22 @@ static LRESULT main_on_wm_create(HWND hWnd, CREATESTRUCTW *crs) return TRUE; } +static LRESULT main_on_wm_size(ExplorerBrowserImpl *This) +{ + update_layout(This); + size_panes(This); + + return TRUE; +} + static LRESULT CALLBACK main_wndproc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) { + ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + switch(uMessage) { case WM_CREATE: return main_on_wm_create(hWnd, (CREATESTRUCTW*)lParam); + case WM_SIZE: return main_on_wm_size(This); default: return DefWindowProcW(hWnd, uMessage, wParam, lParam); } @@ -183,6 +218,14 @@ static HRESULT WINAPI IExplorerBrowser_fnDestroy(IExplorerBrowser *iface) ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; TRACE("%p\n", This); + if(This->psv) + { + IShellView_DestroyViewWindow(This->psv); + IShellView_Release(This->psv); + This->psv = NULL; + This->hwnd_sv = NULL; + } + DestroyWindow(This->hwnd_main); This->destroyed = TRUE; @@ -325,10 +368,12 @@ static HRESULT WINAPI IExplorerBrowser_fnGetCurrentView(IExplorerBrowser *iface, REFIID riid, void **ppv) { ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; - FIXME("stub, %p (%s, %p)\n", This, shdebugstr_guid(riid), ppv); + TRACE("%p (%s, %p)\n", This, shdebugstr_guid(riid), ppv); - *ppv = NULL; - return E_FAIL; + if(!This->psv) + return E_FAIL; + + return IShellView_QueryInterface(This->psv, riid, ppv); } static const IExplorerBrowserVtbl vt_IExplorerBrowser = @@ -510,9 +555,15 @@ static HRESULT WINAPI IShellBrowser_fnQueryActiveShellView(IShellBrowser *iface, IShellView **ppshv) { ExplorerBrowserImpl *This = impl_from_IShellBrowser(iface); - FIXME("stub, %p (%p)\n", This, ppshv); + TRACE("%p (%p)\n", This, ppshv); - return E_NOTIMPL; + if(!This->psv) + return E_FAIL; + + *ppshv = This->psv; + IShellView_AddRef(This->psv); + + return S_OK; } static HRESULT WINAPI IShellBrowser_fnOnViewWindowActive(IShellBrowser *iface,

1 0

David Hedberg : shell32: Implement IExplorerBrowser::SetFolderSettings.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 270845d3dda70d7e0ea30f77c99370c90a52f120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=270845d3dda70d7e0ea30f77c… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Aug 23 12:55:19 2010 +0200 shell32: Implement IExplorerBrowser::SetFolderSettings. --- dlls/shell32/ebrowser.c | 33 +++++++++++++++++++++++++++++++-- dlls/shell32/tests/ebrowser.c | 16 ++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 2f77063..e4e132b 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -45,6 +45,7 @@ typedef struct _ExplorerBrowserImpl { HWND hwnd_sv; EXPLORER_BROWSER_OPTIONS eb_options; + FOLDERSETTINGS fs; IShellView *psv; RECT sv_rc; @@ -70,6 +71,24 @@ static void size_panes(ExplorerBrowserImpl *This) TRUE); } +static HRESULT change_viewmode(ExplorerBrowserImpl *This, UINT viewmode) +{ + IFolderView *pfv; + HRESULT hr; + + if(!This->psv) + return E_FAIL; + + hr = IShellView_QueryInterface(This->psv, &IID_IFolderView, (void*)&pfv); + if(SUCCEEDED(hr)) + { + hr = IFolderView_SetCurrentViewMode(pfv, This->fs.ViewMode); + IFolderView_Release(pfv); + } + + return hr; +} + /************************************************************************** * Main window related functions. */ @@ -210,6 +229,9 @@ static HRESULT WINAPI IExplorerBrowser_fnInitialize(IExplorerBrowser *iface, return E_FAIL; } + This->fs.ViewMode = pfs ? pfs->ViewMode : FVM_DETAILS; + This->fs.fFlags = pfs ? (pfs->fFlags | FWF_NOCLIENTEDGE) : FWF_NOCLIENTEDGE; + return S_OK; } @@ -275,9 +297,16 @@ static HRESULT WINAPI IExplorerBrowser_fnSetFolderSettings(IExplorerBrowser *ifa const FOLDERSETTINGS *pfs) { ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; - FIXME("stub, %p (%p)\n", This, pfs); + TRACE("%p (%p)\n", This, pfs); - return E_NOTIMPL; + if(!pfs) + return E_INVALIDARG; + + This->fs.ViewMode = pfs->ViewMode; + This->fs.fFlags = pfs->fFlags | FWF_NOCLIENTEDGE; + + /* Change the settings of the current view, if any. */ + return change_viewmode(This, This->fs.ViewMode); } static HRESULT WINAPI IExplorerBrowser_fnAdvise(IExplorerBrowser *iface, diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 8486645..3397eb7 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -276,6 +276,7 @@ static void test_basics(void) { IExplorerBrowser *peb; IShellBrowser *psb; + FOLDERSETTINGS fs; ULONG lres; DWORD flags; HDWP hdwp; @@ -358,6 +359,21 @@ static void test_basics(void) ok(hr == S_OK, "got (0x%08x)\n", hr); IExplorerBrowser_Destroy(peb); + IExplorerBrowser_Release(peb); + + ebrowser_instantiate(&peb); + ebrowser_initialize(peb); + + /* SetFolderSettings */ + hr = IExplorerBrowser_SetFolderSettings(peb, NULL); + ok(hr == E_INVALIDARG, "got (0x%08x)\n", hr); + fs.ViewMode = 0; fs.fFlags = 0; + hr = IExplorerBrowser_SetFolderSettings(peb, &fs); + todo_wine ok(hr == E_INVALIDARG, "got (0x%08x)\n", hr); + + /* TODO: Test after browsing somewhere. */ + + IExplorerBrowser_Destroy(peb); lres = IExplorerBrowser_Release(peb); ok(lres == 0, "Got %d\n", lres); }

1 0

Andrew Eikum : regedit: Don't call ungetc() twice consecutively.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 06f4532cf6b434e0027ae892620e23e944ed20f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f4532cf6b434e0027ae8926… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 23 07:39:26 2010 -0500 regedit: Don't call ungetc() twice consecutively. Spotted by Sylvain Hitier. --- programs/regedit/regproc.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 82349f6..edf3d00 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -680,19 +680,18 @@ static void processRegLinesA(FILE *in, char* first_chars) } if(s[i] == '\r'){ /* read the next character iff it's \n */ + if(i+2 >= size_to_get){ + /* buffer too short, so put back the EOL char to + * read next cycle */ + ungetc('\r', in); + break; + } s[i+1] = fgetc(in); if(s[i+1] != '\n'){ ungetc(s[i+1], in); i = i+1; - }else{ - if(i+2 >= size_to_get){ - /* buffer too short, so put back the EOL chars to - * read next cycle */ - ungetc('\n', in); - ungetc('\r', in); - }else - i = i+2; - } + }else + i = i+2; break; } if(s[i] == '\n'){

1 0

Jacek Caban : mshtml: Provide profile directory to Gecko.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 99c4aca480e28fa90d122ab750997e826a87bdd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c4aca480e28fa90d122ab75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 23 15:07:30 2010 +0200 mshtml: Provide profile directory to Gecko. --- dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/nsembed.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/nsiface.idl | 12 +++++ 3 files changed, 122 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 2b46717..224a5fa 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mshtml.dll IMPORTLIB = mshtml -IMPORTS = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 +IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 EXTRADEFS = -DCOM_NO_WINDOWS_H DELAYIMPORTS = wininet diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index b2f14dd..8ea99a2 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -27,6 +27,7 @@ #include "winuser.h" #include "winreg.h" #include "ole2.h" +#include "shlobj.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -70,6 +71,7 @@ static HINSTANCE hXPCOM = NULL; static nsIServiceManager *pServMgr = NULL; static nsIComponentManager *pCompMgr = NULL; static nsIMemory *nsmem = NULL; +static nsIFile *profile_directory; static const WCHAR wszNsContainer[] = {'N','s','C','o','n','t','a','i','n','e','r',0}; @@ -77,6 +79,107 @@ static ATOM nscontainer_class; static WCHAR gecko_path[MAX_PATH]; static unsigned gecko_path_len; +static nsresult NSAPI nsDirectoryServiceProvider_QueryInterface(nsIDirectoryServiceProvider *iface, + nsIIDRef riid, void **result) +{ + if(IsEqualGUID(&IID_nsISupports, riid)) { + TRACE("(IID_nsISupports %p)\n", result); + *result = iface; + }else if(IsEqualGUID(&IID_nsIDirectoryServiceProvider, riid)) { + TRACE("(IID_nsIDirectoryServiceProvider %p)\n", result); + *result = iface; + }else { + WARN("(%s %p)\n", debugstr_guid(riid), result); + *result = NULL; + return NS_NOINTERFACE; + } + + nsISupports_AddRef((nsISupports*)*result); + return NS_OK; +} + +static nsrefcnt NSAPI nsDirectoryServiceProvider_AddRef(nsIDirectoryServiceProvider *iface) +{ + return 2; +} + +static nsrefcnt NSAPI nsDirectoryServiceProvider_Release(nsIDirectoryServiceProvider *iface) +{ + return 1; +} + +static nsresult create_profile_directory(void) +{ + static const WCHAR wine_geckoW[] = {'\\','w','i','n','e','_','g','e','c','k','o',0}; + + WCHAR path[MAX_PATH + sizeof(wine_geckoW)/sizeof(WCHAR)]; + nsAString str; + PRBool exists; + nsresult nsres; + HRESULT hres; + + hres = SHGetFolderPathW(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_DEFAULT, path); + if(FAILED(hres)) { + ERR("SHGetFolderPath failed: %08x\n", hres); + return NS_ERROR_FAILURE; + } + + strcatW(path, wine_geckoW); + nsAString_InitDepend(&str, path); + nsres = NS_NewLocalFile(&str, FALSE, &profile_directory); + nsAString_Finish(&str); + if(NS_FAILED(nsres)) { + ERR("NS_NewLocalFile failed: %08x\n", nsres); + return nsres; + } + + nsres = nsIFile_Exists(profile_directory, &exists); + if(NS_FAILED(nsres)) { + ERR("Exists failed: %08x\n", nsres); + return nsres; + } + + if(!exists) { + nsres = nsIFile_Create(profile_directory, 1, 0700); + if(NS_FAILED(nsres)) + ERR("Create failed: %08x\n", nsres); + } + + return nsres; +} + +static nsresult NSAPI nsDirectoryServiceProvider_GetFile(nsIDirectoryServiceProvider *iface, + const char *prop, PRBool *persistent, nsIFile **_retval) +{ + TRACE("(%s %p %p)\n", debugstr_a(prop), persistent, _retval); + + if(!strcmp(prop, "ProfD")) { + if(!profile_directory) { + nsresult nsres; + + nsres = create_profile_directory(); + if(NS_FAILED(nsres)) + return nsres; + } + + return nsIFile_Clone(profile_directory, _retval); + } + + return NS_ERROR_FAILURE; +} + +#undef NSWEAKREF_THIS + +static const nsIDirectoryServiceProviderVtbl nsDirectoryServiceProviderVtbl = { + nsDirectoryServiceProvider_QueryInterface, + nsDirectoryServiceProvider_AddRef, + nsDirectoryServiceProvider_Release, + nsDirectoryServiceProvider_GetFile +}; + +static nsIDirectoryServiceProvider nsDirectoryServiceProvider = + { &nsDirectoryServiceProviderVtbl }; + static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { NSContainer *This; @@ -424,7 +527,7 @@ static BOOL init_xpcom(const PRUnichar *gre_path) return FALSE; } - nsres = NS_InitXPCOM2(&pServMgr, gre_dir, NULL); + nsres = NS_InitXPCOM2(&pServMgr, gre_dir, &nsDirectoryServiceProvider); if(NS_FAILED(nsres)) { ERR("NS_InitXPCOM2 failed: %08x\n", nsres); FreeLibrary(hXPCOM); @@ -785,6 +888,11 @@ void close_gecko(void) release_nsio(); + if(profile_directory) { + nsIFile_Release(profile_directory); + profile_directory = NULL; + } + if(pCompMgr) nsIComponentManager_Release(pCompMgr); diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index ab50ee1..5b4ab6a 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1917,6 +1917,8 @@ interface nsIFile : nsISupports nsresult SetPermissionsOfLink(PRUint32 pPermissions); nsresult GetLastModifiedTime(PRInt64 *aLastModifiedTime); nsresult SetLastModifiedTime(PRInt64 aLastModifiedTime); + nsresult GetLastModifiedTimeOfLink(PRInt64 *aLastModifiedTimeOfLink); + nsresult SetLastModifiedTimeOfLink(PRInt64 aLastModifiedTimeOfLink); nsresult GetFileSize(PRInt64 *aFileSize); nsresult SetFileSize(PRInt64 aFileSize); nsresult GetFileSizeOfLink(PRInt64 *aFileSizeOfLink); @@ -1970,6 +1972,16 @@ interface nsIPrefBranch : nsISupports [ object, + uuid(bbf8cab0-d43a-11d3-8cc2-00609792278c), + local +] +interface nsIDirectoryServiceProvider : nsISupports +{ + nsresult GetFile(const char *prop, PRBool *persistent, nsIFile **_retval); +} + +[ + object, uuid(15fd6940-8ea7-11d3-93ad-00104ba0fd40), local ]

1 0

Tony Wasserka : d3dx9: Black out pixels which are outside the source rect in D3DXLoadSurfaceFromMemory if no stretching is used .
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 18b891694266435edfeece184ab7cecf3d59f56b URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b891694266435edfeece184… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Aug 21 12:54:38 2010 +0200 d3dx9: Black out pixels which are outside the source rect in D3DXLoadSurfaceFromMemory if no stretching is used. --- dlls/d3dx9_36/surface.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 487f06f..ca4fd25 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -526,6 +526,7 @@ static void make_argb_color(CONST struct argb_conversion_info *info, CONST DWORD * * Copies the source buffer to the destination buffer, performing * any necessary format conversion and color keying. + * Pixels outsize the source rect are blacked out. * Works only for ARGB formats with 1 - 4 bytes per pixel. */ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, CONST PixelFormatDesc *srcformat, @@ -555,8 +556,12 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C srcptr += srcformat->bytes_per_pixel; destptr += destformat->bytes_per_pixel; } + + if(srcsize.x < destsize.x) /* black out remaining pixels */ + ZeroMemory(destptr, destformat->bytes_per_pixel * (destsize.x - srcsize.x)); } - /* TODO: Black out unused pixels */ + if(srcsize.y < destsize.y) /* black out remaining pixels */ + ZeroMemory(dest + srcsize.y * destpitch, destpitch * (destsize.y - srcsize.y)); } /************************************************************

1 0

Tony Wasserka : d3dx9: Fix an off by one error in point_filter_simple_data.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: ecce9eebcf14ed31a4613e7fc7902a35bd2430d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecce9eebcf14ed31a4613e7fc… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Aug 21 13:07:09 2010 +0200 d3dx9: Fix an off by one error in point_filter_simple_data. --- dlls/d3dx9_36/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ca4fd25..199209f 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -586,16 +586,16 @@ static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT sr for(y = 0;y < destsize.y;y++) { BYTE *destptr = dest + y * destpitch; const BYTE *bufptr = src + srcpitch * (y * srcsize.y / destsize.y); - const BYTE *srcptr = bufptr; for(x = 0;x < destsize.x;x++) { + const BYTE *srcptr = bufptr + (x * srcsize.x / destsize.x) * srcformat->bytes_per_pixel; + /* extract source color components */ if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(const DWORD*)srcptr, channels); /* recombine the components */ if(destformat->type == FORMAT_ARGB) make_argb_color(&conv_info, channels, (DWORD*)destptr); - srcptr = bufptr + (x * srcsize.x / destsize.x) * srcformat->bytes_per_pixel; destptr += destformat->bytes_per_pixel; } }

1 0