May 2013 - Wine-commits - list.winehq.org

Detlef Riekenberg : user32/tests: Add tests for EM_GETHANDLE.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: caf1bbba94157211f7ab43b61f46a4b018c8e72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf1bbba94157211f7ab43b61… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 3 09:22:44 2013 +0200 user32/tests: Add tests for EM_GETHANDLE. --- dlls/user32/tests/edit.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 11550f7..700dfb0 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2530,6 +2530,120 @@ static void test_dialogmode(void) destroy_child_editcontrol(hwEdit); } +static void test_EM_GETHANDLE(void) +{ + static const char str0[] = "untouched"; + static const char str1[] = "1111+1111+1111#"; + static const char str2[] = "2222-2222-2222-2222#"; + static const char str3[] = "3333*3333*3333*3333*3333#"; + CHAR current[42]; + HWND hEdit; + HLOCAL hmem; + HLOCAL hmem2; + HLOCAL halloc; + char *buffer; + int len; + int r; + + trace("EDIT: EM_GETHANDLE\n"); + + /* EM_GETHANDLE is not supported for a single line edit control */ + hEdit = create_editcontrol(WS_BORDER, 0); + ok(hEdit != NULL, "got %p (expected != NULL)\n", hEdit); + + hmem = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem == NULL, "got %p (expected NULL)\n", hmem); + DestroyWindow(hEdit); + + + /* EM_GETHANDLE needs a multiline edit control */ + hEdit = create_editcontrol(WS_BORDER | ES_MULTILINE, 0); + ok(hEdit != NULL, "got %p (expected != NULL)\n", hEdit); + + /* set some text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + hmem = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + /* The buffer belongs to the app now. According to MSDN, the app has to LocalFree the + buffer, LocalAlloc a new buffer and pass it to the edit control with EM_SETHANDLE. */ + + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + len = lstrlenA(buffer); + ok((len == lstrlenA(str1)) && !lstrcmpA(buffer, str1), + "got %d and \"%s\" (expected %d and \"%s\")\n", len, buffer, lstrlenA(str1), str1); + LocalUnlock(hmem); + + /* use LocalAlloc first to get a different handle */ + halloc = LocalAlloc(LMEM_MOVEABLE, 42); + ok(halloc != NULL, "got %p (expected != NULL)\n", halloc); + /* prepare our new memory */ + buffer = LocalLock(halloc); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + lstrcpyA(buffer, str2); + LocalUnlock(halloc); + + /* LocalFree the old memory handle before EM_SETHANDLE the new handle */ + LocalFree(hmem); + /* use LocalAlloc after the LocalFree to likely consume the handle */ + hmem2 = LocalAlloc(LMEM_MOVEABLE, 42); + ok(hmem2 != NULL, "got %p (expected != NULL)\n", hmem2); + + SendMessage(hEdit, EM_SETHANDLE, (WPARAM)halloc, 0); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(len == lstrlenA(str2), "got %d (expected %d)\n", len, lstrlenA(str2)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str2)) && !lstrcmpA(current, str2), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str2), str2); + + /* set a different text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str3); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str3)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str3)); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); + ok((r == lstrlenA(str3)) && !lstrcmpA(current, str3), + "got %d and \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str3), str3); + + LocalFree(hmem2); + DestroyWindow(hEdit); + + /* Some apps have bugs ... */ + hEdit = create_editcontrol(WS_BORDER | ES_MULTILINE, 0); + + /* set some text */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); + + /* everything is normal upto EM_GETHANDLE */ + hmem = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); + /* Some messages still work while other messages fail. + After LocalFree the memory handle, messages can crash the app */ + + /* A buggy editor used EM_GETHANDLE twice */ + hmem2 = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); + ok(hmem2 == hmem, "got %p (expected %p)\n", hmem2, hmem); + + /* Let the edit control free the memory handle */ + SendMessage(hEdit, EM_SETHANDLE, (WPARAM)hmem2, 0); + + DestroyWindow(hEdit); +} + + START_TEST(edit) { BOOL b; @@ -2568,5 +2682,7 @@ START_TEST(edit) else win_skip("EndMenu is not available\n"); + test_EM_GETHANDLE(); + UnregisterWindowClasses(); }

