Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[cwittich] 41569: fix comment IsUserAdmin -> IsUserAnAdmin

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jun 23 02:59:30 2009 New Revision: 41569 URL: http://svn.reactos.org/svn/reactos?rev=41569&view=rev Log: fix comment IsUserAdmin -> IsUserAnAdmin Modified: trunk/reactos/dll/win32/shell32/shellord.c Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Tue Jun 23 02:59:30 2009 @@ -1265,11 +1265,19 @@ { FIXME("(%s)\n", bFullInit ? "true" : "false"); return 0; } -/************************************************************************* - * IsUserAdmin [SHELL32.680] NT 4.0 - * - */ - + +/************************************************************************* + * IsUserAnAdmin [SHELL32.680] NT 4.0 + * + * Checks whether the current user is a member of the Administrators group. + * + * PARAMS + * None + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ BOOL WINAPI IsUserAnAdmin(VOID) { SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; @@ -1331,7 +1339,6 @@ FreeSid(lpSid); HeapFree(GetProcessHeap(), 0, lpGroups); - return bResult; }

15 years, 4 months

[cwittich] 41568: partial advapi32 sid sync to wine 1.1.24

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jun 23 02:54:03 2009 New Revision: 41568 URL: http://svn.reactos.org/svn/reactos?rev=41568&view=rev Log: partial advapi32 sid sync to wine 1.1.24 Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Tue Jun 23 02:54:03 2009 @@ -506,7 +506,7 @@ return FALSE; } - piace = (ACCESS_ALLOWED_ACE *)pace; + piace = pace; DumpString(&openbr, 1, pwptr, plen); switch (piace->Header.AceType) { @@ -789,7 +789,6 @@ return GetSidLengthRequired(0); } - /****************************************************************************** * ParseStringSidToSid */ @@ -899,7 +898,6 @@ TRACE("returning %s\n", bret ? "TRUE" : "FALSE"); return bret; } - /****************************************************************************** * ParseAclStringFlags @@ -930,7 +928,6 @@ return flags; } - /****************************************************************************** * ParseAceStringType */ @@ -1182,7 +1179,7 @@ */ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( LPCWSTR StringSecurityDescriptor, - SECURITY_DESCRIPTOR* SecurityDescriptor, + SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, LPDWORD cBytes) { BOOL bret = FALSE; @@ -1195,7 +1192,7 @@ *cBytes = sizeof(SECURITY_DESCRIPTOR); if (SecurityDescriptor) - lpNext = ((LPBYTE) SecurityDescriptor) + sizeof(SECURITY_DESCRIPTOR); + lpNext = (LPBYTE)(SecurityDescriptor + 1); while (*StringSecurityDescriptor) { @@ -1233,7 +1230,7 @@ if (SecurityDescriptor) { - SecurityDescriptor->Owner = (PSID)(lpNext - (LPBYTE)SecurityDescriptor); + SecurityDescriptor->Owner = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ } @@ -1251,7 +1248,7 @@ if (SecurityDescriptor) { - SecurityDescriptor->Group = (PSID)(lpNext - (LPBYTE)SecurityDescriptor); + SecurityDescriptor->Group = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ } @@ -1271,7 +1268,7 @@ if (SecurityDescriptor) { SecurityDescriptor->Control |= SE_DACL_PRESENT | flags; - SecurityDescriptor->Dacl = (PACL)(lpNext - (LPBYTE)SecurityDescriptor); + SecurityDescriptor->Dacl = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ } @@ -1291,7 +1288,7 @@ if (SecurityDescriptor) { SecurityDescriptor->Control |= SE_SACL_PRESENT | flags; - SecurityDescriptor->Sacl = (PACL)(lpNext - (LPBYTE)SecurityDescriptor); + SecurityDescriptor->Sacl = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ } @@ -1360,7 +1357,7 @@ psd->Control |= SE_SELF_RELATIVE; if (!ParseStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor, - psd, &cBytes)) + (SECURITY_DESCRIPTOR_RELATIVE *)psd, &cBytes)) { LocalFree(psd); goto lend;

15 years, 4 months

