April 2013 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Store IWebBrowserApp reference in HTMLDocumentObj.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: 8f323e9b91656f73111f549fed83d83f715d1c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f323e9b91656f73111f549fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 15 17:40:43 2013 +0200 mshtml: Store IWebBrowserApp reference in HTMLDocumentObj. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 2 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/oleobj.c | 13 +++++++------ dlls/mshtml/persist.c | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d0bb68e..f141bdf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -544,6 +544,7 @@ struct HTMLDocumentObj { IOleInPlaceUIWindow *ip_window; IAdviseSink *view_sink; IDocObjectService *doc_object_service; + IUnknown *webbrowser; DOCHOSTUIINFO hostinfo; @@ -557,7 +558,6 @@ struct HTMLDocumentObj { BOOL ui_active; BOOL window_active; BOOL hostui_setup; - BOOL is_webbrowser; BOOL container_locked; BOOL focus; BOOL has_popup; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index b585b68..3bae9f7 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -268,7 +268,7 @@ static void parse_complete(HTMLDocumentObj *doc) call_property_onchanged(&doc->basedoc.cp_container, 1005); call_explorer_69(doc); - if(doc->is_webbrowser && doc->usermode != EDITMODE && !(doc->basedoc.window->load_flags & BINDING_REFRESH)) + if(doc->webbrowser && doc->usermode != EDITMODE && !(doc->basedoc.window->load_flags & BINDING_REFRESH)) IDocObjectService_FireNavigateComplete2(doc->doc_object_service, &doc->basedoc.window->base.IHTMLWindow2_iface, 0); /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index d99d0aa..5661308 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2268,7 +2268,7 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis TRACE("%s\n", debugstr_w(display_uri)); - if(window->doc_obj && window->doc_obj->is_webbrowser && window == window->doc_obj->basedoc.window) { + if(window->doc_obj && window->doc_obj->webbrowser && window == window->doc_obj->basedoc.window) { if(!(flags & BINDING_REFRESH)) { BOOL cancel = FALSE; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index d62c306..c463ebe 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -246,8 +246,12 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->doc_object_service = NULL; } + if(This->doc_obj->webbrowser) { + IUnknown_Release(This->doc_obj->webbrowser); + This->doc_obj->webbrowser = NULL; + } + memset(&This->doc_obj->hostinfo, 0, sizeof(DOCHOSTUIINFO)); - This->doc_obj->is_webbrowser = FALSE; if(!pClientSite) return S_OK; @@ -348,11 +352,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite * embedder supports IWebBrowserApp. */ hres = do_query_service((IUnknown*)pClientSite, &IID_IWebBrowserApp, &IID_IWebBrowser2, (void**)&wb); - if(SUCCEEDED(hres)) { - This->doc_obj->is_webbrowser = TRUE; - IWebBrowser2_Release(wb); - } - + if(SUCCEEDED(hres)) + This->doc_obj->webbrowser = (IUnknown*)wb; IBrowserService_Release(browser_service); } } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index b2eefd3..0038942 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -77,7 +77,7 @@ static void notify_travellog_update(HTMLDocumentObj *doc) IOleCommandTarget *cmdtrg; HRESULT hres; - if(!doc->is_webbrowser) + if(!doc->webbrowser) return; hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&cmdtrg);

1 0

Stefan Dösinger : wined3d: Store ps 1. 4 texture types in ps_compile_args.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: 0680b1758df48222f6770d9c3de0def95ff97ea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0680b1758df48222f6770d9c3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 13 16:37:16 2013 +0200 wined3d: Store ps 1.4 texture types in ps_compile_args. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 3 +- dlls/wined3d/shader.c | 61 ++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 17 ++++++++-- 4 files changed, 56 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c3313ec..6683829 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4354,7 +4354,7 @@ static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_shader *sh shader_data->gl_shaders[shader_data->num_gl_shaders].args = *args; - pixelshader_update_samplers(&shader->reg_maps, device->stateBlock->state.textures); + pixelshader_update_samplers(shader, args->super.tex_types); if (!shader_buffer_init(&buffer)) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ab32abe..c84d73b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4627,7 +4627,6 @@ static GLhandleARB find_glsl_pshader(const struct wined3d_context *context, struct wined3d_shader_buffer *buffer, struct wined3d_shader *shader, const struct ps_compile_args *args, const struct ps_np2fixup_info **np2fixup_info) { - struct wined3d_state *state = &shader->device->stateBlock->state; struct glsl_ps_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; struct ps_np2fixup_info *np2fixup; @@ -4690,7 +4689,7 @@ static GLhandleARB find_glsl_pshader(const struct wined3d_context *context, memset(np2fixup, 0, sizeof(*np2fixup)); *np2fixup_info = args->np2_fixup ? np2fixup : NULL; - pixelshader_update_samplers(&shader->reg_maps, state->textures); + pixelshader_update_samplers(shader, args->tex_types); shader_buffer_clear(buffer); ret = shader_glsl_generate_pshader(context, buffer, shader, args, np2fixup); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 692e5b2..0431c1f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2062,6 +2062,39 @@ void find_ps_compile_args(const struct wined3d_state *state, } } } + if (shader->reg_maps.shader_version.major == 1 + && shader->reg_maps.shader_version.minor <= 4) + { + for (i = 0; i < shader->limits.sampler; ++i) + { + const struct wined3d_texture *texture = state->textures[i]; + + if (!shader->reg_maps.sampler_type[i]) + continue; + + /* Treat unbound textures as 2D. The dummy texture will provide + * the proper sample value. The tex_types bitmap defaults to + * 2D because of the memset. */ + if (!texture) + continue; + + switch (texture->target) + { + /* RECT textures are distinguished from 2D textures via np2_fixup */ + case GL_TEXTURE_RECTANGLE_ARB: + case GL_TEXTURE_2D: + break; + + case GL_TEXTURE_3D: + args->tex_types |= WINED3D_SHADER_TEX_3D << i * WINED3D_PSARGS_TEXTYPE_SHIFT; + break; + + case GL_TEXTURE_CUBE_MAP_ARB: + args->tex_types |= WINED3D_SHADER_TEX_CUBE << i * WINED3D_PSARGS_TEXTYPE_SHIFT; + break; + } + } + } for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { @@ -2274,46 +2307,32 @@ static HRESULT pixelshader_init(struct wined3d_shader *shader, struct wined3d_de return WINED3D_OK; } -void pixelshader_update_samplers(struct wined3d_shader_reg_maps *reg_maps, struct wined3d_texture * const *textures) +void pixelshader_update_samplers(struct wined3d_shader *shader, WORD tex_types) { + struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; enum wined3d_sampler_texture_type *sampler_type = reg_maps->sampler_type; unsigned int i; if (reg_maps->shader_version.major != 1) return; - for (i = 0; i < max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS); ++i) + for (i = 0; i < shader->limits.sampler; ++i) { /* We don't sample from this sampler. */ if (!sampler_type[i]) continue; - if (!textures[i]) + switch ((tex_types >> i * WINED3D_PSARGS_TEXTYPE_SHIFT) & WINED3D_PSARGS_TEXTYPE_MASK) { - WARN("No texture bound to sampler %u, using 2D.\n", i); - sampler_type[i] = WINED3DSTT_2D; - continue; - } - - switch (textures[i]->target) - { - case GL_TEXTURE_RECTANGLE_ARB: - case GL_TEXTURE_2D: - /* We have to select between texture rectangles and 2D - * textures later because 2.0 and 3.0 shaders only have - * WINED3DSTT_2D as well. */ + case WINED3D_SHADER_TEX_2D: sampler_type[i] = WINED3DSTT_2D; break; - case GL_TEXTURE_3D: + case WINED3D_SHADER_TEX_3D: sampler_type[i] = WINED3DSTT_VOLUME; break; - case GL_TEXTURE_CUBE_MAP_ARB: + case WINED3D_SHADER_TEX_CUBE: sampler_type[i] = WINED3DSTT_CUBE; break; - - default: - FIXME("Unrecognized texture type %#x, using 2D.\n", textures[i]->target); - sampler_type[i] = WINED3DSTT_2D; } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9ca2b10..2137585 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -746,13 +746,25 @@ enum fogmode { #define WINED3D_PSARGS_PROJECTED (1 << 3) #define WINED3D_PSARGS_TEXTRANSFORM_SHIFT 4 #define WINED3D_PSARGS_TEXTRANSFORM_MASK 0xf +#define WINED3D_PSARGS_TEXTYPE_SHIFT 2 +#define WINED3D_PSARGS_TEXTYPE_MASK 0x3 + +/* Similar to tex_types, except that it doesn't have 1d textures + * (can't be bound), rect textures (handled via np2_fixup) and + * none / unknown (treated as 2d and handled via dummy textures). */ +enum wined3d_shader_tex_types +{ + WINED3D_SHADER_TEX_2D = 0, + WINED3D_SHADER_TEX_3D = 1, + WINED3D_SHADER_TEX_CUBE = 2, +}; struct ps_compile_args { struct color_fixup_desc color_fixup[MAX_FRAGMENT_SAMPLERS]; enum vertexprocessing_mode vp_mode; enum fogmode fog; WORD tex_transform; /* ps 1.0-1.3, 4 textures */ - /* Texture types(2D, Cube, 3D) in ps 1.x */ + WORD tex_types; /* ps 1.0 - 1.4, 6 textures */ WORD srgb_correction; WORD np2_fixup; /* Bitmap for NP2 texcoord fixups (16 samplers max currently). @@ -2635,8 +2647,7 @@ struct wined3d_shader } u; }; -void pixelshader_update_samplers(struct wined3d_shader_reg_maps *reg_maps, - struct wined3d_texture * const *textures) DECLSPEC_HIDDEN; +void pixelshader_update_samplers(struct wined3d_shader *shader, WORD tex_types) DECLSPEC_HIDDEN; void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, struct ps_compile_args *args) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : Remove empty DLL_PROCESS_DETACH case statements.
by Alexandre Julliard April 15, 2013

April 15, 2013

1 0

Dmitry Timoshkov : kernel32: Make the ExitProcess test work on x86_64.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: c5fbb4a780b856ab7281d675d3ccd141287ceb6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5fbb4a780b856ab7281d675d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 15 18:10:00 2013 +0900 kernel32: Make the ExitProcess test work on x86_64. --- dlls/kernel32/tests/loader.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 61ec904..c88a995 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -408,7 +408,6 @@ static void test_Loader(void) if (nt_header.OptionalHeader.SectionAlignment >= si.dwPageSize) { const char *start; - int size; start = (const char *)hlib + nt_header.OptionalHeader.SizeOfHeaders; size = ALIGN_SIZE((ULONG_PTR)start, si.dwPageSize) - (ULONG_PTR)start; @@ -449,7 +448,6 @@ static void test_Loader(void) if (nt_header.OptionalHeader.SectionAlignment >= si.dwPageSize) { const char *start; - int size; start = (const char *)hlib + section.VirtualAddress + section.PointerToRawData + section.SizeOfRawData; size = ALIGN_SIZE((ULONG_PTR)start, si.dwPageSize) - (ULONG_PTR)start; @@ -1302,20 +1300,20 @@ static void child_process(const char *dll_name, DWORD target_offset) static void test_ExitProcess(void) { #include "pshpack1.h" -#ifdef JMP_EAX +#ifdef __x86_64__ static struct section_data { - BYTE mov_eax; + BYTE mov_rax[2]; void *target; - BYTE jmp_eax[2]; - } section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } }; + BYTE jmp_rax[2]; + } section_data = { { 0x48,0xb8 }, dll_entry_point, { 0xff,0xe0 } }; #else static struct section_data { - BYTE push; + BYTE mov_eax; void *target; - BYTE ret; - } section_data = { 0x68, dll_entry_point, 0xc3 }; + BYTE jmp_eax[2]; + } section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } }; #endif #include "poppack.h" static const char filler[0x1000]; @@ -1327,7 +1325,7 @@ static void test_ExitProcess(void) PROCESS_INFORMATION pi; STARTUPINFO si = { sizeof(si) }; -#ifndef __i386__ +#if !defined(__i386__) && !defined(__x86_64__) skip("x86 specific ExitProcess test\n"); return; #endif

1 0

Daniel Lehman : msvcr100: Implement _get_daylight.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: 3f39f377c82b04c3074098b6f61518ebc6ad6bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f39f377c82b04c3074098b6f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Apr 12 12:57:49 2013 -0700 msvcr100: Implement _get_daylight. --- dlls/msvcr100/msvcr100.c | 11 +++++++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 2735d17..d43cbbf 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -473,6 +473,17 @@ int CDECL _get_timezone(LONG *timezone) return 0; } +/********************************************************************* + * _get_daylight (MSVCR100.@) + */ +int CDECL _get_daylight(int *hours) +{ + if(!CHECK_PMT(hours != NULL)) return EINVAL; + + *hours = *(int*)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_daylight"); + return 0; +} + /* copied from dlls/msvcrt/heap.c */ #define SAVED_PTR(x) ((void *)((DWORD_PTR)((char *)x - sizeof(void *)) & \ ~(sizeof(void *) - 1))) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1982668..de346c4 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -866,7 +866,7 @@ @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ cdecl _get_current_locale() msvcrt._get_current_locale -@ stub _get_daylight +@ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 62631f7..29c7186 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1218,7 +1218,7 @@ @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ cdecl _get_current_locale() msvcrt._get_current_locale -@ stub _get_daylight +@ cdecl _get_daylight(ptr) msvcr100._get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fb76449..30e3fa5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -520,7 +520,7 @@ @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_amblksiz @ cdecl _get_current_locale() msvcrt._get_current_locale -@ stub _get_daylight +@ cdecl _get_daylight(ptr) msvcr100._get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index aec46f7..2db3042 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -515,7 +515,7 @@ @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_amblksiz @ cdecl _get_current_locale() msvcrt._get_current_locale -@ stub _get_daylight +@ cdecl _get_daylight(ptr) msvcr100._get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno

1 0

Henri Verbeet : d3drm: Avoid LPD3DRMPMESHLOADSTATUS.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: a6a38bb2591865248a2240cb0bb01c3b35227b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a38bb2591865248a2240cb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 15 08:14:54 2013 +0200 d3drm: Avoid LPD3DRMPMESHLOADSTATUS. --- include/d3drmobj.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 47e4d48..ea09186 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2021,7 +2021,7 @@ DECLARE_INTERFACE_(IDirect3DRMProgressiveMesh,IDirect3DRMVisual) /*** IDirect3DRMProgressiveMesh methods ***/ STDMETHOD(Load) (THIS_ LPVOID pObjLocation, LPVOID pObjId, D3DRMLOADOPTIONS dloLoadflags, D3DRMLOADTEXTURECALLBACK pCallback, LPVOID lpArg) PURE; - STDMETHOD(GetLoadStatus) (THIS_ LPD3DRMPMESHLOADSTATUS pStatus) PURE; + STDMETHOD(GetLoadStatus) (THIS_ D3DRMPMESHLOADSTATUS *status) PURE; STDMETHOD(SetMinRenderDetail) (THIS_ D3DVALUE d3dVal) PURE; STDMETHOD(Abort) (THIS_ DWORD flags) PURE; STDMETHOD(GetFaceDetail) (THIS_ LPDWORD pCount) PURE;

1 0

André Hentschel : ntdll: Respect the 8-bit part in the ARM relocation.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: e187c4aec2f8c5d3720fcfa5d2d7c52f8c7a417f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e187c4aec2f8c5d3720fcfa5d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 12 23:19:46 2013 +0200 ntdll: Respect the 8-bit part in the ARM relocation. --- dlls/ntdll/loader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 271907f..9642f62 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2180,7 +2180,7 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count { DWORD inst = *(INT_PTR *)((char *)page + offset); DWORD imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + - ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x000f); + ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); if ((inst & 0x8000fbf0) != 0x0000f240) ERR("wrong Thumb2 instruction %08x, expected MOVW\n", inst); @@ -2191,13 +2191,13 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count *(INT_PTR *)((char *)page + offset) = (inst & 0x8f00fbf0) + ((imm16 >> 1) & 0x0400) + ((imm16 >> 12) & 0x000f) + ((imm16 << 20) & 0x70000000) + - ((imm16 << 16) & 0x0f0000); + ((imm16 << 16) & 0xff0000); if (delta > 0xffff) { inst = *(INT_PTR *)((char *)page + offset + 4); imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + - ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x000f); + ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x00ff); if ((inst & 0x8000fbf0) != 0x0000f2c0) ERR("wrong Thumb2 instruction %08x, expected MOVT\n", inst); @@ -2209,7 +2209,7 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count ((imm16 >> 1) & 0x0400) + ((imm16 >> 12) & 0x000f) + ((imm16 << 20) & 0x70000000) + - ((imm16 << 16) & 0x0f0000); + ((imm16 << 16) & 0xff0000); } } break;

1 0

Henri Verbeet : d3drm: Get rid of Direct3DRM_create().
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: 06561779110c8d0b55fa9d71716776499144ca65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06561779110c8d0b55fa9d717… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 15 08:14:53 2013 +0200 d3drm: Get rid of Direct3DRM_create(). --- dlls/d3drm/d3drm.c | 11 +++++------ dlls/d3drm/d3drm_main.c | 10 ---------- dlls/d3drm/d3drm_private.h | 1 - 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index a18eb11..65dea6c 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1678,14 +1678,13 @@ static const struct IDirect3DRM3Vtbl Direct3DRM3_Vtbl = IDirect3DRM3Impl_GetOptions }; -HRESULT Direct3DRM_create(IUnknown** ppObj) +HRESULT WINAPI Direct3DRMCreate(IDirect3DRM **d3drm) { - IDirect3DRMImpl* object; + IDirect3DRMImpl *object; - TRACE("(%p)\n", ppObj); + TRACE("d3drm %p.\n", d3drm); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMImpl)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRM_iface.lpVtbl = &Direct3DRM_Vtbl; @@ -1693,7 +1692,7 @@ HRESULT Direct3DRM_create(IUnknown** ppObj) object->IDirect3DRM3_iface.lpVtbl = &Direct3DRM3_Vtbl; object->ref = 1; - *ppObj = (IUnknown*)&object->IDirect3DRM_iface; + *d3drm = &object->IDirect3DRM_iface; return S_OK; } diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index 2adc188..c9bf703 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -42,13 +42,3 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } return TRUE; } - -/*********************************************************************** - * (D3DRM.@) - */ -HRESULT WINAPI Direct3DRMCreate(LPDIRECT3DRM* ppDirect3DRM) -{ - TRACE("(%p)\n", ppDirect3DRM); - - return Direct3DRM_create((IUnknown**)ppDirect3DRM); -} diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 0283cad..ce896a1 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -24,7 +24,6 @@ #include "d3drm.h" #include "dxfile.h" -HRESULT Direct3DRM_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN; HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : mshtml: Implement IHTMLTable_get_tBodies.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: f91c0356e77aa0d7a1a010afe2534969110be891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91c0356e77aa0d7a1a010afe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 14 18:43:30 2013 +0400 mshtml: Implement IHTMLTable_get_tBodies. --- dlls/mshtml/htmltable.c | 17 +++++++++++++++-- dlls/mshtml/tests/dom.c | 11 ++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 85daf5b..f3c7ba8 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -379,8 +379,21 @@ static HRESULT WINAPI HTMLTable_get_tFoot(IHTMLTable *iface, IHTMLTableSection * static HRESULT WINAPI HTMLTable_get_tBodies(IHTMLTable *iface, IHTMLElementCollection **p) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLCollection *nscol = NULL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLTableElement_GetTBodies(This->nstable, &nscol); + if(NS_FAILED(nsres)) { + ERR("GetTBodies failed: %08x\n", nsres); + return E_FAIL; + } + + *p = create_collection_from_htmlcol(This->element.node.doc, nscol); + + nsIDOMHTMLCollection_Release(nscol); + return S_OK; } static HRESULT WINAPI HTMLTable_get_caption(IHTMLTable *iface, IHTMLTableCaption **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5cb0a94..44306ee 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5466,6 +5466,7 @@ static void test_table_elem(IHTMLElement *elem) static const elem_type_t row_types[] = {ET_TR,ET_TR}; static const elem_type_t all_types[] = {ET_TBODY,ET_TR,ET_TR,ET_TD,ET_TD}; + static const elem_type_t tbodies_types[] = {ET_TBODY}; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTable, (void**)&table); ok(hres == S_OK, "Could not get IHTMLTable iface: %08x\n", hres); @@ -5475,7 +5476,7 @@ static void test_table_elem(IHTMLElement *elem) col = NULL; hres = IHTMLTable_get_rows(table, &col); ok(hres == S_OK, "get_rows failed: %08x\n", hres); - ok(col != NULL, "get_ros returned NULL\n"); + ok(col != NULL, "get_rows returned NULL\n"); test_elem_collection((IUnknown*)col, row_types, sizeof(row_types)/sizeof(*row_types)); IHTMLElementCollection_Release(col); @@ -5492,6 +5493,14 @@ static void test_table_elem(IHTMLElement *elem) test_elem_all((IUnknown*)node, NULL, 0); IHTMLDOMNode_Release(node); + col = NULL; + hres = IHTMLTable_get_tBodies(table, &col); + ok(hres == S_OK, "get_tBodies failed: %08x\n", hres); + ok(col != NULL, "get_tBodies returned NULL\n"); + + test_elem_collection((IUnknown*)col, tbodies_types, sizeof(tbodies_types)/sizeof(*tbodies_types)); + IHTMLElementCollection_Release(col); + IHTMLTable_Release(table); }

1 0

André Hentschel : kernel32: Silence a noisy FIXME in GetConsoleKeyboardLayoutNameW.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: e1c884256e476eac448888a48e159de65a01d806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c884256e476eac448888a48… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 13 23:57:30 2013 +0200 kernel32: Silence a noisy FIXME in GetConsoleKeyboardLayoutNameW. --- dlls/kernel32/console.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index d6d1414..8405f4f 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1274,7 +1274,9 @@ BOOL WINAPI GetConsoleKeyboardLayoutNameA(LPSTR layoutName) */ BOOL WINAPI GetConsoleKeyboardLayoutNameW(LPWSTR layoutName) { - FIXME( "stub %p\n", layoutName); + static int once; + if (!once++) + FIXME( "stub %p\n", layoutName); return TRUE; }

1 0