1 0

Detlef Riekenberg : user32: The flag EF_APP_HAS_HANDLE is now obsolete.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 9782ad77b54d8743e06ab5eaf6e34a065840698c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9782ad77b54d8743e06ab5eaf… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 3 09:22:45 2013 +0200 user32: The flag EF_APP_HAS_HANDLE is now obsolete. --- dlls/user32/edit.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 8910748..3e5a850 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -79,9 +79,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); #define EF_AFTER_WRAP 0x0080 /* the caret is displayed after the last character of a wrapped line, instead of in front of the next character */ #define EF_USE_SOFTBRK 0x0100 /* Enable soft breaks in text. */ -#define EF_APP_HAS_HANDLE 0x0200 /* Set when an app sends EM_[G|S]ETHANDLE. We are in sole control of - the text buffer if this is clear. */ -#define EF_DIALOGMODE 0x0400 /* Indicates that we are inside a dialog window */ +#define EF_DIALOGMODE 0x0200 /* Indicates that we are inside a dialog window */ typedef enum { @@ -1296,7 +1294,6 @@ static void EDIT_LockBuffer(EDITSTATE *es) } else es->text = LocalLock(es->hloc32W); } - if(es->flags & EF_APP_HAS_HANDLE) text_buffer_changed(es); es->lock_count++; } @@ -2493,8 +2490,7 @@ static HLOCAL EDIT_EM_GetHandle(EDITSTATE *es) /* The text buffer handle belongs to the app */ es->hlocapp = hLocal; - /* The app has knowledge of the text buffer handle */ - es->flags |= EF_APP_HAS_HANDLE; + TRACE("Returning %p, LocalSize() = %ld\n", hLocal, LocalSize(hLocal)); return hLocal; } @@ -2837,9 +2833,9 @@ static void EDIT_EM_SetHandle(EDITSTATE *es, HLOCAL hloc) /* The text buffer handle belongs to the control */ es->hlocapp = NULL; - /* The app has knowledge of the text buffer handle */ - es->flags |= EF_APP_HAS_HANDLE; + EDIT_LockBuffer(es); + text_buffer_changed(es); es->x_offset = es->y_offset = 0; es->selection_start = es->selection_end = 0;

1 0

