Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 66411: [NTVDM] - Fix BINARY_TO_BCD and BCD_TO_BINARY - Fix MSVC warnings
by tkreuzer＠svn.reactos.org 22 Feb '15

22 Feb '15

Author: tkreuzer Date: Sun Feb 22 16:31:58 2015 New Revision: 66411 URL: http://svn.reactos.org/svn/reactos?rev=66411&view=rev Log: [NTVDM] - Fix BINARY_TO_BCD and BCD_TO_BINARY - Fix MSVC warnings Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c trunk/reactos/subsystems/ntvdm/emulator.h Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Sun Feb 22 16:31:58 2015 @@ -2014,6 +2014,8 @@ case SCROLL_DOWN: { + INT Bottom; + /* Move text lines down */ for (i = Rectangle.Bottom - Amount; i >= Rectangle.Top; i--) { @@ -2024,7 +2026,8 @@ } /* Fill the top of the rectangle */ - for (i = Rectangle.Top; i <= Rectangle.Top + Amount - 1; i++) + Bottom = Rectangle.Top + Amount - 1; + for (i = Rectangle.Top; i <= Bottom; i++) { for (j = Rectangle.Left; j <= Rectangle.Right; j++) { @@ -2078,7 +2081,8 @@ /* Fill the left of the rectangle */ for (i = Rectangle.Top; i <= Rectangle.Bottom; i++) { - for (j = Rectangle.Left; j <= Rectangle.Left + Amount - 1; j++) + INT Right = Rectangle.Left + Amount - 1; + for (j = Rectangle.Left; j <= Right; j++) { EmulatorWriteMemory(&EmulatorContext, VideoAddress + (i * Bda->ScreenColumns + j) * sizeof(WORD), Modified: trunk/reactos/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.h [iso-8859-1] Sun Feb 22 16:31:58 2015 @@ -36,9 +36,40 @@ /* BCD-Binary conversion */ -#define BINARY_TO_BCD(x) ((((x) / 1000) << 12) + (((x) / 100) << 8) + (((x) / 10) << 4) + ((x) % 10)) -#define BCD_TO_BINARY(x) (((x) >> 12) * 1000 + ((x) >> 8) * 100 + ((x) >> 4) * 10 + ((x) & 0x0F)) +FORCEINLINE +USHORT +BINARY_TO_BCD(USHORT Value) +{ + USHORT Result; + + Result = (Value / 1000) << 12; + Value %= 1000; + Result |= (Value / 100) << 8; + Value %= 100; + Result |= (Value / 10) << 4; + Value %= 10; + Result |= Value; + + return Result; +} + +FORCEINLINE +USHORT +BCD_TO_BINARY(USHORT Value) +{ + USHORT Result; + + Result = Value & 0xF; + Value >>= 4; + Result += (Value & 0xF) * 10; + Value >>= 4; + Result += (Value & 0xF) * 100; + Value >>= 4; + Result += Value * 1000; + + return Result; +} /* System I/O ports */ #define CONTROL_SYSTEM_PORT61H 0x61

1 0

[spetreolle] 66410: [BROWSEUI] update Russian Translation by Akhlamov Petr CORE-7981 #resolve #comment Committed.
by spetreolle＠svn.reactos.org 22 Feb '15

22 Feb '15

Author: spetreolle Date: Sun Feb 22 16:25:23 2015 New Revision: 66410 URL: http://svn.reactos.org/svn/reactos?rev=66410&view=rev Log: [BROWSEUI] update Russian Translation by Akhlamov Petr CORE-7981 #resolve #comment Committed. Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/browseui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ru-RU.rc [iso-8859-1] Sun Feb 22 16:25:23 2015 @@ -102,16 +102,16 @@ LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 - PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE } IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Te&xt options:", -1, 4, 2, 48, 15 + LTEXT "Ð¢ÐµÐºÑÑ ÐºÐ½&Ð¾Ð¿ÐºÐ¸:", -1, 4, 2, 48, 15 COMBOBOX IDC_TEXTOPTIONS, 52, 0, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Ico&n options:", -1, 4, 20, 48, 15 + LTEXT "Ð Ð°Ð·Ð¼ÐµÑ Ð·Ð½&Ð°ÑÐºÐ°:", -1, 4, 20, 48, 15 COMBOBOX IDC_ICONOPTIONS, 52, 18, 123, 57, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -138,8 +138,8 @@ STRINGTABLE BEGIN - IDS_CANCELLING "Canceling..." - IDS_REMAINING "Remaining" + IDS_CANCELLING "ÐÑÐ¼ÐµÐ½Ð°..." + IDS_REMAINING "ÐÑÑÐ°Ð»Ð¾ÑÑ" END STRINGTABLE

1 0

[tfaber] 66409: [SPOOLSV] - The Spooler service is not pausable. Fixes some wbemprox:query tests
by tfaber＠svn.reactos.org 22 Feb '15

22 Feb '15

Author: tfaber Date: Sun Feb 22 16:25:20 2015 New Revision: 66409 URL: http://svn.reactos.org/svn/reactos?rev=66409&view=rev Log: [SPOOLSV] - The Spooler service is not pausable. Fixes some wbemprox:query tests Modified: trunk/reactos/base/services/spoolsv/spoolsv.c Modified: trunk/reactos/base/services/spoolsv/spoolsv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/spoolsv/spoo… ============================================================================== --- trunk/reactos/base/services/spoolsv/spoolsv.c [iso-8859-1] (original) +++ trunk/reactos/base/services/spoolsv/spoolsv.c [iso-8859-1] Sun Feb 22 16:25:20 2015 @@ -38,9 +38,7 @@ ServiceStatus.dwCurrentState = dwState; if (dwState == SERVICE_RUNNING) - ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_PAUSE_CONTINUE | SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; - else if (dwState == SERVICE_PAUSED) - ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_PAUSE_CONTINUE; + ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; else ServiceStatus.dwControlsAccepted = 0; @@ -49,9 +47,7 @@ ServiceStatus.dwCheckPoint = 0; if (dwState == SERVICE_START_PENDING || - dwState == SERVICE_STOP_PENDING || - dwState == SERVICE_PAUSE_PENDING || - dwState == SERVICE_CONTINUE_PENDING) + dwState == SERVICE_STOP_PENDING) ServiceStatus.dwWaitHint = 10000; else ServiceStatus.dwWaitHint = 0; @@ -74,16 +70,6 @@ case SERVICE_CONTROL_STOP: TRACE(" SERVICE_CONTROL_STOP received\n"); UpdateServiceStatus(SERVICE_STOPPED); - return ERROR_SUCCESS; - - case SERVICE_CONTROL_PAUSE: - TRACE(" SERVICE_CONTROL_PAUSE received\n"); - UpdateServiceStatus(SERVICE_PAUSED); - return ERROR_SUCCESS; - - case SERVICE_CONTROL_CONTINUE: - TRACE(" SERVICE_CONTROL_CONTINUE received\n"); - UpdateServiceStatus(SERVICE_RUNNING); return ERROR_SUCCESS; case SERVICE_CONTROL_INTERROGATE:

1 0

[tkreuzer] 66408: [PSDK] Improve / fix range constants in limits.h and intsafe.h, get rid of stuff that shouldn't be there.
by tkreuzer＠svn.reactos.org 22 Feb '15

22 Feb '15

