May 2007 - Wine-commits - list.winehq.org

Alexandre Julliard : ntoskrnl.exe: Reuse the kernel32 instruction emulation support for kernel-mode drivers.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: 73cc00f9a55ea5a0fe78a302034637f21f05e283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73cc00f9a55ea5a0fe78a3020… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 18 16:37:23 2007 +0200 ntoskrnl.exe: Reuse the kernel32 instruction emulation support for kernel-mode drivers. --- dlls/kernel32/instr.c | 6 +++--- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/kernel_private.h | 2 +- dlls/kernel32/wowthunk.c | 4 ++-- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++++++++++++ 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c index 8a37a47..f9b99c8 100644 --- a/dlls/kernel32/instr.c +++ b/dlls/kernel32/instr.c @@ -428,12 +428,12 @@ static void INSTR_outport( WORD port, int size, DWORD val, CONTEXT86 *context ) /*********************************************************************** - * INSTR_EmulateInstruction + * __wine_emulate_instruction * * Emulate a privileged instruction. * Returns exception continuation status. */ -DWORD INSTR_EmulateInstruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ) +DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ) { int prefix, segprefix, prefixlen, len, repX, long_op, long_addr; BYTE *instr; @@ -886,7 +886,7 @@ LONG CALLBACK INSTR_vectored_handler( EXCEPTION_POINTERS *ptrs ) (record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION || record->ExceptionCode == EXCEPTION_PRIV_INSTRUCTION)) { - if (INSTR_EmulateInstruction( record, context ) == ExceptionContinueExecution) + if (__wine_emulate_instruction( record, context ) == ExceptionContinueExecution) return EXCEPTION_CONTINUE_EXECUTION; } return EXCEPTION_CONTINUE_SEARCH; diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d6bb2bf..32bf8e3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1234,6 +1234,7 @@ @ cdecl __wine_dll_register_16(ptr str) @ cdecl __wine_dll_unregister_16(ptr) @ varargs -private __wine_call_from_16_regs() +@ cdecl __wine_emulate_instruction(ptr ptr) # Unix files @ cdecl wine_get_unix_file_name(wstr) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 4796e62..dd7c916 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -79,7 +79,7 @@ extern void FILE_SetDosError(void); extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ); extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ); -extern DWORD INSTR_EmulateInstruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ); +extern DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ); extern LONG CALLBACK INSTR_vectored_handler( EXCEPTION_POINTERS *ptrs ); extern void INSTR_CallBuiltinHandler( CONTEXT86 *context, BYTE intnum ); diff --git a/dlls/kernel32/wowthunk.c b/dlls/kernel32/wowthunk.c index 9e27f85..4f714ab 100644 --- a/dlls/kernel32/wowthunk.c +++ b/dlls/kernel32/wowthunk.c @@ -256,7 +256,7 @@ static DWORD call16_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RE else { SEGPTR gpHandler; - DWORD ret = INSTR_EmulateInstruction( record, context ); + DWORD ret = __wine_emulate_instruction( record, context ); /* * Insert check for pending DPMI events. Note that this @@ -310,7 +310,7 @@ static DWORD vm86_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECO if (record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION || record->ExceptionCode == EXCEPTION_PRIV_INSTRUCTION) { - return INSTR_EmulateInstruction( record, context ); + return __wine_emulate_instruction( record, context ); } return ExceptionContinueSearch; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3380434..b0007fc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -30,6 +30,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "excpt.h" #include "ddk/wdm.h" #include "wine/unicode.h" #include "wine/server.h" @@ -103,6 +104,23 @@ static HANDLE get_device_manager(void) return ret; } +/* exception handler for emulation of privileged instructions */ +static LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs ) +{ + extern DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ); + + EXCEPTION_RECORD *record = ptrs->ExceptionRecord; + CONTEXT86 *context = ptrs->ContextRecord; + + if (record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION || + record->ExceptionCode == EXCEPTION_PRIV_INSTRUCTION) + { + if (__wine_emulate_instruction( record, context ) == ExceptionContinueExecution) + return EXCEPTION_CONTINUE_EXECUTION; + } + return EXCEPTION_CONTINUE_SEARCH; +} + /* process an ioctl request for a given device */ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, ULONG in_size, void *out_buff, ULONG *out_size ) @@ -479,6 +497,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( inst ); + RtlAddVectoredExceptionHandler( TRUE, vectored_handler ); break; } return TRUE;

