Ros-diffs September 2016

ros-diffs@reactos.org

18 participants
342 discussions

[gedmurphy] 72590: [FLTMGR] - Add a header for sharing data between fltlib and fltmgr
by gedmurphy＠svn.reactos.org 06 Sep '16

06 Sep '16

Author: gedmurphy Date: Tue Sep 6 15:48:44 2016 New Revision: 72590 URL: http://svn.reactos.org/svn/reactos?rev=72590&view=rev Log: [FLTMGR] - Add a header for sharing data between fltlib and fltmgr Added: trunk/reactos/sdk/include/reactos/drivers/fltmgr/ trunk/reactos/sdk/include/reactos/drivers/fltmgr/fltmgr_shared.h (with props) Added: trunk/reactos/sdk/include/reactos/drivers/fltmgr/fltmgr_shared.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/driver… ============================================================================== --- trunk/reactos/sdk/include/reactos/drivers/fltmgr/fltmgr_shared.h (added) +++ trunk/reactos/sdk/include/reactos/drivers/fltmgr/fltmgr_shared.h [iso-8859-1] Tue Sep 6 15:48:44 2016 @@ -0,0 +1,16 @@ +#pragma once + +#define IOCTL_LOAD_FILTER CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x01, 0, FILE_WRITE_DATA) //88004 +#define IOCTL_UNLOAD_FILTER CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x02, 0, FILE_WRITE_DATA) //88008 +#define IOCTL_INIT_FIND CTL_CODE(FILE_DEVICE_DISK_FILE_SYSTEM, 0x03, 0, FILE_READ_DATA) //8400C + +//84024 find first +//84028 find next + + +typedef struct _FILTER_NAME +{ + USHORT Length; + WCHAR FilterName[1]; + +} FILTER_NAME, *PFILTER_NAME; Propchange: trunk/reactos/sdk/include/reactos/drivers/fltmgr/fltmgr_shared.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 72589: [CRT] Reduce difference of file.c with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 06 Sep '16

06 Sep '16

