Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 60099: [NETAPI32] NetUserGetLocalGroups: Fix a typo that broke the enumeration of account aliases.
by ekohl＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: ekohl Date: Sat Sep 14 12:22:36 2013 New Revision: 60099 URL: http://svn.reactos.org/svn/reactos?rev=60099&view=rev Log: [NETAPI32] NetUserGetLocalGroups: Fix a typo that broke the enumeration of account aliases. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sat Sep 14 12:22:36 2013 @@ -3118,7 +3118,7 @@ for (i = 0; i < AccountMemberCount; i++) { - if (BuiltinNames[i].Length > 0) + if (AccountNames[i].Length > 0) { Size += (sizeof(LOCALGROUP_USERS_INFO_0) + AccountNames[i].Length + sizeof(UNICODE_NULL)); Count++;

1 0

[akhaldi] 60098: [WPP] * Introduce wpp as a cross compiling lib, and rename out host one as wpphost. [WIDL] * Update the link reference to the host wpp. [PSDK] * Update d3d9types.h and import d3d11...
by akhaldi＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: akhaldi Date: Sat Sep 14 10:30:44 2013 New Revision: 60098 URL: http://svn.reactos.org/svn/reactos?rev=60098&view=rev Log: [WPP] * Introduce wpp as a cross compiling lib, and rename out host one as wpphost. [WIDL] * Update the link reference to the host wpp. [PSDK] * Update d3d9types.h and import d3d11shader.h and d3dcompiler.h from Wine. [DXGUID] * Introduce dx10guid to contain some GUIDs needed only by Wine DirectX modules. [D3DCOMPILER_43] * Import from Wine 1.7.1. Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/ (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.l (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.h (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.y (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.yy.c (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/blob.c (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43.spec (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.l (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.c (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.h (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.y (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.yy.c (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/reflection.c (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/utils.c (with props) trunk/reactos/dll/directx/wine/d3dcompiler_43/version.rc (with props) trunk/reactos/include/psdk/d3d11shader.h (with props) trunk/reactos/include/psdk/d3dcompiler.h (with props) trunk/reactos/lib/sdk/dxguid/dx10guid.c (with props) Modified: trunk/reactos/CMakeLists.txt trunk/reactos/dll/directx/wine/CMakeLists.txt trunk/reactos/include/psdk/d3d9types.h trunk/reactos/lib/sdk/dxguid/CMakeLists.txt trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/CMakeLists.txt trunk/reactos/tools/wpp/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=60098&r… Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/CMakeList… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/asmshader.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/blob.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/bytecodewriter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/compiler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_43_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/d3dcompiler_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/hlsl.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/reflection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/dll/directx/wine/d3dcompiler_43/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dcompil… Added: trunk/reactos/include/psdk/d3d11shader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d11shader.h… Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9types.h?r… Added: trunk/reactos/include/psdk/d3dcompiler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dcompiler.h… Modified: trunk/reactos/lib/sdk/dxguid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/dxguid/CMakeLists.… Added: trunk/reactos/lib/sdk/dxguid/dx10guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/dxguid/dx10guid.c?… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/widl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/CMakeLists.txt?… Modified: trunk/reactos/tools/wpp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/CMakeLists.txt?r…

1 0

