June 2014 - Wine-Commits - list.winehq.org

Sebastian Lackner : ntdll/tests: Use an EXCEPTION_REGISTRATION_RECORD array to prevent compiler from reordering variables.
by Alexandre Julliard June 20, 2014

June 20, 2014

Module: wine Branch: master Commit: 3aa62498da73d75464fa52a8937c787602572ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa62498da73d75464fa52a89… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 19 23:15:42 2014 +0200 ntdll/tests: Use an EXCEPTION_REGISTRATION_RECORD array to prevent compiler from reordering variables. --- dlls/ntdll/tests/exception.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 40cdea7..032cc0b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -434,38 +434,38 @@ static const BYTE call_unwind_code[] = { static void test_unwind(void) { - EXCEPTION_REGISTRATION_RECORD frame2, frame1; + EXCEPTION_REGISTRATION_RECORD frames[2], *frame2 = &frames[0], *frame1 = &frames[1]; DWORD (*func)(void* function, EXCEPTION_REGISTRATION_RECORD *pEndFrame, EXCEPTION_RECORD* record, DWORD retval) = code_mem; DWORD retval; memcpy(code_mem, call_unwind_code, sizeof(call_unwind_code)); /* add first unwind handler */ - frame1.Handler = unwind_handler; - frame1.Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = &frame1; + frame1->Handler = unwind_handler; + frame1->Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = frame1; /* add second unwind handler */ - frame2.Handler = unwind_handler; - frame2.Prev = pNtCurrentTeb()->Tib.ExceptionList; - pNtCurrentTeb()->Tib.ExceptionList = &frame2; + frame2->Handler = unwind_handler; + frame2->Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = frame2; /* test unwind to current frame */ unwind_expected_eax = 0xDEAD0000; - retval = func(pRtlUnwind, &frame2, NULL, 0xDEAD0000); + retval = func(pRtlUnwind, frame2, NULL, 0xDEAD0000); ok(retval == 0xDEAD0000, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0000); - ok(pNtCurrentTeb()->Tib.ExceptionList == &frame2, "Exception record points to %p instead of %p\n", - pNtCurrentTeb()->Tib.ExceptionList, &frame2); + ok(pNtCurrentTeb()->Tib.ExceptionList == frame2, "Exception record points to %p instead of %p\n", + pNtCurrentTeb()->Tib.ExceptionList, frame2); /* unwind to frame1 */ unwind_expected_eax = 0xDEAD0000; - retval = func(pRtlUnwind, &frame1, NULL, 0xDEAD0000); + retval = func(pRtlUnwind, frame1, NULL, 0xDEAD0000); ok(retval == 0xDEAD0001, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0001); - ok(pNtCurrentTeb()->Tib.ExceptionList == &frame1, "Exception record points to %p instead of %p\n", - pNtCurrentTeb()->Tib.ExceptionList, &frame1); + ok(pNtCurrentTeb()->Tib.ExceptionList == frame1, "Exception record points to %p instead of %p\n", + pNtCurrentTeb()->Tib.ExceptionList, frame1); /* restore original handler */ - pNtCurrentTeb()->Tib.ExceptionList = frame1.Prev; + pNtCurrentTeb()->Tib.ExceptionList = frame1->Prev; } static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame,

1 0

Frédéric Delanoy : Assorted spelling/ grammar fixes.
by Alexandre Julliard June 20, 2014

June 20, 2014

Module: wine Branch: master Commit: 2ab87290200553e90ec121651148ff4cdbb71e64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab87290200553e90ec121651… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jun 19 23:30:35 2014 +0200 Assorted spelling/grammar fixes. --- dlls/ddraw/ddraw.c | 4 ++-- dlls/dmusic/collection.c | 2 +- dlls/gdi32/region.c | 2 +- dlls/ole32/storage32.h | 2 +- dlls/shell32/tests/shlfolder.c | 4 ++-- dlls/usp10/usp10.c | 2 +- dlls/wininet/internet.c | 4 ++-- dlls/wintrust/tests/crypt.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 062fe02..b62d5f6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1890,7 +1890,7 @@ static HRESULT WINAPI ddraw1_GetVerticalBlankStatus(IDirectDraw *iface, BOOL *st * * Returns * DD_OK on success - * DDERR_INVALIDPARAMS of free and total are NULL + * DDERR_INVALIDPARAMS if free and total are NULL * *****************************************************************************/ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *Caps, DWORD *total, @@ -4174,7 +4174,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, * D3D_OK on success * DDERR_OUTOFMEMORY if memory allocation failed * The return value of IWineD3DDevice::CreateVertexBuffer if this call fails - * DDERR_INVALIDPARAMS if desc or vertex_buffer are NULL + * DDERR_INVALIDPARAMS if desc or vertex_buffer is NULL * *****************************************************************************/ static HRESULT WINAPI d3d7_CreateVertexBuffer(IDirect3D7 *iface, D3DVERTEXBUFFERDESC *desc, diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 5754884..ec9914f 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -35,7 +35,7 @@ typedef struct IDirectMusicCollectionImpl { IStream *pStm; /* stream from which we load collection and later instruments */ LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ - CHAR *szCopyright; /* FIXME: should probably placed somewhere else */ + CHAR *szCopyright; /* FIXME: should probably be placed somewhere else */ DLSHEADER *pHeader; /* pool table */ POOLTABLE *pPoolTable; diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 93aa6a7..a5df6f1 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -891,7 +891,7 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata) GDI_ReleaseObj( hrgn ); if (rgndata) /* buffer is too small, signal it by return 0 */ return 0; - /* user requested buffer size with rgndata NULL */ + /* user requested buffer size with NULL rgndata */ return FIELD_OFFSET(RGNDATA, Buffer[size]); } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 108aad7..36cbc9d 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -504,7 +504,7 @@ StgStreamImpl* StgStreamImpl_Construct( /* Range lock constants. * * The storage format reserves the region from 0x7fffff00-0x7fffffff for - * locking and synchronization. Unfortuantely, the spec doesn't say which bytes + * locking and synchronization. Unfortunately, the spec doesn't say which bytes * within that range are used, and for what. These are guesses based on testing. * In particular, ends of ranges may be wrong. diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 474f605..e58a863 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3642,8 +3642,8 @@ static void test_ShellItemBindToHandler(void) if(SUCCEEDED(hr)) IUnknown_Release(punk); /* BHID_Transfer - ITransferSource and ITransferDestination are accessible starting Vista, IUnknown is - supported start Win8. */ + ITransferSource and ITransferDestination are accessible starting from Vista, IUnknown is + supported starting from Win8. */ hr = IShellItem_BindToHandler(psi, NULL, &BHID_Transfer, &IID_ITransferSource, (void**)&punk); ok(hr == S_OK || broken(FAILED(hr)) /* pre-Vista */, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 14feb6d..8769bd9 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -904,7 +904,7 @@ static WORD get_char_script( LPCWSTR str, INT index, INT end, INT *consumed) if (str[index] == 0xc || str[index] == 0x20 || str[index] == 0x202f) return Script_CR; - /* These punctuation are separated out as Latin punctuation */ + /* These punctuation characters are separated out as Latin punctuation */ if (strchrW(latin_punc,str[index])) return Script_Punctuation2; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index bb46a43..aa58e34 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2104,7 +2104,7 @@ BOOL WINAPI InternetCanonicalizeUrlA(LPCSTR lpszUrl, LPSTR lpszBuffer, { HRESULT hr; - TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_a(lpszUrl), lpszBuffer, + TRACE("(%s, %p, %p, 0x%08x) buffer length: %d\n", debugstr_a(lpszUrl), lpszBuffer, lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1); dwFlags = convert_url_canonicalization_flags(dwFlags); @@ -2130,7 +2130,7 @@ BOOL WINAPI InternetCanonicalizeUrlW(LPCWSTR lpszUrl, LPWSTR lpszBuffer, { HRESULT hr; - TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_w(lpszUrl), lpszBuffer, + TRACE("(%s, %p, %p, 0x%08x) buffer length: %d\n", debugstr_w(lpszUrl), lpszBuffer, lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1); dwFlags = convert_url_canonicalization_flags(dwFlags); diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 55f9ece..0e77f93 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -240,7 +240,7 @@ static void test_context(void) * FIXME: * We don't want to mess too much with these for now so we should delete only the ones * that shouldn't be there like the deadbeef ones. We first have to figure out if it's - * save to remove files and directories from CatRoot/CatRoot2. + * safe to remove files and directories from CatRoot/CatRoot2. */ ret = pCryptCATAdminAcquireContext(&hca, &dummy, 0);

1 0

Sebastian Lackner : kernel32: Process OutputDebugString events like regular exceptions.
by Alexandre Julliard June 20, 2014

June 20, 2014

Module: wine Branch: master Commit: 15fa6111af44eebf313fe058e849f602db494e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15fa6111af44eebf313fe058e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 19 21:18:31 2014 +0200 kernel32: Process OutputDebugString events like regular exceptions. --- dlls/kernel32/debugger.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 34ef30a..738b6f0 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -77,6 +77,14 @@ BOOL WINAPI WaitForDebugEvent( switch(data.code) { case EXCEPTION_DEBUG_EVENT: + if (data.exception.exc_code == DBG_PRINTEXCEPTION_C && data.exception.nb_params >= 2) + { + event->dwDebugEventCode = OUTPUT_DEBUG_STRING_EVENT; + event->u.DebugString.lpDebugStringData = wine_server_get_ptr( data.exception.params[1] ); + event->u.DebugString.fUnicode = FALSE; + event->u.DebugString.nDebugStringLength = data.exception.params[0]; + break; + } event->u.Exception.dwFirstChance = data.exception.first; event->u.Exception.ExceptionRecord.ExceptionCode = data.exception.exc_code; event->u.Exception.ExceptionRecord.ExceptionFlags = data.exception.flags; @@ -120,11 +128,6 @@ BOOL WINAPI WaitForDebugEvent( case UNLOAD_DLL_DEBUG_EVENT: event->u.UnloadDll.lpBaseOfDll = wine_server_get_ptr( data.unload_dll.base ); break; - case OUTPUT_DEBUG_STRING_EVENT: - event->u.DebugString.lpDebugStringData = wine_server_get_ptr( data.output_string.string ); - event->u.DebugString.fUnicode = FALSE; - event->u.DebugString.nDebugStringLength = data.output_string.length; - break; case RIP_EVENT: event->u.RipInfo.dwError = data.rip_info.error; event->u.RipInfo.dwType = data.rip_info.type; @@ -251,10 +254,12 @@ void WINAPI OutputDebugStringA( LPCSTR str ) { static HANDLE DBWinMutex = NULL; static BOOL mutex_inited = FALSE; + BOOL caught_by_dbg = TRUE; if (!str) str = ""; + WARN("%s\n", debugstr_a(str)); - /* raise fake exception to make copy protections happy */ + /* raise exception, WaitForDebugEvent() will generate a corresponding debug event */ __TRY { ULONG_PTR args[2]; @@ -264,25 +269,12 @@ void WINAPI OutputDebugStringA( LPCSTR str ) } __EXCEPT(debug_exception_handler) { + caught_by_dbg = FALSE; } __ENDTRY - - /* send string to attached debugger */ - /* FIXME should only send to debugger if exception is not caught by user-mode application */ - - SERVER_START_REQ( output_debug_string ) - { - req->string = wine_server_client_ptr( str ); - req->length = strlen(str) + 1; - wine_server_call( req ); - } - SERVER_END_REQ; - - WARN("%s\n", debugstr_a(str)); + if (caught_by_dbg) return; /* send string to a system-wide monitor */ - /* FIXME should only send to monitor if no debuggers are attached */ - if (!mutex_inited) { /* first call to OutputDebugString, initialize mutex handle */

1 0

Vincent Povirk : Revert "windowscodecs: Fix leak in test_QueryCapability." .
by Alexandre Julliard June 20, 2014

June 20, 2014

Module: wine Branch: master Commit: 13a8d80f3044854fc406e7e463fe0f204f92e0cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a8d80f3044854fc406e7e46… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 19 14:43:46 2014 -0500 Revert "windowscodecs: Fix leak in test_QueryCapability.". --- dlls/windowscodecs/tests/tiffformat.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index cee8882..cc1951e 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -242,8 +242,6 @@ todo_wine hr = IStream_Seek(stream, pos, SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek error %#x\n", hr); - IWICBitmapDecoder_Release(decoder); - hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr);

1 0

Sebastian Lackner : ntdll/tests: Run crashing i386 exception tests as the last step.
by Alexandre Julliard June 20, 2014

June 20, 2014

Module: wine Branch: master Commit: 457f6af05747831f9b78488c23b84a98cb89ebaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=457f6af05747831f9b78488c2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 19 10:06:36 2014 +0200 ntdll/tests: Run crashing i386 exception tests as the last step. --- dlls/ntdll/tests/exception.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 032cc0b..623a25e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1767,13 +1767,14 @@ START_TEST(exception) } test_unwind(); - test_prot_fault(); test_exceptions(); test_rtlraiseexception(); + test_outputdebugstring(); test_debugger(); test_simd_exceptions(); test_fpu_exceptions(); test_dpe_exceptions(); + test_prot_fault(); #elif defined(__x86_64__) pRtlAddFunctionTable = (void *)GetProcAddress( hntdll, @@ -1785,6 +1786,7 @@ START_TEST(exception) pRtlLookupFunctionEntry = (void *)GetProcAddress( hntdll, "RtlLookupFunctionEntry" ); + test_outputdebugstring(); test_virtual_unwind(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) @@ -1794,7 +1796,5 @@ START_TEST(exception) #endif - test_outputdebugstring(); - VirtualFree(code_mem, 0, MEM_FREE); }

1 0

Sebastian Lackner : ntdll/tests: Add exception tests for RtlUnwind on i386.
by Alexandre Julliard June 19, 2014

June 19, 2014

Module: wine Branch: master Commit: 0828715179cf28b05fe3e3dce74a9d76709a1679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0828715179cf28b05fe3e3dce… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 19 10:06:36 2014 +0200 ntdll/tests: Add exception tests for RtlUnwind on i386. --- dlls/ntdll/tests/exception.c | 80 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 05bc15c..40cdea7 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -43,6 +43,7 @@ static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pNtSetContextThread)(HANDLE,CONTEXT*); static NTSTATUS (WINAPI *pRtlRaiseException)(EXCEPTION_RECORD *rec); +static PVOID (WINAPI *pRtlUnwind)(PVOID, PVOID, PEXCEPTION_RECORD, PVOID); static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG first, PVECTORED_EXCEPTION_HANDLER func); static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID handler); static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*); @@ -390,6 +391,83 @@ static void test_rtlraiseexception(void) run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); } +static DWORD unwind_expected_eax; + +static DWORD unwind_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + trace("exception: %08x flags:%x addr:%p context: Eip:%x\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Eip); + + ok(rec->ExceptionCode == STATUS_UNWIND, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, STATUS_UNWIND); + ok(rec->ExceptionAddress == (char *)code_mem + 0x22, "ExceptionAddress at %p instead of %p\n", + rec->ExceptionAddress, (char *)code_mem + 0x22); + ok(context->Eax == unwind_expected_eax, "context->Eax is %08x instead of %08x\n", + context->Eax, unwind_expected_eax); + + context->Eax += 1; + return ExceptionContinueSearch; +} + +static const BYTE call_unwind_code[] = { + 0x55, /* push %ebp */ + 0x53, /* push %ebx */ + 0x56, /* push %esi */ + 0x57, /* push %edi */ + 0xe8, 0x00, 0x00, 0x00, 0x00, /* call 0 */ + 0x58, /* 0: pop %eax */ + 0x05, 0x1e, 0x00, 0x00, 0x00, /* add $0x1e,%eax */ + 0xff, 0x74, 0x24, 0x20, /* push 0x20(%esp) */ + 0xff, 0x74, 0x24, 0x20, /* push 0x20(%esp) */ + 0x50, /* push %eax */ + 0xff, 0x74, 0x24, 0x24, /* push 0x24(%esp) */ + 0x8B, 0x44, 0x24, 0x24, /* mov 0x24(%esp),%eax */ + 0xff, 0xd0, /* call *%eax */ + 0x5f, /* pop %edi */ + 0x5e, /* pop %esi */ + 0x5b, /* pop %ebx */ + 0x5d, /* pop %ebp */ + 0xc3, /* ret */ + 0xcc, /* int $3 */ +}; + +static void test_unwind(void) +{ + EXCEPTION_REGISTRATION_RECORD frame2, frame1; + DWORD (*func)(void* function, EXCEPTION_REGISTRATION_RECORD *pEndFrame, EXCEPTION_RECORD* record, DWORD retval) = code_mem; + DWORD retval; + + memcpy(code_mem, call_unwind_code, sizeof(call_unwind_code)); + + /* add first unwind handler */ + frame1.Handler = unwind_handler; + frame1.Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = &frame1; + + /* add second unwind handler */ + frame2.Handler = unwind_handler; + frame2.Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = &frame2; + + /* test unwind to current frame */ + unwind_expected_eax = 0xDEAD0000; + retval = func(pRtlUnwind, &frame2, NULL, 0xDEAD0000); + ok(retval == 0xDEAD0000, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0000); + ok(pNtCurrentTeb()->Tib.ExceptionList == &frame2, "Exception record points to %p instead of %p\n", + pNtCurrentTeb()->Tib.ExceptionList, &frame2); + + /* unwind to frame1 */ + unwind_expected_eax = 0xDEAD0000; + retval = func(pRtlUnwind, &frame1, NULL, 0xDEAD0000); + ok(retval == 0xDEAD0001, "RtlUnwind returned eax %08x instead of %08x\n", retval, 0xDEAD0001); + ok(pNtCurrentTeb()->Tib.ExceptionList == &frame1, "Exception record points to %p instead of %p\n", + pNtCurrentTeb()->Tib.ExceptionList, &frame1); + + /* restore original handler */ + pNtCurrentTeb()->Tib.ExceptionList = frame1.Prev; +} + static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { @@ -1625,6 +1703,7 @@ START_TEST(exception) pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); + pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" ); pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" ); pNtTerminateProcess = (void *)GetProcAddress( hntdll, "NtTerminateProcess" ); pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, @@ -1687,6 +1766,7 @@ START_TEST(exception) return; } + test_unwind(); test_prot_fault(); test_exceptions(); test_rtlraiseexception();

1 0

Jacek Caban : wininet: Use current server in HTTP_GetRedirectURL.
by Alexandre Julliard June 19, 2014

June 19, 2014

Module: wine Branch: master Commit: 153abe0fa7f654a9030915724fafa287e3eb9d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=153abe0fa7f654a9030915724… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 15:14:45 2014 +0200 wininet: Use current server in HTTP_GetRedirectURL. --- dlls/wininet/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bea7308..6c60c3a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3973,9 +3973,9 @@ static LPWSTR HTTP_GetRedirectURL(http_request_t *request, LPCWSTR lpszUrl) urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); urlComponents.lpszScheme = (request->hdr.dwFlags & INTERNET_FLAG_SECURE) ? szHttps : szHttp; urlComponents.dwSchemeLength = 0; - urlComponents.lpszHostName = session->hostName; + urlComponents.lpszHostName = request->server->name; urlComponents.dwHostNameLength = 0; - urlComponents.nPort = session->hostPort; + urlComponents.nPort = request->server->port; urlComponents.lpszUserName = session->userName; urlComponents.dwUserNameLength = 0; urlComponents.lpszPassword = NULL;

1 0

Vincent Povirk : windowscodecs: Fix leak in test_QueryCapability.
by Alexandre Julliard June 19, 2014

June 19, 2014

Module: wine Branch: master Commit: 1aa6e581d74df95c74b17ffddd1f52d451d3dc6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa6e581d74df95c74b17ffdd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 12 16:02:05 2014 -0500 windowscodecs: Fix leak in test_QueryCapability. --- dlls/windowscodecs/tests/tiffformat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 5e01562..cee8882 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -235,6 +235,9 @@ static void test_QueryCapability(void) todo_wine ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "expected WINCODEC_ERR_COMPONENTNOTFOUND, got %#x\n", hr); + if (SUCCEEDED(hr)) + IWICBitmapDecoder_Release(decoder); + pos.QuadPart = 0; hr = IStream_Seek(stream, pos, SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek error %#x\n", hr);

1 0

Jacek Caban : wininet: Update hostPort in HTTP_HandleRedirect.
by Alexandre Julliard June 19, 2014

June 19, 2014

Module: wine Branch: master Commit: a33ae13f7f4ecc3cbadb78db5a899b248d0b1e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33ae13f7f4ecc3cbadb78db5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 15:14:40 2014 +0200 wininet: Update hostPort in HTTP_HandleRedirect. --- dlls/wininet/http.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8e1a81d..bea7308 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4100,6 +4100,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) } else session->hostName = heap_strdupW(hostName); + session->hostPort = urlComponents.nPort; HTTP_ProcessHeader(request, hostW, session->hostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ);

1 0

Jacek Caban : wininet: Don't change hostPort in HTTP_HttpOpenRequestW.
by Alexandre Julliard June 19, 2014

June 19, 2014

Module: wine Branch: master Commit: 7ab99b5c4810a81ac08fa80b0750b27ecd115a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab99b5c4810a81ac08fa80b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 15:14:34 2014 +0200 wininet: Don't change hostPort in HTTP_HttpOpenRequestW. --- dlls/wininet/http.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d2b3de9..8e1a81d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3368,9 +3368,6 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); - if (session->hostPort == INTERNET_INVALID_PORT_NUMBER) - session->hostPort = INTERNET_DEFAULT_HTTP_PORT; - if (hIC->proxy && hIC->proxy[0] && !HTTP_ShouldBypassProxy(hIC, session->hostName)) HTTP_DealWithProxy( hIC, session, request );

1 0

Andrew Eikum : packager: Implement IOleObject::GetMiscStatus.
by Alexandre Julliard June 19, 2014

June 19, 2014

Module: wine Branch: master Commit: 04b6fc9d5ee2c44cdd94c1aaa6adb0c94b124a3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=04b6fc9d5ee2c44cdd94c1aaa… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 18 14:57:45 2014 -0500 packager: Implement IOleObject::GetMiscStatus. --- dlls/packager/packager_main.c | 11 +++++++++-- dlls/packager/tests/oleobj.c | 11 ++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 942ae72..02e691c 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -256,8 +256,15 @@ static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **pp static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %p)\n", This, dwAspect, pdwStatus); - return E_NOTIMPL; + + TRACE("(%p)->(%d, %p)\n", This, dwAspect, pdwStatus); + + if(!pdwStatus) + return E_INVALIDARG; + + *pdwStatus = OLEMISC_ONLYICONIC; + + return S_OK; } static HRESULT WINAPI OleObject_SetColorScheme(IOleObject *iface, LOGPALETTE *pLogpal) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 912dda9..6170e67 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -410,7 +410,7 @@ static void test_packager(void) { IOleObject *oleobj; IPersistStorage *persist; - DWORD len, bytes_read; + DWORD len, bytes_read, status; HRESULT hr; HANDLE file; WCHAR filename[MAX_PATH]; @@ -441,6 +441,15 @@ static void test_packager(void) hr = IOleObject_SetClientSite(oleobj, &clientsite); ok(hr == S_OK, "SetClientSite failed: %08x\n", hr); + hr = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, NULL); + ok(hr == E_INVALIDARG, "GetMiscStatus failed: %08x\n", hr); + + hr = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, &status); + ok(hr == S_OK, "GetMiscStatus failed: %08x\n", hr); + ok(status == OLEMISC_ONLYICONIC || + status == OLEMISC_CANTLINKINSIDE /* winxp */, + "Got wrong DVASPECT_CONTENT status: 0x%x\n", status); + hr = IOleObject_QueryInterface(oleobj, &IID_IPersistStorage, (void**)&persist); ok(hr == S_OK, "QueryInterface(IPersistStorage) failed: %08x\n", hr);

1 0

Andrew Eikum : packager: Implement IOleObject::SetClientSite.
by Alexandre Julliard June 19, 2014

June 19, 2014

Module: wine Branch: master Commit: 07e9d33f39730ff50646bda53ca2d510140e118d URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e9d33f39730ff50646bda53… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 18 14:57:13 2014 -0500 packager: Implement IOleObject::SetClientSite. --- dlls/packager/packager_main.c | 18 ++++++++-- dlls/packager/tests/oleobj.c | 78 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 4735383..942ae72 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -44,6 +44,8 @@ struct Package { LONG ref; WCHAR filename[MAX_PATH]; + + IOleClientSite *clientsite; }; static inline struct Package *impl_from_IOleObject(IOleObject *iface) @@ -95,6 +97,9 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref){ + if(This->clientsite) + IOleClientSite_Release(This->clientsite); + if(*This->filename) DeleteFileW(This->filename); @@ -107,8 +112,17 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, pClientSite); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pClientSite); + + if(This->clientsite) + IOleClientSite_Release(This->clientsite); + + This->clientsite = pClientSite; + if(pClientSite) + IOleClientSite_AddRef(pClientSite); + + return S_OK; } static HRESULT WINAPI OleObject_GetClientSite(IOleObject *iface, IOleClientSite **ppClientSite) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 5ff536a..912dda9 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -334,6 +334,78 @@ static IStorage stg = { &stg_vtbl }; +static HRESULT WINAPI clientsite_QueryInterface(IOleClientSite* This, + REFIID riid, void **ppvObject) +{ + ok(0, "query interface\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI clientsite_AddRef(IOleClientSite* This) +{ + return 2; +} + +static ULONG WINAPI clientsite_Release(IOleClientSite* This) +{ + return 1; +} + +static HRESULT WINAPI clientsite_SaveObject(IOleClientSite* This) +{ + ok(0, "saveobject\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_GetMoniker(IOleClientSite* This, + DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk) +{ + ok(0, "getmoniker\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_GetContainer(IOleClientSite* This, + IOleContainer **ppContainer) +{ + ok(0, "getcontainer\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_ShowObject(IOleClientSite* This) +{ + ok(0, "showobject\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_OnShowWindow(IOleClientSite* This, + BOOL fShow) +{ + ok(0, "onshowwindow\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_RequestNewObjectLayout(IOleClientSite* This) +{ + ok(0, "requestnewobjectlayout\n"); + return E_NOTIMPL; +} + +static IOleClientSiteVtbl clientsite_vtbl = { + clientsite_QueryInterface, + clientsite_AddRef, + clientsite_Release, + clientsite_SaveObject, + clientsite_GetMoniker, + clientsite_GetContainer, + clientsite_ShowObject, + clientsite_OnShowWindow, + clientsite_RequestNewObjectLayout +}; + +static IOleClientSite clientsite = { + &clientsite_vtbl +}; + static void test_packager(void) { IOleObject *oleobj; @@ -363,6 +435,12 @@ static void test_packager(void) &IID_IOleObject, (void**)&oleobj); ok(hr == S_OK, "CoCreateInstance(CLSID_Package_Alt) failed: %08x\n", hr); + hr = IOleObject_SetClientSite(oleobj, NULL); + ok(hr == S_OK, "SetClientSite failed: %08x\n", hr); + + hr = IOleObject_SetClientSite(oleobj, &clientsite); + ok(hr == S_OK, "SetClientSite failed: %08x\n", hr); + hr = IOleObject_QueryInterface(oleobj, &IID_IPersistStorage, (void**)&persist); ok(hr == S_OK, "QueryInterface(IPersistStorage) failed: %08x\n", hr);

1 0

André Hentschel : krnl386: Fix typo in a comment.
by Alexandre Julliard June 19, 2014

June 19, 2014

Module: wine Branch: master Commit: 8cad71cd5e15a77f6f2e4006167b17086269dd44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cad71cd5e15a77f6f2e40061… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 19 13:04:06 2014 +0200 krnl386: Fix typo in a comment. --- dlls/krnl386.exe16/wowthunk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index feb882b..1f352bd 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -561,7 +561,7 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, __wine_push_frame( &frame ); __wine_enter_vm86( context ); __wine_pop_frame( &frame ); - if (errno != 0) /* enter_vm86 will fall with ENOSYS on x64 kernels */ + if (errno != 0) /* enter_vm86 will fail with ENOSYS on x64 kernels */ { WARN("__wine_enter_vm86 failed (errno=%d)\n", errno); if (errno == ENOSYS)

1 0

Andrew Eikum : packager: Implement IOleObject::Close.
by Alexandre Julliard June 19, 2014

June 19, 2014

Module: wine Branch: master Commit: fae22c7c412c11c22b965b9d47d2a8ca9090bb65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae22c7c412c11c22b965b9d4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 18 14:58:50 2014 -0500 packager: Implement IOleObject::Close. --- dlls/packager/packager_main.c | 10 ++++++++-- dlls/packager/tests/oleobj.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 0575fcf..3f05f88 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -142,8 +142,14 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szCont static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(0x%x)\n", This, dwSaveOption); - return E_NOTIMPL; + + TRACE("(%p)->(0x%x)\n", This, dwSaveOption); + + if(dwSaveOption == OLECLOSE_SAVEIFDIRTY || + dwSaveOption == OLECLOSE_PROMPTSAVE) + WARN("Saving unsupported\n"); + + return S_OK; } static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker *pmk) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 6170e67..f81dc22 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -473,8 +473,24 @@ static void test_packager(void) CloseHandle(file); } + hr = IOleObject_Close(oleobj, OLECLOSE_NOSAVE); + ok(hr == S_OK, "Close failed: %08x\n", hr); + + if(extended){ + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Temporary file shouldn't be deleted\n"); + CloseHandle(file); + } + IPersistStorage_Release(persist); IOleObject_Release(oleobj); + + if(extended){ + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file == INVALID_HANDLE_VALUE, "Temporary file should be deleted\n"); + } } START_TEST(oleobj)

1 0

Vincent Povirk : windowscodecs: Fix leak in test_propertybag_getpropertyinfo.
by Alexandre Julliard June 19, 2014

June 19, 2014

Module: wine Branch: master Commit: ed92450d6f7474311561f0bc6322fd39a2c57b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed92450d6f7474311561f0bc6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 12 15:48:36 2014 -0500 windowscodecs: Fix leak in test_propertybag_getpropertyinfo. --- dlls/windowscodecs/tests/propertybag.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windowscodecs/tests/propertybag.c b/dlls/windowscodecs/tests/propertybag.c index b3cf191..55f5f65 100644 --- a/dlls/windowscodecs/tests/propertybag.c +++ b/dlls/windowscodecs/tests/propertybag.c @@ -67,10 +67,12 @@ static void test_propertybag_getpropertyinfo(IPropertyBag2 *property, ULONG expe ok(pb[0].vt == VT_UI1, "Invalid variant type, pb[0].vt=%x\n", pb[0].vt); ok(pb[0].dwType == PROPBAG2_TYPE_DATA, "Invalid variant type, pb[0].dwType=%x\n", pb[0].dwType); ok(lstrcmpW(pb[0].pstrName, wszTestProperty1) == 0, "Invalid property name, pb[0].pstrName=%s\n", wine_dbgstr_w(pb[0].pstrName)); + CoTaskMemFree(pb[0].pstrName); ok(pb[1].vt == VT_R4, "Invalid variant type, pb[1].vt=%x\n", pb[1].vt); ok(pb[1].dwType == PROPBAG2_TYPE_DATA, "Invalid variant type, pb[1].dwType=%x\n", pb[1].dwType); ok(lstrcmpW(pb[1].pstrName, wszTestProperty2) == 0, "Invalid property name, pb[1].pstrName=%s\n", wine_dbgstr_w(pb[1].pstrName)); + CoTaskMemFree(pb[1].pstrName); } static void test_propertybag_countproperties(IPropertyBag2 *property, ULONG expected_count)

1 0

Andrew Eikum : packager: Implement Activate verb for OleObject::DoVerb.
by Alexandre Julliard June 19, 2014

June 19, 2014

Module: wine Branch: master Commit: 7c6899ba7be84dea1ccf5dea095d6a5b7be60eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6899ba7be84dea1ccf5dea0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 18 14:58:26 2014 -0500 packager: Implement Activate verb for OleObject::DoVerb. --- dlls/packager/packager_main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 02e691c..0575fcf 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -175,12 +175,26 @@ static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwRese return E_NOTIMPL; } +static HRESULT do_activate_object(struct Package *This, HWND parent) +{ + static const WCHAR openW[] = {'o','p','e','n',0}; + ShellExecuteW(parent, openW, This->filename, NULL, NULL, SW_SHOW); + return S_OK; +} + static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpmsg, IOleClientSite *pActiveSite, LONG lindex, HWND hwndParent, LPCRECT lprcPosRect) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d)\n", This, iVerb); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, iVerb); + + switch(iVerb){ + case 0: + return do_activate_object(This, hwndParent); + } + + return E_INVALIDARG; } static HRESULT WINAPI OleObject_EnumVerbs(IOleObject *iface, IEnumOLEVERB **ppEnumOleVerb)

