December 2008 - Wine-commits

Hans Leidekker : wintrust: Implement CryptCATEnumerateMember.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: dffccbf1f2c7af506d444b6ed4f7650dc1fd7d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dffccbf1f2c7af506d444b6ed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 23 11:50:37 2008 +0100 wintrust: Implement CryptCATEnumerateMember. Based on work done by Maarten Lankhorst. --- dlls/wintrust/crypt.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 143 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 6a16254..7b30ede 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -30,6 +30,7 @@ #include "mscat.h" #include "mssip.h" #include "imagehlp.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -499,9 +500,149 @@ BOOL WINAPI CryptCATClose(HANDLE hCatalog) /*********************************************************************** * CryptCATEnumerateMember (WINTRUST.@) */ -CRYPTCATMEMBER *WINAPI CryptCATEnumerateMember(HANDLE hCatalog, CRYPTCATMEMBER* pPrevMember) +CRYPTCATMEMBER * WINAPI CryptCATEnumerateMember(HANDLE hCatalog, CRYPTCATMEMBER *prev) { - FIXME("(%p, %p) stub\n", hCatalog, pPrevMember); + struct cryptcat *cc = hCatalog; + CRYPTCATMEMBER *member = prev; + CTL_ENTRY *entry; + DWORD size, i; + + TRACE("%p, %p\n", hCatalog, prev); + + if (!hCatalog || hCatalog == INVALID_HANDLE_VALUE || cc->magic != CRYPTCAT_MAGIC) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + /* dumping the contents makes me think that dwReserved is the iteration number */ + if (!member) + { + if (!(member = HeapAlloc(GetProcessHeap(), 0, sizeof(*member)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + member->cbStruct = sizeof(*member); + member->pwszFileName = member->pwszReferenceTag = NULL; + member->dwReserved = 0; + member->hReserved = NULL; + member->gSubjectType = cc->subject; + member->fdwMemberFlags = 0; + member->pIndirectData = NULL; + member->dwCertVersion = cc->inner->dwVersion; + } + else member->dwReserved++; + + if (member->dwReserved >= cc->inner->cCTLEntry) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto error; + } + + /* list them backwards, like native */ + entry = &cc->inner->rgCTLEntry[cc->inner->cCTLEntry - member->dwReserved - 1]; + + member->sEncodedIndirectData.cbData = member->sEncodedMemberInfo.cbData = 0; + member->sEncodedIndirectData.pbData = member->sEncodedMemberInfo.pbData = NULL; + HeapFree(GetProcessHeap(), 0, member->pIndirectData); + member->pIndirectData = NULL; + + for (i = 0; i < entry->cAttribute; i++) + { + CRYPT_ATTRIBUTE *attr = entry->rgAttribute + i; + + if (attr->cValue != 1) + { + ERR("Can't handle attr->cValue of %u\n", attr->cValue); + continue; + } + if (!strcmp(attr->pszObjId, CAT_MEMBERINFO_OBJID)) + { + CAT_MEMBERINFO *mi; + BOOL ret; + + member->sEncodedMemberInfo.cbData = attr->rgValue->cbData; + member->sEncodedMemberInfo.pbData = attr->rgValue->pbData; + + CryptDecodeObject(cc->encoding, CAT_MEMBERINFO_OBJID, attr->rgValue->pbData, attr->rgValue->cbData, 0, NULL, &size); + + if (!(mi = HeapAlloc(GetProcessHeap(), 0, size))) + { + SetLastError(ERROR_OUTOFMEMORY); + goto error; + } + ret = CryptDecodeObject(cc->encoding, CAT_MEMBERINFO_OBJID, attr->rgValue->pbData, attr->rgValue->cbData, 0, mi, &size); + if (ret) + { + UNICODE_STRING guid; + + member->dwCertVersion = mi->dwCertVersion; + RtlInitUnicodeString(&guid, mi->pwszSubjGuid); + if (RtlGUIDFromString(&guid, &member->gSubjectType)) + { + HeapFree(GetProcessHeap(), 0, mi); + goto error; + } + } + HeapFree(GetProcessHeap(), 0, mi); + if (!ret) goto error; + } + else if (!strcmp(attr->pszObjId, SPC_INDIRECT_DATA_OBJID)) + { + /* SPC_INDIRECT_DATA_CONTENT is equal to SIP_INDIRECT_DATA */ + + member->sEncodedIndirectData.cbData = attr->rgValue->cbData; + member->sEncodedIndirectData.pbData = attr->rgValue->pbData; + + CryptDecodeObject(cc->encoding, SPC_INDIRECT_DATA_OBJID, attr->rgValue->pbData, attr->rgValue->cbData, 0, NULL, &size); + + if (!(member->pIndirectData = HeapAlloc(GetProcessHeap(), 0, size))) + { + SetLastError(ERROR_OUTOFMEMORY); + goto error; + } + CryptDecodeObject(cc->encoding, SPC_INDIRECT_DATA_OBJID, attr->rgValue->pbData, attr->rgValue->cbData, 0, member->pIndirectData, &size); + } + else + /* this object id should probably be handled in CryptCATEnumerateAttr */ + FIXME("unhandled object id \"%s\"\n", attr->pszObjId); + } + + if (!member->sEncodedMemberInfo.cbData || !member->sEncodedIndirectData.cbData) + { + ERR("Corrupted catalog entry?\n"); + SetLastError(CRYPT_E_ATTRIBUTES_MISSING); + goto error; + } + size = (2 * member->pIndirectData->Digest.cbData + 1) * sizeof(WCHAR); + if (member->pwszReferenceTag) + member->pwszReferenceTag = HeapReAlloc(GetProcessHeap(), 0, member->pwszReferenceTag, size); + else + member->pwszReferenceTag = HeapAlloc(GetProcessHeap(), 0, size); + + if (!member->pwszReferenceTag) + { + SetLastError(ERROR_OUTOFMEMORY); + goto error; + } + /* FIXME: reference tag is usually the file hash but doesn't have to be */ + for (i = 0; i < member->pIndirectData->Digest.cbData; i++) + { + DWORD sub; + + sub = member->pIndirectData->Digest.pbData[i] >> 4; + member->pwszReferenceTag[i * 2] = (sub < 10 ? '0' + sub : 'A' + sub - 10); + sub = member->pIndirectData->Digest.pbData[i] & 0xf; + member->pwszReferenceTag[i * 2 + 1] = (sub < 10 ? '0' + sub : 'A' + sub - 10); + } + member->pwszReferenceTag[i * 2] = 0; + return member; + +error: + HeapFree(GetProcessHeap(), 0, member->pIndirectData); + HeapFree(GetProcessHeap(), 0, member->pwszReferenceTag); + HeapFree(GetProcessHeap(), 0, member); return NULL; }

