Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 68301: [KERNEL32] warn about unimplemented MB_ERR_INVALID_CHARS case
by cwittich＠svn.reactos.org 28 Jun '15

28 Jun '15

Author: cwittich Date: Sun Jun 28 13:06:43 2015 New Revision: 68301 URL: http://svn.reactos.org/svn/reactos?rev=68301&view=rev Log: [KERNEL32] warn about unimplemented MB_ERR_INVALID_CHARS case Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Jun 28 13:06:43 2015 @@ -451,13 +451,17 @@ /* Different handling for DBCS code pages. */ if (CodePageTable->MaximumCharacterSize > 1) { - /* FIXME */ - UCHAR Char; USHORT DBCSOffset; LPCSTR MbsEnd = MultiByteString + MultiByteCount; INT Count; + if (Flags & MB_ERR_INVALID_CHARS) + { + /* FIXME */ + DPRINT1("IntMultiByteToWideCharCP: MB_ERR_INVALID_CHARS case not implemented!\n"); + } + /* Does caller query for output buffer size? */ if (WideCharCount == 0) {

1 0

[cwittich] 68300: [KERNEL32] return the thread ansicodepage when no ansicodepage exists for a specific lcid in CP_THREAD_ACP case
by cwittich＠svn.reactos.org 28 Jun '15

28 Jun '15

Author: cwittich Date: Sun Jun 28 12:34:01 2015 New Revision: 68300 URL: http://svn.reactos.org/svn/reactos?rev=68300&view=rev Log: [KERNEL32] return the thread ansicodepage when no ansicodepage exists for a specific lcid in CP_THREAD_ACP case Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Jun 28 12:34:01 2015 @@ -218,6 +218,8 @@ /* Last error is set by GetLocaleInfoW. */ return NULL; } + if (CodePage == 0) + return &AnsiCodePage; } else if (CodePage == CP_MACCP) {

1 0

[cwittich] 68299: [KERNEL32] replace WideCharToUtf7 with wine version
by cwittich＠svn.reactos.org 28 Jun '15

28 Jun '15