1 0

Vincent Povirk : windowscodecs: Fix leak in test_QueryCapability.
by Alexandre Julliard June 19, 2014

June 19, 2014

Module: wine Branch: master Commit: 0f2efcf0c528f9c6b831e5f13d495a26a38734e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f2efcf0c528f9c6b831e5f13… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 12 16:02:05 2014 -0500 windowscodecs: Fix leak in test_QueryCapability. --- dlls/windowscodecs/tests/tiffformat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index aac6618..5e01562 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -239,6 +239,8 @@ todo_wine hr = IStream_Seek(stream, pos, SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + IWICBitmapDecoder_Release(decoder); + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr);

1 0

Francois Gouget : msvcrt/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: eb4d39b9eec312dc880b8d78f17bd27a23c72671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4d39b9eec312dc880b8d78f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 18:03:40 2014 +0200 msvcrt/tests: Add a trailing '\n' to an ok() call. --- dlls/msvcrt/tests/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 353ebb4..97e70f0 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2270,7 +2270,7 @@ static void test_write_flush(void) ok(file != NULL, "unable to create test file\n"); iobuf[0] = 0; fwrite(iobuf, 1, 1, file); /* needed for wine to init _bufsiz */ - ok(file->_bufsiz == 4096, "incorrect default buffer size: %d", file->_bufsiz); + ok(file->_bufsiz == 4096, "incorrect default buffer size: %d\n", file->_bufsiz); test_write_flush_size(file, file->_bufsiz); setvbuf(file, iobuf, _IOFBF, sizeof(iobuf)); test_write_flush_size(file, sizeof(iobuf));