1 0

Hans Leidekker : wintrust: Implement CryptCATAdminResolveCatalogPath and CryptCATCatalogInfoFromContext .
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 615d023bf1468c27444996f5e9d99991cd0e3779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=615d023bf1468c27444996f5e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 23 11:50:46 2008 +0100 wintrust: Implement CryptCATAdminResolveCatalogPath and CryptCATCatalogInfoFromContext. --- dlls/wintrust/crypt.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust.spec | 4 ++-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 7b30ede..44ab4bb 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -475,6 +475,29 @@ BOOL WINAPI CryptCATAdminRemoveCatalog(HCATADMIN hCatAdmin, LPCWSTR pwszCatalogF } /*********************************************************************** + * CryptCATAdminResolveCatalogPath (WINTRUST.@) + */ +BOOL WINAPI CryptCATAdminResolveCatalogPath(HCATADMIN hcatadmin, WCHAR *catalog_file, + CATALOG_INFO *info, DWORD flags) +{ + static const WCHAR slashW[] = {'\\',0}; + struct catadmin *ca = hcatadmin; + + TRACE("%p %s %p %x\n", hcatadmin, debugstr_w(catalog_file), info, flags); + + if (!ca || ca->magic != CATADMIN_MAGIC || !info || info->cbStruct != sizeof(*info) || flags) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + strcpyW(info->wszCatalogFile, ca->path); + strcatW(info->wszCatalogFile, slashW); + strcatW(info->wszCatalogFile, catalog_file); + + return TRUE; +} + +/*********************************************************************** * CryptCATClose (WINTRUST.@) */ BOOL WINAPI CryptCATClose(HANDLE hCatalog) @@ -683,6 +706,25 @@ out: } /*********************************************************************** + * CryptCATCatalogInfoFromContext (WINTRUST.@) + */ +BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO hcatinfo, CATALOG_INFO *info, DWORD flags) +{ + struct catinfo *ci = hcatinfo; + + TRACE("%p, %p, %x\n", hcatinfo, info, flags); + + if (!hcatinfo || hcatinfo == INVALID_HANDLE_VALUE || ci->magic != CATINFO_MAGIC || + flags || !info || info->cbStruct != sizeof(*info)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + strcpyW(info->wszCatalogFile, ci->file); + return TRUE; +} + +/*********************************************************************** * CryptCATOpen (WINTRUST.@) */ HANDLE WINAPI CryptCATOpen(LPWSTR pwszFileName, DWORD fdwOpenFlags, HCRYPTPROV hProv, diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 6f83282..bc5fd41 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -8,7 +8,7 @@ @ stdcall CryptCATAdminReleaseCatalogContext(long long long) @ stdcall CryptCATAdminReleaseContext(long long) @ stdcall CryptCATAdminRemoveCatalog(ptr wstr long) -@ stub CryptCATAdminResolveCatalogPath +@ stdcall CryptCATAdminResolveCatalogPath(ptr wstr ptr long) @ stub CryptCATCDFClose @ stub CryptCATCDFEnumAttributes @ stub CryptCATCDFEnumAttributesWithCDFTag @@ -17,7 +17,7 @@ @ stub CryptCATCDFEnumMembersByCDFTag @ stub CryptCATCDFEnumMembersByCDFTagEx @ stub CryptCATCDFOpen -@ stub CryptCATCatalogInfoFromContext +@ stdcall CryptCATCatalogInfoFromContext(ptr ptr long) @ stdcall CryptCATClose(long) @ stub CryptCATEnumerateAttr @ stub CryptCATEnumerateCatAttr

1 0

Maarten Lankhorst : riched20: Fix cast for dwCookie.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: ac85a76b2d3d9a403f1038f5baca4eb315ad4087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac85a76b2d3d9a403f1038f5b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 22 00:09:17 2008 +0100 riched20: Fix cast for dwCookie. --- dlls/riched20/editor.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 696061a..c93a1e4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1616,7 +1616,7 @@ ME_StreamInRTFString(ME_TextEditor *editor, BOOL selection, char *string) data.string = string; data.length = strlen(string); data.pos = 0; - es.dwCookie = (DWORD)&data; + es.dwCookie = (DWORD_PTR)&data; es.pfnCallback = ME_ReadFromRTFString; ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, FALSE); } @@ -2065,7 +2065,7 @@ static BOOL ME_Paste(ME_TextEditor *editor) return FALSE; gds.hData = GetClipboardData(cf); gds.nLength = 0; - es.dwCookie = (DWORD)&gds; + es.dwCookie = (DWORD_PTR)&gds; es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode; ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE);

