January 2010 - Wine-Commits

Jacek Caban : mshtml: Store body event target in HTMLDocumentNode.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: e4a936a2d2f81d027945c787861e786578300928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a936a2d2f81d027945c7878… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 00:39:31 2010 +0100 mshtml: Store body event target in HTMLDocumentNode. --- dlls/mshtml/htmlbody.c | 4 ++-- dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlevent.h | 10 ---------- dlls/mshtml/htmlwindow.c | 29 ++++++++++++++++++++++++++--- dlls/mshtml/mshtml_private.h | 2 +- 6 files changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 1aa7313..7f22a4e 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -783,8 +783,8 @@ static event_target_t **HTMLBodyElement_get_event_target(HTMLDOMNode *iface) { HTMLBodyElement *This = HTMLBODY_NODE_THIS(iface); - return This->textcont.element.node.doc && This->textcont.element.node.doc->basedoc.window - ? &This->textcont.element.node.doc->basedoc.window->event_target + return This->textcont.element.node.doc + ? &This->textcont.element.node.doc->body_event_target : &This->textcont.element.node.event_target; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 54d3ca3..ac67a84 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1842,6 +1842,8 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) { HTMLDocumentNode *This = HTMLDOCNODE_NODE_THIS(iface); + if(This->body_event_target) + release_event_target(This->body_event_target); if(This->nsevent_listener) release_nsevents(This); if(This->catmgr) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2e2f1c9..d04b2e6 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -934,7 +934,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, nsIDOMNode *target, nsIDOM } } - call_event_handlers(doc, event_obj, doc->basedoc.doc_node->node.event_target, &doc->basedoc.cp_container, eid, + call_event_handlers(doc, event_obj, doc->node.event_target, &doc->basedoc.cp_container, eid, (IDispatch*)HTMLDOC(&doc->basedoc)); break; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index a0fb198..1a8572f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -74,13 +74,3 @@ static inline HRESULT get_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *v { return get_node_event(&doc->doc_node->node, eid, var); } - -static inline HRESULT set_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) -{ - return set_event_handler(&window->event_target, window->doc, eid, var); -} - -static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) -{ - return get_event_handler(&window->event_target, eid, var); -} diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6db3148..4a2babe 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -117,6 +117,26 @@ static HRESULT get_location(HTMLWindow *This, HTMLLocation **ret) return S_OK; } +static inline HRESULT set_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) +{ + if(!window->doc) { + FIXME("No document\n"); + return E_FAIL; + } + + return set_event_handler(&window->doc->body_event_target, window->doc, eid, var); +} + +static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) +{ + if(!window->doc) { + FIXME("No document\n"); + return E_FAIL; + } + + return get_event_handler(&window->doc->body_event_target, eid, var); +} + #define HTMLWINDOW2_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow2, iface) static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID riid, void **ppv) @@ -206,8 +226,6 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) if(This->screen) IHTMLScreen_Release(This->screen); - if(This->event_target) - release_event_target(This->event_target); for(i=0; i < This->global_prop_cnt; i++) heap_free(This->global_props[i].name); @@ -1391,7 +1409,12 @@ static HRESULT WINAPI HTMLWindow3_attachEvent(IHTMLWindow3 *iface, BSTR event, I TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); - return attach_event(&This->event_target, &This->doc_obj->basedoc, event, pDisp, pfResult); + if(!This->doc) { + FIXME("No document\n"); + return E_FAIL; + } + + return attach_event(&This->doc->body_event_target, &This->doc->basedoc, event, pDisp, pfResult); } static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, IDispatch *pDisp) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 491bc2a..68b3393 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -242,7 +242,6 @@ struct HTMLWindow { IMoniker *mon; LPOLESTR url; - event_target_t *event_target; IHTMLEventObj *event; SCRIPTMODE scriptmode; @@ -531,6 +530,7 @@ struct HTMLDocumentNode { nsIDOMHTMLDocument *nsdoc; HTMLDOMNode *nodes; BOOL content_ready; + event_target_t *body_event_target; IInternetSecurityManager *secmgr; ICatInformation *catmgr;

1 0