1 0

Misha Koshelev : msi/tests: automation: Check for NULL source string before calling lstrcpyW.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: 63ed9117c3d749ad4d3ce954fdaa3e0183d76c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=63ed9117c3d749ad4d3ce954f… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu May 17 11:35:48 2007 -0500 msi/tests: automation: Check for NULL source string before calling lstrcpyW. --- dlls/msi/tests/automation.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index aa92b05..33d3118 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -684,7 +684,7 @@ static HRESULT Installer_RegistryValueW(HKEY hkey, LPCWSTR szKey, LPCWSTR szValu V_BSTR(&vararg) = SysAllocString(szValue); hr = Installer_RegistryValue(hkey, szKey, vararg, &varresult, VT_BSTR); - lstrcpyW(szString, V_BSTR(&varresult)); + if (V_BSTR(&varresult)) lstrcpyW(szString, V_BSTR(&varresult)); VariantClear(&varresult); return hr; } @@ -811,7 +811,7 @@ static HRESULT Installer_VersionGet(LPWSTR szVersion) HRESULT hr; hr = invoke(pInstaller, "Version", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_BSTR); - lstrcpyW(szVersion, V_BSTR(&varresult)); + if (V_BSTR(&varresult)) lstrcpyW(szVersion, V_BSTR(&varresult)); VariantClear(&varresult); return hr; } @@ -839,7 +839,7 @@ static HRESULT Session_PropertyGet(IDispatch *pSession, LPCWSTR szName, LPWSTR s V_BSTR(&vararg[0]) = SysAllocString(szName); hr = invoke(pSession, "Property", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_BSTR); - lstrcpyW(szReturn, V_BSTR(&varresult)); + if (V_BSTR(&varresult)) lstrcpyW(szReturn, V_BSTR(&varresult)); VariantClear(&varresult); return hr; } @@ -1101,7 +1101,7 @@ static HRESULT Record_StringDataGet(IDispatch *pRecord, int iField, LPWSTR szStr V_I4(&vararg[0]) = iField; hr = invoke(pRecord, "StringData", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_BSTR); - lstrcpyW(szString, V_BSTR(&varresult)); + if (V_BSTR(&varresult)) lstrcpyW(szString, V_BSTR(&varresult)); VariantClear(&varresult); return hr; } @@ -1169,7 +1169,7 @@ static HRESULT StringList_Item(IDispatch *pStringList, int iIndex, LPWSTR szStri V_I4(&vararg[0]) = iIndex; hr = invoke(pStringList, "Item", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_BSTR); - lstrcpyW(szString, V_BSTR(&varresult)); + if (V_BSTR(&varresult)) lstrcpyW(szString, V_BSTR(&varresult)); VariantClear(&varresult); return hr; }

1 0

Misha Koshelev : msi: automation: Change all tabs to spaces to conform to msi formatting.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: 937b64309278c59fd8cb1684c678932e0a058ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=937b64309278c59fd8cb1684c… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu May 17 11:35:53 2007 -0500 msi: automation: Change all tabs to spaces to conform to msi formatting. --- dlls/msi/automation.c | 282 ++++++++++++++++++++++++------------------------ 1 files changed, 141 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=937b64309278c59fd8cb1…

1 0