Author: akhaldi Date: Tue Sep 6 10:04:29 2016 New Revision: 72589 URL: http://svn.reactos.org/svn/reactos?rev=72589&view=rev Log: [CRT] Reduce difference of file.c with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/sdk/lib/crt/stdio/_flsbuf.c trunk/reactos/sdk/lib/crt/stdio/file.c Modified: trunk/reactos/sdk/lib/crt/stdio/_flsbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/stdio/_flsbuf.… ============================================================================== --- trunk/reactos/sdk/lib/crt/stdio/_flsbuf.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/stdio/_flsbuf.c [iso-8859-1] Tue Sep 6 10:04:29 2016 @@ -8,7 +8,7 @@ #include <precomp.h> -void __cdecl alloc_buffer(FILE *stream); +BOOL __cdecl msvcrt_alloc_buffer(FILE *stream); int __cdecl _flsbuf(int ch, FILE *stream) @@ -47,7 +47,7 @@ if (!(stream->_flag & _IONBF) && stream != stdout && stream != stderr) { /* If we have no buffer, try to allocate one */ - if (!stream->_base) alloc_buffer(stream); + if (!stream->_base) msvcrt_alloc_buffer(stream); } /* Check if we can use a buffer now */ Modified: trunk/reactos/sdk/lib/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/sdk/lib/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/stdio/file.c [iso-8859-1] Tue Sep 6 10:04:29 2016 @@ -107,8 +107,8 @@ static char utf16_bom[2] = { 0xff, 0xfe }; /* FIXME: this should be allocated dynamically */ -#define MAX_FILES 2048 -#define FD_BLOCK_SIZE 64 +#define MSVCRT_MAX_FILES 2048 +#define MSVCRT_FD_BLOCK_SIZE 64 #define MSVCRT_INTERNAL_BUFSIZ 4096 @@ -125,7 +125,7 @@ * __pioinfo (MSVCRT.@) * array of pointers to ioinfo arrays [64] */ -ioinfo * __pioinfo[MAX_FILES/FD_BLOCK_SIZE] = { 0 }; +ioinfo * __pioinfo[MSVCRT_MAX_FILES/MSVCRT_FD_BLOCK_SIZE] = { 0 }; /********************************************************************* * __badioinfo (MSVCRT.@) @@ -141,7 +141,7 @@ } file_crit; FILE _iob[_IOB_ENTRIES] = { { 0 } }; -static file_crit* MSVCRT_fstream[MAX_FILES/FD_BLOCK_SIZE] = { NULL }; +static file_crit* MSVCRT_fstream[MSVCRT_MAX_FILES/MSVCRT_FD_BLOCK_SIZE] = { NULL }; static int MSVCRT_max_streams = 512, MSVCRT_stream_idx; /* INTERNAL: process umask */ @@ -171,23 +171,23 @@ static inline ioinfo* get_ioinfo_nolock(int fd) { ioinfo *ret = NULL; - if(fd>=0 && fd<MAX_FILES) - ret = __pioinfo[fd/FD_BLOCK_SIZE]; + if(fd>=0 && fd<MSVCRT_MAX_FILES) + ret = __pioinfo[fd/MSVCRT_FD_BLOCK_SIZE]; if(!ret) return &__badioinfo; - return ret + (fd%FD_BLOCK_SIZE); + return ret + (fd%MSVCRT_FD_BLOCK_SIZE); } static inline ioinfo* get_ioinfo(int fd) { ioinfo *ret = NULL; - if(fd < MAX_FILES) - ret = __pioinfo[fd/FD_BLOCK_SIZE]; + if(fd < MSVCRT_MAX_FILES) + ret = __pioinfo[fd/MSVCRT_FD_BLOCK_SIZE]; if(!ret) return &__badioinfo; - return ret + (fd%FD_BLOCK_SIZE); + return ret + (fd%MSVCRT_FD_BLOCK_SIZE); } static inline FILE* msvcrt_get_file(int i) @@ -200,18 +200,18 @@ if(i < _IOB_ENTRIES) return &_iob[i]; - ret = MSVCRT_fstream[i/FD_BLOCK_SIZE]; + ret = MSVCRT_fstream[i/MSVCRT_FD_BLOCK_SIZE]; if(!ret) { - MSVCRT_fstream[i/FD_BLOCK_SIZE] = calloc(FD_BLOCK_SIZE, sizeof(file_crit)); - if(!MSVCRT_fstream[i/FD_BLOCK_SIZE]) { + MSVCRT_fstream[i/MSVCRT_FD_BLOCK_SIZE] = calloc(MSVCRT_FD_BLOCK_SIZE, sizeof(file_crit)); + if(!MSVCRT_fstream[i/MSVCRT_FD_BLOCK_SIZE]) { ERR("out of memory\n"); *_errno() = ENOMEM; return NULL; } - ret = MSVCRT_fstream[i/FD_BLOCK_SIZE] + (i%FD_BLOCK_SIZE); + ret = MSVCRT_fstream[i/MSVCRT_FD_BLOCK_SIZE] + (i%MSVCRT_FD_BLOCK_SIZE); } else - ret += i%FD_BLOCK_SIZE; + ret += i%MSVCRT_FD_BLOCK_SIZE; return &ret->file; } @@ -284,7 +284,7 @@ { ioinfo *fdinfo; - if (fd >= MAX_FILES) + if (fd >= MSVCRT_MAX_FILES) { WARN(":files exhausted!\n"); *_errno() = ENFILE; @@ -295,15 +295,15 @@ if(fdinfo == &__badioinfo) { int i; - __pioinfo[fd/FD_BLOCK_SIZE] = calloc(FD_BLOCK_SIZE, sizeof(ioinfo)); - if(!__pioinfo[fd/FD_BLOCK_SIZE]) { + __pioinfo[fd/MSVCRT_FD_BLOCK_SIZE] = calloc(MSVCRT_FD_BLOCK_SIZE, sizeof(ioinfo)); + if(!__pioinfo[fd/MSVCRT_FD_BLOCK_SIZE]) { WARN(":out of memory!\n"); *_errno() = ENOMEM; return -1; } - for(i=0; i<FD_BLOCK_SIZE; i++) - __pioinfo[fd/FD_BLOCK_SIZE][i].handle = INVALID_HANDLE_VALUE; + for(i=0; i<MSVCRT_FD_BLOCK_SIZE; i++) + __pioinfo[fd/MSVCRT_FD_BLOCK_SIZE][i].handle = INVALID_HANDLE_VALUE; fdinfo = get_ioinfo(fd); } @@ -460,7 +460,7 @@ handle_ptr = (HANDLE*)(wxflag_ptr + count); count = min(count, (si.cbReserved2 - sizeof(unsigned)) / (sizeof(HANDLE) + 1)); - count = min(count, MAX_FILES); + count = min(count, MSVCRT_MAX_FILES); for (i = 0; i < count; i++) { if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE) @@ -553,7 +553,7 @@ } /* INTERNAL: Allocate stdio file buffer */ -/*static*/ BOOL alloc_buffer(FILE* file) +/*static*/ BOOL msvcrt_alloc_buffer(FILE* file) { if((file->_file==STDOUT_FILENO || file->_file==STDERR_FILENO) && _isatty(file->_file)) @@ -941,7 +941,7 @@ TRACE("(od=%d, nd=%d)\n", od, nd); LOCK_FILES(); - if (nd < MAX_FILES && nd >= 0 && is_valid_fd(od)) + if (nd < MSVCRT_MAX_FILES && nd >= 0 && is_valid_fd(od)) { HANDLE handle; @@ -1313,7 +1313,7 @@ _unlock_file(file); } -static int get_flags(const wchar_t* mode, int *open_flags, int* stream_flags) +static int msvcrt_get_flags(const wchar_t* mode, int *open_flags, int* stream_flags) { int plus = strchrW(mode, '+') != NULL; @@ -1453,7 +1453,7 @@ int open_flags, stream_flags; FILE* file; - if (get_flags(mode, &open_flags, &stream_flags) == -1) return NULL; + if (msvcrt_get_flags(mode, &open_flags, &stream_flags) == -1) return NULL; LOCK_FILES(); if (!(file = msvcrt_alloc_fp())) @@ -1842,6 +1842,7 @@ else if (access & GENERIC_READ) oflags = check_bom(hand, oflags, TRUE); } + type = GetFileType(hand); if (type == FILE_TYPE_CHAR) wxflag |= WX_TTY; @@ -2757,7 +2758,7 @@ /* Allocate buffer if needed */ if(!(file->_flag & (_IONBF | _IOMYBUF | _USERBUF))) - alloc_buffer(file); + msvcrt_alloc_buffer(file); if(!(file->_flag & _IOREAD)) { if(file->_flag & _IORW) @@ -3105,7 +3106,7 @@ TRACE("(%s,%s)\n", debugstr_w(path), debugstr_w(mode)); /* map mode string to open() flags. "man fopen" for possibilities. */ - if (get_flags(mode, &open_flags, &stream_flags) == -1) + if (msvcrt_get_flags(mode, &open_flags, &stream_flags) == -1) return NULL; LOCK_FILES(); @@ -3280,7 +3281,7 @@ } if(rcnt>0 && !(file->_flag & (_IONBF | _IOMYBUF | _USERBUF))) - alloc_buffer(file); + msvcrt_alloc_buffer(file); while(rcnt>0) { @@ -3344,7 +3345,7 @@ { fclose(file); /* map mode string to open() flags. "man fopen" for possibilities. */ - if (get_flags(mode, &open_flags, &stream_flags) == -1) + if (msvcrt_get_flags(mode, &open_flags, &stream_flags) == -1) file = NULL; else { @@ -3862,7 +3863,7 @@ _lock_file(file); if((!(file->_flag & (_IONBF | _IOMYBUF | _USERBUF)) - && alloc_buffer(file)) + && msvcrt_alloc_buffer(file)) || (!file->_cnt && file->_ptr==file->_base)) file->_ptr++; @@ -3950,7 +3951,7 @@ { TRACE("%d\n", newmax); - if(newmax<_IOB_ENTRIES || newmax>MAX_FILES || newmax<MSVCRT_stream_idx) + if(newmax<_IOB_ENTRIES || newmax>MSVCRT_MAX_FILES || newmax<MSVCRT_stream_idx) return -1; MSVCRT_max_streams = newmax;

