December 2009 - Wine-commits

Juan Lang : winhttp: Don't call a function whose result is never used.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 72025026db9e3802e6b23850110d89641f31b99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72025026db9e3802e6b238501… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 11 14:07:43 2009 -0800 winhttp: Don't call a function whose result is never used. --- dlls/winhttp/net.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 034b229..df6b9d9 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -118,7 +118,6 @@ MAKE_FUNCPTR( SSL_get_peer_certificate ); MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths ); MAKE_FUNCPTR( SSL_CTX_set_verify ); -MAKE_FUNCPTR( BIO_new_fp ); MAKE_FUNCPTR( CRYPTO_num_locks ); MAKE_FUNCPTR( CRYPTO_set_id_callback ); MAKE_FUNCPTR( CRYPTO_set_locking_callback ); @@ -439,7 +438,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LeaveCriticalSection( &init_ssl_cs ); \ return FALSE; \ } - LOAD_FUNCPTR( BIO_new_fp ); LOAD_FUNCPTR( CRYPTO_num_locks ); LOAD_FUNCPTR( CRYPTO_set_id_callback ); LOAD_FUNCPTR( CRYPTO_set_locking_callback ); @@ -454,7 +452,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) pSSL_library_init(); pSSL_load_error_strings(); - pBIO_new_fp( stderr, BIO_NOCLOSE ); method = pSSLv23_method(); ctx = pSSL_CTX_new( method );

1 0

Juan Lang : winhttp/tests: Skip secure connection tests if the request fails.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: c02ee1886924809039b5d38a3e2e0ecb33f98cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02ee1886924809039b5d38a3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 11 14:10:27 2009 -0800 winhttp/tests: Skip secure connection tests if the request fails. --- dlls/winhttp/tests/winhttp.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 342dde2..d9966ea 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -783,6 +783,11 @@ static void test_secure_connection(void) ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(ret, "failed to send request %u\n", GetLastError()); + if (!ret) + { + skip("secure connection failed, skipping remaining secure tests\n"); + goto cleanup; + } size = sizeof(cert); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size ); @@ -806,6 +811,7 @@ static void test_secure_connection(void) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); ok(!ret, "succeeded unexpectedly\n"); +cleanup: WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses);

1 0

