April 2010 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Make "clear_rect" a RECT in IWineD3DDeviceImpl_ClearSurface().
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: 7b80c7d8c02a9efa2617de90f21cd6c3177a3ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b80c7d8c02a9efa2617de90f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 28 00:08:51 2010 +0200 wined3d: Make "clear_rect" a RECT in IWineD3DDeviceImpl_ClearSurface(). --- dlls/wined3d/device.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8e9e225..f285053 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4354,7 +4354,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, return WINED3D_OK; } -static BOOL is_full_clear(IWineD3DSurfaceImpl *target, const RECT *draw_rect, const WINED3DRECT *clear_rect) +static BOOL is_full_clear(IWineD3DSurfaceImpl *target, const RECT *draw_rect, const RECT *clear_rect) { /* partial draw rect */ if (draw_rect->left || draw_rect->top @@ -4363,9 +4363,9 @@ static BOOL is_full_clear(IWineD3DSurfaceImpl *target, const RECT *draw_rect, co return FALSE; /* partial clear rect */ - if (clear_rect && (clear_rect->x1 > 0 || clear_rect->y1 > 0 - || clear_rect->x2 < target->currentDesc.Width - || clear_rect->y2 < target->currentDesc.Height)) + if (clear_rect && (clear_rect->left > 0 || clear_rect->top > 0 + || clear_rect->right < target->currentDesc.Width + || clear_rect->bottom < target->currentDesc.Height)) return FALSE; return TRUE; @@ -4375,7 +4375,7 @@ static BOOL is_full_clear(IWineD3DSurfaceImpl *target, const RECT *draw_rect, co HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, DWORD Count, const WINED3DRECT *pRects, DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) { - const WINED3DRECT *clear_rect = (Count > 0 && pRects) ? pRects : NULL; + const RECT *clear_rect = (Count > 0 && pRects) ? (const RECT *)pRects : NULL; IWineD3DSurfaceImpl *depth_stencil = This->depth_stencil; GLbitfield glMask = 0; unsigned int i; @@ -4506,10 +4506,10 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac for (i = 0; i < Count; ++i) { /* Note gl uses lower left, width/height */ - IntersectRect(&current_rect, &draw_rect, (const RECT *)&clear_rect[i]); + IntersectRect(&current_rect, &draw_rect, &clear_rect[i]); TRACE("clear_rect[%u] %s, current_rect %s.\n", i, - wine_dbgstr_rect((const RECT *)&clear_rect[i]), + wine_dbgstr_rect(&clear_rect[i]), wine_dbgstr_rect(&current_rect)); /* Tests show that rectangles where x1 > x2 or y1 > y2 are ignored silently.

1 0

Henri Verbeet : wined3d: Check if the depth/ stencil surface has any valid location at the start of surface_load_ds_location ().
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: 83cf1ce8e1c39221013a8f1b2fee751fd59b0cc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83cf1ce8e1c39221013a8f1b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 28 00:08:52 2010 +0200 wined3d: Check if the depth/stencil surface has any valid location at the start of surface_load_ds_location(). --- dlls/wined3d/surface.c | 159 +++++++++++++++++++++++------------------------ 1 files changed, 78 insertions(+), 81 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2e2a925..8a934a8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4146,106 +4146,103 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_conte return; } + if (!(surface->Flags & SFLAG_LOCATIONS)) + { + FIXME("No up to date depth stencil location.\n"); + surface->Flags |= location; + return; + } + if (location == SFLAG_DS_OFFSCREEN) { - if (surface->Flags & SFLAG_DS_ONSCREEN) - { - GLint old_binding = 0; - GLenum bind_target; + GLint old_binding = 0; + GLenum bind_target; - TRACE("Copying onscreen depth buffer to depth texture.\n"); + TRACE("Copying onscreen depth buffer to depth texture.\n"); - ENTER_GL(); + ENTER_GL(); - if (!device->depth_blt_texture) { - glGenTextures(1, &device->depth_blt_texture); - } + if (!device->depth_blt_texture) + { + glGenTextures(1, &device->depth_blt_texture); + } - /* Note that we use depth_blt here as well, rather than glCopyTexImage2D - * directly on the FBO texture. That's because we need to flip. */ - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - if (surface->texture_target == GL_TEXTURE_RECTANGLE_ARB) - { - glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); - bind_target = GL_TEXTURE_RECTANGLE_ARB; - } else { - glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); - bind_target = GL_TEXTURE_2D; - } - glBindTexture(bind_target, device->depth_blt_texture); - glCopyTexImage2D(bind_target, surface->texture_level, surface->resource.format_desc->glInternal, - 0, 0, surface->currentDesc.Width, surface->currentDesc.Height, 0); - glTexParameteri(bind_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(bind_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(bind_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameteri(bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - glTexParameteri(bind_target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); - glTexParameteri(bind_target, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); - glBindTexture(bind_target, old_binding); - - /* Setup the destination */ - if (!device->depth_blt_rb) { - gl_info->fbo_ops.glGenRenderbuffers(1, &device->depth_blt_rb); - checkGLcall("glGenRenderbuffersEXT"); - } - if (device->depth_blt_rb_w != surface->currentDesc.Width - || device->depth_blt_rb_h != surface->currentDesc.Height) - { - gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, device->depth_blt_rb); - checkGLcall("glBindRenderbufferEXT"); - gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, - surface->currentDesc.Width, surface->currentDesc.Height); - checkGLcall("glRenderbufferStorageEXT"); - device->depth_blt_rb_w = surface->currentDesc.Width; - device->depth_blt_rb_h = surface->currentDesc.Height; - } + /* Note that we use depth_blt here as well, rather than glCopyTexImage2D + * directly on the FBO texture. That's because we need to flip. */ + context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + if (surface->texture_target == GL_TEXTURE_RECTANGLE_ARB) + { + glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); + bind_target = GL_TEXTURE_RECTANGLE_ARB; + } + else + { + glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); + bind_target = GL_TEXTURE_2D; + } + glBindTexture(bind_target, device->depth_blt_texture); + glCopyTexImage2D(bind_target, surface->texture_level, surface->resource.format_desc->glInternal, + 0, 0, surface->currentDesc.Width, surface->currentDesc.Height, 0); + glTexParameteri(bind_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(bind_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(bind_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glTexParameteri(bind_target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); + glTexParameteri(bind_target, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); + glBindTexture(bind_target, old_binding); + + /* Setup the destination */ + if (!device->depth_blt_rb) + { + gl_info->fbo_ops.glGenRenderbuffers(1, &device->depth_blt_rb); + checkGLcall("glGenRenderbuffersEXT"); + } + if (device->depth_blt_rb_w != surface->currentDesc.Width + || device->depth_blt_rb_h != surface->currentDesc.Height) + { + gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, device->depth_blt_rb); + checkGLcall("glBindRenderbufferEXT"); + gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, + surface->currentDesc.Width, surface->currentDesc.Height); + checkGLcall("glRenderbufferStorageEXT"); + device->depth_blt_rb_w = surface->currentDesc.Width; + device->depth_blt_rb_h = surface->currentDesc.Height; + } - context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, - GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, device->depth_blt_rb); - checkGLcall("glFramebufferRenderbufferEXT"); - context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, surface, FALSE); + context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); + gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, + GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, device->depth_blt_rb); + checkGLcall("glFramebufferRenderbufferEXT"); + context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, surface, FALSE); - /* Do the actual blit */ - surface_depth_blt(surface, gl_info, device->depth_blt_texture, - surface->currentDesc.Width, surface->currentDesc.Height, bind_target); - checkGLcall("depth_blt"); + /* Do the actual blit */ + surface_depth_blt(surface, gl_info, device->depth_blt_texture, + surface->currentDesc.Width, surface->currentDesc.Height, bind_target); + checkGLcall("depth_blt"); - if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER, &context->current_fbo->id); - else context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER, &context->current_fbo->id); + else context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - LEAVE_GL(); + LEAVE_GL(); - if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ - } - else - { - FIXME("No up to date depth stencil location\n"); - } + if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ } else if (location == SFLAG_DS_ONSCREEN) { - if (surface->Flags & SFLAG_DS_OFFSCREEN) - { - TRACE("Copying depth texture to onscreen depth buffer.\n"); + TRACE("Copying depth texture to onscreen depth buffer.\n"); - ENTER_GL(); + ENTER_GL(); - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - surface_depth_blt(surface, gl_info, surface->texture_name, - surface->currentDesc.Width, surface->currentDesc.Height, surface->texture_target); - checkGLcall("depth_blt"); + context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + surface_depth_blt(surface, gl_info, surface->texture_name, + surface->currentDesc.Width, surface->currentDesc.Height, surface->texture_target); + checkGLcall("depth_blt"); - if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER, &context->current_fbo->id); + if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER, &context->current_fbo->id); - LEAVE_GL(); + LEAVE_GL(); - if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ - } - else - { - FIXME("No up to date depth stencil location\n"); - } + if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ } else {

1 0

Michael Stefaniuc : progman: Use LANGUAGE as a global setting and not per resource.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: 11b8ffc2c925cc6747ad6a85a8af972fdab857e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b8ffc2c925cc6747ad6a85a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 28 01:07:20 2010 +0200 progman: Use LANGUAGE as a global setting and not per resource. --- programs/progman/Cs.rc | 13 ++++--------- programs/progman/De.rc | 15 +++++---------- programs/progman/En.rc | 15 +++++---------- programs/progman/Fr.rc | 7 +++---- programs/progman/Hu.rc | 13 ++++--------- programs/progman/It.rc | 16 +++++----------- programs/progman/Ko.rc | 15 +++++---------- programs/progman/Nl.rc | 13 ++++--------- programs/progman/No.rc | 15 +++++---------- programs/progman/Si.rc | 15 +++++---------- programs/progman/Sv.rc | 19 +++++++------------ programs/progman/Tr.rc | 13 ++++--------- 12 files changed, 56 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11b8ffc2c925cc6747ad6…

1 0

Michael Stefaniuc : wineconsole: Use the explicit W-form of the registry functions.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: cb2f2447ff4cae9a99b7b19824e1c0a37027af63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb2f2447ff4cae9a99b7b1982… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 28 01:07:32 2010 +0200 wineconsole: Use the explicit W-form of the registry functions. --- programs/wineconsole/registry.c | 64 +++++++++++++++++++------------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index 67f7577..2805f2a 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -88,64 +88,64 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) DWORD val; count = sizeof(val); - if (!RegQueryValueEx(hConKey, wszCursorSize, 0, &type, (LPBYTE)&val, &count)) + if (!RegQueryValueExW(hConKey, wszCursorSize, 0, &type, (LPBYTE)&val, &count)) cfg->cursor_size = val; count = sizeof(val); - if (!RegQueryValueEx(hConKey, wszCursorVisible, 0, &type, (LPBYTE)&val, &count)) + if (!RegQueryValueExW(hConKey, wszCursorVisible, 0, &type, (LPBYTE)&val, &count)) cfg->cursor_visible = val; count = sizeof(val); - if (!RegQueryValueEx(hConKey, wszEditionMode, 0, &type, (LPBYTE)&val, &count)) + if (!RegQueryValueExW(hConKey, wszEditionMode, 0, &type, (LPBYTE)&val, &count)) cfg->edition_mode = val; count = sizeof(val); - if (!RegQueryValueEx(hConKey, wszExitOnDie, 0, &type, (LPBYTE)&val, &count)) + if (!RegQueryValueExW(hConKey, wszExitOnDie, 0, &type, (LPBYTE)&val, &count)) cfg->exit_on_die = val; count = sizeof(cfg->face_name); - RegQueryValueEx(hConKey, wszFaceName, 0, &type, (LPBYTE)&cfg->face_name, &count); + RegQueryValueExW(hConKey, wszFaceName, 0, &type, (LPBYTE)&cfg->face_name, &count); count = sizeof(val); - if (!RegQueryValueEx(hConKey, wszFontSize, 0, &type, (LPBYTE)&val, &count)) + if (!RegQueryValueExW(hConKey, wszFontSize, 0, &type, (LPBYTE)&val, &count)) { cfg->cell_height = HIWORD(val); cfg->cell_width = LOWORD(val); } count = sizeof(val); - if (!RegQueryValueEx(hConKey, wszFontWeight, 0, &type, (LPBYTE)&val, &count)) + if (!RegQueryValueExW(hConKey, wszFontWeight, 0, &type, (LPBYTE)&val, &count)) cfg->font_weight = val; count = sizeof(val); - if (!RegQueryValueEx(hConKey, wszHistoryBufferSize, 0, &type, (LPBYTE)&val, &count)) + if (!RegQueryValueExW(hConKey, wszHistoryBufferSize, 0, &type, (LPBYTE)&val, &count)) cfg->history_size = val; count = sizeof(val); - if (!RegQueryValueEx(hConKey, wszHistoryNoDup, 0, &type, (LPBYTE)&val, &count)) + if (!RegQueryValueExW(hConKey, wszHistoryNoDup, 0, &type, (LPBYTE)&val, &count)) cfg->history_nodup = val; count = sizeof(val); - if (!RegQueryValueEx(hConKey, wszMenuMask, 0, &type, (LPBYTE)&val, &count)) + if (!RegQueryValueExW(hConKey, wszMenuMask, 0, &type, (LPBYTE)&val, &count)) cfg->menu_mask = val; count = sizeof(val); - if (!RegQueryValueEx(hConKey, wszQuickEdit, 0, &type, (LPBYTE)&val, &count)) + if (!RegQueryValueExW(hConKey, wszQuickEdit, 0, &type, (LPBYTE)&val, &count)) cfg->quick_edit = val; count = sizeof(val); - if (!RegQueryValueEx(hConKey, wszScreenBufferSize, 0, &type, (LPBYTE)&val, &count)) + if (!RegQueryValueExW(hConKey, wszScreenBufferSize, 0, &type, (LPBYTE)&val, &count)) { cfg->sb_height = HIWORD(val); cfg->sb_width = LOWORD(val); } count = sizeof(val); - if (!RegQueryValueEx(hConKey, wszScreenColors, 0, &type, (LPBYTE)&val, &count)) + if (!RegQueryValueExW(hConKey, wszScreenColors, 0, &type, (LPBYTE)&val, &count)) cfg->def_attr = val; count = sizeof(val); - if (!RegQueryValueEx(hConKey, wszWindowSize, 0, &type, (LPBYTE)&val, &count)) + if (!RegQueryValueExW(hConKey, wszWindowSize, 0, &type, (LPBYTE)&val, &count)) { cfg->win_height = HIWORD(val); cfg->win_width = LOWORD(val); @@ -188,7 +188,7 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) cfg->registry = NULL; /* then read global settings */ - if (!RegOpenKey(HKEY_CURRENT_USER, wszConsole, &hConKey)) + if (!RegOpenKeyW(HKEY_CURRENT_USER, wszConsole, &hConKey)) { WINECON_RegLoadHelper(hConKey, cfg); /* if requested, load part related to console title */ @@ -197,7 +197,7 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) HKEY hAppKey; cfg->registry = WINECON_CreateKeyName(appname); - if (!RegOpenKey(hConKey, cfg->registry, &hAppKey)) + if (!RegOpenKeyW(hConKey, cfg->registry, &hAppKey)) { WINECON_RegLoadHelper(hAppKey, cfg); RegCloseKey(hAppKey); @@ -220,45 +220,45 @@ static void WINECON_RegSaveHelper(HKEY hConKey, const struct config_data* cfg) WINECON_DumpConfig("save", cfg); val = cfg->cursor_size; - RegSetValueEx(hConKey, wszCursorSize, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + RegSetValueExW(hConKey, wszCursorSize, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); val = cfg->cursor_visible; - RegSetValueEx(hConKey, wszCursorVisible, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + RegSetValueExW(hConKey, wszCursorVisible, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); val = cfg->edition_mode; - RegSetValueEx(hConKey, wszEditionMode, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + RegSetValueExW(hConKey, wszEditionMode, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); val = cfg->exit_on_die; - RegSetValueEx(hConKey, wszExitOnDie, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + RegSetValueExW(hConKey, wszExitOnDie, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); - RegSetValueEx(hConKey, wszFaceName, 0, REG_SZ, (LPBYTE)&cfg->face_name, sizeof(cfg->face_name)); + RegSetValueExW(hConKey, wszFaceName, 0, REG_SZ, (LPBYTE)&cfg->face_name, sizeof(cfg->face_name)); val = MAKELONG(cfg->cell_width, cfg->cell_height); - RegSetValueEx(hConKey, wszFontSize, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + RegSetValueExW(hConKey, wszFontSize, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); val = cfg->font_weight; - RegSetValueEx(hConKey, wszFontWeight, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + RegSetValueExW(hConKey, wszFontWeight, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); val = cfg->history_size; - RegSetValueEx(hConKey, wszHistoryBufferSize, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + RegSetValueExW(hConKey, wszHistoryBufferSize, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); val = cfg->history_nodup; - RegSetValueEx(hConKey, wszHistoryNoDup, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + RegSetValueExW(hConKey, wszHistoryNoDup, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); val = cfg->menu_mask; - RegSetValueEx(hConKey, wszMenuMask, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + RegSetValueExW(hConKey, wszMenuMask, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); val = cfg->quick_edit; - RegSetValueEx(hConKey, wszQuickEdit, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + RegSetValueExW(hConKey, wszQuickEdit, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); val = MAKELONG(cfg->sb_width, cfg->sb_height); - RegSetValueEx(hConKey, wszScreenBufferSize, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + RegSetValueExW(hConKey, wszScreenBufferSize, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); val = cfg->def_attr; - RegSetValueEx(hConKey, wszScreenColors, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + RegSetValueExW(hConKey, wszScreenColors, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); val = MAKELONG(cfg->win_width, cfg->win_height); - RegSetValueEx(hConKey, wszWindowSize, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + RegSetValueExW(hConKey, wszWindowSize, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); } /****************************************************************** @@ -271,7 +271,7 @@ void WINECON_RegSave(const struct config_data* cfg) HKEY hConKey; WINE_TRACE("saving registry settings.\n"); - if (RegCreateKey(HKEY_CURRENT_USER, wszConsole, &hConKey)) + if (RegCreateKeyW(HKEY_CURRENT_USER, wszConsole, &hConKey)) { WINE_ERR("Can't open registry for saving\n"); } @@ -281,7 +281,7 @@ void WINECON_RegSave(const struct config_data* cfg) { HKEY hAppKey; - if (RegCreateKey(hConKey, cfg->registry, &hAppKey)) + if (RegCreateKeyW(hConKey, cfg->registry, &hAppKey)) { WINE_ERR("Can't open registry for saving\n"); }

1 0

Michael Stefaniuc : wineconsole: Use the explicit W types/functions in user .c.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: f6217640beb5df871f9cd75467fd660ea3da60cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6217640beb5df871f9cd7546… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 28 01:07:52 2010 +0200 wineconsole: Use the explicit W types/functions in user.c. --- programs/wineconsole/user.c | 162 +++++++++++++++++++++--------------------- 1 files changed, 81 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6217640beb5df871f9cd…

1 0

Michael Stefaniuc : wineconsole: Use the explicit W types/ functions in dialog.c.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: fe0c5cb68a7bc0d55a83f5adffb9035cd6b4d49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0c5cb68a7bc0d55a83f5adf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 28 01:08:48 2010 +0200 wineconsole: Use the explicit W types/functions in dialog.c. --- programs/wineconsole/dialog.c | 255 ++++++++++++++++++++--------------------- 1 files changed, 126 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe0c5cb68a7bc0d55a83f…

1 0

Michael Stefaniuc : wineconsole: Switch the rest to use the explicit W-forms.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: b3350899f20cfc341a6d2cf9e4f1c1cc53e34e10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3350899f20cfc341a6d2cf9e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 28 01:10:42 2010 +0200 wineconsole: Switch the rest to use the explicit W-forms. And compile with -DWINE_NO_UNICODE_MACROS. --- programs/wineconsole/Makefile.in | 2 +- programs/wineconsole/curses.c | 2 +- programs/wineconsole/winecon_user.h | 14 +++++++------- programs/wineconsole/wineconsole.c | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index f35767c..1763b18 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DUNICODE +EXTRADEFS = -DWINE_NO_UNICODE_MACROS TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 549efb4..773f985 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -882,7 +882,7 @@ static DWORD CALLBACK input_thread( void *arg ) else numEvent = WCCURSES_FillSimpleChar(ir, inchar); - if (numEvent) WriteConsoleInput(data->hConIn, ir, numEvent, &n); + if (numEvent) WriteConsoleInputW(data->hConIn, ir, numEvent, &n); } close( PRIVATE(data)->sync_pipe[0] ); return 0; diff --git a/programs/wineconsole/winecon_user.h b/programs/wineconsole/winecon_user.h index 51db26c..73a7701 100644 --- a/programs/wineconsole/winecon_user.h +++ b/programs/wineconsole/winecon_user.h @@ -45,13 +45,13 @@ struct inner_data_user { /* from user.c */ extern const COLORREF WCUSER_ColorMap[16]; extern BOOL WCUSER_GetProperties(struct inner_data*, BOOL); -extern BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONT* lf); +extern BOOL WCUSER_ValidateFont(const struct inner_data* data, const LOGFONTW* lf); extern BOOL WCUSER_ValidateFontMetric(const struct inner_data* data, - const TEXTMETRIC* tm, DWORD fontType); -extern HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONT* lf, - LONG* el); -extern void WCUSER_FillLogFont(LOGFONT* lf, const WCHAR* name, + const TEXTMETRICW* tm, DWORD fontType); +extern HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, + const LOGFONTW* lf, LONG* el); +extern void WCUSER_FillLogFont(LOGFONTW* lf, const WCHAR* name, UINT height, UINT weight); -extern void WCUSER_DumpLogFont(const char* pfx, const LOGFONT* lf, DWORD ft); -extern void WCUSER_DumpTextMetric(const TEXTMETRIC* tm, DWORD ft); +extern void WCUSER_DumpLogFont(const char* pfx, const LOGFONTW* lf, DWORD ft); +extern void WCUSER_DumpTextMetric(const TEXTMETRICW* tm, DWORD ft); diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 0e57176..5acb9ad 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -45,7 +45,7 @@ static void printf_res(UINT uResId, ...) va_list args; va_start(args, uResId); - LoadStringW(GetModuleHandle(NULL), uResId, buffer, sizeof(buffer)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), uResId, buffer, sizeof(buffer)/sizeof(buffer[0])); WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, ansi, sizeof(ansi), NULL, NULL); vprintf(ansi, args); va_end(args); @@ -561,7 +561,7 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); if (!data) return 0; - GetStartupInfo(&si); + GetStartupInfoW(&si); if (pid == 0) { @@ -672,9 +672,9 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna */ static BOOL WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) { - PROCESS_INFORMATION info; - STARTUPINFO startup; - BOOL done; + PROCESS_INFORMATION info; + STARTUPINFOW startup; + BOOL done; /* we're in the case wineconsole <exe> <options>... spawn the new process */ memset(&startup, 0, sizeof(startup)); @@ -696,7 +696,7 @@ static BOOL WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) return FALSE; } - done = CreateProcess(NULL, cmdLine, NULL, NULL, TRUE, 0L, NULL, NULL, &startup, &info); + done = CreateProcessW(NULL, cmdLine, NULL, NULL, TRUE, 0L, NULL, NULL, &startup, &info); /* we no longer need the handles passed to the child for the console */ CloseHandle(startup.hStdInput);

1 0

Andrew Nguyen : kernel32: Fail if a format placeholder is present without a format specifier in FormatMessageA /W.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: 3cb43a081b4b062330c82900fbd1dee03b00cba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb43a081b4b062330c82900f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Apr 28 04:20:19 2010 -0500 kernel32: Fail if a format placeholder is present without a format specifier in FormatMessageA/W. --- dlls/kernel32/format_msg.c | 9 +++++- dlls/kernel32/tests/format_msg.c | 51 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 4dbaf36..b6ffb7f 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -297,8 +297,9 @@ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr f++; if (!*f) { - ADD_TO_T('%'); - continue; + SetLastError(ERROR_INVALID_PARAMETER); + HeapFree(GetProcessHeap(), 0, target); + return NULL; } switch (*f) { @@ -433,6 +434,8 @@ DWORD WINAPI FormatMessageA( } target = format_message( FALSE, dwFlags, from, &format_args ); + if (!target) + goto failure; TRACE("-- %s\n", debugstr_w(target)); destlength = WideCharToMultiByte(CP_ACP, 0, target, -1, NULL, 0, NULL, NULL); @@ -522,6 +525,8 @@ DWORD WINAPI FormatMessageW( } target = format_message( TRUE, dwFlags, from, &format_args ); + if (!target) + goto failure; talloced = strlenW(target)+1; TRACE("-- %s\n",debugstr_w(target)); diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index f118831..c842409 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -58,6 +58,8 @@ static void test_message_from_string_wide(void) static const WCHAR t[] = {'t',0}; static const WCHAR e[] = {'e',0}; static const WCHAR s[] = {'s',0}; + static const WCHAR fmt_null[] = {'%',0}; + static const WCHAR fmt_tnull[] = {'t','e','s','t','%',0}; static const WCHAR fmt_1[] = {'%','1',0}; static const WCHAR fmt_12[] = {'%','1','%','2',0}; static const WCHAR fmt_123[] = {'%','1','%','3','%','2','%','1',0}; @@ -121,6 +123,9 @@ static void test_message_from_string_wide(void) static const WCHAR s_sp002sp003[] = {' ',' ','0','0','0','2',',',' ','0','0','0','0','3',0}; static const WCHAR s_sp001004[] = {' ',' ','0','0','1',',','0','0','0','0','0','4',0}; + static const WCHAR init_buf[] = {'x', 'x', 'x', 'x', 'x', 'x'}; + static const WCHAR broken_buf[] = {'t','e','s','t','x','x'}; + WCHAR out[0x100] = {0}; DWORD r, error; @@ -139,6 +144,29 @@ static void test_message_from_string_wide(void) ok(!lstrcmpW(test, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4, "failed: r=%d\n", r); + /* format placeholder with no specifier */ + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, fmt_null, 0, + 0, out, sizeof(out)/sizeof(WCHAR), NULL); + error = GetLastError(); + ok(!memcmp(out, init_buf, sizeof(init_buf)), + "Expected the buffer to be unchanged\n"); + ok(r==0, "succeeded: r=%d\n", r); + ok(error==ERROR_INVALID_PARAMETER, "last error %u\n", error); + + /* test string with format placeholder with no specifier */ + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, fmt_tnull, 0, + 0, out, sizeof(out)/sizeof(WCHAR), NULL); + error = GetLastError(); + ok(!memcmp(out, init_buf, sizeof(init_buf)) || + broken(!memcmp(out, broken_buf, sizeof(broken_buf))), /* W2K3+ */ + "Expected the buffer to be unchanged\n"); + ok(r==0, "succeeded: r=%d\n", r); + ok(error==ERROR_INVALID_PARAMETER, "last error %u\n", error); + /* using the format feature */ r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1s, 0, 0, out, sizeof(out)/sizeof(WCHAR), test); @@ -383,6 +411,7 @@ static void test_message_from_string(void) { CHAR out[0x100] = {0}; DWORD r; + static const char init_buf[] = {'x', 'x', 'x', 'x', 'x', 'x'}; static const WCHAR szwTest[] = { 't','e','s','t',0}; /* the basics */ @@ -391,6 +420,28 @@ static void test_message_from_string(void) ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); + /* format placeholder with no specifier */ + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "%", 0, + 0, out, sizeof(out)/sizeof(CHAR), NULL); + ok(!memcmp(out, init_buf, sizeof(init_buf)), + "Expected the buffer to be untouched\n"); + ok(r==0, "succeeded: r=%d\n", r); + ok(GetLastError()==ERROR_INVALID_PARAMETER, + "last error %u\n", GetLastError()); + + /* test string with format placeholder with no specifier */ + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "test%", 0, + 0, out, sizeof(out)/sizeof(CHAR), NULL); + ok(!memcmp(out, init_buf, sizeof(init_buf)), + "Expected the buffer to be untouched\n"); + ok(r==0, "succeeded: r=%d\n", r); + ok(GetLastError()==ERROR_INVALID_PARAMETER, + "last error %u\n", GetLastError()); + /* using the format feature */ r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!s!", 0, 0, out, sizeof(out)/sizeof(CHAR), "test");

1 0

Nikolay Sivov : ole32: Use -W versions of window/message calls.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: d819f13911deae2b1c14b34ab0d444f78e08de71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d819f13911deae2b1c14b34ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 27 23:41:04 2010 +0400 ole32: Use -W versions of window/message calls. --- dlls/ole32/ole2.c | 54 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 6bf79fd..6c0f8c1 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -110,7 +110,14 @@ static LONG OLE_moduleLockCount = 0; /* * Name of our registered window class. */ -static const char OLEDD_DRAGTRACKERCLASS[] = "WineDragDropTracker32"; +static const WCHAR OLEDD_DRAGTRACKERCLASS[] = + {'W','i','n','e','D','r','a','g','D','r','o','p','T','r','a','c','k','e','r','3','2',0}; + +/* + * Name of menu descriptor property. + */ +static const WCHAR prop_olemenuW[] = + {'P','R','O','P','_','O','L','E','M','e','n','u','D','e','s','c','r','i','p','t','o','r',0}; /* * This is the head of the Drop target container. @@ -478,6 +485,7 @@ HRESULT WINAPI DoDragDrop ( DWORD dwOKEffect, /* [in] effects allowed by the source */ DWORD *pdwEffect) /* [out] ptr to effects of the source */ { + static const WCHAR trackerW[] = {'T','r','a','c','k','e','r','W','i','n','d','o','w',0}; TrackerWindowInfo trackerInfo; HWND hwndTrackWindow; MSG msg; @@ -500,12 +508,12 @@ HRESULT WINAPI DoDragDrop ( trackerInfo.curTargetHWND = 0; trackerInfo.curDragTarget = 0; - hwndTrackWindow = CreateWindowA(OLEDD_DRAGTRACKERCLASS, "TrackerWindow", + hwndTrackWindow = CreateWindowW(OLEDD_DRAGTRACKERCLASS, trackerW, WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, 0, &trackerInfo); - if (hwndTrackWindow!=0) + if (hwndTrackWindow) { /* * Capture the mouse input @@ -517,7 +525,7 @@ HRESULT WINAPI DoDragDrop ( /* * Pump messages. All mouse input should go to the capture window. */ - while (!trackerInfo.trackingDone && GetMessageA(&msg, 0, 0, 0) ) + while (!trackerInfo.trackingDone && GetMessageW(&msg, 0, 0, 0) ) { trackerInfo.curMousePos.x = msg.pt.x; trackerInfo.curMousePos.y = msg.pt.y; @@ -548,7 +556,7 @@ HRESULT WINAPI DoDragDrop ( /* * Dispatch the messages only when it's not a keyboard message. */ - DispatchMessageA(&msg); + DispatchMessageW(&msg); } } @@ -1180,7 +1188,7 @@ static void OLEMenu_UnInitialize(void) */ static BOOL OLEMenu_InstallHooks( DWORD tid ) { - OleMenuHookItem *pHookItem = NULL; + OleMenuHookItem *pHookItem; /* Create an entry for the hook table */ if ( !(pHookItem = HeapAlloc(GetProcessHeap(), 0, @@ -1191,13 +1199,13 @@ static BOOL OLEMenu_InstallHooks( DWORD tid ) pHookItem->hHeap = GetProcessHeap(); /* Install a thread scope message hook for WH_GETMESSAGE */ - pHookItem->GetMsg_hHook = SetWindowsHookExA( WH_GETMESSAGE, OLEMenu_GetMsgProc, + pHookItem->GetMsg_hHook = SetWindowsHookExW( WH_GETMESSAGE, OLEMenu_GetMsgProc, 0, GetCurrentThreadId() ); if ( !pHookItem->GetMsg_hHook ) goto CLEANUP; /* Install a thread scope message hook for WH_CALLWNDPROC */ - pHookItem->CallWndProc_hHook = SetWindowsHookExA( WH_CALLWNDPROC, OLEMenu_CallWndProc, + pHookItem->CallWndProc_hHook = SetWindowsHookExW( WH_CALLWNDPROC, OLEMenu_CallWndProc, 0, GetCurrentThreadId() ); if ( !pHookItem->CallWndProc_hHook ) goto CLEANUP; @@ -1271,7 +1279,7 @@ CLEANUP: */ static OleMenuHookItem * OLEMenu_IsHookInstalled( DWORD tid ) { - OleMenuHookItem *pHookItem = NULL; + OleMenuHookItem *pHookItem; /* Do a simple linear search for an entry whose tid matches ours. * We really need a map but efficiency is not a concern here. */ @@ -1376,7 +1384,7 @@ static BOOL OLEMenu_SetIsServerMenu( HMENU hmenu, OleMenuDescriptor *pOleMenuDes */ static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lParam) { - LPCWPSTRUCT pMsg = NULL; + LPCWPSTRUCT pMsg; HOLEMENU hOleMenu = 0; OleMenuDescriptor *pOleMenuDescriptor = NULL; OleMenuHookItem *pHookItem = NULL; @@ -1395,7 +1403,7 @@ static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lPar * If the window has an OLEMenu property we may need to dispatch * the menu message to its active objects window instead. */ - hOleMenu = GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); + hOleMenu = GetPropW( pMsg->hwnd, prop_olemenuW ); if ( !hOleMenu ) goto NEXTHOOK; @@ -1413,7 +1421,7 @@ static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lPar pOleMenuDescriptor->bIsServerItem = FALSE; /* Send this message to the server as well */ - SendMessageA( pOleMenuDescriptor->hwndActiveObject, + SendMessageW( pOleMenuDescriptor->hwndActiveObject, pMsg->message, pMsg->wParam, pMsg->lParam ); goto NEXTHOOK; } @@ -1454,7 +1462,7 @@ static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lPar /* If the message was for the server dispatch it accordingly */ if ( pOleMenuDescriptor->bIsServerItem ) { - SendMessageA( pOleMenuDescriptor->hwndActiveObject, + SendMessageW( pOleMenuDescriptor->hwndActiveObject, pMsg->message, pMsg->wParam, pMsg->lParam ); } @@ -1481,7 +1489,7 @@ NEXTHOOK: */ static LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lParam) { - LPMSG pMsg = NULL; + LPMSG pMsg; HOLEMENU hOleMenu = 0; OleMenuDescriptor *pOleMenuDescriptor = NULL; OleMenuHookItem *pHookItem = NULL; @@ -1500,7 +1508,7 @@ static LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lPara * If the window has an OLEMenu property we may need to dispatch * the menu message to its active objects window instead. */ - hOleMenu = GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); + hOleMenu = GetPropW( pMsg->hwnd, prop_olemenuW ); if ( !hOleMenu ) goto NEXTHOOK; @@ -1671,7 +1679,7 @@ HRESULT WINAPI OleSetMenuDescriptor( pOleMenuDescriptor = NULL; /* Add a menu descriptor windows property to the frame window */ - SetPropA( hwndFrame, "PROP_OLEMenuDescriptor", hOleMenu ); + SetPropW( hwndFrame, prop_olemenuW, hOleMenu ); /* Install thread scope message hooks for WH_GETMESSAGE and WH_CALLWNDPROC */ if ( !OLEMenu_InstallHooks( GetCurrentThreadId() ) ) @@ -1684,7 +1692,7 @@ HRESULT WINAPI OleSetMenuDescriptor( return E_FAIL; /* Remove the menu descriptor property from the frame window */ - RemovePropA( hwndFrame, "PROP_OLEMenuDescriptor" ); + RemovePropW( hwndFrame, prop_olemenuW ); } return S_OK; @@ -1870,9 +1878,9 @@ void WINAPI ReleaseStgMedium( */ static void OLEDD_Initialize(void) { - WNDCLASSA wndClass; + WNDCLASSW wndClass; - ZeroMemory (&wndClass, sizeof(WNDCLASSA)); + ZeroMemory (&wndClass, sizeof(WNDCLASSW)); wndClass.style = CS_GLOBALCLASS; wndClass.lpfnWndProc = OLEDD_DragTrackerWindowProc; wndClass.cbClsExtra = 0; @@ -1881,7 +1889,7 @@ static void OLEDD_Initialize(void) wndClass.hbrBackground = 0; wndClass.lpszClassName = OLEDD_DRAGTRACKERCLASS; - RegisterClassA (&wndClass); + RegisterClassW (&wndClass); } /*** @@ -1958,7 +1966,7 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc( { LPCREATESTRUCTA createStruct = (LPCREATESTRUCTA)lParam; - SetWindowLongPtrA(hwnd, 0, (LONG_PTR)createStruct->lpCreateParams); + SetWindowLongPtrW(hwnd, 0, (LONG_PTR)createStruct->lpCreateParams); SetTimer(hwnd, DRAG_TIMER_ID, 50, NULL); break; @@ -1989,7 +1997,7 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc( /* * This is a window proc after all. Let's call the default. */ - return DefWindowProcA (hwnd, uMsg, wParam, lParam); + return DefWindowProcW (hwnd, uMsg, wParam, lParam); } /*** @@ -2257,8 +2265,8 @@ static void OLEUTL_ReadRegistryDWORDValue( DWORD* pdwValue) { char buffer[20]; + DWORD cbData = sizeof(buffer); DWORD dwKeyType; - DWORD cbData = 20; LONG lres; lres = RegQueryValueExA(regKey,

1 0

Nikolay Sivov : ole32: Avoid uninitialized value to be potentialy passed to UnhookWindowsHookEx.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: 16bd9d53b91df0adef75aa2cf9a518137f242964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16bd9d53b91df0adef75aa2cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 27 23:45:07 2010 +0400 ole32: Avoid uninitialized value to be potentialy passed to UnhookWindowsHookEx. --- dlls/ole32/ole2.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 6c0f8c1..0bb7437 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1197,6 +1197,7 @@ static BOOL OLEMenu_InstallHooks( DWORD tid ) pHookItem->tid = tid; pHookItem->hHeap = GetProcessHeap(); + pHookItem->CallWndProc_hHook = NULL; /* Install a thread scope message hook for WH_GETMESSAGE */ pHookItem->GetMsg_hHook = SetWindowsHookExW( WH_GETMESSAGE, OLEMenu_GetMsgProc,

1 0