February 2009 - Wine-Commits

Detlef Riekenberg : winspool: Move EnumPortsW to the backend.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 857e942992bea953ddffaf57d8a907a7d552748d URL: http://source.winehq.org/git/wine.git/?a=commit;h=857e942992bea953ddffaf57d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Feb 8 16:45:08 2009 +0100 winspool: Move EnumPortsW to the backend. --- dlls/localspl/provider.c | 229 +++++++++++++++++++++++++++++++++++++++++++++- dlls/winspool.drv/info.c | 212 +++---------------------------------------- 2 files changed, 241 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=857e942992bea953ddffa…

1 0

Detlef Riekenberg : spoolss: Implement EnumMonitors.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: c861e03866ee670a9ae99df6af4c774a1ff0c2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c861e03866ee670a9ae99df6a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Feb 8 16:49:38 2009 +0100 spoolss: Implement EnumMonitors. --- dlls/spoolss/router.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ dlls/spoolss/spoolss.spec | 2 +- 2 files changed, 64 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 0cd24a7..c3b9bb8 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -271,3 +271,66 @@ BOOL backend_load_all(void) return (pb != NULL); } + +/****************************************************************************** + * backend_first [internal] + * + * find the first usable backend + * + * RETURNS + * Success: PTR to the backend + * Failure: NULL + * + */ +static backend_t * backend_first(LPWSTR name) +{ + /* test for the local system first */ + if(!name || !name[0]) return backend[0]; + + FIXME("server %s not supported\n", debugstr_w(name)); + return NULL; +} + +/****************************************************************** + * EnumMonitorsW (spoolss.@) + * + * Enumerate available Port-Monitors + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level + * pMonitors [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at pMonitors + * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / required for pMonitors + * pcReturned [O] PTR to DWORD that receives the number of Monitors in pMonitors + * + * RETURNS + * Success: TRUE + * Failure: FALSE and in pcbNeeded the Bytes required for pMonitors, if cbBuf is too small + * + */ +BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbBuf, + LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + backend_t * pb; + DWORD res = ROUTER_UNKNOWN; + + TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pMonitors, + cbBuf, pcbNeeded, pcReturned); + + if (pcbNeeded) *pcbNeeded = 0; + if (pcReturned) *pcReturned = 0; + + pb = backend_first(pName); + if (pb && pb->fpEnumMonitors) + res = pb->fpEnumMonitors(pName, Level, pMonitors, cbBuf, pcbNeeded, pcReturned); + else + { + SetLastError(ERROR_PROC_NOT_FOUND); + } + + TRACE("got %u with %u (%u byte for %u entries)\n\n", res, GetLastError(), + pcbNeeded ? *pcbNeeded : 0, pcReturned ? *pcReturned : 0); + + return (res == ROUTER_SUCCESS); +} diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index da5ee04..237bab1 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -45,7 +45,7 @@ @ stub EndPagePrinter @ stub EnumFormsW @ stub EnumJobsW -@ stub EnumMonitorsW +@ stdcall EnumMonitorsW(wstr long ptr long ptr ptr) @ stub EnumPerMachineConnectionsW @ stdcall EnumPortsW(wstr long ptr ptr ptr ptr) winspool.drv.EnumPortsW @ stub EnumPrintProcessorDatatypesW

1 0

