August 2007 - Wine-Commits - list.winehq.org

Francois Gouget : crypt32: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: f67fd2cfa4538772d21ce535b9841e4fd9c8bb5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f67fd2cfa4538772d21ce535b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 4 03:13:39 2007 +0200 crypt32: Better match the PSDK types and fix the winapi_check warnings. --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/main.c | 2 +- include/wincrypt.h | 2 +- tools/winapi/win32.api | 24 ++++++++++++++++++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 7fbfd22..cc9de4b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1338,7 +1338,7 @@ BOOL WINAPI CryptSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, BOOL WINAPI CryptSignAndEncodeCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, DWORD dwKeySpec, DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm, - const void *pvHashAuxInfo, PBYTE pbEncoded, DWORD *pcbEncoded) + const void *pvHashAuxInfo, BYTE *pbEncoded, DWORD *pcbEncoded) { BOOL ret; DWORD encodedSize, hashSize; diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index a377b24..c311ce9 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -186,7 +186,7 @@ BOOL WINAPI I_CryptReadTrustedPublisherDWORDValueFromRegistry(LPCWSTR name, return ret; } -int WINAPI I_CryptInstallOssGlobal(DWORD x, DWORD y, DWORD z) +DWORD WINAPI I_CryptInstallOssGlobal(DWORD x, DWORD y, DWORD z) { static int ret = 8; ret++; diff --git a/include/wincrypt.h b/include/wincrypt.h index 0661890..93e9459 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3771,7 +3771,7 @@ BOOL WINAPI CryptSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, DWO BOOL WINAPI CryptSignAndEncodeCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, DWORD dwKeySpec, DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, PCRYPT_ALGORITHM_IDENTIFIER pSignatureAlgorithm, - const void *pvHashAuxInfo, PBYTE pbEncoded, DWORD *pcbEncoded); + const void *pvHashAuxInfo, BYTE *pbEncoded, DWORD *pcbEncoded); BOOL WINAPI CryptVerifyCertificateSignature(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded, diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 725a7c2..c1e4003 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -696,13 +696,17 @@ ALG_ID BOOL DWORD HANDLE +HCRYPTMSG HCRYPTPROV +HCRYPTPROV_LEGACY +HCRYPTPROV_OR_NCRYPT_KEY_HANDLE HMODULE LONG ULONG %ptr +BOOL * BYTE * CERT_EXTENSION[] CRYPT_ATTRIBUTE[] @@ -711,8 +715,11 @@ CRYPTPROTECT_PROMPTSTRUCT * DATA_BLOB * DWORD * GUID * +HCERTCHAINENGINE +HCERTCHAINENGINE * HCERTSTORE HCERTSTORE * +HCRYPTPROV_OR_NCRYPT_KEY_HANDLE * HCRYPTKEY * HCRYPTMSG * HCRYPTOIDFUNCADDR @@ -720,10 +727,13 @@ HCRYPTOIDFUNCADDR * HCRYPTOIDFUNCSET HLRUCACHE HLRUCACHE * +LPCSTR * +LPCWSTR * LPFILETIME LPSTR * LPVOID LPWSTR * +PCCERT_CHAIN_CONTEXT * PCCERT_CONTEXT PCCERT_CONTEXT * PCCRL_CONTEXT @@ -731,22 +741,36 @@ PCCRL_CONTEXT * PCCRYPT_OID_INFO PCCTL_CONTEXT PCCTL_CONTEXT * +PCERT_CHAIN_ENGINE_CONFIG +PCERT_CHAIN_PARA PCERT_ENHKEY_USAGE PCERT_EXTENSION +PCERT_EXTENSIONS PCERT_INFO PCERT_NAME_BLOB PCERT_NAME_INFO PCERT_PUBLIC_KEY_INFO PCERT_RDN_ATTR PCERT_RDN_VALUE_BLOB +PCMSG_STREAM_INFO +PCRL_ENTRY * +PCRL_INFO +PCRL_INFO[] PCRYPT_ALGORITHM_IDENTIFIER PCRYPT_ATTRIBUTE PCRYPT_DECODE_PARA PCRYPT_ENCODE_PARA +PCRYPT_INTEGER_BLOB +PCRYPT_KEY_PROV_INFO +PCRYPT_VERIFY_MESSAGE_PARA +PFN_CERT_ENUM_SYSTEM_STORE PFN_CRYPT_ENUM_OID_INFO +PSYSTEMTIME PVOID SIP_ADD_NEWPROVIDER * SIP_DISPATCH_INFO * +SIP_INDIRECT_DATA * +SIP_SUBJECTINFO * int * void * void **

1 0

Francois Gouget : mapi32: Add missing #include directives.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: d44b6d46628faa77485253c4bedc9afd8d46234a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d44b6d46628faa77485253c4b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 4 03:23:30 2007 +0200 mapi32: Add missing #include directives. --- include/mapidefs.h | 1 + include/mapival.h | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/mapidefs.h b/include/mapidefs.h index 2c89c0f..219177d 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -27,6 +27,7 @@ #ifndef _OBJBASE_H_ #include <objbase.h> #endif +#include <stddef.h> /* Some types from other headers */ #ifndef __LHANDLE diff --git a/include/mapival.h b/include/mapival.h index 2a653a3..82cd020 100644 --- a/include/mapival.h +++ b/include/mapival.h @@ -24,6 +24,8 @@ extern "C" { #endif #include <mapiutil.h> +#include <stddef.h> +#include <stdarg.h> BOOL WINAPI FBadRglpszW(LPWSTR*,ULONG); BOOL WINAPI FBadRowSet(LPSRowSet);

1 0

Francois Gouget : dnsapi: The DNS APIs don't take PIP4_ARRAYs anymore ( for IPv6 compatibility).
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: cace3f9e8c36d5f59b2b333eaf38a0c62337253d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cace3f9e8c36d5f59b2b333ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 4 03:20:32 2007 +0200 dnsapi: The DNS APIs don't take PIP4_ARRAYs anymore (for IPv6 compatibility). --- dlls/dnsapi/main.c | 12 ++++++------ dlls/dnsapi/query.c | 6 +++--- include/windns.h | 20 ++++++++++---------- tools/winapi/win32.api | 1 - 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 10e3204..2016d75 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -130,7 +130,7 @@ DNS_STATUS WINAPI DnsExtractRecordsFromMessage_W( PDNS_MESSAGE_BUFFER buffer, */ DNS_STATUS WINAPI DnsModifyRecordsInSet_A( PDNS_RECORDA add, PDNS_RECORDA delete, DWORD options, HANDLE context, - PIP4_ARRAY servers, PVOID reserved ) + PVOID servers, PVOID reserved ) { FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options, context, servers, reserved ); @@ -143,7 +143,7 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_A( PDNS_RECORDA add, PDNS_RECORDA delete */ DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8( PDNS_RECORDA add, PDNS_RECORDA delete, DWORD options, HANDLE context, - PIP4_ARRAY servers, PVOID reserved ) + PVOID servers, PVOID reserved ) { FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options, context, servers, reserved ); @@ -156,7 +156,7 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8( PDNS_RECORDA add, PDNS_RECORDA del */ DNS_STATUS WINAPI DnsModifyRecordsInSet_W( PDNS_RECORDW add, PDNS_RECORDW delete, DWORD options, HANDLE context, - PIP4_ARRAY servers, PVOID reserved ) + PVOID servers, PVOID reserved ) { FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options, context, servers, reserved ); @@ -194,7 +194,7 @@ BOOL WINAPI DnsWriteQuestionToBuffer_W( PDNS_MESSAGE_BUFFER buffer, LPDWORD size * */ DNS_STATUS WINAPI DnsReplaceRecordSetA( PDNS_RECORDA set, DWORD options, - HANDLE context, PIP4_ARRAY servers, + HANDLE context, PVOID servers, PVOID reserved ) { FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context, @@ -207,7 +207,7 @@ DNS_STATUS WINAPI DnsReplaceRecordSetA( PDNS_RECORDA set, DWORD options, * */ DNS_STATUS WINAPI DnsReplaceRecordSetUTF8( PDNS_RECORDA set, DWORD options, - HANDLE context, PIP4_ARRAY servers, + HANDLE context, PVOID servers, PVOID reserved ) { FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context, @@ -220,7 +220,7 @@ DNS_STATUS WINAPI DnsReplaceRecordSetUTF8( PDNS_RECORDA set, DWORD options, * */ DNS_STATUS WINAPI DnsReplaceRecordSetW( PDNS_RECORDW set, DWORD options, - HANDLE context, PIP4_ARRAY servers, + HANDLE context, PVOID servers, PVOID reserved ) { FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context, diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 608f496..5073b6a 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -660,7 +660,7 @@ exit: * DnsQuery_A [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PIP4_ARRAY servers, +DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PVOID servers, PDNS_RECORDA *result, PVOID *reserved ) { WCHAR *nameW; @@ -695,7 +695,7 @@ DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PIP4_ARRAY s * DnsQuery_UTF8 [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PIP4_ARRAY servers, +DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID servers, PDNS_RECORDA *result, PVOID *reserved ) { DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; @@ -737,7 +737,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PIP4_ARRA * DnsQuery_W [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PIP4_ARRAY servers, +DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PVOID servers, PDNS_RECORDW *result, PVOID *reserved ) { char *nameU; diff --git a/include/windns.h b/include/windns.h index 1b1a4e1..83fb178 100644 --- a/include/windns.h +++ b/include/windns.h @@ -156,7 +156,7 @@ typedef enum _DnsSection } DNS_SECTION; typedef LONG DNS_STATUS, *PDNS_STATUS; -typedef DWORD IP4_ADDRESS; +typedef DWORD IP4_ADDRESS, *PIP4_ADDRESS; typedef struct { @@ -618,14 +618,14 @@ DNS_STATUS WINAPI DnsAcquireContextHandle_A(DWORD,PVOID,HANDLE*); DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,HANDLE*); DNS_STATUS WINAPI DnsExtractRecordsFromMessage_W(PDNS_MESSAGE_BUFFER,WORD,PDNS_RECORDW*); DNS_STATUS WINAPI DnsExtractRecordsFromMessage_UTF8(PDNS_MESSAGE_BUFFER,WORD,PDNS_RECORDA*); -DNS_STATUS WINAPI DnsModifyRecordsInSet_A(PDNS_RECORDA,PDNS_RECORDA,DWORD,HANDLE,PIP4_ARRAY,PVOID); -DNS_STATUS WINAPI DnsModifyRecordsInSet_W(PDNS_RECORDW,PDNS_RECORDW,DWORD,HANDLE,PIP4_ARRAY,PVOID); -DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8(PDNS_RECORDA,PDNS_RECORDA,DWORD,HANDLE,PIP4_ARRAY,PVOID); +DNS_STATUS WINAPI DnsModifyRecordsInSet_A(PDNS_RECORDA,PDNS_RECORDA,DWORD,HANDLE,PVOID,PVOID); +DNS_STATUS WINAPI DnsModifyRecordsInSet_W(PDNS_RECORDW,PDNS_RECORDW,DWORD,HANDLE,PVOID,PVOID); +DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8(PDNS_RECORDA,PDNS_RECORDA,DWORD,HANDLE,PVOID,PVOID); BOOL WINAPI DnsNameCompare_A(LPSTR,LPSTR); BOOL WINAPI DnsNameCompare_W(LPWSTR,LPWSTR); -DNS_STATUS WINAPI DnsQuery_A(PCSTR,WORD,DWORD,PIP4_ARRAY,PDNS_RECORDA*,PVOID*); -DNS_STATUS WINAPI DnsQuery_W(PCWSTR,WORD,DWORD,PIP4_ARRAY,PDNS_RECORDW*,PVOID*); -DNS_STATUS WINAPI DnsQuery_UTF8(PCSTR,WORD,DWORD,PIP4_ARRAY,PDNS_RECORDA*,PVOID*); +DNS_STATUS WINAPI DnsQuery_A(PCSTR,WORD,DWORD,PVOID,PDNS_RECORDA*,PVOID*); +DNS_STATUS WINAPI DnsQuery_W(PCWSTR,WORD,DWORD,PVOID,PDNS_RECORDW*,PVOID*); +DNS_STATUS WINAPI DnsQuery_UTF8(PCSTR,WORD,DWORD,PVOID,PDNS_RECORDA*,PVOID*); DNS_STATUS WINAPI DnsQueryConfig(DNS_CONFIG_TYPE,DWORD,PWSTR,PVOID,PVOID,PDWORD); BOOL WINAPI DnsRecordCompare(PDNS_RECORD,PDNS_RECORD); PDNS_RECORD WINAPI DnsRecordCopyEx(PDNS_RECORD,DNS_CHARSET,DNS_CHARSET); @@ -634,9 +634,9 @@ BOOL WINAPI DnsRecordSetCompare(PDNS_RECORD,PDNS_RECORD,PDNS_RECORD*,PDNS_RECORD PDNS_RECORD WINAPI DnsRecordSetCopyEx(PDNS_RECORD,DNS_CHARSET,DNS_CHARSET); PDNS_RECORD WINAPI DnsRecordSetDetach(PDNS_RECORD); void WINAPI DnsReleaseContextHandle(HANDLE); -DNS_STATUS WINAPI DnsReplaceRecordSetA(PDNS_RECORDA,DWORD,HANDLE,PIP4_ARRAY,PVOID); -DNS_STATUS WINAPI DnsReplaceRecordSetW(PDNS_RECORDW,DWORD,HANDLE,PIP4_ARRAY,PVOID); -DNS_STATUS WINAPI DnsReplaceRecordSetUTF8(PDNS_RECORDA,DWORD,HANDLE,PIP4_ARRAY,PVOID); +DNS_STATUS WINAPI DnsReplaceRecordSetA(PDNS_RECORDA,DWORD,HANDLE,PVOID,PVOID); +DNS_STATUS WINAPI DnsReplaceRecordSetW(PDNS_RECORDW,DWORD,HANDLE,PVOID,PVOID); +DNS_STATUS WINAPI DnsReplaceRecordSetUTF8(PDNS_RECORDA,DWORD,HANDLE,PVOID,PVOID); DNS_STATUS WINAPI DnsValidateName_A(LPCSTR,DNS_NAME_FORMAT); DNS_STATUS WINAPI DnsValidateName_W(LPCWSTR, DNS_NAME_FORMAT); DNS_STATUS WINAPI DnsValidateName_UTF8(LPCSTR,DNS_NAME_FORMAT); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 30eee71..725a7c2 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1173,7 +1173,6 @@ PDNS_RECORDA * PDNS_RECORDW PDNS_RECORDW * PDWORD -PIP4_ARRAY PVOID PVOID *

1 0

Francois Gouget : msi: MsiProvideComponentFromDescriptorA/W() is not supposed to be defined in msi.h.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 2f051c34a4202c249c61fa71b26a0f1fa721dc85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f051c34a4202c249c61fa71b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 4 03:14:08 2007 +0200 msi: MsiProvideComponentFromDescriptorA/W() is not supposed to be defined in msi.h. --- include/msi.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/include/msi.h b/include/msi.h index 37f4b4b..1f78c66 100644 --- a/include/msi.h +++ b/include/msi.h @@ -413,10 +413,6 @@ UINT WINAPI MsiOpenProductA(LPCSTR, MSIHANDLE*); UINT WINAPI MsiOpenProductW(LPCWSTR, MSIHANDLE*); #define MsiOpenProduct WINELIB_NAME_AW(MsiOpenProduct) -UINT WINAPI MsiProvideComponentFromDescriptorA(LPCSTR,LPSTR,DWORD*,DWORD*); -UINT WINAPI MsiProvideComponentFromDescriptorW(LPCWSTR,LPWSTR,DWORD*,DWORD*); -#define MsiProvideComponentFromDescriptor WINELIB_NAME_AW(MsiProvideComponentFromDescriptor) - UINT WINAPI MsiGetProductPropertyA(MSIHANDLE,LPCSTR,LPSTR,DWORD*); UINT WINAPI MsiGetProductPropertyW(MSIHANDLE,LPCWSTR,LPWSTR,DWORD*); #define MsiGetProductProperty WINELIB_NAME_AW(MsiGetProductProperty)

1 0

Francois Gouget : advapi32: We have cfgmgr32.h now.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 3b48ea2d6a3fb994aadbdd4693c4c43851298b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b48ea2d6a3fb994aadbdd469… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 4 03:23:39 2007 +0200 advapi32: We have cfgmgr32.h now. --- include/advpub.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/advpub.h b/include/advpub.h index e144d66..c31df33 100644 --- a/include/advpub.h +++ b/include/advpub.h @@ -19,7 +19,7 @@ #define __WINE_ADVPUB_H #include <setupapi.h> -/* FIXME: #include <cfgmgr32.h> */ +#include <cfgmgr32.h> #ifdef __cplusplus extern "C" {

1 0

Francois Gouget : imagehlp & dbghelp: Add the IMAGEAPI and DBHLPAPI macros.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 4c11d57f74fe858144e969c3736186c43c62322f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c11d57f74fe858144e969c37… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 4 03:15:17 2007 +0200 imagehlp & dbghelp: Add the IMAGEAPI and DBHLPAPI macros. --- include/dbghelp.h | 3 +++ include/imagehlp.h | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index 9e7faa5..1528249 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -25,6 +25,9 @@ extern "C" { #endif /* defined(__cplusplus) */ +#define IMAGEAPI WINAPI +#define DBHLPAPI IMAGEAPI + typedef struct _LOADED_IMAGE { PSTR ModuleName; diff --git a/include/imagehlp.h b/include/imagehlp.h index 89883d9..25dec08 100644 --- a/include/imagehlp.h +++ b/include/imagehlp.h @@ -27,6 +27,9 @@ extern "C" { #endif /* defined(__cplusplus) */ +#define IMAGEAPI WINAPI +#define DBHLPAPI IMAGEAPI + #define API_VERSION_NUMBER 7 /* 7 is the default */ /***********************************************************************

1 0

Francois Gouget : kernel32/tests: Re-balance the curly parentheses so winapi_check can parse the file.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: f74d2a8fbf7807ebaeaf753d5f18d43c684269db URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74d2a8fbf7807ebaeaf753d5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 4 03:23:56 2007 +0200 kernel32/tests: Re-balance the curly parentheses so winapi_check can parse the file. --- dlls/kernel32/tests/loader.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 8d2c7aa..e27d0e8 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -40,10 +40,11 @@ static const struct static IMAGE_NT_HEADERS nt_header = { IMAGE_NT_SIGNATURE, /* Signature */ + { #if defined __i386__ - { IMAGE_FILE_MACHINE_I386, /* Machine */ + IMAGE_FILE_MACHINE_I386, /* Machine */ #elif defined __x86_64__ - { IMAGE_FILE_MACHINE_AMD64, /* Machine */ + IMAGE_FILE_MACHINE_AMD64, /* Machine */ #else # error You must specify the machine type #endif

1 0

Francois Gouget : mapi32: Add a skeleton mapiform. h header with a proper prototype for MAPIOpenLocalFormContainer().
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 83340ec0e49200911fad7510675b294fa68e4552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83340ec0e49200911fad75106… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 4 03:25:15 2007 +0200 mapi32: Add a skeleton mapiform.h header with a proper prototype for MAPIOpenLocalFormContainer(). --- dlls/mapi32/mapi32_main.c | 1 + include/Makefile.in | 1 + include/mapiform.h | 47 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index 983dc24..a985ac6 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -25,6 +25,7 @@ #include "winerror.h" #include "objbase.h" #include "mapix.h" +#include "mapiform.h" #include "mapi.h" #include "wine/debug.h" diff --git a/include/Makefile.in b/include/Makefile.in index 0810f81..07daf60 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -209,6 +209,7 @@ SRCDIR_INCLUDES = \ mapi.h \ mapicode.h \ mapidefs.h \ + mapiform.h \ mapiguid.h \ mapitags.h \ mapiutil.h \ diff --git a/include/mapiform.h b/include/mapiform.h new file mode 100644 index 0000000..d9375ce --- /dev/null +++ b/include/mapiform.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) 1998 Justin Bradford + * + * 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 + */ + +#ifndef MAPIFORM_H +#define MAPIFORM_H + +#include <mapidefs.h> +#include <mapicode.h> +#include <mapiguid.h> +#include <mapitags.h> + + +typedef ULONG HFRMREG; +#define HFRMREG_DEFAULT 0 +#define HFRMREG_LOCAL 1 +#define HFRMREG_PERSONAL 2 +#define HFRMREG_FOLDER 3 + +typedef const char **LPPCSTR; + + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI MAPIOpenLocalFormContainer(LPVOID*); + +#ifdef __cplusplus +} +#endif + +#endif /* MAPIFORM_H */

1 0

Evan Stade : gdiplus: Added GdipImageSelectActiveFrame stub.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 1015722dfe87266c330097c8c874d8ae356d2b51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1015722dfe87266c330097c8c… Author: Evan Stade <estade(a)gmail.com> Date: Fri Aug 3 17:30:34 2007 -0700 gdiplus: Added GdipImageSelectActiveFrame stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 14 ++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e8802ab..e0ea275 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -410,7 +410,7 @@ @ stub GdipImageGetFrameDimensionsCount @ stdcall GdipImageGetFrameDimensionsList(ptr ptr long) @ stub GdipImageRotateFlip -@ stub GdipImageSelectActiveFrame +@ stdcall GdipImageSelectActiveFrame(ptr ptr long) @ stub GdipImageSetAbort @ stub GdipInitializePalette @ stub GdipInvertMatrix diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a52b9ca..c050fd2 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -407,6 +407,20 @@ GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage* image, return Ok; } +GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, + GDIPCONST GUID* dimensionID, UINT frameidx) +{ + static int calls; + + if(!image || !dimensionID) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return Ok; +} + GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) { if(!stream || !image) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index bb8855e..8c96a2c 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -181,6 +181,7 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile*,MetafileHeader GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage*,PROPID,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage*,GUID*,UINT); +GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage*,GDIPCONST GUID*,UINT); GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream*,GpImage**); GpStatus WINGDIPAPI GdipLoadImageFromStreamICM(IStream*,GpImage**); GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage*,PROPID);

