October 2012 - Wine-commits

Henri Verbeet : d3d10core: Implement d3d10_device_OMSetDepthStencilState().
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: a78fa408165886b2cc7fc9c962b01f91b026d804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78fa408165886b2cc7fc9c96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 2 22:15:36 2012 +0200 d3d10core: Implement d3d10_device_OMSetDepthStencilState(). --- dlls/d3d10core/d3d10core_private.h | 4 ++++ dlls/d3d10core/device.c | 7 ++++++- dlls/d3d10core/state.c | 9 +++++++++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 4f98c93..2dcd89a 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -226,6 +226,8 @@ struct d3d10_depthstencil_state }; HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) DECLSPEC_HIDDEN; +struct d3d10_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( + ID3D10DepthStencilState *iface) DECLSPEC_HIDDEN; /* ID3D10RasterizerState */ struct d3d10_rasterizer_state @@ -267,6 +269,8 @@ struct d3d10_device struct wined3d_device_parent device_parent; struct wined3d_device *wined3d_device; + struct d3d10_depthstencil_state *depth_stencil_state; + UINT stencil_ref; struct d3d10_rasterizer_state *rasterizer_state; }; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index eaf0793..78d930b 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -325,8 +325,13 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device *iface, ID3D10DepthStencilState *depth_stencil_state, UINT stencil_ref) { - FIXME("iface %p, depth_stencil_state %p, stencil_ref %u stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, depth_stencil_state %p, stencil_ref %u.\n", iface, depth_stencil_state, stencil_ref); + + device->depth_stencil_state = unsafe_impl_from_ID3D10DepthStencilState(depth_stencil_state); + device->stencil_ref = stencil_ref; } static void STDMETHODCALLTYPE d3d10_device_SOSetTargets(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 3b5c45f..1d927ce 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -256,6 +256,15 @@ HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) return S_OK; } +struct d3d10_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState(ID3D10DepthStencilState *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_depthstencil_state_vtbl); + + return impl_from_ID3D10DepthStencilState(iface); +} + static inline struct d3d10_rasterizer_state *impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) { return CONTAINING_RECORD(iface, struct d3d10_rasterizer_state, ID3D10RasterizerState_iface);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_OMGetDepthStencilState().
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: e4df956f95484d0193172199d73c459c7284b260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4df956f95484d0193172199d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 2 22:15:37 2012 +0200 d3d10core: Implement d3d10_device_OMGetDepthStencilState(). --- dlls/d3d10core/device.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 78d930b..ae3b865 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -572,8 +572,15 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device *iface, ID3D10DepthStencilState **depth_stencil_state, UINT *stencil_ref) { - FIXME("iface %p, depth_stencil_state %p, stencil_ref %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); + + if ((*depth_stencil_state = device->depth_stencil_state + ? &device->depth_stencil_state->ID3D10DepthStencilState_iface : NULL)) + ID3D10DepthStencilState_AddRef(*depth_stencil_state); + *stencil_ref = device->stencil_ref; } static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device *iface,

1 0

Henri Verbeet : wined3d: Just return the surface from wined3d_device_get_surface_from_dc().
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 50c61959ebb7c4604430e39ef828f5f2ef1137d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c61959ebb7c4604430e39ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 2 22:15:38 2012 +0200 wined3d: Just return the surface from wined3d_device_get_surface_from_dc(). --- dlls/ddraw/ddraw.c | 4 +--- dlls/wined3d/device.c | 12 +++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 +-- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1530685..e83091e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2422,14 +2422,12 @@ static HRESULT WINAPI ddraw7_GetSurfaceFromDC(IDirectDraw7 *iface, HDC hdc, struct ddraw *ddraw = impl_from_IDirectDraw7(iface); struct wined3d_surface *wined3d_surface; struct ddraw_surface *surface_impl; - HRESULT hr; TRACE("iface %p, dc %p, surface %p.\n", iface, hdc, Surface); if (!Surface) return E_INVALIDARG; - hr = wined3d_device_get_surface_from_dc(ddraw->wined3d_device, hdc, &wined3d_surface); - if (FAILED(hr)) + if (!(wined3d_surface = wined3d_device_get_surface_from_dc(ddraw->wined3d_device, hdc))) { TRACE("No surface found for dc %p.\n", hdc); *Surface = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c03537d..8a7d6d5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5417,15 +5417,14 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso TRACE("Resource released.\n"); } -HRESULT CDECL wined3d_device_get_surface_from_dc(const struct wined3d_device *device, - HDC dc, struct wined3d_surface **surface) +struct wined3d_surface * CDECL wined3d_device_get_surface_from_dc(const struct wined3d_device *device, HDC dc) { struct wined3d_resource *resource; - TRACE("device %p, dc %p, surface %p.\n", device, dc, surface); + TRACE("device %p, dc %p.\n", device, dc); if (!dc) - return WINED3DERR_INVALIDCALL; + return NULL; LIST_FOR_EACH_ENTRY(resource, &device->resources, struct wined3d_resource, resource_list_entry) { @@ -5436,13 +5435,12 @@ HRESULT CDECL wined3d_device_get_surface_from_dc(const struct wined3d_device *de if (s->hDC == dc) { TRACE("Found surface %p for dc %p.\n", s, dc); - *surface = s; - return WINED3D_OK; + return s; } } } - return WINED3DERR_INVALIDCALL; + return NULL; } HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a885746..865bf90 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -82,7 +82,7 @@ @ cdecl wined3d_device_get_software_vertex_processing(ptr) @ cdecl wined3d_device_get_stream_source(ptr long ptr ptr ptr) @ cdecl wined3d_device_get_stream_source_freq(ptr long ptr) -@ cdecl wined3d_device_get_surface_from_dc(ptr ptr ptr) +@ cdecl wined3d_device_get_surface_from_dc(ptr ptr) @ cdecl wined3d_device_get_swapchain(ptr long) @ cdecl wined3d_device_get_swapchain_count(ptr) @ cdecl wined3d_device_get_texture(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a5465fb..8db9357 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2152,8 +2152,7 @@ HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *de UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride); HRESULT __cdecl wined3d_device_get_stream_source_freq(const struct wined3d_device *device, UINT stream_idx, UINT *divider); -HRESULT __cdecl wined3d_device_get_surface_from_dc(const struct wined3d_device *device, - HDC dc, struct wined3d_surface **surface); +struct wined3d_surface * __cdecl wined3d_device_get_surface_from_dc(const struct wined3d_device *device, HDC dc); struct wined3d_swapchain * __cdecl wined3d_device_get_swapchain(const struct wined3d_device *device, UINT swapchain_idx); UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device);

1 0

Henri Verbeet : wined3d: wined3d_swapchain_set_window() never fails.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: e55416a113b44d21fab5d41d0018f31d9a3b2bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55416a113b44d21fab5d41d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 2 22:15:39 2012 +0200 wined3d: wined3d_swapchain_set_window() never fails. --- dlls/wined3d/swapchain.c | 6 ++---- include/wine/wined3d.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6be89af..8117df8 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -130,18 +130,16 @@ void * CDECL wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapch return swapchain->parent; } -HRESULT CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window) +void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window) { if (!window) window = swapchain->device_window; if (window == swapchain->win_handle) - return WINED3D_OK; + return; TRACE("Setting swapchain %p window from %p to %p.\n", swapchain, swapchain->win_handle, window); swapchain->win_handle = window; - - return WINED3D_OK; } HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8db9357..c8d95ba 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2379,7 +2379,7 @@ HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, const RGNDATA *dirty_region, DWORD flags); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, DWORD flags, const struct wined3d_gamma_ramp *ramp); -HRESULT __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); +void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region);

