March 2011 - wine-commits

Hans Leidekker : server: Map the Unix user id to a local user SID instead of the interactive SID.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: c65bcce5899ba81226295303ed3df73a7be86c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65bcce5899ba81226295303e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 2 10:46:12 2011 +0100 server: Map the Unix user id to a local user SID instead of the interactive SID. --- dlls/advapi32/tests/security.c | 12 +++--------- dlls/kernel32/tests/environ.c | 3 +-- server/registry.c | 2 +- server/security.h | 2 +- server/token.c | 13 +++++++++++-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4ba244f..3dae81b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1674,10 +1674,7 @@ static void test_LookupAccountSid(void) user_sizeA = MAX_PATH; ret = GetUserNameA(usernameA , &user_sizeA); ok(ret, "GetUserNameA() Expected TRUE, got FALSE\n"); - todo_wine - { - ok(lstrcmpA(usernameA, accountA) == 0, "LookupAccountSidA() Expected account name: %s got: %s\n", usernameA, accountA ); - } + ok(lstrcmpA(usernameA, accountA) == 0, "LookupAccountSidA() Expected account name: %s got: %s\n", usernameA, accountA ); } HeapFree(GetProcessHeap(), 0, ptiUser); @@ -1912,11 +1909,8 @@ static void test_LookupAccountName(void) get_sid_info(psid, &account, &sid_dom); ok(ret, "Failed to lookup account name\n"); ok(sid_size == GetLengthSid(psid), "Expected %d, got %d\n", GetLengthSid(psid), sid_size); - todo_wine - { - ok(!lstrcmp(account, user_name), "Expected %s, got %s\n", user_name, account); - ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); - } + ok(!lstrcmp(account, user_name), "Expected %s, got %s\n", user_name, account); + ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); ok(domain_size == domain_save - 1, "Expected %d, got %d\n", domain_save - 1, domain_size); ok(strlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); ok(sid_use == SidTypeUser, "Expected SidTypeUser (%d), got %d\n", SidTypeUser, sid_use); diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 0a7eef9..3ac86cd 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -72,8 +72,7 @@ static void test_Predefined(void) ok(NoErr, "Failed to open token, error %u\n", GetLastError()); DataSize = sizeof(Data); NoErr = pGetUserProfileDirectoryA(Token, Data, &DataSize); - todo_wine ok(NoErr, "Failed to get user profile dir, error %u\n", - GetLastError()); + ok(NoErr, "Failed to get user profile dir, error %u\n", GetLastError()); if (NoErr) { EnvSize = GetEnvironmentVariableA("USERPROFILE", Env, sizeof(Env)); diff --git a/server/registry.c b/server/registry.c index 2aea747..a144c26 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1718,7 +1718,7 @@ void init_registry(void) /* load user.reg into HKEY_CURRENT_USER */ /* FIXME: match default user in token.c. should get from process token instead */ - current_user_path = format_user_registry_path( security_interactive_sid, &current_user_str ); + current_user_path = format_user_registry_path( security_local_user_sid, &current_user_str ); if (!current_user_path || !(hkcu = create_key_recursive( root_key, &current_user_str, current_time ))) fatal_error( "could not create HKEY_CURRENT_USER registry key\n" ); diff --git a/server/security.h b/server/security.h index 33cf5da..d5f629d 100644 --- a/server/security.h +++ b/server/security.h @@ -40,7 +40,7 @@ extern const LUID SeImpersonatePrivilege; extern const LUID SeCreateGlobalPrivilege; extern const PSID security_world_sid; -extern const PSID security_interactive_sid; +extern const PSID security_local_user_sid; extern const PSID security_local_system_sid; diff --git a/server/token.c b/server/token.c index 69ffab7..e8e85fc 100644 --- a/server/token.c +++ b/server/token.c @@ -70,11 +70,20 @@ static const SID interactive_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_ANONYMOUS_LOGON_RID } }; static const SID authenticated_user_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } }; static const SID local_system_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } }; +static const struct /* same fields as struct SID */ +{ + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[5]; +} local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, 1000 } }; + const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; -const PSID security_interactive_sid = (PSID)&interactive_sid; +static const PSID security_interactive_sid = (PSID)&interactive_sid; static const PSID security_authenticated_user_sid = (PSID)&authenticated_user_sid; const PSID security_local_system_sid = (PSID)&local_system_sid; +const PSID security_local_user_sid = (PSID)&local_user_sid; static luid_t prev_luid_value = { 1000, 0 }; @@ -194,7 +203,7 @@ const SID *security_unix_uid_to_sid( uid_t uid ) { /* very simple mapping: either the current user or not the current user */ if (uid == getuid()) - return &interactive_sid; + return (const SID *)&local_user_sid; else return &anonymous_logon_sid; }

1 0

Henri Verbeet : wined3d: Retrieve the surface' s texture name through a function.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: d523dee76b032e269d8724c43dc77d8f325fafae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d523dee76b032e269d8724c43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 08:55:49 2011 +0100 wined3d: Retrieve the surface's texture name through a function. --- dlls/wined3d/context.c | 14 ++++++-------- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cc0ad7e..9ace3b2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -273,20 +273,18 @@ static void context_attach_surface_fbo(const struct wined3d_context *context, if (surface && surface->resource.format->id != WINED3DFMT_NULL) { + BOOL srgb; + switch (location) { case SFLAG_INTEXTURE: - surface_prepare_texture(surface, gl_info, FALSE); - context_apply_attachment_filter_states(surface, location); - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_COLOR_ATTACHMENT0 + idx, - surface->texture_target, surface->texture_name, surface->texture_level); - break; - case SFLAG_INSRGBTEX: - surface_prepare_texture(surface, gl_info, TRUE); + srgb = location == SFLAG_INSRGBTEX; + surface_prepare_texture(surface, gl_info, srgb); context_apply_attachment_filter_states(surface, location); gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_COLOR_ATTACHMENT0 + idx, - surface->texture_target, surface->texture_name_srgb, surface->texture_level); + surface->texture_target, surface_get_texture_name(surface, srgb), + surface->texture_level); break; default: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3155b04..32a2189 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2155,6 +2155,11 @@ static inline IWineD3DSurfaceImpl *surface_from_resource(struct wined3d_resource return CONTAINING_RECORD(resource, IWineD3DSurfaceImpl, resource); } +static inline GLuint surface_get_texture_name(IWineD3DSurfaceImpl *surface, BOOL srgb) +{ + return srgb ? surface->texture_name_srgb : surface->texture_name; +} + void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect) DECLSPEC_HIDDEN; void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) DECLSPEC_HIDDEN; HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Standalone surfaces should never be sRGB.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: ddc7a803e96897b8e95e9ce6ca54021cbb68e87d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc7a803e96897b8e95e9ce6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 08:55:48 2011 +0100 wined3d: Standalone surfaces should never be sRGB. --- dlls/wined3d/surface.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b0f9dc6..0897467 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -707,24 +707,25 @@ void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) } else { - GLuint *name = srgb ? &surface->texture_name_srgb : &surface->texture_name; - if (surface->texture_level) { ERR("Standalone surface %p is non-zero texture level %u.\n", surface, surface->texture_level); } + if (srgb) + ERR("Trying to bind standalone surface %p as sRGB.\n", surface); + ENTER_GL(); - if (!*name) + if (!surface->texture_name) { - glGenTextures(1, name); + glGenTextures(1, &surface->texture_name); checkGLcall("glGenTextures"); - TRACE("Surface %p given name %u.\n", surface, *name); + TRACE("Surface %p given name %u.\n", surface, surface->texture_name); - glBindTexture(surface->texture_target, *name); + glBindTexture(surface->texture_target, surface->texture_name); checkGLcall("glBindTexture"); glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(surface->texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); @@ -735,7 +736,7 @@ void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) } else { - glBindTexture(surface->texture_target, *name); + glBindTexture(surface->texture_target, surface->texture_name); checkGLcall("glBindTexture"); }

1 0