[tkreuzer] 60097: [CRT] _cdecl -> __cdecl
by tkreuzer＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: tkreuzer Date: Sat Sep 14 10:28:30 2013 New Revision: 60097 URL: http://svn.reactos.org/svn/reactos?rev=60097&view=rev Log: [CRT] _cdecl -> __cdecl Modified: trunk/reactos/lib/sdk/crt/printf/_cwprintf.c trunk/reactos/lib/sdk/crt/printf/_sxprintf.c trunk/reactos/lib/sdk/crt/printf/_vscprintf.c trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c trunk/reactos/lib/sdk/crt/printf/fprintf.c trunk/reactos/lib/sdk/crt/printf/fprintf_s.c trunk/reactos/lib/sdk/crt/printf/fwprintf.c trunk/reactos/lib/sdk/crt/printf/fwprintf_s.c trunk/reactos/lib/sdk/crt/printf/printf.c trunk/reactos/lib/sdk/crt/printf/printf_s.c trunk/reactos/lib/sdk/crt/printf/streamout.c trunk/reactos/lib/sdk/crt/printf/vfprintf.c trunk/reactos/lib/sdk/crt/printf/vfprintf_s.c trunk/reactos/lib/sdk/crt/printf/vfwprintf.c trunk/reactos/lib/sdk/crt/printf/vfwprintf_s.c trunk/reactos/lib/sdk/crt/printf/vprintf.c trunk/reactos/lib/sdk/crt/printf/vprintf_s.c trunk/reactos/lib/sdk/crt/printf/vwprintf.c trunk/reactos/lib/sdk/crt/printf/vwprintf_s.c trunk/reactos/lib/sdk/crt/printf/wprintf.c trunk/reactos/lib/sdk/crt/printf/wprintf_s.c Modified: trunk/reactos/lib/sdk/crt/printf/_cwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_cwprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_cwprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/_cwprintf.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -10,7 +10,7 @@ #include <stdarg.h> int -_cdecl +__cdecl _cwprintf(const wchar_t* format, ...) { int retval; Modified: trunk/reactos/lib/sdk/crt/printf/_sxprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_sxprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_sxprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/_sxprintf.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -22,13 +22,13 @@ #define min(a,b) (((a) < (b)) ? (a) : (b)) -int _cdecl _tstreamout(FILE *stream, const TCHAR *format, va_list argptr); +int __cdecl _tstreamout(FILE *stream, const TCHAR *format, va_list argptr); int #if defined(USER32_WSPRINTF) && defined(_M_IX86) -_stdcall +__stdcall #else -_cdecl +__cdecl #endif _sxprintf( TCHAR *buffer, Modified: trunk/reactos/lib/sdk/crt/printf/_vscprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_vscpri… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_vscprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/_vscprintf.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -8,12 +8,12 @@ #include <stdio.h> #include <stdarg.h> -int _cdecl streamout(FILE *stream, const char *format, va_list argptr); +int __cdecl streamout(FILE *stream, const char *format, va_list argptr); -int _vscprintf( +int +_vscprintf( const char *format, - va_list argptr -) + va_list argptr) { int ret; FILE* nulfile = fopen("nul", "w"); Modified: trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_vscwpr… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -12,12 +12,12 @@ #include <ntddk.h> #endif -int _cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr); +int __cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr); -int _vscwprintf( +int +_vscwprintf( const wchar_t *format, - va_list argptr -) + va_list argptr) { int ret; #ifndef _LIBCNT_ Modified: trunk/reactos/lib/sdk/crt/printf/fprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/fprintf… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/fprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/fprintf.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -10,7 +10,7 @@ #include <stdarg.h> int -_cdecl +__cdecl fprintf(FILE *file, const char *format, ...) { va_list argptr; Modified: trunk/reactos/lib/sdk/crt/printf/fprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/fprintf… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/fprintf_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/fprintf_s.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -12,7 +12,7 @@ #include <stdarg.h> int -_cdecl +__cdecl fprintf_s(FILE* file, const char *format, ...) { va_list argptr; Modified: trunk/reactos/lib/sdk/crt/printf/fwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/fwprint… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/fwprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/fwprintf.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -10,7 +10,7 @@ #include <stdarg.h> int -_cdecl +__cdecl fwprintf(FILE* file, const wchar_t *format, ...) { va_list argptr; Modified: trunk/reactos/lib/sdk/crt/printf/fwprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/fwprint… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/fwprintf_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/fwprintf_s.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -12,7 +12,7 @@ #include <stdarg.h> int -_cdecl +__cdecl fwprintf_s(FILE* file, const wchar_t *format, ...) { va_list valist; Modified: trunk/reactos/lib/sdk/crt/printf/printf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/printf.… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/printf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/printf.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -11,7 +11,7 @@ #include <stdarg.h> int -_cdecl +__cdecl printf(const char *format, ...) { va_list argptr; Modified: trunk/reactos/lib/sdk/crt/printf/printf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/printf_… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/printf_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/printf_s.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -12,7 +12,7 @@ #include <stdarg.h> int -_cdecl +__cdecl printf_s(const char *format, ...) { va_list argptr; Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -307,7 +307,7 @@ #endif int -_cdecl +__cdecl streamout(FILE *stream, const TCHAR *format, va_list argptr) { static const TCHAR digits_l[] = _T("0123456789abcdef0x"); Modified: trunk/reactos/lib/sdk/crt/printf/vfprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/vfprint… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/vfprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/vfprintf.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -9,10 +9,10 @@ #include <stdio.h> #include <stdarg.h> -int _cdecl streamout(FILE *stream, const char *format, va_list argptr); +int __cdecl streamout(FILE *stream, const char *format, va_list argptr); int -_cdecl +__cdecl vfprintf(FILE *file, const char *format, va_list argptr) { int result; Modified: trunk/reactos/lib/sdk/crt/printf/vfprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/vfprint… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/vfprintf_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/vfprintf_s.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -12,10 +12,10 @@ #include <stdarg.h> #include <internal/safecrt.h> -int _cdecl streamout(FILE *stream, const char *format, va_list argptr); +int __cdecl streamout(FILE *stream, const char *format, va_list argptr); int -_cdecl +__cdecl vfprintf_s(FILE* file, const char *format, va_list argptr) { int result; Modified: trunk/reactos/lib/sdk/crt/printf/vfwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/vfwprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/vfwprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/vfwprintf.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -9,10 +9,10 @@ #include <stdio.h> #include <stdarg.h> -int _cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr); +int __cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr); int -_cdecl +__cdecl vfwprintf(FILE* file, const wchar_t *format, va_list argptr) { int ret; Modified: trunk/reactos/lib/sdk/crt/printf/vfwprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/vfwprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/vfwprintf_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/vfwprintf_s.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -13,10 +13,10 @@ #include <stdarg.h> #include <internal/safecrt.h> -int _cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr); +int __cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr); int -_cdecl +__cdecl vfwprintf_s(FILE* file, const wchar_t *format, va_list argptr) { int ret; Modified: trunk/reactos/lib/sdk/crt/printf/vprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/vprintf… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/vprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/vprintf.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -10,7 +10,7 @@ #include <stdarg.h> int -_cdecl +__cdecl vprintf(const char *format, va_list argptr) { return vfprintf(stdout, format, argptr); Modified: trunk/reactos/lib/sdk/crt/printf/vprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/vprintf… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/vprintf_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/vprintf_s.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -12,7 +12,7 @@ #include <stdarg.h> int -_cdecl +__cdecl vprintf_s(const char *format, va_list valist) { return vfprintf_s(stdout,format,valist); Modified: trunk/reactos/lib/sdk/crt/printf/vwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/vwprint… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/vwprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/vwprintf.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -10,8 +10,8 @@ #include <stdarg.h> int -_cdecl +__cdecl vwprintf(const wchar_t *format, va_list valist) { - return vfwprintf(stdout,format,valist); + return vfwprintf(stdout, format, valist); } Modified: trunk/reactos/lib/sdk/crt/printf/vwprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/vwprint… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/vwprintf_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/vwprintf_s.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -12,8 +12,8 @@ #include <stdarg.h> int -_cdecl +__cdecl vwprintf_s(const wchar_t *format, va_list valist) { - return vfwprintf_s(stdout,format,valist); + return vfwprintf_s(stdout, format, valist); } Modified: trunk/reactos/lib/sdk/crt/printf/wprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/wprintf… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/wprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/wprintf.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -11,7 +11,7 @@ #include <stdarg.h> int -_cdecl +__cdecl wprintf(const wchar_t *format, ...) { va_list argptr; Modified: trunk/reactos/lib/sdk/crt/printf/wprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/wprintf… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/wprintf_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/wprintf_s.c [iso-8859-1] Sat Sep 14 10:28:30 2013 @@ -12,7 +12,7 @@ #include <stdarg.h> int -_cdecl +__cdecl wprintf_s(const wchar_t *format, ...) { va_list argptr;

1 0

