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

Mikołaj Zalewski : include: Add KEY_WOW64_* defines.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: 140b259d58735f03a960031f92c7ce97d7e65373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=140b259d58735f03a960031f9… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jul 24 12:12:21 2008 +0200 include: Add KEY_WOW64_* defines. --- include/winnt.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 28a3986..e8a37f5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4566,6 +4566,9 @@ typedef struct _TAPE_GET_MEDIA_PARAMETERS { #define KEY_ENUMERATE_SUB_KEYS 0x00000008 #define KEY_NOTIFY 0x00000010 #define KEY_CREATE_LINK 0x00000020 +#define KEY_WOW64_64KEY 0x00000100 +#define KEY_WOW64_32KEY 0x00000200 +#define KEY_WOW64_RES 0x00000300 /* for RegKeyRestore flags */ #define REG_WHOLE_HIVE_VOLATILE 0x00000001

1 0

Mikołaj Zalewski : shell32: autocomplete: Don' t pass NULL pceltFetched to IEnumString_Next.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: 763018e176053b838c42e18048d5ee9dc50bcd41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=763018e176053b838c42e1804… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jul 24 11:22:48 2008 +0200 shell32: autocomplete: Don't pass NULL pceltFetched to IEnumString_Next. --- dlls/shell32/autocomplete.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 4c32b3f..5eb76f7 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -574,7 +574,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, IEnumString_Reset(This->enumstr); filled = FALSE; for(cpt = 0;;) { - hr = IEnumString_Next(This->enumstr, 1, &strs, NULL); + ULONG fetched; + hr = IEnumString_Next(This->enumstr, 1, &strs, &fetched); if (hr != S_OK) break;

1 0

Reece Dunn : comctl32: Made the button theme drawing code extensible.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: e7d22dc966c531b701fd79b77d5c201bc0465645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d22dc966c531b701fd79b77… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Tue Jul 15 09:20:14 2008 +0100 comctl32: Made the button theme drawing code extensible. --- dlls/comctl32/theme_button.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 588f1a4..54955fa 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(themingbutton); #define BUTTON_TYPE 0x0f /* bit mask for the available button types */ +typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc); + static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC) { RECT bgRect, textRect; @@ -71,21 +73,42 @@ static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC) if (hPrevFont) SelectObject(hDC, hPrevFont); } +static const pfThemedPaint btnThemedPaintFunc[BUTTON_TYPE + 1] = +{ + NULL, /* BS_PUSHBUTTON */ + NULL, /* BS_DEFPUSHBUTTON */ + NULL, /* BS_CHECKBOX */ + NULL, /* BS_AUTOCHECKBOX */ + NULL, /* BS_RADIOBUTTON */ + NULL, /* BS_3STATE */ + NULL, /* BS_AUTO3STATE */ + GB_draw, /* BS_GROUPBOX */ + NULL, /* BS_USERBUTTON */ + NULL, /* BS_AUTORADIOBUTTON */ + NULL, /* Not defined */ + NULL, /* BS_OWNERDRAW */ + NULL, /* Not defined */ + NULL, /* Not defined */ + NULL, /* Not defined */ + NULL, /* Not defined */ +}; + static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) { PAINTSTRUCT ps; HDC hDC; DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); + pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; - if ((dwStyle & BUTTON_TYPE) == BS_GROUPBOX) + if (paint) { hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); - GB_draw(theme, hwnd, hDC); + paint(theme, hwnd, hDC); if (!hParamDC) EndPaint(hwnd, &ps); + return TRUE; } - else return FALSE; /* Delegate drawing to the non-themed code. */ - return TRUE; + return FALSE; /* Delegate drawing to the non-themed code. */ } /**********************************************************************

1 0

Juan Lang : wintrust: Implement CryptSIPGetSignedDataMsg for cabinet files.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: 2a317603318d3560b4fee54b20ca961cdcf6ea38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a317603318d3560b4fee54b2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 23 17:42:32 2008 -0700 wintrust: Implement CryptSIPGetSignedDataMsg for cabinet files. Fixes a regression in installing the DirectX 9 runtime. Based on code from cabinet.dll's fdi.c, thus the healthy dose of attributions. Unfortunately there's no public API that'll get this info for me (that I know of.) --- dlls/wintrust/crypt.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 211 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index b1b7771..e2129df 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -2,6 +2,10 @@ * WinTrust Cryptography functions * * Copyright 2006 James Hawkins + * Copyright 2000-2002 Stuart Caie + * Copyright 2002 Patrik Stridvall + * Copyright 2003 Greg Turner + * 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 @@ -19,7 +23,7 @@ */ #include <stdarg.h> - +#include <stdio.h> #include "windef.h" #include "winbase.h" #include "wintrust.h" @@ -267,6 +271,207 @@ error: return ret; } +/* structure offsets */ +#define cfhead_Signature (0x00) +#define cfhead_CabinetSize (0x08) +#define cfhead_MinorVersion (0x18) +#define cfhead_MajorVersion (0x19) +#define cfhead_Flags (0x1E) +#define cfhead_SIZEOF (0x24) +#define cfheadext_HeaderReserved (0x00) +#define cfheadext_SIZEOF (0x04) +#define cfsigninfo_CertOffset (0x04) +#define cfsigninfo_CertSize (0x08) +#define cfsigninfo_SIZEOF (0x0C) + +/* flags */ +#define cfheadRESERVE_PRESENT (0x0004) + +/* endian-neutral reading of little-endian data */ +#define EndGetI32(a) ((((a)[3])<<24)|(((a)[2])<<16)|(((a)[1])<<8)|((a)[0])) +#define EndGetI16(a) ((((a)[1])<<8)|((a)[0])) + +/* For documentation purposes only: this is the structure in the reserved + * area of a signed cabinet file. The cert offset indicates where in the + * cabinet file the signature resides, and the count indicates its size. + */ +typedef struct _CAB_SIGNINFO +{ + WORD unk0; /* always 0? */ + WORD unk1; /* always 0x0010? */ + DWORD dwCertOffset; + DWORD cbCertBlock; +} CAB_SIGNINFO, *PCAB_SIGNINFO; + +static BOOL WINTRUST_GetSignedMsgFromCabFile(SIP_SUBJECTINFO *pSubjectInfo, + DWORD *pdwEncodingType, DWORD dwIndex, DWORD *pcbSignedDataMsg, + BYTE *pbSignedDataMsg) +{ + int header_resv; + LONG base_offset, cabsize; + USHORT flags; + BYTE buf[64]; + DWORD cert_offset, cert_size, dwRead; + + TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, + pcbSignedDataMsg, pbSignedDataMsg); + + /* + * FIXME: I just noticed that I am memorizing the initial file pointer + * offset and restoring it before reading in the rest of the header + * information in the cabinet. Perhaps that's correct -- that is, perhaps + * this API is supposed to support "streaming" cabinets which are embedded + * in other files, or cabinets which begin at file offsets other than zero. + * Otherwise, I should instead go to the absolute beginning of the file. + * (Either way, the semantics of wine's FDICopy require me to leave the + * file pointer where it is afterwards -- If Windows does not do so, we + * ought to duplicate the native behavior in the FDIIsCabinet API, not here. + * + * So, the answer lies in Windows; will native cabinet.dll recognize a + * cabinet "file" embedded in another file? Note that cabextract.c does + * support this, which implies that Microsoft's might. I haven't tried it + * yet so I don't know. ATM, most of wine's FDI cabinet routines (except + * this one) would not work in this way. To fix it, we could just make the + * various references to absolute file positions in the code relative to an + * initial "beginning" offset. Because the FDICopy API doesn't take a + * file-handle like this one, we would therein need to search through the + * file for the beginning of the cabinet (as we also do in cabextract.c). + * Note that this limits us to a maximum of one cabinet per. file: the first. + * + * So, in summary: either the code below is wrong, or the rest of fdi.c is + * wrong... I cannot imagine that both are correct ;) One of these flaws + * should be fixed after determining the behavior on Windows. We ought + * to check both FDIIsCabinet and FDICopy for the right behavior. + * + * -gmt + */ + + /* get basic offset & size info */ + base_offset = SetFilePointer(pSubjectInfo->hFile, 0L, NULL, SEEK_CUR); + + if (SetFilePointer(pSubjectInfo->hFile, 0, NULL, SEEK_END) == -1) + { + TRACE("seek error\n"); + return FALSE; + } + + cabsize = SetFilePointer(pSubjectInfo->hFile, 0L, NULL, SEEK_CUR); + if ((cabsize == -1) || (base_offset == -1) || + (SetFilePointer(pSubjectInfo->hFile, base_offset, NULL, SEEK_SET) == -1)) + { + TRACE("seek error\n"); + return FALSE; + } + + /* read in the CFHEADER */ + if (!ReadFile(pSubjectInfo->hFile, buf, cfhead_SIZEOF, &dwRead, NULL) || + dwRead != cfhead_SIZEOF) + { + TRACE("reading header failed\n"); + return FALSE; + } + + /* check basic MSCF signature */ + if (EndGetI32(buf+cfhead_Signature) != 0x4643534d) + { + WARN("cabinet signature not present\n"); + return FALSE; + } + + /* Ignore the number of folders and files and the set and cabinet IDs */ + + /* check the header revision */ + if ((buf[cfhead_MajorVersion] > 1) || + (buf[cfhead_MajorVersion] == 1 && buf[cfhead_MinorVersion] > 3)) + { + WARN("cabinet format version > 1.3\n"); + return FALSE; + } + + /* pull the flags out */ + flags = EndGetI16(buf+cfhead_Flags); + + if (!(flags & cfheadRESERVE_PRESENT)) + { + TRACE("no header present, not signed\n"); + return FALSE; + } + + if (!ReadFile(pSubjectInfo->hFile, buf, cfheadext_SIZEOF, &dwRead, NULL) || + dwRead != cfheadext_SIZEOF) + { + ERR("bunk reserve-sizes?\n"); + return FALSE; + } + + header_resv = EndGetI16(buf+cfheadext_HeaderReserved); + if (!header_resv) + { + TRACE("no header_resv, not signed\n"); + return FALSE; + } + else if (header_resv < cfsigninfo_SIZEOF) + { + TRACE("header_resv too small, not signed\n"); + return FALSE; + } + + if (header_resv > 60000) + { + WARN("WARNING; header reserved space > 60000\n"); + } + + if (!ReadFile(pSubjectInfo->hFile, buf, cfsigninfo_SIZEOF, &dwRead, NULL) || + dwRead != cfsigninfo_SIZEOF) + { + ERR("couldn't read reserve\n"); + return FALSE; + } + + cert_offset = EndGetI32(buf+cfsigninfo_CertOffset); + TRACE("cert_offset: %d\n", cert_offset); + cert_size = EndGetI32(buf+cfsigninfo_CertSize); + TRACE("cert_size: %d\n", cert_size); + + /* The redundant checks are to avoid wraparound */ + if (cert_offset > cabsize || cert_size > cabsize || + cert_offset + cert_size > cabsize) + { + WARN("offset beyond file, not attempting to read\n"); + return FALSE; + } + + SetFilePointer(pSubjectInfo->hFile, base_offset, NULL, SEEK_SET); + if (!pbSignedDataMsg) + { + *pcbSignedDataMsg = cert_size; + return TRUE; + } + if (*pcbSignedDataMsg < cert_size) + { + *pcbSignedDataMsg = cert_size; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + if (SetFilePointer(pSubjectInfo->hFile, cert_offset, NULL, SEEK_SET) == -1) + { + ERR("couldn't seek to cert location\n"); + return FALSE; + } + if (!ReadFile(pSubjectInfo->hFile, pbSignedDataMsg, cert_size, &dwRead, + NULL) || dwRead != cert_size) + { + ERR("couldn't read cert\n"); + return FALSE; + } + /* The encoding of the files I've seen appears to be in ASN.1 + * format, and there isn't a field indicating the type, so assume it + * always is. + */ + *pdwEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; + return TRUE; +} + /*********************************************************************** * CryptSIPGetSignedDataMsg (WINTRUST.@) */ @@ -275,6 +480,8 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn { static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47, 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; + static const GUID cabGUID = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47, + 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; BOOL ret; TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, @@ -283,6 +490,9 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn if (!memcmp(pSubjectInfo->pgSubjectType, &unknown, sizeof(unknown))) ret = WINTRUST_GetSignedMsgFromPEFile(pSubjectInfo, pdwEncodingType, dwIndex, pcbSignedDataMsg, pbSignedDataMsg); + else if (!memcmp(pSubjectInfo->pgSubjectType, &cabGUID, sizeof(cabGUID))) + ret = WINTRUST_GetSignedMsgFromCabFile(pSubjectInfo, pdwEncodingType, + dwIndex, pcbSignedDataMsg, pbSignedDataMsg); else { FIXME("unimplemented for subject type %s\n",

1 0

Juan Lang : wintrust: Don' t assume input file is a PE file in CryptSIPGetSignedDataMsg.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: c7d1d34956ab8a9759bd423ee156aa6472b80522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d1d34956ab8a9759bd423ee… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 23 17:42:09 2008 -0700 wintrust: Don't assume input file is a PE file in CryptSIPGetSignedDataMsg. --- dlls/wintrust/crypt.c | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 8819ea8..b1b7771 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -202,11 +202,9 @@ BOOL WINAPI CryptSIPCreateIndirectData(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pcb return FALSE; } -/*********************************************************************** - * CryptSIPGetSignedDataMsg (WINTRUST.@) - */ -BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEncodingType, - DWORD dwIndex, DWORD* pcbSignedDataMsg, BYTE* pbSignedDataMsg) +static BOOL WINTRUST_GetSignedMsgFromPEFile(SIP_SUBJECTINFO *pSubjectInfo, + DWORD *pdwEncodingType, DWORD dwIndex, DWORD *pcbSignedDataMsg, + BYTE *pbSignedDataMsg) { BOOL ret; WIN_CERTIFICATE *pCert = NULL; @@ -264,9 +262,34 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn } } } - error: HeapFree(GetProcessHeap(), 0, pCert); + return ret; +} + +/*********************************************************************** + * CryptSIPGetSignedDataMsg (WINTRUST.@) + */ +BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEncodingType, + DWORD dwIndex, DWORD* pcbSignedDataMsg, BYTE* pbSignedDataMsg) +{ + static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47, + 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; + BOOL ret; + + TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex, + pcbSignedDataMsg, pbSignedDataMsg); + + if (!memcmp(pSubjectInfo->pgSubjectType, &unknown, sizeof(unknown))) + ret = WINTRUST_GetSignedMsgFromPEFile(pSubjectInfo, pdwEncodingType, + dwIndex, pcbSignedDataMsg, pbSignedDataMsg); + else + { + FIXME("unimplemented for subject type %s\n", + debugstr_guid(pSubjectInfo->pgSubjectType)); + ret = FALSE; + } + TRACE("returning %d\n", ret); return ret; }

