March 2011 - wine-commits

Henri Verbeet : wined3d: Replace "pow2_matrix_identity" in wined3d_texture with a flag.
by Alexandre Julliard 29 Mar '11

29 Mar '11

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: Replace "cond_np2" in wined3d_texture with a flag.
by Alexandre Julliard 29 Mar '11

29 Mar '11

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

Henri Verbeet : wined3d: Get rid of IWineD3DBaseTextureClass.
by Alexandre Julliard 29 Mar '11

29 Mar '11

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 29 Mar '11

29 Mar '11

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

André Hentschel : winhttp: Port numbers are unsigned ( more).
by Alexandre Julliard 29 Mar '11

29 Mar '11

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

André Hentschel : mshtml: Port numbers are unsigned.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 3a06c5a54a4fcab661c40d3a8c3071e88d20b448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a06c5a54a4fcab661c40d3a8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 28 21:40:24 2011 +0200 mshtml: Port numbers are unsigned. --- dlls/mshtml/htmllocation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 9d61cd1..9c90edc 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -333,7 +333,7 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) if(url.nPort) { /* <hostname>:<port> */ - const WCHAR format[] = {'%','d',0}; + const WCHAR format[] = {'%','u',0}; DWORD len = url.dwHostNameLength + 1 + 5 + 1; WCHAR buf[len]; @@ -406,7 +406,7 @@ static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p) return hres; if(url.nPort) { - const WCHAR format[] = {'%','d',0}; + const WCHAR format[] = {'%','u',0}; WCHAR buf[6]; snprintfW(buf, 6, format, url.nPort); *p = SysAllocString(buf);

1 0

David Hedberg : comdlg32: Add stub implementation of the Common Item dialogs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

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 29 Mar '11

29 Mar '11

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

Joshua Beck : winex11: Improved error handling in pglXMakeCurrent() call.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: ddada6753836faac170b9613b1d237d937b41ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddada6753836faac170b9613b… Author: Joshua Beck <jxb091000(a)utdallas.edu> Date: Thu Mar 24 01:50:33 2011 -0500 winex11: Improved error handling in pglXMakeCurrent() call. --- dlls/winex11.drv/opengl.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a9cc178..b74bc0a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -344,8 +344,11 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) else win = root; - pglXMakeCurrent(gdi_display, win, ctx); - + if(pglXMakeCurrent(gdi_display, win, ctx) == 0) + { + ERR_(winediag)( "Unable to activate OpenGL context, most likely your OpenGL drivers haven't been installed correctly\n" ); + goto done; + } WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION); str = (const char *) pglGetString(GL_EXTENSIONS); WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1);

1 0

David Hedberg : msi: Add support for patching files.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 6771ed40e808bfaadaee49aae9cbc7092686994a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6771ed40e808bfaadaee49aae… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Mar 22 20:45:11 2011 +0100 msi: Add support for patching files. --- dlls/msi/action.c | 73 ++++++++++++++++++++++--- dlls/msi/files.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/helpers.c | 14 +++++ dlls/msi/msipriv.h | 14 +++++ dlls/msi/package.c | 1 + include/msidefs.h | 6 ++- 6 files changed, 252 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6771ed40e808bfaadaee4…

1 0

David Hedberg : msi: Generalize media helpers a bit.
by Alexandre Julliard 29 Mar '11

29 Mar '11

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 29 Mar '11

29 Mar '11

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

Dmitry Timoshkov : ntdll: Add a bunch of NtCreateFile tests.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 3998820497423dcc0a619aef8c8b3ae13f166202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3998820497423dcc0a619aef8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 22 19:38:44 2011 +0800 ntdll: Add a bunch of NtCreateFile tests. --- dlls/ntdll/tests/file.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 58e4a4b..cc91eb6 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3,6 +3,7 @@ * Copyright 2007 Jeff Latimer * Copyright 2007 Andrey Turkin * Copyright 2008 Jeff Zaroyko + * Copyright 2011 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1554,6 +1555,102 @@ todo_wine CloseHandle( dir ); } +static void test_NtCreateFile(void) +{ + static const struct test_data + { + DWORD disposition, attrib_in, status, result, attrib_out, needs_cleanup; + } td[] = + { + /* 0*/{ FILE_CREATE, FILE_ATTRIBUTE_READONLY, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, + /* 1*/{ FILE_CREATE, 0, STATUS_OBJECT_NAME_COLLISION, 0, 0, TRUE }, + /* 2*/{ FILE_CREATE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /* 3*/{ FILE_OPEN, FILE_ATTRIBUTE_READONLY, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, TRUE }, + /* 4*/{ FILE_OPEN, FILE_ATTRIBUTE_READONLY, STATUS_OBJECT_NAME_NOT_FOUND, 0, 0, FALSE }, + /* 5*/{ FILE_OPEN_IF, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /* 6*/{ FILE_OPEN_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /* 7*/{ FILE_OVERWRITE, FILE_ATTRIBUTE_READONLY, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, + /* 8*/{ FILE_OVERWRITE_IF, 0, STATUS_ACCESS_DENIED, 0, 0, FALSE }, + /* 9*/{ FILE_OVERWRITE_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, + /*10*/{ FILE_SUPERSEDE, 0, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, + /*11*/{ FILE_SUPERSEDE, FILE_ATTRIBUTE_READONLY, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, TRUE }, + /*12*/{ FILE_SUPERSEDE, FILE_ATTRIBUTE_READONLY, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, TRUE } + }; + static const WCHAR fooW[] = {'f','o','o',0}; + static const WCHAR dotW[] = {'.',0}; + NTSTATUS status; + HANDLE handle; + WCHAR path[MAX_PATH]; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + UNICODE_STRING nameW; + DWORD ret, i; + + GetTempFileNameW(dotW, fooW, 0, path); + DeleteFileW(path); + pRtlDosPathNameToNtPathName_U(path, &nameW, NULL, NULL); + + attr.Length = sizeof(attr); + attr.RootDirectory = NULL; + attr.ObjectName = &nameW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + status = pNtCreateFile(&handle, GENERIC_READ, &attr, &io, NULL, + td[i].attrib_in, FILE_SHARE_READ|FILE_SHARE_WRITE, + td[i].disposition, 0, NULL, 0); + + /* FIXME: completely remove once Wine is fixed */ + if (td[i].status == STATUS_ACCESS_DENIED) + { + todo_wine + ok(status == td[i].status, "%d: expected %#x got %#x\n", i, td[i].status, status); + CloseHandle(handle); + SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); + continue; + } + + ok(status == td[i].status, "%d: expected %#x got %#x\n", i, td[i].status, status); + + if (status == STATUS_ACCESS_DENIED) + { + SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); + continue; + } + + if (!status) + { + ok(io.Information == td[i].result,"%d: expected %#x got %#lx\n", i, td[i].result, io.Information); + + ret = GetFileAttributesW(path); + ret &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + /* FIXME: leave only 'else' case below once Wine is fixed */ + if (ret != td[i].attrib_out) + { + todo_wine + ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret); + SetFileAttributesW(path, td[i].attrib_out); + } + else + ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret); + + CloseHandle(handle); + } + + if (td[i].needs_cleanup) + { + SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); + DeleteFileW(path); + } + } + + SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); + DeleteFileW( path ); +} + START_TEST(file) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -1590,6 +1687,7 @@ START_TEST(file) pNtQueryDirectoryFile = (void *)GetProcAddress(hntdll, "NtQueryDirectoryFile"); pNtQueryVolumeInformationFile = (void *)GetProcAddress(hntdll, "NtQueryVolumeInformationFile"); + test_NtCreateFile(); create_file_test(); open_file_test(); delete_file_test();

1 0

Dmitry Timoshkov : winex11.drv: Do not use any window types except _NET_WM_WINDOW_TYPE_NORMAL.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 5ef58c11ce28c963908672f5c5c1fde866272ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef58c11ce28c963908672f5c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 22 15:11:40 2011 +0800 winex11.drv: Do not use any window types except _NET_WM_WINDOW_TYPE_NORMAL. Main window of the Atom Zombie Smasher game has WS_DLGFRAME style set, but Metacity allows making fullscreen ONLY normal windows, so do not use any window types except _NET_WM_WINDOW_TYPE_NORMAL. --- dlls/winex11.drv/window.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0e55619..e2ffccc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1169,17 +1169,7 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) /* size hints */ set_size_hints( display, data, style ); - /* set the WM_WINDOW_TYPE */ - if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - else if (ex_style & WS_EX_APPWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - else if (style & WS_MINIMIZEBOX) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); - else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); - /* many window managers don't handle utility windows very well, so we don't use TYPE_UTILITY here */ - else if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - else if ((style & WS_POPUP) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); - else window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); - + window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1);

1 0

Austin English : mshtml: Avoid shadowing a parameter.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: c199a468578d03e051c2b2972de3c88262f65993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c199a468578d03e051c2b2972… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 21 17:40:33 2011 -0700 mshtml: Avoid shadowing a parameter. --- dlls/mshtml/htmlwindow.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 656999e..695b829 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2148,22 +2148,22 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD switch(prop->type) { case GLOBAL_SCRIPTVAR: { - IDispatchEx *dispex; + IDispatchEx *iface; IDispatch *disp; disp = get_script_disp(prop->script_host); if(!disp) return E_UNEXPECTED; - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&iface); if(SUCCEEDED(hres)) { TRACE("%s >>>\n", debugstr_w(prop->name)); - hres = IDispatchEx_InvokeEx(dispex, prop->id, lcid, flags, params, res, ei, caller); + hres = IDispatchEx_InvokeEx(iface, prop->id, lcid, flags, params, res, ei, caller); if(hres == S_OK) TRACE("%s <<<\n", debugstr_w(prop->name)); else WARN("%s <<< %08x\n", debugstr_w(prop->name), hres); - IDispatchEx_Release(dispex); + IDispatchEx_Release(iface); }else { FIXME("No IDispatchEx\n"); }

1 0

André Hentschel : cabinet: Be more verbose.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 9701621f0ff6ed5089780e70efb8e8c5a3667f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9701621f0ff6ed5089780e70e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 21 22:41:00 2011 +0100 cabinet: Be more verbose. --- dlls/cabinet/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 5fc22cd..a004c1d 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2533,7 +2533,7 @@ BOOL __cdecl FDICopy( /* check if it's really a cabfile. Note that this doesn't implement the bug */ if (!FDI_read_entries(fdi, cabhf, &fdici, &(CAB(mii)))) { - ERR("FDIIsCabinet failed.\n"); + ERR("FDIIsCabinet failed: %u.\n", fdi->perf->erfOper); fdi->free(decomp_state); fdi->close(cabhf); return FALSE;

1 0

Konrad Rzepecki : wined3d: Implement WINED3DFMT_YUY2 to WINED3DFMT_B5G6R5_UNORM conversion function.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: e1524883c10b63d05a82624eca7fb775c69e3cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1524883c10b63d05a82624ec… Author: Konrad Rzepecki <hannibal(a)astral.lodz.pl> Date: Sun Mar 20 11:59:46 2011 +0100 wined3d: Implement WINED3DFMT_YUY2 to WINED3DFMT_B5G6R5_UNORM conversion function. --- dlls/wined3d/surface_base.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 74fa196..4239f69 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -782,6 +782,49 @@ static void convert_yuy2_x8r8g8b8(const BYTE *src, BYTE *dst, } } +static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst, + DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) +{ + unsigned int x, y; + int c2, d, e, r2 = 0, g2 = 0, b2 = 0; + + TRACE("Converting %ux%u pixels, pitches %u %u\n", w, h, pitch_in, pitch_out); + + for (y = 0; y < h; ++y) + { + const BYTE *src_line = src + y * pitch_in; + WORD *dst_line = (WORD *)(dst + y * pitch_out); + for (x = 0; x < w; ++x) + { + /* YUV to RGB conversion formulas from http://en.wikipedia.org/wiki/YUV: + * C = Y - 16; D = U - 128; E = V - 128; + * R = cliptobyte((298 * C + 409 * E + 128) >> 8); + * G = cliptobyte((298 * C - 100 * D - 208 * E + 128) >> 8); + * B = cliptobyte((298 * C + 516 * D + 128) >> 8); + * Two adjacent YUY2 pixels are stored as four bytes: Y0 U Y1 V . + * U and V are shared between the pixels. + */ + if (!(x & 1)) /* for every even pixel, read new U and V */ + { + d = (int) src_line[1] - 128; + e = (int) src_line[3] - 128; + r2 = 409 * e + 128; + g2 = - 100 * d - 208 * e + 128; + b2 = 516 * d + 128; + } + c2 = 298 * ((int) src_line[0] - 16); + dst_line[x] = (cliptobyte((c2 + r2) >> 8) >> 3) << 11 /* red */ + | (cliptobyte((c2 + g2) >> 8) >> 2) << 5 /* green */ + | (cliptobyte((c2 + b2) >> 8) >> 3); /* blue */ + /* Scale RGB values to 0..255 range, + * then clip them if still not in range (may be negative), + * then shift them within DWORD if necessary. + */ + src_line += 2; + } + } +} + struct d3dfmt_convertor_desc { enum wined3d_format_id from, to; @@ -794,6 +837,7 @@ static const struct d3dfmt_convertor_desc convertors[] = {WINED3DFMT_B5G6R5_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_r5g6b5_x8r8g8b8}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_a8r8g8b8_x8r8g8b8}, {WINED3DFMT_YUY2, WINED3DFMT_B8G8R8X8_UNORM, convert_yuy2_x8r8g8b8}, + {WINED3DFMT_YUY2, WINED3DFMT_B5G6R5_UNORM, convert_yuy2_r5g6b5}, }; static inline const struct d3dfmt_convertor_desc *find_convertor(enum wined3d_format_id from, enum wined3d_format_id to)