[cwittich] 41567: don't build arm stuff on non arm builds fixes 2nd stage

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jun 23 02:48:39 2009 New Revision: 41567 URL: http://svn.reactos.org/svn/reactos?rev=41567&view=rev Log: don't build arm stuff on non arm builds fixes 2nd stage Modified: trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Jun 23 02:48:39 2009 @@ -384,11 +384,11 @@ /* Unmap low memory */ MmDeletePageTable(NULL, 0); - // - // Initialize ARMÂ³ - // +#ifdef _ARM_ + /* Initialize ARMÂ³ */ MmArmInitSystem(0, KeLoaderBlock); - +#endif + /* Initialize nonpaged pool */ MiInitializeNonPagedPool(); Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Jun 23 02:48:39 2009 @@ -352,6 +352,11 @@ <directory name="arm"> <file>stubs.c</file> </directory> + <directory name="ARM3"> + <file>init.c</file> + <file>pool.c</file> + <file>syspte.c</file> + </directory> </if> <if property="ARCH" value="powerpc"> <directory name="powerpc"> @@ -359,11 +364,6 @@ <file>page.c</file> </directory> </if> - <directory name="ARM3"> - <file>init.c</file> - <file>pool.c</file> - <file>syspte.c</file> - </directory> <file>anonmem.c</file> <file>balance.c</file> <file>cont.c</file>

15 years, 4 months

[janderwald] 41566: - define YieldProcessor msvc compatible - rtl now builds

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Jun 23 01:07:52 2009 New Revision: 41566 URL: http://svn.reactos.org/svn/reactos?rev=41566&view=rev Log: - define YieldProcessor msvc compatible - rtl now builds Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Tue Jun 23 01:07:52 2009 @@ -4946,10 +4946,24 @@ #error Unknown architecture #endif +VOID +_mm_pause ( + VOID + ); + + #if defined(_M_IX86) +#ifdef _MSC_VER +#pragma intrinsic(_mm_pause) +#else #define YieldProcessor() __asm__ __volatile__("pause"); +#endif #elif defined (_M_AMD64) +#ifdef _MSC_VER +#define YieldProcessor _mm_pause +#else #define YieldProcessor() __asm__ __volatile__("pause"); +#endif #elif defined(_M_PPC) #define YieldProcessor() __asm__ __volatile__("nop"); #elif defined(_M_MIPS)

15 years, 4 months

[hyperion] 41565: Change <wine/list.h> to use the magic attribute salad for inline functions in headers

by hyperion＠svn.reactos.org

Author: hyperion Date: Tue Jun 23 00:29:48 2009 New Revision: 41565 URL: http://svn.reactos.org/svn/reactos?rev=41565&view=rev Log: Change <wine/list.h> to use the magic attribute salad for inline functions in headers Modified: trunk/reactos/include/reactos/wine/list.h Modified: trunk/reactos/include/reactos/wine/list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/list.… ============================================================================== --- trunk/reactos/include/reactos/wine/list.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/list.h [iso-8859-1] Tue Jun 23 00:29:48 2009 @@ -20,6 +20,18 @@ #ifndef __WINE_SERVER_LIST_H #define __WINE_SERVER_LIST_H + +#ifdef __cplusplus +#define __WINE_SERVER_LIST_INLINE inline +#else +#if defined(__GNUC__) +#define __WINE_SERVER_LIST_INLINE extern __inline__ __attribute__((__always_inline__,__gnu_inline__)) +#elif defined(_MSC_VER) +#define __WINE_SERVER_LIST_INLINE __inline +#else +#define __WINE_SERVER_LIST_INLINE static +#endif +#endif struct list { @@ -63,7 +75,7 @@ */ /* add an element after the specified one */ -static inline void list_add_after( struct list *elem, struct list *to_add ) +__WINE_SERVER_LIST_INLINE void list_add_after( struct list *elem, struct list *to_add ) { to_add->next = elem->next; to_add->prev = elem; @@ -72,7 +84,7 @@ } /* add an element before the specified one */ -static inline void list_add_before( struct list *elem, struct list *to_add ) +__WINE_SERVER_LIST_INLINE void list_add_before( struct list *elem, struct list *to_add ) { to_add->next = elem; to_add->prev = elem->prev; @@ -81,26 +93,26 @@ } /* add element at the head of the list */ -static inline void list_add_head( struct list *list, struct list *elem ) +__WINE_SERVER_LIST_INLINE void list_add_head( struct list *list, struct list *elem ) { list_add_after( list, elem ); } /* add element at the tail of the list */ -static inline void list_add_tail( struct list *list, struct list *elem ) +__WINE_SERVER_LIST_INLINE void list_add_tail( struct list *list, struct list *elem ) { list_add_before( list, elem ); } /* remove an element from its list */ -static inline void list_remove( struct list *elem ) +__WINE_SERVER_LIST_INLINE void list_remove( struct list *elem ) { elem->next->prev = elem->prev; elem->prev->next = elem->next; } /* get the next element */ -static inline struct list *list_next( const struct list *list, const struct list *elem ) +__WINE_SERVER_LIST_INLINE struct list *list_next( const struct list *list, const struct list *elem ) { struct list *ret = elem->next; if (elem->next == list) ret = NULL; @@ -108,7 +120,7 @@ } /* get the previous element */ -static inline struct list *list_prev( const struct list *list, const struct list *elem ) +__WINE_SERVER_LIST_INLINE struct list *list_prev( const struct list *list, const struct list *elem ) { struct list *ret = elem->prev; if (elem->prev == list) ret = NULL; @@ -116,31 +128,31 @@ } /* get the first element */ -static inline struct list *list_head( const struct list *list ) +__WINE_SERVER_LIST_INLINE struct list *list_head( const struct list *list ) { return list_next( list, list ); } /* get the last element */ -static inline struct list *list_tail( const struct list *list ) +__WINE_SERVER_LIST_INLINE struct list *list_tail( const struct list *list ) { return list_prev( list, list ); } /* check if a list is empty */ -static inline int list_empty( const struct list *list ) +__WINE_SERVER_LIST_INLINE int list_empty( const struct list *list ) { return list->next == list; } /* initialize a list */ -static inline void list_init( struct list *list ) +__WINE_SERVER_LIST_INLINE void list_init( struct list *list ) { list->next = list->prev = list; } /* count the elements of a list */ -static inline unsigned int list_count( const struct list *list ) +__WINE_SERVER_LIST_INLINE unsigned int list_count( const struct list *list ) { unsigned count = 0; const struct list *ptr; @@ -149,7 +161,7 @@ } /* move all elements from src to the tail of dst */ -static inline void list_move_tail( struct list *dst, struct list *src ) +__WINE_SERVER_LIST_INLINE void list_move_tail( struct list *dst, struct list *src ) { if (list_empty(src)) return; @@ -161,7 +173,7 @@ } /* move all elements from src to the head of dst */ -static inline void list_move_head( struct list *dst, struct list *src ) +__WINE_SERVER_LIST_INLINE void list_move_head( struct list *dst, struct list *src ) { if (list_empty(src)) return;

