wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Nikolay Sivov : oleaut32/tests: Fix indentation warning on GCC 6.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 00c591a947919cf67a01c86d2d5da4ee32c46dcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c591a947919cf67a01c86d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 15 09:58:02 2016 +0300 oleaut32/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/safearray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index f57b886..651a0c3 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -708,7 +708,7 @@ static void test_safearray(void) if (!pSafeArrayAllocDescriptorEx) return; - for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) { + for (i = 0; i < sizeof(vttypes)/sizeof(vttypes[0]); i++) { a = NULL; hres = pSafeArrayAllocDescriptorEx(vttypes[i].vt,1,&a); ok(hres == S_OK, "SafeArrayAllocDescriptorEx gave hres 0x%x\n", hres); @@ -762,7 +762,7 @@ static void test_safearray(void) } hres = SafeArrayDestroyDescriptor(a); ok(hres == S_OK,"SADD failed with hres %x\n",hres); - } + } } static void test_SafeArrayAllocDestroyDescriptor(void)

1 0

Nikolay Sivov : comctl32/listview: Fix indentation warnings on GCC 6.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: fa846bdb270dde71adf1d042ba775c8a131c5c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa846bdb270dde71adf1d042b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 15 09:51:47 2016 +0300 comctl32/listview: Fix indentation warnings on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 54 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cc1721b..56e2563 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -588,23 +588,28 @@ static const char* debugscrollinfo(const SCROLLINFO *pScrollInfo) if (pScrollInfo == NULL) return "(null)"; len = snprintf(buf, size, "{cbSize=%u, ", pScrollInfo->cbSize); - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (pScrollInfo->fMask & SIF_RANGE) len = snprintf(buf, size, "nMin=%d, nMax=%d, ", pScrollInfo->nMin, pScrollInfo->nMax); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (pScrollInfo->fMask & SIF_PAGE) len = snprintf(buf, size, "nPage=%u, ", pScrollInfo->nPage); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (pScrollInfo->fMask & SIF_POS) len = snprintf(buf, size, "nPos=%d, ", pScrollInfo->nPos); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (pScrollInfo->fMask & SIF_TRACKPOS) len = snprintf(buf, size, "nTrackPos=%d, ", pScrollInfo->nTrackPos); else len = 0; - if (len == -1) goto end; buf += len; + if (len == -1) goto end; + buf += len; goto undo; end: buf = text + strlen(text); @@ -629,27 +634,33 @@ static const char* debuglvitem_t(const LVITEMW *lpLVItem, BOOL isW) if (lpLVItem == NULL) return "(null)"; len = snprintf(buf, size, "{iItem=%d, iSubItem=%d, ", lpLVItem->iItem, lpLVItem->iSubItem); - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_STATE) len = snprintf(buf, size, "state=%x, stateMask=%x, ", lpLVItem->state, lpLVItem->stateMask); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_TEXT) len = snprintf(buf, size, "pszText=%s, cchTextMax=%d, ", debugtext_tn(lpLVItem->pszText, isW, 80), lpLVItem->cchTextMax); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_IMAGE) len = snprintf(buf, size, "iImage=%d, ", lpLVItem->iImage); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_PARAM) len = snprintf(buf, size, "lParam=%lx, ", lpLVItem->lParam); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpLVItem->mask & LVIF_INDENT) len = snprintf(buf, size, "iIndent=%d, ", lpLVItem->iIndent); else len = 0; - if (len == -1) goto end; buf += len; + if (len == -1) goto end; + buf += len; goto undo; end: buf = text + strlen(text); @@ -665,31 +676,38 @@ static const char* debuglvcolumn_t(const LVCOLUMNW *lpColumn, BOOL isW) if (lpColumn == NULL) return "(null)"; len = snprintf(buf, size, "{"); - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_SUBITEM) len = snprintf(buf, size, "iSubItem=%d, ", lpColumn->iSubItem); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_FMT) len = snprintf(buf, size, "fmt=%x, ", lpColumn->fmt); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_WIDTH) len = snprintf(buf, size, "cx=%d, ", lpColumn->cx); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_TEXT) len = snprintf(buf, size, "pszText=%s, cchTextMax=%d, ", debugtext_tn(lpColumn->pszText, isW, 80), lpColumn->cchTextMax); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_IMAGE) len = snprintf(buf, size, "iImage=%d, ", lpColumn->iImage); else len = 0; - if (len == -1) goto end; buf += len; size -= len; + if (len == -1) goto end; + buf += len; size -= len; if (lpColumn->mask & LVCF_ORDER) len = snprintf(buf, size, "iOrder=%d, ", lpColumn->iOrder); else len = 0; - if (len == -1) goto end; buf += len; + if (len == -1) goto end; + buf += len; goto undo; end: buf = text + strlen(text);