1 0

Konrad Rzepecki : wined3d: Prevent crash when blit_priv is NULL.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 37aadc9e377d7840a607dbabff10de375f9fdde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37aadc9e377d7840a607dbabf… Author: Konrad Rzepecki <hannibal(a)astral.lodz.pl> Date: Sun Mar 20 11:58:08 2011 +0100 wined3d: Prevent crash when blit_priv is NULL. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 104b445..ec959cc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3924,8 +3924,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT } /* Special cases for RenderTargets */ - if ((This->resource.usage & WINED3DUSAGE_RENDERTARGET) - || (src && (src->resource.usage & WINED3DUSAGE_RENDERTARGET))) + if (This->resource.device->blit_priv && ((This->resource.usage & WINED3DUSAGE_RENDERTARGET) + || (src && (src->resource.usage & WINED3DUSAGE_RENDERTARGET)))) { if (SUCCEEDED(IWineD3DSurfaceImpl_BltOverride(This, DestRect, src, SrcRect, flags, DDBltFx, Filter))) return WINED3D_OK;

1 0

Konrad Rzepecki : msvcrt: Implement _mbslwr_s.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 332d5954ed0335dc54040dd67942494ae942d224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=332d5954ed0335dc54040dd67… Author: Konrad Rzepecki <hannibal(a)astral.lodz.pl> Date: Sun Mar 20 02:19:02 2011 +0100 msvcrt: Implement _mbslwr_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 40 ++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 60 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 104 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a4589e1..1812407 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -921,7 +921,7 @@ @ stub _mbslen_l @ cdecl _mbslwr(str) msvcrt._mbslwr @ stub _mbslwr_l -@ stub _mbslwr_s +@ cdecl _mbslwr_s(str long) msvcrt._mbslwr_s @ stub _mbslwr_s_l @ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat @ stub _mbsnbcat_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b491d87..8b58e7d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -767,7 +767,7 @@ @ stub _mbslen_l @ cdecl _mbslwr(str) msvcrt._mbslwr @ stub _mbslwr_l -@ stub _mbslwr_s +@ cdecl _mbslwr_s(str long) msvcrt._mbslwr_s @ stub _mbslwr_s_l @ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat @ stub _mbsnbcat_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d1cae36..d18651d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -755,7 +755,7 @@ @ stub _mbslen_l @ cdecl _mbslwr(str) msvcrt._mbslwr @ stub _mbslwr_l -@ stub _mbslwr_s +@ cdecl _mbslwr_s(str long) msvcrt._mbslwr_s @ stub _mbslwr_s_l @ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat @ stub _mbsnbcat_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 081aa88..2a2ac72 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1544,6 +1544,46 @@ unsigned char* CDECL _mbslwr(unsigned char* s) /********************************************************************* + * _mbslwr_s(MSVCRT.@) + */ +int CDECL _mbslwr_s(unsigned char* s, MSVCRT_size_t len) +{ + if (!s && !len) + { + return 0; + } + else if (!s || !len) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + if (get_locale()->locinfo->mb_cur_max > 1) + { + unsigned int c; + for ( ; *s && len > 0; len--) + { + c = _mbctolower(_mbsnextc(s)); + /* Note that I assume that the size of the character is unchanged */ + if (c > 255) + { + *s++=(c>>8); + c=c & 0xff; + } + *s++=c; + } + } + else for ( ; *s && len > 0; s++, len--) *s = tolower(*s); + if (*s) + { + *s = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + return 0; +} + + +/********************************************************************* * _mbsupr(MSVCRT.@) */ unsigned char* CDECL _mbsupr(unsigned char* s) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e43c3f5..103142e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -703,7 +703,7 @@ # stub _mbslen_l @ cdecl _mbslwr(str) # stub _mbslwr_l -# stub _mbslwr_s +@ cdecl _mbslwr_s(str long) # stub _mbslwr_s_l @ cdecl _mbsnbcat(str str long) # stub _mbsnbcat_l diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index e231077..f3d8dc4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -77,6 +77,7 @@ static unsigned char *p_mbctype; static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); +static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -1769,6 +1770,63 @@ static void test__mbsupr_s(void) } +static void test__mbslwr_s(void) +{ + errno_t ret; + unsigned char buffer[20]; + + if (!p_mbslwr_s) + { + win_skip("Skipping _mbslwr_s tests\n"); + return; + } + + errno = EBADF; + ret = p_mbslwr_s(NULL, 0); + ok(ret == 0, "Expected _mbslwr_s to return 0, got %d\n", ret); + + errno = EBADF; + ret = p_mbslwr_s(NULL, sizeof(buffer)); + ok(ret == EINVAL, "Expected _mbslwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + errno = EBADF; + ret = p_mbslwr_s(buffer, 0); + ok(ret == EINVAL, "Expected _mbslwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memcpy(buffer, "ABCDEFGH", sizeof("ABCDEFGH")); + errno = EBADF; + ret = p_mbslwr_s(buffer, sizeof("ABCDEFGH")); + ok(ret == 0, "Expected _mbslwr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "abcdefgh", sizeof("abcdefgh")), + "Expected the output buffer to be \"abcdefgh\", got \"%s\"\n", + buffer); + + memcpy(buffer, "ABCDEFGH", sizeof("ABCDEFGH")); + errno = EBADF; + ret = p_mbslwr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbslwr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "abcdefgh", sizeof("abcdefgh")), + "Expected the output buffer to be \"abcdefgh\", got \"%s\"\n", + buffer); + + memcpy(buffer, "ABCDEFGH", sizeof("ABCDEFGH")); + errno = EBADF; + ret = p_mbslwr_s(buffer, 4); + ok(ret == EINVAL, "Expected _mbslwr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memcpy(buffer, "ABCDEFGH\0IJKLMNOP", sizeof("ABCDEFGH\0IJKLMNOP")); + errno = EBADF; + ret = p_mbslwr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbslwr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "abcdefgh\0IJKLMNOP", sizeof("abcdefgh\0IJKLMNOP")), + "Expected the output buffer to be \"abcdefgh\\0IJKLMNOP\", got \"%s\"\n", + buffer); + +} + static void test__ultoa_s(void) { errno_t ret; @@ -1880,6 +1938,7 @@ START_TEST(string) p_set_invalid_parameter_handler = (void *) GetProcAddress(hMsvcrt, "_set_invalid_parameter_handler"); p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); + p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1921,4 +1980,5 @@ START_TEST(string) test__ultoa_s(); test__wcslwr_s(); test__mbsupr_s(); + test__mbslwr_s(); }

1 0

Konrad Rzepecki : msvcrt: Implement _mbsupr_s.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 0b3175cb24a6ae9c3a1f6c97c9cc24dea5b8a1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b3175cb24a6ae9c3a1f6c97c… Author: Konrad Rzepecki <hannibal(a)astral.lodz.pl> Date: Sun Mar 20 02:17:12 2011 +0100 msvcrt: Implement _mbsupr_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 40 ++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 60 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 104 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 473f663..a4589e1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1001,7 +1001,7 @@ @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @ stub _mbsupr_l -@ stub _mbsupr_s +@ cdecl _mbsupr_s(str long) msvcrt._mbsupr_s @ stub _mbsupr_s_l @ stub _mbtowc_l @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9da91db..b491d87 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -847,7 +847,7 @@ @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @ stub _mbsupr_l -@ stub _mbsupr_s +@ cdecl _mbsupr_s(str long) msvcrt._mbsupr_s @ stub _mbsupr_s_l @ stub _mbtowc_l @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 96d4589..d1cae36 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -835,7 +835,7 @@ @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @ stub _mbsupr_l -@ stub _mbsupr_s +@ cdecl _mbsupr_s(str long) msvcrt._mbsupr_s @ stub _mbsupr_s_l @ stub _mbtowc_l @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 5767242..081aa88 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1572,6 +1572,46 @@ unsigned char* CDECL _mbsupr(unsigned char* s) /********************************************************************* + * _mbsupr_s(MSVCRT.@) + */ +int CDECL _mbsupr_s(unsigned char* s, MSVCRT_size_t len) +{ + if (!s && !len) + { + return 0; + } + else if (!s || !len) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + if (get_locale()->locinfo->mb_cur_max > 1) + { + unsigned int c; + for ( ; *s && len > 0; len--) + { + c = _mbctoupper(_mbsnextc(s)); + /* Note that I assume that the size of the character is unchanged */ + if (c > 255) + { + *s++=(c>>8); + c=c & 0xff; + } + *s++=c; + } + } + else for ( ; *s && len > 0; s++, len--) *s = toupper(*s); + if (*s) + { + *s = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + return 0; +} + + +/********************************************************************* * _mbsspn (MSVCRT.@) */ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* set) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c324dea..e43c3f5 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -783,7 +783,7 @@ # stub _mbstrnlen_l @ cdecl _mbsupr(str) # stub _mbsupr_l -# stub _mbsupr_s +@ cdecl _mbsupr_s(str long) # stub _mbsupr_s_l # stub _mbtowc_l @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index dfa38e6..e231077 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -76,6 +76,7 @@ static int *p__mb_cur_max; static unsigned char *p_mbctype; static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); +static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -1711,6 +1712,63 @@ static void test__mbsnbcat_s(void) "Expected the output buffer string to be \"\\0inosaurdu\" without ending null terminator\n"); } +static void test__mbsupr_s(void) +{ + errno_t ret; + unsigned char buffer[20]; + + if (!p_mbsupr_s) + { + win_skip("Skipping _mbsupr_s tests\n"); + return; + } + + errno = EBADF; + ret = p_mbsupr_s(NULL, 0); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + + errno = EBADF; + ret = p_mbsupr_s(NULL, sizeof(buffer)); + ok(ret == EINVAL, "Expected _mbsupr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + errno = EBADF; + ret = p_mbsupr_s(buffer, 0); + ok(ret == EINVAL, "Expected _mbsupr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memcpy(buffer, "abcdefgh", sizeof("abcdefgh")); + errno = EBADF; + ret = p_mbsupr_s(buffer, sizeof("abcdefgh")); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "ABCDEFGH", sizeof("ABCDEFGH")), + "Expected the output buffer to be \"ABCDEFGH\", got \"%s\"\n", + buffer); + + memcpy(buffer, "abcdefgh", sizeof("abcdefgh")); + errno = EBADF; + ret = p_mbsupr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "ABCDEFGH", sizeof("ABCDEFGH")), + "Expected the output buffer to be \"ABCDEFGH\", got \"%s\"\n", + buffer); + + memcpy(buffer, "abcdefgh", sizeof("abcdefgh")); + errno = EBADF; + ret = p_mbsupr_s(buffer, 4); + ok(ret == EINVAL, "Expected _mbsupr_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + + memcpy(buffer, "abcdefgh\0ijklmnop", sizeof("abcdefgh\0ijklmnop")); + errno = EBADF; + ret = p_mbsupr_s(buffer, sizeof(buffer)); + ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret); + ok(!memcmp(buffer, "ABCDEFGH\0ijklmnop", sizeof("ABCDEFGH\0ijklmnop")), + "Expected the output buffer to be \"ABCDEFGH\\0ijklmnop\", got \"%s\"\n", + buffer); + +} + static void test__ultoa_s(void) { errno_t ret; @@ -1821,6 +1879,7 @@ START_TEST(string) p_ultoa_s = (void *)GetProcAddress(hMsvcrt, "_ultoa_s"); p_set_invalid_parameter_handler = (void *) GetProcAddress(hMsvcrt, "_set_invalid_parameter_handler"); p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); + p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1861,4 +1920,5 @@ START_TEST(string) test__mbsnbcat_s(); test__ultoa_s(); test__wcslwr_s(); + test__mbsupr_s(); }

1 0

Alexandre Julliard : winecoreaudio.drv: Remove unnecessary ifdefs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 41d9d0a2f351d983834422aba70ea44841fa974c URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d9d0a2f351d983834422aba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 22:15:12 2011 +0200 winecoreaudio.drv: Remove unnecessary ifdefs. --- dlls/winecoreaudio.drv/audio.c | 27 --------------------------- dlls/winecoreaudio.drv/audiounit.c | 4 ---- dlls/winecoreaudio.drv/coreaudio.c | 6 +----- dlls/winecoreaudio.drv/coremidi.c | 3 --- dlls/winecoreaudio.drv/midi.c | 16 ---------------- dlls/winecoreaudio.drv/mixer.c | 11 ----------- 6 files changed, 1 insertions(+), 66 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 9fb11b1..faf4f54 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -59,9 +59,6 @@ #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(wave); - -#if defined(HAVE_COREAUDIO_COREAUDIO_H) && defined(HAVE_AUDIOUNIT_AUDIOUNIT_H) - WINE_DECLARE_DEBUG_CHANNEL(coreaudio); /* @@ -2547,27 +2544,3 @@ OSStatus CoreAudio_wiAudioUnitIOProc(void *inRefCon, if (needNotify) wodSendNotifyInputCompletionsMessage(wwi); return err; } - -#else - -/************************************************************************** - * widMessage (WINECOREAUDIO.6) - */ -DWORD WINAPI CoreAudio_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) -{ - FIXME("(%u, %04X, %08X, %08X, %08X): CoreAudio support not compiled into wine\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -/************************************************************************** -* wodMessage (WINECOREAUDIO.7) -*/ -DWORD WINAPI CoreAudio_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) -{ - FIXME("(%u, %04X, %08X, %08X, %08X): CoreAudio support not compiled into wine\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -#endif diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index bd0ad17..bbe565f 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -20,8 +20,6 @@ #include "config.h" -#ifdef HAVE_AUDIOUNIT_AUDIOUNIT_H - #define ULONG CoreFoundation_ULONG #define HRESULT CoreFoundation_HRESULT #ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H @@ -503,5 +501,3 @@ int SynthUnit_Close(AUGraph graph) return 1; } - -#endif diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 0690afd..b065030 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -34,7 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); -#ifdef HAVE_COREAUDIO_COREAUDIO_H /************************************************************************** * CoreAudio_drvLoad [internal] @@ -80,7 +79,6 @@ static DWORD CoreAudio_drvClose(DWORD dwDevID) TRACE("(%08x)\n", dwDevID); return 1; } -#endif /* HAVE_COREAUDIO_COREAUDIO_H */ /************************************************************************** * DriverProc (WINECOREAUDIO.1) @@ -100,9 +98,8 @@ LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, wMsg == DRV_INSTALL ? "DRV_INSTALL" : wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", wMsg, dwParam1, dwParam2); - + switch(wMsg) { -#ifdef HAVE_COREAUDIO_COREAUDIO_H case DRV_LOAD: return CoreAudio_drvLoad(); case DRV_FREE: return CoreAudio_drvFree(); case DRV_OPEN: return CoreAudio_drvOpen((LPSTR)dwParam1); @@ -113,7 +110,6 @@ LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case DRV_CONFIGURE: MessageBoxA(0, "CoreAudio driver!", "CoreAudio driver", MB_OK); return 1; case DRV_INSTALL: return DRVCNF_RESTART; case DRV_REMOVE: return DRVCNF_RESTART; -#endif default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index ea7d2fd..1733418 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -21,8 +21,6 @@ #include "config.h" -#ifdef HAVE_COREAUDIO_COREAUDIO_H - #include <CoreMIDI/CoreMIDI.h> #include <mach/mach_time.h> @@ -84,4 +82,3 @@ void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigne if (packet) MIDISend(port, dest, packetList); } -#endif /* HAVE_COREAUDIO_COREAUDIO_H */ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 071e937..a50fc78 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -44,7 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -#if defined(HAVE_COREAUDIO_COREAUDIO_H) #include <CoreAudio/CoreAudio.h> #define WINE_DEFINITIONS @@ -1021,18 +1020,3 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw } return MMSYSERR_NOTSUPPORTED; } -#else - -DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) -{ - TRACE("%08x, %08x, %08x, %08x, %08x\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) -{ - TRACE("%08x, %08x, %08x, %08x, %08x\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} -#endif diff --git a/dlls/winecoreaudio.drv/mixer.c b/dlls/winecoreaudio.drv/mixer.c index 1e9faef..7a64aa4 100644 --- a/dlls/winecoreaudio.drv/mixer.c +++ b/dlls/winecoreaudio.drv/mixer.c @@ -43,7 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mixer); -#if defined(HAVE_COREAUDIO_COREAUDIO_H) #include <CoreAudio/CoreAudio.h> #include <CoreFoundation/CoreFoundation.h> @@ -1027,13 +1026,3 @@ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return MMSYSERR_NOTSUPPORTED; } } - -#else - -DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - TRACE("(%04X, %04x, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} -#endif /* HAVE_COREAUDIO_COREAUDIO_H */

1 0

Alexandre Julliard : winejoystick.drv: Remove unnecessary ifdefs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 6a4c47c98d4bc24b164289f1744f5b260bc88133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a4c47c98d4bc24b164289f17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 22:14:20 2011 +0200 winejoystick.drv: Remove unnecessary ifdefs. --- dlls/winejoystick.drv/joystick.c | 31 ------------------------------- 1 files changed, 0 insertions(+), 31 deletions(-) diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index 1f81353..df73b4c 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -76,8 +76,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(joystick); -#ifdef HAVE_LINUX_JOYSTICK_H - #define MAXJOYSTICK (JOYSTICKID2 + 30) typedef struct tagWINE_JSTCK { @@ -525,32 +523,3 @@ LRESULT CALLBACK JSTCK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } } - -#else - -/************************************************************************** - * DriverProc (JOYSTICK.@) - */ -LRESULT CALLBACK JSTCK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2) -{ - /* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */ - /* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */ - - switch(wMsg) { - case DRV_LOAD: - case DRV_FREE: - case DRV_OPEN: - case DRV_CLOSE: - case DRV_ENABLE: - case DRV_DISABLE: - case DRV_QUERYCONFIGURE: return 0; - case DRV_CONFIGURE: MessageBoxA(0, "JoyStick MultiMedia Driver !", "JoyStick Driver", MB_OK); return 1; - case DRV_INSTALL: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; - default: - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); - } -} - -#endif

1 0

Alexandre Julliard : winejack.drv: Remove unnecessary ifdefs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: d25763d4b6ad10713a33700dead3a8ff24d3380b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25763d4b6ad10713a33700de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 22:14:00 2011 +0200 winejack.drv: Remove unnecessary ifdefs. --- dlls/winejack.drv/Makefile.in | 3 +- dlls/winejack.drv/audio.c | 72 ++++++++++++++++-------- dlls/winejack.drv/jack.c | 122 ----------------------------------------- dlls/winejack.drv/jack.h | 25 -------- 4 files changed, 49 insertions(+), 173 deletions(-) diff --git a/dlls/winejack.drv/Makefile.in b/dlls/winejack.drv/Makefile.in index 6a074e9..e7263d3 100644 --- a/dlls/winejack.drv/Makefile.in +++ b/dlls/winejack.drv/Makefile.in @@ -2,7 +2,6 @@ MODULE = winejack.drv IMPORTS = dxguid uuid winmm user32 C_SRCS = \ - audio.c \ - jack.c + audio.c @MAKE_DLL_RULES@ diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index da04824..ac8a0c0 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -51,7 +51,6 @@ #include "mmddk.h" #include "dsound.h" #include "dsdriver.h" -#include "jack.h" #include "wine/unicode.h" #include "wine/library.h" #include "wine/debug.h" @@ -63,8 +62,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); -#ifdef SONAME_LIBJACK - #define MAKE_FUNCPTR(f) static typeof(f) * fp_##f = NULL; /* Function pointers for dynamic loading of libjack */ @@ -86,6 +83,8 @@ MAKE_FUNCPTR(jack_port_name); MAKE_FUNCPTR(jack_get_buffer_size); #undef MAKE_FUNCPTR +static void *jackhandle; + /* define the below to work around a bug in jack where closing a port */ /* takes a very long time, so to get around this we actually don't */ /* close the port when the device is closed but instead mark the */ @@ -2396,28 +2395,53 @@ DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, return MMSYSERR_NOTSUPPORTED; } -#else /* !SONAME_LIBJACK */ - /************************************************************************** - * widMessage (WINEJACK.6) + * DriverProc (WINEJACK.1) */ -DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - FIXME("(%u, %04X, %08X, %08lX, %08lX):jack support not compiled into wine\n", - wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -/************************************************************************** - * wodMessage (WINEJACK.7) - */ -DWORD WINAPI JACK_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) +LRESULT CALLBACK JACK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) { - FIXME("(%u, %04X, %08X, %08lX, %08lX):jack support not compiled into wine\n", - wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; + TRACE("(%08lX, %p, %s (%08X), %08lX, %08lX)\n", + dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" : + wMsg == DRV_FREE ? "DRV_FREE" : + wMsg == DRV_OPEN ? "DRV_OPEN" : + wMsg == DRV_CLOSE ? "DRV_CLOSE" : + wMsg == DRV_ENABLE ? "DRV_ENABLE" : + wMsg == DRV_DISABLE ? "DRV_DISABLE" : + wMsg == DRV_QUERYCONFIGURE ? "DRV_QUERYCONFIGURE" : + wMsg == DRV_CONFIGURE ? "DRV_CONFIGURE" : + wMsg == DRV_INSTALL ? "DRV_INSTALL" : + wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", + wMsg, dwParam1, dwParam2); + + switch(wMsg) { + case DRV_LOAD: + jackhandle = wine_dlopen(SONAME_LIBJACK, RTLD_NOW, NULL, 0); + if (!jackhandle) + { + FIXME("error loading the jack library %s, please install this library to use jack\n", + SONAME_LIBJACK); + return 0; + } + return 1; + case DRV_FREE: + if (jackhandle) + { + TRACE("calling wine_dlclose() on jackhandle\n"); + wine_dlclose(jackhandle, NULL, 0); + jackhandle = NULL; + } + return 1; + case DRV_OPEN: + case DRV_CLOSE: + case DRV_INSTALL: + case DRV_REMOVE: + case DRV_ENABLE: + case DRV_DISABLE: + case DRV_QUERYCONFIGURE: + return 1; + case DRV_CONFIGURE: MessageBoxA(0, "jack audio driver!", "jack driver", MB_OK); return 1; + default: + return 0; + } } - -#endif /* SONAME_LIBJACK */ diff --git a/dlls/winejack.drv/jack.c b/dlls/winejack.drv/jack.c deleted file mode 100644 index ebcb6c7..0000000 --- a/dlls/winejack.drv/jack.c +++ /dev/null @@ -1,122 +0,0 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ -/* - * Wine Driver for jack Sound Server - * http://jackit.sourceforge.net - * - * Copyright 2002 Chris Morgan - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "mmddk.h" -#include "jack.h" -#include "wine/library.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(jack); - -#ifdef SONAME_LIBJACK - -void *jackhandle = NULL; - -/************************************************************************** - * JACK_drvLoad [internal] - */ -static LRESULT JACK_drvLoad(void) -{ - TRACE("()\n"); - - /* dynamically load the jack library if not already loaded */ - jackhandle = wine_dlopen(SONAME_LIBJACK, RTLD_NOW, NULL, 0); - TRACE("SONAME_LIBJACK == %s\n", SONAME_LIBJACK); - TRACE("jackhandle == %p\n", jackhandle); - if(!jackhandle) - { - FIXME("error loading the jack library %s, please install this library to use jack\n", - SONAME_LIBJACK); - return 0; - } - - return 1; -} - -/************************************************************************** - * JACK_drvFree [internal] - */ -/* unload the jack library on driver free */ -static LRESULT JACK_drvFree(void) -{ - TRACE("()\n"); - - if(jackhandle) - { - TRACE("calling wine_dlclose() on jackhandle\n"); - wine_dlclose(jackhandle, NULL, 0); - jackhandle = NULL; - } - - return 1; -} - -#endif /* #ifdef SONAME_LIBJACK */ - - -/************************************************************************** - * DriverProc (WINEJACK.1) - */ -LRESULT CALLBACK JACK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2) -{ - TRACE("(%08lX, %p, %s (%08X), %08lX, %08lX)\n", - dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" : - wMsg == DRV_FREE ? "DRV_FREE" : - wMsg == DRV_OPEN ? "DRV_OPEN" : - wMsg == DRV_CLOSE ? "DRV_CLOSE" : - wMsg == DRV_ENABLE ? "DRV_ENABLE" : - wMsg == DRV_DISABLE ? "DRV_DISABLE" : - wMsg == DRV_QUERYCONFIGURE ? "DRV_QUERYCONFIGURE" : - wMsg == DRV_CONFIGURE ? "DRV_CONFIGURE" : - wMsg == DRV_INSTALL ? "DRV_INSTALL" : - wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", - wMsg, dwParam1, dwParam2); - - switch(wMsg) { -#ifdef SONAME_LIBJACK - case DRV_LOAD: return JACK_drvLoad(); - case DRV_FREE: return JACK_drvFree(); - case DRV_OPEN: - case DRV_CLOSE: - case DRV_INSTALL: - case DRV_REMOVE: - case DRV_ENABLE: - case DRV_DISABLE: - case DRV_QUERYCONFIGURE: - return 1; - case DRV_CONFIGURE: MessageBoxA(0, "jack audio driver!", "jack driver", MB_OK); return 1; -#endif - default: - return 0; - } -} diff --git a/dlls/winejack.drv/jack.h b/dlls/winejack.drv/jack.h deleted file mode 100644 index 5545f24..0000000 --- a/dlls/winejack.drv/jack.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Definition for jack driver : wine multimedia system - * - * Copyright 2002 Chris Morgan - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_JACK_H -#define __WINE_JACK_H - -extern void *jackhandle; /* pointer to the libjack library */ - -#endif /* __WINE_JACK_H */

1 0

Alexandre Julliard : winenas.drv: Remove unnecessary ifdefs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 4c719464bc7d6016bbb1e0b76696b77b521109db URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c719464bc7d6016bbb1e0b76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 22:13:38 2011 +0200 winenas.drv: Remove unnecessary ifdefs. --- configure | 5 +--- configure.ac | 3 +- dlls/winenas.drv/Makefile.in | 3 +- dlls/winenas.drv/audio.c | 27 +++++++++++++----- dlls/winenas.drv/nas.c | 61 ------------------------------------------ include/config.h.in | 3 -- 6 files changed, 22 insertions(+), 80 deletions(-) diff --git a/configure b/configure index 948058f..75b990f 100755 --- a/configure +++ b/configure @@ -9039,10 +9039,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audio_AuCreateFlow" >&5 $as_echo "$ac_cv_lib_audio_AuCreateFlow" >&6; } if test "x$ac_cv_lib_audio_AuCreateFlow" = x""yes; then : - -$as_echo "#define HAVE_NAS 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauGetBestAuthByAddr in -lXau" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauGetBestAuthByAddr in -lXau" >&5 $as_echo_n "checking for XauGetBestAuthByAddr in -lXau... " >&6; } if test "${ac_cv_lib_Xau_XauGetBestAuthByAddr+set}" = set; then : $as_echo_n "(cached) " >&6 diff --git a/configure.ac b/configure.ac index 5b6d018..ddbee8a 100644 --- a/configure.ac +++ b/configure.ac @@ -1112,8 +1112,7 @@ OpenGL and Direct3D won't be supported.]) AC_CHECK_HEADERS(audio/audiolib.h, [AC_CHECK_HEADERS(audio/soundlib.h,,,[#include <audio/audiolib.h>]) AC_CHECK_LIB(audio,AuCreateFlow, - [AC_DEFINE(HAVE_NAS,1,[Define if you have NAS including devel headers]) - AC_CHECK_LIB(Xau,XauGetBestAuthByAddr, + [AC_CHECK_LIB(Xau,XauGetBestAuthByAddr, [NASLIBS="-lXau -laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"], [NASLIBS="-laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"], [$X_LIBS]) diff --git a/dlls/winenas.drv/Makefile.in b/dlls/winenas.drv/Makefile.in index 75a01a4..a324ea8 100644 --- a/dlls/winenas.drv/Makefile.in +++ b/dlls/winenas.drv/Makefile.in @@ -4,7 +4,6 @@ EXTRAINCL = @X_CFLAGS@ EXTRALIBS = @NASLIBS@ C_SRCS = \ - audio.c \ - nas.c + audio.c @MAKE_DLL_RULES@ diff --git a/dlls/winenas.drv/audio.c b/dlls/winenas.drv/audio.c index 9140da1..0c29e48 100644 --- a/dlls/winenas.drv/audio.c +++ b/dlls/winenas.drv/audio.c @@ -89,8 +89,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); /* Allow 1% deviation for sample rates (some ES137x cards) */ #define NEAR_MATCH(rate1,rate2) (((100*((int)(rate1)-(int)(rate2)))/(rate1))==0) -#ifdef HAVE_NAS - static AuServer *AuServ; #define MAX_WAVEOUTDRV (1) @@ -1489,14 +1487,27 @@ static int nas_end(void) return 1; } -#else /* !HAVE_NAS */ /************************************************************************** - * wodMessage (WINENAS.@) + * DriverProc (WINENAS.@) */ -DWORD WINAPI NAS_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) +LRESULT CALLBACK NAS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) { - FIXME("(%u, %04X, %08X, %08X, %08X):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; + switch(wMsg) { + case DRV_LOAD: + case DRV_FREE: + case DRV_OPEN: + case DRV_CLOSE: + case DRV_ENABLE: + case DRV_DISABLE: + case DRV_QUERYCONFIGURE: + return 1; + case DRV_CONFIGURE: MessageBoxA(0, "NAS MultiMedia Driver !", "NAS Driver", MB_OK); return 1; + case DRV_INSTALL: + case DRV_REMOVE: + return DRV_SUCCESS; + default: + return 0; + } } -#endif diff --git a/dlls/winenas.drv/nas.c b/dlls/winenas.drv/nas.c deleted file mode 100644 index 916e5b0..0000000 --- a/dlls/winenas.drv/nas.c +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ -/* - * - * Wine Driver for NAS Network Audio System - * http://radscan.com/nas.html - * - * Copyright 2002 Nicolas Escuder <n.escuder(a)alineanet.com> - * - * Code massively copied from Eric Pouech's OSS driver - * and Chris Morgan aRts driver - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "mmddk.h" - -/************************************************************************** - * DriverProc (WINENAS.@) - */ -LRESULT CALLBACK NAS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2) -{ - switch(wMsg) { -#ifdef HAVE_NAS - case DRV_LOAD: - case DRV_FREE: - case DRV_OPEN: - case DRV_CLOSE: - case DRV_ENABLE: - case DRV_DISABLE: - case DRV_QUERYCONFIGURE: - return 1; - case DRV_CONFIGURE: MessageBoxA(0, "NAS MultiMedia Driver !", "NAS Driver", MB_OK); return 1; - case DRV_INSTALL: - case DRV_REMOVE: - return DRV_SUCCESS; -#endif - default: - return 0; - } -} diff --git a/include/config.h.in b/include/config.h.in index 0c5a5f0..b7460cc 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -503,9 +503,6 @@ /* Define to 1 if you have the <mpg123.h> header file. */ #undef HAVE_MPG123_H -/* Define if you have NAS including devel headers */ -#undef HAVE_NAS - /* Define to 1 if you have the <ncurses.h> header file. */ #undef HAVE_NCURSES_H

1 0

Alexandre Julliard : wineesd.drv: Remove unnecessary ifdefs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 6eea1119af872147b676be900c9d9126b796d27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eea1119af872147b676be900… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 22:12:59 2011 +0200 wineesd.drv: Remove unnecessary ifdefs. --- configure | 3 -- configure.ac | 3 +- dlls/wineesd.drv/Makefile.in | 3 +- dlls/wineesd.drv/audio.c | 39 +++++++++++++--------------- dlls/wineesd.drv/esound.c | 58 ------------------------------------------ include/config.h.in | 3 -- 6 files changed, 20 insertions(+), 89 deletions(-) diff --git a/configure b/configure index 507791f..948058f 100755 --- a/configure +++ b/configure @@ -10799,9 +10799,6 @@ if test "x$ac_cv_lib_esd_esd_open_sound" = x""yes; then : ESDLIBS="$ac_esd_libs" - -$as_echo "#define HAVE_ESD 1" >>confdefs.h - fi fi diff --git a/configure.ac b/configure.ac index a59cae9..5b6d018 100644 --- a/configure.ac +++ b/configure.ac @@ -1470,8 +1470,7 @@ then AC_CHECK_HEADER(esd.h, [AC_CHECK_LIB(esd,esd_open_sound, [AC_SUBST(ESDINCL, "$ac_esd_incl") - AC_SUBST(ESDLIBS, "$ac_esd_libs") - AC_DEFINE(HAVE_ESD, 1, [Define if you have EsounD sound server])],, + AC_SUBST(ESDLIBS, "$ac_esd_libs")],, [$ac_esd_libs])]) CFLAGS="$save_CFLAGS" fi diff --git a/dlls/wineesd.drv/Makefile.in b/dlls/wineesd.drv/Makefile.in index 52da94a..91d9731 100644 --- a/dlls/wineesd.drv/Makefile.in +++ b/dlls/wineesd.drv/Makefile.in @@ -4,7 +4,6 @@ EXTRAINCL = @ESDINCL@ EXTRALIBS = @ESDLIBS@ C_SRCS = \ - audio.c \ - esound.c + audio.c @MAKE_DLL_RULES@ diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index 9f7ff00..f7f190c 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -71,8 +71,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); #include <sys/errno.h> #endif -#ifdef HAVE_ESD - #include <esd.h> /* unless someone makes a wineserver kernel module, Unix pipes are faster than win32 events */ @@ -2100,26 +2098,25 @@ DWORD WINAPI ESD_widMessage(UINT wDevID, UINT wMsg, DWORD dwUser, return MMSYSERR_NOTSUPPORTED; } -#else /* !HAVE_ESD */ - /************************************************************************** - * wodMessage (WINEESD.@) + * DriverProc (WINEESD.@) */ -DWORD WINAPI ESD_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) +LRESULT CALLBACK ESD_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) { - FIXME("(%u, %04X, %08X, %08lX, %08lX):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -/************************************************************************** - * widMessage (WINEESD.6) - */ -DWORD WINAPI ESD_widMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - FIXME("(%u, %04X, %08X, %08lX, %08lX):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; + switch(wMsg) { + case DRV_LOAD: + case DRV_FREE: + case DRV_OPEN: + case DRV_CLOSE: + case DRV_INSTALL: + case DRV_REMOVE: + case DRV_ENABLE: + case DRV_DISABLE: + case DRV_QUERYCONFIGURE: + return 1; + case DRV_CONFIGURE: MessageBoxA(0, "EsounD MultiMedia Driver!", "EsounD Driver", MB_OK); return 1; + default: + return 0; + } } - -#endif /* HAVE_ESD */ diff --git a/dlls/wineesd.drv/esound.c b/dlls/wineesd.drv/esound.c deleted file mode 100644 index 64c0753..0000000 --- a/dlls/wineesd.drv/esound.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Wine Driver for EsounD Sound Server - * http://www.tux.org/~ricdude/EsounD.html - * - * Copyright 2004 Zhangrong Huang <hzhr(a)users.sourceforge.net> - * - * Code massively copied from Eric Pouech's OSS driver - * and Chris Morgan aRts driver - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "mmddk.h" - -/************************************************************************** - * DriverProc (WINEESD.@) - */ -LRESULT CALLBACK ESD_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2) -{ - switch(wMsg) { -#ifdef HAVE_ESD - case DRV_LOAD: - case DRV_FREE: - case DRV_OPEN: - case DRV_CLOSE: - case DRV_INSTALL: - case DRV_REMOVE: - case DRV_ENABLE: - case DRV_DISABLE: - case DRV_QUERYCONFIGURE: - return 1; - case DRV_CONFIGURE: MessageBoxA(0, "EsounD MultiMedia Driver!", "EsounD Driver", MB_OK); return 1; -#endif - default: - return 0; - } -} diff --git a/include/config.h.in b/include/config.h.in index dbe35f9..0c5a5f0 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -104,9 +104,6 @@ /* Define to 1 if you have the `epoll_create' function. */ #undef HAVE_EPOLL_CREATE -/* Define if you have EsounD sound server */ -#undef HAVE_ESD - /* Define to 1 if you have the `ffs' function. */ #undef HAVE_FFS