1 0

[akhaldi] 72588: [CRT] Resort to partially syncing msvcrt_flush_buffer() in order to fix some test regressions. CORE-11866 CORE-11949
by akhaldi＠svn.reactos.org 05 Sep '16

05 Sep '16

Author: akhaldi Date: Mon Sep 5 22:39:59 2016 New Revision: 72588 URL: http://svn.reactos.org/svn/reactos?rev=72588&view=rev Log: [CRT] Resort to partially syncing msvcrt_flush_buffer() in order to fix some test regressions. CORE-11866 CORE-11949 Modified: trunk/reactos/sdk/lib/crt/stdio/file.c Modified: trunk/reactos/sdk/lib/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/sdk/lib/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/stdio/file.c [iso-8859-1] Mon Sep 5 22:39:59 2016 @@ -528,10 +528,17 @@ if(file->_flag & _IORW) file->_flag &= ~_IOWRT; - } - + +#ifdef __REACTOS__ /* CORE-11949 */ file->_ptr=file->_base; file->_cnt=0; +#endif + } + +#ifndef __REACTOS__ /* CORE-11949 */ + file->_ptr=file->_base; + file->_cnt=0; +#endif return 0; }

1 0

[akhaldi] 72587: [CRT] Sync msvcrt_flush_buffer(), add_std_buffer() and remove_std_buffer() with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 05 Sep '16