[tkreuzer] 60096: [SMSS] Fix some MSVC warnings.
by tkreuzer＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: tkreuzer Date: Sat Sep 14 10:25:59 2013 New Revision: 60096 URL: http://svn.reactos.org/svn/reactos?rev=60096&view=rev Log: [SMSS] Fix some MSVC warnings. Modified: trunk/reactos/base/system/smss/pagefile.c trunk/reactos/base/system/smss/smutil.c Modified: trunk/reactos/base/system/smss/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/pagefile.… ============================================================================== --- trunk/reactos/base/system/smss/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/pagefile.c [iso-8859-1] Sat Sep 14 10:25:59 2013 @@ -160,10 +160,10 @@ { /* Use the rest of the arguments as a maximum size */ SecondArgument.Buffer = &Arguments.Buffer[i]; - SecondArgument.Length = Arguments.Length - - i * sizeof(WCHAR); - SecondArgument.MaximumLength = Arguments.MaximumLength - - i * sizeof(WCHAR); + SecondArgument.Length = (USHORT)(Arguments.Length - + i * sizeof(WCHAR)); + SecondArgument.MaximumLength = (USHORT)(Arguments.MaximumLength - + i * sizeof(WCHAR)); Status = RtlUnicodeStringToInteger(&SecondArgument, 0, &MaxSize); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/base/system/smss/smutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smutil.c?… ============================================================================== --- trunk/reactos/base/system/smss/smutil.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smutil.c [iso-8859-1] Sat Sep 14 10:25:59 2013 @@ -213,14 +213,14 @@ if (!Token->Buffer) return STATUS_NO_MEMORY; /* Fill in the unicode string to hold it */ - Token->MaximumLength = TokenLength + sizeof(UNICODE_NULL); - Token->Length = TokenLength; + Token->MaximumLength = (USHORT)(TokenLength + sizeof(UNICODE_NULL)); + Token->Length = (USHORT)TokenLength; RtlCopyMemory(Token->Buffer, p, TokenLength); Token->Buffer[TokenLength / sizeof(WCHAR)] = UNICODE_NULL; } /* Modify the input string with the position of where the next token begins */ - Input->Length -= (ULONG_PTR)pp - (ULONG_PTR)Input->Buffer; + Input->Length -= (USHORT)((ULONG_PTR)pp - (ULONG_PTR)Input->Buffer); Input->Buffer = pp; return STATUS_SUCCESS; } @@ -256,7 +256,7 @@ sizeof(L"\\system32;"); RtlInitEmptyUnicodeString(&FullPathString, RtlAllocateHeap(SmpHeap, SmBaseTag, Length), - Length); + (USHORT)Length); if (FullPathString.Buffer) { /* Append the root, system32;, and then the current library path */ @@ -308,7 +308,7 @@ Length = PAGE_SIZE; RtlInitEmptyUnicodeString(&PathString, RtlAllocateHeap(SmpHeap, SmBaseTag, Length), - Length); + (USHORT)Length); if (!PathString.Buffer) { /* Fail if we have no memory for this */ @@ -329,7 +329,7 @@ Length = PathString.Length + sizeof(UNICODE_NULL); RtlInitEmptyUnicodeString(&PathString, RtlAllocateHeap(SmpHeap, SmBaseTag, Length), - Length); + (USHORT)Length); if (!PathString.Buffer) { /* Fail if we have no memory for this */

1 0

