wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

Francois Gouget : taskmgr: Tweak the spelling of a label.
by Alexandre Julliard 16 Aug '12

16 Aug '12

1 0

Alexandre Julliard : winex11: Use the labels to find the mouse motion valuators for XInput2.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: ff60249cab238bed124b98a7624ccfe415f8648e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff60249cab238bed124b98a76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 22:05:07 2012 +0200 winex11: Use the labels to find the mouse motion valuators for XInput2. --- dlls/winex11.drv/mouse.c | 50 +++++++++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 2 + 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 369d492..e8ba8e3 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -257,7 +257,7 @@ static void enable_xinput2(void) XIEventMask mask; XIDeviceInfo *devices; unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; - int i, j; + int i, j, count; if (!xinput2_available) return; @@ -279,21 +279,18 @@ static void enable_xinput2(void) for (i = 0; i < data->xi2_device_count; ++i) { if (devices[i].use != XIMasterPointer) continue; - for (j = 0; j < devices[i].num_classes; j++) + for (j = count = 0; j < devices[i].num_classes; j++) { XIValuatorClassInfo *class = (XIValuatorClassInfo *)devices[i].classes[j]; if (devices[i].classes[j]->type != XIValuatorClass) continue; - if (class->number != 0 && class->number != 1) continue; - TRACE( "Device %u (%s) class %u num %u %f,%f res %u mode %u\n", + TRACE( "Device %u (%s) num %u %f,%f res %u mode %u label %s\n", devices[i].deviceid, debugstr_a(devices[i].name), - j, class->number, class->min, class->max, class->resolution, class->mode ); - if (class->mode == XIModeAbsolute) - { - TRACE( "Device is absolute, not enabling XInput2\n" ); - goto done; - } + class->number, class->min, class->max, class->resolution, class->mode, + XGetAtomName( data->display, class->label )); + if (class->label == x11drv_atom( Rel_X ) || class->label == x11drv_atom( Rel_Y )) count++; } + if (count < 2) continue; TRACE( "Using %u (%s) as core pointer\n", devices[i].deviceid, debugstr_a(devices[i].name) ); data->xi2_core_pointer = devices[i].deviceid; @@ -318,7 +315,6 @@ static void enable_xinput2(void) } } -done: wine_tsx11_unlock(); #endif } @@ -1523,11 +1519,8 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) input.u.mi.dwFlags = MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; - - if (XIMaskIsSet( event->valuators.mask, 0 )) dx = *values++; - if (XIMaskIsSet( event->valuators.mask, 1 )) dy = *values++; - input.u.mi.dx = dx; - input.u.mi.dy = dy; + input.u.mi.dx = 0; + input.u.mi.dy = 0; wine_tsx11_lock(); for (i = 0; i < thread_data->xi2_device_count; ++i) @@ -1538,13 +1531,24 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) XIValuatorClassInfo *class = (XIValuatorClassInfo *)devices[i].classes[j]; if (devices[i].classes[j]->type != XIValuatorClass) continue; - if (class->min >= class->max) continue; - if (class->number == 0) - input.u.mi.dx = dx * (virtual_screen_rect.right - virtual_screen_rect.left) - / (class->max - class->min); - else if (class->number == 1) - input.u.mi.dy = dy * (virtual_screen_rect.bottom - virtual_screen_rect.top) - / (class->max - class->min); + if (XIMaskIsSet( event->valuators.mask, class->number )) + { + double val = *values++; + if (class->label == x11drv_atom( Rel_X )) + { + input.u.mi.dx = dx = val; + if (class->min < class->max) + input.u.mi.dx = val * (virtual_screen_rect.right - virtual_screen_rect.left) + / (class->max - class->min); + } + else if (class->label == x11drv_atom( Rel_Y )) + { + input.u.mi.dy = dy = val; + if (class->min < class->max) + input.u.mi.dy = val * (virtual_screen_rect.bottom - virtual_screen_rect.top) + / (class->max - class->min); + } + } } break; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 99efdb52..f24ccdc 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -407,6 +407,8 @@ enum x11drv_atoms XATOM_RAW_ASCENT, XATOM_RAW_DESCENT, XATOM_RAW_CAP_HEIGHT, + XATOM_Rel_X, + XATOM_Rel_Y, XATOM_WM_PROTOCOLS, XATOM_WM_DELETE_WINDOW, XATOM_WM_STATE, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index f660953..1499329 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -127,6 +127,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "RAW_ASCENT", "RAW_DESCENT", "RAW_CAP_HEIGHT", + "Rel X", + "Rel Y", "WM_PROTOCOLS", "WM_DELETE_WINDOW", "WM_STATE",

