wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Hans Leidekker : kerberos: Use the global memory allocation helpers.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 51a0b4ebb110645a9bd578c04dd574f87f56ccc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51a0b4ebb110645a9bd578c0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 2 12:20:25 2018 +0100 kerberos: Use the global memory allocation helpers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index d2280e5..8b5b612 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -43,6 +43,7 @@ #include "ntsecapi.h" #include "ntsecpkg.h" #include "winternl.h" +#include "wine/heap.h" #include "wine/library.h" #include "wine/debug.h" @@ -106,21 +107,6 @@ MAKE_FUNCPTR(krb5_free_unparsed_name); MAKE_FUNCPTR(krb5_free_cred_contents); #undef MAKE_FUNCPTR -static inline void *heap_alloc(SIZE_T size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void *heap_realloc(void *p, SIZE_T size) -{ - return HeapReAlloc(GetProcessHeap(), 0, p, size); -} - -static inline void heap_free(void *p) -{ - HeapFree(GetProcessHeap(), 0, p); -} - static void load_krb5(void) { if (!(libkrb5_handle = wine_dlopen(SONAME_LIBKRB5, RTLD_NOW, NULL, 0))) @@ -757,7 +743,7 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam gss_buffer_desc buf; buf.length = WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ) + 1; - if (!(buf.value = HeapAlloc( GetProcessHeap(), 0, buf.length ))) return SEC_E_INSUFFICIENT_MEMORY; + if (!(buf.value = heap_alloc( buf.length ))) return SEC_E_INSUFFICIENT_MEMORY; WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), buf.value, buf.length, NULL, NULL ); buf.length--; @@ -765,7 +751,7 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam TRACE( "gss_import_name returned %08x minor status %08x\n", ret, minor_status ); if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); - HeapFree( GetProcessHeap(), 0, buf.value ); + heap_free( buf.value ); return status_gss_to_sspi( ret ); }

1 0

Hans Leidekker : kerberos: Fix parameter check in kerberos_SpUnsealMessage.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: e1bef53ebb7f82364aaf1eeb3345fad3dc195703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1bef53ebb7f82364aaf1eeb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 2 12:20:24 2018 +0100 kerberos: Fix parameter check in kerberos_SpUnsealMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 0345469..d2280e5 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1339,7 +1339,7 @@ static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBuffe TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); - if (context) return SEC_E_INVALID_HANDLE; + if (!context) return SEC_E_INVALID_HANDLE; ctxt_handle = ctxthandle_sspi_to_gss( context ); if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN;

1 0