1 0

Francois Gouget : ole32: Return the correct error in FileLockBytesImpl_*LockRegion*().
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 082d0910290e609a58ccd1c7c6d5b866f36c6ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=082d0910290e609a58ccd1c7c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 17:55:13 2014 +0200 ole32: Return the correct error in FileLockBytesImpl_*LockRegion*(). --- dlls/ole32/filelockbytes.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index 1c8c938..605b5df 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -313,6 +313,19 @@ static HRESULT WINAPI FileLockBytesImpl_SetSize(ILockBytes* iface, ULARGE_INTEGE return hr; } +static HRESULT get_lock_error(void) +{ + switch (GetLastError()) + { + case ERROR_LOCK_VIOLATION: return STG_E_LOCKVIOLATION; break; + case ERROR_ACCESS_DENIED: return STG_E_ACCESSDENIED; break; + case ERROR_NOT_SUPPORTED: return STG_E_INVALIDFUNCTION; break; + default: + FIXME("no mapping for error %d\n", GetLastError()); + return STG_E_INVALIDFUNCTION; + } +} + static HRESULT WINAPI FileLockBytesImpl_LockRegion(ILockBytes* iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { @@ -334,8 +347,7 @@ static HRESULT WINAPI FileLockBytesImpl_LockRegion(ILockBytes* iface, if (LockFileEx(This->hfile, lock_flags, 0, cb.u.LowPart, cb.u.HighPart, &ol)) return S_OK; - else - return STG_E_ACCESSDENIED; + return get_lock_error(); } HRESULT FileLockBytesImpl_LockRegionSync(ILockBytes* iface, @@ -353,8 +365,7 @@ HRESULT FileLockBytesImpl_LockRegionSync(ILockBytes* iface, if (LockFileEx(This->hfile, LOCKFILE_EXCLUSIVE_LOCK, 0, cb.u.LowPart, cb.u.HighPart, &ol)) return S_OK; - else - return STG_E_ACCESSDENIED; + return get_lock_error(); } static HRESULT WINAPI FileLockBytesImpl_UnlockRegion(ILockBytes* iface, @@ -374,8 +385,7 @@ static HRESULT WINAPI FileLockBytesImpl_UnlockRegion(ILockBytes* iface, if (UnlockFileEx(This->hfile, 0, cb.u.LowPart, cb.u.HighPart, &ol)) return S_OK; - else - return STG_E_ACCESSDENIED; + return get_lock_error(); } static HRESULT WINAPI FileLockBytesImpl_Stat(ILockBytes* iface,

1 0

Piotr Caban : msvcrt: Add small blocks heap tests.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: ac399b084262cd494e368298c3cc6e90d17849d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac399b084262cd494e368298c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 18 11:35:26 2014 +0200 msvcrt: Add small blocks heap tests. --- dlls/msvcrt/tests/heap.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 309e194..2aaf48d 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -413,6 +413,49 @@ static void test_aligned(void) test_aligned_offset_realloc(256, 128, 64, 112); } +static void test_sbheap(void) +{ + void *mem; + int threshold; + + if(sizeof(void*) == 8) { + ok(!_set_sbh_threshold(0), "_set_sbh_threshold succeeded\n"); + ok(!_set_sbh_threshold(1000), "_set_sbh_threshold succeeded\n"); + return; + } + + mem = malloc(1); + ok(mem != NULL, "malloc failed\n"); + + ok(_set_sbh_threshold(1), "_set_sbh_threshold failed\n"); + threshold = _get_sbh_threshold(); + ok(threshold == 16, "threshold = %d\n", threshold); + + ok(_set_sbh_threshold(8), "_set_sbh_threshold failed\n"); + threshold = _get_sbh_threshold(); + ok(threshold == 16, "threshold = %d\n", threshold); + + ok(_set_sbh_threshold(1000), "_set_sbh_threshold failed\n"); + threshold = _get_sbh_threshold(); + ok(threshold == 1008, "threshold = %d\n", threshold); + + free(mem); + + mem = malloc(1); + ok(mem != NULL, "malloc failed\n"); + ok(!((UINT_PTR)mem & 0xf), "incorrect alignement (%p)\n", mem); + + mem = realloc(mem, 10); + ok(mem != NULL, "realloc failed\n"); + ok(!((UINT_PTR)mem & 0xf), "incorrect alignement (%p)\n", mem); + + ok(_set_sbh_threshold(0), "_set_sbh_threshold failed\n"); + threshold = _get_sbh_threshold(); + ok(threshold == 0, "threshold = %d\n", threshold); + + free(mem); +} + START_TEST(heap) { void *mem; @@ -436,4 +479,5 @@ START_TEST(heap) free(mem); test_aligned(); + test_sbheap(); }

1 0

Alexandre Julliard : msvcrt/tests: Avoid size_t in traces.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 762c94144fe43e3c2402d6dc5cbae8e45a790396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=762c94144fe43e3c2402d6dc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 18 19:52:27 2014 +0200 msvcrt/tests: Avoid size_t in traces. --- dlls/msvcrt/tests/file.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index c98adf4..73965f3 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2219,12 +2219,11 @@ static void test__open_osfhandle(void) CloseHandle(tmp); } -static void test_write_flush_size(FILE *file, size_t bufsize) +static void test_write_flush_size(FILE *file, int bufsize) { char *inbuffer; char *outbuffer; - size_t size; - int fd; + int size, fd; fd = fileno(file); inbuffer = calloc(bufsize + 1, 1);

1 0

Vincent Povirk : windowscodecs: Fix leak in DGifGetImageDesc.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: bb8fdb734ed1552f0d9bf9b2bcec614d29d72bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8fdb734ed1552f0d9bf9b2b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 12 14:15:21 2014 -0500 windowscodecs: Fix leak in DGifGetImageDesc. --- dlls/windowscodecs/ungif.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index c2887ed..427b32f 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -405,10 +405,7 @@ DGifGetImageDesc(GifFileType * GifFile) { GifFile->Image.Interlace = (Buf[0] & 0x40); if (Buf[0] & 0x80) { /* Does this image have local color map? */ - /*** FIXME: Why do we check both of these in order to do this? - * Why do we have both Image and SavedImages? */ - if (GifFile->Image.ColorMap && GifFile->SavedImages == NULL) - FreeMapObject(GifFile->Image.ColorMap); + FreeMapObject(GifFile->Image.ColorMap); GifFile->Image.ColorMap = MakeMapObject(1 << BitsPerPixel, NULL); if (GifFile->Image.ColorMap == NULL) {

1 0

Vincent Povirk : windowscodecs: Fix memory leak in ComponentFactory_CreateBitmapFromSource.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 831b7371bc70525413bf9554f74922620ab9bf34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831b7371bc70525413bf9554f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 6 15:28:09 2014 -0500 windowscodecs: Fix memory leak in ComponentFactory_CreateBitmapFromSource. --- dlls/windowscodecs/imgfactory.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index b969313..e7095dd 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -547,20 +547,22 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFacto IWICBitmapLock_Release(lock); } - if (SUCCEEDED(hr)) - hr = PaletteImpl_Create(&palette); - if (SUCCEEDED(hr) && (format_type == WICPixelFormatNumericRepresentationUnspecified || format_type == WICPixelFormatNumericRepresentationIndexed)) { - hr = IWICBitmapSource_CopyPalette(piBitmapSource, palette); + hr = PaletteImpl_Create(&palette); if (SUCCEEDED(hr)) - hr = IWICBitmap_SetPalette(result, palette); - else - hr = S_OK; + { + hr = IWICBitmapSource_CopyPalette(piBitmapSource, palette); + + if (SUCCEEDED(hr)) + hr = IWICBitmap_SetPalette(result, palette); + else + hr = S_OK; - IWICPalette_Release(palette); + IWICPalette_Release(palette); + } } if (SUCCEEDED(hr))

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 6144bae7f873e2881c554762dc01c87cb9200aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6144bae7f873e2881c554762d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 19 00:27:53 2014 +0900 po: Update Japanese translation. --- po/ja.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ja.po b/po/ja.po index 82d4e3e..8214d10 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-05-22 01:00+0900\n" -"Last-Translator: Toshiaki Hirose <t_hirose(a)aol.com>\n" +"PO-Revision-Date: 2014-06-19 00:15+0900\n" +"Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" "MIME-Version: 1.0\n" @@ -6581,10 +6581,8 @@ msgid "This network connection does not exist.\n" msgstr "このネットワーク接続は存在しません。\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "接続は拒否されました。\n" +msgstr "相手側により接続がリセットされました。\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Alexandre Julliard : kernel32: Only try to load krnl386 in native applications.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: b0953a09bdc8d807b6549051c4283a6e2dc6ad88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0953a09bdc8d807b6549051c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 18 18:35:19 2014 +0200 kernel32: Only try to load krnl386 in native applications. --- dlls/kernel32/kernel_main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 13c01ed..6afc1cb 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -101,7 +101,13 @@ static BOOL process_attach( HMODULE module ) /* Securom checks for this one when version is NT */ set_entry_point( module, "FT_Thunk", 0 ); } - else LoadLibraryA( "krnl386.exe16" ); + else + { + LDR_MODULE *ldr; + + if (LdrFindEntryForAddress( GetModuleHandleW( 0 ), &ldr ) || !(ldr->Flags & LDR_WINE_INTERNAL)) + LoadLibraryA( "krnl386.exe16" ); + } /* finish the process initialisation for console bits, if needed */ __wine_set_signal_handler(SIGINT, CONSOLE_HandleCtrlC);

1 0