Paul Vriens : fusion/tests: Skip tests on .NET 1.1.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: f803e9d316613fba494c6dad57c14f71e3e74781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f803e9d316613fba494c6dad5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Feb 9 13:39:37 2009 +0100 fusion/tests: Skip tests on .NET 1.1. --- dlls/fusion/tests/asmcache.c | 29 +++++++++++++++++++++++++++++ include/corerror.h | 2 ++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 4c36a63..58aadf4 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -835,6 +835,32 @@ static void create_assembly(LPCSTR file) CloseHandle(hfile); } +static BOOL check_dotnet20(void) +{ + IAssemblyCache *cache; + HRESULT hr; + BOOL ret = FALSE; + + static const WCHAR winedll[] = {'w','i','n','e','.','d','l','l',0}; + + create_assembly("wine.dll"); + + hr = pCreateAssemblyCache(&cache, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IAssemblyCache_InstallAssembly(cache, 0, winedll, NULL); + if (hr == S_OK) + ret = TRUE; + else if (hr == CLDB_E_FILE_OLDVER) + win_skip("Tests can't be run on older .NET version (.NET 1.1)\n"); + else + ok(0, "Expected S_OK, got %08x\n", hr); + + DeleteFileA("wine.dll"); + IAssemblyCache_Release(cache); + return ret; +} + static void test_CreateAssemblyCache(void) { IAssemblyCache *cache; @@ -1464,6 +1490,9 @@ START_TEST(asmcache) if (!init_functionpointers()) return; + if (!check_dotnet20()) + return; + test_CreateAssemblyCache(); test_InstallAssembly(); test_QueryAssemblyInfo(); diff --git a/include/corerror.h b/include/corerror.h index 8a04699..892fc28 100644 --- a/include/corerror.h +++ b/include/corerror.h @@ -121,4 +121,6 @@ #define FUSION_E_INVALID_NAME EMAKEHR(0x1047) +#define CLDB_E_FILE_OLDVER EMAKEHR(0x1107) + #endif /* __WINE_CORERROR_H */

1 0

Francois Gouget : shell32: Make ILGetDisplayNameExA() static, remove WINAPI and fix its documentation.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 54b2984de2dab0009f034e8a1c955489753125e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b2984de2dab0009f034e8a1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 9 12:15:06 2009 +0100 shell32: Make ILGetDisplayNameExA() static, remove WINAPI and fix its documentation. --- dlls/shell32/pidl.c | 7 +++++-- dlls/shell32/pidl.h | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 5dc07a1..a7a0771 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -59,7 +59,7 @@ static LPSTR _ILGetSTextPointer(LPCITEMIDLIST pidl); static LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl); /************************************************************************* - * ILGetDisplayNameEx [SHELL32.186] + * ILGetDisplayNameExA * * Retrieves the display name of an ItemIDList * @@ -75,7 +75,7 @@ static LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl); * RETURNS * True if the display name could be retrieved successfully, False otherwise */ -BOOL WINAPI ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR path, DWORD type) +static BOOL ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR path, DWORD type) { BOOL ret = FALSE; WCHAR wPath[MAX_PATH]; @@ -160,6 +160,9 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa return SUCCEEDED(ret); } +/************************************************************************* + * ILGetDisplayNameEx [SHELL32.186] + */ BOOL WINAPI ILGetDisplayNameEx(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPVOID path, DWORD type) { TRACE_(shell)("%p %p %p %d\n", psf, pidl, path, type); diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index 0a84c4c..78a9bc3 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -270,7 +270,6 @@ void _ILFreeaPidl(LPITEMIDLIST * apidl, UINT cidl); LPITEMIDLIST * _ILCopyaPidl(const LPCITEMIDLIST * apidlsrc, UINT cidl); LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida); -BOOL WINAPI ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR path, DWORD type); BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type); #endif

1 0

Michael Stefaniuc : oleaut32: Remove superfluous pointer casts.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: a3f8fd71e1f75d75beb5630328b97621f2734fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f8fd71e1f75d75beb563032… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 9 09:45:52 2009 +0100 oleaut32: Remove superfluous pointer casts. --- dlls/oleaut32/connpt.c | 8 ++++---- dlls/oleaut32/dispatch.c | 2 +- dlls/oleaut32/oleaut.c | 4 ++-- dlls/oleaut32/olefont.c | 18 +++++++++--------- dlls/oleaut32/olepicture.c | 16 ++++++++-------- dlls/oleaut32/recinfo.c | 2 +- dlls/oleaut32/safearray.c | 36 ++++++++++++++++++------------------ dlls/oleaut32/tests/safearray.c | 2 +- dlls/oleaut32/tmarshal.c | 12 ++++++------ dlls/oleaut32/typelib.c | 9 ++++----- dlls/oleaut32/ungif.c | 16 ++++++++-------- dlls/oleaut32/usrmarshal.c | 12 ++++++------ dlls/oleaut32/varformat.c | 2 +- 13 files changed, 69 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3f8fd71e1f75d75beb56…

1 0

