wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Jeremy White : include: Add a resource type for scalable font resource (. fot) files.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 40c3718d52bb743af5cbb37b86d4c3750abd9eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c3718d52bb743af5cbb37b8… Author: Jeremy White <jwhite(a)winehq.org> Date: Wed Apr 9 22:37:12 2008 -0500 include: Add a resource type for scalable font resource (.fot) files. --- include/wine/winbase16.h | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 21d8dca..83c410c 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -300,18 +300,19 @@ typedef struct */ } NE_TYPEINFO; -#define NE_RSCTYPE_CURSOR 0x8001 -#define NE_RSCTYPE_BITMAP 0x8002 -#define NE_RSCTYPE_ICON 0x8003 -#define NE_RSCTYPE_MENU 0x8004 -#define NE_RSCTYPE_DIALOG 0x8005 -#define NE_RSCTYPE_STRING 0x8006 -#define NE_RSCTYPE_FONTDIR 0x8007 -#define NE_RSCTYPE_FONT 0x8008 -#define NE_RSCTYPE_ACCELERATOR 0x8009 -#define NE_RSCTYPE_RCDATA 0x800a -#define NE_RSCTYPE_GROUP_CURSOR 0x800c -#define NE_RSCTYPE_GROUP_ICON 0x800e +#define NE_RSCTYPE_CURSOR 0x8001 +#define NE_RSCTYPE_BITMAP 0x8002 +#define NE_RSCTYPE_ICON 0x8003 +#define NE_RSCTYPE_MENU 0x8004 +#define NE_RSCTYPE_DIALOG 0x8005 +#define NE_RSCTYPE_STRING 0x8006 +#define NE_RSCTYPE_FONTDIR 0x8007 +#define NE_RSCTYPE_FONT 0x8008 +#define NE_RSCTYPE_ACCELERATOR 0x8009 +#define NE_RSCTYPE_RCDATA 0x800a +#define NE_RSCTYPE_GROUP_CURSOR 0x800c +#define NE_RSCTYPE_GROUP_ICON 0x800e +#define NE_RSCTYPE_SCALABLE_FONTPATH 0x80cc /* Resource found in .fot files */ #define __AHSHIFT 3 /* don't change! */

1 0

Dmitry Timoshkov : tools: Fix font structure layout for 64-bit mode.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 7ab35476a757945097d89cd0eb8c849eb685287d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab35476a757945097d89cd0e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 11 16:56:33 2008 +0900 tools: Fix font structure layout for 64-bit mode. --- tools/fnt2bdf.h | 4 ++-- tools/fnt2fon.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/fnt2bdf.h b/tools/fnt2bdf.h index 3dc2590..27eafe5 100644 --- a/tools/fnt2bdf.h +++ b/tools/fnt2bdf.h @@ -30,8 +30,8 @@ enum data_types {dfChar, dfShort, dfLong, dfString}; typedef struct tagFontHeader { - short dfVersion; /* Version */ - long dfSize; /* Total File Size */ + SHORT dfVersion; /* Version */ + LONG dfSize; /* Total File Size */ char dfCopyright[60]; /* Copyright notice */ FONTINFO16 fi; /* FONTINFO structure */ } fnt_hdrS; diff --git a/tools/fnt2fon.c b/tools/fnt2fon.c index 87c5ab7..aa7d72b 100644 --- a/tools/fnt2fon.c +++ b/tools/fnt2fon.c @@ -40,8 +40,8 @@ #include "pshpack1.h" struct _fnt_header { - short dfVersion; - long dfSize; + SHORT dfVersion; + LONG dfSize; char dfCopyright[60]; FONTINFO16 fi; };

1 0