1 0

Juan Lang : crypt32: Add cab file checking to CryptSIPRetrieveSubjectGUID.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: d3beb5056ec31fa8b926f3f8639896b94d74b73e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3beb5056ec31fa8b926f3f86… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 23 21:47:42 2008 -0700 crypt32: Add cab file checking to CryptSIPRetrieveSubjectGUID. --- dlls/crypt32/sip.c | 11 ++++++++++- dlls/crypt32/tests/sip.c | 2 -- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 869e2a9..f8e8be4 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -283,6 +283,8 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid IMAGE_DOS_HEADER *dos; /* FIXME, find out if there is a name for this GUID */ static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + static const GUID cabGUID = { 0xc689aaba, 0x8e78, 0x11d0, {0x8c,0x47,0x00,0xc0,0x4f,0xc2,0x95,0xee }}; + static const BYTE cabHdr[] = { 'M','S','C','F' }; TRACE("(%s %p %p)\n", wine_dbgstr_w(FileName), hFileIn, pgSubject); @@ -330,10 +332,17 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid bRet = TRUE; goto cleanup1; } + /* Quick-n-dirty check for a cab file. FIXME: use FDIIsCabinet instead? */ + if (!memcmp(pMapped, cabHdr, sizeof(cabHdr))) + { + *pgSubject = cabGUID; + SetLastError(S_OK); + bRet = TRUE; + goto cleanup1; + } /* FIXME * There is a lot more to be checked: - * - Check for MSFC in the header * - Check for the keys CryptSIPDllIsMyFileType and CryptSIPDllIsMyFileType2 * under HKLM\Software\Microsoft\Cryptography\OID\EncodingType 0. Here are * functions listed that need check if a SIP Provider can deal with the diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 69bc18c..b01229c 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -274,10 +274,8 @@ static void test_SIPRetrieveSubjectGUID(void) SetLastError(0xdeadbeef); memset(&subject, 1, sizeof(GUID)); ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); - todo_wine ok( ret, "CryptSIPRetrieveSubjectGuid failed: %d (0x%08x)\n", GetLastError(), GetLastError() ); - todo_wine ok ( !memcmp(&subject, &cabGUID, sizeof(GUID)), "Expected GUID %s for cabinet file, not %s\n", show_guid(&cabGUID, guid1), show_guid(&subject, guid2)); /* Clean up */