[tkreuzer] 60095: [KERNEL32] Fix MSVC warnings.
by tkreuzer＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: tkreuzer Date: Sat Sep 14 10:20:11 2013 New Revision: 60095 URL: http://svn.reactos.org/svn/reactos?rev=60095&view=rev Log: [KERNEL32] Fix MSVC warnings. Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c trunk/reactos/dll/win32/kernel32/client/console/readwrite.c trunk/reactos/dll/win32/kernel32/client/environ.c trunk/reactos/dll/win32/kernel32/client/file/create.c trunk/reactos/dll/win32/kernel32/client/loader.c trunk/reactos/dll/win32/kernel32/client/path.c trunk/reactos/dll/win32/kernel32/client/power.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/dll/win32/kernel32/client/thread.c trunk/reactos/dll/win32/kernel32/client/time.c trunk/reactos/dll/win32/kernel32/client/vdm.c trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] Sat Sep 14 10:20:11 2013 @@ -121,7 +121,7 @@ ConsoleStartInfo->dwStartupFlags = si.dwFlags; if (si.dwFlags & STARTF_USEFILLATTRIBUTE) { - ConsoleStartInfo->wFillAttribute = si.dwFillAttribute; + ConsoleStartInfo->wFillAttribute = (WORD)si.dwFillAttribute; } if (si.dwFlags & STARTF_USECOUNTCHARS) { @@ -134,13 +134,13 @@ } if (si.dwFlags & STARTF_USEPOSITION) { - ConsoleStartInfo->dwWindowOrigin.X = (LONG)(si.dwX); - ConsoleStartInfo->dwWindowOrigin.Y = (LONG)(si.dwY); + ConsoleStartInfo->dwWindowOrigin.X = (SHORT)(si.dwX); + ConsoleStartInfo->dwWindowOrigin.Y = (SHORT)(si.dwY); } if (si.dwFlags & STARTF_USESIZE) { - ConsoleStartInfo->dwWindowSize.X = (LONG)(si.dwXSize); - ConsoleStartInfo->dwWindowSize.Y = (LONG) (si.dwYSize); + ConsoleStartInfo->dwWindowSize.X = (SHORT)(si.dwXSize); + ConsoleStartInfo->dwWindowSize.Y = (SHORT)(si.dwYSize); } /* Set up the title for the console */ Modified: trunk/reactos/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Sat Sep 14 10:20:11 2013 @@ -660,7 +660,7 @@ WriteOutputCodeRequest->CodeType = CodeType; WriteOutputCodeRequest->Coord = dwWriteCoord; - WriteOutputCodeRequest->Length = nLength; + WriteOutputCodeRequest->Length = (USHORT)nLength; /* Call the server */ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, Modified: trunk/reactos/dll/win32/kernel32/client/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] Sat Sep 14 10:20:11 2013 @@ -50,7 +50,7 @@ if (nSize) { /* Keep the given size, minus a NULL-char */ - UniSize = nSize - 1; + UniSize = (USHORT)(nSize - 1); } else { @@ -114,7 +114,7 @@ { /* Check if the size is too big to fit */ UniSize = UNICODE_STRING_MAX_BYTES - 1; - if (nSize <= UniSize) UniSize = nSize; + if (nSize <= UniSize) UniSize = (USHORT)nSize; /* Check the size */ Result = RtlUnicodeStringToAnsiSize(&VarValueU); @@ -169,7 +169,7 @@ { if (nSize) { - UniSize = nSize * sizeof(WCHAR) - sizeof(UNICODE_NULL); + UniSize = (USHORT)nSize * sizeof(WCHAR) - sizeof(UNICODE_NULL); } else { @@ -180,7 +180,7 @@ { UniSize = UNICODE_STRING_MAX_BYTES - sizeof(UNICODE_NULL); } - + Status = RtlInitUnicodeStringEx(&VarName, lpName); if (!NT_SUCCESS(Status)) { @@ -404,11 +404,11 @@ /* Check if the size is too big to fit */ UniSize = UNICODE_STRING_MAX_CHARS - 2; - if (nSize <= UniSize) UniSize = nSize; - + if (nSize <= UniSize) UniSize = (USHORT)nSize; + /* Clear the input buffer */ if (lpDst) *lpDst = ANSI_NULL; - + /* Initialize all the strings */ RtlInitAnsiString(&Source, lpSrc); RtlInitUnicodeString(&SourceU, NULL); @@ -446,7 +446,7 @@ if (!(NT_SUCCESS(Status)) && (Status == STATUS_BUFFER_TOO_SMALL)) { /* Fixup the length that the API returned */ - DestU.MaximumLength = Length; + DestU.MaximumLength = (SHORT)Length; /* Free old Unicode buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, DestU.Buffer); @@ -474,7 +474,7 @@ { /* Check if the size is too big to fit */ UniSize = UNICODE_STRING_MAX_BYTES - 1; - if (nSize <= UniSize) UniSize = nSize; + if (nSize <= UniSize) UniSize = (USHORT)nSize; /* Check the size */ Result = RtlUnicodeStringToAnsiSize(&DestU); @@ -483,7 +483,7 @@ /* Convert the string */ RtlInitEmptyAnsiString(&Dest, lpDst, UniSize); Status = RtlUnicodeStringToAnsiString(&Dest, &DestU, FALSE); - + /* Write a NULL-char in case of failure only */ if (!NT_SUCCESS(Status)) *lpDst = ANSI_NULL; } @@ -517,13 +517,13 @@ UNICODE_STRING Source, Destination; NTSTATUS Status; USHORT UniSize; - + UniSize = UNICODE_STRING_MAX_CHARS - 2; - if (nSize <= UniSize) UniSize = nSize; + if (nSize <= UniSize) UniSize = (USHORT)nSize; RtlInitUnicodeString(&Source, (LPWSTR)lpSrc); RtlInitEmptyUnicodeString(&Destination, lpDst, UniSize * sizeof(WCHAR)); - + Status = RtlExpandEnvironmentStrings_U(NULL, &Source, &Destination, Modified: trunk/reactos/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/create.c [iso-8859-1] Sat Sep 14 10:20:11 2013 @@ -418,7 +418,7 @@ lpReOpenBuff->szPathName, NULL)) { - lpReOpenBuff->nErrCode = GetLastError(); + lpReOpenBuff->nErrCode = (WORD)GetLastError(); return HFILE_ERROR; } @@ -492,7 +492,7 @@ if (Len == 0 || Len > OFS_MAXPATHNAME) { - lpReOpenBuff->nErrCode = GetLastError(); + lpReOpenBuff->nErrCode = (WORD)GetLastError(); return (HFILE)INVALID_HANDLE_VALUE; } @@ -500,7 +500,7 @@ { if (!DeleteFileW(PathNameW)) { - lpReOpenBuff->nErrCode = GetLastError(); + lpReOpenBuff->nErrCode = (WORD)GetLastError(); return HFILE_ERROR; } TRACE("(%s): OF_DELETE return = OK\n", lpFileName); @@ -546,7 +546,7 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, FileNameString.Buffer); - lpReOpenBuff->nErrCode = RtlNtStatusToDosError(errCode); + lpReOpenBuff->nErrCode = (WORD)RtlNtStatusToDosError(errCode); if (!NT_SUCCESS(errCode)) { Modified: trunk/reactos/dll/win32/kernel32/client/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] Sat Sep 14 10:20:11 2013 @@ -552,7 +552,7 @@ } /* Call unicode API */ - FilenameW.Length = GetModuleFileNameW(hModule, FilenameW.Buffer, nSize) * sizeof(WCHAR); + FilenameW.Length = (USHORT)GetModuleFileNameW(hModule, FilenameW.Buffer, nSize) * sizeof(WCHAR); FilenameW.MaximumLength = FilenameW.Length + sizeof(WCHAR); if (FilenameW.Length) Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sat Sep 14 10:20:11 2013 @@ -557,7 +557,7 @@ IN ULONG Length) { BOOLEAN HasExtension; - WCHAR c; + UCHAR c; NTSTATUS Status; UNICODE_STRING UnicodeName; ANSI_STRING AnsiName; @@ -587,7 +587,7 @@ /* Initialize our two strings */ RtlInitEmptyAnsiString(&AnsiName, AnsiBuffer, MAX_PATH); - RtlInitEmptyUnicodeString(&UnicodeName, Name, Length * sizeof(WCHAR)); + RtlInitEmptyUnicodeString(&UnicodeName, Name, (USHORT)Length * sizeof(WCHAR)); UnicodeName.Length = UnicodeName.MaximumLength; /* Now do the conversion */ @@ -914,7 +914,7 @@ ANSI_STRING AnsiDllDirectory; ULONG Length; - RtlInitEmptyAnsiString(&AnsiDllDirectory, lpBuffer, nBufferLength); + RtlInitEmptyAnsiString(&AnsiDllDirectory, lpBuffer, (USHORT)nBufferLength); RtlEnterCriticalSection(&BaseDllDirectoryLock); @@ -1363,7 +1363,7 @@ } /* Set the path size now that we have it */ - PathString.MaximumLength = PathString.Length = LengthNeeded * sizeof(WCHAR); + PathString.MaximumLength = PathString.Length = (USHORT)LengthNeeded * sizeof(WCHAR); /* Request SxS isolation from RtlDosSearchPath_Ustr */ Flags |= 1; @@ -1377,7 +1377,7 @@ if (nBufferLength <= UNICODE_STRING_MAX_CHARS) { /* Add it into the string */ - CallerBuffer.MaximumLength = nBufferLength * sizeof(WCHAR); + CallerBuffer.MaximumLength = (USHORT)nBufferLength * sizeof(WCHAR); } else { @@ -1707,9 +1707,9 @@ if (!PathLength) goto Quickie; - ShortPathUni.MaximumLength = PathLength * sizeof(WCHAR) + sizeof(UNICODE_NULL); + ShortPathUni.MaximumLength = (USHORT)PathLength * sizeof(WCHAR) + sizeof(UNICODE_NULL); LongPathUni.Buffer = LongPath; - LongPathUni.Length = PathLength * sizeof(WCHAR); + LongPathUni.Length = (USHORT)PathLength * sizeof(WCHAR); Status = BasepUnicodeStringTo8BitString(&LongPathAnsi, &LongPathUni, TRUE); if (!NT_SUCCESS(Status)) @@ -1788,9 +1788,9 @@ if (!PathLength) goto Quickie; - LongPathUni.MaximumLength = PathLength * sizeof(WCHAR) + sizeof(UNICODE_NULL); + LongPathUni.MaximumLength = (USHORT)PathLength * sizeof(WCHAR) + sizeof(UNICODE_NULL); ShortPathUni.Buffer = ShortPath; - ShortPathUni.Length = PathLength * sizeof(WCHAR); + ShortPathUni.Length = (USHORT)PathLength * sizeof(WCHAR); Status = BasepUnicodeStringTo8BitString(&ShortPathAnsi, &ShortPathUni, TRUE); if (!NT_SUCCESS(Status)) @@ -2150,8 +2150,8 @@ MaxLength = UNICODE_STRING_MAX_BYTES - 1; } - StaticString->Length = RtlGetCurrentDirectory_U(StaticString->MaximumLength, - StaticString->Buffer); + StaticString->Length = (USHORT)RtlGetCurrentDirectory_U(StaticString->MaximumLength, + StaticString->Buffer); Status = RtlUnicodeToMultiByteSize(&nBufferLength, StaticString->Buffer, StaticString->Length); @@ -2167,7 +2167,7 @@ } AnsiString.Buffer = lpBuffer; - AnsiString.MaximumLength = MaxLength; + AnsiString.MaximumLength = (USHORT)MaxLength; Status = BasepUnicodeStringTo8BitString(&AnsiString, StaticString, FALSE); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/dll/win32/kernel32/client/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/power.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/power.c [iso-8859-1] Sat Sep 14 10:20:11 2013 @@ -53,7 +53,7 @@ { if (Current <= Max) { - PowerStatus->BatteryLifePercent = (100 * Current + Max / 2) / Max; + PowerStatus->BatteryLifePercent = (UCHAR)((100 * Current + Max / 2) / Max); } else { Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sat Sep 14 10:20:11 2013 @@ -102,7 +102,7 @@ /* Allocate buffer for the output string */ Length = CommandLineString.MaximumLength + ApplicationNameString.MaximumLength + 32; Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); - RtlInitEmptyUnicodeString(SubsysCommandLine, Buffer, Length); + RtlInitEmptyUnicodeString(SubsysCommandLine, Buffer, (USHORT)Length); if (!Buffer) { /* Fail, no memory */ @@ -2295,7 +2295,8 @@ SECTION_IMAGE_INFORMATION ImageInformation; IO_STATUS_BLOCK IoStatusBlock; CLIENT_ID ClientId; - ULONG NoWindow, RegionSize, StackSize, ImageMachine, ErrorCode, Flags; + ULONG NoWindow, RegionSize, StackSize, ErrorCode, Flags; + USHORT ImageMachine; ULONG ParameterFlags, PrivilegeValue, HardErrorMode, ErrorResponse; ULONG_PTR ErrorParameters[2]; BOOLEAN InJob, SaferNeeded, UseLargePages, HavePrivilege; @@ -2576,7 +2577,7 @@ } /* Use the allocated size and convert */ - UnicodeEnv.MaximumLength = RegionSize; + UnicodeEnv.MaximumLength = (USHORT)RegionSize; Status = RtlAnsiStringToUnicodeString(&UnicodeEnv, &AnsiEnv, FALSE); if (!NT_SUCCESS(Status)) { @@ -3784,7 +3785,7 @@ /* Set the length */ RtlInitEmptyUnicodeString(&DebuggerString, DebuggerString.Buffer, - n); + (USHORT)n); /* Now perform the command line creation */ ImageDbgStatus = RtlAppendUnicodeToString(&DebuggerString, Modified: trunk/reactos/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] Sat Sep 14 10:20:11 2013 @@ -920,7 +920,7 @@ SetThreadUILanguage(IN LANGID LangId) { UNIMPLEMENTED; - return NtCurrentTeb()->CurrentLocale; + return (LANGID)NtCurrentTeb()->CurrentLocale; } /* Modified: trunk/reactos/dll/win32/kernel32/client/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/time.c [iso-8859-1] Sat Sep 14 10:20:11 2013 @@ -531,7 +531,7 @@ PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION ProcPerfInfo; LARGE_INTEGER TotalUserTime, TotalKernTime, TotalIdleTime; SIZE_T BufferSize, ReturnLength; - ULONG i; + CCHAR i; NTSTATUS Status; TotalUserTime.QuadPart = TotalKernTime.QuadPart = TotalIdleTime.QuadPart = 0; Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sat Sep 14 10:20:11 2013 @@ -382,8 +382,8 @@ /* Initialize the unicode string to hold it */ EnvironmentSize = (p - NewEnvironment) * sizeof(WCHAR); - RtlInitEmptyUnicodeString(UnicodeEnv, NewEnvironment, EnvironmentSize); - UnicodeEnv->Length = EnvironmentSize; + RtlInitEmptyUnicodeString(UnicodeEnv, NewEnvironment, (USHORT)EnvironmentSize); + UnicodeEnv->Length = (USHORT)EnvironmentSize; /* Create the ASCII version of it */ Status = RtlUnicodeStringToAnsiString(AnsiEnv, UnicodeEnv, TRUE); Modified: trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] Sat Sep 14 10:20:11 2013 @@ -212,7 +212,7 @@ (unicode_caller && format[0] == 'C') || (!unicode_caller && format[0] == 'c')) { - char ch = arg; + char ch = (char)arg; wstring = HeapAlloc( GetProcessHeap(), 0, 2 * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, &ch, 1, wstring, 1 ); wstring[1] = 0; @@ -446,9 +446,9 @@ else if (dwFlags & (FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM)) { if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) - from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId ); + from = load_message( (HMODULE)lpSource, dwMessageId, (WORD)dwLanguageId ); if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) - from = load_message( kernel32_handle, dwMessageId, dwLanguageId ); + from = load_message( kernel32_handle, dwMessageId, (WORD)dwLanguageId ); if (!from) return 0; } else @@ -549,9 +549,9 @@ else if (dwFlags & (FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM)) { if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) - from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId ); + from = load_message( (HMODULE)lpSource, dwMessageId, (WORD)dwLanguageId ); if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) - from = load_message( kernel32_handle, dwMessageId, dwLanguageId ); + from = load_message( kernel32_handle, dwMessageId, (WORD)dwLanguageId ); if (!from) return 0; } else Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sat Sep 14 10:20:11 2013 @@ -551,10 +551,10 @@ static INT -WINAPI -IntMultiByteToWideCharSYMBOL(DWORD Flags, +WINAPI +IntMultiByteToWideCharSYMBOL(DWORD Flags, LPCSTR MultiByteString, - INT MultiByteCount, + INT MultiByteCount, LPWSTR WideCharString, INT WideCharCount) { @@ -569,7 +569,7 @@ return 0; } - if (WideCharCount == 0) + if (WideCharCount == 0) { return MultiByteCount; } @@ -588,7 +588,7 @@ WideCharString[Count] = Char + 0xf000; } } - if (MultiByteCount > WideCharMaxLen) + if (MultiByteCount > WideCharMaxLen) { SetLastError(ERROR_INSUFFICIENT_BUFFER); return 0; @@ -624,7 +624,7 @@ } - if (MultiByteCount == 0) + if (MultiByteCount == 0) { return WideCharCount; } @@ -635,11 +635,11 @@ Char = WideCharString[Count]; if (Char < 0x20) { - MultiByteString[Count] = Char; - } - else - { - if ((Char>=0xf020)&&(Char<0xf100)) + MultiByteString[Count] = (CHAR)Char; + } + else + { + if ((Char >= 0xf020) && (Char < 0xf100)) { MultiByteString[Count] = Char - 0xf000; } @@ -650,7 +650,8 @@ } } } - if (WideCharCount > MaxLen) + + if (WideCharCount > MaxLen) { SetLastError(ERROR_INSUFFICIENT_BUFFER); return 0; @@ -1013,7 +1014,7 @@ if (DefaultChar) DefChar = *DefaultChar; else - DefChar = CodePageTable->TransDefaultChar; + DefChar = (CHAR)CodePageTable->TransDefaultChar; /* Convert the WideCharString to the MultiByteString and verify if the mapping is valid */ for (TempLength = MultiByteCount; @@ -1259,16 +1260,16 @@ return GetCPFileNameFromRegistry(CodePage, NULL, 0); } -static const signed char -base64inv[] = -{ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, +static const signed char +base64inv[] = +{ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, - -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1 }; @@ -1334,7 +1335,7 @@ } cchUtf7--; pch = pszUtf7; - while(cchUtf7 > 0 && (BYTE) *pszUtf7 < 0x80 && + while(cchUtf7 > 0 && (BYTE) *pszUtf7 < 0x80 && base64inv[*pszUtf7] >= 0) { cchUtf7--; @@ -1390,7 +1391,7 @@ } cchUtf7--; pch = pszUtf7; - while(cchUtf7 > 0 && (BYTE) *pszUtf7 < 0x80 && + while(cchUtf7 > 0 && (BYTE) *pszUtf7 < 0x80 && base64inv[*pszUtf7] >= 0) { cchUtf7--; @@ -2166,5 +2167,5 @@ STUB; return TRUE; } - + /* EOF */