Piotr Caban : oleview: CreateCoclassHeader partially implemented.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: aad4547d953bd5dd4f8424c11c3d402f9fc7a657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad4547d953bd5dd4f8424c11… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Apr 11 01:11:45 2008 +0200 oleview: CreateCoclassHeader partially implemented. --- programs/oleview/main.h | 1 + programs/oleview/typelib.c | 60 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/programs/oleview/main.h b/programs/oleview/main.h index c196883..a6f199a 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -37,6 +37,7 @@ #define MAX_WINDOW_WIDTH 30000 #define MIN_FUNC_ID 0x60000000 #define MIN_VAR_ID 0x40000000 +#define TAB_SIZE 4 #define STATUS_WINDOW 2000 #define TREE_WINDOW 2001 diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 7215980..626abea 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -634,7 +634,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen if(pFuncDesc->cParams != 1) { AddToTLDataStrW(tld, wszNewLine); - AddSpaces(tld, 4); + AddSpaces(tld, TAB_SIZE); } bFirst = TRUE; #define ENUM_PARAM_FLAG(x)\ @@ -808,7 +808,7 @@ static void EnumCoclassImplTypes(ITypeInfo *pTypeInfo, continue; } - AddSpaces(pTLData, 4); + AddSpaces(pTLData, TAB_SIZE); ITypeInfo_GetImplTypeFlags(pTypeInfo, i, &flags); bFirst = TRUE; #define ENUM_IMPLTYPEFLAG(x)\ @@ -943,12 +943,12 @@ static void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wsz AddToTLDataStrW(pTLData, wszNewLine); if(pTypeAttr->typekind != TKIND_DISPATCH) { - AddSpaces(pTLData, 4); + AddSpaces(pTLData, TAB_SIZE); AddToTLDataStrW(pTLData, wszOdl); AddToTLDataStrW(pTLData, wszComa); AddToTLDataStrW(pTLData, wszNewLine); } - AddSpaces(pTLData, 4); + AddSpaces(pTLData, TAB_SIZE); AddToTLDataStrW(pTLData, wszUUID); AddToTLDataStrW(pTLData, wszOpenBrackets2); StringFromGUID2(&(pTypeAttr->guid), wszGuid, MAX_LOAD_STRING); @@ -959,7 +959,7 @@ static void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wsz { AddToTLDataStrW(pTLData, wszComa); AddToTLDataStrW(pTLData, wszNewLine); - AddSpaces(pTLData, 4); + AddSpaces(pTLData, TAB_SIZE); AddToTLDataStrW(pTLData, wszHelpstring); AddToTLDataStrW(pTLData, wszOpenBrackets2); AddToTLDataStrW(pTLData, wszInvertedComa); @@ -971,7 +971,7 @@ static void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wsz { AddToTLDataStrW(pTLData, wszComa); AddToTLDataStrW(pTLData, wszNewLine); - AddSpaces(pTLData, 4); + AddSpaces(pTLData, TAB_SIZE); AddToTLDataStrW(pTLData, wszHelpcontext); AddToTLDataStrW(pTLData, wszOpenBrackets2); wsprintfW(wszHelpContext, wszFormat, ulHelpContext); @@ -985,7 +985,7 @@ static void CreateInterfaceInfo(ITypeInfo *pTypeInfo, int cImplTypes, WCHAR *wsz {\ AddToTLDataStrW(pTLData, wszComa);\ AddToTLDataStrW(pTLData, wszNewLine);\ - AddSpaces(pTLData, 4);\ + AddSpaces(pTLData, TAB_SIZE);\ AddToTLDataStrW(pTLData, wsz##x);\ } ENUM_FLAGS(TYPEFLAG_FAPPOBJECT); @@ -1078,9 +1078,49 @@ static void CreateTypedefHeader(ITypeInfo *pTypeInfo, static void CreateCoclassHeader(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, TYPELIB_DATA *pTLData) { + WCHAR wszGuid[MAX_LOAD_STRING]; + BSTR bstrHelpString; + const WCHAR wszNoncreatable[] + = { 'n','o','n','c','r','e','a','t','a','b','l','e','\0' }; + AddToTLDataStrW(pTLData, wszOpenBrackets1); AddToTLDataStrW(pTLData, wszNewLine); + AddSpaces(pTLData, TAB_SIZE); + AddToTLDataStrW(pTLData, wszUUID); + AddToTLDataStrW(pTLData, wszOpenBrackets2); + StringFromGUID2(&(pTypeAttr->guid), wszGuid, MAX_LOAD_STRING); + wszGuid[lstrlenW(wszGuid)-1] = '\0'; + AddToTLDataStrW(pTLData, &wszGuid[1]); + AddToTLDataStrW(pTLData, wszCloseBrackets2); + + if(SUCCEEDED(ITypeInfo_GetDocumentation(pTypeInfo, MEMBERID_NIL, NULL, + &bstrHelpString, NULL, NULL))) + { + if(SysStringLen(bstrHelpString)) + { + AddToTLDataStrW(pTLData, wszComa); + AddToTLDataStrW(pTLData, wszNewLine); + AddSpaces(pTLData, TAB_SIZE); + AddToTLDataStrW(pTLData, wszHelpstring); + AddToTLDataStrW(pTLData, wszOpenBrackets1); + AddToTLDataStrW(pTLData, wszInvertedComa); + AddToTLDataStrW(pTLData, bstrHelpString); + AddToTLDataStrW(pTLData, wszInvertedComa); + AddToTLDataStrW(pTLData, wszCloseBrackets1); + } + SysFreeString(bstrHelpString); + } + + if(!(pTypeAttr->wTypeFlags & TYPEFLAG_FCANCREATE)) + { + AddToTLDataStrW(pTLData, wszComa); + AddToTLDataStrW(pTLData, wszNewLine); + AddSpaces(pTLData, TAB_SIZE); + AddToTLDataStrW(pTLData, wszNoncreatable); + } + + AddToTLDataStrW(pTLData, wszNewLine); AddToTLDataStrW(pTLData, wszCloseBrackets1); AddToTLDataStrW(pTLData, wszNewLine); } @@ -1165,7 +1205,7 @@ static int PopulateTree(void) AddToTLDataStrW(tld, wszNewLine); AddToTLDataStrW(tld, wszOpenBrackets1); AddToTLDataStrW(tld, wszNewLine); - AddSpaces(tld, 4); + AddSpaces(tld, TAB_SIZE); AddToTLDataStrW(tld, wszUUID); AddToTLDataStrW(tld, wszOpenBrackets2); StringFromGUID2(&(pTLibAttr->guid), wszText, MAX_LOAD_STRING); @@ -1174,12 +1214,12 @@ static int PopulateTree(void) AddToTLDataStrW(tld, wszCloseBrackets2); AddToTLDataStrW(tld, wszComa); AddToTLDataStrW(tld, wszNewLine); - AddSpaces(tld, 4); + AddSpaces(tld, TAB_SIZE); wsprintfW(wszText, wszFormat2, pTLibAttr->wMajorVerNum, pTLibAttr->wMinorVerNum); AddToTLDataStrW(tld, wszText); AddToTLDataStrW(tld, wszComa); AddToTLDataStrW(tld, wszNewLine); - AddSpaces(tld, 4); + AddSpaces(tld, TAB_SIZE); AddToTLDataStrW(tld, wszHelpstring); AddToTLDataStrW(tld, wszOpenBrackets2); AddToTLDataStrW(tld, wszInvertedComa);

