April 2008 - Wine-commits - list.winehq.org

Piotr Caban : oleview: Skip IDispatch functions in dual interfaces properly .
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: af1c1484d71fd560520046efa441c23bf80093f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1c1484d71fd560520046efa… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Apr 11 01:10:07 2008 +0200 oleview: Skip IDispatch functions in dual interfaces properly. --- programs/oleview/typelib.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 217ce7d..922fa11 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -512,12 +512,17 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen cFuncs = pTypeAttr->cFuncs; - for(i=0; i<cFuncs; i++) + i = 0; + if(pTypeAttr->wTypeFlags & TYPEFLAG_FDUAL) { /* skip 7 members of IDispatch */ + cFuncs += 7; + i += 7; + } + + for(; i<cFuncs; i++) { TYPELIB_DATA *tld; if(FAILED(ITypeInfo_GetFuncDesc(pTypeInfo, i, &pFuncDesc))) continue; - if(pTypeAttr->wTypeFlags & TYPEFLAG_FDUAL && pFuncDesc->memid >= MIN_FUNC_ID) continue; if(FAILED(ITypeInfo_GetDocumentation(pTypeInfo, pFuncDesc->memid, &bstrName, &bstrHelpString, NULL, NULL))) continue; @@ -529,7 +534,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen U(tvis).item.pszText = bstrName; U(tvis).item.lParam = (LPARAM) tld; bFirst = TRUE; - if(pFuncDesc->memid < MIN_FUNC_ID) + if(pFuncDesc->memid < MIN_FUNC_ID || pTypeAttr->wTypeFlags & TYPEFLAG_FDUAL) { AddToTLDataStrW(tld, wszOpenBrackets1); bFirst = FALSE;

1 0

James Hawkins : kernel32: Add traces to see why the tests fail in win2k.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: e314ef699e4b610c4e23d1f9b1d9690afe090e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e314ef699e4b610c4e23d1f9b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Apr 10 18:07:12 2008 -0500 kernel32: Add traces to see why the tests fail in win2k. --- dlls/kernel32/tests/environ.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 3088e92..958da24 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -359,6 +359,7 @@ static void test_GetComputerName(void) ret = pGetComputerNameExA(ComputerNameDnsDomain, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExA should have failed with ERROR_MORE_DATA instead of %d\n", error); + trace("domain size is %d\n", size); name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameDnsDomain, name, &size); @@ -370,6 +371,7 @@ static void test_GetComputerName(void) ret = pGetComputerNameExA(ComputerNameDnsFullyQualified, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExA should have failed with ERROR_MORE_DATA instead of %d\n", error); + trace("fully qualified hostname size is %d\n", size); name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameDnsFullyQualified, name, &size); @@ -381,6 +383,7 @@ static void test_GetComputerName(void) ret = pGetComputerNameExA(ComputerNameDnsHostname, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExA should have failed with ERROR_MORE_DATA instead of %d\n", error); + trace("hostname size is %d\n", size); name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameDnsHostname, name, &size); @@ -392,6 +395,7 @@ static void test_GetComputerName(void) ret = pGetComputerNameExA(ComputerNameNetBIOS, (LPSTR)0xdeadbeef, &size); error = GetLastError(); ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExA should have failed with ERROR_MORE_DATA instead of %d\n", error); + trace("NetBIOS size is %d\n", size); name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameNetBIOS, name, &size);

1 0

