October 2012 - Wine-commits

Alexandre Julliard : winex11: Add a helper function to get a pixel format index.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 3d73e0a3570af4285d627447e4cc6d61e334684a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d73e0a3570af4285d627447e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 23:01:19 2012 +0200 winex11: Add a helper function to get a pixel format index. --- dlls/winex11.drv/opengl.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 20591e2..b8c55c2 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1043,6 +1043,11 @@ static inline BOOL is_onscreen_pixel_format( int format ) return format > 0 && format <= nb_onscreen_formats; } +static inline int pixel_format_index( const struct wgl_pixel_format *format ) +{ + return format - pixel_formats + 1; +} + /* GLX can advertise dozens of different pixelformats including offscreen and onscreen ones. * In our WGL implementation we only support a subset of these formats namely the format of * Wine's main visual and offscreen formats (if they are available). @@ -1506,7 +1511,7 @@ static int glxdrv_wglGetPixelFormat( HDC hdc ) if ((gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) { - ret = gl->format - pixel_formats + 1; + ret = pixel_format_index( gl->format ); /* Offscreen formats can't be used with traditional WGL calls. * As has been verified on Windows GetPixelFormat doesn't fail but returns iPixelFormat=1. */ if (!is_onscreen_pixel_format( ret )) ret = 1; @@ -1550,7 +1555,7 @@ static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORM if ((gl = get_gl_drawable( hwnd, hdc ))) { - int prev = gl->format - pixel_formats + 1; + int prev = pixel_format_index( gl->format ); release_gl_drawable( gl ); return prev == iPixelFormat; /* cannot change it if already set */ }

1 0

Alexandre Julliard : user32: Add a Wine-specific entry point to set the pixel format of a window.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: e41a4828900d513359b4a323d43bea4e60b43885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e41a4828900d513359b4a323d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 23:01:43 2012 +0200 user32: Add a Wine-specific entry point to set the pixel format of a window. --- dlls/user32/user32.spec | 1 + dlls/user32/win.c | 15 +++++++++++++++ dlls/winex11.drv/opengl.c | 2 ++ include/wine/wgl_driver.h | 1 + 4 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index d5c123c..231d3b1 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -779,3 +779,4 @@ # or 'wine_' (for user-visible functions) to avoid namespace conflicts. # @ cdecl __wine_send_input(long ptr) +@ cdecl __wine_set_pixel_format(long long) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 0f487f7..ee5fac9 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3592,6 +3592,21 @@ BOOL WINAPI SwitchDesktop( HDESK hDesktop) return TRUE; } + +/*********************************************************************** + * __wine_set_pixel_format + */ +BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format ) +{ + RECT window_rect, client_rect; + + WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); + return set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, + &window_rect, &client_rect, NULL ); +} + + /***************************************************************************** * SetLayeredWindowAttributes (USER32.@) */ diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b8c55c2..b19f334 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1286,6 +1286,8 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) free_gl_drawable( prev ); XSaveContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char *)gl ); LeaveCriticalSection( &context_section ); + + __wine_set_pixel_format( hwnd, pixel_format_index( format )); return TRUE; } diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h index a9385e6..74ad0f2 100644 --- a/include/wine/wgl_driver.h +++ b/include/wine/wgl_driver.h @@ -2853,5 +2853,6 @@ struct opengl_funcs USE_GL_FUNC(glViewport) extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); +extern BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format ); #endif /* __WINE_WGL_DRIVER_H */

1 0

Alexandre Julliard : winex11: Hold a reference to the surface in UpdateLayeredWindow.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 2500e21a90a085f34ad7433e362aa05fa37b0692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2500e21a90a085f34ad7433e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 4 10:34:41 2012 +0200 winex11: Hold a reference to the surface in UpdateLayeredWindow. --- dlls/winex11.drv/window.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 052eafa..7c8f391 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2386,11 +2386,15 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO } else set_surface_color_key( surface, color_key ); + if (surface) window_surface_add_ref( surface ); release_win_data( data ); if (!surface) return FALSE; - if (!info->hdcSrc) return TRUE; - if (info->prcDirty && !IntersectRect( &rect, &rect, info->prcDirty )) return TRUE; + if (!info->hdcSrc) + { + window_surface_release( surface ); + return TRUE; + } dst_bits = surface->funcs->get_info( surface, bmi ); @@ -2403,6 +2407,7 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO if (info->prcDirty) { + IntersectRect( &rect, &rect, info->prcDirty ); memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); PatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); } @@ -2422,6 +2427,7 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO surface->funcs->flush( surface ); done: + window_surface_release( surface ); if (hdc) DeleteDC( hdc ); if (dib) DeleteObject( dib ); return ret;

