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

Vincent Povirk : windowscodecs: Fix leak in DGifGetImageDesc.
by Alexandre Julliard 18 Jun '14

18 Jun '14

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

Austin English : kernel32: Add a stub for UnregisterApplicationRestart.
by Alexandre Julliard 18 Jun '14

18 Jun '14

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

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

18 Jun '14

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

Alexandre Julliard : krnl386: Properly handle failure to set a 16-bit LDT entry.
by Alexandre Julliard 18 Jun '14

18 Jun '14

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

Alexandre Julliard : kernel32: Only try to load krnl386 in native applications.
by Alexandre Julliard 18 Jun '14

18 Jun '14

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 : msvcrt/tests: Avoid size_t in traces.
by Alexandre Julliard 18 Jun '14

18 Jun '14

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

Andrew Eikum : packager: Add stub Packager implementation.
by Alexandre Julliard 18 Jun '14

18 Jun '14

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

Andrew Eikum : packager: Add loading support for Ole10Native storage objects.
by Alexandre Julliard 18 Jun '14

18 Jun '14

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

Piotr Caban : msvcrt: Allocate data with 16-bytes alignement if small blocks heap is used.
by Alexandre Julliard 18 Jun '14

18 Jun '14

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

Piotr Caban : msvcrt: Add small blocks heap tests.
by Alexandre Julliard 18 Jun '14

18 Jun '14

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