05 Sep '16

Author: akhaldi Date: Mon Sep 5 20:58:12 2016 New Revision: 72587 URL: http://svn.reactos.org/svn/reactos?rev=72587&view=rev Log: [CRT] Sync msvcrt_flush_buffer(), add_std_buffer() and remove_std_buffer() with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/sdk/lib/crt/stdio/file.c Modified: trunk/reactos/sdk/lib/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/sdk/lib/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/stdio/file.c [iso-8859-1] Mon Sep 5 20:58:12 2016 @@ -518,16 +518,21 @@ /* INTERNAL: Flush stdio file buffer */ static int msvcrt_flush_buffer(FILE* file) { - if(file->_flag & (_IOMYBUF | _USERBUF)) { + if((file->_flag & (_IOREAD|_IOWRT)) == _IOWRT && + file->_flag & (_IOMYBUF|_USERBUF)) { int cnt=file->_ptr-file->_base; if(cnt>0 && _write(file->_file, file->_base, cnt) != cnt) { file->_flag |= _IOERR; return EOF; } - file->_ptr=file->_base; - file->_cnt=0; - } - return 0; + + if(file->_flag & _IORW) + file->_flag &= ~_IOWRT; + } + + file->_ptr=file->_base; + file->_cnt=0; + return 0; } /********************************************************************* @@ -567,11 +572,13 @@ static char buffers[2][BUFSIZ]; if((file->_file!=STDOUT_FILENO && file->_file!=STDERR_FILENO) - || !_isatty(file->_file) || file->_bufsiz) + || (file->_flag & (_IONBF | _IOMYBUF | _USERBUF)) + || !_isatty(file->_file)) return FALSE; file->_ptr = file->_base = buffers[file->_file == STDOUT_FILENO ? 0 : 1]; file->_bufsiz = file->_cnt = BUFSIZ; + file->_flag |= _USERBUF; return TRUE; } @@ -582,6 +589,7 @@ msvcrt_flush_buffer(file); file->_ptr = file->_base = NULL; file->_bufsiz = file->_cnt = 0; + file->_flag &= ~_USERBUF; } /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */

1 0

[dchapyshev] 72586: [RTL] - It is impossible to look for multi byte char in single byte table
by dchapyshev＠svn.reactos.org 05 Sep '16

05 Sep '16