James Hawkins : ntdll: Fix a few tests that fail in win2k.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: bfaed5e7fa88940224e1a6259ed2f22c72a7889d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfaed5e7fa88940224e1a6259… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Apr 10 18:07:57 2008 -0500 ntdll: Fix a few tests that fail in win2k. --- dlls/ntdll/tests/error.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index ab5c0d4..b00b83b 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -244,11 +244,11 @@ static void run_error_tests(void) cmp2(STATUS_PKINIT_FAILURE, ERROR_PKINIT_FAILURE); cmp2(STATUS_SMARTCARD_SUBSYSTEM_FAILURE, ERROR_SMARTCARD_SUBSYSTEM_FAILURE); cmp2(STATUS_DOWNGRADE_DETECTED, ERROR_DOWNGRADE_DETECTED); - cmp3(STATUS_SMARTCARD_CERT_REVOKED, SEC_E_SMARTCARD_CERT_REVOKED, 1266); /* FIXME: real name? */ - cmp3(STATUS_ISSUING_CA_UNTRUSTED, SEC_E_ISSUING_CA_UNTRUSTED, 1267); /* FIXME: real name? */ - cmp3(STATUS_REVOCATION_OFFLINE_C, SEC_E_REVOCATION_OFFLINE_C, 1268); /* FIXME: real name? */ - cmp3(STATUS_PKINIT_CLIENT_FAILURE, SEC_E_PKINIT_CLIENT_FAILURE, 1269); /* FIXME: real name? */ - cmp3(STATUS_SMARTCARD_CERT_EXPIRED, SEC_E_SMARTCARD_CERT_EXPIRED, 1270); /* FIXME: real name? */ + cmp4(STATUS_SMARTCARD_CERT_REVOKED, SEC_E_SMARTCARD_CERT_REVOKED, 1266); /* FIXME: real name? */ + cmp4(STATUS_ISSUING_CA_UNTRUSTED, SEC_E_ISSUING_CA_UNTRUSTED, 1267); /* FIXME: real name? */ + cmp4(STATUS_REVOCATION_OFFLINE_C, SEC_E_REVOCATION_OFFLINE_C, 1268); /* FIXME: real name? */ + cmp4(STATUS_PKINIT_CLIENT_FAILURE, SEC_E_PKINIT_CLIENT_FAILURE, 1269); /* FIXME: real name? */ + cmp4(STATUS_SMARTCARD_CERT_EXPIRED, SEC_E_SMARTCARD_CERT_EXPIRED, 1270); /* FIXME: real name? */ cmp2(STATUS_NO_KERB_KEY, SEC_E_NO_KERB_KEY); cmp2(STATUS_CURRENT_DOMAIN_NOT_ALLOWED, ERROR_CURRENT_DOMAIN_NOT_ALLOWED); cmp2(STATUS_SMARTCARD_WRONG_PIN, SCARD_W_WRONG_CHV);

1 0

James Hawkins : crypt32: Fix a few tests that fail in win2k.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 9d2cc2171f0e99a7801582072cf27ba2ec9145c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d2cc2171f0e99a7801582072… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Apr 10 18:06:29 2008 -0500 crypt32: Fix a few tests that fail in win2k. --- dlls/crypt32/tests/oid.c | 10 ++++++---- dlls/crypt32/tests/protectdata.c | 28 ++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 2477bf5..e2e8bc4 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -99,10 +99,12 @@ static void testOIDToAlgID(void) /* Test with a bogus one */ SetLastError(0xdeadbeef); alg = CertOIDToAlgId("1.2.3"); - ok(!alg && (GetLastError() == 0xdeadbeef || - GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND), - "Expected ERROR_RESOURCE_NAME_NOT_FOUND or no error set, got %08x\n", - GetLastError()); + ok(!alg, "Expected failure, got %d\n", alg); + ok(GetLastError() == 0xdeadbeef || + GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND || + GetLastError() == ERROR_SUCCESS, /* win2k */ + "Expected ERROR_RESOURCE_NAME_NOT_FOUND, ERROR_SUCCESS " + "or no error set, got %08x\n", GetLastError()); for (i = 0; i < sizeof(oidToAlgID) / sizeof(oidToAlgID[0]); i++) { diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index 0dfad9a..d0c662e 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -71,7 +71,9 @@ static void test_cryptprotectdata(void) protected = pCryptProtectData(&plain,desc,NULL,NULL,NULL,0,&cipher); ok(protected, "Encrypting without entropy.\n"); r = GetLastError(); - ok(r == ERROR_SUCCESS, "Wrong (%u) GetLastError seen\n",r); + ok(r == ERROR_SUCCESS || + r == ERROR_IO_PENDING, /* win2k */ + "Expected ERROR_SUCCESS or ERROR_IO_PENDING, got %d\n",r); cipher_entropy.pbData=NULL; cipher_entropy.cbData=0; @@ -81,7 +83,9 @@ static void test_cryptprotectdata(void) protected = pCryptProtectData(&plain,desc,&entropy,NULL,NULL,0,&cipher_entropy); ok(protected, "Encrypting with entropy.\n"); r = GetLastError(); - ok(r == ERROR_SUCCESS, "Wrong (%u) GetLastError seen\n",r); + ok(r == ERROR_SUCCESS || + r == ERROR_IO_PENDING, /* win2k */ + "Expected ERROR_SUCCESS or ERROR_IO_PENDING, got %d\n",r); cipher_no_desc.pbData=NULL; cipher_no_desc.cbData=0; @@ -91,9 +95,17 @@ static void test_cryptprotectdata(void) plain.cbData=strlen(secret2)+1; SetLastError(0xDEADBEEF); protected = pCryptProtectData(&plain,NULL,&entropy,NULL,NULL,0,&cipher_no_desc); - ok(protected, "Encrypting with entropy and no description.\n"); r = GetLastError(); - ok(r == ERROR_SUCCESS, "Wrong (%u) GetLastError seen\n",r); + if (protected) + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + } + else + { + /* fails in win2k */ + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + } } static void test_cryptunprotectdata(void) @@ -107,8 +119,12 @@ static void test_cryptunprotectdata(void) entropy.pbData=(void*)key; entropy.cbData=strlen(key)+1; - ok(protected, "CryptProtectData failed to run, so I can't test its output\n"); - if (!protected) return; + /* fails in win2k */ + if (!protected) + { + skip("CryptProtectData failed to run\\n"); + return; + } plain.pbData=NULL; plain.cbData=0;

