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

Francois Gouget : winecfg: Tweak the spelling of a couple of labels.
by Alexandre Julliard 16 Aug '12

16 Aug '12

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

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

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

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

Vincent Povirk : windowscodecs: Add tests for IWICBitmap.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: c2001c2b53b75045c1645ed1b23e7c4d711a7acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2001c2b53b75045c1645ed1b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 11:28:32 2012 -0500 windowscodecs: Add tests for IWICBitmap. --- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/bitmap.c | 279 ++++++++++++++++++++++++++++++++++ include/wincodec.idl | 7 + 3 files changed, 287 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2001c2b53b75045c1645…

1 0

Vincent Povirk : windowscodecs: Add a stub IWICBitmap implementation.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: f9b67b6c183806e9a1bc20bc7a2c98cb221334ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b67b6c183806e9a1bc20bc7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 13:39:15 2012 -0500 windowscodecs: Add a stub IWICBitmap implementation. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/bitmap.c | 187 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/imgfactory.c | 4 +- dlls/windowscodecs/tests/bitmap.c | 14 ++- dlls/windowscodecs/wincodecs_private.h | 3 + 5 files changed, 201 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index acbb0e9..b462249 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -6,6 +6,7 @@ EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DWIDL_C_ EXTRALIBS = @APPLICATIONSERVICESLIB@ C_SRCS = \ + bitmap.c \ bmpdecode.c \ bmpencode.c \ clsfactory.c \ diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c new file mode 100644 index 0000000..5014488 --- /dev/null +++ b/dlls/windowscodecs/bitmap.c @@ -0,0 +1,187 @@ +/* + * Copyright 2012 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct BitmapImpl { + IWICBitmap IWICBitmap_iface; + LONG ref; +} BitmapImpl; + +static inline BitmapImpl *impl_from_IWICBitmap(IWICBitmap *iface) +{ + return CONTAINING_RECORD(iface, BitmapImpl, IWICBitmap_iface); +} + +static HRESULT WINAPI BitmapImpl_QueryInterface(IWICBitmap *iface, REFIID iid, + void **ppv) +{ + BitmapImpl *This = impl_from_IWICBitmap(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICBitmap, iid)) + { + *ppv = &This->IWICBitmap_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI BitmapImpl_AddRef(IWICBitmap *iface) +{ + BitmapImpl *This = impl_from_IWICBitmap(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface) +{ + BitmapImpl *This = impl_from_IWICBitmap(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI BitmapImpl_GetSize(IWICBitmap *iface, + UINT *puiWidth, UINT *puiHeight) +{ + FIXME("(%p,%p,%p)\n", iface, puiWidth, puiHeight); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapImpl_GetPixelFormat(IWICBitmap *iface, + WICPixelFormatGUID *pPixelFormat) +{ + FIXME("(%p,%p)\n", iface, pPixelFormat); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapImpl_GetResolution(IWICBitmap *iface, + double *pDpiX, double *pDpiY) +{ + FIXME("(%p,%p,%p)\n", iface, pDpiX, pDpiY); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapImpl_CopyPalette(IWICBitmap *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p)\n", iface, pIPalette); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapImpl_CopyPixels(IWICBitmap *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + FIXME("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapImpl_Lock(IWICBitmap *iface, const WICRect *prcLock, + DWORD flags, IWICBitmapLock **ppILock) +{ + FIXME("(%p,%p,%x,%p)\n", iface, prcLock, flags, ppILock); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapImpl_SetPalette(IWICBitmap *iface, IWICPalette *pIPalette) +{ + FIXME("(%p,%p)\n", iface, pIPalette); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapImpl_SetResolution(IWICBitmap *iface, + double dpiX, double dpiY) +{ + FIXME("(%p,%f,%f)\n", iface, dpiX, dpiY); + + return E_NOTIMPL; +} + +static const IWICBitmapVtbl BitmapImpl_Vtbl = { + BitmapImpl_QueryInterface, + BitmapImpl_AddRef, + BitmapImpl_Release, + BitmapImpl_GetSize, + BitmapImpl_GetPixelFormat, + BitmapImpl_GetResolution, + BitmapImpl_CopyPalette, + BitmapImpl_CopyPixels, + BitmapImpl_Lock, + BitmapImpl_SetPalette, + BitmapImpl_SetResolution +}; + +HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, + REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, + IWICBitmap **ppIBitmap) +{ + BitmapImpl *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapImpl)); + if (!This) return E_OUTOFMEMORY; + + This->IWICBitmap_iface.lpVtbl = &BitmapImpl_Vtbl; + This->ref = 1; + + *ppIBitmap = &This->IWICBitmap_iface; + + return S_OK; +} diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index ea6df28..a739662 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -457,9 +457,9 @@ static HRESULT WINAPI ComponentFactory_CreateBitmap(IWICComponentFactory *iface, UINT uiWidth, UINT uiHeight, REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, IWICBitmap **ppIBitmap) { - FIXME("(%p,%u,%u,%s,%u,%p): stub\n", iface, uiWidth, uiHeight, + TRACE("(%p,%u,%u,%s,%u,%p)\n", iface, uiWidth, uiHeight, debugstr_guid(pixelFormat), option, ppIBitmap); - return E_NOTIMPL; + return BitmapImpl_Create(uiWidth, uiHeight, pixelFormat, option, ppIBitmap); } static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index ebcefb9..748a1f9 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -52,7 +52,7 @@ static void test_createbitmap(void) hr = IWICImagingFactory_CreateBitmap(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, WICBitmapCacheOnLoad, &bitmap); - todo_wine ok(hr == S_OK, "IWICImagingFactory_CreateBitmap failed hr=%x\n", hr); + ok(hr == S_OK, "IWICImagingFactory_CreateBitmap failed hr=%x\n", hr); if (FAILED(hr)) return; @@ -62,34 +62,35 @@ static void test_createbitmap(void) /* Palette is unavailable until explicitly set */ hr = IWICBitmap_CopyPalette(bitmap, palette); - ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "IWICBitmap_CopyPalette failed hr=%x\n", hr); + todo_wine ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "IWICBitmap_CopyPalette failed hr=%x\n", hr); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray256, FALSE); ok(hr == S_OK, "IWICPalette_InitializePredefined failed hr=%x\n", hr); hr = IWICBitmap_SetPalette(bitmap, palette); - ok(hr == S_OK, "IWICBitmap_SetPalette failed hr=%x\n", hr); + todo_wine ok(hr == S_OK, "IWICBitmap_SetPalette failed hr=%x\n", hr); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray4, FALSE); ok(hr == S_OK, "IWICPalette_InitializePredefined failed hr=%x\n", hr); hr = IWICBitmap_CopyPalette(bitmap, palette); - ok(hr == S_OK, "IWICBitmap_CopyPalette failed hr=%x\n", hr); + todo_wine ok(hr == S_OK, "IWICBitmap_CopyPalette failed hr=%x\n", hr); hr = IWICPalette_GetType(palette, &palettetype); ok(hr == S_OK, "IWICPalette_GetType failed hr=%x\n", hr); - ok(palettetype == WICBitmapPaletteTypeFixedGray256, + todo_wine ok(palettetype == WICBitmapPaletteTypeFixedGray256, "expected WICBitmapPaletteTypeFixedGray256, got %x\n", palettetype); IWICPalette_Release(palette); /* pixel data is initially zeroed */ hr = IWICBitmap_CopyPixels(bitmap, NULL, 9, 27, returned_data); - ok(hr == S_OK, "IWICBitmap_CopyPixels failed hr=%x\n", hr); + todo_wine ok(hr == S_OK, "IWICBitmap_CopyPixels failed hr=%x\n", hr); for (i=0; i<27; i++) ok(returned_data[i] == 0, "returned_data[%i] == %i\n", i, returned_data[i]); +todo_wine { /* Invalid lock rects */ rc.X = rc.Y = 0; rc.Width = 4; @@ -257,6 +258,7 @@ static void test_createbitmap(void) ok(hr == S_OK, "IWICBitmap_GetSize failed hr=%x\n", hr); ok(width == 3, "got %d, expected 3\n", width); ok(height == 3, "got %d, expected 3\n", height); +} IWICBitmap_Release(bitmap); } diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index a3a7548..0bee818 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -44,6 +44,9 @@ extern HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void* extern HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, + REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, + IWICBitmap **ppIBitmap) DECLSPEC_HIDDEN; extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN; extern HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator) DECLSPEC_HIDDEN; extern HRESULT PaletteImpl_Create(IWICPalette **palette) DECLSPEC_HIDDEN;

1 0

Vincent Povirk : windowscodecs: Implement BitmapImpl_SetPalette and CopyPalette.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 3e36f1e4b5d1454fd9e5ae058ec95b34e7dd6496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e36f1e4b5d1454fd9e5ae058… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 14 14:01:11 2012 -0500 windowscodecs: Implement BitmapImpl_SetPalette and CopyPalette. --- dlls/windowscodecs/bitmap.c | 39 +++++++++++++++++++++++++++++++++--- dlls/windowscodecs/tests/bitmap.c | 8 +++--- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index 5014488..1f8d87d 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct BitmapImpl { IWICBitmap IWICBitmap_iface; LONG ref; + IWICPalette *palette; + int palette_set; } BitmapImpl; static inline BitmapImpl *impl_from_IWICBitmap(IWICBitmap *iface) @@ -86,6 +88,7 @@ static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface) if (ref == 0) { + if (This->palette) IWICPalette_Release(This->palette); HeapFree(GetProcessHeap(), 0, This); } @@ -119,9 +122,13 @@ static HRESULT WINAPI BitmapImpl_GetResolution(IWICBitmap *iface, static HRESULT WINAPI BitmapImpl_CopyPalette(IWICBitmap *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p)\n", iface, pIPalette); + BitmapImpl *This = impl_from_IWICBitmap(iface); + TRACE("(%p,%p)\n", iface, pIPalette); - return E_NOTIMPL; + if (!This->palette_set) + return WINCODEC_ERR_PALETTEUNAVAILABLE; + + return IWICPalette_InitializeFromPalette(pIPalette, This->palette); } static HRESULT WINAPI BitmapImpl_CopyPixels(IWICBitmap *iface, @@ -142,9 +149,31 @@ static HRESULT WINAPI BitmapImpl_Lock(IWICBitmap *iface, const WICRect *prcLock, static HRESULT WINAPI BitmapImpl_SetPalette(IWICBitmap *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p)\n", iface, pIPalette); + BitmapImpl *This = impl_from_IWICBitmap(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, pIPalette); + + if (!This->palette) + { + IWICPalette *new_palette; + hr = PaletteImpl_Create(&new_palette); + + if (FAILED(hr)) return hr; + + if (InterlockedCompareExchangePointer((void**)&This->palette, new_palette, NULL)) + { + /* someone beat us to it */ + IWICPalette_Release(new_palette); + } + } + + hr = IWICPalette_InitializeFromPalette(This->palette, pIPalette); + + if (SUCCEEDED(hr)) + This->palette_set = 1; + + return S_OK; } static HRESULT WINAPI BitmapImpl_SetResolution(IWICBitmap *iface, @@ -180,6 +209,8 @@ HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, This->IWICBitmap_iface.lpVtbl = &BitmapImpl_Vtbl; This->ref = 1; + This->palette = NULL; + This->palette_set = 0; *ppIBitmap = &This->IWICBitmap_iface; diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 748a1f9..a5577a1 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -62,23 +62,23 @@ static void test_createbitmap(void) /* Palette is unavailable until explicitly set */ hr = IWICBitmap_CopyPalette(bitmap, palette); - todo_wine ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "IWICBitmap_CopyPalette failed hr=%x\n", hr); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "IWICBitmap_CopyPalette failed hr=%x\n", hr); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray256, FALSE); ok(hr == S_OK, "IWICPalette_InitializePredefined failed hr=%x\n", hr); hr = IWICBitmap_SetPalette(bitmap, palette); - todo_wine ok(hr == S_OK, "IWICBitmap_SetPalette failed hr=%x\n", hr); + ok(hr == S_OK, "IWICBitmap_SetPalette failed hr=%x\n", hr); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray4, FALSE); ok(hr == S_OK, "IWICPalette_InitializePredefined failed hr=%x\n", hr); hr = IWICBitmap_CopyPalette(bitmap, palette); - todo_wine ok(hr == S_OK, "IWICBitmap_CopyPalette failed hr=%x\n", hr); + ok(hr == S_OK, "IWICBitmap_CopyPalette failed hr=%x\n", hr); hr = IWICPalette_GetType(palette, &palettetype); ok(hr == S_OK, "IWICPalette_GetType failed hr=%x\n", hr); - todo_wine ok(palettetype == WICBitmapPaletteTypeFixedGray256, + ok(palettetype == WICBitmapPaletteTypeFixedGray256, "expected WICBitmapPaletteTypeFixedGray256, got %x\n", palettetype); IWICPalette_Release(palette);

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmap::Lock.
by Alexandre Julliard 15 Aug '12

15 Aug '12

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 15 Aug '12

15 Aug '12

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