Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 74103: [NTOS:OB] - Define and use a pool tag for directory security descriptors. - Use a custom security descriptor to create the KernelObjects directory.
by ekohl＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: ekohl Date: Sun Mar 5 21:28:10 2017 New Revision: 74103 URL: http://svn.reactos.org/svn/reactos?rev=74103&view=rev Log: [NTOS:OB] - Define and use a pool tag for directory security descriptors. - Use a custom security descriptor to create the KernelObjects directory. Modified: trunk/reactos/ntoskrnl/include/internal/tag.h trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] Sun Mar 5 21:28:10 2017 @@ -150,6 +150,8 @@ /* Object Manager Tags */ #define OB_NAME_TAG 'mNbO' #define OB_DIR_TAG 'iDbO' +#define TAG_OB_DIR_SD 'sDbO' + /* formerly located in ps/cid.c */ #define TAG_CIDOBJECT 'ODIC' Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] Sun Mar 5 21:28:10 2017 @@ -53,6 +53,82 @@ ULONG ObpInitializationPhase; /* PRIVATE FUNCTIONS *********************************************************/ + +static +NTSTATUS +NTAPI +INIT_FUNCTION +ObpCreateKernelObjectsSD(OUT PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + ULONG AclLength; + PACL Dacl; + NTSTATUS Status; + + /* Initialize the SD */ + Status = RtlCreateSecurityDescriptor(SecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + return Status; + + /* Allocate the DACL */ + AclLength = sizeof(ACL) + + sizeof(ACE) + RtlLengthSid(SeWorldSid) + + sizeof(ACE) + RtlLengthSid(SeAliasAdminsSid) + + sizeof(ACE) + RtlLengthSid(SeLocalSystemSid); + + Dacl = ExAllocatePoolWithTag(PagedPool, AclLength, TAG_OB_DIR_SD); + if (Dacl == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Initialize the DACL */ + RtlCreateAcl(Dacl, AclLength, ACL_REVISION); + + /* Add the ACEs */ + RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_READ, + SeWorldSid); + + RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + SeAliasAdminsSid); + + RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + SeLocalSystemSid); + + /* Attach the DACL to the SD */ + Status = RtlSetDaclSecurityDescriptor(SecurityDescriptor, + TRUE, + Dacl, + FALSE); + + return Status; +} + +static +VOID +NTAPI +INIT_FUNCTION +ObpFreeKernelObjectsSD(IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + PACL Dacl = NULL; + BOOLEAN DaclPresent, Defaulted; + NTSTATUS Status; + + Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor, + &DaclPresent, + &Dacl, + &Defaulted); + if (NT_SUCCESS(Status) && Dacl != NULL) + { + ExFreePool(Dacl); + } +} BOOLEAN INIT_FUNCTION @@ -136,6 +212,7 @@ POBJECT_HEADER Header; POBJECT_HEADER_CREATOR_INFO CreatorInfo; POBJECT_HEADER_NAME_INFO NameInfo; + SECURITY_DESCRIPTOR KernelObjectsSD; NTSTATUS Status; /* Check if this is actually Phase 1 initialization */ @@ -258,25 +335,31 @@ Status = NtClose(Handle); if (!NT_SUCCESS(Status)) return FALSE; - /* Initialize Object Types directory attributes */ + /* Create a custom security descriptor for the KernelObjects directory */ + Status = ObpCreateKernelObjectsSD(&KernelObjectsSD); + if (!NT_SUCCESS(Status)) + return FALSE; + + /* Initialize the KernelObjects directory attributes */ RtlInitUnicodeString(&Name, L"\\KernelObjects"); InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, NULL, - NULL); - + &KernelObjectsSD); + /* Create the directory */ Status = NtCreateDirectoryObject(&Handle, DIRECTORY_ALL_ACCESS, &ObjectAttributes); - if (!NT_SUCCESS(Status)) return FALSE; - + ObpFreeKernelObjectsSD(&KernelObjectsSD); + if (!NT_SUCCESS(Status)) return FALSE; + /* Close the extra handle */ Status = NtClose(Handle); if (!NT_SUCCESS(Status)) return FALSE; - /* Initialize Object Types directory attributes */ + /* Initialize ObjectTypes directory attributes */ RtlInitUnicodeString(&Name, L"\\ObjectTypes"); InitializeObjectAttributes(&ObjectAttributes, &Name, Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Sun Mar 5 21:28:10 2017 @@ -55,10 +55,10 @@ sizeof(ACE) + RtlLengthSid(SeLocalSystemSid) + sizeof(ACE) + RtlLengthSid(SeCreatorOwnerSid); - Dacl = ExAllocatePool(PagedPool, AclLength); + Dacl = ExAllocatePoolWithTag(PagedPool, AclLength, TAG_OB_DIR_SD); if (Dacl == NULL) { - return STATUS_NO_MEMORY; + return STATUS_INSUFFICIENT_RESOURCES; } /* Initialize the DACL */

1 0

[akhaldi] 74102: [CRYPT32_WINETEST] Sync with Wine Staging 2.2. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:22:31 2017 New Revision: 74102 URL: http://svn.reactos.org/svn/reactos?rev=74102&view=rev Log: [CRYPT32_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/crypt32/base64.c trunk/rostests/winetests/crypt32/chain.c trunk/rostests/winetests/crypt32/sip.c trunk/rostests/winetests/crypt32/store.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/crypt32/base64.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/base64.… Modified: trunk/rostests/winetests/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/chain.c… Modified: trunk/rostests/winetests/crypt32/sip.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/sip.c?r… Modified: trunk/rostests/winetests/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/store.c…

1 0

