October 2008 - Wine-commits

Paul Bryan Roberts : advapi32: LookupAccountNameW() - NULL account name handled.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 0e6626958f441eaee1bbfaf250a5b30988429a39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e6626958f441eaee1bbfaf25… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Sat Oct 18 21:40:21 2008 +0100 advapi32: LookupAccountNameW() - NULL account name handled. --- dlls/advapi32/security.c | 5 +++++ dlls/advapi32/tests/security.c | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index fcb048b..a33d6ec 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2532,6 +2532,11 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); + if (!lpAccountName || !strcmpW(lpAccountName, Blank)) + { + lpAccountName = BUILTIN; + } + for (i = 0; i < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); i++) { if (!strcmpW(lpAccountName, ACCOUNT_SIDS[i].account)) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4e9e7ef..b6756f5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1632,14 +1632,11 @@ static void test_LookupAccountName(void) ret = LookupAccountNameA(NULL, NULL, psid, &sid_size, domain, &domain_size, &sid_use); get_sid_info(psid, &account, &sid_dom); ok(ret, "Failed to lookup account name\n"); - todo_wine - { - /* Using a fixed string will not work on different locales */ - ok(!lstrcmp(account, domain), - "Got %s for account and %s for domain, these should be the same\n", - account, domain); - ok(sid_use == SidTypeDomain, "Expected SidTypeDomain (%d), got %d\n", SidTypeDomain, sid_use); - } + /* Using a fixed string will not work on different locales */ + ok(!lstrcmp(account, domain), + "Got %s for account and %s for domain, these should be the same\n", + account, domain); + ok(sid_use == SidTypeDomain, "Expected SidTypeDomain (%d), got %d\n", SidTypeDomain, sid_use); /* try an invalid account name */ SetLastError(0xdeadbeef);

1 0

Paul Bryan Roberts : advapi32: LookupAccountNameW() - only first user account and well known SIDs accepted.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: f04804f44cbe07fe95d5fc18b431ed39209834c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f04804f44cbe07fe95d5fc18b… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Sat Oct 18 22:09:14 2008 +0100 advapi32: LookupAccountNameW() - only first user account and well known SIDs accepted. --- dlls/advapi32/security.c | 32 +++++++++++++++++++++++++++++++- dlls/advapi32/tests/security.c | 32 ++++++++++++++++++++++++-------- 2 files changed, 55 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 29ff696..2093f7e 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2027,7 +2027,7 @@ LookupAccountSidW( if (!ADVAPI_IsLocalComputer(system)) { FIXME("Only local computer supported!\n"); - SetLastError(ERROR_NONE_MAPPED); + SetLastError(RPC_S_SERVER_UNAVAILABLE); return FALSE; } @@ -2535,16 +2535,25 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI static const WCHAR dm[] = {'D','O','M','A','I','N',0}; unsigned int i; DWORD nameLen; + LPWSTR userName = NULL; LPCWSTR domainName; FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); + if (!ADVAPI_IsLocalComputer(lpSystemName)) + { + SetLastError(RPC_S_SERVER_UNAVAILABLE); + return FALSE; + } + if (!lpAccountName || !strcmpW(lpAccountName, Blank)) { lpAccountName = BUILTIN; } + /* Check well known SIDs first */ + for (i = 0; i < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); i++) { if (!strcmpW(lpAccountName, ACCOUNT_SIDS[i].account)) @@ -2597,6 +2606,27 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI } } + /* Let the current Unix user id masquerade as first Windows user account */ + + nameLen = UNLEN + 1; + + userName = HeapAlloc(GetProcessHeap(), 0, nameLen); + + ret = GetUserNameW(userName, &nameLen); + + if (ret && strcmpW(lpAccountName, userName) != 0) + { + SetLastError(ERROR_NONE_MAPPED); + ret = FALSE; + } + + HeapFree(GetProcessHeap(), 0, userName); + + if (!ret) + { + return ret; + } + ret = AllocateAndInitializeSid(&identifierAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b6756f5..d4f532d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1314,6 +1314,14 @@ static void test_LookupAccountSid(void) ret = LookupAccountSidW(NULL, pUsersSid, accountW, &real_acc_sizeW, domainW, &real_dom_sizeW, &use); ok(ret, "LookupAccountSidW() Expected TRUE, got FALSE\n"); + /* try an invalid system name */ + real_acc_sizeA = MAX_PATH; + real_dom_sizeA = MAX_PATH; + ret = LookupAccountSidA("deepthought", pUsersSid, accountA, &real_acc_sizeA, domainA, &real_dom_sizeA, &use); + ok(!ret, "LookupAccountSidA() Expected FALSE got TRUE\n"); + ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE, + "LookupAccountSidA() Expected RPC_S_SERVER_UNAVAILABLE, got %u\n", GetLastError()); + /* native windows crashes if domainW or accountW is NULL */ /* try a small account buffer */ @@ -1644,14 +1652,22 @@ static void test_LookupAccountName(void) domain_size = 0; ret = LookupAccountNameA(NULL, "oogabooga", NULL, &sid_size, NULL, &domain_size, &sid_use); ok(!ret, "Expected 0, got %d\n", ret); - todo_wine - { - ok(GetLastError() == ERROR_NONE_MAPPED || - broken(GetLastError() == ERROR_TRUSTED_RELATIONSHIP_FAILURE), - "Expected ERROR_NONE_MAPPED, got %d\n", GetLastError()); - ok(sid_size == 0, "Expected 0, got %d\n", sid_size); - ok(domain_size == 0, "Expected 0, got %d\n", domain_size); - } + ok(GetLastError() == ERROR_NONE_MAPPED || + broken(GetLastError() == ERROR_TRUSTED_RELATIONSHIP_FAILURE), + "Expected ERROR_NONE_MAPPED, got %d\n", GetLastError()); + ok(sid_size == 0, "Expected 0, got %d\n", sid_size); + ok(domain_size == 0, "Expected 0, got %d\n", domain_size); + + /* try an invalid system name */ + SetLastError(0xdeadbeef); + sid_size = 0; + domain_size = 0; + ret = LookupAccountNameA("deepthought", NULL, NULL, &sid_size, NULL, &domain_size, &sid_use); + ok(!ret, "Expected 0, got %d\n", ret); + ok(GetLastError() == RPC_S_SERVER_UNAVAILABLE, + "Expected RPC_S_SERVER_UNAVAILABLE, got %d\n", GetLastError()); + ok(sid_size == 0, "Expected 0, got %d\n", sid_size); + ok(domain_size == 0, "Expected 0, got %d\n", domain_size); HeapFree(GetProcessHeap(), 0, psid); HeapFree(GetProcessHeap(), 0, domain);

