wine-commits February 2008

wine-commits@winehq.org

3 participants
999 discussions

Eric Pouech : dbghelp: Fix mixed up return and this type in MFunction V2.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: d5a60cf40980b29d403fec4eae681e4f832e0419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a60cf40980b29d403fec4ea… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 6 21:55:17 2008 +0100 dbghelp: Fix mixed up return and this type in MFunction V2. --- include/wine/mscvpdb.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index da486d9..8a22dfd 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -343,9 +343,9 @@ union codeview_type { unsigned short int len; short int id; - unsigned this_type; - unsigned int class_type; unsigned int rvtype; + unsigned int class_type; + unsigned this_type; unsigned char call; unsigned char reserved; unsigned short params; @@ -733,6 +733,7 @@ union codeview_fieldtype * are apparently not used by the compiler, or represent pointer types * that are not used. */ + /* the type number of a built-in type is a 16-bit value specified in the following format: bit # | 11 | 10-8 | 7-4 | 3 | 2-0 | field | reserved | mode | type | reserved | size | @@ -1033,7 +1034,6 @@ union codeview_fieldtype #define T_NEAR64PTR_BITS 0x0600 - #define LF_MODIFIER_V1 0x0001 #define LF_POINTER_V1 0x0002 #define LF_ARRAY_V1 0x0003

1 0

Eric Pouech : dbghelp: Pass the 'details' flags to _fetch_type so that we can simplify some code around.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 464d51e75a850cb5b49a79912b7962969a833210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=464d51e75a850cb5b49a79912… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 6 21:55:10 2008 +0100 dbghelp: Pass the 'details' flags to _fetch_type so that we can simplify some code around. --- dlls/dbghelp/msc.c | 34 +++++++++++++++------------------- 1 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 24084d3..7870261 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -407,7 +407,7 @@ static void* codeview_cast_symt(struct symt* symt, enum SymTagEnum tag) } static struct symt* codeview_fetch_type(struct codeview_type_parse* ctp, - unsigned typeno) + unsigned typeno, BOOL details) { struct symt* symt; const union codeview_type* p; @@ -421,7 +421,7 @@ static struct symt* codeview_fetch_type(struct codeview_type_parse* ctp, FIXME("Cannot locate type %x\n", typeno); return NULL; } - symt = codeview_parse_one_type(ctp, typeno, p, FALSE); + symt = codeview_parse_one_type(ctp, typeno, p, details); if (!symt) FIXME("Couldn't load forward type %x\n", typeno); return symt; } @@ -437,7 +437,7 @@ static struct symt* codeview_add_type_pointer(struct codeview_type_parse* ctp, existing = codeview_cast_symt(existing, SymTagPointerType); return existing; } - pointee = codeview_fetch_type(ctp, pointee_type); + pointee = codeview_fetch_type(ctp, pointee_type, FALSE); return &symt_new_pointer(ctp->module, pointee)->symt; } @@ -447,8 +447,8 @@ static struct symt* codeview_add_type_array(struct codeview_type_parse* ctp, unsigned int indextype, unsigned int arr_len) { - struct symt* elem = codeview_fetch_type(ctp, elemtype); - struct symt* index = codeview_fetch_type(ctp, indextype); + struct symt* elem = codeview_fetch_type(ctp, elemtype, FALSE); + struct symt* index = codeview_fetch_type(ctp, indextype, FALSE); DWORD arr_max = 0; if (elem) @@ -520,19 +520,19 @@ static void codeview_add_udt_element(struct codeview_type_parse* ctp, { case LF_BITFIELD_V1: symt_add_udt_element(ctp->module, symt, name, - codeview_fetch_type(ctp, cv_type->bitfield_v1.type), + codeview_fetch_type(ctp, cv_type->bitfield_v1.type, FALSE), cv_type->bitfield_v1.bitoff, cv_type->bitfield_v1.nbits); return; case LF_BITFIELD_V2: symt_add_udt_element(ctp->module, symt, name, - codeview_fetch_type(ctp, cv_type->bitfield_v2.type), + codeview_fetch_type(ctp, cv_type->bitfield_v2.type, FALSE), cv_type->bitfield_v2.bitoff, cv_type->bitfield_v2.nbits); return; } } - subtype = codeview_fetch_type(ctp, type); + subtype = codeview_fetch_type(ctp, type, FALSE); if (subtype) { @@ -791,7 +791,7 @@ static void codeview_add_func_signature_args(struct codeview_type_parse* ctp, { const union codeview_reftype* reftype; - sym->rettype = codeview_fetch_type(ctp, ret_type); + sym->rettype = codeview_fetch_type(ctp, ret_type, FALSE); if (args_list && (reftype = codeview_jump_to_type(ctp, args_list))) { int i; @@ -800,12 +800,12 @@ static void codeview_add_func_signature_args(struct codeview_type_parse* ctp, case LF_ARGLIST_V1: for (i = 0; i < reftype->arglist_v1.num; i++) symt_add_function_signature_parameter(ctp->module, sym, - codeview_fetch_type(ctp, reftype->arglist_v1.args[i])); + codeview_fetch_type(ctp, reftype->arglist_v1.args[i], FALSE)); break; case LF_ARGLIST_V2: for (i = 0; i < reftype->arglist_v2.num; i++) symt_add_function_signature_parameter(ctp->module, sym, - codeview_fetch_type(ctp, reftype->arglist_v2.args[i])); + codeview_fetch_type(ctp, reftype->arglist_v2.args[i], FALSE)); break; default: FIXME("Unexpected leaf %x for signature's pmt\n", reftype->generic.id); @@ -828,8 +828,8 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, switch (type->generic.id) { case LF_MODIFIER_V1: - /* FIXME: we don't handle modifiers, - * but readd previous type on the curr_type + /* FIXME: we don't handle modifiers, + * but read previous type on the curr_type */ WARN("Modifier on %x: %s%s%s%s\n", type->modifier_v1.type, @@ -837,9 +837,7 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, type->modifier_v1.attribute & 0x02 ? "volatile " : "", type->modifier_v1.attribute & 0x04 ? "unaligned " : "", type->modifier_v1.attribute & ~0x07 ? "unknown " : ""); - if (!(symt = codeview_get_type(type->modifier_v1.type, TRUE))) - symt = codeview_parse_one_type(ctp, type->modifier_v1.type, - codeview_jump_to_type(ctp, type->modifier_v1.type), details); + symt = codeview_fetch_type(ctp, type->modifier_v1.type, details); break; case LF_MODIFIER_V2: /* FIXME: we don't handle modifiers, but readd previous type on the curr_type */ @@ -849,9 +847,7 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, type->modifier_v2.attribute & 0x02 ? "volatile " : "", type->modifier_v2.attribute & 0x04 ? "unaligned " : "", type->modifier_v2.attribute & ~0x07 ? "unknown " : ""); - if (!(symt = codeview_get_type(type->modifier_v2.type, TRUE))) - symt = codeview_parse_one_type(ctp, type->modifier_v2.type, - codeview_jump_to_type(ctp, type->modifier_v2.type), details); + symt = codeview_fetch_type(ctp, type->modifier_v2.type, details); break; case LF_POINTER_V1:

1 0

Eric Pouech : dbghelp: Added missing basic types for booleans and integers.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 428d0e5464eb459497bfc6bf97e5fd968df3aa7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=428d0e5464eb459497bfc6bf9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Feb 6 21:55:04 2008 +0100 dbghelp: Added missing basic types for booleans and integers. --- dlls/dbghelp/msc.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 66a2570..24084d3 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -125,12 +125,20 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_USHORT] = &symt_new_basic(module, btUInt, "unsigned short", 2)->symt; cv_basic_types[T_ULONG] = &symt_new_basic(module, btUInt, "unsigned long", 4)->symt; cv_basic_types[T_UQUAD] = &symt_new_basic(module, btUInt, "unsigned long long", 8)->symt; + cv_basic_types[T_BOOL08] = &symt_new_basic(module, btBool, "BOOL08", 1)->symt; + cv_basic_types[T_BOOL16] = &symt_new_basic(module, btBool, "BOOL16", 2)->symt; + cv_basic_types[T_BOOL32] = &symt_new_basic(module, btBool, "BOOL32", 4)->symt; + cv_basic_types[T_BOOL64] = &symt_new_basic(module, btBool, "BOOL64", 8)->symt; cv_basic_types[T_REAL32] = &symt_new_basic(module, btFloat, "float", 4)->symt; cv_basic_types[T_REAL64] = &symt_new_basic(module, btFloat, "double", 8)->symt; cv_basic_types[T_RCHAR] = &symt_new_basic(module, btInt, "signed char", 1)->symt; cv_basic_types[T_WCHAR] = &symt_new_basic(module, btWChar, "wchar_t", 2)->symt; + cv_basic_types[T_INT2] = &symt_new_basic(module, btInt, "INT2", 2)->symt; + cv_basic_types[T_UINT2] = &symt_new_basic(module, btUInt, "UINT2", 2)->symt; cv_basic_types[T_INT4] = &symt_new_basic(module, btInt, "INT4", 4)->symt; cv_basic_types[T_UINT4] = &symt_new_basic(module, btUInt, "UINT4", 4)->symt; + cv_basic_types[T_INT8] = &symt_new_basic(module, btInt, "INT8", 8)->symt; + cv_basic_types[T_UINT8] = &symt_new_basic(module, btUInt, "UINT8", 8)->symt; cv_basic_types[T_32PVOID] = &symt_new_pointer(module, cv_basic_types[T_VOID])->symt; cv_basic_types[T_32PCHAR] = &symt_new_pointer(module, cv_basic_types[T_CHAR])->symt; @@ -141,12 +149,20 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_32PUSHORT] = &symt_new_pointer(module, cv_basic_types[T_USHORT])->symt; cv_basic_types[T_32PULONG] = &symt_new_pointer(module, cv_basic_types[T_ULONG])->symt; cv_basic_types[T_32PUQUAD] = &symt_new_pointer(module, cv_basic_types[T_UQUAD])->symt; + cv_basic_types[T_32PBOOL08] = &symt_new_pointer(module, cv_basic_types[T_BOOL08])->symt; + cv_basic_types[T_32PBOOL16] = &symt_new_pointer(module, cv_basic_types[T_BOOL16])->symt; + cv_basic_types[T_32PBOOL32] = &symt_new_pointer(module, cv_basic_types[T_BOOL32])->symt; + cv_basic_types[T_32PBOOL64] = &symt_new_pointer(module, cv_basic_types[T_BOOL64])->symt; cv_basic_types[T_32PREAL32] = &symt_new_pointer(module, cv_basic_types[T_REAL32])->symt; cv_basic_types[T_32PREAL64] = &symt_new_pointer(module, cv_basic_types[T_REAL64])->symt; cv_basic_types[T_32PRCHAR] = &symt_new_pointer(module, cv_basic_types[T_RCHAR])->symt; cv_basic_types[T_32PWCHAR] = &symt_new_pointer(module, cv_basic_types[T_WCHAR])->symt; + cv_basic_types[T_32PINT2] = &symt_new_pointer(module, cv_basic_types[T_INT2])->symt; + cv_basic_types[T_32PUINT2] = &symt_new_pointer(module, cv_basic_types[T_UINT2])->symt; cv_basic_types[T_32PINT4] = &symt_new_pointer(module, cv_basic_types[T_INT4])->symt; cv_basic_types[T_32PUINT4] = &symt_new_pointer(module, cv_basic_types[T_UINT4])->symt; + cv_basic_types[T_32PINT8] = &symt_new_pointer(module, cv_basic_types[T_INT8])->symt; + cv_basic_types[T_32PUINT8] = &symt_new_pointer(module, cv_basic_types[T_UINT8])->symt; } static int numeric_leaf(int* value, const unsigned short int* leaf)