1 0

Alexandre Julliard : wineoss.drv: Remove unnecessary ifdefs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 1644b258473e9b88008ac353793a1f14124af08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1644b258473e9b88008ac3537… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 22:11:45 2011 +0200 wineoss.drv: Remove unnecessary ifdefs. --- dlls/wineoss.drv/Makefile.in | 3 +- dlls/wineoss.drv/audio.c | 56 ++++++++++++++++++++++--------------- dlls/wineoss.drv/audio.h | 4 -- dlls/wineoss.drv/dscapture.c | 15 ++++++--- dlls/wineoss.drv/dsrender.c | 15 ++++++--- dlls/wineoss.drv/midi.c | 11 ++++++- dlls/wineoss.drv/mixer.c | 22 ++++++-------- dlls/wineoss.drv/mmaux.c | 19 ++++++------ dlls/wineoss.drv/oss.c | 63 ------------------------------------------ dlls/wineoss.drv/oss.h | 39 -------------------------- 10 files changed, 84 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1644b258473e9b88008ac…

1 0

Alexandre Julliard : winealsa.drv: Remove unnecessary ifdefs.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 255cc210b6bbc24cff0912782fe1dabce84c58c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=255cc210b6bbc24cff0912782… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 22:07:26 2011 +0200 winealsa.drv: Remove unnecessary ifdefs. --- configure | 5 +---- configure.ac | 3 +-- dlls/winealsa.drv/alsa.c | 6 ------ dlls/winealsa.drv/alsa.h | 2 +- dlls/winealsa.drv/dscapture.c | 4 ---- dlls/winealsa.drv/dsoutput.c | 4 ---- dlls/winealsa.drv/midi.c | 8 -------- dlls/winealsa.drv/mixer.c | 10 ---------- dlls/winealsa.drv/wavein.c | 16 ---------------- dlls/winealsa.drv/waveinit.c | 5 ----- dlls/winealsa.drv/waveout.c | 16 ---------------- include/config.h.in | 3 --- 12 files changed, 3 insertions(+), 79 deletions(-) diff --git a/configure b/configure index 3b5e8bd..507791f 100755 --- a/configure +++ b/configure @@ -10985,10 +10985,7 @@ int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL) } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - -$as_echo "#define HAVE_ALSA 1" >>confdefs.h - - ALSALIBS="-lasound" + ALSALIBS="-lasound" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi diff --git a/configure.ac b/configure.ac index 326aa30..a59cae9 100644 --- a/configure.ac +++ b/configure.ac @@ -1513,8 +1513,7 @@ then #elif defined(HAVE_SYS_ASOUNDLIB_H) #include <sys/asoundlib.h> #endif]], [[int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL)]])], - [AC_DEFINE(HAVE_ALSA,1,[Define if you have ALSA 1.x including devel headers]) - ALSALIBS="-lasound"],[])]) + [ALSALIBS="-lasound"])]) fi dnl **** Check for capi4linux **** diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 122817c..dc0ef29 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -39,8 +39,6 @@ #include "alsa.h" -#ifdef HAVE_ALSA - #include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -725,8 +723,6 @@ if (err<0) { \ return; } -#endif - /************************************************************************** * DriverProc (WINEALSA.@) */ @@ -737,7 +733,6 @@ LRESULT CALLBACK ALSA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, /* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */ switch(wMsg) { -#ifdef HAVE_ALSA case DRV_LOAD: case DRV_FREE: case DRV_OPEN: @@ -750,7 +745,6 @@ LRESULT CALLBACK ALSA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case DRV_INSTALL: case DRV_REMOVE: return DRV_SUCCESS; -#endif default: return 0; } diff --git a/dlls/winealsa.drv/alsa.h b/dlls/winealsa.drv/alsa.h index d961dce..8c21b01 100644 --- a/dlls/winealsa.drv/alsa.h +++ b/dlls/winealsa.drv/alsa.h @@ -24,7 +24,7 @@ # error You must include config.h to use this header #endif -#if defined(HAVE_ALSA) && !defined(__ALSA_H) +#ifndef __ALSA_H #define __ALSA_H #ifdef interface diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 0b67749..edf8c13 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -54,8 +54,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#ifdef HAVE_ALSA - /* Notify timer checks every 10 ms with a resolution of 2 ms */ #define DS_TIME_DEL 10 #define DS_TIME_RES 2 @@ -1092,5 +1090,3 @@ DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc) *desc = WInDev[wDevID].ds_desc; return MMSYSERR_NOERROR; } - -#endif /* HAVE_ALSA */ diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 5ea43f4..ec219d9 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -58,8 +58,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#ifdef HAVE_ALSA - WINE_DEFAULT_DEBUG_CHANNEL(dsalsa); typedef struct IDsDriverImpl IDsDriverImpl; @@ -959,5 +957,3 @@ DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) *desc = WOutDev[wDevID].ds_desc; return MMSYSERR_NOERROR; } - -#endif /* HAVE_ALSA */ diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 54ea2eb..7dd6c0f 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -53,8 +53,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -#ifdef HAVE_ALSA - #ifndef SND_SEQ_PORT_TYPE_PORT #define SND_SEQ_PORT_TYPE_PORT (1<<19) /* Appears in version 1.0.12rc1 */ #endif @@ -1299,8 +1297,6 @@ static LONG ALSA_MidiInit(void) return TRUE; } -#endif - /************************************************************************** * midMessage (WINEALSA.@) */ @@ -1310,7 +1306,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { -#ifdef HAVE_ALSA case DRVM_INIT: ALSA_MidiInit(); case DRVM_EXIT: @@ -1338,7 +1333,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midStart(wDevID); case MIDM_STOP: return midStop(wDevID); -#endif default: TRACE("Unsupported message\n"); } @@ -1355,7 +1349,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { -#ifdef HAVE_ALSA case DRVM_INIT: ALSA_MidiInit(); case DRVM_EXIT: @@ -1385,7 +1378,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return 0; case MODM_RESET: return modReset(wDevID); -#endif default: TRACE("Unsupported message\n"); } diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 7d5b452..833d2ae 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -52,8 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mixer); -#ifdef HAVE_ALSA - #define WINE_MIXER_MANUF_ID 0xAA #define WINE_MIXER_PRODUCT_ID 0x55 #define WINE_MIXER_VERSION 0x0100 @@ -1557,15 +1555,12 @@ static DWORD MIX_GetLineControls(UINT wDevID, LPMIXERLINECONTROLSW mlc, DWORD_PT return MMSYSERR_NOERROR; } -#endif /*HAVE_ALSA*/ - /************************************************************************** * mxdMessage (WINEALSA.3) */ DWORD WINAPI ALSA_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { -#ifdef HAVE_ALSA DWORD ret; TRACE("(%04X, %s, %08lX, %08lX, %08lX);\n", wDevID, getMessage(wMsg), dwUser, dwParam1, dwParam2); @@ -1611,9 +1606,4 @@ DWORD WINAPI ALSA_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("Returning %08X\n", ret); return ret; -#else /*HAVE_ALSA*/ - TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - - return MMSYSERR_NOTENABLED; -#endif /*HAVE_ALSA*/ } diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 32442fa..3a2fad8 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -59,8 +59,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); -#ifdef HAVE_ALSA - WINE_WAVEDEV *WInDev; DWORD ALSA_WidNumMallocedDevs; DWORD ALSA_WidNumDevs; @@ -778,17 +776,3 @@ DWORD WINAPI ALSA_widMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, } return MMSYSERR_NOTSUPPORTED; } - -#else /* HAVE_ALSA */ - -/************************************************************************** - * widMessage (WINEALSA.@) - */ -DWORD WINAPI ALSA_widMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - FIXME("(%u, %04X, %08lX, %08lX, %08lX):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -#endif /* HAVE_ALSA */ diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index 4ae93bb..fda1efc 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -25,9 +25,6 @@ */ #include "config.h" - -#ifdef HAVE_ALSA - #include "wine/port.h" #include <stdlib.h> @@ -1014,5 +1011,3 @@ void ALSA_WaveInit(void) if (key) RegCloseKey(key); } - -#endif /* HAVE_ALSA */ diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index ac3db1a..127e50e 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -60,8 +60,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); -#ifdef HAVE_ALSA - WINE_WAVEDEV *WOutDev; DWORD ALSA_WodNumMallocedDevs; DWORD ALSA_WodNumDevs; @@ -1180,17 +1178,3 @@ DWORD WINAPI ALSA_wodMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, } return MMSYSERR_NOTSUPPORTED; } - -#else /* HAVE_ALSA */ - -/************************************************************************** - * wodMessage (WINEALSA.@) - */ -DWORD WINAPI ALSA_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) -{ - FIXME("(%u, %04X, %08X, %08X, %08X):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -#endif /* HAVE_ALSA */ diff --git a/include/config.h.in b/include/config.h.in index 44b6bb6..dbe35f9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -12,9 +12,6 @@ /* Define to 1 if you have the <alias.h> header file. */ #undef HAVE_ALIAS_H -/* Define if you have ALSA 1.x including devel headers */ -#undef HAVE_ALSA - /* Define to 1 if you have the <alsa/asoundlib.h> header file. */ #undef HAVE_ALSA_ASOUNDLIB_H