Jacek Caban : mshtml: Use nsIDocShell to load a page in set_moniker.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 2e6353d4bc6ffbac0d226d1f932c586c4dda9d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e6353d4bc6ffbac0d226d1f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 00:38:57 2010 +0100 mshtml: Use nsIDocShell to load a page in set_moniker. --- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/navigate.c | 59 ++++++++++++++++++++++------------------- dlls/mshtml/nsembed.c | 23 +--------------- dlls/mshtml/nsiface.idl | 6 +++- dlls/mshtml/nsio.c | 48 +++++++++++++++++++++++++++------- dlls/mshtml/persist.c | 33 ++++++++++------------- 6 files changed, 92 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e6353d4bc6ffbac0d226…

1 0

Henri Verbeet : wined3d: Add support for source and destination rectangles to swapchain_blit().
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: b5907e23cc595de1f0aba2a615c8c4510b433d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5907e23cc595de1f0aba2a61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 3 21:18:25 2010 +0100 wined3d: Add support for source and destination rectangles to swapchain_blit(). --- dlls/wined3d/swapchain.c | 51 ++++++++++++++++++++++++++++----------------- 1 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 445fbbf..c6b0b01 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -96,19 +96,23 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface) } /* A GL context is provided by the caller */ -static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context *context) +static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context *context, + const RECT *src_rect, const RECT *dst_rect) { - RECT window; IWineD3DDeviceImpl *device = This->device; IWineD3DSurfaceImpl *backbuffer = ((IWineD3DSurfaceImpl *) This->backBuffer[0]); - UINT w = backbuffer->currentDesc.Width; - UINT h = backbuffer->currentDesc.Height; + UINT src_w = src_rect->right - src_rect->left; + UINT src_h = src_rect->bottom - src_rect->top; GLenum gl_filter; const struct wined3d_gl_info *gl_info = context->gl_info; - GetClientRect(This->win_handle, &window); - if(w == window.right && h == window.bottom) gl_filter = GL_NEAREST; - else gl_filter = GL_LINEAR; + TRACE("swapchain %p, context %p, src_rect %s, dst_rect %s.\n", + This, context, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect)); + + if (src_w == dst_rect->right - dst_rect->left && src_h == dst_rect->bottom - dst_rect->top) + gl_filter = GL_NEAREST; + else + gl_filter = GL_LINEAR; if (gl_info->fbo_ops.glBlitFramebuffer) { @@ -124,8 +128,8 @@ static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_co IWineD3DDeviceImpl_MarkStateDirty(This->device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); /* Note that the texture is upside down */ - gl_info->fbo_ops.glBlitFramebuffer(0, 0, w, h, - window.left, window.bottom, window.right, window.top, + gl_info->fbo_ops.glBlitFramebuffer(src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, + dst_rect->left, dst_rect->bottom, dst_rect->right, dst_rect->top, GL_COLOR_BUFFER_BIT, gl_filter); checkGLcall("Swapchain present blit(EXT_framebuffer_blit)\n"); LEAVE_GL(); @@ -133,19 +137,19 @@ static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_co else { struct wined3d_context *context2; - float tex_left = 0; - float tex_top = 0; - float tex_right = w; - float tex_bottom = h; + float tex_left = src_rect->left; + float tex_top = src_rect->top; + float tex_right = src_rect->right; + float tex_bottom = src_rect->bottom; context2 = context_acquire(This->device, This->backBuffer[0], CTXUSAGE_BLIT); if(backbuffer->Flags & SFLAG_NORMCOORD) { - tex_left /= w; - tex_right /= w; - tex_top /= h; - tex_bottom /= h; + tex_left /= src_w; + tex_right /= src_w; + tex_top /= src_h; + tex_bottom /= src_h; } ENTER_GL(); @@ -171,7 +175,7 @@ static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_co * size - we want the GL drawable(=window) size. */ glPushAttrib(GL_VIEWPORT_BIT); - glViewport(window.left, window.top, window.right, window.bottom); + glViewport(dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom); glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity(); @@ -208,6 +212,7 @@ static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_co static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; struct wined3d_context *context; + RECT src_rect, dst_rect; unsigned int sync; int retval; @@ -316,7 +321,15 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO { FIXME("Render-to-fbo with WINED3DSWAPEFFECT_FLIP\n"); } - swapchain_blit(This, context); + + src_rect.left = 0; + src_rect.top = 0; + src_rect.right = This->presentParms.BackBufferWidth; + src_rect.bottom = This->presentParms.BackBufferHeight; + + GetClientRect(This->win_handle, &dst_rect); + + swapchain_blit(This, context, &src_rect, &dst_rect); } SwapBuffers(This->context[0]->hdc); /* TODO: cycle through the swapchain buffers */

1 0

Henri Verbeet : wined3d: Move "wrap_lookup" to struct wined3d_gl_info.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: f50b4c7d71c8074d0b29b2e9176329bf004942c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50b4c7d71c8074d0b29b2e91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 3 21:18:22 2010 +0100 wined3d: Move "wrap_lookup" to struct wined3d_gl_info. --- dlls/wined3d/basetexture.c | 17 ++++++++--------- dlls/wined3d/directx.c | 12 +++++------- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 7 +++---- 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index e671ec4..f3c3fe7 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -323,7 +323,8 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac } /* GL locking is done by the caller */ -static void apply_wrap(GLenum target, WINED3DTEXTUREADDRESS d3d_wrap, GLenum param, BOOL cond_np2) +static void apply_wrap(const struct wined3d_gl_info *gl_info, GLenum target, + WINED3DTEXTUREADDRESS d3d_wrap, GLenum param, BOOL cond_np2) { GLint gl_wrap; @@ -341,7 +342,7 @@ static void apply_wrap(GLenum target, WINED3DTEXTUREADDRESS d3d_wrap, GLenum par } else { - gl_wrap = wrap_lookup[d3d_wrap - WINED3DTADDRESS_WRAP]; + gl_wrap = gl_info->wrap_lookup[d3d_wrap - WINED3DTADDRESS_WRAP]; } TRACE("Setting param %#x to %#x for target %#x.\n", param, gl_wrap, target); @@ -352,7 +353,8 @@ static void apply_wrap(GLenum target, WINED3DTEXTUREADDRESS d3d_wrap, GLenum par /* GL locking is done by the caller (state handler) */ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], - const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) + const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], + const struct wined3d_gl_info *gl_info) { IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; DWORD state; @@ -373,19 +375,19 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, if(samplerStates[WINED3DSAMP_ADDRESSU] != gl_tex->states[WINED3DTEXSTA_ADDRESSU]) { state = samplerStates[WINED3DSAMP_ADDRESSU]; - apply_wrap(textureDimensions, state, GL_TEXTURE_WRAP_S, cond_np2); + apply_wrap(gl_info, textureDimensions, state, GL_TEXTURE_WRAP_S, cond_np2); gl_tex->states[WINED3DTEXSTA_ADDRESSU] = state; } if(samplerStates[WINED3DSAMP_ADDRESSV] != gl_tex->states[WINED3DTEXSTA_ADDRESSV]) { state = samplerStates[WINED3DSAMP_ADDRESSV]; - apply_wrap(textureDimensions, state, GL_TEXTURE_WRAP_T, cond_np2); + apply_wrap(gl_info, textureDimensions, state, GL_TEXTURE_WRAP_T, cond_np2); gl_tex->states[WINED3DTEXSTA_ADDRESSV] = state; } if(samplerStates[WINED3DSAMP_ADDRESSW] != gl_tex->states[WINED3DTEXSTA_ADDRESSW]) { state = samplerStates[WINED3DSAMP_ADDRESSW]; - apply_wrap(textureDimensions, state, GL_TEXTURE_WRAP_R, cond_np2); + apply_wrap(gl_info, textureDimensions, state, GL_TEXTURE_WRAP_R, cond_np2); gl_tex->states[WINED3DTEXSTA_ADDRESSW] = state; } @@ -475,9 +477,6 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, if (gl_tex->states[WINED3DTEXSTA_MAXANISOTROPY] != aniso) { - IWineD3DDeviceImpl *device = This->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) { glTexParameteri(textureDimensions, GL_TEXTURE_MAX_ANISOTROPY_EXT, aniso); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 487b435..e0e6880 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -156,8 +156,6 @@ static const struct { static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType, WINED3DFORMAT AdapterFormat, DWORD Usage, WINED3DRESOURCETYPE RType, WINED3DFORMAT CheckFormat, WINED3DSURFTYPE SurfaceType); -GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1]; - const struct min_lookup minMipLookup[] = { /* NONE POINT LINEAR */ @@ -2123,13 +2121,13 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str else gl_info->vidmem = WINE_DEFAULT_VIDMEM; - wrap_lookup[WINED3DTADDRESS_WRAP - WINED3DTADDRESS_WRAP] = GL_REPEAT; - wrap_lookup[WINED3DTADDRESS_MIRROR - WINED3DTADDRESS_WRAP] = + gl_info->wrap_lookup[WINED3DTADDRESS_WRAP - WINED3DTADDRESS_WRAP] = GL_REPEAT; + gl_info->wrap_lookup[WINED3DTADDRESS_MIRROR - WINED3DTADDRESS_WRAP] = gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT] ? GL_MIRRORED_REPEAT_ARB : GL_REPEAT; - wrap_lookup[WINED3DTADDRESS_CLAMP - WINED3DTADDRESS_WRAP] = GL_CLAMP_TO_EDGE; - wrap_lookup[WINED3DTADDRESS_BORDER - WINED3DTADDRESS_WRAP] = + gl_info->wrap_lookup[WINED3DTADDRESS_CLAMP - WINED3DTADDRESS_WRAP] = GL_CLAMP_TO_EDGE; + gl_info->wrap_lookup[WINED3DTADDRESS_BORDER - WINED3DTADDRESS_WRAP] = gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; - wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP] = + gl_info->wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP] = gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; /* Make sure there's an active HDC else the WGL extensions will fail */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8078118..e984529 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3520,7 +3520,7 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wine tex_impl->baseTexture.internal_preload(stateblock->textures[sampler], srgb ? SRGB_SRGB : SRGB_RGB); IWineD3DBaseTexture_BindTexture(stateblock->textures[sampler], srgb); basetexture_apply_state_changes(stateblock->textures[sampler], - stateblock->textureState[sampler], stateblock->samplerState[sampler]); + stateblock->textureState[sampler], stateblock->samplerState[sampler], gl_info); if (context->gl_info->supported[EXT_TEXTURE_LOD_BIAS]) { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 4eb57d2..49f8114 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4101,6 +4101,7 @@ struct wined3d_gl_info DWORD reserved_glsl_constants; DWORD quirks; BOOL supported[WINED3D_GL_EXT_COUNT]; + GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1]; struct wined3d_fbo_ops fbo_ops; /* GL function pointers */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 361967b..3cb0942 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -149,8 +149,6 @@ void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; #define MAX_ACTIVE_LIGHTS 8 #define MAX_CLIPPLANES WINED3DMAXUSERCLIPPLANES -extern GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1] DECLSPEC_HIDDEN; - struct min_lookup { GLenum mip[WINED3DTEXF_LINEAR + 1]; @@ -1758,8 +1756,9 @@ typedef struct IWineD3DBaseTextureImpl } IWineD3DBaseTextureImpl; void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, - const DWORD texture_states[WINED3D_HIGHEST_TEXTURE_STATE + 1], - const DWORD sampler_states[WINED3D_HIGHEST_SAMPLER_STATE + 1]) DECLSPEC_HIDDEN; + const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], + const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], + const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; void basetexture_cleanup(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;