Vincent Povirk : include: Add PaletteFlags enumeration.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: a5b9cbfffcf886fbf16bbdcb8b1e59c0813ad2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b9cbfffcf886fbf16bbdcb8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 17:19:53 2009 -0600 include: Add PaletteFlags enumeration. --- include/gdiplusenums.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 9997bf1..d472fd8 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -291,6 +291,13 @@ enum HotkeyPrefix HotkeyPrefixHide = 2 }; +enum PaletteFlags +{ + PaletteFlagsHasAlpha = 1, + PaletteFlagsGrayScale = 2, + PaletteFlagsHalftone = 4 +}; + enum ImageCodecFlags { ImageCodecFlagsEncoder = 1, @@ -455,6 +462,7 @@ typedef enum FontStyle FontStyle; typedef enum StringFormatFlags StringFormatFlags; typedef enum HotkeyPrefix HotkeyPrefix; typedef enum PenAlignment GpPenAlignment; +typedef enum PaletteFlags PaletteFlags; typedef enum ImageCodecFlags ImageCodecFlags; typedef enum CombineMode CombineMode; typedef enum FlushIntention FlushIntention;

1 0

Vincent Povirk : gdiplus: Implement GdipSetImagePalette.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 39dc81cc809b4a8bff19e5d166432d31c31a5183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39dc81cc809b4a8bff19e5d16… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 16:51:46 2009 -0600 gdiplus: Implement GdipSetImagePalette. --- dlls/gdiplus/gdiplus_private.h | 4 ++++ dlls/gdiplus/graphics.c | 4 ++++ dlls/gdiplus/image.c | 32 +++++++++++++++++++++++++++----- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index dfff66c..0ceeb6e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -213,6 +213,10 @@ struct GpImage{ ImageType type; GUID format; UINT flags; + UINT palette_flags; + UINT palette_count; + UINT palette_size; + ARGB *palette_entries; }; struct GpMetafile{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index df107e4..80ef463 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1256,6 +1256,10 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, (*metafile)->image.type = ImageTypeMetafile; memcpy(&(*metafile)->image.format, &ImageFormatWMF, sizeof(GUID)); + (*metafile)->image.palette_flags = 0; + (*metafile)->image.palette_count = 0; + (*metafile)->image.palette_size = 0; + (*metafile)->image.palette_entries = NULL; (*metafile)->bounds.X = ((REAL) placeable->BoundingBox.Left) / ((REAL) placeable->Inch); (*metafile)->bounds.Y = ((REAL) placeable->BoundingBox.Right) / ((REAL) placeable->Inch); (*metafile)->bounds.Width = ((REAL) (placeable->BoundingBox.Right diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 73a6bd6..340f2e6 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1201,6 +1201,10 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->image.type = ImageTypeBitmap; memcpy(&(*bitmap)->image.format, &ImageFormatMemoryBMP, sizeof(GUID)); (*bitmap)->image.flags = ImageFlagsNone; + (*bitmap)->image.palette_flags = 0; + (*bitmap)->image.palette_count = 0; + (*bitmap)->image.palette_size = 0; + (*bitmap)->image.palette_entries = NULL; (*bitmap)->width = width; (*bitmap)->height = height; (*bitmap)->format = format; @@ -1318,6 +1322,7 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) GdipFree(((GpBitmap*)image)->bitmapbits); DeleteDC(((GpBitmap*)image)->hdc); } + GdipFree(image->palette_entries); GdipFree(image); return Ok; @@ -1891,6 +1896,10 @@ static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid (*image)->type = ImageTypeMetafile; (*image)->picture = pic; (*image)->flags = ImageFlagsNone; + (*image)->palette_flags = 0; + (*image)->palette_count = 0; + (*image)->palette_size = 0; + (*image)->palette_entries = NULL; return Ok; } @@ -2243,15 +2252,28 @@ GpStatus WINGDIPAPI GdipGetImagePalette(GpImage *image, ColorPalette *palette, I GpStatus WINGDIPAPI GdipSetImagePalette(GpImage *image, GDIPCONST ColorPalette *palette) { - static int calls; + TRACE("(%p,%p)\n", image, palette); - if(!image || !palette) + if(!image || !palette || palette->Count > 256) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + if (palette->Count > image->palette_size) + { + ARGB *new_palette; - return NotImplemented; + new_palette = GdipAlloc(sizeof(ARGB) * palette->Count); + if (!new_palette) return OutOfMemory; + + GdipFree(image->palette_entries); + image->palette_entries = new_palette; + image->palette_size = palette->Count; + } + + image->palette_flags = palette->Flags; + image->palette_count = palette->Count; + memcpy(image->palette_entries, palette->Entries, sizeof(ARGB)*palette->Count); + + return Ok; } /*************************************************************************

1 0

Alexandre Julliard : msi/tests: Fix a handle leak.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 8b50188f571c298ff2a99aefe7fa0832a37f51b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b50188f571c298ff2a99aefe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 19:19:27 2009 +0100 msi/tests: Fix a handle leak. --- dlls/msi/tests/record.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 2c8f5bf..369c855 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -604,6 +604,8 @@ static void test_fieldzero(void) r = MsiRecordIsNull(rec, 0); ok(r == FALSE, "Expected FALSE, got %d\n", r); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); MsiCloseHandle(rec); MsiCloseHandle(hdb); DeleteFileA(msifile);

1 0

Alexandre Julliard : user32: Add a thunking mechanism for 16-bit edit word break procedures.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: dcec342b50524562844f64d43d423ed2c83c1f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcec342b50524562844f64d43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 14:52:28 2009 +0100 user32: Add a thunking mechanism for 16-bit edit word break procedures. --- dlls/user32/edit.c | 122 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 88 insertions(+), 34 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index b512aa4..c5a78c7 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -131,7 +131,6 @@ typedef struct and just line width for single line controls */ INT region_posx; /* Position of cursor relative to region: */ INT region_posy; /* -1: to left, 0: within, 1: to right */ - EDITWORDBREAKPROC16 word_break_proc16; void *word_break_proc; /* 32-bit word break proc: ANSI or Unicode */ INT line_count; /* number of lines */ INT y_offset; /* scroll offset in number of lines */ @@ -252,6 +251,90 @@ static HBRUSH EDIT_NotifyCtlColor(EDITSTATE *es, HDC hdc) } +/********************************************************************** + * Support for word break proc thunks + */ + +#define MAX_THUNKS 32 + +#include <pshpack1.h> +static struct word_break_thunk +{ + BYTE popl_eax; /* popl %eax (return address) */ + BYTE pushl_proc16; /* pushl proc16 */ + EDITWORDBREAKPROC16 proc16; + BYTE pushl_eax; /* pushl %eax */ + BYTE jmp; /* ljmp call_word_break_proc16 */ + DWORD callback; +} *word_break_thunks; +#include <poppack.h> + +/********************************************************************** + * call_word_break_proc16 + */ +static INT16 CALLBACK call_word_break_proc16( SEGPTR proc16, LPSTR text, INT index, INT count, INT action ) +{ + SEGPTR segptr; + WORD args[5]; + DWORD result; + + segptr = MapLS( text ); + args[4] = SELECTOROF(segptr); + args[3] = OFFSETOF(segptr); + args[2] = index; + args[1] = count; + args[0] = action; + WOWCallback16Ex( proc16, WCB16_PASCAL, sizeof(args), args, &result ); + UnMapLS( segptr ); + return LOWORD(result); +} + +/****************************************************************** + * add_word_break_thunk + */ +static struct word_break_thunk *add_word_break_thunk( EDITWORDBREAKPROC16 proc16 ) +{ + struct word_break_thunk *thunk; + + if (!word_break_thunks) + { + word_break_thunks = VirtualAlloc( NULL, MAX_THUNKS * sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + if (!word_break_thunks) return NULL; + + for (thunk = word_break_thunks; thunk < &word_break_thunks[MAX_THUNKS]; thunk++) + { + thunk->popl_eax = 0x58; /* popl %eax */ + thunk->pushl_proc16 = 0x68; /* pushl proc16 */ + thunk->pushl_eax = 0x50; /* pushl %eax */ + thunk->jmp = 0xe9; /* jmp call_word_break_proc16 */ + thunk->callback = (char *)call_word_break_proc16 - (char *)(&thunk->callback + 1); + } + } + for (thunk = word_break_thunks; thunk < &word_break_thunks[MAX_THUNKS]; thunk++) + if (thunk->proc16 == proc16) return thunk; + + for (thunk = word_break_thunks; thunk < &word_break_thunks[MAX_THUNKS]; thunk++) + { + if (thunk->proc16) continue; + thunk->proc16 = proc16; + return thunk; + } + FIXME("Out of word break thunks\n"); + return NULL; +} + +/****************************************************************** + * get_word_break_thunk + */ +static EDITWORDBREAKPROC16 get_word_break_thunk( EDITWORDBREAKPROCA proc ) +{ + struct word_break_thunk *thunk = (struct word_break_thunk *)proc; + if (word_break_thunks && thunk >= word_break_thunks && thunk < &word_break_thunks[MAX_THUNKS]) + return thunk->proc16; + return NULL; +} + /********************************************************************* * * EDIT_WordBreakProc @@ -336,28 +419,7 @@ static INT EDIT_CallWordBreakProc(EDITSTATE *es, INT start, INT index, INT count { INT ret; - if (es->word_break_proc16) { - HGLOBAL16 hglob16; - SEGPTR segptr; - INT countA; - WORD args[5]; - DWORD result; - - countA = WideCharToMultiByte(CP_ACP, 0, es->text + start, count, NULL, 0, NULL, NULL); - hglob16 = GlobalAlloc16(GMEM_MOVEABLE | GMEM_ZEROINIT, countA); - segptr = WOWGlobalLock16(hglob16); - WideCharToMultiByte(CP_ACP, 0, es->text + start, count, MapSL(segptr), countA, NULL, NULL); - args[4] = SELECTOROF(segptr); - args[3] = OFFSETOF(segptr); - args[2] = index; - args[1] = countA; - args[0] = action; - WOWCallback16Ex((DWORD)es->word_break_proc16, WCB16_PASCAL, sizeof(args), args, &result); - ret = LOWORD(result); - GlobalUnlock16(hglob16); - GlobalFree16(hglob16); - } - else if (es->word_break_proc) + if (es->word_break_proc) { if(es->is_unicode) { @@ -3091,7 +3153,6 @@ static void EDIT_EM_SetWordBreakProc(EDITSTATE *es, void *wbp) return; es->word_break_proc = wbp; - es->word_break_proc16 = NULL; if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); @@ -3107,15 +3168,8 @@ static void EDIT_EM_SetWordBreakProc(EDITSTATE *es, void *wbp) */ static void EDIT_EM_SetWordBreakProc16(EDITSTATE *es, EDITWORDBREAKPROC16 wbp) { - if (es->word_break_proc16 == wbp) - return; - - es->word_break_proc = NULL; - es->word_break_proc16 = wbp; - if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { - EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); - EDIT_UpdateText(es, NULL, TRUE); - } + struct word_break_thunk *thunk = add_word_break_thunk( wbp ); + if (thunk) EDIT_EM_SetWordBreakProc( es, thunk ); } @@ -5048,7 +5102,7 @@ static LRESULT EditWndProc_common( HWND hwnd, UINT msg, break; case EM_GETWORDBREAKPROC16: - result = (LRESULT)es->word_break_proc16; + result = (LRESULT)get_word_break_thunk( es->word_break_proc ); break; case EM_GETWORDBREAKPROC: result = (LRESULT)es->word_break_proc;

1 0

Alexandre Julliard : user32: Split the code that deals with the 16-bit edit buffer handle to separate functions .
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 7e9721f8f2542971eb3cc89b29c949e1cb64c91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9721f8f2542971eb3cc89b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 17:04:59 2009 +0100 user32: Split the code that deals with the 16-bit edit buffer handle to separate functions. --- dlls/user32/edit.c | 252 +++++++++++++++++++--------------------------------- 1 files changed, 92 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e9721f8f2542971eb3cc…

1 0

Alexandre Julliard : user32: Store the 16-bit edit handle directly in the window extra bytes.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 810e701a3f21ccebdff4684ac1685d57d98f98ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=810e701a3f21ccebdff4684ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 18:13:03 2009 +0100 user32: Store the 16-bit edit handle directly in the window extra bytes. --- dlls/user32/edit.c | 56 ++++++++++++++++++++++++++++----------------------- 1 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 7f7520b..c91abc1 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -149,8 +149,6 @@ typedef struct LPINT tabs; LINEDEF *first_line_def; /* linked list of (soft) linebreaks */ HLOCAL hloc32W; /* our unicode local memory block */ - HLOCAL16 hloc16; /* alias for 16-bit control receiving EM_GETHANDLE16 - or EM_SETHANDLE16 */ HLOCAL hloc32A; /* alias for ANSI control receiving EM_GETHANDLE or EM_SETHANDLE */ /* @@ -1176,29 +1174,32 @@ static inline void text_buffer_changed(EDITSTATE *es) es->text_length = (UINT)-1; } +#define GWW_HANDLE16 sizeof(EDITSTATE*) + /********************************************************************* * EDIT_LockBuffer16 */ static void EDIT_LockBuffer16(EDITSTATE *es) { STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); + HLOCAL16 hloc16 = GetWindowWord( es->hwndSelf, GWW_HANDLE16 ); HANDLE16 oldDS; HLOCAL hloc32; UINT size; - if (!es->hloc16) return; + if (!hloc16) return; if (!(hloc32 = es->hloc32A)) return; oldDS = stack16->ds; stack16->ds = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); - size = LocalSize16(es->hloc16); + size = LocalSize16(hloc16); if (LocalReAlloc( hloc32, size, LMEM_MOVEABLE )) { - char *text = MapSL( LocalLock16( es->hloc16 )); + char *text = MapSL( LocalLock16( hloc16 )); char *dest = LocalLock( hloc32 ); memcpy( dest, text, size ); LocalUnlock( hloc32 ); - LocalUnlock16( es->hloc16 ); + LocalUnlock16( hloc16 ); } stack16->ds = oldDS; @@ -1211,23 +1212,24 @@ static void EDIT_LockBuffer16(EDITSTATE *es) static void EDIT_UnlockBuffer16(EDITSTATE *es) { STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); + HLOCAL16 hloc16 = GetWindowWord( es->hwndSelf, GWW_HANDLE16 ); HANDLE16 oldDS; HLOCAL hloc32; UINT size; - if (!es->hloc16) return; + if (!hloc16) return; if (!(hloc32 = es->hloc32A)) return; size = LocalSize( hloc32 ); oldDS = stack16->ds; stack16->ds = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); - if (LocalReAlloc16( es->hloc16, size, LMEM_MOVEABLE )) + if (LocalReAlloc16( hloc16, size, LMEM_MOVEABLE )) { char *text = LocalLock( hloc32 ); - char *dest = MapSL( LocalLock16( es->hloc16 )); + char *dest = MapSL( LocalLock16( hloc16 )); memcpy( dest, text, size ); LocalUnlock( hloc32 ); - LocalUnlock16( es->hloc16 ); + LocalUnlock16( hloc16 ); } stack16->ds = oldDS; } @@ -2472,8 +2474,9 @@ static HLOCAL16 EDIT_EM_GetHandle16(EDITSTATE *es) HLOCAL hloc; STACK16FRAME* stack16; HANDLE16 oldDS; + HLOCAL16 hloc16 = GetWindowWord( es->hwndSelf, GWW_HANDLE16 ); - if (es->hloc16) return es->hloc16; + if (hloc16) return hloc16; if (!(hloc = EDIT_EM_GetHandle(es))) return 0; alloc_size = LocalSize( hloc ); @@ -2492,26 +2495,27 @@ static HLOCAL16 EDIT_EM_GetHandle16(EDITSTATE *es) } TRACE("Allocating 16-bit ANSI alias buffer\n"); - if (!(es->hloc16 = LocalAlloc16(LMEM_MOVEABLE | LMEM_ZEROINIT, alloc_size))) { + if (!(hloc16 = LocalAlloc16(LMEM_MOVEABLE | LMEM_ZEROINIT, alloc_size))) { ERR("could not allocate new 16 bit buffer\n"); goto done; } - if (!(textA = MapSL(LocalLock16( es->hloc16)))) { + if (!(textA = MapSL(LocalLock16( hloc16)))) { ERR("could not lock new 16 bit buffer\n"); - LocalFree16(es->hloc16); - es->hloc16 = 0; + LocalFree16(hloc16); + hloc16 = 0; goto done; } memcpy( textA, LocalLock( hloc ), alloc_size ); LocalUnlock( hloc ); - LocalUnlock16(es->hloc16); + LocalUnlock16( hloc16 ); + SetWindowWord( es->hwndSelf, GWW_HANDLE16, hloc16 ); - TRACE("Returning %04X, LocalSize() = %d\n", es->hloc16, LocalSize16(es->hloc16)); + TRACE("Returning %04X, LocalSize() = %d\n", hloc16, alloc_size); done: stack16->ds = oldDS; - return es->hloc16; + return hloc16; } @@ -2893,7 +2897,7 @@ static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc16) memcpy( LocalLock(hloc32), text, count ); LocalUnlock(hloc32); LocalUnlock16(hloc16); - es->hloc16 = hloc16; + SetWindowWord( es->hwndSelf, GWW_HANDLE16, hloc16 ); } stack16->ds = oldDS; @@ -4683,6 +4687,7 @@ static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name) static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) { LINEDEF *pc, *pp; + HLOCAL16 hloc16 = GetWindowWord( es->hwndSelf, GWW_HANDLE16 ); if (es->hloc32W) { LocalFree(es->hloc32W); @@ -4690,14 +4695,15 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) if (es->hloc32A) { LocalFree(es->hloc32A); } - if (es->hloc16) { + if (hloc16) { STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); HANDLE16 oldDS = stack16->ds; stack16->ds = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); - while (LocalUnlock16(es->hloc16)) ; - LocalFree16(es->hloc16); + while (LocalUnlock16(hloc16)) ; + LocalFree16(hloc16); stack16->ds = oldDS; + SetWindowWord( es->hwndSelf, GWW_HANDLE16, 0 ); } pc = es->first_line_def; @@ -5411,10 +5417,10 @@ const struct builtin_class_descr EDIT_builtin_class = CS_DBLCLKS | CS_PARENTDC, /* style */ EditWndProcA, /* procA */ EditWndProcW, /* procW */ -#ifdef _WIN64 - sizeof(EDITSTATE *), /* extra */ +#ifdef __i386__ + sizeof(EDITSTATE *) + sizeof(HLOCAL16), /* extra */ #else - sizeof(EDITSTATE *) + sizeof(HANDLE16), /* extra */ + sizeof(EDITSTATE *), /* extra */ #endif IDC_IBEAM, /* cursor */ 0 /* brush */