Author: cwittich Date: Sun Jun 28 10:21:52 2015 New Revision: 68299 URL: http://svn.reactos.org/svn/reactos?rev=68299&view=rev Log: [KERNEL32] replace WideCharToUtf7 with wine version Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Jun 28 10:21:52 2015 @@ -1476,160 +1476,127 @@ } } -static const char mustshift[] = -{ - 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1 -}; - -static const char base64[] = -"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - -static INT WideCharToUtf7Size(LPCWSTR pszWide, INT cchWide) -{ - WCHAR wch; - INT c = 0; - BOOL fShift = FALSE; - - while(cchWide > 0) - { - wch = *pszWide; - if (wch < 0x80 && !mustshift[wch]) - { - c++; - cchWide--; - pszWide++; +static inline BOOL utf7_can_directly_encode(WCHAR codepoint) +{ + static const BOOL directly_encodable_table[] = + { + 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, /* 0x00 - 0x0F */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 - 0x1F */ + 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, /* 0x20 - 0x2F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, /* 0x30 - 0x3F */ + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x40 - 0x4F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, /* 0x50 - 0x5F */ + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x60 - 0x6F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 /* 0x70 - 0x7A */ + }; + + return codepoint <= 0x7A ? directly_encodable_table[codepoint] : FALSE; +} + +static inline BOOL utf7_write_c(char *dst, int dstlen, int *index, char character) +{ + if (dstlen > 0) + { + if (*index >= dstlen) + return FALSE; + + dst[*index] = character; + } + + (*index)++; + + return TRUE; +} + +static INT WideCharToUtf7(const WCHAR *src, int srclen, char *dst, int dstlen) +{ + static const char base64_encoding_table[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + + const WCHAR *source_end = src + srclen; + int dest_index = 0; + + while (src < source_end) + { + if (*src == '+') + { + if (!utf7_write_c(dst, dstlen, &dest_index, '+')) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + if (!utf7_write_c(dst, dstlen, &dest_index, '-')) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + src++; + } + else if (utf7_can_directly_encode(*src)) + { + if (!utf7_write_c(dst, dstlen, &dest_index, *src)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + src++; } else { - if (wch == L'+') - { - c++; - c++; - cchWide--; - pszWide++; - continue; - } - if (!fShift) - { - c++; - fShift = TRUE; - } - pszWide++; - cchWide--; - c += 3; - if (cchWide > 0 && (*pszWide >= 0x80 || mustshift[*pszWide])) - { - pszWide++; - cchWide--; - c += 3; - if (cchWide > 0 && (*pszWide >= 0x80 || mustshift[*pszWide])) + unsigned int offset = 0; + DWORD byte_pair = 0; + + if (!utf7_write_c(dst, dstlen, &dest_index, '+')) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + + while (src < source_end && !utf7_can_directly_encode(*src)) + { + byte_pair = (byte_pair << 16) | *src; + offset += 16; + while (offset >= 6) { - pszWide++; - cchWide--; - c += 2; + if (!utf7_write_c(dst, dstlen, &dest_index, base64_encoding_table[(byte_pair >> (offset - 6)) & 0x3F])) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + offset -= 6; } - } - if (cchWide > 0 && *pszWide < 0x80 && !mustshift[*pszWide]) - { - c++; - fShift = FALSE; - } - } - } - if (fShift) - c++; - - return c; -} - -static INT WideCharToUtf7(LPCWSTR pszWide, INT cchWide, LPSTR pszUtf7, INT cchUtf7) -{ - WCHAR wch; - INT c, n; - WCHAR wsz[3]; - BOOL fShift = FALSE; - - c = WideCharToUtf7Size(pszWide, cchWide); - if (cchUtf7 == 0) - return c; - - if (cchUtf7 < c) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return 0; - } - - while(cchWide > 0) - { - wch = *pszWide; - if (wch < 0x80 && !mustshift[wch]) - { - *pszUtf7++ = (CHAR) wch; - cchWide--; - pszWide++; - } - else - { - if (wch == L'+') - { - *pszUtf7++ = '+'; - *pszUtf7++ = '-'; - cchWide--; - pszWide++; - continue; - } - if (!fShift) - { - *pszUtf7++ = '+'; - fShift = TRUE; - } - wsz[0] = *pszWide++; - cchWide--; - n = 1; - if (cchWide > 0 && (*pszWide >= 0x80 || mustshift[*pszWide])) - { - wsz[1] = *pszWide++; - cchWide--; - n++; - if (cchWide > 0 && (*pszWide >= 0x80 || mustshift[*pszWide])) + src++; + } + + if (offset) + { + /* Windows won't create a padded base64 character if there's no room for the - sign + * as well ; this is probably a bug in Windows */ + if (dstlen > 0 && dest_index + 1 >= dstlen) { - wsz[2] = *pszWide++; - cchWide--; - n++; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; } - } - *pszUtf7++ = base64[wsz[0] >> 10]; - *pszUtf7++ = base64[(wsz[0] >> 4) & 0x3F]; - *pszUtf7++ = base64[(wsz[0] << 2 | (n >= 2 ? wsz[1] >> 14 : 0)) & 0x3F]; - if (n >= 2) - { - *pszUtf7++ = base64[(wsz[1] >> 8) & 0x3F]; - *pszUtf7++ = base64[(wsz[1] >> 2) & 0x3F]; - *pszUtf7++ = base64[(wsz[1] << 4 | (n >= 3 ? wsz[2] >> 12 : 0)) & 0x3F]; - if (n >= 3) + + byte_pair <<= (6 - offset); + if (!utf7_write_c(dst, dstlen, &dest_index, base64_encoding_table[byte_pair & 0x3F])) { - *pszUtf7++ = base64[(wsz[2] >> 6) & 0x3F]; - *pszUtf7++ = base64[wsz[2] & 0x3F]; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; } } - if (cchWide > 0 && *pszWide < 0x80 && !mustshift[*pszWide]) - { - *pszUtf7++ = '-'; - fShift = FALSE; - } - } - } - if (fShift) - *pszUtf7 = '-'; - - return c; + + /* Windows always explicitly terminates the base64 sequence + even though RFC 2152 (page 3, rule 2) does not require this */ + if (!utf7_write_c(dst, dstlen, &dest_index, '-')) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + } + } + + return dest_index; } DWORD

1 0

[hbelusca] 68298: [SHELL32]:Add SmartCard icon from Tango; patch by Lee Schroeder. CORE-9888 #resolve
by hbelusca＠svn.reactos.org 28 Jun '15

28 Jun '15

Author: hbelusca Date: Sun Jun 28 10:05:56 2015 New Revision: 68298 URL: http://svn.reactos.org/svn/reactos?rev=68298&view=rev Log: [SHELL32]:Add SmartCard icon from Tango; patch by Lee Schroeder. CORE-9888 #resolve Added: trunk/reactos/dll/win32/shell32/res/icons/308.ico (with props) Modified: trunk/reactos/dll/win32/shell32/icon_res.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/icon_res… ============================================================================== --- trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] Sun Jun 28 10:05:56 2015 @@ -146,7 +146,8 @@ /* TODO: 303.ico */ IDI_SHELL_DVD_ROM1 ICON "res/icons/304.ico" IDI_SHELL_FDD2 ICON "res/icons/305.ico" -/* TODO: 306.ico, 307.ico, 308.ico */ +/* TODO: 306.ico, 307.ico */ +IDI_SHELL_SMART_MEDIA ICON "res/icons/308.ico" IDI_SHELL_CAMERA1 ICON "res/icons/309.ico" /* TODO: 310.ico, 311.ico, 312.ico, 313.ico, 314.ico */ IDI_SHELL_SCANNER ICON "res/icons/315.ico" Added: trunk/reactos/dll/win32/shell32/res/icons/308.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/308.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sun Jun 28 10:05:56 2015 @@ -451,7 +451,8 @@ /* TODO: 303.ico */ #define IDI_SHELL_DVD_ROM1 304 #define IDI_SHELL_FDD2 305 -/* TODO: 306.ico, 307.ico, 308.ico */ +/* TODO: 306.ico, 307.ico */ +#define IDI_SHELL_SMART_MEDIA 308 #define IDI_SHELL_CAMERA1 309 /* TODO: 310.ico, 311.ico, 312.ico, 313.ico, 314.ico */ #define IDI_SHELL_SCANNER 315

