November 2008 - Wine-commits

Alexander Morozov : kernel32: NT drivers can handle IOCTL codes with HIWORD == 0.
by Alexandre Julliard 14 Nov '08

14 Nov '08

Module: wine Branch: master Commit: f52402e71a121ef967d046143087b9b5650b6ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52402e71a121ef967d046143… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Nov 13 13:15:10 2008 +0300 kernel32: NT drivers can handle IOCTL codes with HIWORD == 0. --- dlls/kernel32/vxd.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/vxd.c b/dlls/kernel32/vxd.c index 9227bad..1ce1060 100644 --- a/dlls/kernel32/vxd.c +++ b/dlls/kernel32/vxd.c @@ -339,12 +339,11 @@ BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, /* Check if this is a user defined control code for a VxD */ - if( HIWORD( dwIoControlCode ) == 0 ) + if (HIWORD( dwIoControlCode ) == 0 && (GetVersion() & 0x80000000)) { DeviceIoProc proc = get_vxd_proc( hDevice ); if (proc) return proc( dwIoControlCode, lpvInBuffer, cbInBuffer, lpvOutBuffer, cbOutBuffer, lpcbBytesReturned, lpOverlapped ); - return FALSE; } /* Not a VxD, let ntdll handle it */

1 0

Andrew Talbot : urlmon: Sign-compare warnings fix.
by Alexandre Julliard 14 Nov '08

14 Nov '08

