October 2016 - Wine-commits

Roman Pisl : winex11: Send WM_CONTEXTMENU on WM_RBUTTONUP and NIN_SELECT on WM_LBUTTONUP.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: fb70cdb41910cae2bea946702d2dce92f9645963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb70cdb41910cae2bea946702… Author: Roman Pisl <rpisl(a)seznam.cz> Date: Mon Oct 10 16:35:41 2016 +0200 winex11: Send WM_CONTEXTMENU on WM_RBUTTONUP and NIN_SELECT on WM_LBUTTONUP. Signed-off-by: Roman Pisl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/systray.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 794f2c6..fab10c6 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -509,6 +509,25 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR ret = PostMessageW(icon->owner, icon->callback_message, wpar, oldver ? msg : MAKELPARAM(msg, icon->id)); + if (ret && icon->version > 0) { + switch (msg) { + case WM_RBUTTONUP: + /* notify the owner hwnd of the message */ + TRACE("relaying 0x%x\n", WM_CONTEXTMENU); + ret = PostMessageW(icon->owner, icon->callback_message, wpar, + oldver ? WM_CONTEXTMENU : MAKELPARAM(WM_CONTEXTMENU, icon->id)); + break; + case WM_LBUTTONUP: + /* notify the owner hwnd of the message */ + TRACE("relaying 0x%x\n", NIN_SELECT); + ret = PostMessageW(icon->owner, icon->callback_message, wpar, + oldver ? NIN_SELECT : MAKELPARAM(NIN_SELECT, icon->id)); + break; + default: + break; + } + } + if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WARN( "application window was destroyed, removing icon %u\n", icon->id );

1 0