1 0

[cwittich] 68297: [KERNEL32] replace Utf7ToWideChar with wine version
by cwittich＠svn.reactos.org 28 Jun '15

28 Jun '15

Author: cwittich Date: Sun Jun 28 09:00:03 2015 New Revision: 68297 URL: http://svn.reactos.org/svn/reactos?rev=68297&view=rev Log: [KERNEL32] replace Utf7ToWideChar with wine version Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Jun 28 09:00:03 2015 @@ -1269,168 +1269,121 @@ return GetCPFileNameFromRegistry(CodePage, NULL, 0); } -static const signed char -base64inv[] = -{ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, - -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, - -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1 -}; - -static VOID Utf7Base64Decode(BYTE *pbDest, LPCSTR pszSrc, INT cchSrc) -{ - INT i, j, n; - BYTE b; - - for(i = 0; i < cchSrc / 4 * 4; i += 4) - { - for(j = n = 0; j < 4; ) - { - b = (BYTE) base64inv[(BYTE) *pszSrc++]; - n |= (((INT) b) << ((3 - j) * 6)); - j++; - } - for(j = 0; j < 3; j++) - *pbDest++ = (BYTE) ((n >> (8 * (2 - j))) & 0xFF); - } - for(j = n = 0; j < cchSrc % 4; ) - { - b = (BYTE) base64inv[(BYTE) *pszSrc++]; - n |= (((INT) b) << ((3 - j) * 6)); - j++; - } - for(j = 0; j < ((cchSrc % 4) * 6 / 8); j++) - *pbDest++ = (BYTE) ((n >> (8 * (2 - j))) & 0xFF); -} - -static VOID myswab(LPVOID pv, INT cw) -{ - LPBYTE pb = (LPBYTE) pv; - BYTE b; - while(cw > 0) - { - b = *pb; - *pb = pb[1]; - pb[1] = b; - pb += 2; - cw--; - } -} - -static INT Utf7ToWideCharSize(LPCSTR pszUtf7, INT cchUtf7) -{ - INT n, c, cch; - CHAR ch; - LPCSTR pch; - - c = 0; - while(cchUtf7 > 0) - { - ch = *pszUtf7++; - if (ch == '+') - { - ch = *pszUtf7; - if (ch == '-') - { - c++; - pszUtf7++; - cchUtf7 -= 2; +static inline BOOL utf7_write_w(WCHAR *dst, int dstlen, int *index, WCHAR character) +{ + if (dstlen > 0) + { + if (*index >= dstlen) + return FALSE; + + dst[*index] = character; + } + + (*index)++; + + return TRUE; +} + +static INT Utf7ToWideChar(const char *src, int srclen, WCHAR *dst, int dstlen) +{ + static const signed char base64_decoding_table[] = + { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00-0x0F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10-0x1F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, /* 0x20-0x2F */ + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, /* 0x30-0x3F */ + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, /* 0x40-0x4F */ + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, /* 0x50-0x5F */ + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, /* 0x60-0x6F */ + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1 /* 0x70-0x7F */ + }; + + const char *source_end = src + srclen; + int dest_index = 0; + + DWORD byte_pair = 0; + short offset = 0; + + while (src < source_end) + { + if (*src == '+') + { + src++; + if (src >= source_end) + break; + + if (*src == '-') + { + /* just a plus sign escaped as +- */ + if (!utf7_write_w(dst, dstlen, &dest_index, '+')) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + src++; continue; } - cchUtf7--; - pch = pszUtf7; - while(cchUtf7 > 0 && (BYTE) *pszUtf7 < 0x80 && - base64inv[*pszUtf7] >= 0) - { - cchUtf7--; - pszUtf7++; - } - cch = pszUtf7 - pch; - n = (cch * 3) / 8; - c += n; - if (cchUtf7 > 0 && *pszUtf7 == '-') - { - pszUtf7++; - cchUtf7--; - } + + do + { + signed char sextet = *src; + if (sextet == '-') + { + /* skip over the dash and end base64 decoding + * the current, unfinished byte pair is discarded */ + src++; + offset = 0; + break; + } + if (sextet < 0) + { + /* the next character of src is < 0 and therefore not part of a base64 sequence + * the current, unfinished byte pair is NOT discarded in this case + * this is probably a bug in Windows */ + break; + } + + sextet = base64_decoding_table[sextet]; + if (sextet == -1) + { + /* -1 means that the next character of src is not part of a base64 sequence + * in other words, all sextets in this base64 sequence have been processed + * the current, unfinished byte pair is discarded */ + offset = 0; + break; + } + + byte_pair = (byte_pair << 6) | sextet; + offset += 6; + + if (offset >= 16) + { + /* this byte pair is done */ + if (!utf7_write_w(dst, dstlen, &dest_index, (byte_pair >> (offset - 16)) & 0xFFFF)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + offset -= 16; + } + + src++; + } + while (src < source_end); } else { - c++; - cchUtf7--; - } - } - - return c; -} - -static INT Utf7ToWideChar(LPCSTR pszUtf7, INT cchUtf7, LPWSTR pszWide, INT cchWide) -{ - INT n, c, cch; - CHAR ch; - LPCSTR pch; - WORD *pwsz; - - c = Utf7ToWideCharSize(pszUtf7, cchUtf7); - if (cchWide == 0) - return c; - - if (cchWide < c) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return 0; - } - - while(cchUtf7 > 0) - { - ch = *pszUtf7++; - if (ch == '+') - { - if (*pszUtf7 == '-') - { - *pszWide++ = L'+'; - pszUtf7++; - cchUtf7 -= 2; - continue; - } - cchUtf7--; - pch = pszUtf7; - while(cchUtf7 > 0 && (BYTE) *pszUtf7 < 0x80 && - base64inv[*pszUtf7] >= 0) - { - cchUtf7--; - pszUtf7++; - } - cch = pszUtf7 - pch; - n = (cch * 3) / 8; - pwsz = (WORD *) HeapAlloc(GetProcessHeap(), 0, (n + 1) * sizeof(WORD)); - if (pwsz == NULL) + /* we have to convert to unsigned char in case *src < 0 */ + if (!utf7_write_w(dst, dstlen, &dest_index, (unsigned char)*src)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); return 0; - ZeroMemory(pwsz, n * sizeof(WORD)); - Utf7Base64Decode((BYTE *) pwsz, pch, cch); - myswab(pwsz, n); - CopyMemory(pszWide, pwsz, n * sizeof(WORD)); - HeapFree(GetProcessHeap(), 0, pwsz); - pszWide += n; - if (cchUtf7 > 0 && *pszUtf7 == '-') - { - pszUtf7++; - cchUtf7--; - } - } - else - { - *pszWide++ = (WCHAR) ch; - cchUtf7--; - } - } - - return c; + } + src++; + } + } + + return dest_index; } /**