Module: wine Branch: master Commit: c7284efa1328f88fc115c3110514c52217ea7891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7284efa1328f88fc115c3110… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 13 22:20:48 2008 +0000 urlmon: Sign-compare warnings fix. --- dlls/urlmon/binding.c | 3 ++- dlls/urlmon/file.c | 2 +- dlls/urlmon/http.c | 2 +- dlls/urlmon/regsvr.c | 2 +- dlls/urlmon/umon.c | 2 +- dlls/urlmon/urlmon_main.c | 8 ++++---- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 47b521c..e0f0085 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1532,7 +1532,8 @@ static BOOL is_urlmon_protocol(LPCWSTR url) {wszMk, sizeof(wszMk) /sizeof(WCHAR)} }; - int i, len = strlenW(url); + unsigned int i; + int len = lstrlenW(url); for(i=0; i < sizeof(protocol_list)/sizeof(protocol_list[0]); i++) { if(len >= protocol_list[i].len diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index dda1dd0..8b5a229 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -109,7 +109,7 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); - if(!szUrl || lstrlenW(szUrl) < sizeof(wszFile)/sizeof(WCHAR) + if(!szUrl || strlenW(szUrl) < sizeof(wszFile)/sizeof(WCHAR) || memcmp(szUrl, wszFile, sizeof(wszFile))) return E_INVALIDARG; diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index ede6f14..99321ef 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -330,7 +330,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl goto done; } - if (lstrlenW(szUrl) < sizeof(wszHttp)/sizeof(WCHAR) + if (strlenW(szUrl) < sizeof(wszHttp)/sizeof(WCHAR) || memcmp(szUrl, wszHttp, sizeof(wszHttp))) { hres = MK_E_SYNTAX; diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index ece1915..2fabcc0 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -526,7 +526,7 @@ static HRESULT register_inf(BOOL doregister) STRTABLEA strtable; STRENTRYA pse[7]; static CLSID const *clsids[34]; - int i = 0; + unsigned int i = 0; static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 793a8f0..860c386 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -1273,7 +1273,7 @@ HRESULT WINAPI URLDownloadToCacheFileW(LPUNKNOWN lpUnkCaller, LPCWSTR szURL, LPW header, sizeof(header), NULL, NULL)) return E_FAIL; - if (lstrlenW(cache_path) > dwBufLength) + if (strlenW(cache_path) > dwBufLength) return E_OUTOFMEMORY; lstrcpyW(szFileName, cache_path); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 15944b6..bbf58c7 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -210,7 +210,7 @@ static const struct object_creation_info object_creation[] = static void init_session(BOOL init) { - int i; + unsigned int i; for(i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) { @@ -240,7 +240,7 @@ static void init_session(BOOL init) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - int i; + unsigned int i; TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); @@ -435,7 +435,7 @@ static BOOL text_richtext_filter(const BYTE *b, DWORD size) static BOOL text_html_filter(const BYTE *b, DWORD size) { - int i; + DWORD i; if(size < 5) return FALSE; @@ -598,7 +598,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, const BYTE *buf = pBuffer; DWORD len; LPCWSTR ret = NULL; - int i; + unsigned int i; static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR wszTextRichtext[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0};

1 0

Andrew Talbot : msxml3: Void function should not return a value.
by Alexandre Julliard 14 Nov '08

14 Nov '08

Module: wine Branch: master Commit: ce3af50d101e709e074187e9596983d2620132d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce3af50d101e709e074187e95… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 13 22:20:52 2008 +0000 msxml3: Void function should not return a value. --- dlls/msxml3/saxreader.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 4a98b4b..5b16663 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1353,7 +1353,10 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) hr = ISAXLexicalHandler_startCDATA(This->saxreader->lexicalHandler); if(FAILED(hr)) - return format_error_message_from_id(This, hr); + { + format_error_message_from_id(This, hr); + return; + } realLen = This->pParserCtxt->input->cur-beg-3; cur = beg;

1 0

Lei Zhang : quartz: Reaching a renderer in the filtergraph is not an error .
by Alexandre Julliard 14 Nov '08

14 Nov '08

Module: wine Branch: master Commit: 62a0bd65d2fe9febd6928ff5912e84a34f76a97f URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a0bd65d2fe9febd6928ff59… Author: Lei Zhang <thestig(a)google.com> Date: Thu Nov 13 17:52:51 2008 -0800 quartz: Reaching a renderer in the filtergraph is not an error. --- dlls/quartz/filtergraph.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7b773ef..8b68d2f 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1030,9 +1030,8 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, if (SUCCEEDED(hr)) { unsigned int i; if (nb == 0) { - IPin_Disconnect(ppinfilter); - IPin_Disconnect(ppinOut); - goto error; + TRACE("Reached a renderer\n"); + break; } TRACE("pins to consider: %d\n", nb); for(i = 0; i < nb; i++)

1 0

Alexandre Julliard : ntdll: Added stubs for NtGetWriteWatch and NtResetWriteWatch.
by Alexandre Julliard 14 Nov '08

14 Nov '08

Module: wine Branch: master Commit: 6c7ff61639e332b422937faa9973ecba54acea42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7ff61639e332b422937faa9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 14 10:49:02 2008 +0100 ntdll: Added stubs for NtGetWriteWatch and NtResetWriteWatch. --- dlls/ntdll/ntdll.spec | 8 ++++---- dlls/ntdll/virtual.c | 25 ++++++++++++++++++++++++- include/winternl.h | 2 ++ 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 32a2a73..52db956 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -178,7 +178,7 @@ # @ stub NtGetDevicePowerState @ stub NtGetPlugPlayEvent @ stdcall NtGetTickCount() -# @ stub NtGetWriteWatch +@ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr) @ stub NtImpersonateAnonymousToken @ stub NtImpersonateClientOfPort @ stub NtImpersonateThread @@ -298,7 +298,7 @@ @ stdcall NtRequestWaitReplyPort(ptr ptr ptr) # @ stub NtRequestWakeupLatency @ stdcall NtResetEvent(long ptr) -# @ stub NtResetWriteWatch +@ stdcall NtResetWriteWatch(long ptr long) @ stdcall NtRestoreKey(long long long) # @ stub NtResumeProcess @ stdcall NtResumeThread(long long) @@ -1022,7 +1022,7 @@ # @ stub ZwGetDevicePowerState @ stub ZwGetPlugPlayEvent @ stdcall ZwGetTickCount() NtGetTickCount -# @ stub ZwGetWriteWatch +@ stdcall ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch # @ stub ZwImpersonateAnonymousToken @ stub ZwImpersonateClientOfPort @ stub ZwImpersonateThread @@ -1142,7 +1142,7 @@ @ stdcall ZwRequestWaitReplyPort(ptr ptr ptr) NtRequestWaitReplyPort # @ stub ZwRequestWakeupLatency @ stdcall ZwResetEvent(long ptr) NtResetEvent -# @ stub ZwResetWriteWatch +@ stdcall ZwResetWriteWatch(long ptr long) NtResetWriteWatch @ stdcall ZwRestoreKey(long long long) NtRestoreKey # @ stub ZwResumeProcess @ stdcall ZwResumeThread(long long) NtResumeThread diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 21da9af..7a12da2 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1551,7 +1551,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ if (type & MEM_WRITE_WATCH) { FIXME("MEM_WRITE_WATCH type not supported\n"); - return STATUS_NOT_SUPPORTED; + return STATUS_INVALID_PARAMETER; } } vprot = VIRTUAL_GetProt( protect ) | VPROT_VALLOC; @@ -2347,6 +2347,29 @@ NTSTATUS WINAPI NtFlushVirtualMemory( HANDLE process, LPCVOID *addr_ptr, /*********************************************************************** + * NtGetWriteWatch (NTDLL.@) + * ZwGetWriteWatch (NTDLL.@) + */ +NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T size, PVOID *addresses, + ULONG_PTR *count, ULONG *granularity ) +{ + FIXME( "%p %x %p-%p %p %lu\n", process, flags, base, (char *)base + size, addresses, *count ); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** + * NtResetWriteWatch (NTDLL.@) + * ZwResetWriteWatch (NTDLL.@) + */ +NTSTATUS WINAPI NtResetWriteWatch( HANDLE process, PVOID base, SIZE_T size ) +{ + FIXME( "%p %p-%p\n", process, base, (char *)base + size ); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * NtReadVirtualMemory (NTDLL.@) * ZwReadVirtualMemory (NTDLL.@) */ diff --git a/include/winternl.h b/include/winternl.h index 25a205a..3968e24 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1920,6 +1920,7 @@ NTSYSAPI NTSTATUS WINAPI NtFsControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PI NTSYSAPI NTSTATUS WINAPI NtGetContextThread(HANDLE,CONTEXT*); NTSYSAPI NTSTATUS WINAPI NtGetPlugPlayEvent(ULONG,ULONG,PVOID,ULONG); NTSYSAPI ULONG WINAPI NtGetTickCount(VOID); +NTSYSAPI NTSTATUS WINAPI NtGetWriteWatch(HANDLE,ULONG,PVOID,SIZE_T,PVOID*,ULONG_PTR*,ULONG*); NTSYSAPI NTSTATUS WINAPI NtImpersonateAnonymousToken(HANDLE); NTSYSAPI NTSTATUS WINAPI NtImpersonateClientOfPort(HANDLE,PPORT_MESSAGE); NTSYSAPI NTSTATUS WINAPI NtImpersonateThread(HANDLE,HANDLE,PSECURITY_QUALITY_OF_SERVICE); @@ -2015,6 +2016,7 @@ NTSYSAPI NTSTATUS WINAPI NtReplyWaitReplyPort(HANDLE,PLPC_MESSAGE); NTSYSAPI NTSTATUS WINAPI NtRequestPort(HANDLE,PLPC_MESSAGE); NTSYSAPI NTSTATUS WINAPI NtRequestWaitReplyPort(HANDLE,PLPC_MESSAGE,PLPC_MESSAGE); NTSYSAPI NTSTATUS WINAPI NtResetEvent(HANDLE,PULONG); +NTSYSAPI NTSTATUS WINAPI NtResetWriteWatch(HANDLE,PVOID,SIZE_T); NTSYSAPI NTSTATUS WINAPI NtRestoreKey(HANDLE,HANDLE,ULONG); NTSYSAPI NTSTATUS WINAPI NtResumeThread(HANDLE,PULONG); NTSYSAPI NTSTATUS WINAPI NtSaveKey(HANDLE,HANDLE);

1 0

Alexandre Julliard : kernel32: Added GetWriteWatch and ResetWriteWatch.
by Alexandre Julliard 14 Nov '08

14 Nov '08

Module: wine Branch: master Commit: 23be27ef8067e97fdf5442de0a0732175bc7e15d URL: http://source.winehq.org/git/wine.git/?a=commit;h=23be27ef8067e97fdf5442de0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 14 10:49:45 2008 +0100 kernel32: Added GetWriteWatch and ResetWriteWatch. --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/virtual.c | 27 +++++++++++++++++++++++++++ include/winbase.h | 2 ++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0f601d8..808635d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -671,7 +671,7 @@ # @ stub GetVolumePathNamesForVolumeNameW @ stdcall GetWindowsDirectoryA(ptr long) @ stdcall GetWindowsDirectoryW(ptr long) -@ stub GetWriteWatch +@ stdcall GetWriteWatch(long ptr long ptr ptr ptr) @ stdcall GlobalAddAtomA(str) @ stdcall GlobalAddAtomW(wstr) @ stdcall GlobalAlloc(long long) @@ -917,7 +917,7 @@ @ stub RequestDeviceWakeup @ stdcall RequestWakeupLatency(long) @ stdcall ResetEvent(long) -@ stub ResetWriteWatch +@ stdcall ResetWriteWatch(ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) # @ stub RtlCaptureContext ( -> ntdll.RtlCaptureContext) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 6a12885..56c7228 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -602,6 +602,33 @@ BOOL WINAPI FlushViewOfFile( LPCVOID base, SIZE_T size ) /*********************************************************************** + * GetWriteWatch (KERNEL32.@) + */ +UINT WINAPI GetWriteWatch( DWORD flags, LPVOID base, SIZE_T size, LPVOID *addresses, + ULONG_PTR *count, ULONG *granularity ) +{ + NTSTATUS status; + + status = NtGetWriteWatch( GetCurrentProcess(), flags, base, size, addresses, count, granularity ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return status ? ~0u : 0; +} + + +/*********************************************************************** + * ResetWriteWatch (KERNEL32.@) + */ +UINT WINAPI ResetWriteWatch( LPVOID base, SIZE_T size ) +{ + NTSTATUS status; + + status = NtResetWriteWatch( GetCurrentProcess(), base, size ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return status ? ~0u : 0; +} + + +/*********************************************************************** * IsBadReadPtr (KERNEL32.@) * * Check for read access on a memory block. diff --git a/include/winbase.h b/include/winbase.h index a7733b0..714a670 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1759,6 +1759,7 @@ WINBASEAPI BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR,LPWSTR,DW WINBASEAPI UINT WINAPI GetWindowsDirectoryA(LPSTR,UINT); WINBASEAPI UINT WINAPI GetWindowsDirectoryW(LPWSTR,UINT); #define GetWindowsDirectory WINELIB_NAME_AW(GetWindowsDirectory) +WINBASEAPI UINT WINAPI GetWriteWatch(DWORD,LPVOID,SIZE_T,LPVOID*,ULONG_PTR*,ULONG*); WINBASEAPI ATOM WINAPI GlobalAddAtomA(LPCSTR); WINBASEAPI ATOM WINAPI GlobalAddAtomW(LPCWSTR); #define GlobalAddAtom WINELIB_NAME_AW(GlobalAddAtom) @@ -1989,6 +1990,7 @@ WINADVAPI BOOL WINAPI ReportEventW(HANDLE,WORD,WORD,DWORD,PSID,WORD,DWOR WINBASEAPI BOOL WINAPI RequestWakeupLatency(LATENCY_TIME latency); #define ReportEvent WINELIB_NAME_AW(ReportEvent) WINBASEAPI BOOL WINAPI ResetEvent(HANDLE); +WINBASEAPI UINT WINAPI ResetWriteWatch(LPVOID,SIZE_T); WINBASEAPI DWORD WINAPI ResumeThread(HANDLE); WINADVAPI BOOL WINAPI RevertToSelf(void); WINBASEAPI DWORD WINAPI SearchPathA(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*);

1 0

Alexandre Julliard : ole32/tests: Use a CLSID that is more likely to exist on old Windows versions.
by Alexandre Julliard 14 Nov '08

14 Nov '08

Module: wine Branch: master Commit: 48d41dbc37545ce7fd8ec9f3b0964eab4fadbf93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d41dbc37545ce7fd8ec9f3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 13 21:45:25 2008 +0100 ole32/tests: Use a CLSID that is more likely to exist on old Windows versions. --- dlls/ole32/tests/compobj.c | 45 +++++++++++++++++++------------------------ 1 files changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index bdc34d9..b30e939 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -40,18 +40,13 @@ HRESULT (WINAPI * pCoGetObjectContext)(REFIID riid, LPVOID *ppv); #define ok_no_locks() ok(cLocks == 0, "Number of locks should be 0, but actually is %d\n", cLocks) static const CLSID CLSID_non_existent = { 0x12345678, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; -static const CLSID CLSID_CDeviceMoniker = { 0x4315d437, 0x5b8c, 0x11d0, { 0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86 } }; -static WCHAR devicedotone[] = {'d','e','v','i','c','e','.','1',0}; +static const CLSID CLSID_StdFont = { 0x0be35203, 0x8f91, 0x11ce, { 0x9d, 0xe3, 0x00, 0xaa, 0x00, 0x4b, 0xb8, 0x51 } }; +static WCHAR stdfont[] = {'S','t','d','F','o','n','t',0}; static const WCHAR wszNonExistent[] = {'N','o','n','E','x','i','s','t','e','n','t',0}; -static WCHAR wszCLSID_CDeviceMoniker[] = +static WCHAR wszCLSID_StdFont[] = { - '{', - '4','3','1','5','d','4','3','7','-', - '5','b','8','c','-', - '1','1','d','0','-', - 'b','d','3','b','-', - '0','0','a','0','c','9','1','1','c','e','8','6', - '}',0 + '{','0','b','e','3','5','2','0','3','-','8','f','9','1','-','1','1','c','e','-', + '9','d','e','3','-','0','0','a','a','0','0','4','b','b','8','5','1','}',0 }; static const IID IID_IWineTest = @@ -143,11 +138,11 @@ static IClassFactory Test_ClassFactory = { &TestClassFactory_Vtbl }; static void test_ProgIDFromCLSID(void) { LPWSTR progid; - HRESULT hr = ProgIDFromCLSID(&CLSID_CDeviceMoniker, &progid); + HRESULT hr = ProgIDFromCLSID(&CLSID_StdFont, &progid); ok(hr == S_OK, "ProgIDFromCLSID failed with error 0x%08x\n", hr); if (hr == S_OK) { - ok(!lstrcmpiW(progid, devicedotone), "Didn't get expected prog ID\n"); + ok(!lstrcmpiW(progid, stdfont), "Didn't get expected prog ID\n"); CoTaskMemFree(progid); } @@ -156,20 +151,20 @@ static void test_ProgIDFromCLSID(void) ok(hr == REGDB_E_CLASSNOTREG, "ProgIDFromCLSID returned %08x\n", hr); ok(progid == NULL, "ProgIDFromCLSID returns with progid %p\n", progid); - hr = ProgIDFromCLSID(&CLSID_CDeviceMoniker, NULL); + hr = ProgIDFromCLSID(&CLSID_StdFont, NULL); ok(hr == E_INVALIDARG, "ProgIDFromCLSID should return E_INVALIDARG instead of 0x%08x\n", hr); } static void test_CLSIDFromProgID(void) { CLSID clsid; - HRESULT hr = CLSIDFromProgID(devicedotone, &clsid); + HRESULT hr = CLSIDFromProgID(stdfont, &clsid); ok(hr == S_OK, "CLSIDFromProgID failed with error 0x%08x\n", hr); - ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n"); + ok(IsEqualCLSID(&clsid, &CLSID_StdFont), "clsid wasn't equal to CLSID_StdFont\n"); - hr = CLSIDFromString(devicedotone, &clsid); + hr = CLSIDFromString(stdfont, &clsid); ok_ole_success(hr, "CLSIDFromString"); - ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n"); + ok(IsEqualCLSID(&clsid, &CLSID_StdFont), "clsid wasn't equal to CLSID_StdFont\n"); /* test some failure cases */ @@ -188,9 +183,9 @@ static void test_CLSIDFromProgID(void) static void test_CLSIDFromString(void) { CLSID clsid; - HRESULT hr = CLSIDFromString(wszCLSID_CDeviceMoniker, &clsid); + HRESULT hr = CLSIDFromString(wszCLSID_StdFont, &clsid); ok_ole_success(hr, "CLSIDFromString"); - ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n"); + ok(IsEqualCLSID(&clsid, &CLSID_StdFont), "clsid wasn't equal to CLSID_StdFont\n"); hr = CLSIDFromString(NULL, &clsid); ok_ole_success(hr, "CLSIDFromString"); @@ -202,19 +197,19 @@ static void test_StringFromGUID2(void) WCHAR str[50]; int len; /* Test corner cases for buffer size */ - len = StringFromGUID2(&CLSID_CDeviceMoniker,str,50); + len = StringFromGUID2(&CLSID_StdFont,str,50); ok(len == 39, "len: %d (expected 39)\n", len); - ok(!lstrcmpiW(str, wszCLSID_CDeviceMoniker),"string wan't equal for CLSID_CDeviceMoniker\n"); + ok(!lstrcmpiW(str, wszCLSID_StdFont),"string wan't equal for CLSID_StdFont\n"); memset(str,0,sizeof str); - len = StringFromGUID2(&CLSID_CDeviceMoniker,str,39); + len = StringFromGUID2(&CLSID_StdFont,str,39); ok(len == 39, "len: %d (expected 39)\n", len); - ok(!lstrcmpiW(str, wszCLSID_CDeviceMoniker),"string wan't equal for CLSID_CDeviceMoniker\n"); + ok(!lstrcmpiW(str, wszCLSID_StdFont),"string wan't equal for CLSID_StdFont\n"); - len = StringFromGUID2(&CLSID_CDeviceMoniker,str,38); + len = StringFromGUID2(&CLSID_StdFont,str,38); ok(len == 0, "len: %d (expected 0)\n", len); - len = StringFromGUID2(&CLSID_CDeviceMoniker,str,30); + len = StringFromGUID2(&CLSID_StdFont,str,30); ok(len == 0, "len: %d (expected 0)\n", len); }

1 0

Alexandre Julliard : ole32/tests: Don't hardcode the Ansi codepage value.
by Alexandre Julliard 14 Nov '08

14 Nov '08

Module: wine Branch: master Commit: 4bff91265a0440ca4894444a945e3133b9ba2ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bff91265a0440ca4894444a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 13 21:45:41 2008 +0100 ole32/tests: Don't hardcode the Ansi codepage value. --- dlls/ole32/tests/stg_prop.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index a7024b3..c4e2d0c 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -408,8 +408,7 @@ static void testCodepage(void) /* check code page before it's been explicitly set */ hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var); ok(hr == S_OK, "ReadMultiple failed: 0x%08x\n", hr); - ok(var.vt == VT_I2 && U(var).iVal == 1252, - "Didn't get expected type or value for property\n"); + ok(var.vt == VT_I2, "Didn't get expected type for property (%u)\n", var.vt); /* Set code page to Unicode */ U(var).iVal = 1200; hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0);

1 0

Alexandre Julliard : ole32/tests: Fix a couple of test failures on Win9x and NT4.
by Alexandre Julliard 14 Nov '08

14 Nov '08

Module: wine Branch: master Commit: f8b8478f91ae7dcee61bffa7215f1c3cc4c95cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b8478f91ae7dcee61bffa72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 13 21:45:57 2008 +0100 ole32/tests: Fix a couple of test failures on Win9x and NT4. --- dlls/ole32/tests/storage32.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 6a7158b..f65af73 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -262,7 +262,8 @@ static void test_storage_stream(void) r = IStorage_CreateStream(stg, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==STG_E_INVALIDNAME, "IStorage->CreateStream wrong error\n"); r = IStorage_CreateStream(stg, longname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); - ok(r==STG_E_INVALIDNAME, "IStorage->CreateStream wrong error, got %d GetLastError()=%d\n", r, GetLastError()); + ok(r==STG_E_INVALIDNAME || broken(r==S_OK) /* nt4 */, + "IStorage->CreateStream wrong error, got %d GetLastError()=%d\n", r, GetLastError()); r = IStorage_CreateStream(stg, stmname, STGM_READWRITE, 0, 0, &stm ); ok(r==STG_E_INVALIDFLAG, "IStorage->CreateStream wrong error\n"); r = IStorage_CreateStream(stg, stmname, STGM_READ, 0, 0, &stm ); @@ -1100,7 +1101,8 @@ static void _test_file_access(LPCSTR file, const struct access_res *ares, DWORD line, idx, ares[idx].gothandle, (hfile != INVALID_HANDLE_VALUE)); - ok(lasterr == ares[idx].lasterr, + ok(lasterr == ares[idx].lasterr || + broken(lasterr == 0xdeadbeef) /* win9x */, "(%d, lasterr, %d): Expected %d, got %d\n", line, idx, ares[idx].lasterr, lasterr);

1 0

Paul Vriens : quartz/tests: Fix a few failures on Win95 and NT4.
by Alexandre Julliard 14 Nov '08

14 Nov '08

Module: wine Branch: master Commit: 36c40e53e0f49975b477955e0fcd1d44a54e8bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c40e53e0f49975b477955e0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 13 18:07:01 2008 +0100 quartz/tests: Fix a few failures on Win95 and NT4. --- dlls/quartz/tests/misc.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/tests/misc.c b/dlls/quartz/tests/misc.c index 95468b4..74c386b 100644 --- a/dlls/quartz/tests/misc.c +++ b/dlls/quartz/tests/misc.c @@ -95,7 +95,17 @@ static void test_aggregation(const CLSID clsidOuter, const CLSID clsidInner, /* these QueryInterface calls should work */ QI_SUCCEED(pUnkOuter, iidOuter, pUnkAggregator); QI_SUCCEED(pUnkOuter, IID_IUnknown, pUnkOuterTest); - QI_SUCCEED(pUnkInner, iidInner, pUnkAggregatee); + /* IGraphConfig interface comes with DirectShow 9 */ + if(IsEqualGUID(&IID_IGraphConfig, &iidInner)) + { + hr = IUnknown_QueryInterface(pUnkInner, &iidInner, (LPVOID*)&pUnkAggregatee); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "IUnknown_QueryInterface returned %x\n", hr); + ok(pUnkAggregatee != NULL || broken(!pUnkAggregatee), "Pointer is NULL\n"); + } + else + { + QI_SUCCEED(pUnkInner, iidInner, pUnkAggregatee); + } QI_SUCCEED(pUnkInner, IID_IUnknown, pUnkInnerTest); if (!pUnkAggregator || !pUnkOuterTest || !pUnkAggregatee

1 0