15 years, 4 months

[hyperion] 41564: Don't want to fix all uses of PSEH2 macros, therefore have some curly braces, everyone

by hyperion＠svn.reactos.org

Author: hyperion Date: Tue Jun 23 00:27:16 2009 New Revision: 41564 URL: http://svn.reactos.org/svn/reactos?rev=41564&view=rev Log: Don't want to fix all uses of PSEH2 macros, therefore have some curly braces, everyone Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Tue Jun 23 00:27:16 2009 @@ -401,10 +401,10 @@ #include <excpt.h> -#define _SEH2_TRY __try -#define _SEH2_FINALLY __finally -#define _SEH2_EXCEPT(...) __except(__VA_ARGS__) -#define _SEH2_END +#define _SEH2_TRY __try { +#define _SEH2_FINALLY } __finally { +#define _SEH2_EXCEPT(...) } __except(__VA_ARGS__) { +#define _SEH2_END } #define _SEH2_GetExceptionInformation() (GetExceptionInformation()) #define _SEH2_GetExceptionCode() (GetExceptionCode())

15 years, 4 months

[hyperion] 41563: Correct placement of calling convention attribute

by hyperion＠svn.reactos.org

Author: hyperion Date: Tue Jun 23 00:25:25 2009 New Revision: 41563 URL: http://svn.reactos.org/svn/reactos?rev=41563&view=rev Log: Correct placement of calling convention attribute Modified: trunk/reactos/include/ddk/ntddser.h Modified: trunk/reactos/include/ddk/ntddser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddser.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntddser.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddser.h [iso-8859-1] Tue Jun 23 00:25:25 2009 @@ -365,12 +365,12 @@ USHORT Reserved[1]; } SERENUM_PORT_DESC, *PSERENUM_PORT_DESC; -typedef UCHAR NTAPI -(*PSERENUM_READPORT)( +typedef UCHAR +(NTAPI*PSERENUM_READPORT)( PVOID SerPortAddress); -typedef VOID NTAPI -(*PSERENUM_WRITEPORT)( +typedef VOID +(NTAPI*PSERENUM_WRITEPORT)( PVOID SerPortAddress, UCHAR Value);

15 years, 4 months

[hyperion] 41562: modified lib/sdk/crt/include/float.h What the hell has <float.h> to do with S_IFIFO, Arch?

by hyperion＠svn.reactos.org

