March 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Explicitly pass the texUnitMap to shader_glsl_load_vsamplers() and shader_glsl_load_psamplers().
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 2219749ae97e1ef951c04cda38215a4f69b28bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2219749ae97e1ef951c04cda3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 09:53:14 2009 +0100 wined3d: Explicitly pass the texUnitMap to shader_glsl_load_vsamplers() and shader_glsl_load_psamplers(). The general idea here is to reduce dependencies on the entire stateblock, and pass the real dependencies explicitly. This should make it clearer what context a shader really needs. --- dlls/wined3d/glsl_shader.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1fd3a05..9eefe64 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -178,9 +178,8 @@ static void print_glsl_info_log(const WineD3D_GL_Info *gl_info, GLhandleARB obj) /** * Loads (pixel shader) samplers */ -static void shader_glsl_load_psamplers(const WineD3D_GL_Info *gl_info, IWineD3DStateBlock *iface, GLhandleARB programId) +static void shader_glsl_load_psamplers(const WineD3D_GL_Info *gl_info, DWORD *tex_unit_map, GLhandleARB programId) { - IWineD3DStateBlockImpl* stateBlock = (IWineD3DStateBlockImpl*) iface; GLhandleARB name_loc; int i; char sampler_name[20]; @@ -189,7 +188,7 @@ static void shader_glsl_load_psamplers(const WineD3D_GL_Info *gl_info, IWineD3DS snprintf(sampler_name, sizeof(sampler_name), "Psampler%d", i); name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name)); if (name_loc != -1) { - DWORD mapped_unit = stateBlock->wineD3DDevice->texUnitMap[i]; + DWORD mapped_unit = tex_unit_map[i]; if (mapped_unit != WINED3D_UNMAPPED_STAGE && mapped_unit < GL_LIMITS(fragment_samplers)) { TRACE("Loading %s for texture %d\n", sampler_name, mapped_unit); @@ -202,9 +201,8 @@ static void shader_glsl_load_psamplers(const WineD3D_GL_Info *gl_info, IWineD3DS } } -static void shader_glsl_load_vsamplers(const WineD3D_GL_Info *gl_info, IWineD3DStateBlock *iface, GLhandleARB programId) +static void shader_glsl_load_vsamplers(const WineD3D_GL_Info *gl_info, DWORD *tex_unit_map, GLhandleARB programId) { - IWineD3DStateBlockImpl* stateBlock = (IWineD3DStateBlockImpl*) iface; GLhandleARB name_loc; char sampler_name[20]; int i; @@ -213,7 +211,7 @@ static void shader_glsl_load_vsamplers(const WineD3D_GL_Info *gl_info, IWineD3DS snprintf(sampler_name, sizeof(sampler_name), "Vsampler%d", i); name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name)); if (name_loc != -1) { - DWORD mapped_unit = stateBlock->wineD3DDevice->texUnitMap[MAX_FRAGMENT_SAMPLERS + i]; + DWORD mapped_unit = tex_unit_map[MAX_FRAGMENT_SAMPLERS + i]; if (mapped_unit != WINED3D_UNMAPPED_STAGE && mapped_unit < GL_LIMITS(combined_samplers)) { TRACE("Loading %s for texture %d\n", sampler_name, mapped_unit); @@ -3508,11 +3506,11 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use */ if(vshader_id) { /* Load vertex shader samplers */ - shader_glsl_load_vsamplers(gl_info, (IWineD3DStateBlock*)This->stateBlock, programId); + shader_glsl_load_vsamplers(gl_info, This->texUnitMap, programId); } if(pshader_id) { /* Load pixel shader samplers */ - shader_glsl_load_psamplers(gl_info, (IWineD3DStateBlock*)This->stateBlock, programId); + shader_glsl_load_psamplers(gl_info, This->texUnitMap, programId); } /* If the local constants do not have to be loaded with the environment constants,

1 0

Henri Verbeet : wined3d: Remove an unused field.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: e4ea7976a5aad795a17656f5df786ae19db1fbd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4ea7976a5aad795a17656f5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 09:53:14 2009 +0100 wined3d: Remove an unused field. --- dlls/wined3d/wined3d_private.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 443acbc..d04164a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2266,8 +2266,6 @@ typedef struct IWineD3DBaseShaderClass struct list constantsI; shader_reg_maps reg_maps; - UINT recompile_count; - /* Pointer to the parent device */ IWineD3DDevice *device; struct list shader_list_entry;

1 0

Henri Verbeet : wined3d: Remove a redundant check.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 81075d2db39273186f8298c3a042dc2e13caaab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81075d2db39273186f8298c3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 09:53:14 2009 +0100 wined3d: Remove a redundant check. This is redundant now, InitAdapters() will only be called once for each IWineD3DImpl object, as pointed out by Allan Tong. --- dlls/wined3d/directx.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 155d704..55b2b7e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4236,7 +4236,6 @@ BOOL InitAdapters(IWineD3DImpl *This) /* No need to hold any lock. The calling library makes sure only one thread calls * wined3d simultaneously */ - if (This->adapter_count) return This->adapters[0].opengl; TRACE("Initializing adapters\n");

1 0

Henri Verbeet : wined3d: Store a pointer to the format description in the resource.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 38178541b032edfd03086496b7c1c5c3ccfc01e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38178541b032edfd03086496b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 09:53:14 2009 +0100 wined3d: Store a pointer to the format description in the resource. The goal is to eventually use a pointer to the format description in most places where we currently use WINED3DFORMAT. IWineD3DSurfaceImpl for example has copies of several fields from the format description, but also needs to lookup the format description itself in several places. --- dlls/wined3d/resource.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index b4e49b1..34015f8 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -35,6 +35,7 @@ HRESULT resource_init(struct IWineD3DResourceClass *resource, WINED3DRESOURCETYP resource->ref = 1; resource->pool = pool; resource->format = format; + getFormatDescEntry(format, &device->adapter->gl_info, &resource->format_desc); resource->usage = usage; resource->size = size; resource->priority = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d04164a..8ed82fc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1236,6 +1236,7 @@ typedef struct IWineD3DResourceClass UINT size; DWORD usage; WINED3DFORMAT format; + const struct GlPixelFormatDesc *format_desc; DWORD priority; BYTE *allocatedMemory; /* Pointer to the real data location */ BYTE *heapMemory; /* Pointer to the HeapAlloced block of memory */

1 0

Henri Verbeet : wined3d: Get rid of some calls to getFormatDescEntry().
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 1dcf222ab2b82938a4fad60d897ea80727fb24d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcf222ab2b82938a4fad60d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 09:53:15 2009 +0100 wined3d: Get rid of some calls to getFormatDescEntry(). Use the format description stored in the resource instead. --- dlls/wined3d/device.c | 27 ++++++++++----------------- dlls/wined3d/state.c | 5 ++--- dlls/wined3d/surface.c | 12 ++++-------- dlls/wined3d/volume.c | 3 +-- 4 files changed, 17 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 63f7352..683c9f4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -911,8 +911,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, HRESULT hr; unsigned int pow2Width; unsigned int pow2Height; - const struct GlPixelFormatDesc *glDesc; - getFormatDescEntry(Format, &GLINFO_LOCATION, &glDesc); TRACE("(%p) : Width %d, Height %d, Levels %d, Usage %#x\n", This, Width, Height, Levels, Usage); TRACE("Format %#x (%s), Pool %#x, ppTexture %p, pSharedHandle %p, parent %p\n", @@ -1000,7 +998,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, object->width = Width; object->height = Height; - if(glDesc->Flags & WINED3DFMT_FLAG_FILTERING) { + if (object->resource.format_desc->Flags & WINED3DFMT_FLAG_FILTERING) + { object->baseTexture.minMipLookup = minMipLookup; object->baseTexture.magLookup = magLookup; } else { @@ -1068,7 +1067,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, tmpW = max(1, tmpW >> 1); tmpH = max(1, tmpH >> 1); } - object->baseTexture.shader_color_fixup = glDesc->color_fixup; + object->baseTexture.shader_color_fixup = object->resource.format_desc->color_fixup; object->baseTexture.internal_preload = texture_internal_preload; TRACE("(%p) : Created texture %p\n", This, object); @@ -1085,11 +1084,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa UINT tmpW; UINT tmpH; UINT tmpD; - const struct GlPixelFormatDesc *glDesc; HRESULT hr; - getFormatDescEntry(Format, &GLINFO_LOCATION, &glDesc); - /* TODO: It should only be possible to create textures for formats that are reported as supported */ if (WINED3DFMT_UNKNOWN >= Format) { @@ -1157,7 +1153,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa object->baseTexture.pow2Matrix[10] = 1.0; object->baseTexture.pow2Matrix[15] = 1.0; - if(glDesc->Flags & WINED3DFMT_FLAG_FILTERING) { + if (object->resource.format_desc->Flags & WINED3DFMT_FLAG_FILTERING) + { object->baseTexture.minMipLookup = minMipLookup; object->baseTexture.magLookup = magLookup; } else { @@ -1191,7 +1188,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa tmpH = max(1, tmpH >> 1); tmpD = max(1, tmpD >> 1); } - object->baseTexture.shader_color_fixup = glDesc->color_fixup; + object->baseTexture.shader_color_fixup = object->resource.format_desc->color_fixup; object->baseTexture.internal_preload = volumetexture_internal_preload; *ppVolumeTexture = (IWineD3DVolumeTexture *) object; @@ -1270,8 +1267,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface UINT tmpW; HRESULT hr; unsigned int pow2EdgeLength; - const struct GlPixelFormatDesc *glDesc; - getFormatDescEntry(Format, &GLINFO_LOCATION, &glDesc); /* TODO: It should only be possible to create textures for formats that are reported as supported */ @@ -1352,7 +1347,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface object->baseTexture.pow2Matrix[15] = 1.0; } - if(glDesc->Flags & WINED3DFMT_FLAG_FILTERING) { + if (object->resource.format_desc->Flags & WINED3DFMT_FLAG_FILTERING) + { object->baseTexture.minMipLookup = minMipLookup; object->baseTexture.magLookup = magLookup; } else { @@ -1390,7 +1386,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface } tmpW = max(1, tmpW >> 1); } - object->baseTexture.shader_color_fixup = glDesc->color_fixup; + object->baseTexture.shader_color_fixup = object->resource.format_desc->color_fixup; object->baseTexture.internal_preload = cubetexture_internal_preload; TRACE("(%p) : Created Cube Texture %p\n", This, object); @@ -5806,7 +5802,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetFrontBufferData(IWineD3DDevice *if static HRESULT WINAPI IWineD3DDeviceImpl_ValidateDevice(IWineD3DDevice *iface, DWORD* pNumPasses) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DBaseTextureImpl *texture; - const struct GlPixelFormatDesc *gl_info; DWORD i; TRACE("(%p) : %p\n", This, pNumPasses); @@ -5822,9 +5817,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ValidateDevice(IWineD3DDevice *iface, } texture = (IWineD3DBaseTextureImpl *) This->stateBlock->textures[i]; - if(!texture) continue; - getFormatDescEntry(texture->resource.format, &GLINFO_LOCATION, &gl_info); - if(gl_info->Flags & WINED3DFMT_FLAG_FILTERING) continue; + if (!texture || texture->resource.format_desc->Flags & WINED3DFMT_FLAG_FILTERING) continue; if(This->stateBlock->samplerState[i][WINED3DSAMP_MAGFILTER] != WINED3DTEXF_POINT) { WARN("Non-filterable texture and mag filter enabled on samper %u, returning E_FAIL\n", i); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c8f252f..390bed0 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -243,12 +243,11 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D if (stateblock->renderState[WINED3DRS_ALPHABLENDENABLE] || stateblock->renderState[WINED3DRS_EDGEANTIALIAS] || stateblock->renderState[WINED3DRS_ANTIALIASEDLINEENABLE]) { - const struct GlPixelFormatDesc *glDesc; - getFormatDescEntry(target->resource.format, &GLINFO_LOCATION, &glDesc); /* Disable blending in all cases even without pixelshaders. With blending on we could face a big performance penalty. * The d3d9 visual test confirms the behavior. */ - if(!(glDesc->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) { + if (!(target->resource.format_desc->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + { glDisable(GL_BLEND); checkGLcall("glDisable GL_BLEND"); return; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f2ad9eb..c4c0b4b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -445,12 +445,10 @@ void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int wi } if (!renderbuffer) { - const struct GlPixelFormatDesc *glDesc; - getFormatDescEntry(This->resource.format, &GLINFO_LOCATION, &glDesc); - GL_EXTCALL(glGenRenderbuffersEXT(1, &renderbuffer)); GL_EXTCALL(glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, renderbuffer)); - GL_EXTCALL(glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, glDesc->glInternal, width, height)); + GL_EXTCALL(glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, + This->resource.format_desc->glInternal, width, height)); entry = HeapAlloc(GetProcessHeap(), 0, sizeof(renderbuffer_entry_t)); entry->width = width; @@ -1604,9 +1602,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, GLenum *format, GLenum *internal, GLenum *type, CONVERT_TYPES *convert, int *target_bpp, BOOL srgb_mode) { BOOL colorkey_active = need_alpha_ck && (This->CKeyFlags & WINEDDSD_CKSRCBLT); - const struct GlPixelFormatDesc *glDesc; + const struct GlPixelFormatDesc *glDesc = This->resource.format_desc; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - getFormatDescEntry(This->resource.format, &GLINFO_LOCATION, &glDesc); /* Default values: From the surface */ *format = glDesc->glFormat; @@ -3838,10 +3835,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { /** Check against the maximum texture sizes supported by the video card **/ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + const struct GlPixelFormatDesc *glDesc = This->resource.format_desc; unsigned int pow2Width, pow2Height; - const struct GlPixelFormatDesc *glDesc; - getFormatDescEntry(This->resource.format, &GLINFO_LOCATION, &glDesc); /* Setup some glformat defaults */ This->glDescription.glFormat = glDesc->glFormat; This->glDescription.glFormatInternal = glDesc->glInternal; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 4bae1cb..c4bdb74 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -301,9 +301,8 @@ static HRESULT WINAPI IWineD3DVolumeImpl_SetContainer(IWineD3DVolume *iface, IWi static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int gl_level, BOOL srgb_mode) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; + const struct GlPixelFormatDesc *glDesc = This->resource.format_desc; WINED3DFORMAT format = This->resource.format; - const struct GlPixelFormatDesc *glDesc; - getFormatDescEntry(format, &GLINFO_LOCATION, &glDesc); TRACE("(%p) : level %u, format %s (0x%08x)\n", This, gl_level, debug_d3dformat(format), format);

1 0

Michael Stefaniuc : mshtml: Change long to LONG in mshtml.idl ( HTML*Element stuff).
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 491ae71e52b81376a3603c72067fbf95657acc31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=491ae71e52b81376a3603c720… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 12 01:43:18 2009 +0100 mshtml: Change long to LONG in mshtml.idl (HTML*Element stuff). --- dlls/mshtml/htmlelem.c | 10 +- dlls/mshtml/htmlelem2.c | 44 +++--- dlls/mshtml/htmlelemcol.c | 6 +- dlls/mshtml/htmlimg.c | 24 ++-- dlls/mshtml/htmlinput.c | 48 +++--- dlls/mshtml/htmlselect.c | 24 ++-- dlls/mshtml/htmltextarea.c | 12 +- dlls/mshtml/htmltextcont.c | 16 +- dlls/mshtml/tests/dom.c | 40 +++--- include/mshtml.idl | 400 ++++++++++++++++++++++---------------------- 10 files changed, 312 insertions(+), 312 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=491ae71e52b81376a3603…

1 0

Michael Stefaniuc : mshtml: Change long to LONG in mshtml.idl ( remaining stuff).
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: cb133a12d0a5c76d56efc653fd622f5e063da59a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb133a12d0a5c76d56efc653f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 12 01:43:31 2009 +0100 mshtml: Change long to LONG in mshtml.idl (remaining stuff). --- dlls/mshtml/htmlcomment.c | 6 +- dlls/mshtml/htmldoc.c | 8 +- dlls/mshtml/htmlevent.c | 26 ++++---- dlls/mshtml/htmlnode.c | 8 +- dlls/mshtml/htmlstyle.c | 16 ++-- dlls/mshtml/htmlstyle2.c | 12 ++-- dlls/mshtml/htmlstylesheet.c | 24 +++--- dlls/mshtml/htmltable.c | 20 +++--- dlls/mshtml/htmltablerow.c | 12 ++-- dlls/mshtml/htmltextnode.c | 6 +- dlls/mshtml/omnavigator.c | 2 +- dlls/mshtml/tests/dom.c | 30 ++++---- dlls/mshtml/txtrange.c | 24 +++--- include/mshtml.idl | 162 +++++++++++++++++++++--------------------- 14 files changed, 178 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb133a12d0a5c76d56efc…

1 0

Dylan Smith : winhlp32: Links are clicked on WM_LBUTTONDOWN not WM_LBUTTONUP.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: cbf820abb030cd8b5bc0bad51b59bddb322647b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf820abb030cd8b5bc0bad51… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Mar 12 01:35:33 2009 -0400 winhlp32: Links are clicked on WM_LBUTTONDOWN not WM_LBUTTONUP. This behaviour was tested against native winhlp32 by pressing down the left mouse button and holding it while over the link to avoid having WM_LBUTTONUP sent. I noticed that the action for clicking the link happened right away, without waiting for me to release the mouse button. --- programs/winhlp32/winhelp.c | 12 +++--------- programs/winhlp32/winhelp.h | 1 - 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index db9769a..b042a5a 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -842,12 +842,7 @@ static BOOL WINHELP_HandleTextMouse(WINHELP_WINDOW* win, UINT msg, LPARAM lParam switch (msg) { case WM_LBUTTONDOWN: - if ((win->current_link = WINHELP_FindLink(win, lParam))) - ret = TRUE; - break; - - case WM_LBUTTONUP: - if ((link = WINHELP_FindLink(win, lParam)) && link == win->current_link) + if ((link = WINHELP_FindLink(win, lParam))) { HLPFILE_WINDOWINFO* wi; @@ -882,7 +877,6 @@ static BOOL WINHELP_HandleTextMouse(WINHELP_WINDOW* win, UINT msg, LPARAM lParam } ret = TRUE; } - win->current_link = NULL; break; } return ret; @@ -917,11 +911,11 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam (HWND)lParam == Globals.active_popup->hMainWnd || GetWindow((HWND)lParam, GW_OWNER) == Globals.active_win->hMainWnd) break; - case WM_LBUTTONUP: case WM_LBUTTONDOWN: - if (WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam) && msg == WM_LBUTTONDOWN) + if (WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam)) return FALSE; /* fall through */ + case WM_LBUTTONUP: case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: case WM_NCLBUTTONDOWN: diff --git a/programs/winhlp32/winhelp.h b/programs/winhlp32/winhelp.h index 407089e..994547b 100644 --- a/programs/winhlp32/winhelp.h +++ b/programs/winhlp32/winhelp.h @@ -90,7 +90,6 @@ typedef struct tagWinHelp HBRUSH hBrush; HLPFILE_WINDOWINFO* info; - HLPFILE_LINK* current_link; WINHELP_PAGESET back; unsigned font_scale; /* 0 = small, 1 = normal, 2 = large */

1 0

Alexandre Julliard : wine.inf: Fix typo in the shift_jis entry.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 3df2c88dcbca9c967abb51c2ef401f16c215944e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3df2c88dcbca9c967abb51c2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 12 11:50:56 2009 +0100 wine.inf: Fix typo in the shift_jis entry. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 58fd911..aa82cc1 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -241,7 +241,7 @@ HKCR,MIME\Database\Charset\koi8-ru,"InternetEncoding",0x10003,21866 HKCR,MIME\Database\Charset\ks_c_5601-1987,"Codepage",0x10003,949 HKCR,MIME\Database\Charset\ks_c_5601-1987,"InternetEncoding",0x10003,949 HKCR,MIME\Database\Charset\shift_jis,"Codepage",0x10003,932 -HKCR,MIME\Database\Charset\shift_jis,"InternetEncoding",0x1003,932 +HKCR,MIME\Database\Charset\shift_jis,"InternetEncoding",0x10003,932 HKCR,MIME\Database\Charset\unicode,"Codepage",0x10003,1200 HKCR,MIME\Database\Charset\unicode,"InternetEncoding",0x10003,1200 HKCR,MIME\Database\Charset\unicodeFFFE,"Codepage",0x10003,1200

1 0

Alexandre Julliard : rpcrt4: Use RpcMsg-> Buffer instead of BufferStart since the latter isn't always set.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 85f8f30a6548a181f41f378160d66477098b275e URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f8f30a6548a181f41f37816… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 12 11:51:35 2009 +0100 rpcrt4: Use RpcMsg->Buffer instead of BufferStart since the latter isn't always set. --- dlls/rpcrt4/ndr_marshall.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b29186c..e983f61 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -3278,13 +3278,13 @@ unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, /* get the buffer pointer after complex array data, but before * pointer data */ - pStubMsg->BufferLength = pStubMsg->Buffer - pStubMsg->BufferStart; + pStubMsg->BufferLength = pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer; pStubMsg->IgnoreEmbeddedPointers = 1; NdrComplexStructBufferSize(pStubMsg, pMemory, pFormat); pStubMsg->IgnoreEmbeddedPointers = saved_ignore_embedded; /* save it for use by embedded pointer code later */ - pStubMsg->PointerBufferMark = pStubMsg->BufferStart + pStubMsg->BufferLength; + pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; TRACE("difference = 0x%x\n", pStubMsg->PointerBufferMark - pStubMsg->Buffer); pointer_buffer_mark_set = 1; @@ -3840,14 +3840,14 @@ unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, /* get the buffer pointer after complex array data, but before * pointer data */ - pStubMsg->BufferLength = pStubMsg->Buffer - pStubMsg->BufferStart; + pStubMsg->BufferLength = pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer; pStubMsg->IgnoreEmbeddedPointers = 1; NdrComplexArrayBufferSize(pStubMsg, pMemory, pFormat); pStubMsg->IgnoreEmbeddedPointers = saved_ignore_embedded; /* save it for use by embedded pointer code later */ - pStubMsg->PointerBufferMark = pStubMsg->BufferStart + pStubMsg->BufferLength; - TRACE("difference = 0x%x\n", pStubMsg->Buffer - pStubMsg->BufferStart); + pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; + TRACE("difference = 0x%x\n", pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer); pointer_buffer_mark_set = 1; /* restore fields */

1 0