Ros-diffs December 2012

ros-diffs@reactos.org

12 participants
287 discussions

[cgutman] 58022: - Never queue a DPC for MiniportHandleInterrupt regardless of what MiniportISR requests if MiniportInitialize is executing - Very likely fixes CORE-6064

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Dec 28 00:36:28 2012 New Revision: 58022 URL: http://svn.reactos.org/svn/reactos?rev=58022&view=rev Log: - Never queue a DPC for MiniportHandleInterrupt regardless of what MiniportISR requests if MiniportInitialize is executing - Very likely fixes CORE-6064 Modified: trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Fri Dec 28 00:36:28 2012 @@ -62,11 +62,16 @@ BOOLEAN QueueMiniportHandleInterrupt = FALSE; PNDIS_MINIPORT_INTERRUPT NdisInterrupt = ServiceContext; PNDIS_MINIPORT_BLOCK NdisMiniportBlock = NdisInterrupt->Miniport; + BOOLEAN Initializing; NDIS_DbgPrint(MAX_TRACE, ("Called. Interrupt (0x%X)\n", NdisInterrupt)); - /* FIXME: This probably isn't the right check for MiniportInitialize, but we need to see what Windows uses here */ - if ((NdisMiniportBlock->PnPDeviceState != NdisPnPDeviceStarted) || (NdisInterrupt->IsrRequested)) { + /* Certain behavior differs if MiniportInitialize is executing when the interrupt is generated */ + Initializing = (NdisMiniportBlock->PnPDeviceState != NdisPnPDeviceStarted); + NDIS_DbgPrint(MAX_TRACE, ("MiniportInitialize executing: %s\n", (Initializing ? "yes" : "no"))); + + /* MiniportISR is always called for interrupts during MiniportInitialize */ + if ((Initializing) || (NdisInterrupt->IsrRequested)) { NDIS_DbgPrint(MAX_TRACE, ("Calling MiniportISR\n")); (*NdisMiniportBlock->DriverHandle->MiniportCharacteristics.ISRHandler)( &InterruptRecognized, @@ -81,8 +86,8 @@ InterruptRecognized = TRUE; } - - if (QueueMiniportHandleInterrupt) + /* MiniportHandleInterrupt is never called for an interrupt during MiniportInitialize */ + if ((QueueMiniportHandleInterrupt) && (!Initializing)) { NDIS_DbgPrint(MAX_TRACE, ("Queuing DPC.\n")); KeInsertQueueDpc(&NdisInterrupt->InterruptDpc, NULL, NULL);

11 years, 8 months

[akhaldi] 58021: [CRT/BUILTINS] * memcpy should behave exactly like memmove for Windows compatibility. CORE-6833 #resolve #comment Committed in r58021.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Dec 27 22:26:35 2012 New Revision: 58021 URL: http://svn.reactos.org/svn/reactos?rev=58021&view=rev Log: [CRT/BUILTINS] * memcpy should behave exactly like memmove for Windows compatibility. CORE-6833 #resolve #comment Committed in r58021. Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Thu Dec 27 22:26:35 2012 @@ -68,6 +68,13 @@ #ifdef __cplusplus extern "C" { #endif + +/*** memcopy must be memmove ***/ +__INTRIN_INLINE void* memcpy(void* dest, const void* source, size_t num) +{ + return memmove(dest, source, num); +} + /*** Stack frame juggling ***/ #define _ReturnAddress() (__builtin_return_address(0))

11 years, 8 months

