August 2008 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Keep track of the last used device.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: 5d75939b09538444b125d31cf618e8424059097f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d75939b09538444b125d31cf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 31 13:29:50 2008 -0500 wined3d: Keep track of the last used device. --- dlls/wined3d/context.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4440848..68ec2a7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -29,6 +29,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION This->adapter->gl_info +/* The last used device. + * + * If the application creates multiple devices and switches between them, ActivateContext has to + * change the opengl context. This flag allows to keep track which device is active + */ +static IWineD3DDeviceImpl *last_device; + /***************************************************************************** * Context_MarkStateDirty * @@ -562,6 +569,8 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar */ if(oldDrawable && oldCtx) { pwglMakeCurrent(oldDrawable, oldCtx); + } else { + last_device = This; } This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); @@ -627,6 +636,8 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { TRACE("Destroying ctx %p\n", context); if(pwglGetCurrentContext() == context->glCtx){ pwglMakeCurrent(NULL, NULL); + } else { + last_device = NULL; } if(context->isPBuffer) { @@ -1125,7 +1136,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU } /* Activate the opengl context */ - if(context != This->activeContext) { + if(last_device != This || context != This->activeContext) { BOOL ret; /* Prevent an unneeded context switch as those are expensive */ @@ -1152,6 +1163,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU sizeof(*This->activeContext->pshader_const_dirty) * GL_LIMITS(pshader_constantsF)); } This->activeContext = context; + last_device = This; } /* We only need ENTER_GL for the gl calls made below and for the helper functions which make GL calls */

1 0

