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

Lucas Zawacki : dinput: Append driver name to dinput joysticks on Linux.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 8bfb12561746b7cc56323348b5d35c4d0f2260d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfb12561746b7cc56323348b… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Fri Aug 24 04:55:06 2012 -0300 dinput: Append driver name to dinput joysticks on Linux. --- dlls/dinput/joystick_linux.c | 7 ++++++- dlls/dinput/joystick_linuxinput.c | 15 ++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5afd07c..9a24157 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -71,6 +71,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); #define JOYDEV_NEW "/dev/input/js" #define JOYDEV_OLD "/dev/js" +#define JOYDEVDRIVER " (js)" struct JoyDev { @@ -150,9 +151,13 @@ static INT find_joystick_devices(void) strcpy(joydev.name, "Wine Joystick"); #if defined(JSIOCGNAME) - if (ioctl(fd, JSIOCGNAME(sizeof(joydev.name)), joydev.name) < 0) + if (ioctl(fd, JSIOCGNAME(sizeof(joydev.name) - sizeof(JOYDEVDRIVER)), joydev.name) < 0) WARN("ioctl(%s,JSIOCGNAME) failed: %s\n", joydev.device, strerror(errno)); #endif + + /* Append driver name */ + strcat(joydev.name, JOYDEVDRIVER); + #ifdef JSIOCGAXES if (ioctl(fd, JSIOCGAXES, &joydev.axis_count) < 0) { diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 3cab015..808ebf4 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -67,7 +67,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); #ifdef HAVE_CORRECT_LINUXINPUT_H -#define EVDEVPREFIX "/dev/input/event" +#define EVDEVPREFIX "/dev/input/event" +#define EVDEVDRIVER " (event)" /* Wine joystick driver object instances */ #define WINE_JOYSTICK_MAX_AXES 8 @@ -241,15 +242,19 @@ static void find_joydevs(void) buf[MAX_PATH - 1] = 0; if (ioctl(fd, EVIOCGNAME(MAX_PATH - 1), buf) != -1 && - (joydev.name = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1))) + (joydev.name = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + strlen(EVDEVDRIVER) + 1))) + { strcpy(joydev.name, buf); + /* Append driver name */ + strcat(joydev.name, EVDEVDRIVER); + } else joydev.name = joydev.device; - joydev.guid = DInput_Wine_Joystick_Base_GUID; - joydev.guid.Data3 += have_joydevs; + joydev.guid = DInput_Wine_Joystick_Base_GUID; + joydev.guid.Data3 += have_joydevs; - TRACE("Found a joystick on %s: %s (%s)\n", + TRACE("Found a joystick on %s: %s (%s)\n", joydev.device, joydev.name, debugstr_guid(&joydev.guid) );

1 0

Lucas Zawacki : dinput: Disable linuxinput or linux joysticks based on registry key.
by Alexandre Julliard 24 Aug '12

24 Aug '12

Module: wine Branch: master Commit: 3da6f1754efa0311e00c63cea1465c2afb62369e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3da6f1754efa0311e00c63cea… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Fri Aug 24 04:55:07 2012 -0300 dinput: Disable linuxinput or linux joysticks based on registry key. --- dlls/dinput/joystick.c | 38 +++++++++++++++++++++++++++++++++++++ dlls/dinput/joystick_linux.c | 2 + dlls/dinput/joystick_linuxinput.c | 2 + dlls/dinput/joystick_private.h | 2 + 4 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index dfcaeb7..0f7ba19 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -49,6 +49,44 @@ static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickGener return &This->base.IDirectInputDevice8W_iface; } +BOOL device_disabled_registry(const char* name) +{ + static const char *disabled_str = "disabled"; + static const char *joystick_key = "Joysticks"; + char buffer[MAX_PATH]; + HKEY hkey, appkey, temp; + BOOL do_disable = FALSE; + + get_app_key(&hkey, &appkey); + + /* Joystick settings are in the 'joysticks' subkey */ + if (appkey) + { + if (RegOpenKeyA(appkey, joystick_key, &temp)) temp = 0; + RegCloseKey(appkey); + appkey = temp; + } + if (hkey) + { + if (RegOpenKeyA(hkey, joystick_key, &temp)) temp = 0; + RegCloseKey(hkey); + hkey = temp; + } + + /* Look for the "controllername"="disabled" key */ + if (!get_config_key(hkey, appkey, name, buffer, sizeof(buffer))) + if (!strncmp(disabled_str, buffer, sizeof(disabled_str))) + { + TRACE("Disabling joystick '%s' based on registry key.\n", name); + do_disable = TRUE; + } + + if (appkey) RegCloseKey(appkey); + if (hkey) RegCloseKey(hkey); + + return do_disable; +} + /****************************************************************************** * SetProperty : change input device properties */ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 9a24157..ed2498b 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -158,6 +158,8 @@ static INT find_joystick_devices(void) /* Append driver name */ strcat(joydev.name, JOYDEVDRIVER); + if (device_disabled_registry(joydev.name)) continue; + #ifdef JSIOCGAXES if (ioctl(fd, JSIOCGAXES, &joydev.axis_count) < 0) { diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 808ebf4..341e169 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -251,6 +251,8 @@ static void find_joydevs(void) else joydev.name = joydev.device; + if (device_disabled_registry(joydev.name)) continue; + joydev.guid = DInput_Wine_Joystick_Base_GUID; joydev.guid.Data3 += have_joydevs; diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 71d91f1..483db66 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -57,6 +57,8 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ DWORD joystick_map_pov(const POINTL *p) DECLSPEC_HIDDEN; +BOOL device_disabled_registry(const char* name) DECLSPEC_HIDDEN; + HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow) DECLSPEC_HIDDEN;