Hans Leidekker : kerberos: Don' t check for GSS_S_CONTINUE_NEEDED from gss_acquire_cred.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 1195f586435229ba47c73de5a5fed9758ff04412 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1195f586435229ba47c73de5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 2 12:20:23 2018 +0100 kerberos: Don't check for GSS_S_CONTINUE_NEEDED from gss_acquire_cred. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 78e4e93..0345469 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -860,7 +860,7 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( &cred_handle, NULL, &expiry_time ); TRACE( "gss_acquire_cred returned %08x minor status %08x\n", ret, minor_status ); if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); - if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) + if (ret == GSS_S_COMPLETE) { credhandle_gss_to_sspi( cred_handle, credential ); expirytime_gss_to_sspi( expiry_time, ts_expiry );

1 0

Dmitry Timoshkov : secur32: Print contents of LSA_STRING in traces.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: d2c22ab58e47c80c529268748709b03032b635ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2c22ab58e47c80c52926874… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 2 18:22:29 2018 +0800 secur32: Print contents of LSA_STRING in traces. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 3a99135..511e24a 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -58,6 +58,12 @@ struct lsa_connection DWORD magic; }; +static const char *debugstr_as(const LSA_STRING *str) +{ + if (!str) return "<null>"; + return debugstr_an(str->Buffer, str->Length); +} + NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id, PVOID in_buffer, ULONG in_buffer_length, PVOID *out_buffer, PULONG out_buffer_length, PNTSTATUS status) @@ -135,8 +141,8 @@ NTSTATUS WINAPI LsaLogonUser(HANDLE LsaHandle, PLSA_STRING OriginName, PVOID* ProfileBuffer, PULONG ProfileBufferLength, PLUID LogonId, PHANDLE Token, PQUOTA_LIMITS Quotas, PNTSTATUS SubStatus) { - FIXME("%p %p %d %d %p %d %p %p %p %p %p %p %p %p stub\n", LsaHandle, - OriginName, LogonType, AuthenticationPackage, + FIXME("%p %s %d %d %p %d %p %p %p %p %p %p %p %p stub\n", LsaHandle, + debugstr_as(OriginName), LogonType, AuthenticationPackage, AuthenticationInformation, AuthenticationInformationLength, LocalGroups, SourceContext, ProfileBuffer, ProfileBufferLength, LogonId, Token, Quotas, SubStatus); @@ -158,7 +164,8 @@ static NTSTATUS NTAPI lsa_DeleteLogonSession(LUID *logon_id) static NTSTATUS NTAPI lsa_AddCredential(LUID *logon_id, ULONG package_id, LSA_STRING *primary_key, LSA_STRING *credentials) { - FIXME("%p,%u,%p,%p: stub\n", logon_id, package_id, primary_key, credentials); + FIXME("%p,%u,%s,%s: stub\n", logon_id, package_id, + debugstr_as(primary_key), debugstr_as(credentials)); return STATUS_NOT_IMPLEMENTED; } @@ -172,7 +179,7 @@ static NTSTATUS NTAPI lsa_GetCredentials(LUID *logon_id, ULONG package_id, ULONG static NTSTATUS NTAPI lsa_DeleteCredential(LUID *logon_id, ULONG package_id, LSA_STRING *primary_key) { - FIXME("%p,%#x,%p: stub\n", logon_id, package_id, primary_key); + FIXME("%p,%#x,%s: stub\n", logon_id, package_id, debugstr_as(primary_key)); return STATUS_NOT_IMPLEMENTED; } @@ -859,7 +866,7 @@ NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE lsa_handle, { ULONG i; - TRACE("%p %p %p\n", lsa_handle, package_name, package_id); + TRACE("%p %s %p\n", lsa_handle, debugstr_as(package_name), package_id); for (i = 0; i < loaded_packages_count; i++) {

1 0

Alexandre Julliard : kernel32: Remove support for vm86 exceptions.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: d8454f9231116f10b4e969d052c6ae6049b5c762 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8454f9231116f10b4e969d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 12:53:21 2018 +0100 kernel32: Remove support for vm86 exceptions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/except.c | 10 ---------- include/wine/exception.h | 7 ------- 2 files changed, 17 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 1a1521a..2a9f0f1 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -143,16 +143,6 @@ static int format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, in case EXCEPTION_WINE_ASSERTION: len = snprintf( buffer, size, "Assertion failed" ); break; - case EXCEPTION_VM86_INTx: - len = snprintf( buffer, size, "Unhandled interrupt %02lx in vm86 mode", - rec->ExceptionInformation[0]); - break; - case EXCEPTION_VM86_STI: - len = snprintf( buffer, size, "Unhandled sti in vm86 mode"); - break; - case EXCEPTION_VM86_PICRETURN: - len = snprintf( buffer, size, "Unhandled PIC return in vm86 mode"); - break; default: len = snprintf( buffer, size, "Unhandled exception 0x%08x in thread %x", rec->ExceptionCode, GetCurrentThreadId()); break; diff --git a/include/wine/exception.h b/include/wine/exception.h index 3b1a3cf..e93968f 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -303,13 +303,6 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void) #define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ #define EXCEPTION_WINE_ASSERTION 0x80000101 /* assertion failed */ -/* unhandled return status from vm86 mode */ -#define EXCEPTION_VM86_INTx 0x80000110 -#define EXCEPTION_VM86_STI 0x80000111 -#define EXCEPTION_VM86_PICRETURN 0x80000112 - -extern void __wine_enter_vm86( CONTEXT *context ); - #ifdef __cplusplus } #endif

1 0

Alexandre Julliard : winedbg: Remove support for vm86 exceptions.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 39b1384e78e24d39e750ae74bee9e255a45633c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39b1384e78e24d39e750ae74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 12:53:09 2018 +0100 winedbg: Remove support for vm86 exceptions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index c1de158..83341c0 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -930,15 +930,6 @@ void info_win32_exception(void) case EXCEPTION_WINE_ASSERTION: dbg_printf("assertion failed"); break; - case EXCEPTION_VM86_INTx: - dbg_printf("interrupt %02lx in vm86 mode", rec->ExceptionInformation[0]); - break; - case EXCEPTION_VM86_STI: - dbg_printf("sti in vm86 mode"); - break; - case EXCEPTION_VM86_PICRETURN: - dbg_printf("PIC return in vm86 mode"); - break; case EXCEPTION_FLT_DENORMAL_OPERAND: dbg_printf("denormal float operand"); break;

1 0

Alexandre Julliard : krnl386: Remove support for VGA emulation.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 33b2d8521c916e1d5c9201adc8e52507bedb7d26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33b2d8521c916e1d5c9201ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 12:43:25 2018 +0100 krnl386: Remove support for VGA emulation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 4 +- dlls/krnl386.exe16/dosexe.h | 4 - dlls/krnl386.exe16/int10.c | 1462 ---------------------------- dlls/krnl386.exe16/int21.c | 2 - dlls/krnl386.exe16/interrupts.c | 17 +- dlls/krnl386.exe16/ioports.c | 86 -- dlls/krnl386.exe16/vga.c | 1999 --------------------------------------- dlls/krnl386.exe16/vga.h | 97 -- 8 files changed, 3 insertions(+), 3668 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33b2d8521c916e1d5c92…

1 0

Alexandre Julliard : krnl386: Remove support for DOS devices and event handling.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 5ec544959632d63ad50175885503cc78f6ed6c58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ec544959632d63ad5017588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 10:50:48 2018 +0100 krnl386: Remove support for DOS devices and event handling. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 5 - dlls/krnl386.exe16/dosdev.c | 489 -------------------------------------- dlls/krnl386.exe16/dosexe.h | 126 ---------- dlls/krnl386.exe16/dosvm.c | 221 ----------------- dlls/krnl386.exe16/instr.c | 6 - dlls/krnl386.exe16/int09.c | 244 ------------------- dlls/krnl386.exe16/int16.c | 215 ----------------- dlls/krnl386.exe16/int21.c | 184 ++------------ dlls/krnl386.exe16/int2f.c | 57 ----- dlls/krnl386.exe16/int31.c | 119 +--------- dlls/krnl386.exe16/int33.c | 367 ---------------------------- dlls/krnl386.exe16/interrupts.c | 112 +-------- dlls/krnl386.exe16/ioports.c | 3 - dlls/krnl386.exe16/soundblaster.c | 6 +- dlls/krnl386.exe16/timer.c | 74 ------ dlls/krnl386.exe16/wowthunk.c | 113 --------- 16 files changed, 30 insertions(+), 2311 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ec544959632d63ad501…

1 0

Zebediah Figura : user32/tests: Flush events after test_ShowWindow().
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 0741d193ffef9e05668dd4a3eedcf55f063b7c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0741d193ffef9e05668dd4a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 1 18:36:54 2018 -0600 user32/tests: Flush events after test_ShowWindow(). The test minimizes windows, which triggers most window managers to generate focus events on other windows. These events aren't processed until halfway through the next test, test_EnableWindow(), when a message loop is run, and as a result an unexpected window (usually hwndMain) is activated, causing the test to fail. The testbot uses focus-follows-mouse mode, so these focus events were not triggered, thereby causing a success inside the todo block. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f492ecc..9cf4ed3 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6780,6 +6780,8 @@ static void test_ShowWindow(void) ok(EqualRect(&rcEmpty, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcEmpty), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); + + flush_events(TRUE); } static DWORD CALLBACK enablewindow_thread(LPVOID arg) @@ -6834,8 +6836,7 @@ static void test_EnableWindow(void) } ok(!IsWindowEnabled(hwnd), "window should not be enabled\n"); - todo_wine - check_active_state(hwnd, hwnd, hwnd); + check_active_state(hwnd, hwnd, hwnd); ok(0 == GetCapture(), "GetCapture() = %p\n", GetCapture()); CloseHandle(hthread);

1 0

Nikolay Sivov : comctl32/imagelist: Use HeapAlloc() wrappers.
by Alexandre Julliard 02 Feb '18

02 Feb '18

Module: wine Branch: master Commit: 3b3c25e17d9bc04adec7a7db5800a4532f42bc3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b3c25e17d9bc04adec7a7db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:39:42 2018 +0300 comctl32/imagelist: Use HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 53 ++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 71145ed..608d853 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -54,6 +54,7 @@ #include "commoncontrols.h" #include "wine/debug.h" #include "wine/exception.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(imagelist); @@ -274,7 +275,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, SelectObject( hdc, hbmImage ); mask_width = (bm.bmWidth + 31) / 32 * 4; - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + if (!(info = heap_alloc( FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biWidth = bm.bmWidth; info->bmiHeader.biHeight = -height; @@ -286,17 +287,17 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - if (!(bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; + if (!(bits = heap_alloc( info->bmiHeader.biSizeImage ))) goto done; if (!GetDIBits( hdc, hbmImage, 0, height, bits, info, DIB_RGB_COLORS )) goto done; if (hbmMask) { - if (!(mask_info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[2] )))) + if (!(mask_info = heap_alloc( FIELD_OFFSET( BITMAPINFO, bmiColors[2] )))) goto done; mask_info->bmiHeader = info->bmiHeader; mask_info->bmiHeader.biBitCount = 1; mask_info->bmiHeader.biSizeImage = mask_width * height; - if (!(mask_bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mask_info->bmiHeader.biSizeImage ))) + if (!(mask_bits = heap_alloc_zero( mask_info->bmiHeader.biSizeImage ))) goto done; if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done; } @@ -305,10 +306,10 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, ret = TRUE; done: - HeapFree( GetProcessHeap(), 0, info ); - HeapFree( GetProcessHeap(), 0, mask_info ); - HeapFree( GetProcessHeap(), 0, bits ); - HeapFree( GetProcessHeap(), 0, mask_bits ); + heap_free( info ); + heap_free( mask_info ); + heap_free( bits ); + heap_free( mask_bits ); return ret; } @@ -391,7 +392,7 @@ IMAGELIST_InternalExpandBitmaps(HIMAGELIST himl, INT nImageCount) if (new_alpha) himl->has_alpha = new_alpha; else { - HeapFree( GetProcessHeap(), 0, himl->has_alpha ); + heap_free( himl->has_alpha ); himl->has_alpha = NULL; } } @@ -862,7 +863,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, himl->hbmMask = 0; if (ilc == ILC_COLOR32) - himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); + himl->has_alpha = heap_alloc_zero( himl->cMaxImage ); else himl->has_alpha = NULL; @@ -1270,7 +1271,7 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des int i, j; if (!(hdc = CreateCompatibleDC( 0 ))) return FALSE; - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + if (!(info = heap_alloc( FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biWidth = cx; info->bmiHeader.biHeight = cy; @@ -1353,7 +1354,7 @@ done: DeleteDC( hdc ); if (bmp) DeleteObject( bmp ); if (mask) DeleteObject( mask ); - HeapFree( GetProcessHeap(), 0, info ); + heap_free( info ); return ret; } @@ -1971,11 +1972,11 @@ ImageList_LoadImageA (HINSTANCE hi, LPCSTR lpbmp, INT cx, INT cGrow, uType, uFlags); len = MultiByteToWideChar(CP_ACP, 0, lpbmp, -1, NULL, 0); - lpbmpW = Alloc(len * sizeof(WCHAR)); + lpbmpW = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, lpbmp, -1, lpbmpW, len); himl = ImageList_LoadImageW(hi, lpbmpW, cx, cGrow, clrMask, uType, uFlags); - Free (lpbmpW); + heap_free (lpbmpW); return himl; } @@ -2216,12 +2217,12 @@ static void *read_bitmap(IStream *pstm, BITMAPINFO *bmi) if (palspace && FAILED(IStream_Read(pstm, bmi->bmiColors, palspace, NULL))) return NULL; - bits = Alloc(bmi->bmiHeader.biSizeImage); + bits = heap_alloc_zero(bmi->bmiHeader.biSizeImage); if (!bits) return NULL; if (FAILED(IStream_Read(pstm, bits, bmi->bmiHeader.biSizeImage, NULL))) { - Free(bits); + heap_free(bits); return NULL; } return bits; @@ -2333,8 +2334,8 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) 0, 0, mask_info->bmiHeader.biWidth, mask_info->bmiHeader.biHeight, mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY); } - Free( image_bits ); - Free( mask_bits ); + heap_free( image_bits ); + heap_free( mask_bits ); himl->cCurImage = ilHead.cCurImage; himl->cMaxImage = ilHead.cMaxImage; @@ -2398,8 +2399,8 @@ ImageList_Remove (HIMAGELIST himl, INT i) if (himl->has_alpha) { - HeapFree( GetProcessHeap(), 0, himl->has_alpha ); - himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); + heap_free( himl->has_alpha ); + himl->has_alpha = heap_alloc_zero( himl->cMaxImage ); } hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); @@ -2946,7 +2947,7 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) if (new_alpha) himl->has_alpha = new_alpha; else { - HeapFree( GetProcessHeap(), 0, himl->has_alpha ); + heap_free( himl->has_alpha ); himl->has_alpha = NULL; } } @@ -3014,7 +3015,7 @@ static BOOL _write_bitmap(HBITMAP hBitmap, IStream *pstm) offBits = totalSize; totalSize += sizeImage; - data = Alloc(totalSize); + data = heap_alloc_zero(totalSize); bmfh = (LPBITMAPFILEHEADER)data; bmih = (LPBITMAPINFOHEADER)(data + sizeof(BITMAPFILEHEADER)); lpBits = data + offBits; @@ -3055,7 +3056,7 @@ static BOOL _write_bitmap(HBITMAP hBitmap, IStream *pstm) result = TRUE; failed: - Free(data); + heap_free(data); return result; } @@ -3292,8 +3293,8 @@ static ULONG WINAPI ImageListImpl_Release(IImageList2 *iface) if (This->hbrBlend50) DeleteObject (This->hbrBlend50); This->IImageList2_iface.lpVtbl = NULL; - HeapFree(GetProcessHeap(), 0, This->has_alpha); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This->has_alpha); + heap_free(This); } return ref; @@ -3822,7 +3823,7 @@ static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID ii if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct _IMAGELIST)); + This = heap_alloc_zero(sizeof(struct _IMAGELIST)); if (!This) return E_OUTOFMEMORY; This->IImageList2_iface.lpVtbl = &ImageListImpl_Vtbl;

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2018