Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 22538: fix duplicate control id spotted by msvc :-)
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 22:35:15 2006 New Revision: 22538 URL: http://svn.reactos.org/svn/reactos?rev=22538&view=rev Log: fix duplicate control id spotted by msvc :-) Modified: trunk/reactos/dll/win32/devmgr/resource.h Modified: trunk/reactos/dll/win32/devmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/resource.… ============================================================================== --- trunk/reactos/dll/win32/devmgr/resource.h (original) +++ trunk/reactos/dll/win32/devmgr/resource.h Fri Jun 23 22:35:15 2006 @@ -35,7 +35,7 @@ #define IDC_DRIVERFILES 0x592 #define IDC_FILEPROVIDER 0x593 #define IDC_FILEVERSION 0x594 -#define IDC_FILECOPYRIGHT 0x594 +#define IDC_FILECOPYRIGHT 0x595 #define IDS_NAME 0x100 #define IDS_TYPE 0x101

1 0

[janderwald] 22537: include wingdi before winuser.h replace nice construct with static const WCHAR :)
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 22:27:08 2006 New Revision: 22537 URL: http://svn.reactos.org/svn/reactos?rev=22537&view=rev Log: include wingdi before winuser.h replace nice construct with static const WCHAR :) Modified: trunk/reactos/dll/win32/crypt32/oid.c trunk/reactos/dll/win32/crypt32/protectdata.c trunk/reactos/dll/win32/crypt32/store.c Modified: trunk/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/oid.c (original) +++ trunk/reactos/dll/win32/crypt32/oid.c Fri Jun 23 22:27:08 2006 @@ -23,6 +23,7 @@ #include "winbase.h" #include "wincrypt.h" #include "winreg.h" +#include "wingdi.h" #include "winuser.h" #include "wine/debug.h" #include "wine/list.h" Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd… ============================================================================== --- trunk/reactos/dll/win32/crypt32/protectdata.c (original) +++ trunk/reactos/dll/win32/crypt32/protectdata.c Fri Jun 23 22:27:08 2006 @@ -56,6 +56,9 @@ 'I','\'','m',' ','h','u','n','t','i','n','g',' ', 'w','a','b','b','i','t','s',0 }; + +static const WCHAR szNullString[] = +{ '\0' }; /* * The data format returned by the real Windows CryptProtectData seems @@ -843,6 +846,8 @@ HCRYPTKEY hKey; DWORD dwLength; + + TRACE("called\n"); SetLastError(ERROR_SUCCESS); @@ -861,7 +866,7 @@ /* Windows appears to create an empty szDataDescr instead of maintaining * a NULL */ if (!szDataDescr) - szDataDescr=(WCHAR[]){'\0'}; + szDataDescr = szNullString; /* get crypt context */ if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT)) Modified: trunk/reactos/dll/win32/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/store.c?… ============================================================================== --- trunk/reactos/dll/win32/crypt32/store.c (original) +++ trunk/reactos/dll/win32/crypt32/store.c Fri Jun 23 22:27:08 2006 @@ -32,6 +32,7 @@ #include "winbase.h" #include "winnls.h" #include "winreg.h" +#include "wingdi.h" #include "winuser.h" #include "wincrypt.h" #include "wine/debug.h"

1 0

[janderwald] 22536: yet another msvc fix inline -> __inline
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 22:07:10 2006 New Revision: 22536 URL: http://svn.reactos.org/svn/reactos?rev=22536&view=rev Log: yet another msvc fix inline -> __inline Modified: trunk/reactos/include/winternl.h Modified: trunk/reactos/include/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/winternl.h?rev=225… ============================================================================== --- trunk/reactos/include/winternl.h (original) +++ trunk/reactos/include/winternl.h Fri Jun 23 22:07:10 2006 @@ -1985,7 +1985,7 @@ BOOL WINAPI RtlEqualSid(PSID,PSID); BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); BOOLEAN WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); -void WINAPI RtlExitUserThread(ULONG) DECLSPEC_NORETURN; +//void WINAPI RtlExitUserThread(ULONG) DECLSPEC_NORETURN; NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*); LONGLONG WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT); LONGLONG WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT); @@ -2227,7 +2227,7 @@ #define RtlZeroMemory(Destination,Length) memset((Destination),0,(Length)) #endif -inline static BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit) +static __inline BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit) { if (lpBits && ulBit < lpBits->SizeOfBitMap && lpBits->Buffer[ulBit >> 5] & (1 << (ulBit & 31))) @@ -2236,11 +2236,11 @@ } /* These are implemented as __fastcall, so we can't let Winelib apps link with them */ -inline static USHORT RtlUshortByteSwap(USHORT s) +static __inline USHORT RtlUshortByteSwap(USHORT s) { return (s >> 8) | (s << 8); } -inline static ULONG RtlUlongByteSwap(ULONG i) +static __inline ULONG RtlUlongByteSwap(ULONG i) { #if defined(__i386__) && defined(__GNUC__) ULONG ret; @@ -2322,7 +2322,7 @@ #define InsertTailList(le,e) do { PLIST_ENTRY b = (le)->Blink; (e)->Flink = (le); (e)->Blink = b; b->Flink = (e); (le)->Blink = (e); } while (0) #define IsListEmpty(le) ((le)->Flink == (le)) #define RemoveEntryList(e) do { PLIST_ENTRY f = (e)->Flink, b = (e)->Blink; f->Blink = b; b->Flink = f; (e)->Flink = (e)->Blink = NULL; } while (0) -static inline PLIST_ENTRY RemoveHeadList(PLIST_ENTRY le) +static __inline PLIST_ENTRY RemoveHeadList(PLIST_ENTRY le) { PLIST_ENTRY f, b, e; @@ -2335,7 +2335,7 @@ if (e != le) e->Flink = e->Blink = NULL; return e; } -static inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le) +static __inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le) { PLIST_ENTRY f, b, e;