Stefan Dösinger : wined3d: Test formats for surface support.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: 438b6bd4c3d82736076a5a55f428a19c54513e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=438b6bd4c3d82736076a5a55f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 7 14:36:55 2008 -0500 wined3d: Test formats for surface support. --- dlls/wined3d/directx.c | 59 ++++++++++++++++++++++++++++++----------------- 1 files changed, 38 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index de4e1b9..b5eb406 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2410,6 +2410,17 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) return FALSE; } +static BOOL CheckSurfaceCapability(UINT Adapter, WINED3DFORMAT AdapterFormat, WINED3DFORMAT CheckFormat) { + /* All format that are supported for textures are supported for surfaces as well */ + if(CheckTextureCapability(Adapter, CheckFormat)) return TRUE; + /* All depth stencil formats are supported on surfaces */ + if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) return TRUE; + + /* Reject other formats */ + TRACE_(d3d_caps)("[FAILED]\n"); + return FALSE; +} + static BOOL CheckVertexTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) { if (!GL_LIMITS(vertex_samplers)) { @@ -2565,33 +2576,39 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt * - D3DUSAGE_RENDERTARGET */ - if(Usage & WINED3DUSAGE_DEPTHSTENCIL) { - if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) { - UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; - } else { - TRACE_(d3d_caps)("[FAILED] - No depthstencil support\n"); - return WINED3DERR_NOTAVAILABLE; + if(CheckSurfaceCapability(Adapter, AdapterFormat, CheckFormat)) { + if(Usage & WINED3DUSAGE_DEPTHSTENCIL) { + if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; + } else { + TRACE_(d3d_caps)("[FAILED] - No depthstencil support\n"); + return WINED3DERR_NOTAVAILABLE; + } } - } - if(Usage & WINED3DUSAGE_RENDERTARGET) { - if(CheckRenderTargetCapability(AdapterFormat, CheckFormat)) { - UsageCaps |= WINED3DUSAGE_RENDERTARGET; - } else { - TRACE_(d3d_caps)("[FAILED] - No rendertarget support\n"); - return WINED3DERR_NOTAVAILABLE; + if(Usage & WINED3DUSAGE_RENDERTARGET) { + if(CheckRenderTargetCapability(AdapterFormat, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_RENDERTARGET; + } else { + TRACE_(d3d_caps)("[FAILED] - No rendertarget support\n"); + return WINED3DERR_NOTAVAILABLE; + } } - } - /* Check QUERY_POSTPIXELSHADER_BLENDING support */ - if(Usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) { - if(CheckPostPixelShaderBlendingCapability(Adapter, CheckFormat)) { - UsageCaps |= WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING; - } else { - TRACE_(d3d_caps)("[FAILED] - No query post pixelshader blending support\n"); - return WINED3DERR_NOTAVAILABLE; + /* Check QUERY_POSTPIXELSHADER_BLENDING support */ + if(Usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) { + if(CheckPostPixelShaderBlendingCapability(Adapter, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING; + } else { + TRACE_(d3d_caps)("[FAILED] - No query post pixelshader blending support\n"); + return WINED3DERR_NOTAVAILABLE; + } } + } else { + TRACE_(d3d_caps)("[FAILED] - Not supported for plain surfaces\n"); + return WINED3DERR_NOTAVAILABLE; } + } else if(RType == WINED3DRTYPE_TEXTURE) { /* Texture allows: * - D3DUSAGE_AUTOGENMIPMAP

1 0

Stefan Dösinger : wined3d: Ask the ffp/shader/ blit implementation about format support.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: bfe7067973c38c3974389b68143259db2e46e97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe7067973c38c3974389b681… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 7 14:51:35 2008 -0500 wined3d: Ask the ffp/shader/blit implementation about format support. If a format is not supported natively by opengl, a shader may be able to convert it. Up to now, CheckDeviceFormat had magic knowldge which GL extensions lead to which supported format. This patch adds functions that allow CheckDeviceFormat to ask the actual implementation for its capabilities. --- dlls/wined3d/arb_program_shader.c | 19 ++++ dlls/wined3d/ati_fragment_shader.c | 14 +++ dlls/wined3d/baseshader.c | 18 ++++- dlls/wined3d/directx.c | 152 +++++++++++++++++----------------- dlls/wined3d/glsl_shader.c | 18 ++++ dlls/wined3d/nvidia_texture_shader.c | 7 ++ dlls/wined3d/state.c | 5 + dlls/wined3d/surface.c | 8 ++- dlls/wined3d/utils.c | 15 ++++ dlls/wined3d/wined3d_private.h | 3 + 10 files changed, 180 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bfe7067973c38c3974389…

1 0

Stefan Dösinger : wined3d: Start a framework for color conversion shaders in blits.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: fc6b9774862e62cfbd38f31374073957007e62d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc6b9774862e62cfbd38f3137… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 1 13:21:10 2008 -0500 wined3d: Start a framework for color conversion shaders in blits. --- dlls/wined3d/device.c | 23 +++++++++++++++++++++-- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/surface.c | 39 +++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 12 ++++++++++++ 4 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 43837b2..e1e01e2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2170,6 +2170,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR TRACE("Fragment pipeline private data couldn't be allocated\n"); goto err_out; } + hr = This->blitter->alloc_private(iface); + if(FAILED(hr)) { + TRACE("Blitter private data couldn't be allocated\n"); + goto err_out; + } /* Set up some starting GL setup */ @@ -2254,6 +2259,7 @@ err_out: IWineD3DStateBlock_Release((IWineD3DStateBlock *) This->stateBlock); This->stateBlock = NULL; } + This->blitter->free_private(iface); This->frag_pipe->free_private(iface); This->shader_backend->shader_free_private(iface); return hr; @@ -2371,6 +2377,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D } /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ + This->blitter->free_private(iface); This->frag_pipe->free_private(iface); This->shader_backend->shader_free_private(iface); @@ -7220,6 +7227,7 @@ void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_ This->depth_blt_rb_w = 0; This->depth_blt_rb_h = 0; } + This->blitter->free_private(iface); This->frag_pipe->free_private(iface); This->shader_backend->shader_free_private(iface); @@ -7263,15 +7271,26 @@ HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain * hr = This->shader_backend->shader_alloc_private(iface); if(FAILED(hr)) { ERR("Failed to recreate shader private data\n"); - return hr; + goto err_out; } hr = This->frag_pipe->alloc_private(iface); if(FAILED(hr)) { TRACE("Fragment pipeline private data couldn't be allocated\n"); - return hr; + goto err_out; + } + hr = This->blitter->alloc_private(iface); + if(FAILED(hr)) { + TRACE("Blitter private data couldn't be allocated\n"); + goto err_out; } return WINED3D_OK; + +err_out: + This->blitter->free_private(iface); + This->frag_pipe->free_private(iface); + This->shader_backend->shader_free_private(iface); + return hr; } static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRESENT_PARAMETERS* pPresentationParameters) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b5bc44d..de4e1b9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2933,6 +2933,15 @@ static const struct fragment_pipeline *select_fragment_implementation(UINT Adapt } } +static const struct blit_shader *select_blit_implementation(UINT Adapter, WINED3DDEVTYPE DeviceType) { + int vs_selected_mode; + int ps_selected_mode; + + select_shader_mode(&GLINFO_LOCATION, DeviceType, &ps_selected_mode, &vs_selected_mode); + return &ffp_blit; + +} + /* Note: d3d8 passes in a pointer to a D3DCAPS8 structure, which is a true subset of a D3DCAPS9 structure. However, it has to come via a void * as the d3d8 interface cannot import the d3d9 header */ @@ -3568,6 +3577,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, object->frag_pipe = frag_pipeline; compile_state_table(object->StateTable, object->multistate_funcs, &GLINFO_LOCATION, ffp_vertexstate_template, frag_pipeline, misc_state_template); + object->blitter = select_blit_implementation(Adapter, DeviceType); /* Prefer the vtable with functions optimized for single dirtifyable objects if the shader * model can deal with that. It is essentially the same, just with adjusted diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a114921..197ff16 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3467,8 +3467,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * glDrawBuffer(buffer); checkGLcall("glDrawBuffer"); - glEnable(Src->glDescription.target); - checkGLcall("glEnable(Src->glDescription.target)"); + myDevice->blitter->set_shader((IWineD3DDevice *) myDevice, Src->resource.format, + Src->glDescription.target, Src->pow2Width, Src->pow2Height); /* Bind the texture */ glBindTexture(Src->glDescription.target, Src->glDescription.textureName); @@ -3537,8 +3537,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * glBindTexture(Src->glDescription.target, 0); checkGLcall("glBindTexture(Src->glDescription.target, 0)"); /* Leave the opengl state valid for blitting */ - glDisable(Src->glDescription.target); - checkGLcall("glDisable(Src->glDescription.target)"); + myDevice->blitter->unset_shader((IWineD3DDevice *) myDevice); /* The draw buffer should only need to be restored if we were drawing to the front buffer, and there is a back buffer. * otherwise the context manager should choose between GL_BACK / offscreenDrawBuffer @@ -4623,3 +4622,35 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_GetImplType, IWineD3DSurfaceImpl_DrawOverlay }; +#undef GLINFO_LOCATION + +#define GLINFO_LOCATION device->adapter->gl_info +static HRESULT ffp_blit_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } +static void ffp_blit_free(IWineD3DDevice *iface) { } + +static HRESULT ffp_blit_set(IWineD3DDevice *iface, WINED3DFORMAT fmt, GLenum textype, UINT width, UINT height) { + glEnable(textype); + checkGLcall("glEnable(textype)"); + return WINED3D_OK; +} + +static void ffp_blit_unset(IWineD3DDevice *iface) { + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; + glDisable(GL_TEXTURE_2D); + checkGLcall("glDisable(GL_TEXTURE_2D)"); + if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { + glDisable(GL_TEXTURE_CUBE_MAP_ARB); + checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + } + if(GL_SUPPORT(ARB_TEXTURE_RECTANGLE)) { + glDisable(GL_TEXTURE_RECTANGLE_ARB); + checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)"); + } +} + +const struct blit_shader ffp_blit = { + ffp_blit_alloc, + ffp_blit_free, + ffp_blit_set, + ffp_blit_unset +}; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6f14790..70bac96 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -575,6 +575,16 @@ void compile_state_table(struct StateEntry *StateTable, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc); +/* Shaders for color conversions in blits */ +struct blit_shader { + HRESULT (*alloc_private)(IWineD3DDevice *iface); + void (*free_private)(IWineD3DDevice *iface); + HRESULT (*set_shader)(IWineD3DDevice *iface, WINED3DFORMAT fmt, GLenum textype, UINT width, UINT height); + void (*unset_shader)(IWineD3DDevice *iface); +}; + +extern const struct blit_shader ffp_blit; + /* The new context manager that should deal with onscreen and offscreen rendering */ struct WineD3DContext { /* State dirtification @@ -829,10 +839,12 @@ struct IWineD3DDeviceImpl const shader_backend_t *shader_backend; void *shader_priv; void *fragment_priv; + void *blit_priv; struct StateEntry StateTable[STATE_HIGHEST + 1]; /* Array of functions for states which are handled by more than one pipeline part */ APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; const struct fragment_pipeline *frag_pipe; + const struct blit_shader *blitter; /* To store */ BOOL view_ident; /* true iff view matrix is identity */

1 0

Stefan Dösinger : wined3d: Support YUV formats with GL_APPLE_ycbcr_422.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: 6a24b28b75d89336738451eb4843d8688162019b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a24b28b75d89336738451eb4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 19 10:55:42 2008 -0500 wined3d: Support YUV formats with GL_APPLE_ycbcr_422. --- dlls/d3d9/tests/visual.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 8 ++- dlls/wined3d/utils.c | 18 +++++-- 3 files changed, 138 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a24b28b75d8933673845…

1 0

Owen Rudge : uninstaller: Remove GUI portion of Wine uninstaller.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: 393fd51f79784149bfe84613079523dd715a1bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=393fd51f79784149bfe846130… Author: Owen Rudge <owen(a)owenrudge.net> Date: Tue Aug 19 21:12:21 2008 +0100 uninstaller: Remove GUI portion of Wine uninstaller. --- programs/uninstaller/Bg.rc | 18 ----- programs/uninstaller/Da.rc | 18 ----- programs/uninstaller/De.rc | 17 ----- programs/uninstaller/En.rc | 18 ----- programs/uninstaller/Eo.rc | 18 ----- programs/uninstaller/Es.rc | 18 ----- programs/uninstaller/Fi.rc | 18 ----- programs/uninstaller/Fr.rc | 18 ----- programs/uninstaller/Hu.rc | 18 ----- programs/uninstaller/It.rc | 18 ----- programs/uninstaller/Ko.rc | 18 ----- programs/uninstaller/Makefile.in | 2 +- programs/uninstaller/Nl.rc | 18 ----- programs/uninstaller/No.rc | 18 ----- programs/uninstaller/Pl.rc | 18 ----- programs/uninstaller/Pt.rc | 17 ----- programs/uninstaller/Ru.rc | 18 ----- programs/uninstaller/Si.rc | 18 ----- programs/uninstaller/Sv.rc | 18 ----- programs/uninstaller/Tr.rc | 18 ----- programs/uninstaller/main.c | 126 ++-------------------------------- programs/uninstaller/resource.h | 14 +--- programs/uninstaller/rsrc.rc | 5 -- programs/uninstaller/uninstaller.ico | Bin 766 -> 0 bytes 24 files changed, 8 insertions(+), 479 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=393fd51f79784149bfe84…

1 0

Alexander Nicolaysen Sørnes : regedit: Convert clipboard handling to unicode.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: 6168a7c60c69d1f7e46838680ef185183b0f475b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6168a7c60c69d1f7e46838680… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Aug 10 13:52:44 2008 +0200 regedit: Convert clipboard handling to unicode. --- programs/regedit/childwnd.c | 78 +++++++++++++++++++++++++++++++++++++++++++ programs/regedit/framewnd.c | 10 +++--- programs/regedit/main.c | 11 ++++++ programs/regedit/main.h | 13 +++++++ programs/regedit/regproc.c | 15 +------- programs/regedit/treeview.c | 59 ++++++++++++++++++++++++++++++++ 6 files changed, 168 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6168a7c60c69d1f7e4683…

1 0

Roderick Colenbrander : wined3d: Fix BltOverride regression.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: 4421e3ebe50a760cc0df6256d318d44b350479dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4421e3ebe50a760cc0df6256d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Aug 19 20:21:37 2008 +0000 wined3d: Fix BltOverride regression. --- dlls/wined3d/surface.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5e5303d..a114921 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3436,7 +3436,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * /* Activate the destination context, set it up for blitting */ - myDevice->activeContext->last_was_blit = FALSE; ActivateContext(myDevice, (IWineD3DSurface *) This, CTXUSAGE_BLIT); if(!dstSwapchain) {

1 0

Hongbo Ni : msvcmaker: Fix msvc project file generation under MinGW32.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: e0df1b9e578d6bd3eab1dc7dcabe404806f04d00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0df1b9e578d6bd3eab1dc7dc… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Aug 6 10:20:40 2008 +1000 msvcmaker: Fix msvc project file generation under MinGW32. When converting a makefile to a msvc .dsp file, if a line is ended with a back slash, it will be joined with next line. This patch changes the joining character from '\n' to a space in order to fix the bug of running MinGW32 on Windows. --- tools/winapi/msvcmaker | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 132d655..01b6d4b 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -135,7 +135,7 @@ MAKEFILE_IN: foreach my $makefile_in_file (@makefile_in_files) { chomp $line; if($lookahead) { $lookahead = 0; - $_ .= "\n" . $line; + $_ .= " " . $line; } else { $_ = $line; }

1 0

Alexander Nicolaysen Sørnes : regedit: Convert deletion to unicode.
by Alexandre Julliard 20 Aug '08

20 Aug '08

Module: wine Branch: master Commit: 04929756e74a34943a81054c1cba63ca1ba8b349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04929756e74a34943a81054c1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Aug 9 02:25:34 2008 +0200 regedit: Convert deletion to unicode. --- programs/regedit/edit.c | 30 ++++++++++++++++++++---------- programs/regedit/framewnd.c | 27 ++++++++++++++++++--------- programs/regedit/main.c | 2 ++ programs/regedit/main.h | 5 +++-- programs/regedit/regproc.h | 1 + 5 files changed, 44 insertions(+), 21 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 954e647..f9a5abf 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -386,22 +386,23 @@ done: return result; } -BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath) +BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath) { BOOL result = FALSE; LONG lRet; HKEY hKey; - - lRet = RegOpenKeyEx(hKeyRoot, keyPath, 0, KEY_READ|KEY_SET_VALUE, &hKey); + CHAR* keyPathA = GetMultiByteString(keyPath); + + lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ|KEY_SET_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { error_code_messagebox(hwnd, lRet); return FALSE; } - if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_BOX_TITLE, IDS_DELETE_BOX_TEXT, keyPath) != IDYES) + if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_BOX_TITLE, IDS_DELETE_BOX_TEXT, keyPathA) != IDYES) goto done; - lRet = SHDeleteKey(hKeyRoot, keyPath); + lRet = SHDeleteKeyW(hKeyRoot, keyPath); if (lRet != ERROR_SUCCESS) { error(hwnd, IDS_BAD_KEY, keyPath); goto done; @@ -410,24 +411,33 @@ BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath) done: RegCloseKey(hKey); + HeapFree(GetProcessHeap(), 0, keyPathA); return result; } -BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR valueName, BOOL showMessageBox) +BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox) { BOOL result = FALSE; LONG lRet; HKEY hKey; - LPCSTR visibleValueName = valueName ? valueName : g_pszDefaultValueName; + LPCWSTR visibleValueName = valueName ? valueName : g_pszDefaultValueNameW; + WCHAR empty = 0; - lRet = RegOpenKeyEx(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); + lRet = RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &hKey); if (lRet != ERROR_SUCCESS) return FALSE; if (showMessageBox) - if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_BOX_TITLE, IDS_DELETE_BOX_TEXT, visibleValueName) != IDYES) + { + LPSTR visibleValueNameA = GetMultiByteString(visibleValueName); + if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_BOX_TITLE, IDS_DELETE_BOX_TEXT, visibleValueNameA) != IDYES) + { + HeapFree(GetProcessHeap(), 0, visibleValueNameA); goto done; + } + HeapFree(GetProcessHeap(), 0, visibleValueNameA); + } - lRet = RegDeleteValue(hKey, valueName ? valueName : ""); + lRet = RegDeleteValueW(hKey, valueName ? valueName : &empty); if (lRet != ERROR_SUCCESS && valueName) { error(hwnd, IDS_BAD_VALUE, valueName); } diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index b661019..873a255 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -675,29 +675,38 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) break; case ID_EDIT_DELETE: if (GetFocus() == g_pChildWnd->hTreeWnd) { + WCHAR* keyPathW = GetWideString(keyPath); if (keyPath == 0 || *keyPath == 0) { MessageBeep(MB_ICONHAND); - } else if (DeleteKey(hWnd, hKeyRoot, keyPath)) { + } else if (DeleteKey(hWnd, hKeyRoot, keyPathW)) { DeleteNode(g_pChildWnd->hTreeWnd, 0); } + HeapFree(GetProcessHeap(), 0, keyPathW); } else if (GetFocus() == g_pChildWnd->hListWnd) { curIndex = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_SELECTED); while(curIndex != -1) { + WCHAR* valueNameW; + WCHAR* keyPathW; + valueName = GetItemText(g_pChildWnd->hListWnd, curIndex); curIndex = ListView_GetNextItem(g_pChildWnd->hListWnd, curIndex, LVNI_SELECTED); if(curIndex != -1 && firstItem) { - TCHAR title[256]; - TCHAR text[1024]; - if(!LoadString(hInst, IDS_DELETE_BOX_TITLE, title, COUNT_OF(title))) - lstrcpy(title, "Error"); - if(!LoadString(hInst, IDS_DELETE_BOX_TEXT_MULTIPLE, text, COUNT_OF(text))) - lstrcpy(text, "Unknown error string!"); - if (MessageBox(hWnd, text, title, MB_YESNO | MB_ICONEXCLAMATION) != IDYES) + if (MessageBoxW(hWnd, MAKEINTRESOURCEW(IDS_DELETE_BOX_TEXT_MULTIPLE), + MAKEINTRESOURCEW(IDS_DELETE_BOX_TITLE), + MB_YESNO | MB_ICONEXCLAMATION) != IDYES) break; } - if (!DeleteValue(hWnd, hKeyRoot, keyPath, valueName, curIndex==-1 && firstItem)) + valueNameW = GetWideString(valueName); + keyPathW = GetWideString(keyPath); + if (!DeleteValue(hWnd, hKeyRoot, keyPathW, valueNameW, curIndex==-1 && firstItem)) + { + HeapFree(GetProcessHeap(), 0, valueNameW); + HeapFree(GetProcessHeap(), 0, keyPathW); break; + } firstItem = FALSE; + HeapFree(GetProcessHeap(), 0, valueNameW); + HeapFree(GetProcessHeap(), 0, keyPathW); } RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, NULL); } diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 2b95287..2b37565 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -30,6 +30,7 @@ #include "main.h" TCHAR g_pszDefaultValueName[64]; +WCHAR g_pszDefaultValueNameW[64]; BOOL ProcessCmdLine(LPSTR lpCmdLine); @@ -171,6 +172,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, /* Initialize global strings */ LoadString(hInstance, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); LoadString(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueName, COUNT_OF(g_pszDefaultValueName)); + LoadStringW(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueNameW, COUNT_OF(g_pszDefaultValueNameW)); /* Store instance handle in our global variable */ hInst = hInstance; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 7547ea0..f0f0c64 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -91,6 +91,7 @@ extern TCHAR szTitle[]; extern const TCHAR szFrameClass[]; extern const TCHAR szChildClass[]; extern TCHAR g_pszDefaultValueName[]; +extern WCHAR g_pszDefaultValueNameW[]; /* about.c */ extern void ShowAboutBox(HWND hWnd); @@ -129,8 +130,8 @@ extern HTREEITEM FindNext(HWND hwndTV, HTREEITEM hItem, LPCTSTR sstring, int mod extern BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPTSTR newKeyName); extern BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, DWORD valueType, LPTSTR valueName); extern BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR valueName); -extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath); -extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR valueName, BOOL showMessageBox); +extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); +extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); extern BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCTSTR keyPath, LPCTSTR oldName, LPCTSTR newName); extern BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCTSTR keyPath, LPCTSTR newName); extern void error(HWND hwnd, INT resId, ...); diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 0621d8b..7122379 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -25,3 +25,4 @@ BOOL export_registry_key(CHAR *file_name, CHAR *reg_key_name); BOOL import_registry_file(FILE *in); void delete_registry_key(WCHAR *reg_key_name); WCHAR* GetWideString(const char* strA); +CHAR* GetMultiByteString(const WCHAR* strW);

1 0