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

Alexandre Julliard : krnl386: Properly handle failure to set a 16-bit LDT entry.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 699daa77495c559b5f7f651bcc8e39661512309a URL: http://source.winehq.org/git/wine.git/?a=commit;h=699daa77495c559b5f7f651bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 18 18:34:33 2014 +0200 krnl386: Properly handle failure to set a 16-bit LDT entry. --- dlls/krnl386.exe16/kernel.c | 2 +- dlls/krnl386.exe16/ne_module.c | 9 ++++++++- dlls/krnl386.exe16/selector.c | 36 +++++++++++++++++++++++++----------- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/krnl386.exe16/kernel.c b/dlls/krnl386.exe16/kernel.c index 6b0081a..0a66d1e 100644 --- a/dlls/krnl386.exe16/kernel.c +++ b/dlls/krnl386.exe16/kernel.c @@ -71,7 +71,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: - LoadLibrary16( "krnl386.exe" ); + if (LoadLibrary16( "krnl386.exe" ) < 32) return FALSE; /* fall through */ case DLL_THREAD_ATTACH: thread_attach(); diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 34d961c..c0e1a98 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -43,6 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); WINE_DECLARE_DEBUG_CHANNEL(loaddll); WINE_DECLARE_DEBUG_CHANNEL(relay); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #include "pshpack1.h" typedef struct _GPHANDLERDEF @@ -623,7 +624,12 @@ static HMODULE16 build_module( const void *mapping, SIZE_T mapping_size, LPCSTR sizeof(OFSTRUCT) - sizeof(ofs->szPathName) + strlen(path) + 1; hModule = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, size ); - if (!hModule) return ERROR_BAD_FORMAT; + if (!hModule) + { + ERR_(winediag)( "Failed to create module for %s, 16-bit LDT support may be missing.\n", + debugstr_a(path) ); + return ERROR_BAD_FORMAT; + } FarSetOwner16( hModule, hModule ); pModule = GlobalLock16( hModule ); @@ -1035,6 +1041,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ TRACE("Trying built-in '%s'\n", libname); hinst = NE_DoLoadBuiltinModule( descr, file_name, mod32 ); if (hinst > 32) TRACE_(loaddll)("Loaded module %s : builtin\n", debugstr_a(file_name)); + else FreeLibrary( mod32 ); } else { diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index 5a99f72..fa9dd52 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -52,7 +52,14 @@ WORD WINAPI AllocSelectorArray16( WORD count ) wine_ldt_set_base( &entry, 0 ); wine_ldt_set_limit( &entry, 1 ); /* avoid 0 base and limit */ wine_ldt_set_flags( &entry, WINE_LDT_FLAGS_DATA ); - for (i = 0; i < count; i++) wine_ldt_set_entry( sel + (i << __AHSHIFT), &entry ); + for (i = 0; i < count; i++) + { + if (wine_ldt_set_entry( sel + (i << __AHSHIFT), &entry ) < 0) + { + wine_ldt_free_entries( sel, count ); + return 0; + } + } } return sel; } @@ -102,7 +109,7 @@ WORD WINAPI FreeSelector16( WORD sel ) * * Set the LDT entries for an array of selectors. */ -static void SELECTOR_SetEntries( WORD sel, const void *base, DWORD size, unsigned char flags ) +static BOOL SELECTOR_SetEntries( WORD sel, const void *base, DWORD size, unsigned char flags ) { LDT_ENTRY entry; WORD i, count; @@ -113,11 +120,12 @@ static void SELECTOR_SetEntries( WORD sel, const void *base, DWORD size, unsigne count = (size + 0xffff) / 0x10000; for (i = 0; i < count; i++) { - wine_ldt_set_entry( sel + (i << __AHSHIFT), &entry ); + if (wine_ldt_set_entry( sel + (i << __AHSHIFT), &entry ) < 0) return FALSE; wine_ldt_set_base( &entry, (char*)wine_ldt_get_base(&entry) + 0x10000); /* yep, Windows sets limit like that, not 64K sel units */ wine_ldt_set_limit( &entry, wine_ldt_get_limit(&entry) - 0x10000 ); } + return TRUE; } @@ -132,8 +140,12 @@ WORD SELECTOR_AllocBlock( const void *base, DWORD size, unsigned char flags ) if (!size) return 0; count = (size + 0xffff) / 0x10000; - sel = wine_ldt_alloc_entries( count ); - if (sel) SELECTOR_SetEntries( sel, base, size, flags ); + if ((sel = wine_ldt_alloc_entries( count ))) + { + if (SELECTOR_SetEntries( sel, base, size, flags )) return sel; + wine_ldt_free_entries( sel, count ); + sel = 0; + } return sel; } @@ -202,8 +214,9 @@ WORD WINAPI AllocCStoDSAlias16( WORD sel ) if (!newsel) return 0; wine_ldt_get_entry( sel, &entry ); entry.HighWord.Bits.Type = WINE_LDT_FLAGS_DATA; - wine_ldt_set_entry( newsel, &entry ); - return newsel; + if (wine_ldt_set_entry( newsel, &entry ) >= 0) return newsel; + wine_ldt_free_entries( newsel, 1 ); + return 0; } @@ -221,8 +234,9 @@ WORD WINAPI AllocDStoCSAlias16( WORD sel ) if (!newsel) return 0; wine_ldt_get_entry( sel, &entry ); entry.HighWord.Bits.Type = WINE_LDT_FLAGS_CODE; - wine_ldt_set_entry( newsel, &entry ); - return newsel; + if (wine_ldt_set_entry( newsel, &entry ) >= 0) return newsel; + wine_ldt_free_entries( newsel, 1 ); + return 0; } @@ -260,7 +274,7 @@ WORD WINAPI SetSelectorBase( WORD sel, DWORD base ) LDT_ENTRY entry; wine_ldt_get_entry( sel, &entry ); wine_ldt_set_base( &entry, DOSMEM_MapDosToLinear(base) ); - wine_ldt_set_entry( sel, &entry ); + if (wine_ldt_set_entry( sel, &entry ) < 0) sel = 0; return sel; } @@ -282,7 +296,7 @@ WORD WINAPI SetSelectorLimit16( WORD sel, DWORD limit ) LDT_ENTRY entry; wine_ldt_get_entry( sel, &entry ); wine_ldt_set_limit( &entry, limit ); - wine_ldt_set_entry( sel, &entry ); + if (wine_ldt_set_entry( sel, &entry ) < 0) sel = 0; return sel; }

1 0

Sebastian Lackner : wininet: Don' t update *lpdwIndex if HttpQueryInfoW fails with ERROR_INSUFFICIENT_BUFFER.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 2e0921d065121fe4bf3b17a54ab529f3fd4041fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0921d065121fe4bf3b17a54… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jun 17 02:57:10 2014 +0200 wininet: Don't update *lpdwIndex if HttpQueryInfoW fails with ERROR_INSUFFICIENT_BUFFER. --- dlls/wininet/http.c | 3 +-- dlls/wininet/tests/http.c | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c7e3474..d2b3de9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3695,8 +3695,6 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, return ERROR_HTTP_HEADER_NOT_FOUND; } - if (lpdwIndex) (*lpdwIndex)++; - /* coalesce value to requested type */ if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER && lpBuffer) { @@ -3742,6 +3740,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, } *lpdwBufferLength = len - sizeof(WCHAR); } + if (lpdwIndex) (*lpdwIndex)++; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 41f4c5b..f3340df 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -465,7 +465,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) char *post_data = NULL; BOOL res, on_async = TRUE; CHAR buffer[4000]; - DWORD length, exlen = 0, post_len = 0; + DWORD length, index, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -635,12 +635,23 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); ok(!strcmp(buffer, test->redirected_url), "Wrong URL %s\n", buffer); + index = 0; + length = 0; + SetLastError(0xdeadbeef); + ok(HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,NULL,&length,&index) == FALSE,"Query worked\n"); + if(test->flags & TESTF_COMPRESSED) + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, + "expected ERROR_HTTP_HEADER_NOT_FOUND, got %u\n", GetLastError()); + ok(index == 0, "Index was incremented\n"); + + index = 0; length = 16; - res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,0x0); + res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,&index); trace("Option HTTP_QUERY_CONTENT_LENGTH -> %i %s (%u)\n",res,buffer,GetLastError()); if(test->flags & TESTF_COMPRESSED) ok(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND, got %x (%u)\n", res, GetLastError()); + ok(!res || index == 1, "Index was not incremented although result is %x (index = %u)\n", res, index); length = 100; res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_TYPE,buffer,&length,0x0); @@ -1594,6 +1605,8 @@ static void HttpHeaders_test(void) strcpy(buffer,"Warning"); ok(HttpQueryInfoA(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index) == FALSE,"Query succeeded on a too small buffer\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(index == 0, "Index was incremented\n"); ok(strcmp(buffer,"Warning")==0, "incorrect string was returned(%s)\n",buffer); /* string not touched */ ok(len == 6, "Invalid length (exp. 6, got %d)\n", len); /* unlike success, the length includes the NULL-terminator */

1 0

Austin English : kernel32: Add a stub for UnregisterApplicationRestart.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: fd6c5490dfe8818b1f9fa19e6502e22ae1736e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd6c5490dfe8818b1f9fa19e6… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 17 16:24:48 2014 -0700 kernel32: Add a stub for UnregisterApplicationRestart. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a6c6b29..8aa5d21 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1237,6 +1237,7 @@ @ stdcall UnlockFile(long long long long long) @ stdcall UnlockFileEx(long long long long ptr) @ stdcall UnmapViewOfFile(ptr) +@ stdcall UnregisterApplicationRestart() # @ stub UnregisterConsoleIME @ stdcall UnregisterWait(long) @ stdcall UnregisterWaitEx(long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0b70a55..2566ac4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3956,3 +3956,13 @@ VOID WINAPI FlushProcessWriteBuffers(void) if (!once++) FIXME(": stub\n"); } + +/*********************************************************************** + * UnregisterApplicationRestart (KERNEL32.@) + */ +HRESULT WINAPI UnregisterApplicationRestart(void) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return S_OK; +} diff --git a/include/winbase.h b/include/winbase.h index 7432983..a269833 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2411,6 +2411,7 @@ WINBASEAPI BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED); #define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle)) WINBASEAPI BOOL WINAPI UnmapViewOfFile(LPCVOID); +WINBASEAPI HRESULT WINAPI UnregisterApplicationRestart(void); WINBASEAPI BOOL WINAPI UnregisterWait(HANDLE); WINBASEAPI BOOL WINAPI UnregisterWaitEx(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI UpdateResourceA(HANDLE,LPCSTR,LPCSTR,WORD,LPVOID,DWORD);

1 0

Vincent Povirk : advapi32/tests: Account for limited users in registry test.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 8340636c55cdbcf4f3415ac25dc01377fb8e6fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8340636c55cdbcf4f3415ac25… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 29 14:10:05 2014 -0500 advapi32/tests: Account for limited users in registry test. --- dlls/advapi32/tests/registry.c | 151 +++++++++++++++++++++++++++------------- 1 file changed, 102 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8340636c55cdbcf4f3415…

1 0

Vincent Povirk : shell32: Set tm_isdst before calling mktime.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: fa8d59c30b250ac1d4814268e2b7956a11d8f8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8d59c30b250ac1d4814268e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 28 10:20:42 2014 -0500 shell32: Set tm_isdst before calling mktime. --- dlls/shell32/trash.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 043ae5b..3ca6e4e 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -515,6 +515,7 @@ static HRESULT TRASH_GetDetails(const TRASH_BUCKET *bucket, LPCSTR filename, WIN &del_time.tm_hour, &del_time.tm_min, &del_time.tm_sec); del_time.tm_year -= 1900; del_time.tm_mon--; + del_time.tm_isdst = -1; del_secs = mktime(&del_time); RtlSecondsSince1970ToTime(del_secs, (LARGE_INTEGER *)&data->ftLastAccessTime);

1 0

Grazvydas Ignotas : msvcrt/tests: Test _cnt value after rewind/fflush.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 47909d8d8b33a2c849477477bf0e063c326b2f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47909d8d8b33a2c849477477b… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jun 18 13:55:51 2014 +0300 msvcrt/tests: Test _cnt value after rewind/fflush. --- dlls/msvcrt/tests/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 73965f3..353ebb4 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2232,12 +2232,14 @@ static void test_write_flush_size(FILE *file, int bufsize) for (size = bufsize + 1; size >= bufsize - 1; size--) { rewind(file); + ok(file->_cnt == 0, "_cnt should be 0 after rewind, but is %d\n", file->_cnt); fwrite(outbuffer, 1, size, file); /* lseek() below intentionally redirects the write in fflush() to detect * if fwrite() has already flushed the whole buffer or not. */ lseek(fd, 1, SEEK_SET); fflush(file); + todo_wine ok(file->_cnt == 0, "_cnt should be 0 after fflush, but is %d\n", file->_cnt); fseek(file, 0, SEEK_SET); ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); if (size == bufsize)

1 0

Francois Gouget : ole32: FileLockBytesImpl_WriteAt() should return STG_E_WRITEFAULT for write errors.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: cc4ad353d765234901ddd0c94e9db97db379e4d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc4ad353d765234901ddd0c94… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 17:44:12 2014 +0200 ole32: FileLockBytesImpl_WriteAt() should return STG_E_WRITEFAULT for write errors. --- dlls/ole32/filelockbytes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index 52c1d26..1c8c938 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -265,14 +265,14 @@ static HRESULT WINAPI FileLockBytesImpl_WriteAt( ret = SetFilePointerEx(This->hfile, offset, NULL, FILE_BEGIN); if (!ret) - return STG_E_READFAULT; + return STG_E_WRITEFAULT; while (bytes_left) { ret = WriteFile(This->hfile, writePtr, bytes_left, &cbWritten, NULL); if (!ret) - return STG_E_READFAULT; + return STG_E_WRITEFAULT; if (pcbWritten) *pcbWritten += cbWritten;

1 0

Piotr Caban : msvcrt: Allocate data with 16-bytes alignement if small blocks heap is used.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: 608605c7dcb9584cf658e247938c18fa13a7b0b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=608605c7dcb9584cf658e2479… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 18 11:35:19 2014 +0200 msvcrt: Allocate data with 16-bytes alignement if small blocks heap is used. --- dlls/msvcrt/heap.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 105 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 0cac3fe..432df86 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -38,7 +38,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); ((((DWORD_PTR)((char *)ptr + alignment + sizeof(void *) + offset)) & \ ~(alignment - 1)) - offset)) -static HANDLE heap; +#define SB_HEAP_ALIGN 16 + +static HANDLE heap, sb_heap; typedef int (CDECL *MSVCRT_new_handler_func)(MSVCRT_size_t size); @@ -50,6 +52,78 @@ static unsigned int MSVCRT_amblksiz = 16; /* FIXME - According to documentation it should be 480 bytes, at runtime default is 0 */ static MSVCRT_size_t MSVCRT_sbh_threshold = 0; +static void* msvcrt_heap_alloc(DWORD flags, MSVCRT_size_t size) +{ + if(size < MSVCRT_sbh_threshold) + { + void *memblock, *temp, **saved; + + temp = HeapAlloc(sb_heap, flags, size+sizeof(void*)+SB_HEAP_ALIGN); + if(!temp) return NULL; + + memblock = ALIGN_PTR(temp, SB_HEAP_ALIGN, 0); + saved = SAVED_PTR(memblock); + *saved = temp; + return memblock; + } + + return HeapAlloc(heap, flags, size); +} + +static void* msvcrt_heap_realloc(DWORD flags, void *ptr, MSVCRT_size_t size) +{ + if(sb_heap && ptr && !HeapValidate(heap, 0, ptr)) + { + /* TODO: move data to normal heap if it exceeds sbh_threshold limit */ + void *memblock, *temp, **saved; + MSVCRT_size_t old_padding, new_padding, old_size; + + saved = SAVED_PTR(ptr); + old_padding = (char*)ptr - (char*)*saved; + old_size = HeapSize(sb_heap, 0, *saved); + if(old_size == -1) + return NULL; + old_size -= old_padding; + + temp = HeapReAlloc(sb_heap, flags, *saved, size+sizeof(void*)+SB_HEAP_ALIGN); + if(!temp) return NULL; + + memblock = ALIGN_PTR(temp, SB_HEAP_ALIGN, 0); + saved = SAVED_PTR(memblock); + new_padding = (char*)memblock - (char*)temp; + + if(new_padding != old_padding) + memmove(memblock, (char*)temp+old_padding, old_size>size ? size : old_size); + + *saved = temp; + return memblock; + } + + return HeapReAlloc(heap, flags, ptr, size); +} + +static BOOL msvcrt_heap_free(void *ptr) +{ + if(sb_heap && ptr && !HeapValidate(heap, 0, ptr)) + { + void **saved = SAVED_PTR(ptr); + return HeapFree(sb_heap, 0, *saved); + } + + return HeapFree(heap, 0, ptr); +} + +static MSVCRT_size_t msvcrt_heap_size(void *ptr) +{ + if(sb_heap && ptr && !HeapValidate(heap, 0, ptr)) + { + void **saved = SAVED_PTR(ptr); + return HeapSize(sb_heap, 0, *saved); + } + + return HeapSize(heap, 0, ptr); +} + /********************************************************************* * ??2(a)YAPAXI@Z (MSVCRT.@) */ @@ -60,7 +134,7 @@ void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) do { - retval = HeapAlloc(heap, 0, size); + retval = msvcrt_heap_alloc(0, size); if(retval) { TRACE("(%ld) returning %p\n", size, retval); @@ -95,7 +169,7 @@ void* CDECL MSVCRT_operator_new_dbg(MSVCRT_size_t size, int type, const char *fi void CDECL MSVCRT_operator_delete(void *mem) { TRACE("(%p)\n", mem); - HeapFree(heap, 0, mem); + msvcrt_heap_free(mem); } @@ -167,7 +241,7 @@ int CDECL _callnewh(MSVCRT_size_t size) */ void* CDECL _expand(void* mem, MSVCRT_size_t size) { - return HeapReAlloc(heap, HEAP_REALLOC_IN_PLACE_ONLY, mem, size); + return msvcrt_heap_realloc(HEAP_REALLOC_IN_PLACE_ONLY, mem, size); } /********************************************************************* @@ -175,7 +249,8 @@ void* CDECL _expand(void* mem, MSVCRT_size_t size) */ int CDECL _heapchk(void) { - if (!HeapValidate( heap, 0, NULL)) + if (!HeapValidate(heap, 0, NULL) || + (sb_heap && !HeapValidate(sb_heap, 0, NULL))) { msvcrt_set_errno(GetLastError()); return MSVCRT__HEAPBADNODE; @@ -188,7 +263,8 @@ int CDECL _heapchk(void) */ int CDECL _heapmin(void) { - if (!HeapCompact( heap, 0 )) + if (!HeapCompact( heap, 0 ) || + (sb_heap && !HeapCompact( sb_heap, 0 ))) { if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) msvcrt_set_errno(GetLastError()); @@ -204,6 +280,9 @@ int CDECL _heapwalk(struct MSVCRT__heapinfo* next) { PROCESS_HEAP_ENTRY phe; + if (sb_heap) + FIXME("small blocks heap not supported\n"); + LOCK_HEAP; phe.lpData = next->_pentry; phe.cbData = next->_size; @@ -280,7 +359,7 @@ MSVCRT_intptr_t CDECL _get_heap_handle(void) */ MSVCRT_size_t CDECL _msize(void* mem) { - MSVCRT_size_t size = HeapSize(heap,0,mem); + MSVCRT_size_t size = msvcrt_heap_size(mem); if (size == ~(MSVCRT_size_t)0) { WARN(":Probably called with non wine-allocated memory, ret = -1\n"); @@ -310,7 +389,7 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs */ void* CDECL MSVCRT_calloc(MSVCRT_size_t size, MSVCRT_size_t count) { - return HeapAlloc( heap, HEAP_ZERO_MEMORY, size * count ); + return msvcrt_heap_alloc(HEAP_ZERO_MEMORY, size*count); } /********************************************************************* @@ -318,7 +397,7 @@ void* CDECL MSVCRT_calloc(MSVCRT_size_t size, MSVCRT_size_t count) */ void CDECL MSVCRT_free(void* ptr) { - HeapFree(heap,0,ptr); + msvcrt_heap_free(ptr); } /********************************************************************* @@ -326,7 +405,7 @@ void CDECL MSVCRT_free(void* ptr) */ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) { - void *ret = HeapAlloc(heap,0,size); + void *ret = msvcrt_heap_alloc(0, size); if (!ret) *MSVCRT__errno() = MSVCRT_ENOMEM; return ret; @@ -338,7 +417,7 @@ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) { if (!ptr) return MSVCRT_malloc(size); - if (size) return HeapReAlloc(heap, 0, ptr, size); + if (size) return msvcrt_heap_realloc(0, ptr, size); MSVCRT_free(ptr); return NULL; } @@ -389,11 +468,22 @@ MSVCRT_size_t CDECL _get_sbh_threshold(void) */ int CDECL _set_sbh_threshold(MSVCRT_size_t threshold) { +#ifdef _WIN64 + return 0; +#else if(threshold > 1016) return 0; - else - MSVCRT_sbh_threshold = threshold; + + if(!sb_heap) + { + sb_heap = HeapCreate(0, 0, 0); + if(!sb_heap) + return 0; + } + + MSVCRT_sbh_threshold = (threshold+0xf) & ~0xf; return 1; +#endif } /********************************************************************* @@ -726,4 +816,6 @@ BOOL msvcrt_init_heap(void) void msvcrt_destroy_heap(void) { HeapDestroy(heap); + if(sb_heap) + HeapDestroy(sb_heap); }

1 0

Andrew Eikum : packager: Add loading support for Ole10Native storage objects.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: d03c1cfc17fdbbff60db665ddd78ec3bf94d4a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03c1cfc17fdbbff60db665dd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 17 11:43:39 2014 -0500 packager: Add loading support for Ole10Native storage objects. --- configure | 1 + configure.ac | 1 + dlls/packager/Makefile.in | 2 +- dlls/packager/packager_main.c | 277 ++++++++++++++++++++++++++- dlls/packager/tests/Makefile.in | 5 + dlls/packager/tests/oleobj.c | 400 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 684 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d03c1cfc17fdbbff60db6…

1 0

Andrew Eikum : packager: Add stub Packager implementation.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: b456eb5213dbf638c57076038e23a160a6b6d386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b456eb5213dbf638c57076038… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 17 08:22:32 2014 -0500 packager: Add stub Packager implementation. --- configure | 2 + configure.ac | 1 + dlls/packager/Makefile.in | 8 + dlls/packager/packager.rc | 24 +++ dlls/packager/packager.rgs | 15 ++ dlls/packager/packager.spec | 4 + dlls/packager/packager_classes.idl | 26 +++ dlls/packager/packager_main.c | 369 ++++++++++++++++++++++++++++++++++++ 8 files changed, 449 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b456eb5213dbf638c5707…

1 0

Francois Gouget : ole32: Treat STG_E_LOCKVIOLATION the same way as STG_E_ACCESSDENIED as both indicate locking contention.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: bea2c6f2d5a345b3e1b1a534eaa65fd80d429caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea2c6f2d5a345b3e1b1a534e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 17:53:48 2014 +0200 ole32: Treat STG_E_LOCKVIOLATION the same way as STG_E_ACCESSDENIED as both indicate locking contention. --- dlls/ole32/storage32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f425d87..6ebc1e7 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2885,12 +2885,12 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs { hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, dwLockType); - if (hr == STG_E_ACCESSDENIED) + if (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION) { Sleep(delay); if (delay < 150) delay++; } - } while (hr == STG_E_ACCESSDENIED); + } while (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION); return hr; } @@ -2907,7 +2907,7 @@ static HRESULT StorageImpl_CheckLockRange(StorageImpl *This, ULONG start, hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE); if (SUCCEEDED(hr)) ILockBytes_UnlockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE); - if (hr == STG_E_ACCESSDENIED) + if (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION) return fail_hr; else return S_OK; @@ -2925,7 +2925,7 @@ static HRESULT StorageImpl_LockOne(StorageImpl *This, ULONG start, ULONG end) { offset.QuadPart = i; hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE); - if (hr != STG_E_ACCESSDENIED) + if (hr != STG_E_ACCESSDENIED && hr != STG_E_LOCKVIOLATION) break; }

1 0

Francois Gouget : server: Treat ENOTSUP the same way as ENOLCK, consider locking to be non-functional on that filesystem.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: wine Branch: master Commit: f4c7e6d607d15c681daa60cfb12b128e4376b809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c7e6d607d15c681daa60cfb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 18 17:53:06 2014 +0200 server: Treat ENOTSUP the same way as ENOLCK, consider locking to be non-functional on that filesystem. --- server/fd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/fd.c b/server/fd.c index 7043d04..e3b722c 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1167,6 +1167,7 @@ static int set_unix_lock( struct fd *fd, file_pos_t start, file_pos_t end, int t /* fall through */ case EIO: case ENOLCK: + case ENOTSUP: /* no locking on this fs, just ignore it */ fd->fs_locks = 0; return 1;

1 0

Francois Gouget : patches: Update the sample Apache configuration file so it works with 2.4.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: tools Branch: master Commit: f2bf7041960e53b00dd162f4e63531620cd7fb62 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f2bf7041960e53b00dd162f4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 18 13:46:15 2014 +0200 patches: Update the sample Apache configuration file so it works with 2.4. --- patches/doc/vhost_source.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/patches/doc/vhost_source.conf b/patches/doc/vhost_source.conf index 30bfca5..60a5bb5 100644 --- a/patches/doc/vhost_source.conf +++ b/patches/doc/vhost_source.conf @@ -5,7 +5,10 @@ ServerAdmin winehq(a)example.com <Directory /home/winehq/opt/source> + # Access control the Apache 2.2 way Order allow,deny Allow from all + # And the Apache 2.4 way + Require all granted </Directory> </VirtualHost>

1 0

Francois Gouget : testbot/lib: Improve the methods argument handling.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: tools Branch: master Commit: f792f79622fdb823f91f7809714fcfca36467414 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f792f79622fdb823f91f7809… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 18 13:45:36 2014 +0200 testbot/lib: Improve the methods argument handling. This standardizes the way we handle the arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/lib/WineTestBot/Branches.pm | 14 ++--- testbot/lib/WineTestBot/Jobs.pm | 46 +++++++------- testbot/lib/WineTestBot/Patches.pm | 35 +++++------ testbot/lib/WineTestBot/PendingPatchSets.pm | 33 +++++----- testbot/lib/WineTestBot/PendingPatches.pm | 4 +- testbot/lib/WineTestBot/Roles.pm | 4 +- testbot/lib/WineTestBot/Steps.pm | 14 ++--- testbot/lib/WineTestBot/StepsTasks.pm | 13 ++-- testbot/lib/WineTestBot/Tasks.pm | 11 ++-- testbot/lib/WineTestBot/UserRoles.pm | 4 +- testbot/lib/WineTestBot/Users.pm | 81 +++++++++++-------------- testbot/lib/WineTestBot/VMs.pm | 56 ++++++++--------- testbot/lib/WineTestBot/WineTestBotObjects.pm | 6 +- 13 files changed, 146 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=f792f79622fdb823f91f…

1 0

Francois Gouget : testbot/lib: Fix the UseDBIBackEnd() export directive.
by Alexandre Julliard June 18, 2014

June 18, 2014

Module: tools Branch: master Commit: d351d076e44489eca812d6abde4cef422a78aeb4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d351d076e44489eca812d6ab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 18 13:45:47 2014 +0200 testbot/lib: Fix the UseDBIBackEnd() export directive. --- testbot/lib/ObjectModel/DBIBackEnd.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 45bd1f6..1378f63 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -38,7 +38,7 @@ use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(ObjectModel::BackEnd Exporter); -(a)EXPORT = qw(&UseDBIBackend); +(a)EXPORT = qw(&UseDBIBackEnd); sub GetDb($) {

1 0

Nikolay Sivov : xmllite/writer: Implement WriteFullEndElement().
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: bfceaa4f39d106eaefbf2ac20b59a3975efb3345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfceaa4f39d106eaefbf2ac20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 14:13:43 2014 +0400 xmllite/writer: Implement WriteFullEndElement(). --- dlls/xmllite/writer.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 9b07785..e6548cd 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -675,10 +675,21 @@ static HRESULT WINAPI xmlwriter_WriteEntityRef(IXmlWriter *iface, LPCWSTR pwszNa static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); + struct element *element; - FIXME("%p\n", This); + TRACE("%p\n", This); - return E_NOTIMPL; + element = pop_element(This); + if (!element) + return WR_E_INVALIDACTION; + + /* write full end tag */ + write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); + write_output_buffer(This->output, element->qname, element->len); + write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + This->starttagopen = FALSE; + + return S_OK; } static HRESULT WINAPI xmlwriter_WriteName(IXmlWriter *iface, LPCWSTR pwszName)