1 0

Jérôme Gardou : opengl32/tests: Do not pass NULL attrib list to wglCreatePBufferARB.
by Alexandre Julliard 23 Aug '12

23 Aug '12

Module: wine Branch: master Commit: dbf1c836323fda85888e1bd0280e2bd29c68b986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf1c836323fda85888e1bd02… Author: Jérôme Gardou <jerome.gardou(a)reactos.org> Date: Wed Aug 22 10:18:14 2012 +0200 opengl32/tests: Do not pass NULL attrib list to wglCreatePBufferARB. --- dlls/opengl32/tests/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8e3d729..4f799d2 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -197,7 +197,8 @@ static void test_pbuffers(HDC hdc) if(iPixelFormat != 0) { HDC pbuffer_hdc; - HPBUFFERARB pbuffer = pwglCreatePbufferARB(hdc, iPixelFormat, 640 /* width */, 480 /* height */, NULL); + int attrib = 0; + HPBUFFERARB pbuffer = pwglCreatePbufferARB(hdc, iPixelFormat, 640 /* width */, 480 /* height */, &attrib); if(!pbuffer) skip("Pbuffer creation failed!\n");

1 0

Alexandre Julliard : configure: Only enable -gdwarf-2 if -g was specified.
by Alexandre Julliard 23 Aug '12

23 Aug '12

Module: wine Branch: master Commit: ce48e2c8ab4537fb57e4416d03f6fdd0685262b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce48e2c8ab4537fb57e4416d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:28:41 2012 +0200 configure: Only enable -gdwarf-2 if -g was specified. --- configure | 11 ++++++++--- configure.ac | 10 ++++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/configure b/configure index d067b54..29b50e8 100755 --- a/configure +++ b/configure @@ -12287,7 +12287,10 @@ $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 + + for ac_flag in $CFLAGS; do + case $ac_flag in + -g) { $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 @@ -12312,7 +12315,7 @@ $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 "$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 @@ -12336,7 +12339,9 @@ fi $as_echo "$ac_cv_cflags__gstrict_dwarf" >&6; } if test $ac_cv_cflags__gstrict_dwarf = yes; then : EXTRACFLAGS="$EXTRACFLAGS -gstrict-dwarf" -fi +fi ;; + esac + done 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 15ada86..a6be56f 100644 --- a/configure.ac +++ b/configure.ac @@ -1748,8 +1748,14 @@ 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 Default to dwarf-2 debug info + for ac_flag in $CFLAGS; do + case $ac_flag in + -g) WINE_TRY_CFLAGS([-gdwarf-2]) + WINE_TRY_CFLAGS([-gstrict-dwarf]) ;; + esac + done dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections case $host_cpu in

1 0

Alexandre Julliard : opengl32: Generate null driver entry points for all extension functions.
by Alexandre Julliard 23 Aug '12

23 Aug '12

Module: wine Branch: master Commit: 2c54f8c12c8321b68999e2d8b3fb08cd7bc15610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c54f8c12c8321b68999e2d8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 21:23:09 2012 +0200 opengl32: Generate null driver entry points for all extension functions. --- dlls/opengl32/make_opengl | 13 +- dlls/opengl32/opengl_norm.c | 4513 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 4518 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c54f8c12c8321b68999e…

1 0

Dmitry Timoshkov : gdiplus: Clarify in the tests where 1/ 3 of extra text height comes from.
by Alexandre Julliard 23 Aug '12

23 Aug '12

Module: wine Branch: master Commit: e6c77a7c7a98e819d81aa91b30a0e66a068653cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c77a7c7a98e819d81aa91b3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 23 15:27:35 2012 +0900 gdiplus: Clarify in the tests where 1/3 of extra text height comes from. --- dlls/gdiplus/tests/graphics.c | 39 ++++++++++----------------------------- 1 files changed, 10 insertions(+), 29 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 6765bce..913d895 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3483,24 +3483,15 @@ static void test_GdipMeasureString(void) REAL base_cx = 0, base_cy = 0, height; INT chars, lines; LOGFONTW lf; - HDC display; - UINT i, font_dpi; - REAL font_to_pixel_scale, font_size; + UINT i; + REAL font_size; GpUnit font_unit, unit; - display = CreateCompatibleDC(0); - ok(display != 0, "CreateCompatibleDC failed\n"); - font_dpi = GetDeviceCaps(display, LOGPIXELSY); - DeleteDC(display); - status = GdipCreateStringFormat(0, LANG_NEUTRAL, &format); expect(Ok, status); status = GdipCreateFontFamilyFromName(tahomaW, NULL, &family); expect(Ok, status); - font_to_pixel_scale = units_scale(UnitPoint, UnitPixel, font_dpi); - trace("font to pixel, %u dpi => unit_scale %f\n", font_dpi, font_to_pixel_scale); - /* font size in pixels */ status = GdipCreateFont(family, 100.0, FontStyleRegular, UnitPixel, &font); expect(Ok, status); @@ -3524,7 +3515,7 @@ static void test_GdipMeasureString(void) ok(-lf.lfHeight == (LONG)(height + 0.5), "%u: expected %d (%f), got %d\n", i, (LONG)(height + 0.5), height, lf.lfHeight); - height = font_size * font_to_pixel_scale; + height = font_size + 2.0 * font_size / 6.0; set_rect_empty(&rc); set_rect_empty(&bounds); @@ -3571,7 +3562,8 @@ static void test_GdipMeasureString(void) for (unit = 3; unit <= 6; unit++) { /* create a font which final height is 100.0 pixels with 200 dpi device */ - height = pixels_to_units(100.0 / font_to_pixel_scale, unit, 200.0); + /* height + 2 * (height/6) = 100 => height = 100 * 3 / 4 => 75 */ + height = pixels_to_units(75.0, unit, 200.0); status = GdipCreateFont(family, height, FontStyleRegular, unit, &font); expect(Ok, status); status = GdipGetFontSize(font, &font_size); @@ -3603,7 +3595,7 @@ static void test_GdipMeasureString(void) else unit_scale = units_scale(font_unit, td[i].unit, td[i].res_y); /*trace("%u: %d to %d, %.1f dpi => unit_scale %f\n", i, font_unit, td[i].unit, td[i].res_y, unit_scale);*/ - height = font_size * font_to_pixel_scale * unit_scale; + height = (font_size + 2.0 * font_size / 6.0) * unit_scale; if (td[i].unit != UnitDisplay) height /= td[i].page_scale; /*trace("%u: %.1f font units = %f units with %.1f dpi, page_scale %.1f\n", i, font_size, height, td[i].res_y, td[i].page_scale);*/ @@ -3758,23 +3750,12 @@ static void test_font_height_scaling(void) differs in behaviour */ for (font_unit = 3; font_unit <= 6; font_unit++) { - /* There is a bug somewhere in native gdiplus that leads - * to extra conversion from points to pixels, so in order - * to get a 100 pixel text height it's needed to convert - * 100 pixels to points, and only then convert the result - * to desired units. The scale factor is 1.333333 at 96 dpi! - * Perhaps an implementor took name of GdipTransformPoints - * directly and assumed that it takes value in *points*? - */ - status = GdipSetPageUnit(graphics, UnitPoint); - expect(Ok, status); - ptf.X = 0; - ptf.Y = 100.0; - status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &ptf, 1); - expect(Ok, status); - /*trace("100.0 pixels, %.1f dpi => %f points\n", dpi, ptf.Y);*/ + /* create a font for the final text height of 100 pixels */ + /* height + 2 * (height/6) = 100 => height = 100 * 3 / 4 => 75 */ status = GdipSetPageUnit(graphics, font_unit); expect(Ok, status); + ptf.X = 0; + ptf.Y = 75.0; status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &ptf, 1); expect(Ok, status); height = ptf.Y;

1 0

Dmitry Timoshkov : gdiplus: Filter tabs out until they are properly supported using stringformat.
by Alexandre Julliard 23 Aug '12

23 Aug '12

Module: wine Branch: master Commit: 144a692ffa4fb73eb3e526c832f598cf373bc362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=144a692ffa4fb73eb3e526c83… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 23 10:24:22 2012 +0900 gdiplus: Filter tabs out until they are properly supported using stringformat. --- dlls/gdiplus/graphics.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 9a9f092..5e76927 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4755,6 +4755,10 @@ GpStatus gdip_format_string(HDC hdc, if(!isprintW(string[i]) && (string[i] != '\n')) continue; + /* FIXME: tabs should be handled using tabstops from stringformat */ + if (string[i] == '\t') + continue; + if (seen_prefix && hkprefix == HotkeyPrefixShow && string[i] != '&') hotkeyprefix_offsets[hotkeyprefix_count++] = j; else if (!seen_prefix && hkprefix != HotkeyPrefixNone && string[i] == '&')

1 0

Francois Gouget : po: A spelling fix in the French translation.
by Alexandre Julliard 22 Aug '12

22 Aug '12

Module: wine Branch: master Commit: 58d2d0898cd48f1145c0ea2305a28711f283c176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d2d0898cd48f1145c0ea230… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 22 09:12:52 2012 +0200 po: A spelling fix in the French translation. --- po/fr.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/fr.po b/po/fr.po index dbbb10a..934139e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13826,7 +13826,7 @@ msgstr "Erreur : ligne de commande invalide\n" #: wmic.rc:26 msgid "Error: Alias not found\n" -msgstr "Erreur : alias no trouvé\n" +msgstr "Erreur : alias non trouvé\n" #: wmic.rc:27 msgid "Error: Invalid query\n"

1 0

Piotr Caban : user32: Don' t limit time needed for WM_DDE_INITIATE processing.
by Alexandre Julliard 22 Aug '12

22 Aug '12

Module: wine Branch: master Commit: d2e846f3d4c77f8e2cf4c1becf57ce9a0747641f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e846f3d4c77f8e2cf4c1bec… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 22 10:12:19 2012 +0200 user32: Don't limit time needed for WM_DDE_INITIATE processing. --- dlls/user32/dde_client.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 90fa4db..91e1549 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -175,7 +175,7 @@ HCONV WINAPI DdeConnect(DWORD idInst, HSZ hszService, HSZ hszTopic, /* note: sent messages shall not use packing */ SendMessageTimeoutW( HWND_BROADCAST, WM_DDE_INITIATE, (WPARAM)hwndClient, MAKELPARAM(aSrv, aTpc), - SMTO_ABORTIFHUNG, 2000, NULL ); + SMTO_ABORTIFHUNG, 0, NULL ); pInstance = WDML_GetInstance(idInst); if (!pInstance)

1 0

Alexandre Julliard : kernel32/tests: "en" is not a valid locale on some platforms.
by Alexandre Julliard 22 Aug '12

22 Aug '12

Module: wine Branch: master Commit: 57bb58f7f5c15c45327f8194a0f7aaa40a9080c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57bb58f7f5c15c45327f8194a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 22 12:03:34 2012 +0200 kernel32/tests: "en" is not a valid locale on some platforms. --- dlls/kernel32/tests/locale.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c264ca3..199451b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3444,7 +3444,6 @@ todo_wine static void test_IsValidLocaleName(void) { - static const WCHAR enW[] = {'e','n',0}; static const WCHAR enusW[] = {'e','n','-','U','S',0}; static const WCHAR zzW[] = {'z','z',0}; static const WCHAR zzzzW[] = {'z','z','-','Z','Z',0}; @@ -3456,8 +3455,6 @@ static void test_IsValidLocaleName(void) return; } - ret = pIsValidLocaleName(enW); - ok(ret, "IsValidLocaleName failed\n"); ret = pIsValidLocaleName(enusW); ok(ret, "IsValidLocaleName failed\n"); ret = pIsValidLocaleName(zzW);

1 0