1 0

Juan Lang : crypt32: Test CryptRetrieveSubjectGUID with a cab file.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: 210c91f9195019d2bed2eea511a36bc19827d623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=210c91f9195019d2bed2eea51… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 23 21:46:05 2008 -0700 crypt32: Test CryptRetrieveSubjectGUID with a cab file. --- dlls/crypt32/tests/sip.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 09d5767..69bc18c 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -2,6 +2,7 @@ * Subject Interface Package tests * * Copyright 2006 Paul Vriens + * 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 @@ -129,6 +130,14 @@ static void test_AddRemoveProvider(void) ok ( ret, "CryptSIPRemoveProvider should have succeeded\n"); } +static const BYTE cabFileData[] = { +0x4d,0x53,0x43,0x46,0x00,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x2c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x01,0x01,0x00,0x01,0x00,0x00,0x00, +0xef,0xbe,0xff,0xff,0x42,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x06,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0xf7,0x38,0x4b,0xac,0x00,0x00,0x61,0x2e,0x74,0x78, +0x74,0x00,0x6d,0x5a,0x72,0x78,0x06,0x00,0x06,0x00,0x61,0x2e,0x74,0x78,0x74,0x0a, +}; + static void test_SIPRetrieveSubjectGUID(void) { BOOL ret; @@ -140,6 +149,7 @@ static void test_SIPRetrieveSubjectGUID(void) static const WCHAR deadbeef[] = { 'c',':','\\','d','e','a','d','b','e','e','f','.','d','b','f',0 }; /* Couldn't find a name for this GUID, it's the one used for 95% of the files */ static const GUID unknownGUID = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + static const GUID cabGUID = { 0xc689aaba, 0x8e78, 0x11d0, {0x8c,0x47,0x00,0xc0,0x4f,0xc2,0x95,0xee }}; static CHAR regeditPath[MAX_PATH]; static WCHAR regeditPathW[MAX_PATH]; static CHAR path[MAX_PATH]; @@ -255,6 +265,23 @@ static void test_SIPRetrieveSubjectGUID(void) /* Clean up */ DeleteFileA(tempfile); + + /* Create a .cab file */ + file = CreateFileW(tempfileW, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + WriteFile(file, cabFileData, sizeof(cabFileData), &written, NULL); + CloseHandle(file); + + SetLastError(0xdeadbeef); + memset(&subject, 1, sizeof(GUID)); + ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); + todo_wine + ok( ret, "CryptSIPRetrieveSubjectGuid failed: %d (0x%08x)\n", + GetLastError(), GetLastError() ); + todo_wine + ok ( !memcmp(&subject, &cabGUID, sizeof(GUID)), + "Expected GUID %s for cabinet file, not %s\n", show_guid(&cabGUID, guid1), show_guid(&subject, guid2)); + /* Clean up */ + DeleteFileW(tempfileW); } static void test_SIPLoad(void)