1 0

James Hawkins : advapi32: Fix a few tests that fail in win2k.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 9dc979604c040e1ce6747b67c21a14ecd2df2778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dc979604c040e1ce6747b67c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Apr 10 18:05:30 2008 -0500 advapi32: Fix a few tests that fail in win2k. --- dlls/advapi32/tests/security.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a1a44bb..d393f11 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2254,10 +2254,9 @@ static void test_ConvertStringSecurityDescriptor(void) SetLastError(0xdeadbeef); ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( "D:(D;;GA;;;Nonexistent account)", SDDL_REVISION_1, &pSD, NULL); - todo_wine - ok(!ret && GetLastError() == ERROR_INVALID_ACL, - "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_ACL instead of %d\n", - GetLastError()); + ok(!ret, "Expected failure, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_ACL || GetLastError() == ERROR_INVALID_SID, + "Expected ERROR_INVALID_ACL or ERROR_INVALID_SID, got %d\n", GetLastError()); } static void test_ConvertSecurityDescriptorToString() @@ -2353,16 +2352,22 @@ static void test_ConvertSecurityDescriptorToString() ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); CHECK_RESULT_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:"); + /* fails in win2k */ SetSecurityDescriptorDacl(&desc, TRUE, NULL, FALSE); pAddAuditAccessAceEx(pacl, ACL_REVISION, VALID_INHERIT_FLAGS, KEY_READ|KEY_WRITE, psid2, TRUE, TRUE); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); - CHECK_ONE_OF_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)", /* XP */ - "O:SYG:S-1-5-21-93476-23408-4576D:NO_ACCESS_CONTROLS:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)" /* Vista */); + if (pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len)) + { + CHECK_ONE_OF_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)", /* XP */ + "O:SYG:S-1-5-21-93476-23408-4576D:NO_ACCESS_CONTROLS:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)" /* Vista */); + } + /* fails in win2k */ pAddAuditAccessAceEx(pacl, ACL_REVISION, NO_PROPAGATE_INHERIT_ACE, FILE_GENERIC_READ|FILE_GENERIC_WRITE, psid2, TRUE, FALSE); - ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Conversion failed\n"); - CHECK_ONE_OF_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)", /* XP */ - "O:SYG:S-1-5-21-93476-23408-4576D:NO_ACCESS_CONTROLS:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)" /* Vista */); + if (pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len)) + { + CHECK_ONE_OF_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)", /* XP */ + "O:SYG:S-1-5-21-93476-23408-4576D:NO_ACCESS_CONTROLS:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)" /* Vista */); + } } static void test_PrivateObjectSecurity(void)

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetMetafileDownLevelRasterizationLimit.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 54a06642f40129949475a689115383908e9b7dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a06642f40129949475a6891… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 10 12:40:21 2008 -0700 gdiplus: Add a stub for GdipSetMetafileDownLevelRasterizationLimit. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c48c18c..337ffb2 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -544,7 +544,7 @@ @ stdcall GdipSetLineTransform(ptr ptr) @ stdcall GdipSetLineWrapMode(ptr long) @ stdcall GdipSetMatrixElements(ptr long long long long long long) -@ stub GdipSetMetafileDownLevelRasterizationLimit +@ stdcall GdipSetMetafileDownLevelRasterizationLimit(ptr long) @ stdcall GdipSetPageScale(ptr long) @ stdcall GdipSetPageUnit(ptr long) @ stdcall GdipSetPathFillMode(ptr long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3fcdfc6..7356234 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2111,3 +2111,14 @@ GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics *graphics, GpRegion *region, return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpGraphics *graphics, + UINT limitDpi) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetLineTransform.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 82d01449129e3c5616eb9bc36ca2ccf80851b0ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d01449129e3c5616eb9bc36… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 10 12:40:20 2008 -0700 gdiplus: Add a stub for GdipSetLineTransform. --- dlls/gdiplus/brush.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 26b5682..7f324f3 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -686,3 +686,14 @@ GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient *brush, return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient *brush, + GDIPCONST GpMatrix *matrix) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 6fc7f0b..c48c18c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -541,7 +541,7 @@ @ stdcall GdipSetLineLinearBlend(ptr long long) @ stdcall GdipSetLinePresetBlend(ptr ptr ptr long) @ stdcall GdipSetLineSigmaBlend(ptr long long) -@ stub GdipSetLineTransform +@ stdcall GdipSetLineTransform(ptr ptr) @ stdcall GdipSetLineWrapMode(ptr long) @ stdcall GdipSetMatrixElements(ptr long long long long long long) @ stub GdipSetMetafileDownLevelRasterizationLimit

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetLinePresetBlend.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 942f3496b392113d0d3913983af6690f2400f3b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=942f3496b392113d0d3913983… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 10 12:40:19 2008 -0700 gdiplus: Add a stub for GdipSetLinePresetBlend. --- dlls/gdiplus/brush.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 182af75..26b5682 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -675,3 +675,14 @@ GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient *brush, REAL focus, return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient *brush, + GDIPCONST ARGB *blend, GDIPCONST REAL* positions, INT count) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 69f3521..6fc7f0b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -539,7 +539,7 @@ @ stdcall GdipSetLineColors(ptr long long) @ stdcall GdipSetLineGammaCorrection(ptr long) @ stdcall GdipSetLineLinearBlend(ptr long long) -@ stub GdipSetLinePresetBlend +@ stdcall GdipSetLinePresetBlend(ptr ptr ptr long) @ stdcall GdipSetLineSigmaBlend(ptr long long) @ stub GdipSetLineTransform @ stdcall GdipSetLineWrapMode(ptr long)

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetLineLinearBlend.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 0399cdaff0b8847b7fad13d49a7bdf42f7ac915b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0399cdaff0b8847b7fad13d49… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 10 12:40:18 2008 -0700 gdiplus: Add a stub for GdipSetLineLinearBlend. --- dlls/gdiplus/brush.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 68178e9..182af75 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -664,3 +664,14 @@ GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient *brush, ARGB color1, return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient *brush, REAL focus, + REAL scale) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c33bb42..69f3521 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -538,7 +538,7 @@ @ stdcall GdipSetLineBlend(ptr ptr ptr long) @ stdcall GdipSetLineColors(ptr long long) @ stdcall GdipSetLineGammaCorrection(ptr long) -@ stub GdipSetLineLinearBlend +@ stdcall GdipSetLineLinearBlend(ptr long long) @ stub GdipSetLinePresetBlend @ stdcall GdipSetLineSigmaBlend(ptr long long) @ stub GdipSetLineTransform

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetLineColors.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 89b0a979c8855b09d1190df09836411d3c885b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b0a979c8855b09d1190df09… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 10 12:40:17 2008 -0700 gdiplus: Add a stub for GdipSetLineColors. --- dlls/gdiplus/brush.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 45de034..68178e9 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -653,3 +653,14 @@ GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *texture, return Ok; } + +GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient *brush, ARGB color1, + ARGB color2) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 58e913e..c33bb42 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -536,7 +536,7 @@ @ stdcall GdipSetInfinite(ptr) @ stdcall GdipSetInterpolationMode(ptr long) @ stdcall GdipSetLineBlend(ptr ptr ptr long) -@ stub GdipSetLineColors +@ stdcall GdipSetLineColors(ptr long long) @ stdcall GdipSetLineGammaCorrection(ptr long) @ stub GdipSetLineLinearBlend @ stub GdipSetLinePresetBlend

1 0