June 2011 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Handle disabled components properly in the ProcessComponents action.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 597e16643384e689272c4fdaf352fb5ca16929ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=597e16643384e689272c4fdaf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 7 10:35:05 2011 +0200 msi: Handle disabled components properly in the ProcessComponents action. --- dlls/msi/action.c | 64 +++++++++++++++++++++++++++------------------------- 1 files changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5f42d7c..e460465 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3188,10 +3188,27 @@ static void ACTION_RefCountComponent( MSIPACKAGE* package, MSICOMPONENT *comp ) ACTION_WriteSharedDLLsCount( comp->FullKeypath, comp->RefCount ); } +static WCHAR *build_full_keypath( MSIPACKAGE *package, MSICOMPONENT *comp ) +{ + if (comp->assembly) + { + const WCHAR prefixW[] = {'<','\\',0}; + DWORD len = strlenW( prefixW ) + strlenW( comp->assembly->display_name ); + WCHAR *keypath = msi_alloc( (len + 1) * sizeof(WCHAR) ); + + if (keypath) + { + strcpyW( keypath, prefixW ); + strcatW( keypath, comp->assembly->display_name ); + } + return keypath; + } + return resolve_keypath( package, comp ); +} + static UINT ACTION_ProcessComponents(MSIPACKAGE *package) { - WCHAR squished_pc[GUID_SIZE]; - WCHAR squished_cc[GUID_SIZE]; + WCHAR squished_pc[GUID_SIZE], squished_cc[GUID_SIZE]; UINT rc; MSICOMPONENT *comp; HKEY hkey; @@ -3205,41 +3222,27 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { - MSIRECORD * uirow; + MSIRECORD *uirow; + INSTALLSTATE action; msi_ui_progress( package, 2, 0, 0, 0 ); if (!comp->ComponentId) continue; - squash_guid(comp->ComponentId,squished_cc); - - msi_free(comp->FullKeypath); - if (comp->assembly) - { - const WCHAR prefixW[] = {'<','\\',0}; - DWORD len = strlenW( prefixW ) + strlenW( comp->assembly->display_name ); - - comp->FullKeypath = msi_alloc( (len + 1) * sizeof(WCHAR) ); - if (comp->FullKeypath) - { - strcpyW( comp->FullKeypath, prefixW ); - strcatW( comp->FullKeypath, comp->assembly->display_name ); - } - } - else comp->FullKeypath = resolve_keypath( package, comp ); + squash_guid( comp->ComponentId, squished_cc ); + msi_free( comp->FullKeypath ); + comp->FullKeypath = build_full_keypath( package, comp ); ACTION_RefCountComponent( package, comp ); - comp->Action = msi_get_component_action( package, comp ); + if (package->need_rollback) action = comp->Installed; + else action = comp->ActionRequest; + TRACE("Component %s (%s), Keypath=%s, RefCount=%u Action=%u\n", - debugstr_w(comp->Component), - debugstr_w(squished_cc), - debugstr_w(comp->FullKeypath), - comp->RefCount, - comp->Action); - - if (comp->Action == INSTALLSTATE_LOCAL || - comp->Action == INSTALLSTATE_SOURCE) + debugstr_w(comp->Component), debugstr_w(squished_cc), + debugstr_w(comp->FullKeypath), comp->RefCount, action); + + if (action == INSTALLSTATE_LOCAL || action == INSTALLSTATE_SOURCE) { if (package->Context == MSIINSTALLCONTEXT_MACHINE) rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, szLocalSid, &hkey, TRUE); @@ -3258,8 +3261,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) msi_reg_set_val_str(hkey, szPermKey, comp->FullKeypath); } - - if (comp->Action == INSTALLSTATE_LOCAL) + if (action == INSTALLSTATE_LOCAL) msi_reg_set_val_str(hkey, squished_pc, comp->FullKeypath); else { @@ -3299,7 +3301,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) } RegCloseKey(hkey); } - else if (comp->Action == INSTALLSTATE_ABSENT) + else if (action == INSTALLSTATE_ABSENT) { if (package->Context == MSIINSTALLCONTEXT_MACHINE) MSIREG_DeleteUserDataComponentKey(comp->ComponentId, szLocalSid);

1 0

Hans Leidekker : msi: Get rid of forward declarations for custom action handlers.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: b4c20e7fef73b65dd3511ed27cbc27e954deea03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c20e7fef73b65dd3511ed27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 7 10:35:20 2011 +0200 msi: Get rid of forward declarations for custom action handlers. --- dlls/msi/custom.c | 383 +++++++++++++++++++++++++---------------------------- 1 files changed, 179 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4c20e7fef73b65dd3511…

1 0

Hans Leidekker : msi: Avoid some AW conversions.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 4004b25c1d811a314b37bbea5bdd00437e71bf60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4004b25c1d811a314b37bbea5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 7 10:35:34 2011 +0200 msi: Avoid some AW conversions. --- dlls/msi/events.c | 90 +++++++++++++++++++++++++++++----------------------- 1 files changed, 50 insertions(+), 40 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index b888c1c..88b84ff 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -35,8 +35,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); typedef UINT (*EVENTHANDLER)(MSIPACKAGE*,LPCWSTR,msi_dialog *); -struct _events { - LPCSTR event; +struct control_events +{ + const WCHAR *event; EVENTHANDLER handler; }; @@ -395,49 +396,58 @@ static UINT ControlEvent_ValidateProductID(MSIPACKAGE *package, LPCWSTR argument return ret; } -static const struct _events Events[] = { - { "EndDialog",ControlEvent_EndDialog }, - { "NewDialog",ControlEvent_NewDialog }, - { "SpawnDialog",ControlEvent_SpawnDialog }, - { "SpawnWaitDialog",ControlEvent_SpawnWaitDialog }, - { "DoAction",ControlEvent_DoAction }, - { "AddLocal",ControlEvent_AddLocal }, - { "Remove",ControlEvent_Remove }, - { "AddSource",ControlEvent_AddSource }, - { "SetTargetPath",ControlEvent_SetTargetPath }, - { "Reset",ControlEvent_Reset }, - { "SetInstallLevel",ControlEvent_SetInstallLevel }, - { "DirectoryListUp",ControlEvent_DirectoryListUp }, - { "SelectionBrowse",ControlEvent_SpawnDialog }, - { "ReinstallMode",ControlEvent_ReinstallMode }, - { "Reinstall",ControlEvent_Reinstall }, - { "ValidateProductID",ControlEvent_ValidateProductID }, - { NULL,NULL }, +static const WCHAR end_dialogW[] = {'E','n','d','D','i','a','l','o','g',0}; +static const WCHAR new_dialogW[] = {'N','e','w','D','i','a','l','o','g',0}; +static const WCHAR spawn_dialogW[] = {'S','p','a','w','n','D','i','a','l','o','g',0}; +static const WCHAR spawn_wait_dialogW[] = {'S','p','a','w','n','W','a','i','t','D','i','a','l','o','g',0}; +static const WCHAR do_actionW[] = {'D','o','A','c','t','i','o','n',0}; +static const WCHAR add_localW[] = {'A','d','d','L','o','c','a','l',0}; +static const WCHAR removeW[] = {'R','e','m','o','v','e',0}; +static const WCHAR add_sourceW[] = {'A','d','d','S','o','u','r','c','e',0}; +static const WCHAR set_target_pathW[] = {'S','e','t','T','a','r','g','e','t','P','a','t','h',0}; +static const WCHAR resetW[] = {'R','e','s','e','t',0}; +static const WCHAR set_install_levelW[] = {'S','e','t','I','n','s','t','a','l','l','L','e','v','e','l',0}; +static const WCHAR directory_list_upW[] = {'D','i','r','e','c','t','o','r','y','L','i','s','t','U','p',0}; +static const WCHAR selection_browseW[] = {'S','e','l','e','c','t','i','o','n','B','r','o','w','s','e',0}; +static const WCHAR reinstall_modeW[] = {'R','e','i','n','s','t','a','l','l','M','o','d','e',0}; +static const WCHAR reinstallW[] = {'R','e','i','n','s','t','a','l','l',0}; +static const WCHAR validate_product_idW[] = {'V','a','l','i','d','a','t','e','P','r','o','d','u','c','t','I','D',0}; + +static const struct control_events control_events[] = +{ + { end_dialogW, ControlEvent_EndDialog }, + { new_dialogW, ControlEvent_NewDialog }, + { spawn_dialogW, ControlEvent_SpawnDialog }, + { spawn_wait_dialogW, ControlEvent_SpawnWaitDialog }, + { do_actionW, ControlEvent_DoAction }, + { add_localW, ControlEvent_AddLocal }, + { removeW, ControlEvent_Remove }, + { add_sourceW, ControlEvent_AddSource }, + { set_target_pathW, ControlEvent_SetTargetPath }, + { resetW, ControlEvent_Reset }, + { set_install_levelW, ControlEvent_SetInstallLevel }, + { directory_list_upW, ControlEvent_DirectoryListUp }, + { selection_browseW, ControlEvent_SpawnDialog }, + { reinstall_modeW, ControlEvent_ReinstallMode }, + { reinstallW, ControlEvent_Reinstall }, + { validate_product_idW, ControlEvent_ValidateProductID }, + { NULL, NULL } }; -UINT ControlEvent_HandleControlEvent(MSIPACKAGE *package, LPCWSTR event, - LPCWSTR argument, msi_dialog* dialog) +UINT ControlEvent_HandleControlEvent( MSIPACKAGE *package, LPCWSTR event, + LPCWSTR argument, msi_dialog *dialog ) { - int i = 0; - UINT rc = ERROR_SUCCESS; + unsigned int i; + + TRACE("handling control event %s\n", debugstr_w(event)); - TRACE("Handling Control Event %s\n",debugstr_w(event)); - if (!event) - return rc; + if (!event) return ERROR_SUCCESS; - while( Events[i].event != NULL) + for (i = 0; control_events[i].event; i++) { - LPWSTR wevent = strdupAtoW(Events[i].event); - if (!strcmpW( wevent, event )) - { - msi_free(wevent); - rc = Events[i].handler(package,argument,dialog); - return rc; - } - msi_free(wevent); - i++; + if (!strcmpW( control_events[i].event, event )) + return control_events[i].handler( package, argument, dialog ); } - FIXME("unhandled control event %s arg(%s)\n", - debugstr_w(event), debugstr_w(argument)); - return rc; + FIXME("unhandled control event %s arg(%s)\n", debugstr_w(event), debugstr_w(argument)); + return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Get rid of some more forward declarations.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 1ae309f98194f56b3734943cd63d8a798319fb34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae309f98194f56b3734943cd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 7 10:35:58 2011 +0200 msi: Get rid of some more forward declarations. --- dlls/msi/dialog.c | 38 +++--- dlls/msi/table.c | 443 +++++++++++++++++++++++++---------------------------- 2 files changed, 228 insertions(+), 253 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ae309f98194f56b37349…

1 0

Henri Verbeet : wined3d: Get rid of wined3d_texture_get_type().
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 1fbdfd625aab1799f24c1c1f4ec1a85e14f29dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbdfd625aab1799f24c1c1f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 11:06:24 2011 +0200 wined3d: Get rid of wined3d_texture_get_type(). --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/texture.c | 7 ------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cb60719..c7bade0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4337,8 +4337,8 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, } /* Verify that the source and destination textures are the same type. */ - type = wined3d_texture_get_type(src_texture); - if (wined3d_texture_get_type(dst_texture) != type) + type = src_texture->resource.resourceType; + if (dst_texture->resource.resourceType != type) { WARN("Source and destination have different types, returning WINED3DERR_INVALIDCALL.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7abf18a..c138d01 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -483,13 +483,6 @@ void CDECL wined3d_texture_preload(struct wined3d_texture *texture) texture->texture_ops->texture_preload(texture, SRGB_ANY); } -WINED3DRESOURCETYPE CDECL wined3d_texture_get_type(const struct wined3d_texture *texture) -{ - TRACE("texture %p.\n", texture); - - return texture->resource.resourceType; -} - void * CDECL wined3d_texture_get_parent(const struct wined3d_texture *texture) { TRACE("texture %p.\n", texture); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 45c9aaf..cfdd236 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -268,7 +268,6 @@ @ cdecl wined3d_texture_get_priority(ptr) @ cdecl wined3d_texture_get_private_data(ptr ptr ptr ptr) @ cdecl wined3d_texture_get_sub_resource(ptr long) -@ cdecl wined3d_texture_get_type(ptr) @ cdecl wined3d_texture_incref(ptr) @ cdecl wined3d_texture_preload(ptr) @ cdecl wined3d_texture_set_autogen_filter_type(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ed269f0..aadd5fd 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2504,7 +2504,6 @@ HRESULT __cdecl wined3d_texture_get_private_data(const struct wined3d_texture *t REFGUID guid, void *data, DWORD *data_size); struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(struct wined3d_texture *texture, UINT sub_resource_idx); -WINED3DRESOURCETYPE __cdecl wined3d_texture_get_type(const struct wined3d_texture *texture); ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture); void __cdecl wined3d_texture_preload(struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_set_autogen_filter_type(struct wined3d_texture *texture,

1 0

Henri Verbeet : wined3d: Just enable ARB_shader_texture_lod if it' s available.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 95bd0ec61cafc2d848e00badc793db15d0b73b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95bd0ec61cafc2d848e00badc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 11:06:25 2011 +0200 wined3d: Just enable ARB_shader_texture_lod if it's available. --- dlls/wined3d/glsl_shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9b8cd5b..1cf7f22 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3182,8 +3182,9 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) if (!gl_info->supported[ARB_SHADER_TEXTURE_LOD] && !gl_info->supported[EXT_GPU_SHADER4] && shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { - /* The GLSL spec claims the Lod sampling functions are only supported in vertex shaders. - * However, they seem to work just fine in fragment shaders as well. */ + /* Plain GLSL only supports Lod sampling functions in vertex shaders. + * However, the NVIDIA drivers allow them in fragment shaders as well, + * even without the appropriate extension. */ WARN("Using %s in fragment shader.\n", sample_function.name); } shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, swizzle, NULL, NULL, lod_param.param_str, @@ -3993,7 +3994,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "#version 120\n"); - if (gl_info->supported[ARB_SHADER_TEXTURE_LOD] && reg_maps->usestexldd) + if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) { shader_addline(buffer, "#extension GL_ARB_shader_texture_lod : enable\n"); }

1 0

Henri Verbeet : wined3d: Use GL_DEPTH_COMPONENT as internal format for depth_blt_texture.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 01e668b00747be4a359e7a74f17bb40e2490d006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e668b00747be4a359e7a74f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 11:06:26 2011 +0200 wined3d: Use GL_DEPTH_COMPONENT as internal format for depth_blt_texture. This also changes the texture level to always be zero while we're at it. In practice depth/stencil textures should rarely have multiple levels, if ever, but only 0 makes sense here. --- dlls/wined3d/surface.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c5c526b..ad217fc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5707,7 +5707,14 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co bind_target = GL_TEXTURE_2D; } glBindTexture(bind_target, device->depth_blt_texture); - glCopyTexImage2D(bind_target, surface->texture_level, surface->resource.format->glInternal, 0, 0, w, h, 0); + /* We use GL_DEPTH_COMPONENT instead of the surface's specific + * internal format, because the internal format might include stencil + * data. In principle we should copy stencil data as well, but unless + * the driver supports stencil export it's hard to do, and doesn't + * seem to be needed in practice. If the hardware doesn't support + * writing stencil data, the glCopyTexImage2D() call might trigger + * software fallbacks. */ + glCopyTexImage2D(bind_target, 0, GL_DEPTH_COMPONENT, 0, 0, w, h, 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);

1 0

Henri Verbeet : wined3d: Rename IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt to wined3d_check_pixel_format_depth ().
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: fec6137de27e2c90eb9b6f808ba0458e36e81913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec6137de27e2c90eb9b6f808… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 11:06:27 2011 +0200 wined3d: Rename IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt to wined3d_check_pixel_format_depth(). --- dlls/wined3d/directx.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a29533e..4b77d5e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2968,7 +2968,7 @@ static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(const struct wined return FALSE; } -static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(const struct wined3d_gl_info *gl_info, +static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_info, const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { BYTE depthSize, stencilSize; @@ -3043,7 +3043,7 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, { if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, &cfgs[i], rt_format)) { - if (IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(&adapter->gl_info, &cfgs[i], ds_format)) + if (wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], ds_format)) { TRACE_(d3d_caps)("Formats match.\n"); return WINED3D_OK; @@ -3104,7 +3104,7 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 if(cfgs[i].numSamples != multisample_type) continue; - if (!IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(&adapter->gl_info, &cfgs[i], format)) + if (!wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], format)) continue; TRACE("Found pixel format %u to support multisample_type %#x for format %s.\n", @@ -3190,10 +3190,8 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, const struct wined3d_pixel_format *cfg = &adapter->cfgs[it]; if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, cfg, display_format)) { - if (IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(&adapter->gl_info, cfg, ds_format)) - { + if (wined3d_check_pixel_format_depth(&adapter->gl_info, cfg, ds_format)) return TRUE; - } } } }