[akhaldi] 74101: [CRYPT32] Sync with Wine Staging 2.2. CORE-12823 a7d1d77 crypt32: Recognize sha256/384/512 KEY OIDs. e376123 crypt32: Remove unused parameter and dead code. 254eb21 crypt32: Fix wr...
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:21:36 2017 New Revision: 74101 URL: http://svn.reactos.org/svn/reactos?rev=74101&view=rev Log: [CRYPT32] Sync with Wine Staging 2.2. CORE-12823 a7d1d77 crypt32: Recognize sha256/384/512 KEY OIDs. e376123 crypt32: Remove unused parameter and dead code. 254eb21 crypt32: Fix wrong Base64 trailer WCHAR constants. a2f2de1 crypt32: CryptStringToBinary accepts any header. 552820a crypt32: Fix Base64 issues in CryptStringToBinary. e353ab6 crypt32: Base64 header requires a space. Modified: trunk/reactos/dll/win32/crypt32/base64.c trunk/reactos/dll/win32/crypt32/oid.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/crypt32/base64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/base64.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/base64.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/base64.c [iso-8859-1] Sun Mar 5 21:21:36 2017 @@ -24,10 +24,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); #define CERT_HEADER "-----BEGIN CERTIFICATE-----" -#define CERT_HEADER_START "-----BEGIN" +#define CERT_HEADER_START "-----BEGIN " #define CERT_DELIMITER "-----" #define CERT_TRAILER "-----END CERTIFICATE-----" -#define CERT_TRAILER_START "-----END" +#define CERT_TRAILER_START "-----END " #define CERT_REQUEST_HEADER "-----BEGIN NEW CERTIFICATE REQUEST-----" #define CERT_REQUEST_TRAILER "-----END NEW CERTIFICATE REQUEST-----" #define X509_HEADER "-----BEGIN X509 CRL-----" @@ -37,14 +37,14 @@ '-','-','-','-','-','B','E','G','I','N',' ','C','E','R','T','I','F','I','C', 'A','T','E','-','-','-','-','-',0 }; static const WCHAR CERT_HEADER_START_W[] = { -'-','-','-','-','-','B','E','G','I','N',0 }; +'-','-','-','-','-','B','E','G','I','N',' ',0 }; static const WCHAR CERT_DELIMITER_W[] = { '-','-','-','-','-',0 }; static const WCHAR CERT_TRAILER_W[] = { -'-','-','-','-','-','E','N','D',0 }; -static const WCHAR CERT_TRAILER_START_W[] = { '-','-','-','-','-','E','N','D',' ','C','E','R','T','I','F','I','C','A','T', 'E','-','-','-','-','-',0 }; +static const WCHAR CERT_TRAILER_START_W[] = { +'-','-','-','-','-','E','N','D',' ',0 }; static const WCHAR CERT_REQUEST_HEADER_W[] = { '-','-','-','-','-','B','E','G','I','N',' ','N','E','W',' ','C','E','R','T', 'I','F','I','C','A','T','E','R','E','Q','U','E','S','T','-','-','-','-','-',0 }; @@ -477,9 +477,13 @@ return encoder(pbBinary, cbBinary, dwFlags, pszString, pcchString); } -static inline BYTE decodeBase64Byte(int c) -{ - BYTE ret; +#define BASE64_DECODE_PADDING 0x100 +#define BASE64_DECODE_WHITESPACE 0x200 +#define BASE64_DECODE_INVALID 0x300 + +static inline int decodeBase64Byte(int c) +{ + int ret = BASE64_DECODE_INVALID; if (c >= 'A' && c <= 'Z') ret = c - 'A'; @@ -491,76 +495,11 @@ ret = 62; else if (c == '/') ret = 63; - else - ret = 64; - return ret; -} - -static LONG decodeBase64Block(const char *in_buf, int in_len, - const char **nextBlock, PBYTE out_buf, DWORD *out_len) -{ - int len = in_len; - const char *d = in_buf; - int ip0, ip1, ip2, ip3; - - if (len < 4) - return ERROR_INVALID_DATA; - - if (d[2] == '=') - { - if ((ip0 = decodeBase64Byte(d[0])) > 63) - return ERROR_INVALID_DATA; - if ((ip1 = decodeBase64Byte(d[1])) > 63) - return ERROR_INVALID_DATA; - - if (out_buf) - out_buf[0] = (ip0 << 2) | (ip1 >> 4); - *out_len = 1; - } - else if (d[3] == '=') - { - if ((ip0 = decodeBase64Byte(d[0])) > 63) - return ERROR_INVALID_DATA; - if ((ip1 = decodeBase64Byte(d[1])) > 63) - return ERROR_INVALID_DATA; - if ((ip2 = decodeBase64Byte(d[2])) > 63) - return ERROR_INVALID_DATA; - - if (out_buf) - { - out_buf[0] = (ip0 << 2) | (ip1 >> 4); - out_buf[1] = (ip1 << 4) | (ip2 >> 2); - } - *out_len = 2; - } - else - { - if ((ip0 = decodeBase64Byte(d[0])) > 63) - return ERROR_INVALID_DATA; - if ((ip1 = decodeBase64Byte(d[1])) > 63) - return ERROR_INVALID_DATA; - if ((ip2 = decodeBase64Byte(d[2])) > 63) - return ERROR_INVALID_DATA; - if ((ip3 = decodeBase64Byte(d[3])) > 63) - return ERROR_INVALID_DATA; - - if (out_buf) - { - out_buf[0] = (ip0 << 2) | (ip1 >> 4); - out_buf[1] = (ip1 << 4) | (ip2 >> 2); - out_buf[2] = (ip2 << 6) | ip3; - } - *out_len = 3; - } - if (len >= 6 && d[4] == '\r' && d[5] == '\n') - *nextBlock = d + 6; - else if (len >= 5 && d[4] == '\n') - *nextBlock = d + 5; - else if (len >= 4 && d[4]) - *nextBlock = d + 4; - else - *nextBlock = NULL; - return ERROR_SUCCESS; + else if (c == '=') + ret = BASE64_DECODE_PADDING; + else if (c == ' ' || c == '\t' || c == '\r' || c == '\n') + ret = BASE64_DECODE_WHITESPACE; + return ret; } /* Unlike CryptStringToBinaryA, cchString is guaranteed to be the length of the @@ -569,46 +508,101 @@ typedef LONG (*StringToBinaryAFunc)(LPCSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags); +static LONG Base64ToBinary(const void* pszString, BOOL wide, DWORD cchString, + BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) +{ + DWORD cbIn, cbValid, cbOut, hasPadding; + BYTE block[4]; + for (cbIn = cbValid = cbOut = hasPadding = 0; cbIn < cchString; ++cbIn) + { + int c = wide ? (int)((WCHAR*)pszString)[cbIn] : (int)((char*)pszString)[cbIn]; + int d = decodeBase64Byte(c); + if (d == BASE64_DECODE_INVALID) + goto invalid; + if (d == BASE64_DECODE_WHITESPACE) + continue; + + /* When padding starts, data is not acceptable */ + if (hasPadding && d != BASE64_DECODE_PADDING) + goto invalid; + + /* Padding after a full block (like "VVVV=") is ok and stops decoding */ + if (d == BASE64_DECODE_PADDING && (cbValid & 3) == 0) + break; + + cbValid += 1; + + if (d == BASE64_DECODE_PADDING) + { + hasPadding = 1; + /* When padding reaches a full block, stop decoding */ + if ((cbValid & 3) == 0) + break; + continue; + } + + /* cbOut is incremented in the 4-char block as follows: "1-23" */ + if ((cbValid & 3) != 2) + cbOut += 1; + } + /* Fail if the block has bad padding; omitting padding is fine */ + if ((cbValid & 3) != 0 && hasPadding) + goto invalid; + /* Check available buffer size */ + if (pbBinary && *pcbBinary && cbOut > *pcbBinary) + goto overflow; + /* Convert the data; this step depends on the validity checks above! */ + if (pbBinary) for (cbIn = cbValid = cbOut = 0; cbIn < cchString; ++cbIn) + { + int c = wide ? (int)((WCHAR*)pszString)[cbIn] : (int)((char*)pszString)[cbIn]; + int d = decodeBase64Byte(c); + if (d == BASE64_DECODE_WHITESPACE) + continue; + if (d == BASE64_DECODE_PADDING) + break; + block[cbValid & 3] = d; + cbValid += 1; + switch (cbValid & 3) { + case 1: + pbBinary[cbOut++] = (block[0] << 2); + break; + case 2: + pbBinary[cbOut-1] = (block[0] << 2) | (block[1] >> 4); + break; + case 3: + pbBinary[cbOut++] = (block[1] << 4) | (block[2] >> 2); + break; + case 0: + pbBinary[cbOut++] = (block[2] << 6) | (block[3] >> 0); + break; + } + } + *pcbBinary = cbOut; + if (pdwSkip) + *pdwSkip = 0; + if (pdwFlags) + *pdwFlags = CRYPT_STRING_BASE64; + return ERROR_SUCCESS; +overflow: + return ERROR_INSUFFICIENT_BUFFER; +invalid: + *pcbBinary = cbOut; + return ERROR_INVALID_DATA; +} + static LONG Base64ToBinaryA(LPCSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { - LONG ret = ERROR_SUCCESS; - const char *nextBlock; - DWORD outLen = 0; - - nextBlock = pszString; - while (nextBlock && !ret) - { - DWORD len = 0; - - ret = decodeBase64Block(nextBlock, cchString - (nextBlock - pszString), - &nextBlock, pbBinary ? pbBinary + outLen : NULL, &len); - if (!ret) - outLen += len; - if (cchString - (nextBlock - pszString) <= 0) - nextBlock = NULL; - } - *pcbBinary = outLen; - if (!ret) - { - if (pdwSkip) - *pdwSkip = 0; - if (pdwFlags) - *pdwFlags = CRYPT_STRING_BASE64; - } - else if (ret == ERROR_INSUFFICIENT_BUFFER) - { - if (!pbBinary) - ret = ERROR_SUCCESS; - } - return ret; + return Base64ToBinary(pszString, FALSE, cchString, pbBinary, pcbBinary, pdwSkip, pdwFlags); } static LONG Base64WithHeaderAndTrailerToBinaryA(LPCSTR pszString, - DWORD cchString, LPCSTR header, LPCSTR trailer, BYTE *pbBinary, - DWORD *pcbBinary, DWORD *pdwSkip, BOOL exactHeaderAndTrailerMatch) + DWORD cchString, BYTE *pbBinary, + DWORD *pcbBinary, DWORD *pdwSkip) { LONG ret; + LPCSTR header = CERT_HEADER_START; + LPCSTR trailer = CERT_TRAILER_START; LPCSTR headerBegins; LPCSTR dataBegins; @@ -627,43 +621,20 @@ } dataBegins = headerBegins + strlen(header); - if (!exactHeaderAndTrailerMatch) - { - if ((dataBegins = strstr(dataBegins, CERT_DELIMITER))) - { - dataBegins += strlen(CERT_DELIMITER); - } - else - { - return ERROR_INVALID_DATA; - } - } + if (!(dataBegins = strstr(dataBegins, CERT_DELIMITER))) + { + return ERROR_INVALID_DATA; + } + dataBegins += strlen(CERT_DELIMITER); if (*dataBegins == '\r') dataBegins++; if (*dataBegins == '\n') dataBegins++; - if (exactHeaderAndTrailerMatch) - { - trailerBegins = pszString + cchString - strlen(trailer); - if (pszString[cchString - 1] == '\n') trailerBegins--; - if (pszString[cchString - 2] == '\r') trailerBegins--; - - if (*(trailerBegins-1) == '\n') trailerBegins--; - if (*(trailerBegins-1) == '\r') trailerBegins--; - - if (!strncmp(trailerBegins, trailer, strlen(trailer))) - { - return ERROR_INVALID_DATA; - } - } - else - { - if (!(trailerBegins = strstr(dataBegins, trailer))) - { - return ERROR_INVALID_DATA; - } - if (*(trailerBegins-1) == '\n') trailerBegins--; - if (*(trailerBegins-1) == '\r') trailerBegins--; - } + if (!(trailerBegins = strstr(dataBegins, trailer))) + { + return ERROR_INVALID_DATA; + } + if (*(trailerBegins-1) == '\n') trailerBegins--; + if (*(trailerBegins-1) == '\r') trailerBegins--; if (pdwSkip) *pdwSkip = headerBegins - pszString; @@ -680,7 +651,7 @@ BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - CERT_HEADER_START, CERT_TRAILER_START, pbBinary, pcbBinary, pdwSkip, FALSE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64HEADER; @@ -691,7 +662,7 @@ BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - CERT_REQUEST_HEADER, CERT_REQUEST_TRAILER, pbBinary, pcbBinary, pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64REQUESTHEADER; @@ -702,7 +673,7 @@ BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - X509_HEADER, X509_TRAILER, pbBinary, pcbBinary, pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64X509CRLHEADER; @@ -824,75 +795,6 @@ return ret == ERROR_SUCCESS; } -static LONG decodeBase64BlockW(const WCHAR *in_buf, int in_len, - const WCHAR **nextBlock, PBYTE out_buf, DWORD *out_len) -{ - int len = in_len, i; - const WCHAR *d = in_buf; - int ip0, ip1, ip2, ip3; - - if (len < 4) - return ERROR_INVALID_DATA; - - i = 0; - if (d[2] == '=') - { - if ((ip0 = decodeBase64Byte(d[0])) > 63) - return ERROR_INVALID_DATA; - if ((ip1 = decodeBase64Byte(d[1])) > 63) - return ERROR_INVALID_DATA; - - if (out_buf) - out_buf[i] = (ip0 << 2) | (ip1 >> 4); - i++; - } - else if (d[3] == '=') - { - if ((ip0 = decodeBase64Byte(d[0])) > 63) - return ERROR_INVALID_DATA; - if ((ip1 = decodeBase64Byte(d[1])) > 63) - return ERROR_INVALID_DATA; - if ((ip2 = decodeBase64Byte(d[2])) > 63) - return ERROR_INVALID_DATA; - - if (out_buf) - { - out_buf[i + 0] = (ip0 << 2) | (ip1 >> 4); - out_buf[i + 1] = (ip1 << 4) | (ip2 >> 2); - } - i += 2; - } - else - { - if ((ip0 = decodeBase64Byte(d[0])) > 63) - return ERROR_INVALID_DATA; - if ((ip1 = decodeBase64Byte(d[1])) > 63) - return ERROR_INVALID_DATA; - if ((ip2 = decodeBase64Byte(d[2])) > 63) - return ERROR_INVALID_DATA; - if ((ip3 = decodeBase64Byte(d[3])) > 63) - return ERROR_INVALID_DATA; - - if (out_buf) - { - out_buf[i + 0] = (ip0 << 2) | (ip1 >> 4); - out_buf[i + 1] = (ip1 << 4) | (ip2 >> 2); - out_buf[i + 2] = (ip2 << 6) | ip3; - } - i += 3; - } - if (len >= 6 && d[4] == '\r' && d[5] == '\n') - *nextBlock = d + 6; - else if (len >= 5 && d[4] == '\n') - *nextBlock = d + 5; - else if (len >= 4 && d[4]) - *nextBlock = d + 4; - else - *nextBlock = NULL; - *out_len = i; - return ERROR_SUCCESS; -} - /* Unlike CryptStringToBinaryW, cchString is guaranteed to be the length of the * string to convert. */ @@ -902,43 +804,16 @@ static LONG Base64ToBinaryW(LPCWSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { - LONG ret = ERROR_SUCCESS; - const WCHAR *nextBlock; - DWORD outLen = 0; - - nextBlock = pszString; - while (nextBlock && !ret) - { - DWORD len = 0; - - ret = decodeBase64BlockW(nextBlock, cchString - (nextBlock - pszString), - &nextBlock, pbBinary ? pbBinary + outLen : NULL, &len); - if (!ret) - outLen += len; - if (cchString - (nextBlock - pszString) <= 0) - nextBlock = NULL; - } - *pcbBinary = outLen; - if (!ret) - { - if (pdwSkip) - *pdwSkip = 0; - if (pdwFlags) - *pdwFlags = CRYPT_STRING_BASE64; - } - else if (ret == ERROR_INSUFFICIENT_BUFFER) - { - if (!pbBinary) - ret = ERROR_SUCCESS; - } - return ret; + return Base64ToBinary(pszString, TRUE, cchString, pbBinary, pcbBinary, pdwSkip, pdwFlags); } static LONG Base64WithHeaderAndTrailerToBinaryW(LPCWSTR pszString, - DWORD cchString, LPCWSTR header, LPCWSTR trailer, BYTE *pbBinary, - DWORD *pcbBinary, DWORD *pdwSkip, BOOL exactHeaderAndTrailerMatch) + DWORD cchString, BYTE *pbBinary, + DWORD *pcbBinary, DWORD *pdwSkip) { LONG ret; + LPCWSTR header = CERT_HEADER_START_W; + LPCWSTR trailer = CERT_TRAILER_START_W; LPCWSTR headerBegins; LPCWSTR dataBegins; @@ -957,43 +832,20 @@ } dataBegins = headerBegins + strlenW(header); - if (!exactHeaderAndTrailerMatch) - { - if ((dataBegins = strstrW(dataBegins, CERT_DELIMITER_W))) - { - dataBegins += strlenW(CERT_DELIMITER_W); - } - else - { - return ERROR_INVALID_DATA; - } - } + if (!(dataBegins = strstrW(dataBegins, CERT_DELIMITER_W))) + { + return ERROR_INVALID_DATA; + } + dataBegins += strlenW(CERT_DELIMITER_W); if (*dataBegins == '\r') dataBegins++; if (*dataBegins == '\n') dataBegins++; - if (exactHeaderAndTrailerMatch) - { - trailerBegins = pszString + cchString - strlenW(trailer); - if (pszString[cchString - 1] == '\n') trailerBegins--; - if (pszString[cchString - 2] == '\r') trailerBegins--; - - if (*(trailerBegins-1) == '\n') trailerBegins--; - if (*(trailerBegins-1) == '\r') trailerBegins--; - - if (!strncmpW(trailerBegins, trailer, strlenW(trailer))) - { - return ERROR_INVALID_DATA; - } - } - else - { - if (!(trailerBegins = strstrW(dataBegins, trailer))) - { - return ERROR_INVALID_DATA; - } - if (*(trailerBegins-1) == '\n') trailerBegins--; - if (*(trailerBegins-1) == '\r') trailerBegins--; - } + if (!(trailerBegins = strstrW(dataBegins, trailer))) + { + return ERROR_INVALID_DATA; + } + if (*(trailerBegins-1) == '\n') trailerBegins--; + if (*(trailerBegins-1) == '\r') trailerBegins--; if (pdwSkip) *pdwSkip = headerBegins - pszString; @@ -1010,8 +862,7 @@ BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - CERT_HEADER_START_W, CERT_TRAILER_START_W, pbBinary, pcbBinary, - pdwSkip, FALSE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64HEADER; @@ -1022,8 +873,7 @@ BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - CERT_REQUEST_HEADER_W, CERT_REQUEST_TRAILER_W, pbBinary, pcbBinary, - pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64REQUESTHEADER; @@ -1034,7 +884,7 @@ BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - X509_HEADER_W, X509_TRAILER_W, pbBinary, pcbBinary, pdwSkip, TRUE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64X509CRLHEADER; Modified: trunk/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] Sun Mar 5 21:21:36 2017 @@ -1039,6 +1039,9 @@ static const WCHAR rc4[] = { 'r','c','4',0 }; static const WCHAR sha[] = { 's','h','a',0 }; static const WCHAR sha1[] = { 's','h','a','1',0 }; +static const WCHAR sha256[] = { 's','h','a','2','5','6',0 }; +static const WCHAR sha384[] = { 's','h','a','3','8','4',0 }; +static const WCHAR sha512[] = { 's','h','a','5','1','2',0 }; static const WCHAR RSA[] = { 'R','S','A',0 }; static const WCHAR RSA_KEYX[] = { 'R','S','A','_','K','E','Y','X',0 }; static const WCHAR RSA_SIGN[] = { 'R','S','A','_','S','I','G','N',0 }; @@ -1143,6 +1146,9 @@ { 1, szOID_RSA_MD5, CALG_MD5, md5, NULL }, { 1, szOID_RSA_MD4, CALG_MD4, md4, NULL }, { 1, szOID_RSA_MD2, CALG_MD2, md2, NULL }, + { 1, szOID_NIST_sha256, CALG_SHA_256, sha256, NULL }, + { 1, szOID_NIST_sha384, CALG_SHA_384, sha384, NULL }, + { 1, szOID_NIST_sha512, CALG_SHA_512, sha512, NULL }, { 2, szOID_OIWSEC_desCBC, CALG_DES, des, NULL }, { 2, szOID_RSA_DES_EDE3_CBC, CALG_3DES, tripledes, NULL }, Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 5 21:21:36 2017 @@ -58,7 +58,7 @@ reactos/dll/win32/comdlg32 # Synced to WineStaging-2.2 reactos/dll/win32/compstui # Synced to WineStaging-2.2 reactos/dll/win32/credui # Synced to WineStaging-2.2 -reactos/dll/win32/crypt32 # Synced to WineStaging-1.9.23 +reactos/dll/win32/crypt32 # Synced to WineStaging-2.2 reactos/dll/win32/cryptdlg # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptdll # Synced to WineStaging-1.9.11 reactos/dll/win32/cryptnet # Synced to WineStaging-1.9.11