Akihiro Sagawa : fonts: Fix default character index of Japanese Fixedsys.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: d29f6c41eb13e647a311091956af3131633e7eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=d29f6c41eb13e647a31109195… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 16 23:33:42 2013 +0900 fonts: Fix default character index of Japanese Fixedsys. --- fonts/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index ac034f6..556ed0c 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -93,7 +93,7 @@ vgafix.fon: fixedsys.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/fixedsys.ttf 15,1252,8 jvgafix.fon: fixedsys_jp.ttf - $(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/fixedsys_jp.ttf 18,932,8 + $(LDPATH) $(SFNT2FNT) -o $@ -d 160 $(srcdir)/fixedsys_jp.ttf 18,932,8 sserife.fon: ms_sans_serif.ttf $(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8

1 0

Ken Thomases : winemac: Improve positioning of input method candidate window.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 939d9a906ff75ac8db68f09d3ccbb6b7e32eec2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=939d9a906ff75ac8db68f09d3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 16:48:39 2013 -0500 winemac: Improve positioning of input method candidate window. --- dlls/winemac.drv/cocoa_window.m | 28 +++++++++- dlls/winemac.drv/event.c | 4 + dlls/winemac.drv/ime.c | 123 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 6 ++ 5 files changed, 161 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 8ebda3b..daa1e66 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -370,6 +370,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [[window queue] postEvent:event]; macdrv_release_event(event); + + [[self inputContext] invalidateCharacterCoordinates]; } } @@ -414,10 +416,32 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (NSRect) firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange { + macdrv_query* query; + WineWindow* window = (WineWindow*)[self window]; + NSRect ret; + aRange = NSIntersectionRange(aRange, NSMakeRange(0, [markedText length])); + + query = macdrv_create_query(); + query->type = QUERY_IME_CHAR_RECT; + query->window = (macdrv_window)[window retain]; + query->ime_char_rect.data = [window imeData]; + query->ime_char_rect.range = CFRangeMake(aRange.location, aRange.length); + + if ([window.queue query:query timeout:1]) + { + aRange = NSMakeRange(query->ime_char_rect.range.location, query->ime_char_rect.range.length); + ret = NSRectFromCGRect(query->ime_char_rect.rect); + [[WineApplicationController sharedController] flipRect:&ret]; + } + else + ret = NSMakeRect(100, 100, aRange.length ? 1 : 0, 12); + + macdrv_release_query(query); + if (actualRange) *actualRange = aRange; - return NSMakeRect(100, 100, aRange.length ? 1 : 0, 12); + return ret; } - (NSUInteger) characterIndexForPoint:(NSPoint)aPoint @@ -1211,6 +1235,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) event->window_frame_changed.frame = NSRectToCGRect(frame); [queue postEvent:event]; macdrv_release_event(event); + + [[[self contentView] inputContext] invalidateCharacterCoordinates]; } - (BOOL)windowShouldClose:(id)sender diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index cb305d6..51f6723 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -136,6 +136,10 @@ static void macdrv_query_event(HWND hwnd, const macdrv_event *event) TRACE("QUERY_DRAG_OPERATION\n"); success = query_drag_operation(query); break; + case QUERY_IME_CHAR_RECT: + TRACE("QUERY_IME_CHAR_RECT\n"); + success = query_ime_char_rect(query); + break; case QUERY_PASTEBOARD_DATA: TRACE("QUERY_PASTEBOARD_DATA\n"); success = query_pasteboard_data(hwnd, query->pasteboard_data.type); diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index e9f1369..44d5d8b 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -1509,3 +1509,126 @@ void macdrv_im_set_text(const macdrv_event *event) if (event->im_set_text.complete) IME_NotifyComplete(himc); } + + +/************************************************************************** + * query_ime_char_rect + */ +BOOL query_ime_char_rect(macdrv_query* query) +{ + HWND hwnd = macdrv_get_window_hwnd(query->window); + void *himc = query->ime_char_rect.data; + CFRange* range = &query->ime_char_rect.range; + CGRect* rect = &query->ime_char_rect.rect; + IMECHARPOSITION charpos; + BOOL ret = FALSE; + + TRACE("win %p/%p himc %p range %ld-%ld\n", hwnd, query->window, himc, range->location, + range->length); + + if (!himc) himc = RealIMC(FROM_MACDRV); + + charpos.dwSize = sizeof(charpos); + charpos.dwCharPos = range->location; + if (ImmRequestMessageW(himc, IMR_QUERYCHARPOSITION, (ULONG_PTR)&charpos)) + { + int i; + + *rect = CGRectMake(charpos.pt.x, charpos.pt.y, 0, charpos.cLineHeight); + + /* iterate over rest of length to extend rect */ + for (i = 1; i <= range->length; i++) + { + charpos.dwSize = sizeof(charpos); + charpos.dwCharPos = range->location + i; + if (!ImmRequestMessageW(himc, IMR_QUERYCHARPOSITION, (ULONG_PTR)&charpos) || + charpos.pt.y != rect->origin.y) + { + range->length = i; + break; + } + + rect->size.width = charpos.pt.x - rect->origin.x; + } + + ret = TRUE; + } + + if (!ret) + { + LPINPUTCONTEXT ic = ImmLockIMC(himc); + + if (ic) + { + LPIMEPRIVATE private = ImmLockIMCC(ic->hPrivate); + LPBYTE compdata = ImmLockIMCC(ic->hCompStr); + LPCOMPOSITIONSTRING compstr = (LPCOMPOSITIONSTRING)compdata; + LPWSTR str = (LPWSTR)(compdata + compstr->dwCompStrOffset); + + if (private->hwndDefault && compstr->dwCompStrOffset && + IsWindowVisible(private->hwndDefault)) + { + HDC dc = GetDC(private->hwndDefault); + HFONT oldfont = NULL; + SIZE size; + + if (private->textfont) + oldfont = SelectObject(dc, private->textfont); + + if (range->location > compstr->dwCompStrLen) + range->location = compstr->dwCompStrLen; + if (range->location + range->length > compstr->dwCompStrLen) + range->length = compstr->dwCompStrLen - range->location; + + GetTextExtentPoint32W(dc, str, range->location, &size); + charpos.rcDocument.left = size.cx; + charpos.rcDocument.top = 0; + GetTextExtentPoint32W(dc, str, range->location + range->length, &size); + charpos.rcDocument.right = size.cx; + charpos.rcDocument.bottom = size.cy; + + if (ic->cfCompForm.dwStyle == CFS_DEFAULT) + OffsetRect(&charpos.rcDocument, 10, 10); + + LPtoDP(dc, (POINT*)&charpos.rcDocument, 2); + MapWindowPoints(private->hwndDefault, 0, (POINT*)&charpos.rcDocument, 2); + *rect = cgrect_from_rect(charpos.rcDocument); + ret = TRUE; + + if (oldfont) + SelectObject(dc, oldfont); + ReleaseDC(private->hwndDefault, dc); + } + + ImmUnlockIMCC(ic->hCompStr); + ImmUnlockIMCC(ic->hPrivate); + } + + ImmUnlockIMC(himc); + } + + if (!ret) + { + HWND focus = GetFocus(); + if (focus && (focus == hwnd || IsChild(hwnd, focus)) && + GetClientRect(focus, &charpos.rcDocument)) + { + if (!GetCaretPos((POINT*)&charpos.rcDocument)) + charpos.rcDocument.left = charpos.rcDocument.top = 0; + + charpos.rcDocument.right = charpos.rcDocument.left + 1; + MapWindowPoints(focus, 0, (POINT*)&charpos.rcDocument, 2); + + *rect = cgrect_from_rect(charpos.rcDocument); + ret = TRUE; + } + } + + if (ret && range->length && !rect->size.width) + rect->size.width = 1; + + TRACE(" -> %s range %ld-%ld rect %s\n", ret ? "TRUE" : "FALSE", range->location, + range->length, wine_dbgstr_cgrect(*rect)); + + return ret; +} diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index fed1d47..1010ded 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -204,5 +204,6 @@ extern BOOL macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const B extern void macdrv_im_set_cursor_pos(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_im_set_text(const macdrv_event *event) DECLSPEC_HIDDEN; +extern BOOL query_ime_char_rect(macdrv_query* query) DECLSPEC_HIDDEN; #endif /* __WINE_MACDRV_H */ diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 84dfd87..905738f 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -259,6 +259,7 @@ enum { QUERY_DRAG_DROP, QUERY_DRAG_EXITED, QUERY_DRAG_OPERATION, + QUERY_IME_CHAR_RECT, QUERY_PASTEBOARD_DATA, NUM_QUERY_TYPES }; @@ -284,6 +285,11 @@ typedef struct macdrv_query { CFTypeRef pasteboard; } drag_operation; struct { + void *data; + CFRange range; + CGRect rect; + } ime_char_rect; + struct { CFStringRef type; } pasteboard_data; };

1 0

Ken Thomases : winemac: Always call super in -validateMenuItem:; fixes check mark in Windows menu.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 05c250dfcb394a41ac96c51fcaa40a10f411c2d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c250dfcb394a41ac96c51fc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 16 18:41:59 2013 -0500 winemac: Always call super in -validateMenuItem:; fixes check mark in Windows menu. --- dlls/winemac.drv/cocoa_window.m | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index daa1e66..3e60c84 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1020,9 +1020,12 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (BOOL) validateMenuItem:(NSMenuItem *)menuItem { + BOOL ret = [super validateMenuItem:menuItem]; + if ([menuItem action] == @selector(makeKeyAndOrderFront:)) - return [self isKeyWindow] || (!self.disabled && !self.noActivate); - return [super validateMenuItem:menuItem]; + ret = [self isKeyWindow] || (!self.disabled && !self.noActivate); + + return ret; } /* We don't call this. It's the action method of the items in the Window menu. */

1 0

Alexandre Julliard : powrprof: Don' t bother to close handles at process exit.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 30d7d31369c776f5e5fe7c5e6b878273fe8b1a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=30d7d31369c776f5e5fe7c5e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:17:41 2013 +0200 powrprof: Don't bother to close handles at process exit. --- dlls/powrprof/powrprof.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index a589728..7327fdf 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -341,6 +341,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; } case DLL_PROCESS_DETACH: + if (lpvReserved) break; CloseHandle(PPRegSemaphore); break; }