1 0

Henri Verbeet : wined3d: cfg can never be NULL in wined3d_check_pixel_format_depth().
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: be180bed7cdde56cb8d4d7517f9e699546b6af55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be180bed7cdde56cb8d4d7517… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 11:06:28 2011 +0200 wined3d: cfg can never be NULL in wined3d_check_pixel_format_depth(). --- dlls/wined3d/directx.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4b77d5e..02cb33c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2974,9 +2974,6 @@ static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_in BYTE depthSize, stencilSize; BOOL lockable = FALSE; - if(!cfg) - return FALSE; - if (!getDepthStencilBits(format, &depthSize, &stencilSize)) { ERR("Unable to check compatibility for format %s.\n", debug_d3dformat(format->id));

1 0

Piotr Caban : comctl32: Fix ListView_Scroll implementation.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 734a4c3aec80d45252bdbb7695e06e29a5a3437b URL: http://source.winehq.org/git/wine.git/?a=commit;h=734a4c3aec80d45252bdbb769… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 6 22:16:26 2011 +0200 comctl32: Fix ListView_Scroll implementation. --- dlls/comctl32/listview.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6c7e26e..1b35c06 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7838,10 +7838,8 @@ static BOOL LISTVIEW_RedrawItems(const LISTVIEW_INFO *infoPtr, INT nFirst, INT n * is passed, then the scroll will be 0. (per MSDN 7/2002) * * For: (per experimentation with native control and CSpy ListView) - * LV_VIEW_ICON dy=1 = 1 pixel (vertical only) - * dx ignored - * LV_VIEW_SMALLICON dy=1 = 1 pixel (vertical only) - * dx ignored + * LV_VIEW_ICON scrolling in any direction is allowed + * LV_VIEW_SMALLICON scrolling in any direction is allowed * LV_VIEW_LIST dx=1 = 1 column (horizontal only) * but will only scroll 1 column per message * no matter what the value. @@ -7861,7 +7859,6 @@ static BOOL LISTVIEW_Scroll(LISTVIEW_INFO *infoPtr, INT dx, INT dy) if (dy != 0) return FALSE; break; default: /* icon */ - dx = 0; break; }

1 0