1 0

[akhaldi] 74100: [PSDK] Update wincrypt.h. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:19:15 2017 New Revision: 74100 URL: http://svn.reactos.org/svn/reactos?rev=74100&view=rev Log: [PSDK] Update wincrypt.h. CORE-12823 Modified: trunk/reactos/sdk/include/psdk/wincrypt.h Modified: trunk/reactos/sdk/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/wincrypt.… ============================================================================== --- trunk/reactos/sdk/include/psdk/wincrypt.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/wincrypt.h [iso-8859-1] Sun Mar 5 21:19:15 2017 @@ -3294,6 +3294,10 @@ #define szOID_NETSCAPE_DATA_TYPE "2.16.840.1.113730.2" #define szOID_NETSCAPE_CERT_SEQUENCE "2.16.840.1.113730.2.5" +#define szOID_NIST_sha256 "2.16.840.1.101.3.4.2.1" +#define szOID_NIST_sha384 "2.16.840.1.101.3.4.2.2" +#define szOID_NIST_sha512 "2.16.840.1.101.3.4.2.3" + /* Bits for szOID_NETSCAPE_CERT_TYPE */ #define NETSCAPE_SSL_CLIENT_AUTH_CERT_TYPE 0x80 #define NETSCAPE_SSL_SERVER_AUTH_CERT_TYPE 0x40 @@ -4018,6 +4022,22 @@ DWORD dwRecipientIndex; } CMSG_CTRL_KEY_TRANS_DECRYPT_PARA, *PCMSG_CTRL_KEY_TRANS_DECRYPT_PARA; +typedef struct _CERT_STRONG_SIGN_SERIALIZED_INFO { + DWORD dwFlags; + WCHAR *pwszCNGSignHashAlgids; + WCHAR *pwszCNGPubKeyMinBitLengths; +} CERT_STRONG_SIGN_SERIALIZED_INFO, *PCERT_STRONG_SIGN_SERIALIZED_INFO; + +typedef struct _CERT_STRONG_SIGN_PARA { + DWORD cbSize; + DWORD dwInfoChoice; + union { + void *pvInfo; + CERT_STRONG_SIGN_SERIALIZED_INFO *pSerializedInfo; + char *pszOID; + } DUMMYUNIONNAME; +} CERT_STRONG_SIGN_PARA, *PCERT_STRONG_SIGN_PARA; + typedef BOOL (WINAPI *PFN_CMSG_GEN_CONTENT_ENCRYPT_KEY)( _Inout_ PCMSG_CONTENT_ENCRYPT_INFO pContentEncryptInfo,

1 0

[akhaldi] 74099: [GDIPLUS_WINETEST] Sync with Wine Staging 2.2. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:16:17 2017 New Revision: 74099 URL: http://svn.reactos.org/svn/reactos?rev=74099&view=rev Log: [GDIPLUS_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/gdiplus/customlinecap.c trunk/rostests/winetests/gdiplus/image.c trunk/rostests/winetests/gdiplus/pen.c Modified: trunk/rostests/winetests/gdiplus/customlinecap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/customl… ============================================================================== --- trunk/rostests/winetests/gdiplus/customlinecap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/customlinecap.c [iso-8859-1] Sun Mar 5 21:16:17 2017 @@ -223,6 +223,100 @@ GdipDeletePath(path); } +static void test_create_adjustable_cap(void) +{ + GpAdjustableArrowCap *cap; + REAL inset, scale; + GpLineJoin join; + GpStatus stat; + GpLineCap base; + + stat = GdipCreateAdjustableArrowCap(10.0, 10.0, TRUE, NULL); +todo_wine + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + stat = GdipCreateAdjustableArrowCap(17.0, 15.0, TRUE, &cap); +todo_wine + ok(stat == Ok, "Failed to create adjustable cap, %d\n", stat); + if (stat != Ok) + return; + + stat = GdipGetAdjustableArrowCapMiddleInset(cap, NULL); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + stat = GdipGetAdjustableArrowCapMiddleInset(cap, &inset); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(inset == 0.0f, "Unexpected middle inset %f\n", inset); + + stat = GdipGetCustomLineCapBaseCap((GpCustomLineCap*)cap, &base); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(base == LineCapTriangle, "Unexpected base cap %d\n", base); + + stat = GdipSetCustomLineCapBaseCap((GpCustomLineCap*)cap, LineCapSquare); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + + stat = GdipGetCustomLineCapBaseCap((GpCustomLineCap*)cap, &base); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(base == LineCapSquare, "Unexpected base cap %d\n", base); + + stat = GdipGetCustomLineCapBaseInset((GpCustomLineCap*)cap, &inset); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + + stat = GdipGetCustomLineCapWidthScale((GpCustomLineCap*)cap, &scale); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(scale == 1.0f, "Unexpected width scale %f\n", scale); + + stat = GdipGetCustomLineCapStrokeJoin((GpCustomLineCap*)cap, &join); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(join == LineJoinMiter, "Unexpected stroke join %d\n", join); + + GdipDeleteCustomLineCap((GpCustomLineCap*)cap); +} + +static void test_captype(void) +{ + GpAdjustableArrowCap *arrowcap; + GpCustomLineCap *custom; + CustomLineCapType type; + GpStatus stat; + GpPath *path; + + stat = GdipGetCustomLineCapType(NULL, NULL); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + type = 10; + stat = GdipGetCustomLineCapType(NULL, &type); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + ok(type == 10, "Unexpected cap type, %d\n", type); + + /* default cap */ + stat = GdipCreatePath(FillModeAlternate, &path); + ok(stat == Ok, "Failed to create path, %d\n", stat); + stat = GdipAddPathRectangle(path, 5.0, 5.0, 10.0, 10.0); + ok(stat == Ok, "AddPathRectangle failed, %d\n", stat); + + stat = GdipCreateCustomLineCap(NULL, path, LineCapFlat, 0.0, &custom); + ok(stat == Ok, "Failed to create cap, %d\n", stat); + stat = GdipGetCustomLineCapType(custom, &type); + ok(stat == Ok, "Failed to get cap type, %d\n", stat); + ok(type == CustomLineCapTypeDefault, "Unexpected cap type %d\n", stat); + GdipDeleteCustomLineCap(custom); + GdipDeletePath(path); + + /* arrow cap */ + stat = GdipCreateAdjustableArrowCap(17.0, 15.0, TRUE, &arrowcap); +todo_wine + ok(stat == Ok, "Failed to create adjustable cap, %d\n", stat); + if (stat != Ok) + return; + + stat = GdipGetCustomLineCapType((GpCustomLineCap*)arrowcap, &type); + ok(stat == Ok, "Failed to get cap type, %d\n", stat); + ok(type == CustomLineCapTypeAdjustableArrow, "Unexpected cap type %d\n", stat); + + GdipDeleteCustomLineCap((GpCustomLineCap*)arrowcap); +} + START_TEST(customlinecap) { struct GdiplusStartupInput gdiplusStartupInput; @@ -239,6 +333,8 @@ test_linejoin(); test_inset(); test_scale(); + test_create_adjustable_cap(); + test_captype(); GdiplusShutdown(gdiplusToken); } Modified: trunk/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/image.c… ============================================================================== --- trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] Sun Mar 5 21:16:17 2017 @@ -1688,6 +1688,7 @@ HDC hdc; COLORREF pixel; BYTE bits[640]; + BitmapData lockeddata; memset(bits, 0x68, 640); @@ -1872,6 +1873,30 @@ stat = GdipDisposeImage((GpImage*)bitmap); expect(Ok, stat); + + /* create HBITMAP from locked data */ + memset(bits, 0x68, 640); + stat = GdipCreateBitmapFromScan0(10, 20, 32, PixelFormat24bppRGB, bits, &bitmap); + expect(Ok, stat); + + memset(&lockeddata, 0, sizeof(lockeddata)); + stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead | ImageLockModeWrite, + PixelFormat32bppRGB, &lockeddata); + expect(Ok, stat); + ((DWORD*)lockeddata.Scan0)[0] = 0xff242424; + stat = GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0); + expect(Ok, stat); + stat = GdipBitmapUnlockBits(bitmap, &lockeddata); + expect(Ok, stat); + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + hdc = CreateCompatibleDC(NULL); + oldhbitmap = SelectObject(hdc, hbitmap); + pixel = GetPixel(hdc, 0, 0); + expect(0x686868, pixel); + SelectObject(hdc, oldhbitmap); + DeleteDC(hdc); } static void test_getthumbnail(void) @@ -3107,8 +3132,6 @@ ok(refcount == 1, "expected stream refcount 1, got %d\n", refcount); status = GdipLoadImageFromStream(stream, &image); - ok(status == Ok || broken(status == InvalidParameter), /* XP */ - "GdipLoadImageFromStream error %d\n", status); if (status != Ok) { IStream_Release(stream); @@ -5168,6 +5191,186 @@ GdipDisposeImage((GpImage *)bitmap); } +#include "pshpack2.h" +static const struct tiff_1x1_data +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[12]; + ULONG next_IFD; + struct IFD_rational res; + short palette_data[3][256]; + short bps_data[4]; + BYTE pixel_data[32]; +} tiff_1x1_data = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_1x1_data, number_of_entries), + 12, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 1 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 1 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 3, FIELD_OFFSET(struct tiff_1x1_data, bps_data) }, /* BITSPERSAMPLE */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ + { 0x106, IFD_SHORT, 1, 2 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_1x1_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 3 }, /* SAMPLESPERPIXEL */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1x1_data, res) }, + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1x1_data, res) }, + { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ + { 0x140, IFD_SHORT, 256*3, FIELD_OFFSET(struct tiff_1x1_data, palette_data) } /* COLORMAP */ + }, + 0, + { 96, 1 }, + { { 0 } }, + { 8,8,8,0 }, + { 1,0,2,3,4,5,6,7,8,9,0,1,2,3,4,5 } +}; +#include "poppack.h" + +static void test_tiff_color_formats(void) +{ + static const struct + { + int photometric; /* PhotometricInterpretation */ + int samples; /* SamplesPerPixel */ + int bps; /* BitsPerSample */ + PixelFormat format; + } td[] = + { + /* 2 - RGB */ + { 2, 3, 1, PixelFormat24bppRGB }, + { 2, 3, 4, PixelFormat24bppRGB }, + { 2, 3, 8, PixelFormat24bppRGB }, + { 2, 3, 16, PixelFormat48bppRGB }, + { 2, 3, 24, 0 }, +#if 0 /* FIXME */ + { 2, 3, 32, 0 }, +#endif + { 2, 4, 1, PixelFormat32bppARGB }, + { 2, 4, 4, PixelFormat32bppARGB }, + { 2, 4, 8, PixelFormat32bppARGB }, + { 2, 4, 16, PixelFormat48bppRGB }, + { 2, 4, 24, 0 }, + { 2, 4, 32, 0 }, + /* 1 - BlackIsZero (Bilevel) */ + { 1, 1, 1, PixelFormat1bppIndexed }, +#if 0 /* FIXME: PNG vs TIFF mismatch */ + { 1, 1, 4, PixelFormat8bppIndexed }, +#endif + { 1, 1, 8, PixelFormat8bppIndexed }, + { 1, 1, 16, PixelFormat32bppARGB }, + { 1, 1, 24, 0 }, + { 1, 1, 32, PixelFormat32bppARGB }, + /* 3 - Palette Color */ + { 3, 1, 1, PixelFormat1bppIndexed }, + { 3, 1, 4, PixelFormat4bppIndexed }, + { 3, 1, 8, PixelFormat8bppIndexed }, +#if 0 /* FIXME: for some reason libtiff replaces photometric 3 by 1 for bps > 8 */ + { 3, 1, 16, 0 }, + { 3, 1, 24, 0 }, + { 3, 1, 32, 0 }, +#endif + /* 5 - Separated */ + { 5, 4, 1, 0 }, + { 5, 4, 4, 0 }, + { 5, 4, 8, PixelFormat32bppCMYK }, + { 5, 4, 16, PixelFormat48bppRGB }, + { 5, 4, 24, 0 }, + { 5, 4, 32, 0 }, + }; + BYTE buf[sizeof(tiff_1x1_data)]; + GpStatus status; + GpImage *image; + UINT count, i; + struct IFD_entry *tag, *tag_photo = NULL, *tag_bps = NULL, *tag_samples = NULL, *tag_colormap = NULL; + short *bps; + ImageType type; + PixelFormat format; + + memcpy(buf, &tiff_1x1_data, sizeof(tiff_1x1_data)); + + count = *(short *)(buf + tiff_1x1_data.dir_offset); + tag = (struct IFD_entry *)(buf + tiff_1x1_data.dir_offset + sizeof(short)); + + /* verify the TIFF structure */ + for (i = 0; i < count; i++) + { + if (tag[i].id == 0x102) /* BitsPerSample */ + tag_bps = &tag[i]; + else if (tag[i].id == 0x106) /* PhotometricInterpretation */ + tag_photo = &tag[i]; + else if (tag[i].id == 0x115) /* SamplesPerPixel */ + tag_samples = &tag[i]; + else if (tag[i].id == 0x140) /* ColorMap */ + tag_colormap = &tag[i]; + } + + ok(tag_bps && tag_photo && tag_samples && tag_colormap, "tag 0x102,0x106,0x115 or 0x140 is missing\n"); + if (!tag_bps || !tag_photo || !tag_samples || !tag_colormap) return; + + ok(tag_bps->type == IFD_SHORT, "tag 0x102 should have type IFD_SHORT\n"); + bps = (short *)(buf + tag_bps->value); + ok(bps[0] == 8 && bps[1] == 8 && bps[2] == 8 && bps[3] == 0, + "expected bps 8,8,8,0 got %d,%d,%d,%d\n", bps[0], bps[1], bps[2], bps[3]); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + tag_colormap->count = (1 << td[i].bps) * 3; + tag_photo->value = td[i].photometric; + tag_bps->count = td[i].samples; + tag_samples->value = td[i].samples; + + if (td[i].samples == 1) + tag_bps->value = td[i].bps; + else if (td[i].samples == 2) + tag_bps->value = MAKELONG(td[i].bps, td[i].bps); + else if (td[i].samples == 3) + { + tag_bps->value = (BYTE *)bps - buf; + bps[0] = bps[1] = bps[2] = td[i].bps; + } + else if (td[i].samples == 4) + { + tag_bps->value = (BYTE *)bps - buf; + bps[0] = bps[1] = bps[2] = bps[3] = td[i].bps; + } + else + { + ok(0, "%u: unsupported samples count %d\n", i, td[i].samples); + continue; + } + + image = load_image(buf, sizeof(buf)); + if (!td[i].format) + ok(!image, + "%u: (%d,%d,%d) TIFF image loading should have failed\n", i, td[i].photometric, td[i].samples, td[i].bps); + else + ok(image != NULL || broken(!image) /* XP */, "%u: failed to load TIFF image data (%d,%d,%d)\n", + i, td[i].photometric, td[i].samples, td[i].bps); + if (!image) continue; + + status = GdipGetImageType(image, &type); + ok(status == Ok, "%u: GdipGetImageType error %d\n", i, status); + ok(type == ImageTypeBitmap, "%u: wrong image type %d\n", i, type); + + status = GdipGetImagePixelFormat(image, &format); + expect(Ok, status); + ok(format == td[i].format, + "%u: expected %#x, got %#x\n", i, td[i].format, format); + + GdipDisposeImage(image); + } +} + START_TEST(image) { HMODULE mod = GetModuleHandleA("gdiplus.dll"); @@ -5185,6 +5388,7 @@ pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram"); pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort"); + test_tiff_color_formats(); test_GdipInitializePalette(); test_png_color_formats(); test_supported_encoders(); Modified: trunk/rostests/winetests/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/pen.c?r… ============================================================================== --- trunk/rostests/winetests/gdiplus/pen.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/pen.c [iso-8859-1] Sun Mar 5 21:16:17 2017 @@ -350,6 +350,7 @@ GpStatus status; GpPen *pen; static const REAL testvalues[] = {0.2, 0.4, 0.6, 0.8}; + INT count; status = GdipSetPenCompoundArray(NULL, testvalues, 4); expect(InvalidParameter, status); @@ -357,6 +358,20 @@ status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); expect(Ok, status); + status = GdipGetPenCompoundCount(NULL, NULL); + expect(InvalidParameter, status); + + status = GdipGetPenCompoundCount(pen, NULL); + expect(InvalidParameter, status); + + count = 10; + status = GdipGetPenCompoundCount(pen, &count); +todo_wine { + expect(Ok, status); + ok(count == 0, "Unexpected compound count %d\n", count); +} + status = GdipSetPenCompoundArray(pen, NULL, 0); + expect(InvalidParameter, status); status = GdipSetPenCompoundArray(pen, NULL, 4); expect(InvalidParameter, status); status = GdipSetPenCompoundArray(pen, testvalues, 3); @@ -368,7 +383,15 @@ status = GdipSetPenCompoundArray(pen, testvalues, 4); todo_wine expect(Ok, status); - + status = GdipSetPenCompoundArray(pen, NULL, 0); + expect(InvalidParameter, status); + + count = 0; + status = GdipGetPenCompoundCount(pen, &count); +todo_wine { + expect(Ok, status); + ok(count == 4, "Unexpected compound count %d\n", count); +} GdipDeletePen(pen); }