1 0

[ion] 22535: Import latest NDK
by ion＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: ion Date: Fri Jun 23 21:57:51 2006 New Revision: 22535 URL: http://svn.reactos.org/svn/reactos?rev=22535&view=rev Log: Import latest NDK Added: vendor/NDK/current/arch/ vendor/NDK/current/arch/ketypes.h vendor/NDK/current/arch/mmtypes.h vendor/NDK/current/asm.h vendor/NDK/current/cctypes.h vendor/NDK/current/cmfuncs.h vendor/NDK/current/cmtypes.h vendor/NDK/current/dbgkfuncs.h vendor/NDK/current/dbgktypes.h vendor/NDK/current/exfuncs.h vendor/NDK/current/extypes.h vendor/NDK/current/halfuncs.h vendor/NDK/current/haltypes.h vendor/NDK/current/i386/ vendor/NDK/current/i386/ketypes.h vendor/NDK/current/i386/mmtypes.h vendor/NDK/current/ifssupp.h vendor/NDK/current/inbvfuncs.h vendor/NDK/current/iofuncs.h vendor/NDK/current/iotypes.h vendor/NDK/current/kdfuncs.h vendor/NDK/current/kdtypes.h vendor/NDK/current/kefuncs.h vendor/NDK/current/ketypes.h vendor/NDK/current/ldrfuncs.h vendor/NDK/current/ldrtypes.h vendor/NDK/current/lpcfuncs.h vendor/NDK/current/lpctypes.h vendor/NDK/current/mmfuncs.h vendor/NDK/current/mmtypes.h vendor/NDK/current/ntndk.h vendor/NDK/current/obfuncs.h vendor/NDK/current/obtypes.h vendor/NDK/current/pofuncs.h vendor/NDK/current/potypes.h vendor/NDK/current/powerpc/ vendor/NDK/current/powerpc/ketypes.h vendor/NDK/current/powerpc/mmtypes.h vendor/NDK/current/psfuncs.h vendor/NDK/current/pstypes.h vendor/NDK/current/rtlfuncs.h vendor/NDK/current/rtltypes.h vendor/NDK/current/sefuncs.h vendor/NDK/current/setypes.h vendor/NDK/current/umfuncs.h vendor/NDK/current/umtypes.h [This mail would be too long, it was shortened to contain the URLs only.] Added: vendor/NDK/current/arch/ketypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/arch/ketypes.h?rev=22… Added: vendor/NDK/current/arch/mmtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/arch/mmtypes.h?rev=22… Added: vendor/NDK/current/asm.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/asm.h?rev=22535&view=… Added: vendor/NDK/current/cctypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/cctypes.h?rev=22535&v… Added: vendor/NDK/current/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/cmfuncs.h?rev=22535&v… Added: vendor/NDK/current/cmtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/cmtypes.h?rev=22535&v… Added: vendor/NDK/current/dbgkfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/dbgkfuncs.h?rev=22535… Added: vendor/NDK/current/dbgktypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/dbgktypes.h?rev=22535… Added: vendor/NDK/current/exfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/exfuncs.h?rev=22535&v… Added: vendor/NDK/current/extypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/extypes.h?rev=22535&v… Added: vendor/NDK/current/halfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/halfuncs.h?rev=22535&… Added: vendor/NDK/current/haltypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/haltypes.h?rev=22535&… Added: vendor/NDK/current/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/i386/ketypes.h?rev=22… Added: vendor/NDK/current/i386/mmtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/i386/mmtypes.h?rev=22… Added: vendor/NDK/current/ifssupp.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/ifssupp.h?rev=22535&v… Added: vendor/NDK/current/inbvfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/inbvfuncs.h?rev=22535… Added: vendor/NDK/current/iofuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/iofuncs.h?rev=22535&v… Added: vendor/NDK/current/iotypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/iotypes.h?rev=22535&v… Added: vendor/NDK/current/kdfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/kdfuncs.h?rev=22535&v… Added: vendor/NDK/current/kdtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/kdtypes.h?rev=22535&v… Added: vendor/NDK/current/kefuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/kefuncs.h?rev=22535&v… Added: vendor/NDK/current/ketypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/ketypes.h?rev=22535&v… Added: vendor/NDK/current/ldrfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/ldrfuncs.h?rev=22535&… Added: vendor/NDK/current/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/ldrtypes.h?rev=22535&… Added: vendor/NDK/current/lpcfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/lpcfuncs.h?rev=22535&… Added: vendor/NDK/current/lpctypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/lpctypes.h?rev=22535&… Added: vendor/NDK/current/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/mmfuncs.h?rev=22535&v… Added: vendor/NDK/current/mmtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/mmtypes.h?rev=22535&v… Added: vendor/NDK/current/ntndk.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/ntndk.h?rev=22535&vie… Added: vendor/NDK/current/obfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/obfuncs.h?rev=22535&v… Added: vendor/NDK/current/obtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/obtypes.h?rev=22535&v… Added: vendor/NDK/current/pofuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/pofuncs.h?rev=22535&v… Added: vendor/NDK/current/potypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/potypes.h?rev=22535&v… Added: vendor/NDK/current/powerpc/ketypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/powerpc/ketypes.h?rev… Added: vendor/NDK/current/powerpc/mmtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/powerpc/mmtypes.h?rev… Added: vendor/NDK/current/psfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/psfuncs.h?rev=22535&v… Added: vendor/NDK/current/pstypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/pstypes.h?rev=22535&v… Added: vendor/NDK/current/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/rtlfuncs.h?rev=22535&… Added: vendor/NDK/current/rtltypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/rtltypes.h?rev=22535&… Added: vendor/NDK/current/sefuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/sefuncs.h?rev=22535&v… Added: vendor/NDK/current/setypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/setypes.h?rev=22535&v… Added: vendor/NDK/current/umfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/umfuncs.h?rev=22535&v… Added: vendor/NDK/current/umtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/umtypes.h?rev=22535&v…