1 0

[cwittich] 68296: fix a typo
by cwittich＠svn.reactos.org 27 Jun '15

27 Jun '15

Author: cwittich Date: Sat Jun 27 19:30:17 2015 New Revision: 68296 URL: http://svn.reactos.org/svn/reactos?rev=68296&view=rev Log: fix a typo Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sat Jun 27 19:30:17 2015 @@ -2188,7 +2188,7 @@ Cell = Kcb->KeyCell; CmHive = (PCMHIVE)Hive; - /* Fail if the key is no a hive root key */ + /* Fail if the key is not a hive root key */ if (Cell != Hive->BaseBlock->RootCell) { DPRINT1("Key is not a hive root key!\n");

1 0

[ekohl] 68295: [NTOSKRNL] Implement NtUnloadKey2. TODO: Destroy the unlinked hive. CORE-3094
by ekohl＠svn.reactos.org 27 Jun '15

27 Jun '15

Author: ekohl Date: Sat Jun 27 19:26:12 2015 New Revision: 68295 URL: http://svn.reactos.org/svn/reactos?rev=68295&view=rev Log: [NTOSKRNL] Implement NtUnloadKey2. TODO: Destroy the unlinked hive. CORE-3094 Modified: trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sat Jun 27 19:26:12 2015 @@ -2127,13 +2127,123 @@ return Status; } +static +BOOLEAN +NTAPI +CmpUnlinkHiveFromMaster(IN PHHIVE Hive, + IN HCELL_INDEX Cell) +{ + PCELL_DATA CellData; + HCELL_INDEX LinkCell; + NTSTATUS Status; + + DPRINT("CmpUnlinkHiveFromMaster()\n"); + + /* Get the cell data */ + CellData = HvGetCell(Hive, Cell); + if (CellData == NULL) + return FALSE; + + /* Get the link cell and release the current cell */ + LinkCell = CellData->u.KeyNode.Parent; + HvReleaseCell(Hive, Cell); + + /* Remove the link cell from the master hive */ + CmpLockHiveFlusherExclusive(CmiVolatileHive); + Status = CmpFreeKeyByCell((PHHIVE)CmiVolatileHive, + LinkCell, + TRUE); + CmpUnlockHiveFlusher(CmiVolatileHive); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CmpFreeKeyByCell() failed (Status 0x%08lx)\n", Status); + return FALSE; + } + + /* Lock the hive list */ + ExAcquirePushLockExclusive(&CmpHiveListHeadLock); + + /* Remove this hive */ + RemoveEntryList(&((PCMHIVE)Hive)->HiveList); + + /* Release the lock */ + ExReleasePushLock(&CmpHiveListHeadLock); + + return TRUE; +} + NTSTATUS NTAPI CmUnloadKey(IN PCM_KEY_CONTROL_BLOCK Kcb, IN ULONG Flags) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PHHIVE Hive; + PCMHIVE CmHive; + HCELL_INDEX Cell; + + DPRINT("CmUnloadKey(%p, %lx)\n", Kcb, Flags); + + /* Get the hive */ + Hive = Kcb->KeyHive; + Cell = Kcb->KeyCell; + CmHive = (PCMHIVE)Hive; + + /* Fail if the key is no a hive root key */ + if (Cell != Hive->BaseBlock->RootCell) + { + DPRINT1("Key is not a hive root key!\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Fail if we try to unload the master hive */ + if (CmHive == CmiVolatileHive) + { + DPRINT1("Do not try to unload the master hive!\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Flush the hive */ + CmFlushKey(Kcb, TRUE); + + /* Unlink the hive from the master hive */ + if (!CmpUnlinkHiveFromMaster(Hive, Cell)) + { + DPRINT("CmpUnlinkHiveFromMaster() failed!\n"); + + /* Remove the unloading flag */ + Hive->HiveFlags &= ~HIVE_IS_UNLOADING; + + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Clean up information we have on the subkey */ + CmpCleanUpSubKeyInfo(Kcb->ParentKcb); + + /* Set the KCB in delete mode and remove it */ + Kcb->Delete = TRUE; + CmpRemoveKeyControlBlock(Kcb); + + if (Flags != REG_FORCE_UNLOAD) + { + /* Release the KCB locks */ + CmpReleaseTwoKcbLockByKey(Kcb->ConvKey, Kcb->ParentKcb->ConvKey); + + /* Release the hive loading lock */ + ExReleasePushLockExclusive(&CmpLoadHiveLock); + } + + /* Release hive lock */ + CmpUnlockRegistry(); + + /* Close file handles */ + CmpCloseHiveFiles(CmHive); + + /* Remove the hive from the hive file list */ + CmpRemoveFromHiveFileList(CmHive); + + /* FIXME: Destroy the hive */ + + return STATUS_SUCCESS; } ULONG Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Sat Jun 27 19:26:12 2015 @@ -626,3 +626,19 @@ ZwClose(EventHandle); return STATUS_SUCCESS; } + +VOID +NTAPI +CmpCloseHiveFiles(IN PCMHIVE Hive) +{ + ULONG i; + + for (i = 0; i < HFILE_TYPE_MAX; i++) + { + if (Hive->FileHandles[i] != NULL) + { + ZwClose(Hive->FileHandles[i]); + Hive->FileHandles[i] = NULL; + } + } +} Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sat Jun 27 19:26:12 2015 @@ -2138,7 +2138,6 @@ { PLIST_ENTRY ListEntry; PCMHIVE Hive; - ULONG i; /* Kill the workers */ if (!CmFirstTime) CmpShutdownWorkers(); @@ -2153,14 +2152,7 @@ { Hive = CONTAINING_RECORD(ListEntry, CMHIVE, HiveList); - for (i = 0; i < HFILE_TYPE_MAX; i++) - { - if (Hive->FileHandles[i] != NULL) - { - ZwClose(Hive->FileHandles[i]); - Hive->FileHandles[i] = NULL; - } - } + CmpCloseHiveFiles(Hive); ListEntry = ListEntry->Flink; } Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Sat Jun 27 19:26:12 2015 @@ -1372,7 +1372,6 @@ NtUnloadKey2(IN POBJECT_ATTRIBUTES TargetKey, IN ULONG Flags) { -#if 0 NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING ObjectName; @@ -1381,6 +1380,7 @@ PCM_KEY_BODY KeyBody = NULL; ULONG ParentConv = 0, ChildConv = 0; HANDLE Handle; + PAGED_CODE(); /* Validate privilege */ @@ -1515,11 +1515,11 @@ { if (Flags != REG_FORCE_UNLOAD) { + /* Release two KCBs lock */ + CmpReleaseTwoKcbLockByKey(ChildConv, ParentConv); + /* Release the hive loading lock */ ExReleasePushLockExclusive(&CmpLoadHiveLock); - - /* Release two KCBs lock */ - CmpReleaseTwoKcbLockByKey(ChildConv, ParentConv); } /* Unlock the registry */ @@ -1532,19 +1532,15 @@ /* Return status */ return Status; -#else +} + +NTSTATUS +NTAPI +NtUnloadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, + IN HANDLE Event) +{ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; -#endif -} - -NTSTATUS -NTAPI -NtUnloadKeyEx(IN POBJECT_ATTRIBUTES TargetKey, - IN HANDLE Event) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; } /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Sat Jun 27 19:26:12 2015 @@ -828,6 +828,12 @@ OUT PULONG ClusterSize OPTIONAL ); +VOID +NTAPI +CmpCloseHiveFiles( + IN PCMHIVE Hive +); + NTSTATUS NTAPI CmpInitHiveFromFile(

