February 2010 - Wine-Commits

Vincent Povirk : comdlg32: Add a minimal test for the font dialog.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: f45b648634ed713dde2ceea71d1b8f6da79d2e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45b648634ed713dde2ceea71… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 15 14:13:44 2010 -0600 comdlg32: Add a minimal test for the font dialog. --- dlls/comdlg32/tests/Makefile.in | 1 + dlls/comdlg32/tests/fontdlg.c | 75 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/Makefile.in b/dlls/comdlg32/tests/Makefile.in index 11ee930..969ad6b 100644 --- a/dlls/comdlg32/tests/Makefile.in +++ b/dlls/comdlg32/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = comdlg32 user32 gdi32 kernel32 CTESTS = \ filedlg.c \ + fontdlg.c \ printdlg.c RC_SRCS = rsrc.rc diff --git a/dlls/comdlg32/tests/fontdlg.c b/dlls/comdlg32/tests/fontdlg.c new file mode 100644 index 0000000..422bf8d --- /dev/null +++ b/dlls/comdlg32/tests/fontdlg.c @@ -0,0 +1,75 @@ +/* + * Unit test suite for comdlg32 API functions: font dialogs + * + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "winuser.h" +#include "objbase.h" + +#include "commdlg.h" + +#include "wine/test.h" + +static UINT_PTR CALLBACK CFHookProcOK(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + PostMessageA(hdlg, WM_COMMAND, IDOK, FALSE); + return 0; + default: + return 0; + } +} + +static void test_ChooseFontA(void) +{ + LOGFONTA lfa; + CHOOSEFONTA cfa; + BOOL ret; + + memset(&lfa, 0, sizeof(LOGFONTA)); + lfa.lfHeight = -16; + lfa.lfWeight = FW_NORMAL; + strcpy(lfa.lfFaceName, "Tahoma"); + + memset(&cfa, 0, sizeof(CHOOSEFONTA)); + cfa.lStructSize = sizeof(cfa); + cfa.lpLogFont = &lfa; + cfa.Flags = CF_ENABLEHOOK|CF_INITTOLOGFONTSTRUCT|CF_SCREENFONTS; + cfa.lpfnHook = CFHookProcOK; + + ret = ChooseFontA(&cfa); + + ok(ret == TRUE, "ChooseFontA returned FALSE\n"); + ok(lfa.lfHeight == -16, "Expected -16, got %i\n", lfa.lfHeight); + ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %i\n", lfa.lfWeight); + ok(strcmp(lfa.lfFaceName, "Tahoma") == 0, "Expected Arial, got %s\n", lfa.lfFaceName); +} + +START_TEST(fontdlg) +{ + test_ChooseFontA(); +}

1 0

Vincent Povirk : include: ChooseFont hook procedures return UINT_PTR.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: e37bbd60ac0e3b946c0d8199dbb9f6b77ae473c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37bbd60ac0e3b946c0d8199d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 15 14:13:16 2010 -0600 include: ChooseFont hook procedures return UINT_PTR. --- include/commdlg.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/commdlg.h b/include/commdlg.h index b6e40c6..67b18a2 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -264,7 +264,7 @@ DECL_WINELIB_TYPE_AW(LPFINDREPLACE) #define FR_MATCHKASHIDA 0x40000000 #define FR_MATCHALEFHAMZA 0x80000000 -typedef UINT (CALLBACK *LPCFHOOKPROC)(HWND,UINT,WPARAM,LPARAM); +typedef UINT_PTR (CALLBACK *LPCFHOOKPROC)(HWND,UINT,WPARAM,LPARAM); typedef struct tagCHOOSEFONTA {

1 0

Alexandre Julliard : advapi32/tests: Add tests for registry symlinks at the advapi32 level.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: 18a2e8390488cf4e982ea20a0504c5acc81c9030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a2e8390488cf4e982ea20a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 21:07:51 2010 +0100 advapi32/tests: Add tests for registry symlinks at the advapi32 level. --- dlls/advapi32/tests/registry.c | 147 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 140 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index dee7664..4601134 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -24,6 +24,7 @@ #include "wine/test.h" #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winreg.h" #include "winsvc.h" #include "winerror.h" @@ -34,10 +35,10 @@ static DWORD GLE; static const char * sTestpath1 = "%LONGSYSTEMVAR%\\subdir1"; static const char * sTestpath2 = "%FOO%\\subdir1"; -static HMODULE hadvapi32; static DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); static DWORD (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR); - +static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); +static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(UNICODE_STRING*); /* Debugging functions from wine/libs/wine/debug.c */ @@ -112,16 +113,19 @@ static const char *wine_debugstr_an( const char *str, int n ) } #define ADVAPI32_GET_PROC(func) \ - p ## func = (void*)GetProcAddress(hadvapi32, #func); - + p ## func = (void*)GetProcAddress(hadvapi32, #func) static void InitFunctionPtrs(void) { - hadvapi32 = GetModuleHandleA("advapi32.dll"); + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); /* This function was introduced with Windows 2003 SP1 */ - ADVAPI32_GET_PROC(RegGetValueA) - ADVAPI32_GET_PROC(RegDeleteTreeA) + ADVAPI32_GET_PROC(RegGetValueA); + ADVAPI32_GET_PROC(RegDeleteTreeA); + + pRtlFormatCurrentUserKeyPath = (void *)GetProcAddress( hntdll, "RtlFormatCurrentUserKeyPath" ); + pNtDeleteKey = (void *)GetProcAddress( hntdll, "NtDeleteKey" ); } /* delete key and all its subkeys */ @@ -1503,6 +1507,134 @@ static void test_rw_order(void) ok(!RegDeleteKey(HKEY_CURRENT_USER, keyname), "Failed to delete key\n"); } +static void test_symlinks(void) +{ + static const WCHAR targetW[] = {'\\','S','o','f','t','w','a','r','e','\\','W','i','n','e', + '\\','T','e','s','t','\\','t','a','r','g','e','t',0}; + BYTE buffer[1024]; + UNICODE_STRING target_str; + WCHAR *target; + HKEY key, link; + NTSTATUS status; + DWORD target_len, type, len, dw, err; + + if (!pRtlFormatCurrentUserKeyPath || !pNtDeleteKey) + { + win_skip( "Can't perform symlink tests\n" ); + return; + } + + pRtlFormatCurrentUserKeyPath( &target_str ); + + target_len = target_str.Length + sizeof(targetW); + target = HeapAlloc( GetProcessHeap(), 0, target_len ); + memcpy( target, target_str.Buffer, target_str.Length ); + memcpy( target + target_str.Length/sizeof(WCHAR), targetW, sizeof(targetW) ); + + err = RegCreateKeyExA( hkey_main, "link", 0, NULL, REG_OPTION_CREATE_LINK, + KEY_ALL_ACCESS, NULL, &link, NULL ); + ok( err == ERROR_SUCCESS, "RegCreateKeyEx failed: %u\n", err ); + + /* REG_SZ is not allowed */ + err = RegSetValueExA( link, "SymbolicLinkValue", 0, REG_SZ, (BYTE *)"foobar", sizeof("foobar") ); + ok( err == ERROR_ACCESS_DENIED, "RegSetValueEx wrong error %u\n", err ); + err = RegSetValueExA( link, "SymbolicLinkValue", 0, REG_LINK, + (BYTE *)target, target_len - sizeof(WCHAR) ); + ok( err == ERROR_SUCCESS, "RegSetValueEx failed error %u\n", err ); + /* other values are not allowed */ + err = RegSetValueExA( link, "link", 0, REG_LINK, (BYTE *)target, target_len - sizeof(WCHAR) ); + ok( err == ERROR_ACCESS_DENIED, "RegSetValueEx wrong error %u\n", err ); + + /* try opening the target through the link */ + + err = RegOpenKeyA( hkey_main, "link", &key ); + ok( err == ERROR_FILE_NOT_FOUND, "RegOpenKey wrong error %u\n", err ); + + err = RegCreateKeyExA( hkey_main, "target", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL ); + ok( err == ERROR_SUCCESS, "RegCreateKeyEx failed error %u\n", err ); + + dw = 0xbeef; + err = RegSetValueExA( key, "value", 0, REG_DWORD, (BYTE *)&dw, sizeof(dw) ); + ok( err == ERROR_SUCCESS, "RegSetValueEx failed error %u\n", err ); + RegCloseKey( key ); + + err = RegOpenKeyA( hkey_main, "link", &key ); + ok( err == ERROR_SUCCESS, "RegOpenKey failed error %u\n", err ); + + len = sizeof(buffer); + err = RegQueryValueExA( key, "value", NULL, &type, buffer, &len ); + ok( err == ERROR_SUCCESS, "RegOpenKey failed error %u\n", err ); + ok( len == sizeof(DWORD), "wrong len %u\n", len ); + + len = sizeof(buffer); + err = RegQueryValueExA( key, "SymbolicLinkValue", NULL, &type, buffer, &len ); + ok( err == ERROR_FILE_NOT_FOUND, "RegQueryValueEx wrong error %u\n", err ); + + /* REG_LINK can be created in non-link keys */ + err = RegSetValueExA( key, "SymbolicLinkValue", 0, REG_LINK, + (BYTE *)target, target_len - sizeof(WCHAR) ); + ok( err == ERROR_SUCCESS, "RegSetValueEx failed error %u\n", err ); + len = sizeof(buffer); + err = RegQueryValueExA( key, "SymbolicLinkValue", NULL, &type, buffer, &len ); + ok( err == ERROR_SUCCESS, "RegQueryValueEx failed error %u\n", err ); + ok( len == target_len - sizeof(WCHAR), "wrong len %u\n", len ); + err = RegDeleteValueA( key, "SymbolicLinkValue" ); + ok( err == ERROR_SUCCESS, "RegDeleteValue failed error %u\n", err ); + + RegCloseKey( key ); + + err = RegCreateKeyExA( hkey_main, "link", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL ); + ok( err == ERROR_SUCCESS, "RegCreateKeyEx failed error %u\n", err ); + + len = sizeof(buffer); + err = RegQueryValueExA( key, "value", NULL, &type, buffer, &len ); + ok( err == ERROR_SUCCESS, "RegQueryValueEx failed error %u\n", err ); + ok( len == sizeof(DWORD), "wrong len %u\n", len ); + + err = RegQueryValueExA( key, "SymbolicLinkValue", NULL, &type, buffer, &len ); + ok( err == ERROR_FILE_NOT_FOUND, "RegQueryValueEx wrong error %u\n", err ); + RegCloseKey( key ); + + /* now open the symlink itself */ + + err = RegOpenKeyExA( hkey_main, "link", REG_OPTION_OPEN_LINK, KEY_ALL_ACCESS, &key ); + ok( err == ERROR_SUCCESS, "RegOpenKeyEx failed error %u\n", err ); + len = sizeof(buffer); + err = RegQueryValueExA( key, "SymbolicLinkValue", NULL, &type, buffer, &len ); + ok( err == ERROR_SUCCESS, "RegQueryValueEx failed error %u\n", err ); + ok( len == target_len - sizeof(WCHAR), "wrong len %u\n", len ); + RegCloseKey( key ); + + err = RegCreateKeyExA( hkey_main, "link", 0, NULL, REG_OPTION_OPEN_LINK, + KEY_ALL_ACCESS, NULL, &key, NULL ); + ok( err == ERROR_SUCCESS, "RegCreateKeyEx failed error %u\n", err ); + len = sizeof(buffer); + err = RegQueryValueExA( key, "SymbolicLinkValue", NULL, &type, buffer, &len ); + ok( err == ERROR_SUCCESS, "RegQueryValueEx failed error %u\n", err ); + ok( len == target_len - sizeof(WCHAR), "wrong len %u\n", len ); + RegCloseKey( key ); + + err = RegCreateKeyExA( hkey_main, "link", 0, NULL, REG_OPTION_CREATE_LINK, + KEY_ALL_ACCESS, NULL, &key, NULL ); + ok( err == ERROR_ALREADY_EXISTS, "RegCreateKeyEx wrong error %u\n", err ); + + err = RegCreateKeyExA( hkey_main, "link", 0, NULL, REG_OPTION_CREATE_LINK | REG_OPTION_OPEN_LINK, + KEY_ALL_ACCESS, NULL, &key, NULL ); + ok( err == ERROR_ALREADY_EXISTS, "RegCreateKeyEx wrong error %u\n", err ); + + err = RegDeleteKey( hkey_main, "target" ); + ok( err == ERROR_SUCCESS, "RegDeleteKey failed error %u\n", err ); + + err = RegDeleteKey( hkey_main, "link" ); + ok( err == ERROR_FILE_NOT_FOUND, "RegDeleteKey wrong error %u\n", err ); + + status = pNtDeleteKey( link ); + ok( !status, "NtDeleteKey failed: 0x%08x\n", status ); + RegCloseKey( link ); + + HeapFree( GetProcessHeap(), 0, target ); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -1520,6 +1652,7 @@ START_TEST(registry) test_reg_delete_key(); test_reg_query_value(); test_string_termination(); + test_symlinks(); /* SaveKey/LoadKey require the SE_BACKUP_NAME privilege to be set */ if (set_privileges(SE_BACKUP_NAME, TRUE) &&

