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

Juan Lang : wintrust: Implement SoftpubLoadSignature.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 92de4384690fd86f2b7951d5c3e5a9850ac85fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=92de4384690fd86f2b7951d5c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 27 16:18:50 2007 -0700 wintrust: Implement SoftpubLoadSignature. --- dlls/wintrust/softpub.c | 68 +++++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index f78ed9e..4c8d356 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -299,3 +299,71 @@ error: GetLastError(); return ret ? S_OK : S_FALSE; } + +HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) +{ + BOOL ret; + DWORD signerCount, size; + + TRACE("(%p)\n", data); + + if (!data->padwTrustStepErrors) + return S_FALSE; + + size = sizeof(signerCount); + ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_COUNT_PARAM, 0, + &signerCount, &size); + if (ret) + { + DWORD i; + + for (i = 0; ret && i < signerCount; i++) + { + ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_CERT_INFO_PARAM, + i, NULL, &size); + if (ret) + { + CERT_INFO *certInfo = data->psPfns->pfnAlloc(size); + + if (certInfo) + { + ret = CryptMsgGetParam(data->hMsg, + CMSG_SIGNER_CERT_INFO_PARAM, i, certInfo, &size); + if (ret) + { + CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA para = { + sizeof(para), 0, i, CMSG_VERIFY_SIGNER_CERT, NULL }; + + para.pvSigner = + (LPVOID)CertGetSubjectCertificateFromStore( + data->pahStores[0], data->dwEncoding, certInfo); + if (para.pvSigner) + { + ret = CryptMsgControl(data->hMsg, 0, + CMSG_CTRL_VERIFY_SIGNATURE_EX, &para); + if (!ret) + SetLastError(TRUST_E_CERT_SIGNATURE); + } + else + { + SetLastError(TRUST_E_NO_SIGNER_CERT); + ret = FALSE; + } + } + data->psPfns->pfnFree(certInfo); + } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } + } + } + } + else + SetLastError(TRUST_E_NOSIGNATURE); + if (!ret) + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = + GetLastError(); + return ret ? S_OK : S_FALSE; +} diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index fe9df8a..ef877b4 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -67,7 +67,7 @@ @ stdcall SoftpubInitialize(ptr) @ stub SoftpubLoadDefUsageCallData @ stdcall SoftpubLoadMessage(ptr) -@ stub SoftpubLoadSignature +@ stdcall SoftpubLoadSignature(ptr) @ stub TrustDecode @ stub TrustFindIssuerCertificate @ stub TrustFreeDecode

1 0