1 0

Alexandre Julliard : msxml3/tests: Avoid size_t in a trace.
by Alexandre Julliard 29 Mar '11

29 Mar '11

Module: wine Branch: master Commit: 8e59bbb02726fd1aada6d010fa8ef7bf9d0abd81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e59bbb02726fd1aada6d010f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 21:22:47 2011 +0200 msxml3/tests: Avoid size_t in a trace. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 75fec54..29c20bf 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7258,7 +7258,7 @@ static void test_nodeTypedValue(void) if (entry->type == (VT_ARRAY|VT_UI1)) { ok(V_ARRAY(&value)->rgsabound[0].cElements == strlen(entry->value), - "incorrect array size, got %d, expected %d\n", V_ARRAY(&value)->rgsabound[0].cElements, strlen(entry->value)); + "incorrect array size %d\n", V_ARRAY(&value)->rgsabound[0].cElements); } if (entry->type != VT_BSTR)

1 0

Aric Stewart : wineqtdecoder: fourCC value needs to be reversed as an OSType.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 7ee63f000b6b7af28953b69a2dc84dd616cfe145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee63f000b6b7af28953b69a2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 28 11:22:46 2011 -0500 wineqtdecoder: fourCC value needs to be reversed as an OSType. --- dlls/wineqtdecoder/qtvdecoder.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index b0cf128..83d5156 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -413,10 +413,10 @@ static HRESULT WINAPI QTVDecoder_SetMediaType(TransformFilter *tf, PIN_DIRECTION goto failed; TRACE("Fourcc: %s\n", debugstr_an((const char *)&pmt->subtype.Data1, 4)); - fourCC = ((const char *)&pmt->subtype.Data1)[0] | - (((const char *)&pmt->subtype.Data1)[1]<<8) | - (((const char *)&pmt->subtype.Data1)[2]<<16) | - (((const char *)&pmt->subtype.Data1)[3]<<24); + fourCC = ((const char *)&pmt->subtype.Data1)[3] | + (((const char *)&pmt->subtype.Data1)[2]<<8) | + (((const char *)&pmt->subtype.Data1)[1]<<16) | + (((const char *)&pmt->subtype.Data1)[0]<<24); err = FindCodec(fourCC,NULL,NULL,&dc); if (err != noErr || dc == 0x0)

1 0

Maarten Lankhorst : wined3d: Fix a clipping issue with D3DSPSM_SIGNNEG.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: d19f840361d901c8ca9f61a95651fbf125ca6448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19f840361d901c8ca9f61a95… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 23 15:13:18 2011 +0100 wined3d: Fix a clipping issue with D3DSPSM_SIGNNEG. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e495643..c6b6619 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1473,7 +1473,7 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in shader_addline(buffer, "MAD T%c, %s, %s, -%s;\n", 'A' + tmpreg, regstr, two, one); break; case WINED3DSPSM_SIGNNEG: - shader_addline(buffer, "MAD T%c, %s, %s, %s;\n", 'A' + tmpreg, regstr, two, one); + shader_addline(buffer, "MAD T%c, %s, -%s, %s;\n", 'A' + tmpreg, regstr, two, one); break; case WINED3DSPSM_COMP: shader_addline(buffer, "SUB T%c, %s, %s;\n", 'A' + tmpreg, one, regstr);

1 0

Roderick Colenbrander : wined3d: Check for ARB_fragment_program in arbfp_blit_supported.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: b2132202c77b0d56b68d2a0f4c0c1f6d637ab577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2132202c77b0d56b68d2a0f4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 22 19:02:27 2011 +0000 wined3d: Check for ARB_fragment_program in arbfp_blit_supported. --- dlls/wined3d/arb_program_shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d53e008..e495643 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7128,6 +7128,9 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum bli { enum complex_fixup src_fixup; + if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) + return FALSE; + if (blit_op != BLIT_OP_BLIT) { TRACE("Unsupported blit_op=%d\n", blit_op);

1 0

André Hentschel : mscoree: Add stub implementation for CreateConfigStream.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 87429c72f67b08acbb254e6c1686d3f61b6d3e58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87429c72f67b08acbb254e6c1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 25 21:56:57 2011 +0100 mscoree: Add stub implementation for CreateConfigStream. --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 8cf548d..63a14b6 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -28,7 +28,7 @@ @ stub CorIsLatestSvc @ stub CorMarkThreadInThreadPool @ stub CorTickleSvc -@ stub CreateConfigStream +@ stdcall CreateConfigStream(wstr ptr) @ stub CreateDebuggingInterfaceFromVersion @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 6f53c8f..9b5d401 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -422,6 +422,12 @@ BOOL WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOL forceVerifi return FALSE; } +HRESULT WINAPI CreateConfigStream(LPCWSTR filename, IStream **stream) +{ + FIXME("(%s, %p): stub\n", debugstr_w(filename), stream); + return E_NOTIMPL; +} + HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterface) { TRACE("(%s,%s,%p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppInterface);

1 0

André Hentschel : urlmon/tests: Add another case to IUri tests.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 47a44f61e2d980274e433d2debe81267f2bd845f URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a44f61e2d980274e433d2de… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 24 18:55:33 2011 +0100 urlmon/tests: Add another case to IUri tests. --- dlls/urlmon/tests/uri.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 68345f1..5ebdd6e 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -788,6 +788,32 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + /* Make sure already percent encoded characters don't get unencoded. */ + { "ftp://\"%20\"weird(a)ftp.google.com/\"%20\"weird", Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS, S_OK, FALSE, + { + {"ftp://\"%20\"weird(a)ftp.google.com/\"%20\"weird",S_OK,FALSE}, + {"\"%20\"weird(a)ftp.google.com",S_OK,FALSE}, + {"ftp://ftp.google.com/\"%20\"weird",S_OK,FALSE}, + {"google.com",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"ftp.google.com",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/\"%20\"weird",S_OK,FALSE}, + {"/\"%20\"weird",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"ftp://\"%20\"weird(a)ftp.google.com/\"%20\"weird",S_OK,FALSE}, + {"ftp",S_OK,FALSE}, + {"\"%20\"weird",S_OK,FALSE}, + {"\"%20\"weird",S_OK,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,FALSE}, + {21,S_OK,FALSE}, + {URL_SCHEME_FTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, /* Allowed to have invalid % encoded because its an unknown scheme type. */ { "zip://%xy:word@winehq.org/", 0, S_OK, FALSE, {

1 0

Nikolay Sivov : msxml3: Allow to create dummy node map for <?xml ?>.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 64e5a6a2576ea784a9df204c78f0593fbda2b267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e5a6a2576ea784a9df204c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 00:17:01 2011 +0300 msxml3: Allow to create dummy node map for <?xml ?>. --- dlls/msxml3/pi.c | 5 +++-- dlls/msxml3/tests/domdoc.c | 9 +++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 89b2b5a..302aea2 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -333,9 +333,10 @@ static HRESULT WINAPI dom_pi_get_attributes( if (!strcmpW(name, xmlW)) { - FIXME("not implemented for <?xml..?> declaration\n"); + FIXME("created dummy map for <?xml ?>\n"); + *map = create_nodemap(This->node.node); SysFreeString(name); - return E_NOTIMPL; + return S_OK; } SysFreeString(name); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index cdba14b..75fec54 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9714,9 +9714,14 @@ static void test_get_attributes(void) ok(hr == S_OK, "got %08x\n", hr); hr = IXMLDOMNode_get_attributes(node, &map); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); + + length = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &length); + EXPECT_HR(hr, S_OK); + todo_wine ok(length == 1, "got %d\n", length); - if (hr == S_OK) + if (hr == S_OK && length == 1) { IXMLDOMAttribute *attr; DOMNodeType type;

1 0

Nikolay Sivov : msxml3: More tests for <?xml ?> attributes.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: e5e0b84200a8bfe9d25f168da77377e420686047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e0b84200a8bfe9d25f168da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 00:16:17 2011 +0300 msxml3: More tests for <?xml ?> attributes. --- dlls/msxml3/tests/domdoc.c | 155 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 131 insertions(+), 24 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1f297ab..cdba14b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3901,52 +3901,77 @@ static void test_get_text(void) static void test_get_childNodes(void) { - HRESULT r; BSTR str; VARIANT_BOOL b; IXMLDOMDocument *doc; IXMLDOMElement *element; IXMLDOMNode *node, *node2; IXMLDOMNodeList *node_list, *node_list2; + HRESULT hr; LONG len; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; str = SysAllocString( szComplete4 ); - r = IXMLDOMDocument_loadXML( doc, str, &b ); - ok( r == S_OK, "loadXML failed\n"); + hr = IXMLDOMDocument_loadXML( doc, str, &b ); + EXPECT_HR(hr, S_OK); ok( b == VARIANT_TRUE, "failed to load XML string\n"); SysFreeString( str ); - r = IXMLDOMDocument_get_documentElement( doc, &element ); - ok( r == S_OK, "ret %08x\n", r); + hr = IXMLDOMDocument_get_documentElement( doc, &element ); + EXPECT_HR(hr, S_OK); - r = IXMLDOMElement_get_childNodes( element, &node_list ); - ok( r == S_OK, "ret %08x\n", r); + hr = IXMLDOMElement_get_childNodes( element, &node_list ); + EXPECT_HR(hr, S_OK); - r = IXMLDOMNodeList_get_length( node_list, &len ); - ok( r == S_OK, "ret %08x\n", r); + hr = IXMLDOMNodeList_get_length( node_list, &len ); + EXPECT_HR(hr, S_OK); ok( len == 4, "len %d\n", len); - r = IXMLDOMNodeList_get_item( node_list, 2, &node ); - ok( r == S_OK, "ret %08x\n", r); + hr = IXMLDOMNodeList_get_item( node_list, 2, &node ); + EXPECT_HR(hr, S_OK); - r = IXMLDOMNode_get_childNodes( node, &node_list2 ); - ok( r == S_OK, "ret %08x\n", r); + hr = IXMLDOMNode_get_childNodes( node, &node_list2 ); + EXPECT_HR(hr, S_OK); - r = IXMLDOMNodeList_get_length( node_list2, &len ); - ok( r == S_OK, "ret %08x\n", r); + hr = IXMLDOMNodeList_get_length( node_list2, &len ); + EXPECT_HR(hr, S_OK); ok( len == 0, "len %d\n", len); - r = IXMLDOMNodeList_get_item( node_list2, 0, &node2); - ok( r == S_FALSE, "ret %08x\n", r); + hr = IXMLDOMNodeList_get_item( node_list2, 0, &node2); + EXPECT_HR(hr, S_FALSE); IXMLDOMNodeList_Release( node_list2 ); IXMLDOMNode_Release( node ); IXMLDOMNodeList_Release( node_list ); IXMLDOMElement_Release( element ); + + /* test for children of <?xml ..?> node */ + hr = IXMLDOMDocument_get_firstChild(doc, &node); + EXPECT_HR(hr, S_OK); + + str = NULL; + hr = IXMLDOMNode_get_nodeName(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("xml")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + /* it returns empty but valid node list */ + node_list = (void*)0xdeadbeef; + hr = IXMLDOMNode_get_childNodes(node, &node_list); + EXPECT_HR(hr, S_OK); + + len = -1; + hr = IXMLDOMNodeList_get_length(node_list, &len); + EXPECT_HR(hr, S_OK); + ok(len == 0, "got %d\n", len); + + IXMLDOMNodeList_Release( node_list ); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release( doc ); + free_bstrs(); } static void test_get_firstChild(void) @@ -3973,7 +3998,7 @@ static void test_get_firstChild(void) r = IXMLDOMNode_get_nodeName( node, &str ); ok( r == S_OK, "ret %08x\n", r); - ok(memcmp(str, xmlW, sizeof(xmlW)) == 0, "expected \"xml\" node name\n"); + ok(!lstrcmpW(str, xmlW), "expected \"xml\" node name, got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release( node ); @@ -9693,19 +9718,101 @@ static void test_get_attributes(void) if (hr == S_OK) { - IXMLDOMNode_Release(node); + IXMLDOMAttribute *attr; + DOMNodeType type; + VARIANT v; - node = NULL; - hr = IXMLDOMNamedNodeMap_get_item(map, 0, &node); + node2 = NULL; + hr = IXMLDOMNamedNodeMap_get_item(map, 0, &node2); + EXPECT_HR(hr, S_OK); + ok(node != NULL, "got %p\n", node2); + + hr = IXMLDOMNode_get_nodeName(node2, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("version")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + length = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &length); + EXPECT_HR(hr, S_OK); + ok(length == 1, "got %d\n", length); + + type = -1; + hr = IXMLDOMNode_get_nodeType(node2, &type); + EXPECT_HR(hr, S_OK); + ok(type == NODE_ATTRIBUTE, "got %d\n", type); + + hr = IXMLDOMNode_get_xml(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<?xml version=\"1.0\"?>")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IXMLDOMNode_get_text(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("version=\"1.0\"")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IXMLDOMNamedNodeMap_removeNamedItem(map, _bstr_("version"), NULL); + EXPECT_HR(hr, S_OK); + + length = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &length); + EXPECT_HR(hr, S_OK); + ok(length == 0, "got %d\n", length); + + hr = IXMLDOMNode_get_xml(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<?xml version=\"1.0\"?>")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IXMLDOMNode_get_text(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMNamedNodeMap_Release(map); + + hr = IXMLDOMNode_get_attributes(node, &map); ok(hr == S_OK, "got %08x\n", hr); - ok(node != NULL, "got %p\n", node); - hr = IXMLDOMNode_get_nodeName(node, &str); + length = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &length); + EXPECT_HR(hr, S_OK); + ok(length == 0, "got %d\n", length); + + hr = IXMLDOMDocument_createAttribute(doc, _bstr_("encoding"), &attr); + EXPECT_HR(hr, S_OK); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("UTF-8"); + hr = IXMLDOMAttribute_put_nodeValue(attr, v); + EXPECT_HR(hr, S_OK); + + EXPECT_REF(attr, 2); + hr = IXMLDOMNamedNodeMap_setNamedItem(map, (IXMLDOMNode*)attr, NULL); + EXPECT_HR(hr, S_OK); + EXPECT_REF(attr, 2); + + hr = IXMLDOMNode_get_attributes(node, &map); ok(hr == S_OK, "got %08x\n", hr); - ok(!lstrcmpW(str, _bstr_("version")), "got %s\n", wine_dbgstr_w(str)); + + length = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &length); + EXPECT_HR(hr, S_OK); + ok(length == 1, "got %d\n", length); + + hr = IXMLDOMNode_get_xml(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<?xml version=\"1.0\"?>")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IXMLDOMNode_get_text(node, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("encoding=\"UTF-8\"")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNamedNodeMap_Release(map); + IXMLDOMNode_Release(node2); } IXMLDOMNode_Release(node);

1 0

Nikolay Sivov : msxml3: Initial tests for IObjectWithSite support for httprequest.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 61f693846ac5da3cfa76b9c6c0ff444ac64e8111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f693846ac5da3cfa76b9c6c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 00:13:14 2011 +0300 msxml3: Initial tests for IObjectWithSite support for httprequest. --- dlls/msxml3/tests/domdoc.c | 1523 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 1360 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61f693846ac5da3cfa76b…

1 0

Nikolay Sivov : comctl32/listview: Fix edit box text limit.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 7bdcbfb9a0e5662018b9c2f091841b80d5b3825c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bdcbfb9a0e5662018b9c2f09… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 00:32:27 2011 +0300 comctl32/listview: Fix edit box text limit. --- dlls/comctl32/listview.c | 1 + dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 754d817..1f64cbe 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5879,6 +5879,7 @@ static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, BOOL isW) SetWindowLongPtrA(hedit, GWLP_WNDPROC, (DWORD_PTR)EditLblWndProcA) ); SendMessageW(hedit, WM_SETFONT, (WPARAM)infoPtr->hFont, FALSE); + SendMessageW(hedit, EM_SETLIMITTEXT, DISP_TEXT_SIZE-1, 0); return hedit; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a7de6e7..c2bf70b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -350,7 +350,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (edit) { INT len = SendMessageA(edit, EM_GETLIMITTEXT, 0, 0); - todo_wine ok(len == 259 || broken(len == 260) /* includes NULL in NT4 */, + ok(len == 259 || broken(len == 260) /* includes NULL in NT4 */, "text limit %d, expected 259\n", len); }

1 0

Nikolay Sivov : comctl32/listview: Adjust dispinfo text buffer length.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 124eaa046f5dfd98747448de2915a95c7713cbc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=124eaa046f5dfd98747448de2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 00:28:21 2011 +0300 comctl32/listview: Adjust dispinfo text buffer length. --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 40 +++++++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 60178b3..754d817 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -360,7 +360,7 @@ typedef struct tagLISTVIEW_INFO #define SB_INTERNAL -1 /* maximum size of a label */ -#define DISP_TEXT_SIZE 512 +#define DISP_TEXT_SIZE 260 /* padding for items in list and small icon display modes */ #define WIDTH_PADDING 12 diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a4ffa2e..a7de6e7 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -340,12 +340,22 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP switch (((NMHDR*)lParam)->code) { case LVN_BEGINLABELEDIT: + { + HWND edit = NULL; + /* subclass edit box */ if (!blockEdit) - subclass_editbox(((NMHDR*)lParam)->hwndFrom); + edit = subclass_editbox(((NMHDR*)lParam)->hwndFrom); - return blockEdit; + if (edit) + { + INT len = SendMessageA(edit, EM_GETLIMITTEXT, 0, 0); + todo_wine ok(len == 259 || broken(len == 260) /* includes NULL in NT4 */, + "text limit %d, expected 259\n", len); + } + return blockEdit; + } case LVN_ENDLABELEDIT: { /* always accept new item text */ @@ -381,6 +391,13 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP dispinfo->hdr.code = LVN_GETDISPINFOW; memcpy(dispinfo->item.pszText, testW, sizeof(testW)); } + + /* test control buffer size for text, 10 used to mask cases when control + is using caller buffer to process LVM_GETITEM for example */ + if (dispinfo->item.mask & LVIF_TEXT && dispinfo->item.cchTextMax > 10) + ok(dispinfo->item.cchTextMax == 260 || + broken(dispinfo->item.cchTextMax == 264) /* NT4 reports aligned size */, + "buffer size %d\n", dispinfo->item.cchTextMax); } break; case NM_HOVER: @@ -634,7 +651,6 @@ static void test_lvm_hittest_(HWND hwnd, INT x, INT y, INT item, UINT flags, UIN lpht.pt.y = y; lpht.iSubItem = 10; - trace("hittesting pt=(%d,%d)\n", lpht.pt.x, lpht.pt.y); ret = SendMessage(hwnd, LVM_HITTEST, 0, (LPARAM)&lpht); if (todo_item) @@ -677,7 +693,6 @@ static void test_lvm_subitemhittest_(HWND hwnd, INT x, INT y, INT item, INT subi lpht.pt.x = x; lpht.pt.y = y; - trace("subhittesting pt=(%d,%d)\n", lpht.pt.x, lpht.pt.y); ret = SendMessage(hwnd, LVM_SUBITEMHITTEST, 0, (LPARAM)&lpht); if (todo_item) @@ -1503,7 +1518,6 @@ static void test_redraw(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("invalidate & update\n"); InvalidateRect(hwnd, NULL, TRUE); UpdateWindow(hwnd); ok_sequence(sequences, LISTVIEW_SEQ_INDEX, redraw_listview_seq, "redraw listview", FALSE); @@ -1637,8 +1651,6 @@ static void test_icon_spacing(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test icon spacing\n"); - r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(20, 30)); ok(r == MAKELONG(w, h) || broken(r == MAKELONG(w, w)), /* win98 */ @@ -1679,7 +1691,6 @@ static void test_color(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test color seq\n"); for (i = 0; i < 4; i++) { color = colors[i]; @@ -1743,8 +1754,6 @@ static void test_item_count(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test item count\n"); - r = SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); expect(0, r); @@ -1833,8 +1842,6 @@ static void test_item_position(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test item position\n"); - /* [item0] */ item0.mask = LVIF_TEXT; item0.iItem = 0; @@ -1896,7 +1903,7 @@ static void test_getorigin(void) hwnd = create_listview_control(LVS_ICON); ok(hwnd != NULL, "failed to create a listview window\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); expect(TRUE, r); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -1905,7 +1912,7 @@ static void test_getorigin(void) hwnd = create_listview_control(LVS_SMALLICON); ok(hwnd != NULL, "failed to create a listview window\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); expect(TRUE, r); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -1914,7 +1921,7 @@ static void test_getorigin(void) hwnd = create_listview_control(LVS_LIST); ok(hwnd != NULL, "failed to create a listview window\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); expect(FALSE, r); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -1923,12 +1930,11 @@ static void test_getorigin(void) hwnd = create_listview_control(LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); - trace("test get origin results\n"); + r = SendMessage(hwnd, LVM_GETORIGIN, 0, (LPARAM)&position); expect(FALSE, r); flush_sequences(sequences, NUM_MSG_SEQUENCES); DestroyWindow(hwnd); - } static void test_multiselect(void)

1 0

Nikolay Sivov : comctl32/monthcal: Clean day painting function.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 3796f127102093c1af1e9e10973fc9d0ea284855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3796f127102093c1af1e9e109… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 26 22:11:54 2011 +0300 comctl32/monthcal: Clean day painting function. --- dlls/comctl32/monthcal.c | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 0e1a65c..58afc97 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -666,20 +666,18 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM static const WCHAR fmtW[] = { '%','d',0 }; WCHAR buf[10]; RECT r, r_temp; - static BOOL bold_selected; - BOOL selected_day = FALSE; COLORREF oldCol = 0; COLORREF oldBk = 0; + INT old_bkmode, selection; -/* No need to check styles: when selection is not valid, it is set to zero. - * 1<day<31, so everything is OK. - */ - + /* no need to check styles: when selection is not valid, it is set to zero. + 1 < day < 31, so everything is OK */ MONTHCAL_CalcPosFromDay(infoPtr, st, &r); if(!IntersectRect(&r_temp, &(ps->rcPaint), &r)) return; if ((MONTHCAL_CompareDate(st, &infoPtr->minSel) >= 0) && - (MONTHCAL_CompareDate(st, &infoPtr->maxSel) <= 0)) { + (MONTHCAL_CompareDate(st, &infoPtr->maxSel) <= 0)) + { TRACE("%d %d %d\n", st->wDay, infoPtr->minSel.wDay, infoPtr->maxSel.wDay); TRACE("%s\n", wine_dbgstr_rect(&r)); @@ -687,23 +685,20 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM oldBk = SetBkColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); FillRect(hdc, &r, infoPtr->brushes[MCSC_TITLEBK]); - selected_day = TRUE; + selection = 1; } + else + selection = 0; - if(bold && !bold_selected) { - SelectObject(hdc, infoPtr->hBoldFont); - bold_selected = TRUE; - } - if(!bold && bold_selected) { - SelectObject(hdc, infoPtr->hFont); - bold_selected = FALSE; - } + SelectObject(hdc, bold ? infoPtr->hBoldFont : infoPtr->hFont); - SetBkMode(hdc,TRANSPARENT); + old_bkmode = SetBkMode(hdc, TRANSPARENT); wsprintfW(buf, fmtW, st->wDay); DrawTextW(hdc, buf, -1, &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE ); + SetBkMode(hdc, old_bkmode); - if(selected_day) { + if (selection) + { SetTextColor(hdc, oldCol); SetBkColor(hdc, oldBk); }

1 0

Nikolay Sivov : comctl32/monthcal: Selection and abbreviations should use title colour.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 802ab38f0ce2f346e9b79e3c970495ebaeddbb05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=802ab38f0ce2f346e9b79e3c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 26 16:49:21 2011 +0300 comctl32/monthcal: Selection and abbreviations should use title colour. --- dlls/comctl32/monthcal.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index b750a18..0e1a65c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -668,7 +668,6 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM RECT r, r_temp; static BOOL bold_selected; BOOL selected_day = FALSE; - HBRUSH hbr; COLORREF oldCol = 0; COLORREF oldBk = 0; @@ -686,8 +685,7 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM TRACE("%s\n", wine_dbgstr_rect(&r)); oldCol = SetTextColor(hdc, infoPtr->colors[MCSC_MONTHBK]); oldBk = SetBkColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); - hbr = GetSysColorBrush(COLOR_HIGHLIGHT); - FillRect(hdc, &r, hbr); + FillRect(hdc, &r, infoPtr->brushes[MCSC_TITLEBK]); selected_day = TRUE; } @@ -1013,7 +1011,7 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const /* draw day abbreviations */ SelectObject(hdc, infoPtr->hFont); SetBkColor(hdc, infoPtr->colors[MCSC_MONTHBK]); - SetTextColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); + SetTextColor(hdc, infoPtr->colors[MCSC_TITLEBK]); /* rectangle to draw a single day abbreviation within */ r = infoPtr->calendars[calIdx].wdays; r.right = r.left + infoPtr->width_increment;

1 0

Nikolay Sivov : comctl32/monthcal: Cache brush handles.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 6d4b96020e2f8e9cff19b16a67f6ed11d9263435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4b96020e2f8e9cff19b16a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 26 15:58:59 2011 +0300 comctl32/monthcal: Cache brush handles. --- dlls/comctl32/monthcal.c | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 28af051..b750a18 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -95,6 +95,7 @@ typedef struct DWORD dwStyle; /* cached GWL_STYLE */ COLORREF colors[MCSC_TRAILINGTEXT+1]; + HBRUSH brushes[MCSC_MONTHBK+1]; HFONT hFont; HFONT hBoldFont; @@ -754,13 +755,10 @@ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRU RECT *title = &infoPtr->calendars[calIdx].title; const SYSTEMTIME *st = &infoPtr->calendars[calIdx].month; WCHAR buf_month[80], buf_fmt[80]; - HBRUSH hbr; SIZE sz; /* fill header box */ - hbr = CreateSolidBrush(infoPtr->colors[MCSC_TITLEBK]); - FillRect(hdc, title, hbr); - DeleteObject(hbr); + FillRect(hdc, title, infoPtr->brushes[MCSC_TITLEBK]); /* month/year string */ SetBkColor(hdc, infoPtr->colors[MCSC_TITLEBK]); @@ -792,7 +790,6 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con INT i, prev_month; SYSTEMTIME st; WCHAR buf[80]; - HBRUSH hbr; RECT r; if (!(infoPtr->dwStyle & MCS_WEEKNUMBERS)) return; @@ -864,9 +861,7 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con r = infoPtr->calendars[calIdx].weeknums; /* erase whole week numbers area */ - hbr = CreateSolidBrush(infoPtr->colors[MCSC_MONTHBK]); - FillRect(hdc, &r, hbr); - DeleteObject(hbr); + FillRect(hdc, &r, infoPtr->brushes[MCSC_MONTHBK]); /* reduce rectangle to one week number */ r.bottom = r.top + infoPtr->height_increment; @@ -994,7 +989,6 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const RECT r, fill_bk_rect; SYSTEMTIME st; WCHAR buf[80]; - HBRUSH hbr; int mask; /* fill whole days area - from week days area to today note rectangle */ @@ -1002,9 +996,7 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const fill_bk_rect.bottom = infoPtr->calendars[calIdx].days.bottom + (infoPtr->todayrect.bottom - infoPtr->todayrect.top); - hbr = CreateSolidBrush(infoPtr->colors[MCSC_MONTHBK]); - FillRect(hdc, &fill_bk_rect, hbr); - DeleteObject(hbr); + FillRect(hdc, &fill_bk_rect, infoPtr->brushes[MCSC_MONTHBK]); /* draw line under day abbreviations */ MoveToEx(hdc, infoPtr->calendars[calIdx].days.left + 3, @@ -1136,6 +1128,13 @@ MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, UINT index, COLORREF color) prev = infoPtr->colors[index]; infoPtr->colors[index] = color; + /* update cached brush */ + if (index == MCSC_BACKGROUND || index == MCSC_TITLEBK || index == MCSC_MONTHBK) + { + DeleteObject(infoPtr->brushes[index]); + infoPtr->brushes[index] = CreateSolidBrush(color); + } + InvalidateRect(infoPtr->hwndSelf, NULL, index == MCSC_BACKGROUND ? TRUE : FALSE); return prev; } @@ -2237,15 +2236,12 @@ MONTHCAL_Paint(MONTHCAL_INFO *infoPtr, HDC hdc_paint) static LRESULT MONTHCAL_EraseBkgnd(const MONTHCAL_INFO *infoPtr, HDC hdc) { - HBRUSH hbr; RECT rc; if (!GetClipBox(hdc, &rc)) return FALSE; /* fill background */ - hbr = CreateSolidBrush (infoPtr->colors[MCSC_BACKGROUND]); - FillRect(hdc, &rc, hbr); - DeleteObject(hbr); + FillRect(hdc, &rc, infoPtr->brushes[MCSC_BACKGROUND]); return TRUE; } @@ -2538,6 +2534,10 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->colors[MCSC_MONTHBK] = comctl32_color.clrWindow; infoPtr->colors[MCSC_TRAILINGTEXT] = comctl32_color.clrGrayText; + infoPtr->brushes[MCSC_BACKGROUND] = CreateSolidBrush(infoPtr->colors[MCSC_BACKGROUND]); + infoPtr->brushes[MCSC_TITLEBK] = CreateSolidBrush(infoPtr->colors[MCSC_TITLEBK]); + infoPtr->brushes[MCSC_MONTHBK] = CreateSolidBrush(infoPtr->colors[MCSC_MONTHBK]); + infoPtr->minSel = infoPtr->todaysDate; infoPtr->maxSel = infoPtr->todaysDate; infoPtr->calendars[0].month = infoPtr->todaysDate; @@ -2571,6 +2571,10 @@ MONTHCAL_Destroy(MONTHCAL_INFO *infoPtr) CloseThemeData (GetWindowTheme (infoPtr->hwndSelf)); + DeleteObject(infoPtr->brushes[MCSC_BACKGROUND]); + DeleteObject(infoPtr->brushes[MCSC_TITLEBK]); + DeleteObject(infoPtr->brushes[MCSC_MONTHBK]); + Free(infoPtr); return 0; }

1 0

Nikolay Sivov : comctl32/monthcal: Fix hit test for previous month.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: eb2dc5c900e7b7a54105e159d5f3932cac507a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2dc5c900e7b7a54105e159d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 26 04:05:59 2011 +0300 comctl32/monthcal: Fix hit test for previous month. --- dlls/comctl32/monthcal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 745ccbd..28af051 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1727,7 +1727,7 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) { htinfo.uHit = MCHT_CALENDARDATEPREV; MONTHCAL_GetPrevMonth(&htinfo.st); - htinfo.st.wDay = MONTHCAL_MonthLength(lpht->st.wMonth, lpht->st.wYear) + day; + htinfo.st.wDay = MONTHCAL_MonthLength(htinfo.st.wMonth, htinfo.st.wYear) + day; } else if (day > MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear)) {

1 0

Nikolay Sivov : comctl32/monthcal: Move partially visible months painting outside of calendar loop.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 2f65a83370b7f1e99f86ef71a7fccb0f9219293b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f65a83370b7f1e99f86ef71a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 26 02:23:01 2011 +0300 comctl32/monthcal: Move partially visible months painting outside of calendar loop. --- dlls/comctl32/monthcal.c | 87 ++++++++++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 42 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index b973ff9..745ccbd 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -946,6 +946,46 @@ static void MONTHCAL_PaintFocusAndCircle(const MONTHCAL_INFO *infoPtr, HDC hdc, } } +/* months before first calendar month and after last calendar month */ +static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) +{ + INT prev_month, mask, length; + SYSTEMTIME st_max, st; + + if (infoPtr->dwStyle & MCS_NOTRAILINGDATES) return; + + SetTextColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); + + prev_month = infoPtr->calendars[0].month.wMonth - 1; + + /* draw prev month */ + MONTHCAL_GetMinDate(infoPtr, &st); + mask = 1 << (st.wDay-1); + /* December and January both 31 days long, so no worries if wrapped */ + length = MONTHCAL_MonthLength(infoPtr->calendars[0].month.wMonth - 1, + infoPtr->calendars[0].month.wYear); + while(st.wDay <= length) + { + MONTHCAL_DrawDay(infoPtr, hdc, &st, infoPtr->monthdayState[0] & mask, ps); + mask <<= 1; + st.wDay++; + } + + /* draw next month */ + st = infoPtr->calendars[infoPtr->cal_num-1].month; + st.wDay = 1; + MONTHCAL_GetNextMonth(&st); + MONTHCAL_GetMaxDate(infoPtr, &st_max); + mask = 1; + + while(st.wDay <= st_max.wDay) + { + MONTHCAL_DrawDay(infoPtr, hdc, &st, infoPtr->monthdayState[2] & mask, ps); + mask <<= 1; + st.wDay++; + } +} + /* paint a calendar area */ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { @@ -978,7 +1018,7 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const infoPtr->calendars[calIdx].wdays.left = infoPtr->calendars[calIdx].days.left = infoPtr->calendars[calIdx].weeknums.right; - /* 1. draw day abbreviations */ + /* draw day abbreviations */ SelectObject(hdc, infoPtr->hFont); SetBkColor(hdc, infoPtr->colors[MCSC_MONTHBK]); SetTextColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); @@ -993,47 +1033,7 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const OffsetRect(&r, infoPtr->width_increment, 0); } - /* 2. previous and next months */ - if (!(infoPtr->dwStyle & MCS_NOTRAILINGDATES) && (calIdx == 0 || calIdx == infoPtr->cal_num - 1)) - { - SYSTEMTIME st_max; - - SetTextColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); - - /* draw prev month */ - if (calIdx == 0) - { - MONTHCAL_GetMinDate(infoPtr, &st); - mask = 1 << (st.wDay-1); - length = MONTHCAL_MonthLength(prev_month, date->wYear); - - while(st.wDay <= length) - { - MONTHCAL_DrawDay(infoPtr, hdc, &st, infoPtr->monthdayState[0] & mask, ps); - mask <<= 1; - st.wDay++; - } - } - - /* draw next month */ - if (calIdx == infoPtr->cal_num - 1) - { - st = *date; - st.wDay = 1; - MONTHCAL_GetNextMonth(&st); - MONTHCAL_GetMaxDate(infoPtr, &st_max); - mask = 1; - - while(st.wDay <= st_max.wDay) - { - MONTHCAL_DrawDay(infoPtr, hdc, &st, infoPtr->monthdayState[2] & mask, ps); - mask <<= 1; - st.wDay++; - } - } - } - - /* 3. current month */ + /* draw current month */ SetTextColor(hdc, infoPtr->colors[MCSC_TEXT]); st = *date; st.wDay = 1; @@ -1075,6 +1075,9 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT MONTHCAL_PaintWeeknumbers(infoPtr, hdc, ps, i); } + /* partially visible months */ + MONTHCAL_PaintLeadTrailMonths(infoPtr, hdc, ps); + /* focus and today rectangle */ MONTHCAL_PaintFocusAndCircle(infoPtr, hdc, ps);