1 0

Alexandre Julliard : winscard: Don' t bother to close handles at process exit.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 8d23d9cbdcc604d7c00e5a1201aac8af76244a29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d23d9cbdcc604d7c00e5a120… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:18:10 2013 +0200 winscard: Don't bother to close handles at process exit. --- dlls/winscard/winscard.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index c57ef49..bcf8129 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -40,17 +40,14 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - { DisableThreadLibraryCalls(hinstDLL); /* FIXME: for now, we act as if the pcsc daemon is always started */ g_startedEvent = CreateEventA(NULL,TRUE,TRUE,NULL); break; - } case DLL_PROCESS_DETACH: - { + if (lpvReserved) break; CloseHandle(g_startedEvent); break; - } } return TRUE;

1 0

Alexandre Julliard : mapi32: Don't bother to free libraries at process exit .
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: cbb2792e01395c3c0ee8a6e86d4d8b1e70f1dfbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb2792e01395c3c0ee8a6e86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:23:03 2013 +0200 mapi32: Don't bother to free libraries at process exit. --- dlls/mapi32/mapi32_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index e7c1781..0dcc811 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -51,6 +51,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) load_mapi_providers(); break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; TRACE("DLL_PROCESS_DETACH: %d objects remaining\n", MAPI_ObjectCount); unload_mapi_providers(); break;