1 0

[akhaldi] 68294: [KBSWITCH] Improve mouse events handling. By Joachim Henze. CORE-9883
by akhaldi＠svn.reactos.org 27 Jun '15

27 Jun '15

Author: akhaldi Date: Sat Jun 27 17:15:38 2015 New Revision: 68294 URL: http://svn.reactos.org/svn/reactos?rev=68294&view=rev Log: [KBSWITCH] Improve mouse events handling. By Joachim Henze. CORE-9883 Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sat Jun 27 17:15:38 2015 @@ -434,18 +434,17 @@ case WM_NOTIFYICONMSG: switch (lParam) { - case WM_RBUTTONDOWN: - case WM_LBUTTONDOWN: + case WM_RBUTTONUP: + case WM_LBUTTONUP: { POINT pt; GetCursorPos(&pt); SetForegroundWindow(hwnd); - if (lParam == WM_LBUTTONDOWN) + if (lParam == WM_LBUTTONUP) { HMENU hLeftPopupMenu; - /* Rebuild the left popup menu on every click to take care of keyboard layout changes */ hLeftPopupMenu = BuildLeftPopupMenu(); TrackPopupMenu(hLeftPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL);

1 0

[akhaldi] 68293: [DESK] Use pixels instead of Pixel. By Jared Smudde. CORE-9738
by akhaldi＠svn.reactos.org 27 Jun '15