1 0

Andrew Riedi : user32: winex11.drv has support for color cursors now.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 58d2e3df390b2aec2021a7b09db915e021e7d1e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d2e3df390b2aec2021a7b09… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Thu Feb 7 01:31:51 2008 -0800 user32: winex11.drv has support for color cursors now. --- dlls/user32/cursoricon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 88fdd65..0ec5b32 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -914,7 +914,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, goto end; if ( fCursor ) - entry = CURSORICON_FindBestCursorFile( dir, width, height, 1 ); + entry = CURSORICON_FindBestCursorFile( dir, width, height, colors ); else entry = CURSORICON_FindBestIconFile( dir, width, height, colors );

1 0

Andrew Talbot : wintab32: Remove unneeded cast.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 78ea65bb3a4236f4a1e2ac130f2b3819c1e7a2b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ea65bb3a4236f4a1e2ac130… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 6 21:12:13 2008 +0000 wintab32: Remove unneeded cast. --- dlls/wintab32/wintab32.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 5f8608b..1ef19d9 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -143,8 +143,7 @@ static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, { prox = MAKELPARAM( wParam, 1 ); TABLET_PostTabletMessage(handler, WT_PROXIMITY, - (WPARAM)handler->handle, (LPARAM)prox, - TRUE); + (WPARAM)handler->handle, prox, TRUE); } break; }