Author: hyperion Date: Tue Jun 23 00:22:06 2009 New Revision: 41562 URL: http://svn.reactos.org/svn/reactos?rev=41562&view=rev Log: modified lib/sdk/crt/include/float.h What the hell has <float.h> to do with S_IFIFO, Arch? Modified: trunk/reactos/lib/sdk/crt/include/float.h Modified: trunk/reactos/lib/sdk/crt/include/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/float.… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/float.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/float.h [iso-8859-1] Tue Jun 23 00:22:06 2009 @@ -101,9 +101,6 @@ #ifndef DBL_MAX_10_EXP #define DBL_MAX_10_EXP 308 #endif -#ifndef S_IFIFO -#define S_IFIFO -1 -#endif #ifndef UINT64_MAX #define UINT64_MAX 0xffffffffffffffff #endif @@ -117,10 +114,10 @@ #ifndef _CRTIMP #ifdef _DLL #define _CRTIMP __declspec(dllimport) -#else +#else #define _CRTIMP #endif /* _DLL */ -#endif +#endif /* Set the FPU control word as cw = (cw & ~unMask) | (unNew & unMask), * i.e. change the bits in unMask to have the values they have in unNew,

15 years, 4 months

[hyperion] 41561: modified lib/rtl/exception.c Silence unavoidable warning modified lib/rtl/generictable.c Avoid silenceable warning

by hyperion＠svn.reactos.org

Author: hyperion Date: Tue Jun 23 00:19:06 2009 New Revision: 41561 URL: http://svn.reactos.org/svn/reactos?rev=41561&view=rev Log: modified lib/rtl/exception.c Silence unavoidable warning modified lib/rtl/generictable.c Avoid silenceable warning Modified: trunk/reactos/lib/rtl/exception.c trunk/reactos/lib/rtl/generictable.c Modified: trunk/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/exception.c?rev=41… ============================================================================== --- trunk/reactos/lib/rtl/exception.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/exception.c [iso-8859-1] Tue Jun 23 00:19:06 2009 @@ -66,6 +66,11 @@ RtlRaiseStatus(Status); } +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4717) +#endif + /* * @implemented */ @@ -112,6 +117,10 @@ /* If we returned, raise a status */ RtlRaiseStatus(Status); } + +#ifdef _MSC_VER +#pragma warning(pop) +#endif /* * @implemented Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/generictable.c [iso-8859-1] Tue Jun 23 00:19:06 2009 @@ -619,7 +619,7 @@ IN OUT PVOID *RestartKey) { /* FIXME! */ - return RtlEnumerateGenericTableWithoutSplayingAvl(Table, RestartKey); + return NULL; } /*

15 years, 4 months

[hyperion] 41560: modified dll/win32/kernel32/file/volume.c modified dll/win32/kernel32/misc/actctx.c modified dll/win32/kernel32/misc/lang.c C89 compliance modified dll/win32/kernel32/k32.h Include <limits.h> modified dll/win32/kernel32/misc/res.c Hey Arch, instead of copying and pasting definitions from <wine/list.h>, why don't you include it?

by hyperion＠svn.reactos.org