1 0

Alexandre Julliard : server: Implement registry symlinks.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: b139b935c4b6e84ea6c76d018d53789f586b0be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b139b935c4b6e84ea6c76d018… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 21:04:26 2010 +0100 server: Implement registry symlinks. --- dlls/ntdll/tests/reg.c | 30 ------------- server/registry.c | 114 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 97 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b139b935c4b6e84ea6c76…

1 0

Alexandre Julliard : advapi32: Add support for registry symlinks.
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: 6c07850270f9ad1e7001445cc6a8723248c1fc45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c07850270f9ad1e7001445cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 21:07:36 2010 +0100 advapi32: Add support for registry symlinks. --- dlls/advapi32/registry.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 84320d1..7faee3c 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -190,6 +190,7 @@ LSTATUS WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; + if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; RtlInitUnicodeString( &nameW, name ); RtlInitUnicodeString( &classW, class ); @@ -244,6 +245,7 @@ LSTATUS WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR cl attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; + if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; RtlInitAnsiString( &nameA, name ); RtlInitAnsiString( &classA, class ); @@ -301,7 +303,7 @@ LSTATUS WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpSubKey, PHKEY phkResult ) * * See RegOpenKeyExA. */ -LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, REGSAM access, PHKEY retkey ) +LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM access, PHKEY retkey ) { OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; @@ -317,6 +319,7 @@ LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, REGSAM ac attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; + if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; RtlInitUnicodeString( &nameW, name ); return RtlNtStatusToDosError( NtOpenKey( (PHANDLE)retkey, access, &attr ) ); } @@ -330,7 +333,7 @@ LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, REGSAM ac * PARAMS * hkey [I] Handle of open key * name [I] Name of subkey to open - * reserved [I] Reserved - must be zero + * options [I] Open options (can be set to REG_OPTION_OPEN_LINK) * access [I] Security access mask * retkey [O] Handle to open key * @@ -342,7 +345,7 @@ LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, REGSAM ac * Unlike RegCreateKeyExA(), this function will not create the key if it * does not exist. */ -LSTATUS WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM access, PHKEY retkey ) +LSTATUS WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD options, REGSAM access, PHKEY retkey ) { OBJECT_ATTRIBUTES attr; STRING nameA; @@ -363,6 +366,7 @@ LSTATUS WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM acc attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; + if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; RtlInitAnsiString( &nameA, name ); if (!(status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString,

1 0

Rico Schüller : d3d10: Fix a HeapFree() in d3d10_effect_Release().
by Alexandre Julliard Feb. 16, 2010

Feb. 16, 2010

Module: wine Branch: master Commit: 71a96755b274704e3ba216f91973ef026a93a20e URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a96755b274704e3ba216f91… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 15 20:01:26 2010 +0100 d3d10: Fix a HeapFree() in d3d10_effect_Release(). --- dlls/d3d10/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9249c11..a24a728 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1951,7 +1951,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) for (i = 0; i < This->anonymous_shader_count; ++i) { d3d10_effect_variable_destroy(&This->anonymous_shaders[i].shader); - HeapFree(GetProcessHeap(), 0, &This->anonymous_shaders[i].type.name); + HeapFree(GetProcessHeap(), 0, This->anonymous_shaders[i].type.name); } HeapFree(GetProcessHeap(), 0, This->anonymous_shaders); }

1 0

Hans Leidekker : msi: Implement and test MsiGetPatchInfoA/W.
by Alexandre Julliard Feb. 15, 2010

Feb. 15, 2010

Module: wine Branch: master Commit: 438ad93b223dc8cb722b1550adca160a59812e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=438ad93b223dc8cb722b1550a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 15 16:18:30 2010 +0100 msi: Implement and test MsiGetPatchInfoA/W. --- dlls/msi/msi.c | 87 ++++++++++++++++++++++++ dlls/msi/msi.spec | 4 +- dlls/msi/tests/msi.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/msi.h | 4 + 4 files changed, 271 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=438ad93b223dc8cb722b1…

1 0

Jacek Caban : mshtml: Added IViewObject::SetSink tests.
by Alexandre Julliard Feb. 15, 2010

Feb. 15, 2010

Module: wine Branch: master Commit: 38933b1a31b1a389f78a65430e79e03f3983ff13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38933b1a31b1a389f78a65430… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 16:04:06 2010 +0100 mshtml: Added IViewObject::SetSink tests. --- dlls/mshtml/tests/htmldoc.c | 104 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 87 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 1cb18c1..d49a6ff 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -152,6 +152,7 @@ DEFINE_EXPECT(Frame_EnableModeless_FALSE); DEFINE_EXPECT(Frame_GetWindow); DEFINE_EXPECT(TranslateUrl); DEFINE_EXPECT(Advise_Close); +DEFINE_EXPECT(OnViewChange); static IUnknown *doc_unk; static IMoniker *doc_mon; @@ -2678,50 +2679,60 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { static IServiceProvider ServiceProvider = { &ServiceProviderVtbl }; -static HRESULT WINAPI AdviseSink_QueryInterface(IAdviseSink *iface, +static HRESULT WINAPI AdviseSink_QueryInterface(IAdviseSinkEx *iface, REFIID riid, void **ppv) { return QueryInterface(riid, ppv); } -static ULONG WINAPI AdviseSink_AddRef(IAdviseSink *iface) +static ULONG WINAPI AdviseSink_AddRef(IAdviseSinkEx *iface) { return 2; } -static ULONG WINAPI AdviseSink_Release(IAdviseSink *iface) +static ULONG WINAPI AdviseSink_Release(IAdviseSinkEx *iface) { return 1; } -static void WINAPI AdviseSink_OnDataChange(IAdviseSink *iface, +static void WINAPI AdviseSink_OnDataChange(IAdviseSinkEx *iface, FORMATETC *pFormatetc, STGMEDIUM *pStgmed) { ok(0, "unexpected call\n"); } -static void WINAPI AdviseSink_OnViewChange(IAdviseSink *iface, +static void WINAPI AdviseSink_OnViewChange(IAdviseSinkEx *iface, DWORD dwAspect, LONG lindex) { ok(0, "unexpected call\n"); } -static void WINAPI AdviseSink_OnRename(IAdviseSink *iface, IMoniker *pmk) +static void WINAPI AdviseSink_OnRename(IAdviseSinkEx *iface, IMoniker *pmk) { ok(0, "unexpected call\n"); } -static void WINAPI AdviseSink_OnSave(IAdviseSink *iface) +static void WINAPI AdviseSink_OnSave(IAdviseSinkEx *iface) { ok(0, "unexpected call\n"); } -static void WINAPI AdviseSink_OnClose(IAdviseSink *iface) +static void WINAPI AdviseSink_OnClose(IAdviseSinkEx *iface) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI AdviseSinkEx_OnViewStatusChange(IAdviseSinkEx *iface, DWORD dwViewStatus) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI ObjectAdviseSink_OnClose(IAdviseSinkEx *iface) { CHECK_EXPECT(Advise_Close); } -static const IAdviseSinkVtbl AdviseSinkVtbl = { +static const IAdviseSinkExVtbl AdviseSinkVtbl = { AdviseSink_QueryInterface, AdviseSink_AddRef, AdviseSink_Release, @@ -2729,10 +2740,47 @@ static const IAdviseSinkVtbl AdviseSinkVtbl = { AdviseSink_OnViewChange, AdviseSink_OnRename, AdviseSink_OnSave, - AdviseSink_OnClose + ObjectAdviseSink_OnClose, + AdviseSinkEx_OnViewStatusChange +}; + +static IAdviseSinkEx AdviseSink = { &AdviseSinkVtbl }; + +static HRESULT WINAPI ViewAdviseSink_QueryInterface(IAdviseSinkEx *iface, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IAdviseSinkEx, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static void WINAPI ViewAdviseSink_OnViewChange(IAdviseSinkEx *iface, + DWORD dwAspect, LONG lindex) +{ + CHECK_EXPECT2(OnViewChange); + + ok(dwAspect == DVASPECT_CONTENT, "dwAspect = %d\n", dwAspect); + ok(lindex == -1, "lindex = %d\n", lindex); +} + +static const IAdviseSinkExVtbl ViewAdviseSinkVtbl = { + ViewAdviseSink_QueryInterface, + AdviseSink_AddRef, + AdviseSink_Release, + AdviseSink_OnDataChange, + ViewAdviseSink_OnViewChange, + AdviseSink_OnRename, + AdviseSink_OnSave, + AdviseSink_OnClose, + AdviseSinkEx_OnViewStatusChange }; -static IAdviseSink AdviseSink = { &AdviseSinkVtbl }; +static IAdviseSinkEx ViewAdviseSink = { &ViewAdviseSinkVtbl }; DEFINE_GUID(IID_unk1, 0xD48A6EC6,0x6A4A,0x11CF,0x94,0xA7,0x44,0x45,0x53,0x54,0x00,0x00); /* HTMLWindow2 ? */ DEFINE_GUID(IID_IThumbnailView, 0x7BB0B520,0xB1A7,0x11D2,0xBB,0x23,0x00,0xC0,0x4F,0x79,0xAB,0xCD); @@ -2919,6 +2967,20 @@ static void _test_readyState(unsigned line, IUnknown *unk) IHTMLDocument2_Release(htmldoc); } +static void test_ViewAdviseSink(IHTMLDocument2 *doc) +{ + IViewObject *view; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IViewObject, (void**)&view); + ok(hres == S_OK, "QueryInterface(IID_IViewObject) failed: %08x\n", hres); + + hres = IViewObject_SetAdvise(view, DVASPECT_CONTENT, ADVF_PRIMEFIRST, (IAdviseSink*)&ViewAdviseSink); + ok(hres == S_OK, "SetAdvise failed: %08x\n", hres); + + IViewObject_Release(view); +} + static void test_ConnectionPoint(IConnectionPointContainer *container, REFIID riid) { IConnectionPointContainer *tmp_container = NULL; @@ -3100,6 +3162,7 @@ static void test_download(DWORD flags) SET_EXPECT(SetStatusText); if(!(flags & DWL_EMPTY)) SET_EXPECT(Exec_SETDOWNLOADSTATE_1); + SET_EXPECT(OnViewChange); SET_EXPECT(GetDropTarget); if(flags & DWL_TRYCSS) SET_EXPECT(Exec_ShellDocView_84); @@ -3148,6 +3211,7 @@ static void test_download(DWORD flags) CHECK_CALLED(SetStatusText); if(!(flags & DWL_EMPTY)) CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); + CHECK_CALLED(OnViewChange); CHECK_CALLED(GetDropTarget); if(flags & DWL_TRYCSS) SET_CALLED(Exec_ShellDocView_84); @@ -3845,14 +3909,14 @@ static void test_Advise(IHTMLDocument2 *doc) ok(hres == E_INVALIDARG || hres == S_OK, "Advise returned: %08x\n", hres); ok(conn == 0 || conn == 1, "conn = %d\n", conn); - hres = IOleObject_Advise(oleobj, &AdviseSink, NULL); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, NULL); ok(hres == E_INVALIDARG, "Advise returned: %08x\n", hres); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise returned: %08x\n", hres); ok(conn == 1, "conn = %d\n", conn); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise returned: %08x\n", hres); ok(conn == 2, "conn = %d\n", conn); @@ -4281,6 +4345,7 @@ static void test_HTMLDocument(BOOL do_load) test_IsDirty(doc, S_FALSE); test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); test_external(doc, FALSE); + test_ViewAdviseSink(doc); test_ConnectionPointContainer(doc); test_GetCurMoniker((IUnknown*)doc, NULL, NULL); test_Persist(doc, &Moniker); @@ -4376,6 +4441,7 @@ static void test_HTMLDocument_hlink(void) return; doc_unk = (IUnknown*)doc; + test_ViewAdviseSink(doc); test_ConnectionPointContainer(doc); test_GetCurMoniker((IUnknown*)doc, NULL, NULL); test_Persist(doc, &Moniker); @@ -4476,6 +4542,7 @@ static void test_HTMLDocument_http(void) hres = CreateURLMoniker(NULL, http_urlW, &http_mon); ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); + test_ViewAdviseSink(doc); test_ConnectionPointContainer(doc); test_GetCurMoniker((IUnknown*)doc, NULL, NULL); test_Persist(doc, http_mon); @@ -4551,11 +4618,12 @@ static void test_HTMLDocument_StreamLoad(void) hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise failed: %08x\n", hres); test_readyState((IUnknown*)doc); test_IsDirty(doc, S_FALSE); + test_ViewAdviseSink(doc); test_ConnectionPointContainer(doc); test_QueryService(doc, FALSE); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); @@ -4608,11 +4676,12 @@ static void test_HTMLDocument_StreamInitNew(void) hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise failed: %08x\n", hres); test_readyState((IUnknown*)doc); test_IsDirty(doc, S_FALSE); + test_ViewAdviseSink(doc); test_ConnectionPointContainer(doc); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj); @@ -4691,10 +4760,11 @@ static void test_editing_mode(BOOL do_load) hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); - hres = IOleObject_Advise(oleobj, &AdviseSink, &conn); + hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); ok(hres == S_OK, "Advise failed: %08x\n", hres); test_readyState((IUnknown*)doc); + test_ViewAdviseSink(doc); test_ConnectionPointContainer(doc); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj);