1 0

[akhaldi] 60094: [D3DXOF] * Import from Wine 1.7.1.
by akhaldi＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: akhaldi Date: Sat Sep 14 10:13:29 2013 New Revision: 60094 URL: http://svn.reactos.org/svn/reactos?rev=60094&view=rev Log: [D3DXOF] * Import from Wine 1.7.1. Added: trunk/reactos/dll/directx/wine/d3dxof/ (with props) trunk/reactos/dll/directx/wine/d3dxof/CMakeLists.txt (with props) trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c (with props) trunk/reactos/dll/directx/wine/d3dxof/d3dxof.idl (with props) trunk/reactos/dll/directx/wine/d3dxof/d3dxof.spec (with props) trunk/reactos/dll/directx/wine/d3dxof/d3dxof_private.h (with props) trunk/reactos/dll/directx/wine/d3dxof/main.c (with props) trunk/reactos/dll/directx/wine/d3dxof/mszip.c (with props) trunk/reactos/dll/directx/wine/d3dxof/mszip.h (with props) trunk/reactos/dll/directx/wine/d3dxof/parsing.c (with props) trunk/reactos/dll/directx/wine/d3dxof/version.rc (with props) Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt trunk/reactos/include/dxsdk/dxfile.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/CMakeList… Added: trunk/reactos/dll/directx/wine/d3dxof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/CM… Added: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3… Added: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3… Added: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3… Added: trunk/reactos/dll/directx/wine/d3dxof/d3dxof_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3… Added: trunk/reactos/dll/directx/wine/d3dxof/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/ma… Added: trunk/reactos/dll/directx/wine/d3dxof/mszip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/ms… Added: trunk/reactos/dll/directx/wine/d3dxof/mszip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/ms… Added: trunk/reactos/dll/directx/wine/d3dxof/parsing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/pa… Added: trunk/reactos/dll/directx/wine/d3dxof/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/ve… Modified: trunk/reactos/include/dxsdk/dxfile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxfile.h?rev… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[tfaber] 60093: [KERNEL32] - Fix an off-by-one in the UNC case in WaitNamedPipeW - Some readability
by tfaber＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: tfaber Date: Sat Sep 14 09:12:12 2013 New Revision: 60093 URL: http://svn.reactos.org/svn/reactos?rev=60093&view=rev Log: [KERNEL32] - Fix an off-by-one in the UNC case in WaitNamedPipeW - Some readability Modified: trunk/reactos/dll/win32/kernel32/client/file/npipe.c Modified: trunk/reactos/dll/win32/kernel32/client/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/npipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/npipe.c [iso-8859-1] Sat Sep 14 09:12:12 2013 @@ -415,8 +415,9 @@ } /* Move past it */ - NewName.Buffer += 9; - NewName.Length -= 9 * sizeof(WCHAR); + NewName.Buffer += PipePrefix.Length / sizeof(WCHAR); + NewName.Length -= PipePrefix.Length; + NewName.MaximumLength -= PipePrefix.Length; /* Initialize the Dos Devices name */ TRACE("NewName: %wZ\n", &NewName); @@ -438,10 +439,10 @@ } while (*p); /* Now make sure the full name contains "pipe\" */ - if ((*p) && !(_wcsnicmp(p + 1, L"pipe\\", sizeof("pipe\\")))) + if ((*p) && !(_wcsnicmp(p + 1, L"pipe\\", sizeof("pipe\\") - sizeof(ANSI_NULL)))) { /* Get to the pipe name itself now */ - p += sizeof("pipe\\") - 1; + p += sizeof("pipe\\") - sizeof(ANSI_NULL); } else {