1 0

Huw Davies : ole32: Partial implementation of IOleObject_Update().
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: f2cf617f006e2184fd7c3956606041221ae0dbca URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2cf617f006e2184fd7c39566… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 20 14:45:56 2008 +0100 ole32: Partial implementation of IOleObject_Update(). --- dlls/ole32/defaulthandler.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index fcff476..a744718 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -621,8 +621,15 @@ static HRESULT WINAPI DefaultHandler_EnumVerbs( static HRESULT WINAPI DefaultHandler_Update( IOleObject* iface) { - FIXME(": Stub\n"); - return E_NOTIMPL; + DefaultHandler *This = impl_from_IOleObject(iface); + TRACE("(%p)\n", iface); + + if (!object_is_running(This)) + { + FIXME("Should run object\n"); + return E_NOTIMPL; + } + return IOleObject_Update(This->pOleDelegate); } /************************************************************************

1 0

Paul Bryan Roberts : advapi32: LookupAccountNameW() - use ACCOUNT_SIDS domain and name_use fields for well known SIDS.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 04cccae9438691fa3042bda7a7d7fadbcbcf3dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=04cccae9438691fa3042bda7a… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Sat Oct 18 20:51:58 2008 +0100 advapi32: LookupAccountNameW() - use ACCOUNT_SIDS domain and name_use fields for well known SIDS. --- dlls/advapi32/security.c | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 87dca9b..77009af 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2536,11 +2536,30 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI { if (!strcmpW(lpAccountName, ACCOUNT_SIDS[i].account)) { - if (*cchReferencedDomainName) - *ReferencedDomainName = '\0'; - *cchReferencedDomainName = 0; - *peUse = SidTypeWellKnownGroup; - return CreateWellKnownSid(ACCOUNT_SIDS[i].type, NULL, Sid, cbSid); + ret = CreateWellKnownSid(ACCOUNT_SIDS[i].type, NULL, Sid, cbSid); + + domainName = ACCOUNT_SIDS[i].domain; + nameLen = strlenW(domainName); + + if (*cchReferencedDomainName <= nameLen && ReferencedDomainName) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + nameLen += 1; + ret = FALSE; + } + else if (ReferencedDomainName && domainName) + { + strcpyW(ReferencedDomainName, domainName); + } + + *cchReferencedDomainName = nameLen; + + if (ret) + { + *peUse = ACCOUNT_SIDS[i].name_use; + } + + return ret; } }

1 0

Paul Bryan Roberts : advapi32: LookupAccountNameW() - passes expected SidTypeUser test.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: a1a2dd3509be7df70f43aa74a3d9b8905f1330b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1a2dd3509be7df70f43aa74a… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Sat Oct 18 20:36:36 2008 +0100 advapi32: LookupAccountNameW() - passes expected SidTypeUser test. --- dlls/advapi32/security.c | 5 +++++ dlls/advapi32/tests/security.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 3c26654..59275c8 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2578,6 +2578,11 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI *cchReferencedDomainName = strlenW(dm)+1; + if (ret) + { + *peUse = SidTypeUser; + } + FreeSid(pSid); return ret; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d1e5b5c..7ec03b2 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1556,8 +1556,8 @@ static void test_LookupAccountName(void) 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(lstrlen(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); } + ok(sid_use == SidTypeUser, "Expected SidTypeUser (%d), got %d\n", SidTypeUser, sid_use); domain_size = domain_save; sid_size = sid_save;

1 0

Paul Bryan Roberts : advapi32: LookupAccountNameW() - return correct domain name length for not-so-well-known SIDs.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: e9e4da8f3647e3c47afef5ccba38779c342cb008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e4da8f3647e3c47afef5ccb… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Sat Oct 18 20:46:35 2008 +0100 advapi32: LookupAccountNameW() - return correct domain name length for not-so-well-known SIDs. --- dlls/advapi32/security.c | 25 ++++++++++++++++--------- dlls/advapi32/tests/security.c | 6 ++---- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 59275c8..87dca9b 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2502,8 +2502,8 @@ LookupAccountNameA( if (ret && lpReferencedDomainNameW) { - WideCharToMultiByte(CP_ACP, 0, lpReferencedDomainNameW, *cbReferencedDomainName, - ReferencedDomainName, *cbReferencedDomainName, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, lpReferencedDomainNameW, -1, + ReferencedDomainName, *cbReferencedDomainName+1, NULL, NULL); } RtlFreeUnicodeString(&lpSystemW); @@ -2526,6 +2526,8 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI PSID pSid; static const WCHAR dm[] = {'D','O','M','A','I','N',0}; unsigned int i; + DWORD nameLen; + LPCWSTR domainName; FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); @@ -2566,17 +2568,22 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI ret = FALSE; } *cbSid = GetLengthSid(pSid); - - if (ReferencedDomainName != NULL && (*cchReferencedDomainName > strlenW(dm))) - strcpyW(ReferencedDomainName, dm); - if (*cchReferencedDomainName <= strlenW(dm)) + domainName = dm; + nameLen = strlenW(domainName); + + if (*cchReferencedDomainName <= nameLen || !ret) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - ret = FALSE; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + nameLen += 1; + ret = FALSE; + } + else if (ReferencedDomainName && domainName) + { + strcpyW(ReferencedDomainName, domainName); } - *cchReferencedDomainName = strlenW(dm)+1; + *cchReferencedDomainName = nameLen; if (ret) { diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7ec03b2..4e9e7ef 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1554,9 +1554,9 @@ static void test_LookupAccountName(void) { 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(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); } + ok(domain_size == domain_save - 1, "Expected %d, got %d\n", domain_save - 1, domain_size); + ok(lstrlen(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); domain_size = domain_save; sid_size = sid_save; @@ -1572,10 +1572,8 @@ static void test_LookupAccountName(void) ok(ret, "Failed to lookup account name\n"); ok(sid_size != 0, "sid_size was zero\n"); ok(!lstrcmp(account, "Everyone"), "Expected Everyone, got %s\n", account); - todo_wine ok(!lstrcmp(domain, sid_dom), "Expected %s, got %s\n", sid_dom, domain); ok(domain_size == 0, "Expected 0, got %d\n", domain_size); - todo_wine ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); ok(sid_use == SidTypeWellKnownGroup, "Expected SidTypeWellKnownGroup (%d), got %d\n", SidTypeWellKnownGroup, sid_use); domain_size = domain_save;

1 0

Paul Bryan Roberts : advapi32: LookupAccountNameW() - add got clause to test.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 30e6ca9eeb7f05d521a33a985042db3f804a85e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e6ca9eeb7f05d521a33a985… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Sat Oct 18 19:54:32 2008 +0100 advapi32: LookupAccountNameW() - add got clause to test. --- dlls/advapi32/tests/security.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7e4d832..d1e5b5c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1555,8 +1555,8 @@ static void test_LookupAccountName(void) 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(lstrlen(domain) == domain_size, "Expected %d\n", lstrlen(domain)); - ok(sid_use == SidTypeUser, "Expected SidTypeUser, got %d\n", sid_use); + ok(lstrlen(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); } domain_size = domain_save; sid_size = sid_save; @@ -1577,7 +1577,7 @@ static void test_LookupAccountName(void) ok(domain_size == 0, "Expected 0, got %d\n", domain_size); todo_wine ok(lstrlen(domain) == domain_size, "Expected %d, got %d\n", lstrlen(domain), domain_size); - ok(sid_use == SidTypeWellKnownGroup, "Expected SidTypeUser, got %d\n", sid_use); + ok(sid_use == SidTypeWellKnownGroup, "Expected SidTypeWellKnownGroup (%d), got %d\n", SidTypeWellKnownGroup, sid_use); domain_size = domain_save; } @@ -1640,7 +1640,7 @@ static void test_LookupAccountName(void) ok(!lstrcmp(account, domain), "Got %s for account and %s for domain, these should be the same\n", account, domain); - ok(sid_use == SidTypeDomain, "Expected SidTypeDomain, got %d\n", SidTypeDomain); + ok(sid_use == SidTypeDomain, "Expected SidTypeDomain (%d), got %d\n", SidTypeDomain, sid_use); } /* try an invalid account name */

1 0

Detlef Riekenberg : mscms: Quiet a noisy fixme.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 991c76525fa892befe5c1fe07d5b17d8c4150b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991c76525fa892befe5c1fe07… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Oct 18 01:03:49 2008 +0200 mscms: Quiet a noisy fixme. --- dlls/mscms/transform.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 2ed65d1..a795386 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -58,6 +58,7 @@ static DWORD from_profile( HPROFILE profile ) static DWORD from_bmformat( BMFORMAT format ) { + static int quietfixme = 0; TRACE( "bitmap format: 0x%08x\n", format ); switch (format) @@ -66,7 +67,11 @@ static DWORD from_bmformat( BMFORMAT format ) case BM_BGRTRIPLETS: return TYPE_BGR_8; case BM_GRAY: return TYPE_GRAY_8; default: - FIXME("unhandled bitmap format\n"); + if (quietfixme == 0) + { + FIXME("unhandled bitmap format 0x%x\n", format); + quietfixme = 1; + } return TYPE_RGB_8; } }