Author: dchapyshev Date: Mon Sep 5 19:14:22 2016 New Revision: 72586 URL: http://svn.reactos.org/svn/reactos?rev=72586&view=rev Log: [RTL] - It is impossible to look for multi byte char in single byte table Modified: trunk/reactos/sdk/lib/rtl/unicode.c Modified: trunk/reactos/sdk/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/unicode.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] Mon Sep 5 19:14:22 2016 @@ -515,7 +515,6 @@ { WCHAR UnicodeChar; WCHAR OemChar; - UCHAR Index; /* If multi-byte code page present */ if (NlsMbOemCodePageTag) @@ -528,18 +527,20 @@ if (NlsOemLeadByteInfo[HIBYTE(OemChar)]) Offset = NlsOemLeadByteInfo[HIBYTE(OemChar)]; - Index = LOBYTE(OemChar) + Offset; + /* Receive Unicode character from the table */ + UnicodeChar = RtlUpcaseUnicodeChar(NlsOemToUnicodeTable[LOBYTE(OemChar) + Offset]); + + /* Receive OEM character from the table */ + OemChar = NlsUnicodeToMbOemTable[UnicodeChar]; } else { - Index = NlsUnicodeToOemTable[*Char]; - } - - /* Receive Unicode character from the table */ - UnicodeChar = RtlUpcaseUnicodeChar(NlsOemToUnicodeTable[Index]); - - /* Receive OEM character from the table */ - OemChar = NlsUnicodeToOemTable[UnicodeChar]; + /* Receive Unicode character from the table */ + UnicodeChar = RtlUpcaseUnicodeChar(NlsOemToUnicodeTable[(UCHAR)NlsUnicodeToOemTable[*Char]]); + + /* Receive OEM character from the table */ + OemChar = NlsUnicodeToOemTable[UnicodeChar]; + } /* Not valid character, failed */ if (OemChar == NlsOemDefaultChar)

1 0

[dchapyshev] 72585: [RTL] - Use correct table for multibyte code page
by dchapyshev＠svn.reactos.org 05 Sep '16

05 Sep '16

Author: dchapyshev Date: Mon Sep 5 17:44:05 2016 New Revision: 72585 URL: http://svn.reactos.org/svn/reactos?rev=72585&view=rev Log: [RTL] - Use correct table for multibyte code page Modified: trunk/reactos/sdk/lib/rtl/unicode.c Modified: trunk/reactos/sdk/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/unicode.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] Mon Sep 5 17:44:05 2016 @@ -27,6 +27,7 @@ extern PUSHORT NlsOemLeadByteInfo; extern PWCHAR NlsOemToUnicodeTable; extern PCHAR NlsUnicodeToOemTable; +extern PUSHORT NlsUnicodeToMbOemTable; /* FUNCTIONS *****************************************************************/ @@ -521,7 +522,7 @@ { USHORT Offset = 0; - OemChar = NlsUnicodeToOemTable[*Char]; + OemChar = NlsUnicodeToMbOemTable[*Char]; /* If character has Lead Byte */ if (NlsOemLeadByteInfo[HIBYTE(OemChar)])

1 0