Author: tkreuzer Date: Sun Feb 22 16:05:51 2015 New Revision: 66408 URL: http://svn.reactos.org/svn/reactos?rev=66408&view=rev Log: [PSDK] Improve / fix range constants in limits.h and intsafe.h, get rid of stuff that shouldn't be there. Modified: trunk/reactos/include/crt/limits.h trunk/reactos/include/psdk/intsafe.h Modified: trunk/reactos/include/crt/limits.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/limits.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/limits.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/limits.h [iso-8859-1] Sun Feb 22 16:05:51 2015 @@ -3,6 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ +#pragma once #include <crtdefs.h> #ifndef _INC_LIMITS @@ -23,8 +24,13 @@ #define SCHAR_MAX 127 #define UCHAR_MAX 0xff -#define CHAR_MIN SCHAR_MIN -#define CHAR_MAX SCHAR_MAX +#ifdef _CHAR_UNSIGNED + #define CHAR_MIN 0 + #define CHAR_MAX UCHAR_MAX +#else + #define CHAR_MIN SCHAR_MIN + #define CHAR_MAX SCHAR_MAX +#endif /* _CHAR_UNSIGNED */ #define MB_LEN_MAX 5 #define SHRT_MIN (-32768) @@ -36,41 +42,30 @@ #define LONG_MIN (-2147483647L - 1) #define LONG_MAX 2147483647L #define ULONG_MAX 0xffffffffUL -#define LLONG_MAX 9223372036854775807ll -#define LLONG_MIN (-9223372036854775807ll - 1) -#define ULLONG_MAX 0xffffffffffffffffull +#define LLONG_MAX 9223372036854775807LL +#define LLONG_MIN (-9223372036854775807LL - 1) +#define ULLONG_MAX 0xffffffffffffffffULL -#if _INTEGRAL_MAX_BITS >= 8 -#define _I8_MIN (-127 - 1) -#define _I8_MAX 127i8 -#define _UI8_MAX 0xffu -#endif +#define _I8_MIN ((signed char)(-127 - 1)) +#define _I8_MAX ((signed char)127) +#define _UI8_MAX ((unsigned char)0xff) -#if _INTEGRAL_MAX_BITS >= 16 -#define _I16_MIN (-32767 - 1) -#define _I16_MAX 32767i16 -#define _UI16_MAX 0xffffu -#endif +#define _I16_MIN ((short)(-32767 - 1)) +#define _I16_MAX ((short)32767) +#define _UI16_MAX ((unsigned short)0xffffU) -#if _INTEGRAL_MAX_BITS >= 32 #define _I32_MIN (-2147483647 - 1) #define _I32_MAX 2147483647 #define _UI32_MAX 0xffffffffu -#endif -#if defined(__GNUC__) -#undef LONG_LONG_MAX -#define LONG_LONG_MAX 9223372036854775807ll -#undef LONG_LONG_MIN -#define LONG_LONG_MIN (-LONG_LONG_MAX-1) -#undef ULONG_LONG_MAX -#define ULONG_LONG_MAX (2ull * LONG_LONG_MAX + 1ull) -#endif +#define _I64_MIN (-9223372036854775807LL - 1) +#define _I64_MAX 9223372036854775807LL +#define _UI64_MAX 0xffffffffffffffffULL -#if _INTEGRAL_MAX_BITS >= 64 -#define _I64_MIN (-9223372036854775807ll - 1) -#define _I64_MAX 9223372036854775807ll -#define _UI64_MAX 0xffffffffffffffffull +#if defined(_MSC_VER) && (_INTEGRAL_MAX_BITS >= 128) +#define _I128_MIN (-170141183460469231731687303715884105727i128 - 1) +#define _I128_MAX 170141183460469231731687303715884105727i128 +#define _UI128_MAX 0xffffffffffffffffffffffffffffffffui128 #endif #ifndef SIZE_MAX @@ -79,33 +74,12 @@ #else #define SIZE_MAX UINT_MAX #endif -#endif +#endif /* SIZE_MAX */ -#ifdef _POSIX_ -#define _POSIX_ARG_MAX 4096 -#define _POSIX_CHILD_MAX 6 -#define _POSIX_LINK_MAX 8 -#define _POSIX_MAX_CANON 255 -#define _POSIX_MAX_INPUT 255 -#define _POSIX_NAME_MAX 14 -#define _POSIX_NGROUPS_MAX 0 -#define _POSIX_OPEN_MAX 16 -#define _POSIX_PATH_MAX 255 -#define _POSIX_PIPE_BUF 512 -#define _POSIX_SSIZE_MAX 32767 -#define _POSIX_STREAM_MAX 8 -#define _POSIX_TZNAME_MAX 3 -#define ARG_MAX 14500 -#define LINK_MAX 1024 -#define MAX_CANON _POSIX_MAX_CANON -#define MAX_INPUT _POSIX_MAX_INPUT -#define NAME_MAX 255 -#define NGROUPS_MAX 16 -#define OPEN_MAX 32 -#define PATH_MAX 512 -#define PIPE_BUF _POSIX_PIPE_BUF -#define SSIZE_MAX _POSIX_SSIZE_MAX -#define STREAM_MAX 20 -#define TZNAME_MAX 10 -#endif -#endif +#if __STDC_WANT_SECURE_LIB__ +#ifndef RSIZE_MAX +#define RSIZE_MAX SIZE_MAX +#endif /* RSIZE_MAX */ +#endif /* __STDC_WANT_SECURE_LIB__ */ + +#endif /* _INC_LIMITS */ Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Sun Feb 22 16:05:51 2015 @@ -122,52 +122,40 @@ C_ASSERT(sizeof(DWORD) == 4); C_ASSERT(sizeof(UINT_PTR) == sizeof(ULONG_PTR)); -/* Undefine these to avoid conflicts with limits.h */ -#undef CHAR_MIN -#undef CHAR_MAX -#undef INT_MIN -#undef INT_MAX -#undef LONG_MIN -#undef LONG_MAX -#undef UCHAR_MAX -#undef UINT_MAX -#undef ULONG_MAX - /* Integer range margins (use (x-1) to prevent warnings) */ -#define INT8_MIN (-127 - 1) -#define SHORT_MIN (-32767 - 1) -#define INT16_MIN (-32767 - 1) +#define INT8_MIN ((signed char)(-127 - 1)) +#define SHORT_MIN (-32768) +#define INT16_MIN ((short)(-32767 - 1)) #define INT_MIN (-2147483647 - 1) #define INT32_MIN (-2147483647 - 1) #define LONG_MIN (-2147483647L - 1) #define LONGLONG_MIN (-9223372036854775807LL - 1) #define LONG64_MIN (-9223372036854775807LL - 1) #define INT64_MIN (-9223372036854775807LL - 1) -//#define INT128_MIN (-170141183460469231731687303715884105728) +#define INT128_MIN (-170141183460469231731687303715884105727i128 - 1) #ifdef _WIN64 -#define INT_PTR_MIN INT64_MIN -#define LONG_PTR_MIN LONG64_MIN -#define PTRDIFF_T_MIN INT64_MIN -#define SSIZE_T_MIN INT64_MIN -#else // _WIN64 -#define INT_PTR_MIN INT_MIN -#define LONG_PTR_MIN LONG_MIN -#define PTRDIFF_T_MIN INT_MIN -#define SSIZE_T_MIN INT_MIN -#endif // _WIN64 - -#define INT8_MAX 127 -#define UINT8_MAX 0xff -#define UCHAR_MAX 0xff +#define INT_PTR_MIN (-9223372036854775807LL - 1) +#define LONG_PTR_MIN (-9223372036854775807LL - 1) +#define PTRDIFF_T_MIN (-9223372036854775807LL - 1) +#define SSIZE_T_MIN (-9223372036854775807LL - 1) +#else /* _WIN64 */ +#define INT_PTR_MIN (-2147483647 - 1) +#define LONG_PTR_MIN (-2147483647L - 1) +#define PTRDIFF_T_MIN (-2147483647 - 1) +#define SSIZE_T_MIN (-2147483647L - 1) +#endif /* _WIN64 */ + +#define INT8_MAX ((signed char)127) +#define UINT8_MAX ((unsigned char)0xffU) #define BYTE_MAX 0xff #define SHORT_MAX 32767 -#define INT16_MAX 32767 +#define INT16_MAX ((short)32767) #define USHORT_MAX 0xffff -#define UINT16_MAX 0xffff +#define UINT16_MAX ((unsigned short)0xffffU) #define WORD_MAX 0xffff #define INT_MAX 2147483647 #define INT32_MAX 2147483647 -#define UINT_MAX 0xffffffffU +#define UINT_MAX 0xffffffff #define UINT32_MAX 0xffffffffU #define LONG_MAX 2147483647L #define ULONG_MAX 0xffffffffUL @@ -180,54 +168,44 @@ #define ULONG64_MAX 0xffffffffffffffffULL #define DWORD64_MAX 0xffffffffffffffffULL #define UINT64_MAX 0xffffffffffffffffULL -#define INT128_MAX 170141183460469231731687303715884105727 -#define UINT128_MAX 0xffffffffffffffffffffffffffffffff +#define INT128_MAX 170141183460469231731687303715884105727i128 +#define UINT128_MAX 0xffffffffffffffffffffffffffffffffui128 #undef SIZE_T_MAX #ifdef _WIN64 -#define INT_PTR_MAX INT64_MAX -#define UINT_PTR_MAX UINT64_MAX -#define LONG_PTR_MAX LONG64_MAX -#define ULONG_PTR_MAX ULONG64_MAX -#define DWORD_PTR_MAX DWORD64_MAX -#define PTRDIFF_T_MAX INT64_MAX -#define SIZE_T_MAX UINT64_MAX -#define SSIZE_T_MAX INT64_MAX -#define _SIZE_T_MAX UINT64_MAX -#else // _WIN64 -#define INT_PTR_MAX INT_MAX -#define UINT_PTR_MAX UINT_MAX -#define LONG_PTR_MAX LONG_MAX -#define ULONG_PTR_MAX ULONG_MAX -#define DWORD_PTR_MAX DWORD_MAX -#define PTRDIFF_T_MAX INT_MAX -#define SIZE_T_MAX UINT_MAX -#define SSIZE_T_MAX INT_MAX -#define _SIZE_T_MAX UINT_MAX -#endif // _WIN64 - -#ifndef CHAR_MIN -#ifdef _CHAR_UNSIGNED -#define CHAR_MIN 0 -#define CHAR_MAX 0xff -#else -#define CHAR_MIN (-128) -#define CHAR_MAX 127 -#endif -#endif +#define INT_PTR_MAX 9223372036854775807LL +#define UINT_PTR_MAX 0xffffffffffffffffULL +#define LONG_PTR_MAX 9223372036854775807LL +#define ULONG_PTR_MAX 0xffffffffffffffffULL +#define DWORD_PTR_MAX 0xffffffffffffffffULL +#define PTRDIFF_T_MAX 9223372036854775807LL +#define SIZE_T_MAX 0xffffffffffffffffULL +#define SSIZE_T_MAX 9223372036854775807LL +#define _SIZE_T_MAX 0xffffffffffffffffULL +#else /* _WIN64 */ +#define INT_PTR_MAX 2147483647 +#define UINT_PTR_MAX 0xffffffff +#define LONG_PTR_MAX 2147483647L +#define ULONG_PTR_MAX 0xffffffffUL +#define DWORD_PTR_MAX 0xffffffffUL +#define PTRDIFF_T_MAX 2147483647 +#define SIZE_T_MAX 0xffffffff +#define SSIZE_T_MAX 2147483647L +#define _SIZE_T_MAX 0xffffffffUL +#endif /* _WIN64 */ /* Error values */ -#define INT8_ERROR (-1) -#define UINT8_ERROR 0xff +#define INT8_ERROR ((signed char)(-1)) +#define UINT8_ERROR ((unsigned char)0xff) #define BYTE_ERROR 0xff #define SHORT_ERROR (-1) -#define INT16_ERROR (-1) +#define INT16_ERROR ((short)(-1)) #define USHORT_ERROR 0xffff -#define UINT16_ERROR 0xffff +#define UINT16_ERROR ((unsigned short)0xffffU) #define WORD_ERROR 0xffff #define INT_ERROR (-1) #define INT32_ERROR (-1) #define UINT_ERROR 0xffffffff -#define UINT32_ERROR 0xffffffff +#define UINT32_ERROR 0xffffffffU #define LONG_ERROR (-1L) #define ULONG_ERROR 0xffffffffUL #define DWORD_ERROR 0xffffffffUL @@ -248,7 +226,7 @@ #define SIZE_T_ERROR 0xffffffffffffffffULL #define SSIZE_T_ERROR (-1LL) #define _SIZE_T_ERROR 0xffffffffffffffffULL -#else // _WIN64 +#else /* _WIN64 */ #define INT_PTR_ERROR (-1) #define UINT_PTR_ERROR 0xffffffff #define LONG_PTR_ERROR (-1L) @@ -258,7 +236,18 @@ #define SIZE_T_ERROR 0xffffffff #define SSIZE_T_ERROR (-1L) #define _SIZE_T_ERROR 0xffffffffUL -#endif // _WIN64 +#endif /* _WIN64 */ + +/* special definitons (the CHAR ones should not be defined here!) */ +#define _INTSAFE_CHAR CHAR +#define _INTSAFE_CHAR_ERROR 0xff +#ifdef _CHAR_UNSIGNED + #define _INTSAFE_CHAR_MIN 0 + #define _INTSAFE_CHAR_MAX 0xff +#else + #define _INTSAFE_CHAR_MIN (-128) + #define _INTSAFE_CHAR_MAX 127 +#endif /* _CHAR_UNSIGNED */ #define size_t_ERROR SIZE_T_ERROR #define UCHAR_ERROR '\0' @@ -290,23 +279,23 @@ } \ } -DEFINE_SAFE_CONVERT_UTOX(ByteToChar, BYTE, CHAR) +DEFINE_SAFE_CONVERT_UTOX(ByteToChar, BYTE, _INTSAFE_CHAR) DEFINE_SAFE_CONVERT_UTOX(ByteToInt8, BYTE, INT8) -DEFINE_SAFE_CONVERT_UTOX(UInt8ToChar, UINT8, CHAR) +DEFINE_SAFE_CONVERT_UTOX(UInt8ToChar, UINT8, _INTSAFE_CHAR) DEFINE_SAFE_CONVERT_UTOX(UInt8ToInt8, UINT8, INT8) -DEFINE_SAFE_CONVERT_UTOX(UShortToChar, USHORT, CHAR) -DEFINE_SAFE_CONVERT_UTOX(UShortToUChar, USHORT, UCHAR) +DEFINE_SAFE_CONVERT_UTOX(UShortToChar, USHORT, _INTSAFE_CHAR) +DEFINE_SAFE_CONVERT_UTOX(UShortToUChar, USHORT, UINT8) DEFINE_SAFE_CONVERT_UTOX(UShortToInt8, USHORT, INT8) DEFINE_SAFE_CONVERT_UTOX(UShortToUInt8, USHORT, UINT8) DEFINE_SAFE_CONVERT_UTOX(UShortToShort, USHORT, SHORT) -DEFINE_SAFE_CONVERT_UTOX(UIntToUChar, UINT, UCHAR) +DEFINE_SAFE_CONVERT_UTOX(UIntToUChar, UINT, UINT8) DEFINE_SAFE_CONVERT_UTOX(UIntToInt8, UINT, INT8) DEFINE_SAFE_CONVERT_UTOX(UIntToUInt8, UINT, UINT8) DEFINE_SAFE_CONVERT_UTOX(UIntToShort, UINT, SHORT) DEFINE_SAFE_CONVERT_UTOX(UIntToUShort, UINT, USHORT) DEFINE_SAFE_CONVERT_UTOX(UIntToInt, UINT, INT) DEFINE_SAFE_CONVERT_UTOX(UIntToLong, UINT, LONG) -DEFINE_SAFE_CONVERT_UTOX(UIntPtrToUChar, UINT_PTR, UCHAR) +DEFINE_SAFE_CONVERT_UTOX(UIntPtrToUChar, UINT_PTR, UINT8) DEFINE_SAFE_CONVERT_UTOX(UIntPtrToInt8, UINT_PTR, INT8) DEFINE_SAFE_CONVERT_UTOX(UIntPtrToUInt8, UINT_PTR, UINT8) DEFINE_SAFE_CONVERT_UTOX(UIntPtrToShort, UINT_PTR, SHORT) @@ -317,7 +306,7 @@ DEFINE_SAFE_CONVERT_UTOX(UIntPtrToLong, UINT_PTR, LONG) DEFINE_SAFE_CONVERT_UTOX(UIntPtrToIntPtr, UINT_PTR, INT_PTR) DEFINE_SAFE_CONVERT_UTOX(UIntPtrToLongPtr, UINT_PTR, LONG_PTR) -DEFINE_SAFE_CONVERT_UTOX(ULongToUChar, ULONG, UCHAR) +DEFINE_SAFE_CONVERT_UTOX(ULongToUChar, ULONG, UINT8) DEFINE_SAFE_CONVERT_UTOX(ULongToUInt8, ULONG, UINT8) DEFINE_SAFE_CONVERT_UTOX(ULongToShort, ULONG, SHORT) DEFINE_SAFE_CONVERT_UTOX(ULongToUShort, ULONG, USHORT) @@ -354,7 +343,7 @@ } \ } -DEFINE_SAFE_CONVERT_STOU(Int8ToUChar, INT8, UCHAR) +DEFINE_SAFE_CONVERT_STOU(Int8ToUChar, INT8, UINT8) DEFINE_SAFE_CONVERT_STOU(Int8ToUInt8, INT8, UINT8) DEFINE_SAFE_CONVERT_STOU(Int8ToUShort, INT8, USHORT) DEFINE_SAFE_CONVERT_STOU(Int8ToUInt, INT8, UINT) @@ -362,7 +351,7 @@ DEFINE_SAFE_CONVERT_STOU(Int8ToUIntPtr, INT8, UINT_PTR) DEFINE_SAFE_CONVERT_STOU(Int8ToULongPtr, INT8, ULONG_PTR) DEFINE_SAFE_CONVERT_STOU(Int8ToULongLong, INT8, ULONGLONG) -DEFINE_SAFE_CONVERT_STOU(ShortToUChar, SHORT, UCHAR) +DEFINE_SAFE_CONVERT_STOU(ShortToUChar, SHORT, UINT8) DEFINE_SAFE_CONVERT_STOU(ShortToUInt8, SHORT, UINT8) DEFINE_SAFE_CONVERT_STOU(ShortToUShort, SHORT, USHORT) DEFINE_SAFE_CONVERT_STOU(ShortToUInt, SHORT, UINT) @@ -371,13 +360,13 @@ DEFINE_SAFE_CONVERT_STOU(ShortToULongPtr, SHORT, ULONG_PTR) DEFINE_SAFE_CONVERT_STOU(ShortToDWordPtr, SHORT, DWORD_PTR) DEFINE_SAFE_CONVERT_STOU(ShortToULongLong, SHORT, ULONGLONG) -DEFINE_SAFE_CONVERT_STOU(IntToUChar, INT, UCHAR) +DEFINE_SAFE_CONVERT_STOU(IntToUChar, INT, UINT8) DEFINE_SAFE_CONVERT_STOU(IntToUInt8, INT, UINT8) DEFINE_SAFE_CONVERT_STOU(IntToUShort, INT, USHORT) DEFINE_SAFE_CONVERT_STOU(IntToUInt, INT, UINT) DEFINE_SAFE_CONVERT_STOU(IntToULong, INT, ULONG) DEFINE_SAFE_CONVERT_STOU(IntToULongLong, INT, ULONGLONG) -DEFINE_SAFE_CONVERT_STOU(LongToUChar, LONG, UCHAR) +DEFINE_SAFE_CONVERT_STOU(LongToUChar, LONG, UINT8) DEFINE_SAFE_CONVERT_STOU(LongToUInt8, LONG, UINT8) DEFINE_SAFE_CONVERT_STOU(LongToUShort, LONG, USHORT) DEFINE_SAFE_CONVERT_STOU(LongToUInt, LONG, UINT) @@ -385,7 +374,7 @@ DEFINE_SAFE_CONVERT_STOU(LongToUIntPtr, LONG, UINT_PTR) DEFINE_SAFE_CONVERT_STOU(LongToULongPtr, LONG, ULONG_PTR) DEFINE_SAFE_CONVERT_STOU(LongToULongLong, LONG, ULONGLONG) -DEFINE_SAFE_CONVERT_STOU(IntPtrToUChar, INT_PTR, UCHAR) +DEFINE_SAFE_CONVERT_STOU(IntPtrToUChar, INT_PTR, UINT8) DEFINE_SAFE_CONVERT_STOU(IntPtrToUInt8, INT_PTR, UINT8) DEFINE_SAFE_CONVERT_STOU(IntPtrToUShort, INT_PTR, USHORT) DEFINE_SAFE_CONVERT_STOU(IntPtrToUInt, INT_PTR, UINT) @@ -393,7 +382,7 @@ DEFINE_SAFE_CONVERT_STOU(IntPtrToUIntPtr, INT_PTR, UINT_PTR) DEFINE_SAFE_CONVERT_STOU(IntPtrToULongPtr, INT_PTR, ULONG_PTR) DEFINE_SAFE_CONVERT_STOU(IntPtrToULongLong, INT_PTR, ULONGLONG) -DEFINE_SAFE_CONVERT_STOU(LongPtrToUChar, LONG_PTR, UCHAR) +DEFINE_SAFE_CONVERT_STOU(LongPtrToUChar, LONG_PTR, UINT8) DEFINE_SAFE_CONVERT_STOU(LongPtrToUInt8, LONG_PTR, UINT8) DEFINE_SAFE_CONVERT_STOU(LongPtrToUShort, LONG_PTR, USHORT) DEFINE_SAFE_CONVERT_STOU(LongPtrToUInt, LONG_PTR, UINT) @@ -402,8 +391,8 @@ DEFINE_SAFE_CONVERT_STOU(LongPtrToULongPtr, LONG_PTR, ULONG_PTR) DEFINE_SAFE_CONVERT_STOU(LongPtrToULongLong, LONG_PTR, ULONGLONG) #ifdef _CHAR_UNSIGNED -DEFINE_SAFE_CONVERT_STOU(ShortToChar, SHORT, UCHAR) -DEFINE_SAFE_CONVERT_STOU(LongPtrToChar, LONG_PTR, UCHAR) +DEFINE_SAFE_CONVERT_STOU(ShortToChar, SHORT, UINT8) +DEFINE_SAFE_CONVERT_STOU(LongPtrToChar, LONG_PTR, UINT8) #endif @@ -447,10 +436,8 @@ DEFINE_SAFE_CONVERT_STOS(LongLongToLong, LONGLONG, LONG) DEFINE_SAFE_CONVERT_STOS(LongLongToIntPtr, LONGLONG, INT_PTR) DEFINE_SAFE_CONVERT_STOS(LongLongToLongPtr, LONGLONG, LONG_PTR) -#ifndef _CHAR_UNSIGNED -DEFINE_SAFE_CONVERT_STOS(ShortToChar, SHORT, CHAR) -DEFINE_SAFE_CONVERT_STOS(LongPtrToChar, LONG_PTR, CHAR) -#endif +DEFINE_SAFE_CONVERT_STOS(ShortToChar, SHORT, _INTSAFE_CHAR) +DEFINE_SAFE_CONVERT_STOS(LongPtrToChar, LONG_PTR, _INTSAFE_CHAR) #ifdef _NTINTSAFE_H_INCLUDED_ @@ -789,6 +776,10 @@ #else #endif +#undef _INTSAFE_CHAR_MIN +#undef _INTSAFE_CHAR_MAX +#undef _INTSAFE_CHAR_ERROR + #endif // _NTINTSAFE_H_INCLUDED_ #endif // !_INTSAFE_H_INCLUDED_