1 0

[akhaldi] 74098: [GDIPLUS] Sync with Wine Staging 2.2. CORE-12823 818b141 gdiplus: Add support for more image color formats. f8f0a35 gdiplus: Implement GdipInitializePalette. (v2) 973bba9 gdiplus: ...
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:15:16 2017 New Revision: 74098 URL: http://svn.reactos.org/svn/reactos?rev=74098&view=rev Log: [GDIPLUS] Sync with Wine Staging 2.2. CORE-12823 818b141 gdiplus: Add support for more image color formats. f8f0a35 gdiplus: Implement GdipInitializePalette. (v2) 973bba9 gdiplus: Ignore an externally set DC clipping region. 650b8d0 gdiplus: Ignore an externally set DC origin. e100661 gdiplus: Add GdipCreateHBITMAPFromBitmap tests when bitmap bits are locked. b58276a gdiplus: Reimplement GdipCreateHBITMAPFromBitmap so it can work on locked bitmaps. 5673d82 gdiplus: GpBitmap can be only locked once, get rid of numlocks field. 0eaaa15 gdiplus: Make GpBitmap->bitmapbits access thread safe. 4e685eb gdiplus: Added GdipGetCustomLineCapType(). 36bb9d9 gdiplus: Fix some spec file entries. f870708 gdiplus: Make some GdipDraw*Path() functions static. 046fc19 gdiplus: Fix memory leak in format_string_callback error path. 5018594 gdiplus: Create the FontFamily before checking for duplicates. 0d6a4b0 gdiplus: Don't include rotated fonts in the installed font collection. Modified: trunk/reactos/dll/win32/gdiplus/customlinecap.c trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/gdiplus/customlinecap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/customli… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/customlinecap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/customlinecap.c [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -65,6 +65,7 @@ *customCap = heap_alloc_zero(sizeof(GpCustomLineCap)); if(!*customCap) return OutOfMemory; + (*customCap)->type = CustomLineCapTypeDefault; if(strokePath){ (*customCap)->fill = FALSE; pathdata = &strokePath->pathdata; @@ -233,6 +234,17 @@ return Ok; } +GpStatus WINGDIPAPI GdipGetCustomLineCapType(GpCustomLineCap *customCap, CustomLineCapType *type) +{ + TRACE("(%p, %p)\n", customCap, type); + + if(!customCap || !type) + return InvalidParameter; + + *type = customCap->type; + return Ok; +} + GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL height, REAL width, BOOL fill, GpAdjustableArrowCap **cap) { Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -1584,15 +1584,18 @@ DWORD type, LPARAM lParam) { GpFontCollection* fonts = (GpFontCollection*)lParam; + GpFontFamily* family; int i; if (type == RASTER_FONTTYPE) return 1; - /* skip duplicates */ - for (i=0; i<fonts->count; i++) - if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0) - return 1; + /* skip rotated fonts */ + if (lfw->lfFaceName[0] == '@') + return 1; + + if (fonts->count && strcmpiW(lfw->lfFaceName, fonts->FontFamilies[fonts->count-1]->FamilyName) == 0) + return 1; if (fonts->allocated == fonts->count) { @@ -1608,10 +1611,20 @@ fonts->allocated = new_alloc_count; } - if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &fonts->FontFamilies[fonts->count]) == Ok) - fonts->count++; - else + if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family) != Ok) return 0; + + /* skip duplicates */ + for (i=0; i<fonts->count; i++) + { + if (strcmpiW(family->FamilyName, fonts->FontFamilies[i]->FamilyName) == 0) + { + GdipDeleteFontFamily(family); + return 1; + } + } + + fonts->FontFamilies[fonts->count++] = family; return 1; } Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -172,8 +172,8 @@ 172 stdcall GdipDrawImagePointsRectI(ptr ptr ptr long long long long long long ptr ptr ptr) 173 stdcall GdipDrawImageRect(ptr ptr float float float float) 174 stdcall GdipDrawImageRectI(ptr ptr long long long long) -175 stdcall GdipDrawImageRectRect(ptr ptr float float float float float float float float long ptr long ptr) -176 stdcall GdipDrawImageRectRectI(ptr ptr long long long long long long long long long ptr long ptr) +175 stdcall GdipDrawImageRectRect(ptr ptr float float float float float float float float long ptr ptr ptr) +176 stdcall GdipDrawImageRectRectI(ptr ptr long long long long long long long long long ptr ptr ptr) 177 stdcall GdipDrawLine(ptr ptr float float float float) 178 stdcall GdipDrawLineI(ptr ptr long long long long) 179 stdcall GdipDrawLines(ptr ptr ptr long) @@ -189,7 +189,7 @@ 189 stdcall GdipDrawRectanglesI(ptr ptr ptr long) 190 stdcall GdipDrawString(ptr wstr long ptr ptr ptr ptr) 191 stdcall GdipEmfToWmfBits(ptr long ptr long long) -192 stdcall GdipEndContainer(ptr ptr) +192 stdcall GdipEndContainer(ptr long) 193 stdcall GdipEnumerateMetafileDestPoint(ptr ptr ptr ptr ptr ptr) 194 stdcall GdipEnumerateMetafileDestPointI(ptr ptr ptr ptr ptr ptr) 195 stub GdipEnumerateMetafileDestPoints @@ -240,7 +240,7 @@ 240 stdcall GdipGetCustomLineCapBaseInset(ptr ptr) 241 stub GdipGetCustomLineCapStrokeCaps 242 stdcall GdipGetCustomLineCapStrokeJoin(ptr ptr) -243 stub GdipGetCustomLineCapType +243 stdcall GdipGetCustomLineCapType(ptr ptr) 244 stdcall GdipGetCustomLineCapWidthScale(ptr ptr) 245 stdcall GdipGetDC(ptr ptr) 246 stdcall GdipGetDpiX(ptr ptr) @@ -563,7 +563,7 @@ 563 stdcall GdipSetPropertyItem(ptr ptr) 564 stdcall GdipSetRenderingOrigin(ptr long long) 565 stdcall GdipSetSmoothingMode(ptr long) -566 stdcall GdipSetSolidFillColor(ptr ptr) +566 stdcall GdipSetSolidFillColor(ptr long) 567 stdcall GdipSetStringFormatAlign(ptr long) 568 stdcall GdipSetStringFormatDigitSubstitution(ptr long long) 569 stdcall GdipSetStringFormatFlags(ptr long) @@ -604,8 +604,8 @@ 604 stdcall GdipWidenPath(ptr ptr ptr float) 605 stdcall GdipWindingModeOutline(ptr ptr float) 606 stdcall GdiplusNotificationHook(ptr) -607 stdcall GdiplusNotificationUnhook(ptr) -608 stdcall GdiplusShutdown(ptr) GdiplusShutdown_wrapper +607 stdcall GdiplusNotificationUnhook(long) +608 stdcall GdiplusShutdown(long) GdiplusShutdown_wrapper 609 stdcall GdiplusStartup(ptr ptr ptr) 610 stdcall GdipFindFirstImageItem(ptr ptr) 611 stub GdipFindNextImageItem Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -335,6 +335,7 @@ }; struct GpCustomLineCap{ + CustomLineCapType type; GpPathData pathdata; BOOL fill; /* TRUE for fill, FALSE for stroke */ GpLineCap cap; /* as far as I can tell, this value is ignored */ @@ -355,6 +356,7 @@ UINT frame_count, current_frame; ColorPalette *palette; REAL xres, yres; + LONG busy; }; struct GpMetafile{ @@ -397,7 +399,6 @@ INT height; PixelFormat format; ImageLockMode lockmode; - INT numlocks; BYTE *bitmapbits; /* pointer to the buffer we passed in BitmapLockBits */ HBITMAP hbitmap; HDC hdc; @@ -522,4 +523,17 @@ void get_log_fontW(const GpFont *, GpGraphics *, LOGFONTW *) DECLSPEC_HIDDEN; +static inline BOOL image_lock(GpImage *image, BOOL *unlock) +{ + LONG tid = GetCurrentThreadId(), owner_tid; + owner_tid = InterlockedCompareExchange(&image->busy, tid, 0); + *unlock = !owner_tid; + return !owner_tid || owner_tid==tid; +} + +static inline void image_unlock(GpImage *image, BOOL unlock) +{ + if (unlock) image->busy = 0; +} + #endif /* __WINE_GP_PRIVATE_H_ */ Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -493,8 +493,9 @@ save = SaveDC(graphics->hdc); - if (hrgn) - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + SetViewportOrgEx(graphics->hdc, 0, 0, NULL); + + ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); if (hregion) ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND); @@ -3371,7 +3372,7 @@ return retval; } -GpStatus GDI32_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +static GpStatus GDI32_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { INT save_state; GpStatus retval; @@ -3397,7 +3398,7 @@ return retval; } -GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { GpStatus stat; GpPath* flat_path; @@ -3695,7 +3696,7 @@ return stat; } -GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +static GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { GpStatus stat; GpPath *wide_path; Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -867,6 +867,7 @@ start = (char *)ph; if (!ph || !lengthen_path(path, len / sizeof(POINTFX))) { + heap_free(ph); status = OutOfMemory; break; } Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -38,13 +38,19 @@ { { &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, { &GUID_WICPixelFormat1bppIndexed, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, + { &GUID_WICPixelFormat4bppIndexed, PixelFormat4bppIndexed, WICBitmapPaletteTypeFixedHalftone8 }, { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, + { &GUID_WICPixelFormat32bppGrayFloat, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedGray256 }, { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat32bppBGR, PixelFormat32bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat48bppRGB, PixelFormat48bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat32bppBGRA, PixelFormat32bppARGB, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat32bppPBGRA, PixelFormat32bppPARGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat32bppCMYK, PixelFormat32bppCMYK, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat64bppCMYK, PixelFormat48bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, + { &GUID_WICPixelFormat64bppRGBA, PixelFormat48bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, { NULL } }; @@ -1010,16 +1016,22 @@ INT bitspp = PIXELFORMATBPP(format); GpRect act_rect; /* actual rect to be used */ GpStatus stat; + BOOL unlock; TRACE("%p %p %d 0x%x %p\n", bitmap, rect, flags, format, lockeddata); if(!lockeddata || !bitmap) return InvalidParameter; + if(!image_lock(&bitmap->image, &unlock)) + return ObjectBusy; if(rect){ if(rect->X < 0 || rect->Y < 0 || (rect->X + rect->Width > bitmap->width) || (rect->Y + rect->Height > bitmap->height) || !flags) + { + image_unlock(&bitmap->image, unlock); return InvalidParameter; + } act_rect = *rect; } @@ -1032,6 +1044,7 @@ if(bitmap->lockmode) { WARN("bitmap is already locked and cannot be locked again\n"); + image_unlock(&bitmap->image, unlock); return WrongState; } @@ -1047,8 +1060,8 @@ bitmap->stride * act_rect.Y; bitmap->lockmode = flags | ImageLockModeRead; - bitmap->numlocks++; - + + image_unlock(&bitmap->image, unlock); return Ok; } @@ -1059,6 +1072,7 @@ if (stat == NotImplemented) { FIXME("cannot read bitmap from %x to %x\n", bitmap->format, format); + image_unlock(&bitmap->image, unlock); return NotImplemented; } } @@ -1071,6 +1085,7 @@ if (stat == NotImplemented) { FIXME("cannot write bitmap from %x to %x\n", format, bitmap->format); + image_unlock(&bitmap->image, unlock); return NotImplemented; } } @@ -1086,7 +1101,11 @@ bitmap->bitmapbits = heap_alloc_zero(lockeddata->Stride * act_rect.Height); - if (!bitmap->bitmapbits) return OutOfMemory; + if (!bitmap->bitmapbits) + { + image_unlock(&bitmap->image, unlock); + return OutOfMemory; + } lockeddata->Scan0 = bitmap->bitmapbits; } @@ -1111,15 +1130,16 @@ { heap_free(bitmap->bitmapbits); bitmap->bitmapbits = NULL; + image_unlock(&bitmap->image, unlock); return stat; } } bitmap->lockmode = flags | ImageLockModeRead; - bitmap->numlocks++; bitmap->lockx = act_rect.X; bitmap->locky = act_rect.Y; + image_unlock(&bitmap->image, unlock); return Ok; } @@ -1141,21 +1161,26 @@ { GpStatus stat; static BOOL fixme = FALSE; + BOOL unlock; TRACE("(%p,%p)\n", bitmap, lockeddata); if(!bitmap || !lockeddata) return InvalidParameter; + if(!image_lock(&bitmap->image, &unlock)) + return ObjectBusy; if(!bitmap->lockmode) + { + image_unlock(&bitmap->image, unlock); return WrongState; + } if(!(lockeddata->Reserved & ImageLockModeWrite)){ - if(!(--bitmap->numlocks)) - bitmap->lockmode = 0; - + bitmap->lockmode = 0; heap_free(bitmap->bitmapbits); bitmap->bitmapbits = NULL; + image_unlock(&bitmap->image, unlock); return Ok; } @@ -1163,7 +1188,7 @@ { /* we passed a direct reference; no need to do anything */ bitmap->lockmode = 0; - bitmap->numlocks = 0; + image_unlock(&bitmap->image, unlock); return Ok; } @@ -1187,8 +1212,8 @@ heap_free(bitmap->bitmapbits); bitmap->bitmapbits = NULL; bitmap->lockmode = 0; - bitmap->numlocks = 0; - + + image_unlock(&bitmap->image, unlock); return stat; } @@ -1441,10 +1466,12 @@ UINT width, height; BITMAPINFOHEADER bih; LPBYTE bits; - BitmapData lockeddata; + BOOL unlock; + TRACE("(%p,%p,%x)\n", bitmap, hbmReturn, background); if (!bitmap || !hbmReturn) return InvalidParameter; + if (!image_lock(&bitmap->image, &unlock)) return ObjectBusy; GdipGetImageWidth(&bitmap->image, &width); GdipGetImageHeight(&bitmap->image, &height); @@ -1462,41 +1489,36 @@ bih.biClrImportant = 0; result = CreateDIBSection(0, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&bits, NULL, 0); - - if (result) - { - lockeddata.Stride = -width * 4; - lockeddata.Scan0 = bits + (width * 4 * (height - 1)); - - stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead|ImageLockModeUserInputBuf, - PixelFormat32bppPARGB, &lockeddata); - - if (stat == Ok) - stat = GdipBitmapUnlockBits(bitmap, &lockeddata); - - if (stat == Ok && (background & 0xffffff)) - { - DWORD *ptr; - UINT i; - for (ptr = (DWORD*)bits, i = 0; i < width * height; ptr++, i++) - { - if ((*ptr & 0xff000000) == 0xff000000) continue; - *ptr = blend_argb_no_bkgnd_alpha(*ptr, background); - } - } - } - else - stat = GenericError; - - if (stat != Ok && result) + if (!result) + { + image_unlock(&bitmap->image, unlock); + return GenericError; + } + + stat = convert_pixels(width, height, -width*4, + bits + (width * 4 * (height - 1)), PixelFormat32bppPARGB, + bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette); + if (stat != Ok) { DeleteObject(result); - result = NULL; + image_unlock(&bitmap->image, unlock); + return stat; + } + + if (background & 0xffffff) + { + DWORD *ptr; + UINT i; + for (ptr = (DWORD*)bits, i = 0; i < width * height; ptr++, i++) + { + if ((*ptr & 0xff000000) == 0xff000000) continue; + *ptr = blend_argb_no_bkgnd_alpha(*ptr, background); + } } *hbmReturn = result; - - return stat; + image_unlock(&bitmap->image, unlock); + return Ok; } GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, @@ -3736,6 +3758,7 @@ if(status != Ok) return status; + new_image->busy = image->busy; memcpy(&new_image->format, &image->format, sizeof(GUID)); free_image_data(image); if (image->type == ImageTypeBitmap) @@ -4239,30 +4262,39 @@ { GpStatus stat; const struct image_codec *codec = NULL; + BOOL unlock; TRACE("(%p,%s,%u)\n", image, debugstr_guid(dimensionID), frame); if (!image || !dimensionID) return InvalidParameter; + if(!image_lock(image, &unlock)) + return ObjectBusy; if (frame >= image->frame_count) { WARN("requested frame %u, but image has only %u\n", frame, image->frame_count); + image_unlock(image, unlock); return InvalidParameter; } if (image->type != ImageTypeBitmap && image->type != ImageTypeMetafile) { WARN("invalid image type %d\n", image->type); + image_unlock(image, unlock); return InvalidParameter; } if (image->current_frame == frame) + { + image_unlock(image, unlock); return Ok; + } if (!image->decoder) { TRACE("image doesn't have an associated decoder\n"); + image_unlock(image, unlock); return Ok; } @@ -4271,10 +4303,13 @@ if (stat != Ok) { WARN("can't find decoder info\n"); + image_unlock(image, unlock); return stat; } - return codec->select_func(image, frame); + stat = codec->select_func(image, frame); + image_unlock(image, unlock); + return stat; } GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream *stream, GpImage **image) @@ -5284,11 +5319,14 @@ UINT x, y, width, height; BitmapData src_lock, dst_lock; GpStatus stat; + BOOL unlock; TRACE("(%p, %u)\n", image, type); if (!image) return InvalidParameter; + if (!image_lock(image, &unlock)) + return ObjectBusy; rotate_90 = type&1; flip_x = (type&6) == 2 || (type&6) == 4; @@ -5297,6 +5335,7 @@ if (image->type != ImageTypeBitmap) { FIXME("Not implemented for type %i\n", image->type); + image_unlock(image, unlock); return NotImplemented; } @@ -5306,6 +5345,7 @@ if (bpp < 8) { FIXME("Not implemented for %i bit images\n", bpp); + image_unlock(image, unlock); return NotImplemented; } @@ -5325,7 +5365,10 @@ stat = GdipCreateBitmapFromScan0(width, height, 0, bitmap->format, NULL, &new_bitmap); if (stat != Ok) + { + image_unlock(image, unlock); return stat; + } stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, bitmap->format, &src_lock); @@ -5385,6 +5428,7 @@ else GdipDisposeImage(&new_bitmap->image); + image_unlock(image, unlock); return stat; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 5 21:15:16 2017 @@ -68,7 +68,7 @@ reactos/dll/win32/faultrep # Synced to WineStaging-1.9.11 reactos/dll/win32/fontsub # Synced to WineStaging-1.9.13 reactos/dll/win32/fusion # Synced to WineStaging-1.9.23 -reactos/dll/win32/gdiplus # Synced to WineStaging-1.9.23 +reactos/dll/win32/gdiplus # Synced to WineStaging-2.2 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-2.2 reactos/dll/win32/hlink # Synced to WineStaging-2.2 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16