1 0

Qian Hong : findstr: Added stub exe.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 3ce21826c87434e9aea6fad5e62bd37b3bd99730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ce21826c87434e9aea6fad5e… Author: Qian Hong <fracting(a)gmail.com> Date: Wed Oct 3 23:25:52 2012 +0800 findstr: Added stub exe. --- configure | 1 + configure.ac | 1 + programs/findstr/Makefile.in | 7 +++++++ programs/findstr/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 57f1e58..9a133a2 100755 --- a/configure +++ b/configure @@ -15902,6 +15902,7 @@ wine_fn_config_program eject enable_eject install wine_fn_config_program expand enable_expand install wine_fn_config_program explorer enable_explorer install,po wine_fn_config_program extrac32 enable_extrac32 install +wine_fn_config_program findstr enable_findstr install wine_fn_config_program hh enable_hh install wine_fn_config_program hostname enable_hostname install,po wine_fn_config_program icinfo enable_icinfo install diff --git a/configure.ac b/configure.ac index 0479899..fc1d93c 100644 --- a/configure.ac +++ b/configure.ac @@ -3125,6 +3125,7 @@ WINE_CONFIG_PROGRAM(eject,,[install]) WINE_CONFIG_PROGRAM(expand,,[install]) WINE_CONFIG_PROGRAM(explorer,,[install,po]) WINE_CONFIG_PROGRAM(extrac32,,[install]) +WINE_CONFIG_PROGRAM(findstr,,[install]) WINE_CONFIG_PROGRAM(hh,,[install]) WINE_CONFIG_PROGRAM(hostname,,[install,po]) WINE_CONFIG_PROGRAM(icinfo,,[install]) diff --git a/programs/findstr/Makefile.in b/programs/findstr/Makefile.in new file mode 100644 index 0000000..48fcf89 --- /dev/null +++ b/programs/findstr/Makefile.in @@ -0,0 +1,7 @@ +MODULE = findstr.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/findstr/main.c b/programs/findstr/main.c new file mode 100644 index 0000000..de5de33 --- /dev/null +++ b/programs/findstr/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2012 Qian Hong + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(findstr); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Erich Hoover : hhctrl.ocx: Fix removing a window from the help list when window creation fails.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: aedcc11e4fe0954323d5257e14981e9729738f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aedcc11e4fe0954323d5257e1… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Oct 3 09:18:52 2012 -0600 hhctrl.ocx: Fix removing a window from the help list when window creation fails. --- dlls/hhctrl.ocx/help.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index c884dc0..833b681 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1825,13 +1825,12 @@ void ReleaseHelpViewer(HHInfo *info) HHInfo *CreateHelpViewer(HHInfo *info, LPCWSTR filename, HWND caller) { - BOOL add_to_window_list = FALSE; int i; if(!info) { info = heap_alloc_zero(sizeof(HHInfo)); - add_to_window_list = TRUE; + list_add_tail(&window_list, &info->entry); } /* Set the invalid tab ID (-1) as the default value for all @@ -1859,9 +1858,6 @@ HHInfo *CreateHelpViewer(HHInfo *info, LPCWSTR filename, HWND caller) return NULL; } - if(add_to_window_list) - list_add_tail(&window_list, &info->entry); - return info; }

1 0

Erich Hoover : hhctrl.ocx: Recognize the embedded window name for finding existing windows.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: d1c363424d9ed028d44658bf3ca50a6eca2c7528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c363424d9ed028d44658bf3… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Oct 3 09:19:53 2012 -0600 hhctrl.ocx: Recognize the embedded window name for finding existing windows. --- dlls/hhctrl.ocx/help.c | 21 +++++++++++++++++++++ dlls/hhctrl.ocx/hhctrl.c | 12 ------------ dlls/hhctrl.ocx/hhctrl.h | 3 ++- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 833b681..38446dc 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1825,6 +1825,7 @@ void ReleaseHelpViewer(HHInfo *info) HHInfo *CreateHelpViewer(HHInfo *info, LPCWSTR filename, HWND caller) { + HHInfo *tmp_info; int i; if(!info) @@ -1853,6 +1854,13 @@ HHInfo *CreateHelpViewer(HHInfo *info, LPCWSTR filename, HWND caller) } info->WinType.hwndCaller = caller; + /* If the window is already open then load the file in that existing window */ + if ((tmp_info = find_window(info->WinType.pszType)) && tmp_info != info) + { + ReleaseHelpViewer(info); + return CreateHelpViewer(tmp_info, filename, caller); + } + if(!info->viewer_initialized && !CreateViewer(info)) { ReleaseHelpViewer(info); return NULL; @@ -1949,3 +1957,16 @@ WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_p heap_free(tmp); return unicode_text; } + +/* Find the HTMLHelp structure for an existing window title */ +HHInfo *find_window(const WCHAR *window) +{ + HHInfo *info; + + LIST_FOR_EACH_ENTRY(info, &window_list, HHInfo, entry) + { + if (strcmpW(info->WinType.pszType, window) == 0) + return info; + } + return NULL; +} diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 03592c8..2814ab2 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -146,18 +146,6 @@ static BOOL resolve_filename(const WCHAR *filename, WCHAR *fullname, DWORD bufle return (GetFileAttributesW(fullname) != INVALID_FILE_ATTRIBUTES); } -static inline HHInfo *find_window(const WCHAR *window) -{ - HHInfo *info; - - LIST_FOR_EACH_ENTRY(info, &window_list, HHInfo, entry) - { - if (strcmpW(info->WinType.pszType, window) == 0) - return info; - } - return NULL; -} - /****************************************************************** * HtmlHelpW (HHCTRL.OCX.15) */ diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 81b6879..e48137d 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -227,7 +227,8 @@ void ReleaseSearch(HHInfo *info) DECLSPEC_HIDDEN; LPCWSTR skip_schema(LPCWSTR url) DECLSPEC_HIDDEN; void wintype_stringsA_free(struct wintype_stringsA *stringsA) DECLSPEC_HIDDEN; void wintype_stringsW_free(struct wintype_stringsW *stringsW) DECLSPEC_HIDDEN; -WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page); +WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page) DECLSPEC_HIDDEN; +HHInfo *find_window(const WCHAR *window) DECLSPEC_HIDDEN; /* memory allocation functions */