1 0

[akhaldi] 66407: [WBEMPROX] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 22 Feb '15

22 Feb '15

Author: akhaldi Date: Sun Feb 22 15:46:17 2015 New Revision: 66407 URL: http://svn.reactos.org/svn/reactos?rev=66407&view=rev Log: [WBEMPROX] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/wbemprox/CMakeLists.txt trunk/reactos/dll/win32/wbemprox/builtin.c trunk/reactos/dll/win32/wbemprox/security.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wbemprox/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/CMakeLists.txt [iso-8859-1] Sun Feb 22 15:46:17 2015 @@ -31,7 +31,7 @@ set_source_files_properties(wbemprox.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/wbemprox.rgs) set_module_type(wbemprox win32dll) target_link_libraries(wbemprox uuid wine) -add_importlibs(wbemprox iphlpapi dxgi oleaut32 advapi32 user32 gdi32 version msvcrt kernel32 ntdll) +add_importlibs(wbemprox iphlpapi dxgi oleaut32 advapi32 user32 gdi32 version ws2_32 msvcrt kernel32 ntdll) add_dependencies(wbemprox d3d_idl_headers) add_pch(wbemprox wbemprox_private.h SOURCE) add_cd_file(TARGET wbemprox DESTINATION reactos/system32/wbem FOR all) Modified: trunk/reactos/dll/win32/wbemprox/builtin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/builtin… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] Sun Feb 22 15:46:17 2015 @@ -20,11 +20,14 @@ #include <wingdi.h> #include <winsock2.h> +#include <ws2tcpip.h> #include <iphlpapi.h> #include <tlhelp32.h> #include <winternl.h> #include <winioctl.h> #include <winver.h> +#include <ntsecapi.h> +#include <sddl.h> #include <initguid.h> #include <d3d10.h> @@ -37,6 +40,8 @@ {'W','i','n','3','2','_','C','D','R','O','M','D','r','i','v','e',0}; static const WCHAR class_compsysW[] = {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; +static const WCHAR class_compsysproductW[] = + {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m','P','r','o','d','u','c','t',0}; static const WCHAR class_datafileW[] = {'C','I','M','_','D','a','t','a','F','i','l','e',0}; static const WCHAR class_directoryW[] = @@ -71,11 +76,15 @@ {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; static const WCHAR class_processor2W[] = {'C','I','M','_','P','r','o','c','e','s','s','o','r',0}; +static const WCHAR class_sidW[] = + {'W','i','n','3','2','_','S','I','D',0}; static const WCHAR class_sounddeviceW[] = {'W','i','n','3','2','_','S','o','u','n','d','D','e','v','i','c','e',0}; static const WCHAR class_videocontrollerW[] = {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; +static const WCHAR prop_accountnameW[] = + {'A','c','c','o','u','n','t','N','a','m','e',0}; static const WCHAR prop_acceptpauseW[] = {'A','c','c','e','p','t','P','a','u','s','e',0}; static const WCHAR prop_acceptstopW[] = @@ -92,6 +101,8 @@ {'A','d','d','r','e','s','s','W','i','d','t','h',0}; static const WCHAR prop_availabilityW[] = {'A','v','a','i','l','a','b','i','l','i','t','y',0}; +static const WCHAR prop_binaryrepresentationW[] = + {'B','i','n','a','r','y','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; static const WCHAR prop_bootableW[] = {'B','o','o','t','a','b','l','e',0}; static const WCHAR prop_bootpartitionW[] = @@ -134,12 +145,16 @@ {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR prop_diskindexW[] = {'D','i','s','k','I','n','d','e','x',0}; +static const WCHAR prop_dnshostnameW[] = + {'D','N','S','H','o','s','t','N','a','m','e',0}; static const WCHAR prop_domainW[] = {'D','o','m','a','i','n',0}; static const WCHAR prop_domainroleW[] = {'D','o','m','a','i','n','R','o','l','e',0}; static const WCHAR prop_driveW[] = {'D','r','i','v','e',0}; +static const WCHAR prop_driverversionW[] = + {'D','r','i','v','e','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_drivetypeW[] = {'D','r','i','v','e','T','y','p','e',0}; static const WCHAR prop_familyW[] = @@ -156,6 +171,8 @@ {'I','D',0}; static const WCHAR prop_identificationcodeW[] = {'I','d','e','n','t','i','f','i','c','a','t','i','o','n','C','o','d','e',0}; +static const WCHAR prop_identifyingnumberW[] = + {'I','d','e','n','t','i','f','y','i','n','g','N','u','m','b','e','r',0}; static const WCHAR prop_indexW[] = {'I','n','d','e','x',0}; static const WCHAR prop_installdateW[] = @@ -218,8 +235,14 @@ {'P','r','o','c','e','s','s','I','D',0}; static const WCHAR prop_processoridW[] = {'P','r','o','c','e','s','s','o','r','I','d',0}; +static const WCHAR prop_processortypeW[] = + {'P','r','o','c','e','s','s','o','r','T','y','p','e',0}; +static const WCHAR prop_productW[] = + {'P','r','o','d','u','c','t',0}; static const WCHAR prop_productnameW[] = {'P','r','o','d','u','c','t','N','a','m','e',0}; +static const WCHAR prop_referenceddomainnameW[] = + {'R','e','f','e','r','e','n','c','e','d','D','o','m','a','i','n','N','a','m','e',0}; static const WCHAR prop_releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; static const WCHAR prop_serialnumberW[] = @@ -234,6 +257,10 @@ {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; static const WCHAR prop_startmodeW[] = {'S','t','a','r','t','M','o','d','e',0}; +static const WCHAR prop_sidW[] = + {'S','I','D',0}; +static const WCHAR prop_sidlengthW[] = + {'S','i','d','L','e','n','g','t','h',0}; static const WCHAR prop_sizeW[] = {'S','i','z','e',0}; static const WCHAR prop_speedW[] = @@ -242,6 +269,8 @@ {'S','t','a','r','t','i','n','g','O','f','f','s','e','t',0}; static const WCHAR prop_stateW[] = {'S','t','a','t','e',0}; +static const WCHAR prop_statusinfoW[] = + {'S','t','a','t','u','s','I','n','f','o',0}; static const WCHAR prop_strvalueW[] = {'S','t','r','i','n','g','V','a','l','u','e',0}; static const WCHAR prop_suitemaskW[] = @@ -256,14 +285,22 @@ {'T','h','r','e','a','d','C','o','u','n','t',0}; static const WCHAR prop_totalphysicalmemoryW[] = {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; +static const WCHAR prop_totalvisiblememorysizeW[] = + {'T','o','t','a','l','V','i','s','i','b','l','e','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR prop_typeW[] = {'T','y','p','e',0}; static const WCHAR prop_uniqueidW[] = {'U','n','i','q','u','e','I','d',0}; +static const WCHAR prop_uuidW[] = + {'U','U','I','D',0}; static const WCHAR prop_varianttypeW[] = {'V','a','r','i','a','n','t','T','y','p','e',0}; static const WCHAR prop_versionW[] = {'V','e','r','s','i','o','n',0}; +static const WCHAR prop_videoprocessorW[] = + {'V','i','d','e','o','P','r','o','c','e','s','s','o','r',0}; +static const WCHAR prop_volumenameW[] = + {'V','o','l','u','m','e','N','a','m','e',0}; static const WCHAR prop_volumeserialnumberW[] = {'V','o','l','u','m','e','S','e','r','i','a','l','N','u','m','b','e','r',0}; @@ -273,8 +310,10 @@ { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, { prop_nameW, CIM_STRING }, + { prop_productW, CIM_STRING }, { prop_serialnumberW, CIM_STRING }, - { prop_tagW, CIM_STRING|COL_FLAG_KEY } + { prop_tagW, CIM_STRING|COL_FLAG_KEY }, + { prop_versionW, CIM_STRING } }; static const struct column col_bios[] = { @@ -306,6 +345,11 @@ { prop_numprocessorsW, CIM_UINT32, VT_I4 }, { prop_totalphysicalmemoryW, CIM_UINT64 } }; +static const struct column col_compsysproduct[] = +{ + { prop_identifyingnumberW, CIM_STRING|COL_FLAG_KEY }, + { prop_uuidW, CIM_STRING } +}; static const struct column col_datafile[] = { { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, @@ -324,6 +368,7 @@ { prop_manufacturerW, CIM_STRING }, { prop_mediatypeW, CIM_STRING }, { prop_modelW, CIM_STRING }, + { prop_pnpdeviceidW, CIM_STRING }, { prop_serialnumberW, CIM_STRING }, { prop_sizeW, CIM_UINT64 } }; @@ -347,6 +392,7 @@ { prop_freespaceW, CIM_UINT64 }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_sizeW, CIM_UINT64 }, + { prop_volumenameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_volumeserialnumberW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_networkadapter[] = @@ -365,6 +411,7 @@ }; static const struct column col_networkadapterconfig[] = { + { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_indexW, CIM_UINT32|COL_FLAG_KEY, VT_I4 }, { prop_ipconnectionmetricW, CIM_UINT32, VT_I4 }, { prop_ipenabledW, CIM_BOOLEAN }, @@ -372,26 +419,27 @@ }; static const struct column col_os[] = { - { prop_buildnumberW, CIM_STRING }, - { prop_captionW, CIM_STRING }, - { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_csdversionW, CIM_STRING }, - { prop_installdateW, CIM_DATETIME }, - { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, - { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, - { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_nameW, CIM_STRING }, - { prop_osarchitectureW, CIM_STRING }, - { prop_oslanguageW, CIM_UINT32, VT_I4 }, - { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, - { prop_ostypeW, CIM_UINT16, VT_I4 }, - { prop_serialnumberW, CIM_STRING }, - { prop_servicepackmajorW, CIM_UINT16, VT_I4 }, - { prop_servicepackminorW, CIM_UINT16, VT_I4 }, - { prop_suitemaskW, CIM_UINT32, VT_I4 }, - { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_versionW, CIM_STRING } + { prop_buildnumberW, CIM_STRING }, + { prop_captionW, CIM_STRING }, + { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_csdversionW, CIM_STRING }, + { prop_installdateW, CIM_DATETIME }, + { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, + { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, + { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_nameW, CIM_STRING }, + { prop_osarchitectureW, CIM_STRING }, + { prop_oslanguageW, CIM_UINT32, VT_I4 }, + { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, + { prop_ostypeW, CIM_UINT16, VT_I4 }, + { prop_serialnumberW, CIM_STRING }, + { prop_servicepackmajorW, CIM_UINT16, VT_I4 }, + { prop_servicepackminorW, CIM_UINT16, VT_I4 }, + { prop_suitemaskW, CIM_UINT32, VT_I4 }, + { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_totalvisiblememorysizeW, CIM_UINT64 }, + { prop_versionW, CIM_STRING } }; static const struct column col_param[] = { @@ -438,6 +486,7 @@ { prop_numcoresW, CIM_UINT32, VT_I4 }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_processortypeW, CIM_UINT16, VT_I4 }, { prop_uniqueidW, CIM_STRING } }; static const struct column col_qualifier[] = @@ -467,10 +516,19 @@ { method_startserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { method_stopserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } }; +static const struct column col_sid[] = +{ + { prop_accountnameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_binaryrepresentationW, CIM_UINT8|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, + { prop_referenceddomainnameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_sidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_sidlengthW, CIM_UINT32 } +}; static const struct column col_sounddevice[] = { { prop_nameW, CIM_STRING }, - { prop_productnameW, CIM_STRING } + { prop_productnameW, CIM_STRING }, + { prop_statusinfoW, CIM_UINT16, VT_I4 } }; static const struct column col_stdregprov[] = { @@ -493,8 +551,10 @@ { prop_currentverticalresW, CIM_UINT32, VT_I4 }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, + { prop_driverversionW, CIM_STRING }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_videoprocessorW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const WCHAR baseboard_manufacturerW[] = @@ -503,6 +563,8 @@ {'N','o','n','e',0}; static const WCHAR baseboard_tagW[] = {'B','a','s','e',' ','B','o','a','r','d',0}; +static const WCHAR baseboard_versionW[] = + {'1','.','0',0}; static const WCHAR bios_descriptionW[] = {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0}; static const WCHAR bios_manufacturerW[] = @@ -532,6 +594,11 @@ {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; +static const WCHAR compsysproduct_identifyingnumberW[] = + {'0',0}; +static const WCHAR compsysproduct_uuidW[] = + {'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','0','0','0','0','0','0',0}; static const WCHAR diskdrive_interfacetypeW[] = {'I','D','E',0}; static const WCHAR diskdrive_manufacturerW[] = @@ -542,6 +609,8 @@ {'R','e','m','o','v','a','b','l','e',' ','m','e','d','i','a',0}; static const WCHAR diskdrive_modelW[] = {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; +static const WCHAR diskdrive_pnpdeviceidW[] = + {'I','D','E','\\','D','i','s','k','\\','V','E','N','_','W','I','N','E',0}; static const WCHAR diskdrive_serialW[] = {'W','I','N','E','H','D','I','S','K',0}; static const WCHAR networkadapter_pnpdeviceidW[]= @@ -578,6 +647,8 @@ {'I','n','t','e','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const WCHAR videocontroller_deviceidW[] = {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; +static const WCHAR videocontroller_driverversionW[] = + {'1','.','0',0}; #include "pshpack1.h" struct record_baseboard @@ -585,8 +656,10 @@ const WCHAR *manufacturer; const WCHAR *model; const WCHAR *name; + const WCHAR *product; const WCHAR *serialnumber; const WCHAR *tag; + const WCHAR *version; }; struct record_bios { @@ -618,6 +691,11 @@ UINT32 num_processors; UINT64 total_physical_memory; }; +struct record_computersystemproduct +{ + const WCHAR *identifyingnumber; + const WCHAR *uuid; +}; struct record_datafile { const WCHAR *name; @@ -636,6 +714,7 @@ const WCHAR *manufacturer; const WCHAR *mediatype; const WCHAR *model; + const WCHAR *pnpdevice_id; const WCHAR *serialnumber; UINT64 size; }; @@ -659,6 +738,7 @@ UINT64 freespace; const WCHAR *name; UINT64 size; + const WCHAR *volumename; const WCHAR *volumeserialnumber; }; struct record_networkadapter @@ -677,6 +757,7 @@ }; struct record_networkadapterconfig { + const WCHAR *dnshostname; UINT32 index; UINT32 ipconnectionmetric; int ipenabled; @@ -703,6 +784,7 @@ UINT16 servicepackminor; UINT32 suitemask; const WCHAR *systemdirectory; + UINT64 totalvisiblememorysize; const WCHAR *version; }; struct record_param @@ -750,6 +832,7 @@ UINT32 num_cores; UINT32 num_logical_processors; const WCHAR *processor_id; + UINT16 processortype; const WCHAR *unique_id; }; struct record_qualifier @@ -779,10 +862,19 @@ class_method *start_service; class_method *stop_service; }; +struct record_sid +{ + const WCHAR *accountname; + const UINT8 *binaryrepresentation; + const WCHAR *referenceddomainname; + const WCHAR *sid; + UINT32 sidlength; +}; struct record_sounddevice { const WCHAR *name; const WCHAR *productname; + UINT16 statusinfo; }; struct record_stdregprov { @@ -805,19 +897,25 @@ UINT32 current_verticalres; const WCHAR *description; const WCHAR *device_id; + const WCHAR *driverversion; const WCHAR *name; const WCHAR *pnpdevice_id; + const WCHAR *videoprocessor; }; #include "poppack.h" static const struct record_baseboard data_baseboard[] = { - { baseboard_manufacturerW, baseboard_tagW, baseboard_tagW, baseboard_serialnumberW, baseboard_tagW } + { baseboard_manufacturerW, baseboard_tagW, baseboard_tagW, baseboard_tagW, baseboard_serialnumberW, baseboard_versionW } }; static const struct record_bios data_bios[] = { { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, bios_smbiosbiosversionW, bios_versionW } +}; +static const struct record_computersystemproduct data_compsysproduct[] = +{ + { compsysproduct_identifyingnumberW, compsysproduct_uuidW } }; static const struct record_param data_param[] = { @@ -862,7 +960,7 @@ }; static const struct record_sounddevice data_sounddevice[] = { - { sounddevice_productnameW, sounddevice_productnameW } + { sounddevice_productnameW, sounddevice_productnameW, 3 /* enabled */ } }; static const struct record_stdregprov data_stdregprov[] = { @@ -1552,6 +1650,7 @@ else rec->mediatype = diskdrive_mediatype_removableW; rec->model = diskdrive_modelW; + rec->pnpdevice_id = diskdrive_pnpdeviceidW; rec->serialnumber = diskdrive_serialW; get_freespace( root, &size ); rec->size = size; @@ -1631,6 +1730,12 @@ return status; } +static WCHAR *get_volumename( const WCHAR *root ) +{ + WCHAR buf[MAX_PATH + 1] = {0}; + GetVolumeInformationW( root, buf, sizeof(buf)/sizeof(buf[0]), NULL, NULL, NULL, NULL, 0 ); + return heap_strdupW( buf ); +} static WCHAR *get_volumeserialnumber( const WCHAR *root ) { static const WCHAR fmtW[] = {'%','0','8','X',0}; @@ -1673,6 +1778,7 @@ rec->freespace = get_freespace( root, &size ); rec->name = heap_strdupW( device_id ); rec->size = size; + rec->volumename = get_volumename( root ); rec->volumeserialnumber = get_volumeserialnumber( root ); if (!match_row( table, row, cond, &status )) { @@ -1791,6 +1897,17 @@ return status; } +static WCHAR *get_dnshostname( IP_ADAPTER_UNICAST_ADDRESS *addr ) +{ + const SOCKET_ADDRESS *sa = &addr->Address; + WCHAR buf[NI_MAXHOST]; + + if (!addr) return NULL; + if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, sizeof(buf)/sizeof(buf[0]), NULL, + 0, NI_NAMEREQD )) return NULL; + return heap_strdupW( buf ); +} + static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) { struct record_networkadapterconfig *rec; @@ -1822,6 +1939,7 @@ if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; rec = (struct record_networkadapterconfig *)(table->data + offset); + rec->dnshostname = get_dnshostname( aa->FirstUnicastAddress ); rec->index = aa->u.s.IfIndex; rec->ipconnectionmetric = 20; rec->ipenabled = -1; @@ -2041,6 +2159,7 @@ rec->num_cores = num_cores; rec->num_logical_processors = num_logical_processors; rec->processor_id = heap_strdupW( processor_id ); + rec->processortype = 3; /* central processor */ rec->unique_id = NULL; if (!match_row( table, i, cond, &status )) { @@ -2136,26 +2255,27 @@ if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_operatingsystem *)table->data; - rec->buildnumber = os_buildnumberW; - rec->caption = os_captionW; - rec->codeset = get_codeset(); - rec->countrycode = get_countrycode(); - rec->csdversion = os_csdversionW; - rec->installdate = os_installdateW; - rec->lastbootuptime = get_lastbootuptime(); - rec->localdatetime = get_localdatetime(); - rec->locale = get_locale(); - rec->name = os_nameW; - rec->osarchitecture = get_osarchitecture(); - rec->oslanguage = GetSystemDefaultLangID(); - rec->osproductsuite = 2461140; /* Windows XP Professional */ - rec->ostype = 18; /* WINNT */ - rec->serialnumber = os_serialnumberW; - rec->servicepackmajor = 3; - rec->servicepackminor = 0; - rec->suitemask = 272; /* Single User + Terminal */ - rec->systemdirectory = get_systemdirectory(); - rec->version = os_versionW; + rec->buildnumber = os_buildnumberW; + rec->caption = os_captionW; + rec->codeset = get_codeset(); + rec->countrycode = get_countrycode(); + rec->csdversion = os_csdversionW; + rec->installdate = os_installdateW; + rec->lastbootuptime = get_lastbootuptime(); + rec->localdatetime = get_localdatetime(); + rec->locale = get_locale(); + rec->name = os_nameW; + rec->osarchitecture = get_osarchitecture(); + rec->oslanguage = GetSystemDefaultLangID(); + rec->osproductsuite = 2461140; /* Windows XP Professional */ + rec->ostype = 18; /* WINNT */ + rec->serialnumber = os_serialnumberW; + rec->servicepackmajor = 3; + rec->servicepackminor = 0; + rec->suitemask = 272; /* Single User + Terminal */ + rec->systemdirectory = get_systemdirectory(); + rec->totalvisiblememorysize = get_total_physical_memory() / 1024; + rec->version = os_versionW; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; @@ -2320,6 +2440,91 @@ return fill_status; } +static WCHAR *get_accountname( LSA_TRANSLATED_NAME *name ) +{ + if (!name || !name->Name.Buffer) return NULL; + return heap_strdupW( name->Name.Buffer ); +} +static UINT8 *get_binaryrepresentation( PSID sid, UINT len ) +{ + UINT8 *ret = heap_alloc( len ); + if (!ret) return NULL; + memcpy( ret, sid, len ); + return ret; +} +static WCHAR *get_referenceddomainname( LSA_REFERENCED_DOMAIN_LIST *domain ) +{ + if (!domain || !domain->Domains || !domain->Domains->Name.Buffer) return NULL; + return heap_strdupW( domain->Domains->Name.Buffer ); +} +static const WCHAR *find_sid_str( const struct expr *cond ) +{ + const struct expr *left, *right; + const WCHAR *ret = NULL; + + if (!cond || cond->type != EXPR_COMPLEX || cond->u.expr.op != OP_EQ) return NULL; + + left = cond->u.expr.left; + right = cond->u.expr.right; + if (left->type == EXPR_PROPVAL && right->type == EXPR_SVAL && !strcmpiW( left->u.propval->name, prop_sidW )) + { + ret = right->u.sval; + } + else if (left->type == EXPR_SVAL && right->type == EXPR_PROPVAL && !strcmpiW( right->u.propval->name, prop_sidW )) + { + ret = left->u.sval; + } + return ret; +} + +static enum fill_status fill_sid( struct table *table, const struct expr *cond ) +{ + PSID sid; + LSA_REFERENCED_DOMAIN_LIST *domain; + LSA_TRANSLATED_NAME *name; + LSA_HANDLE handle; + LSA_OBJECT_ATTRIBUTES attrs; + const WCHAR *str; + struct record_sid *rec; + UINT len; + + if (!(str = find_sid_str( cond ))) return FILL_STATUS_FAILED; + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + if (!ConvertStringSidToSidW( str, &sid )) return FILL_STATUS_FAILED; + len = GetLengthSid( sid ); + + memset( &attrs, 0, sizeof(attrs) ); + attrs.Length = sizeof(attrs); + if (LsaOpenPolicy( NULL, &attrs, POLICY_ALL_ACCESS, &handle )) + { + LocalFree( sid ); + return FILL_STATUS_FAILED; + } + if (LsaLookupSids( handle, 1, &sid, &domain, &name )) + { + LocalFree( sid ); + LsaClose( handle ); + return FILL_STATUS_FAILED; + } + + rec = (struct record_sid *)table->data; + rec->accountname = get_accountname( name ); + rec->binaryrepresentation = get_binaryrepresentation( sid, len ); + rec->referenceddomainname = get_referenceddomainname( domain ); + rec->sid = heap_strdupW( str ); + rec->sidlength = len; + + TRACE("created 1 row\n"); + table->num_rows = 1; + + LsaFreeMemory( domain ); + LsaFreeMemory( name ); + LocalFree( sid ); + LsaClose( handle ); + return FILL_STATUS_FILTERED; +} + static UINT32 get_bits_per_pixel( UINT *hres, UINT *vres ) { HDC hdc = GetDC( NULL ); @@ -2384,8 +2589,10 @@ rec->current_verticalres = vres; rec->description = heap_strdupW( name ); rec->device_id = videocontroller_deviceidW; + rec->driverversion = videocontroller_driverversionW; rec->name = heap_strdupW( name ); rec->pnpdevice_id = get_pnpdeviceid( &desc ); + rec->videoprocessor = heap_strdupW( name ); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; @@ -2403,6 +2610,7 @@ { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), 0, (BYTE *)data_bios }, { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, 0, 0, NULL, fill_cdromdrive }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, 0, NULL, fill_compsys }, + { class_compsysproductW, SIZEOF(col_compsysproduct), col_compsysproduct, SIZEOF(data_compsysproduct), 0, (BYTE *)data_compsysproduct }, { class_datafileW, SIZEOF(col_datafile), col_datafile, 0, 0, NULL, fill_datafile }, { class_directoryW, SIZEOF(col_directory), col_directory, 0, 0, NULL, fill_directory }, { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, 0, 0, NULL, fill_diskdrive }, @@ -2410,8 +2618,7 @@ { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, 0, NULL, fill_networkadapter }, - { class_networkadapterconfigW, SIZEOF(col_networkadapterconfig), col_networkadapterconfig, 0, 0, NULL, - fill_networkadapterconfig }, + { class_networkadapterconfigW, SIZEOF(col_networkadapterconfig), col_networkadapterconfig, 0, 0, NULL, fill_networkadapterconfig }, { class_osW, SIZEOF(col_os), col_os, 0, 0, NULL, fill_os }, { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, { class_physicalmediaW, SIZEOF(col_physicalmedia), col_physicalmedia, SIZEOF(data_physicalmedia), 0, (BYTE *)data_physicalmedia }, @@ -2421,6 +2628,7 @@ { class_processor2W, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, { class_qualifiersW, SIZEOF(col_qualifier), col_qualifier, SIZEOF(data_qualifier), 0, (BYTE *)data_qualifier }, { class_serviceW, SIZEOF(col_service), col_service, 0, 0, NULL, fill_service }, + { class_sidW, SIZEOF(col_sid), col_sid, 0, 0, NULL, fill_sid }, { class_sounddeviceW, SIZEOF(col_sounddevice), col_sounddevice, SIZEOF(data_sounddevice), 0, (BYTE *)data_sounddevice }, { class_stdregprovW, SIZEOF(col_stdregprov), col_stdregprov, SIZEOF(data_stdregprov), 0, (BYTE *)data_stdregprov }, { class_systemsecurityW, SIZEOF(col_systemsecurity), col_systemsecurity, SIZEOF(data_systemsecurity), 0, (BYTE *)data_systemsecurity }, Modified: trunk/reactos/dll/win32/wbemprox/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/securit… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/security.c [iso-8859-1] Sun Feb 22 15:46:17 2015 @@ -109,8 +109,11 @@ if (SUCCEEDED(hr)) { - if (!MakeSelfRelativeSD(&absolute_sd, *sd, size)) + if (!MakeSelfRelativeSD(&absolute_sd, *sd, size)) { + HeapFree( GetProcessHeap(), 0, *sd ); + *sd = NULL; hr = E_FAIL; + } } return hr; 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 Feb 22 15:46:17 2015 @@ -207,7 +207,7 @@ reactos/dll/win32/vbscript # Synced to Wine-1.7.27 reactos/dll/win32/version # Synced to Wine-1.7.27 reactos/dll/win32/wbemdisp # Synced to Wine-1.7.27 -reactos/dll/win32/wbemprox # Synced to Wine-1.7.27 +reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.37 reactos/dll/win32/wer # Autosync reactos/dll/win32/windowscodecs # Synced to Wine-1.7.27 reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.27