1 0

Juan Lang : crypt32: Fix GUID output for failing tests by passing buffer to output function.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: 238ccdf2062f9ad01aaf183cd7010ae86a96e456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=238ccdf2062f9ad01aaf183cd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 23 17:40:33 2008 -0700 crypt32: Fix GUID output for failing tests by passing buffer to output function. --- dlls/crypt32/tests/sip.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index d47b6fc..09d5767 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -35,17 +35,15 @@ static BOOL (WINAPI * funcCryptSIPCreateIndirectData)(SIP_SUBJECTINFO *,DWORD *, static BOOL (WINAPI * funcCryptSIPVerifyIndirectData)(SIP_SUBJECTINFO *,SIP_INDIRECT_DATA *); static BOOL (WINAPI * funcCryptSIPRemoveSignedDataMsg)(SIP_SUBJECTINFO *,DWORD); -static char *show_guid(const GUID *guid) +static char *show_guid(const GUID *guid, char *buf) { - static char guidstring[39]; - - sprintf(guidstring, + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - return guidstring; + return buf; } static void test_AddRemoveProvider(void) @@ -147,6 +145,7 @@ static void test_SIPRetrieveSubjectGUID(void) static CHAR path[MAX_PATH]; static CHAR tempfile[MAX_PATH]; static WCHAR tempfileW[MAX_PATH]; + static char guid1[39], guid2[39]; DWORD written; /* NULL check */ @@ -165,7 +164,7 @@ static void test_SIPRetrieveSubjectGUID(void) ok (GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d.\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for c:\\deadbeef.dbf, not %s\n", show_guid(&subject)); + "Expected a NULL GUID for c:\\deadbeef.dbf, not %s\n", show_guid(&subject, guid1)); /* Now with an executable that should exist * @@ -184,7 +183,7 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(regeditPathW, NULL, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), - "Expected (%s), got (%s).\n", show_guid(&unknownGUID), show_guid(&subject)); + "Expected (%s), got (%s).\n", show_guid(&unknownGUID, guid1), show_guid(&subject, guid2)); /* The same thing but now with a handle instead of a filename */ file = CreateFileA(regeditPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -193,7 +192,7 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(NULL, file, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), - "Expected (%s), got (%s).\n", show_guid(&unknownGUID), show_guid(&subject)); + "Expected (%s), got (%s).\n", show_guid(&unknownGUID, guid1), show_guid(&subject, guid2)); CloseHandle(file); /* And both */ @@ -203,7 +202,7 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(regeditPathW, file, &subject); ok ( ret, "Expected CryptSIPRetrieveSubjectGuid to succeed\n"); ok ( !memcmp(&subject, &unknownGUID, sizeof(GUID)), - "Expected (%s), got (%s).\n", show_guid(&unknownGUID), show_guid(&subject)); + "Expected (%s), got (%s).\n", show_guid(&unknownGUID, guid1), show_guid(&subject, guid2)); CloseHandle(file); /* Now with an empty file */ @@ -222,7 +221,7 @@ static void test_SIPRetrieveSubjectGUID(void) GetLastError() == ERROR_SUCCESS /* Win98 */, "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER or ERROR_SUCCESS, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject)); + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject, guid1)); /* Use a file with a size of 3 (at least < 4) */ file = CreateFileA(tempfile, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -237,7 +236,7 @@ static void test_SIPRetrieveSubjectGUID(void) GetLastError() == ERROR_SUCCESS /* Win98 */, "Expected ERROR_INVALID_PARAMETER or ERROR_SUCCESS, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject)); + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject, guid1)); /* And now >= 4 */ file = CreateFileA(tempfile, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -252,7 +251,7 @@ static void test_SIPRetrieveSubjectGUID(void) GetLastError() == ERROR_SUCCESS /* Win98 */, "Expected TRUST_E_SUBJECT_FORM_UNKNOWN or ERROR_SUCCESS, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), - "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject)); + "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject, guid1)); /* Clean up */ DeleteFileA(tempfile);