Misha Koshelev : msi: script: Change all tabs to spaces to conform to msi formatting.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: 04505f71076474a41630ea3102e28d9be7236e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04505f71076474a41630ea310… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu May 17 11:36:00 2007 -0500 msi: script: Change all tabs to spaces to conform to msi formatting. --- dlls/msi/script.c | 114 ++++++++++++++++++++++++++-------------------------- 1 files changed, 57 insertions(+), 57 deletions(-) diff --git a/dlls/msi/script.c b/dlls/msi/script.c index 54d0ee8..cbce0ce 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -111,21 +111,21 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function /* Create the scripting engine */ if ((type & 7) == msidbCustomActionTypeJScript) - hr = CLSIDFromProgID(szJScript, &clsid); + hr = CLSIDFromProgID(szJScript, &clsid); else if ((type & 7) == msidbCustomActionTypeVBScript) - hr = CLSIDFromProgID(szVBScript, &clsid); + hr = CLSIDFromProgID(szVBScript, &clsid); else { - ERR("Unknown script type %d\n", type); - goto done; + ERR("Unknown script type %d\n", type); + goto done; } if (FAILED(hr)) { - ERR("Could not find CLSID for Windows Script\n"); - goto done; + ERR("Could not find CLSID for Windows Script\n"); + goto done; } hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IActiveScript, (void **)&pActiveScript); if (FAILED(hr)) { - ERR("Could not instantiate class for Windows Script\n"); - goto done; + ERR("Could not instantiate class for Windows Script\n"); + goto done; } /* If we got this far, Windows Script is installed, so don't return success by default anymore */ @@ -156,29 +156,29 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function /* Call a function if necessary through the IDispatch interface */ if (function != NULL && strlenW(function) > 0) { - TRACE("Calling function %s\n", debugstr_w(function)); + TRACE("Calling function %s\n", debugstr_w(function)); - hr = IActiveScript_GetScriptDispatch(pActiveScript, NULL, &pDispatch); - if (FAILED(hr)) goto done; + hr = IActiveScript_GetScriptDispatch(pActiveScript, NULL, &pDispatch); + if (FAILED(hr)) goto done; - hr = IDispatch_GetIDsOfNames(pDispatch, &IID_NULL, (WCHAR **)&function, 1,LOCALE_USER_DEFAULT, &dispid); - if (FAILED(hr)) goto done; + hr = IDispatch_GetIDsOfNames(pDispatch, &IID_NULL, (WCHAR **)&function, 1,LOCALE_USER_DEFAULT, &dispid); + if (FAILED(hr)) goto done; - hr = IDispatch_Invoke(pDispatch, dispid, &IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &dispparamsNoArgs, &var, NULL, NULL); - if (FAILED(hr)) goto done; + hr = IDispatch_Invoke(pDispatch, dispid, &IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &dispparamsNoArgs, &var, NULL, NULL); + if (FAILED(hr)) goto done; - /* Check return value, if it's not IDOK we failed */ - hr = VariantChangeType(&var, &var, 0, VT_I4); - if (FAILED(hr)) goto done; + /* Check return value, if it's not IDOK we failed */ + hr = VariantChangeType(&var, &var, 0, VT_I4); + if (FAILED(hr)) goto done; - if (V_I4(&var) == IDOK) - ret = ERROR_SUCCESS; - else ret = ERROR_INSTALL_FAILURE; + if (V_I4(&var) == IDOK) + ret = ERROR_SUCCESS; + else ret = ERROR_INSTALL_FAILURE; - VariantClear(&var); + VariantClear(&var); } else { - /* If no function to be called, MSI behavior is to succeed */ - ret = ERROR_SUCCESS; + /* If no function to be called, MSI behavior is to succeed */ + ret = ERROR_SUCCESS; } done: @@ -187,9 +187,9 @@ done: if (pDispatch) IDispatch_Release(pDispatch); if (pActiveScript) IActiveScriptSite_Release(pActiveScript); if (pActiveScriptSite && - pActiveScriptSite->pSession) IUnknown_Release((IUnknown *)pActiveScriptSite->pSession); + pActiveScriptSite->pSession) IUnknown_Release((IUnknown *)pActiveScriptSite->pSession); if (pActiveScriptSite && - pActiveScriptSite->pInstaller) IUnknown_Release((IUnknown *)pActiveScriptSite->pInstaller); + pActiveScriptSite->pInstaller) IUnknown_Release((IUnknown *)pActiveScriptSite->pInstaller); if (pActiveScriptSite) IUnknown_Release((IUnknown *)pActiveScriptSite); CoUninitialize(); /* must call even if CoInitialize failed */ @@ -258,21 +258,21 @@ static HRESULT WINAPI MsiActiveScriptSite_GetItemInfo(IActiveScriptSite* iface, /* Determine the kind of pointer that is requested, and make sure placeholder is valid */ if (dwReturnMask & SCRIPTINFO_ITYPEINFO) { - if (!ppti) return E_INVALIDARG; - *ppti = NULL; + if (!ppti) return E_INVALIDARG; + *ppti = NULL; } if (dwReturnMask & SCRIPTINFO_IUNKNOWN) { - if (!ppiunkItem) return E_INVALIDARG; - *ppiunkItem = NULL; + if (!ppiunkItem) return E_INVALIDARG; + *ppiunkItem = NULL; } /* Are we looking for the session object? */ if (!strcmpW(szSession, pstrName)) { - if (dwReturnMask & SCRIPTINFO_ITYPEINFO) - return load_type_info(This->pSession, ppti, &DIID_Session, 0); - else if (dwReturnMask & SCRIPTINFO_IUNKNOWN) { - IDispatch_QueryInterface(This->pSession, &IID_IUnknown, (void **)ppiunkItem); - return S_OK; + if (dwReturnMask & SCRIPTINFO_ITYPEINFO) + return load_type_info(This->pSession, ppti, &DIID_Session, 0); + else if (dwReturnMask & SCRIPTINFO_IUNKNOWN) { + IDispatch_QueryInterface(This->pSession, &IID_IUnknown, (void **)ppiunkItem); + return S_OK; } } @@ -296,33 +296,33 @@ static HRESULT WINAPI MsiActiveScriptSite_OnScriptTerminate(IActiveScriptSite* i static HRESULT WINAPI MsiActiveScriptSite_OnStateChange(IActiveScriptSite* iface, SCRIPTSTATE ssScriptState) { switch (ssScriptState) { - case SCRIPTSTATE_UNINITIALIZED: - TRACE("State: Uninitialized.\n"); - break; + case SCRIPTSTATE_UNINITIALIZED: + TRACE("State: Uninitialized.\n"); + break; - case SCRIPTSTATE_INITIALIZED: - TRACE("State: Initialized.\n"); - break; + case SCRIPTSTATE_INITIALIZED: + TRACE("State: Initialized.\n"); + break; - case SCRIPTSTATE_STARTED: - TRACE("State: Started.\n"); - break; + case SCRIPTSTATE_STARTED: + TRACE("State: Started.\n"); + break; - case SCRIPTSTATE_CONNECTED: - TRACE("State: Connected.\n"); - break; + case SCRIPTSTATE_CONNECTED: + TRACE("State: Connected.\n"); + break; - case SCRIPTSTATE_DISCONNECTED: - TRACE("State: Disconnected.\n"); - break; + case SCRIPTSTATE_DISCONNECTED: + TRACE("State: Disconnected.\n"); + break; - case SCRIPTSTATE_CLOSED: - TRACE("State: Closed.\n"); - break; + case SCRIPTSTATE_CLOSED: + TRACE("State: Closed.\n"); + break; - default: - ERR("Unknown State: %d\n", ssScriptState); - break; + default: + ERR("Unknown State: %d\n", ssScriptState); + break; } return S_OK; @@ -338,7 +338,7 @@ static HRESULT WINAPI MsiActiveScriptSite_OnScriptError(IActiveScriptSite* iface hr = IActiveScriptError_GetExceptionInfo(pscripterror, &exception); if (SUCCEEDED(hr)) - ERR("script error: %s\n", debugstr_w(exception.bstrDescription)); + ERR("script error: %s\n", debugstr_w(exception.bstrDescription)); return S_OK; }

1 0

Misha Koshelev : msi/tests: automation: Change SUCCEEDED(hr) to more specific hr == S_OK.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: ee33e405424447327c3ddaf593238367b8a0b280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee33e405424447327c3ddaf59… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu May 17 11:36:09 2007 -0500 msi/tests: automation: Change SUCCEEDED(hr) to more specific hr == S_OK. --- dlls/msi/tests/automation.c | 184 +++++++++++++++++++++--------------------- 1 files changed, 92 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee33e405424447327c3dd…

1 0

Mikołaj Zalewski : msxml3: Improve the XPath queries handling.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: e1cbec75c1383ef605d91c2c36841c360eb3cba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1cbec75c1383ef605d91c2c3… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri May 11 17:03:13 2007 +0200 msxml3: Improve the XPath queries handling. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/domdoc.c | 15 ++- dlls/msxml3/msxml_private.h | 5 +- dlls/msxml3/node.c | 33 +---- dlls/msxml3/nodelist.c | 227 ++++---------------------------- dlls/msxml3/queryresult.c | 292 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/Makefile.in | 2 +- dlls/msxml3/tests/domdoc.c | 250 +++++++++++++++++++++++++++++++++++ 8 files changed, 584 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1cbec75c1383ef605d91…

1 0

Rob Shearman : ole32: Create host apartments to enable isolation of objects of incompatible threading models .
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: 600143d4fac9e8237de33fab439e7d715ee37122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=600143d4fac9e8237de33fab4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu May 17 17:06:16 2007 +0100 ole32: Create host apartments to enable isolation of objects of incompatible threading models. There should be one host apartment per apartment. Existing apartments should not be re-used, except in the case of the main apartment. --- dlls/ole32/compobj.c | 220 ++++++++++++++++++++++++++++++++---------- dlls/ole32/compobj_private.h | 2 + dlls/ole32/tests/marshal.c | 1 - 3 files changed, 170 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=600143d4fac9e8237de33…

1 0

Rob Shearman : ole32: Fix reading from an HGLOBALStreamImpl with an invalid HGLOBAL.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: 82cfed96a7dc8ee97e59b688968867c143104b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82cfed96a7dc8ee97e59b6889… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu May 17 17:06:56 2007 +0100 ole32: Fix reading from an HGLOBALStreamImpl with an invalid HGLOBAL. Add tests that show the strange behaviour of IStream_Read returning S_OK instead of an error code. --- dlls/ole32/hglobalstream.c | 13 +++++++++++ dlls/ole32/tests/hglobalstream.c | 45 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 872fb24..e6d2f73 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -233,6 +233,12 @@ static HRESULT WINAPI HGLOBALStreamImpl_Read( * Lock the buffer in position and copy the data. */ supportBuffer = GlobalLock(This->supportHandle); + if (!supportBuffer) + { + WARN("read from invalid hglobal %p\n", This->supportHandle); + *pcbRead = 0; + return S_OK; + } memcpy(pv, (char *) supportBuffer+This->currentPosition.u.LowPart, bytesToReadFromBuffer); @@ -293,6 +299,8 @@ static HRESULT WINAPI HGLOBALStreamImpl_Write( if (cb == 0) goto out; + *pcbWritten = 0; + newSize.u.HighPart = 0; newSize.u.LowPart = This->currentPosition.u.LowPart + cb; @@ -314,6 +322,11 @@ static HRESULT WINAPI HGLOBALStreamImpl_Write( * Lock the buffer in position and copy the data. */ supportBuffer = GlobalLock(This->supportHandle); + if (!supportBuffer) + { + WARN("write to invalid hglobal %p\n", This->supportHandle); + return S_OK; + } memcpy((char *) supportBuffer+This->currentPosition.u.LowPart, pv, cb); diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 8f14544..6338dfe 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -259,6 +259,50 @@ static void test_copyto(void) IStream_Release(pStream); } +static void test_freed_hglobal(void) +{ + HRESULT hr; + IStream *pStream; + HGLOBAL hglobal; + char *p; + char buffer[10]; + ULARGE_INTEGER ull; + ULONG read, written; + + hglobal = GlobalAlloc(GMEM_DDESHARE|GMEM_NODISCARD|GMEM_MOVEABLE, strlen("Rob") + 1); + ok(hglobal != NULL, "GlobalAlloc failed with error %d\n", GetLastError()); + p = GlobalLock(hglobal); + strcpy(p, "Rob"); + GlobalUnlock(hglobal); + + hr = CreateStreamOnHGlobal(hglobal, FALSE, &pStream); + ok_ole_success(hr, "CreateStreamOnHGlobal"); + + hr = IStream_Read(pStream, buffer, sizeof(buffer), &read); + ok_ole_success(hr, "IStream_Read"); + ok(!strcmp(buffer, "Rob"), "buffer data %s differs\n", buffer); + ok(read == strlen("Rob") + 1, "read should be 4 instead of %d\n", read); + + GlobalFree(hglobal); + + memset(buffer, 0, sizeof(buffer)); + read = -1; + hr = IStream_Read(pStream, buffer, sizeof(buffer), &read); + ok_ole_success(hr, "IStream_Read"); + ok(buffer[0] == 0, "buffer data should be untouched\n"); + ok(read == 0, "read should be 0 instead of %d\n", read); + + ull.QuadPart = sizeof(buffer); + hr = IStream_SetSize(pStream, ull); + ok(hr == E_OUTOFMEMORY, "IStream_SetSize with invalid HGLOBAL should return E_OUTOFMEMORY instead of 0x%08x\n", hr); + + hr = IStream_Write(pStream, buffer, sizeof(buffer), &written); + ok(hr == E_OUTOFMEMORY, "IStream_Write with invalid HGLOBAL should return E_OUTOFMEMORY instead of 0x%08x\n", hr); + ok(written == 0, "written should be 0 instead of %d\n", written); + + IStream_Release(pStream); +} + START_TEST(hglobalstream) { HRESULT hr; @@ -270,4 +314,5 @@ START_TEST(hglobalstream) test_streamonhglobal(pStream); IStream_Release(pStream); test_copyto(); + test_freed_hglobal(); }

1 0

Misha Koshelev : msi/tests: automation: Change non-const LPCWSTR parameters to LPWSTR.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: f1f687e646f022a484d9bccc50873cbaf3ab446d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f687e646f022a484d9bccc5… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu May 17 11:35:43 2007 -0500 msi/tests: automation: Change non-const LPCWSTR parameters to LPWSTR. --- dlls/msi/tests/automation.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index fb353a5..aa92b05 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -804,14 +804,14 @@ static HRESULT Installer_RelatedProducts(LPCWSTR szProduct, IDispatch **pStringL return hr; } -static HRESULT Installer_VersionGet(LPCWSTR szVersion) +static HRESULT Installer_VersionGet(LPWSTR szVersion) { VARIANT varresult; DISPPARAMS dispparams = {NULL, NULL, 0, 0}; HRESULT hr; hr = invoke(pInstaller, "Version", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_BSTR); - lstrcpyW((WCHAR *)szVersion, V_BSTR(&varresult)); + lstrcpyW(szVersion, V_BSTR(&varresult)); VariantClear(&varresult); return hr; } @@ -827,7 +827,7 @@ static HRESULT Session_Installer(IDispatch *pSession, IDispatch **pInst) return hr; } -static HRESULT Session_PropertyGet(IDispatch *pSession, LPCWSTR szName, LPCWSTR szReturn) +static HRESULT Session_PropertyGet(IDispatch *pSession, LPCWSTR szName, LPWSTR szReturn) { VARIANT varresult; VARIANTARG vararg[1]; @@ -839,7 +839,7 @@ static HRESULT Session_PropertyGet(IDispatch *pSession, LPCWSTR szName, LPCWSTR V_BSTR(&vararg[0]) = SysAllocString(szName); hr = invoke(pSession, "Property", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_BSTR); - lstrcpyW((WCHAR *)szReturn, V_BSTR(&varresult)); + lstrcpyW(szReturn, V_BSTR(&varresult)); VariantClear(&varresult); return hr; } @@ -1089,7 +1089,7 @@ static HRESULT Record_FieldCountGet(IDispatch *pRecord, int *pFieldCount) return hr; } -static HRESULT Record_StringDataGet(IDispatch *pRecord, int iField, LPCWSTR szString) +static HRESULT Record_StringDataGet(IDispatch *pRecord, int iField, LPWSTR szString) { VARIANT varresult; VARIANTARG vararg[1]; @@ -1101,7 +1101,7 @@ static HRESULT Record_StringDataGet(IDispatch *pRecord, int iField, LPCWSTR szSt V_I4(&vararg[0]) = iField; hr = invoke(pRecord, "StringData", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_BSTR); - lstrcpyW((WCHAR *)szString, V_BSTR(&varresult)); + lstrcpyW(szString, V_BSTR(&varresult)); VariantClear(&varresult); return hr; }

1 0

Aric Stewart : comctl32: Trying to blend an image without a mask causes problem, especially if the background is white.
by Alexandre Julliard 18 May '07

18 May '07

Module: wine Branch: master Commit: df0d77b007a8187fb344ae3201a0d93697501421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df0d77b007a8187fb344ae320… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 17 10:56:39 2007 -0500 comctl32: Trying to blend an image without a mask causes problem, especially if the background is white. --- dlls/comctl32/imagelist.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 0c23d19..3c9e89b 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1192,8 +1192,13 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); - BitBlt( hImageDC, 0, 0, cx, cy, hMaskListDC, pt.x, pt.y, SRCAND ); - BitBlt( hImageDC, 0, 0, cx, cy, hImageListDC, pt.x, pt.y, SRCPAINT ); + if (himl->hbmMask) + { + BitBlt( hImageDC, 0, 0, cx, cy, hMaskListDC, pt.x, pt.y, SRCAND ); + BitBlt( hImageDC, 0, 0, cx, cy, hImageListDC, pt.x, pt.y, SRCPAINT ); + } + else + BitBlt( hImageDC, 0, 0, cx, cy, hImageListDC, pt.x, pt.y, SRCCOPY); DeleteObject (SelectObject (hImageDC, hOldBrush)); }

1 0