March 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Replace "pow2_matrix_identity" in wined3d_texture with a flag.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 0e22aea01e768ccf7bb66fbe7088e48ee8725ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e22aea01e768ccf7bb66fbe7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:44 2011 +0200 wined3d: Replace "pow2_matrix_identity" in wined3d_texture with a flag. --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 6 ++---- dlls/wined3d/texture.c | 9 ++++----- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1c01a42..0641b27 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2101,7 +2101,7 @@ void find_ps_compile_args(const struct wined3d_state *state, args->shadow |= 1 << i; /* Flag samplers that need NP2 texcoord fixup. */ - if (!texture->pow2_matrix_identity) + if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) args->np2_fixup |= (1 << i); } if (shader->baseShader.reg_maps.shader_version.major >= 3) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e1de072..315705c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3600,7 +3600,7 @@ static void sampler_texmatrix(DWORD state, struct wined3d_stateblock *stateblock */ if (sampler < MAX_TEXTURES) { - const BOOL texIsPow2 = !texture->pow2_matrix_identity; + const BOOL texIsPow2 = !(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT); if (texIsPow2 || (context->lastWasPow2Texture & (1 << sampler))) { @@ -3671,10 +3671,8 @@ static void sampler(DWORD state_id, struct wined3d_stateblock *stateblock, struc } /* Trigger shader constant reloading (for NP2 texcoord fixup) */ - if (!texture->pow2_matrix_identity) - { + if (!(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) device->shader_backend->shader_load_np2fixup_constants(device->shader_priv, gl_info, state); - } } else if (mapped_stage < gl_info->limits.textures) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e16d72d..10edf4a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -58,8 +58,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->texture_rgb.dirty = TRUE; texture->texture_srgb.dirty = TRUE; texture->is_srgb = FALSE; - texture->pow2_matrix_identity = TRUE; - texture->flags = 0; + texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) { @@ -900,7 +899,7 @@ HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_length, UINT texture->pow2_matrix[5] = ((float)edge_length) / ((float)pow2_edge_length); texture->pow2_matrix[10] = ((float)edge_length) / ((float)pow2_edge_length); texture->pow2_matrix[15] = 1.0f; - texture->pow2_matrix_identity = FALSE; + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; } texture->target = GL_TEXTURE_CUBE_MAP_ARB; @@ -1037,7 +1036,7 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U && wined3d_settings.rendertargetlock_mode == RTL_READTEX)) { if (width != 1 || height != 1) - texture->pow2_matrix_identity = FALSE; + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; texture->pow2_matrix[0] = (float)width; texture->pow2_matrix[5] = (float)height; @@ -1055,9 +1054,9 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U { if ((width != pow2_width) || (height != pow2_height)) { - texture->pow2_matrix_identity = FALSE; texture->pow2_matrix[0] = (((float)width) / ((float)pow2_width)); texture->pow2_matrix[5] = (((float)height) / ((float)pow2_height)); + texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de50930..4ec25e6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1889,6 +1889,7 @@ struct wined3d_texture_ops }; #define WINED3D_TEXTURE_COND_NP2 0x1 +#define WINED3D_TEXTURE_POW2_MAT_IDENT 0x2 struct wined3d_texture { @@ -1905,7 +1906,6 @@ struct wined3d_texture DWORD sampler; BOOL is_srgb; DWORD flags; - BOOL pow2_matrix_identity; const struct min_lookup *min_mip_lookup; const GLenum *mag_lookup; GLenum target;

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DBaseTextureClass.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: c5bf96c95174b40cb53cc1668c6db5cdf185c190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bf96c95174b40cb53cc1668… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:42 2011 +0200 wined3d: Get rid of IWineD3DBaseTextureClass. --- dlls/wined3d/arb_program_shader.c | 15 ++- dlls/wined3d/context.c | 4 +- dlls/wined3d/device.c | 16 +- dlls/wined3d/glsl_shader.c | 23 ++- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/shader.c | 9 +- dlls/wined3d/state.c | 19 ++- dlls/wined3d/surface.c | 14 +- dlls/wined3d/texture.c | 283 +++++++++++++++++----------------- dlls/wined3d/utils.c | 8 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 34 ++--- 12 files changed, 214 insertions(+), 215 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5bf96c95174b40cb53cc…

1 0

André Hentschel : wininet: Port numbers are unsigned.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 316f1c2e7c5c37a275cb912b777c5b5b9d698d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=316f1c2e7c5c37a275cb912b7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 28 22:47:27 2011 +0200 wininet: Port numbers are unsigned. --- dlls/wininet/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a0db965..9b37e58 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4068,7 +4068,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, INTERNET_SCHEME nScheme; static const WCHAR slashSlashW[] = {'/','/'}; - static const WCHAR percentD[] = {'%','d',0}; + static const WCHAR fmtW[] = {'%','u',0}; TRACE("(%p,%d,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); @@ -4155,7 +4155,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, { WCHAR szPort[MAX_WORD_DIGITS+1]; - sprintfW(szPort, percentD, lpUrlComponents->nPort); + sprintfW(szPort, fmtW, lpUrlComponents->nPort); *lpszUrl = ':'; lpszUrl++; dwLen = strlenW(szPort);

1 0

Henri Verbeet : wined3d: Move IWineD3DVertexShader::SetLocalConstantsF() to IWineD3DBaseShader.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 57d70bfddae578398a74acec9cbe3ed4609d5fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d70bfddae578398a74acec9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:46 2011 +0200 wined3d: Move IWineD3DVertexShader::SetLocalConstantsF() to IWineD3DBaseShader. --- dlls/wined3d/shader.c | 75 ++++++++++++++++++++++++++++++--------------- include/wine/wined3d.idl | 10 +++--- 2 files changed, 55 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0641b27..80ea5ea 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1572,6 +1572,33 @@ static HRESULT shader_get_function(IWineD3DBaseShaderImpl *shader, void *data, U return WINED3D_OK; } +/* Set local constants for d3d8 shaders. */ +static HRESULT shader_set_local_constants_float(IWineD3DBaseShaderImpl *shader, + UINT start_idx, const float *src_data, UINT count) +{ + UINT end_idx = start_idx + count; + UINT i; + + if (end_idx > shader->baseShader.limits.constant_float) + { + WARN("end_idx %u > float constants limit %u.\n", + end_idx, shader->baseShader.limits.constant_float); + end_idx = shader->baseShader.limits.constant_float; + } + + for (i = start_idx; i < end_idx; ++i) + { + local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); + if (!lconst) return E_OUTOFMEMORY; + + lconst->idx = i; + memcpy(lconst->value, src_data + (i - start_idx) * 4 /* 4 components */, 4 * sizeof(float)); + list_add_head(&shader->baseShader.constantsF, &lconst->entry); + } + + return WINED3D_OK; +} + static HRESULT shader_set_function(IWineD3DBaseShaderImpl *shader, const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, DWORD float_const_count) { @@ -1679,34 +1706,13 @@ static HRESULT STDMETHODCALLTYPE vertexshader_GetFunction(IWineD3DVertexShader * return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); } -/* Set local constants for d3d8 shaders. */ static HRESULT STDMETHODCALLTYPE vertexshader_SetLocalConstantsF(IWineD3DVertexShader *iface, UINT start_idx, const float *src_data, UINT count) { - IWineD3DVertexShaderImpl *shader =(IWineD3DVertexShaderImpl *)iface; - IWineD3DDeviceImpl *device = shader->baseShader.device; - UINT i, end_idx; - TRACE("iface %p, start_idx %u, src_data %p, count %u.\n", iface, start_idx, src_data, count); - end_idx = start_idx + count; - if (end_idx > device->d3d_vshader_constantF) - { - WARN("end_idx %u > float constants limit %u.\n", end_idx, device->d3d_vshader_constantF); - end_idx = device->d3d_vshader_constantF; - } - - for (i = start_idx; i < end_idx; ++i) - { - local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); - if (!lconst) return E_OUTOFMEMORY; - - lconst->idx = i; - memcpy(lconst->value, src_data + (i - start_idx) * 4 /* 4 components */, 4 * sizeof(float)); - list_add_head(&shader->baseShader.constantsF, &lconst->entry); - } - - return WINED3D_OK; + return shader_set_local_constants_float((IWineD3DBaseShaderImpl *)iface, + start_idx, src_data, count); } static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = @@ -1719,7 +1725,6 @@ static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = vertexshader_GetParent, /* IWineD3DBaseShader methods */ vertexshader_GetFunction, - /* IWineD3DVertexShader methods */ vertexshader_SetLocalConstantsF, }; @@ -1951,6 +1956,15 @@ static HRESULT STDMETHODCALLTYPE geometryshader_GetFunction(IWineD3DGeometryShad return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); } +static HRESULT STDMETHODCALLTYPE geometryshader_SetLocalConstantsF(IWineD3DGeometryShader *iface, + UINT start_idx, const float *src_data, UINT count) +{ + TRACE("iface %p, start_idx %u, src_data %p, count %u.\n", iface, start_idx, src_data, count); + + return shader_set_local_constants_float((IWineD3DBaseShaderImpl *)iface, + start_idx, src_data, count); +} + static const IWineD3DGeometryShaderVtbl wined3d_geometryshader_vtbl = { /* IUnknown methods */ @@ -1961,6 +1975,7 @@ static const IWineD3DGeometryShaderVtbl wined3d_geometryshader_vtbl = geometryshader_GetParent, /* IWineD3DBaseShader methods */ geometryshader_GetFunction, + geometryshader_SetLocalConstantsF, }; HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDeviceImpl *device, @@ -2047,6 +2062,15 @@ static HRESULT STDMETHODCALLTYPE pixelshader_GetFunction(IWineD3DPixelShader *if return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); } +static HRESULT STDMETHODCALLTYPE pixelshader_SetLocalConstantsF(IWineD3DPixelShader *iface, + UINT start_idx, const float *src_data, UINT count) +{ + TRACE("iface %p, start_idx %u, src_data %p, count %u.\n", iface, start_idx, src_data, count); + + return shader_set_local_constants_float((IWineD3DBaseShaderImpl *)iface, + start_idx, src_data, count); +} + static const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl = { /* IUnknown methods */ @@ -2056,7 +2080,8 @@ static const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl = /* IWineD3DBase methods */ pixelshader_GetParent, /* IWineD3DBaseShader methods */ - pixelshader_GetFunction + pixelshader_GetFunction, + pixelshader_SetLocalConstantsF, }; void find_ps_compile_args(const struct wined3d_state *state, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index bc7d588..e56aea5 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2395,6 +2395,11 @@ interface IWineD3DBaseShader : IWineD3DBase [out] void *data, [in, out] UINT *data_size ); + HRESULT SetLocalConstantsF( + [in] UINT start_idx, + [in] const float *src_data, + [in] UINT vector4f_count + ); } [ @@ -2404,11 +2409,6 @@ interface IWineD3DBaseShader : IWineD3DBase ] interface IWineD3DVertexShader : IWineD3DBaseShader { - HRESULT SetLocalConstantsF( - [in] UINT start_idx, - [in] const float *src_data, - [in] UINT vector4f_count - ); } [

1 0

André Hentschel : winhttp: Port numbers are unsigned ( more).
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 1c7d45c093b2981a9c31061fe00ee7aef1314fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c7d45c093b2981a9c31061fe… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 28 21:40:43 2011 +0200 winhttp: Port numbers are unsigned (more). --- dlls/winhttp/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 09835b4..6ead33c 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -299,7 +299,7 @@ static DWORD comp_length( DWORD len, DWORD flags, WCHAR *comp ) static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len ) { - static const WCHAR formatW[] = {'%','d',0}; + static const WCHAR formatW[] = {'%','u',0}; INTERNET_SCHEME scheme; *len = 0; @@ -360,7 +360,7 @@ static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len ) */ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDWORD required ) { - static const WCHAR formatW[] = {'%','d',0}; + static const WCHAR formatW[] = {'%','u',0}; static const WCHAR twoslashW[] = {'/','/'}; DWORD len;

1 0

Henri Verbeet : wined3d: Replace "cond_np2" in wined3d_texture with a flag.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: e111acdf11673e5d985e8de1432683c69a765aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e111acdf11673e5d985e8de14… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 21:58:43 2011 +0200 wined3d: Replace "cond_np2" in wined3d_texture with a flag. --- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 170507b..e16d72d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -59,6 +59,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->texture_srgb.dirty = TRUE; texture->is_srgb = FALSE; texture->pow2_matrix_identity = TRUE; + texture->flags = 0; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) { @@ -262,7 +263,7 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, const DWORD sampler_states[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) { - BOOL cond_np2 = texture->cond_np2; + BOOL cond_np2 = texture->flags & WINED3D_TEXTURE_COND_NP2; GLenum target = texture->target; struct gl_texture *gl_tex; DWORD state; @@ -666,7 +667,7 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, * state. The same applies to filtering. Even if the texture has only * one mip level, the default LINEAR_MIPMAP_LINEAR filter causes a SW * fallback on macos. */ - if (texture->cond_np2) + if (texture->flags & WINED3D_TEXTURE_COND_NP2) { GLenum target = texture->target; @@ -1028,7 +1029,7 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_2D; - texture->cond_np2 = TRUE; + texture->flags |= WINED3D_TEXTURE_COND_NP2; texture->min_mip_lookup = minMipLookup_noFilter; } else if (gl_info->supported[ARB_TEXTURE_RECTANGLE] && (width != pow2_width || height != pow2_height) @@ -1043,7 +1044,7 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_RECTANGLE_ARB; - texture->cond_np2 = TRUE; + texture->flags |= WINED3D_TEXTURE_COND_NP2; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) texture->min_mip_lookup = minMipLookup_noMip; @@ -1067,7 +1068,6 @@ HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT height, U texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_2D; - texture->cond_np2 = FALSE; } TRACE("xf(%f) yf(%f)\n", texture->pow2_matrix[0], texture->pow2_matrix[5]); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 382df9d..de50930 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1888,6 +1888,8 @@ struct wined3d_texture_ops void (*texture_sub_resource_cleanup)(struct wined3d_resource *sub_resource); }; +#define WINED3D_TEXTURE_COND_NP2 0x1 + struct wined3d_texture { struct wined3d_resource resource; @@ -1902,8 +1904,8 @@ struct wined3d_texture LONG bind_count; DWORD sampler; BOOL is_srgb; + DWORD flags; BOOL pow2_matrix_identity; - BOOL cond_np2; const struct min_lookup *min_mip_lookup; const GLenum *mag_lookup; GLenum target;