[hbelusca] 58020: [FREELDR] - Move PcBeep function declaration to a better header. - Resuscitate OptionMenuCustomBootReactOS() from revision r52491, update it to match recent changes in freeldr as ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 27 21:52:40 2012 New Revision: 58020 URL: http://svn.reactos.org/svn/reactos?rev=58020&view=rev Log: [FREELDR] - Move PcBeep function declaration to a better header. - Resuscitate OptionMenuCustomBootReactOS() from revision r52491, update it to match recent changes in freeldr as well as making it using new boot method, and reuse ConstructArcPath. Why I'm doing this ? Because it can be useful to enter personalized boot options by hand at boot time rather than being obliged to edit freeldr.ini. This needs care, not brutal deletion. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/reactos.h trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c [iso-8859-1] Thu Dec 27 21:52:40 2012 @@ -67,6 +67,9 @@ case 2: // Boot Sector File OptionMenuCustomBootBootSectorFile(); break; + case 3: // ReactOS + OptionMenuCustomBootReactOS(); + break; case 4: // Linux OptionMenuCustomBootLinux(); break; @@ -117,7 +120,8 @@ OperatingSystem.LoadIdentifier = NULL; OperatingSystem.OsLoadOptions = NULL; - LoadAndBootDrive(&OperatingSystem, 0); + // LoadAndBootDrive(&OperatingSystem, 0); + LoadOperatingSystem(&OperatingSystem); } VOID OptionMenuCustomBootPartition(VOID) @@ -177,7 +181,8 @@ OperatingSystem.LoadIdentifier = NULL; OperatingSystem.OsLoadOptions = NULL; - LoadAndBootPartition(&OperatingSystem, 0); + // LoadAndBootPartition(&OperatingSystem, 0); + LoadOperatingSystem(&OperatingSystem); } VOID OptionMenuCustomBootBootSectorFile(VOID) @@ -250,7 +255,87 @@ OperatingSystem.LoadIdentifier = NULL; OperatingSystem.OsLoadOptions = NULL; - LoadAndBootBootSector(&OperatingSystem, 0); + // LoadAndBootBootSector(&OperatingSystem, 0); + LoadOperatingSystem(&OperatingSystem); +} + +VOID OptionMenuCustomBootReactOS(VOID) +{ + ULONG_PTR SectionId; + CHAR SectionName[100]; + CHAR BootDriveString[20]; + CHAR BootPartitionString[20]; + CHAR ReactOSSystemPath[200]; + CHAR ReactOSARCPath[200]; + CHAR ReactOSOptions[200]; + TIMEINFO* TimeInfo; + OperatingSystemItem OperatingSystem; + + RtlZeroMemory(SectionName, sizeof(SectionName)); + RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); + RtlZeroMemory(BootPartitionString, sizeof(BootPartitionString)); + RtlZeroMemory(ReactOSSystemPath, sizeof(ReactOSSystemPath)); + RtlZeroMemory(ReactOSOptions, sizeof(ReactOSOptions)); + + if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) + { + return; + } + + if (!UiEditBox(BootPartitionPrompt, BootPartitionString, 20)) + { + return; + } + + if (!UiEditBox(ReactOSSystemPathPrompt, ReactOSSystemPath, 200)) + { + return; + } + + if (!UiEditBox(ReactOSOptionsPrompt, ReactOSOptions, 200)) + { + return; + } + + // Generate a unique section name + TimeInfo = ArcGetTime(); + sprintf(SectionName, "CustomReactOS%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); + + // Add the section + if (!IniAddSection(SectionName, &SectionId)) + { + return; + } + + // Add the BootType + if (!IniAddSettingValueToSection(SectionId, "BootType", "Windows2003")) + { + return; + } + + // Construct the ReactOS ARC system path + ConstructArcPath(ReactOSARCPath, ReactOSSystemPath, DriveMapGetBiosDriveNumber(BootDriveString), atoi(BootPartitionString)); + + // Add the system path + if (!IniAddSettingValueToSection(SectionId, "SystemPath", ReactOSARCPath)) + { + return; + } + + // Add the CommandLine + if (!IniAddSettingValueToSection(SectionId, "Options", ReactOSOptions)) + { + return; + } + + UiMessageBox(CustomBootPrompt); + + OperatingSystem.SystemPartition = SectionName; + OperatingSystem.LoadIdentifier = NULL; + OperatingSystem.OsLoadOptions = NULL; // ReactOSOptions + + // LoadAndBootWindows(&OperatingSystem, _WIN32_WINNT_WS03); + LoadOperatingSystem(&OperatingSystem); } VOID OptionMenuCustomBootLinux(VOID) @@ -352,7 +437,8 @@ OperatingSystem.LoadIdentifier = "Custom Linux Setup"; OperatingSystem.OsLoadOptions = NULL; - LoadAndBootLinux(&OperatingSystem, 0); + // LoadAndBootLinux(&OperatingSystem, 0); + LoadOperatingSystem(&OperatingSystem); } VOID OptionMenuReboot(VOID) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c [iso-8859-1] Thu Dec 27 21:52:40 2012 @@ -22,7 +22,7 @@ void sound(int freq); void delay(unsigned msec); -void PcBeep(void) +VOID PcBeep(VOID) { sound(700); delay(200); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h [iso-8859-1] Thu Dec 27 21:52:40 2012 @@ -25,6 +25,8 @@ #endif VOID PcMachInit(const char *CmdLine); + +VOID PcBeep(VOID); VOID PcConsPutChar(int Ch); BOOLEAN PcConsKbHit(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Thu Dec 27 21:52:40 2012 @@ -119,6 +119,7 @@ #endif VOID BootMain(LPSTR CmdLine); +VOID LoadOperatingSystem(IN OperatingSystemItem* OperatingSystem); VOID RunLoader(VOID); #endif // defined __FREELDR_H Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] Thu Dec 27 21:52:40 2012 @@ -34,6 +34,6 @@ OUT ULONG *PathSyntax); BOOLEAN DissectArcPath(CHAR *ArcPath, CHAR *BootPath, UCHAR* BootDrive, ULONG* BootPartition); VOID ConstructArcPath(PCHAR ArcPath, PCHAR SystemFolder, UCHAR Disk, ULONG Partition); +#if 0 UCHAR ConvertArcNameToBiosDriveNumber(PCHAR ArcPath); - -void PcBeep(void); +#endif Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c [iso-8859-1] Thu Dec 27 21:52:40 2012 @@ -160,8 +160,6 @@ return FALSE; } - -#if 0 VOID ConstructArcPath(PCHAR ArcPath, PCHAR SystemFolder, UCHAR Disk, ULONG Partition) { char tmp[50]; @@ -198,6 +196,7 @@ } } +#if 0 UCHAR ConvertArcNameToBiosDriveNumber(PCHAR ArcPath) { char * p; Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] Thu Dec 27 21:52:40 2012 @@ -193,7 +193,7 @@ return; } - if (!InfGetDataField (&InfContext, 1, &LoadOptions)) + if (!InfGetDataField(&InfContext, 1, &LoadOptions)) { ERR("Failed to get load options\n"); return;

11 years, 8 months

[akhaldi] 58019: * Addendum to r58018. Altered the wrong function. Also: "Should be sent to Wine (TM)" ; )

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Dec 27 12:42:31 2012 New Revision: 58019 URL: http://svn.reactos.org/svn/reactos?rev=58019&view=rev Log: * Addendum to r58018. Altered the wrong function. Also: "Should be sent to Wine (TM)" ;) Modified: trunk/reactos/dll/win32/setupapi/misc.c Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] Thu Dec 27 12:42:31 2012 @@ -1448,7 +1448,7 @@ return ERROR_INVALID_PARAMETER; ret = SetupGetFileCompressionInfoExA( source, NULL, 0, &required, NULL, NULL, NULL ); - if (!(actual_name = MyMalloc( required*sizeof(WCHAR) ))) return ERROR_NOT_ENOUGH_MEMORY; + if (!(actual_name = MyMalloc( required ))) return ERROR_NOT_ENOUGH_MEMORY; ret = SetupGetFileCompressionInfoExA( source, actual_name, required, &required, source_size, target_size, type ); @@ -1491,7 +1491,7 @@ return ERROR_INVALID_PARAMETER; ret = SetupGetFileCompressionInfoExW( source, NULL, 0, &required, NULL, NULL, NULL ); - if (!(actual_name = MyMalloc( required ))) return ERROR_NOT_ENOUGH_MEMORY; + if (!(actual_name = MyMalloc( required*sizeof(WCHAR) ))) return ERROR_NOT_ENOUGH_MEMORY; ret = SetupGetFileCompressionInfoExW( source, actual_name, required, &required, source_size, target_size, type );

11 years, 8 months