1 0

[janderwald] 22534: include wingdi.h before winuser.h fixes last compile prob with msvc
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 21:57:19 2006 New Revision: 22534 URL: http://svn.reactos.org/svn/reactos?rev=22534&view=rev Log: include wingdi.h before winuser.h fixes last compile prob with msvc Modified: trunk/reactos/dll/win32/avifil32/editstream.c Modified: trunk/reactos/dll/win32/avifil32/editstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstr… ============================================================================== --- trunk/reactos/dll/win32/avifil32/editstream.c (original) +++ trunk/reactos/dll/win32/avifil32/editstream.c Fri Jun 23 21:57:19 2006 @@ -22,8 +22,8 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" -#include "wingdi.h" #include "winnls.h" #include "winerror.h" #include "windowsx.h"

1 0

[greatlrd] 22533: Created folder remotely
by greatlrd＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: greatlrd Date: Fri Jun 23 21:54:41 2006 New Revision: 22533 URL: http://svn.reactos.org/svn/reactos?rev=22533&view=rev Log: Created folder remotely Added: vendor/NDK/current/

1 0

[greatlrd] 22532: Created folder remotely
by greatlrd＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: greatlrd Date: Fri Jun 23 21:54:05 2006 New Revision: 22532 URL: http://svn.reactos.org/svn/reactos?rev=22532&view=rev Log: Created folder remotely Added: vendor/NDK/

1 0

[ion] 22531: well it seems this didn't work so well. (would help not to have 5 year old and not-working docs on the Wiki..but hey..)
by ion＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: ion Date: Fri Jun 23 21:49:49 2006 New Revision: 22531 URL: http://svn.reactos.org/svn/reactos?rev=22531&view=rev Log: well it seems this didn't work so well. (would help not to have 5 year old and not-working docs on the Wiki..but hey..) Removed: vendor/NDK/

1 0

[ion] 22530: Create "current" ndk tag
by ion＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: ion Date: Fri Jun 23 21:48:16 2006 New Revision: 22530 URL: http://svn.reactos.org/svn/reactos?rev=22530&view=rev Log: Create "current" ndk tag Added: vendor/NDK/current/

1 0

[ion] 22529: Create NDK Vendor Tree
by ion＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: ion Date: Fri Jun 23 21:47:19 2006 New Revision: 22529 URL: http://svn.reactos.org/svn/reactos?rev=22529&view=rev Log: Create NDK Vendor Tree Added: vendor/NDK/

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