1 0

Jacek Caban : mshtml: Added IViewObject::SetAdvise implementation.
by Alexandre Julliard Feb. 15, 2010

Feb. 15, 2010

Module: wine Branch: master Commit: a84741182ff36f01e3972fd8b075b008f4e2af5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84741182ff36f01e3972fd8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 16:03:25 2010 +0100 mshtml: Added IViewObject::SetAdvise implementation. --- dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 2 ++ dlls/mshtml/nsevents.c | 3 +++ dlls/mshtml/view.c | 15 +++++++++++++-- 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f99ab29..935ec00 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1992,6 +1992,8 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) if(This->basedoc.advise_holder) IOleAdviseHolder_Release(This->basedoc.advise_holder); + if(This->view_sink) + IAdviseSink_Release(This->view_sink); if(This->client) IOleObject_SetClientSite(OLEOBJ(&This->basedoc), NULL); if(This->in_place_active) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2fafdf0..c65bffa 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -380,6 +380,7 @@ struct HTMLDocumentObj { IOleInPlaceSite *ipsite; IOleInPlaceFrame *frame; IOleInPlaceUIWindow *ip_window; + IAdviseSink *view_sink; DOCHOSTUIINFO hostinfo; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 0adf87e..61ceca8 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -322,6 +322,8 @@ static void parse_complete_proc(task_t *task) init_editor(&doc->basedoc); call_explorer_69(doc); + if(doc->view_sink) + IAdviseSink_OnViewChange(doc->view_sink, DVASPECT_CONTENT, -1); call_property_onchanged(&doc->basedoc.cp_propnotif, 1005); call_explorer_69(doc); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 2dd8248..65bcae0 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -236,6 +236,9 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event set_ready_state(doc->basedoc.window, READYSTATE_COMPLETE); if(doc == doc_obj->basedoc.doc_node) { + if(doc_obj->view_sink) + IAdviseSink_OnViewChange(doc_obj->view_sink, DVASPECT_CONTENT, -1); + if(doc_obj->frame) { static const WCHAR wszDone[] = {'D','o','n','e',0}; IOleInPlaceFrame_SetStatusText(doc_obj->frame, wszDone); diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index f4c62a0..261e959 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -807,8 +807,19 @@ static HRESULT WINAPI ViewObject_Unfreeze(IViewObjectEx *iface, DWORD dwFreeze) static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink) { HTMLDocument *This = VIEWOBJ_THIS(iface); - FIXME("(%p)->(%d %d %p)\n", This, aspects, advf, pAdvSink); - return E_NOTIMPL; + + TRACE("(%p)->(%d %d %p)\n", This, aspects, advf, pAdvSink); + + if(aspects != DVASPECT_CONTENT || advf != ADVF_PRIMEFIRST) + FIXME("unsuported arguments\n"); + + if(This->doc_obj->view_sink) + IAdviseSink_Release(This->doc_obj->view_sink); + if(pAdvSink) + IAdviseSink_AddRef(pAdvSink); + + This->doc_obj->view_sink = pAdvSink; + return S_OK; } static HRESULT WINAPI ViewObject_GetAdvise(IViewObjectEx *iface, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink)

1 0

Detlef Riekenberg : shlwapi/tests: Use defined settings when testing GetAcceptLanguages.
by Alexandre Julliard Feb. 15, 2010

Feb. 15, 2010

Module: wine Branch: master Commit: c723015fdc42ed3431c60c325ca6b3a1f2147222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c723015fdc42ed3431c60c325… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 15 13:47:55 2010 +0100 shlwapi/tests: Use defined settings when testing GetAcceptLanguages. --- dlls/shlwapi/tests/ordinal.c | 336 ++++++++++++++++++++++++++++++------------ 1 files changed, 238 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c723015fdc42ed3431c60…

1 0