1 0

Rob Shearman : comctl32: Don' t get the background colour in ANIMATE_PaintFrame as this can be called inside a critical section .
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 5c517a20b778cdae2dbb406f35ef1cc2126455ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c517a20b778cdae2dbb406f3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 6 16:50:15 2008 +0000 comctl32: Don't get the background colour in ANIMATE_PaintFrame as this can be called inside a critical section. This could therefore create a deadlock if the processing for WM_CTLCOLORSTATIC ends up sending certain messages to the animate control. So move the retrieval of the background colour into the callers of ANIMATE_PaintFrame but outside of any critical section. --- dlls/comctl32/animate.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index ee668ae..6ba05bd 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -317,9 +317,6 @@ static BOOL ANIMATE_PaintFrame(ANIMATE_INFO* infoPtr, HDC hDC) rect.right = nWidth; rect.bottom = nHeight; - infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, - WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)infoPtr->hwndSelf); if(!infoPtr->hbrushBG) infoPtr->hbrushBG = GetCurrentObject(hDC, OBJ_BRUSH); @@ -403,6 +400,10 @@ static DWORD CALLBACK ANIMATE_AnimationThread(LPVOID ptr_) while(1) { + if (infoPtr->dwStyle & ACS_TRANSPARENT) + infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, + WM_CTLCOLORSTATIC, + 0, (LPARAM)infoPtr->hwndSelf); EnterCriticalSection(&infoPtr->cs); ANIMATE_DrawFrame(infoPtr); timeout = infoPtr->mah.dwMicroSecPerFrame; @@ -451,6 +452,10 @@ static LRESULT ANIMATE_Play(ANIMATE_INFO *infoPtr, UINT cRepeat, WORD wFrom, WOR * does it send a notification */ if (infoPtr->nFromFrame == infoPtr->nToFrame) { + if (infoPtr->dwStyle & ACS_TRANSPARENT) + infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, + WM_CTLCOLORSTATIC, + 0, (LPARAM)infoPtr->hwndSelf); ANIMATE_DrawFrame(infoPtr); return TRUE; }

1 0

Jacek Caban : urlmon: Fixed ref count leak.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: ac61b90f87a2062b99f6f70686ea86b5b6c241c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac61b90f87a2062b99f6f7068… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 6 17:42:55 2008 +0100 urlmon: Fixed ref count leak. --- dlls/urlmon/binding.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 6c5ed61..b564651 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -811,7 +811,10 @@ static stgmed_obj_t *create_stgmed_stream(stgmed_buf_t *buf) static void stgmed_file_release(stgmed_obj_t *obj) { - heap_free(obj); + stgmed_file_obj_t *file_obj = (stgmed_file_obj_t*)obj; + + IUnknown_Release(STGMEDUNK(file_obj->buf)); + heap_free(file_obj); } static HRESULT stgmed_file_fill_stgmed(stgmed_obj_t *obj, STGMEDIUM *stgmed)