Henri Verbeet : wined3d: Use basetexture_set_dirty() in some more places.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: fe425a2f23180ccbec4434ca9796167963fd0f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe425a2f23180ccbec4434ca9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 08:55:47 2011 +0100 wined3d: Use basetexture_set_dirty() in some more places. --- dlls/wined3d/basetexture.c | 3 +-- dlls/wined3d/cubetexture.c | 3 +-- dlls/wined3d/texture.c | 3 +-- dlls/wined3d/volume.c | 3 +-- dlls/wined3d/volumetexture.c | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 2c88675..20685e4 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -122,8 +122,7 @@ void basetexture_unload(IWineD3DBaseTextureImpl *texture) if (context) context_release(context); - texture->baseTexture.texture_rgb.dirty = TRUE; - texture->baseTexture.texture_srgb.dirty = TRUE; + basetexture_set_dirty(texture, TRUE); resource_unload(&texture->resource); } diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 0fc5aba..47dcc2b 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -418,8 +418,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_AddDirtyRect(IWineD3DCubeTexture * return WINED3DERR_INVALIDCALL; } - texture->baseTexture.texture_rgb.dirty = TRUE; - texture->baseTexture.texture_srgb.dirty = TRUE; + basetexture_set_dirty(texture, TRUE); surface_add_dirty_rect(surface_from_resource(sub_resource), dirty_rect); return WINED3D_OK; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index df52996..32ff66b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -435,8 +435,7 @@ static HRESULT WINAPI IWineD3DTextureImpl_AddDirtyRect(IWineD3DTexture *iface, c return WINED3DERR_INVALIDCALL; } - texture->baseTexture.texture_rgb.dirty = TRUE; - texture->baseTexture.texture_srgb.dirty = TRUE; + basetexture_set_dirty(texture, TRUE); surface_add_dirty_rect(surface_from_resource(sub_resource), dirty_rect); return WINED3D_OK; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 7c98cc9..e877cfb 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -279,8 +279,7 @@ static HRESULT WINAPI IWineD3DVolumeImpl_Map(IWineD3DVolume *iface, if (!(flags & (WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY))) { volume_add_dirty_box(This, &This->lockedBox); - This->container->baseTexture.texture_rgb.dirty = TRUE; - This->container->baseTexture.texture_srgb.dirty = TRUE; + basetexture_set_dirty((IWineD3DBaseTextureImpl *)This->container, TRUE); } This->locked = TRUE; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 6ebd1c2..2ac6091 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -349,8 +349,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_AddDirtyBox(IWineD3DVolumeTextur return WINED3DERR_INVALIDCALL; } - texture->baseTexture.texture_rgb.dirty = TRUE; - texture->baseTexture.texture_srgb.dirty = TRUE; + basetexture_set_dirty(texture, TRUE); volume_add_dirty_box(volume_from_resource(sub_resource), dirty_box); return WINED3D_OK;

1 0

Henri Verbeet : wined3d: The basetexture_set_dirty() return value is never used.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 7b2274dff19baece534fc3a9b1a331a7ac05c555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b2274dff19baece534fc3a9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 08:55:46 2011 +0100 wined3d: The basetexture_set_dirty() return value is never used. --- dlls/wined3d/basetexture.c | 7 +------ dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 8b2797e..2c88675 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -232,15 +232,10 @@ void basetexture_generate_mipmaps(IWineD3DBaseTextureImpl *texture) FIXME("texture %p stub!\n", texture); } -BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) +void basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) { - BOOL old; - - old = texture->baseTexture.texture_rgb.dirty || texture->baseTexture.texture_srgb.dirty; texture->baseTexture.texture_rgb.dirty = dirty; texture->baseTexture.texture_srgb.dirty = dirty; - - return old; } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0487a78..3155b04 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1925,7 +1925,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, const struct wined3d_ const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTextureImpl *texture, WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN; -BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPEC_HIDDEN; +void basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPEC_HIDDEN; DWORD basetexture_set_lod(IWineD3DBaseTextureImpl *texture, DWORD lod) DECLSPEC_HIDDEN; void basetexture_unload(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN;

1 0

Andrew Eikum : dsound: Also handle two-to-six-channel conversions.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 54ff22b8443fcc3023ef8d384656f2f24608a2f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ff22b8443fcc3023ef8d384… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 1 14:57:35 2011 -0600 dsound: Also handle two-to-six-channel conversions. --- dlls/dsound/mixer.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 6647e4a..846278e 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -294,22 +294,29 @@ static inline void cp_fields(const IDirectSoundBufferImpl *dsb, const BYTE *ibuf INT istep = dsb->pwfx->wBitsPerSample / 8, ostep = device->pwfx->wBitsPerSample / 8; if (device->pwfx->nChannels == dsb->pwfx->nChannels || - (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 6)) { + (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 6) || + (device->pwfx->nChannels == 6 && dsb->pwfx->nChannels == 2)) { dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj); - if (device->pwfx->nChannels == 2) + if (device->pwfx->nChannels == 2 || dsb->pwfx->nChannels == 2) dsb->convert(ibuf + istep, obuf + ostep, istride, ostride, count, freqAcc, adj); + return; } if (device->pwfx->nChannels == 1 && dsb->pwfx->nChannels == 2) { dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj); + return; } if (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 1) { dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj); dsb->convert(ibuf, obuf + ostep, istride, ostride, count, freqAcc, adj); + return; } + + WARN("Unable to remap channels: device=%u, buffer=%u\n", device->pwfx->nChannels, + dsb->pwfx->nChannels); } /**

1 0

John Edmonds : gdi32: Fixes GetDIBits for top-down destination bitmaps.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 0d0d4f394fd9e3f66f6a8ca6855cb31f4c741272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0d4f394fd9e3f66f6a8ca68… Author: John Edmonds <pocketcookies2(a)gmail.com> Date: Tue Mar 1 22:29:51 2011 -0500 gdi32: Fixes GetDIBits for top-down destination bitmaps. --- dlls/gdi32/dib.c | 14 ++++++++++---- dlls/gdi32/tests/bitmap.c | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index eae7f35..0abd833 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -874,7 +874,7 @@ INT WINAPI GetDIBits( unsigned int srcwidth = bmp->dib->dsBm.bmWidth; int srcwidthb = bmp->dib->dsBm.bmWidthBytes; unsigned int dstwidth = width; - unsigned int dstwidthb = DIB_GetDIBWidthBytes( width, bpp ); + int dstwidthb = DIB_GetDIBWidthBytes( width, bpp ); LPBYTE dbits = bits, sbits = (LPBYTE) bmp->dib->dsBm.bmBits + (startscan * srcwidthb); unsigned int x, y, width, widthb; @@ -888,6 +888,12 @@ INT WINAPI GetDIBits( sbits += (srcwidthb * (int)(abs(bmp->dib->dsBmih.biHeight) - 2 * startscan - 1)); srcwidthb = -srcwidthb; } + /*Same for the destination.*/ + if (height < 0) + { + dbits = (LPBYTE)bits + (dstwidthb * (lines - 1)); + dstwidthb = -dstwidthb; + } switch( bpp ) { case 15: @@ -902,7 +908,7 @@ INT WINAPI GetDIBits( case 16: /* 16 bpp srcDIB -> 16 bpp dstDIB */ { - widthb = min(abs(srcwidthb), dstwidthb); + widthb = min(abs(srcwidthb), abs(dstwidthb)); /* FIXME: BI_BITFIELDS not supported yet */ for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb) memcpy(dbits, sbits, widthb); @@ -980,7 +986,7 @@ INT WINAPI GetDIBits( case 24: /* 24 bpp srcDIB -> 24 bpp dstDIB */ { - widthb = min(abs(srcwidthb), dstwidthb); + widthb = min(abs(srcwidthb), abs(dstwidthb)); for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb) memcpy(dbits, sbits, widthb); } @@ -1056,7 +1062,7 @@ INT WINAPI GetDIBits( case 32: /* 32 bpp srcDIB -> 32 bpp dstDIB */ { - widthb = min(abs(srcwidthb), dstwidthb); + widthb = min(abs(srcwidthb), abs(dstwidthb)); /* FIXME: BI_BITFIELDS not supported yet */ for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb) { memcpy(dbits, sbits, widthb); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 01ac758..adef035 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3057,12 +3057,12 @@ static void test_GetDIBits_top_down(int bpp) /*Check both scanlines.*/ statusCode = GetDIBits(hdc, bmptb, 0, 2, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - todo_wine ok((char)pictureOut[0] == 0, "Top-down -> top-down: first scanline should be 0 but was %d.\n", (char)pictureOut[0]); - todo_wine ok((char)pictureOut[1] == 2, "Top-down -> top-down: second scanline should be 2 but was %d.\n", (char)pictureOut[0]); + ok((char)pictureOut[0] == 0, "Top-down -> top-down: first scanline should be 0 but was %d.\n", (char)pictureOut[0]); + ok((char)pictureOut[1] == 2, "Top-down -> top-down: second scanline should be 2 but was %d.\n", (char)pictureOut[0]); statusCode = GetDIBits(hdc, bmpbt, 0, 2, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - todo_wine ok((char)pictureOut[0] == 2, "Bottom up -> top-down: first scanline should be 2 but was %d.\n", (char)pictureOut[0]); - todo_wine ok((char)pictureOut[1] == 0, "Bottom up -> top-down: second scanline should be 0 but was %d.\n", (char)pictureOut[0]); + ok((char)pictureOut[0] == 2, "Bottom up -> top-down: first scanline should be 2 but was %d.\n", (char)pictureOut[0]); + ok((char)pictureOut[1] == 0, "Bottom up -> top-down: second scanline should be 0 but was %d.\n", (char)pictureOut[0]); DeleteObject(bmpbt); DeleteObject(bmptb);

1 0

John Edmonds : gdi32/tests: Updated tests for top-down destination bitmaps.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 374db9240b4c951c14b851dd5c840d55c6bf87fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=374db9240b4c951c14b851dd5… Author: John Edmonds <pocketcookies2(a)gmail.com> Date: Tue Mar 1 22:29:50 2011 -0500 gdi32/tests: Updated tests for top-down destination bitmaps. --- dlls/gdi32/tests/bitmap.c | 64 ++++++++++++++++++++++++++++---------------- 1 files changed, 41 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 17601be..01ac758 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2956,7 +2956,7 @@ static void test_32bit_bitmap_blt(void) } /* - * Used by test_GetDIBits_single_pixel_destination to create the bitmap to test against. + * Used by test_GetDIBits_top_down to create the bitmap to test against. */ static void setup_picture(char *picture, int bpp) { @@ -2980,12 +2980,12 @@ static void setup_picture(char *picture, int bpp) } } -static void test_GetDIBits_single_pixel_destination(int bpp) +static void test_GetDIBits_top_down(int bpp) { BITMAPINFO bi; HBITMAP bmptb, bmpbt; HDC hdc; - int pixelOut; + int pictureOut[4]; int *picture; int statusCode; @@ -3015,36 +3015,54 @@ static void test_GetDIBits_single_pixel_destination(int bpp) bi.bmiHeader.biWidth = 1; bi.bmiHeader.biHeight = 2; - statusCode = GetDIBits(hdc, bmpbt, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); + statusCode = GetDIBits(hdc, bmpbt, 0, 1, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); /*Check the first byte of the pixel.*/ - ok((char)pixelOut == 0, "Bottom-up -> bottom-up: first pixel should be 0 but was %d.\n", (char)pixelOut); - statusCode = GetDIBits(hdc, bmptb, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); + ok((char)pictureOut[0] == 0, "Bottom-up -> bottom-up: first pixel should be 0 but was %d.\n", (char)pictureOut[0]); + statusCode = GetDIBits(hdc, bmptb, 0, 1, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - ok((char)pixelOut == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pixelOut); + ok((char)pictureOut[0] == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pictureOut[0]); /*Check second scanline.*/ - statusCode = GetDIBits(hdc, bmptb, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); + statusCode = GetDIBits(hdc, bmptb, 1, 1, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - ok((char)pixelOut == 0, "Top-down -> bottom-up: first pixel should be 0 but was %d.\n", (char)pixelOut); - statusCode = GetDIBits(hdc, bmpbt, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); + ok((char)pictureOut[0] == 0, "Top-down -> bottom-up: first pixel should be 0 but was %d.\n", (char)pictureOut[0]); + statusCode = GetDIBits(hdc, bmpbt, 1, 1, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - ok((char)pixelOut == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pixelOut); + ok((char)pictureOut[0] == 2, "Bottom-up -> bottom-up: first pixel should be 2 but was %d.\n", (char)pictureOut[0]); + /*Check both scanlines.*/ + statusCode = GetDIBits(hdc, bmptb, 0, 2, pictureOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + ok((char)pictureOut[0] == 2, "Top-down -> bottom-up: first scanline should be 2 but was %d.\n", (char)pictureOut[0]); + ok((char)pictureOut[1] == 0, "Top-down -> bottom-up: second scanline should be 0 but was %d.\n", (char)pictureOut[0]); + statusCode = GetDIBits(hdc, bmpbt, 0, 2, pictureOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + ok((char)pictureOut[0] == 0, "Bottom up -> bottom-up: first scanline should be 0 but was %d.\n", (char)pictureOut[0]); + ok((char)pictureOut[1] == 2, "Bottom up -> bottom-up: second scanline should be 2 but was %d.\n", (char)pictureOut[0]); - /*Make destination bitmap top-down. This should be ignored by GetDIBits.*/ + /*Make destination bitmap top-down.*/ bi.bmiHeader.biHeight = -2; - statusCode = GetDIBits(hdc, bmpbt, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); + statusCode = GetDIBits(hdc, bmpbt, 0, 1, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - ok((char)pixelOut == 0, "Bottom-up -> top-down: first pixel should be 0 but was %d.\n", (char)pixelOut); - statusCode = GetDIBits(hdc, bmptb, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); + ok((char)pictureOut[0] == 0, "Bottom-up -> top-down: first pixel should be 0 but was %d.\n", (char)pictureOut[0]); + statusCode = GetDIBits(hdc, bmptb, 0, 1, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - ok((char)pixelOut == 2, "Top-down -> top-down: first pixel should be 2 but was %d.\n", (char)pixelOut); + ok((char)pictureOut[0] == 2, "Top-down -> top-down: first pixel should be 2 but was %d.\n", (char)pictureOut[0]); /*Check second scanline.*/ - statusCode = GetDIBits(hdc, bmptb, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); + statusCode = GetDIBits(hdc, bmptb, 1, 1, pictureOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + ok((char)pictureOut[0] == 0, "Top-down -> bottom-up: first pixel should be 0 but was %d.\n", (char)pictureOut[0]); + statusCode = GetDIBits(hdc, bmpbt, 1, 1, pictureOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + ok((char)pictureOut[0] == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pictureOut[0]); + /*Check both scanlines.*/ + statusCode = GetDIBits(hdc, bmptb, 0, 2, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - ok((char)pixelOut == 0, "Top-down -> bottom-up: first pixel should be 0 but was %d.\n", (char)pixelOut); - statusCode = GetDIBits(hdc, bmpbt, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); + todo_wine ok((char)pictureOut[0] == 0, "Top-down -> top-down: first scanline should be 0 but was %d.\n", (char)pictureOut[0]); + todo_wine ok((char)pictureOut[1] == 2, "Top-down -> top-down: second scanline should be 2 but was %d.\n", (char)pictureOut[0]); + statusCode = GetDIBits(hdc, bmpbt, 0, 2, pictureOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - ok((char)pixelOut == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pixelOut); + todo_wine ok((char)pictureOut[0] == 2, "Bottom up -> top-down: first scanline should be 2 but was %d.\n", (char)pictureOut[0]); + todo_wine ok((char)pictureOut[1] == 0, "Bottom up -> top-down: second scanline should be 0 but was %d.\n", (char)pictureOut[0]); DeleteObject(bmpbt); DeleteObject(bmptb); @@ -3079,7 +3097,7 @@ START_TEST(bitmap) test_bitmapinfoheadersize(); test_get16dibits(); test_clipping(); - test_GetDIBits_single_pixel_destination(16); - test_GetDIBits_single_pixel_destination(24); - test_GetDIBits_single_pixel_destination(32); + test_GetDIBits_top_down(16); + test_GetDIBits_top_down(24); + test_GetDIBits_top_down(32); }

1 0

Rico Schüller : d3dcompiler: Move some code from header to source file.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 5861deaefca84613fd8fc012e694a6dfb5ee1459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5861deaefca84613fd8fc012e… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Mar 1 22:36:22 2011 +0100 d3dcompiler: Move some code from header to source file. --- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 48 --------- dlls/d3dcompiler_43/d3dcompiler_private.h | 108 -------------------- dlls/d3dcompiler_43/reflection.c | 155 ++++++++++++++++++++++++++++- 3 files changed, 154 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5861deaefca84613fd8fc…

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionType::IsEqual().
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 4080242d7f1d5316a2c998f6e7edf609bc12666c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4080242d7f1d5316a2c998f6e… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Mar 1 22:36:19 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionType::IsEqual(). --- dlls/d3dcompiler_43/reflection.c | 15 +++++++++++++-- dlls/d3dcompiler_43/tests/reflection.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index e97512f..96c2920 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -872,9 +872,20 @@ static LPCSTR STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberType static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsEqual( ID3D11ShaderReflectionType *iface, ID3D11ShaderReflectionType *type) { - FIXME("iface %p, type %p stub!\n", iface, type); + struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); - return E_NOTIMPL; + TRACE("iface %p, type %p\n", iface, type); + + if (This == &null_type) + { + WARN("Null type specified\n"); + return E_FAIL; + } + + if (iface == type) + return S_OK; + + return S_FALSE; } static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetSubType( diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index fb27e0d..70c062e 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1380,6 +1380,18 @@ static void test_reflection_constant_buffer(void) t11 = t11_valid->lpVtbl->GetMemberTypeByName(t11_valid, "invalid"); ok(t11_dummy == t11, "GetMemberTypeByName failed, got %p, expected %p\n", t11, t11_dummy); + hr = t11_dummy->lpVtbl->IsEqual(t11_dummy, t11_dummy); + ok(hr == E_FAIL, "IsEqual failed, got %x, expected %x\n", hr, E_FAIL); + + hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11_dummy); + ok(hr == S_FALSE, "IsEqual failed, got %x, expected %x\n", hr, S_FALSE); + + hr = t11_dummy->lpVtbl->IsEqual(t11_dummy, t11_valid); + ok(hr == E_FAIL, "IsEqual failed, got %x, expected %x\n", hr, E_FAIL); + + hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11_valid); + ok(hr == S_OK, "IsEqual failed, got %x, expected %x\n", hr, S_OK); + /* constant buffers */ for (i = 0; i < sizeof(test_reflection_constant_buffer_cb_result)/sizeof(*test_reflection_constant_buffer_cb_result); ++i) { @@ -1472,6 +1484,23 @@ static void test_reflection_constant_buffer(void) string = t11->lpVtbl->GetMemberTypeName(t11, 1); ok(!strcmp(string, "b"), "GetMemberTypeName failed, got \"%s\", expected \"%s\"\n", string, "b"); + /* float vs float (in struct) */ + hr = t11->lpVtbl->IsEqual(t11, t11_valid); + ok(hr == S_FALSE, "IsEqual failed, got %x, expected %x\n", hr, S_FALSE); + + hr = t11_valid->lpVtbl->IsEqual(t11_valid, t11); + ok(hr == S_FALSE, "IsEqual failed, got %x, expected %x\n", hr, S_FALSE); + + /* float vs float */ + t = t11->lpVtbl->GetMemberTypeByIndex(t11, 0); + ok(t != t11_dummy, "GetMemberTypeByIndex failed\n"); + + t2 = t11->lpVtbl->GetMemberTypeByIndex(t11, 1); + ok(t2 != t11_dummy, "GetMemberTypeByIndex failed\n"); + + hr = t->lpVtbl->IsEqual(t, t2); + ok(hr == S_OK, "IsEqual failed, got %x, expected %x\n", hr, S_OK); + count = ref11->lpVtbl->Release(ref11); ok(count == 0, "Release failed %u\n", count); }

1 0

Rico Schüller : d3dcompiler/tests: Add GetMemberType* tests.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 66b286470e478eddfaade6e8c258196d23e34891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b286470e478eddfaade6e8c… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Mar 1 22:36:13 2011 +0100 d3dcompiler/tests: Add GetMemberType* tests. --- dlls/d3dcompiler_43/tests/reflection.c | 52 +++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 7d53f7a..fb27e0d 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1219,7 +1219,7 @@ static void test_reflection_constant_buffer(void) ID3D11ShaderReflection *ref11; ID3D11ShaderReflectionConstantBuffer *cb11, *cb11_dummy = NULL, *cb11_valid = NULL; ID3D11ShaderReflectionVariable *v11, *v11_dummy = NULL, *v11_valid = NULL; - ID3D11ShaderReflectionType *t11, *t11_dummy = NULL, *t11_valid = NULL; + ID3D11ShaderReflectionType *t11, *t, *t2, *t11_dummy = NULL, *t11_valid = NULL; D3D11_SHADER_BUFFER_DESC cbdesc = {0}; D3D11_SHADER_VARIABLE_DESC vdesc = {0}; D3D11_SHADER_TYPE_DESC tdesc = {0}; @@ -1228,6 +1228,7 @@ static void test_reflection_constant_buffer(void) const D3D11_SHADER_VARIABLE_DESC *pvdesc; const D3D11_SHADER_TYPE_DESC *ptdesc; unsigned int i; + LPCSTR string; hr = D3DReflect(test_reflection_constant_buffer_blob, test_reflection_constant_buffer_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); ok(hr == S_OK, "D3DReflect failed %x\n", hr); @@ -1355,6 +1356,30 @@ static void test_reflection_constant_buffer(void) hr = t11_valid->lpVtbl->GetDesc(t11_valid, NULL); ok(hr == E_FAIL, "GetDesc failed, got %x, expected %x\n", hr, E_FAIL); + string = t11_dummy->lpVtbl->GetMemberTypeName(t11_dummy, 0xffffffff); + ok(!strcmp(string, "$Invalid"), "GetMemberTypeName failed, got \"%s\", expected \"%s\"\n", string, "$Invalid"); + + string = t11_valid->lpVtbl->GetMemberTypeName(t11_valid, 0xffffffff); + ok(!string, "GetMemberTypeName failed, got \"%s\", expected NULL\n", string); + + t11 = t11_dummy->lpVtbl->GetMemberTypeByIndex(t11_dummy, 0xffffffff); + ok(t11_dummy == t11, "GetMemberTypeByIndex failed, got %p, expected %p\n", t11, t11_dummy); + + t11 = t11_valid->lpVtbl->GetMemberTypeByIndex(t11_valid, 0xffffffff); + ok(t11_dummy == t11, "GetMemberTypeByIndex failed, got %p, expected %p\n", t11, t11_dummy); + + t11 = t11_dummy->lpVtbl->GetMemberTypeByName(t11_dummy, NULL); + ok(t11_dummy == t11, "GetMemberTypeByName failed, got %p, expected %p\n", t11, t11_dummy); + + t11 = t11_dummy->lpVtbl->GetMemberTypeByName(t11_dummy, "invalid"); + ok(t11_dummy == t11, "GetMemberTypeByName failed, got %p, expected %p\n", t11, t11_dummy); + + t11 = t11_valid->lpVtbl->GetMemberTypeByName(t11_valid, NULL); + ok(t11_dummy == t11, "GetMemberTypeByName failed, got %p, expected %p\n", t11, t11_dummy); + + t11 = t11_valid->lpVtbl->GetMemberTypeByName(t11_valid, "invalid"); + ok(t11_dummy == t11, "GetMemberTypeByName failed, got %p, expected %p\n", t11, t11_dummy); + /* constant buffers */ for (i = 0; i < sizeof(test_reflection_constant_buffer_cb_result)/sizeof(*test_reflection_constant_buffer_cb_result); ++i) { @@ -1422,6 +1447,31 @@ static void test_reflection_constant_buffer(void) i, tdesc.Offset, ptdesc->Offset); } + /* types */ + v11 = ref11->lpVtbl->GetVariableByName(ref11, "t"); + ok(v11_dummy != v11, "GetVariableByName failed\n"); + + t11 = v11->lpVtbl->GetType(v11); + ok(t11 != t11_dummy, "GetType failed\n"); + + t = t11->lpVtbl->GetMemberTypeByIndex(t11, 0); + ok(t != t11_dummy, "GetMemberTypeByIndex failed\n"); + + t2 = t11->lpVtbl->GetMemberTypeByName(t11, "a"); + ok(t == t2, "GetMemberTypeByName failed, got %p, expected %p\n", t2, t); + + string = t11->lpVtbl->GetMemberTypeName(t11, 0); + ok(!strcmp(string, "a"), "GetMemberTypeName failed, got \"%s\", expected \"%s\"\n", string, "a"); + + t = t11->lpVtbl->GetMemberTypeByIndex(t11, 1); + ok(t != t11_dummy, "GetMemberTypeByIndex failed\n"); + + t2 = t11->lpVtbl->GetMemberTypeByName(t11, "b"); + ok(t == t2, "GetMemberTypeByName failed, got %p, expected %p\n", t2, t); + + string = t11->lpVtbl->GetMemberTypeName(t11, 1); + ok(!strcmp(string, "b"), "GetMemberTypeName failed, got \"%s\", expected \"%s\"\n", string, "b"); + count = ref11->lpVtbl->Release(ref11); ok(count == 0, "Release failed %u\n", count); }

1 0

Marcus Meissner : shdocvw: Rewrite code to make more understandable ( Coverity).
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: f90b5bfe731ee73bc3c2e2d1974831187676edb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90b5bfe731ee73bc3c2e2d19… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Mar 2 12:30:04 2011 +0100 shdocvw: Rewrite code to make more understandable (Coverity). --- dlls/shdocvw/shlinstobj.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index d272c91..63bf0e6 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -375,16 +375,15 @@ HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, REFIID riid, ppvClassObj); /* Figure if there is an 'Instance' subkey for the given CLSID and acquire a handle. */ - if (!StringFromGUID2(rclsid, wszInstanceKey + 6, CHARS_IN_GUID) || - !(wszInstanceKey[5+CHARS_IN_GUID]='\\') || /* Repair the null-termination. */ - ERROR_SUCCESS != RegOpenKeyExW(HKEY_CLASSES_ROOT, wszInstanceKey, 0, KEY_READ, &hInstanceKey)) - { + if (!StringFromGUID2(rclsid, wszInstanceKey + 6, CHARS_IN_GUID)) + return CLASS_E_CLASSNOTAVAILABLE; + wszInstanceKey[5+CHARS_IN_GUID] = '\\'; /* Repair the null-termination. */ + if (ERROR_SUCCESS != RegOpenKeyExW(HKEY_CLASSES_ROOT, wszInstanceKey, 0, KEY_READ, &hInstanceKey)) /* If there is no 'Instance' subkey, then it's not a Shell Instance Object. */ return CLASS_E_CLASSNOTAVAILABLE; - } - if (RegQueryValueExW(hInstanceKey, wszCLSID, NULL, &dwType, (LPBYTE)wszCLSIDInstance, &cbBytes) - != ERROR_SUCCESS || FAILED(CLSIDFromString(wszCLSIDInstance, &clsidInstance))) + if (ERROR_SUCCESS != RegQueryValueExW(hInstanceKey, wszCLSID, NULL, &dwType, (LPBYTE)wszCLSIDInstance, &cbBytes) || + FAILED(CLSIDFromString(wszCLSIDInstance, &clsidInstance))) { /* 'Instance' should have a 'CLSID' value with a well-formed clsid-string. */ FIXME("Failed to infer instance CLSID! %s\n", debugstr_w(wszCLSIDInstance));

1 0

André Hentschel : kernel32/tests: Add SetLastError() before a test (Valgrind).
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 4c6e57654f59a625c58726019093db5aa7b9e494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6e57654f59a625c58726019… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 1 17:08:06 2011 +0100 kernel32/tests: Add SetLastError() before a test (Valgrind). --- dlls/kernel32/tests/fiber.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 9811439..0e68535 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -138,6 +138,7 @@ static void test_FiberHandling(void) return; } + SetLastError(0xdeadbeef); fibers[1] = pCreateFiberEx(0,0,0,FiberMainProc,&testparam); ok(fibers[1] != 0, "CreateFiberEx failed with error %d\n", GetLastError());

1 0

Charles Davis : ntdll: Implement CDROM_GetInterfaceInfo() on Mac OS.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: f082eac97c3ec71de58eea85bb4de5a12b19f13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f082eac97c3ec71de58eea85b… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Tue Mar 1 12:59:44 2011 -0700 ntdll: Implement CDROM_GetInterfaceInfo() on Mac OS. --- dlls/ntdll/cdrom.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index c51ef6b..2722998 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -103,7 +103,16 @@ typedef struct uint64_t senseLen; } dk_scsi_command_t; +typedef struct +{ + uint64_t bus; + uint64_t port; + uint64_t target; + uint64_t lun; +} dk_scsi_identify_t; + #define DKIOCSCSICOMMAND _IOWR('d', 253, dk_scsi_command_t) +#define DKIOCSCSIIDENTIFY _IOR('d', 254, dk_scsi_identify_t) #endif @@ -630,6 +639,17 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi } } return 0; +#elif defined(__APPLE__) + dk_scsi_identify_t addr; + if (ioctl(fd, DKIOCSCSIIDENTIFY, &addr) != -1) + { + *port = addr.bus; + *iface = addr.port; + *device = addr.target; + *lun = addr.lun; + return 1; + } + return 0; #else FIXME("not implemented on this O/S\n"); return 0;

1 0

Juan Lang : wininet/tests: Test retrieving http requests from cache.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: eeb3e86f38ab659ddc68a3e97e893eb1b07c5e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb3e86f38ab659ddc68a3e97… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 1 10:56:00 2011 -0800 wininet/tests: Test retrieving http requests from cache. --- dlls/wininet/tests/http.c | 91 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a8c843a..95a5779 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1202,6 +1202,19 @@ static void test_http_cache(void) ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); CloseHandle(file); + /* Send the same request, requiring it to be retrieved from the cache */ + request = HttpOpenRequest(connect, "GET", "/hello.html", NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); + + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + size = sizeof(buf); + ret = InternetReadFile(request, buf, sizeof(buf), &size); + ok(ret, "InternetReadFile failed: %u\n", GetLastError()); + ok(size == 100, "size = %u\n", size); + + ok(InternetCloseHandle(request), "Close request handle failed\n"); + request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, types, INTERNET_FLAG_NO_CACHE_WRITE, 0); ok(request != NULL, "Failed to open request handle err %u\n", GetLastError()); @@ -1602,6 +1615,7 @@ static const char page1[] = struct server_info { HANDLE hEvent; int port; + int num_testH_retrievals; }; static DWORD CALLBACK server_thread(LPVOID param) @@ -1792,6 +1806,17 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, page1, sizeof page1-1, 0); } + if (strstr(buffer, "GET /testH")) + { + si->num_testH_retrievals++; + if (!strstr(buffer, "Content-Length: 0")) + { + send(c, okmsg, sizeof okmsg-1, 0); + send(c, page1, sizeof page1-1, 0); + } + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } shutdown(c, 2); closesocket(c); @@ -2575,6 +2600,70 @@ static void test_options(int port) InternetCloseHandle(ses); } +static void test_url_caching(int port, int *num_retrievals) +{ + HINTERNET hi, hc, hr; + DWORD r, count; + char buffer[0x100]; + + ok(*num_retrievals == 0, "expected 0 retrievals prior to test\n"); + + hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(hi != NULL, "open failed\n"); + + hc = InternetConnect(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(hc != NULL, "connect failed\n"); + + /* Pre-load the cache: */ + hr = HttpOpenRequest(hc, "GET", "/testH", NULL, NULL, NULL, 0, 0); + ok(hr != NULL, "HttpOpenRequest failed\n"); + + r = HttpSendRequest(hr, NULL, 0, NULL, 0); + ok(r, "HttpSendRequest failed\n"); + + ok(*num_retrievals == 1, "expected 1 retrievals\n"); + + count = 0; + memset(buffer, 0, sizeof buffer); + SetLastError(0xdeadbeef); + r = InternetReadFile(hr, buffer, sizeof buffer, &count); + ok(r, "InternetReadFile failed %u\n", GetLastError()); + ok(count == sizeof page1 - 1, "count was wrong\n"); + ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); + + InternetCloseHandle(hr); + + /* Send the same request, requiring it to be retrieved from the cache */ + hr = HttpOpenRequest(hc, "GET", "/testH", NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); + ok(hr != NULL, "HttpOpenRequest failed\n"); + + r = HttpSendRequest(hr, NULL, 0, NULL, 0); + /* Older Windows versions succeed with this request, newer ones fail with + * ERROR_FILE_NOT_FOUND. Accept either, as the older version allows us + * to verify that the server isn't contacted. + */ + if (!r) + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + else + { + /* The server shouldn't be contacted for this request. */ + todo_wine + ok(*num_retrievals == 1, "expected 1 retrievals\n"); + + count = 0; + memset(buffer, 0, sizeof buffer); + SetLastError(0xdeadbeef); + r = InternetReadFile(hr, buffer, sizeof buffer, &count); + ok(r, "InternetReadFile failed %u\n", GetLastError()); + ok(count == sizeof page1 - 1, "count was wrong\n"); + ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); + } + + InternetCloseHandle(hc); + InternetCloseHandle(hi); +} + static void test_http_connection(void) { struct server_info si; @@ -2583,6 +2672,7 @@ static void test_http_connection(void) si.hEvent = CreateEvent(NULL, 0, 0, NULL); si.port = 7531; + si.num_testH_retrievals = 0; hThread = CreateThread(NULL, 0, server_thread, (LPVOID) &si, 0, &id); ok( hThread != NULL, "create thread failed\n"); @@ -2611,6 +2701,7 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_last_error(si.port); test_options(si.port); + test_url_caching(si.port, &si.num_testH_retrievals); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Juan Lang : wininet: De-Hungarian HTTP request member names.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 2098006d68c8acd79be47a9ebbba200f6db13906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2098006d68c8acd79be47a9eb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 1 11:18:22 2011 -0800 wininet: De-Hungarian HTTP request member names. --- dlls/wininet/dialogs.c | 6 +- dlls/wininet/http.c | 392 +++++++++++++++++++++++----------------------- dlls/wininet/internet.h | 28 ++-- 3 files changed, 213 insertions(+), 213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2098006d68c8acd79be47…

1 0

Juan Lang : wininet: De-Hungarian session member names.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 8e05039102dd45e6cb1b49e3aa83482bc7dd8a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e05039102dd45e6cb1b49e3a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 1 11:02:14 2011 -0800 wininet: De-Hungarian session member names. --- dlls/wininet/dialogs.c | 14 ++-- dlls/wininet/http.c | 158 +++++++++++++++++++++++----------------------- dlls/wininet/internet.h | 14 ++-- 3 files changed, 93 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e05039102dd45e6cb1b4…

1 0

Juan Lang : wininet: De-Hungarian appinfo member names.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 7243156bc1d34d97b17245c06b546c997ef61f64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7243156bc1d34d97b17245c06… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 1 11:00:49 2011 -0800 wininet: De-Hungarian appinfo member names. --- dlls/wininet/dialogs.c | 10 +++--- dlls/wininet/ftp.c | 6 ++-- dlls/wininet/http.c | 26 ++++++++-------- dlls/wininet/internet.c | 78 +++++++++++++++++++++++----------------------- dlls/wininet/internet.h | 12 +++--- 5 files changed, 66 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7243156bc1d34d97b1724…

1 0

Juan Lang : wininet: De-Hungarian auth cache member names.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 2c6ad546cd9fada5d75fe25c28dd4a0353d67a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6ad546cd9fada5d75fe25c2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 1 10:30:46 2011 -0800 wininet: De-Hungarian auth cache member names. --- dlls/wininet/http.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 492e5fc..61e6ced 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -183,10 +183,10 @@ typedef struct _basicAuthorizationData { struct list entry; - LPWSTR lpszwHost; - LPWSTR lpszwRealm; - LPSTR lpszAuthorization; - UINT AuthorizationLen; + LPWSTR host; + LPWSTR realm; + LPSTR authorization; + UINT authorizationLen; } basicAuthorizationData; typedef struct _authorizationData @@ -585,12 +585,12 @@ static UINT retrieve_cached_basic_authorization(LPWSTR host, LPWSTR realm, LPSTR EnterCriticalSection(&authcache_cs); LIST_FOR_EACH_ENTRY(ad, &basicAuthorizationCache, basicAuthorizationData, entry) { - if (!strcmpiW(host,ad->lpszwHost) && !strcmpW(realm,ad->lpszwRealm)) + if (!strcmpiW(host,ad->host) && !strcmpW(realm,ad->realm)) { TRACE("Authorization found in cache\n"); - *auth_data = HeapAlloc(GetProcessHeap(),0,ad->AuthorizationLen); - memcpy(*auth_data,ad->lpszAuthorization,ad->AuthorizationLen); - rc = ad->AuthorizationLen; + *auth_data = HeapAlloc(GetProcessHeap(),0,ad->authorizationLen); + memcpy(*auth_data,ad->authorization,ad->authorizationLen); + rc = ad->authorizationLen; break; } } @@ -609,7 +609,7 @@ static void cache_basic_authorization(LPWSTR host, LPWSTR realm, LPSTR auth_data LIST_FOR_EACH(cursor, &basicAuthorizationCache) { basicAuthorizationData *check = LIST_ENTRY(cursor,basicAuthorizationData,entry); - if (!strcmpiW(host,check->lpszwHost) && !strcmpW(realm,check->lpszwRealm)) + if (!strcmpiW(host,check->host) && !strcmpW(realm,check->realm)) { ad = check; break; @@ -619,19 +619,19 @@ static void cache_basic_authorization(LPWSTR host, LPWSTR realm, LPSTR auth_data if (ad) { TRACE("Found match in cache, replacing\n"); - HeapFree(GetProcessHeap(),0,ad->lpszAuthorization); - ad->lpszAuthorization = HeapAlloc(GetProcessHeap(),0,auth_data_len); - memcpy(ad->lpszAuthorization, auth_data, auth_data_len); - ad->AuthorizationLen = auth_data_len; + HeapFree(GetProcessHeap(),0,ad->authorization); + ad->authorization = HeapAlloc(GetProcessHeap(),0,auth_data_len); + memcpy(ad->authorization, auth_data, auth_data_len); + ad->authorizationLen = auth_data_len; } else { ad = HeapAlloc(GetProcessHeap(),0,sizeof(basicAuthorizationData)); - ad->lpszwHost = heap_strdupW(host); - ad->lpszwRealm = heap_strdupW(realm); - ad->lpszAuthorization = HeapAlloc(GetProcessHeap(),0,auth_data_len); - memcpy(ad->lpszAuthorization, auth_data, auth_data_len); - ad->AuthorizationLen = auth_data_len; + ad->host = heap_strdupW(host); + ad->host = heap_strdupW(realm); + ad->authorization = HeapAlloc(GetProcessHeap(),0,auth_data_len); + memcpy(ad->authorization, auth_data, auth_data_len); + ad->authorizationLen = auth_data_len; list_add_head(&basicAuthorizationCache,&ad->entry); TRACE("authorization cached\n"); }

1 0

Juan Lang : wininet: Rename variables for readability.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: b49b2430ee1a83e818085bfcc6bfffed0d3ee0ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49b2430ee1a83e818085bfcc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 1 10:59:39 2011 -0800 wininet: Rename variables for readability. --- dlls/wininet/dialogs.c | 56 ++-- dlls/wininet/http.c | 988 ++++++++++++++++++++++++------------------------ 2 files changed, 522 insertions(+), 522 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b49b2430ee1a83e818085…

1 0

Alexandre Julliard : winex11: Fetch the key state from the server when adjusting state on KeymapNotify and key events .
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 731f5b0b7b608b9b70683721ad297fdb60432701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=731f5b0b7b608b9b70683721a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 12:24:25 2011 +0100 winex11: Fetch the key state from the server when adjusting state on KeymapNotify and key events. --- dlls/winex11.drv/keyboard.c | 115 +++++++++++++++++++++++-------------------- 1 files changed, 62 insertions(+), 53 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 190436b..04d7371 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1270,28 +1270,21 @@ void X11DRV_send_keyboard_input( HWND hwnd, WORD wVk, WORD wScan, DWORD event_fl /*********************************************************************** - * KEYBOARD_UpdateOneState - * - * Updates internal state for <vkey>, depending on key <state> under X - * + * get_async_key_state */ -static inline void KEYBOARD_UpdateOneState ( HWND hwnd, WORD vkey, WORD scan, int state, DWORD time ) +static BOOL get_async_key_state( BYTE state[256] ) { - /* Do something if internal table state != X state for keycode */ - if (((key_state_table[vkey & 0xff] & 0x80)!=0) != state) - { - DWORD flags = vkey & 0x100 ? KEYEVENTF_EXTENDEDKEY : 0; - - if (!state) flags |= KEYEVENTF_KEYUP; - - TRACE("Adjusting state for vkey %#.2x. State before %#.2x\n", - vkey, key_state_table[vkey & 0xff]); - - /* Fake key being pressed inside wine */ - X11DRV_send_keyboard_input( hwnd, vkey & 0xff, scan & 0xff, flags, time, 0, 0 ); + BOOL ret; - TRACE("State after %#.2x\n", key_state_table[vkey & 0xff]); + SERVER_START_REQ( get_key_state ) + { + req->tid = 0; + req->key = -1; + wine_server_set_reply( req, state, 256 ); + ret = !wine_server_call( req ); } + SERVER_END_REQ; + return ret; } /*********************************************************************** @@ -1307,6 +1300,9 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) { int i, j; DWORD time = GetCurrentTime(); + BYTE keystate[256]; + + if (!get_async_key_state( keystate )) return; /* the minimum keycode is always greater or equal to 8, so we can * skip the first 8 values, hence start at 1 @@ -1316,8 +1312,6 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) for (j = 0; j < 8; j++) { WORD vkey = keyc2vkey[(i * 8) + j]; - WORD scan = keyc2scan[(i * 8) + j]; - int state = (event->xkeymap.key_vector[i] & (1<<j)) != 0; switch(vkey & 0xff) { @@ -1327,21 +1321,62 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) case VK_RCONTROL: case VK_LSHIFT: case VK_RSHIFT: - KEYBOARD_UpdateOneState( hwnd, vkey, scan, state, time ); + if (!(keystate[vkey & 0xff] & 0x80) != !(event->xkeymap.key_vector[i] & (1<<j))) + { + WORD scan = keyc2scan[(i * 8) + j]; + DWORD flags = vkey & 0x100 ? KEYEVENTF_EXTENDEDKEY : 0; + if (!(event->xkeymap.key_vector[i] & (1<<j))) flags |= KEYEVENTF_KEYUP; + + TRACE( "Adjusting state for vkey %#.2x. State before %#.2x\n", + vkey, keystate[vkey & 0xff]); + + /* Fake key being pressed inside wine */ + X11DRV_send_keyboard_input( hwnd, vkey & 0xff, scan & 0xff, flags, time, 0, 0 ); + } break; } } } } -static void update_lock_state(HWND hwnd, BYTE vkey, WORD scan, DWORD time) +static void update_lock_state( HWND hwnd, WORD vkey, UINT state, DWORD time ) { - DWORD flags = vkey == VK_NUMLOCK ? KEYEVENTF_EXTENDEDKEY : 0; + BYTE keystate[256]; + + /* Note: X sets the below states on key down and clears them on key up. + Windows triggers them on key down. */ - if (key_state_table[vkey] & 0x80) flags ^= KEYEVENTF_KEYUP; + if (!get_async_key_state( keystate )) return; - X11DRV_send_keyboard_input( hwnd, vkey, scan, flags, time, 0, 0 ); - X11DRV_send_keyboard_input( hwnd, vkey, scan, flags ^ KEYEVENTF_KEYUP, time, 0, 0 ); + /* Adjust the CAPSLOCK state if it has been changed outside wine */ + if (!(keystate[VK_CAPITAL] & 0x01) != !(state & LockMask) && vkey != VK_CAPITAL) + { + DWORD flags = 0; + if (keystate[VK_CAPITAL] & 0x80) flags ^= KEYEVENTF_KEYUP; + TRACE("Adjusting CapsLock state (%#.2x)\n", keystate[VK_CAPITAL]); + X11DRV_send_keyboard_input( hwnd, VK_CAPITAL, 0x3a, flags, time, 0, 0 ); + X11DRV_send_keyboard_input( hwnd, VK_CAPITAL, 0x3a, flags ^ KEYEVENTF_KEYUP, time, 0, 0 ); + } + + /* Adjust the NUMLOCK state if it has been changed outside wine */ + if (!(keystate[VK_NUMLOCK] & 0x01) != !(state & NumLockMask) && (vkey & 0xff) != VK_NUMLOCK) + { + DWORD flags = KEYEVENTF_EXTENDEDKEY; + if (keystate[VK_NUMLOCK] & 0x80) flags ^= KEYEVENTF_KEYUP; + TRACE("Adjusting NumLock state (%#.2x)\n", keystate[VK_NUMLOCK]); + X11DRV_send_keyboard_input( hwnd, VK_NUMLOCK, 0x45, flags, time, 0, 0 ); + X11DRV_send_keyboard_input( hwnd, VK_NUMLOCK, 0x45, flags ^ KEYEVENTF_KEYUP, time, 0, 0 ); + } + + /* Adjust the SCROLLLOCK state if it has been changed outside wine */ + if (!(keystate[VK_SCROLL] & 0x01) != !(state & ScrollLockMask) && vkey != VK_SCROLL) + { + DWORD flags = 0; + if (keystate[VK_SCROLL] & 0x80) flags ^= KEYEVENTF_KEYUP; + TRACE("Adjusting ScrLock state (%#.2x)\n", keystate[VK_SCROLL]); + X11DRV_send_keyboard_input( hwnd, VK_SCROLL, 0x46, flags, time, 0, 0 ); + X11DRV_send_keyboard_input( hwnd, VK_SCROLL, 0x46, flags ^ KEYEVENTF_KEYUP, time, 0, 0 ); + } } /*********************************************************************** @@ -1441,33 +1476,7 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) if ( event->type == KeyRelease ) dwFlags |= KEYEVENTF_KEYUP; if ( vkey & 0x100 ) dwFlags |= KEYEVENTF_EXTENDEDKEY; - - /* Note: X sets the below states on key down and clears them on key up. - Windows triggers them on key down. */ - - /* Adjust the CAPSLOCK state if it has been changed outside wine */ - if (!(key_state_table[VK_CAPITAL] & 0x01) != !(event->state & LockMask) && - vkey != VK_CAPITAL) - { - TRACE("Adjusting CapsLock state (%#.2x)\n", key_state_table[VK_CAPITAL]); - update_lock_state( hwnd, VK_CAPITAL, 0x3A, event_time ); - } - - /* Adjust the NUMLOCK state if it has been changed outside wine */ - if (!(key_state_table[VK_NUMLOCK] & 0x01) != !(event->state & NumLockMask) && - (vkey & 0xff) != VK_NUMLOCK) - { - TRACE("Adjusting NumLock state (%#.2x)\n", key_state_table[VK_NUMLOCK]); - update_lock_state( hwnd, VK_NUMLOCK, 0x45, event_time ); - } - - /* Adjust the SCROLLLOCK state if it has been changed outside wine */ - if (!(key_state_table[VK_SCROLL] & 0x01) != !(event->state & ScrollLockMask) && - vkey != VK_SCROLL) - { - TRACE("Adjusting ScrLock state (%#.2x)\n", key_state_table[VK_SCROLL]); - update_lock_state( hwnd, VK_SCROLL, 0x46, event_time ); - } + update_lock_state( hwnd, vkey, event->state, event_time ); bScan = keyc2scan[event->keycode] & 0xFF; TRACE_(key)("bScan = 0x%02x.\n", bScan);

1 0

Alexandre Julliard : server: Set the message code for mouse input on the server side.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 0f18d2bb09ff6b391a251596eebd4a26ecfcf6a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f18d2bb09ff6b391a251596e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 11:59:38 2011 +0100 server: Set the message code for mouse input on the server side. --- dlls/winex11.drv/mouse.c | 117 +++++++++++++++++++++++---------------------- server/queue.c | 95 ++++++++++++++++++++++++++++--------- 2 files changed, 132 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f18d2bb09ff6b391a251…

1 0

Alexandre Julliard : server: Set the message code for keyboard input on the server side.
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 9731d44921b71923f5eacee6be3b9308d12c3c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9731d44921b71923f5eacee6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 11:34:59 2011 +0100 server: Set the message code for keyboard input on the server side. --- server/queue.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/server/queue.c b/server/queue.c index 1353b00..19532e2 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1361,8 +1361,7 @@ static void queue_mouse_message( struct desktop *desktop, user_handle_t win, uns } /* queue a hardware message for a keyboard event */ -static void queue_keyboard_message( struct desktop *desktop, user_handle_t win, unsigned int message, - const hw_input_t *input ) +static void queue_keyboard_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input ) { struct hardware_msg_data *msg_data; struct message *msg; @@ -1378,7 +1377,6 @@ static void queue_keyboard_message( struct desktop *desktop, user_handle_t win, msg->type = MSG_HARDWARE; msg->win = get_user_full_handle( win ); - msg->msg = message; msg->lparam = (input->kbd.scan << 16) | 1; /* repeat count */ msg->time = input->kbd.time; msg->result = NULL; @@ -1419,6 +1417,49 @@ static void queue_keyboard_message( struct desktop *desktop, user_handle_t win, msg->wparam = vkey; } + msg->msg = (input->kbd.flags & KEYEVENTF_KEYUP) ? WM_KEYUP : WM_KEYDOWN; + + switch (vkey) + { + case VK_LMENU: + case VK_RMENU: + if (input->kbd.flags & KEYEVENTF_KEYUP) + { + /* send WM_SYSKEYUP if Alt still pressed and no other key in between */ + /* we use 0x02 as a flag to track if some other SYSKEYUP was sent already */ + if ((desktop->keystate[VK_MENU] & 0x82) != 0x82) break; + msg->msg = WM_SYSKEYUP; + desktop->keystate[VK_MENU] &= ~0x02; + } + else + { + /* send WM_SYSKEYDOWN for Alt except with Ctrl */ + if (desktop->keystate[VK_CONTROL] & 0x80) break; + msg->msg = WM_SYSKEYDOWN; + desktop->keystate[VK_MENU] |= 0x02; + } + break; + + case VK_LCONTROL: + case VK_RCONTROL: + /* send WM_SYSKEYUP on release if Alt still pressed */ + if (!(input->kbd.flags & KEYEVENTF_KEYUP)) break; + if (!(desktop->keystate[VK_MENU] & 0x80)) break; + msg->msg = WM_SYSKEYUP; + desktop->keystate[VK_MENU] &= ~0x02; + break; + + default: + /* send WM_SYSKEY for Alt-anykey and for F10 */ + if (desktop->keystate[VK_CONTROL] & 0x80) break; + if (!(desktop->keystate[VK_MENU] & 0x80)) break; + /* fall through */ + case VK_F10: + msg->msg = (input->kbd.flags & KEYEVENTF_KEYUP) ? WM_SYSKEYUP : WM_SYSKEYDOWN; + desktop->keystate[VK_MENU] &= ~0x02; + break; + } + queue_hardware_message( desktop, msg ); } @@ -1879,7 +1920,7 @@ DECL_HANDLER(send_hardware_message) queue_mouse_message( desktop, req->win, req->msg, &req->input ); break; case INPUT_KEYBOARD: - queue_keyboard_message( desktop, req->win, req->msg, &req->input ); + queue_keyboard_message( desktop, req->win, &req->input ); break; case INPUT_HARDWARE: queue_custom_hardware_message( desktop, req->win, &req->input );

1 0

Alexandre Julliard : server: Pass the original hardware input data to the server and set the message parameters on the server side .
by Alexandre Julliard 02 Mar '11

02 Mar '11

Module: wine Branch: master Commit: 02e30f5f77e0aea121137be19c8e5d5a36cd5bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02e30f5f77e0aea121137be19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 20:33:15 2011 +0100 server: Pass the original hardware input data to the server and set the message parameters on the server side. --- dlls/winex11.drv/keyboard.c | 36 +++------ dlls/winex11.drv/mouse.c | 18 +++-- include/wine/server_protocol.h | 41 ++++++++-- server/protocol.def | 39 ++++++++-- server/queue.c | 165 ++++++++++++++++++++++++++++++++++------ server/request.h | 11 +-- server/trace.c | 37 ++++++++-- tools/make_requests | 1 + 8 files changed, 267 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02e30f5f77e0aea121137…

1 0

Hans Leidekker : netapi32: Try running the smbpasswd tool in NetUserChangePassword.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: e572dca4cc219cdf61ced42998f7e100aa9cfefc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e572dca4cc219cdf61ced4299… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 1 13:08:27 2011 +0100 netapi32: Try running the smbpasswd tool in NetUserChangePassword. --- dlls/netapi32/access.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 91f98b1..255e51b 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -18,7 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <stdarg.h> +#include <fcntl.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -864,6 +869,105 @@ NET_API_STATUS WINAPI NetUserModalsGet( return NERR_Success; } +static int fork_smbpasswd( char * const argv[] ) +{ +#ifdef HAVE_FORK + int pipe_out[2]; + + if (pipe( pipe_out ) == -1) return -1; + fcntl( pipe_out[0], F_SETFD, FD_CLOEXEC ); + fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); + + switch (fork()) + { + case -1: + close( pipe_out[0] ); + close( pipe_out[1] ); + return -1; + case 0: + dup2( pipe_out[0], 0 ); + close( pipe_out[0] ); + close( pipe_out[1] ); + execvp( "smbpasswd", argv ); + ERR( "can't execute smbpasswd, is it installed?\n" ); + return -1; + default: + close( pipe_out[0] ); + break; + } + return pipe_out[1]; +#else + ERR( "no fork support on this platform\n" ); + return -1; +#endif +} + +static char *strdup_unixcp( const WCHAR *str ) +{ + char *ret; + int len = WideCharToMultiByte( CP_UNIXCP, 0, str, -1, NULL, 0, NULL, NULL ); + if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) + WideCharToMultiByte( CP_UNIXCP, 0, str, -1, ret, len, NULL, NULL ); + return ret; +} + +static NET_API_STATUS change_password_smb( LPCWSTR domainname, LPCWSTR username, + LPCWSTR oldpassword, LPCWSTR newpassword ) +{ + static char option_silent[] = "-s"; + static char option_user[] = "-U"; + static char option_remote[] = "-r"; + static char smbpasswd[] = "smbpasswd"; + int pipe_out; + char *server = NULL, *user, *argv[7], *old, *new; + + if (domainname && !(server = strdup_unixcp( domainname ))) return ERROR_OUTOFMEMORY; + if (!(user = strdup_unixcp( username ))) + { + HeapFree( GetProcessHeap(), 0, server ); + return ERROR_OUTOFMEMORY; + } + argv[0] = smbpasswd; + argv[1] = option_silent; + argv[2] = option_user; + argv[3] = user; + if (server) + { + argv[4] = option_remote; + argv[5] = server; + argv[6] = NULL; + } + else argv[4] = NULL; + + pipe_out = fork_smbpasswd( argv ); + HeapFree( GetProcessHeap(), 0, server ); + HeapFree( GetProcessHeap(), 0, user ); + if (pipe_out == -1) return NERR_InternalError; + + if (!(old = strdup_unixcp( oldpassword ))) + { + close( pipe_out ); + return ERROR_OUTOFMEMORY; + } + if (!(new = strdup_unixcp( newpassword ))) + { + close( pipe_out ); + HeapFree( GetProcessHeap(), 0, old ); + return ERROR_OUTOFMEMORY; + } + write( pipe_out, old, strlen( old ) ); + write( pipe_out, "\n", 1 ); + write( pipe_out, new, strlen( new ) ); + write( pipe_out, "\n", 1 ); + write( pipe_out, new, strlen( new ) ); + write( pipe_out, "\n", 1 ); + + close( pipe_out ); + HeapFree( GetProcessHeap(), 0, old ); + HeapFree( GetProcessHeap(), 0, new ); + return NERR_Success; +} + /****************************************************************************** * NetUserChangePassword (NETAPI32.@) * PARAMS @@ -886,6 +990,9 @@ NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR domainname, LPCWSTR username TRACE("(%s, %s, ..., ...)\n", debugstr_w(domainname), debugstr_w(username)); + if (!change_password_smb( domainname, username, oldpassword, newpassword )) + return NERR_Success; + if(domainname) FIXME("Ignoring domainname %s.\n", debugstr_w(domainname));

1 0

Jacek Caban : mshtml: Added IHTMLFormElement::get_elements implementation.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 78d743b98680dbef191454b33104d3d4ace199af URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d743b98680dbef191454b33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 1 11:33:03 2011 +0100 mshtml: Added IHTMLFormElement::get_elements implementation. --- dlls/mshtml/htmlform.c | 8 ++++++-- dlls/mshtml/tests/dom.c | 21 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index e53dbc0..d9c2bce 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -274,8 +274,12 @@ static HRESULT WINAPI HTMLFormElement_get_method(IHTMLFormElement *iface, BSTR * static HRESULT WINAPI HTMLFormElement_get_elements(IHTMLFormElement *iface, IDispatch **p) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = (IDispatch*)&This->IHTMLFormElement_iface; + IDispatch_AddRef(*p); + return S_OK; } static HRESULT WINAPI HTMLFormElement_put_target(IHTMLFormElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b8e9f76..432a3b8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2809,6 +2809,23 @@ static void _test_form_put_encoding(unsigned line, IUnknown *unk, HRESULT exp_hr _test_form_encoding(line, unk, encoding); } +#define test_form_elements(a) _test_form_elements(__LINE__,a) +static void _test_form_elements(unsigned line, IUnknown *unk) +{ + IHTMLFormElement *form = _get_form_iface(line, unk); + IDispatch *disp; + HRESULT hres; + + disp = NULL; + hres = IHTMLFormElement_get_elements(form, &disp); + ok_(__FILE__,line)(hres == S_OK, "get_elements failed: %08x\n", hres); + ok_(__FILE__,line)(disp != NULL, "disp = NULL\n"); + ok_(__FILE__,line)(iface_cmp((IUnknown*)form, (IUnknown*)disp), "disp != form\n"); + + IDispatch_Release(disp); + IHTMLFormElement_Release(form); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -6652,6 +6669,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(elem != NULL, "elem == NULL\n"); if(elem) { test_form_length((IUnknown*)elem, 0); + test_form_elements((IUnknown*)elem); IHTMLElement_Release(elem); } @@ -6802,7 +6820,7 @@ static void test_elems2(IHTMLDocument2 *doc) } test_elem_set_innerhtml((IUnknown*)div, - "<form id=\"form\"><input type=\"button\"></input><input type=\"text\"></input></textarea>"); + "<form id=\"form\"><input type=\"button\" /><div><input type=\"text\" /></div></textarea>"); elem = get_elem_by_id(doc, "form", TRUE); if(elem) { test_form_length((IUnknown*)elem, 2); @@ -6820,6 +6838,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_form_put_encoding((IUnknown*)elem, S_OK, "multipart/form-data"); test_form_put_encoding((IUnknown*)elem, E_INVALIDARG, "image/png"); test_form_encoding((IUnknown*)elem, "multipart/form-data"); + test_form_elements((IUnknown*)elem); IHTMLElement_Release(elem); }

1 0

Alexandre Julliard : ntdll: Don' t print an error when architecture is set to win64 and the app is 64-bit.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 29f57999960c989c13c1dffdaf925e1e070e72bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=29f57999960c989c13c1dffda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 14:10:16 2011 +0100 ntdll: Don't print an error when architecture is set to win64 and the app is 64-bit. --- dlls/ntdll/server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 270ccd0..2d88f10 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1122,7 +1122,7 @@ size_t server_init_thread( void *entry_point ) if (!strcmp( arch, "win32" ) && (is_win64 || is_wow64)) fatal_error( "WINEARCH set to win32 but '%s' is a 64-bit installation.\n", wine_get_config_dir() ); - if (!strcmp( arch, "win64" ) && !is_wow64) + if (!strcmp( arch, "win64" ) && !is_win64 && !is_wow64) fatal_error( "WINEARCH set to win64 but '%s' is a 32-bit installation.\n", wine_get_config_dir() ); }

1 0

Henri Verbeet : wined3d: Recognize some Nouveau renderer strings.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: ff8c79e45befad8318a425929c6005c2beb5d31c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8c79e45befad8318a425929… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 09:47:58 2011 +0100 wined3d: Recognize some Nouveau renderer strings. --- dlls/wined3d/directx.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 64076dc..8d77321 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1852,7 +1852,79 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { - FIXME_(d3d_caps)("Card selection not handled for Mesa Nouveau driver\n"); + if (strstr(gl_renderer, "Gallium")) + { + unsigned int i; + + static const struct + { + const char *renderer; + enum wined3d_pci_device id; + } + cards[] = + { + {"NVC4", CARD_NVIDIA_GEFORCE_GTX460}, + {"NVC0", CARD_NVIDIA_GEFORCE_GTX480}, + {"NVAF", CARD_NVIDIA_GEFORCE_GT320M}, + {"NVAC", CARD_NVIDIA_GEFORCE_8200}, + {"NVAA", CARD_NVIDIA_GEFORCE_8200}, + {"NVA8", CARD_NVIDIA_GEFORCE_210}, + {"NVA5", CARD_NVIDIA_GEFORCE_GT220}, + {"NVA3", CARD_NVIDIA_GEFORCE_GT240}, + {"NVA0", CARD_NVIDIA_GEFORCE_GTX280}, + {"NV98", CARD_NVIDIA_GEFORCE_9200}, + {"NV96", CARD_NVIDIA_GEFORCE_9400GT}, + {"NV94", CARD_NVIDIA_GEFORCE_9600GT}, + {"NV92", CARD_NVIDIA_GEFORCE_9800GT}, + {"NV86", CARD_NVIDIA_GEFORCE_8500GT}, + {"NV84", CARD_NVIDIA_GEFORCE_8600GT}, + {"NV68", CARD_NVIDIA_GEFORCE_6200}, /* 7050 */ + {"NV67", CARD_NVIDIA_GEFORCE_6200}, /* 7000M */ + {"NV63", CARD_NVIDIA_GEFORCE_6200}, /* 7100 */ + {"NV50", CARD_NVIDIA_GEFORCE_8800GTX}, + {"NV4E", CARD_NVIDIA_GEFORCE_6200}, /* 6100 Go / 6150 Go */ + {"NV4C", CARD_NVIDIA_GEFORCE_6200}, /* 6150SE */ + {"NV4B", CARD_NVIDIA_GEFORCE_7600}, + {"NV4A", CARD_NVIDIA_GEFORCE_6200}, + {"NV49", CARD_NVIDIA_GEFORCE_7800GT}, /* 7900 */ + {"NV47", CARD_NVIDIA_GEFORCE_7800GT}, + {"NV46", CARD_NVIDIA_GEFORCE_7400}, + {"NV45", CARD_NVIDIA_GEFORCE_6800}, + {"NV44", CARD_NVIDIA_GEFORCE_6200}, + {"NV43", CARD_NVIDIA_GEFORCE_6600GT}, + {"NV42", CARD_NVIDIA_GEFORCE_6800}, + {"NV41", CARD_NVIDIA_GEFORCE_6800}, + {"NV40", CARD_NVIDIA_GEFORCE_6800}, + {"NV38", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5950 Ultra */ + {"NV36", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5700/5750 */ + {"NV35", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5900 */ + {"NV34", CARD_NVIDIA_GEFORCEFX_5200}, + {"NV31", CARD_NVIDIA_GEFORCEFX_5600}, + {"NV30", CARD_NVIDIA_GEFORCEFX_5800}, + {"NV28", CARD_NVIDIA_GEFORCE4_TI4200}, + {"NV25", CARD_NVIDIA_GEFORCE4_TI4200}, + {"NV20", CARD_NVIDIA_GEFORCE3}, + {"NV1F", CARD_NVIDIA_GEFORCE4_MX}, /* GF4 MX IGP */ + {"NV1A", CARD_NVIDIA_GEFORCE2}, /* GF2 IGP */ + {"NV18", CARD_NVIDIA_GEFORCE4_MX}, + {"NV17", CARD_NVIDIA_GEFORCE4_MX}, + {"NV16", CARD_NVIDIA_GEFORCE2}, + {"NV15", CARD_NVIDIA_GEFORCE2}, + {"NV11", CARD_NVIDIA_GEFORCE2_MX}, + {"NV10", CARD_NVIDIA_GEFORCE}, + {"NV05", CARD_NVIDIA_RIVA_TNT2}, + {"NV04", CARD_NVIDIA_RIVA_TNT}, + {"NV03", CARD_NVIDIA_RIVA_128}, + }; + + for (i = 0; i < sizeof(cards) / sizeof(*cards); ++i) + { + if (strstr(gl_renderer, cards[i].renderer)) + return cards[i].id; + } + } + + FIXME_(d3d_caps)("Unknown renderer %s.\n", debugstr_a(gl_renderer)); if (WINE_D3D9_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCEFX_5600; if (WINE_D3D8_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE3; if (WINE_D3D7_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE;

1 0

Henri Verbeet : wined3d: Rename ATI to AMD.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 02fa8bf0137f001320b2d9a3e9b54e65e3176eb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02fa8bf0137f001320b2d9a3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 09:47:57 2011 +0100 wined3d: Rename ATI to AMD. --- dlls/wined3d/directx.c | 328 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 82 +++++----- 2 files changed, 205 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02fa8bf0137f001320b2d…

1 0

Henri Verbeet : wined3d: Make IWineD3DResourceImpl an independent structure .
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 1de6adfbae7ac36c6649aab209d1a62a64e80465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1de6adfbae7ac36c6649aab20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 09:47:56 2011 +0100 wined3d: Make IWineD3DResourceImpl an independent structure. --- dlls/d3d10core/view.c | 13 ++-- dlls/d3d9/device.c | 16 ++-- dlls/wined3d/basetexture.c | 10 +- dlls/wined3d/buffer.c | 76 +++++++++-------- dlls/wined3d/context.c | 8 +- dlls/wined3d/cubetexture.c | 64 +++++++------- dlls/wined3d/device.c | 183 +++++++++++++++++++++------------------- dlls/wined3d/palette.c | 8 +- dlls/wined3d/resource.c | 102 ++++++++++++----------- dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 21 +++-- dlls/wined3d/surface_base.c | 19 +++-- dlls/wined3d/surface_gdi.c | 3 +- dlls/wined3d/texture.c | 63 +++++++------- dlls/wined3d/utils.c | 2 +- dlls/wined3d/view.c | 9 +-- dlls/wined3d/volume.c | 18 ++-- dlls/wined3d/volumetexture.c | 61 +++++++------- dlls/wined3d/wined3d.spec | 2 + dlls/wined3d/wined3d_private.h | 91 +++++++++++--------- include/wine/wined3d.idl | 14 ++- 21 files changed, 417 insertions(+), 370 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1de6adfbae7ac36c6649a…

1 0

Henri Verbeet : wined3d: Pass const resources to some resource functions.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 1674ca1ebdda0038155d449e9521849d1b50c5ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1674ca1ebdda0038155d449e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 09:47:55 2011 +0100 wined3d: Pass const resources to some resource functions. --- dlls/wined3d/resource.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 2f18550..d43cdfa 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -131,7 +131,7 @@ void resource_unload(IWineD3DResourceImpl *resource) resource, resource->resource.resourceType); } -static struct private_data *resource_find_private_data(IWineD3DResourceImpl *This, REFGUID tag) +static struct private_data *resource_find_private_data(const struct IWineD3DResourceImpl *This, REFGUID tag) { struct private_data *data; struct list *entry; @@ -193,7 +193,7 @@ HRESULT resource_set_private_data(struct IWineD3DResourceImpl *resource, REFGUID return WINED3D_OK; } -HRESULT resource_get_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, void *data, DWORD *data_size) +HRESULT resource_get_private_data(const struct IWineD3DResourceImpl *resource, REFGUID guid, void *data, DWORD *data_size) { const struct private_data *d; @@ -260,13 +260,13 @@ DWORD resource_set_priority(struct IWineD3DResourceImpl *resource, DWORD priorit return prev; } -DWORD resource_get_priority(struct IWineD3DResourceImpl *resource) +DWORD resource_get_priority(const struct IWineD3DResourceImpl *resource) { TRACE("resource %p, returning %u.\n", resource, resource->resource.priority); return resource->resource.priority; } -WINED3DRESOURCETYPE resource_get_type(struct IWineD3DResourceImpl *resource) +WINED3DRESOURCETYPE resource_get_type(const struct IWineD3DResourceImpl *resource) { TRACE("resource %p, returning %#x.\n", resource, resource->resource.resourceType); return resource->resource.resourceType; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a7db1ec..0cc9aaf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1830,14 +1830,14 @@ typedef struct IWineD3DResourceImpl void resource_cleanup(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; HRESULT resource_free_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid) DECLSPEC_HIDDEN; -DWORD resource_get_priority(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; -HRESULT resource_get_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, +DWORD resource_get_priority(const struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; +HRESULT resource_get_private_data(const struct IWineD3DResourceImpl *resource, REFGUID guid, void *data, DWORD *data_size) DECLSPEC_HIDDEN; HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format *format, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; -WINED3DRESOURCETYPE resource_get_type(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; +WINED3DRESOURCETYPE resource_get_type(const struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; DWORD resource_set_priority(struct IWineD3DResourceImpl *resource, DWORD priority) DECLSPEC_HIDDEN; HRESULT resource_set_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN;

1 0

Peter Urbanec : comctl32: Add a check for setting number of parts in the statusbar to zero.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 93b5bcc6eb50ac31509865c3c0ab77ee4e4e222a URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b5bcc6eb50ac31509865c3c… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Tue Mar 1 12:01:42 2011 +1100 comctl32: Add a check for setting number of parts in the statusbar to zero. --- dlls/comctl32/status.c | 2 ++ dlls/comctl32/tests/status.c | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index d670370..427fb76 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -665,6 +665,8 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts) TRACE("(%d,%p)\n", count, parts); + if(!count) return FALSE; + oldNumParts = infoPtr->numParts; infoPtr->numParts = count; if (oldNumParts > infoPtr->numParts) { diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index c46b614..8509674 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -382,6 +382,12 @@ static void test_status_control(void) /* Reset number of parts */ r = SendMessage(hWndStatus, SB_SETPARTS, 2, (LPARAM)nParts); expect(TRUE,r); + r = SendMessage(hWndStatus, SB_GETPARTS, 0, 0); + ok(r == 2, "Expected 2, got %d\n", r); + r = SendMessage(hWndStatus, SB_SETPARTS, 0, 0); + expect(FALSE,r); + r = SendMessage(hWndStatus, SB_GETPARTS, 0, 0); + ok(r == 2, "Expected 2, got %d\n", r); /* Set the minimum height and get rectangle information again */ SendMessage(hWndStatus, SB_SETMINHEIGHT, 50, 0);

1 0

Nikolay Sivov : msxml3: Add get_output() implementation for processor.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: a22096c90c2ac8191b14a17f8496e83ab6d96138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a22096c90c2ac8191b14a17f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 28 23:39:15 2011 +0300 msxml3: Add get_output() implementation for processor. --- dlls/msxml3/stylesheet.c | 42 +++++++++++++++++++++++++++++++++--------- dlls/msxml3/tests/domdoc.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 00ba3ca..cf24a9b 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -57,7 +57,9 @@ typedef struct _xslprocessor xsltemplate *stylesheet; IXMLDOMNode *input; + IStream *output; + BSTR outstr; } xslprocessor; static HRESULT XSLProcessor_create(xsltemplate*, IXSLProcessor**); @@ -292,6 +294,7 @@ static HRESULT WINAPI xslprocessor_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } @@ -315,6 +318,7 @@ static ULONG WINAPI xslprocessor_Release( IXSLProcessor *iface ) { if (This->input) IXMLDOMNode_Release(This->input); if (This->output) IStream_Release(This->output); + SysFreeString(This->outstr); IXSLTemplate_Release(&This->stylesheet->IXSLTemplate_iface); heap_free( This ); } @@ -518,8 +522,25 @@ static HRESULT WINAPI xslprocessor_get_output( { xslprocessor *This = impl_from_IXSLProcessor( iface ); - FIXME("(%p)->(%p): stub\n", This, output); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, output); + + if (!output) return E_INVALIDARG; + + if (This->output) + { + V_VT(output) = VT_UNKNOWN; + V_UNKNOWN(output) = (IUnknown*)This->output; + IStream_AddRef(This->output); + } + else if (This->outstr) + { + V_VT(output) = VT_BSTR; + V_BSTR(output) = SysAllocString(This->outstr); + } + else + V_VT(output) = VT_EMPTY; + + return S_OK; } static HRESULT WINAPI xslprocessor_transform( @@ -528,21 +549,23 @@ static HRESULT WINAPI xslprocessor_transform( { xslprocessor *This = impl_from_IXSLProcessor( iface ); HRESULT hr; - BSTR p; TRACE("(%p)->(%p)\n", This, ret); if (!ret) return E_INVALIDARG; - hr = IXMLDOMNode_transformNode(This->input, This->stylesheet->node, &p); + SysFreeString(This->outstr); + hr = IXMLDOMNode_transformNode(This->input, This->stylesheet->node, &This->outstr); if (hr == S_OK) { - ULONG len = 0; + if (This->output) + { + ULONG len = 0; - /* output to stream */ - hr = IStream_Write(This->output, p, SysStringByteLen(p), &len); - *ret = len == SysStringByteLen(p) ? VARIANT_TRUE : VARIANT_FALSE; - SysFreeString(p); + /* output to stream */ + hr = IStream_Write(This->output, This->outstr, SysStringByteLen(This->outstr), &len); + *ret = len == SysStringByteLen(This->outstr) ? VARIANT_TRUE : VARIANT_FALSE; + } } else *ret = VARIANT_FALSE; @@ -642,6 +665,7 @@ HRESULT XSLProcessor_create(xsltemplate *template, IXSLProcessor **ppObj) This->ref = 1; This->input = NULL; This->output = NULL; + This->outstr = NULL; This->stylesheet = template; IXSLTemplate_AddRef(&template->IXSLTemplate_iface); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 552e52b..c852933 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7865,7 +7865,7 @@ static void test_xsltemplate(void) { IXSLTemplate *template; IXSLProcessor *processor; - IXMLDOMDocument *doc; + IXMLDOMDocument *doc, *doc2; IStream *stream; VARIANT_BOOL b; HRESULT hr; @@ -7947,6 +7947,9 @@ todo_wine { ok(V_VT(&v) == VT_EMPTY, "got %d\n", V_VT(&v)); } + hr = IXSLProcessor_get_output(processor, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* reset before it was set */ V_VT(&v) = VT_EMPTY; hr = IXSLProcessor_put_output(processor, v); @@ -7967,6 +7970,17 @@ todo_wine { IStream_Release(stream); todo_wine ok(ref == 4, "got %d\n", ref); + V_VT(&v) = VT_EMPTY; + hr = IXSLProcessor_get_output(processor, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_UNKNOWN, "got type %d\n", V_VT(&v)); + ok(V_UNKNOWN(&v) == (IUnknown*)stream, "got %p\n", V_UNKNOWN(&v)); + + ref = IStream_AddRef(stream); + IStream_Release(stream); + todo_wine ok(ref == 5, "got %d\n", ref); + VariantClear(&v); + hr = IXSLProcessor_transform(processor, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -7980,6 +7994,31 @@ todo_wine { ok(ref == 2, "got %d\n", ref); IStream_Release(stream); + + /* no output interface set, check output */ + doc2 = create_document(&IID_IXMLDOMDocument); + + b = VARIANT_TRUE; + hr = IXMLDOMDocument_loadXML( doc2, _bstr_("<a>test</a>"), &b ); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok( b == VARIANT_TRUE, "got %d\n", b); + + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)doc2; + hr = IXSLProcessor_put_input(processor, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXSLProcessor_transform(processor, &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_EMPTY; + hr = IXSLProcessor_get_output(processor, &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v)); + /* we currently output one '\n' instead of empty string */ + todo_wine ok(lstrcmpW(V_BSTR(&v), _bstr_("")) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + IXMLDOMDocument_Release(doc2); + IXSLProcessor_Release(processor); /* drop reference */ @@ -7991,6 +8030,7 @@ todo_wine { IXMLDOMDocument_Release(doc); IXSLTemplate_Release(template); + free_bstrs(); } START_TEST(domdoc)

1 0

Nikolay Sivov : msxml3: Always set out pointer to null on failed QueryInterface.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 37ce949745d3e31d6b4923c57259b86799876f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ce949745d3e31d6b4923c57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 28 22:28:53 2011 +0300 msxml3: Always set out pointer to null on failed QueryInterface. --- dlls/msxml3/attribute.c | 1 + dlls/msxml3/bsc.c | 1 + dlls/msxml3/cdata.c | 7 +------ dlls/msxml3/comment.c | 1 + dlls/msxml3/docfrag.c | 1 + dlls/msxml3/doctype.c | 1 + dlls/msxml3/domimpl.c | 1 + dlls/msxml3/element.c | 1 + dlls/msxml3/entityref.c | 1 + dlls/msxml3/factory.c | 1 + dlls/msxml3/nodemap.c | 1 + dlls/msxml3/parseerror.c | 1 + dlls/msxml3/pi.c | 1 + dlls/msxml3/schema.c | 1 + dlls/msxml3/stylesheet.c | 1 + dlls/msxml3/text.c | 8 +------- dlls/msxml3/xmldoc.c | 1 + dlls/msxml3/xmlelem.c | 1 + 18 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 60af5a4..170f632 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -77,6 +77,7 @@ static HRESULT WINAPI domattr_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index b57e2b1..9a8be97 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -74,6 +74,7 @@ static HRESULT WINAPI bsc_QueryInterface( } TRACE("interface %s not implemented\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 16c2df2..cdcebb0 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -70,12 +70,6 @@ static HRESULT WINAPI domcdata_QueryInterface( { *ppvObject = iface; } - else if ( IsEqualGUID( riid, &IID_IXMLDOMText ) || - IsEqualGUID( riid, &IID_IXMLDOMElement ) ) - { - TRACE("Unsupported interface\n"); - return E_NOINTERFACE; - } else if(node_query_interface(&This->node, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; @@ -83,6 +77,7 @@ static HRESULT WINAPI domcdata_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 435c4af..433cca9 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -77,6 +77,7 @@ static HRESULT WINAPI domcomment_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 5862b6f..89b82a9 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -76,6 +76,7 @@ static HRESULT WINAPI domfrag_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index ff939fc..9ebe1f0 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -78,6 +78,7 @@ static HRESULT WINAPI domdoctype_QueryInterface( else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 2e35d98..54936bb 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -70,6 +70,7 @@ static HRESULT WINAPI dimimpl_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 9573de9..b1de8df 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -86,6 +86,7 @@ static HRESULT WINAPI domelem_QueryInterface( else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 1c3bd7d..add4d8a 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -76,6 +76,7 @@ static HRESULT WINAPI entityref_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 5cce95b..027506c 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -80,6 +80,7 @@ static HRESULT WINAPI ClassFactory_QueryInterface( } FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index b05192b..6df1028 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -82,6 +82,7 @@ static HRESULT WINAPI xmlnodemap_QueryInterface( else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index a3f400a..3f5c59f 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -71,6 +71,7 @@ static HRESULT WINAPI parseError_QueryInterface( else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 6c5361a..335b584 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -76,6 +76,7 @@ static HRESULT WINAPI dom_pi_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index e43aeb4..e2bf8b3 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -948,6 +948,7 @@ static HRESULT WINAPI schema_cache_QueryInterface(IXMLDOMSchemaCollection2* ifac else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 5bde047..00ba3ca 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -96,6 +96,7 @@ static HRESULT WINAPI xsltemplate_QueryInterface( else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 8036d32..b17d1d4 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -75,16 +75,10 @@ static HRESULT WINAPI domtext_QueryInterface( { return *ppvObject ? S_OK : E_NOINTERFACE; } - else if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || - IsEqualGUID( riid, &IID_IXMLDOMCDATASection ) ) - { - /* IXMLDOMText is known to be correct in not implementing these */ - TRACE("Unsupported interface\n"); - return E_NOINTERFACE; - } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index b833ba2..a9d1dd8 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -95,6 +95,7 @@ static HRESULT WINAPI xmldoc_QueryInterface(IXMLDocument *iface, REFIID riid, vo else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 19e8194..9e08cc2 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -75,6 +75,7 @@ static HRESULT WINAPI xmlelem_QueryInterface(IXMLElement *iface, REFIID riid, vo else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; }

1 0

Austin English : shlwapi/tests: Remove win9x hacks.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: a4cc8bc63c7aa4c3db998c6b3c6de3a69993953b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4cc8bc63c7aa4c3db998c6b3… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 28 14:28:29 2011 -0800 shlwapi/tests: Remove win9x hacks. --- dlls/shlwapi/tests/string.c | 36 +++++++++--------------------------- 1 files changed, 9 insertions(+), 27 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 00a4469..3628f86 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -567,11 +567,7 @@ static void test_StrFormatKBSizeW(void) pStrFormatKBSizeW(result->value, szBuffW, 256); WideCharToMultiByte(0,0,szBuffW,-1,szBuff,sizeof(szBuff)/sizeof(WCHAR),0,0); - /* shlwapi on Win98 SE does not appear to apply delimiters to the output - * and does not correctly handle extremely large values. */ - ok(!strcmp(result->kb_size, szBuff) || - (result->kb_size_broken && !strcmp(result->kb_size2, szBuff)), - "Formatted %x%08x wrong: got %s, expected %s\n", + ok(!strcmp(result->kb_size, szBuff), "Formatted %x%08x wrong: got %s, expected %s\n", (LONG)(result->value >> 32), (LONG)result->value, szBuff, result->kb_size); result++; } @@ -786,15 +782,6 @@ static void test_StrRStrI(void) LPWSTR retW; LPSTR retA; - /* StrCpyNXA was chosen simply because it doesn't appear to be available on - * Win9x machines where StrRStrI crashes. Despite StrRStrI being exported - * by name, all StrRStrI tests appear to crash for unknown reasons. */ - if (!pStrCpyNXA) - { - win_skip("StrRStrI crashes on older Win9x platforms\n"); - return; - } - check_strrstri(A, szTest, 4, "A", szTest+1); check_strrstri(A, szTest, 4, "aX", szTest+1); check_strrstri(A, szTest, 4, "Ay", NULL); @@ -909,15 +896,10 @@ if (0) expect_eq(wbuf[0], 0, WCHAR, "%x"); expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x"); - if (pStrCpyNXA) - { - memset(wbuf, 0xbf, sizeof(wbuf)); - expect_eq(StrCpyNW(wbuf, 0, 10), wbuf, PWCHAR, "%p"); - expect_eq(wbuf[0], 0, WCHAR, "%x"); - expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x"); - } - else - win_skip("StrCpyNW test crashes on older Win9x platforms\n"); + memset(wbuf, 0xbf, sizeof(wbuf)); + expect_eq(StrCpyNW(wbuf, 0, 10), wbuf, PWCHAR, "%p"); + expect_eq(wbuf[0], 0, WCHAR, "%x"); + expect_eq(wbuf[1], (WCHAR)0xbfbf, WCHAR, "%x"); memset(wbuf, 0xbf, sizeof(wbuf)); expect_eq(StrCpyNW(wbuf, 0, 0), wbuf, PWCHAR, "%p"); @@ -1012,7 +994,7 @@ static void test_StrStrA(void) LPSTR ret; int i; - /* Tests crash on Win9x/Win2k. */ + /* Tests crash on Win2k */ if (0) { ret = StrStrA(NULL, NULL); @@ -1066,7 +1048,7 @@ static void test_StrStrW(void) LPWSTR ret; int i; - /* Tests crash on Win9x. */ + /* Tests crash on Win2k */ if (0) { ret = StrStrW(NULL, NULL); @@ -1114,7 +1096,7 @@ static void test_StrStrIA(void) LPSTR ret; int i; - /* Tests crash on Win9x/Win2k. */ + /* Tests crash on Win2k */ if (0) { ret = StrStrIA(NULL, NULL); @@ -1170,7 +1152,7 @@ static void test_StrStrIW(void) LPWSTR ret; int i; - /* Tests crash on Win9x/Win2k */ + /* Tests crash on Win2k */ if (0) { ret = StrStrIW(NULL, NULL);

1 0

Austin English : ntprint/tests: Remove win9x hacks.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 9b9181923dd49486710a6e287e710b9df69fb44e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b9181923dd49486710a6e287… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 28 13:29:38 2011 -0800 ntprint/tests: Remove win9x hacks. --- dlls/ntprint/tests/ntprint.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c index fca7b8d..cf9853d 100644 --- a/dlls/ntprint/tests/ntprint.c +++ b/dlls/ntprint/tests/ntprint.c @@ -214,14 +214,7 @@ static void test_PSetupEnumMonitor(VOID) START_TEST(ntprint) { - LPCSTR ptr; - - /* ntprint.dll does not exist on win9x */ - ptr = load_functions(); - if (ptr) { - skip("%s not found\n", ptr); - return; - } + load_functions(); test_PSetupCreateMonitorInfo(); test_PSetupDestroyMonitorInfo();

1 0

Austin English : setupapi/tests: Remove win9x hacks.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 270298191ddda6dafa8d2a76c77e5345d895c8d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=270298191ddda6dafa8d2a76c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 28 13:06:23 2011 -0800 setupapi/tests: Remove win9x hacks. --- dlls/setupapi/tests/devinst.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index f1d3965..1905406 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1530,21 +1530,7 @@ static void testSetupDiGetINFClassA(void) START_TEST(devinst) { - HDEVINFO set; - - init_function_pointers(); - - /* Win9x/WinMe does things totally different so we skip all the tests - * - * We don't want to exclude NT4 so hence this check. - */ - SetLastError(0xdeadbeef); - set = pSetupDiGetClassDevsW(NULL, NULL, 0, 0); - if (set == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("Win9x/WinMe has totally different behavior\n"); - return; - } + init_function_pointers(); if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64);

1 0

Austin English : secur32/tests: Remove win9x hacks.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 9c84bfa9a4d2d055a1e92daf84a0e7ef7c71c659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c84bfa9a4d2d055a1e92daf8… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 28 13:05:45 2011 -0800 secur32/tests: Remove win9x hacks. --- dlls/secur32/tests/secur32.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 6a46e9b..6e67784 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -198,14 +198,12 @@ static void test_InitSecurityInterface(void) sftA = pInitSecurityInterfaceA(); ok(sftA != NULL, "pInitSecurityInterfaceA failed\n"); ok(sftA->dwVersion == SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, "wrong dwVersion %d in security function table\n", sftA->dwVersion); - ok(!sftA->Reserved2 || broken(sftA->Reserved2 != NULL) /* WinME */, + ok(!sftA->Reserved2, "Reserved2 should be NULL instead of %p in security function table\n", sftA->Reserved2); - ok(sftA->Reserved3 == sftA->EncryptMessage || - broken(sftA->Reserved3 != sftA->EncryptMessage) /* Win9x */, + ok(sftA->Reserved3 == sftA->EncryptMessage, "Reserved3 should be equal to EncryptMessage in the security function table\n"); - ok(sftA->Reserved4 == sftA->DecryptMessage || - broken(sftA->Reserved4 != sftA->DecryptMessage) /* Win9x */, + ok(sftA->Reserved4 == sftA->DecryptMessage, "Reserved4 should be equal to DecryptMessage in the security function table\n"); if (!pInitSecurityInterfaceW)

1 0

Rico Schüller : d3dcompiler: Use defines for shader target masks.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: f7571743c9fb63a3b27a8cee39997ab61070c82e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7571743c9fb63a3b27a8cee3… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 28 19:47:37 2011 +0100 d3dcompiler: Use defines for shader target masks. --- dlls/d3dcompiler_43/reflection.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 130c1e4..e97512f 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -31,6 +31,9 @@ enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7 = 7, }; +#define D3DCOMPILER_SHADER_TARGET_VERSION_MASK 0xffff +#define D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK 0xffff0000 + static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3dcompiler_shader_reflection *reflection, const char *data, DWORD offset); const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl; @@ -1108,7 +1111,7 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type read_dword(&ptr, &member_offset); TRACE("Member Offset %u\n", member_offset); - if ((type->reflection->target & 0xffff) >= 0x500) + if ((type->reflection->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500) skip_dword_unknown(&ptr, 4); if (desc->Members) @@ -1247,7 +1250,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_ goto err_out; } - if ((cb->reflection->target & 0xffff) >= 0x500) + if ((cb->reflection->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500) skip_dword_unknown(&ptr, 4); } @@ -1306,7 +1309,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c TRACE("Creator: %s.\n", debugstr_a(creator)); /* todo: Parse RD11 */ - if ((r->target & 0x0000ffff) >= 0x500) + if ((r->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500) { skip_dword_unknown(&ptr, 8); } @@ -1516,7 +1519,7 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * d[i].Mask = mask & 0xff; /* pixel shaders have a special handling for SystemValueType in the output signature */ - if (((target & 0xffff0000) == 0xffff0000) && (section->tag == TAG_OSG5 || section->tag == TAG_OSGN)) + if (((target & D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK) == 0xffff0000) && (section->tag == TAG_OSG5 || section->tag == TAG_OSGN)) { TRACE("Pixelshader output signature fixup.\n");

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionType::GetMemberTypeName().
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: f9696983cf64587e702f0cb72e671acd46ef33bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9696983cf64587e702f0cb72… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 28 19:47:34 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionType::GetMemberTypeName(). --- dlls/d3dcompiler_43/reflection.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index c0ade43..130c1e4 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -847,9 +847,23 @@ static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflect static LPCSTR STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeName( ID3D11ShaderReflectionType *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + if (This == &null_type) + { + WARN("Null type specified\n"); + return "$Invalid"; + } + + if (index >= This->desc.Members) + { + WARN("Invalid index specified\n"); + return NULL; + } + + return This->members[index].name; } static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_IsEqual(

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionType::GetMemberTypeByName().
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 54b5364988dace512019b91768d7c44c799a97f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b5364988dace512019b9176… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 28 19:47:31 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionType::GetMemberTypeByName(). --- dlls/d3dcompiler_43/reflection.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 7381957..c0ade43 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -817,9 +817,31 @@ static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflect static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByName( ID3D11ShaderReflectionType *iface, LPCSTR name) { - FIXME("iface %p, name %s stub!\n", iface, name); + struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); + unsigned int i; - return NULL; + TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + + if (!name) + { + WARN("Invalid argument specified\n"); + return &null_type.ID3D11ShaderReflectionType_iface; + } + + for (i = 0; i < This->desc.Members; ++i) + { + struct d3dcompiler_shader_reflection_type_member *member = &This->members[i]; + + if (!strcmp(member->name, name)) + { + TRACE("Returning ID3D11ShaderReflectionType %p.\n", member->type); + return &member->type->ID3D11ShaderReflectionType_iface; + } + } + + WARN("Invalid name specified\n"); + + return &null_type.ID3D11ShaderReflectionType_iface; } static LPCSTR STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeName(

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionType::GetMemberTypeByIndex().
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 3ca651cce149d3c2d178a1c5ae3cf86e005b3415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca651cce149d3c2d178a1c5a… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 28 19:47:28 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionType::GetMemberTypeByIndex(). --- dlls/d3dcompiler_43/reflection.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 5c063b9..7381957 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -801,9 +801,17 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetDesc( static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByIndex( ID3D11ShaderReflectionType *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3dcompiler_shader_reflection_type *This = impl_from_ID3D11ShaderReflectionType(iface); - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + if (index >= This->desc.Members) + { + WARN("Invalid index specified\n"); + return &null_type.ID3D11ShaderReflectionType_iface; + } + + return &This->members[index].type->ID3D11ShaderReflectionType_iface; } static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_GetMemberTypeByName(

1 0

Rico Schüller : d3dcompiler: Parse member types.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: a300481187cb237ea34ca3ec3e4a68b069793d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a300481187cb237ea34ca3ec3… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 28 19:47:24 2011 +0100 d3dcompiler: Parse member types. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 8 +++ dlls/d3dcompiler_43/reflection.c | 94 ++++++++++++++++++++++++++--- 2 files changed, 94 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 4d90def..9a5274b 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -75,6 +75,14 @@ struct d3dcompiler_shader_reflection_type struct d3dcompiler_shader_reflection *reflection; D3D11_SHADER_TYPE_DESC desc; + struct d3dcompiler_shader_reflection_type_member *members; +}; + +struct d3dcompiler_shader_reflection_type_member +{ + char *name; + DWORD offset; + struct d3dcompiler_shader_reflection_type *type; }; struct d3dcompiler_shader_reflection_variable diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 157e791..5c063b9 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -31,6 +31,8 @@ enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7 = 7, }; +static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3dcompiler_shader_reflection *reflection, const char *data, DWORD offset); + const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl; const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl; const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl; @@ -81,17 +83,17 @@ static BOOL copy_value(const char *ptr, void **value, DWORD size) return TRUE; } -void *d3dcompiler_rb_alloc(size_t size) +static void *d3dcompiler_rb_alloc(size_t size) { return HeapAlloc(GetProcessHeap(), 0, size); } -void *d3dcompiler_rb_realloc(void *ptr, size_t size) +static void *d3dcompiler_rb_realloc(void *ptr, size_t size) { return HeapReAlloc(GetProcessHeap(), 0, ptr, size); } -void d3dcompiler_rb_free(void *ptr) +static void d3dcompiler_rb_free(void *ptr) { HeapFree(GetProcessHeap(), 0, ptr); } @@ -104,12 +106,29 @@ static int d3dcompiler_shader_reflection_type_compare(const void *key, const str return *id - t->id; } +static void free_type_member(struct d3dcompiler_shader_reflection_type_member *member) +{ + if (member) + { + HeapFree(GetProcessHeap(), 0, member->name); + } +} + static void d3dcompiler_shader_reflection_type_destroy(struct wine_rb_entry *entry, void *context) { struct d3dcompiler_shader_reflection_type *t = WINE_RB_ENTRY_VALUE(entry, struct d3dcompiler_shader_reflection_type, entry); + unsigned int i; TRACE("reflection type %p.\n", t); + if (t->members) + { + for (i = 0; i < t->desc.Members; ++i) + { + free_type_member(&t->members[i]); + } + } + HeapFree(GetProcessHeap(), 0, t); } @@ -985,12 +1004,45 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c return E_FAIL; } +static HRESULT d3dcompiler_parse_type_members(struct d3dcompiler_shader_reflection *ref, + struct d3dcompiler_shader_reflection_type_member *member, const char *data, const char **ptr) +{ + DWORD offset; + + read_dword(ptr, &offset); + if (!copy_name(data + offset, &member->name)) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } + TRACE("Member name: %s.\n", debugstr_a(member->name)); + + read_dword(ptr, &offset); + TRACE("Member type offset: %x\n", offset); + + member->type = get_reflection_type(ref, data, offset); + if (!member->type) + { + ERR("Failed to get member type\n"); + HeapFree(GetProcessHeap(), 0, member->name); + return E_FAIL; + } + + read_dword(ptr, &member->offset); + TRACE("Member offset %x\n", member->offset); + + return S_OK; +} + static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type *type, const char *data, DWORD offset) { const char *ptr = data + offset; DWORD temp; D3D11_SHADER_TYPE_DESC *desc; unsigned int i; + struct d3dcompiler_shader_reflection_type_member *members; + HRESULT hr; + DWORD member_offset; desc = &type->desc; @@ -1009,19 +1061,45 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type desc->Members = temp >> 16; TRACE("Elements %u, Members %u\n", desc->Elements, desc->Members); - read_dword(&ptr, &temp); - TRACE("Member Offset %u\n", temp); + read_dword(&ptr, &member_offset); + TRACE("Member Offset %u\n", member_offset); if ((type->reflection->target & 0xffff) >= 0x500) skip_dword_unknown(&ptr, 4); - /* todo: Parse type members */ - for (i = 0; i < desc->Members; ++i) + if (desc->Members) { - skip_dword_unknown(&ptr, 3); + const char *ptr2 = data + member_offset; + + members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*members)); + if (!members) + { + ERR("Failed to allocate type memory.\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < desc->Members; ++i) + { + hr = d3dcompiler_parse_type_members(type->reflection, &members[i], data, &ptr2); + if (hr != S_OK) + { + FIXME("Failed to parse type members."); + goto err_out; + } + } } + type->members = members; + return S_OK; + +err_out: + for (i = 0; i < desc->Members; ++i) + { + free_type_member(&members[i]); + } + HeapFree(GetProcessHeap(), 0, members); + return hr; } static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3dcompiler_shader_reflection *reflection, const char *data, DWORD offset)

1 0

Alexandre Julliard : server: Don' t pass a thread id to send_hardware_message, determine it from the window.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: bc4afb078677095468d4ee8f9a15c18cbb47bbbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4afb078677095468d4ee8f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 11:54:55 2011 +0100 server: Don't pass a thread id to send_hardware_message, determine it from the window. --- dlls/winex11.drv/keyboard.c | 1 - dlls/winex11.drv/mouse.c | 1 - include/wine/server_protocol.h | 8 +---- server/protocol.def | 6 +---- server/queue.c | 51 ++++++++++++++++----------------------- server/request.h | 12 +++------ server/trace.c | 13 ++-------- 7 files changed, 31 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc4afb078677095468d4e…

1 0

Alexandre Julliard : winex11: Pass a window handle for keyboard hardware messages too.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 8f88d4fe78827f40728f05be2738b40d784bba65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f88d4fe78827f40728f05be2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 11:50:29 2011 +0100 winex11: Pass a window handle for keyboard hardware messages too. --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/keyboard.c | 24 ++++++++++++------------ dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 8a69ecb..0a3977d 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1568,7 +1568,7 @@ UINT CDECL X11DRV_SendInput( UINT count, LPINPUT inputs, int size ) inputs->u.mi.dwExtraInfo, LLMHF_INJECTED ); break; case INPUT_KEYBOARD: - X11DRV_send_keyboard_input( inputs->u.ki.wVk, inputs->u.ki.wScan, inputs->u.ki.dwFlags, + X11DRV_send_keyboard_input( 0, inputs->u.ki.wVk, inputs->u.ki.wScan, inputs->u.ki.dwFlags, inputs->u.ki.time, inputs->u.ki.dwExtraInfo, LLKHF_INJECTED ); break; case INPUT_HARDWARE: diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 901cd71..d8ab4d2 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1150,7 +1150,7 @@ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e) /*********************************************************************** * X11DRV_send_keyboard_input */ -void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD time, +void X11DRV_send_keyboard_input( HWND hwnd, WORD wVk, WORD wScan, DWORD event_flags, DWORD time, DWORD dwExtraInfo, UINT injected_flags ) { UINT message; @@ -1268,7 +1268,7 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD SERVER_START_REQ( send_hardware_message ) { req->id = (injected_flags & LLKHF_INJECTED) ? 0 : GetCurrentThreadId(); - req->win = 0; + req->win = wine_server_user_handle( hwnd ); req->msg = message; req->wparam = wVk; req->lparam = lParam; @@ -1286,7 +1286,7 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD * Updates internal state for <vkey>, depending on key <state> under X * */ -static inline void KEYBOARD_UpdateOneState ( WORD vkey, WORD scan, int state, DWORD time ) +static inline void KEYBOARD_UpdateOneState ( HWND hwnd, WORD vkey, WORD scan, int state, DWORD time ) { /* Do something if internal table state != X state for keycode */ if (((key_state_table[vkey & 0xff] & 0x80)!=0) != state) @@ -1299,7 +1299,7 @@ static inline void KEYBOARD_UpdateOneState ( WORD vkey, WORD scan, int state, DW vkey, key_state_table[vkey & 0xff]); /* Fake key being pressed inside wine */ - X11DRV_send_keyboard_input( vkey & 0xff, scan & 0xff, flags, time, 0, 0 ); + X11DRV_send_keyboard_input( hwnd, vkey & 0xff, scan & 0xff, flags, time, 0, 0 ); TRACE("State after %#.2x\n", key_state_table[vkey & 0xff]); } @@ -1338,21 +1338,21 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) case VK_RCONTROL: case VK_LSHIFT: case VK_RSHIFT: - KEYBOARD_UpdateOneState( vkey, scan, state, time ); + KEYBOARD_UpdateOneState( hwnd, vkey, scan, state, time ); break; } } } } -static void update_lock_state(BYTE vkey, WORD scan, DWORD time) +static void update_lock_state(HWND hwnd, BYTE vkey, WORD scan, DWORD time) { DWORD flags = vkey == VK_NUMLOCK ? KEYEVENTF_EXTENDEDKEY : 0; if (key_state_table[vkey] & 0x80) flags ^= KEYEVENTF_KEYUP; - X11DRV_send_keyboard_input( vkey, scan, flags, time, 0, 0 ); - X11DRV_send_keyboard_input( vkey, scan, flags ^ KEYEVENTF_KEYUP, time, 0, 0 ); + X11DRV_send_keyboard_input( hwnd, vkey, scan, flags, time, 0, 0 ); + X11DRV_send_keyboard_input( hwnd, vkey, scan, flags ^ KEYEVENTF_KEYUP, time, 0, 0 ); } /*********************************************************************** @@ -1461,7 +1461,7 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) vkey != VK_CAPITAL) { TRACE("Adjusting CapsLock state (%#.2x)\n", key_state_table[VK_CAPITAL]); - update_lock_state(VK_CAPITAL, 0x3A, event_time); + update_lock_state( hwnd, VK_CAPITAL, 0x3A, event_time ); } /* Adjust the NUMLOCK state if it has been changed outside wine */ @@ -1469,7 +1469,7 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) (vkey & 0xff) != VK_NUMLOCK) { TRACE("Adjusting NumLock state (%#.2x)\n", key_state_table[VK_NUMLOCK]); - update_lock_state(VK_NUMLOCK, 0x45, event_time); + update_lock_state( hwnd, VK_NUMLOCK, 0x45, event_time ); } /* Adjust the SCROLLLOCK state if it has been changed outside wine */ @@ -1477,13 +1477,13 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) vkey != VK_SCROLL) { TRACE("Adjusting ScrLock state (%#.2x)\n", key_state_table[VK_SCROLL]); - update_lock_state(VK_SCROLL, 0x46, event_time); + update_lock_state( hwnd, VK_SCROLL, 0x46, event_time ); } bScan = keyc2scan[event->keycode] & 0xFF; TRACE_(key)("bScan = 0x%02x.\n", bScan); - X11DRV_send_keyboard_input( vkey & 0xff, bScan, dwFlags, event_time, 0, 0 ); + X11DRV_send_keyboard_input( hwnd, vkey & 0xff, bScan, dwFlags, event_time, 0, 0 ); } /********************************************************************** diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6166755..0728f87 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -804,7 +804,7 @@ extern void set_window_cursor( struct x11drv_win_data *data, HCURSOR handle ); extern void sync_window_cursor( struct x11drv_win_data *data ); extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ); extern void X11DRV_InitKeyboard( Display *display ); -extern void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time, +extern void X11DRV_send_keyboard_input( HWND hwnd, WORD wVk, WORD wScan, DWORD dwFlags, DWORD time, DWORD dwExtraInfo, UINT injected_flags ); extern void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, DWORD data, DWORD time, DWORD extra_info, UINT injected_flags );

1 0

Alexandre Julliard : user32: Retrieve the current cursor position from the server.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 39c4e6d1d9572e2015282578c124615128afa45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39c4e6d1d9572e2015282578c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 28 22:50:21 2011 +0100 user32: Retrieve the current cursor position from the server. --- dlls/user32/input.c | 25 +++++++++++++++++++++++-- dlls/winex11.drv/keyboard.c | 2 -- dlls/winex11.drv/mouse.c | 11 ++++++----- dlls/winex11.drv/x11drv.h | 2 -- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 59cc047..455e55a 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -197,8 +197,29 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, */ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) { + BOOL ret; + if (!pt) return FALSE; - return USER_Driver->pGetCursorPos( pt ); + + ret = USER_Driver->pGetCursorPos( pt ); + + SERVER_START_REQ( set_cursor ) + { + if (ret) /* update it */ + { + req->flags = SET_CURSOR_POS; + req->x = pt->x; + req->y = pt->y; + } + if ((ret = !wine_server_call( req ))) + { + pt->x = reply->new_x; + pt->y = reply->new_y; + } + } + SERVER_END_REQ; + return ret; + } @@ -245,7 +266,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) } } SERVER_END_REQ; - if (ret) ret = USER_Driver->pSetCursorPos( x, y ); + if (ret) USER_Driver->pSetCursorPos( x, y ); return ret; } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index d99378a..901cd71 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1272,8 +1272,6 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD req->msg = message; req->wparam = wVk; req->lparam = lParam; - req->x = cursor_pos.x; - req->y = cursor_pos.y; req->time = time; req->info = dwExtraInfo; wine_server_call( req ); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index a675bf7..2950246 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -92,7 +92,7 @@ static const UINT button_up_flags[NB_BUTTONS] = MOUSEEVENTF_XUP }; -POINT cursor_pos; +static POINT cursor_pos; static HWND cursor_window; static DWORD last_time_modified; static RECT cursor_clip; /* Cursor clipping rect */ @@ -1042,6 +1042,7 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) Window root, child; int rootX, rootY, winX, winY; unsigned int xstate; + BOOL ret = FALSE; wine_tsx11_lock(); if ((GetTickCount() - last_time_modified > 100) && @@ -1051,12 +1052,12 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) winX += virtual_screen_rect.left; winY += virtual_screen_rect.top; TRACE("pointer at (%d,%d)\n", winX, winY ); - cursor_pos.x = winX; - cursor_pos.y = winY; + pos->x = winX; + pos->y = winY; + ret = TRUE; } - *pos = cursor_pos; wine_tsx11_unlock(); - return TRUE; + return ret; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8a75f37..6166755 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -609,8 +609,6 @@ extern int alloc_system_colors; extern int xrender_error_base; extern HMODULE x11drv_module; -extern POINT cursor_pos; - /* atoms */ enum x11drv_atoms

1 0

Alexandre Julliard : user32: Retrieve the key state for GetAsyncKeyState from the server.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: a7da164949ecade05842f89e9255c94ba8b3572a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7da164949ecade05842f89e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 28 21:55:01 2011 +0100 user32: Retrieve the key state for GetAsyncKeyState from the server. --- dlls/user32/driver.c | 2 +- dlls/user32/input.c | 25 +++++++++++++++++++++---- dlls/winex11.drv/keyboard.c | 11 ++--------- dlls/winex11.drv/mouse.c | 26 -------------------------- dlls/winex11.drv/x11drv.h | 1 - 5 files changed, 24 insertions(+), 41 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 5d49882..09dec4f 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -168,7 +168,7 @@ static void CDECL nulldrv_Beep(void) static SHORT CDECL nulldrv_GetAsyncKeyState( INT key ) { - return 0; + return -1; } static INT CDECL nulldrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index f19b7e4..59cc047 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -300,11 +300,28 @@ HWND WINAPI GetCapture(void) * bit set to 1 if currently pressed, low-order bit set to 1 if key has * been pressed. */ -SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState(INT nKey) +SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { - if (nKey < 0 || nKey > 256) - return 0; - return USER_Driver->pGetAsyncKeyState( nKey ); + SHORT ret; + + if (key < 0 || key >= 256) return 0; + + if ((ret = USER_Driver->pGetAsyncKeyState( key )) == -1) + { + ret = 0; + SERVER_START_REQ( get_key_state ) + { + req->tid = 0; + req->key = key; + if (!wine_server_call( req )) + { + if (reply->state & 0x40) ret |= 0x0001; + if (reply->state & 0x80) ret |= 0x8000; + } + } + SERVER_END_REQ; + } + return ret; } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 313ff3a..d99378a 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -65,7 +65,7 @@ WINE_DECLARE_DEBUG_CHANNEL(key); 0x40 -> key got pressed since last time 0x01 -> key is toggled */ -BYTE key_state_table[256]; +static BYTE key_state_table[256]; static BYTE TrackSysKey = 0; /* determine whether ALT key up will cause a WM_SYSKEYUP or a WM_KEYUP message */ @@ -1968,16 +1968,9 @@ static BOOL match_x11_keyboard_layout(HKL hkl) */ SHORT CDECL X11DRV_GetAsyncKeyState(INT key) { - SHORT retval; - /* Photoshop livelocks unless mouse events are included here */ X11DRV_MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_KEY | QS_MOUSE, 0 ); - - retval = ((key_state_table[key] & 0x40) ? 0x0001 : 0) | - ((key_state_table[key] & 0x80) ? 0x8000 : 0); - key_state_table[key] &= ~0x40; - TRACE_(key)("(%X) -> %x\n", key, retval); - return retval; + return -1; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e4a6ab5..a675bf7 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -398,58 +398,32 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, } } if (flags & MOUSEEVENTF_LEFTDOWN) - { - key_state_table[VK_LBUTTON] |= 0xc0; queue_raw_mouse_message( GetSystemMetrics(SM_SWAPBUTTON) ? WM_RBUTTONDOWN : WM_LBUTTONDOWN, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_LEFTUP) - { - key_state_table[VK_LBUTTON] &= ~0x80; queue_raw_mouse_message( GetSystemMetrics(SM_SWAPBUTTON) ? WM_RBUTTONUP : WM_LBUTTONUP, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_RIGHTDOWN) - { - key_state_table[VK_RBUTTON] |= 0xc0; queue_raw_mouse_message( GetSystemMetrics(SM_SWAPBUTTON) ? WM_LBUTTONDOWN : WM_RBUTTONDOWN, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_RIGHTUP) - { - key_state_table[VK_RBUTTON] &= ~0x80; queue_raw_mouse_message( GetSystemMetrics(SM_SWAPBUTTON) ? WM_LBUTTONUP : WM_RBUTTONUP, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_MIDDLEDOWN) - { - key_state_table[VK_MBUTTON] |= 0xc0; queue_raw_mouse_message( WM_MBUTTONDOWN, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_MIDDLEUP) - { - key_state_table[VK_MBUTTON] &= ~0x80; queue_raw_mouse_message( WM_MBUTTONUP, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_WHEEL) - { queue_raw_mouse_message( WM_MOUSEWHEEL, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_XDOWN) - { - key_state_table[VK_XBUTTON1 + data - 1] |= 0xc0; queue_raw_mouse_message( WM_XBUTTONDOWN, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } if (flags & MOUSEEVENTF_XUP) - { - key_state_table[VK_XBUTTON1 + data - 1] &= ~0x80; queue_raw_mouse_message( WM_XBUTTONUP, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - } } #ifdef SONAME_LIBXCURSOR diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3865078..8a75f37 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -609,7 +609,6 @@ extern int alloc_system_colors; extern int xrender_error_base; extern HMODULE x11drv_module; -extern BYTE key_state_table[256]; extern POINT cursor_pos; /* atoms */

1 0

Alexandre Julliard : server: Maintain the "set since last time" bit for the global keystate.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: 22468ec65c494c609e219329ad8283a3d31d2aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22468ec65c494c609e219329a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 28 21:43:44 2011 +0100 server: Maintain the "set since last time" bit for the global keystate. --- server/queue.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/server/queue.c b/server/queue.c index 690687e..3526790 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1106,13 +1106,14 @@ static void set_input_key_state( unsigned char *keystate, unsigned char key, int if (down) { if (!(keystate[key] & 0x80)) keystate[key] ^= 0x01; - keystate[key] |= 0x80; + keystate[key] |= down; } else keystate[key] &= ~0x80; } /* update the input key state for a keyboard message */ -static void update_input_key_state( unsigned char *keystate, const struct message *msg ) +static void update_input_key_state( struct desktop *desktop, unsigned char *keystate, + const struct message *msg ) { unsigned char key; int down = 0; @@ -1120,25 +1121,25 @@ static void update_input_key_state( unsigned char *keystate, const struct messag switch (msg->msg) { case WM_LBUTTONDOWN: - down = 1; + down = (keystate == desktop->keystate) ? 0xc0 : 0x80; /* fall through */ case WM_LBUTTONUP: set_input_key_state( keystate, VK_LBUTTON, down ); break; case WM_MBUTTONDOWN: - down = 1; + down = (keystate == desktop->keystate) ? 0xc0 : 0x80; /* fall through */ case WM_MBUTTONUP: set_input_key_state( keystate, VK_MBUTTON, down ); break; case WM_RBUTTONDOWN: - down = 1; + down = (keystate == desktop->keystate) ? 0xc0 : 0x80; /* fall through */ case WM_RBUTTONUP: set_input_key_state( keystate, VK_RBUTTON, down ); break; case WM_XBUTTONDOWN: - down = 1; + down = (keystate == desktop->keystate) ? 0xc0 : 0x80; /* fall through */ case WM_XBUTTONUP: if (msg->wparam == XBUTTON1) set_input_key_state( keystate, VK_XBUTTON1, down ); @@ -1146,7 +1147,7 @@ static void update_input_key_state( unsigned char *keystate, const struct messag break; case WM_KEYDOWN: case WM_SYSKEYDOWN: - down = 1; + down = (keystate == desktop->keystate) ? 0xc0 : 0x80; /* fall through */ case WM_KEYUP: case WM_SYSKEYUP: @@ -1229,7 +1230,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i } if (remove) { - update_input_key_state( input->keystate, msg ); + update_input_key_state( input->desktop, input->keystate, msg ); list_remove( &msg->entry ); free_message( msg ); } @@ -1280,7 +1281,7 @@ static void queue_hardware_message( struct desktop *desktop, struct thread_input unsigned int msg_code; struct hardware_msg_data *data = msg->data; - update_input_key_state( desktop->keystate, msg ); + update_input_key_state( desktop, desktop->keystate, msg ); last_input_time = get_tick_count(); if (!is_keyboard_msg( msg )) @@ -1300,7 +1301,7 @@ static void queue_hardware_message( struct desktop *desktop, struct thread_input win = find_hardware_message_window( input, msg, &msg_code ); if (!win || !(thread = get_window_thread(win))) { - if (input) update_input_key_state( input->keystate, msg ); + if (input) update_input_key_state( input->desktop, input->keystate, msg ); free( msg ); return; } @@ -1390,7 +1391,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user if (!win || !(win_thread = get_window_thread( win ))) { /* no window at all, remove it */ - update_input_key_state( input->keystate, msg ); + update_input_key_state( input->desktop, input->keystate, msg ); list_remove( &msg->entry ); free_message( msg ); continue; @@ -1406,7 +1407,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user else { /* for another thread input, drop it */ - update_input_key_state( input->keystate, msg ); + update_input_key_state( input->desktop, input->keystate, msg ); list_remove( &msg->entry ); free_message( msg ); } @@ -2117,7 +2118,11 @@ DECL_HANDLER(get_key_state) if (!req->tid) /* get global async key state */ { if (!(desktop = get_thread_desktop( current, 0 ))) return; - if (req->key >= 0) reply->state = desktop->keystate[req->key & 0xff]; + if (req->key >= 0) + { + reply->state = desktop->keystate[req->key & 0xff]; + desktop->keystate[req->key & 0xff] &= ~0x40; + } set_reply_data( desktop->keystate, size ); release_object( desktop ); }

1 0

Alexandre Julliard : server: Fill the key state in mouse events from the server-side state.
by Alexandre Julliard 01 Mar '11

01 Mar '11

Module: wine Branch: master Commit: b9e4b5a28ca6178d5988dc63e098c523015b5bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e4b5a28ca6178d5988dc63e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 28 21:37:09 2011 +0100 server: Fill the key state in mouse events from the server-side state. --- dlls/winex11.drv/mouse.c | 42 +----------------------------------------- server/queue.c | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 44 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 4060018..e4a6ab5 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -145,19 +145,6 @@ static inline void clip_point_to_rect( LPCRECT rect, LPPOINT pt ) } /*********************************************************************** - * update_button_state - * - * Update the button state with what X provides us - */ -static inline void update_button_state( unsigned int state ) -{ - key_state_table[VK_LBUTTON] = (state & Button1Mask ? 0x80 : 0); - key_state_table[VK_MBUTTON] = (state & Button2Mask ? 0x80 : 0); - key_state_table[VK_RBUTTON] = (state & Button3Mask ? 0x80 : 0); - /* X-buttons are not reported from XQueryPointer */ -} - -/*********************************************************************** * get_empty_cursor */ static Cursor get_empty_cursor(void) @@ -299,32 +286,6 @@ static HWND update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned /*********************************************************************** - * get_key_state - */ -static WORD get_key_state(void) -{ - WORD ret = 0; - - if (GetSystemMetrics( SM_SWAPBUTTON )) - { - if (key_state_table[VK_RBUTTON] & 0x80) ret |= MK_LBUTTON; - if (key_state_table[VK_LBUTTON] & 0x80) ret |= MK_RBUTTON; - } - else - { - if (key_state_table[VK_LBUTTON] & 0x80) ret |= MK_LBUTTON; - if (key_state_table[VK_RBUTTON] & 0x80) ret |= MK_RBUTTON; - } - if (key_state_table[VK_MBUTTON] & 0x80) ret |= MK_MBUTTON; - if (key_state_table[VK_SHIFT] & 0x80) ret |= MK_SHIFT; - if (key_state_table[VK_CONTROL] & 0x80) ret |= MK_CONTROL; - if (key_state_table[VK_XBUTTON1] & 0x80) ret |= MK_XBUTTON1; - if (key_state_table[VK_XBUTTON2] & 0x80) ret |= MK_XBUTTON2; - return ret; -} - - -/*********************************************************************** * queue_raw_mouse_message */ static void queue_raw_mouse_message( UINT message, HWND hwnd, DWORD x, DWORD y, @@ -348,7 +309,7 @@ static void queue_raw_mouse_message( UINT message, HWND hwnd, DWORD x, DWORD y, req->id = (injected_flags & LLMHF_INJECTED) ? 0 : GetCurrentThreadId(); req->win = wine_server_user_handle( hwnd ); req->msg = message; - req->wparam = MAKEWPARAM( get_key_state(), data ); + req->wparam = MAKEWPARAM( 0, data ); req->lparam = 0; req->x = x; req->y = y; @@ -1113,7 +1074,6 @@ BOOL CDECL X11DRV_GetCursorPos(LPPOINT pos) XQueryPointer( display, root_window, &root, &child, &rootX, &rootY, &winX, &winY, &xstate )) { - update_button_state( xstate ); winX += virtual_screen_rect.left; winY += virtual_screen_rect.top; TRACE("pointer at (%d,%d)\n", winX, winY ); diff --git a/server/queue.c b/server/queue.c index 281c8bc..690687e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1280,11 +1280,23 @@ static void queue_hardware_message( struct desktop *desktop, struct thread_input unsigned int msg_code; struct hardware_msg_data *data = msg->data; - if (msg->msg == WM_MOUSEMOVE) set_cursor_pos( desktop, data->x, data->y ); - data->x = desktop->cursor_x; - data->y = desktop->cursor_y; update_input_key_state( desktop->keystate, msg ); last_input_time = get_tick_count(); + + if (!is_keyboard_msg( msg )) + { + if (msg->msg == WM_MOUSEMOVE) set_cursor_pos( desktop, data->x, data->y ); + if (desktop->keystate[VK_LBUTTON] & 0x80) msg->wparam |= MK_LBUTTON; + if (desktop->keystate[VK_MBUTTON] & 0x80) msg->wparam |= MK_MBUTTON; + if (desktop->keystate[VK_RBUTTON] & 0x80) msg->wparam |= MK_RBUTTON; + if (desktop->keystate[VK_SHIFT] & 0x80) msg->wparam |= MK_SHIFT; + if (desktop->keystate[VK_CONTROL] & 0x80) msg->wparam |= MK_CONTROL; + if (desktop->keystate[VK_XBUTTON1] & 0x80) msg->wparam |= MK_XBUTTON1; + if (desktop->keystate[VK_XBUTTON2] & 0x80) msg->wparam |= MK_XBUTTON2; + } + data->x = desktop->cursor_x; + data->y = desktop->cursor_y; + win = find_hardware_message_window( input, msg, &msg_code ); if (!win || !(thread = get_window_thread(win))) {

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