1 0

Tobias Jakobi : wined3d: Fix some typos.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: e79d89ff408ce790055bee5b2e95f1215316cb76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79d89ff408ce790055bee5b2… Author: Tobias Jakobi <tjakobi(a)ada20.math.uni-bielefeld.de> Date: Mon Oct 20 17:56:58 2008 +0200 wined3d: Fix some typos. --- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/state.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 65ec578..61a38c5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2564,7 +2564,7 @@ static void pshader_glsl_texm3x3(SHADER_OPCODE_ARG* arg) { } /** Process the WINED3DSIO_TEXM3X3SPEC instruction in GLSL - * Peform the final texture lookup based on the previous 2 3x3 matrix multiplies */ + * Perform the final texture lookup based on the previous 2 3x3 matrix multiplies */ static void pshader_glsl_texm3x3spec(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* shader = (IWineD3DPixelShaderImpl*) arg->shader; @@ -2598,7 +2598,7 @@ static void pshader_glsl_texm3x3spec(SHADER_OPCODE_ARG* arg) { } /** Process the WINED3DSIO_TEXM3X3VSPEC instruction in GLSL - * Peform the final texture lookup based on the previous 2 3x3 matrix multiplies */ + * Perform the final texture lookup based on the previous 2 3x3 matrix multiplies */ static void pshader_glsl_texm3x3vspec(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* shader = (IWineD3DPixelShaderImpl*) arg->shader; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5d8bfc7..1a99d40 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3434,7 +3434,7 @@ static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, W * IWineD3DBaseTexture::ApplyStateChanges multiplies the set matrix with a fixup matrix. Before the * scaling is reapplied or removed, the texture matrix has to be reapplied * - * The mapped stage is alrady active because the sampler() function below, which is part of the + * The mapped stage is already active because the sampler() function below, which is part of the * misc pipeline */ if(sampler < MAX_TEXTURES) { @@ -3681,7 +3681,7 @@ static void transform_worldex(DWORD state, IWineD3DStateBlockImpl *stateblock, W } /* GL_MODELVIEW0_ARB: 0x1700 - * GL_MODELVIEW1_ARB: 0x0x850a + * GL_MODELVIEW1_ARB: 0x850a * GL_MODELVIEW2_ARB: 0x8722 * GL_MODELVIEW3_ARB: 0x8723 * etc

1 0

Kirill K. Smirnov : gdiplus: Whole picture object should be cloned in GdipCloneImage(), not just parent class 'image'.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 176e4ba405a7537efc879adb66bb7c5894017998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=176e4ba405a7537efc879adb6… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Oct 20 17:10:10 2008 +0400 gdiplus: Whole picture object should be cloned in GdipCloneImage(), not just parent class 'image'. --- dlls/gdiplus/image.c | 25 ++++--------------------- dlls/gdiplus/tests/image.c | 4 ++++ 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0cb5ded..9dbefc0 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -254,6 +254,7 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) HRESULT hr; INT size; LARGE_INTEGER move; + GpStatus stat = GenericError; TRACE("%p, %p\n", image, cloneImage); @@ -264,15 +265,6 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) if (FAILED(hr)) return GenericError; - *cloneImage = GdipAlloc(sizeof(GpImage)); - if (!*cloneImage) - { - IStream_Release(stream); - return OutOfMemory; - } - (*cloneImage)->type = image->type; - (*cloneImage)->flags = image->flags; - hr = IPicture_SaveAsFile(image->picture, stream, FALSE, &size); if(FAILED(hr)) { @@ -286,21 +278,12 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) if (FAILED(hr)) goto out; - hr = OleLoadPicture(stream, size, FALSE, &IID_IPicture, - (LPVOID*) &(*cloneImage)->picture); - if (FAILED(hr)) - { - WARN("Failed to load image from stream\n"); - goto out; - } + stat = GdipLoadImageFromStream(stream, cloneImage); + if (stat != Ok) WARN("Failed to load image from stream\n"); - IStream_Release(stream); - return Ok; out: IStream_Release(stream); - GdipFree(*cloneImage); - *cloneImage = NULL; - return GenericError; + return stat; } GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 5d8c535..4d93da4 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -514,6 +514,10 @@ static void test_GdipCloneImage(void) stat = GdipGetImageBounds(image_dest, &rectF, &unit); expect(Ok, stat); + /* Treat FP values carefully */ + ok(fabsf(rectF.Width-WIDTH)<1e-5, "Expected: %d, got %.05f\n", WIDTH, rectF.Width); + ok(fabsf(rectF.Height-HEIGHT)<1e-5, "Expected: %d, got %.05f\n", HEIGHT, rectF.Height); + stat = GdipDisposeImage(image_dest); expect(Ok, stat); }

1 0