Florian Tobias Schandinat : winedos: Adjust get_timer_val calls to prevent buffer overflow.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 15d07b5c9ae4b62b47a8a4842d9a38c70f49eca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d07b5c9ae4b62b47a8a4842… Author: Florian Tobias Schandinat <FlorianSchandinat(a)gmx.de> Date: Mon Feb 9 10:23:47 2009 +0100 winedos: Adjust get_timer_val calls to prevent buffer overflow. --- dlls/winedos/ioports.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winedos/ioports.c b/dlls/winedos/ioports.c index e9a825f..fef2d85 100644 --- a/dlls/winedos/ioports.c +++ b/dlls/winedos/ioports.c @@ -708,17 +708,17 @@ void WINAPI DOSVM_outport( int port, int size, DWORD value ) if (value & 0x02 && !(tmr_8253[0].flags & TMR_LATCHED)) { tmr_8253[0].flags |= TMR_LATCHED; - tmr_8253[0].latch = get_timer_val(chan); + tmr_8253[0].latch = get_timer_val(0); } if (value & 0x04 && !(tmr_8253[1].flags & TMR_LATCHED)) { tmr_8253[1].flags |= TMR_LATCHED; - tmr_8253[1].latch = get_timer_val(chan); + tmr_8253[1].latch = get_timer_val(1); } if (value & 0x08 && !(tmr_8253[2].flags & TMR_LATCHED)) { tmr_8253[2].flags |= TMR_LATCHED; - tmr_8253[2].latch = get_timer_val(chan); + tmr_8253[2].latch = get_timer_val(2); } }

1 0