1 0

Nikolay Sivov : comctl32/monthcal: Remove outdated comment.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: ddab5d8548d4ada5c2b945a6a115c45f953c91fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddab5d8548d4ada5c2b945a6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 25 22:54:26 2011 +0300 comctl32/monthcal: Remove outdated comment. --- dlls/comctl32/monthcal.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 1cc64db..b973ff9 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -33,7 +33,6 @@ * * TODO: * -- MCM_[GS]ETUNICODEFORMAT - * -- MONTHCAL_GetMonthRange * -- handle resources better (doesn't work now); * -- take care of internationalization. * -- keyboard handling. @@ -1265,8 +1264,6 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) } case GMR_DAYSTATE: { - /*FIXME: currently multicalendar feature isn't implemented, - min date from previous month and max date from next one returned */ MONTHCAL_GetMinDate(infoPtr, &st[0]); MONTHCAL_GetMaxDate(infoPtr, &st[1]); break;

1 0

André Hentschel : ntdll: Add check for DragonFly BSD.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: f73ee0a249423c5ed1076d8fbac3341195c8e470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73ee0a249423c5ed1076d8fb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 26 17:28:50 2011 +0100 ntdll: Add check for DragonFly BSD. --- dlls/ntdll/signal_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 13444ae..6c8e8e2 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -208,7 +208,7 @@ typedef struct trapframe SIGCONTEXT; #endif /* bsdi */ -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include <machine/trap.h>

1 0

Eric Pouech : include: Added missing no return attribute.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 394feff361423443f48b9cb16121b983a9975bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=394feff361423443f48b9cb16… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 19:43:28 2011 +0100 include: Added missing no return attribute. --- include/winbase.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 1222bec..2752e12 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1578,7 +1578,7 @@ WINBASEAPI BOOL WINAPI FreeEnvironmentStringsA(LPSTR); WINBASEAPI BOOL WINAPI FreeEnvironmentStringsW(LPWSTR); #define FreeEnvironmentStrings WINELIB_NAME_AW(FreeEnvironmentStrings) WINBASEAPI BOOL WINAPI FreeLibrary(HMODULE); -WINBASEAPI VOID WINAPI FreeLibraryAndExitThread(HINSTANCE,DWORD); +WINBASEAPI VOID DECLSPEC_NORETURN WINAPI FreeLibraryAndExitThread(HINSTANCE,DWORD); #define FreeModule(handle) FreeLibrary(handle) #define FreeProcInstance(proc) /*nothing*/ WINBASEAPI BOOL WINAPI FreeResource(HGLOBAL);

1 0

David Hedberg : mspatcha: New dll stub.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 21085edb51fdbab4b256ecb96c0d2849263fac2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=21085edb51fdbab4b256ecb96… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Mar 22 04:16:56 2011 +0100 mspatcha: New dll stub. --- configure | 1 + configure.ac | 1 + dlls/mspatcha/Makefile.in | 6 ++++ dlls/mspatcha/mspatcha.spec | 12 ++++++++ dlls/mspatcha/mspatcha_main.c | 62 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ea86547..3b5e8bd 100755 --- a/configure +++ b/configure @@ -15174,6 +15174,7 @@ wine_fn_config_dll msimtf enable_msimtf wine_fn_config_dll msisip enable_msisip wine_fn_config_dll msisys.ocx enable_msisys_ocx wine_fn_config_dll msnet32 enable_msnet32 +wine_fn_config_dll mspatcha enable_mspatcha wine_fn_config_dll msrle32 enable_msrle32 po wine_fn_config_dll mssign32 enable_mssign32 wine_fn_config_dll mssip32 enable_mssip32 diff --git a/configure.ac b/configure.ac index 448975e..326aa30 100644 --- a/configure.ac +++ b/configure.ac @@ -2636,6 +2636,7 @@ WINE_CONFIG_DLL(msimtf) WINE_CONFIG_DLL(msisip) WINE_CONFIG_DLL(msisys.ocx) WINE_CONFIG_DLL(msnet32) +WINE_CONFIG_DLL(mspatcha) WINE_CONFIG_DLL(msrle32,,[po]) WINE_CONFIG_DLL(mssign32) WINE_CONFIG_DLL(mssip32) diff --git a/dlls/mspatcha/Makefile.in b/dlls/mspatcha/Makefile.in new file mode 100644 index 0000000..23663eb --- /dev/null +++ b/dlls/mspatcha/Makefile.in @@ -0,0 +1,6 @@ +MODULE = mspatcha.dll + +C_SRCS = \ + mspatcha_main.c + +@MAKE_DLL_RULES@ diff --git a/dlls/mspatcha/mspatcha.spec b/dlls/mspatcha/mspatcha.spec new file mode 100644 index 0000000..ca9bc7d --- /dev/null +++ b/dlls/mspatcha/mspatcha.spec @@ -0,0 +1,12 @@ +1 stub ApplyPatchToFileA +2 stub ApplyPatchToFileByHandles +3 stub ApplyPatchToFileByHandlesEx +4 stub ApplyPatchToFileExA +5 stub ApplyPatchToFileExW +6 stdcall ApplyPatchToFileW(wstr wstr wstr long) +7 stub GetFilePatchSignatureA +8 stub GetFilePatchSignatureByHandle +9 stub GetFilePatchSignatureW +10 stub TestApplyPatchToFileA +11 stub TestApplyPatchToFileByHandles +12 stub TestApplyPatchToFileW diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c new file mode 100644 index 0000000..0110a41 --- /dev/null +++ b/dlls/mspatcha/mspatcha_main.c @@ -0,0 +1,62 @@ +/* + * PatchAPI + * + * Copyright 2011 David Hedberg for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mspatcha); + +/***************************************************** + * DllMain (MSPATCHA.@) + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} + +/***************************************************** + * ApplyPatchToFileW (MSPATCHA.6) + */ +BOOL WINAPI ApplyPatchToFileW(LPCWSTR patch_file, LPCWSTR old_file, LPCWSTR new_file, ULONG apply_flags) +{ + FIXME("stub - %s, %s, %s, %08x\n", debugstr_w(patch_file), debugstr_w(old_file), + debugstr_w(new_file), apply_flags); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

André Hentschel : wininet: Port numbers are unsigned.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 1a39e29c3b405768d8f8192df8dcc1fc407f212f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a39e29c3b405768d8f8192df… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 27 15:27:46 2011 +0200 wininet: Port numbers are unsigned. --- dlls/wininet/http.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9444f08..b78fec4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1437,8 +1437,8 @@ static WCHAR *HTTP_BuildProxyRequestUrl(http_request_t *req) else { static const WCHAR slash[] = { '/',0 }; - static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','d',0 }; - static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','d',0 }; + static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 }; + static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','u',0 }; http_session_t *session = req->session; size = 16; /* "https://" + sizeof(port#) + ":/\0" */ @@ -3424,7 +3424,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT) { int len; - static const WCHAR fmt[] = {'%','s',':','%','i',0}; + static const WCHAR fmt[] = {'%','s',':','%','u',0}; len = lstrlenW(hostName); len += 7; /* 5 for strlen("65535") + 1 for ":" + 1 for '\0' */ session->hostName = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); @@ -3530,7 +3530,7 @@ static DWORD HTTP_SecureProxyConnect(http_request_t *request) char *ascii_req; DWORD res; static const WCHAR szConnect[] = {'C','O','N','N','E','C','T',0}; - static const WCHAR szFormat[] = {'%','s',':','%','d',0}; + static const WCHAR szFormat[] = {'%','s',':','%','u',0}; http_session_t *session = request->session; TRACE("\n");

1 0

André Hentschel : winhttp: Port numbers are unsigned.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 1bf001cf0b4d536eafcbc4fccd2d8f481f74789f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf001cf0b4d536eafcbc4fcc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 27 15:26:26 2011 +0200 winhttp: Port numbers are unsigned. --- dlls/winhttp/request.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f6fc577..2c3d534 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -502,7 +502,7 @@ static WCHAR *build_request_path( request_t *request ) sprintfW( ret, fmt, scheme, request->connect->hostname ); if (request->connect->hostport) { - static const WCHAR colonFmt[] = { ':','%','d',0 }; + static const WCHAR colonFmt[] = { ':','%','u',0 }; sprintfW( ret + strlenW( ret ), colonFmt, request->connect->hostport ); @@ -868,7 +868,7 @@ static BOOL read_reply( request_t *request ); static BOOL secure_proxy_connect( request_t *request ) { static const WCHAR verbConnect[] = {'C','O','N','N','E','C','T',0}; - static const WCHAR fmt[] = {'%','s',':','%','d',0}; + static const WCHAR fmt[] = {'%','s',':','%','u',0}; BOOL ret = FALSE; LPWSTR path; connect_t *connect = request->connect;

1 0

Gregory M. Turner : gdi32: Initialize SetLayout function pointer.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: c7f7848026c47e9a1cf1d5e11246d1aac05e6bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f7848026c47e9a1cf1d5e11… Author: Gregory M. Turner <gmturner007(a)ameritech.net> Date: Sat Mar 26 18:31:04 2011 +0000 gdi32: Initialize SetLayout function pointer. --- dlls/gdi32/driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index bdbb318..13bd7bd 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -165,6 +165,7 @@ static struct graphics_driver *create_driver( HMODULE module ) GET_FUNC(SetDIBitsToDevice); GET_FUNC(SetDeviceClipping); GET_FUNC(SetDeviceGammaRamp); + GET_FUNC(SetLayout); GET_FUNC(SetMapMode); GET_FUNC(SetMapperFlags); GET_FUNC(SetPixel);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011