1 0

[akhaldi] 74097: [PSDK] Update wincodec.idl. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:08:10 2017 New Revision: 74097 URL: http://svn.reactos.org/svn/reactos?rev=74097&view=rev Log: [PSDK] Update wincodec.idl. CORE-12823 Modified: trunk/reactos/sdk/include/psdk/wincodec.idl Modified: trunk/reactos/sdk/include/psdk/wincodec.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/wincodec.… ============================================================================== --- trunk/reactos/sdk/include/psdk/wincodec.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/wincodec.idl [iso-8859-1] Sun Mar 5 21:08:10 2017 @@ -168,6 +168,17 @@ WICTIFFCOMPRESSIONOPTION_FORCE_DWORD = CODEC_FORCE_DWORD } WICTiffCompressionOption; +typedef enum WICPngFilterOption { + WICPngFilterUnspecified = 0, + WICPngFilterNone = 1, + WICPngFilterSub = 2, + WICPngFilterUp = 3, + WICPngFilterAverage = 4, + WICPngFilterPaeth = 5, + WICPngFilterAdaptive = 6, + WICPNFFILTEROPTION_FORCE_DWORD = CODEC_FORCE_DWORD +} WICPngFilterOption; + typedef enum WICSectionAccessLevel { WICSectionAccessLevelRead = 0x00000001, WICSectionAccessLevelReadWrite = 0x00000003, @@ -208,7 +219,10 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x16);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x17);") -cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4fbe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat128bppRGBAFloat, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x19);") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1f);") typedef struct WICRect { INT X;