1 0

Erich Hoover : hhctrl.ocx: Add support for specifying window names with HH_HELP_CONTEXT.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 317f26beefbb7f916a29cde25f7e254b4e10007c URL: http://source.winehq.org/git/wine.git/?a=commit;h=317f26beefbb7f916a29cde25… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Oct 3 09:22:11 2012 -0600 hhctrl.ocx: Add support for specifying window names with HH_HELP_CONTEXT. --- dlls/hhctrl.ocx/hhctrl.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 2814ab2..3fd7df5 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -244,21 +244,33 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat return info->WinType.hwndHelp; } case HH_HELP_CONTEXT: { - HHInfo *info; + WCHAR *window = NULL; + HHInfo *info = NULL; LPWSTR url; if (!filename) return NULL; - if (!resolve_filename(filename, fullname, MAX_PATH, NULL, NULL)) + if (!resolve_filename(filename, fullname, MAX_PATH, NULL, &window)) { WARN("can't find %s\n", debugstr_w(filename)); return 0; } - info = CreateHelpViewer(NULL, fullname, caller); + if (window) + info = find_window(window); + + info = CreateHelpViewer(info, fullname, caller); if(!info) + { + heap_free(window); return NULL; + } + + if(!info->WinType.pszType) + info->WinType.pszType = info->stringsW.pszType = window; + else + heap_free(window); url = FindContextAlias(info->pCHMInfo, data); if(!url)

1 0

André Hentschel : winedbg: Add Coprocessor data operators for Thumb2 disassembler.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 129080774dabbcf7500613f9d177c66d1049c111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129080774dabbcf7500613f9d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 3 21:18:50 2012 +0200 winedbg: Add Coprocessor data operators for Thumb2 disassembler. --- programs/winedbg/be_arm.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 2a52b1d..5a95e61 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -963,6 +963,22 @@ static UINT thumb2_disasm_ldrword(UINT inst, ADDRESS64 *addr) return 0; } +static UINT thumb2_disasm_coprocdat(UINT inst, ADDRESS64 *addr) +{ + WORD opc2 = (inst >> 5) & 0x07; + + if (opc2) + dbg_printf("\n\tcdp%s\tp%u, #%u, cr%u, cr%u, cr%u, #%u", (inst & 0x10000000)?"2":"", + get_nibble(inst, 2), get_nibble(inst, 5), get_nibble(inst, 3), + get_nibble(inst, 4), get_nibble(inst, 0), opc2); + else + dbg_printf("\n\tcdp%s\tp%u, #%u, cr%u, cr%u, cr%u", (inst & 0x10000000)?"2":"", + get_nibble(inst, 2), get_nibble(inst, 5), get_nibble(inst, 3), + get_nibble(inst, 4), get_nibble(inst, 0)); + + return 0; +} + static UINT thumb2_disasm_coprocmov1(UINT inst, ADDRESS64 *addr) { WORD opc1 = (inst >> 21) & 0x07; @@ -1052,6 +1068,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xff8000f0, 0xfb8000f0, thumb2_disasm_longmuldiv }, { 0xff100000, 0xf8000000, thumb2_disasm_str }, { 0xff700000, 0xf8500000, thumb2_disasm_ldrword }, + { 0xef000010, 0xee000000, thumb2_disasm_coprocdat }, { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0x00000000, 0x00000000, NULL } };