[akhaldi] 58018: [SETUPAPI] * Fix allocating the required bytes in SetupGetFileCompressionInfoW. Brought to you by Peter Hater (7element {at} mail [dot] bg) CORE-6815 #resolve #comment Committed in...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Dec 27 12:35:10 2012 New Revision: 58018 URL: http://svn.reactos.org/svn/reactos?rev=58018&view=rev Log: [SETUPAPI] * Fix allocating the required bytes in SetupGetFileCompressionInfoW. Brought to you by Peter Hater (7element {at} mail [dot] bg) CORE-6815 #resolve #comment Committed in r58018. Cheers ;) Modified: trunk/reactos/dll/win32/setupapi/misc.c Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] Thu Dec 27 12:35:10 2012 @@ -1448,7 +1448,7 @@ return ERROR_INVALID_PARAMETER; ret = SetupGetFileCompressionInfoExA( source, NULL, 0, &required, NULL, NULL, NULL ); - if (!(actual_name = MyMalloc( required ))) return ERROR_NOT_ENOUGH_MEMORY; + if (!(actual_name = MyMalloc( required*sizeof(WCHAR) ))) return ERROR_NOT_ENOUGH_MEMORY; ret = SetupGetFileCompressionInfoExA( source, actual_name, required, &required, source_size, target_size, type );

11 years, 8 months