1 0

Alexandre Julliard : user32: Split the handling of the 16-bit messages out of the edit winproc.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 68656c0c3f117c399c5cef81f1304d9ecf04ea05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68656c0c3f117c399c5cef81f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 15:51:34 2009 +0100 user32: Split the handling of the 16-bit messages out of the edit winproc. --- dlls/user32/edit.c | 300 ++++++++++++++++++++++++---------------------------- 1 files changed, 140 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68656c0c3f117c399c5ce…

1 0

Alexandre Julliard : user32: Split the handling of the 16-bit messages out of the button winproc.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 68775d91340ac0fab18c8ac95242d226380ee5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=68775d91340ac0fab18c8ac95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 15:51:34 2009 +0100 user32: Split the handling of the 16-bit messages out of the button winproc. --- dlls/user32/button.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index fbe4c82..9eb731c 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -461,7 +461,6 @@ static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, InvalidateRect( hWnd, NULL, FALSE ); break; - case BM_SETSTYLE16: case BM_SETSTYLE: if ((wParam & 0x0f) >= MAX_BTN_TYPE) break; btn_type = wParam & 0x0f; @@ -499,11 +498,9 @@ static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, case BM_GETIMAGE: return GetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET ); - case BM_GETCHECK16: case BM_GETCHECK: return get_button_state( hWnd ) & 3; - case BM_SETCHECK16: case BM_SETCHECK: if (wParam > maxCheckState[btn_type]) wParam = maxCheckState[btn_type]; state = get_button_state( hWnd ); @@ -522,11 +519,9 @@ static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, BUTTON_CheckAutoRadioButton( hWnd ); break; - case BM_GETSTATE16: case BM_GETSTATE: return get_button_state( hWnd ); - case BM_SETSTATE16: case BM_SETSTATE: state = get_button_state( hWnd ); if (wParam) @@ -553,15 +548,32 @@ static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, } /*********************************************************************** + * ButtonWndProc_wrapper16 + */ +static LRESULT ButtonWndProc_wrapper16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) +{ + static const UINT msg16_offset = BM_GETCHECK16 - BM_GETCHECK; + + switch (msg) + { + case BM_GETCHECK16: + case BM_SETCHECK16: + case BM_GETSTATE16: + case BM_SETSTATE16: + case BM_SETSTYLE16: + return ButtonWndProc_common( hwnd, msg - msg16_offset, wParam, lParam, FALSE ); + default: + return ButtonWndProc_common( hwnd, msg, wParam, lParam, unicode ); + } +} + +/*********************************************************************** * ButtonWndProcW - * The button window procedure. This is just a wrapper which locks - * the passed HWND and calls the real window procedure (with a WND* - * pointer pointing to the locked windowstructure). */ static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; - return ButtonWndProc_common( hWnd, uMsg, wParam, lParam, TRUE ); + return ButtonWndProc_wrapper16( hWnd, uMsg, wParam, lParam, TRUE ); } @@ -571,7 +583,7 @@ static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARA static LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; - return ButtonWndProc_common( hWnd, uMsg, wParam, lParam, FALSE ); + return ButtonWndProc_wrapper16( hWnd, uMsg, wParam, lParam, FALSE ); }

1 0