[dchapyshev] 72584: [RTL] - NlsDbcsUnicodeToAnsiTable -> NlsUnicodeToMbAnsiTable, NlsDbcsUnicodeToOemTable -> NlsUnicodeToMbOemTable - Change types to USHORT (its not PWCHAR's)
by dchapyshev＠svn.reactos.org 05 Sep '16

05 Sep '16

Author: dchapyshev Date: Mon Sep 5 17:32:06 2016 New Revision: 72584 URL: http://svn.reactos.org/svn/reactos?rev=72584&view=rev Log: [RTL] - NlsDbcsUnicodeToAnsiTable -> NlsUnicodeToMbAnsiTable, NlsDbcsUnicodeToOemTable -> NlsUnicodeToMbOemTable - Change types to USHORT (its not PWCHAR's) Modified: trunk/reactos/sdk/lib/rtl/nls.c Modified: trunk/reactos/sdk/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/nls.c?rev=7258… ============================================================================== --- trunk/reactos/sdk/lib/rtl/nls.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/nls.c [iso-8859-1] Mon Sep 5 17:32:06 2016 @@ -20,17 +20,16 @@ USHORT NlsAnsiCodePage = 0; /* exported */ BOOLEAN NlsMbCodePageTag = FALSE; /* exported */ -PWCHAR NlsAnsiToUnicodeTable = NULL; +PUSHORT NlsAnsiToUnicodeTable = NULL; PCHAR NlsUnicodeToAnsiTable = NULL; -PWCHAR NlsDbcsUnicodeToAnsiTable = NULL; +PUSHORT NlsUnicodeToMbAnsiTable = NULL; PUSHORT NlsLeadByteInfo = NULL; /* exported */ - USHORT NlsOemCodePage = 0; BOOLEAN NlsMbOemCodePageTag = FALSE; /* exported */ -PWCHAR NlsOemToUnicodeTable = NULL; +PUSHORT NlsOemToUnicodeTable = NULL; PCHAR NlsUnicodeToOemTable = NULL; -PWCHAR NlsDbcsUnicodeToOemTable = NULL; +PUSHORT NlsUnicodeToMbOemTable = NULL; PUSHORT NlsOemLeadByteInfo = NULL; /* exported */ USHORT NlsOemDefaultChar = '\0'; @@ -444,18 +443,18 @@ DPRINT("RtlResetRtlTranslations() called\n"); /* Set ANSI data */ - NlsAnsiToUnicodeTable = (PWCHAR)NlsTable->AnsiTableInfo.MultiByteTable; /* Real type is PUSHORT */ + NlsAnsiToUnicodeTable = (PUSHORT)NlsTable->AnsiTableInfo.MultiByteTable; NlsUnicodeToAnsiTable = NlsTable->AnsiTableInfo.WideCharTable; - NlsDbcsUnicodeToAnsiTable = (PWCHAR)NlsTable->AnsiTableInfo.WideCharTable; + NlsUnicodeToMbAnsiTable = (PUSHORT)NlsTable->AnsiTableInfo.WideCharTable; NlsMbCodePageTag = (NlsTable->AnsiTableInfo.DBCSCodePage != 0); NlsLeadByteInfo = NlsTable->AnsiTableInfo.DBCSOffsets; NlsAnsiCodePage = NlsTable->AnsiTableInfo.CodePage; DPRINT("Ansi codepage %hu\n", NlsAnsiCodePage); /* Set OEM data */ - NlsOemToUnicodeTable = (PWCHAR)NlsTable->OemTableInfo.MultiByteTable; /* Real type is PUSHORT */ + NlsOemToUnicodeTable = (PUSHORT)NlsTable->OemTableInfo.MultiByteTable; NlsUnicodeToOemTable = NlsTable->OemTableInfo.WideCharTable; - NlsDbcsUnicodeToOemTable = (PWCHAR)NlsTable->OemTableInfo.WideCharTable; + NlsUnicodeToMbOemTable = (PUSHORT)NlsTable->OemTableInfo.WideCharTable; NlsMbOemCodePageTag = (NlsTable->OemTableInfo.DBCSCodePage != 0); NlsOemLeadByteInfo = NlsTable->OemTableInfo.DBCSOffsets; NlsOemCodePage = NlsTable->OemTableInfo.CodePage; @@ -566,7 +565,7 @@ continue; } - MbChar = NlsDbcsUnicodeToAnsiTable[WideChar]; + MbChar = NlsUnicodeToMbAnsiTable[WideChar]; if (!HIBYTE(MbChar)) { @@ -616,7 +615,7 @@ { USHORT WideChar = *UnicodeString++; - if (WideChar >= 0x80 && HIBYTE(NlsDbcsUnicodeToAnsiTable[WideChar])) + if (WideChar >= 0x80 && HIBYTE(NlsUnicodeToMbAnsiTable[WideChar])) { MbLength += sizeof(WCHAR); } @@ -682,7 +681,7 @@ continue; } - OemChar = NlsDbcsUnicodeToOemTable[WideChar]; + OemChar = NlsUnicodeToMbOemTable[WideChar]; if (!HIBYTE(OemChar)) { @@ -879,7 +878,7 @@ continue; } - OemChar = NlsDbcsUnicodeToOemTable[WideChar]; + OemChar = NlsUnicodeToMbOemTable[WideChar]; if (!HIBYTE(OemChar)) {

1 0

[tfaber] 72583: [USBEHCI] - Correct the definition of END_POINT_CAPABILITIES. Brought to you by Vadim Galyant. CORE-11893 #resolve CORE-9296
by tfaber＠svn.reactos.org 05 Sep '16

05 Sep '16

Author: tfaber Date: Mon Sep 5 13:06:26 2016 New Revision: 72583 URL: http://svn.reactos.org/svn/reactos?rev=72583&view=rev Log: [USBEHCI] - Correct the definition of END_POINT_CAPABILITIES. Brought to you by Vadim Galyant. CORE-11893 #resolve CORE-9296 Modified: trunk/reactos/drivers/usb/usbehci/hardware.h Modified: trunk/reactos/drivers/usb/usbehci/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.h [iso-8859-1] Mon Sep 5 13:06:26 2016 @@ -181,8 +181,8 @@ { ULONG InterruptScheduleMask:8; ULONG SplitCompletionMask:8; - ULONG HubAddr:6; - ULONG PortNumber:6; + ULONG HubAddr:7; + ULONG PortNumber:7; ULONG NumberOfTransactionPerFrame:2; } END_POINT_CAPABILITIES, *PEND_POINT_CAPABILITIES;

1 0

[cwittich] 72582: [SHELL32] fix some typos
by cwittich＠svn.reactos.org 05 Sep '16

05 Sep '16

Author: cwittich Date: Mon Sep 5 07:52:52 2016 New Revision: 72582 URL: http://svn.reactos.org/svn/reactos?rev=72582&view=rev Log: [SHELL32] fix some typos Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Mon Sep 5 07:52:52 2016 @@ -670,7 +670,7 @@ * dest [I] path to target file to move to * * RETURNS - * ERORR_SUCCESS if successful + * ERROR_SUCCESS if successful */ static DWORD SHNotifyMoveFileW(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest, BOOL isdir) { @@ -804,7 +804,7 @@ * ERROR_INVALID_NAME if the path contains invalid chars * ERROR_FILE_EXISTS when a file with that name exists * ERROR_ALREADY_EXISTS when the directory already exists - * ERROR_FILENAME_EXCED_RANGE if the filename was to long to process + * ERROR_FILENAME_EXCED_RANGE if the filename was too long to process * * FIXME: Not implemented yet; * SHCreateDirectoryEx also verifies that the files in the directory will be visible @@ -1266,7 +1266,7 @@ if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) { if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op)) - return 0; + return FALSE; } return SHNotifyCopyFileW(op, szFrom, szTo, FALSE) == 0; @@ -1970,7 +1970,7 @@ WCHAR* last_slash; WCHAR* temppath=NULL; - TRACE("%p %p %s 0x%80x\n", hwnd, modless, debugstr_w(path), flags); + TRACE("%p %p %s 0x%08x\n", hwnd, modless, debugstr_w(path), flags); if (flags & ~(SHPPFW_DIRCREATE|SHPPFW_ASKDIRCREATE|SHPPFW_IGNOREFILENAME)) FIXME("unimplemented flags 0x%08x\n", flags);

1 0

[dchapyshev] 72581: [KMTEST] - Add null-pointer test for RtlIsValidOemCharacter
by dchapyshev＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: dchapyshev Date: Sun Sep 4 23:15:08 2016 New Revision: 72581 URL: http://svn.reactos.org/svn/reactos?rev=72581&view=rev Log: [KMTEST] - Add null-pointer test for RtlIsValidOemCharacter Modified: trunk/rostests/kmtests/rtl/RtlIsValidOemCharacter.c Modified: trunk/rostests/kmtests/rtl/RtlIsValidOemCharacter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlIsValidOem… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlIsValidOemCharacter.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlIsValidOemCharacter.c [iso-8859-1] Sun Sep 4 23:15:08 2016 @@ -16,6 +16,7 @@ WCHAR tmp; BOOLEAN res; INT i; + NTSTATUS Status = STATUS_SUCCESS; res = RtlIsValidOemCharacter(&unicode_null); ok(res != FALSE, "UNICODE_NULL is valid char\n"); @@ -49,5 +50,18 @@ ok(res == FALSE, "Expected fail. '%C' [%d] is NOT valid char\n", InvalidChars[i], i); ok(tmp == RtlUpcaseUnicodeChar(InvalidChars[i]), "Expected upcase char for '%C' [%d]\n", InvalidChars[i], i); } + + _SEH2_TRY + { + RtlIsValidOemCharacter(NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + ok(!NT_SUCCESS(Status), "Exception is expected but it did not occur\n"); }

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
35
Older →

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 September 2016