Author: hyperion Date: Tue Jun 23 00:15:42 2009 New Revision: 41560 URL: http://svn.reactos.org/svn/reactos?rev=41560&view=rev Log: modified dll/win32/kernel32/file/volume.c modified dll/win32/kernel32/misc/actctx.c modified dll/win32/kernel32/misc/lang.c C89 compliance modified dll/win32/kernel32/k32.h Include <limits.h> modified dll/win32/kernel32/misc/res.c Hey Arch, instead of copying and pasting definitions from <wine/list.h>, why don't you include it? Modified: trunk/reactos/dll/win32/kernel32/file/volume.c trunk/reactos/dll/win32/kernel32/k32.h trunk/reactos/dll/win32/kernel32/misc/actctx.c trunk/reactos/dll/win32/kernel32/misc/lang.c trunk/reactos/dll/win32/kernel32/misc/res.c Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] Tue Jun 23 00:15:42 2009 @@ -88,6 +88,7 @@ { DWORD drive, count; DWORD dwDriveMap; + LPSTR p; dwDriveMap = GetLogicalDrives(); @@ -100,7 +101,7 @@ if ((count * 4) + 1 > nBufferLength) return ((count * 4) + 1); - LPSTR p = lpBuffer; + p = lpBuffer; for (drive = 0; drive < MAX_DOS_DRIVES; drive++) if (dwDriveMap & (1<<drive)) @@ -126,6 +127,7 @@ { DWORD drive, count; DWORD dwDriveMap; + LPWSTR p; dwDriveMap = GetLogicalDrives(); @@ -137,7 +139,7 @@ if ((count * 4) + 1 > nBufferLength) return ((count * 4) + 1); - LPWSTR p = lpBuffer; + p = lpBuffer; for (drive = 0; drive < MAX_DOS_DRIVES; drive++) if (dwDriveMap & (1<<drive)) { @@ -934,7 +936,7 @@ BufferLength = sizeof(MOUNTDEV_NAME) + MountDevName->NameLength; continue; } - else + else { NtClose(FileHandle); SetLastErrorByStatus(Status); @@ -1023,7 +1025,7 @@ { MountPoint = MountPoints->MountPoints + Index; SymbolicLinkName = (PUCHAR)MountPoints + MountPoint->SymbolicLinkNameOffset; - + /* * Check for "\\?\Volume{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}\" * (with the last slash being optional) style symbolic links. Modified: trunk/reactos/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/k32.h?r… ============================================================================== --- trunk/reactos/dll/win32/kernel32/k32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/k32.h [iso-8859-1] Tue Jun 23 00:15:42 2009 @@ -27,6 +27,7 @@ /* C Headers */ #include <ctype.h> +#include <limits.h> #include <stdio.h> #include <wchar.h> Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ac… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/actctx.c [iso-8859-1] Tue Jun 23 00:15:42 2009 @@ -174,7 +174,7 @@ DPRINT("CreateActCtxW(%p %08lx)\n", pActCtx, pActCtx ? pActCtx->dwFlags : 0); - Status = RtlCreateActivationContext(&hActCtx, &pActCtx); + Status = RtlCreateActivationContext(&hActCtx, (PVOID*)&pActCtx); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -318,6 +318,6 @@ SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } - - return TRUE; -} + + return TRUE; +} Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] Tue Jun 23 00:15:42 2009 @@ -1550,10 +1550,10 @@ case GEO_FRIENDLYNAME: { WCHAR szBuffer[MAX_PATH]; + char szBufferA[sizeof(szBuffer)/sizeof(WCHAR)]; int Ret; - + Ret = NLS_GetGeoFriendlyName(Location, szBuffer, cchData); - char szBufferA[sizeof(szBuffer)/sizeof(WCHAR)]; WideCharToMultiByte(CP_ACP, 0, szBuffer, -1, szBufferA, sizeof(szBufferA), 0, 0); strcpy(lpGeoData, szBufferA); Modified: trunk/reactos/dll/win32/kernel32/misc/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/re… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/res.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/res.c [iso-8859-1] Tue Jun 23 00:15:42 2009 @@ -13,6 +13,7 @@ */ #include <k32.h> +#include <wine/list.h> #define NDEBUG #include <debug.h> @@ -20,55 +21,6 @@ #define STUB \ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); \ DPRINT1("%s() is UNIMPLEMENTED!\n", __FUNCTION__) - -/* Strustures and functions from include/wine/list.h */ -struct list -{ - struct list *next; - struct list *prev; -}; - -static inline void list_init( struct list *list ) -{ - list->next = list->prev = list; -} - -/* add an element before the specified one */ -static inline void list_add_before( struct list *elem, struct list *to_add ) -{ - to_add->next = elem; - to_add->prev = elem->prev; - elem->prev->next = to_add; - elem->prev = to_add; -} - -/* add element at the tail of the list */ -static inline void list_add_tail( struct list *list, struct list *elem ) -{ - list_add_before( list, elem ); -} - -/* remove an element from its list */ -static inline void list_remove( struct list *elem ) -{ - elem->next->prev = elem->prev; - elem->prev->next = elem->next; -} - -/* get the next element */ -static inline struct list *list_next( const struct list *list, const struct list *elem ) -{ - struct list *ret = elem->next; - if (elem->next == list) ret = NULL; - return ret; -} - -/* get the first element */ -static inline struct list *list_head( const struct list *list ) -{ - return list_next( list, list ); -} - /* * Data structure for updating resources. @@ -263,16 +215,6 @@ return resdata; } - -/* get pointer to object containing list element */ -#define LIST_ENTRY(elem, type, field) \ - ((type *)((char *)(elem) - (unsigned int)(&((type *)0)->field))) - -/* iterate through the list using a list entry */ -#define LIST_FOR_EACH_ENTRY(elem, list, type, field) \ - for ((elem) = LIST_ENTRY((list)->next, type, field); \ - &(elem)->field != (list); \ - (elem) = LIST_ENTRY((elem)->field.next, type, field)) static void add_resource_dir_entry( struct list *dir, struct resource_dir_entry *resdir ) {

15 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009