1 0

[akhaldi] 74096: [PSDK] Update gdiplusenums.h and gdiplusflat.h. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:06:16 2017 New Revision: 74096 URL: http://svn.reactos.org/svn/reactos?rev=74096&view=rev Log: [PSDK] Update gdiplusenums.h and gdiplusflat.h. CORE-12823 Modified: trunk/reactos/sdk/include/psdk/gdiplusenums.h trunk/reactos/sdk/include/psdk/gdiplusflat.h Modified: trunk/reactos/sdk/include/psdk/gdiplusenums.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusen… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusenums.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusenums.h [iso-8859-1] Sun Mar 5 21:06:16 2017 @@ -71,6 +71,12 @@ LineCapCustom = 0xff, LineCapAnchorMask = 0xf0 +}; + +enum CustomLineCapType +{ + CustomLineCapTypeDefault = 0, + CustomLineCapTypeAdjustableArrow = 1 }; enum PathPointType{ @@ -720,6 +726,7 @@ typedef enum DriverStringOptions DriverStringOptions; typedef enum FillMode FillMode; typedef enum LineCap LineCap; +typedef enum CustomLineCapType CustomLineCapType; typedef enum PathPointType PathPointType; typedef enum LineJoin LineJoin; typedef enum QualityMode QualityMode; Modified: trunk/reactos/sdk/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusfl… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusflat.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusflat.h [iso-8859-1] Sun Mar 5 21:06:16 2017 @@ -94,6 +94,7 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapWidthScale(GpCustomLineCap*,REAL*); GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap*,REAL); GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap*,REAL); +GpStatus WINGDIPAPI GdipGetCustomLineCapType(GpCustomLineCap*,CustomLineCapType*); /* Font */ GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**); @@ -617,6 +618,7 @@ GpStatus WINGDIPAPI GdipDeletePen(GpPen*); GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen*,GpBrush**); GpStatus WINGDIPAPI GdipGetPenColor(GpPen*,ARGB*); +GpStatus WINGDIPAPI GdipGetPenCompoundCount(GpPen*,INT*); GpStatus WINGDIPAPI GdipGetPenCustomStartCap(GpPen*,GpCustomLineCap**); GpStatus WINGDIPAPI GdipGetPenCustomEndCap(GpPen*,GpCustomLineCap**); GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen*,REAL*,INT);

1 0