Roman Pisl : explorer: Send WM_CONTEXTMENU on WM_RBUTTONUP and NIN_SELECT on WM_LBUTTONUP.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: df8ec3a37125159dbceb1a092d2a109d7aa77727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df8ec3a37125159dbceb1a092… Author: Roman Pisl <rpisl(a)seznam.cz> Date: Mon Oct 10 16:35:42 2016 +0200 explorer: Send WM_CONTEXTMENU on WM_RBUTTONUP and NIN_SELECT on WM_LBUTTONUP. Signed-off-by: Roman Pisl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index a08685b..f4801b7 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -830,6 +830,25 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l ret = PostMessageW(icon->owner, icon->callback_message, wpar, oldver ? msg : MAKELPARAM(msg, icon->id)); + if (ret && icon->version > 0) { + switch (msg) { + case WM_RBUTTONUP: + /* notify the owner hwnd of the message */ + WINE_TRACE("relaying 0x%x\n", WM_CONTEXTMENU); + ret = PostMessageW(icon->owner, icon->callback_message, wpar, + oldver ? WM_CONTEXTMENU : MAKELPARAM(WM_CONTEXTMENU, icon->id)); + break; + case WM_LBUTTONUP: + /* notify the owner hwnd of the message */ + WINE_TRACE("relaying 0x%x\n", NIN_SELECT); + ret = PostMessageW(icon->owner, icon->callback_message, wpar, + oldver ? NIN_SELECT : MAKELPARAM(NIN_SELECT, icon->id)); + break; + default: + break; + } + } + if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WINE_WARN("application window was destroyed without removing "

1 0

Alexandre Julliard : winex11: Add a helper function to send systray notifications.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 2e3aa622641238bf5a416ad350779c33a7be4ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3aa622641238bf5a416ad35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 12 10:57:34 2016 +0200 winex11: Add a helper function to send systray notifications. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/systray.c | 86 +++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 51 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index fab10c6..815e554 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -436,11 +436,35 @@ done: if (dib) DeleteObject( dib ); } +static BOOL notify_owner( struct tray_icon *icon, UINT msg, LPARAM lparam ) +{ + WPARAM wp = icon->id; + LPARAM lp = msg; + + if (icon->version >= NOTIFY_VERSION_4) + { + POINT pt = { (short)LOWORD(lparam), (short)HIWORD(lparam) }; + + ClientToScreen( icon->window, &pt ); + wp = MAKEWPARAM( pt.x, pt.y ); + lp = MAKELPARAM( msg, icon->id ); + } + + TRACE( "relaying 0x%x\n", msg ); + if (!PostMessageW( icon->owner, icon->callback_message, wp, lp ) && + (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) + { + WARN( "application window was destroyed, removing icon %u\n", icon->id ); + delete_icon( icon ); + return FALSE; + } + return TRUE; +} + /* window procedure for the individual tray icon window */ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { struct tray_icon *icon = NULL; - BOOL ret; TRACE("hwnd=%p, msg=0x%x\n", hwnd, msg); @@ -477,64 +501,24 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR case WM_MOUSEMOVE: case WM_LBUTTONDOWN: - case WM_LBUTTONUP: case WM_RBUTTONDOWN: - case WM_RBUTTONUP: case WM_MBUTTONDOWN: case WM_MBUTTONUP: case WM_LBUTTONDBLCLK: case WM_RBUTTONDBLCLK: case WM_MBUTTONDBLCLK: - { - WPARAM wpar; - BOOL oldver; - - oldver = icon->version <= NOTIFY_VERSION; - if (oldver) { - /* 0 up to NOTIFYICON_VERSION (=3) */ - wpar = icon->id; - } else { - /* NOTIFYICON_VERSION_4 */ - RECT rect; - WORD x, y; - - GetWindowRect( icon->window, &rect ); - x = rect.left + LOWORD(lparam); - y = rect.top + HIWORD(lparam); - wpar = MAKEWPARAM(x, y); - } + notify_owner( icon, msg, lparam ); + break; - /* notify the owner hwnd of the message */ - TRACE("relaying 0x%x\n", msg); - ret = PostMessageW(icon->owner, icon->callback_message, wpar, - oldver ? msg : MAKELPARAM(msg, icon->id)); - - if (ret && icon->version > 0) { - switch (msg) { - case WM_RBUTTONUP: - /* notify the owner hwnd of the message */ - TRACE("relaying 0x%x\n", WM_CONTEXTMENU); - ret = PostMessageW(icon->owner, icon->callback_message, wpar, - oldver ? WM_CONTEXTMENU : MAKELPARAM(WM_CONTEXTMENU, icon->id)); - break; - case WM_LBUTTONUP: - /* notify the owner hwnd of the message */ - TRACE("relaying 0x%x\n", NIN_SELECT); - ret = PostMessageW(icon->owner, icon->callback_message, wpar, - oldver ? NIN_SELECT : MAKELPARAM(NIN_SELECT, icon->id)); - break; - default: - break; - } - } + case WM_LBUTTONUP: + if (!notify_owner( icon, msg, lparam )) break; + if (icon->version > 0) notify_owner( icon, NIN_SELECT, lparam ); + break; - if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) - { - WARN( "application window was destroyed, removing icon %u\n", icon->id ); - delete_icon( icon ); - } - return 0; - } + case WM_RBUTTONUP: + if (!notify_owner( icon, msg, lparam )) break; + if (icon->version > 0) notify_owner( icon, WM_CONTEXTMENU, lparam ); + break; case WM_WINDOWPOSCHANGED: update_systray_balloon_position();

1 0

Alexandre Julliard : explorer: Add a helper function to send systray notifications.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: b147bd63e39c73ffd5711c2c3209726271a6345f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b147bd63e39c73ffd5711c2c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 12 10:57:45 2016 +0200 explorer: Add a helper function to send systray notifications. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 84 +++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 48 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index f4801b7..b3c192a 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -716,6 +716,29 @@ static void do_hide_systray(void) 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); } +static BOOL notify_owner( struct icon *icon, UINT msg, POINT pt ) +{ + WPARAM wp = icon->id; + LPARAM lp = msg; + + if (icon->version >= NOTIFY_VERSION_4) + { + ClientToScreen( tray_window, &pt ); + wp = MAKEWPARAM( pt.x, pt.y ); + lp = MAKELPARAM( msg, icon->id ); + } + + TRACE( "relaying 0x%x\n", msg ); + if (!PostMessageW( icon->owner, icon->callback_message, wp, lp ) && + (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) + { + WARN( "application window was destroyed, removing icon %u\n", icon->id ); + delete_icon( icon ); + return FALSE; + } + return TRUE; +} + static void do_show_systray(void) { SIZE size; @@ -795,65 +818,30 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_RBUTTONDBLCLK: case WM_MBUTTONDBLCLK: { - WPARAM wpar; - BOOL oldver; - BOOL ret; MSG message; - struct icon *icon = icon_from_point( (short)LOWORD(lparam), (short)HIWORD(lparam) ); + POINT pt = { (short)LOWORD(lparam), (short)HIWORD(lparam) }; + struct icon *icon = icon_from_point( pt.x, pt.y ); if (!icon) break; - /* notify the owner hwnd of the message */ - WINE_TRACE("relaying 0x%x\n", msg); - message.hwnd = hwnd; message.message = msg; message.wParam = wparam; message.lParam = lparam; SendMessageW( icon->tooltip, TTM_RELAYEVENT, 0, (LPARAM)&message ); - oldver = icon->version <= NOTIFY_VERSION; - if (oldver) { - /* 0 up to NOTIFYICON_VERSION (=3) */ - wpar = icon->id; - } else { - /* NOTIFYICON_VERSION_4 */ - RECT rect; - WORD x, y; - - rect = get_icon_rect( icon ); - MapWindowPoints( tray_window, 0, (POINT *)&rect, 2 ); - x = rect.left + LOWORD(lparam); - y = rect.top + HIWORD(lparam); - wpar = MAKEWPARAM(x, y); - } - - ret = PostMessageW(icon->owner, icon->callback_message, wpar, - oldver ? msg : MAKELPARAM(msg, icon->id)); - - if (ret && icon->version > 0) { - switch (msg) { - case WM_RBUTTONUP: - /* notify the owner hwnd of the message */ - WINE_TRACE("relaying 0x%x\n", WM_CONTEXTMENU); - ret = PostMessageW(icon->owner, icon->callback_message, wpar, - oldver ? WM_CONTEXTMENU : MAKELPARAM(WM_CONTEXTMENU, icon->id)); - break; - case WM_LBUTTONUP: - /* notify the owner hwnd of the message */ - WINE_TRACE("relaying 0x%x\n", NIN_SELECT); - ret = PostMessageW(icon->owner, icon->callback_message, wpar, - oldver ? NIN_SELECT : MAKELPARAM(NIN_SELECT, icon->id)); - break; - default: - break; - } - } + if (!notify_owner( icon, msg, pt )) break; - if (!ret && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) + if (icon->version > 0) { - WINE_WARN("application window was destroyed without removing " - "notification icon, removing automatically\n"); - delete_icon( icon ); + switch (msg) + { + case WM_RBUTTONUP: + notify_owner( icon, WM_CONTEXTMENU, pt ); + break; + case WM_LBUTTONUP: + notify_owner( icon, NIN_SELECT, pt ); + break; + } } break; }

1 0

Hans Leidekker : include: Avoid redefinition of EVENT_FILTER_DESCRIPTOR.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: c185757993095382cc7580ac78d27f08c523e9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c185757993095382cc7580ac7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 12 11:53:41 2016 +0200 include: Avoid redefinition of EVENT_FILTER_DESCRIPTOR. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/evntrace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/evntrace.h b/include/evntrace.h index 6ebcfba..b54cd11 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -248,7 +248,7 @@ typedef struct _EVENT_TRACE_PROPERTIES ULONG LoggerNameOffset; } EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES; -typedef struct _EVENT_FILTER_DESCRIPTOR EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR; +typedef struct _EVENT_FILTER_DESCRIPTOR *PEVENT_FILTER_DESCRIPTOR; typedef struct _ENABLE_TRACE_PARAMETERS {

1 0

Huw Davies : riched20: Add any paragraph numbering fonts to the font table.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 074fafab6577963cd74ed97f2c846d4d6a0c88ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=074fafab6577963cd74ed97f2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 12 12:58:49 2016 +0100 riched20: Add any paragraph numbering fonts to the font table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index fe8c797..c3359c1 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -274,6 +274,10 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, if (item->member.run.para != prev_para) { + /* check for any para numbering text */ + if (item->member.run.para->fmt.wNumbering) + add_font_to_fonttbl( pStream, item->member.run.para->para_num.style ); + if ((pCell = item->member.para.pCell)) { ME_Border* borders[4] = { &pCell->member.cell.border.top,

1 0

Huw Davies : riched20: Add a helper to find a font in the font table.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 48c0c6648bc1657da3ac2b565b1efa313275bb60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c0c6648bc1657da3ac2b565… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 12 12:58:50 2016 +0100 riched20: Add a helper to find a font in the font table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index c3359c1..838168e 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -237,6 +237,31 @@ static void add_font_to_fonttbl( ME_OutStream *stream, ME_Style *style ) } } +static BOOL find_font_in_fonttbl( ME_OutStream *stream, CHARFORMAT2W *fmt, unsigned int *idx ) +{ + WCHAR *facename; + int i; + + *idx = 0; + if (fmt->dwMask & CFM_FACE) + facename = fmt->szFaceName; + else + facename = stream->fonttbl[0].szFaceName; + for (i = 0; i < stream->nFontTblLen; i++) + { + if (facename == stream->fonttbl[i].szFaceName + || !lstrcmpW(facename, stream->fonttbl[i].szFaceName)) + if (!(fmt->dwMask & CFM_CHARSET) + || fmt->bCharSet == stream->fonttbl[i].bCharSet) + { + *idx = i; + break; + } + } + + return i < stream->nFontTblLen; +} + static void add_color_to_colortbl( ME_OutStream *stream, COLORREF color ) { int i; @@ -713,21 +738,9 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) } /* FIXME: How to emit CFM_WEIGHT? */ - if (fmt->dwMask & CFM_FACE || fmt->dwMask & CFM_CHARSET) { - WCHAR *szFaceName; - - if (fmt->dwMask & CFM_FACE) - szFaceName = fmt->szFaceName; - else - szFaceName = pStream->fonttbl[0].szFaceName; - for (i = 0; i < pStream->nFontTblLen; i++) { - if (szFaceName == pStream->fonttbl[i].szFaceName - || !lstrcmpW(szFaceName, pStream->fonttbl[i].szFaceName)) - if (!(fmt->dwMask & CFM_CHARSET) - || fmt->bCharSet == pStream->fonttbl[i].bCharSet) - break; - } - if (i < pStream->nFontTblLen) + if (fmt->dwMask & CFM_FACE || fmt->dwMask & CFM_CHARSET) + { + if (find_font_in_fonttbl( pStream, fmt, &i )) { if (i != pStream->nDefaultFont) sprintf(props + strlen(props), "\\f%u", i);

1 0

Huw Davies : riched20: Add a helper to find a colour in the colour table.
by Alexandre Julliard 12 Oct '16

12 Oct '16

Module: wine Branch: master Commit: 3e9a31ed26c1dd82b5f2a25873ff94f023b1baea URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9a31ed26c1dd82b5f2a2587… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 12 12:58:51 2016 +0100 riched20: Add a helper to find a colour in the colour table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 62 ++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 838168e..e7d340a 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -277,6 +277,23 @@ static void add_color_to_colortbl( ME_OutStream *stream, COLORREF color ) } } +static BOOL find_color_in_colortbl( ME_OutStream *stream, COLORREF color, unsigned int *idx ) +{ + int i; + + *idx = 0; + for (i = 1; i < stream->nColorTblLen; i++) + { + if (stream->colortbl[i] == color) + { + *idx = i; + break; + } + } + + return i < stream->nFontTblLen; +} + static BOOL ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, ME_DisplayItem *pLastRun) @@ -391,17 +408,13 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, { if (borders[i]->width) { - unsigned int j; + unsigned int idx; COLORREF crColor = borders[i]->colorRef; sprintf(props + strlen(props), "\\clbrdr%c", sideChar[i]); sprintf(props + strlen(props), "\\brdrs"); sprintf(props + strlen(props), "\\brdrw%d", borders[i]->width); - for (j = 1; j < pStream->nColorTblLen; j++) { - if (pStream->colortbl[j] == crColor) { - sprintf(props + strlen(props), "\\brdrcf%u", j); - break; - } - } + if (find_color_in_colortbl( pStream, crColor, &idx )) + sprintf(props + strlen(props), "\\brdrcf%u", idx); } } sprintf(props + strlen(props), "\\cellx%d", cell->member.cell.nRightBoundary); @@ -423,17 +436,13 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, { if (borders[i]->width) { - unsigned int j; + unsigned int idx; COLORREF crColor = borders[i]->colorRef; sprintf(props + strlen(props), "\\trbrdr%c", sideChar[i]); sprintf(props + strlen(props), "\\brdrs"); sprintf(props + strlen(props), "\\brdrw%d", borders[i]->width); - for (j = 1; j < pStream->nColorTblLen; j++) { - if (pStream->colortbl[j] == crColor) { - sprintf(props + strlen(props), "\\brdrcf%u", j); - break; - } - } + if (find_color_in_colortbl( pStream, crColor, &idx )) + sprintf(props + strlen(props), "\\brdrcf%u", idx); } } for (i = 0; i < pFmt->cTabCount; i++) @@ -642,26 +651,15 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) strcat(props, "\\caps"); if (fmt->dwMask & CFM_ANIMATION) sprintf(props + strlen(props), "\\animtext%u", fmt->bAnimation); - if (fmt->dwMask & CFM_BACKCOLOR) { - if (!(fmt->dwEffects & CFE_AUTOBACKCOLOR)) { - for (i = 1; i < pStream->nColorTblLen; i++) - if (pStream->colortbl[i] == fmt->crBackColor) { - sprintf(props + strlen(props), "\\cb%u", i); - break; - } - } - } + if ((fmt->dwMask & CFM_BACKCOLOR) && !(fmt->dwEffects & CFE_AUTOBACKCOLOR)) + if (find_color_in_colortbl( pStream, fmt->crBackColor, &i )) + sprintf(props + strlen(props), "\\cb%u", i); if (fmt->dwMask & CFM_BOLD && fmt->dwEffects & CFE_BOLD) strcat(props, "\\b"); - if (fmt->dwMask & CFM_COLOR) { - if (!(fmt->dwEffects & CFE_AUTOCOLOR)) { - for (i = 1; i < pStream->nColorTblLen; i++) - if (pStream->colortbl[i] == fmt->crTextColor) { - sprintf(props + strlen(props), "\\cf%u", i); - break; - } - } - } + if ((fmt->dwMask & CFM_COLOR) && !(fmt->dwEffects & CFE_AUTOCOLOR)) + if (find_color_in_colortbl( pStream, fmt->crTextColor, &i )) + sprintf(props + strlen(props), "\\cf%u", i); + /* TODO: CFM_DISABLED */ if (fmt->dwMask & CFM_EMBOSS && fmt->dwEffects & CFE_EMBOSS) strcat(props, "\\embo");

1 0

Aric Stewart : winebus.sys: Implement IOCTL_HID_GET_DEVICE_DESCRIPTOR for hidraw.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: eac738b95f8b26b9e5f59e0e51d33ecb5eb91594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac738b95f8b26b9e5f59e0e5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 11 14:09:35 2016 +0200 winebus.sys: Implement IOCTL_HID_GET_DEVICE_DESCRIPTOR for hidraw. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_udev.c | 53 ++++++++++++++++++++++++++++++++++++++++++--- dlls/winebus.sys/main.c | 46 ++++++++++++++++++++++++++++++++++----- include/config.h.in | 3 +++ 6 files changed, 96 insertions(+), 9 deletions(-) diff --git a/configure b/configure index e3181e0..bd0a1b9 100755 --- a/configure +++ b/configure @@ -6805,6 +6805,7 @@ for ac_header in \ linux/compiler.h \ linux/filter.h \ linux/hdreg.h \ + linux/hidraw.h \ linux/input.h \ linux/ioctl.h \ linux/joystick.h \ diff --git a/configure.ac b/configure.ac index 741a4ef..eb328a0 100644 --- a/configure.ac +++ b/configure.ac @@ -426,6 +426,7 @@ AC_CHECK_HEADERS(\ linux/compiler.h \ linux/filter.h \ linux/hdreg.h \ + linux/hidraw.h \ linux/input.h \ linux/ioctl.h \ linux/joystick.h \ diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 342a66b..9ab242c 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -23,6 +23,7 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry typedef struct { int (*compare_platform_device)(DEVICE_OBJECT *device, void *platform_dev); + NTSTATUS (*get_reportdescriptor)(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length); } platform_vtbl; void *get_platform_private(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index a01d88e..22ea07d 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -35,6 +35,12 @@ #ifdef HAVE_LIBUDEV_H # include <libudev.h> #endif +#ifdef HAVE_LINUX_HIDRAW_H +# include <linux/hidraw.h> +#endif +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif #define NONAMELESSUNION @@ -64,6 +70,7 @@ DEFINE_GUID(GUID_DEVCLASS_HIDRAW, 0x3def44ad,0x242e,0x46e5,0x82,0x6d,0x70,0x72,0 struct platform_private { struct udev_device *udev_device; + int device_fd; }; static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *device) @@ -105,9 +112,42 @@ static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) return strcmp(udev_device_get_syspath(dev1), udev_device_get_syspath(dev2)); } +static NTSTATUS hidraw_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) +{ +#ifdef HAVE_LINUX_HIDRAW_H + struct hidraw_report_descriptor descriptor; + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + + if (ioctl(private->device_fd, HIDIOCGRDESCSIZE, &descriptor.size) == -1) + { + WARN("ioctl(HIDIOCGRDESCSIZE) failed: %d %s\n", errno, strerror(errno)); + return STATUS_UNSUCCESSFUL; + } + + *out_length = descriptor.size; + + if (length < descriptor.size) + return STATUS_BUFFER_TOO_SMALL; + if (!descriptor.size) + return STATUS_SUCCESS; + + if (ioctl(private->device_fd, HIDIOCGRDESC, &descriptor) == -1) + { + WARN("ioctl(HIDIOCGRDESC) failed: %d %s\n", errno, strerror(errno)); + return STATUS_UNSUCCESSFUL; + } + + memcpy(buffer, descriptor.value, descriptor.size); + return STATUS_SUCCESS; +#else + return STATUS_NOT_IMPLEMENTED; +#endif +} + static const platform_vtbl hidraw_vtbl = { compare_platform_device, + hidraw_get_reportdescriptor, }; static void try_add_device(struct udev_device *dev) @@ -128,7 +168,6 @@ static void try_add_device(struct udev_device *dev) WARN("Unable to open udev device %s: %s\n", debugstr_a(devnode), strerror(errno)); return; } - close(fd); usbdev = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_device"); if (usbdev) @@ -151,11 +190,16 @@ static void try_add_device(struct udev_device *dev) if (device) { - impl_from_DEVICE_OBJECT(device)->udev_device = udev_device_ref(dev); + struct platform_private *private = impl_from_DEVICE_OBJECT(device); + private->udev_device = udev_device_ref(dev); + private->device_fd = fd; IoInvalidateDeviceRelations(device, BusRelations); } else + { WARN("Ignoring device %s with subsystem %s\n", debugstr_a(devnode), subsystem); + close(fd); + } HeapFree(GetProcessHeap(), 0, serial); } @@ -163,9 +207,12 @@ static void try_add_device(struct udev_device *dev) static void try_remove_device(struct udev_device *dev) { DEVICE_OBJECT *device = bus_find_hid_device(&hidraw_vtbl, dev); + struct platform_private *private; if (!device) return; - dev = impl_from_DEVICE_OBJECT(device)->udev_device; + private = impl_from_DEVICE_OBJECT(device); + dev = private->udev_device; + close(private->device_fd); bus_remove_hid_device(device); udev_device_unref(dev); } diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index eaa0b93..bf7071d 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -352,7 +352,7 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { NTSTATUS status = irp->IoStatus.u.Status; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); - struct device_extension *extension = (struct device_extension *)device->DeviceExtension; + struct device_extension *ext = (struct device_extension *)device->DeviceExtension; TRACE("(%p, %p)\n", device, irp); @@ -370,12 +370,46 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) } memset(attr, 0, sizeof(*attr)); - attr->Size = sizeof(HID_DEVICE_ATTRIBUTES); - attr->VendorID = extension->vid; - attr->ProductID = extension->pid; - attr->VersionNumber = extension->version; + attr->Size = sizeof(*attr); + attr->VendorID = ext->vid; + attr->ProductID = ext->pid; + attr->VersionNumber = ext->version; + + irp->IoStatus.u.Status = status = STATUS_SUCCESS; + irp->IoStatus.Information = sizeof(*attr); + break; + } + case IOCTL_HID_GET_DEVICE_DESCRIPTOR: + { + HID_DESCRIPTOR *descriptor = (HID_DESCRIPTOR *)irp->UserBuffer; + DWORD length; + TRACE("IOCTL_HID_GET_DEVICE_DESCRIPTOR\n"); + + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(*descriptor)) + { + irp->IoStatus.u.Status = status = STATUS_BUFFER_TOO_SMALL; + break; + } + + status = ext->vtbl->get_reportdescriptor(device, NULL, 0, &length); + if (status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL) + { + WARN("Failed to get platform report descriptor length\n"); + irp->IoStatus.u.Status = status; + break; + } + + memset(descriptor, 0, sizeof(*descriptor)); + descriptor->bLength = sizeof(*descriptor); + descriptor->bDescriptorType = HID_HID_DESCRIPTOR_TYPE; + descriptor->bcdHID = HID_REVISION; + descriptor->bCountry = 0; + descriptor->bNumDescriptors = 1; + descriptor->DescriptorList[0].bReportType = HID_REPORT_DESCRIPTOR_TYPE; + descriptor->DescriptorList[0].wReportLength = length; + irp->IoStatus.u.Status = status = STATUS_SUCCESS; - irp->IoStatus.Information = sizeof(HID_DEVICE_ATTRIBUTES); + irp->IoStatus.Information = sizeof(*descriptor); break; } default: diff --git a/include/config.h.in b/include/config.h.in index bcee452..40909fe 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -435,6 +435,9 @@ /* Define to 1 if you have the <linux/hdreg.h> header file. */ #undef HAVE_LINUX_HDREG_H +/* Define to 1 if you have the <linux/hidraw.h> header file. */ +#undef HAVE_LINUX_HIDRAW_H + /* Define to 1 if you have the <linux/input.h> header file. */ #undef HAVE_LINUX_INPUT_H

1 0

Aric Stewart : winebus.sys: Implement IOCTL_HID_GET_REPORT_DESCRIPTOR for hidraw.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: da819ebe025fe472d695bfecab57fb063f2acdb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da819ebe025fe472d695bfeca… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 11 14:09:46 2016 +0200 winebus.sys: Implement IOCTL_HID_GET_REPORT_DESCRIPTOR for hidraw. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index bf7071d..ad09ec1 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -412,6 +412,15 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = sizeof(*descriptor); break; } + case IOCTL_HID_GET_REPORT_DESCRIPTOR: + { + DWORD length = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + TRACE("IOCTL_HID_GET_REPORT_DESCRIPTOR\n"); + + irp->IoStatus.u.Status = status = ext->vtbl->get_reportdescriptor(device, irp->UserBuffer, length, &length); + irp->IoStatus.Information = length; + break; + } default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode;

1 0