1 0

[akhaldi] 66406: [WS2_32] Stub and export GetNameInfoW. CORE-9249
by akhaldi＠svn.reactos.org 22 Feb '15

22 Feb '15

Author: akhaldi Date: Sun Feb 22 15:37:44 2015 New Revision: 66406 URL: http://svn.reactos.org/svn/reactos?rev=66406&view=rev Log: [WS2_32] Stub and export GetNameInfoW. CORE-9249 Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c trunk/reactos/dll/win32/ws2_32/ws2_32.spec Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Sun Feb 22 15:37:44 2015 @@ -946,5 +946,23 @@ return EAI_FAIL; } +/* + * @unimplemented + */ +INT +EXPORT +GetNameInfoW(IN CONST SOCKADDR *pSockaddr, + IN socklen_t SockaddrLength, + OUT PWCHAR pNodeBuffer, + IN DWORD NodeBufferSize, + OUT PWCHAR pServiceBuffer, + IN DWORD ServiceBufferSize, + IN INT Flags) +{ + UNIMPLEMENTED + + WSASetLastError(EAI_FAIL); + return EAI_FAIL; +} /* EOF */ Modified: trunk/reactos/dll/win32/ws2_32/ws2_32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/ws2_32.sp… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/ws2_32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/ws2_32.spec [iso-8859-1] Sun Feb 22 15:37:44 2015 @@ -117,3 +117,4 @@ @ stdcall freeaddrinfo(ptr) @ stdcall getaddrinfo(str str ptr ptr) @ stdcall getnameinfo(ptr long ptr long ptr long long) +@ stdcall GetNameInfoW(ptr long wstr long wstr long long)

1 0

[ekohl] 66405: [WKSSVC] Add the Workstation service. CORE-9248
by ekohl＠svn.reactos.org 22 Feb '15

22 Feb '15

