August 2012 - Wine-Commits - list.winehq.org

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

Aug. 16, 2012

1 0

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

Aug. 16, 2012

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 Aug. 16, 2012

Aug. 16, 2012

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 Aug. 15, 2012

Aug. 15, 2012

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 Aug. 15, 2012

Aug. 15, 2012

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

Aric Stewart : usp10: Correct implementation of Pair Positioning Adjustment : Format 1.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: e2250ce6cb5c364242f4f7d954561cf2df75e534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2250ce6cb5c364242f4f7d95… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 14 09:32:02 2012 -0500 usp10: Correct implementation of Pair Positioning Adjustment: Format 1. --- dlls/usp10/opentype.c | 67 +++++++++++++++++++++++++----------------------- 1 files changed, 35 insertions(+), 32 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index cc57f65..a21e0f1 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1174,44 +1174,47 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const WORD *gly ppf1 = (const GPOS_PairPosFormat1*)((const BYTE*)look+offset); if (GET_BE_WORD(ppf1->PosFormat) == 1) { + int index; offset = GET_BE_WORD(ppf1->Coverage); - if (GSUB_is_glyph_covered((const BYTE*)ppf1+offset, glyphs[glyph_index]) != -1) + index = GSUB_is_glyph_covered((const BYTE*)ppf1+offset, glyphs[glyph_index]); + if (index != -1 && index < GET_BE_WORD(ppf1->PairSetCount)) { - int i; - int count = GET_BE_WORD(ppf1->PairSetCount); - for (i = 0; i < count; i++) + int k; + int pair_count; + const GPOS_PairSet *ps; + offset = GET_BE_WORD(ppf1->PairSetOffset[index]); + ps = (const GPOS_PairSet*)((const BYTE*)ppf1+offset); + pair_count = GET_BE_WORD(ps->PairValueCount); + for (k = 0; k < pair_count; k++) { - int k; - int pair_count; - const GPOS_PairSet *ps; - offset = GET_BE_WORD(ppf1->PairSetOffset[i]); - ps = (const GPOS_PairSet*)((const BYTE*)ppf1+offset); - pair_count = GET_BE_WORD(ps->PairValueCount); - for (k = 0; k < pair_count; k++) + WORD second_glyph = GET_BE_WORD(ps->PairValueRecord[k].SecondGlyph); + if (glyphs[glyph_index+write_dir] == second_glyph) { - if (glyphs[glyph_index+write_dir] == GET_BE_WORD(ps->PairValueRecord[k].SecondGlyph)) + int next = 1; + GPOS_ValueRecord ValueRecord1 = {0,0,0,0,0,0,0,0}; + GPOS_ValueRecord ValueRecord2 = {0,0,0,0,0,0,0,0}; + WORD ValueFormat1 = GET_BE_WORD(ppf1->ValueFormat1); + WORD ValueFormat2 = GET_BE_WORD(ppf1->ValueFormat2); + + TRACE("Format 1: Found Pair %x,%x\n",glyphs[glyph_index],glyphs[glyph_index+write_dir]); + + offset = GPOS_get_value_record(ValueFormat1, ps->PairValueRecord[k].Value1, &ValueRecord1); + GPOS_get_value_record(ValueFormat2, (WORD*)((const BYTE*)(ps->PairValueRecord[k].Value2)+offset), &ValueRecord2); + if (ValueFormat1) + { + GPOS_get_value_record_offsets((const BYTE*)ppf1, &ValueRecord1, ValueFormat1, ppem, &ptAdjust[0], &ptAdvance[0]); + TRACE("Glyph 1 resulting cumulative offset is %i,%i design units\n",ptAdjust[0].x,ptAdjust[0].y); + TRACE("Glyph 1 resulting cumulative advance is %i,%i design units\n",ptAdvance[0].x,ptAdvance[0].y); + } + if (ValueFormat2) { - GPOS_ValueRecord ValueRecord1 = {0,0,0,0,0,0,0,0}; - GPOS_ValueRecord ValueRecord2 = {0,0,0,0,0,0,0,0}; - WORD ValueFormat1 = GET_BE_WORD(ppf1->ValueFormat1); - WORD ValueFormat2 = GET_BE_WORD(ppf1->ValueFormat2); - - TRACE("Format 1: Found Pair %x,%x\n",glyphs[glyph_index],glyphs[glyph_index+write_dir]); - - offset = GPOS_get_value_record(ValueFormat1, ps->PairValueRecord[k].Value1, &ValueRecord1); - GPOS_get_value_record(ValueFormat2, (WORD*)((const BYTE*)(ps->PairValueRecord[k].Value2)+offset), &ValueRecord2); - if (ValueFormat1) - { - GPOS_get_value_record_offsets((const BYTE*)ppf1, &ValueRecord1, ValueFormat1, ppem, &ptAdjust[0], &ptAdvance[0]); - TRACE("Glyph 1 resulting cumulative offset is %i,%i design units\n",ptAdjust[0].x,ptAdjust[0].y); - } - if (ValueFormat2) - { - GPOS_get_value_record_offsets((const BYTE*)ppf1, &ValueRecord2, ValueFormat2, ppem, &ptAdjust[1], &ptAdvance[1]); - TRACE("Glyph 2 resulting cumulative offset is %i,%i design units\n",ptAdjust[1].x,ptAdjust[1].y); - return glyph_index+2; - } + GPOS_get_value_record_offsets((const BYTE*)ppf1, &ValueRecord2, ValueFormat2, ppem, &ptAdjust[1], &ptAdvance[1]); + TRACE("Glyph 2 resulting cumulative offset is %i,%i design units\n",ptAdjust[1].x,ptAdjust[1].y); + TRACE("Glyph 2 resulting cumulative advance is %i,%i design units\n",ptAdvance[1].x,ptAdvance[1].y); + next++; } + if (next) + return glyph_index + next; } } }

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmap::Lock.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: 297c10a2bc33d793646d667b2424e3012882f71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=297c10a2bc33d793646d667b2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 14:50:07 2012 -0500 windowscodecs: Implement IWICBitmap::Lock. --- dlls/windowscodecs/bitmap.c | 166 ++++++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/bitmap.c | 71 ++++++++-------- 2 files changed, 201 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=297c10a2bc33d793646d6…

1 0

Vincent Povirk : windowscodecs: Implement getters on IWICBitmapLock.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: 46bbbd27412ec4b2245d1ccfc406ba3f289a3d4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46bbbd27412ec4b2245d1ccfc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 15:24:58 2012 -0500 windowscodecs: Implement getters on IWICBitmapLock. --- dlls/windowscodecs/bitmap.c | 85 ++++++++++++++++++++++++++++++++++--- dlls/windowscodecs/tests/bitmap.c | 50 +++++++++++----------- 2 files changed, 103 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46bbbd27412ec4b2245d1…

1 0

Dmitry Timoshkov : gdiplus: GdipMeasureString should apply its internal scaling factors to layout rectangle .
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: 6f4625559ef2139a34d1e9f8bec819335024646a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4625559ef2139a34d1e9f8b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 15 12:04:07 2012 +0900 gdiplus: GdipMeasureString should apply its internal scaling factors to layout rectangle. --- dlls/gdiplus/graphics.c | 10 ++++++++-- dlls/gdiplus/tests/graphics.c | 31 +------------------------------ 2 files changed, 9 insertions(+), 32 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 41034e5..16e1bc0 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4999,7 +4999,7 @@ static GpStatus measure_string_callback(HDC hdc, REAL new_width, new_height; new_width = bounds->Width / args->rel_width; - new_height = (bounds->Height + bounds->Y - args->bounds->Y) / args->rel_height; + new_height = (bounds->Height + bounds->Y) / args->rel_height - args->bounds->Y; if (new_width > args->bounds->Width) args->bounds->Width = new_width; @@ -5029,6 +5029,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, struct measure_string_args args; HDC temp_hdc=NULL, hdc; GpPointF pt[3]; + RectF scaled_rect; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, @@ -5066,6 +5067,11 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, get_font_hfont(graphics, font, &gdifont); oldfont = SelectObject(hdc, gdifont); + scaled_rect.X = rect->X * args.rel_width; + scaled_rect.Y = rect->Y * args.rel_height; + scaled_rect.Width = rect->Width * args.rel_width; + scaled_rect.Height = rect->Height * args.rel_height; + bounds->X = rect->X; bounds->Y = rect->Y; bounds->Width = 0.0; @@ -5075,7 +5081,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, args.codepointsfitted = codepointsfitted; args.linesfilled = linesfilled; - gdip_format_string(hdc, string, length, font, rect, format, + gdip_format_string(hdc, string, length, font, &scaled_rect, format, measure_string_callback, &args); SelectObject(hdc, oldfont); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index fb0c1cd..647c26a 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3513,13 +3513,6 @@ static void test_GdipMeasureString(void) expect(Ok, status); expectf(50.0, bounds.X); expectf(50.0, bounds.Y); - /* FIXME: remove once Wine is fixed */ - if (fabs(height - bounds.Height) > height / 100.0) - { - /* further testing is useless */ - GdipDeleteGraphics(graphics); - continue; - } expectf_(height, bounds.Height, height / 100.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.05); expect(7, chars); @@ -3584,23 +3577,8 @@ static void test_GdipMeasureString(void) base_cy = bounds.Height; } - /* FIXME: remove once Wine is fixed */ - if (fabs(height - bounds.Height) > height / 85.0) - { - /* further testing is useless */ - GdipDeleteGraphics(graphics); - continue; - } - expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - /* FIXME: remove once Wine is fixed */ - if (fabs(height - bounds.Height) > height / 85.0) - { - /* further testing is useless */ - GdipDeleteGraphics(graphics); - continue; - } expectf_(height, bounds.Height, height / 85.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.05); expect(7, chars); @@ -3617,13 +3595,6 @@ static void test_GdipMeasureString(void) expect(Ok, status); expectf(50.0, bounds.X); expectf(50.0, bounds.Y); - /* FIXME: remove once Wine is fixed */ - if (fabs(height - bounds.Height) > height / 85.0) - { - /* further testing is useless */ - GdipDeleteGraphics(graphics); - continue; - } expectf_(height, bounds.Height, height / 85.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.05); expect(7, chars); @@ -3635,7 +3606,7 @@ static void test_GdipMeasureString(void) height *= td[i].page_scale; /*trace("%u: unit %u, %.1fx%.1f dpi, scale %.1f, height %f, pixels %f\n", i, td[i].unit, td[i].res_x, td[i].res_y, td[i].page_scale, bounds.Height, height);*/ - expectf_(100.0, height, 1.0); + expectf_(100.0, height, 1.1); status = GdipDeleteGraphics(graphics); expect(Ok, status);

1 0

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

Aug. 15, 2012

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