27 Jun '15

Author: akhaldi Date: Sat Jun 27 17:09:04 2015 New Revision: 68293 URL: http://svn.reactos.org/svn/reactos?rev=68293&view=rev Log: [DESK] Use pixels instead of Pixel. By Jared Smudde. CORE-9738 Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/sq-AL.rc Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Sat Jun 27 17:09:04 2015 @@ -205,7 +205,7 @@ IDS_COLOR_16BIT "High Color (16 Bit)" IDS_COLOR_24BIT "True Color (24 Bit)" IDS_COLOR_32BIT "True Color (32 Bit)" - IDS_PIXEL "%lux%lu Pixel" + IDS_PIXEL "%lux%lu pixels" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Sat Jun 27 17:09:04 2015 @@ -207,7 +207,7 @@ IDS_COLOR_16BIT "Moyenne (16 Bits)" IDS_COLOR_24BIT "Vraies couleurs (24 Bits)" IDS_COLOR_32BIT "Optimale (32 Bits)" - IDS_PIXEL "%lux%lu Pixel" + IDS_PIXEL "%lux%lu pixels" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] Sat Jun 27 17:09:04 2015 @@ -205,7 +205,7 @@ IDS_COLOR_16BIT "Warna Tinggi (16 Bit)" IDS_COLOR_24BIT "Warna Asli (24 Bit)" IDS_COLOR_32BIT "Warna Asli (32 Bit)" - IDS_PIXEL "%lux%lu Pixel" + IDS_PIXEL "%lux%lu pixels" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Sat Jun 27 17:09:04 2015 @@ -205,7 +205,7 @@ IDS_COLOR_16BIT "High Color (16 Bit)" IDS_COLOR_24BIT "True Color (24 Bit)" IDS_COLOR_32BIT "True Color (32 Bit)" - IDS_PIXEL "%lux%lu Pixel" + IDS_PIXEL "%lux%lu pixels" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] Sat Jun 27 17:09:04 2015 @@ -205,7 +205,7 @@ IDS_COLOR_16BIT "Hoge kleuren (16 Bit)" IDS_COLOR_24BIT "Ware kleuren (24 Bit)" IDS_COLOR_32BIT "Ware kleuren (32 Bit)" - IDS_PIXEL "%lux%lu Pixel" + IDS_PIXEL "%lux%lu pixels" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sq-AL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] Sat Jun 27 17:09:04 2015 @@ -209,7 +209,7 @@ IDS_COLOR_16BIT "Ngjyra Larta (16 Bit)" IDS_COLOR_24BIT "Ngjyra Verteta (24 Bit)" IDS_COLOR_32BIT "Ngjyra Verteta (32 Bit)" - IDS_PIXEL "%lux%lu Pixel" + IDS_PIXEL "%lux%lu pixels" END STRINGTABLE

1 0

[cfinck] 68292: [LOCALSPL] - Write the shadow file after changing job details. - dwUnknown2 in the shadow file header is actually the offset of the Print Processor Parameters. - Process all known f...
by cfinck＠svn.reactos.org 27 Jun '15

27 Jun '15