Author: ekohl Date: Sun Feb 22 15:27:35 2015 New Revision: 66405 URL: http://svn.reactos.org/svn/reactos?rev=66405&view=rev Log: [WKSSVC] Add the Workstation service. CORE-9248 Added: trunk/reactos/base/services/wkssvc/ (with props) trunk/reactos/base/services/wkssvc/CMakeLists.txt (with props) trunk/reactos/base/services/wkssvc/precomp.h (with props) trunk/reactos/base/services/wkssvc/rpcserver.c (with props) trunk/reactos/base/services/wkssvc/wkssvc.c (with props) trunk/reactos/base/services/wkssvc/wkssvc.rc (with props) trunk/reactos/base/services/wkssvc/wkssvc.spec (with props) Modified: trunk/reactos/base/services/CMakeLists.txt trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/CMakeLists.t… ============================================================================== --- trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] Sun Feb 22 15:27:35 2015 @@ -9,5 +9,6 @@ #add_subdirectory(tftpd) add_subdirectory(thmsvc) add_subdirectory(umpnpmgr) +add_subdirectory(wkssvc) add_subdirectory(wlansvc) add_subdirectory(wmisvc) Propchange: trunk/reactos/base/services/wkssvc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Feb 22 15:27:35 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/services/wkssvc/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/services/wkssvc/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/services/wkssvc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/services/wkssvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wkssvc/CMake… ============================================================================== --- trunk/reactos/base/services/wkssvc/CMakeLists.txt (added) +++ trunk/reactos/base/services/wkssvc/CMakeLists.txt [iso-8859-1] Sun Feb 22 15:27:35 2015 @@ -0,0 +1,16 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl) +add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/wkssvc.idl) +spec2def(wkssvc.dll wkssvc.spec ADD_IMPORTLIB) + +add_library(wkssvc SHARED + rpcserver.c + wkssvc.c + wkssvc.rc + ${CMAKE_CURRENT_BINARY_DIR}/wkssvc_s.c + ${CMAKE_CURRENT_BINARY_DIR}/wkssvc.def) + +set_module_type(wkssvc win32dll UNICODE) +target_link_libraries(wkssvc wine) +add_importlibs(wkssvc advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_cd_file(TARGET wkssvc DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/services/wkssvc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/wkssvc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wkssvc/preco… ============================================================================== --- trunk/reactos/base/services/wkssvc/precomp.h (added) +++ trunk/reactos/base/services/wkssvc/precomp.h [iso-8859-1] Sun Feb 22 15:27:35 2015 @@ -0,0 +1,22 @@ +#ifndef _WKSSVC_PCH_ +#define _WKSSVC_PCH_ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winsvc.h> + +#include <wkssvc_s.h> + +#include <wine/debug.h> + +DWORD +WINAPI +RpcThreadRoutine( + LPVOID lpParameter); + +#endif /* _WKSSVC_PCH_ */ Propchange: trunk/reactos/base/services/wkssvc/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/wkssvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wkssvc/rpcse… ============================================================================== --- trunk/reactos/base/services/wkssvc/rpcserver.c (added) +++ trunk/reactos/base/services/wkssvc/rpcserver.c [iso-8859-1] Sun Feb 22 15:27:35 2015 @@ -0,0 +1,495 @@ +/* + * ReactOS Services + * Copyright (C) 2015 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Services + * FILE: base/services/wkssvc/rpcserver.c + * PURPOSE: Workstation service + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#include "lmerr.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wkssvc); + +/* FUNCTIONS *****************************************************************/ + +DWORD +WINAPI +RpcThreadRoutine( + LPVOID lpParameter) +{ + RPC_STATUS Status; + + Status = RpcServerUseProtseqEpW(L"ncacn_np", 20, L"\\pipe\\wkssvc", NULL); + if (Status != RPC_S_OK) + { + ERR("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerRegisterIf(wkssvc_v1_0_s_ifspec, NULL, NULL); + if (Status != RPC_S_OK) + { + ERR("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, FALSE); + if (Status != RPC_S_OK) + { + ERR("RpcServerListen() failed (Status %lx)\n", Status); + } + + return 0; +} + + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + + +/* Function 0 */ +unsigned long +__stdcall +NetrWkstaGetInfo( + WKSSVC_IDENTIFY_HANDLE ServerName, + unsigned long Level, + LPWKSTA_INFO WkstaInfo) +{ + TRACE("NetrWkstaGetInfo level %lu\n", Level); + + return 0; +} + + +/* Function 1 */ +unsigned long +__stdcall +NetrWkstaSetInfo( + WKSSVC_IDENTIFY_HANDLE ServerName, + unsigned long Level, + LPWKSTA_INFO WkstaInfo, + unsigned long *ErrorParameter) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 2 */ +unsigned long +__stdcall +NetrWkstaUserEnum( + WKSSVC_IDENTIFY_HANDLE ServerName, + LPWKSTA_USER_ENUM_STRUCT UserInfo, + unsigned long PreferredMaximumLength, + unsigned long *TotalEntries, + unsigned long *ResumeHandle) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 3 */ +void +__stdcall +Opnum3NotUsedOnWire(void) +{ + UNIMPLEMENTED; +// return 0; +} + + +/* Function 4 */ +void +__stdcall +Opnum4NotUsedOnWire(void) +{ + UNIMPLEMENTED; +// return 0; +} + + +/* Function 5 */ +unsigned long +__stdcall +NetrWkstaTransportEnum( + WKSSVC_IDENTIFY_HANDLE ServerName, + LPWKSTA_TRANSPORT_ENUM_STRUCT TransportInfo, + unsigned long PreferredMaximumLength, + unsigned long* TotalEntries, + unsigned long *ResumeHandle) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 6 */ +unsigned long +__stdcall +NetrWkstaTransportAdd( + WKSSVC_IDENTIFY_HANDLE ServerName, + unsigned long Level, + LPWKSTA_TRANSPORT_INFO_0 TransportInfo, + unsigned long *ErrorParameter) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 7 */ +unsigned long +__stdcall +NetrWkstaTransportDel( + WKSSVC_IDENTIFY_HANDLE ServerName, + wchar_t *TransportName, + unsigned long ForceLevel) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 8 */ +unsigned long +__stdcall +NetrUseAdd( + WKSSVC_IMPERSONATE_HANDLE ServerName, + unsigned long Level, + LPUSE_INFO InfoStruct, + unsigned long *ErrorParameter) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 9 */ +unsigned long +__stdcall +NetrUseGetInfo( + WKSSVC_IMPERSONATE_HANDLE ServerName, + wchar_t *UseName, + unsigned long Level, + LPUSE_INFO InfoStruct) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 10 */ +unsigned long +__stdcall +NetrUseDel( + WKSSVC_IMPERSONATE_HANDLE ServerName, + wchar_t *UseName, + unsigned long ForceLevel) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 11 */ +unsigned long +__stdcall +NetrUseEnum( + WKSSVC_IDENTIFY_HANDLE ServerName, + LPUSE_ENUM_STRUCT InfoStruct, + unsigned long PreferredMaximumLength, + unsigned long *TotalEntries, + unsigned long *ResumeHandle) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 12 */ +void +__stdcall +Opnum12NotUsedOnWire(void) +{ + UNIMPLEMENTED; +// return 0; +} + + +/* Function 13 */ +unsigned long +__stdcall +NetrWorkstationStatisticsGet( + WKSSVC_IDENTIFY_HANDLE ServerName, + wchar_t *ServiceName, + unsigned long Level, + unsigned long Options, + LPSTAT_WORKSTATION_0 *Buffer) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 14 */ +void +__stdcall +Opnum14NotUsedOnWire(void) +{ + UNIMPLEMENTED; +// return 0; +} + + +/* Function 15 */ +void +__stdcall +Opnum15NotUsedOnWire(void) +{ + UNIMPLEMENTED; +// return 0; +} + + +/* Function 16 */ +void +__stdcall +Opnum16NotUsedOnWire(void) +{ + UNIMPLEMENTED; +// return 0; +} + + +/* Function 17 */ +void +__stdcall +Opnum17NotUsedOnWire(void) +{ + UNIMPLEMENTED; +// return 0; +} + + +/* Function 18 */ +void +__stdcall +Opnum18NotUsedOnWire(void) +{ + UNIMPLEMENTED; +// return 0; +} + + +/* Function 19 */ +void +__stdcall +Opnum19NotUsedOnWire(void) +{ + UNIMPLEMENTED; +// return 0; +} + + +/* Function 20 */ +unsigned long +__stdcall +NetrGetJoinInformation( + WKSSVC_IMPERSONATE_HANDLE ServerName, + wchar_t **NameBuffer, + PNETSETUP_JOIN_STATUS BufferType) +{ + TRACE("NetrGetJoinInformation()\n"); + + *NameBuffer = NULL; + *BufferType = NetSetupUnjoined; + + return NERR_Success; +} + + +/* Function 21 */ +void +__stdcall +Opnum21NotUsedOnWire(void) +{ + UNIMPLEMENTED; +// return 0; +} + + +/* Function 22 */ +unsigned long +__stdcall +NetrJoinDomain2( + handle_t RpcBindingHandle, + wchar_t *ServerName, + wchar_t *DomainNameParam, + wchar_t *MachineAccountOU, + wchar_t *AccountName, + PJOINPR_ENCRYPTED_USER_PASSWORD Password, + unsigned long Options) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 23 */ +unsigned long +__stdcall +NetrUnjoinDomain2( + handle_t RpcBindingHandle, + wchar_t *ServerName, + wchar_t *AccountName, + PJOINPR_ENCRYPTED_USER_PASSWORD Password, + unsigned long Options) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 24 */ +unsigned long +__stdcall +NetrRenameMachineInDomain2( + handle_t RpcBindingHandle, + wchar_t *ServerName, + wchar_t *MachineName, + wchar_t *AccountName, + PJOINPR_ENCRYPTED_USER_PASSWORD Password, + unsigned long Options) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 25 */ +unsigned long +__stdcall +NetrValidateName2( + handle_t RpcBindingHandle, + wchar_t *ServerName, + wchar_t *NameToValidate, + wchar_t *AccountName, + PJOINPR_ENCRYPTED_USER_PASSWORD Password, + NETSETUP_NAME_TYPE NameType) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 26 */ +unsigned long +__stdcall +NetrGetJoinableOUs2( + handle_t RpcBindingHandle, + wchar_t *ServerName, + wchar_t *DomainNameParam, + wchar_t *AccountName, + PJOINPR_ENCRYPTED_USER_PASSWORD Password, + unsigned long* OUCount, + wchar_t ***OUs) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 27 */ +unsigned long +__stdcall +NetrAddAlternateComputerName( + handle_t RpcBindingHandle, + wchar_t *ServerName, + wchar_t *AlternateName, + wchar_t *DomainAccount, + PJOINPR_ENCRYPTED_USER_PASSWORD EncryptedPassword, + unsigned long Reserved) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 28 */ +unsigned long +__stdcall +NetrRemoveAlternateComputerName( + handle_t RpcBindingHandle, + wchar_t *ServerName, + wchar_t *AlternateName, + wchar_t *DomainAccount, + PJOINPR_ENCRYPTED_USER_PASSWORD EncryptedPassword, + unsigned long Reserved) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 29 */ +unsigned long +__stdcall +NetrSetPrimaryComputerName( + handle_t RpcBindingHandle, + wchar_t *ServerName, + wchar_t *PrimaryName, + wchar_t *DomainAccount, + PJOINPR_ENCRYPTED_USER_PASSWORD EncryptedPassword, + unsigned long Reserved) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 30 */ +unsigned long +__stdcall +NetrEnumerateComputerNames( + WKSSVC_IMPERSONATE_HANDLE ServerName, + NET_COMPUTER_NAME_TYPE NameType, + unsigned long Reserved, + PNET_COMPUTER_NAME_ARRAY *ComputerNames) +{ + UNIMPLEMENTED; + return 0; +} + +/* EOF */ Propchange: trunk/reactos/base/services/wkssvc/rpcserver.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/wkssvc/wkssvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wkssvc/wkssv… ============================================================================== --- trunk/reactos/base/services/wkssvc/wkssvc.c (added) +++ trunk/reactos/base/services/wkssvc/wkssvc.c [iso-8859-1] Sun Feb 22 15:27:35 2015 @@ -0,0 +1,183 @@ +/* + * ReactOS Services + * Copyright (C) 2015 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Services + * FILE: base/services/wkssvc/wkssvc.c + * PURPOSE: Workstation service + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wkssvc); + +/* GLOBALS ******************************************************************/ + +static WCHAR ServiceName[] = L"lanmanworkstation"; + +static SERVICE_STATUS_HANDLE ServiceStatusHandle; +static SERVICE_STATUS ServiceStatus; + +/* FUNCTIONS *****************************************************************/ + +static VOID +UpdateServiceStatus(DWORD dwState) +{ + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwCurrentState = dwState; + ServiceStatus.dwControlsAccepted = 0; + ServiceStatus.dwWin32ExitCode = 0; + ServiceStatus.dwServiceSpecificExitCode = 0; + ServiceStatus.dwCheckPoint = 0; + + if (dwState == SERVICE_START_PENDING || + dwState == SERVICE_STOP_PENDING || + dwState == SERVICE_PAUSE_PENDING || + dwState == SERVICE_CONTINUE_PENDING) + ServiceStatus.dwWaitHint = 10000; + else + ServiceStatus.dwWaitHint = 0; + + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); +} + +static DWORD WINAPI +ServiceControlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + TRACE("ServiceControlHandler() called\n"); + + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + TRACE(" SERVICE_CONTROL_STOP received\n"); + /* Stop listening to incoming RPC messages */ + RpcMgmtStopServerListening(NULL); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_PAUSE: + TRACE(" SERVICE_CONTROL_PAUSE received\n"); + UpdateServiceStatus(SERVICE_PAUSED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_CONTINUE: + TRACE(" SERVICE_CONTROL_CONTINUE received\n"); + UpdateServiceStatus(SERVICE_RUNNING); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_INTERROGATE: + TRACE(" SERVICE_CONTROL_INTERROGATE received\n"); + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_SHUTDOWN: + TRACE(" SERVICE_CONTROL_SHUTDOWN received\n"); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + default : + TRACE(" Control %lu received\n", dwControl); + return ERROR_CALL_NOT_IMPLEMENTED; + } +} + + +static +DWORD +ServiceInit(VOID) +{ + HANDLE hThread; + + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE)RpcThreadRoutine, + NULL, + 0, + NULL); + + if (!hThread) + { + ERR("Can't create PortThread\n"); + return GetLastError(); + } + else + CloseHandle(hThread); + + return ERROR_SUCCESS; +} + + +VOID WINAPI +ServiceMain(DWORD argc, LPTSTR *argv) +{ + DWORD dwError; + + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + TRACE("ServiceMain() called\n"); + + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, + ServiceControlHandler, + NULL); + if (!ServiceStatusHandle) + { + ERR("RegisterServiceCtrlHandlerExW() failed! (Error %lu)\n", GetLastError()); + return; + } + + UpdateServiceStatus(SERVICE_START_PENDING); + + dwError = ServiceInit(); + if (dwError != ERROR_SUCCESS) + { + ERR("Service stopped (dwError: %lu\n", dwError); + UpdateServiceStatus(SERVICE_STOPPED); + return; + } + + UpdateServiceStatus(SERVICE_RUNNING); +} + + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} Propchange: trunk/reactos/base/services/wkssvc/wkssvc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/wkssvc/wkssvc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wkssvc/wkssv… ============================================================================== --- trunk/reactos/base/services/wkssvc/wkssvc.rc (added) +++ trunk/reactos/base/services/wkssvc/wkssvc.rc [iso-8859-1] Sun Feb 22 15:27:35 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Workstation Service" +#define REACTOS_STR_INTERNAL_NAME "wkssvc" +#define REACTOS_STR_ORIGINAL_FILENAME "wkssvc.dll" +#include <reactos/version.rc> Propchange: trunk/reactos/base/services/wkssvc/wkssvc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/wkssvc/wkssvc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wkssvc/wkssv… ============================================================================== --- trunk/reactos/base/services/wkssvc/wkssvc.spec (added) +++ trunk/reactos/base/services/wkssvc/wkssvc.spec [iso-8859-1] Sun Feb 22 15:27:35 2015 @@ -0,0 +1 @@ +@ stdcall ServiceMain(long ptr) Propchange: trunk/reactos/base/services/wkssvc/wkssvc.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Feb 22 15:27:35 2015 @@ -1591,7 +1591,7 @@ ; SvcHost services HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","DcomLaunch",0x00010000,"PlugPlay" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"DHCP","BITS","winmgmt" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"DHCP","BITS","lanmanworkstation","winmgmt" ; Win32 config HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Feb 22 15:27:35 2015 @@ -1509,6 +1509,16 @@ HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ImagePath",0x00020000,"system32\drivers\ksecdd.sys" HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Type",0x00010001,0x00000001 + +; Workstation service +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","DisplayName",0x00000000,"Workstation service" +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","Group",0x00000000,"Network Provider" +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","Type",0x00010001,0x00000020 +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\wkssvc.dll" ; MPU-401 MIDI driver HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Group",0x00000000,"Base"

