January 2013 - Wine-Commits

Andrew Talbot : cabinet: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: d03b13c5349bf6034b729b95922d20aecb776cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03b13c5349bf6034b729b959… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 28 22:05:29 2012 +0000 cabinet: Avoid signed-unsigned integer comparisons. --- dlls/cabinet/fdi.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index fb675fc..33734e7 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2041,7 +2041,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state /* outlen=0 means this block was the last contiguous part of a split block, continued in the next cabinet */ if (outlen == 0) { - int pathlen, filenamelen, i; + int pathlen, filenamelen; INT_PTR cabhf; char fullpath[MAX_PATH], userpath[256]; FDINOTIFICATION fdin; @@ -2056,6 +2056,8 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state /* set up the next decomp_state... */ if (!(cab->next)) { + unsigned int i; + if (!cab->mii.hasnext) return DECR_INPUT; if (!((cab->next = CAB(fdi)->alloc(sizeof(fdi_decomp_state))))) @@ -2695,13 +2697,13 @@ BOOL __cdecl FDICopy( /* find the folder for this file if necc. */ if (filehf) { - int i2; - fol = CAB(firstfol); if ((file->index & cffileCONTINUED_TO_NEXT) == cffileCONTINUED_TO_NEXT) { /* pick the last folder */ while (fol->next) fol = fol->next; } else { + unsigned int i2; + for (i2 = 0; (i2 < file->index); i2++) if (fol->next) /* bug resistance, should always be true */ fol = fol->next;

1 0

Andrew Talbot : d3dcompiler_43: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 80e4d899edd168f873a23a0e55e23ce0ac562d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80e4d899edd168f873a23a0e5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 1 15:48:30 2013 +0000 d3dcompiler_43: Avoid signed-unsigned integer comparisons. --- dlls/d3dcompiler_43/bytecodewriter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index d10f6bc..17289d2 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -609,7 +609,7 @@ static void write_declarations(struct bc_writer *This, } static void write_const(struct constant **consts, int num, DWORD opcode, DWORD reg_type, struct bytecode_buffer *buffer, BOOL len) { - DWORD i; + int i; DWORD instr_def = opcode; const DWORD reg = (1<<31) | ((reg_type << D3DSP_REGTYPE_SHIFT) & D3DSP_REGTYPE_MASK) |

1 0

André Hentschel : winedbg: Add modified immediate dataprocessing operators to Thumb2 disassembler.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 0004788e96cfd5f81642bf430dfdd16353e59ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0004788e96cfd5f81642bf430… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 2 17:23:56 2013 +0100 winedbg: Add modified immediate dataprocessing operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 408dbcc..9f6c824 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1133,6 +1133,79 @@ static UINT thumb2_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) return inst; } +static UINT thumb2_disasm_dataprocessingmod(UINT inst, ADDRESS64 *addr) +{ + WORD op = (inst >> 21) & 0x0f; + WORD sf = (inst >> 20) & 0x01; + WORD offset = ((inst >> 15) & 0x0800) + ((inst >> 4) & 0x0700) + (inst & 0xff); + + /* FIXME: use ThumbExpandImm_C */ + + switch (op) + { + case 0: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\ttst\t%s, #%u", tbl_regs[get_nibble(inst, 4)], offset); + else + dbg_printf("\n\tand%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 1: + dbg_printf("\n\tbic%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 2: + if (get_nibble(inst, 4) == 15) + dbg_printf("\n\tmov%s\t%s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], offset); + else + dbg_printf("\n\torr%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 3: + if (get_nibble(inst, 4) == 15) + dbg_printf("\n\tmvn%s\t%s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], offset); + else + dbg_printf("\n\torn%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 4: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\tteq\t%s, #%u", tbl_regs[get_nibble(inst, 4)], offset); + else + dbg_printf("\n\teor%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 8: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\tcmn\t%s, #%u", tbl_regs[get_nibble(inst, 4)], offset); + else + dbg_printf("\n\tadd%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 10: + dbg_printf("\n\tadc%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 11: + dbg_printf("\n\tsbc%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 13: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\tcmp\t%s, #%u", tbl_regs[get_nibble(inst, 4)], offset); + else + dbg_printf("\n\tsub%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + case 14: + dbg_printf("\n\trsb%s\t%s, %s, #%u", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + default: + return inst; + } +} + static UINT thumb2_disasm_coprocdat(UINT inst, ADDRESS64 *addr) { WORD opc2 = (inst >> 5) & 0x07; @@ -1370,6 +1443,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xfe70f000, 0xf810f000, thumb2_disasm_preload }, { 0xfe500000, 0xf8100000, thumb2_disasm_ldrnonword }, { 0xfa008000, 0xf2000000, thumb2_disasm_dataprocessing }, + { 0xfa008000, 0xf0000000, thumb2_disasm_dataprocessingmod }, { 0xef000010, 0xee000000, thumb2_disasm_coprocdat }, { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 },

1 0

Hans Leidekker : wmiutils: Introduce memory allocation helpers.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 0ee1b888a2cb61b991f0abc7d8e73115d20c9a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee1b888a2cb61b991f0abc7d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:33:10 2013 +0100 wmiutils: Introduce memory allocation helpers. --- dlls/wmiutils/path.c | 9 ++++----- dlls/wmiutils/statuscode.c | 5 ++--- dlls/wmiutils/wmiutils_private.h | 11 +++++++++++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index b8c0f3e..a4f3870 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -61,8 +61,8 @@ static ULONG WINAPI path_Release( if (!refs) { TRACE("destroying %p\n", path); - HeapFree( GetProcessHeap(), 0, path->text ); - HeapFree( GetProcessHeap(), 0, path ); + heap_free( path->text ); + heap_free( path ); } return refs; } @@ -103,8 +103,7 @@ static HRESULT WINAPI path_SetText( if (uMode) FIXME("igoring mode %u\n", uMode); len = strlenW( pszPath ); - if (!(path->text = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) - return E_OUTOFMEMORY; + if (!(path->text = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; strcpyW( path->text, pszPath ); path->len = len; @@ -382,7 +381,7 @@ HRESULT WbemPath_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("%p, %p\n", pUnkOuter, ppObj); - if (!(path = HeapAlloc( GetProcessHeap(), 0, sizeof(*path) ))) return E_OUTOFMEMORY; + if (!(path = heap_alloc( sizeof(*path) ))) return E_OUTOFMEMORY; path->IWbemPath_iface.lpVtbl = &path_vtbl; path->refs = 1; diff --git a/dlls/wmiutils/statuscode.c b/dlls/wmiutils/statuscode.c index 2d8a3f8..0718c17 100644 --- a/dlls/wmiutils/statuscode.c +++ b/dlls/wmiutils/statuscode.c @@ -59,7 +59,7 @@ static ULONG WINAPI status_code_Release( if (!refs) { TRACE("destroying %p\n", status_code); - HeapFree( GetProcessHeap(), 0, status_code ); + heap_free( status_code ); } return refs; } @@ -138,8 +138,7 @@ HRESULT WbemStatusCodeText_create( IUnknown *pUnkOuter, LPVOID *ppObj ) TRACE("(%p,%p)\n", pUnkOuter, ppObj); - sc = HeapAlloc( GetProcessHeap(), 0, sizeof(*sc) ); - if (!sc) return E_OUTOFMEMORY; + if (!(sc = heap_alloc( sizeof(*sc) ))) return E_OUTOFMEMORY; sc->IWbemStatusCodeText_iface.lpVtbl = &status_code_vtbl; sc->refs = 1; diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index fdcd48f..fdfca13 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -18,3 +18,14 @@ HRESULT WbemPath_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; + +static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), 0, len ); +} + +static inline BOOL heap_free( void *mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +}

1 0

Hans Leidekker : wmiutils: Support more flags in IWbemPath::GetText.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 0199a94329c80208bab565c56d46cd12f604e951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0199a94329c80208bab565c56… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:34:32 2013 +0100 wmiutils: Support more flags in IWbemPath::GetText. --- dlls/wmiutils/path.c | 178 ++++++++++++++++++++++++++++++++++++-- dlls/wmiutils/wmiutils_private.h | 10 ++ 2 files changed, 179 insertions(+), 9 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 0cb7170..a26ade1 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -28,7 +28,6 @@ #include "wmiutils.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wmiutils_private.h" WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); @@ -211,6 +210,163 @@ static HRESULT WINAPI path_SetText( return S_OK; } +static WCHAR *build_namespace( struct path *path, int *len ) +{ + WCHAR *ret, *p; + int i; + + *len = 0; + for (i = 0; i < path->num_namespaces; i++) + { + if (i > 0) *len += 1; + *len += path->len_namespaces[i]; + } + if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL; + for (i = 0; i < path->num_namespaces; i++) + { + if (i > 0) *p++ = '\\'; + memcpy( p, path->namespaces[i], path->len_namespaces[i] * sizeof(WCHAR) ); + p += path->len_namespaces[i]; + } + *p = 0; + return ret; +} + +static WCHAR *build_server( struct path *path, int *len ) +{ + WCHAR *ret, *p; + + *len = 0; + if (path->server) *len += 2 + path->len_server; + else *len += 4; + if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL; + if (path->server) + { + p[0] = p[1] = '\\'; + strcpyW( p + 2, path->server ); + } + else + { + p[0] = p[1] = p[3] = '\\'; + p[2] = '.'; + } + return ret; +} + +static WCHAR *build_path( struct path *path, LONG flags, int *len ) +{ + switch (flags) + { + case 0: + { + int len_namespace; + WCHAR *ret, *namespace = build_namespace( path, &len_namespace ); + + if (!namespace) return NULL; + + *len = len_namespace; + if (path->class) *len += 1 + path->len_class; + if (!(ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) + { + heap_free( namespace ); + return NULL; + } + strcpyW( ret, namespace ); + if (path->class) + { + ret[len_namespace] = ':'; + strcpyW( ret + len_namespace + 1, path->class ); + } + heap_free( namespace ); + return ret; + + } + case WBEMPATH_GET_RELATIVE_ONLY: + if (!path->class) + { + *len = 0; + return NULL; + } + *len = path->len_class; + return strdupW( path->class ); + + case WBEMPATH_GET_SERVER_TOO: + { + int len_namespace, len_server; + WCHAR *p, *ret, *namespace = build_namespace( path, &len_namespace ); + WCHAR *server = build_server( path, &len_server ); + + if (!namespace || !server) + { + heap_free( namespace ); + heap_free( server ); + return NULL; + } + *len = len_namespace + len_server; + if (path->class) *len += 1 + path->len_class; + if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) + { + heap_free( namespace ); + heap_free( server ); + return NULL; + } + strcpyW( p, server ); + p += len_server; + strcpyW( p, namespace ); + p += len_namespace; + if (path->class) + { + *p = ':'; + strcpyW( p + 1, path->class ); + } + heap_free( namespace ); + heap_free( server ); + return ret; + } + case WBEMPATH_GET_SERVER_AND_NAMESPACE_ONLY: + { + int len_namespace, len_server; + WCHAR *p, *ret, *namespace = build_namespace( path, &len_namespace ); + WCHAR *server = build_server( path, &len_server ); + + if (!namespace || !server) + { + heap_free( namespace ); + heap_free( server ); + return NULL; + } + *len = len_namespace + len_server; + if (!(p = ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) + { + heap_free( namespace ); + heap_free( server ); + return NULL; + } + strcpyW( p, server ); + p += len_server; + strcpyW( p, namespace ); + heap_free( namespace ); + heap_free( server ); + return ret; + } + case WBEMPATH_GET_NAMESPACE_ONLY: + return build_namespace( path, len ); + + case WBEMPATH_GET_ORIGINAL: + if (!path->text) + { + *len = 0; + return NULL; + } + *len = path->len_text; + return strdupW( path->text ); + + default: + ERR("unhandled flags 0x%x\n", flags); + return NULL; + } +} + static HRESULT WINAPI path_GetText( IWbemPath *iface, LONG lFlags, @@ -218,23 +374,27 @@ static HRESULT WINAPI path_GetText( LPWSTR pszText) { struct path *path = impl_from_IWbemPath( iface ); + WCHAR *str; + int len; TRACE("%p, 0x%x, %p, %p\n", iface, lFlags, puBufferLength, pszText); if (!puBufferLength || !pszText) return WBEM_E_INVALID_PARAMETER; - if (lFlags != WBEMPATH_GET_ORIGINAL) + str = build_path( path, lFlags, &len ); + + if (*puBufferLength < len + 1) { - FIXME("flags 0x%x not supported\n", lFlags); - return WBEM_E_INVALID_PARAMETER; + *puBufferLength = len + 1; + return S_OK; } - if (*puBufferLength < path->len_text + 1) + if (pszText) { - *puBufferLength = path->len_text + 1; - return S_OK; + if (str) strcpyW( pszText, str ); + else pszText[0] = 0; } - if (pszText) strcpyW( pszText, path->text ); - *puBufferLength = path->len_text + 1; + *puBufferLength = len + 1; + heap_free( str ); return S_OK; } diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index fdfca13..9837ce8 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" + HRESULT WbemPath_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; @@ -29,3 +31,11 @@ static inline BOOL heap_free( void *mem ) { return HeapFree( GetProcessHeap(), 0, mem ); } + +static inline WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = heap_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) ))) strcpyW( dst, src ); + return dst; +}

1 0

Hans Leidekker : wmiutils: Add tests.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 988ff087547349233554b182eb7f42b64e411173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=988ff087547349233554b182e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:35:09 2013 +0100 wmiutils: Add tests. --- configure | 1 + configure.ac | 1 + dlls/wmiutils/tests/Makefile.in | 7 + dlls/wmiutils/tests/path.c | 249 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 258 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=988ff087547349233554b…

1 0

Alexandre Julliard : winex11: Add an option to disable shaping of layered window to work around compositor bugs .
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: defcfde17ccf27d8ea9693a79e7a9239cd604b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=defcfde17ccf27d8ea9693a79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 2 18:09:34 2013 +0100 winex11: Add an option to disable shaping of layered window to work around compositor bugs. --- dlls/winex11.drv/bitblt.c | 2 ++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 4 ++++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 161fa73..84e8751 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1621,6 +1621,8 @@ static void update_surface_region( struct x11drv_window_surface *surface ) int x, y, start, width; HRGN rgn; + if (!shape_layered_windows) return; + if (!surface->is_argb && surface->color_key == CLR_INVALID) { XShapeCombineMask( gdi_display, surface->window, ShapeBounding, 0, 0, None, ShapeSet ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0c462d6..707ee03 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -218,6 +218,7 @@ extern const int X11DRV_XROPfunction[]; extern int client_side_graphics DECLSPEC_HIDDEN; extern int client_side_with_render DECLSPEC_HIDDEN; +extern int shape_layered_windows DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN; extern struct opengl_funcs *get_glx_driver(UINT) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index ef6b1a9..329fea5 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -81,6 +81,7 @@ int private_color_map = 0; int primary_monitor = 0; int client_side_graphics = 1; int client_side_with_render = 1; +int shape_layered_windows = 1; int copy_default_colors = 128; int alloc_system_colors = 256; DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; @@ -397,6 +398,9 @@ static void setup_options(void) if (!get_config_key( hkey, appkey, "UseXIM", buffer, sizeof(buffer) )) use_xim = IS_OPTION_TRUE( buffer[0] ); + if (!get_config_key( hkey, appkey, "ShapeLayeredWindows", buffer, sizeof(buffer) )) + shape_layered_windows = IS_OPTION_TRUE( buffer[0] ); + if (!get_config_key( hkey, appkey, "PrivateColorMap", buffer, sizeof(buffer) )) private_color_map = IS_OPTION_TRUE( buffer[0] );

1 0

André Hentschel : winedbg: Add plain binary dataprocessing operators to Thumb2 disassembler.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 87fbe4ca107a8fffb8e37106aca1117e5d1ccb0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fbe4ca107a8fffb8e37106a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 2 17:17:03 2013 +0100 winedbg: Add plain binary dataprocessing operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 84 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 83 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index a6f57f7..408dbcc 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1,7 +1,7 @@ /* * Debugger ARM specific functions * - * Copyright 2010-2012 André Hentschel + * Copyright 2010-2013 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1052,6 +1052,87 @@ static UINT thumb2_disasm_ldrnonword(UINT inst, ADDRESS64 *addr) return inst; } +static UINT thumb2_disasm_dataprocessing(UINT inst, ADDRESS64 *addr) +{ + WORD op = (inst >> 20) & 0x1f; + WORD imm5 = ((inst >> 10) & 0x1c) + ((inst >> 6) & 0x03); + + if (op == 0) + { + WORD offset = ((inst >> 15) & 0x0800) + ((inst >> 4) & 0x0700) + (inst & 0xff); + if (get_nibble(inst, 4) == 15) + { + dbg_printf("\n\tadr\t%s, ", tbl_regs[get_nibble(inst, 2)]); + db_printsym(addr->Offset + offset + 4); + } + else + dbg_printf("\n\taddw\t%s, %s, #%u", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + } + + if (op == 4 || op == 12) + { + WORD offset = ((inst >> 15) & 0x0800) + ((inst >> 4) & 0xf000) + + ((inst >> 4) & 0x0700) + (inst & 0xff); + dbg_printf("\n\t%s\t%s, #%u", op == 12 ? "movt" : "movw", tbl_regs[get_nibble(inst, 2)], + offset); + return 0; + } + + if (op == 10) + { + int offset = ((inst >> 15) & 0x0800) + ((inst >> 4) & 0x0700) + (inst & 0xff); + if (get_nibble(inst, 4) == 15) + { + offset *= -1; + dbg_printf("\n\tadr\t%s, ", tbl_regs[get_nibble(inst, 2)]); + db_printsym(addr->Offset + offset + 4); + } + else + dbg_printf("\n\tsubw\t%s, %s, #%u", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], offset); + return 0; + } + + if (op == 16 || op == 18 || op == 24 || op == 26) + { + BOOL sign = op < 24; + WORD sh = (inst >> 21) & 0x01; + WORD sat = (inst & 0x1f); + if (sign) sat++; + if (imm5) + dbg_printf("\n\t%s\t%s, #%u, %s, %s #%u", sign ? "ssat" : "usat", + tbl_regs[get_nibble(inst, 2)], sat, tbl_regs[get_nibble(inst, 4)], + sh ? "asr" : "lsl", imm5); + else + dbg_printf("\n\t%s\t%s, #%u, %s", sign ? "ssat" : "usat", tbl_regs[get_nibble(inst, 2)], + sat, tbl_regs[get_nibble(inst, 4)]); + return 0; + } + + if (op == 20 || op == 28) + { + WORD width = (inst & 0x1f) + 1; + dbg_printf("\n\t%s\t%s, %s, #%u, #%u", op == 28 ? "ubfx" : "sbfx", + tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], imm5, width); + return 0; + } + + if (op == 22) + { + WORD msb = (inst & 0x1f) + 1 - imm5; + if (get_nibble(inst, 4) == 15) + dbg_printf("\n\tbfc\t%s, #%u, #%u", tbl_regs[get_nibble(inst, 2)], imm5, msb); + else + dbg_printf("\n\tbfi\t%s, %s, #%u, #%u", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], imm5, msb); + return 0; + } + + return inst; +} + static UINT thumb2_disasm_coprocdat(UINT inst, ADDRESS64 *addr) { WORD opc2 = (inst >> 5) & 0x07; @@ -1288,6 +1369,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xff700000, 0xf8500000, thumb2_disasm_ldrword }, { 0xfe70f000, 0xf810f000, thumb2_disasm_preload }, { 0xfe500000, 0xf8100000, thumb2_disasm_ldrnonword }, + { 0xfa008000, 0xf2000000, thumb2_disasm_dataprocessing }, { 0xef000010, 0xee000000, thumb2_disasm_coprocdat }, { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 },

1 0

Andrew Talbot : crypt32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 2d7595fd2a091cae495af2f4759bbf888c494d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7595fd2a091cae495af2f47… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 1 15:48:26 2013 +0000 crypt32: Avoid signed-unsigned integer comparisons. --- dlls/crypt32/object.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index cff96f9..5f45d81 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -842,7 +842,7 @@ static BOOL CRYPT_FormatBits(BYTE bits, const struct BitToString *map, DWORD mapEntries, void *pbFormat, DWORD *pcbFormat, BOOL *first) { DWORD bytesNeeded = sizeof(WCHAR); - int i; + unsigned int i; BOOL ret = TRUE, localFirst = *first; for (i = 0; i < mapEntries; i++) @@ -947,7 +947,7 @@ static BOOL WINAPI CRYPT_FormatKeyUsage(DWORD dwCertEncodingType, else { static BOOL stringsLoaded = FALSE; - int i; + unsigned int i; DWORD bitStringLen; BOOL first = TRUE; @@ -1866,7 +1866,7 @@ static BOOL CRYPT_FormatReason(DWORD dwFormatStrType, static const WCHAR sep[] = { ',',' ',0 }; static const WCHAR bitsFmt[] = { ' ','(','%','0','2','x',')',0 }; static BOOL stringsLoaded = FALSE; - int i, numReasons = 0; + unsigned int i, numReasons = 0; BOOL ret = TRUE; DWORD bytesNeeded = sizeof(WCHAR); WCHAR bits[6]; @@ -2317,7 +2317,7 @@ static BOOL WINAPI CRYPT_FormatNetscapeCertType(DWORD dwCertEncodingType, else { static BOOL stringsLoaded = FALSE; - int i; + unsigned int i; DWORD bitStringLen; BOOL first = TRUE;

1 0

Alexandre Julliard : Update copyright info for 2013.
by Alexandre Julliard Jan. 2, 2013

Jan. 2, 2013

Module: wine Branch: master Commit: 63a89f9be26de9050740cd50ec944080efed0d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=63a89f9be26de9050740cd50e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 2 13:22:39 2013 +0100 Update copyright info for 2013. --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 1ec4844..2ef2654 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2012 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2013 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 0e755e6..77ca4a8 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -106,7 +106,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2012 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2013 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0