Author: cfinck Date: Sat Jun 27 15:37:14 2015 New Revision: 68292 URL: http://svn.reactos.org/svn/reactos?rev=68292&view=rev Log: [LOCALSPL] - Write the shadow file after changing job details. - dwUnknown2 in the shadow file header is actually the offset of the Print Processor Parameters. - Process all known fields of the shadow file in ReadJobShadowFile and WriteJobShadowFile. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] Sat Jun 27 15:37:14 2015 @@ -831,10 +831,14 @@ BOOL WINAPI LocalSetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command) { + const WCHAR wszFolder[] = L"\\PRINTERS\\"; + const DWORD cchFolder = _countof(wszFolder) - 1; + DWORD dwErrorCode; PLOCAL_HANDLE pHandle; PLOCAL_JOB pJob; PLOCAL_PRINTER_HANDLE pPrinterHandle; + WCHAR wszFullPath[MAX_PATH]; // Check if this is a printer handle. pHandle = (PLOCAL_HANDLE)hPrinter; @@ -867,6 +871,14 @@ if (dwErrorCode != ERROR_SUCCESS) goto Cleanup; + + // Construct the full path to the shadow file. + CopyMemory(wszFullPath, wszSpoolDirectory, cchSpoolDirectory * sizeof(WCHAR)); + CopyMemory(&wszFullPath[cchSpoolDirectory], wszFolder, cchFolder * sizeof(WCHAR)); + swprintf(&wszFullPath[cchSpoolDirectory + cchFolder], L"%05lu.SHD", JobId); + + // Write the job data into the shadow file. + WriteJobShadowFile(wszFullPath, pJob); // Perform an additional command if desired. if (Command) @@ -983,8 +995,10 @@ PLOCAL_JOB pJob; PLOCAL_JOB pReturnValue = NULL; PLOCAL_PRINTER pPrinter; + PLOCAL_PRINT_PROCESSOR pPrintProcessor; PSHD_HEADER pShadowFile = NULL; PWSTR pwszPrinterName; + PWSTR pwszPrintProcessor; // Try to open the file. hFile = CreateFileW(pwszFilePath, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -1022,7 +1036,16 @@ pPrinter = LookupElementSkiplist(&PrinterList, &pwszPrinterName, NULL); if (!pPrinter) { - ERR("Shadow file \"%S\" references a non-existing printer!\n", pwszFilePath); + ERR("Shadow file \"%S\" references a non-existing printer \"%S\"!\n", pwszFilePath, pwszPrinterName); + goto Cleanup; + } + + // Retrieve the associated Print Processor from the list. + pwszPrintProcessor = (PWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offPrintProcessor); + pPrintProcessor = FindPrintProcessor(pwszPrintProcessor); + if (!pPrintProcessor) + { + ERR("Shadow file \"%S\" references a non-existing Print Processor \"%S\"!\n", pwszFilePath, pwszPrintProcessor); goto Cleanup; } @@ -1035,12 +1058,22 @@ } pJob->dwJobID = pShadowFile->dwJobID; + pJob->dwPriority = pShadowFile->dwPriority; + pJob->dwStartTime = pShadowFile->dwStartTime; pJob->dwTotalPages = pShadowFile->dwTotalPages; - pJob->dwPriority = pShadowFile->dwPriority; + pJob->dwUntilTime = pShadowFile->dwUntilTime; pJob->pPrinter = pPrinter; + pJob->pPrintProcessor = pPrintProcessor; pJob->pwszDatatype = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDatatype)); pJob->pwszDocumentName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDocumentName)); - pJob->pwszOutputFile = NULL; + pJob->pwszMachineName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offMachineName)); + pJob->pwszNotifyName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offNotifyName)); + + if (pShadowFile->offPrintProcessorParameters) + pJob->pwszPrintProcessorParameters = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offPrintProcessorParameters)); + + pJob->pwszUserName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offUserName)); + CopyMemory(&pJob->stSubmitted, &pShadowFile->stSubmitted, sizeof(SYSTEMTIME)); CopyMemory(&pJob->DevMode, (PDEVMODEW)((ULONG_PTR)pShadowFile + pShadowFile->offDevMode), sizeof(DEVMODEW)); @@ -1057,31 +1090,48 @@ } BOOL -WriteJobShadowFile(PCWSTR pwszFilePath, const PLOCAL_JOB pJob) +WriteJobShadowFile(PWSTR pwszFilePath, const PLOCAL_JOB pJob) { BOOL bReturnValue = FALSE; DWORD cbDatatype; DWORD cbDocumentName; DWORD cbFileSize; + DWORD cbMachineName; + DWORD cbNotifyName; + DWORD cbPrinterDriver; DWORD cbPrinterName; + DWORD cbPrintProcessor; + DWORD cbPrintProcessorParameters = 0; + DWORD cbUserName; DWORD cbWritten; DWORD dwCurrentOffset; - HANDLE hFile = INVALID_HANDLE_VALUE; + HANDLE hSHDFile = INVALID_HANDLE_VALUE; + HANDLE hSPLFile = INVALID_HANDLE_VALUE; PSHD_HEADER pShadowFile = NULL; - // Try to open the file. - hFile = CreateFileW(pwszFilePath, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) + // Try to open the SHD file. + hSHDFile = CreateFileW(pwszFilePath, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, 0, NULL); + if (hSHDFile == INVALID_HANDLE_VALUE) { ERR("CreateFileW failed with error %lu for file \"%S\"!\n", GetLastError(), pwszFilePath); goto Cleanup; } // Compute the total size of the shadow file. - cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); - cbFileSize = sizeof(SHD_HEADER) + cbPrinterName + cbDatatype + cbDocumentName + sizeof(DEVMODEW); + cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); + cbNotifyName = (wcslen(pJob->pwszNotifyName) + 1) * sizeof(WCHAR); + cbPrinterDriver = (wcslen(pJob->pPrinter->pwszPrinterDriver) + 1) * sizeof(WCHAR); + cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); + cbPrintProcessor = (wcslen(pJob->pPrintProcessor->pwszName) + 1) * sizeof(WCHAR); + cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); + + // Print Processor Parameters are optional. + if (pJob->pwszPrintProcessorParameters) + cbPrintProcessorParameters = (wcslen(pJob->pwszPrintProcessorParameters) + 1) * sizeof(WCHAR); + + cbFileSize = sizeof(SHD_HEADER) + cbDatatype + cbDocumentName + sizeof(DEVMODEW) + cbMachineName + cbNotifyName + cbPrinterDriver + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbUserName; // Allocate memory for it. pShadowFile = DllAllocSplMem(cbFileSize); @@ -1097,32 +1147,68 @@ // Copy the values. pShadowFile->dwJobID = pJob->dwJobID; + pShadowFile->dwPriority = pJob->dwPriority; + pShadowFile->dwStartTime = pJob->dwStartTime; pShadowFile->dwTotalPages = pJob->dwTotalPages; - pShadowFile->dwPriority = pJob->dwPriority; + pShadowFile->dwUntilTime = pJob->dwUntilTime; CopyMemory(&pShadowFile->stSubmitted, &pJob->stSubmitted, sizeof(SYSTEMTIME)); + + // Determine the file size of the .SPL file + wcscpy(wcsrchr(pwszFilePath, L'.'), L".SPL"); + hSPLFile = CreateFileW(pwszFilePath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); + if (hSPLFile != INVALID_HANDLE_VALUE) + pShadowFile->dwSPLSize = GetFileSize(hSPLFile, NULL); // Add the extra values that are stored as offsets in the shadow file. // The first value begins right after the shadow file header. dwCurrentOffset = sizeof(SHD_HEADER); + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszDatatype, cbDatatype); + pShadowFile->offDatatype = dwCurrentOffset; + dwCurrentOffset += cbDatatype; + + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszDocumentName, cbDocumentName); + pShadowFile->offDocumentName = dwCurrentOffset; + dwCurrentOffset += cbDocumentName; + + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, &pJob->DevMode, sizeof(DEVMODEW)); + pShadowFile->offDevMode = dwCurrentOffset; + dwCurrentOffset += sizeof(DEVMODEW); + + // offDriverName is only written, but automatically determined through offPrinterName when reading. + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pPrinter->pwszPrinterDriver, cbPrinterDriver); + pShadowFile->offDriverName = dwCurrentOffset; + dwCurrentOffset += cbPrinterDriver; + + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszMachineName, cbMachineName); + pShadowFile->offMachineName = dwCurrentOffset; + dwCurrentOffset += cbMachineName; + + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszNotifyName, cbNotifyName); + pShadowFile->offNotifyName = dwCurrentOffset; + dwCurrentOffset += cbNotifyName; + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pPrinter->pwszPrinterName, cbPrinterName); pShadowFile->offPrinterName = dwCurrentOffset; dwCurrentOffset += cbPrinterName; - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszDatatype, cbDatatype); - pShadowFile->offDatatype = dwCurrentOffset; - dwCurrentOffset += cbDatatype; - - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszDocumentName, cbDocumentName); - pShadowFile->offDocumentName = dwCurrentOffset; - dwCurrentOffset += cbDocumentName; - - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, &pJob->DevMode, sizeof(DEVMODEW)); - pShadowFile->offDevMode = dwCurrentOffset; - dwCurrentOffset += sizeof(DEVMODEW); + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pPrintProcessor->pwszName, cbPrintProcessor); + pShadowFile->offPrintProcessor = dwCurrentOffset; + dwCurrentOffset += cbPrintProcessor; + + if (cbPrintProcessorParameters) + { + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszPrintProcessorParameters, cbPrintProcessorParameters); + pShadowFile->offPrintProcessorParameters = dwCurrentOffset; + dwCurrentOffset += cbPrintProcessorParameters; + } + + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszUserName, cbUserName); + pShadowFile->offUserName = dwCurrentOffset; + dwCurrentOffset += cbUserName; // Write the file. - if (!WriteFile(hFile, pShadowFile, cbFileSize, &cbWritten, NULL)) + if (!WriteFile(hSHDFile, pShadowFile, cbFileSize, &cbWritten, NULL)) { ERR("WriteFile failed with error %lu for file \"%S\"!\n", GetLastError(), pwszFilePath); goto Cleanup; @@ -1134,8 +1220,11 @@ if (pShadowFile) DllFreeSplMem(pShadowFile); - if (hFile != INVALID_HANDLE_VALUE) - CloseHandle(hFile); + if (hSHDFile != INVALID_HANDLE_VALUE) + CloseHandle(hSHDFile); + + if (hSPLFile != INVALID_HANDLE_VALUE) + CloseHandle(hSPLFile); return bReturnValue; } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Sat Jun 27 15:37:14 2015 @@ -164,7 +164,7 @@ DWORD offDevMode; DWORD offPrintProcessor; DWORD offDatatype; - DWORD dwUnknown2; + DWORD offPrintProcessorParameters; SYSTEMTIME stSubmitted; DWORD dwStartTime; DWORD dwUntilTime; @@ -191,7 +191,7 @@ BOOL WINAPI LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded); BOOL WINAPI LocalSetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command); PLOCAL_JOB ReadJobShadowFile(PCWSTR pwszFilePath); -BOOL WriteJobShadowFile(PCWSTR pwszFilePath, const PLOCAL_JOB pJob); +BOOL WriteJobShadowFile(PWSTR pwszFilePath, const PLOCAL_JOB pJob); // main.c extern const WCHAR wszCurrentEnvironment[];

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