1 0

André Hentschel : winedbg: Add enhanced Coprocessor move operators to Thumb2 disassembler.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 24abf1f68bd3d9004526edd213763bf9bb244127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24abf1f68bd3d9004526edd21… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 3 21:22:29 2012 +0200 winedbg: Add enhanced Coprocessor move operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 5a95e61..3ecf475 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -996,6 +996,15 @@ static UINT thumb2_disasm_coprocmov1(UINT inst, ADDRESS64 *addr) return 0; } +static UINT thumb2_disasm_coprocmov2(UINT inst, ADDRESS64 *addr) +{ + dbg_printf("\n\t%s%s\tp%u, #%u, %s, %s, cr%u", (inst & 0x00100000)?"mrrc":"mcrr", + (inst & 0x10000000)?"2":"", get_nibble(inst, 2), get_nibble(inst, 1), + tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 4)], get_nibble(inst, 0)); + + return 0; +} + struct inst_arm { UINT mask; @@ -1070,6 +1079,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xff700000, 0xf8500000, thumb2_disasm_ldrword }, { 0xef000010, 0xee000000, thumb2_disasm_coprocdat }, { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, + { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 }, { 0x00000000, 0x00000000, NULL } };

1 0

André Hentschel : winedbg: Add Coprocessor data transfer operators for Thumb2 disassembler.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 0ef9072e0f1697bb59681a0434987f4b4fd3b861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef9072e0f1697bb59681a043… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 3 21:25:25 2012 +0200 winedbg: Add Coprocessor data transfer operators for Thumb2 disassembler. --- programs/winedbg/be_arm.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 3ecf475..2cb126d 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1005,6 +1005,38 @@ static UINT thumb2_disasm_coprocmov2(UINT inst, ADDRESS64 *addr) return 0; } +static UINT thumb2_disasm_coprocdatatrans(UINT inst, ADDRESS64 *addr) +{ + WORD indexing = (inst >> 24) & 0x01; + WORD direction = (inst >> 23) & 0x01; + WORD translen = (inst >> 22) & 0x01; + WORD writeback = (inst >> 21) & 0x01; + WORD load = (inst >> 20) & 0x01; + short offset = (inst & 0xff) << 2; + + if (!direction) offset *= -1; + + dbg_printf("\n\t%s%s%s", load ? "ldc" : "stc", (inst & 0x10000000)?"2":"", translen ? "l" : ""); + if (indexing) + { + if (load && get_nibble(inst, 4) == 15) + { + dbg_printf("\tp%u, cr%u, ", get_nibble(inst, 2), get_nibble(inst, 3)); + db_printsym(addr->Offset + offset + 4); + } + else + dbg_printf("\tp%u, cr%u, [%s, #%d]%s", get_nibble(inst, 2), get_nibble(inst, 3), tbl_regs[get_nibble(inst, 4)], offset, writeback?"!":""); + } + else + { + if (writeback) + dbg_printf("\tp%u, cr%u, [%s], #%d", get_nibble(inst, 2), get_nibble(inst, 3), tbl_regs[get_nibble(inst, 4)], offset); + else + dbg_printf("\tp%u, cr%u, [%s], {%u}", get_nibble(inst, 2), get_nibble(inst, 3), tbl_regs[get_nibble(inst, 4)], inst & 0xff); + } + return 0; +} + struct inst_arm { UINT mask; @@ -1080,6 +1112,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xef000010, 0xee000000, thumb2_disasm_coprocdat }, { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 }, + { 0xee000000, 0xec000000, thumb2_disasm_coprocdatatrans }, { 0x00000000, 0x00000000, NULL } };

1 0