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

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

May 17, 2013

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

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

May 17, 2013

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 : powrprof: Don' t bother to close handles at process exit.
by Alexandre Julliard May 17, 2013

May 17, 2013

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

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

May 17, 2013

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

Alexandre Julliard : winhttp: Don't bother to clean up at process exit.
by Alexandre Julliard May 17, 2013

May 17, 2013

Module: wine Branch: master Commit: 7ad43e4e8874e16401aab08205ea2f22d3a01862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad43e4e8874e16401aab0820… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 12:28:45 2013 +0200 winhttp: Don't bother to clean up at process exit. --- dlls/winhttp/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 5348d4d..5827c10 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -46,6 +46,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: + if (lpv) break; netconn_unload(); break; }

1 0

Jacek Caban : winegecko.php: Added 2.21 release.
by Alexandre Julliard May 17, 2013

May 17, 2013

Module: tools Branch: master Commit: c432bea2ddd7bc484b92fea0ea3b10f480b4888e URL: http://source.winehq.org/git/tools.git/?a=commit;h=c432bea2ddd7bc484b92fea0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 17 12:34:15 2013 +0200 winegecko.php: Added 2.21 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 34f0f36..963966f 100644 --- a/winegecko.php +++ b/winegecko.php @@ -74,7 +74,9 @@ $aFileSizes = array( '1.9-x86'=>19060224, '1.9-x86_64'=>19622400, '2.21-beta1-x86'=>20875264, - '2.21-beta1-x86_64'=>21648896 + '2.21-beta1-x86_64'=>21648896, + '2.21-x86'=>20871680, + '2.21-x86_64'=>21646336 ); // Exact size of the file:

1 0

Andrew Eikum : oleaut32: Also search local typeinfos in ITypeInfo:: GetRefTypeInfo.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: 70ed25fa1a342733fcef1e638fe4b140849dfb30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ed25fa1a342733fcef1e638… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 16 09:30:38 2013 -0500 oleaut32: Also search local typeinfos in ITypeInfo::GetRefTypeInfo. --- dlls/oleaut32/typelib.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6a2a594..9ffcaaa 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7089,6 +7089,19 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( result = ITypeInfoImpl_GetDispatchRefTypeInfo((ITypeInfo *)iface, &href_dispatch, ppTInfo); } else { TLBRefType *ref_type; + UINT i; + + for(i = 0; i < This->pTypeLib->TypeInfoCount; ++i) + { + if (This->pTypeLib->typeinfos[i]->hreftype == hRefType) + { + result = S_OK; + *ppTInfo = (ITypeInfo*)This->pTypeLib->typeinfos[i]; + ITypeInfo_AddRef(*ppTInfo); + goto end; + } + } + LIST_FOR_EACH_ENTRY(ref_type, &This->pTypeLib->ref_list, TLBRefType, entry) { if(ref_type->reference == hRefType)

1 0

Daniel Jelinski : wbemprox: Add CIM_LogicalDisk class, forward to Win32_LogicalDisk.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: 450617ecfca5711f1c9b5a801b29e241769bdab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=450617ecfca5711f1c9b5a801… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed May 15 22:39:05 2013 +0200 wbemprox: Add CIM_LogicalDisk class, forward to Win32_LogicalDisk. --- dlls/wbemprox/builtin.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index fe3fb98..e5a4e37 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); +static const WCHAR class_logicaldisk2W[] = + {'C','I','M','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_baseboardW[] = {'W','i','n','3','2','_','B','a','s','e','B','o','a','r','d',0}; static const WCHAR class_biosW[] = @@ -1447,6 +1449,7 @@ static struct table builtin_classes[] = { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, NULL, fill_compsys }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, SIZEOF(data_diskdrive), (BYTE *)data_diskdrive }, { class_diskpartitionW, SIZEOF(col_diskpartition), col_diskpartition, 0, NULL, fill_diskpartition }, + { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk }, { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, NULL, fill_networkadapter }, { class_osW, SIZEOF(col_os), col_os, 0, NULL, fill_os },

1 0

Daniel Jelinski : wbemprox: Return success if only one result requested from enum.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: 8117ca9c61bc144b1da50c32fcb11849a2aecca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8117ca9c61bc144b1da50c32f… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed May 15 22:19:12 2013 +0200 wbemprox: Return success if only one result requested from enum. --- dlls/wbemprox/class.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index d516efb..a02b325 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -130,7 +130,7 @@ static HRESULT WINAPI enum_class_object_Next( ec->index++; *puReturned = 1; - if (ec->index == view->count) return WBEM_S_FALSE; + if (ec->index == view->count && uCount > 1) return WBEM_S_FALSE; if (uCount > 1) return WBEM_S_TIMEDOUT; return WBEM_S_NO_ERROR; }

1 0

Andrew Eikum : oleaut32: Always initialize PARAMDESCEX's cBytes field.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: c74a9eac9317f5838e847a2439f4e8a575e6b613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74a9eac9317f5838e847a243… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 16 09:30:35 2013 -0500 oleaut32: Always initialize PARAMDESCEX's cBytes field. --- dlls/oleaut32/typelib.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index bb9eaf4..6a2a594 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5291,6 +5291,7 @@ static HRESULT TLB_CopyElemDesc( const ELEMDESC *src, ELEMDESC *dest, char **buf PARAMDESCEX *pparamdescex_dest = dest->u.paramdesc.pparamdescex = (PARAMDESCEX *)*buffer; *buffer += sizeof(PARAMDESCEX); *pparamdescex_dest = *pparamdescex_src; + pparamdescex_dest->cBytes = sizeof(PARAMDESCEX); VariantInit(&pparamdescex_dest->varDefaultValue); return VariantCopy(&pparamdescex_dest->varDefaultValue, (VARIANTARG *)&pparamdescex_src->varDefaultValue);

1 0