1 0

Alexandre Julliard : setupapi: Don' t bother to free libraries at process exit.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: 2aa3d2b0e193cb50e2c345d28c266f59823da350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa3d2b0e193cb50e2c345d28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:24:41 2013 +0200 setupapi: Don't bother to free libraries at process exit. --- dlls/setupapi/setupcab.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 8fcd989..21336d7 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -114,14 +114,6 @@ static BOOL LoadCABINETDll(void) return TRUE; } -static void UnloadCABINETDll(void) -{ - if (CABINET_hInstance) { - FreeLibrary(CABINET_hInstance); - CABINET_hInstance = 0; - } -} - /* FDICreate callbacks */ static void * CDECL sc_cb_alloc(ULONG cb) @@ -701,7 +693,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) SETUPAPI_hInstance = hinstDLL; break; case DLL_PROCESS_DETACH: - UnloadCABINETDll(); + if (lpvReserved) break; + if (CABINET_hInstance) FreeLibrary(CABINET_hInstance); break; }

1 0

Alexandre Julliard : shdocvw: Don' t bother to free libraries at process exit.
by Alexandre Julliard 17 May '13

17 May '13

Module: wine Branch: master Commit: e3b84cf4f7cbc48ad6dac77856dcc7a7e26789af URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b84cf4f7cbc48ad6dac7785… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:25:09 2013 +0200 shdocvw: Don't bother to free libraries at process exit. --- dlls/shdocvw/shdocvw_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index fa89051..5095696 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -149,9 +149,9 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) case DLL_PROCESS_ATTACH: break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; if (SHDOCVW_hshell32) FreeLibrary(SHDOCVW_hshell32); - if(ieframe_instance) - FreeLibrary(ieframe_instance); + if (ieframe_instance) FreeLibrary(ieframe_instance); break; } return TRUE;

1 0