1 0

Piotr Caban : oleview: Removed memory leak in EnumImplTypes.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 3023a186b979386889b472e92f73bf484405a577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3023a186b979386889b472e92… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Apr 11 01:11:03 2008 +0200 oleview: Removed memory leak in EnumImplTypes. --- programs/oleview/typelib.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 96e7574..7215980 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -744,8 +744,16 @@ static int EnumImplTypes(ITypeInfo *pTypeInfo, int cImplTypes, HTREEITEM hParent if(FAILED(ITypeInfo_GetRefTypeInfo(pTypeInfo, hRefType, &pRefTypeInfo))) continue; if(FAILED(ITypeInfo_GetDocumentation(pRefTypeInfo, MEMBERID_NIL, &bstrName, - NULL, NULL, NULL))) continue; - if(FAILED(ITypeInfo_GetTypeAttr(pRefTypeInfo, &pTypeAttr))) continue; + NULL, NULL, NULL))) + { + ITypeInfo_Release(pRefTypeInfo); + continue; + } + if(FAILED(ITypeInfo_GetTypeAttr(pRefTypeInfo, &pTypeAttr))) + { + ITypeInfo_Release(pRefTypeInfo); + continue; + } U(tvis).item.cchTextMax = SysStringLen(bstrName); U(tvis).item.pszText = bstrName;

1 0