1 0

Michael Stefaniuc : msvcrt/tests: Use the C standard for multiline strings.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: a4c2a0ee200b104845faaffa23909a28e9a45e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c2a0ee200b104845faaffa2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 23 11:08:07 2008 +0100 msvcrt/tests: Use the C standard for multiline strings. --- dlls/msvcrt/tests/file.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 66a0035..0f235b5 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -320,15 +320,15 @@ static void test_asciimode2(void) char ibuf[4]; int i; static const char obuf[] = -"00\n\ -000000000000000000000000000000000000000000000000000000000000000000000000000000\n\ -000000000000000000000000000000000000000000000000000000000000000000000000000000\n\ -000000000000000000000000000000000000000000000000000000000000000000000000000000\n\ -000000000000000000000000000000000000000000000000000000000000000000000000000000\n\ -000000000000000000000000000000000000000000000000000000000000000000000000000000\n\ -000000000000000000000000000000000000000000000000000000000000000000000000000000\n\ -000000000000000000\n\ -1111111111111111111"; +"00\n" +"000000000000000000000000000000000000000000000000000000000000000000000000000000\n" +"000000000000000000000000000000000000000000000000000000000000000000000000000000\n" +"000000000000000000000000000000000000000000000000000000000000000000000000000000\n" +"000000000000000000000000000000000000000000000000000000000000000000000000000000\n" +"000000000000000000000000000000000000000000000000000000000000000000000000000000\n" +"000000000000000000000000000000000000000000000000000000000000000000000000000000\n" +"000000000000000000\n" +"1111111111111111111"; fp = fopen("ascii2.tst", "wt"); fwrite(obuf, 1, sizeof(obuf), fp);