[akhaldi] 74095: [OLE32_WINETEST] Sync with Wine Staging 2.2. CORE-12823
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:03:59 2017 New Revision: 74095 URL: http://svn.reactos.org/svn/reactos?rev=74095&view=rev Log: [OLE32_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/ole32/clipboard.c trunk/rostests/winetests/ole32/compobj.c trunk/rostests/winetests/ole32/marshal.c trunk/rostests/winetests/ole32/propvariant.c Modified: trunk/rostests/winetests/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/clipboard… ============================================================================== --- trunk/rostests/winetests/ole32/clipboard.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/clipboard.c [iso-8859-1] Sun Mar 5 21:03:59 2017 @@ -198,7 +198,7 @@ ret->fmtetc_cnt = fmtetc_cnt; ret->fmtetc = HeapAlloc(GetProcessHeap(), 0, fmtetc_cnt*sizeof(FORMATETC)); memcpy(ret->fmtetc, fmtetc, fmtetc_cnt*sizeof(FORMATETC)); - *lplpformatetc = (LPENUMFORMATETC)ret; + *lplpformatetc = &ret->IEnumFORMATETC_iface; return S_OK; } @@ -401,7 +401,7 @@ obj->fmtetc = HeapAlloc(GetProcessHeap(), 0, obj->fmtetc_cnt*sizeof(FORMATETC)); InitFormatEtc(obj->fmtetc[0], CF_TEXT, TYMED_HGLOBAL); - *lplpdataobj = (LPDATAOBJECT)obj; + *lplpdataobj = &obj->IDataObject_iface; return S_OK; } @@ -457,7 +457,7 @@ InitFormatEtc(obj->fmtetc[7], cf_another, 0xfffff); obj->fmtetc[7].dwAspect = DVASPECT_ICON; - *lplpdataobj = (LPDATAOBJECT)obj; + *lplpdataobj = &obj->IDataObject_iface; return S_OK; } @@ -618,9 +618,7 @@ if(src) { hr = IEnumFORMATETC_Next(src_enum, 1, &src_fmt, NULL); - ok(hr == S_FALSE || - broken(hr == S_OK && count == 5), /* win9x and winme don't enumerate duplicated cf's */ - "%d: got %08x\n", count, hr); + ok(hr == S_FALSE, "%d: got %08x\n", count, hr); IEnumFORMATETC_Release(src_enum); } @@ -801,8 +799,7 @@ ok(DataObjectImpl_GetDataHere_calls == 1, "got %d\n", DataObjectImpl_GetDataHere_calls); ptr = GlobalLock(h); size = GlobalSize(h); - ok(size == strlen(cmpl_stm_data) || - broken(size > strlen(cmpl_stm_data)), /* win9x, winme */ + ok(size == strlen(cmpl_stm_data), "expected %d got %d\n", lstrlenA(cmpl_stm_data), size); ok(!memcmp(ptr, cmpl_stm_data, strlen(cmpl_stm_data)), "mismatch\n"); GlobalUnlock(h); @@ -818,8 +815,7 @@ ok(DataObjectImpl_GetDataHere_calls == 0, "got %d\n", DataObjectImpl_GetDataHere_calls); ptr = GlobalLock(h); size = GlobalSize(h); - ok(size == strlen(cmpl_text_data) + 1 || - broken(size > strlen(cmpl_text_data) + 1), /* win9x, winme */ + ok(size == strlen(cmpl_text_data) + 1, "expected %d got %d\n", lstrlenA(cmpl_text_data) + 1, size); ok(!memcmp(ptr, cmpl_text_data, strlen(cmpl_text_data) + 1), "mismatch\n"); GlobalUnlock(h); @@ -836,6 +832,7 @@ ULONG ref; LPDATAOBJECT data1, data2, data_cmpl; HGLOBAL hblob, h; + void *ptr; cf_stream = RegisterClipboardFormatA("stream format"); cf_storage = RegisterClipboardFormatA("storage format"); @@ -861,10 +858,7 @@ CoInitialize(NULL); hr = OleSetClipboard(data1); - ok(hr == CO_E_NOTINITIALIZED || - hr == CLIPBRD_E_CANT_SET, /* win9x */ - "OleSetClipboard should have failed with " - "CO_E_NOTINITIALIZED or CLIPBRD_E_CANT_SET instead of 0x%08x\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "OleSetClipboard failed with 0x%08x\n", hr); CoUninitialize(); hr = OleInitialize(NULL); @@ -896,14 +890,18 @@ /* put a format directly onto the clipboard to show OleFlushClipboard doesn't empty the clipboard */ hblob = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE|GMEM_ZEROINIT, 10); - OpenClipboard(NULL); + ptr = GlobalLock( hblob ); + ok( ptr && ptr != hblob, "got fixed block %p / %p\n", ptr, hblob ); + GlobalUnlock( hblob ); + ok( OpenClipboard(NULL), "OpenClipboard failed\n" ); h = SetClipboardData(cf_onemore, hblob); ok(h == hblob, "got %p\n", h); h = GetClipboardData(cf_onemore); - ok(h == hblob || - broken(h != NULL), /* win9x */ - "got %p\n", h); - CloseClipboard(); + ok(h == hblob, "got %p / %p\n", h, hblob); + ptr = GlobalLock( h ); + ok( ptr && ptr != h, "got fixed block %p / %p\n", ptr, h ); + GlobalUnlock( hblob ); + ok( CloseClipboard(), "CloseClipboard failed\n" ); hr = OleFlushClipboard(); ok(hr == S_OK, "failed to flush clipboard, hr = 0x%08x\n", hr); @@ -915,12 +913,13 @@ ok(hr == S_FALSE, "expect S_FALSE, hr = 0x%08x\n", hr); /* format should survive the flush */ - OpenClipboard(NULL); + ok( OpenClipboard(NULL), "OpenClipboard failed\n" ); h = GetClipboardData(cf_onemore); - ok(h == hblob || - broken(h != NULL), /* win9x */ - "got %p\n", h); - CloseClipboard(); + ok(h == hblob, "got %p\n", h); + ptr = GlobalLock( h ); + ok( ptr && ptr != h, "got fixed block %p / %p\n", ptr, h ); + GlobalUnlock( hblob ); + ok( CloseClipboard(), "CloseClipboard failed\n" ); test_cf_dataobject(NULL); @@ -952,6 +951,104 @@ OleUninitialize(); } +static LPDATAOBJECT clip_data; +static HWND next_wnd; +static UINT wm_drawclipboard; + +static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + LRESULT ret; + + switch (msg) + { + case WM_DRAWCLIPBOARD: + wm_drawclipboard++; + if (clip_data) + { + /* if this is the WM_DRAWCLIPBOARD of a previous change, the data isn't current yet */ + /* this demonstrates an issue in Qt where it will free the data while it's being set */ + HRESULT hr = OleIsCurrentClipboard( clip_data ); + ok( hr == (wm_drawclipboard > 1) ? S_OK : S_FALSE, + "OleIsCurrentClipboard returned %x\n", hr ); + } + break; + case WM_CHANGECBCHAIN: + if (next_wnd == (HWND)wp) next_wnd = (HWND)lp; + else if (next_wnd) SendMessageA( next_wnd, msg, wp, lp ); + break; + case WM_USER: + ret = wm_drawclipboard; + wm_drawclipboard = 0; + return ret; + } + + return DefWindowProcA(hwnd, msg, wp, lp); +} + +static DWORD CALLBACK set_clipboard_thread(void *arg) +{ + OpenClipboard( GetDesktopWindow() ); + EmptyClipboard(); + SetClipboardData( CF_WAVE, 0 ); + CloseClipboard(); + return 0; +} + +/* test that WM_DRAWCLIPBOARD can be delivered for a previous change during OleSetClipboard */ +static void test_set_clipboard_DRAWCLIPBOARD(void) +{ + LPDATAOBJECT data; + HRESULT hr; + WNDCLASSA cls; + HWND viewer; + int ret; + HANDLE thread; + + hr = DataObjectImpl_CreateText("data", &data); + ok(hr == S_OK, "Failed to create data object: 0x%08x\n", hr); + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = clipboard_wnd_proc; + cls.hInstance = GetModuleHandleA(NULL); + cls.lpszClassName = "clipboard_test"; + RegisterClassA(&cls); + + viewer = CreateWindowA("clipboard_test", NULL, 0, 0, 0, 0, 0, NULL, 0, NULL, 0); + ok(viewer != NULL, "CreateWindow failed: %d\n", GetLastError()); + next_wnd = SetClipboardViewer( viewer ); + + ret = SendMessageA( viewer, WM_USER, 0, 0 ); + ok( ret == 1, "%u WM_DRAWCLIPBOARD received\n", ret ); + + hr = OleInitialize(NULL); + ok(hr == S_OK, "OleInitialize failed with error 0x%08x\n", hr); + + ret = SendMessageA( viewer, WM_USER, 0, 0 ); + ok( !ret, "%u WM_DRAWCLIPBOARD received\n", ret ); + + thread = CreateThread(NULL, 0, set_clipboard_thread, NULL, 0, NULL); + ok(thread != NULL, "CreateThread failed (%d)\n", GetLastError()); + ret = WaitForSingleObject(thread, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret); + + clip_data = data; + hr = OleSetClipboard(data); + ok(hr == S_OK, "failed to set clipboard to data, hr = 0x%08x\n", hr); + + ret = SendMessageA( viewer, WM_USER, 0, 0 ); + ok( ret == 2, "%u WM_DRAWCLIPBOARD received\n", ret ); + + clip_data = NULL; + hr = OleFlushClipboard(); + ok(hr == S_OK, "failed to flush clipboard, hr = 0x%08x\n", hr); + ret = IDataObject_Release(data); + ok(ret == 0, "got %d\n", ret); + + OleUninitialize(); + ChangeClipboardChain( viewer, next_wnd ); + DestroyWindow( viewer ); +} + static inline ULONG count_refs(IDataObject *d) { IDataObject_AddRef(d); @@ -987,9 +1084,7 @@ hr = OleGetClipboard(&get2); ok(hr == S_OK, "got %08x\n", hr); - ok(get1 == get2 || - broken(get1 != get2), /* win9x, winme & nt4 */ - "data objects differ\n"); + ok(get1 == get2, "data objects differ\n"); refs = IDataObject_Release(get2); ok(refs == (get1 == get2 ? 1 : 0), "got %d\n", refs); @@ -1345,17 +1440,14 @@ hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); ok(hr == S_OK, "got %08x\n", hr); /* User32 adds some synthesised formats */ - todo_wine ok(fmt.cfFormat == CF_LOCALE, "cf %04x\n", fmt.cfFormat); - if(fmt.cfFormat == CF_LOCALE) - { - ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); - ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); - ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); - ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); - - hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); - ok(hr == S_OK, "got %08x\n", hr); - } + ok(fmt.cfFormat == CF_LOCALE, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + todo_wine ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); ok(fmt.cfFormat == CF_OEMTEXT, "cf %04x\n", fmt.cfFormat); ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); @@ -1365,19 +1457,14 @@ hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); ok(hr == S_OK, "got %08x\n", hr); - ok(fmt.cfFormat == CF_UNICODETEXT || - broken(fmt.cfFormat == CF_METAFILEPICT), /* win9x and winme don't have CF_UNICODETEXT */ - "cf %04x\n", fmt.cfFormat); - if(fmt.cfFormat == CF_UNICODETEXT) - { - ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); - ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); - ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); - ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); - - hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); - ok(hr == S_OK, "got %08x\n", hr); - } + ok(fmt.cfFormat == CF_UNICODETEXT, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); ok(fmt.cfFormat == CF_METAFILEPICT, "cf %04x\n", fmt.cfFormat); ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); @@ -1611,6 +1698,7 @@ { test_get_clipboard_uninitialized(); test_set_clipboard(); + test_set_clipboard_DRAWCLIPBOARD(); test_consumer_refs(); test_flushed_getdata(); test_nonole_clipboard(); Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… ============================================================================== --- trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] Sun Mar 5 21:03:59 2017 @@ -626,6 +626,26 @@ return hr; } +#define test_apt_type(t, q, t_t, t_q) _test_apt_type(t, q, t_t, t_q, __LINE__) +static void _test_apt_type(APTTYPE expected_type, APTTYPEQUALIFIER expected_qualifier, BOOL todo_type, + BOOL todo_qualifier, int line) +{ + APTTYPEQUALIFIER qualifier = ~0u; + APTTYPE type = ~0u; + HRESULT hr; + + if (!pCoGetApartmentType) + return; + + hr = pCoGetApartmentType(&type, &qualifier); + ok_(__FILE__, line)(hr == S_OK || hr == CO_E_NOTINITIALIZED, "Unexpected return code: 0x%08x\n", hr); +todo_wine_if(todo_type) + ok_(__FILE__, line)(type == expected_type, "Wrong apartment type %d, expected %d\n", type, expected_type); +todo_wine_if(todo_qualifier) + ok_(__FILE__, line)(qualifier == expected_qualifier, "Wrong apartment qualifier %d, expected %d\n", qualifier, + expected_qualifier); +} + static void test_CoCreateInstance(void) { HRESULT hr; @@ -670,6 +690,8 @@ /* show that COM doesn't have to be initialized for multi-threaded apartments if another thread has already done so */ + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); @@ -680,6 +702,8 @@ ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); ok( !WaitForSingleObject(info.wait, 10000 ), "wait timed out\n" ); + + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); pUnk = (IUnknown *)0xdeadbeef; hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); @@ -696,6 +720,8 @@ CloseHandle(thread); CloseHandle(info.wait); CloseHandle(info.stop); + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); } static void test_CoGetClassObject(void) @@ -722,6 +748,8 @@ /* show that COM doesn't have to be initialized for multi-threaded apartments if another thread has already done so */ + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); @@ -732,6 +760,8 @@ ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); + + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); pUnk = (IUnknown *)0xdeadbeef; hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); @@ -753,6 +783,8 @@ CloseHandle(thread); CloseHandle(info.wait); CloseHandle(info.stop); + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); if (!pRegOverridePredefKey) { @@ -1807,6 +1839,8 @@ /* show that COM doesn't have to be initialized for multi-threaded apartments if another thread has already done so */ + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); @@ -1817,6 +1851,8 @@ ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); + + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); pComThreadingInfo = NULL; hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); @@ -1851,7 +1887,11 @@ CloseHandle(info.wait); CloseHandle(info.stop); + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE, FALSE, FALSE); hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); ok_ole_success(hr, "CoGetObjectContext"); @@ -2037,6 +2077,8 @@ /* show that COM doesn't have to be initialized for multi-threaded apartments if another thread has already done so */ + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + info.wait = CreateEventA(NULL, TRUE, FALSE, NULL); ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); @@ -2047,6 +2089,8 @@ ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); ok( !WaitForSingleObject(info.wait, 10000), "wait timed out\n" ); + + test_apt_type(APTTYPE_MTA, APTTYPEQUALIFIER_IMPLICIT_MTA, TRUE, TRUE); token = 0; hr = pCoGetContextToken(&token); @@ -2068,7 +2112,11 @@ CloseHandle(info.wait); CloseHandle(info.stop); + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE, FALSE, FALSE); + CoInitialize(NULL); + + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE, FALSE, FALSE); hr = pCoGetContextToken(NULL); ok(hr == E_POINTER, "Expected E_POINTER, got 0x%08x\n", hr); @@ -2888,10 +2936,8 @@ IMalloc *imalloc; HRESULT hr; -if (0) /* crashes on native */ -{ - hr = CoGetMalloc(0, NULL); -} + if (0) /* crashes on native */ + hr = CoGetMalloc(0, NULL); imalloc = (void*)0xdeadbeef; hr = CoGetMalloc(0, &imalloc); Modified: trunk/rostests/winetests/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/marshal.c… ============================================================================== --- trunk/rostests/winetests/ole32/marshal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/marshal.c [iso-8859-1] Sun Mar 5 21:03:59 2017 @@ -3467,6 +3467,19 @@ return 1; } +static BOOL new_hook_struct; +static int method, server_tid; +static GUID causality; + +struct new_hook_info +{ + IID iid; + GUID causality; + DWORD server_pid; + DWORD server_tid; + WORD method; +}; + static void WINAPI TestChannelHook_ClientGetSize( IChannelHook *iface, REFGUID uExtent, @@ -3474,12 +3487,36 @@ ULONG *pDataSize ) { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; - trace("TestChannelHook_ClientGetBuffer\n"); - trace("\t%s method %d\n", debugstr_iid(riid), info->iMethod); - trace("\tcid: %s\n", debugstr_iid(&info->uCausality)); - ok(info->cbSize == sizeof(*info), "info->cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); - ok(info->dwServerPid == GetCurrentProcessId(), "info->dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); - ok(!info->pObject, "info->pObject should be NULL\n"); + trace("TestChannelHook_ClientGetSize\n"); + trace("\t%s\n", debugstr_iid(riid)); + if (info->cbSize != sizeof(*info)) + new_hook_struct = TRUE; + + if (!new_hook_struct) + { + ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); + ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); + ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); + ok(!info->pObject, "pObject should be NULL\n"); + if (method == 3) + causality = info->uCausality; + else + ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); + } + else + { + struct new_hook_info *new_info = (struct new_hook_info *)riid; + ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, + GetCurrentProcessId()); + ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, + server_tid); + ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); + if (method == 3) + causality = new_info->causality; + else + ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); + } + ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); *pDataSize = 1; @@ -3494,9 +3531,26 @@ { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ClientFillBuffer\n"); - ok(info->cbSize == sizeof(*info), "info->cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); - ok(info->dwServerPid == GetCurrentProcessId(), "info->dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); - ok(!info->pObject, "info->pObject should be NULL\n"); + + if (!new_hook_struct) + { + ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); + ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); + ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); + ok(!info->pObject, "pObject should be NULL\n"); + ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); + } + else + { + struct new_hook_info *new_info = (struct new_hook_info *)riid; + ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, + GetCurrentProcessId()); + ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, + server_tid); + ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); + ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); + } + ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); *(unsigned char *)pDataBuffer = 0xcc; @@ -3514,11 +3568,28 @@ { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ClientNotify hrFault = 0x%08x\n", hrFault); - ok(info->cbSize == sizeof(*info), "info->cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); - ok(info->dwServerPid == GetCurrentProcessId(), "info->dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); - todo_wine { - ok(info->pObject != NULL, "info->pObject shouldn't be NULL\n"); - } + + if (!new_hook_struct) + { + ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); + ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); + ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); + todo_wine { + ok(info->pObject != NULL, "pObject shouldn't be NULL\n"); + } + ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); + } + else + { + struct new_hook_info *new_info = (struct new_hook_info *)riid; + ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, + GetCurrentProcessId()); + ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, + server_tid); + ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); + ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); + } + ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); } @@ -3532,9 +3603,26 @@ { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ServerNotify\n"); - ok(info->cbSize == sizeof(*info), "info->cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); - ok(info->dwServerPid == GetCurrentProcessId(), "info->dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); - ok(info->pObject != NULL, "info->pObject shouldn't be NULL\n"); + + if (!new_hook_struct) + { + ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); + ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); + ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); + ok(info->pObject != NULL, "pObject shouldn't be NULL\n"); + ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); + } + else + { + struct new_hook_info *new_info = (struct new_hook_info *)riid; + ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, + GetCurrentProcessId()); + ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, + server_tid); + ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); + ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); + } + ok(cbDataSize == 1, "cbDataSize should have been 1 instead of %d\n", cbDataSize); ok(*(unsigned char *)pDataBuffer == 0xcc, "pDataBuffer should have contained 0xcc instead of 0x%x\n", *(unsigned char *)pDataBuffer); ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); @@ -3549,10 +3637,26 @@ { SChannelHookCallInfo *info = (SChannelHookCallInfo *)riid; trace("TestChannelHook_ServerGetSize\n"); - trace("\t%s method %d\n", debugstr_iid(riid), info->iMethod); - ok(info->cbSize == sizeof(*info), "info->cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); - ok(info->dwServerPid == GetCurrentProcessId(), "info->dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); - ok(info->pObject != NULL, "info->pObject shouldn't be NULL\n"); + trace("\t%s\n", debugstr_iid(riid)); + if (!new_hook_struct) + { + ok(info->cbSize == sizeof(*info), "cbSize was %d instead of %d\n", info->cbSize, (int)sizeof(*info)); + ok(info->dwServerPid == GetCurrentProcessId(), "dwServerPid was 0x%x instead of 0x%x\n", info->dwServerPid, GetCurrentProcessId()); + ok(info->iMethod == method, "iMethod was %d should be %d\n", info->iMethod, method); + ok(info->pObject != NULL, "pObject shouldn't be NULL\n"); + ok(IsEqualGUID(&info->uCausality, &causality), "causality wasn't correct\n"); + } + else + { + struct new_hook_info *new_info = (struct new_hook_info *)riid; + ok(new_info->server_pid == GetCurrentProcessId(), "server pid was 0x%x instead of 0x%x\n", new_info->server_pid, + GetCurrentProcessId()); + ok(new_info->server_tid == server_tid, "server tid was 0x%x instead of 0x%x\n", new_info->server_tid, + server_tid); + ok(new_info->method == method, "method was %d instead of %d\n", new_info->method, method); + ok(IsEqualGUID(&new_info->causality, &causality), "causality wasn't correct\n"); + } + ok(IsEqualGUID(uExtent, &EXTENTID_WineTest), "uExtent wasn't correct\n"); if (hrFault != S_OK) trace("\thrFault = 0x%08x\n", hrFault); @@ -3607,6 +3711,7 @@ hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); ok_ole_success(hr, CreateStreamOnHGlobal); tid = start_host_object2(pStream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter, &thread); + server_tid = tid; ok_more_than_one_lock(); @@ -3617,8 +3722,11 @@ ok_more_than_one_lock(); + method = 3; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (LPVOID*)&proxy); ok_ole_success(hr, IClassFactory_CreateInstance); + + method = 5; IUnknown_Release(proxy); IClassFactory_Release(cf); Modified: trunk/rostests/winetests/ole32/propvariant.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/propvaria… ============================================================================== --- trunk/rostests/winetests/ole32/propvariant.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/propvariant.c [iso-8859-1] Sun Mar 5 21:03:59 2017 @@ -176,16 +176,7 @@ } else if(flags == PROP_V0) ok(hr == S_OK, "%s (%s): got %08x\n", wine_vtypes[idx], modifier, hr); - else if(flags & PROP_TODO) - { - todo_wine - { - if(hr != S_OK) - win_skip("%s (%s): unsupported\n", wine_vtypes[idx], modifier); - else ok(hr == S_OK, "%s (%s): got %08x\n", wine_vtypes[idx], modifier, hr); - } - } - else + else todo_wine_if(flags & PROP_TODO) { if(hr != S_OK) win_skip("%s (%s): unsupported\n", wine_vtypes[idx], modifier);