Piotr Caban : oleview: Added coclass handling base.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: cdc3ee70b3a69b5d24fb6671ed98fb4a48cc0da5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc3ee70b3a69b5d24fb6671e… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Apr 11 01:10:27 2008 +0200 oleview: Added coclass handling base. --- programs/oleview/typelib.c | 105 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 105 insertions(+), 0 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 922fa11..96e7574 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -763,6 +763,84 @@ static int EnumImplTypes(ITypeInfo *pTypeInfo, int cImplTypes, HTREEITEM hParent return 0; } +static void EnumCoclassImplTypes(ITypeInfo *pTypeInfo, + int cImplTypes, TYPELIB_DATA *pTLData) +{ + int i; + ITypeInfo *pRefTypeInfo; + HREFTYPE hRefType; + TYPEATTR *pTypeAttr; + BSTR bstrName; + BOOL bFirst; + INT flags; + const WCHAR wszTKIND_INTERFACE[] = { 'i','n','t','e','r','f','a','c','e',' ','\0' }; + const WCHAR wszTKIND_DISPATCH[] + = { 'd','i','s','p','i','n','t','e','r','f','a','c','e',' ','\0' }; + const WCHAR wszIMPLTYPEFLAG_FDEFAULT[] + = { 'd','e','f','a','u','l','t','\0' }; + const WCHAR wszIMPLTYPEFLAG_FSOURCE[] + = { 's','o','u','r','c','e','\0' }; + const WCHAR wszIMPLTYPEFLAG_FRESTRICTED[] + = { 'r','e','s','t','r','i','c','t','e','d','\0' }; + + for(i=0; i<cImplTypes; i++) + { + if(FAILED(ITypeInfo_GetRefTypeOfImplType(pTypeInfo, i, &hRefType))) continue; + if(FAILED(ITypeInfo_GetRefTypeInfo(pTypeInfo, hRefType, &pRefTypeInfo))) + continue; + if(FAILED(ITypeInfo_GetDocumentation(pRefTypeInfo, MEMBERID_NIL, &bstrName, + NULL, NULL, NULL))) + { + ITypeInfo_Release(pRefTypeInfo); + continue; + } + if(FAILED(ITypeInfo_GetTypeAttr(pRefTypeInfo, &pTypeAttr))) + { + ITypeInfo_Release(pRefTypeInfo); + continue; + } + + AddSpaces(pTLData, 4); + ITypeInfo_GetImplTypeFlags(pTypeInfo, i, &flags); + bFirst = TRUE; +#define ENUM_IMPLTYPEFLAG(x)\ + if(flags & x) \ + {\ + if(bFirst) AddToTLDataStrW(pTLData,\ + wszOpenBrackets1);\ + else\ + {\ + AddToTLDataStrW(pTLData, wszComa);\ + AddToTLDataStrW(pTLData, wszSpace);\ + }\ + bFirst = FALSE;\ + AddToTLDataStrW(pTLData, wsz##x);\ + } + ENUM_IMPLTYPEFLAG(IMPLTYPEFLAG_FDEFAULT); + ENUM_IMPLTYPEFLAG(IMPLTYPEFLAG_FSOURCE); + ENUM_IMPLTYPEFLAG(IMPLTYPEFLAG_FRESTRICTED); + if(!bFirst) + { + AddToTLDataStrW(pTLData, wszCloseBrackets1); + AddToTLDataStrW(pTLData, wszSpace); + } + + if(pTypeAttr->typekind == TKIND_INTERFACE) + AddToTLDataStrW(pTLData, wszTKIND_INTERFACE); + else if(pTypeAttr->typekind == TKIND_DISPATCH) + AddToTLDataStrW(pTLData, wszTKIND_DISPATCH); + AddToTLDataStrW(pTLData, wszSpace); + + AddToTLDataStrW(pTLData, bstrName); + AddToTLDataStrW(pTLData, wszSemicolon); + AddToTLDataStrW(pTLData, wszNewLine); + + SysFreeString(bstrName); + ITypeInfo_ReleaseTypeAttr(pRefTypeInfo, pTypeAttr); + ITypeInfo_Release(pRefTypeInfo); + } +} + static void AddIdlData(HTREEITEM hCur, TYPELIB_DATA *pTLData) { TVITEM tvi; @@ -989,6 +1067,16 @@ static void CreateTypedefHeader(ITypeInfo *pTypeInfo, } } +static void CreateCoclassHeader(ITypeInfo *pTypeInfo, + TYPEATTR *pTypeAttr, TYPELIB_DATA *pTLData) +{ + AddToTLDataStrW(pTLData, wszOpenBrackets1); + AddToTLDataStrW(pTLData, wszNewLine); + + AddToTLDataStrW(pTLData, wszCloseBrackets1); + AddToTLDataStrW(pTLData, wszNewLine); +} + static int PopulateTree(void) { TVINSERTSTRUCT tvis; @@ -1175,6 +1263,23 @@ static int PopulateTree(void) case TKIND_COCLASS: AddToStrW(wszText, wszTKIND_COCLASS); AddToStrW(wszText, bstrName); + + CreateCoclassHeader(pTypeInfo, pTypeAttr, tld); + AddToTLDataStrW(tld, wszTKIND_COCLASS); + AddToTLDataStrW(tld, bstrName); + AddToTLDataStrW(tld, wszSpace); + AddToTLDataStrW(tld, wszOpenBrackets3); + AddToTLDataStrW(tld, wszNewLine); + + EnumCoclassImplTypes(pTypeInfo, pTypeAttr->cImplTypes, tld); + + AddToStrW(tld->wszInsertAfter, wszCloseBrackets3); + AddToStrW(tld->wszInsertAfter, wszSemicolon); + AddToStrW(tld->wszInsertAfter, wszNewLine); + + bInsert = FALSE; + hParent = TreeView_InsertItem(typelib.hTree, &tvis); + AddToTLDataStrW(tld, tld->wszInsertAfter); break; case TKIND_UNION: AddToStrW(wszText, wszTKIND_UNION);

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

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 : 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 : 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

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

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

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

11 Apr '08

Module: wine Branch: master Commit: 0fe2f5b67716c18b074c60b341f9a7c602b41408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe2f5b67716c18b074c60b34… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 10 12:40:16 2008 -0700 gdiplus: Add a stub for GdipSetInfinite. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/region.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b951d65..58e913e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -533,7 +533,7 @@ @ stdcall GdipSetImageAttributesToIdentity(ptr long) @ stdcall GdipSetImageAttributesWrapMode(ptr long long long) @ stdcall GdipSetImagePalette(ptr ptr) -@ stub GdipSetInfinite +@ stdcall GdipSetInfinite(ptr) @ stdcall GdipSetInterpolationMode(ptr long) @ stdcall GdipSetLineBlend(ptr ptr ptr long) @ stub GdipSetLineColors diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 9656f4e..92da580 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -39,3 +39,13 @@ GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *region) return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *region) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

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

11 Apr '08