1 0

Grazvydas Ignotas : msvcrt: Change internal buffer size to 4k.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 40067dd0110f0d7d3e354a89c892a67f4e3ecdc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40067dd0110f0d7d3e354a89c… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sat Jun 14 02:23:56 2014 +0300 msvcrt: Change internal buffer size to 4k. --- dlls/msvcrt/file.c | 6 ++++-- dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 178f164..c1d9d6e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -81,6 +81,8 @@ static char utf16_bom[2] = { 0xff, 0xfe }; #define MSVCRT_MAX_FILES 2048 #define MSVCRT_FD_BLOCK_SIZE 32 +#define MSVCRT_INTERNAL_BUFSIZ 4096 + /* ioinfo structure size is different in msvcrXX.dll's */ typedef struct { HANDLE handle; @@ -619,9 +621,9 @@ static BOOL msvcrt_alloc_buffer(MSVCRT_FILE* file) && MSVCRT__isatty(file->_file)) return FALSE; - file->_base = MSVCRT_calloc(MSVCRT_BUFSIZ,1); + file->_base = MSVCRT_calloc(MSVCRT_INTERNAL_BUFSIZ,1); if(file->_base) { - file->_bufsiz = MSVCRT_BUFSIZ; + file->_bufsiz = MSVCRT_INTERNAL_BUFSIZ; file->_flag |= MSVCRT__IOMYBUF; } else { file->_base = (char*)(&file->_charbuf); diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 00e1f90..c98adf4 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2269,7 +2269,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 */ - todo_wine ok(file->_bufsiz == 4096, "incorrect default buffer size: %d", file->_bufsiz); + ok(file->_bufsiz == 4096, "incorrect default buffer size: %d", file->_bufsiz); test_write_flush_size(file, file->_bufsiz); setvbuf(file, iobuf, _IOFBF, sizeof(iobuf)); test_write_flush_size(file, sizeof(iobuf));