[ekohl] 58017: [NETAPI32] - Include a netapi32.h in most files and move the other includes into netapi32.h. - Add functions to open account and builtin domains directly and use these functions.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Dec 26 21:07:13 2012 New Revision: 58017 URL: http://svn.reactos.org/svn/reactos?rev=58017&view=rev Log: [NETAPI32] - Include a netapi32.h in most files and move the other includes into netapi32.h. - Add functions to open account and builtin domains directly and use these functions. Modified: trunk/reactos/dll/win32/netapi32/access.c trunk/reactos/dll/win32/netapi32/apibuf.c trunk/reactos/dll/win32/netapi32/browsr.c trunk/reactos/dll/win32/netapi32/ds.c trunk/reactos/dll/win32/netapi32/group.c trunk/reactos/dll/win32/netapi32/local_group.c trunk/reactos/dll/win32/netapi32/misc.c trunk/reactos/dll/win32/netapi32/netapi32.h trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -18,22 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "lmcons.h" -#include "lmaccess.h" -#include "lmapibuf.h" -#include "lmerr.h" -#include "lmuse.h" -#include "ntsecapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" +#include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); Modified: trunk/reactos/dll/win32/netapi32/apibuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/apibuf.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/apibuf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/apibuf.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -18,15 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "lmcons.h" -#include "lmapibuf.h" -#include "lmerr.h" -#include "winerror.h" -#include "wine/debug.h" +#include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); Modified: trunk/reactos/dll/win32/netapi32/browsr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/browsr.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/browsr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/browsr.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "lmcons.h" -#include "lmbrowsr.h" -#include "lmshare.h" +#include "netapi32.h" /************************************************************ * I_BrowserSetNetlogonState (NETAPI32.@) Modified: trunk/reactos/dll/win32/netapi32/ds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/ds.c?re… ============================================================================== --- trunk/reactos/dll/win32/netapi32/ds.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/ds.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -18,17 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "ntsecapi.h" -#include "wine/debug.h" -#include "dsrole.h" -#include "dsgetdc.h" +#include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(ds); Modified: trunk/reactos/dll/win32/netapi32/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/group.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/group.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -18,22 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "lmcons.h" -#include "lmaccess.h" -#include "lmapibuf.h" -#include "lmerr.h" -#include "lmuse.h" -#include "ntsecapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" +#include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -18,25 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "lmcons.h" -#include "lmaccess.h" -#include "lmapibuf.h" -#include "lmerr.h" -#include "winreg.h" -#include "ntsecapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -#define NTOS_MODE_USER -#include <ndk/rtlfuncs.h> -#include "ntsam.h" #include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); @@ -232,7 +213,6 @@ SAM_HANDLE ServerHandle = NULL; SAM_HANDLE DomainHandle = NULL; SAM_HANDLE AliasHandle = NULL; - PSID DomainSid = NULL; LPWSTR aliasname = NULL; LPWSTR aliascomment = NULL; ULONG RelativeId; @@ -277,23 +257,13 @@ goto done; } - /* Get the Builtin Domain SID */ - Status = GetBuiltinDomainSid(&DomainSid); + /* Open the Builtin Domain */ + Status = OpenBuiltinDomain(ServerHandle, + DOMAIN_LOOKUP, + &DomainHandle); if (!NT_SUCCESS(Status)) { - ERR("GetBuiltinDomainSid failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - /* Open the Builtin Domain */ - Status = SamOpenDomain(ServerHandle, - DOMAIN_LOOKUP, - DomainSid, - &DomainHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -314,29 +284,15 @@ ApiStatus = NERR_Success; - /* Free the Builtin Domain SID */ - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - DomainSid = NULL; - /* Close the Builtin Domain */ SamCloseHandle(DomainHandle); DomainHandle = NULL; - /* Get the account domain SID */ - Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, - &DomainSid); - if (!NT_SUCCESS(Status)) - { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - /* Open the account domain */ - Status = SamOpenDomain(ServerHandle, - DOMAIN_CREATE_ALIAS | DOMAIN_LOOKUP, - DomainSid, - &DomainHandle); + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_CREATE_ALIAS | DOMAIN_LOOKUP, + &DomainHandle); if (!NT_SUCCESS(Status)) { ERR("SamOpenDomain failed (Status %08lx)\n", Status); @@ -383,9 +339,6 @@ if (AliasHandle != NULL) SamCloseHandle(AliasHandle); - if (DomainSid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - if (DomainHandle != NULL) SamCloseHandle(DomainHandle); @@ -478,7 +431,6 @@ UNICODE_STRING ServerName; PSAM_RID_ENUMERATION CurrentAlias; PENUM_CONTEXT EnumContext = NULL; - PSID DomainSid = NULL; ULONG i; SAM_HANDLE AliasHandle = NULL; PALIAS_GENERAL_INFORMATION AliasInfo = NULL; @@ -523,47 +475,23 @@ goto done; } - Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, - &DomainSid); + Status = OpenAccountDomain(EnumContext->ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + &EnumContext->AccountDomainHandle); if (!NT_SUCCESS(Status)) { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } - Status = SamOpenDomain(EnumContext->ServerHandle, - DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, - DomainSid, - &EnumContext->AccountDomainHandle); - - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - + Status = OpenBuiltinDomain(EnumContext->ServerHandle, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + &EnumContext->BuiltinDomainHandle); if (!NT_SUCCESS(Status)) { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - Status = GetBuiltinDomainSid(&DomainSid); - if (!NT_SUCCESS(Status)) - { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - Status = SamOpenDomain(EnumContext->ServerHandle, - DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, - DomainSid, - &EnumContext->BuiltinDomainHandle); - - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -732,7 +660,6 @@ SAM_HANDLE ServerHandle = NULL; SAM_HANDLE DomainHandle = NULL; SAM_HANDLE AliasHandle = NULL; - PSID DomainSid = NULL; PALIAS_GENERAL_INFORMATION AliasInfo = NULL; LPVOID Buffer = NULL; NET_API_STATUS ApiStatus = NERR_Success; @@ -758,23 +685,13 @@ goto done; } - /* Get the Builtin Domain SID */ - Status = GetBuiltinDomainSid(&DomainSid); + /* Open the Builtin Domain */ + Status = OpenBuiltinDomain(ServerHandle, + DOMAIN_LOOKUP, + &DomainHandle); if (!NT_SUCCESS(Status)) { - ERR("GetBuiltinDomainSid failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - /* Open the Builtin Domain */ - Status = SamOpenDomain(ServerHandle, - DOMAIN_LOOKUP, - DomainSid, - &DomainHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -792,30 +709,17 @@ if (AliasHandle == NULL) { - if (DomainSid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - if (DomainHandle != NULL) SamCloseHandle(DomainHandle); - /* Get the Account Domain SID */ - Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, - &DomainSid); + /* Open the Acount Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LOOKUP, + &DomainHandle); if (!NT_SUCCESS(Status)) { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - /* Open the Acount Domain */ - Status = SamOpenDomain(ServerHandle, - DOMAIN_LOOKUP, - DomainSid, - &DomainHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -854,9 +758,6 @@ if (AliasHandle != NULL) SamCloseHandle(AliasHandle); - - if (DomainSid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); if (DomainHandle != NULL) SamCloseHandle(DomainHandle); Modified: trunk/reactos/dll/win32/netapi32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -9,20 +9,6 @@ /* INCLUDES ******************************************************************/ -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "lmcons.h" -#include "ntsecapi.h" -#include "wine/debug.h" - -#define NTOS_MODE_USER -#include <ndk/rtlfuncs.h> -#include "ntsam.h" #include "netapi32.h" @@ -125,4 +111,68 @@ return Status; } + +NTSTATUS +OpenAccountDomain(IN SAM_HANDLE ServerHandle, + IN PUNICODE_STRING ServerName, + IN ULONG DesiredAccess, + OUT PSAM_HANDLE DomainHandle) +{ + PSID DomainSid = NULL; + NTSTATUS Status; + + Status = GetAccountDomainSid(ServerName, + &DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + return Status; + } + + Status = SamOpenDomain(ServerHandle, + DesiredAccess, + DomainSid, + DomainHandle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + } + + return Status; +} + + +NTSTATUS +OpenBuiltinDomain(IN SAM_HANDLE ServerHandle, + IN ULONG DesiredAccess, + OUT PSAM_HANDLE DomainHandle) +{ + PSID DomainSid = NULL; + NTSTATUS Status; + + Status = GetBuiltinDomainSid(&DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetBuiltinDomainSid failed (Status %08lx)\n", Status); + return Status; + } + + Status = SamOpenDomain(ServerHandle, + DesiredAccess, + DomainSid, + DomainHandle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + } + + return Status; +} + /* EOF */ Modified: trunk/reactos/dll/win32/netapi32/netapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -1,6 +1,32 @@ #ifndef __WINE_NETAPI32_H__ #define __WINE_NETAPI32_H__ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "lmcons.h" +#include "lmaccess.h" +#include "lmapibuf.h" +#include "lmbrowsr.h" +#include "lmerr.h" +#include "lmshare.h" +#include "lmuse.h" +#include "ntsecapi.h" +#include "dsrole.h" +#include "dsgetdc.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/list.h" + +#define NTOS_MODE_USER +#include <ndk/rtlfuncs.h> +#include "ntsam.h" + NET_API_STATUS WINAPI @@ -15,4 +41,15 @@ NTSTATUS GetBuiltinDomainSid(OUT PSID *BuiltinDomainSid); +NTSTATUS +OpenAccountDomain(IN SAM_HANDLE ServerHandle, + IN PUNICODE_STRING ServerName, + IN ULONG DesiredAccess, + OUT PSAM_HANDLE DomainHandle); + +NTSTATUS +OpenBuiltinDomain(IN SAM_HANDLE ServerHandle, + IN ULONG DesiredAccess, + OUT SAM_HANDLE *DomainHandle); + #endif 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] Wed Dec 26 21:07:13 2012 @@ -18,26 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "lmcons.h" -#include "lmaccess.h" -#include "lmapibuf.h" -#include "lmerr.h" -#include "lmuse.h" -#include "ntsecapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" - -#define NTOS_MODE_USER -#include <ndk/rtlfuncs.h> -#include "ntsam.h" #include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); @@ -177,7 +157,7 @@ if (UserInfo->AdminComment.Length > 0) Size += UserInfo->AdminComment.Length + sizeof(WCHAR); - /* FIXME: Add user comment here */ + /* FIXME: usri10_usr_comment */ if (UserInfo->FullName.Length > 0) Size += UserInfo->FullName.Length + sizeof(WCHAR); @@ -239,9 +219,8 @@ UserInfo1->usri1_password = NULL; - UserInfo1->usri1_password_age = 0; /* FIXME */ - - UserInfo1->usri1_priv = 0; /* FIXME */ + /* FIXME: UserInfo1->usri1_password_age */ + /* FIXME: UserInfo1->usri1_priv */ if (UserInfo->HomeDirectory.Length > 0) { @@ -310,7 +289,7 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } - /* FIXME: Add user comment here */ + /* FIXME: UserInfo10->usri10_usr_comment */ if (UserInfo->FullName.Length > 0) { @@ -322,7 +301,6 @@ UserInfo10->usri10_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL; } break; - // case 11: @@ -592,10 +570,7 @@ PSAM_RID_ENUMERATION CurrentUser; PENUM_CONTEXT EnumContext = NULL; LPVOID Buffer = NULL; - PSID DomainSid = NULL; - ULONG i; - SAM_HANDLE UserHandle = NULL; PUSER_ACCOUNT_INFORMATION UserInfo = NULL; @@ -639,47 +614,23 @@ goto done; } - Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, - &DomainSid); + Status = OpenAccountDomain(EnumContext->ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + &EnumContext->AccountDomainHandle); if (!NT_SUCCESS(Status)) { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } - Status = SamOpenDomain(EnumContext->ServerHandle, - DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, - DomainSid, - &EnumContext->AccountDomainHandle); - - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - + Status = OpenBuiltinDomain(EnumContext->ServerHandle, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + &EnumContext->BuiltinDomainHandle); if (!NT_SUCCESS(Status)) { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - Status = GetBuiltinDomainSid(&DomainSid); - if (!NT_SUCCESS(Status)) - { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - Status = SamOpenDomain(EnumContext->ServerHandle, - DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, - DomainSid, - &EnumContext->BuiltinDomainHandle); - - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -871,7 +822,6 @@ SAM_HANDLE ServerHandle = NULL; SAM_HANDLE AccountDomainHandle = NULL; SAM_HANDLE UserHandle = NULL; - PSID DomainSid = NULL; PULONG RelativeIds = NULL; PSID_NAME_USE Use = NULL; PUSER_ACCOUNT_INFORMATION UserInfo = NULL; @@ -899,24 +849,14 @@ goto done; } - /* Get the Account Domain SID */ - Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, - &DomainSid); + /* Open the Account Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + &AccountDomainHandle); if (!NT_SUCCESS(Status)) { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - /* Open the Account Domain */ - Status = SamOpenDomain(ServerHandle, - DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, - DomainSid, - &AccountDomainHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -988,9 +928,6 @@ if (Use != NULL) SamFreeMemory(Use); - - if (DomainSid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); if (AccountDomainHandle != NULL) SamCloseHandle(AccountDomainHandle);