1 0

[akhaldi] 66404: [UNICODE] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 22 Feb '15

22 Feb '15

Author: akhaldi Date: Sun Feb 22 15:05:52 2015 New Revision: 66404 URL: http://svn.reactos.org/svn/reactos?rev=66404&view=rev Log: [UNICODE] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/unicode/collation.c 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 Feb 22 15:05:52 2015 @@ -21,7 +21,7 @@ The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-1.7.27 +reactos/tools/unicode # Synced to WineStaging-1.7.37 reactos/tools/widl # Synced to Wine-1.7.17 reactos/tools/wpp # Synced to Wine-1.7.27 Modified: trunk/reactos/tools/unicode/collation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/collation.c?… ============================================================================== --- trunk/reactos/tools/unicode/collation.c [iso-8859-1] (original) +++ trunk/reactos/tools/unicode/collation.c [iso-8859-1] Sun Feb 22 15:05:52 2015 @@ -75,34 +75,34 @@ 0x00000000, 0x02010111, 0x02020111, 0x02030111, 0x02040111, 0x02050111, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x02090111, 0x024b0111, 0x02700111, 0x02a90111, 0x09e00111, 0x02aa0111, 0x02a70111, 0x02690111, - 0x027a0111, 0x027b0111, 0x02a20111, 0x039f0111, 0x022d0111, 0x02210111, 0x02550111, 0x02a40111, - 0x0a0b0111, 0x0a0c0111, 0x0a0d0111, 0x0a0e0111, 0x0a0f0111, 0x0a100111, 0x0a110111, 0x0a120111, - 0x0a130111, 0x0a140111, 0x02370111, 0x02350111, 0x03a30111, 0x03a40111, 0x03a50111, 0x024e0111, - 0x02a10111, 0x0a150151, 0x0a290141, 0x0a3d0151, 0x0a490151, 0x0a650151, 0x0a910151, 0x0a990151, + 0x01290111, 0x020c0111, 0x020d0111, 0x020f0111, 0x02100111, 0x02140111, 0x02190111, 0x01200111, + 0x021b0111, 0x022d0111, 0x02350111, 0x02a70111, 0x02370111, 0x01210111, 0x024b0111, 0x024c0111, + 0x0a0b0111, 0x0a0c0111, 0x0a0d0111, 0x0a0e0111, 0x0a0f0181, 0x0a100111, 0x0a110111, 0x0a120111, + 0x0a130111, 0x0a140111, 0x024e0111, 0x024f0111, 0x02a90111, 0x02aa0111, 0x030a0111, 0x02550111, + 0x025f0111, 0x0a150151, 0x0a290141, 0x0a3d0151, 0x0a490151, 0x0a650151, 0x0a910151, 0x0a990151, 0x0ab90151, 0x0ad30161, 0x0ae70141, 0x0af70141, 0x0b030161, 0x0b2b0151, 0x0b330151, 0x0b4b0161, 0x0b670141, 0x0b730141, 0x0b7f0141, 0x0ba70151, 0x0bbf0151, 0x0bd70141, 0x0bef0151, 0x0bfb0141, - 0x0c030151, 0x0c070141, 0x0c130141, 0x027c0111, 0x02a60111, 0x027d0111, 0x020f0111, 0x021b0111, - 0x020c0111, 0x0a150111, 0x0a290111, 0x0a3d0111, 0x0a490111, 0x0a650111, 0x0a910111, 0x0a990111, + 0x0c030151, 0x0c070141, 0x0c130141, 0x02700111, 0x02780111, 0x02790111, 0x027a0111, 0x027b0111, + 0x027c0111, 0x0a150111, 0x0a290111, 0x0a3d0111, 0x0a490111, 0x0a650111, 0x0a910111, 0x0a990111, 0x0ab90111, 0x0ad30111, 0x0ae70111, 0x0af70111, 0x0b030111, 0x0b2b0111, 0x0b330111, 0x0b4b0111, 0x0b670111, 0x0b730111, 0x0b7f0111, 0x0ba70111, 0x0bbf0111, 0x0bd70111, 0x0bef0111, 0x0bfb0111, - 0x0c030111, 0x0c070111, 0x0c130111, 0x027e0111, 0x03a70111, 0x027f0111, 0x03aa0111, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02060111, 0x00000000, 0x00000000, + 0x0c030111, 0x0c070111, 0x0c130111, 0x027d0111, 0x027e0111, 0x027f0111, 0x029c0111, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x02090141, 0x024c0111, 0x09df0111, 0x09e10111, 0x09de0111, 0x09e20111, 0x03a80111, 0x029c0111, - 0x02140111, 0x029f0111, 0x0a150181, 0x02780111, 0x03a60111, 0x02200111, 0x02a00111, 0x02100111, - 0x030a0111, 0x03a00111, 0x0a0d0151, 0x0a0e0151, 0x020d0111, 0x0c9f0121, 0x029d0111, 0x025f0111, - 0x02190111, 0x0a0c0151, 0x0b4b01a1, 0x02790111, 0x0a0c0171, 0x0a0c0171, 0x0a0e0171, 0x024f0111, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x01290121, 0x029d0111, 0x03a40111, 0x03a50111, 0x03a60111, 0x03a70111, 0x029f0111, 0x03a80111, + 0x02a00111, 0x03aa0111, 0x0a150181, 0x03a00111, 0x09de0111, 0x01220111, 0x09df0111, 0x02a10111, + 0x09e00111, 0x039f0111, 0x0a0d0151, 0x0a0e0151, 0x02a20111, 0x09e10111, 0x09e20111, 0x09ef0111, + 0x02a40111, 0x0a0c0151, 0x0b4b01a1, 0x03a10111, 0x0a0c0171, 0x0a0c0171, 0x0a0c0171, 0x02a60111, 0x0a150151, 0x0a150151, 0x0a150151, 0x0a150151, 0x0a150151, 0x0a150151, 0x0a190121, 0x0a3d0151, 0x0a650151, 0x0a650151, 0x0a650151, 0x0a650151, 0x0ad30161, 0x0ad30161, 0x0ad30161, 0x0ad30161, 0x0a5d0121, 0x0b330151, 0x0b4b0161, 0x0b4b0161, 0x0b4b0161, 0x0b4b0161, 0x0b4b0161, 0x03a20111, - 0x0b530121, 0x0bd70141, 0x0bd70141, 0x0bd70141, 0x0bd70141, 0x0c070141, 0x0c3b0121, 0x0ba70131, + 0x0b530121, 0x0bd70141, 0x0bd70141, 0x0bd70141, 0x0bd70141, 0x0c070141, 0x0bd40121, 0x0ba70131, 0x0a150111, 0x0a150111, 0x0a150111, 0x0a150111, 0x0a150111, 0x0a150111, 0x0a190111, 0x0a3d0111, 0x0a650111, 0x0a650111, 0x0a650111, 0x0a650111, 0x0ad30111, 0x0ad30111, 0x0ad30111, 0x0ad30111, - 0x0a5d0111, 0x0b330111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x03a10111, - 0x0b530111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0c070111, 0x0c3b0111, 0x0c070111, + 0x0a5d0111, 0x0b330111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x0b4b0111, 0x03a30111, + 0x0b530111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0bd70111, 0x0c070111, 0x0bd40111, 0x0c070111, /* 0x0100 .. 0x01ff */ 0x0a150151, 0x0a150111, 0x0a150151, 0x0a150111, 0x0a150151, 0x0a150111, 0x0a3d0151, 0x0a3d0111, 0x0a3d0151, 0x0a3d0111, 0x0a3d0151, 0x0a3d0111, 0x0a3d0151, 0x0a3d0111, 0x0a490151, 0x0a490111, @@ -189,7 +189,7 @@ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0x020d0111, 0x02140111, 0x0c910121, 0x025f0111, 0x0c950131, 0x0c990121, 0x0c9b0121, 0xffffffff, 0x0ca20121, 0xffffffff, 0x0ca80121, 0x0cac0121, 0x0c9b0111, 0x0c910121, 0x0c920131, 0x0c930121, 0x0c940121, 0x0c950131, 0x0c980121, 0x0c990121, - 0x0c9a0131, 0x0c9b0121, 0x0c9d0131, 0x0c9e0121, 0x0c9f0131, 0x0ca00121, 0x0ca10121, 0x0ca20121, + 0x0c9a0131, 0x0c9b0121, 0x0c9d0131, 0x0c9e0121, 0x0c9f0121, 0x0ca00121, 0x0ca10121, 0x0ca20121, 0x0ca30131, 0x0ca50131, 0xffffffff, 0x0ca60131, 0x0ca70121, 0x0ca80121, 0x0ca90131, 0x0caa0121, 0x0cab0121, 0x0cac0121, 0x0c9b0121, 0x0ca80121, 0x0c910111, 0x0c950111, 0x0c990111, 0x0c9b0111, 0x0ca80111, 0x0c910111, 0x0c920111, 0x0c930111, 0x0c940111, 0x0c950111, 0x0c980111, 0x0c990111, @@ -929,12 +929,12 @@ 0xffffffff, 0xffffffff, 0x0cac0111, 0x0cac0111, 0x0cac0111, 0xffffffff, 0x0cac0111, 0x0cac0111, 0x0ca20121, 0x0ca20121, 0x0cac0121, 0x0cac0121, 0x0cac0121, 0x020d0111, 0x02180111, 0xffffffff, /* 0x2000 .. 0x20ff */ - 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090131, 0x02090141, - 0x02090131, 0x02090131, 0x02090131, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090121, 0x02090131, + 0x02090121, 0x02090121, 0x02090121, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02250111, 0x02250121, 0x02260111, 0x02270111, 0x02280111, 0x02290111, 0x03a90111, 0x021c0111, 0x026a0111, 0x026b0111, 0x026c0111, 0x026d0111, 0x02710111, 0x02720111, 0x02730111, 0x02740111, 0x02ae0111, 0x02af0111, 0x02b00111, 0x02b10111, 0x02550131, 0x02550131, 0x02550131, 0x02b20111, - 0x02070111, 0x02080111, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02090141, + 0x02070111, 0x02080111, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02090131, 0x02ac0111, 0x02ad0111, 0x02b60111, 0x02b60121, 0x02b60121, 0x02b70111, 0x02b70121, 0x02b70121, 0x02b90111, 0x026e0111, 0x026f0111, 0x02ba0111, 0x024b0131, 0x02540111, 0x02110111, 0x02bb0111, 0x02bc0111, 0x02bd0111, 0x02be0111, 0x02b30111, 0x02a50111, 0x02860111, 0x02870111, 0xffffffff, @@ -1292,7 +1292,7 @@ 0x09a90111, 0x09aa0111, 0x09ab0111, 0x09ac0111, 0x09ad0111, 0x09ae0111, 0x09af0111, 0x09b00111, 0x09b10111, 0x09b20111, 0x09b30111, 0x09b40111, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, /* 0x3000 .. 0x30ff */ - 0x02090121, 0x02340111, 0x025e0111, 0x02b80111, 0x09b50111, 0x09d70111, 0x192c0111, 0x0a0b0111, + 0x02090111, 0x02340111, 0x025e0111, 0x02b80111, 0x09b50111, 0x09d70111, 0x192c0111, 0x0a0b0111, 0x02880111, 0x02890111, 0x028a0111, 0x028b0111, 0x028c0111, 0x028d0111, 0x028e0111, 0x028f0111, 0x02900111, 0x02910111, 0x09b60111, 0x09b70111, 0x02920111, 0x02930111, 0x02940111, 0x02950111, 0x02960111, 0x02970111, 0x02980111, 0x02990111, 0x022a0111, 0x02750111, 0x02760111, 0x02770111, @@ -1407,14 +1407,14 @@ 0x0a0c0131, 0x0a0c0131, 0x0a0c0131, 0x0a0c0131, 0x0a0d0131, 0x0a0d0131, 0x0a0d0131, 0x0a0d0131, 0x0a0d0131, 0x0ab901a1, 0x0a490191, 0x0a1501a1, 0x0a290181, 0x0b4b01b1, 0x0b670181, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xfb400151, 0xfb400151, 0xfb400151, 0xfb400151, 0xfb400151, - 0x0b670181, 0x0b3301b1, 0x0c9f0141, 0x0b2b01a1, 0x0af70171, 0x0af70181, 0x0b2b01b1, 0x0a990181, - 0x0a3d01a1, 0x0af70171, 0x0b670181, 0x0b3301b1, 0x0c9f0141, 0x0c9f0141, 0x0b2b01a1, 0x0af70171, - 0x0ab901b1, 0x0af70171, 0x0b2b01b1, 0x0a990181, 0x0bbf01a1, 0x0c9f0141, 0x0b2b01a1, 0x0a490191, - 0x0af70171, 0x0a910191, 0x0b3301b1, 0x0c9f0141, 0x0b2b01a1, 0x0a3d01a1, 0x0af70171, 0x0b2b01a1, + 0x0b670181, 0x0b3301b1, 0x0c9f0131, 0x0b2b01a1, 0x0af70171, 0x0af70181, 0x0b2b01b1, 0x0a990181, + 0x0a3d01a1, 0x0af70171, 0x0b670181, 0x0b3301b1, 0x0c9f0131, 0x0c9f0131, 0x0b2b01a1, 0x0af70171, + 0x0ab901b1, 0x0af70171, 0x0b2b01b1, 0x0a990181, 0x0bbf01a1, 0x0c9f0131, 0x0b2b01a1, 0x0a490191, + 0x0af70171, 0x0a910191, 0x0b3301b1, 0x0c9f0131, 0x0b2b01a1, 0x0a3d01a1, 0x0af70171, 0x0b2b01a1, 0x0a3d01a1, 0x0b2b01a1, 0x0af70171, 0x0b2b01a1, 0x0a3d01a1, 0x0b2b01a1, 0x0af70171, 0x0b2b01a1, 0x0b2b01a1, 0x0b670191, 0x0af70171, 0x0b2b01b1, 0x0a990181, 0x0b7f01a1, 0x0b7f01a1, 0x0b7f01a1, - 0x0b670181, 0x0b3301b1, 0x0c9f0141, 0x0b2b01a1, 0x0b670181, 0x0b3301b1, 0x0c9f0141, 0x0b2b01a1, - 0x0af70171, 0x0b2b01b1, 0x0b670181, 0x0b3301b1, 0x0c9f0141, 0x0b2b01a1, 0x0af70171, 0x0b2b01b1, + 0x0b670181, 0x0b3301b1, 0x0c9f0131, 0x0b2b01a1, 0x0b670181, 0x0b3301b1, 0x0c9f0131, 0x0b2b01a1, + 0x0af70171, 0x0b2b01b1, 0x0b670181, 0x0b3301b1, 0x0c9f0131, 0x0b2b01a1, 0x0af70171, 0x0b2b01b1, 0x0af70171, 0x0b2b01b1, 0x0a150191, 0x0a290191, 0x0a3d01a1, 0x0a3d01a1, 0x0a3d01b1, 0x0a3d01b1, 0x0a490191, 0x0a990181, 0x0ab901a1, 0x0ab901b1, 0x0ad301b1, 0x0af70181, 0x0af70181, 0x0af70171, 0x0b0301c1, 0x0b0301c1, 0x0b0301c1, 0x0b0301c1, 0x0b2b01a1, 0x0b2b01a1, 0x0b2b01a1, 0x0b670191, @@ -1601,7 +1601,7 @@ 0xffffffff, 0x02110121, 0x02110121, 0x02110121, 0x02110121, 0x021b0131, 0x021b0131, 0x021b0131, 0x022d0131, 0x02340121, 0x02550141, 0xffffffff, 0x02350131, 0x02370131, 0x024e0141, 0x024b0141, 0x02280121, 0x027a0141, 0x027b0131, 0x027e0131, 0x027f0131, 0x02920121, 0x02930121, 0x02a90131, - 0x02a70131, 0x02a20131, 0x039f0141, 0x02210131, 0x03a30131, 0x03a50131, 0x03a40131, 0xffffffff, + 0x02a70131, 0x02a20131, 0x039f0141, 0x02210121, 0x03a30131, 0x03a50131, 0x03a40131, 0xffffffff, 0x02a60131, 0x09e00131, 0x02aa0131, 0x02a10131, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0x00006831, 0x00006821, 0x00006921, 0xffffffff, 0x00006a21, 0xffffffff, 0x00006b31, 0x00006b21, 0x00006c31, 0x00006c21, 0x00006d31, 0x00006d21, 0x00006e31, 0x00006e21, 0x00006f31, 0x00006f21, @@ -1622,8 +1622,8 @@ 0x0f480141, 0x0f490161, 0x0f490151, 0x0f490131, 0x0f490141, 0x0f2d0151, 0x0f2d0141, 0x0f2d0151, 0x0f2d0141, 0x0f2d0151, 0x0f2d0141, 0x0f2d0151, 0x0f2d0141, 0xffffffff, 0xffffffff, 0x00000000, /* 0xff00 .. 0xffff */ - 0xffffffff, 0x024b0121, 0x02700121, 0x02a90121, 0x09e00121, 0x02aa0121, 0x02a70121, 0x02690121, - 0x027a0121, 0x027b0121, 0x02a20121, 0x039f0121, 0x022d0121, 0x02210121, 0x02550121, 0x02a40121, + 0xffffffff, 0x024b0121, 0x02700121, 0x02a90121, 0x09e00121, 0x02aa0121, 0x02a70121, 0x02690111, + 0x027a0121, 0x027b0121, 0x02a20121, 0x039f0121, 0x022d0121, 0x02210111, 0x02550121, 0x02a40121, 0x0a0b0121, 0x0a0c0121, 0x0a0d0121, 0x0a0e0121, 0x0a0f0121, 0x0a100121, 0x0a110121, 0x0a120121, 0x0a130121, 0x0a140121, 0x02370121, 0x02350121, 0x03a30121, 0x03a40121, 0x03a50121, 0x024e0121, 0x02a10121, 0x0a150161, 0x0a290151, 0x0a3d0161, 0x0a490161, 0x0a650161, 0x0a910161, 0x0a990161,