1 0

Daniel Lehman : msvcr120: Add lgamma.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 28a54059683a3a01028f4ecf7d922e4b7c8b04f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a54059683a3a01028f4ecf7… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jun 17 14:49:32 2016 -0700 msvcr120: Add lgamma. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 34 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 56 insertions(+), 12 deletions(-) diff --git a/configure b/configure index bf4d1a7..dccacb4 100755 --- a/configure +++ b/configure @@ -16935,6 +16935,8 @@ for ac_func in \ erff \ exp2 \ exp2f \ + lgamma \ + lgammaf \ llrint \ llrintf \ llround \ diff --git a/configure.ac b/configure.ac index 0fad32f..3a24aab 100644 --- a/configure.ac +++ b/configure.ac @@ -2527,6 +2527,8 @@ AC_CHECK_FUNCS(\ erff \ exp2 \ exp2f \ + lgamma \ + lgammaf \ llrint \ llrintf \ llround \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 05a0ac0..f886b97 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -258,9 +258,9 @@ @ stub ilogbf @ stub ilogbl @ cdecl ldexp(double long) ucrtbase.ldexp -@ stub lgamma -@ stub lgammaf -@ stub lgammal +@ cdecl lgamma(double) ucrtbase.lgamma +@ cdecl lgammaf(float) ucrtbase.lgammaf +@ cdecl lgammal(double) ucrtbase.lgammal @ cdecl -ret64 llrint(double) ucrtbase.llrint @ cdecl -ret64 llrintf(float) ucrtbase.llrintf @ cdecl -ret64 llrintl(double) ucrtbase.llrintl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f65d150..953cdba 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2243,9 +2243,9 @@ @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv -@ stub lgamma -@ stub lgammaf -@ stub lgammal +@ cdecl lgamma(double) MSVCR120_lgamma +@ cdecl lgammaf(float) MSVCR120_lgammaf +@ cdecl lgammal(double) MSVCR120_lgammal @ cdecl -ret64 llabs(int64) MSVCRT_llabs @ stub lldiv @ cdecl -ret64 llrint(double) MSVCR120_llrint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index de68b87..c88cde0 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1906,9 +1906,9 @@ @ cdecl labs(long) msvcr120.labs @ cdecl ldexp(double long) msvcr120.ldexp @ cdecl ldiv(long long) msvcr120.ldiv -@ stub lgamma -@ stub lgammaf -@ stub lgammal +@ cdecl lgamma(double) msvcr120.lgamma +@ cdecl lgammaf(float) msvcr120.lgammaf +@ cdecl lgammal(double) msvcr120.lgammal @ cdecl -ret64 llabs(int64) msvcr120.llabs @ stub lldiv @ cdecl -ret64 llrint(double) msvcr120.llrint diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index cf33f01..e87151a 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2843,3 +2843,37 @@ LDOUBLE CDECL MSVCR120_remainderl(LDOUBLE x, LDOUBLE y) { return MSVCR120_remainder(x, y); } + +/********************************************************************* + * lgamma (MSVCR120.@) + */ +double CDECL MSVCR120_lgamma(double x) +{ +#ifdef HAVE_LGAMMA + return lgamma(x); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * lgammaf (MSVCR120.@) + */ +float CDECL MSVCR120_lgammaf(float x) +{ +#ifdef HAVE_LGAMMAF + return lgammaf(x); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* + * lgammal (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_lgammal(LDOUBLE x) +{ + return MSVCR120_lgamma(x); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index bb18d4f..ed985d2 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2377,9 +2377,9 @@ @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv -@ stub lgamma -@ stub lgammaf -@ stub lgammal +@ cdecl lgamma(double) MSVCR120_lgamma +@ cdecl lgammaf(float) MSVCR120_lgammaf +@ cdecl lgammal(double) MSVCR120_lgammal @ cdecl -ret64 llabs(int64) MSVCRT_llabs @ stub lldiv @ cdecl -ret64 llrint(double) MSVCR120_llrint diff --git a/include/config.h.in b/include/config.h.in index 6acafca..382beb6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -351,6 +351,12 @@ /* Define to 1 if you have the `ldap_parse_vlv_control' function. */ #undef HAVE_LDAP_PARSE_VLV_CONTROL +/* Define to 1 if you have the `lgamma' function. */ +#undef HAVE_LGAMMA + +/* Define to 1 if you have the `lgammaf' function. */ +#undef HAVE_LGAMMAF + /* Define to 1 if you have the `gettextpo' library (-lgettextpo). */ #undef HAVE_LIBGETTEXTPO

1 0

Nikolay Sivov : gdi32: Append "TrueType" suffix to registry key names.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: fcd0f6b0749b6827ee466a620e0198abe8a387f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd0f6b0749b6827ee466a620… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 14 23:52:16 2016 +0300 gdi32: Append "TrueType" suffix to registry key names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d989b67..0e82e5e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3131,20 +3131,21 @@ static void update_reg_entries(void) LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { LIST_FOR_EACH_ENTRY( face, &family->faces, Face, entry ) { char *buffer; + WCHAR *name; + if (!(face->flags & ADDFONT_EXTERNAL_FONT)) continue; - if(face->FullName) - { - len = strlenW(face->FullName) + sizeof(TrueType) / sizeof(WCHAR) + 1; - valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - strcpyW(valueW, face->FullName); - } - else - { - len = strlenW(family->FamilyName) + sizeof(TrueType) / sizeof(WCHAR) + 1; - valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - strcpyW(valueW, family->FamilyName); - } + name = face->FullName ? face->FullName : family->FamilyName; + + len = strlenW(name) + 1; + if (face->scalable) + len += sizeof(TrueType) / sizeof(WCHAR); + + valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + strcpyW(valueW, name); + + if (face->scalable) + strcatW(valueW, TrueType); buffer = strWtoA( CP_UNIXCP, face->file ); path = wine_get_dos_file_name( buffer );

1 0

Nikolay Sivov : gdi32: Simplify font table name tracing.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 492b10ef6c6ce9558517c8540296ebd62523947c URL: http://source.winehq.org/git/wine.git/?a=commit;h=492b10ef6c6ce9558517c8540… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 14 23:52:15 2016 +0300 gdi32: Simplify font table name tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2e3b29a..d989b67 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4709,10 +4709,8 @@ static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len); if (err) { - TRACE("Can't find table %c%c%c%c\n", - /* bytes were reversed */ - HIBYTE(HIWORD(table)), LOBYTE(HIWORD(table)), - HIBYTE(LOWORD(table)), LOBYTE(LOWORD(table))); + table = RtlUlongByteSwap( table ); + TRACE("Can't find table %s\n", debugstr_an((char*)&table, 4)); return GDI_ERROR; } return len; @@ -8281,9 +8279,8 @@ static DWORD freetype_GetFontData( PHYSDEV dev, DWORD table, DWORD offset, LPVOI return dev->funcs->pGetFontData( dev, table, offset, buf, cbData ); } - TRACE("font=%p, table=%c%c%c%c, offset=0x%x, buf=%p, cbData=0x%x\n", - physdev->font, LOBYTE(LOWORD(table)), HIBYTE(LOWORD(table)), - LOBYTE(HIWORD(table)), HIBYTE(HIWORD(table)), offset, buf, cbData); + TRACE("font=%p, table=%s, offset=0x%x, buf=%p, cbData=0x%x\n", + physdev->font, debugstr_an((char*)&table, 4), offset, buf, cbData); return get_font_data( physdev->font, table, offset, buf, cbData ); }

1 0

Bruno Jesus : dinput8/tests: Debug device information during enumeration callback.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: d19ff2d8286fc5f24b716c56c160a19f57142fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19ff2d8286fc5f24b716c56c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 14 15:57:36 2016 -0300 dinput8/tests: Debug device information during enumeration callback. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/dinput.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index 0984767..a6cbd34 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -361,6 +361,22 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo { struct enum_devices_test *enum_test = context; + trace("---- Device Information ----\n" + "Product Name : %s\n" + "Instance Name : %s\n" + "devType : 0x%08x\n" + "GUID Product : %s\n" + "GUID Instance : %s\n" + "HID Page : 0x%04x\n" + "HID Usage : 0x%04x\n", + instance->tszProductName, + instance->tszInstanceName, + instance->dwDevType, + wine_dbgstr_guid(&instance->guidProduct), + wine_dbgstr_guid(&instance->guidInstance), + instance->wUsagePage, + instance->wUsage); + enum_test->device_count++; return enum_test->return_value; }

1 0

Bruno Jesus : dinput: Add support for DIPROP_VIDPID property in Linux js implementation.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 58937117fbd4d9e075d2b5be63cb56038623e49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=58937117fbd4d9e075d2b5be6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 14 15:26:23 2016 -0300 dinput: Add support for DIPROP_VIDPID property in Linux js implementation. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3993592..20e2573 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -645,6 +645,16 @@ static HRESULT WINAPI JoystickLinuxWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface switch (LOWORD(rguid)) { + case (DWORD_PTR) DIPROP_VIDPID: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + + if (!This->joydev->product_id || !This->joydev->vendor_id) + return DIERR_UNSUPPORTED; + pd->dwData = MAKELONG(This->joydev->vendor_id, This->joydev->product_id); + TRACE("DIPROP_VIDPID(%08x)\n", pd->dwData); + break; + } case (DWORD_PTR) DIPROP_JOYSTICKID: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph;

1 0

Bruno Jesus : dinput/tests: Improve controller debug information.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: f1b782bfc8413a2fa1cbbc8955f9975b113d18ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b782bfc8413a2fa1cbbc895… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 14 15:12:54 2016 -0300 dinput/tests: Improve controller debug information. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index b196ea7..4882744 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -203,7 +203,21 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) if (hr!=DI_OK) goto DONE; - trace("---- %s ----\n", lpddi->tszProductName); + trace("---- Controller Information ----\n" + "Product Name : %s\n" + "Instance Name : %s\n" + "devType : 0x%08x\n" + "GUID Product : %s\n" + "GUID Instance : %s\n" + "HID Page : 0x%04x\n" + "HID Usage : 0x%04x\n", + lpddi->tszProductName, + lpddi->tszInstanceName, + lpddi->dwDevType, + wine_dbgstr_guid(&lpddi->guidProduct), + wine_dbgstr_guid(&lpddi->guidInstance), + lpddi->wUsagePage, + lpddi->wUsage); /* Test for joystick ID property */ ZeroMemory(&dipw, sizeof(dipw));

1 0

Bruno Jesus : dinput: Add DirectInput8 device type names to debug.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: e3b783174d144036cb97fbb5c902898185ee78aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b783174d144036cb97fbb5c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 14 13:30:53 2016 -0300 dinput: Add DirectInput8 device type names to debug. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 2ff6fd9..98ab273 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -181,15 +181,26 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW(HINSTANCE hinst, DWORD dwVer return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7W, (LPVOID *)ppDI, punkOuter); } -static const char *_dump_DIDEVTYPE_value(DWORD dwDevType) -{ - switch (dwDevType) { - case 0: return "All devices"; - case DIDEVTYPE_MOUSE: return "DIDEVTYPE_MOUSE"; - case DIDEVTYPE_KEYBOARD: return "DIDEVTYPE_KEYBOARD"; - case DIDEVTYPE_JOYSTICK: return "DIDEVTYPE_JOYSTICK"; - case DIDEVTYPE_DEVICE: return "DIDEVTYPE_DEVICE"; - default: return "Unknown"; +static const char *_dump_DIDEVTYPE_value(DWORD dwDevType, DWORD dwVersion) +{ + if (dwVersion < 0x0800) { + switch (dwDevType) { + case 0: return "All devices"; + case DIDEVTYPE_MOUSE: return "DIDEVTYPE_MOUSE"; + case DIDEVTYPE_KEYBOARD: return "DIDEVTYPE_KEYBOARD"; + case DIDEVTYPE_JOYSTICK: return "DIDEVTYPE_JOYSTICK"; + case DIDEVTYPE_DEVICE: return "DIDEVTYPE_DEVICE"; + default: return "Unknown"; + } + } else { + switch (dwDevType) { + case DI8DEVCLASS_ALL: return "All devices"; + case DI8DEVCLASS_POINTER : return "DI8DEVCLASS_POINTER "; + case DI8DEVCLASS_KEYBOARD: return "DI8DEVCLASS_KEYBOARD"; + case DI8DEVCLASS_DEVICE: return "DI8DEVCLASS_DEVICE"; + case DI8DEVCLASS_GAMECTRL: return "DI8DEVCLASS_GAMECTRL"; + default: return "Unknown"; + } } } @@ -384,8 +395,8 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( unsigned int i; int j, r; - TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n", - This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), + TRACE("(this=%p,0x%04x '%s',%p,%p,0x%04x)\n", + This, dwDevType, _dump_DIDEVTYPE_value(dwDevType, This->dwVersion), lpCallback, pvRef, dwFlags); _dump_EnumDevices_dwFlags(dwFlags); @@ -424,8 +435,8 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( int j; HRESULT r; - TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n", - This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), + TRACE("(this=%p,0x%04x '%s',%p,%p,0x%04x)\n", + This, dwDevType, _dump_DIDEVTYPE_value(dwDevType, This->dwVersion), lpCallback, pvRef, dwFlags); _dump_EnumDevices_dwFlags(dwFlags);

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: e2039d8e1d2d3d217e6c604d0961e8cbd2f07118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2039d8e1d2d3d217e6c604d0… Author: Mingcong Bai <jeffbaichina(a)gmail.com> Date: Sun Aug 14 21:52:13 2016 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 927 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 477 insertions(+), 450 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2039d8e1d2d3d217e6c6…

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
78
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 2016