1 0

Alexandre Julliard : winex11: Store XInput2 device info in the thread data.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: f5790913803323e4a36e9d7b7f6d39f28e15f09a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5790913803323e4a36e9d7b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 21:21:20 2012 +0200 winex11: Store XInput2 device info in the thread data. --- dlls/winex11.drv/mouse.c | 58 +++++++++++++++++++++----------------------- dlls/winex11.drv/x11drv.h | 3 ++ 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 2098a8f..369d492 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -130,9 +130,6 @@ static Cursor create_cursor( HANDLE handle ); #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H static BOOL xinput2_available; -static int xinput2_core_pointer; -static int xinput2_device_count; -static XIDeviceInfo *xinput2_devices; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(XIFreeDeviceInfo); MAKE_FUNCPTR(XIQueryDevice); @@ -258,6 +255,7 @@ static void enable_xinput2(void) #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); XIEventMask mask; + XIDeviceInfo *devices; unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; int i, j; @@ -276,19 +274,19 @@ static void enable_xinput2(void) if (data->xi2_state == xi_unavailable) return; wine_tsx11_lock(); - if (xinput2_devices) pXIFreeDeviceInfo( xinput2_devices ); - xinput2_devices = pXIQueryDevice( data->display, XIAllDevices, &xinput2_device_count ); - for (i = 0; i < xinput2_device_count; ++i) + if (data->xi2_devices) pXIFreeDeviceInfo( data->xi2_devices ); + data->xi2_devices = devices = pXIQueryDevice( data->display, XIAllDevices, &data->xi2_device_count ); + for (i = 0; i < data->xi2_device_count; ++i) { - if (xinput2_devices[i].use != XIMasterPointer) continue; - for (j = 0; j < xinput2_devices[i].num_classes; j++) + if (devices[i].use != XIMasterPointer) continue; + for (j = 0; j < devices[i].num_classes; j++) { - XIValuatorClassInfo *class = (XIValuatorClassInfo *)xinput2_devices[i].classes[j]; + XIValuatorClassInfo *class = (XIValuatorClassInfo *)devices[i].classes[j]; - if (xinput2_devices[i].classes[j]->type != XIValuatorClass) continue; + if (devices[i].classes[j]->type != XIValuatorClass) continue; if (class->number != 0 && class->number != 1) continue; TRACE( "Device %u (%s) class %u num %u %f,%f res %u mode %u\n", - xinput2_devices[i].deviceid, debugstr_a(xinput2_devices[i].name), + devices[i].deviceid, debugstr_a(devices[i].name), j, class->number, class->min, class->max, class->resolution, class->mode ); if (class->mode == XIModeAbsolute) { @@ -297,8 +295,8 @@ static void enable_xinput2(void) } } TRACE( "Using %u (%s) as core pointer\n", - xinput2_devices[i].deviceid, debugstr_a(xinput2_devices[i].name) ); - xinput2_core_pointer = xinput2_devices[i].deviceid; + devices[i].deviceid, debugstr_a(devices[i].name) ); + data->xi2_core_pointer = devices[i].deviceid; break; } @@ -308,14 +306,13 @@ static void enable_xinput2(void) XISetMask( mask_bits, XI_RawMotion ); XISetMask( mask_bits, XI_ButtonPress ); - for (i = 0; i < xinput2_device_count; ++i) + for (i = 0; i < data->xi2_device_count; ++i) { - if (xinput2_devices[i].use == XISlavePointer && - xinput2_devices[i].attachment == xinput2_core_pointer) + if (devices[i].use == XISlavePointer && devices[i].attachment == data->xi2_core_pointer) { TRACE( "Device %u (%s) is attached to the core pointer\n", - xinput2_devices[i].deviceid, debugstr_a(xinput2_devices[i].name) ); - mask.deviceid = xinput2_devices[i].deviceid; + devices[i].deviceid, debugstr_a(devices[i].name) ); + mask.deviceid = devices[i].deviceid; pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); data->xi2_state = xi_enabled; } @@ -333,6 +330,7 @@ static void disable_xinput2(void) { #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H struct x11drv_thread_data *data = x11drv_thread_data(); + XIDeviceInfo *devices = data->xi2_devices; XIEventMask mask; int i; @@ -345,18 +343,17 @@ static void disable_xinput2(void) mask.mask_len = 0; wine_tsx11_lock(); - for (i = 0; i < xinput2_device_count; ++i) + for (i = 0; i < data->xi2_device_count; ++i) { - if (xinput2_devices[i].use == XISlavePointer && - xinput2_devices[i].attachment == xinput2_core_pointer) + if (devices[i].use == XISlavePointer && devices[i].attachment == data->xi2_core_pointer) { - mask.deviceid = xinput2_devices[i].deviceid; + mask.deviceid = devices[i].deviceid; pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); } } - pXIFreeDeviceInfo( xinput2_devices ); - xinput2_devices = NULL; - xinput2_device_count = 0; + pXIFreeDeviceInfo( devices ); + data->xi2_devices = NULL; + data->xi2_device_count = 0; wine_tsx11_unlock(); #endif } @@ -1517,6 +1514,7 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) int i, j; double dx = 0, dy = 0; struct x11drv_thread_data *thread_data = x11drv_thread_data(); + XIDeviceInfo *devices = thread_data->xi2_devices; if (!event->valuators.mask_len) return; if (thread_data->xi2_state != xi_enabled) return; @@ -1532,14 +1530,14 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) input.u.mi.dy = dy; wine_tsx11_lock(); - for (i = 0; i < xinput2_device_count; ++i) + for (i = 0; i < thread_data->xi2_device_count; ++i) { - if (xinput2_devices[i].deviceid != event->deviceid) continue; - for (j = 0; j < xinput2_devices[i].num_classes; j++) + if (devices[i].deviceid != event->deviceid) continue; + for (j = 0; j < devices[i].num_classes; j++) { - XIValuatorClassInfo *class = (XIValuatorClassInfo *)xinput2_devices[i].classes[j]; + XIValuatorClassInfo *class = (XIValuatorClassInfo *)devices[i].classes[j]; - if (xinput2_devices[i].classes[j]->type != XIValuatorClass) continue; + if (devices[i].classes[j]->type != XIValuatorClass) continue; if (class->min >= class->max) continue; if (class->number == 0) input.u.mi.dx = dx * (virtual_screen_rect.right - virtual_screen_rect.left) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8c3b38d..99efdb52 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -327,6 +327,9 @@ struct x11drv_thread_data DWORD clip_reset; /* time when clipping was last reset */ HKL kbd_layout; /* active keyboard layout */ enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ + void *xi2_devices; /* list of XInput2 devices (valid when state is enabled) */ + int xi2_device_count; + int xi2_core_pointer; /* XInput2 core pointer id */ }; extern struct x11drv_thread_data *x11drv_init_thread_data(void) DECLSPEC_HIDDEN;