1 0

[ekohl] 66403: [INCLUDE] CORE-9248 Add the RPC interface difinition for the Workstation service.
by ekohl＠svn.reactos.org 22 Feb '15

22 Feb '15

Author: ekohl Date: Sun Feb 22 14:36:29 2015 New Revision: 66403 URL: http://svn.reactos.org/svn/reactos?rev=66403&view=rev Log: [INCLUDE] CORE-9248 Add the RPC interface difinition for the Workstation service. Added: trunk/reactos/include/reactos/idl/wkssvc.acf (with props) trunk/reactos/include/reactos/idl/wkssvc.idl (with props) Added: trunk/reactos/include/reactos/idl/wkssvc.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wkssvc… ============================================================================== --- trunk/reactos/include/reactos/idl/wkssvc.acf (added) +++ trunk/reactos/include/reactos/idl/wkssvc.acf [iso-8859-1] Sun Feb 22 14:36:29 2015 @@ -0,0 +1,6 @@ +[ + implicit_handle(handle_t hBinding) +] +interface wkssvc +{ +} Propchange: trunk/reactos/include/reactos/idl/wkssvc.acf ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/reactos/idl/wkssvc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wkssvc… ============================================================================== --- trunk/reactos/include/reactos/idl/wkssvc.idl (added) +++ trunk/reactos/include/reactos/idl/wkssvc.idl [iso-8859-1] Sun Feb 22 14:36:29 2015 @@ -0,0 +1,603 @@ +/* + * Workstation Service interface definition + */ + +#include <ms-dtyp.idl> + +typedef [handle] wchar_t *WKSSVC_IDENTIFY_HANDLE; +typedef [handle] wchar_t *WKSSVC_IMPERSONATE_HANDLE; + +typedef enum _NETSETUP_JOIN_STATUS +{ + NetSetupUnknownStatus = 0, + NetSetupUnjoined, + NetSetupWorkgroupName, + NetSetupDomainName +} NETSETUP_JOIN_STATUS, *PNETSETUP_JOIN_STATUS; + +typedef enum _NETSETUP_NAME_TYPE +{ + NetSetupUnknown = 0, + NetSetupMachine, + NetSetupWorkgroup, + NetSetupDomain, + NetSetupNonExistentDomain, + NetSetupDnsMachine +} NETSETUP_NAME_TYPE, *PNETSETUP_NAME_TYPE; + +typedef enum _NET_COMPUTER_NAME_TYPE +{ + NetPrimaryComputerName = 0, + NetAlternateComputerNames, + NetAllComputerNames, + NetComputerNameTypeMax +} NET_COMPUTER_NAME_TYPE, *PNET_COMPUTER_NAME_TYPE; + +typedef struct _STAT_WORKSTATION_0 +{ + LARGE_INTEGER StatisticsStartTime; + LARGE_INTEGER BytesReceived; + LARGE_INTEGER SmbsReceived; + LARGE_INTEGER PagingReadBytesRequested; + LARGE_INTEGER NonPagingReadBytesRequested; + LARGE_INTEGER CacheReadBytesRequested; + LARGE_INTEGER NetworkReadBytesRequested; + LARGE_INTEGER BytesTransmitted; + LARGE_INTEGER SmbsTransmitted; + LARGE_INTEGER PagingWriteBytesRequested; + LARGE_INTEGER NonPagingWriteBytesRequested; + LARGE_INTEGER CacheWriteBytesRequested; + LARGE_INTEGER NetworkWriteBytesRequested; + unsigned long InitiallyFailedOperations; + unsigned long FailedCompletionOperations; + unsigned long ReadOperations; + unsigned long RandomReadOperations; + unsigned long ReadSmbs; + unsigned long LargeReadSmbs; + unsigned long SmallReadSmbs; + unsigned long WriteOperations; + unsigned long RandomWriteOperations; + unsigned long WriteSmbs; + unsigned long LargeWriteSmbs; + unsigned long SmallWriteSmbs; + unsigned long RawReadsDenied; + unsigned long RawWritesDenied; + unsigned long NetworkErrors; + unsigned long Sessions; + unsigned long FailedSessions; + unsigned long Reconnects; + unsigned long CoreConnects; + unsigned long Lanman20Connects; + unsigned long Lanman21Connects; + unsigned long LanmanNtConnects; + unsigned long ServerDisconnects; + unsigned long HungSessions; + unsigned long UseCount; + unsigned long FailedUseCount; + unsigned long CurrentCommands; +} STAT_WORKSTATION_0, *PSTAT_WORKSTATION_0, *LPSTAT_WORKSTATION_0; + +typedef struct _WKSTA_INFO_100 +{ + unsigned long wki100_platform_id; + [string] wchar_t *wki100_computername; + [string] wchar_t *wki100_langroup; + unsigned long wki100_ver_major; + unsigned long wki100_ver_minor; +} WKSTA_INFO_100, *PWKSTA_INFO_100, *LPWKSTA_INFO_100; + +typedef struct _WKSTA_INFO_101 +{ + unsigned long wki101_platform_id; + [string] wchar_t *wki101_computername; + [string] wchar_t *wki101_langroup; + unsigned long wki101_ver_major; + unsigned long wki101_ver_minor; + [string] wchar_t* wki101_lanroot; +} WKSTA_INFO_101, *PWKSTA_INFO_101, *LPWKSTA_INFO_101; + +typedef struct _WKSTA_INFO_102 +{ + unsigned long wki102_platform_id; + [string] wchar_t *wki102_computername; + [string] wchar_t *wki102_langroup; + unsigned long wki102_ver_major; + unsigned long wki102_ver_minor; + [string] wchar_t *wki102_lanroot; + unsigned long wki102_logged_on_users; +} WKSTA_INFO_102, *PWKSTA_INFO_102, *LPWKSTA_INFO_102; + +typedef struct _WKSTA_INFO_502 +{ + unsigned long wki502_char_wait; + unsigned long wki502_collection_time; + unsigned long wki502_maximum_collection_count; + unsigned long wki502_keep_conn; + unsigned long wki502_max_cmds; + unsigned long wki502_sess_timeout; + unsigned long wki502_siz_char_buf; + unsigned long wki502_max_threads; + unsigned long wki502_lock_quota; + unsigned long wki502_lock_increment; + unsigned long wki502_lock_maximum; + unsigned long wki502_pipe_increment; + unsigned long wki502_pipe_maximum; + unsigned long wki502_cache_file_timeout; + unsigned long wki502_dormant_file_limit; + unsigned long wki502_read_ahead_throughput; + unsigned long wki502_num_mailslot_buffers; + unsigned long wki502_num_srv_announce_buffers; + unsigned long wki502_max_illegal_datagram_events; + unsigned long wki502_illegal_datagram_event_reset_frequency; + int wki502_log_election_packets; + int wki502_use_opportunistic_locking; + int wki502_use_unlock_behind; + int wki502_use_close_behind; + int wki502_buf_named_pipes; + int wki502_use_lock_read_unlock; + int wki502_utilize_nt_caching; + int wki502_use_raw_read; + int wki502_use_raw_write; + int wki502_use_write_raw_data; + int wki502_use_encryption; + int wki502_buf_files_deny_write; + int wki502_buf_read_only_files; + int wki502_force_core_create_mode; + int wki502_use_512_byte_max_transfer; +} WKSTA_INFO_502, *PWKSTA_INFO_502, *LPWKSTA_INFO_502; + +typedef struct _WKSTA_INFO_1013 +{ + unsigned long wki1013_keep_conn; +} WKSTA_INFO_1013, *PWKSTA_INFO_1013, *LPWKSTA_INFO_1013; + +typedef struct _WKSTA_INFO_1018 +{ + unsigned long wki1018_sess_timeout; +} WKSTA_INFO_1018, *PWKSTA_INFO_1018, *LPWKSTA_INFO_1018; + +typedef struct _WKSTA_INFO_1046 +{ + unsigned long wki1046_dormant_file_limit; +} WKSTA_INFO_1046, *PWKSTA_INFO_1046, *LPWKSTA_INFO_1046; + +typedef struct _WKSTA_USER_INFO_0 +{ + [string] wchar_t *wkui0_username; +} WKSTA_USER_INFO_0, *PWKSTA_USER_INFO_0, *LPWKSTA_USER_INFO_0; + +typedef struct _WKSTA_USER_INFO_1 +{ + [string] wchar_t *wkui1_username; + [string] wchar_t *wkui1_logon_domain; + [string] wchar_t *wkui1_oth_domains; + [string] wchar_t *wkui1_logon_server; +} WKSTA_USER_INFO_1, *PWKSTA_USER_INFO_1, *LPWKSTA_USER_INFO_1; + +typedef struct _WKSTA_TRANSPORT_INFO_0 +{ + unsigned long wkti0_quality_of_service; + unsigned long wkti0_number_of_vcs; + [string] wchar_t *wkti0_transport_name; + [string] wchar_t *wkti0_transport_address; + unsigned long wkti0_wan_ish; +} WKSTA_TRANSPORT_INFO_0, *PWKSTA_TRANSPORT_INFO_0, *LPWKSTA_TRANSPORT_INFO_0; + +typedef [switch_type(unsigned long)] union _WKSTA_INFO +{ + [case(100)] LPWKSTA_INFO_100 WkstaInfo100; + [case(101)] LPWKSTA_INFO_101 WkstaInfo101; + [case(102)] LPWKSTA_INFO_102 WkstaInfo102; + [case(502)] LPWKSTA_INFO_502 WkstaInfo502; + [case(1013)] LPWKSTA_INFO_1013 WkstaInfo1013; + [case(1018)] LPWKSTA_INFO_1018 WkstaInfo1018; + [case(1046)] LPWKSTA_INFO_1046 WkstaInfo1046; + [default] ; +} WKSTA_INFO, *PWKSTA_INFO, *LPWKSTA_INFO; + +typedef struct _USE_INFO_0 +{ + [string] wchar_t *ui0_local; + [string] wchar_t *ui0_remote; +} USE_INFO_0, *PUSE_INFO_0, *LPUSE_INFO_0; + +typedef struct _USE_INFO_1 +{ + [string] wchar_t *ui1_local; + [string] wchar_t *ui1_remote; + [string] wchar_t *ui1_password; + unsigned long ui1_status; + unsigned long ui1_asg_type; + unsigned long ui1_refcount; + unsigned long ui1_usecount; +} USE_INFO_1, *PUSE_INFO_1, *LPUSE_INFO_1; + +typedef struct _USE_INFO_2 +{ + USE_INFO_1 ui2_useinfo; + [string] wchar_t *ui2_username; + [string] wchar_t *ui2_domainname; +} USE_INFO_2, *PUSE_INFO_2, *LPUSE_INFO_2; + +typedef struct _USE_INFO_3 +{ + USE_INFO_2 ui3_ui2; + ULONG ui3_flags; +} USE_INFO_3, *PUSE_INFO_3, *LPUSE_INFO_3; + +typedef [switch_type(unsigned long)] union _USE_INFO +{ + [case(0)] LPUSE_INFO_0 UseInfo0; + [case(1)] LPUSE_INFO_1 UseInfo1; + [case(2)] LPUSE_INFO_2 UseInfo2; + [case(3)] LPUSE_INFO_3 UseInfo3; + [default] ; +} USE_INFO, *PUSE_INFO, *LPUSE_INFO; + +typedef struct _USE_INFO_0_CONTAINER +{ + unsigned long EntriesRead; + LPUSE_INFO_0 Buffer; +} USE_INFO_0_CONTAINER, *PUSE_INFO_0_CONTAINER, *LPUSE_INFO_0_CONTAINER; + +typedef struct _USE_INFO_1_CONTAINER +{ + unsigned long EntriesRead; + LPUSE_INFO_1 Buffer; +} USE_INFO_1_CONTAINER, *PUSE_INFO_1_CONTAINER, *LPUSE_INFO_1_CONTAINER; + +typedef struct _USE_INFO_2_CONTAINER +{ + unsigned long EntriesRead; + LPUSE_INFO_2 Buffer; +} USE_INFO_2_CONTAINER, *PUSE_INFO_2_CONTAINER, *LPUSE_INFO_2_CONTAINER; + +typedef struct _USE_ENUM_STRUCT +{ + DWORD Level; + [switch_is(Level)] union _USE_ENUM_UNION + { + [case(0)] LPUSE_INFO_0_CONTAINER Level0; + [case(1)] LPUSE_INFO_1_CONTAINER Level1; + [case(2)] LPUSE_INFO_2_CONTAINER Level2; + [default] ; + } UseInfo; +} USE_ENUM_STRUCT, *PUSE_ENUM_STRUCT, *LPUSE_ENUM_STRUCT; + +typedef struct _WKSTA_USER_INFO_0_CONTAINER +{ + unsigned long EntriesRead; + [size_is(EntriesRead)] LPWKSTA_USER_INFO_0 Buffer; +} WKSTA_USER_INFO_0_CONTAINER, *PWKSTA_USER_INFO_0_CONTAINER, *LPWKSTA_USER_INFO_0_CONTAINER; + +typedef struct _WKSTA_USER_INFO_1_CONTAINER +{ + unsigned long EntriesRead; + [size_is(EntriesRead)] LPWKSTA_USER_INFO_1 Buffer; +} WKSTA_USER_INFO_1_CONTAINER, *PWKSTA_USER_INFO_1_CONTAINER, *LPWKSTA_USER_INFO_1_CONTAINER; + +typedef struct _WKSTA_USER_ENUM_STRUCT +{ + unsigned long Level; + [switch_is(Level)] union _WKSTA_USER_ENUM_UNION + { + [case(0)] LPWKSTA_USER_INFO_0_CONTAINER Level0; + [case(1)] LPWKSTA_USER_INFO_1_CONTAINER Level1; + [default] ; + } WkstaUserInfo; +} WKSTA_USER_ENUM_STRUCT, *PWKSTA_USER_ENUM_STRUCT, *LPWKSTA_USER_ENUM_STRUCT; + +typedef struct _WKSTA_TRANSPORT_INFO_0_CONTAINER +{ + unsigned long EntriesRead; + [size_is(EntriesRead)] LPWKSTA_TRANSPORT_INFO_0 Buffer; +} WKSTA_TRANSPORT_INFO_0_CONTAINER, *PWKSTA_TRANSPORT_INFO_0_CONTAINER, *LPWKSTA_TRANSPORT_INFO_0_CONTAINER; + +typedef struct _WKSTA_TRANSPORT_ENUM_STRUCT +{ + unsigned long Level; + [switch_is(Level)] union _WKSTA_TRANSPORT_ENUM_UNION + { + [case(0)] LPWKSTA_TRANSPORT_INFO_0_CONTAINER Level0; + [default] ; + } WkstaTransportInfo; +} WKSTA_TRANSPORT_ENUM_STRUCT, *PWKSTA_TRANSPORT_ENUM_STRUCT, *LPWKSTA_TRANSPORT_ENUM_STRUCT; + +#define JOIN_OBFUSCATOR_LENGTH 8 +#define JOIN_MAX_PASSWORD_LENGTH 256 +typedef struct _JOINPR_USER_PASSWORD +{ + unsigned char Obfuscator[JOIN_OBFUSCATOR_LENGTH]; + wchar_t Buffer[JOIN_MAX_PASSWORD_LENGTH]; + unsigned long Length; +} JOINPR_USER_PASSWORD, *PJOINPR_USER_PASSWORD; + +typedef struct _JOINPR_ENCRYPTED_USER_PASSWORD +{ + unsigned char Buffer[JOIN_OBFUSCATOR_LENGTH + (JOIN_MAX_PASSWORD_LENGTH * sizeof(wchar_t)) + sizeof(unsigned long)]; +} JOINPR_ENCRYPTED_USER_PASSWORD, *PJOINPR_ENCRYPTED_USER_PASSWORD; + +cpp_quote("#if !defined(_NTSECAPI_H)") +typedef struct _UNICODE_STRING +{ + unsigned short Length; + unsigned short MaximumLength; + [size_is(MaximumLength / 2), length_is((Length) / 2)] unsigned short *Buffer; +} UNICODE_STRING, *PUNICODE_STRING; +cpp_quote("#endif") + +typedef struct _NET_COMPUTER_NAME_ARRAY +{ + unsigned long EntryCount; + [size_is(EntryCount)] PUNICODE_STRING ComputerNames; +} NET_COMPUTER_NAME_ARRAY, *PNET_COMPUTER_NAME_ARRAY; + + +[ + uuid(6BFFD098-A112-3610-9833-46C3F87E345A),version(1.0), + version(1.0), + pointer_default(unique), + endpoint("ncacn_np:[\\pipe\\wkssvc]") +#ifndef __midl + ,implicit_handle(handle_t hBinding) +#endif + +] +interface wkssvc +{ + /* Function 0 */ + unsigned long + __stdcall + NetrWkstaGetInfo ( + [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, + [in] unsigned long Level, + [out, switch_is(Level)] LPWKSTA_INFO WkstaInfo); + + /* Function 1 */ + unsigned long + __stdcall + NetrWkstaSetInfo ( + [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, + [in] unsigned long Level, + [in, switch_is(Level)] LPWKSTA_INFO WkstaInfo, + [in, out, unique] unsigned long *ErrorParameter); + + /* Function 2 */ + unsigned long + __stdcall + NetrWkstaUserEnum ( + [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, + [in, out] LPWKSTA_USER_ENUM_STRUCT UserInfo, + [in] unsigned long PreferredMaximumLength, + [out] unsigned long *TotalEntries, + [in, out, unique] unsigned long *ResumeHandle); + + /* Function 3 */ + void + __stdcall + Opnum3NotUsedOnWire(void); + + /* Function 4 */ + void + __stdcall + Opnum4NotUsedOnWire(void); + + /* Function 5 */ + unsigned long + __stdcall + NetrWkstaTransportEnum ( + [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, + [in, out] LPWKSTA_TRANSPORT_ENUM_STRUCT TransportInfo, + [in] unsigned long PreferredMaximumLength, + [out] unsigned long* TotalEntries, + [in, out, unique] unsigned long *ResumeHandle); + + /* Function 6 */ + unsigned long + __stdcall + NetrWkstaTransportAdd ( + [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, + [in] unsigned long Level, + [in] LPWKSTA_TRANSPORT_INFO_0 TransportInfo, + [in, out, unique] unsigned long *ErrorParameter); + + /* Function 7 */ + unsigned long + __stdcall + NetrWkstaTransportDel ( + [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, + [in, string, unique] wchar_t *TransportName, + [in] unsigned long ForceLevel); + + /* Function 8 */ + unsigned long + __stdcall + NetrUseAdd ( + [in, string, unique] WKSSVC_IMPERSONATE_HANDLE ServerName, + [in] unsigned long Level, + [in, switch_is(Level)] LPUSE_INFO InfoStruct, + [in, out, unique] unsigned long *ErrorParameter); + + /* Function 9 */ + unsigned long + __stdcall + NetrUseGetInfo ( + [in, string, unique] WKSSVC_IMPERSONATE_HANDLE ServerName, + [in, string] wchar_t *UseName, + [in] unsigned long Level, + [out, switch_is(Level)] LPUSE_INFO InfoStruct); + + /* Function 10 */ + unsigned long + __stdcall + NetrUseDel ( + [in, string, unique] WKSSVC_IMPERSONATE_HANDLE ServerName, + [in, string] wchar_t *UseName, + [in] unsigned long ForceLevel); + + /* Function 11 */ + unsigned long + __stdcall + NetrUseEnum ( + [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, + [in, out] LPUSE_ENUM_STRUCT InfoStruct, + [in] unsigned long PreferredMaximumLength, + [out] unsigned long *TotalEntries, + [in, out, unique] unsigned long *ResumeHandle); + + /* Function 12 */ + void + __stdcall + Opnum12NotUsedOnWire(void); + + /* Function 13 */ + unsigned long + __stdcall + NetrWorkstationStatisticsGet( + [in, string, unique] WKSSVC_IDENTIFY_HANDLE ServerName, + [in, string, unique] wchar_t *ServiceName, + [in] unsigned long Level, + [in] unsigned long Options, + [out] LPSTAT_WORKSTATION_0 *Buffer); + + /* Function 14 */ + void + __stdcall + Opnum14NotUsedOnWire(void); + + /* Function 15 */ + void + __stdcall + Opnum15NotUsedOnWire(void); + + /* Function 16 */ + void + __stdcall + Opnum16NotUsedOnWire(void); + + /* Function 17 */ + void + __stdcall + Opnum17NotUsedOnWire(void); + + /* Function 18 */ + void + __stdcall + Opnum18NotUsedOnWire(void); + + /* Function 19 */ + void + __stdcall + Opnum19NotUsedOnWire(void); + + /* Function 20 */ + unsigned long + __stdcall + NetrGetJoinInformation( + [in, string, unique] WKSSVC_IMPERSONATE_HANDLE ServerName, + [in, out, string] wchar_t **NameBuffer, + [out] PNETSETUP_JOIN_STATUS BufferType); + + /* Function 21 */ + void + __stdcall + Opnum21NotUsedOnWire(void); + + /* Function 22 */ + unsigned long + __stdcall + NetrJoinDomain2( + [in] handle_t RpcBindingHandle, + [in, string, unique] wchar_t *ServerName, + [in, string] wchar_t *DomainNameParam, + [in, string, unique] wchar_t *MachineAccountOU, + [in, string, unique] wchar_t *AccountName, + [in, unique] PJOINPR_ENCRYPTED_USER_PASSWORD Password, + [in] unsigned long Options); + + /* Function 23 */ + unsigned long + __stdcall + NetrUnjoinDomain2( + [in] handle_t RpcBindingHandle, + [in, string, unique] wchar_t *ServerName, + [in, string, unique] wchar_t *AccountName, + [in, unique] PJOINPR_ENCRYPTED_USER_PASSWORD Password, + [in] unsigned long Options); + + /* Function 24 */ + unsigned long + __stdcall + NetrRenameMachineInDomain2( + [in] handle_t RpcBindingHandle, + [in, string, unique] wchar_t *ServerName, + [in, string, unique] wchar_t *MachineName, + [in, string, unique] wchar_t *AccountName, + [in, unique] PJOINPR_ENCRYPTED_USER_PASSWORD Password, + [in] unsigned long Options); + + /* Function 25 */ + unsigned long + __stdcall + NetrValidateName2( + [in] handle_t RpcBindingHandle, + [in, string, unique] wchar_t *ServerName, + [in, string] wchar_t *NameToValidate, + [in, string, unique] wchar_t *AccountName, + [in, unique] PJOINPR_ENCRYPTED_USER_PASSWORD Password, + [in] NETSETUP_NAME_TYPE NameType); + + /* Function 26 */ + unsigned long + __stdcall + NetrGetJoinableOUs2( + [in] handle_t RpcBindingHandle, + [in, string, unique] wchar_t *ServerName, + [in, string] wchar_t *DomainNameParam, + [in, string, unique] wchar_t *AccountName, + [in, unique] PJOINPR_ENCRYPTED_USER_PASSWORD Password, + [in, out] unsigned long* OUCount, + [out, string, size_is(,*OUCount)] wchar_t ***OUs); + + /* Function 27 */ + unsigned long + __stdcall + NetrAddAlternateComputerName( + [in] handle_t RpcBindingHandle, + [in, string, unique] wchar_t *ServerName, + [in, string, unique] wchar_t *AlternateName, + [in, string, unique] wchar_t *DomainAccount, + [in, unique] PJOINPR_ENCRYPTED_USER_PASSWORD EncryptedPassword, + [in] unsigned long Reserved); + + /* Function 28 */ + unsigned long + __stdcall + NetrRemoveAlternateComputerName( + [in] handle_t RpcBindingHandle, + [in, string, unique] wchar_t *ServerName, + [in, string, unique] wchar_t *AlternateName, + [in, string, unique] wchar_t *DomainAccount, + [in, unique] PJOINPR_ENCRYPTED_USER_PASSWORD EncryptedPassword, + [in] unsigned long Reserved); + + /* Function 29 */ + unsigned long + __stdcall + NetrSetPrimaryComputerName( + [in] handle_t RpcBindingHandle, + [in, string, unique] wchar_t *ServerName, + [in, string, unique] wchar_t *PrimaryName, + [in, string, unique] wchar_t *DomainAccount, + [in, unique] PJOINPR_ENCRYPTED_USER_PASSWORD EncryptedPassword, + [in] unsigned long Reserved); + + /* Function 30 */ + unsigned long + __stdcall + NetrEnumerateComputerNames( + [in, string, unique] WKSSVC_IMPERSONATE_HANDLE ServerName, + [in] NET_COMPUTER_NAME_TYPE NameType, + [in] unsigned long Reserved, + [out] PNET_COMPUTER_NAME_ARRAY *ComputerNames); +} Propchange: trunk/reactos/include/reactos/idl/wkssvc.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 66402: [COMCTL32] - Rebar: paint the area that is not covered by the bands. This is a v6 feature and fixes the ugly non-painted rectangle in the taskbar.
by gadamopoulos＠svn.reactos.org 22 Feb '15