1 0

Maarten Lankhorst : kernel32: Change all functions to use CDECL.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 70441d5bb890db84a93e43e74ab2d6a27d8f9d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70441d5bb890db84a93e43e74… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 16 16:16:10 2008 +0100 kernel32: Change all functions to use CDECL. --- dlls/kernel32/path.c | 4 ++-- dlls/kernel32/process.c | 2 +- dlls/ntdll/loader.c | 2 +- include/winbase.h | 4 ++-- programs/start/start.c | 2 +- programs/winepath/winepath.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index fca12cc..b0f2fa0 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1583,7 +1583,7 @@ BOOL WINAPI NeedCurrentDirectoryForExePathA( LPCSTR name ) * Return the full Unix file name for a given path. * Returned buffer must be freed by caller. */ -char *wine_get_unix_file_name( LPCWSTR dosW ) +char CDECL *wine_get_unix_file_name( LPCWSTR dosW ) { UNICODE_STRING nt_name; ANSI_STRING unix_name; @@ -1607,7 +1607,7 @@ char *wine_get_unix_file_name( LPCWSTR dosW ) * Return the full DOS file name for a given Unix path. * Returned buffer must be freed by caller. */ -WCHAR *wine_get_dos_file_name( LPCSTR str ) +WCHAR CDECL *wine_get_dos_file_name( LPCSTR str ) { UNICODE_STRING nt_name; ANSI_STRING unix_name; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 918ce3e..8b1fb9f 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -956,7 +956,7 @@ static void set_process_name( int argc, char *argv[] ) * * Wine initialisation: load and start the main exe file. */ -void __wine_kernel_init(void) +void CDECL __wine_kernel_init(void) { static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; static const WCHAR dotW[] = {'.',0}; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3bada92..968d7fd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2652,7 +2652,7 @@ void __wine_process_init(void) WINE_MODREF *wm; NTSTATUS status; ANSI_STRING func_name; - void (* DECLSPEC_NORETURN init_func)(void); + void (* DECLSPEC_NORETURN CDECL init_func)(void); extern mode_t FILE_umask; main_exe_file = thread_init(); diff --git a/include/winbase.h b/include/winbase.h index 909a3e2..f7bb9bf 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2311,8 +2311,8 @@ WINBASEAPI VOID WINAPI _LeaveSysLevel(SYSLEVEL*); /* Wine internal functions */ -extern char *wine_get_unix_file_name( LPCWSTR dos ); -extern WCHAR *wine_get_dos_file_name( LPCSTR str ); +extern char CDECL *wine_get_unix_file_name( LPCWSTR dos ); +extern WCHAR CDECL *wine_get_dos_file_name( LPCSTR str ); /* Interlocked functions */ diff --git a/programs/start/start.c b/programs/start/start.c index 2009e78..d98f215 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -258,7 +258,7 @@ int wmain (int argc, WCHAR *argv[]) sei.lpParameters = args; if (unix_mode) { - LPWSTR (*wine_get_dos_file_name_ptr)(LPCSTR); + LPWSTR (*CDECL wine_get_dos_file_name_ptr)(LPCSTR); char* multibyte_unixpath; int multibyte_unixpath_len; diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index f4430d3..2471803 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -142,8 +142,8 @@ static int parse_options(const WCHAR *argv[]) */ int wmain(int argc, const WCHAR *argv[]) { - LPSTR (*wine_get_unix_file_name_ptr)(LPCWSTR) = NULL; - LPWSTR (*wine_get_dos_file_name_ptr)(LPCSTR) = NULL; + LPSTR (*CDECL wine_get_unix_file_name_ptr)(LPCWSTR) = NULL; + LPWSTR (*CDECL wine_get_dos_file_name_ptr)(LPCSTR) = NULL; WCHAR dos_pathW[MAX_PATH]; char path[MAX_PATH]; int outputformats;

1 0

Maarten Lankhorst : msi: Add missing CDECL to cabinet functions.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 49abc9878f6cf19fc727c4d2df0df4e9b5f36742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49abc9878f6cf19fc727c4d2d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Dec 21 12:48:20 2008 +0100 msi: Add missing CDECL to cabinet functions. --- dlls/msi/media.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index a236eba..28b6e2f 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -145,17 +145,17 @@ end: return rc; } -static void *cabinet_alloc(ULONG cb) +static void CDECL *cabinet_alloc(ULONG cb) { return msi_alloc(cb); } -static void cabinet_free(void *pv) +static void CDECL cabinet_free(void *pv) { msi_free(pv); } -static INT_PTR cabinet_open(char *pszFile, int oflag, int pmode) +static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) { HANDLE handle; DWORD dwAccess = 0; @@ -191,7 +191,7 @@ static INT_PTR cabinet_open(char *pszFile, int oflag, int pmode) return (INT_PTR)handle; } -static UINT cabinet_read(INT_PTR hf, void *pv, UINT cb) +static UINT CDECL cabinet_read(INT_PTR hf, void *pv, UINT cb) { HANDLE handle = (HANDLE)hf; DWORD read; @@ -202,7 +202,7 @@ static UINT cabinet_read(INT_PTR hf, void *pv, UINT cb) return 0; } -static UINT cabinet_write(INT_PTR hf, void *pv, UINT cb) +static UINT CDECL cabinet_write(INT_PTR hf, void *pv, UINT cb) { HANDLE handle = (HANDLE)hf; DWORD written; @@ -213,20 +213,20 @@ static UINT cabinet_write(INT_PTR hf, void *pv, UINT cb) return 0; } -static int cabinet_close(INT_PTR hf) +static int CDECL cabinet_close(INT_PTR hf) { HANDLE handle = (HANDLE)hf; return CloseHandle(handle) ? 0 : -1; } -static long cabinet_seek(INT_PTR hf, long dist, int seektype) +static long CDECL cabinet_seek(INT_PTR hf, long dist, int seektype) { HANDLE handle = (HANDLE)hf; /* flags are compatible and so are passed straight through */ return SetFilePointer(handle, dist, NULL, seektype); } -static UINT msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) +static UINT CDECL msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) { MSIRECORD *row; LPWSTR ptr; @@ -374,7 +374,7 @@ static INT_PTR cabinet_close_file_info(FDINOTIFICATIONTYPE fdint, return 1; } -static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) +static INT_PTR CDECL cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { TRACE("(%d)\n", fdint);

1 0

Maarten Lankhorst : includes: Fix EDITSTREAM definition for win64.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 99868d7c16ad3b83b145d48619ad2307dc0679be URL: http://source.winehq.org/git/wine.git/?a=commit;h=99868d7c16ad3b83b145d4861… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 22 00:08:59 2008 +0100 includes: Fix EDITSTREAM definition for win64. --- include/richedit.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/richedit.h b/include/richedit.h index f4f0ab5..02ebdc2 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -516,7 +516,7 @@ DECL_WINELIB_TYPE_AW(TEXTRANGE) typedef struct _editstream { - DWORD dwCookie; + DWORD_PTR dwCookie; DWORD dwError; EDITSTREAMCALLBACK pfnCallback; } EDITSTREAM;

1 0

Maarten Lankhorst : user32/winex11.drv: Change all user32 operations to use CDECL.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 0a6459598a0a63339ed4b56e6e6acca5524f60c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a6459598a0a63339ed4b56e6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 16 15:32:08 2008 +0100 user32/winex11.drv: Change all user32 operations to use CDECL. --- dlls/user32/driver.c | 240 ++++++++++++++++++++-------------------- dlls/user32/user_private.h | 104 +++++++++--------- dlls/winex11.drv/clipboard.c | 24 ++-- dlls/winex11.drv/event.c | 6 +- dlls/winex11.drv/keyboard.c | 24 ++-- dlls/winex11.drv/mouse.c | 10 +- dlls/winex11.drv/scroll.c | 4 +- dlls/winex11.drv/settings.c | 6 +- dlls/winex11.drv/window.c | 44 ++++---- dlls/winex11.drv/x11drv.h | 12 +- dlls/winex11.drv/x11drv_main.c | 4 +- dlls/winex11.drv/xinerama.c | 4 +- 12 files changed, 241 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a6459598a0a63339ed4b…

1 0

Maarten Lankhorst : gdi32/winex11.drv: Change all gdi/ opengl operations to use CDECL calling convention.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 131d0a79a1907436dbfdfc4383ccadf26b5f9cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=131d0a79a1907436dbfdfc438… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 16 14:18:49 2008 +0100 gdi32/winex11.drv: Change all gdi/opengl operations to use CDECL calling convention. --- dlls/gdi32/enhmfdrv/bitblt.c | 12 +- dlls/gdi32/enhmfdrv/dc.c | 48 +++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 204 +++++++++++++------------- dlls/gdi32/enhmfdrv/graphics.c | 48 +++--- dlls/gdi32/enhmfdrv/mapping.c | 26 ++-- dlls/gdi32/enhmfdrv/objects.c | 14 +- dlls/gdi32/gdi_private.h | 268 +++++++++++++++++----------------- dlls/gdi32/mfdrv/bitblt.c | 28 ++-- dlls/gdi32/mfdrv/dc.c | 48 +++--- dlls/gdi32/mfdrv/graphics.c | 44 +++--- dlls/gdi32/mfdrv/init.c | 6 +- dlls/gdi32/mfdrv/mapping.c | 18 +- dlls/gdi32/mfdrv/metafiledrv.h | 199 +++++++++++++------------- dlls/gdi32/mfdrv/objects.c | 16 +- dlls/gdi32/mfdrv/text.c | 2 +- dlls/winex11.drv/bitblt.c | 12 +- dlls/winex11.drv/bitmap.c | 10 +- dlls/winex11.drv/brush.c | 4 +- dlls/winex11.drv/dib.c | 22 ++-- dlls/winex11.drv/graphics.c | 42 +++--- dlls/winex11.drv/init.c | 12 +- dlls/winex11.drv/opengl.c | 76 +++++----- dlls/winex11.drv/pen.c | 4 +- dlls/winex11.drv/text.c | 6 +- dlls/winex11.drv/x11drv.h | 144 +++++++++--------- dlls/winex11.drv/xfont.c | 12 +- dlls/winex11.drv/xrender.c | 6 +- dlls/winex11.drv/xvidmode.c | 4 +- 28 files changed, 666 insertions(+), 669 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=131d0a79a1907436dbfdf…

1 0

Maarten Lankhorst : winex11.drv/wined3d: Fix tsx11 calling convention.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 4eca43e7024995da186f7cd21f92ff5f6fc0b04b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eca43e7024995da186f7cd21… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Dec 18 21:12:36 2008 +0100 winex11.drv/wined3d: Fix tsx11 calling convention. --- dlls/wined3d/wined3d_main.c | 6 +++--- dlls/wined3d/wined3d_private.h | 4 ++-- dlls/winex11.drv/x11drv_main.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index ee8f07f..b401f94 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -29,8 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); int num_lock = 0; -void (*wine_tsx11_lock_ptr)(void) = NULL; -void (*wine_tsx11_unlock_ptr)(void) = NULL; +void (*CDECL wine_tsx11_lock_ptr)(void) = NULL; +void (*CDECL wine_tsx11_unlock_ptr)(void) = NULL; /* When updating default value here, make sure to update winecfg as well, @@ -88,7 +88,7 @@ static inline DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char* n return ERROR_FILE_NOT_FOUND; } -static void wined3d_do_nothing(void) +static void CDECL wined3d_do_nothing(void) { } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e422fb..60414ee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -483,8 +483,8 @@ extern const shader_backend_t none_shader_backend; /* X11 locking */ -extern void (*wine_tsx11_lock_ptr)(void); -extern void (*wine_tsx11_unlock_ptr)(void); +extern void (* CDECL wine_tsx11_lock_ptr)(void); +extern void (* CDECL wine_tsx11_unlock_ptr)(void); /* As GLX relies on X, this is needed */ extern int num_lock; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 6b0e95c..b4e4bca 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -271,7 +271,7 @@ static int error_handler( Display *display, XErrorEvent *error_evt ) /*********************************************************************** * wine_tsx11_lock (X11DRV.@) */ -void wine_tsx11_lock(void) +void CDECL wine_tsx11_lock(void) { EnterCriticalSection( &X11DRV_CritSection ); } @@ -279,7 +279,7 @@ void wine_tsx11_lock(void) /*********************************************************************** * wine_tsx11_unlock (X11DRV.@) */ -void wine_tsx11_unlock(void) +void CDECL wine_tsx11_unlock(void) { LeaveCriticalSection( &X11DRV_CritSection ); }

1 0