1 0

David Hedberg : comdlg32: Add stub implementation of the Common Item dialogs.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: ab085d661c901fd18fb4e02354dfbaffcd0d5c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab085d661c901fd18fb4e0235… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 24 22:38:51 2011 +0100 comdlg32: Add stub implementation of the Common Item dialogs. --- dlls/comdlg32/Makefile.in | 1 + dlls/comdlg32/cdlg.h | 4 + dlls/comdlg32/cdlg32.c | 9 + dlls/comdlg32/itemdlg.c | 845 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 859 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab085d661c901fd18fb4e…

1 0

David Hedberg : comdlg32: Add DllGetClassObject and a default class factory .
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 55c717e84cd87d841da49f4fbd3210efaa2479a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55c717e84cd87d841da49f4fb… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Mar 24 22:38:50 2011 +0100 comdlg32: Add DllGetClassObject and a default class factory. --- dlls/comdlg32/cdlg32.c | 97 +++++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/comdlg32.spec | 1 + 2 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index 9502443..0982dfb 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -21,6 +21,8 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -167,3 +169,98 @@ DWORD WINAPI CommDlgExtendedError(void) else return 0; /* we never set an error, so there isn't one */ } + +/************************************************************************* + * Implement the CommDlg32 class factory + * + * (Taken from shdocvw/factory.c; based on implementation in + * ddraw/main.c) + */ +typedef struct +{ + IClassFactory IClassFactory_iface; + HRESULT (*cf)(IUnknown*, REFIID, void**); +} IClassFactoryImpl; + +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + +/************************************************************************* + * CDLGCF_QueryInterface (IUnknown) + */ +static HRESULT WINAPI CDLGCF_QueryInterface(IClassFactory* iface, + REFIID riid, void **ppobj) +{ + TRACE("%p (%s %p)\n", iface, debugstr_guid(riid), ppobj); + + if(!ppobj) + return E_POINTER; + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) + { + *ppobj = iface; + IClassFactory_AddRef(iface); + return S_OK; + } + + WARN("Interface not supported.\n"); + + *ppobj = NULL; + return E_NOINTERFACE; +} + +/************************************************************************* + * CDLGCF_AddRef (IUnknown) + */ +static ULONG WINAPI CDLGCF_AddRef(IClassFactory *iface) +{ + return 2; /* non-heap based object */ +} + +/************************************************************************* + * CDLGCF_Release (IUnknown) + */ +static ULONG WINAPI CDLGCF_Release(IClassFactory *iface) +{ + return 1; /* non-heap based object */ +} + +/************************************************************************* + * CDLGCF_CreateInstance (IClassFactory) + */ +static HRESULT WINAPI CDLGCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + return This->cf(pOuter, riid, ppobj); +} + +/************************************************************************* + * CDLGCF_LockServer (IClassFactory) + */ +static HRESULT WINAPI CDLGCF_LockServer(IClassFactory *iface, BOOL dolock) +{ + TRACE("%p (%d)\n", iface, dolock); + return S_OK; +} + +static const IClassFactoryVtbl CDLGCF_Vtbl = +{ + CDLGCF_QueryInterface, + CDLGCF_AddRef, + CDLGCF_Release, + CDLGCF_CreateInstance, + CDLGCF_LockServer +}; + +/************************************************************************* + * DllGetClassObject (COMMDLG32.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + TRACE("%s, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/comdlg32/comdlg32.spec b/dlls/comdlg32/comdlg32.spec index 618ccd0..118d3d7 100644 --- a/dlls/comdlg32/comdlg32.spec +++ b/dlls/comdlg32/comdlg32.spec @@ -3,6 +3,7 @@ @ stdcall ChooseFontA(ptr) @ stdcall ChooseFontW(ptr) @ stdcall CommDlgExtendedError() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall FindTextA(ptr) @ stdcall FindTextW(ptr) @ stdcall GetFileTitleA(str ptr long)

1 0

David Hedberg : msi: Generalize media helpers a bit.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: 18973df9c7ae9f6f9ce45867c4de3fb23915ead6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18973df9c7ae9f6f9ce45867c… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Mar 22 20:45:10 2011 +0100 msi: Generalize media helpers a bit. --- dlls/msi/files.c | 5 +++-- dlls/msi/media.c | 10 +++++----- dlls/msi/msipriv.h | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 1f61873..4d8c502 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -302,7 +302,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { - rc = msi_load_media_info( package, file, mi ); + rc = msi_load_media_info( package, file->Sequence, mi ); if (rc != ERROR_SUCCESS) { ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); @@ -310,7 +310,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) } if (!file->Component->Enabled) continue; - if (file->state != msifs_hashmatch && (rc = ready_media( package, file, mi ))) + if (file->state != msifs_hashmatch && + (rc = ready_media( package, file->Sequence, file->IsCompressed, mi ))) { ERR("Failed to ready media for %s\n", debugstr_w(file->File)); goto done; diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 37d3530..7cf7585 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -656,7 +656,7 @@ static UINT get_drive_type(const WCHAR *path) return GetDriveTypeW(root); } -UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) +UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) { MSIRECORD *row; LPWSTR source_dir; @@ -669,7 +669,7 @@ UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) '`','L','a','s','t','S','e','q','u','e','n','c','e','`',' ','>','=',' ','%','i', ' ','O','R','D','E','R',' ','B','Y',' ','`','D','i','s','k','I','d','`',0}; - row = MSI_QueryGetRecord(package->db, query, file->Sequence); + row = MSI_QueryGetRecord(package->db, query, Sequence); if (!row) { TRACE("Unable to query row\n"); @@ -815,7 +815,7 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) return ERROR_FUNCTION_FAILED; } -UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) +UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, MSIMEDIAINFO *mi) { UINT rc = ERROR_SUCCESS; WCHAR *cabinet_file; @@ -831,7 +831,7 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) cabinet_file = get_cabinet_filename(mi); /* package should be downloaded */ - if (file->IsCompressed && + if (IsCompressed && GetFileAttributesW(cabinet_file) == INVALID_FILE_ATTRIBUTES && package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) { @@ -874,7 +874,7 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) } } - if (file->IsCompressed && + if (IsCompressed && GetFileAttributesW(cabinet_file) == INVALID_FILE_ATTRIBUTES) { rc = find_published_source(package, mi); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 1a0bee0..266c25e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -990,8 +990,8 @@ typedef struct PVOID user; } MSICABDATA; -extern UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi); -extern UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi); +extern UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, MSIMEDIAINFO *mi); +extern UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi); extern void msi_free_media_info(MSIMEDIAINFO *mi); extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data);

1 0

David Hedberg : msi: Add an offset to sequence numbers belonging to files added by a patch.
by Alexandre Julliard March 29, 2011

March 29, 2011

Module: wine Branch: master Commit: fed6e5211c6f743fd3889ed5bf667ae79c561930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed6e5211c6f743fd3889ed5b… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Mar 22 20:45:09 2011 +0100 msi: Add an offset to sequence numbers belonging to files added by a patch. --- dlls/msi/action.c | 251 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/database.c | 2 + dlls/msi/msipriv.h | 3 + dlls/msi/tests/patch.c | 77 +++++++++++++++ 4 files changed, 333 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fed6e5211c6f743fd3889…

1 0