11 years, 8 months

[hbelusca] 58016: [MSVCRT] Export __crtLCMapStringW and correct __crtLCMapStringA: their prototypes are : int CDECL __crtLCMapStringW(LCID lcid, DWORD mapflags, const wchar_t *src, int srclen, wcha...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 26 19:26:08 2012 New Revision: 58016 URL: http://svn.reactos.org/svn/reactos?rev=58016&view=rev Log: [MSVCRT] Export __crtLCMapStringW and correct __crtLCMapStringA: their prototypes are : int CDECL __crtLCMapStringW(LCID lcid, DWORD mapflags, const wchar_t *src, int srclen, wchar_t *dst, int dstlen, unsigned int codepage, int xflag) and int CDECL __crtLCMapStringA(LCID lcid, DWORD mapflags, const char* src, int srclen, char* dst, int dstlen, unsigned int codepage, int xflag) Needed by SVN. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Wed Dec 26 19:26:08 2012 @@ -143,8 +143,8 @@ @ cdecl __crtCompareStringW(long long wstr long wstr long) kernel32.CompareStringW @ cdecl __crtGetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW @ cdecl __crtGetStringTypeW(long long wstr long ptr) -@ cdecl __crtLCMapStringA(long long str long ptr long long long) -# stub __crtLCMapStringW +@ cdecl __crtLCMapStringA(long long str long str long long long) +@ cdecl __crtLCMapStringW(long long wstr long wstr long long long) @ cdecl __daylight() __p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno()

11 years, 8 months

[ekohl] 58015: [NETAPI32] - Implement NetLocalGroupAdd. - Implement and use a helper function that opens aliases by name.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Dec 26 16:31:28 2012 New Revision: 58015 URL: http://svn.reactos.org/svn/reactos?rev=58015&view=rev Log: [NETAPI32] - Implement NetLocalGroupAdd. - Implement and use a helper function that opens aliases by name. Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Wed Dec 26 16:31:28 2012 @@ -160,19 +160,241 @@ } -/************************************************************ - * NetLocalGroupAdd (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetLocalGroupAdd( +static +NET_API_STATUS +OpenAliasByName(SAM_HANDLE DomainHandle, + PUNICODE_STRING AliasName, + ULONG DesiredAccess, + PSAM_HANDLE AliasHandle) +{ + PULONG RelativeIds = NULL; + PSID_NAME_USE Use = NULL; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + /* Get the RID for the given user name */ + Status = SamLookupNamesInDomain(DomainHandle, + 1, + AliasName, + &RelativeIds, + &Use); + if (!NT_SUCCESS(Status)) + { + ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status); + return NetpNtStatusToApiStatus(Status); + } + + /* Fail, if it is not an alias account */ + if (Use[0] != SidTypeAlias) + { + ERR("Object is not an Alias!\n"); + ApiStatus = NERR_GroupNotFound; + goto done; + } + + /* Open the alias account */ + Status = SamOpenAlias(DomainHandle, + DesiredAccess, + RelativeIds[0], + AliasHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + +done: + if (RelativeIds != NULL) + SamFreeMemory(RelativeIds); + + if (Use != NULL) + SamFreeMemory(Use); + + return ApiStatus; +} + + +/************************************************************ + * NetLocalGroupAdd (NETAPI32.@) + */ +NET_API_STATUS +WINAPI +NetLocalGroupAdd( LPCWSTR servername, DWORD level, LPBYTE buf, LPDWORD parm_err) { - FIXME("(%s %d %p %p) stub!\n", debugstr_w(servername), level, buf, + ALIAS_ADM_COMMENT_INFORMATION AdminComment; + UNICODE_STRING ServerName; + UNICODE_STRING AliasName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE AliasHandle = NULL; + PSID DomainSid = NULL; + LPWSTR aliasname = NULL; + LPWSTR aliascomment = NULL; + ULONG RelativeId; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("(%s %d %p %p) stub!\n", debugstr_w(servername), level, buf, parm_err); - return NERR_Success; -} + + /* Initialize the Server name*/ + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + /* Initialize the Alias name*/ + switch (level) + { + case 0: + aliasname = ((PLOCALGROUP_INFO_0)buf)->lgrpi0_name; + aliascomment = NULL; + break; + + case 1: + aliasname = ((PLOCALGROUP_INFO_1)buf)->lgrpi1_name; + aliascomment = ((PLOCALGROUP_INFO_1)buf)->lgrpi1_comment; + break; + + default: + return ERROR_INVALID_LEVEL; + } + + RtlInitUnicodeString(&AliasName, aliasname); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Get the Builtin Domain SID */ + Status = GetBuiltinDomainSid(&DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetBuiltinDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Builtin Domain */ + Status = SamOpenDomain(ServerHandle, + DOMAIN_LOOKUP, + DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Try to open the Alias Account in the Builtin Domain */ + ApiStatus = OpenAliasByName(DomainHandle, + &AliasName, + ALIAS_READ_INFORMATION, + &AliasHandle); + if (ApiStatus == NERR_Success) + { + ERR("OpenAliasByName: alias %wZ already exists!\n", &AliasName); + + SamCloseHandle(AliasHandle); + ApiStatus = ERROR_ALIAS_EXISTS; + goto done; + } + + ApiStatus = NERR_Success; + + /* Free the Builtin Domain SID */ + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + DomainSid = NULL; + + /* Close the Builtin Domain */ + SamCloseHandle(DomainHandle); + DomainHandle = NULL; + + /* Get the account domain SID */ + Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, + &DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the account domain */ + Status = SamOpenDomain(ServerHandle, + DOMAIN_CREATE_ALIAS | DOMAIN_LOOKUP, + DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Create the alias */ + Status = SamCreateAliasInDomain(DomainHandle, + &AliasName, + DELETE | ALIAS_WRITE_ACCOUNT, + &AliasHandle, + &RelativeId); + if (!NT_SUCCESS(Status)) + { + ERR("SamCreateAliasInDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + TRACE("Created alias \"%wZ\" (RID: %lu)\n", &AliasName, RelativeId); + + /* Set the admin comment */ + if (level == 1) + { + RtlInitUnicodeString(&AdminComment.AdminComment, aliascomment); + + Status = SamSetInformationAlias(AliasHandle, + AliasAdminCommentInformation, + &AdminComment); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationAlias failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + + /* Delete the Alias if the Comment could not be set */ + SamDeleteAlias(AliasHandle); + + goto done; + } + } + +done: + if (AliasHandle != NULL) + SamCloseHandle(AliasHandle); + + if (DomainSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; +} + /************************************************************ * NetLocalGroupAddMember (NETAPI32.@) @@ -264,7 +486,7 @@ NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; - FIXME("(%s %d %p %d %p %p %p) stub!\n", debugstr_w(servername), + TRACE("(%s %d %p %d %p %p %p) stub!\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); *entriesread = 0; @@ -511,14 +733,12 @@ SAM_HANDLE DomainHandle = NULL; SAM_HANDLE AliasHandle = NULL; PSID DomainSid = NULL; - PULONG RelativeIds = NULL; - PSID_NAME_USE Use = NULL; PALIAS_GENERAL_INFORMATION AliasInfo = NULL; LPVOID Buffer = NULL; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; - FIXME("(%s %s %d %p) stub!\n", debugstr_w(servername), + TRACE("(%s %s %d %p) stub!\n", debugstr_w(servername), debugstr_w(groupname), level, bufptr); if (servername != NULL) @@ -559,49 +779,24 @@ goto done; } - /* Get the RID for the given user name */ - Status = SamLookupNamesInDomain(DomainHandle, - 1, - &GroupName, - &RelativeIds, - &Use); - if (!NT_SUCCESS(Status) && Status != STATUS_NONE_MAPPED) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - if (Status == STATUS_SUCCESS) - { - /* FIXME: Check Use*/ - - Status = SamOpenAlias(DomainHandle, - ALIAS_READ_INFORMATION, - RelativeIds[0], - &AliasHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } + /* Open the alias account in the builtin domain */ + ApiStatus = OpenAliasByName(DomainHandle, + &GroupName, + ALIAS_READ_INFORMATION, + &AliasHandle); + if (ApiStatus != NERR_Success) + { + ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus); + goto done; } if (AliasHandle == NULL) { - if (RelativeIds != NULL) - SamFreeMemory(RelativeIds); - - if (Use != NULL) - SamFreeMemory(Use); - if (DomainSid != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); if (DomainHandle != NULL) SamCloseHandle(DomainHandle); - /* Get the Account Domain SID */ Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, @@ -625,29 +820,14 @@ goto done; } - /* Get the RID for the given user name */ - Status = SamLookupNamesInDomain(DomainHandle, - 1, - &GroupName, - &RelativeIds, - &Use); - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - /* FIXME: Check Use*/ - - Status = SamOpenAlias(DomainHandle, - ALIAS_READ_INFORMATION, - RelativeIds[0], - &AliasHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); + /* Open the alias account in the account domain */ + ApiStatus = OpenAliasByName(DomainHandle, + &GroupName, + ALIAS_READ_INFORMATION, + &AliasHandle); + if (ApiStatus != NERR_Success) + { + ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus); goto done; } } @@ -675,12 +855,6 @@ if (AliasHandle != NULL) SamCloseHandle(AliasHandle); - if (RelativeIds != NULL) - SamFreeMemory(RelativeIds); - - if (Use != NULL) - SamFreeMemory(Use); - if (DomainSid != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); @@ -692,7 +866,7 @@ *bufptr = (LPBYTE)Buffer; - return NERR_Success; + return ApiStatus; }

11 years, 8 months

[hbelusca] 58014: [MSVCRT] Export ___lc_collate_cp_func since it exists in Win2k3 msvcrt.dll AND it is needed by SVN in RosBE 2.1.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 26 16:28:44 2012 New Revision: 58014 URL: http://svn.reactos.org/svn/reactos?rev=58014&view=rev Log: [MSVCRT] Export ___lc_collate_cp_func since it exists in Win2k3 msvcrt.dll AND it is needed by SVN in RosBE 2.1. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Wed Dec 26 16:28:44 2012 @@ -131,7 +131,7 @@ @ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid @ cdecl __STRINGTOLD(ptr ptr str long) @ cdecl ___lc_codepage_func() -# @ cdecl ___lc_collate_cp_func() +@ cdecl ___lc_collate_cp_func() @ cdecl ___lc_handle_func() @ cdecl ___mb_cur_max_func() @ cdecl ___setlc_active_func()

11 years, 8 months

[tfaber] 58013: [EXPLORER_NEW] - Fix some formatting and GetWindowLong[Ptr] confusion

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Dec 26 15:48:49 2012 New Revision: 58013 URL: http://svn.reactos.org/svn/reactos?rev=58013&view=rev Log: [EXPLORER_NEW] - Fix some formatting and GetWindowLong[Ptr] confusion Modified: trunk/reactos/base/shell/explorer-new/explorer.c trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/base/shell/explorer-new/trayntfy.c trunk/reactos/base/shell/explorer-new/trayprop.c trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] Wed Dec 26 15:48:49 2012 @@ -41,17 +41,17 @@ ASSERT((~dwStyleMask & dwStyle) == 0); - PrevStyle = GetWindowLongPtr(hWnd, - GWL_STYLE); + PrevStyle = GetWindowLong(hWnd, + GWL_STYLE); if (PrevStyle != 0 && (PrevStyle & dwStyleMask) != dwStyle) { Style = PrevStyle & ~dwStyleMask; Style |= dwStyle; - PrevStyle = SetWindowLongPtr(hWnd, - GWL_STYLE, - Style); + PrevStyle = SetWindowLong(hWnd, + GWL_STYLE, + Style); } return PrevStyle; @@ -66,17 +66,17 @@ ASSERT((~dwStyleMask & dwStyle) == 0); - PrevStyle = GetWindowLongPtr(hWnd, - GWL_EXSTYLE); + PrevStyle = GetWindowLong(hWnd, + GWL_EXSTYLE); if (PrevStyle != 0 && (PrevStyle & dwStyleMask) != dwStyle) { Style = PrevStyle & ~dwStyleMask; Style |= dwStyle; - PrevStyle = SetWindowLongPtr(hWnd, - GWL_EXSTYLE, - Style); + PrevStyle = SetWindowLong(hWnd, + GWL_EXSTYLE, + Style); } return PrevStyle; @@ -291,11 +291,11 @@ BOOL bRet = FALSE; unsigned int i; - dwLen = GetFileVersionInfoSize(szFileName,&dwHandle); + dwLen = GetFileVersionInfoSize(szFileName, &dwHandle); if (dwLen > 0) { - lpData = HeapAlloc(hProcessHeap,0,dwLen); + lpData = HeapAlloc(hProcessHeap, 0, dwLen); if (lpData != NULL) { @@ -324,14 +324,15 @@ sizeof(szSubBlock) / sizeof(szSubBlock[0]), TEXT("\\StringFileInfo\\%04X%04X\\%s"), lpTranslate[i].wLanguage, - lpTranslate[i].wCodePage,szVersionInfo); + lpTranslate[i].wCodePage, + szVersionInfo); if (VerQueryValue(lpData, szSubBlock, (LPVOID *)&lpszLocalBuf, &cbLen) != 0) { - wcsncpy(szBuffer,lpszLocalBuf,cbBufLen); + wcsncpy(szBuffer, lpszLocalBuf, cbBufLen); bRet = TRUE; break; @@ -339,7 +340,7 @@ } } } - HeapFree(hProcessHeap,0,lpData); + HeapFree(hProcessHeap, 0, lpData); lpData = NULL; } } Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] Wed Dec 26 15:48:49 2012 @@ -15,7 +15,7 @@ MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR MENUITEM "ÐÐ°Ð´Ð°ÑÐµÐ½ ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»", ID_SHELL_CMD_OPEN_TASKMGR - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð·Ð°Ð´Ð°ÑÐ½Ð°ÑÐ° Ð»ÐµÐ½ÑÐ°", ID_LOCKTASKBAR MENUITEM "Ð¡&Ð²Ð¾Ð¹ÑÑÐ²Ð°", ID_SHELL_CMD_PROPERTIES END Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Wed Dec 26 15:48:49 2012 @@ -431,7 +431,9 @@ TaskItem); icon = TaskSwitchWnd_GetWndIcon(TaskItem->hWnd); - TaskItem->IconIndex = ImageList_ReplaceIcon(This->TaskIcons,TaskItem->IconIndex,icon); + TaskItem->IconIndex = ImageList_ReplaceIcon(This->TaskIcons, + TaskItem->IconIndex, + icon); tbbi.iImage = TaskItem->IconIndex; if (!SendMessage(This->hWndToolbar, @@ -452,9 +454,9 @@ IN PTASK_ITEM TaskItem) { TBBUTTONINFO tbbi; - PTASK_ITEM currentTaskItem,LastItem; - - if (TaskItem->IconIndex==-1) + PTASK_ITEM currentTaskItem, LastItem; + + if (TaskItem->IconIndex == -1) return; tbbi.cbSize = sizeof(tbbi); @@ -1377,8 +1379,8 @@ /* Don't list popup windows and also no tool windows */ if (GetWindow(hWnd, GW_OWNER) == NULL && - !(GetWindowLongPtr(hWnd, - GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) + !(GetWindowLong(hWnd, + GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) { TaskSwitchWnd_AddTask(This, hWnd); @@ -2126,7 +2128,7 @@ #if DUMP_TASKS != 0 case WM_TIMER: - switch(wParam) + switch (wParam) { case 1: TaskSwitchWnd_DumpTasks(This); Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Wed Dec 26 15:48:49 2012 @@ -187,7 +187,7 @@ tbBtn.dwData = notifyItem->Index; tbBtn.iString = (INT_PTR)text; - tbBtn.idCommand=notifyItem->Index; + tbBtn.idCommand = notifyItem->Index; if (iconData->uFlags & NIF_MESSAGE) { @@ -237,7 +237,7 @@ { PNOTIFY_ITEM deleteItem; PNOTIFY_ITEM updateItem; - deleteItem=*NotifyPointer; + deleteItem = *NotifyPointer; SendMessage(This->hWndToolbar, @@ -245,7 +245,7 @@ deleteItem->Index, 0); - *NotifyPointer=updateItem=deleteItem->next; + *NotifyPointer = updateItem = deleteItem->next; if (!(deleteItem->iconData.dwState & NIS_HIDDEN)) This->VisibleButtonCount--; @@ -382,13 +382,10 @@ SendMessage(This->hWndToolbar, TB_SETIMAGELIST, 0, (LPARAM)This->SysIcons); BtnSize.cx = BtnSize.cy = 18; - //BtnSize.cx = GetSystemMetrics(SM_CXMINIMIZED); - //This->ButtonSize.cy = BtnSize.cy = GetSystemMetrics(SM_CYSIZE) + (2 * GetSystemMetrics(SM_CYEDGE)); SendMessage(This->hWndToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(BtnSize.cx, BtnSize.cy)); - /*SysPagerWnd_AddButton(This);*/ SetWindowSubclass(This->hWndToolbar, SysPagerWnd_ToolbarSubclassedProc, @@ -427,6 +424,7 @@ parentHWND = GetParent(parentHWND); GetClientRect(parentHWND, &windowRect); + /* FIXME: ever heard of "struct"? */ trayCommand = *(DWORD *) (((BYTE *)cpData->lpData) + 4); iconData = (NOTIFYICONDATA *) (((BYTE *)cpData->lpData) + 8); @@ -448,7 +446,7 @@ PPNOTIFY_ITEM NotifyPointer; NotifyPointer = SysPagerWnd_FindPPNotifyItemByIconData(This, iconData); - if(!NotifyPointer) + if (!NotifyPointer) { SysPagerWnd_AddButton(This, iconData); } @@ -697,10 +695,10 @@ BOOL IsTime; DWORD dwFormatFlags; LPCTSTR lpFormat; -}ClockWndFormats[]= { -{TRUE, 0, NULL}, -{FALSE, 0, TEXT("dddd")}, -{FALSE, DATE_SHORTDATE, NULL} +} ClockWndFormats[] = { + { TRUE, 0, NULL }, + { FALSE, 0, TEXT("dddd") }, + { FALSE, DATE_SHORTDATE, NULL } }; HRESULT RegGetDWord(HKEY hKey, LPCTSTR szValueName, DWORD * lpdwResult) @@ -997,7 +995,7 @@ nmh.hwndFrom = This->hWnd; nmh.idFrom = GetWindowLongPtr(This->hWnd, - GWL_ID); + GWLP_ID); nmh.code = NTNWM_REALIGN; SendMessage(This->hWndNotify, @@ -1491,9 +1489,9 @@ if (This->TrayTheme) { - style = GetWindowLongPtr(This->hWnd, GWL_EXSTYLE); + style = GetWindowLong(This->hWnd, GWL_EXSTYLE); style = style & ~WS_EX_STATICEDGE; - SetWindowLongPtr(This->hWnd, GWL_EXSTYLE, style); + SetWindowLong(This->hWnd, GWL_EXSTYLE, style); GetThemeMargins(This->TrayTheme, NULL, @@ -1505,9 +1503,9 @@ } else { - style = GetWindowLongPtr(This->hWnd, GWL_EXSTYLE); + style = GetWindowLong(This->hWnd, GWL_EXSTYLE); style = style | WS_EX_STATICEDGE; - SetWindowLongPtr(This->hWnd, GWL_EXSTYLE, style); + SetWindowLong(This->hWnd, GWL_EXSTYLE, style); This->ContentMargin.cxLeftWidth = 0; This->ContentMargin.cxRightWidth = 0; Modified: trunk/reactos/base/shell/explorer-new/trayprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayprop.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayprop.c [iso-8859-1] Wed Dec 26 15:48:49 2012 @@ -142,7 +142,7 @@ break; case WM_COMMAND: - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDC_TASKBARPROP_LOCK: case IDC_TASKBARPROP_HIDE: @@ -163,7 +163,7 @@ { LPNMHDR pnmh = (LPNMHDR)lParam; - switch(pnmh->code) + switch (pnmh->code) { case PSN_SETACTIVE: break; @@ -259,7 +259,7 @@ { LPNMHDR pnmh = (LPNMHDR)lParam; - switch(pnmh->code) + switch (pnmh->code) { case PSN_SETACTIVE: break; @@ -294,7 +294,7 @@ { LPNMHDR pnmh = (LPNMHDR)lParam; - switch(pnmh->code) + switch (pnmh->code) { case PSN_SETACTIVE: break; @@ -329,7 +329,7 @@ { LPNMHDR pnmh = (LPNMHDR)lParam; - switch(pnmh->code) + switch (pnmh->code) { case PSN_SETACTIVE: break; Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Wed Dec 26 15:48:49 2012 @@ -372,11 +372,11 @@ RECT rcMin = {0}; AdjustWindowRectEx(&rcMin, - GetWindowLongPtr(This->hWnd, - GWL_STYLE), + GetWindowLong(This->hWnd, + GWL_STYLE), FALSE, - GetWindowLongPtr(This->hWnd, - GWL_EXSTYLE)); + GetWindowLong(This->hWnd, + GWL_EXSTYLE)); *pRect = rcMin; } @@ -655,7 +655,7 @@ RECT rcTray,rcWorkArea; /* If monitor has changed then fix the previous monitors work area */ - if(This->PreviousMonitor!=This->Monitor) + if (This->PreviousMonitor != This->Monitor) { ITrayWindowImpl_GetScreenRect(This, This->PreviousMonitor, @@ -671,25 +671,25 @@ ITrayWindowImpl_GetScreenRect(This, This->Monitor, &rcWorkArea); - This->PreviousMonitor=This->Monitor; + This->PreviousMonitor = This->Monitor; /* If AutoHide is false then change the workarea to exclude the area that the taskbar covers. */ - if(!This->AutoHide) - { - switch(This->Position) + if (!This->AutoHide) + { + switch (This->Position) { case ABE_TOP: - rcWorkArea.top=rcTray.bottom; + rcWorkArea.top = rcTray.bottom; break; case ABE_LEFT: - rcWorkArea.left=rcTray.right; + rcWorkArea.left = rcTray.right; break; case ABE_RIGHT: - rcWorkArea.right=rcTray.left; + rcWorkArea.right = rcTray.left; break; case ABE_BOTTOM: - rcWorkArea.bottom=rcTray.top; + rcWorkArea.bottom = rcTray.top; break; } } @@ -1978,7 +1978,7 @@ static DWORD WINAPI RunFileDlgThread(IN OUT PVOID pParam) -{ +{ ITrayWindowImpl *This = pParam; HANDLE hShell32; RUNFILEDLG RunFileDlg; @@ -2007,7 +2007,7 @@ DestroyWindow(hwnd); - return 0; + return 0; } static LRESULT CALLBACK @@ -2519,7 +2519,7 @@ lParam, &Ret))) { - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { /* FIXME: Handle these commands as well */ case IDM_TASKBARANDSTARTMENU:

11 years, 8 months

← Newer
1
2
3
4
5
6
7
8
9
...
29
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 December 2012