Module: wine Branch: master Commit: 6a44f191797b6425aa11dee13027fc3a71b57aee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a44f191797b6425aa11dee13… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 10 12:40:15 2008 -0700 gdiplus: Add a stub for GdipSetImageAttributesToIdentity. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index caf8864..b951d65 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -530,7 +530,7 @@ @ stdcall GdipSetImageAttributesOutputChannelColorProfile(ptr long long ptr) @ stdcall GdipSetImageAttributesRemapTable(ptr long long long ptr) @ stdcall GdipSetImageAttributesThreshold(ptr long long long) -@ stub GdipSetImageAttributesToIdentity +@ stdcall GdipSetImageAttributesToIdentity(ptr long) @ stdcall GdipSetImageAttributesWrapMode(ptr long long long) @ stdcall GdipSetImagePalette(ptr ptr) @ stub GdipSetInfinite diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 879c443..858ea15 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -169,3 +169,14 @@ GpStatus WINGDIPAPI GdipSetImageAttributesThreshold(GpImageAttributes *imageAttr return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetImageAttributesToIdentity(GpImageAttributes *imageAttr, + ColorAdjustType type) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

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

11 Apr '08

Module: wine Branch: master Commit: 03c7d5583049d59e8bae61406fe8c61d49fda928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c7d5583049d59e8bae61406… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 10 12:40:14 2008 -0700 gdiplus: Add a stub for GdipSetImageAttributesThreshold. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 349e10f..caf8864 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -529,7 +529,7 @@ @ stdcall GdipSetImageAttributesOutputChannel(ptr long long long) @ stdcall GdipSetImageAttributesOutputChannelColorProfile(ptr long long ptr) @ stdcall GdipSetImageAttributesRemapTable(ptr long long long ptr) -@ stub GdipSetImageAttributesThreshold +@ stdcall GdipSetImageAttributesThreshold(ptr long long long) @ stub GdipSetImageAttributesToIdentity @ stdcall GdipSetImageAttributesWrapMode(ptr long long long) @ stdcall GdipSetImagePalette(ptr ptr) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index f4cecbe..879c443 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -158,3 +158,14 @@ GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes *imageAtt return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetImageAttributesThreshold(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag, REAL threshold) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

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

11 Apr '08

Module: wine Branch: master Commit: 65445b9e7ebf77b4b24bda687249a67091152512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65445b9e7ebf77b4b24bda687… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 10 12:40:13 2008 -0700 gdiplus: Add a stub for GdipSetImageAttributesRemapTable. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 12 ++++++++++++ include/gdipluscolor.h | 16 +++++++++++++++- include/gdipluscolormatrix.h | 7 +++++++ include/gdiplusgpstubs.h | 1 + 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8157f4f..349e10f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -528,7 +528,7 @@ @ stdcall GdipSetImageAttributesNoOp(ptr long long) @ stdcall GdipSetImageAttributesOutputChannel(ptr long long long) @ stdcall GdipSetImageAttributesOutputChannelColorProfile(ptr long long ptr) -@ stub GdipSetImageAttributesRemapTable +@ stdcall GdipSetImageAttributesRemapTable(ptr long long long ptr) @ stub GdipSetImageAttributesThreshold @ stub GdipSetImageAttributesToIdentity @ stdcall GdipSetImageAttributesWrapMode(ptr long long long) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index b74fc66..f4cecbe 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -146,3 +146,15 @@ GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannelColorProfile(GpImageAttri return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag, UINT mapSize, + GDIPCONST ColorMap *map) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/include/gdipluscolor.h b/include/gdipluscolor.h index 5c8e53f..39b7cb6 100644 --- a/include/gdipluscolor.h +++ b/include/gdipluscolor.h @@ -28,7 +28,21 @@ enum ColorChannelFlags ColorChannelFlagsLast }; -#ifndef __cplusplus +#ifdef __cplusplus + +/* FIXME: missing the methods. */ +class Color +{ +protected: + ARGB Argb; +}; + +#else /* end of c++ typedefs */ + +typedef struct Color +{ + ARGB Argb; +} Color; typedef enum ColorChannelFlags ColorChannelFlags; diff --git a/include/gdipluscolormatrix.h b/include/gdipluscolormatrix.h index afc04c0..532e8f4 100644 --- a/include/gdipluscolormatrix.h +++ b/include/gdipluscolormatrix.h @@ -42,11 +42,18 @@ enum ColorAdjustType ColorAdjustTypeAny }; +struct ColorMap +{ + Color oldColor; + Color newCOlor; +}; + #ifndef __cplusplus typedef enum ColorAdjustType ColorAdjustType; typedef enum ColorMatrixFlags ColorMatrixFlags; typedef struct ColorMatrix ColorMatrix; +typedef struct ColorMap ColorMap; #endif /* end of c typedefs */ diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index d7d8702..9f7d092 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -80,5 +80,6 @@ typedef DashStyle GpDashStyle; typedef MatrixOrder GpMatrixOrder; typedef Point GpPoint; typedef WrapMode GpWrapMode; +typedef Color GpColor; #endif

1 0