22 Feb '15

Author: gadamopoulos Date: Sun Feb 22 13:18:41 2015 New Revision: 66402 URL: http://svn.reactos.org/svn/reactos?rev=66402&view=rev Log: [COMCTL32] - Rebar: paint the area that is not covered by the bands. This is a v6 feature and fixes the ugly non-painted rectangle in the taskbar. Modified: trunk/reactos/dll/win32/comctl32/rebar.c Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] Sun Feb 22 13:18:41 2015 @@ -1828,15 +1828,24 @@ RECT cr; COLORREF old = CLR_NONE, new; HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); + HRGN hrgn; GetClientRect (infoPtr->hwndSelf, &cr); + hrgn = CreateRectRgn(cr.left, cr.top, cr.right, cr.bottom); oldrow = -1; for(i=0; i<infoPtr->uNumBands; i++) { RECT rcBand; + HRGN hrgnBand; + lpBand = REBAR_GetBand(infoPtr, i); + if (HIDDENBAND(lpBand)) continue; translate_rect(infoPtr, &rcBand, &lpBand->rcBand); + + hrgnBand = CreateRectRgn(rcBand.left, rcBand.top, rcBand.right, rcBand.bottom); + CombineRgn(hrgn, hrgn, hrgnBand, RGN_DIFF); + DeleteObject(hrgnBand); /* draw band separator between rows */ if (lpBand->iRow != oldrow) { @@ -1928,6 +1937,16 @@ SetBkColor (hdc, old); } } + +#if 1 + { + //FIXME: Apparently painting the remaining area is a v6 feature + HBRUSH hbrush = CreateSolidBrush(new); + FillRgn(hdc, hrgn, hbrush); + DeleteObject(hbrush); + DeleteObject(hrgn); + } +#endif return TRUE; }

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