wine-commits October 2008

wine-commits@winehq.org

3 participants
1216 discussions

Paul Bryan Roberts : advapi32: LookupAccountNameW() - use CreateWellKnownSid() properly.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: a37512ee63f33b69f3838c32a7a42abffb70d772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37512ee63f33b69f3838c32a… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Sat Oct 18 21:28:39 2008 +0100 advapi32: LookupAccountNameW() - use CreateWellKnownSid() properly. --- dlls/advapi32/security.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 03933d2..fcb048b 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2536,7 +2536,26 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI { if (!strcmpW(lpAccountName, ACCOUNT_SIDS[i].account)) { - ret = CreateWellKnownSid(ACCOUNT_SIDS[i].type, NULL, Sid, cbSid); + DWORD sidLen = SECURITY_MAX_SID_SIZE; + + pSid = HeapAlloc(GetProcessHeap(), 0, sidLen); + + ret = CreateWellKnownSid(ACCOUNT_SIDS[i].type, NULL, pSid, &sidLen); + + if (ret) + { + if (*cbSid < sidLen) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + else if (Sid) + { + CopySid(*cbSid, Sid, pSid); + } + + *cbSid = sidLen; + } domainName = ACCOUNT_SIDS[i].domain; nameLen = strlenW(domainName); @@ -2559,6 +2578,8 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI *peUse = ACCOUNT_SIDS[i].name_use; } + HeapFree(GetProcessHeap(), 0, pSid); + return ret; } }

1 0

Paul Bryan Roberts : advapi32: LookupAccountSidW() - handle first user account.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 2981650435019e104da6d8c5c831dd8665550694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2981650435019e104da6d8c5c… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Sat Oct 18 21:53:24 2008 +0100 advapi32: LookupAccountSidW() - handle first user account. --- dlls/advapi32/security.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a33d6ec..29ff696 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -38,6 +38,7 @@ #include "objbase.h" #include "iads.h" #include "advapi32_misc.h" +#include "lmcons.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -1953,12 +1954,6 @@ LookupAccountSidA( DWORD accountSizeW = *accountSize; DWORD domainSizeW = *domainSize; - TRACE("(%s,sid=%s,%p,%p(%u),%p,%p(%u),%p)\n", - debugstr_a(system),debugstr_sid(sid), - account,accountSize,accountSize?*accountSize:0, - domain,domainSize,domainSize?*domainSize:0, - name_use); - if (system) { len = MultiByteToWideChar( CP_ACP, 0, system, -1, NULL, 0 ); systemW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); @@ -2022,6 +2017,7 @@ LookupAccountSidW( const WCHAR * dm = NULL; SID_NAME_USE use = 0; LPWSTR computer_name = NULL; + LPWSTR account_name = NULL; TRACE("(%s,sid=%s,%p,%p(%u),%p,%p(%u),%p)\n", debugstr_w(system),debugstr_sid(sid), @@ -2108,6 +2104,16 @@ LookupAccountSidW( case DOMAIN_ALIAS_RID_RAS_SERVERS: ac = RAS_and_IAS_Servers; break; + case 1000: /* first user account */ + size = UNLEN + 1; + account_name = HeapAlloc( + GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (GetUserNameW(account_name, &size)) + ac = account_name; + else + dm = NULL; + + break; default: dm = NULL; break; @@ -2145,10 +2151,12 @@ LookupAccountSidW( else *accountSize = ac_len + 1; *name_use = use; + HeapFree(GetProcessHeap(), 0, account_name); HeapFree(GetProcessHeap(), 0, computer_name); return status; } + HeapFree(GetProcessHeap(), 0, account_name); HeapFree(GetProcessHeap(), 0, computer_name); SetLastError(ERROR_NONE_MAPPED); return FALSE;

1 0

Huw Davies : ole32: Call the object's own IOleObject_GetUserType() if the object is running.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 5ba96d7ae1a5951887539f0906b265455449d9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ba96d7ae1a5951887539f090… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 20 14:48:38 2008 +0100 ole32: Call the object's own IOleObject_GetUserType() if the object is running. --- dlls/ole32/defaulthandler.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index a744718..899ae41 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -689,6 +689,8 @@ static HRESULT WINAPI DefaultHandler_GetUserType( DefaultHandler *This = impl_from_IOleObject(iface); TRACE("(%p, %d, %p)\n", iface, dwFormOfType, pszUserType); + if (object_is_running(This)) + return IOleObject_GetUserType(This->pOleDelegate, dwFormOfType, pszUserType); return OleRegGetUserType(&This->clsid, dwFormOfType, pszUserType); }

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() - 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() - 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() - 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

Tobias Jakobi : wined3d: Add GL_TEXTURE_BINDING_3D to wined3d_gl header.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 7aef1c71855837ca988d38ee3fb85683b6ceca60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aef1c71855837ca988d38ee3… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Sat Oct 18 16:08:49 2008 +0200 wined3d: Add GL_TEXTURE_BINDING_3D to wined3d_gl header. --- include/wine/wined3d_gl.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 3832a2a..25159b1 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -690,6 +690,7 @@ typedef void GLvoid; #define GL_UNSIGNED_INT_10_10_10_2 0x8036 #define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 #define GL_RESCALE_NORMAL 0x803A +#define GL_TEXTURE_BINDING_3D 0x806A #define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 #define GL_SINGLE_COLOR 0x81F9 #define GL_SEPARATE_SPECULAR_COLOR 0x81FA

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

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

Jump to page:

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 October 2008