1 0

Jacek Caban : urlmon: Added gecko_installer_workaround to url.c tests.
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: 5bad12c6bc3072a2676f0d9edc9e3a48bca1ceaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bad12c6bc3072a2676f0d9ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 6 17:43:08 2008 +0100 urlmon: Added gecko_installer_workaround to url.c tests. --- dlls/urlmon/tests/Makefile.in | 2 +- dlls/urlmon/tests/url.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/Makefile.in b/dlls/urlmon/tests/Makefile.in index 808e3a4..9cdff83 100644 --- a/dlls/urlmon/tests/Makefile.in +++ b/dlls/urlmon/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = urlmon.dll -IMPORTS = urlmon user32 kernel32 ole32 +IMPORTS = urlmon ole32 user32 advapi32 kernel32 EXTRALIBS = -luuid CTESTS = \ diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index b65f434..dec6da8 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2395,8 +2395,40 @@ static void test_BindToStorage_fail(void) test_ReportResult(S_FALSE); } +static void gecko_installer_workaround(BOOL disable) +{ + HKEY hkey; + DWORD res; + + static BOOL has_url = FALSE; + static char url[2048]; + + if(!disable && !has_url) + return; + + res = RegOpenKey(HKEY_CURRENT_USER, "Software\\Wine\\MSHTML", &hkey); + if(res != ERROR_SUCCESS) + return; + + if(disable) { + DWORD type, size = sizeof(url); + + res = RegQueryValueEx(hkey, "GeckoUrl", NULL, &type, (PVOID)url, &size); + if(res == ERROR_SUCCESS && type == REG_SZ) + has_url = TRUE; + + RegDeleteValue(hkey, "GeckoUrl"); + }else { + RegSetValueEx(hkey, "GeckoUrl", 0, REG_SZ, (PVOID)url, lstrlenA(url)+1); + } + + RegCloseKey(hkey); +} + START_TEST(url) { + gecko_installer_workaround(TRUE); + complete_event = CreateEvent(NULL, FALSE, FALSE, NULL); complete_event2 = CreateEvent(NULL, FALSE, FALSE, NULL); thread_id = GetCurrentThreadId(); @@ -2508,4 +2540,6 @@ START_TEST(url) CloseHandle(complete_event); CloseHandle(complete_event2); CoUninitialize(); + + gecko_installer_workaround(FALSE); }

1 0