1 0

Henri Verbeet : wined3d: Handle WINED3DSPR_CONSTBUFFER registers in the GLSL shader backend.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 4d39cb56fccaa45a9c9d4be7711a28865091acb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d39cb56fccaa45a9c9d4be77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 2 22:15:40 2012 +0200 wined3d: Handle WINED3DSPR_CONSTBUFFER registers in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 21 ++++++++++++++++++++- dlls/wined3d/shader.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d344bfa..bc262ec 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -994,6 +994,12 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (shader->limits.constant_bool > 0 && reg_maps->boolean_constants) shader_addline(buffer, "uniform bool %s_b[%u];\n", prefix, shader->limits.constant_bool); + for (i = 0; i < WINED3D_MAX_CBS; ++i) + { + if (reg_maps->cb_sizes[i]) + shader_addline(buffer, "uniform vec4 %s_cb%u[%u];\n", prefix, i, reg_maps->cb_sizes[i]); + } + if (!pshader) { shader_addline(buffer, "uniform vec4 posFixup;\n"); @@ -1530,8 +1536,21 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * } break; + case WINED3DSPR_CONSTBUFFER: + if (reg->rel_addr) + { + struct glsl_src_param rel_param; + shader_glsl_add_src_param(ins, reg->rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); + sprintf(register_name, "%s_cb%u[%s + %u]", prefix, reg->idx, rel_param.param_str, reg->array_idx); + } + else + { + sprintf(register_name, "%s_cb%u[%u]", prefix, reg->idx, reg->array_idx); + } + break; + default: - FIXME("Unhandled register name Type(%d)\n", reg->type); + FIXME("Unhandled register type %#x.\n", reg->type); sprintf(register_name, "unrecognized_register"); break; } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d07809b..9223dce 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -533,6 +533,14 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st break; } } + else if (ins.handler_idx == WINED3DSIH_DCL_CONSTANT_BUFFER) + { + struct wined3d_shader_register *reg = &ins.declaration.src.reg; + if (reg->idx >= WINED3D_MAX_CBS) + ERR("Invalid CB index %u.\n", reg->idx); + else + reg_maps->cb_sizes[reg->idx] = reg->array_idx; + } else if (ins.handler_idx == WINED3DSIH_DEF) { struct wined3d_shader_lconst *lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(*lconst)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b14e85d..b5f0f4d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -409,6 +409,7 @@ enum wined3d_shader_rel_op #define MAX_REG_OUTPUT 32 #define MAX_CONST_I 16 #define MAX_CONST_B 16 +#define WINED3D_MAX_CBS 15 /* FIXME: This needs to go up to 2048 for * Shader model 3 according to msdn (and for software shaders) */ @@ -571,6 +572,7 @@ struct wined3d_shader_reg_maps WORD boolean_constants; /* MAX_CONST_B, 16 */ WORD local_int_consts; /* MAX_CONST_I, 16 */ WORD local_bool_consts; /* MAX_CONST_B, 16 */ + UINT cb_sizes[WINED3D_MAX_CBS]; enum wined3d_sampler_texture_type sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BYTE bumpmat; /* MAX_TEXTURES, 8 */

1 0

André Hentschel : winedbg: Improve and add branch operators for Thumb2 disassembler.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 1e1e181b2e31cde75057e5898d9eeabc1f46bc5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1e181b2e31cde75057e5898… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 3 00:20:40 2012 +0200 winedbg: Improve and add branch operators for Thumb2 disassembler. --- programs/winedbg/be_arm.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 6da8c9f..c7acfee 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -634,11 +634,29 @@ static WORD thumb_disasm_movshift(WORD inst, ADDRESS64 *addr) return 0; } -static UINT thumb2_disasm_branchlinked(UINT inst, ADDRESS64 *addr) +static UINT thumb2_disasm_branch(UINT inst, ADDRESS64 *addr) { - UINT offset = (((inst & 0x07ff0000) >> 4) | ((inst & 0x000007ff) << 1)) + 4; + UINT S = (inst >> 26) & 0x01; + UINT L = (inst >> 14) & 0x01; + UINT I1 = !(((inst >> 13) & 0x01) ^ S); + UINT C = !((inst >> 12) & 0x01); + UINT I2 = !(((inst >> 11) & 0x01) ^ S); + UINT offset = (inst & 0x000007ff) << 1; - dbg_printf("\n\tbl\t"); + if (C) + { + offset |= I1 << 19 | I2 << 18 | (inst & 0x003f0000) >> 4; + offset += 4; + if (S) offset |= 0x0fff << 20; + } + else + { + offset |= I1 << 23 | I2 << 22 | (inst & 0x03ff0000) >> 4; + offset += 4; + if (S) offset |= 0xff << 24; + } + + dbg_printf("\n\tb%s%s\t", L ? "l" : "", C ? tbl_cond[(inst >> 22) & 0x0f] : ""); db_printsym(addr->Offset + offset); return 0; } @@ -946,7 +964,7 @@ static const struct inst_thumb16 tbl_thumb16[] = { }; static const struct inst_arm tbl_thumb32[] = { - { 0xf800f800, 0xf000f800, thumb2_disasm_branchlinked }, + { 0xf800f000, 0xf0008000, thumb2_disasm_branch }, { 0xffc0f0c0, 0xfa80f080, thumb2_disasm_misc }, { 0xff80f000, 0xfa00f000, thumb2_disasm_dataprocessingreg }, { 0xff8000c0, 0xfb000000, thumb2_disasm_mul },

1 0

André Hentschel : winedbg: Add special register processing operators to Thumb2 disassembler.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 60af8659c99d9d13bf3be1f7d4b16100f3475c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60af8659c99d9d13bf3be1f7d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 3 00:21:17 2012 +0200 winedbg: Add special register processing operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index c7acfee..a045e49 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -92,6 +92,11 @@ static char const tbl_width_t2[][2] = { "b", "h", "", "?" }; +static char const tbl_special_regs_t2[][12] = { + "apsr", "iapsr", "eapsr", "xpsr", "rsvd", "ipsr", "epsr", "iepsr", "msp", "psp", "rsvd", "rsvd", + "rsvd", "rsvd", "rsvd", "rsvd", "primask", "basepri", "basepri_max", "faultmask", "control" +}; + static UINT db_get_inst(void* addr, int size) { UINT result = 0; @@ -661,6 +666,26 @@ static UINT thumb2_disasm_branch(UINT inst, ADDRESS64 *addr) return 0; } +static UINT thumb2_disasm_srtrans(UINT inst, ADDRESS64 *addr) +{ + UINT fromsr = (inst >> 21) & 0x03; + UINT sysreg = inst & 0xff; + + if (fromsr == 3 && get_nibble(inst,4) == 0x0f && sysreg <= 20) + { + dbg_printf("\n\tmrs\t%s, %s", tbl_regs[get_nibble(inst, 2)], tbl_special_regs_t2[sysreg]); + return 0; + } + + if (fromsr == 0 && sysreg <= 20) + { + dbg_printf("\n\tmsr\t%s, %s", tbl_special_regs_t2[sysreg], tbl_regs[get_nibble(inst, 4)]); + return 0; + } + + return inst; +} + static UINT thumb2_disasm_misc(UINT inst, ADDRESS64 *addr) { WORD op1 = (inst >> 20) & 0x03; @@ -965,6 +990,7 @@ static const struct inst_thumb16 tbl_thumb16[] = { static const struct inst_arm tbl_thumb32[] = { { 0xf800f000, 0xf0008000, thumb2_disasm_branch }, + { 0xff90f000, 0xf3808000, thumb2_disasm_srtrans }, { 0xffc0f0c0, 0xfa80f080, thumb2_disasm_misc }, { 0xff80f000, 0xfa00f000, thumb2_disasm_dataprocessingreg }, { 0xff8000c0, 0xfb000000, thumb2_disasm_mul },

1 0

André Hentschel : winedbg: Add hint operators to Thumb2 disassembler.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 613ebcd07043a7eefc45fd92b9933f9ab334ec79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613ebcd07043a7eefc45fd92b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 3 00:21:38 2012 +0200 winedbg: Add hint operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 38 +++++++++++++++++++++++++++++++++----- 1 files changed, 33 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index a045e49..37b3a5b 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -97,6 +97,10 @@ static char const tbl_special_regs_t2[][12] = { "rsvd", "rsvd", "rsvd", "rsvd", "primask", "basepri", "basepri_max", "faultmask", "control" }; +static char const tbl_hints_t2[][6] = { + "nop", "yield", "wfe", "wfi", "sev" +}; + static UINT db_get_inst(void* addr, int size) { UINT result = 0; @@ -686,6 +690,28 @@ static UINT thumb2_disasm_srtrans(UINT inst, ADDRESS64 *addr) return inst; } +static UINT thumb2_disasm_hint(UINT inst, ADDRESS64 *addr) +{ + WORD op1 = (inst >> 8) & 0x07; + WORD op2 = inst & 0xff; + + if (op1) return inst; + + if (op2 <= 4) + { + dbg_printf("\n\t%s", tbl_hints_t2[op2]); + return 0; + } + + if (op2 & 0xf0) + { + dbg_printf("\n\tdbg\t#%u", get_nibble(inst, 0)); + return 0; + } + + return inst; +} + static UINT thumb2_disasm_misc(UINT inst, ADDRESS64 *addr) { WORD op1 = (inst >> 20) & 0x03; @@ -989,8 +1015,10 @@ static const struct inst_thumb16 tbl_thumb16[] = { }; static const struct inst_arm tbl_thumb32[] = { - { 0xf800f000, 0xf0008000, thumb2_disasm_branch }, - { 0xff90f000, 0xf3808000, thumb2_disasm_srtrans }, + { 0xfff0f000, 0xf3e08000, thumb2_disasm_srtrans }, + { 0xfff0f000, 0xf3808000, thumb2_disasm_srtrans }, + { 0xfff0d000, 0xf3a08000, thumb2_disasm_hint }, + { 0xf8008000, 0xf0008000, thumb2_disasm_branch }, { 0xffc0f0c0, 0xfa80f080, thumb2_disasm_misc }, { 0xff80f000, 0xfa00f000, thumb2_disasm_dataprocessingreg }, { 0xff8000c0, 0xfb000000, thumb2_disasm_mul }, @@ -1033,7 +1061,7 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) size = ARM_INSN_SIZE; inst = db_get_inst( memory_to_linear_addr(addr), size ); while (a_ptr->func) { - if ((inst & a_ptr->mask) == a_ptr->pattern) { + if ((inst & a_ptr->mask) == a_ptr->pattern) { matched = 1; break; } @@ -1066,7 +1094,7 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) inst |= (tinst << 16); while (t2_ptr->func) { - if ((inst & t2_ptr->mask) == t2_ptr->pattern) { + if ((inst & t2_ptr->mask) == t2_ptr->pattern) { matched = 1; break; } @@ -1089,7 +1117,7 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) size = THUMB_INSN_SIZE; while (t_ptr->func) { - if ((tinst & t_ptr->mask) == t_ptr->pattern) { + if ((tinst & t_ptr->mask) == t_ptr->pattern) { matched = 1; break; }

1 0

André Hentschel : winedbg: Add control operators to Thumb2 disassembler.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 4deaee99276a28b7596d40196e22ba80e1b3688a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4deaee99276a28b7596d40196… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 3 00:23:21 2012 +0200 winedbg: Add control operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 37b3a5b..2a52b1d 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -712,6 +712,31 @@ static UINT thumb2_disasm_hint(UINT inst, ADDRESS64 *addr) return inst; } +static UINT thumb2_disasm_miscctrl(UINT inst, ADDRESS64 *addr) +{ + WORD op = (inst >> 4) & 0x0f; + + switch (op) + { + case 2: + dbg_printf("\n\tclrex"); + break; + case 4: + dbg_printf("\n\tdsb\t#%u", get_nibble(inst, 0)); + break; + case 5: + dbg_printf("\n\tdmb\t#%u", get_nibble(inst, 0)); + break; + case 6: + dbg_printf("\n\tisb\t#%u", get_nibble(inst, 0)); + break; + default: + return inst; + } + + return 0; +} + static UINT thumb2_disasm_misc(UINT inst, ADDRESS64 *addr) { WORD op1 = (inst >> 20) & 0x03; @@ -1018,6 +1043,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xfff0f000, 0xf3e08000, thumb2_disasm_srtrans }, { 0xfff0f000, 0xf3808000, thumb2_disasm_srtrans }, { 0xfff0d000, 0xf3a08000, thumb2_disasm_hint }, + { 0xfff0d000, 0xf3b08000, thumb2_disasm_miscctrl }, { 0xf8008000, 0xf0008000, thumb2_disasm_branch }, { 0xffc0f0c0, 0xfa80f080, thumb2_disasm_misc }, { 0xff80f000, 0xfa00f000, thumb2_disasm_dataprocessingreg },

1 0

André Hentschel : inetcpl.cpl: Reuse Internet icon.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: a2db974d191f404ac3651f22bdb01a8ac51513c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2db974d191f404ac3651f22b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 3 01:17:49 2012 +0200 inetcpl.cpl: Reuse Internet icon. --- dlls/inetcpl.cpl/inetcpl.h | 1 + dlls/inetcpl.cpl/inetcpl.rc | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h index bd1e55a..4aae292 100644 --- a/dlls/inetcpl.cpl/inetcpl.h +++ b/dlls/inetcpl.cpl/inetcpl.h @@ -54,6 +54,7 @@ static inline BOOL heap_free( void *mem ) /* icons */ #define ICO_MAIN 100 +#define ICO_INTERNET 1313 /* strings */ #define IDS_CPL_NAME 1 diff --git a/dlls/inetcpl.cpl/inetcpl.rc b/dlls/inetcpl.cpl/inetcpl.rc index 8ba7b4b..d666b65 100644 --- a/dlls/inetcpl.cpl/inetcpl.rc +++ b/dlls/inetcpl.cpl/inetcpl.rc @@ -129,3 +129,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: inetcpl.ico */ ICO_MAIN ICON "inetcpl.ico" +ICO_INTERNET ICON "inetcpl.ico"

1 0