1 0

Evan Stade : gdiplus: Added GdipGetImagePixelFormat.
by Alexandre Julliard Aug. 6, 2007

Aug. 6, 2007

Module: wine Branch: master Commit: 4d25791b40e5529c5bba30eeecfe960e096171ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d25791b40e5529c5bba30eee… Author: Evan Stade <estade(a)gmail.com> Date: Fri Aug 3 17:30:30 2007 -0700 gdiplus: Added GdipGetImagePixelFormat. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/image.c | 57 ++++++++++++++++++++++++++++++--------- include/gdiplusflat.h | 1 + include/gdipluspixelformats.h | 26 ++++++++++++++++++ 5 files changed, 73 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3d79760..e8802ab 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -293,7 +293,7 @@ @ stub GdipGetImageItemData @ stub GdipGetImagePalette @ stub GdipGetImagePaletteSize -@ stub GdipGetImagePixelFormat +@ stdcall GdipGetImagePixelFormat(ptr ptr) @ stdcall GdipGetImageRawFormat(ptr ptr) @ stub GdipGetImageThumbnail @ stdcall GdipGetImageType(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 02db7aa..cea667f 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -142,6 +142,7 @@ struct GpBitmap{ GpImage image; INT width; INT height; + PixelFormat format; }; struct GpImageAttributes{ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 6b71014..a52b9ca 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); typedef void ImageItemData; +#define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24) + static INT ipicture_pixel_height(IPicture *pic) { HDC hdcref; @@ -121,7 +123,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, bmih->biWidth = width; bmih->biHeight = height; /* FIXME: use the rest of the data from format */ - bmih->biBitCount = format >> 8; + bmih->biBitCount = PIXELFORMATBPP(format); bmih->biCompression = BI_RGB; memcpy(bmih + 1, scan0, datalen); @@ -145,6 +147,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->image.type = ImageTypeBitmap; (*bitmap)->width = width; (*bitmap)->height = height; + (*bitmap)->format = format; return Ok; } @@ -152,6 +155,10 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream* stream, GpBitmap **bitmap) { + BITMAPINFO bmi; + BITMAPCOREHEADER* bmch; + OLE_HANDLE hbm; + HDC hdc; GpStatus stat; stat = GdipLoadImageFromStream(stream, (GpImage**) bitmap); @@ -164,24 +171,34 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream* stream, (*bitmap)->width = ipicture_pixel_width((*bitmap)->image.picture); (*bitmap)->height = ipicture_pixel_height((*bitmap)->image.picture); + /* get the pixel format */ + IPicture_get_Handle((*bitmap)->image.picture, &hbm); + IPicture_get_CurDC((*bitmap)->image.picture, &hdc); + + bmch = (BITMAPCOREHEADER*) (&bmi.bmiHeader); + bmch->bcSize = sizeof(BITMAPCOREHEADER); + + if(!hdc){ + HBITMAP old; + hdc = GetDC(0); + old = SelectObject(hdc, (HBITMAP)hbm); + GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS); + SelectObject(hdc, old); + ReleaseDC(0, hdc); + } + else + GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS); + + (*bitmap)->format = (bmch->bcBitCount << 8) | PixelFormatGDI; + return Ok; } +/* FIXME: no icm */ GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream* stream, GpBitmap **bitmap) { - GpStatus stat; - - stat = GdipLoadImageFromStreamICM(stream, (GpImage**) bitmap); - - if(stat != Ok) - return stat; - - (*bitmap)->image.type = ImageTypeBitmap; - (*bitmap)->width = ipicture_pixel_width((*bitmap)->image.picture); - (*bitmap)->height = ipicture_pixel_height((*bitmap)->image.picture); - - return Ok; + return GdipCreateBitmapFromStream(stream, bitmap); } GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) @@ -263,6 +280,20 @@ GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage *image, REAL *res) return NotImplemented; } +/* FIXME: test this function for non-bitmap types */ +GpStatus WINGDIPAPI GdipGetImagePixelFormat(GpImage *image, PixelFormat *format) +{ + if(!image || !format) + return InvalidParameter; + + if(image->type != ImageTypeBitmap) + *format = PixelFormat24bppRGB; + else + *format = ((GpBitmap*) image)->format; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage *image, GUID *format) { static int calls; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 7e94a68..bb8855e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -172,6 +172,7 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage*); GpStatus WINGDIPAPI GdipGetImageBounds(GpImage*,GpRectF*,GpUnit*); GpStatus WINGDIPAPI GdipGetImageHeight(GpImage*,UINT*); GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage*,REAL*); +GpStatus WINGDIPAPI GdipGetImagePixelFormat(GpImage*,PixelFormat*); GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage*,GUID*); GpStatus WINGDIPAPI GdipGetImageType(GpImage*,ImageType*); GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage*,REAL*); diff --git a/include/gdipluspixelformats.h b/include/gdipluspixelformats.h index 6f50492..dd67410 100644 --- a/include/gdipluspixelformats.h +++ b/include/gdipluspixelformats.h @@ -22,4 +22,30 @@ typedef DWORD ARGB; typedef INT PixelFormat; +#define PixelFormatIndexed 0x00010000 +#define PixelFormatGDI 0x00020000 +#define PixelFormatAlpha 0x00040000 +#define PixelFormatPAlpha 0x00080000 +#define PixelFormatExtended 0x00100000 +#define PixelFormatCanonical 0x00200000 + +#define PixelFormatUndefined 0 +#define PixelFormatDontCare 0 + +#define PixelFormat1bppIndexed (1 | ( 1 << 8) | PixelFormatIndexed | PixelFormatGDI) +#define PixelFormat4bppIndexed (2 | ( 4 << 8) | PixelFormatIndexed | PixelFormatGDI) +#define PixelFormat8bppIndexed (3 | ( 8 << 8) | PixelFormatIndexed | PixelFormatGDI) +#define PixelFormat16bppGrayScale (4 | (16 << 8) | PixelFormatExtended) +#define PixelFormat16bppRGB555 (5 | (16 << 8) | PixelFormatGDI) +#define PixelFormat16bppRGB565 (6 | (16 << 8) | PixelFormatGDI) +#define PixelFormat16bppARGB1555 (7 | (16 << 8) | PixelFormatAlpha | PixelFormatGDI) +#define PixelFormat24bppRGB (8 | (24 << 8) | PixelFormatGDI) +#define PixelFormat32bppRGB (9 | (32 << 8) | PixelFormatGDI) +#define PixelFormat32bppARGB (10 | (32 << 8) | PixelFormatAlpha | PixelFormatGDI | PixelFormatCanonical) +#define PixelFormat32bppPARGB (11 | (32 << 8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatGDI) +#define PixelFormat48bppRGB (12 | (48 << 8) | PixelFormatExtended) +#define PixelFormat64bppARGB (13 | (64 << 8) | PixelFormatAlpha | PixelFormatCanonical | PixelFormatExtended) +#define PixelFormat64bppPARGB (14 | (64 << 8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatExtended) +#define PixelFormatMax 15 + #endif

1 0