Alexandre Julliard : user32/tests: Fix some window test failures on various Windows platforms.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: a5162b62e7ea49869d62618fced038d901bba1cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5162b62e7ea49869d62618fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 9 14:20:17 2009 +0100 user32/tests: Fix some window test failures on various Windows platforms. --- dlls/user32/tests/win.c | 48 +++++++++++++++++++++++++++++++++------------- 1 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f3befc4..496a770 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -986,6 +986,14 @@ static void test_shell_window(void) DWORD pid; HANDLE hProcess; + GetWindowThreadProcessId(shellWindow, &pid); + hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid); + if (!hProcess) + { + skip( "cannot get access to shell process\n" ); + return; + } + SetLastError(0xdeadbeef); ret = DestroyWindow(shellWindow); error = GetLastError(); @@ -996,8 +1004,6 @@ static void test_shell_window(void) "got %u after DestroyWindow(shellWindow)\n", error); /* close old shell instance */ - GetWindowThreadProcessId(shellWindow, &pid); - hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid); ret = TerminateProcess(hProcess, 0); ok(ret, "termination of previous shell process failed: GetLastError()=%d\n", GetLastError()); WaitForSingleObject(hProcess, INFINITE); /* wait for termination */ @@ -2624,9 +2630,16 @@ static void test_keyboard_input(HWND hwnd) flush_events( TRUE ); PostMessageA(hwnd, WM_KEYDOWN, 0, 0); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + do + { + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ok( ret, "no message available\n"); + } + while (ret && msg.message >= 0xc000); ok(msg.hwnd == hwnd && msg.message == WM_KEYDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + do + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + while (ret && (msg.message == WM_TIMER || msg.message >= 0xc000)); ok( !ret, "message %04x available\n", msg.message); ok(GetFocus() == hwnd, "wrong focus window %p\n", GetFocus()); @@ -2755,7 +2768,7 @@ static void test_mouse_input(HWND hwnd) /* FIXME: SetCursorPos in Wine generates additional WM_MOUSEMOVE message */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) { - if (msg.message >= 0xc000) continue; /* skip registered messages */ + if (msg.message == WM_TIMER || msg.message >= 0xc000) continue; /* skip registered messages */ ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); } @@ -2778,8 +2791,10 @@ static void test_mouse_input(HWND hwnd) /* test mouse clicks */ ShowWindow(hwnd, SW_SHOW); + SetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); flush_events( TRUE ); ShowWindow(popup, SW_SHOW); + SetWindowPos( popup, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); flush_events( TRUE ); mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); @@ -3440,10 +3455,12 @@ static void test_params(void) 0, 0, 100, 100, NULL, (HMENU)1, NULL, 0); - ok(!hwnd, "CreateWindow with invalid menu handle should fail\n"); - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE || /* NT */ - GetLastError() == 0xdeadbeef, /* Win9x */ - "wrong last error value %d\n", GetLastError()); + ok(!hwnd || broken(hwnd != NULL), /* w2k3 sp2 */ + "CreateWindow with invalid menu handle should fail\n"); + if (!hwnd) + ok(GetLastError() == ERROR_INVALID_MENU_HANDLE || /* NT */ + GetLastError() == 0xdeadbeef, /* Win9x */ + "wrong last error value %d\n", GetLastError()); } static void test_AWRwindow(LPCSTR class, LONG style, LONG exStyle, BOOL menu) @@ -4828,11 +4845,14 @@ static void test_GetWindowModuleFileName(void) buf2[0] = 0; SetLastError(0xdeadbeef); ret2 = pGetWindowModuleFileNameA(hwnd, buf2, sizeof(buf2)); - ok(ret2, "GetWindowModuleFileNameA error %u\n", GetLastError()); - - ok(ret1 == ret2 || broken(ret2 == ret1 + 1), /* win98 */ "%u != %u\n", ret1, ret2); - ok(!strcmp(buf1, buf2), "%s != %s\n", buf1, buf2); + ok(ret2 || broken(!ret2), /* nt4 sp 3 */ + "GetWindowModuleFileNameA error %u\n", GetLastError()); + if (ret2) + { + ok(ret1 == ret2 || broken(ret2 == ret1 + 1), /* win98 */ "%u != %u\n", ret1, ret2); + ok(!strcmp(buf1, buf2), "%s != %s\n", buf1, buf2); + } hinst = GetModuleHandle(0); SetLastError(0xdeadbeef); @@ -4852,7 +4872,7 @@ static void test_GetWindowModuleFileName(void) SetLastError(0xdeadbeef); ret2 = pGetWindowModuleFileNameA(hwnd, buf2, ret1 - 2); - ok(ret2 == ret1 - 2 || broken(ret2 == ret1 - 3), /* win98 */ + ok(ret2 == ret1 - 2 || broken(ret2 == ret1 - 3) /* win98 */ || broken(!ret2), /* nt4 sp3 */ "expected %u, got %u\n", ret1 - 2, ret2); ok(GetLastError() == 0xdeadbeef /* XP */ || GetLastError() == ERROR_INSUFFICIENT_BUFFER, /* win2k3, vista */

1 0

Alexandre Julliard : dbghelp: Fix handling of empty file regexp (Coverity).
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 0f3445d6db7743a6707705f72dd7ff03bb860fea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3445d6db7743a6707705f72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 9 14:20:00 2009 +0100 dbghelp: Fix handling of empty file regexp (Coverity). --- dlls/dbghelp/symbol.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 9e66f00..0810506 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -128,10 +128,11 @@ static BOOL compile_file_regex(regex_t* re, const char* srcfile) char *mask, *p; BOOL ret; + if (!srcfile || !*srcfile) return regcomp(re, ".*", REG_NOSUB); + p = mask = HeapAlloc(GetProcessHeap(), 0, 5 * strlen(srcfile) + 4); *p++ = '^'; - if (!srcfile || !*srcfile) *p++ = '*'; - else while (*srcfile) + while (*srcfile) { switch (*srcfile) { @@ -192,12 +193,14 @@ static void compile_regex(const char* str, int numchar, regex_t* re, BOOL _case) static BOOL compile_file_regex(regex_t* re, const char* srcfile) { - compile_regex( srcfile, -1, re, FALSE ); + if (!srcfile || !*srcfile) re->str = NULL; + else compile_regex( srcfile, -1, re, FALSE ); return TRUE; } static int match_regexp( const regex_t *re, const char *str ) { + if (!re->str) return 1; if (re->icase) return !lstrcmpiA( re->str, str ); return !strcmp( re->str, str ); }

1 0

Marcus Meissner : advapi32: LookupAccountNameW removed redundant NULL check (Coverity).
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 398b5cfef6ac03df0e573b57b9c9ec70e8cbc5be URL: http://source.winehq.org/git/wine.git/?a=commit;h=398b5cfef6ac03df0e573b57b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Feb 9 08:52:42 2009 +0100 advapi32: LookupAccountNameW removed redundant NULL check (Coverity). --- dlls/advapi32/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 38ca284..4153d93 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2699,7 +2699,7 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI nameLen += 1; ret = FALSE; } - else if (ReferencedDomainName && domainName) + else if (ReferencedDomainName) { strcpyW(ReferencedDomainName, domainName); }

1 0

Rob Shearman : ole32: Allow some optional methods to be called in the OleCreate tests.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: b859d2052be2bf84eed73907d1dcc02c924a03fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b859d2052be2bf84eed73907d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Feb 8 18:03:27 2009 +0000 ole32: Allow some optional methods to be called in the OleCreate tests. Fixes failures in these tests on NT4. --- dlls/ole32/tests/ole2.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index f90ef85..214c17e 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -683,10 +683,14 @@ static void test_OleCreate(IStorage *pStorage) { "OleObject_QueryInterface", 0 }, { "OleObject_AddRef", 0 }, { "OleObject_QueryInterface", 0 }, + { "OleObject_AddRef", TEST_OPTIONAL }, + { "OleObject_Release", TEST_OPTIONAL }, + { "OleObject_QueryInterface", TEST_OPTIONAL }, { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, { "OleObjectPersistStg_Release", 0 }, { "OleObject_Release", 0 }, + { "OleObject_Release", TEST_OPTIONAL }, { NULL, 0 } }; static const struct expected_method methods_olerender_draw[] = @@ -694,6 +698,9 @@ static void test_OleCreate(IStorage *pStorage) { "OleObject_QueryInterface", 0 }, { "OleObject_AddRef", 0 }, { "OleObject_QueryInterface", 0 }, + { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, + { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, + { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, { "OleObjectPersistStg_Release", 0 }, @@ -706,6 +713,7 @@ static void test_OleCreate(IStorage *pStorage) { "OleObjectCache_Cache", 0 }, { "OleObjectCache_Release", 0 }, { "OleObject_Release", 0 }, + { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; static const struct expected_method methods_olerender_format[] = @@ -737,10 +745,14 @@ static void test_OleCreate(IStorage *pStorage) { "OleObject_QueryInterface", 0 }, { "OleObject_AddRef", 0 }, { "OleObject_QueryInterface", 0 }, + { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, + { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, + { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, { "OleObjectPersistStg_Release", 0 }, { "OleObject_Release", 0 }, + { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; static const struct expected_method methods_olerender_draw_no_runnable[] = @@ -748,6 +760,9 @@ static void test_OleCreate(IStorage *pStorage) { "OleObject_QueryInterface", 0 }, { "OleObject_AddRef", 0 }, { "OleObject_QueryInterface", 0 }, + { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, + { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, + { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, { "OleObjectPersistStg_Release", 0 }, @@ -757,6 +772,7 @@ static void test_OleCreate(IStorage *pStorage) { "OleObjectCache_Cache", 0 }, { "OleObjectCache_Release", 0 }, { "OleObject_Release", 0 }, + { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 }, }; static const struct expected_method methods_olerender_draw_no_cache[] = @@ -764,6 +780,9 @@ static void test_OleCreate(IStorage *pStorage) { "OleObject_QueryInterface", 0 }, { "OleObject_AddRef", 0 }, { "OleObject_QueryInterface", 0 }, + { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, + { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, + { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, { "OleObjectPersistStg_Release", 0 }, @@ -773,6 +792,7 @@ static void test_OleCreate(IStorage *pStorage) { "OleObjectRunnable_Release", 0 }, { "OleObject_QueryInterface", 0 }, { "OleObject_Release", 0 }, + { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; @@ -818,7 +838,7 @@ static void test_OleCreate(IStorage *pStorage) runnable = NULL; expected_method_list = methods_olerender_draw_no_runnable; - trace("OleCreate with OLERENDER_DRAW (no IOlObjectRunnable):\n"); + trace("OleCreate with OLERENDER_DRAW (no IRunnableObject):\n"); hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, NULL, pStorage, (void **)&pObject); ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); @@ -827,7 +847,7 @@ static void test_OleCreate(IStorage *pStorage) runnable = &OleObjectRunnable; cache = NULL; expected_method_list = methods_olerender_draw_no_cache; - trace("OleCreate with OLERENDER_DRAW (no IOlObjectRunnable):\n"); + trace("OleCreate with OLERENDER_DRAW (no IOleCache):\n"); hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, NULL, pStorage, (void **)&pObject); ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject);

1 0