1 0

Grazvydas Ignotas : msvcrt: Free old buffer properly in setvbuf.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 9614283996933feac38163e89dc6ebb3d5254e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9614283996933feac38163e89… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sat Jun 14 02:23:54 2014 +0300 msvcrt: Free old buffer properly in setvbuf. --- dlls/msvcrt/file.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7ebf6d2..178f164 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4465,7 +4465,10 @@ int CDECL MSVCRT_setvbuf(MSVCRT_FILE* file, char *buf, int mode, MSVCRT_size_t s { MSVCRT__lock_file(file); if(file->_bufsiz) { - MSVCRT_free(file->_base); + if(file->_flag & MSVCRT__IOMYBUF) + MSVCRT_free(file->_base); + file->_flag &= ~MSVCRT__IOMYBUF; + file->_base = file->_ptr = NULL; file->_bufsiz = 0; file->_cnt = 0; }

1 0

Alexandre Julliard : gdi32/tests: Silence some noisy traces.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: ec3f8a76d58acc914bf77acdb5448420d0ccc9a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3f8a76d58acc914bf77acdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 17 10:58:51 2014 +0200 gdi32/tests: Silence some noisy traces. --- dlls/gdi32/tests/metafile.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 54b5973..1b0d34b 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -84,9 +84,6 @@ static int CALLBACK eto_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, LOGFONTA device_lf; INT ret; - trace("hdc %p, emr->iType %d, emr->nSize %d, param %p\n", - hdc, emr->iType, emr->nSize, (void *)param); - if(!hdc) return 1; PlayEnhMetaFileRecord(hdc, handle_table, emr, n_objs); @@ -299,10 +296,6 @@ static int CALLBACK eto_scale_enum_proc(HDC hdc, HANDLETABLE *handle_table, if (emr->iType == EMR_EXTTEXTOUTW) { const EMREXTTEXTOUTW *pExtTextOutW = (const EMREXTTEXTOUTW *)emr; - trace("gm %d, mm %d, scale %f, %f, expected %f, %f\n", - test->graphics_mode, test->map_mode, - pExtTextOutW->exScale, pExtTextOutW->eyScale, - test->ex_scale, test->ey_scale); ok(fabs(test->ex_scale - pExtTextOutW->exScale) < 0.001, "Got exScale %f, expected %f\n", pExtTextOutW->exScale, test->ex_scale); ok(fabs(test->ey_scale - pExtTextOutW->eyScale) < 0.001, @@ -488,7 +481,6 @@ static int CALLBACK savedc_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, trace("hdc %p, emr->iType %d, emr->nSize %d, param %p\n", hdc, emr->iType, emr->nSize, (void *)param); - trace("BEFORE:\n"); SetLastError(0xdeadbeef); ret = GetWorldTransform(hdc, &xform); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -610,7 +602,6 @@ static int CALLBACK savedc_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, break; } - trace("AFTER:\n"); SetLastError(0xdeadbeef); ret = GetWorldTransform(hdc, &xform); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -3222,11 +3213,8 @@ static void test_GetWinMetaFileBits(void) for(mode = MM_MIN; mode <= MM_MAX; mode++) { RECT *rc; - trace("mode %d\n", mode); - for(rc = frames; rc->right - rc->left > 0; rc++) { - trace("frame %d,%d - %d,%d\n", rc->left, rc->top, rc->right, rc->bottom); getwinmetafilebits(mode, 1, rc); getwinmetafilebits(mode, 2, rc); }

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::scroll implementation.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 0b30276e2feb93931b575a6b39c79ce6dabe639e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b30276e2feb93931b575a6b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 17 12:43:48 2014 +0200 mshtml: Added IHTMLWindow2::scroll implementation. --- dlls/mshtml/htmlwindow.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 1333608..fab227e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1294,8 +1294,17 @@ static HRESULT WINAPI HTMLWindow2_blur(IHTMLWindow2 *iface) static HRESULT WINAPI HTMLWindow2_scroll(IHTMLWindow2 *iface, LONG x, LONG y) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%d %d)\n", This, x, y); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d %d)\n", This, x, y); + + nsres = nsIDOMWindow_Scroll(This->outer_window->nswindow, x, y); + if(NS_FAILED(nsres)) { + ERR("ScrollBy failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLWindow2_get_clientInformation(IHTMLWindow2 *iface, IOmNavigator **p)

1 0

Alexandre Julliard : user32: Properly block sent messages while waiting for a reply with SMTO_BLOCK.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 82bee5ceda12ec30603d7f87034abd0454580bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=82bee5ceda12ec30603d7f870… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 17 15:14:47 2014 +0200 user32: Properly block sent messages while waiting for a reply with SMTO_BLOCK. --- dlls/user32/message.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 3167a2f..fd82498 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3011,6 +3011,7 @@ static void wait_message_reply( UINT flags ) { struct user_thread_info *thread_info = get_user_thread_info(); HANDLE server_queue = get_server_queue_handle(); + unsigned int wake_mask = QS_SMRESULT | ((flags & SMTO_BLOCK) ? 0 : QS_SENDMESSAGE); for (;;) { @@ -3018,11 +3019,10 @@ static void wait_message_reply( UINT flags ) SERVER_START_REQ( set_queue_mask ) { - req->wake_mask = QS_SMRESULT | ((flags & SMTO_BLOCK) ? 0 : QS_SENDMESSAGE); - req->changed_mask = req->wake_mask; + req->wake_mask = wake_mask; + req->changed_mask = wake_mask; req->skip_wait = 1; - if (!wine_server_call( req )) - wake_bits = reply->wake_bits; + if (!wine_server_call( req )) wake_bits = reply->wake_bits & wake_mask; } SERVER_END_REQ; @@ -3036,7 +3036,7 @@ static void wait_message_reply( UINT flags ) continue; } - wow_handlers.wait_message( 1, &server_queue, INFINITE, QS_SENDMESSAGE, 0 ); + wow_handlers.wait_message( 1, &server_queue, INFINITE, wake_mask, 0 ); } }

1 0

Piotr Caban : msvcrt: Use size_t to store indexes in qsort.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 8436b58ee7e3ceced8835b1deebc60193aca0636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8436b58ee7e3ceced8835b1de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 17 12:48:40 2014 +0200 msvcrt: Use size_t to store indexes in qsort. It also avoids potential overflow while computing median position (found by Frédéric Delanoy). --- dlls/msvcrt/misc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 36d0608..c07005a 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -262,8 +262,9 @@ static void small_sort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, static void quick_sort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, int (CDECL *compar)(void *, const void *, const void *), void *context) { - int stack_lo[8*sizeof(MSVCRT_size_t)], stack_hi[8*sizeof(MSVCRT_size_t)], stack_pos; - int beg, end, lo, hi, med; + MSVCRT_size_t stack_lo[8*sizeof(MSVCRT_size_t)], stack_hi[8*sizeof(MSVCRT_size_t)]; + MSVCRT_size_t beg, end, lo, hi, med; + int stack_pos; stack_pos = 0; stack_lo[stack_pos] = 0; @@ -281,7 +282,7 @@ static void quick_sort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, lo = beg; hi = end; - med = (hi+lo+1)/2; + med = lo + (hi-lo+1)/2; if(compar(context, X(lo), X(med)) > 0) swap(X(lo), X(med), size); if(compar(context, X(lo), X(hi)) > 0)

1 0

Grazvydas Ignotas : msvcrt/tests: Add a test for fwrite flushing behavior.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 147be95a68727eed1f021319ea05903c5451e3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147be95a68727eed1f021319e… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sat Jun 14 02:23:55 2014 +0300 msvcrt/tests: Add a test for fwrite flushing behavior. --- dlls/msvcrt/tests/file.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index f6a1624..00e1f90 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2219,6 +2219,65 @@ static void test__open_osfhandle(void) CloseHandle(tmp); } +static void test_write_flush_size(FILE *file, size_t bufsize) +{ + char *inbuffer; + char *outbuffer; + size_t size; + int fd; + + fd = fileno(file); + inbuffer = calloc(bufsize + 1, 1); + outbuffer = calloc(bufsize + 1, 1); + _snprintf(outbuffer, bufsize + 1, "0,1,2,3,4,5,6,7,8,9"); + + for (size = bufsize + 1; size >= bufsize - 1; size--) { + rewind(file); + fwrite(outbuffer, 1, size, file); + /* lseek() below intentionally redirects the write in fflush() to detect + * if fwrite() has already flushed the whole buffer or not. + */ + lseek(fd, 1, SEEK_SET); + fflush(file); + fseek(file, 0, SEEK_SET); + ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); + if (size == bufsize) + todo_wine ok(memcmp(outbuffer, inbuffer, bufsize) == 0, "missing flush by %d byte write\n", size); + else + ok(memcmp(outbuffer, inbuffer, bufsize) != 0, "unexpected flush by %d byte write\n", size); + } + rewind(file); + fwrite(outbuffer, 1, bufsize / 2, file); + fwrite(outbuffer + bufsize / 2, 1, bufsize / 2, file); + lseek(fd, 1, SEEK_SET); + fflush(file); + fseek(file, 0, SEEK_SET); + ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); + ok(memcmp(outbuffer, inbuffer, bufsize) != 0, "unexpected flush by %d/2 byte double write\n", bufsize); + free(inbuffer); + free(outbuffer); +} + +static void test_write_flush(void) +{ + char iobuf[1024]; + char *tempf; + FILE *file; + + tempf = _tempnam(".","wne"); + file = fopen(tempf, "wb+"); + ok(file != NULL, "unable to create test file\n"); + iobuf[0] = 0; + fwrite(iobuf, 1, 1, file); /* needed for wine to init _bufsiz */ + todo_wine ok(file->_bufsiz == 4096, "incorrect default buffer size: %d", file->_bufsiz); + test_write_flush_size(file, file->_bufsiz); + setvbuf(file, iobuf, _IOFBF, sizeof(iobuf)); + test_write_flush_size(file, sizeof(iobuf)); + fclose(file); + unlink(tempf); + free(tempf); +} + START_TEST(file) { int arg_c; @@ -2284,6 +2343,7 @@ START_TEST(file) test_stdin(); test_mktemp(); test__open_osfhandle(); + test_write_flush(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: 93c225a72d6b6ee77282225fd7d1b0ee3599df00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c225a72d6b6ee77282225fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 17 14:56:31 2014 +0400 po: Update Russian translation. --- po/ru.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index f6de2db..5ca9842 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6595,10 +6595,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 : user32/tests: Silence some noisy traces.
by Alexandre Julliard June 17, 2014

June 17, 2014

Module: wine Branch: master Commit: ae6efdd45dca4d6c9f0f00b0c9e1186a40957dad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6efdd45dca4d6c9f0f00b0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 17 10:58:55 2014 +0200 user32/tests: Silence some noisy traces. --- dlls/user32/tests/menu.c | 4 ++-- dlls/user32/tests/win.c | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 593292d..eaa93a5 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -172,7 +172,7 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, case WM_MEASUREITEM: { MEASUREITEMSTRUCT* pmis = (MEASUREITEMSTRUCT*)lparam; - if( winetest_debug) + if (winetest_debug > 1) trace("WM_MEASUREITEM received data %lx size %dx%d\n", pmis->itemData, pmis->itemWidth, pmis->itemHeight); ok( !wparam, "wrong wparam %lx\n", wparam ); @@ -191,7 +191,7 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, SIZE sz; int i; pdis = (DRAWITEMSTRUCT *) lparam; - if( winetest_debug) { + if (winetest_debug > 1) { RECT rc; GetMenuItemRect( hwnd, (HMENU)pdis->hwndItem, pdis->itemData ,&rc); trace("WM_DRAWITEM received hwnd %p hmenu %p itemdata %ld item %d rc %d,%d-%d,%d itemrc: %d,%d-%d,%d\n", diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5bdfed6..bf9bb2c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1643,12 +1643,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_1(HWND hwnd, UINT msg, WPARAM wparam, L style = GetWindowLongA(hwnd, GWL_STYLE); exstyle = GetWindowLongA(hwnd, GWL_EXSTYLE); - GetWindowRect(client, &rc); - trace("MDI client %p window size = (%d x %d)\n", client, rc.right-rc.left, rc.bottom-rc.top); GetClientRect(client, &rc); - trace("MDI client %p client size = (%d x %d)\n", client, rc.right, rc.bottom); - trace("screen size: %d x %d\n", GetSystemMetrics(SM_CXSCREEN), - GetSystemMetrics(SM_CYSCREEN)); GetClientRect(client, &rc); if ((style & WS_CAPTION) == WS_CAPTION) @@ -6276,7 +6271,6 @@ static LRESULT CALLBACK fullscreen_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPAR case WM_NCCREATE: { CREATESTRUCTA *cs = (CREATESTRUCTA *)lp; - trace("WM_NCCREATE: rect %d,%d-%d,%d\n", cs->x, cs->y, cs->cx, cs->cy); ok(cs->x == mi.rcMonitor.left && cs->y == mi.rcMonitor.top && cs->cx == mi.rcMonitor.right && cs->cy == mi.rcMonitor.bottom, "expected %d,%d-%d,%d, got %d,%d-%d,%d\n", @@ -6287,7 +6281,6 @@ static LRESULT CALLBACK fullscreen_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPAR case WM_GETMINMAXINFO: { MINMAXINFO *minmax = (MINMAXINFO *)lp; - dump_minmax_info(minmax); ok(minmax->ptMaxPosition.x <= mi.rcMonitor.left, "%d <= %d\n", minmax->ptMaxPosition.x, mi.rcMonitor.left); ok(minmax->ptMaxPosition.y <= mi.rcMonitor.top, "%d <= %d\n", minmax->ptMaxPosition.y, mi.rcMonitor.top); ok(minmax->ptMaxSize.x >= mi.rcMonitor.right, "%d >= %d\n", minmax->ptMaxSize.x, mi.rcMonitor.right);

1 0