1 0

André Hentschel : kernel32/tests: Test LocaleNameToLCID with bad name.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: f881dcf712206e3b8e3bb45bcbe590591cb80b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f881dcf712206e3b8e3bb45bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 15 15:42:52 2012 +0200 kernel32/tests: Test LocaleNameToLCID with bad name. --- dlls/kernel32/tests/locale.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 34b5fd8..397b30e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1789,7 +1789,7 @@ static INT LCMapStringEx_wrapper(DWORD flags, LPCWSTR src, INT srclen, LPWSTR ds static void test_LCMapStringEx(void) { int ret; - WCHAR buf[256], badname[] = {'w', 'i', 'n', 'e', 't', 'e', 's', 't', 0}; + WCHAR buf[256]; if (!pLCMapStringEx) { @@ -1800,7 +1800,7 @@ static void test_LCMapStringEx(void) trace("testing LCMapStringEx\n"); SetLastError(0xdeadbeef); - ret = pLCMapStringEx(badname, LCMAP_LOWERCASE, + ret = pLCMapStringEx(fooW, LCMAP_LOWERCASE, upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR), NULL, NULL, 0); todo_wine { ok(!ret, "LCMapStringEx should fail with bad locale name\n"); @@ -1889,6 +1889,10 @@ static void test_LocaleNameToLCID(void) ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); trace("%08x, %s\n", lcid, wine_dbgstr_w(buffer)); + /* bad name */ + lcid = pLocaleNameToLCID(fooW, 0); + todo_wine ok(lcid == 0, "got 0x%04x\n", lcid); + /* english neutral name */ lcid = pLocaleNameToLCID(enW, 0); ok(lcid == MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT) ||

1 0

Austin English : configure: Use -gdwarf-2 / -gstrict-dwarf when available.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 3f1dbaf3df0ae8ec2f0e86191eae3879fc422e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1dbaf3df0ae8ec2f0e86191… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 13 15:01:34 2012 -0500 configure: Use -gdwarf-2 / -gstrict-dwarf when available. --- configure | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 609a9c2..86c9698 100755 --- a/configure +++ b/configure @@ -12285,6 +12285,56 @@ $as_echo "$ac_cv_cflags__Wwrite_strings" >&6; } if test $ac_cv_cflags__Wwrite_strings = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-2" >&5 +$as_echo_n "checking whether the compiler supports -gdwarf-2... " >&6; } +if ${ac_cv_cflags__gdwarf_2+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -gdwarf-2" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__gdwarf_2=yes +else + ac_cv_cflags__gdwarf_2=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__gdwarf_2" >&5 +$as_echo "$ac_cv_cflags__gdwarf_2" >&6; } +if test $ac_cv_cflags__gdwarf_2 = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -gdwarf-2" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstrict-dwarf" >&5 +$as_echo_n "checking whether the compiler supports -gstrict-dwarf... " >&6; } +if ${ac_cv_cflags__gstrict_dwarf+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -gstrict-dwarf" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__gstrict_dwarf=yes +else + ac_cv_cflags__gstrict_dwarf=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__gstrict_dwarf" >&5 +$as_echo "$ac_cv_cflags__gstrict_dwarf" >&6; } +if test $ac_cv_cflags__gstrict_dwarf = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -gstrict-dwarf" +fi case $host_cpu in *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5 diff --git a/configure.ac b/configure.ac index 4bd43d1..c80fd8a 100644 --- a/configure.ac +++ b/configure.ac @@ -1746,6 +1746,8 @@ then WINE_TRY_CFLAGS([-Wtype-limits]) WINE_TRY_CFLAGS([-Wunused-but-set-parameter]) WINE_TRY_CFLAGS([-Wwrite-strings]) + WINE_TRY_CFLAGS([-gdwarf-2]) + WINE_TRY_CFLAGS([-gstrict-dwarf]) dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections case $host_cpu in

1 0

Dmitry Timoshkov : winedbg: Make the crash dialog slightly larger and minimize/maximize-able.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 6407cd8e0ccb53c0c80c1f61d6d1568c671ba45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6407cd8e0ccb53c0c80c1f61d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 6 11:08:20 2012 +0900 winedbg: Make the crash dialog slightly larger and minimize/maximize-able. --- programs/winedbg/winedbg.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/winedbg.rc b/programs/winedbg/winedbg.rc index 4effa6e..8d9dc34 100644 --- a/programs/winedbg/winedbg.rc +++ b/programs/winedbg/winedbg.rc @@ -58,17 +58,17 @@ BEGIN PUSHBUTTON "Show &Details", ID_DETAILS, 140, 151, 60, 16, WS_TABSTOP END -IDD_DETAILS_DLG DIALOGEX 100, 100, 300, 240 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_VISIBLE +IDD_DETAILS_DLG DIALOGEX 100, 100, 400, 340 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE CAPTION "Program Error Details" FONT 8, "MS Shell Dlg" BEGIN - EDITTEXT IDC_CRASH_TXT, 4, 4, 292, 172, ES_MULTILINE | ES_READONLY | WS_HSCROLL | WS_VSCROLL, WS_TABSTOP + EDITTEXT IDC_CRASH_TXT, 4, 4, 392, 272, ES_MULTILINE | ES_READONLY | WS_HSCROLL | WS_VSCROLL, WS_TABSTOP CONTROL "If this problem is not present under Windows and has not been reported yet, \ you can save the detailed information to a file using the \"Save As\" button, \ then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> \ and attach that file to the report.", - IDC_STATIC_TXT2,"SysLink",0,6,185,288,32 - DEFPUSHBUTTON "Close", IDOK, 226, 220, 70, 16, WS_TABSTOP - PUSHBUTTON "&Save As...", ID_SAVEAS, 152, 220, 70, 16, WS_TABSTOP + IDC_STATIC_TXT2,"SysLink",0,6,285,388,32 + DEFPUSHBUTTON "Close", IDOK, 326, 320, 70, 16, WS_TABSTOP + PUSHBUTTON "&Save As...", ID_SAVEAS, 252, 320, 70, 16, WS_TABSTOP END

1 0

Alexandre Julliard : winex11: Remove the redundant pixel format index from the pixel format object.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 5e932efbf6a9bec78c24fc7960c6d31c77b6419c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e932efbf6a9bec78c24fc796… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 15:44:00 2012 +0200 winex11: Remove the redundant pixel format index from the pixel format object. --- dlls/winex11.drv/opengl.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5f3c766..fc7448a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -133,7 +133,6 @@ struct WineGLInfo { struct wgl_pixel_format { - int iPixelFormat; GLXFBConfig fbconfig; int fmt_id; int render_type; @@ -964,7 +963,6 @@ static void init_pixel_formats( Display *display ) } TRACE("Found onscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); - list[size].iPixelFormat = size+1; /* The index starts at 1 */ list[size].fbconfig = cfgs[i]; list[size].fmt_id = fmt_id; list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); @@ -976,7 +974,6 @@ static void init_pixel_formats( Display *display ) if(check_fbconfig_bitmap_capability(display, cfgs[i])) { TRACE("Found bitmap capable format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); - list[size].iPixelFormat = size+1; /* The index starts at 1 */ list[size].fbconfig = cfgs[i]; list[size].fmt_id = fmt_id; list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); @@ -1001,7 +998,6 @@ static void init_pixel_formats( Display *display ) } TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); - list[size].iPixelFormat = size+1; /* The index starts at 1 */ list[size].fbconfig = cfgs[i]; list[size].fmt_id = fmt_id; list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); @@ -1469,10 +1465,9 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (ctx->fmt->iPixelFormat != escape.pixel_format) + if (ctx->fmt - pixel_formats != escape.pixel_format - 1) { - WARN( "mismatched pixel format hdc %p %u ctx %p %u\n", - hdc, escape.pixel_format, ctx, ctx->fmt->iPixelFormat ); + WARN( "mismatched pixel format hdc %p %u ctx %p\n", hdc, escape.pixel_format, ctx ); SetLastError( ERROR_INVALID_PIXEL_FORMAT ); return FALSE; }