1 0

[akhaldi] 60092: [WPP] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 14 Sep '13

14 Sep '13

Author: akhaldi Date: Sat Sep 14 09:02:13 2013 New Revision: 60092 URL: http://svn.reactos.org/svn/reactos?rev=60092&view=rev Log: [WPP] * Sync with Wine 1.7.1. Added: trunk/reactos/tools/wpp/ppl.yy.c - copied, changed from r59998, trunk/reactos/tools/wpp/lex.yy.c Removed: trunk/reactos/tools/wpp/lex.yy.c Modified: trunk/reactos/include/reactos/wine/wpp.h trunk/reactos/media/doc/README.WINE trunk/reactos/tools/wpp/CMakeLists.txt trunk/reactos/tools/wpp/ppl.l trunk/reactos/tools/wpp/ppy.tab.c trunk/reactos/tools/wpp/ppy.tab.h trunk/reactos/tools/wpp/ppy.y trunk/reactos/tools/wpp/preproc.c trunk/reactos/tools/wpp/wpp.c trunk/reactos/tools/wpp/wpp_private.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/reactos/wine/wpp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wpp.h… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/wpp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/CMakeLists.txt?r… Removed: trunk/reactos/tools/wpp/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/lex.yy.c?rev=600… Modified: trunk/reactos/tools/wpp/ppl.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppl.l?rev=60092&… Copied: trunk/reactos/tools/wpp/ppl.yy.c (from r59998, trunk/reactos/tools/wpp/lex.yy.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppl.yy.c?p2=trun… Modified: trunk/reactos/tools/wpp/ppy.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppy.tab.c?rev=60… Modified: trunk/reactos/tools/wpp/ppy.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppy.tab.h?rev=60… Modified: trunk/reactos/tools/wpp/ppy.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppy.y?rev=60092&… Modified: trunk/reactos/tools/wpp/preproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/preproc.c?rev=60… Modified: trunk/reactos/tools/wpp/wpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp.c?rev=60092&… Modified: trunk/reactos/tools/wpp/wpp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp_private.h?re…