Alexandre Julliard : winex11: Only update the virtual screen rect once in xinerama_init to minimize race conditions .
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: e00840cf57907746f6fa1f0350773af0bcc63bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00840cf57907746f6fa1f035… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 6 20:38:20 2008 +0100 winex11: Only update the virtual screen rect once in xinerama_init to minimize race conditions. --- dlls/winex11.drv/xinerama.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 782c779..ee735e6 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -138,14 +138,15 @@ void xinerama_init( unsigned int width, unsigned int height ) { MONITORINFOEXW *primary; int i; + RECT rect; wine_tsx11_lock(); - SetRect( &virtual_screen_rect, 0, 0, width, height ); + SetRect( &rect, 0, 0, width, height ); if (root_window != DefaultRootWindow( gdi_display ) || !query_screens()) { - default_monitor.rcWork = default_monitor.rcMonitor = virtual_screen_rect; + default_monitor.rcWork = default_monitor.rcMonitor = rect; nb_monitors = 1; monitors = &default_monitor; } @@ -153,20 +154,21 @@ void xinerama_init( unsigned int width, unsigned int height ) primary = get_primary(); /* coordinates (0,0) have to point to the primary monitor origin */ - OffsetRect( &virtual_screen_rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); + OffsetRect( &rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); for (i = 0; i < nb_monitors; i++) { - OffsetRect( &monitors[i].rcMonitor, virtual_screen_rect.left, virtual_screen_rect.top ); - OffsetRect( &monitors[i].rcWork, virtual_screen_rect.left, virtual_screen_rect.top ); + OffsetRect( &monitors[i].rcMonitor, rect.left, rect.top ); + OffsetRect( &monitors[i].rcWork, rect.left, rect.top ); TRACE( "monitor %p: %s%s\n", index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } + virtual_screen_rect = rect; screen_width = primary->rcMonitor.right - primary->rcMonitor.left; screen_height = primary->rcMonitor.bottom - primary->rcMonitor.top; TRACE( "virtual size: %s primary size: %dx%d\n", - wine_dbgstr_rect(&virtual_screen_rect), screen_width, screen_height ); + wine_dbgstr_rect(&rect), screen_width, screen_height ); wine_tsx11_unlock(); ClipCursor( NULL ); /* reset the cursor clip rectangle */

1 0

Alexandre Julliard : winex11: Use the gdi display when initializing the keyboard to avoid creating a second display connection .
by Alexandre Julliard 07 Feb '08

07 Feb '08

Module: wine Branch: master Commit: e14261dbb737e6177be95df6cea787401c1f7ad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e14261dbb737e6177be95df6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 6 20:37:41 2008 +0100 winex11: Use the gdi display when initializing the keyboard to avoid creating a second display connection. --- dlls/winex11.drv/keyboard.c | 10 ++++------ dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 5196d5e..b5f7261 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1468,9 +1468,8 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) * X11 lock must be held. */ static void -X11DRV_KEYBOARD_DetectLayout (void) +X11DRV_KEYBOARD_DetectLayout( Display *display ) { - Display *display = thread_display(); unsigned current, match, mismatch, seq, i, syms; int score, keyc, key, pkey, ok; KeySym keysym = 0; @@ -1577,9 +1576,8 @@ X11DRV_KEYBOARD_DetectLayout (void) /********************************************************************** * X11DRV_InitKeyboard */ -void X11DRV_InitKeyboard(void) +void X11DRV_InitKeyboard( Display *display ) { - Display *display = thread_display(); KeySym *ksp; XModifierKeymap *mmp; KeySym keysym; @@ -1621,7 +1619,7 @@ void X11DRV_InitKeyboard(void) XFreeModifiermap(mmp); /* Detect the keyboard layout */ - X11DRV_KEYBOARD_DetectLayout(); + X11DRV_KEYBOARD_DetectLayout( display ); lkey = main_key_tab[kbd_layout].key; syms = (keysyms_per_keycode > 4) ? 4 : keysyms_per_keycode; @@ -1969,7 +1967,7 @@ void X11DRV_MappingNotify( HWND dummy, XEvent *event ) wine_tsx11_lock(); XRefreshKeyboardMapping(&event->xmapping); wine_tsx11_unlock(); - X11DRV_InitKeyboard(); + X11DRV_InitKeyboard( thread_display() ); hwnd = GetFocus(); if (!hwnd) hwnd = GetActiveWindow(); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7af082c..d7fb478 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -712,7 +712,7 @@ extern void X11DRV_ResetSelectionOwner(void); extern void X11DRV_SetFocus( HWND hwnd ); extern Cursor X11DRV_GetCursor( Display *display, struct tagCURSORICONINFO *ptr ); extern BOOL X11DRV_ClipCursor( LPCRECT clip ); -extern void X11DRV_InitKeyboard(void); +extern void X11DRV_InitKeyboard( Display *display ); extern void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time, DWORD dwExtraInfo, UINT injected_flags ); extern void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 6f682c2..444754b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -543,7 +543,7 @@ static BOOL process_attach(void) X11DRV_XComposite_Init(); #endif - X11DRV_InitKeyboard(); + X11DRV_InitKeyboard( gdi_display ); X11DRV_InitClipboard(); return TRUE;

1 0

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 2008