Stefan Leichter : hhctrl.ocx: Remove 'recursive registry key delete' function.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 256e3e1c7cb7117b0c58235b7c1df902621da461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=256e3e1c7cb7117b0c58235b7… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Aug 27 21:36:00 2007 +0200 hhctrl.ocx: Remove 'recursive registry key delete' function. --- dlls/hhctrl.ocx/regsvr.c | 79 +++++----------------------------------------- 1 files changed, 8 insertions(+), 71 deletions(-) diff --git a/dlls/hhctrl.ocx/regsvr.c b/dlls/hhctrl.ocx/regsvr.c index cfdc362..fc247c6 100644 --- a/dlls/hhctrl.ocx/regsvr.c +++ b/dlls/hhctrl.ocx/regsvr.c @@ -115,9 +115,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -206,7 +203,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -313,16 +311,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -435,70 +436,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Stefan Leichter : dxdiagn: Remove 'recursive registry key delete' function.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 5861d0842669d362866a7ce2f63a2c97e3444714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5861d0842669d362866a7ce2f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Aug 27 21:41:22 2007 +0200 dxdiagn: Remove 'recursive registry key delete' function. --- dlls/dxdiagn/regsvr.c | 79 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 71 deletions(-) diff --git a/dlls/dxdiagn/regsvr.c b/dlls/dxdiagn/regsvr.c index 3e60696..949c4d2 100644 --- a/dlls/dxdiagn/regsvr.c +++ b/dlls/dxdiagn/regsvr.c @@ -115,9 +115,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -206,7 +203,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -313,16 +311,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -435,70 +436,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Dan Hipschman : widl: Handle LPSTR in typelibs.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: d82b384859c9d87827a35151e14f8ca2365e8a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82b384859c9d87827a35151e… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Aug 27 20:24:37 2007 -0700 widl: Handle LPSTR in typelibs. --- tools/widl/typelib.c | 12 ++++++++++-- tools/widl/write_msft.c | 7 +++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 608a114..0238dc2 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -126,8 +126,9 @@ static int kw_cmp_func(const void *s1, const void *s2) return strcmp(KWP(s1)->kw, KWP(s2)->kw); } -static unsigned short builtin_vt(const char *kw) +static unsigned short builtin_vt(const type_t *t) { + const char *kw = t->name; struct oatype key, *kwp; key.kw = kw; #ifdef KW_BSEARCH @@ -145,6 +146,13 @@ static unsigned short builtin_vt(const char *kw) if (kwp) { return kwp->vt; } + if (is_string_type (t->attrs, t)) + switch (t->ref->type) + { + case RPC_FC_CHAR: return VT_LPSTR; + case RPC_FC_WCHAR: return VT_LPWSTR; + default: break; + } return 0; } @@ -160,7 +168,7 @@ unsigned short get_type_vt(type_t *t) chat("get_type_vt: %p type->name %s\n", t, t->name); if (t->name) { - vt = builtin_vt(t->name); + vt = builtin_vt(t); if (vt) return vt; } diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 920ca2b..dd29c73 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -852,6 +852,13 @@ static int encode_type( *encoded_type = default_type; break; + case VT_LPSTR: + case VT_LPWSTR: + *encoded_type = 0xfffe0000 | vt; + *width = 4; + *alignment = 4; + break; + case VT_PTR: { int next_vt;

1 0

Juan Lang : imagehlp: Move WIN_CERTIFICATE types to wintrust.h, and rename a type, to match PSDK.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 01b083c5758b25a1ba7d495033f9abac2633d273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01b083c5758b25a1ba7d49503… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 27 16:32:29 2007 -0700 imagehlp: Move WIN_CERTIFICATE types to wintrust.h, and rename a type, to match PSDK. --- dlls/imagehlp/integrity.c | 6 +++--- include/imagehlp.h | 20 +++----------------- include/wintrust.h | 19 +++++++++++++++++++ 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index fb228f4..df6de0f 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -144,7 +144,7 @@ static BOOL IMAGEHLP_GetCertificateOffset( HANDLE handle, DWORD num, */ BOOL WINAPI ImageAddCertificate( - HANDLE FileHandle, PWIN_CERTIFICATE Certificate, PDWORD Index) + HANDLE FileHandle, LPWIN_CERTIFICATE Certificate, PDWORD Index) { FIXME("(%p, %p, %p): stub\n", FileHandle, Certificate, Index @@ -220,7 +220,7 @@ BOOL WINAPI ImageEnumerateCertificates( */ BOOL WINAPI ImageGetCertificateData( HANDLE handle, DWORD Index, - PWIN_CERTIFICATE Certificate, PDWORD RequiredLength) + LPWIN_CERTIFICATE Certificate, PDWORD RequiredLength) { DWORD r, offset, ofs, size, count; @@ -263,7 +263,7 @@ BOOL WINAPI ImageGetCertificateData( * ImageGetCertificateHeader (IMAGEHLP.@) */ BOOL WINAPI ImageGetCertificateHeader( - HANDLE handle, DWORD index, PWIN_CERTIFICATE pCert) + HANDLE handle, DWORD index, LPWIN_CERTIFICATE pCert) { DWORD r, offset, ofs, size, count; const size_t cert_hdr_size = sizeof *pCert - sizeof pCert->bCertificate; diff --git a/include/imagehlp.h b/include/imagehlp.h index 6e9ac51..93bbaee 100644 --- a/include/imagehlp.h +++ b/include/imagehlp.h @@ -71,13 +71,6 @@ typedef enum _IMAGEHLP_STATUS_REASON { #define CERT_SECTION_TYPE_ANY 0xFF -#define WIN_CERT_REVISION_1_0 0x0100 -#define WIN_CERT_REVISION_2_0 0x0200 - -#define WIN_CERT_TYPE_X509 0x0001 /* X.509 Certificate */ -#define WIN_CERT_TYPE_PKCS_SIGNED_DATA 0x0002 /* PKCS SignedData */ -#define WIN_CERT_TYPE_RESERVED_1 0x0003 /* Reserved */ - #define SPLITSYM_REMOVE_PRIVATE 0x00000001 #define SPLITSYM_EXTRACT_ALL 0x00000002 #define SPLITSYM_SYMBOLPATH_IS_SRC 0x00000004 @@ -179,13 +172,6 @@ typedef struct _LOADED_IMAGE ULONG SizeOfImage; } LOADED_IMAGE, *PLOADED_IMAGE; -typedef struct _WIN_CERTIFICATE { - DWORD dwLength; - WORD wRevision; /* WIN_CERT_REVISON_xxx */ - WORD wCertificateType; /* WIN_CERT_TYPE_xxx */ - BYTE bCertificate[ANYSIZE_ARRAY]; -} WIN_CERTIFICATE, *PWIN_CERTIFICATE; - typedef struct _API_VERSION { USHORT MajorVersion; USHORT MinorVersion; @@ -841,7 +827,7 @@ DWORD WINAPI GetTimestampForLoadedLibrary( HMODULE Module ); BOOL WINAPI ImageAddCertificate( - HANDLE FileHandle, PWIN_CERTIFICATE Certificate, PDWORD Index + HANDLE FileHandle, LPWIN_CERTIFICATE Certificate, PDWORD Index ); PVOID WINAPI ImageDirectoryEntryToData( PVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size @@ -852,11 +838,11 @@ BOOL WINAPI ImageEnumerateCertificates( ); BOOL WINAPI ImageGetCertificateData( HANDLE FileHandle, DWORD CertificateIndex, - PWIN_CERTIFICATE Certificate, PDWORD RequiredLength + LPWIN_CERTIFICATE Certificate, PDWORD RequiredLength ); BOOL WINAPI ImageGetCertificateHeader( HANDLE FileHandle, DWORD CertificateIndex, - PWIN_CERTIFICATE Certificateheader + LPWIN_CERTIFICATE Certificateheader ); BOOL WINAPI ImageGetDigestStream( HANDLE FileHandle, DWORD DigestLevel, diff --git a/include/wintrust.h b/include/wintrust.h index 0fb9838..3290e31 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -533,6 +533,25 @@ typedef struct _CAT_MEMBERINFO DWORD dwCertVersion; } CAT_MEMBERINFO, *PCAT_MEMBERINFO; +/* PSDK protects the remaining defines with WT_DEFINE_ALL_APIS, but it's + * defined by default. No need to protect against bad headers from old PSDKs. + */ + +typedef struct _WIN_CERTIFICATE { + DWORD dwLength; + WORD wRevision; /* WIN_CERT_REVISON_xxx */ + WORD wCertificateType; /* WIN_CERT_TYPE_xxx */ + BYTE bCertificate[ANYSIZE_ARRAY]; +} WIN_CERTIFICATE, *LPWIN_CERTIFICATE; + +#define WIN_CERT_REVISION_1_0 0x0100 +#define WIN_CERT_REVISION_2_0 0x0200 + +#define WIN_CERT_TYPE_X509 0x0001 /* X.509 Certificate */ +#define WIN_CERT_TYPE_PKCS_SIGNED_DATA 0x0002 /* PKCS SignedData */ +#define WIN_CERT_TYPE_RESERVED_1 0x0003 /* Reserved */ +#define WIN_CERT_TYPE_TS_STACK_SIGNED 0x0004 + #define WIN_SPUB_ACTION_PUBLISHED_SOFTWARE \ { 0x64b9d180, 0x8da2, 0x11cf, { 0x87,0x36,0x00,0xaa,0x00,0xa4,0x85,0xeb }}

1 0

Juan Lang : wintrust: Test and implement SoftpubLoadMessage.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 5a3fb3b566875b4ba52430e460e14318db3a469f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a3fb3b566875b4ba52430e46… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 27 16:17:52 2007 -0700 wintrust: Test and implement SoftpubLoadMessage. --- dlls/wintrust/softpub.c | 264 +++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/tests/softpub.c | 90 ++++++++++++++ dlls/wintrust/wintrust.spec | 2 +- 3 files changed, 355 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a3fb3b566875b4ba5243…

1 0

Alexandre Julliard : kernel32: Store a few more locale values in the registry.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 2e55b3d6ab16de0923c8ebad607a0b4d4dfca701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e55b3d6ab16de0923c8ebad6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 28 11:36:45 2007 +0200 kernel32: Store a few more locale values in the registry. --- dlls/kernel32/locale.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 859f30a..1d607f1 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -641,6 +641,7 @@ void LOCALE_InitRegistry(void) static const WCHAR lc_timeW[] = { 'L','C','_','T','I','M','E',0 }; static const WCHAR lc_measurementW[] = { 'L','C','_','M','E','A','S','U','R','E','M','E','N','T',0 }; static const WCHAR lc_telephoneW[] = { 'L','C','_','T','E','L','E','P','H','O','N','E',0 }; + static const WCHAR lc_paperW[] = { 'L','C','_','P','A','P','E','R',0}; static const struct { LPCWSTR name; @@ -659,13 +660,20 @@ void LOCALE_InitRegistry(void) LOCALE_ICURRENCY, LOCALE_INEGCURR, LOCALE_ICURRDIGITS, - LOCALE_ILZERO }; + LOCALE_ILZERO, + LOCALE_SMONDECIMALSEP, + LOCALE_SMONGROUPING, + LOCALE_SMONTHOUSANDSEP }; static const LCTYPE lc_numeric_values[] = { LOCALE_SDECIMAL, LOCALE_STHOUSAND, LOCALE_IDIGITS, LOCALE_IDIGITSUBSTITUTION, - LOCALE_SNATIVEDIGITS }; + LOCALE_SNATIVEDIGITS, + LOCALE_INEGNUMBER, + LOCALE_SNEGATIVESIGN, + LOCALE_SPOSITIVESIGN, + LOCALE_SGROUPING }; static const LCTYPE lc_time_values[] = { LOCALE_S1159, LOCALE_S2359, @@ -676,9 +684,15 @@ void LOCALE_InitRegistry(void) LOCALE_SLONGDATE, LOCALE_SDATE, LOCALE_ITIMEMARKPOSN, - LOCALE_ICALENDARTYPE }; + LOCALE_ICALENDARTYPE, + LOCALE_IFIRSTDAYOFWEEK, + LOCALE_IFIRSTWEEKOFYEAR, + LOCALE_STIMEFORMAT, + LOCALE_SYEARMONTH, + LOCALE_IDATE }; static const LCTYPE lc_measurement_values[] = { LOCALE_IMEASURE }; static const LCTYPE lc_telephone_values[] = { LOCALE_ICOUNTRY }; + static const LCTYPE lc_paper_values[] = { LOCALE_IPAPERSIZE }; UNICODE_STRING nameW; WCHAR bufferW[80]; @@ -701,6 +715,8 @@ void LOCALE_InitRegistry(void) sizeof(lc_measurement_values)/sizeof(lc_measurement_values[0]) ); locale_update_registry( hkey, lc_telephoneW, lcid_LC_TELEPHONE, lc_telephone_values, sizeof(lc_telephone_values)/sizeof(lc_telephone_values[0]) ); + locale_update_registry( hkey, lc_paperW, lcid_LC_PAPER, lc_paper_values, + sizeof(lc_paper_values)/sizeof(lc_paper_values[0]) ); if (locale_update_registry( hkey, lc_ctypeW, lcid_LC_CTYPE, NULL, 0 )) {

1 0

Detlef Riekenberg : ntdll: Make RtlCompactHeap more silent.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: a45badf5c0a1c4d4cddf3c131450d796aa393f17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a45badf5c0a1c4d4cddf3c131… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Aug 27 17:11:36 2007 +0200 ntdll: Make RtlCompactHeap more silent. --- dlls/ntdll/heap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 1369b0d..fb7df12 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1461,7 +1461,8 @@ error: */ ULONG WINAPI RtlCompactHeap( HANDLE heap, ULONG flags ) { - FIXME( "stub\n" ); + static BOOL reported; + if (!reported++) FIXME( "(%p, 0x%x) stub\n", heap, flags ); return 0; }

1 0

Stefan Dösinger : wined3d: Fix the half pixel correction.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 322b55e29a83a3ab61a1912d751816aa24662e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=322b55e29a83a3ab61a1912d7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 19 19:43:44 2007 +0200 wined3d: Fix the half pixel correction. --- dlls/wined3d/state.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 900e366..4b38e40 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2631,9 +2631,9 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock } checkGLcall("glOrtho"); - /* Window Coord 0 is the middle of the first pixel, so translate by 3/8 pixels */ - glTranslatef(0.375, 0.375, 0); - checkGLcall("glTranslatef(0.375, 0.375, 0)"); + /* Window Coord 0 is the middle of the first pixel, so translate by 1/2 pixels */ + glTranslatef(0.5, 0.5, 0); + checkGLcall("glTranslatef(0.5, 0.5, 0)"); /* D3D texture coordinates are flipped compared to OpenGL ones, so * render everything upside down when rendering offscreen. */ if (stateblock->wineD3DDevice->render_offscreen) { @@ -2647,9 +2647,14 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock the left to the right end of the viewport (with all matrices set to be identity), the x coords of both ends of the line would be not -1 and 1 respectively but (-1-1/viewport_widh) and (1-1/viewport_width) - instead. */ - glTranslatef(0.9 / stateblock->viewport.Width, -0.9 / stateblock->viewport.Height, 0); - checkGLcall("glTranslatef (0.9 / width, -0.9 / height, 0)"); + instead. + + 1.0 / Width is used because the coord range goes from -1.0 to 1.0, then we + divide by the Width/Height, so we need the half range(1.0) to translate by + half a pixel. + */ + glTranslatef(1.0 / stateblock->viewport.Width, -1.0/ stateblock->viewport.Height, 0); + checkGLcall("glTranslatef (1.0 / width, -1.0 / height, 0)"); /* D3D texture coordinates are flipped compared to OpenGL ones, so * render everything upside down when rendering offscreen. */ @@ -3369,8 +3374,8 @@ static void viewport(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCon checkGLcall("glViewport"); - stateblock->wineD3DDevice->posFixup[2] = 0.9 / stateblock->viewport.Width; - stateblock->wineD3DDevice->posFixup[3] = -0.9 / stateblock->viewport.Height; + stateblock->wineD3DDevice->posFixup[2] = 1.0 / stateblock->viewport.Width; + stateblock->wineD3DDevice->posFixup[3] = -1.0 / stateblock->viewport.Height; if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION))) { transform_projection(STATE_TRANSFORM(WINED3DTS_PROJECTION), stateblock, context); }

1 0

Stefan Dösinger : wined3d: Remove the D3DTTFF_PROJECTED handling from drawStridedSlow.
by Alexandre Julliard 28 Aug '07

28 Aug '07

Module: wine Branch: master Commit: 4779a27eed77c964f9f0a176616580559f055cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4779a27eed77c964f9f0a1766… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 19 19:51:17 2007 +0200 wined3d: Remove the D3DTTFF_PROJECTED handling from drawStridedSlow. --- dlls/wined3d/drawprim.c | 30 ------------------------------ 1 files changed, 0 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 4eb6786..3b45db3 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -430,36 +430,6 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData case 1: s = ptrToCoords[0]; } - /* Projected is more 'fun' - Move the last coord to the 'q' - parameter (see comments under WINED3DTSS_TEXTURETRANSFORMFLAGS */ - if ((This->stateBlock->textureState[textureNo][WINED3DTSS_TEXTURETRANSFORMFLAGS] != WINED3DTTFF_DISABLE) && - (This->stateBlock->textureState[textureNo][WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED)) { - - if (This->stateBlock->textureState[textureNo][WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED) { - switch (coordsToUse) { - case 0: /* Drop Through */ - case 1: - FIXME("WINED3DTTFF_PROJECTED but only zero or one coordinate?\n"); - break; - case 2: - q = t; - t = 0.0; - coordsToUse = 4; - break; - case 3: - q = r; - r = 0.0; - coordsToUse = 4; - break; - case 4: /* Nop here */ - break; - default: - FIXME("Unexpected WINED3DTSS_TEXTURETRANSFORMFLAGS value of %d\n", - This->stateBlock->textureState[textureNo][WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED); - } - } - } - switch (coordsToUse) { /* Supply the provided texture coords */ case WINED3DTTFF_COUNT1: VTRACE(("tex:%d, s=%f\n", textureNo, s));

1 0