1 0

[akhaldi] 74094: [OLE32] Sync with Wine Staging 2.2. CORE-12823 23607d0 ole32: Implement returning a name in IEnumSTATPROPSTG. 5cf1db5 ole32: Support reading VT_BOOL, VT_R8 and VT_I8 into propery s...
by akhaldi＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: akhaldi Date: Sun Mar 5 21:03:00 2017 New Revision: 74094 URL: http://svn.reactos.org/svn/reactos?rev=74094&view=rev Log: [OLE32] Sync with Wine Staging 2.2. CORE-12823 23607d0 ole32: Implement returning a name in IEnumSTATPROPSTG. 5cf1db5 ole32: Support reading VT_BOOL, VT_R8 and VT_I8 into propery storage. 591c9c8 ole32: Correctly parse unicode property storage dictionaries. 93a8ede ole32: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). 182fad8 ole32: Call GetClipboardFormatName with the correct parameters. e31dd0f ole32: Use a HWND_MESSAGE window for the clipboard. c85eaae ole32: Only trace a clipboard format name if it has one. 77e566a ole32: Don't set zero-size clipboard data, this no longer works. Modified: trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/compobj_private.h trunk/reactos/dll/win32/ole32/enumx.c trunk/reactos/dll/win32/ole32/enumx.h trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/stg_prop.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… ============================================================================== --- trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] Sun Mar 5 21:03:00 2017 @@ -1094,7 +1094,7 @@ h = GetClipboardData(wine_marshal_clipboard_format); if(!h) return S_FALSE; - if(GlobalSize(h) == 0) return S_FALSE; + if(GlobalSize(h) <= 1) return S_FALSE; ptr = GlobalLock(h); if(!ptr) return S_FALSE; @@ -1182,9 +1182,11 @@ for(cf = 0; (cf = EnumClipboardFormats(cf)) != 0; count++) { - char buf[100]; - GetClipboardFormatNameA(cf, buf, sizeof(buf)); - TRACE("cf %04x %s\n", cf, buf); + WCHAR buf[256]; + if (GetClipboardFormatNameW(cf, buf, sizeof(buf) / sizeof(WCHAR))) + TRACE("cf %04x %s\n", cf, debugstr_w(buf)); + else + TRACE("cf %04x\n", cf); } TRACE("count %d\n", count); size += count * sizeof(ret->entries[0]); @@ -1941,7 +1943,7 @@ dup_global_mem(h_stm, GMEM_DDESHARE|GMEM_MOVEABLE, &h); } else /* flushed */ - h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 0); + h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 1); if(!h) return E_OUTOFMEMORY; @@ -2084,8 +2086,7 @@ RegisterClassExW(&class); return CreateWindowW(clipbrd_wndclass, title, WS_POPUP | WS_CLIPSIBLINGS | WS_OVERLAPPED, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, hinst, 0); + 0, 0, 0, 0, HWND_MESSAGE, NULL, hinst, 0); } /********************************************************************* Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj_private.h [iso-8859-1] Sun Mar 5 21:03:00 2017 @@ -309,7 +309,7 @@ extern const char *debugstr_formatetc(const FORMATETC *formatetc) DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } Modified: trunk/reactos/dll/win32/ole32/enumx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/enumx.c?re… ============================================================================== --- trunk/reactos/dll/win32/ole32/enumx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/enumx.c [iso-8859-1] Sun Mar 5 21:03:00 2017 @@ -30,6 +30,8 @@ struct list *current; ULONG elem_size; GUID riid; + IUnknown *parent; + enumx_copy_cb copy_cb; }; /************************************************************************ @@ -80,6 +82,7 @@ list_remove(x); HeapFree(GetProcessHeap(), 0, x); } + IUnknown_Release(This->parent); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -101,7 +104,10 @@ p = rgelt; while (count < celt && This->current && This->current != &This->elements) { - memcpy(p, &This->current[1], This->elem_size); + if (This->copy_cb) + This->copy_cb(This->parent, &This->current[1], p); + else + memcpy(p, &This->current[1], This->elem_size); p += This->elem_size; This->current = This->current->next; count++; @@ -158,7 +164,8 @@ * * Allocate a generic enumerator */ -enumx_impl *enumx_allocate(REFIID riid, const void *vtbl, ULONG elem_size) +enumx_impl *enumx_allocate(REFIID riid, const void *vtbl, ULONG elem_size, + IUnknown *parent, enumx_copy_cb copy_cb) { enumx_impl *enumx; @@ -170,6 +177,11 @@ enumx->current = NULL; enumx->elem_size = elem_size; enumx->riid = *riid; + enumx->parent = parent; + enumx->copy_cb = copy_cb; + + IUnknown_AddRef(parent); + list_init(&enumx->elements); } Modified: trunk/reactos/dll/win32/ole32/enumx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/enumx.h?re… ============================================================================== --- trunk/reactos/dll/win32/ole32/enumx.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/enumx.h [iso-8859-1] Sun Mar 5 21:03:00 2017 @@ -21,6 +21,8 @@ typedef struct tagEnumSTATPROPSETSTG_impl enumx_impl; +typedef void (*enumx_copy_cb)(IUnknown *parent, void *orig, void *dest); + extern HRESULT WINAPI enumx_QueryInterface(enumx_impl *, REFIID, void**) DECLSPEC_HIDDEN; extern ULONG WINAPI enumx_AddRef(enumx_impl *) DECLSPEC_HIDDEN; extern ULONG WINAPI enumx_Release(enumx_impl *) DECLSPEC_HIDDEN; @@ -28,7 +30,8 @@ extern HRESULT WINAPI enumx_Skip(enumx_impl *, ULONG) DECLSPEC_HIDDEN; extern HRESULT WINAPI enumx_Reset(enumx_impl *) DECLSPEC_HIDDEN; extern HRESULT WINAPI enumx_Clone(enumx_impl *, enumx_impl **) DECLSPEC_HIDDEN; -extern enumx_impl *enumx_allocate(REFIID, const void *, ULONG) DECLSPEC_HIDDEN; +extern enumx_impl *enumx_allocate(REFIID, const void *, ULONG, + IUnknown *, enumx_copy_cb) DECLSPEC_HIDDEN; extern void *enumx_add_element(enumx_impl *, const void *) DECLSPEC_HIDDEN; #endif /* __OLE_ENUM_H__ */ Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Sun Mar 5 21:03:00 2017 @@ -45,7 +45,7 @@ @ stdcall CoGetDefaultContext(long ptr ptr) @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) -# CoGetInterceptor +@ stdcall -stub CoGetInterceptor(ptr ptr ptr ptr) # CoGetInterceptorFromTypeInfo @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) Modified: trunk/reactos/dll/win32/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_prop.c… ============================================================================== --- trunk/reactos/dll/win32/ole32/stg_prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/stg_prop.c [iso-8859-1] Sun Mar 5 21:03:00 2017 @@ -1004,15 +1004,18 @@ if (This->codePage != CP_UNICODE) ptr[cbEntry - 1] = '\0'; else - *((LPWSTR)ptr + cbEntry / sizeof(WCHAR)) = '\0'; + ((LPWSTR)ptr)[cbEntry - 1] = 0; hr = PropertyStorage_StoreNameWithId(This, (char*)ptr, This->codePage, propid); if (This->codePage == CP_UNICODE) { + /* cbEntry is the number of characters */ + cbEntry *= 2; + /* Unicode entries are padded to DWORD boundaries */ if (cbEntry % sizeof(DWORD)) ptr += sizeof(DWORD) - (cbEntry % sizeof(DWORD)); } - ptr += sizeof(DWORD) + cbEntry; + ptr += cbEntry; } return hr; } @@ -1052,6 +1055,10 @@ case VT_UI1: prop->u.bVal = *data; TRACE("Read byte 0x%x\n", prop->u.bVal); + break; + case VT_BOOL: + StorageUtl_ReadWord(data, 0, (WORD*)&prop->u.boolVal); + TRACE("Read bool %d\n", prop->u.boolVal); break; case VT_I2: StorageUtl_ReadWord(data, 0, (WORD*)&prop->u.iVal); @@ -1070,6 +1077,18 @@ case VT_UI4: StorageUtl_ReadDWord(data, 0, &prop->u.ulVal); TRACE("Read ulong %d\n", prop->u.ulVal); + break; + case VT_I8: + StorageUtl_ReadULargeInteger(data, 0, (ULARGE_INTEGER *)&prop->u.hVal); + TRACE("Read long long %s\n", wine_dbgstr_longlong(prop->u.hVal.QuadPart)); + break; + case VT_UI8: + StorageUtl_ReadULargeInteger(data, 0, &prop->u.uhVal); + TRACE("Read ulong long %s\n", wine_dbgstr_longlong(prop->u.uhVal.QuadPart)); + break; + case VT_R8: + memcpy(&prop->u.dblVal, data, sizeof(double)); + TRACE("Read double %f\n", prop->u.dblVal); break; case VT_LPSTR: { @@ -2364,7 +2383,9 @@ enumx = enumx_allocate(&IID_IEnumSTATPROPSETSTG, &IEnumSTATPROPSETSTG_Vtbl, - sizeof (STATPROPSETSTG)); + sizeof (STATPROPSETSTG), + (IUnknown*)&This->base.IStorage_iface, + NULL); /* add all the property set elements into a list */ r = IStorage_EnumElements(stg, 0, NULL, 0, &penum); @@ -2457,6 +2478,27 @@ return enumx_Clone((enumx_impl*)iface, (enumx_impl**)ppenum); } +static void prop_enum_copy_cb(IUnknown *parent, void *orig, void *dest) +{ + PropertyStorage_impl *storage = impl_from_IPropertyStorage((IPropertyStorage*)parent); + STATPROPSTG *src_prop = orig; + STATPROPSTG *dest_prop = dest; + LPWSTR name; + + dest_prop->propid = src_prop->propid; + dest_prop->vt = src_prop->vt; + dest_prop->lpwstrName = NULL; + + if (dictionary_find(storage->propid_to_name, UlongToPtr(src_prop->propid), (void**)&name)) + { + DWORD size = (strlenW(name) + 1) * sizeof(WCHAR); + + dest_prop->lpwstrName = CoTaskMemAlloc(size); + if (!dest_prop->lpwstrName) return; + memcpy(dest_prop->lpwstrName, name, size); + } +} + static BOOL prop_enum_stat(const void *k, const void *v, void *extra, void *arg) { enumx_impl *enumx = arg; @@ -2483,7 +2525,9 @@ enumx = enumx_allocate(&IID_IEnumSTATPROPSTG, &IEnumSTATPROPSTG_Vtbl, - sizeof (STATPROPSTG)); + sizeof (STATPROPSTG), + (IUnknown*)&This->IPropertyStorage_iface, + prop_enum_copy_cb); dictionary_enumerate(This->propid_to_prop, prop_enum_stat, enumx); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 5 21:03:00 2017 @@ -139,7 +139,7 @@ reactos/dll/win32/objsel # Synced to WineStaging-1.9.11 reactos/dll/win32/odbc32 # Synced to WineStaging-2.2. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/ole32 # Synced to WineStaging-1.9.23 +reactos/dll/win32/ole32 # Synced to WineStaging-2.2 reactos/dll/win32/oleacc # Synced to WineStaging-1.9.11 reactos/dll/win32/oleaut32 # Synced to WineStaging-1.9.23 reactos/dll/win32/olecli32 # Synced to WineStaging-1.9.11

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs