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

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