1 0

André Hentschel : comctl32: Improve German translation .
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 9d9c4061f9775cf6f2746dc98ee1a9d5975280bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9c4061f9775cf6f2746dc98… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 1 18:27:59 2010 +0100 comctl32: Improve German translation. --- dlls/comctl32/comctl_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comctl_De.rc b/dlls/comctl32/comctl_De.rc index 4a94f23..87730c8 100644 --- a/dlls/comctl32/comctl_De.rc +++ b/dlls/comctl32/comctl_De.rc @@ -63,7 +63,7 @@ FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< &Zurück", IDC_BACK_BUTTON,71,138,50,14 DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "&Beenden", IDC_FINISH_BUTTON,121,138,50,14 + DEFPUSHBUTTON "&Fertig", IDC_FINISH_BUTTON,121,138,50,14 PUSHBUTTON "Abbrechen", IDCANCEL,178,138,50,14 PUSHBUTTON "&Hilfe", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

1 0

Dan Kegel : cmd: Fix echoing of multiline commands.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: b6e8e135996cbd0b4ed3f5d6292e9a8f70c69ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6e8e135996cbd0b4ed3f5d62… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Jan 2 17:04:05 2010 -0800 cmd: Fix echoing of multiline commands. --- programs/cmd/wcmdmain.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d5ef48c..e94cb3b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1269,13 +1269,6 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, handleExpansion(new_redir, (context != NULL), forVariable, forValue); cmd = new_cmd; - /* Show prompt before batch line IF echo is on and in batch program */ - if (context && echo_mode && (cmd[0] != '@')) { - WCMD_show_prompt(); - WCMD_output_asis ( cmd); - WCMD_output_asis ( newline); - } - /* * Changing default drive has to be handled as a special case. */ @@ -1774,6 +1767,12 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF /* Replace env vars if in a batch context */ if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); + /* Show prompt before batch line IF echo is on and in batch program */ + if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { + WCMD_show_prompt(); + WCMD_output_asis(extraSpace); + WCMD_output_asis(newline); + } /* Start with an empty string, copying to the command string */ curStringLen = 0; @@ -2106,6 +2105,11 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF } curPos = extraSpace; if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); + /* Continue to echo commands IF echo is on and in batch program */ + if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { + WCMD_output_asis(extraSpace); + WCMD_output_asis(newline); + } } }