1 0

Stefan Dösinger : wined3d: Make the MAC ARBvp implementation happy about ARL.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: 5a6b4e9f476237dc8b69cb84156f3a9dc2d69d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6b4e9f476237dc8b69cb841… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 17 15:58:23 2008 -0500 wined3d: Make the MAC ARBvp implementation happy about ARL. --- dlls/wined3d/arb_program_shader.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 22a8b55..2de05bf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1718,15 +1718,30 @@ void vshader_hw_map2gl(SHADER_OPCODE_ARG* arg) { unsigned int i; if ((curOpcode->opcode == WINED3DSIO_MOV && dst_regtype == WINED3DSPR_ADDR) || curOpcode->opcode == WINED3DSIO_MOVA) { + memset(tmpLine, 0, sizeof(tmpLine)); if(shader->rel_offset) { - memset(tmpLine, 0, sizeof(tmpLine)); vshader_program_add_param(arg, src[0], TRUE, tmpLine); shader_addline(buffer, "ADD TMP.x, %s, helper_const.z;\n", tmpLine); shader_addline(buffer, "ARL A0.x, TMP.x;\n"); - return; } else { - strcpy(tmpLine, "ARL"); + /* Apple's ARB_vertex_program implementation does not accept an ARL source argument + * with more than one component. Thus replicate the first source argument over all + * 4 components. For example, .xyzw -> .x (or better: .xxxx), .zwxy -> .z, etc) + */ + DWORD parm = src[0] & ~(WINED3DVS_SWIZZLE_MASK); + if((src[0] & WINED3DVS_X_W) == WINED3DVS_X_W) { + parm |= WINED3DVS_X_W | WINED3DVS_Y_W | WINED3DVS_Z_W | WINED3DVS_W_W; + } else if((src[0] & WINED3DVS_X_Z) == WINED3DVS_X_Z) { + parm |= WINED3DVS_X_Z | WINED3DVS_Y_Z | WINED3DVS_Z_Z | WINED3DVS_W_Z; + } else if((src[0] & WINED3DVS_X_Y) == WINED3DVS_X_Y) { + parm |= WINED3DVS_X_Y | WINED3DVS_Y_Y | WINED3DVS_Z_Y | WINED3DVS_W_Y; + } else if((src[0] & WINED3DVS_X_X) == WINED3DVS_X_X) { + parm |= WINED3DVS_X_X | WINED3DVS_Y_X | WINED3DVS_Z_X | WINED3DVS_W_X; + } + vshader_program_add_param(arg, parm, TRUE, tmpLine); + shader_addline(buffer, "ARL A0.x, %s;\n", tmpLine); } + return; } else strcpy(tmpLine, curOpcode->glname);

1 0

Stefan Dösinger : wined3d: ATI2N support using GL_EXT_texture_compression_rgtc.
by Alexandre Julliard 24 Jul '08

24 Jul '08

Module: wine Branch: master Commit: 726d9d47afb278e61cd86c4f05a5c4fbf671b3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=726d9d47afb278e61cd86c4f0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 23 10:39:04 2008 -0500 wined3d: ATI2N support using GL_EXT_texture_compression_rgtc. --- dlls/wined3d/arb_program_shader.c | 23 +++++++++++++++-------- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/glsl_shader.c | 33 ++++++++++++++++++++++++--------- dlls/wined3d/utils.c | 7 ++++++- include/wine/wined3d_gl.h | 9 +++++++++ 5 files changed, 56 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9f074ad..22a8b55 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -820,16 +820,23 @@ static void shader_arb_color_correction(SHADER_OPCODE_ARG* arg) { /* GL_ATI_texture_compression_3dc returns the two channels as luminance-alpha, * which means the first one is replicated accross .rgb, and the 2nd one is in * .a. We need the 2nd in .g + * + * GL_EXT_texture_compression_rgtc returns the values in .rg, however, they + * are swapped compared to d3d. So swap red and green. */ - if(strlen(writemask) == 5) { - /* Swap y and z (U and L), and do a sign conversion on x and the new y(V and U) */ - shader_addline(arg->buffer, "MOV %s.%c, %s.%c;\n", - reg, writemask[2], reg, writemask[4]); - } else if(strlen(writemask) == 2) { - /* Nothing to do */ + if(GL_SUPPORT(EXT_TEXTURE_COMPRESSION_RGTC)) { + shader_addline(arg->buffer, "SWZ %s, %s, %c, %c, 1, 0;\n", + reg, reg, writemask[2], writemask[1]); } else { - /* This is bad: We have VL, but we need VU */ - FIXME("2 or 3 components sampled from a converted ATI2N texture\n"); + if(strlen(writemask) == 5) { + shader_addline(arg->buffer, "MOV %s.%c, %s.%c;\n", + reg, writemask[2], reg, writemask[4]); + } else if(strlen(writemask) == 2) { + /* Nothing to do */ + } else { + /* This is bad: We have VL, but we need VU */ + FIXME("2 or 3 components sampled from a converted ATI2N texture\n"); + } } break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f4bc0ee..a95c778 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -105,6 +105,7 @@ static const struct { {"GL_EXT_stencil_wrap", EXT_STENCIL_WRAP, 0 }, {"GL_EXT_texture3D", EXT_TEXTURE3D, MAKEDWORD_VERSION(1, 2) }, {"GL_EXT_texture_compression_s3tc", EXT_TEXTURE_COMPRESSION_S3TC, 0 }, + {"GL_EXT_texture_compression_rgtc", EXT_TEXTURE_COMPRESSION_RGTC, 0 }, {"GL_EXT_texture_env_add", EXT_TEXTURE_ENV_ADD, 0 }, {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE, 0 }, {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3, 0 }, @@ -2374,7 +2375,7 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) /* Vendor specific formats */ case WINED3DFMT_ATI2N: - if(GL_SUPPORT(ATI_TEXTURE_COMPRESSION_3DC)) { + if(GL_SUPPORT(ATI_TEXTURE_COMPRESSION_3DC) || GL_SUPPORT(EXT_TEXTURE_COMPRESSION_RGTC)) { TRACE_(d3d_caps)("[OK]\n"); return TRUE; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7a20ae1..ce84ea7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1348,19 +1348,34 @@ static void shader_glsl_color_correction(SHADER_OPCODE_ARG* arg) { /* GL_ATI_texture_compression_3dc returns the two channels as luminance-alpha, * which means the first one is replicated accross .rgb, and the 2nd one is in * .a. We need the 2nd in .g + * + * GL_EXT_texture_compression_rgtc returns the values in .rg, however, they + * are swapped compared to d3d. So swap red and green. */ mask = shader_glsl_add_dst_param(arg, arg->dst, WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1, &dst_param); mask_size = shader_glsl_get_write_mask_size(mask); - if(mask_size == 4) { - /* Swap y and z (U and L), and do a sign conversion on x and the new y(V and U) */ - shader_addline(arg->buffer, "%s.%c = %s.%c;\n", - dst_param.reg_name, dst_param.mask_str[2], - dst_param.reg_name, dst_param.mask_str[4]); - } else if(mask_size == 1) { - /* Nothing to do */ + if(GL_SUPPORT(EXT_TEXTURE_COMPRESSION_RGTC)) { + if(mask_size >= 2) { + shader_addline(arg->buffer, "%s.%c%c = %s.%c%c;\n", + dst_param.reg_name, dst_param.mask_str[1], + dst_param.mask_str[2], + dst_param.reg_name, dst_param.mask_str[2], + dst_param.mask_str[1]); + } else { + FIXME("%u components sampled from a converted ATI2N texture\n", mask_size); + } } else { - FIXME("%u components sampled from a converted ATI2N texture\n", mask_size); - /* This is bad: We have .r[gb], but we need .ra */ + if(mask_size == 4) { + /* Swap y and z (U and L), and do a sign conversion on x and the new y(V and U) */ + shader_addline(arg->buffer, "%s.%c = %s.%c;\n", + dst_param.reg_name, dst_param.mask_str[2], + dst_param.reg_name, dst_param.mask_str[4]); + } else if(mask_size == 1) { + /* Nothing to do */ + } else { + FIXME("%u components sampled from a converted ATI2N texture\n", mask_size); + /* This is bad: We have .r[gb], but we need .ra */ + } } break; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 370f50b..da08d4f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -395,7 +395,12 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) */ } - if(GL_SUPPORT(ATI_TEXTURE_COMPRESSION_3DC)) { + if(GL_SUPPORT(EXT_TEXTURE_COMPRESSION_RGTC)) { + dst = getFmtIdx(WINED3DFMT_ATI2N); + gl_info->gl_formats[dst].glInternal = GL_COMPRESSED_RED_GREEN_RGTC2_EXT; + gl_info->gl_formats[dst].glGammaInternal = GL_COMPRESSED_RED_GREEN_RGTC2_EXT; + gl_info->gl_formats[dst].conversion_group= WINED3DFMT_ATI2N; + } else if(GL_SUPPORT(ATI_TEXTURE_COMPRESSION_3DC)) { dst = getFmtIdx(WINED3DFMT_ATI2N); gl_info->gl_formats[dst].glInternal = GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI; gl_info->gl_formats[dst].glGammaInternal = GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI; diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 533c991..ac4967d 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -2996,6 +2996,14 @@ typedef void (WINE_GLAPI *PGLFNSETFRAGMENTSHADERCONSTANTATI) (GLuint dst, const #define GL_ATI_texture_compression_3dc #define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837 #endif +/* GL_EXT_texture_compression_rgtc */ +#ifndef GL_EXT_texture_compression_rgtc +#define GL_EXT_texture_compression_rgtc +#define GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB +#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC +#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD +#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE +#endif /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 @@ -3327,6 +3335,7 @@ typedef enum _GL_SupportedExt { EXT_STENCIL_WRAP, EXT_TEXTURE3D, EXT_TEXTURE_COMPRESSION_S3TC, + EXT_TEXTURE_COMPRESSION_RGTC, EXT_TEXTURE_FILTER_ANISOTROPIC, EXT_TEXTURE_LOD, EXT_TEXTURE_LOD_BIAS,

1 0