Petr Sumbera : server: Workaround for conflict between Wine and Solaris list.h.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: f4575aaa5f0f179a9021a160f865091ceb8ab1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4575aaa5f0f179a9021a160f… Author: Petr Sumbera <petr.sumbera(a)sun.com> Date: Thu Apr 10 17:03:18 2008 +0200 server: Workaround for conflict between Wine and Solaris list.h. --- server/fd.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/server/fd.c b/server/fd.c index 41e404c..0d33e77 100644 --- a/server/fd.c +++ b/server/fd.c @@ -44,7 +44,25 @@ #include <sys/statvfs.h> #endif #ifdef HAVE_SYS_VFS_H +/* + * Solaris defines its system list in sys/list.h. + * This need to be workaround it here. + */ +#define list SYSLIST +#define list_next SYSLIST_NEXT +#define list_prev SYSLIST_PREV +#define list_head SYSLIST_HEAD +#define list_tail SYSLIST_TAIL +#define list_move_tail SYSLIST_MOVE_TAIL +#define list_remove SYSLIST_REMOVE #include <sys/vfs.h> +#undef list +#undef list_next +#undef list_prev +#undef list_head +#undef list_tail +#undef list_move_tail +#undef list_remove #endif #ifdef HAVE_SYS_PARAM_H #include <sys/param.h>

1 0

Petr Sumbera : winetest: Fix shell substitution syntax for Solaris.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 7975a1a926c90153fbe573598063bb2b548ceca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7975a1a926c90153fbe573598… Author: Petr Sumbera <petr.sumbera(a)sun.com> Date: Thu Apr 10 12:02:04 2008 +0200 winetest: Fix shell substitution syntax for Solaris. --- programs/winetest/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 5a188b6..917c6f7 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -6,7 +6,7 @@ MODULE = winetest.exe APPMODE = -mconsole IMPORTS = comctl32 version user32 gdi32 advapi32 wsock32 kernel32 -EXTRARCFLAGS = -DBUILD_SHA1=\"$$(GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null)\" +EXTRARCFLAGS = -DBUILD_SHA1=\"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" C_SRCS = \ gui.c \

1 0

Luis C.=?UTF-8?Q?=20Busquets=20P=C3=A9rez=20?=: tools: Add Spanish translation to wine.desktop.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: f1f76e8a4e3bb079c6fa7b11002f7daae2755cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f76e8a4e3bb079c6fa7b110… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Thu Apr 10 20:50:51 2008 +0200 tools: Add Spanish translation to wine.desktop. --- tools/wine.desktop | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index a2165f9..a499530 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -2,6 +2,7 @@ Type=Application Name=Wine Windows Emulator Name[de]=Wine Windows-Emulator +Name[es]=Emulador Windows de Wine Name[nl]=Wine Windows-emulator Name[sv]=Windows-emulatorn Wine Name[ru]=Wine Эмулятор Windows

1 0