1 0

[akhaldi] 60091: [DDRAW] * Remove some now unneeded source files.
by akhaldi＠svn.reactos.org 13 Sep '13

13 Sep '13

Author: akhaldi Date: Fri Sep 13 23:56:46 2013 New Revision: 60091 URL: http://svn.reactos.org/svn/reactos?rev=60091&view=rev Log: [DDRAW] * Remove some now unneeded source files. Removed: trunk/reactos/dll/directx/wine/ddraw/legacy.h trunk/reactos/dll/directx/wine/ddraw/stubs.c Removed: trunk/reactos/dll/directx/wine/ddraw/legacy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/leg… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/legacy.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/legacy.h (removed) @@ -1,130 +0,0 @@ -/* -* Copyright (C) the Wine project -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2.1 of the License, or (at your option) any later version. -* -* This library 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 -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -*/ - - -#ifdef __cplusplus -extern "C" { -#endif - - /***************************************************************************** - * IDirectDraw3 interface - */ - -#if defined( _WIN32 ) && !defined( _NO_COM ) - #define INTERFACE IDirectDraw3 - DECLARE_INTERFACE_(IDirectDraw3,IUnknown) - { - /*** IUnknown methods ***/ - /*00*/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; - /*04*/ STDMETHOD_(ULONG,AddRef)(THIS) PURE; - /*08*/ STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** IDirectDraw2 methods ***/ - /*0c*/ STDMETHOD(Compact)(THIS) PURE; - /*10*/ STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE; - /*14*/ STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE; - /*18*/ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE *lplpDDSurface, IUnknown *pUnkOuter) PURE; - /*1c*/ STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface, LPDIRECTDRAWSURFACE *lplpDupDDSurface) PURE; - /*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE; - /*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; - /*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE; - /*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; - /*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; - /*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; - /*38*/ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE *lplpGDIDDSurface) PURE; - /*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; - /*40*/ STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE; - /*44*/ STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE; - /*48*/ STDMETHOD(Initialize)(THIS_ GUID *lpGUID) PURE; - /*4c*/ STDMETHOD(RestoreDisplayMode)(THIS) PURE; - /*50*/ STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE; - /*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; - /*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; - /* added in v2 */ - /*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; - /* added in v3 */ - /*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC hdc, LPDIRECTDRAWSURFACE *pSurf) PURE; - }; - #undef INTERFACE - - #if !defined(__cplusplus) || defined(CINTERFACE) - /*** IUnknown methods ***/ - #define IDirectDraw3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) - #define IDirectDraw3_AddRef(p) (p)->lpVtbl->AddRef(p) - #define IDirectDraw3_Release(p) (p)->lpVtbl->Release(p) - /*** IDirectDraw methods ***/ - #define IDirectDraw3_Compact(p) (p)->lpVtbl->Compact(p) - #define IDirectDraw3_CreateClipper(p,a,b,c) (p)->lpVtbl->CreateClipper(p,a,b,c) - #define IDirectDraw3_CreatePalette(p,a,b,c,d) (p)->lpVtbl->CreatePalette(p,a,b,c,d) - #define IDirectDraw3_CreateSurface(p,a,b,c) (p)->lpVtbl->CreateSurface(p,a,b,c) - #define IDirectDraw3_DuplicateSurface(p,a,b) (p)->lpVtbl->DuplicateSurface(p,a,b) - #define IDirectDraw3_EnumDisplayModes(p,a,b,c,d) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d) - #define IDirectDraw3_EnumSurfaces(p,a,b,c,d) (p)->lpVtbl->EnumSurfaces(p,a,b,c,d) - #define IDirectDraw3_FlipToGDISurface(p) (p)->lpVtbl->FlipToGDISurface(p) - #define IDirectDraw3_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b) - #define IDirectDraw3_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a) - #define IDirectDraw3_GetFourCCCodes(p,a,b) (p)->lpVtbl->GetFourCCCodes(p,a,b) - #define IDirectDraw3_GetGDISurface(p,a) (p)->lpVtbl->GetGDISurface(p,a) - #define IDirectDraw3_GetMonitorFrequency(p,a) (p)->lpVtbl->GetMonitorFrequency(p,a) - #define IDirectDraw3_GetScanLine(p,a) (p)->lpVtbl->GetScanLine(p,a) - #define IDirectDraw3_GetVerticalBlankStatus(p,a) (p)->lpVtbl->GetVerticalBlankStatus(p,a) - #define IDirectDraw3_Initialize(p,a) (p)->lpVtbl->Initialize(p,a) - #define IDirectDraw3_RestoreDisplayMode(p) (p)->lpVtbl->RestoreDisplayMode(p) - #define IDirectDraw3_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b) - #define IDirectDraw3_SetDisplayMode(p,a,b,c,d,e) (p)->lpVtbl->SetDisplayMode(p,a,b,c,d,e) - #define IDirectDraw3_WaitForVerticalBlank(p,a,b) (p)->lpVtbl->WaitForVerticalBlank(p,a,b) - /*** IDirectDraw2 methods ***/ - #define IDirectDraw3_GetAvailableVidMem(p,a,b,c) (p)->lpVtbl->GetAvailableVidMem(p,a,b,c) - /*** IDirectDraw3 methods ***/ - #define IDirectDraw3_GetSurfaceFromDC(p,a,b) (p)->lpVtbl->GetSurfaceFromDC(p,a,b) - #else - /*** IUnknown methods ***/ - #define IDirectDraw3_QueryInterface(p,a,b) (p)->QueryInterface(a,b) - #define IDirectDraw3_AddRef(p) (p)->AddRef() - #define IDirectDraw3_Release(p) (p)->Release() - /*** IDirectDraw methods ***/ - #define IDirectDraw3_Compact(p) (p)->Compact() - #define IDirectDraw3_CreateClipper(p,a,b,c) (p)->CreateClipper(a,b,c) - #define IDirectDraw3_CreatePalette(p,a,b,c,d) (p)->CreatePalette(a,b,c,d) - #define IDirectDraw3_CreateSurface(p,a,b,c) (p)->CreateSurface(a,b,c) - #define IDirectDraw3_DuplicateSurface(p,a,b) (p)->DuplicateSurface(a,b) - #define IDirectDraw3_EnumDisplayModes(p,a,b,c,d) (p)->EnumDisplayModes(a,b,c,d) - #define IDirectDraw3_EnumSurfaces(p,a,b,c,d) (p)->EnumSurfaces(a,b,c,d) - #define IDirectDraw3_FlipToGDISurface(p) (p)->FlipToGDISurface() - #define IDirectDraw3_GetCaps(p,a,b) (p)->GetCaps(a,b) - #define IDirectDraw3_GetDisplayMode(p,a) (p)->GetDisplayMode(a) - #define IDirectDraw3_GetFourCCCodes(p,a,b) (p)->GetFourCCCodes(a,b) - #define IDirectDraw3_GetGDISurface(p,a) (p)->GetGDISurface(a) - #define IDirectDraw3_GetMonitorFrequency(p,a) (p)->GetMonitorFrequency(a) - #define IDirectDraw3_GetScanLine(p,a) (p)->GetScanLine(a) - #define IDirectDraw3_GetVerticalBlankStatus(p,a) (p)->GetVerticalBlankStatus(a) - #define IDirectDraw3_Initialize(p,a) (p)->Initialize(a) - #define IDirectDraw3_RestoreDisplayMode(p) (p)->RestoreDisplayMode() - #define IDirectDraw3_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b) - #define IDirectDraw3_SetDisplayMode(p,a,b,c,d,e) (p)->SetDisplayMode(a,b,c,d,e) - #define IDirectDraw3_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b) - /*** IDirectDraw2 methods ***/ - #define IDirectDraw3_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c) - /*** IDirectDraw3 methods ***/ - #define IDirectDraw3_GetSurfaceFromDC(p,a,b) (p)->GetSurfaceFromDC(a,b) - #endif -#undef INTERFACE -#endif - -#ifdef __cplusplus -} -#endif Removed: trunk/reactos/dll/directx/wine/ddraw/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/stu… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/stubs.c (removed) @@ -1,8 +0,0 @@ -#include "ddraw_private.h" - -HRESULT WINAPI -D3DParseUnknownCommand( LPVOID lpCmd, - LPVOID *lpRetCmd) -{ - return DD_OK; -}

1 0

[akhaldi] 60090: [DXGI][D3D8][D3D9][DDRAW][WINED3D] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 13 Sep '13

13 Sep '13

Author: akhaldi Date: Fri Sep 13 23:50:10 2013 New Revision: 60090 URL: http://svn.reactos.org/svn/reactos?rev=60090&view=rev Log: [DXGI][D3D8][D3D9][DDRAW][WINED3D] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/directx/dxgi/device.c trunk/reactos/dll/directx/dxgi/dxgi_main.c trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/ddraw/viewport.c trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/wined3d.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/dxgi/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dxgi/device.c?… Modified: trunk/reactos/dll/directx/dxgi/dxgi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dxgi/dxgi_main… Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/CMak… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/CMa… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

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