1 0

Alexandre Julliard : winex11: Make pixel format objects const and get rid of the WineGLPixelFormat typedef .
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 451828e169ce41ec696f7fcd8a17a35ffa1eef4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=451828e169ce41ec696f7fcd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 15:38:05 2012 +0200 winex11: Make pixel format objects const and get rid of the WineGLPixelFormat typedef. --- dlls/winex11.drv/opengl.c | 56 +++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=451828e169ce41ec696f7…

1 0

Alexandre Julliard : winex11: Initialize the OpenGL format list at startup and simplify the conversion routines .
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: b908a72635db90b459c3e74d550daa6a8b0b1cb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b908a72635db90b459c3e74d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 15:32:24 2012 +0200 winex11: Initialize the OpenGL format list at startup and simplify the conversion routines. --- dlls/winex11.drv/opengl.c | 186 ++++++++++++++++---------------------------- 1 files changed, 68 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b908a72635db90b459c3e…

1 0

Alexandre Julliard : winex11: Add a critical section to protect the OpenGL context list.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: b8cc4d50ef0e38832b43e16f882441dcb43d5998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8cc4d50ef0e38832b43e16f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 14 14:54:39 2012 +0200 winex11: Add a critical section to protect the OpenGL context list. --- dlls/winex11.drv/opengl.c | 51 ++++++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ff8b0ae..63ab09f 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -196,6 +196,15 @@ static int use_render_texture_emulation = 1; static BOOL has_swap_control; static int swap_interval = 1; +static CRITICAL_SECTION context_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &context_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": context_section") } +}; +static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + static struct opengl_funcs opengl_funcs; #define USE_GL_FUNC(name) #name, @@ -1088,6 +1097,8 @@ static int pixelformat_from_fbconfig_id(XID fbconfig_id) void mark_drawable_dirty(Drawable old, Drawable new) { struct wgl_context *ctx; + + EnterCriticalSection( &context_section ); LIST_FOR_EACH_ENTRY( ctx, &context_list, struct wgl_context, entry ) { if (old == ctx->drawables[0]) { @@ -1099,12 +1110,14 @@ void mark_drawable_dirty(Drawable old, Drawable new) ctx->refresh_drawables = TRUE; } } + LeaveCriticalSection( &context_section ); } /* Given the current context, make sure its drawable is sync'd */ static inline void sync_context(struct wgl_context *context) { - if(context && context->refresh_drawables) { + EnterCriticalSection( &context_section ); + if (context->refresh_drawables) { if (glxRequireVersion(3)) pglXMakeContextCurrent(gdi_display, context->drawables[0], context->drawables[1], context->ctx); @@ -1112,6 +1125,7 @@ static inline void sync_context(struct wgl_context *context) pglXMakeCurrent(gdi_display, context->drawables[0], context->ctx); context->refresh_drawables = FALSE; } + LeaveCriticalSection( &context_section ); } @@ -1435,11 +1449,12 @@ static struct wgl_context *glxdrv_wglCreateContext( HDC hdc ) ret->has_been_current = FALSE; ret->sharing = FALSE; - wine_tsx11_lock(); ret->vis = pglXGetVisualFromFBConfig(gdi_display, fmt->fbconfig); ret->ctx = create_glxcontext(gdi_display, ret, NULL); + + EnterCriticalSection( &context_section ); list_add_head( &context_list, &ret->entry ); - wine_tsx11_unlock(); + LeaveCriticalSection( &context_section ); TRACE(" creating context %p (GL context creation delayed)\n", ret); return ret; @@ -1452,12 +1467,12 @@ static void glxdrv_wglDeleteContext(struct wgl_context *ctx) { TRACE("(%p)\n", ctx); - wine_tsx11_lock(); + EnterCriticalSection( &context_section ); list_remove( &ctx->entry ); + LeaveCriticalSection( &context_section ); + if (ctx->ctx) pglXDestroyContext( gdi_display, ctx->ctx ); if (ctx->vis) XFree( ctx->vis ); - wine_tsx11_unlock(); - HeapFree( GetProcessHeap(), 0, ctx ); } @@ -1507,8 +1522,6 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) } else { - wine_tsx11_lock(); - if (TRACE_ON(wgl)) { int vis_id; pglXGetFBConfigAttrib(gdi_display, ctx->fmt->fbconfig, GLX_VISUAL_ID, &vis_id); @@ -1523,15 +1536,16 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) { NtCurrentTeb()->glContext = ctx; + EnterCriticalSection( &context_section ); ctx->has_been_current = TRUE; ctx->hdc = hdc; ctx->drawables[0] = escape.gl_drawable; ctx->drawables[1] = escape.gl_drawable; ctx->refresh_drawables = FALSE; + LeaveCriticalSection( &context_section ); } else SetLastError(ERROR_INVALID_HANDLE); - wine_tsx11_unlock(); } TRACE(" returning %s\n", (ret ? "True" : "False")); return ret; @@ -1574,20 +1588,20 @@ static BOOL X11DRV_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct { if (!pglXMakeContextCurrent) return FALSE; - wine_tsx11_lock(); ret = pglXMakeContextCurrent(gdi_display, escape_draw.gl_drawable, escape_read.gl_drawable, ctx->ctx); if (ret) { + EnterCriticalSection( &context_section ); ctx->has_been_current = TRUE; ctx->hdc = draw_hdc; ctx->drawables[0] = escape_draw.gl_drawable; ctx->drawables[1] = escape_read.gl_drawable; ctx->refresh_drawables = FALSE; + LeaveCriticalSection( &context_section ); NtCurrentTeb()->glContext = ctx; } else SetLastError(ERROR_INVALID_HANDLE); - wine_tsx11_unlock(); } TRACE(" returning %s\n", (ret ? "True" : "False")); @@ -1674,10 +1688,8 @@ static void wglFinish(void) struct wgl_context *ctx = NtCurrentTeb()->glContext; enum x11drv_escape_codes code = X11DRV_FLUSH_GL_DRAWABLE; - wine_tsx11_lock(); sync_context(ctx); pglFinish(); - wine_tsx11_unlock(); ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); } @@ -1686,10 +1698,8 @@ static void wglFlush(void) struct wgl_context *ctx = NtCurrentTeb()->glContext; enum x11drv_escape_codes code = X11DRV_FLUSH_GL_DRAWABLE; - wine_tsx11_lock(); sync_context(ctx); pglFlush(); - wine_tsx11_unlock(); ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); } @@ -1767,7 +1777,6 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg } } - wine_tsx11_lock(); X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); ret->ctx = create_glxcontext(gdi_display, ret, NULL); @@ -1777,12 +1786,13 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg /* In the future we should convert the GLX error to a win32 one here if needed */ ERR("Context creation failed\n"); HeapFree( GetProcessHeap(), 0, ret ); - wine_tsx11_unlock(); return NULL; } + EnterCriticalSection( &context_section ); list_add_head( &context_list, &ret->entry ); - wine_tsx11_unlock(); + LeaveCriticalSection( &context_section ); + TRACE(" creating context %p\n", ret); return ret; } @@ -2210,10 +2220,8 @@ static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, c } /* Search for FB configurations matching the requirements in attribs */ - wine_tsx11_lock(); cfgs = pglXChooseFBConfig(gdi_display, DefaultScreen(gdi_display), attribs, &nCfgs); if (NULL == cfgs) { - wine_tsx11_unlock(); WARN("Compatible Pixel Format not found\n"); return GL_FALSE; } @@ -2248,7 +2256,6 @@ static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, c *nNumFormats = pfmt_it; /** free list */ XFree(cfgs); - wine_tsx11_unlock(); return GL_TRUE; } @@ -2879,7 +2886,6 @@ static BOOL glxdrv_SwapBuffers(PHYSDEV dev) return FALSE; } - wine_tsx11_lock(); sync_context(ctx); switch (physdev->type) { @@ -2903,7 +2909,6 @@ static BOOL glxdrv_SwapBuffers(PHYSDEV dev) } flush_gl_drawable( physdev ); - wine_tsx11_unlock(); /* FPS support */ if (TRACE_ON(fps))

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
55
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 August 2012