1 0

Vincent Povirk : ole32: Remove fixme for transacted mode.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 0debd2fef4c7bb9778d14d77faf9062bb8828c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0debd2fef4c7bb9778d14d77f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Jan 3 11:29:42 2010 -0600 ole32: Remove fixme for transacted mode. --- dlls/ole32/storage32.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index e000535..0e78a6d 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -6355,9 +6355,6 @@ HRESULT WINAPI StgCreateDocfile( if (STGM_SHARE_MODE(grfMode) && !(grfMode & STGM_SHARE_DENY_NONE)) FIXME("Storage share mode not implemented.\n"); - if (grfMode & STGM_TRANSACTED) - FIXME("Transacted mode not implemented.\n"); - *ppstgOpen = 0; hFile = CreateFileW(pwcsName,

1 0

Andrew Eikum : hlink: Fix copy-paste typo.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 9b164cf6f405385795de1d910ff3b66ac7c233f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b164cf6f405385795de1d910… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Dec 31 16:37:27 2009 -0600 hlink: Fix copy-paste typo. --- dlls/hlink/hlink_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index f6c4184..1a15c08 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -126,7 +126,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, /*********************************************************************** - * HlinkNavigate (HLINK.@) + * HlinkCreateBrowseContext (HLINK.@) */ HRESULT WINAPI HlinkCreateBrowseContext( IUnknown* piunkOuter, REFIID riid, void** ppvObj) {

1 0

William Waghorn : wined3d: Added NVidia GT240 detection.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 0c582dca3adccc83a34727c0d8979989bd25fbb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c582dca3adccc83a34727c0d… Author: William Waghorn <willw(a)litany.me.uk> Date: Wed Dec 30 18:54:30 2009 -0800 wined3d: Added NVidia GT240 detection. --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f9bc752..487b435 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -954,6 +954,7 @@ static const struct driver_version_information driver_version_table[] = {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 15, 11, 8618 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 15, 11, 8618 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT240, "NVIDIA GeForce GT 240", 15, 11, 8618 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode. */ {VENDOR_ATI, CARD_ATI_RADEON_9500, "ATI Radeon 9500", 14, 10, 6764 }, @@ -1222,6 +1223,12 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * *vidmem = 1024; return CARD_NVIDIA_GEFORCE_GTX260; } + /* Geforce 200 - midend */ + if (strstr(gl_renderer, "GT 240")) + { + *vidmem = 512; + return CARD_NVIDIA_GEFORCE_GT240; + } /* Geforce9 - highend / Geforce 200 - midend (GTS 150/250 are based on the same core) */ if (strstr(gl_renderer, "9800") diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 47b89c9..361967b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1313,6 +1313,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, + CARD_NVIDIA_GEFORCE_GT240 = 0x0ca3, CARD_INTEL_845G = 0x2562, CARD_INTEL_I830G = 0x3577,

1 0

Dan Kegel : cmd: Echoed prompts are preceded by a blank line.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 27235ecb65408a23ca61dd64202abcd9b8df8c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27235ecb65408a23ca61dd642… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Jan 2 17:00:45 2010 -0800 cmd: Echoed prompts are preceded by a blank line. --- programs/cmd/wcmdmain.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5f3a0ca..d5ef48c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -325,6 +325,8 @@ static void WCMD_show_prompt (void) { } p = prompt_string; q = out_string; + *q++ = '\r'; + *q++ = '\n'; *q = '\0'; while (*p != '\0') { if (*p != '$') {

1 0