Juan Lang : cryptui: Add stub DLL.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 2016c63e8278d69ac399eb4908344ec3a70c5ed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2016c63e8278d69ac399eb490… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Apr 10 11:16:01 2008 -0700 cryptui: Add stub DLL. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/cryptui/Makefile.in | 13 ++++++++++++ dlls/cryptui/cryptui.spec | 48 +++++++++++++++++++++++++++++++++++++++++++++ dlls/cryptui/main.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 114 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index cc9211d..c91c86d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -201,6 +201,7 @@ ALL_MAKEFILES = \ dlls/cryptdll/Makefile \ dlls/cryptnet/Makefile \ dlls/cryptnet/tests/Makefile \ + dlls/cryptui/Makefile \ dlls/ctapi32/Makefile \ dlls/ctl3d32/Makefile \ dlls/d3d10/Makefile \ @@ -625,6 +626,7 @@ dlls/cryptdlg/Makefile: dlls/cryptdlg/Makefile.in dlls/Makedll.rules dlls/cryptdll/Makefile: dlls/cryptdll/Makefile.in dlls/Makedll.rules dlls/cryptnet/Makefile: dlls/cryptnet/Makefile.in dlls/Makedll.rules dlls/cryptnet/tests/Makefile: dlls/cryptnet/tests/Makefile.in dlls/Maketest.rules +dlls/cryptui/Makefile: dlls/cryptui/Makefile.in dlls/Makedll.rules dlls/ctapi32/Makefile: dlls/ctapi32/Makefile.in dlls/Makedll.rules dlls/ctl3d32/Makefile: dlls/ctl3d32/Makefile.in dlls/Makedll.rules dlls/d3d10/Makefile: dlls/d3d10/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 3a18ed9..b66a40a 100755 --- a/configure +++ b/configure @@ -21350,6 +21350,8 @@ ac_config_files="$ac_config_files dlls/cryptnet/Makefile" ac_config_files="$ac_config_files dlls/cryptnet/tests/Makefile" +ac_config_files="$ac_config_files dlls/cryptui/Makefile" + ac_config_files="$ac_config_files dlls/ctapi32/Makefile" ac_config_files="$ac_config_files dlls/ctl3d32/Makefile" @@ -22699,6 +22701,7 @@ do "dlls/cryptdll/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptdll/Makefile" ;; "dlls/cryptnet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/Makefile" ;; "dlls/cryptnet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/tests/Makefile" ;; + "dlls/cryptui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptui/Makefile" ;; "dlls/ctapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctapi32/Makefile" ;; "dlls/ctl3d32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctl3d32/Makefile" ;; "dlls/d3d10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/Makefile" ;; diff --git a/configure.ac b/configure.ac index 3e14bdc..e9dadee 100644 --- a/configure.ac +++ b/configure.ac @@ -1704,6 +1704,7 @@ AC_CONFIG_FILES([dlls/cryptdlg/Makefile]) AC_CONFIG_FILES([dlls/cryptdll/Makefile]) AC_CONFIG_FILES([dlls/cryptnet/Makefile]) AC_CONFIG_FILES([dlls/cryptnet/tests/Makefile]) +AC_CONFIG_FILES([dlls/cryptui/Makefile]) AC_CONFIG_FILES([dlls/ctapi32/Makefile]) AC_CONFIG_FILES([dlls/ctl3d32/Makefile]) AC_CONFIG_FILES([dlls/d3d10/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 6f171d7..9b979ac 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -43,6 +43,7 @@ BASEDIRS = \ cryptdlg \ cryptdll \ cryptnet \ + cryptui \ ctapi32 \ ctl3d32 \ d3d10 \ diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in new file mode 100644 index 0000000..2ab5e16 --- /dev/null +++ b/dlls/cryptui/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = cryptui.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec new file mode 100644 index 0000000..aa4b00a --- /dev/null +++ b/dlls/cryptui/cryptui.spec @@ -0,0 +1,48 @@ +1 stub ACUIProviderInvokeUI +2 stub CryptUIDlgCertMgr +3 stub CryptUIDlgFreeCAContext +4 stub CryptUIDlgSelectCA +5 stub CryptUIDlgSelectCertificateA +6 stub CryptUIDlgSelectCertificateFromStore +7 stub CryptUIDlgSelectCertificateW +8 stub CryptUIDlgSelectStoreA +9 stub CryptUIDlgSelectStoreW +10 stub CryptUIDlgViewCRLA +11 stub CryptUIDlgViewCRLW +12 stub CryptUIDlgViewCTLA +13 stub CryptUIDlgViewCTLW +14 stub CryptUIDlgViewCertificateA +15 stub CryptUIDlgViewCertificatePropertiesA +16 stub CryptUIDlgViewCertificatePropertiesW +17 stub CryptUIDlgViewCertificateW +18 stub CryptUIDlgViewContext +19 stub CryptUIDlgViewSignerInfoA +20 stub CryptUIDlgViewSignerInfoW +21 stub CryptUIFreeCertificatePropertiesPagesA +22 stub CryptUIFreeCertificatePropertiesPagesW +23 stub CryptUIFreeViewSignaturesPagesA +24 stub CryptUIFreeViewSignaturesPagesW +25 stub CryptUIGetCertificatePropertiesPagesA +26 stub CryptUIGetCertificatePropertiesPagesW +27 stub CryptUIGetViewSignaturesPagesA +28 stub CryptUIGetViewSignaturesPagesW +29 stub CryptUIStartCertMgr +30 stub CryptUIWizBuildCTL +31 stub CryptUIWizCertRequest +32 stub CryptUIWizCreateCertRequestNoDS +33 stub CryptUIWizDigitalSign +34 stub CryptUIWizExport +35 stub CryptUIWizFreeCertRequestNoDS +36 stub CryptUIWizFreeDigitalSignContext +37 stub CryptUIWizImport +38 stub CryptUIWizQueryCertRequestNoDS +39 stub CryptUIWizSubmitCertRequestNoDS +40 stub DllRegisterServer +41 stub DllUnregisterServer +42 stub EnrollmentCOMObjectFactory_getInstance +43 stub I_CryptUIProtect +44 stub I_CryptUIProtectFailure +45 stub LocalEnroll +46 stub LocalEnrollNoDS +47 stub RetrievePKCS7FromCA +48 stub WizardFree diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c new file mode 100644 index 0000000..a951f01 --- /dev/null +++ b/dlls/cryptui/main.c @@ -0,0 +1,46 @@ +/* + * Copyright 2008 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cryptui); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + default: + break; + } + return TRUE; +}

1 0

Juan Lang : softpub: Forward softpub functions to wintrust.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 7267c0772bb15416d0cebcb7f0b5693c4c7fbdd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7267c0772bb15416d0cebcb7f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Apr 10 10:27:04 2008 -0700 softpub: Forward softpub functions to wintrust. --- dlls/softpub/Makefile.in | 5 +--- dlls/softpub/main.c | 46 --------------------------------------------- dlls/softpub/softpub.spec | 42 ++++++++++++++++++++-------------------- 3 files changed, 22 insertions(+), 71 deletions(-) diff --git a/dlls/softpub/Makefile.in b/dlls/softpub/Makefile.in index b62dae7..8166939 100644 --- a/dlls/softpub/Makefile.in +++ b/dlls/softpub/Makefile.in @@ -3,10 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = softpub.dll -IMPORTS = kernel32 - -C_SRCS = \ - main.c +IMPORTS = wintrust kernel32 @MAKE_DLL_RULES@ diff --git a/dlls/softpub/main.c b/dlls/softpub/main.c deleted file mode 100644 index bf9a6f5..0000000 --- a/dlls/softpub/main.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2008 Maarten Lankhorst - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(softpub); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - default: - break; - } - return TRUE; -} diff --git a/dlls/softpub/softpub.spec b/dlls/softpub/softpub.spec index 620ae27..5b2e20a 100644 --- a/dlls/softpub/softpub.spec +++ b/dlls/softpub/softpub.spec @@ -1,24 +1,24 @@ -1 stub GenericChainCertificateTrust -2 stub GenericChainFinalProv -3 stub HTTPSCertificateTrust -4 stub SoftpubDefCertInit +1 stdcall GenericChainCertificateTrust(ptr) wintrust.GenericChainCertificateTrust +2 stdcall GenericChainFinalProv(ptr) wintrust.GenericChainFinalProv +3 stdcall HTTPSCertificateTrust(ptr) wintrust.HTTPSCertificateTrust +4 stdcall SoftpubDefCertInit(ptr) wintrust.SoftpubDefCertInit 5 stub SoftpubFreeDefUsageCallData 6 stub SoftpubLoadDefUsageCallData 7 stub AddPersonalTrustDBPages -8 stub DllRegisterServer -9 stub DllUnregisterServer -10 stub DriverCleanupPolicy -11 stub DriverFinalPolicy -12 stub DriverInitializePolicy -13 stub FindCertsByIssuer -14 stub HTTPSFinalProv -15 stub OfficeCleanupPolicy -16 stub OfficeInitializePolicy -17 stub OpenPersonalTrustDBDialog -18 stub SoftpubAuthenticode -19 stub SoftpubCheckCert -20 stub SoftpubCleanup -21 stub SoftpubDumpStructure -22 stub SoftpubInitialize -23 stub SoftpubLoadMessage -24 stub SoftpubLoadSignature +8 stdcall -private DllRegisterServer() wintrust.SoftpubDllRegisterServer +9 stdcall -private DllUnregisterServer() wintrust.SoftpubDllUnregisterServer +10 stdcall DriverCleanupPolicy(ptr) wintrust.DriverCleanupPolicy +11 stdcall DriverFinalPolicy(ptr) wintrust.DriverFinalPolicy +12 stdcall DriverInitializePolicy(ptr) wintrust.DriverInitializePolicy +13 stdcall FindCertsByIssuer(ptr ptr ptr ptr long wstr long) wintrust.FindCertsByIssuer +14 stdcall HTTPSFinalProv(ptr) wintrust.HTTPSFinalProv +15 stdcall OfficeCleanupPolicy(ptr) wintrust.OfficeCleanupPolicy +16 stdcall OfficeInitializePolicy(ptr) wintrust.OfficeInitializePolicy +17 stdcall OpenPersonalTrustDBDialog(long) wintrust.OpenPersonalTrustDBDialog +18 stdcall SoftpubAuthenticode(ptr) wintrust.SoftpubAuthenticode +19 stdcall SoftpubCheckCert(ptr long long long) wintrust.SoftpubCheckCert +20 stdcall SoftpubCleanup(ptr) wintrust.SoftpubCleanup +21 stdcall SoftpubDumpStructure(ptr) wintrust.SoftpubDumpStructure +22 stdcall SoftpubInitialize(ptr) wintrust.SoftpubInitialize +23 stdcall SoftpubLoadMessage(ptr) wintrust.SoftpubLoadMessage +24 stdcall SoftpubLoadSignature(ptr) wintrust.SoftpubLoadSignature

1 0

Rob Shearman : winedos: The calling convention should come after the return type in the declaration of VGA_DoShowMouse for portability .
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 8dcde49a53148c56bd35f273c6a7bce7958833bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcde49a53148c56bd35f273c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 10 12:01:59 2008 +0100 winedos: The calling convention should come after the return type in the declaration of VGA_DoShowMouse for portability. --- dlls/winedos/vga.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index d236591..26618a2 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -657,7 +657,7 @@ int VGA_GetWindowStart(void) * * Callback for VGA_ShowMouse. */ -static WINAPI void VGA_DoShowMouse( ULONG_PTR show ) +static void WINAPI VGA_DoShowMouse( ULONG_PTR show ) { INT rv;

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
52
Older →

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