Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mkupfer] 35016: - extended range for calendar view for years 1900-9999, each selectable year/month combination creates a correct month view - special case september 1752 partly prepared, but disabled as long as unneeded ; -) - enable via #define WITH_1752
by mkupfer＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: mkupfer Date: Fri Aug 1 12:43:53 2008 New Revision: 35016 URL: http://svn.reactos.org/svn/reactos?rev=35016&view=rev Log: - extended range for calendar view for years 1900-9999, each selectable year/month combination creates a correct month view - special case september 1752 partly prepared, but disabled as long as unneeded ;-) - enable via #define WITH_1752 Modified: trunk/reactos/dll/cpl/timedate/monthcal.c Modified: trunk/reactos/dll/cpl/timedate/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/monthcal.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/monthcal.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/monthcal.c [iso-8859-1] Fri Aug 1 12:43:53 2008 @@ -75,6 +75,19 @@ return Ret; } +/* + * for the year range 1..9999 + * return 1 if is leap year otherwise 0 + */ +static WORD LeapYear(IN WORD Year) +{ + return +#ifdef WITH_1752 + (Year <= 1752) ? !(Year % 4) : +#endif + !(Year % 4) && ((Year % 100) || !(Year % 400)); +} + static WORD MonthCalMonthLength(IN WORD Month, IN WORD Year) @@ -82,9 +95,16 @@ const BYTE MonthDays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0}; if(Month == 2) - return MonthDays[Month - 1] + ((Year % 400 == 0) ? 1 : ((Year % 100 != 0) && (Year % 4 == 0)) ? 1 : 0); + return MonthDays[Month - 1] + LeapYear(Year); else - return MonthDays[Month - 1]; + { +#ifdef WITH_1752 + if ((Year == 1752) && (Month == 9)) + return 19; // special case: September 1752 has no 3rd-13th + else +#endif + return MonthDays[Month - 1]; + } } static WORD @@ -134,7 +154,7 @@ if (Month < 1 || Month > 12 || Day == 0 || Day > MonthCalMonthLength(Month, Year) || - Year < 1980 || Year > 2099) + Year < 1899 || Year > 9999) { return FALSE; }

1 0

[jmorlan] 35015: - IntRemoveMenuItem: Fix bug involving deleting item from submenu. (Bug 3292) - IntFreeMenuItem: Remove code for removing item from list - the only caller that "used" this was IntRemoveMenuItem, which actually removes the item itself. - IntInsertMenuItemToList, IntEnableMenuItem, IntCheckMenuItem, IntHiliteMenuItem: Simplify some more redundant code.
by jmorlan＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: jmorlan Date: Fri Aug 1 12:40:56 2008 New Revision: 35015 URL: http://svn.reactos.org/svn/reactos?rev=35015&view=rev Log: - IntRemoveMenuItem: Fix bug involving deleting item from submenu. (Bug 3292) - IntFreeMenuItem: Remove code for removing item from list - the only caller that "used" this was IntRemoveMenuItem, which actually removes the item itself. - IntInsertMenuItemToList, IntEnableMenuItem, IntCheckMenuItem, IntHiliteMenuItem: Simplify some more redundant code. Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/menu.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/menu.h [iso-8859-1] Fri Aug 1 12:40:56 2008 @@ -50,8 +50,7 @@ UserDereferenceObject(MenuObj) BOOL FASTCALL -IntFreeMenuItem(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, - BOOL RemoveFromList, BOOL bRecurse); +IntFreeMenuItem(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, BOOL bRecurse); BOOL FASTCALL IntRemoveMenuItem(PMENU_OBJECT MenuObject, UINT uPosition, UINT uFlags, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Fri Aug 1 12:40:56 2008 @@ -206,27 +206,9 @@ } BOOL FASTCALL -IntFreeMenuItem(PMENU_OBJECT Menu, PMENU_ITEM MenuItem, - BOOL RemoveFromList, BOOL bRecurse) +IntFreeMenuItem(PMENU_OBJECT Menu, PMENU_ITEM MenuItem, BOOL bRecurse) { FreeMenuText(MenuItem); - if(RemoveFromList) - { - PMENU_ITEM CurItem = Menu->MenuItemList; - while(CurItem) - { - if (CurItem->Next == MenuItem) - { - CurItem->Next = MenuItem->Next; - break; - } - else - { - CurItem = CurItem->Next; - } - } - Menu->MenuInfo.MenuItemCount--; - } if(bRecurse && MenuItem->hSubMenu) { PMENU_OBJECT SubMenu; @@ -249,7 +231,7 @@ BOOL bRecurse) { PMENU_ITEM PrevMenuItem, MenuItem; - if(IntGetMenuItemByFlag(Menu, uPosition, uFlags, NULL, &MenuItem, + if(IntGetMenuItemByFlag(Menu, uPosition, uFlags, &Menu, &MenuItem, &PrevMenuItem) > -1) { if(MenuItem) @@ -260,7 +242,8 @@ { Menu->MenuItemList = MenuItem->Next; } - return IntFreeMenuItem(Menu, MenuItem, TRUE, bRecurse); + Menu->MenuInfo.MenuItemCount--; + return IntFreeMenuItem(Menu, MenuItem, bRecurse); } } return FALSE; @@ -275,7 +258,7 @@ while(CurItem) { NextItem = CurItem->Next; - IntFreeMenuItem(Menu, CurItem, FALSE, bRecurse); + IntFreeMenuItem(Menu, CurItem, bRecurse); CurItem = NextItem; res++; } @@ -651,56 +634,25 @@ UINT npos = 0; CurItem = Menu->MenuItemList; - if(pos <= -1) - { - while(CurItem) - { - LastItem = CurItem; - CurItem = CurItem->Next; - npos++; - } + while(CurItem && (pos != 0)) + { + LastItem = CurItem; + CurItem = CurItem->Next; + pos--; + npos++; + } + + if(LastItem) + { + /* insert the item after LastItem */ + LastItem->Next = MenuItem; } else { - while(CurItem && (pos > 0)) - { - LastItem = CurItem; - CurItem = CurItem->Next; - pos--; - npos++; - } - } - - if(CurItem) - { - if(LastItem) - { - /* insert the item before CurItem */ - MenuItem->Next = LastItem->Next; - LastItem->Next = MenuItem; - } - else - { - /* insert at the beginning */ - Menu->MenuItemList = MenuItem; - MenuItem->Next = CurItem; - } - } - else - { - if(LastItem) - { - /* append item */ - LastItem->Next = MenuItem; - MenuItem->Next = NULL; - } - else - { - /* insert first item */ - Menu->MenuItemList = MenuItem; - MenuItem->Next = NULL; - } - } + /* insert at the beginning */ + Menu->MenuItemList = MenuItem; + } + MenuItem->Next = CurItem; Menu->MenuInfo.MenuItemCount++; return npos; @@ -1011,29 +963,18 @@ if(uEnable & MF_DISABLED) { - if(!(MenuItem->fState & MF_DISABLED)) - MenuItem->fState |= MF_DISABLED; + MenuItem->fState |= MF_DISABLED; + MenuItem->fState |= uEnable & MF_GRAYED; + } + else + { if(uEnable & MF_GRAYED) { - if(!(MenuItem->fState & MF_GRAYED)) - MenuItem->fState |= MF_GRAYED; - } - } - else - { - if(uEnable & MF_GRAYED) - { - if(!(MenuItem->fState & MF_GRAYED)) - MenuItem->fState |= MF_GRAYED; - if(!(MenuItem->fState & MF_DISABLED)) - MenuItem->fState |= MF_DISABLED; + MenuItem->fState |= (MF_GRAYED | MF_DISABLED); } else { - if(MenuItem->fState & MF_DISABLED) - MenuItem->fState ^= MF_DISABLED; - if(MenuItem->fState & MF_GRAYED) - MenuItem->fState ^= MF_GRAYED; + MenuItem->fState &= ~(MF_DISABLED | MF_GRAYED); } } @@ -1155,13 +1096,11 @@ res = (DWORD)(MenuItem->fState & MF_CHECKED); if(uCheck & MF_CHECKED) { - if(!(MenuItem->fState & MF_CHECKED)) - MenuItem->fState |= MF_CHECKED; + MenuItem->fState |= MF_CHECKED; } else { - if(MenuItem->fState & MF_CHECKED) - MenuItem->fState ^= MF_CHECKED; + MenuItem->fState &= ~MF_CHECKED; } return (DWORD)res; @@ -1180,13 +1119,11 @@ if(uHilite & MF_HILITE) { - if(!(MenuItem->fState & MF_HILITE)) - MenuItem->fState |= MF_HILITE; + MenuItem->fState |= MF_HILITE; } else { - if(MenuItem->fState & MF_HILITE) - MenuItem->fState ^= MF_HILITE; + MenuItem->fState &= ~MF_HILITE; } /* FIXME - update the window's menu */ @@ -1204,8 +1141,7 @@ { while(MenuItem) { - if(MenuItem->fState & MFS_DEFAULT) - MenuItem->fState ^= MFS_DEFAULT; + MenuItem->fState &= ~MFS_DEFAULT; MenuItem = MenuItem->Next; } return TRUE; @@ -1218,14 +1154,12 @@ { if(pos == uItem) { - if(!(MenuItem->fState & MFS_DEFAULT)) - MenuItem->fState |= MFS_DEFAULT; + MenuItem->fState |= MFS_DEFAULT; ret = TRUE; } else { - if(MenuItem->fState & MFS_DEFAULT) - MenuItem->fState ^= MFS_DEFAULT; + MenuItem->fState &= ~MFS_DEFAULT; } pos++; MenuItem = MenuItem->Next; @@ -1237,14 +1171,12 @@ { if(!ret && (MenuItem->wID == uItem)) { - if(!(MenuItem->fState & MFS_DEFAULT)) - MenuItem->fState |= MFS_DEFAULT; + MenuItem->fState |= MFS_DEFAULT; ret = TRUE; } else { - if(MenuItem->fState & MFS_DEFAULT) - MenuItem->fState ^= MFS_DEFAULT; + MenuItem->fState &= ~MFS_DEFAULT; } MenuItem = MenuItem->Next; }

1 0

[cgutman] 35014: - These should no longer be needed now that TDI doesn't give back invalid IRPs - I'll look into the canceling issue later
by cgutman＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: cgutman Date: Fri Aug 1 12:21:52 2008 New Revision: 35014 URL: http://svn.reactos.org/svn/reactos?rev=35014&view=rev Log: - These should no longer be needed now that TDI doesn't give back invalid IRPs - I'll look into the canceling issue later Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c branches/aicom-network-fixes/drivers/network/afd/afd/write.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] Fri Aug 1 12:21:52 2008 @@ -227,11 +227,6 @@ ASSERT_IRQL(APC_LEVEL); - if (Irp->Cancel) { - FCB->ReceiveIrp.InFlightRequest = NULL; - return STATUS_SUCCESS; - } - if( !SocketAcquireStateLock( FCB ) ) return Status; FCB->ReceiveIrp.InFlightRequest = NULL; @@ -447,11 +442,6 @@ UINT DGSize = Irp->IoStatus.Information + sizeof( AFD_STORED_DATAGRAM ); AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - - if (Irp->Cancel) { - FCB->ReceiveIrp.InFlightRequest = NULL; - return STATUS_SUCCESS; - } if( !SocketAcquireStateLock( FCB ) ) return STATUS_UNSUCCESSFUL; Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] Fri Aug 1 12:21:52 2008 @@ -40,11 +40,6 @@ ASSERT_IRQL(APC_LEVEL); - if (Irp->Cancel) { - FCB->SendIrp.InFlightRequest = NULL; - return STATUS_SUCCESS; - } - if( !SocketAcquireStateLock( FCB ) ) return Status; FCB->SendIrp.InFlightRequest = NULL; @@ -176,11 +171,6 @@ Irp->IoStatus.Status, Irp->IoStatus.Information)); - if (Irp->Cancel) { - FCB->SendIrp.InFlightRequest = NULL; - return STATUS_SUCCESS; - } - /* It's ok if the FCB already died */ if( !SocketAcquireStateLock( FCB ) ) return STATUS_SUCCESS;

1 0

[jmorlan] 35013: - PspSetPrimaryToken: Fix some incorrect object dereferencing. - WlxStartApplication: Fix handle leaks. - Make userinit.exe exit when it's done everything. No need to wait for explorer to exit first.
by jmorlan＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: jmorlan Date: Fri Aug 1 11:54:14 2008 New Revision: 35013 URL: http://svn.reactos.org/svn/reactos?rev=35013&view=rev Log: - PspSetPrimaryToken: Fix some incorrect object dereferencing. - WlxStartApplication: Fix handle leaks. - Make userinit.exe exit when it's done everything. No need to wait for explorer to exit first. Modified: trunk/reactos/base/system/userinit/userinit.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Fri Aug 1 11:54:14 2008 @@ -263,7 +263,6 @@ StartAutoApplications(CSIDL_STARTUP); StartAutoApplications(CSIDL_COMMON_STARTUP); - WaitForSingleObject(pi.hProcess, INFINITE); CloseHandle(pi.hProcess); CloseHandle(pi.hThread); return TRUE; Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Fri Aug 1 11:54:14 2008 @@ -247,6 +247,8 @@ CurrentDirectory, &StartupInfo, &ProcessInformation); + CloseHandle(ProcessInformation.hProcess); + CloseHandle(ProcessInformation.hThread); CloseHandle(hAppToken); if (!ret) WARN("CreateProcessAsUserW() failed with error %lu\n", GetLastError()); Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] Fri Aug 1 11:54:14 2008 @@ -255,7 +255,7 @@ PreviousMode)) { /* Failed, dereference */ - if (TokenHandle) ObDereferenceObject(Token); + if (TokenHandle) ObDereferenceObject(NewToken); return STATUS_PRIVILEGE_NOT_HELD; } } @@ -311,13 +311,10 @@ STANDARD_RIGHTS_ALL | PROCESS_SET_QUOTA); } - - /* Dereference the process */ - ObDereferenceObject(Process); } /* Dereference the token */ - if (Token) ObDereferenceObject(NewToken); + if (TokenHandle) ObDereferenceObject(NewToken); return Status; }

1 0

[sginsberg] 35012: - Use macros instead of magic "1" and "2" for Setup Loader Block Flags - Initialize AcpiTableDetected to FALSE - Misc header fixes
by sginsberg＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: sginsberg Date: Fri Aug 1 11:47:17 2008 New Revision: 35012 URL: http://svn.reactos.org/svn/reactos?rev=35012&view=rev Log: - Use macros instead of magic "1" and "2" for Setup Loader Block Flags - Initialize AcpiTableDetected to FALSE - Misc header fixes Modified: trunk/reactos/include/reactos/arc/arc.h trunk/reactos/include/reactos/arc/setupblk.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] Fri Aug 1 11:47:17 2008 @@ -412,7 +412,8 @@ { ULONG FirmwareTypeEfi:1; ULONG Reserved:31; - union { + union + { EFI_FIRMWARE_INFORMATION EfiInformation; PCAT_FIRMWARE_INFORMATION PcatInformation; } u; @@ -447,7 +448,7 @@ { I386_LOADER_BLOCK I386; ALPHA_LOADER_BLOCK Alpha; - IA64_LOADER_BLOCK Ia64; + IA64_LOADER_BLOCK IA64; PPC_LOADER_BLOCK PowerPC; ARM_LOADER_BLOCK Arm; } u; Modified: trunk/reactos/include/reactos/arc/setupblk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/setupb… ============================================================================== --- trunk/reactos/include/reactos/arc/setupblk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arc/setupblk.h [iso-8859-1] Fri Aug 1 11:47:17 2008 @@ -1,5 +1,11 @@ #ifndef _SETUPBLK_ #define _SETUPBLK_ + +// +// Setup Flags +// +#define SETUPLDR_TEXT_MODE 0x1 +#define SETUPLDR_REMOTE_BOOT 0x2 // // Type of file described in DETECTED_DEVICE_FILE Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=350… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Fri Aug 1 11:47:17 2008 @@ -869,10 +869,10 @@ if (LoaderBlock->SetupLdrBlock) { /* Check if this is text-mode setup */ - if (LoaderBlock->SetupLdrBlock->Flags & 1) ExpInTextModeSetup = TRUE; + if (LoaderBlock->SetupLdrBlock->Flags & SETUPLDR_TEXT_MODE) ExpInTextModeSetup = TRUE; /* Check if this is network boot */ - if (LoaderBlock->SetupLdrBlock->Flags & 2) + if (LoaderBlock->SetupLdrBlock->Flags & SETUPLDR_REMOTE_BOOT) { /* Set variable */ IoRemoteBootClient = TRUE; Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Fri Aug 1 11:47:17 2008 @@ -31,7 +31,7 @@ /* FreeLDR Loader Data */ PROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock; -BOOLEAN AcpiTableDetected; +BOOLEAN AcpiTableDetected = FALSE; ADDRESS_RANGE KeMemoryMap[64]; ULONG KeMemoryMapRangeCount; @@ -1187,7 +1187,7 @@ if (LoaderBlock->SetupLdrBlock) { /* All we'll setup right now is the flag for text-mode setup */ - LoaderBlock->SetupLdrBlock->Flags = 1; + LoaderBlock->SetupLdrBlock->Flags = SETUPLDR_TEXT_MODE; } /* Make a copy of the command line */

1 0

[sginsberg] 35011: - Revert 35008
by sginsberg＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: sginsberg Date: Fri Aug 1 11:29:40 2008 New Revision: 35011 URL: http://svn.reactos.org/svn/reactos?rev=35011&view=rev Log: - Revert 35008 Added: trunk/reactos/dll/win32/acledit/resource.h - copied unchanged from r35006, trunk/reactos/dll/win32/acledit/resource.h Removed: trunk/reactos/dll/win32/beepmidi/beepmidi.h trunk/reactos/dll/win32/dhcpcsvc/dhcpsvc.h trunk/reactos/dll/win32/lsasrv/precomp.h trunk/reactos/dll/win32/uext2/precomp.h trunk/reactos/dll/win32/ufat/precomp.h trunk/reactos/dll/win32/untfs/precomp.h trunk/reactos/dll/win32/wsock32/wsock32.h Modified: trunk/reactos/dll/win32/acledit/acledit.c trunk/reactos/dll/win32/acledit/acledit.rbuild trunk/reactos/dll/win32/acledit/acledit.rc trunk/reactos/dll/win32/acledit/acleditint.h trunk/reactos/dll/win32/acledit/stubs.c trunk/reactos/dll/win32/beepmidi/beepmidi.c trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild trunk/reactos/dll/win32/cards/cards.c trunk/reactos/dll/win32/cards/cards.h trunk/reactos/dll/win32/cards/cards.rbuild trunk/reactos/dll/win32/cards/cards.rc trunk/reactos/dll/win32/crtdll/dllmain.c trunk/reactos/dll/win32/crtdll/precomp.h trunk/reactos/dll/win32/dbghelp/pe_module.c trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild trunk/reactos/dll/win32/lpk/lpk.rbuild trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild trunk/reactos/dll/win32/uext2/uext2.c trunk/reactos/dll/win32/uext2/uext2.rbuild trunk/reactos/dll/win32/ufat/ufat.c trunk/reactos/dll/win32/ufat/ufat.rbuild trunk/reactos/dll/win32/untfs/untfs.c trunk/reactos/dll/win32/untfs/untfs.rbuild trunk/reactos/dll/win32/ws2help/ws2help.rbuild trunk/reactos/dll/win32/wshirda/wshirda.rbuild trunk/reactos/dll/win32/wshtcpip/wshtcpip.rbuild trunk/reactos/dll/win32/wsock32/stubs.c trunk/reactos/dll/win32/wsock32/wsock32.rbuild Modified: trunk/reactos/dll/win32/acledit/acledit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/acledit.… ============================================================================== --- trunk/reactos/dll/win32/acledit/acledit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/acledit.c [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -29,8 +29,9 @@ * UPDATE HISTORY: * 07/09/2004 Created */ - +#include <windows.h> #include "acleditint.h" +#include "resource.h" HINSTANCE hDllInstance; Modified: trunk/reactos/dll/win32/acledit/acledit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/acledit.… ============================================================================== --- trunk/reactos/dll/win32/acledit/acledit.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/acledit.rbuild [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -8,7 +8,6 @@ <library>kernel32</library> <library>advapi32</library> <library>user32</library> - <pch>acleditint.h</pch> <file>acledit.c</file> <file>stubs.c</file> <file>acledit.rc</file> Modified: trunk/reactos/dll/win32/acledit/acledit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/acledit.… ============================================================================== --- trunk/reactos/dll/win32/acledit/acledit.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/acledit.rc [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -1,4 +1,5 @@ -#include "acleditint.h" +#include <windows.h> +#include "resource.h" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Access Control Editor\0" Modified: trunk/reactos/dll/win32/acledit/acleditint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/aclediti… ============================================================================== --- trunk/reactos/dll/win32/acledit/acleditint.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/acleditint.h [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -1,9 +1,5 @@ #ifndef __ACLEDITINT_H #define __ACLEDITINT_H - -#include <windows.h> - -#define IDI_DEVMGR 100 extern HINSTANCE hDllInstance; Modified: trunk/reactos/dll/win32/acledit/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/acledit/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/stubs.c [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -13,7 +13,7 @@ * UPDATE HISTORY: * 07/09/2004 Created */ - +#include <windows.h> #include "acleditint.h" ULONG DbgPrint(PCH Format,...); Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -40,7 +40,16 @@ */ #define CONTINUOUS_NOTES -#include <beepmidi.h> +#define WIN32_NO_STATUS +#define NTOS_MODE_USER +#include <windows.h> +#include <ndk/ntndk.h> +#include <stdio.h> +#include <ntddbeep.h> +#include <math.h> + +#include <mmddk.h> +#include <mmsystem.h> /*#define DPRINT printf*/ #define DPRINT FakePrintf Removed: trunk/reactos/dll/win32/beepmidi/beepmidi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== Binary file - no diff available. Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -5,6 +5,5 @@ <library>kernel32</library> <library>user32</library> <library>winmm</library> - <pch>beepmidi.h</pch> <file>beepmidi.c</file> </module> Modified: trunk/reactos/dll/win32/cards/cards.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.c?re… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.c [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -18,6 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <stdarg.h> + +#include "windows.h" #include "cards.h" HBITMAP g_CardBitmaps[MAX_CARD_BITMAPS]; Modified: trunk/reactos/dll/win32/cards/cards.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.h?re… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.h [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -20,9 +20,6 @@ #ifndef _CARDS_H #define _CARDS_H - -#include <stdarg.h> -#include "windows.h" /* * 52 card faces + Modified: trunk/reactos/dll/win32/cards/cards.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rbui… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.rbuild [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -8,7 +8,6 @@ <library>kernel32</library> <library>gdi32</library> <library>user32</library> - <pch>cards.h</pch> <file>cards.c</file> <file>cards.rc</file> </module> Modified: trunk/reactos/dll/win32/cards/cards.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rc?r… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.rc [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "cards.h" +#include <windows.h> #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Cardplaying Helper DLL\0" Modified: trunk/reactos/dll/win32/crtdll/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/dllmain.c… ============================================================================== --- trunk/reactos/dll/win32/crtdll/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/dllmain.c [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -17,7 +17,12 @@ */ #include <precomp.h> - +#include <internal/wine/msvcrt.h> +#include <sys/stat.h> +#include <locale.h> +#include <mbctype.h> + +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(crtdll); Modified: trunk/reactos/dll/win32/crtdll/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/crtdll/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/precomp.h [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -5,11 +5,5 @@ #include <windows.h> #include <internal/tls.h> #include <stdlib.h> -#include <internal/wine/msvcrt.h> -#include <sys/stat.h> -#include <locale.h> -#include <mbctype.h> - -#include "wine/debug.h" #endif /* _CRT_PRECOMP_H */ Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -138,7 +138,7 @@ else WINE_ERR("-Unable to peruse .DBG file %s (%s)\n", dbg_name, debugstr_a(tmp)); - if (dbg_mapping) UnmapViewOfFile((PVOID)dbg_mapping); + if (dbg_mapping) UnmapViewOfFile(dbg_mapping); if (hMap) CloseHandle(hMap); if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); return ret; @@ -266,7 +266,7 @@ for (j = 0; j < exports->NumberOfNames; j++) if ((ordinals[j] == i) && names[j]) break; if (j < exports->NumberOfNames) continue; - snprintf(buffer, sizeof(buffer), "%lu", i + exports->Base); + snprintf(buffer, sizeof(buffer), "%d", i + exports->Base); symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1, TRUE /* FIXME */, TRUE /* FIXME */); } Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcpcsv… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -6,7 +6,11 @@ * COPYRIGHT: Copyright 2005 Art Yerkes <ayerkes(a)speakeasy.net> */ -#include <dhcpsvc.h> +#include <roscfg.h> +#include <winsock2.h> +#include <dhcpcsdk.h> +#include <time.h> +#include <dhcp/rosdhcp_public.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcpcsv… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -8,7 +8,6 @@ <library>msvcrt</library> <library>ws2_32</library> <library>iphlpapi</library> - <pch>dhcpsvc.h</pch> <file>dhcpcsvc.c</file> <file>dhcpcsvc.rc</file> <file>dhcpcsvc.spec</file> Removed: trunk/reactos/dll/win32/dhcpcsvc/dhcpsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcpsvc… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcpsvc.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcpsvc.h (removed) @@ -1,10 +1,0 @@ -#ifndef _DHCPSVC_H_ -#define _DHCPSVC_H_ - -#include <roscfg.h> -#include <winsock2.h> -#include <dhcpcsdk.h> -#include <time.h> -#include <dhcp/rosdhcp_public.h> - -#endif Modified: trunk/reactos/dll/win32/lpk/lpk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/lpk.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/lpk/lpk.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lpk/lpk.rbuild [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -9,7 +9,7 @@ <library>kernel32</library> <library>user32</library> <library>usp10</library> - <pch>ros_lpk.h</pch> + <file>dllmain.c</file> <file>stub.c</file> Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -1,6 +1,13 @@ /* INCLUDES ****************************************************************/ -#include "precomp.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <ntsecapi.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +#include "lsa_s.h" + #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -1,4 +1,8 @@ -#include "precomp.h" +#define WIN32_NO_STATUS +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rb… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -9,7 +9,6 @@ <library>kernel32</library> <library>rpcrt4</library> <library>pseh</library> - <pch>precomp.h</pch> <file>lsarpc.c</file> <file>lsasrv.c</file> <file>lsasrv.rc</file> Removed: trunk/reactos/dll/win32/lsasrv/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/precomp.h (removed) @@ -1,7 +1,0 @@ -#define WIN32_NO_STATUS -#include <windows.h> -#include <ntsecapi.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - -#include "lsa_s.h" Removed: trunk/reactos/dll/win32/uext2/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/uext2/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uext2/precomp.h (removed) @@ -1,5 +1,0 @@ -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <fmifs/fmifs.h> Modified: trunk/reactos/dll/win32/uext2/uext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/uext2.c?re… ============================================================================== --- trunk/reactos/dll/win32/uext2/uext2.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uext2/uext2.c [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -7,7 +7,11 @@ * PROGRAMMERS: Pierre Schweitzer */ -#include "precomp.h" +#define WIN32_NO_STATUS +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <fmifs/fmifs.h> INT WINAPI DllMain( Modified: trunk/reactos/dll/win32/uext2/uext2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/uext2.rbui… ============================================================================== --- trunk/reactos/dll/win32/uext2/uext2.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uext2/uext2.rbuild [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -5,7 +5,6 @@ <define name="_WIN32_WINNT">0x0600</define> <library>ext2lib</library> <library>ntdll</library> - <pch>precomp.h</pch> <file>uext2.c</file> <file>uext2.rc</file> </module> Removed: trunk/reactos/dll/win32/ufat/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufat/precomp.h?r… ============================================================================== --- trunk/reactos/dll/win32/ufat/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufat/precomp.h (removed) @@ -1,5 +1,0 @@ -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <fmifs/fmifs.h> Modified: trunk/reactos/dll/win32/ufat/ufat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufat/ufat.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ufat/ufat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufat/ufat.c [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -7,7 +7,11 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ -#include "precomp.h" +#define WIN32_NO_STATUS +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <fmifs/fmifs.h> INT WINAPI DllMain( Modified: trunk/reactos/dll/win32/ufat/ufat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufat/ufat.rbuild… ============================================================================== --- trunk/reactos/dll/win32/ufat/ufat.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufat/ufat.rbuild [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -5,7 +5,6 @@ <define name="_WIN32_WINNT">0x0600</define> <library>vfatlib</library> <library>ntdll</library> - <pch>precomp.h</pch> <file>ufat.c</file> <file>ufat.rc</file> </module> Removed: trunk/reactos/dll/win32/untfs/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/untfs/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/untfs/precomp.h (removed) @@ -1,5 +1,0 @@ -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <fmifs/fmifs.h> Modified: trunk/reactos/dll/win32/untfs/untfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.c?re… ============================================================================== --- trunk/reactos/dll/win32/untfs/untfs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/untfs/untfs.c [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -7,7 +7,11 @@ * PROGRAMMERS: Pierre Schweitzer */ -#include "precomp.h" +#define WIN32_NO_STATUS +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <fmifs/fmifs.h> INT WINAPI DllMain( Modified: trunk/reactos/dll/win32/untfs/untfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.rbui… ============================================================================== --- trunk/reactos/dll/win32/untfs/untfs.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/untfs/untfs.rbuild [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -5,7 +5,6 @@ <define name="_WIN32_WINNT">0x0600</define> <library>ntfslib</library> <library>ntdll</library> - <pch>precomp.h</pch> <file>untfs.c</file> <file>untfs.rc</file> </module> Modified: trunk/reactos/dll/win32/ws2help/ws2help.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/ws2help.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -5,7 +5,6 @@ <library>ntdll</library> <library>kernel32</library> <library>ws2_32</library> - <pch>ws2help.h</pch> <file>ws2help.c</file> <file>ws2help.rc</file> </module> Modified: trunk/reactos/dll/win32/wshirda/wshirda.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshirda/wshirda.… ============================================================================== --- trunk/reactos/dll/win32/wshirda/wshirda.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshirda/wshirda.rbuild [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -5,7 +5,6 @@ <library>ntdll</library> <library>kernel32</library> <library>ws2_32</library> - <pch>wshirda.h</pch> <file>wshirda.c</file> <file>wshirda.rc</file> </module> Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/wshtcpi… ============================================================================== --- trunk/reactos/dll/win32/wshtcpip/wshtcpip.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshtcpip/wshtcpip.rbuild [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -6,7 +6,6 @@ <library>ntdll</library> <library>kernel32</library> <library>ws2_32</library> - <pch>wshtcpip.h</pch> <file>wshtcpip.c</file> <file>wshtcpip.rc</file> </module> Modified: trunk/reactos/dll/win32/wsock32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wsock32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/wsock32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wsock32/stubs.c [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -1,4 +1,5 @@ -/* +/* $Id$ + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock DLL * FILE: stubs.c @@ -6,8 +7,9 @@ * PROGRAMMERS: Ge van Geldorp (ge(a)gse.nl) * REVISIONS: */ - -#include "wsock32.h" +#include <winsock2.h> +#include <windows.h> +//#include <stdlib.h> /* * @unimplemented Removed: trunk/reactos/dll/win32/wsock32/wsock32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wsock32/wsock32.… ============================================================================== --- trunk/reactos/dll/win32/wsock32/wsock32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wsock32/wsock32.h (removed) @@ -1,2 +1,0 @@ -#include <winsock2.h> -#include <windows.h> Modified: trunk/reactos/dll/win32/wsock32/wsock32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wsock32/wsock32.… ============================================================================== --- trunk/reactos/dll/win32/wsock32/wsock32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wsock32/wsock32.rbuild [iso-8859-1] Fri Aug 1 11:29:40 2008 @@ -4,7 +4,6 @@ <library>ntdll</library> <library>kernel32</library> <library>ws2_32</library> - <pch>wsock32.h</pch> <file>stubs.c</file> <file>wsock32.rc</file> </module>

1 0

[sginsberg] 35010: - Get rid of a confusing goto and call KiUnwaitThread directly. This was a remnant of some code refactoring.
by sginsberg＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: sginsberg Date: Fri Aug 1 11:03:49 2008 New Revision: 35010 URL: http://svn.reactos.org/svn/reactos?rev=35010&view=rev Log: - Get rid of a confusing goto and call KiUnwaitThread directly. This was a remnant of some code refactoring. Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3501… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Fri Aug 1 11:03:49 2008 @@ -207,7 +207,6 @@ Status = STATUS_KERNEL_APC; /* Wake up the thread */ -Unwait: KiUnwaitThread(Thread, Status, PriorityBoost); } else if (Thread->State == GateWait) @@ -240,7 +239,9 @@ /* Set user-mode APC pending */ Thread->ApcState.UserApcPending = TRUE; Status = STATUS_USER_APC; - goto Unwait; + + /* Wake up the thread */ + KiUnwaitThread(Thread, Status, PriorityBoost); } /* Release dispatcher lock */

1 0

[sginsberg] 35009: - Fix broken VideoPortSignalDmaComplete definition - Cleanup and reformat dma.c and add missing functions (not yet exported)
by sginsberg＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: sginsberg Date: Fri Aug 1 09:54:19 2008 New Revision: 35009 URL: http://svn.reactos.org/svn/reactos?rev=35009&view=rev Log: - Fix broken VideoPortSignalDmaComplete definition - Cleanup and reformat dma.c and add missing functions (not yet exported) Modified: trunk/reactos/drivers/video/videoprt/dma.c trunk/reactos/include/ddk/video.h Modified: trunk/reactos/drivers/video/videoprt/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dma… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dma.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/dma.c [iso-8859-1] Fri Aug 1 09:54:19 2008 @@ -1,143 +1,274 @@ /* - * VideoPort driver - * - * Copyright (C) 2002, 2003, 2004 ReactOS Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; see the file COPYING.LIB. - * If not, write to the Free Software Foundation, - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#include "videoprt.h" + * PROJECT: ReactOS Videoport + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/video/videoprt/dma.c + * PURPOSE: Videoport Direct Memory Access Support + * PROGRAMMERS: ... + */ + +/* INCLUDES ******************************************************************/ + +#include <videoprt.h> +#define NDEBUG +#include <debug.h> /* PUBLIC FUNCTIONS ***********************************************************/ /* * @implemented */ - -PVOID NTAPI -VideoPortAllocateCommonBuffer( - IN PVOID HwDeviceExtension, - IN PVP_DMA_ADAPTER VpDmaAdapter, - IN ULONG DesiredLength, - OUT PPHYSICAL_ADDRESS LogicalAddress, - IN BOOLEAN CacheEnabled, - PVOID Reserved) -{ - return HalAllocateCommonBuffer( - (PADAPTER_OBJECT)VpDmaAdapter, - DesiredLength, - LogicalAddress, - CacheEnabled); -} - -/* - * @implemented - */ - -VOID NTAPI -VideoPortReleaseCommonBuffer( - IN PVOID HwDeviceExtension, - IN PVP_DMA_ADAPTER VpDmaAdapter, - IN ULONG Length, - IN PHYSICAL_ADDRESS LogicalAddress, - IN PVOID VirtualAddress, - IN BOOLEAN CacheEnabled) -{ - HalFreeCommonBuffer( - (PADAPTER_OBJECT)VpDmaAdapter, - Length, - LogicalAddress, - VirtualAddress, - CacheEnabled); -} - -/* - * @unimplemented - */ - -VOID NTAPI -VideoPortPutDmaAdapter( - IN PVOID HwDeviceExtension, - IN PVP_DMA_ADAPTER VpDmaAdapter) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ - -PVP_DMA_ADAPTER NTAPI -VideoPortGetDmaAdapter( - IN PVOID HwDeviceExtension, - IN PVP_DEVICE_DESCRIPTION VpDeviceExtension) -{ - DEVICE_DESCRIPTION DeviceDescription; - PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; - ULONG NumberOfMapRegisters; - PVP_DMA_ADAPTER Adapter; - - DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); - - TRACE_(VIDEOPRT, "VideoPortGetDmaAdapter\n"); - - DeviceDescription.Version = DEVICE_DESCRIPTION_VERSION; - DeviceDescription.Master = TRUE /* ?? */; - DeviceDescription.ScatterGather = VpDeviceExtension->ScatterGather; - DeviceDescription.DemandMode = FALSE /* ?? */; - DeviceDescription.AutoInitialize = FALSE /* ?? */; - DeviceDescription.Dma32BitAddresses = VpDeviceExtension->Dma32BitAddresses; - DeviceDescription.IgnoreCount = FALSE /* ?? */; - DeviceDescription.Reserved1 = FALSE; - DeviceDescription.BusNumber = DeviceExtension->SystemIoBusNumber; - DeviceDescription.DmaChannel = 0 /* ?? */; - DeviceDescription.InterfaceType = DeviceExtension->AdapterInterfaceType; - DeviceDescription.DmaWidth = Width8Bits; - DeviceDescription.DmaSpeed = Compatible; - DeviceDescription.MaximumLength = VpDeviceExtension->MaximumLength; - DeviceDescription.DmaPort = 0; - - Adapter = - (PVP_DMA_ADAPTER)HalGetAdapter(&DeviceDescription, &NumberOfMapRegisters); - INFO_(VIDEOPRT, "Adapter %p\n", Adapter); - return(Adapter); -} - -/* - * @implemented - */ -VOID NTAPI -VideoPortFreeCommonBuffer( IN PVOID HwDeviceExtension, - IN ULONG Length, - IN PVOID VirtualAddress, - IN PHYSICAL_ADDRESS LogicalAddress, - IN BOOLEAN CacheEnabled) -{ - DEVICE_DESCRIPTION DeviceDescription; - PVP_DMA_ADAPTER VpDmaAdapter; - - VpDmaAdapter = VideoPortGetDmaAdapter( - HwDeviceExtension, - (PVP_DEVICE_DESCRIPTION)&DeviceDescription); - - HalFreeCommonBuffer( - (PADAPTER_OBJECT)VpDmaAdapter, - Length, - LogicalAddress, - VirtualAddress, - CacheEnabled); -} +PVOID +NTAPI +VideoPortAllocateCommonBuffer(IN PVOID HwDeviceExtension, + IN PVP_DMA_ADAPTER VpDmaAdapter, + IN ULONG DesiredLength, + OUT PPHYSICAL_ADDRESS LogicalAddress, + IN BOOLEAN CacheEnabled, + PVOID Reserved) +{ + /* Forward to HAL */ + return HalAllocateCommonBuffer((PADAPTER_OBJECT)VpDmaAdapter, + DesiredLength, + LogicalAddress, + CacheEnabled); +} + +/* + * @implemented + */ +VOID +NTAPI +VideoPortReleaseCommonBuffer(IN PVOID HwDeviceExtension, + IN PVP_DMA_ADAPTER VpDmaAdapter, + IN ULONG Length, + IN PHYSICAL_ADDRESS LogicalAddress, + IN PVOID VirtualAddress, + IN BOOLEAN CacheEnabled) +{ + /* Forward to HAL */ + HalFreeCommonBuffer((PADAPTER_OBJECT)VpDmaAdapter, + Length, + LogicalAddress, + VirtualAddress, + CacheEnabled); +} + +/* + * @unimplemented + */ +VOID +NTAPI +VideoPortPutDmaAdapter(IN PVOID HwDeviceExtension, + IN PVP_DMA_ADAPTER VpDmaAdapter) +{ + UNIMPLEMENTED; +} + +/* + * @implemented + */ +PVP_DMA_ADAPTER +NTAPI +VideoPortGetDmaAdapter(IN PVOID HwDeviceExtension, + IN PVP_DEVICE_DESCRIPTION VpDeviceExtension) +{ + DEVICE_DESCRIPTION DeviceDescription; + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); + ULONG NumberOfMapRegisters; + + /* Zero the structure */ + RtlZeroMemory(&DeviceDescription, + sizeof(DEVICE_DESCRIPTION)); + + /* Initialize the structure */ + DeviceDescription.Version = DEVICE_DESCRIPTION_VERSION; + DeviceDescription.Master = TRUE /* ?? */; + DeviceDescription.DmaWidth = Width8Bits; + DeviceDescription.DmaSpeed = Compatible; + + /* Copy data from caller's device extension */ + DeviceDescription.ScatterGather = VpDeviceExtension->ScatterGather; + DeviceDescription.Dma32BitAddresses = VpDeviceExtension->Dma32BitAddresses; + DeviceDescription.Dma64BitAddresses = VpDeviceExtension->Dma64BitAddresses; + DeviceDescription.MaximumLength = VpDeviceExtension->MaximumLength; + + /* Copy data from the internal device extension */ + DeviceDescription.BusNumber = DeviceExtension->SystemIoBusNumber; + DeviceDescription.InterfaceType = DeviceExtension->AdapterInterfaceType; + + return (PVP_DMA_ADAPTER)HalGetAdapter(&DeviceDescription, + &NumberOfMapRegisters); +} + +/* + * @implemented + */ +VOID +NTAPI +VideoPortFreeCommonBuffer(IN PVOID HwDeviceExtension, + IN ULONG Length, + IN PVOID VirtualAddress, + IN PHYSICAL_ADDRESS LogicalAddress, + IN BOOLEAN CacheEnabled) +{ + DEVICE_DESCRIPTION DeviceDescription; + PVP_DMA_ADAPTER VpDmaAdapter; + + /* FIXME: Broken code*/ + VpDmaAdapter = VideoPortGetDmaAdapter(HwDeviceExtension, + (PVP_DEVICE_DESCRIPTION)&DeviceDescription); + HalFreeCommonBuffer((PADAPTER_OBJECT)VpDmaAdapter, + Length, + LogicalAddress, + VirtualAddress, + CacheEnabled); +} + +/* + * @unimplemented + */ +PVOID +NTAPI +VideoPortGetCommonBuffer(IN PVOID HwDeviceExtension, + IN ULONG DesiredLength, + IN ULONG Alignment, + OUT PPHYSICAL_ADDRESS LogicalAddress, + OUT PULONG pActualLength, + IN BOOLEAN CacheEnabled) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +VideoPortUnmapDmaMemory( + PVOID HwDeviceExtension, + PVOID VirtualAddress, + HANDLE ProcessHandle, + PDMA BoardMemoryHandle) +{ + /* Deprecated */ + return FALSE; +} + +/* + * @implemented + */ +PDMA +NTAPI +VideoPortMapDmaMemory(IN PVOID HwDeviceExtension, + IN PVIDEO_REQUEST_PACKET pVrp, + IN PHYSICAL_ADDRESS BoardAddress, + IN PULONG Length, + IN PULONG InIoSpace, + IN PVOID MappedUserEvent, + IN PVOID DisplayDriverEvent, + IN OUT PVOID *VirtualAddress) +{ + /* Deprecated */ + return NULL; +} + +/* + * @implemented + */ +VOID +NTAPI +VideoPortSetDmaContext(IN PVOID HwDeviceExtension, + OUT PDMA pDma, + IN PVOID InstanceContext) +{ + /* Deprecated */ + return; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +VideoPortSignalDmaComplete(IN PVOID HwDeviceExtension, + IN PDMA pDmaHandle) +{ + /* Deprecated */ + return FALSE; +} + +/* + * @unimplemented + */ +VP_STATUS +NTAPI +VideoPortStartDma(IN PVOID HwDeviceExtension, + IN PVP_DMA_ADAPTER VpDmaAdapter, + IN PVOID Mdl, + IN ULONG Offset, + IN OUT PULONG pLength, + IN PEXECUTE_DMA ExecuteDmaRoutine, + IN PVOID Context, + IN BOOLEAN WriteToDevice) +{ + UNIMPLEMENTED; + + /* Lie and return success */ + return NO_ERROR; +} + +/* + * @implemented + */ +PVOID +NTAPI +VideoPortGetDmaContext(IN PVOID HwDeviceExtension, + IN PDMA pDma) +{ + /* Deprecated */ + return NULL; +} + +/* + * @implemented + */ +PDMA +NTAPI +VideoPortDoDma(IN PVOID HwDeviceExtension, + IN PDMA pDma, + IN DMA_FLAGS DmaFlags) +{ + /* Deprecated */ + return NULL; +} + +/* + * @unimplemented + */ +PDMA +NTAPI +VideoPortAssociateEventsWithDmaHandle(IN PVOID HwDeviceExtension, + IN OUT PVIDEO_REQUEST_PACKET pVrp, + IN PVOID MappedUserEvent, + IN PVOID DisplayDriverEvent) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +VP_STATUS +NTAPI +VideoPortCompleteDma(IN PVOID HwDeviceExtension, + IN PVP_DMA_ADAPTER VpDmaAdapter, + IN PVP_SCATTER_GATHER_LIST VpScatterGather, + IN BOOLEAN WriteToDevice) +{ + UNIMPLEMENTED; + + /* Lie and return success */ + return NO_ERROR; +} Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=35… ============================================================================== --- trunk/reactos/include/ddk/video.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/video.h [iso-8859-1] Fri Aug 1 09:54:19 2008 @@ -1348,7 +1348,7 @@ DDKAPI VideoPortSignalDmaComplete( IN PVOID HwDeviceExtension, - IN PVOID pDmaHandle); + IN PDMA pDmaHandle); VPAPI VOID

1 0

[sginsberg] 35008: - PCHify Acledit, Beepmidi, Cards, Crtdll, Dhcpsvc, Lpk, Lsasrv, uext2, ufat, untfs, ws2help, wshtcpip, and wsock32
by sginsberg＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: sginsberg Date: Fri Aug 1 09:27:43 2008 New Revision: 35008 URL: http://svn.reactos.org/svn/reactos?rev=35008&view=rev Log: - PCHify Acledit, Beepmidi, Cards, Crtdll, Dhcpsvc, Lpk, Lsasrv, uext2, ufat, untfs, ws2help, wshtcpip, and wsock32 Added: trunk/reactos/dll/win32/beepmidi/beepmidi.h (with props) trunk/reactos/dll/win32/dhcpcsvc/dhcpsvc.h (with props) trunk/reactos/dll/win32/lsasrv/precomp.h (with props) trunk/reactos/dll/win32/uext2/precomp.h (with props) trunk/reactos/dll/win32/ufat/precomp.h (with props) trunk/reactos/dll/win32/untfs/precomp.h (with props) trunk/reactos/dll/win32/wsock32/wsock32.h (with props) Removed: trunk/reactos/dll/win32/acledit/resource.h Modified: trunk/reactos/dll/win32/acledit/acledit.c trunk/reactos/dll/win32/acledit/acledit.rbuild trunk/reactos/dll/win32/acledit/acledit.rc trunk/reactos/dll/win32/acledit/acleditint.h trunk/reactos/dll/win32/acledit/stubs.c trunk/reactos/dll/win32/beepmidi/beepmidi.c trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild trunk/reactos/dll/win32/cards/cards.c trunk/reactos/dll/win32/cards/cards.h trunk/reactos/dll/win32/cards/cards.rbuild trunk/reactos/dll/win32/cards/cards.rc trunk/reactos/dll/win32/crtdll/dllmain.c trunk/reactos/dll/win32/crtdll/precomp.h trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild trunk/reactos/dll/win32/lpk/lpk.rbuild trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild trunk/reactos/dll/win32/uext2/uext2.c trunk/reactos/dll/win32/uext2/uext2.rbuild trunk/reactos/dll/win32/ufat/ufat.c trunk/reactos/dll/win32/ufat/ufat.rbuild trunk/reactos/dll/win32/untfs/untfs.c trunk/reactos/dll/win32/untfs/untfs.rbuild trunk/reactos/dll/win32/ws2help/ws2help.rbuild trunk/reactos/dll/win32/wshirda/wshirda.rbuild trunk/reactos/dll/win32/wshtcpip/wshtcpip.rbuild trunk/reactos/dll/win32/wsock32/stubs.c trunk/reactos/dll/win32/wsock32/wsock32.rbuild Modified: trunk/reactos/dll/win32/acledit/acledit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/acledit.… ============================================================================== --- trunk/reactos/dll/win32/acledit/acledit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/acledit.c [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -29,9 +29,8 @@ * UPDATE HISTORY: * 07/09/2004 Created */ -#include <windows.h> + #include "acleditint.h" -#include "resource.h" HINSTANCE hDllInstance; Modified: trunk/reactos/dll/win32/acledit/acledit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/acledit.… ============================================================================== --- trunk/reactos/dll/win32/acledit/acledit.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/acledit.rbuild [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -8,6 +8,7 @@ <library>kernel32</library> <library>advapi32</library> <library>user32</library> + <pch>acleditint.h</pch> <file>acledit.c</file> <file>stubs.c</file> <file>acledit.rc</file> Modified: trunk/reactos/dll/win32/acledit/acledit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/acledit.… ============================================================================== --- trunk/reactos/dll/win32/acledit/acledit.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/acledit.rc [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -1,5 +1,4 @@ -#include <windows.h> -#include "resource.h" +#include "acleditint.h" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Access Control Editor\0" Modified: trunk/reactos/dll/win32/acledit/acleditint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/aclediti… ============================================================================== --- trunk/reactos/dll/win32/acledit/acleditint.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/acleditint.h [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -1,5 +1,9 @@ #ifndef __ACLEDITINT_H #define __ACLEDITINT_H + +#include <windows.h> + +#define IDI_DEVMGR 100 extern HINSTANCE hDllInstance; Removed: trunk/reactos/dll/win32/acledit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/resource… ============================================================================== --- trunk/reactos/dll/win32/acledit/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/resource.h (removed) @@ -1,8 +1,0 @@ -#ifndef __DEVMGR_RESOURCE_H -#define __DEVMGR_RESOURCE_H - -#define IDI_DEVMGR 100 - -#endif /* __DEVMGR_RESOURCE_H */ - -/* EOF */ Modified: trunk/reactos/dll/win32/acledit/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/acledit/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/stubs.c [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -13,7 +13,7 @@ * UPDATE HISTORY: * 07/09/2004 Created */ -#include <windows.h> + #include "acleditint.h" ULONG DbgPrint(PCH Format,...); Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -40,16 +40,7 @@ */ #define CONTINUOUS_NOTES -#define WIN32_NO_STATUS -#define NTOS_MODE_USER -#include <windows.h> -#include <ndk/ntndk.h> -#include <stdio.h> -#include <ntddbeep.h> -#include <math.h> - -#include <mmddk.h> -#include <mmsystem.h> +#include <beepmidi.h> /*#define DPRINT printf*/ #define DPRINT FakePrintf Added: trunk/reactos/dll/win32/beepmidi/beepmidi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/beepmidi/beepmidi.h ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -5,5 +5,6 @@ <library>kernel32</library> <library>user32</library> <library>winmm</library> + <pch>beepmidi.h</pch> <file>beepmidi.c</file> </module> Modified: trunk/reactos/dll/win32/cards/cards.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.c?re… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.c [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -18,9 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <stdarg.h> - -#include "windows.h" #include "cards.h" HBITMAP g_CardBitmaps[MAX_CARD_BITMAPS]; Modified: trunk/reactos/dll/win32/cards/cards.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.h?re… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.h [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -20,6 +20,9 @@ #ifndef _CARDS_H #define _CARDS_H + +#include <stdarg.h> +#include "windows.h" /* * 52 card faces + Modified: trunk/reactos/dll/win32/cards/cards.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rbui… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.rbuild [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -8,6 +8,7 @@ <library>kernel32</library> <library>gdi32</library> <library>user32</library> + <pch>cards.h</pch> <file>cards.c</file> <file>cards.rc</file> </module> Modified: trunk/reactos/dll/win32/cards/cards.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rc?r… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.rc [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <windows.h> +#include "cards.h" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Cardplaying Helper DLL\0" Modified: trunk/reactos/dll/win32/crtdll/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/dllmain.c… ============================================================================== --- trunk/reactos/dll/win32/crtdll/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/dllmain.c [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -17,12 +17,7 @@ */ #include <precomp.h> -#include <internal/wine/msvcrt.h> -#include <sys/stat.h> -#include <locale.h> -#include <mbctype.h> - -#include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(crtdll); Modified: trunk/reactos/dll/win32/crtdll/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/crtdll/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/precomp.h [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -5,5 +5,11 @@ #include <windows.h> #include <internal/tls.h> #include <stdlib.h> +#include <internal/wine/msvcrt.h> +#include <sys/stat.h> +#include <locale.h> +#include <mbctype.h> + +#include "wine/debug.h" #endif /* _CRT_PRECOMP_H */ Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcpcsv… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -6,11 +6,7 @@ * COPYRIGHT: Copyright 2005 Art Yerkes <ayerkes(a)speakeasy.net> */ -#include <roscfg.h> -#include <winsock2.h> -#include <dhcpcsdk.h> -#include <time.h> -#include <dhcp/rosdhcp_public.h> +#include <dhcpsvc.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcpcsv… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -8,6 +8,7 @@ <library>msvcrt</library> <library>ws2_32</library> <library>iphlpapi</library> + <pch>dhcpsvc.h</pch> <file>dhcpcsvc.c</file> <file>dhcpcsvc.rc</file> <file>dhcpcsvc.spec</file> Added: trunk/reactos/dll/win32/dhcpcsvc/dhcpsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcpsvc… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcpsvc.h (added) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcpsvc.h [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -1,0 +1,10 @@ +#ifndef _DHCPSVC_H_ +#define _DHCPSVC_H_ + +#include <roscfg.h> +#include <winsock2.h> +#include <dhcpcsdk.h> +#include <time.h> +#include <dhcp/rosdhcp_public.h> + +#endif Propchange: trunk/reactos/dll/win32/dhcpcsvc/dhcpsvc.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/lpk/lpk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/lpk.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/lpk/lpk.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lpk/lpk.rbuild [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -9,7 +9,7 @@ <library>kernel32</library> <library>user32</library> <library>usp10</library> - + <pch>ros_lpk.h</pch> <file>dllmain.c</file> <file>stub.c</file> Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -1,13 +1,6 @@ /* INCLUDES ****************************************************************/ -#define WIN32_NO_STATUS -#include <windows.h> -#include <ntsecapi.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - -#include "lsa_s.h" - +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -1,8 +1,4 @@ -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> - +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rb… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -9,6 +9,7 @@ <library>kernel32</library> <library>rpcrt4</library> <library>pseh</library> + <pch>precomp.h</pch> <file>lsarpc.c</file> <file>lsasrv.c</file> <file>lsasrv.rc</file> Added: trunk/reactos/dll/win32/lsasrv/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/precomp.h (added) +++ trunk/reactos/dll/win32/lsasrv/precomp.h [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -1,0 +1,7 @@ +#define WIN32_NO_STATUS +#include <windows.h> +#include <ntsecapi.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +#include "lsa_s.h" Propchange: trunk/reactos/dll/win32/lsasrv/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/uext2/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/uext2/precomp.h (added) +++ trunk/reactos/dll/win32/uext2/precomp.h [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -1,0 +1,5 @@ +#define WIN32_NO_STATUS +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <fmifs/fmifs.h> Propchange: trunk/reactos/dll/win32/uext2/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/uext2/uext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/uext2.c?re… ============================================================================== --- trunk/reactos/dll/win32/uext2/uext2.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uext2/uext2.c [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -7,11 +7,7 @@ * PROGRAMMERS: Pierre Schweitzer */ -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <fmifs/fmifs.h> +#include "precomp.h" INT WINAPI DllMain( Modified: trunk/reactos/dll/win32/uext2/uext2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/uext2.rbui… ============================================================================== --- trunk/reactos/dll/win32/uext2/uext2.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uext2/uext2.rbuild [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -5,6 +5,7 @@ <define name="_WIN32_WINNT">0x0600</define> <library>ext2lib</library> <library>ntdll</library> + <pch>precomp.h</pch> <file>uext2.c</file> <file>uext2.rc</file> </module> Added: trunk/reactos/dll/win32/ufat/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufat/precomp.h?r… ============================================================================== --- trunk/reactos/dll/win32/ufat/precomp.h (added) +++ trunk/reactos/dll/win32/ufat/precomp.h [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -1,0 +1,5 @@ +#define WIN32_NO_STATUS +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <fmifs/fmifs.h> Propchange: trunk/reactos/dll/win32/ufat/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/ufat/ufat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufat/ufat.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ufat/ufat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufat/ufat.c [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -7,11 +7,7 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <fmifs/fmifs.h> +#include "precomp.h" INT WINAPI DllMain( Modified: trunk/reactos/dll/win32/ufat/ufat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufat/ufat.rbuild… ============================================================================== --- trunk/reactos/dll/win32/ufat/ufat.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufat/ufat.rbuild [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -5,6 +5,7 @@ <define name="_WIN32_WINNT">0x0600</define> <library>vfatlib</library> <library>ntdll</library> + <pch>precomp.h</pch> <file>ufat.c</file> <file>ufat.rc</file> </module> Added: trunk/reactos/dll/win32/untfs/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/untfs/precomp.h (added) +++ trunk/reactos/dll/win32/untfs/precomp.h [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -1,0 +1,5 @@ +#define WIN32_NO_STATUS +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <fmifs/fmifs.h> Propchange: trunk/reactos/dll/win32/untfs/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/untfs/untfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.c?re… ============================================================================== --- trunk/reactos/dll/win32/untfs/untfs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/untfs/untfs.c [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -7,11 +7,7 @@ * PROGRAMMERS: Pierre Schweitzer */ -#define WIN32_NO_STATUS -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <fmifs/fmifs.h> +#include "precomp.h" INT WINAPI DllMain( Modified: trunk/reactos/dll/win32/untfs/untfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.rbui… ============================================================================== --- trunk/reactos/dll/win32/untfs/untfs.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/untfs/untfs.rbuild [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -5,6 +5,7 @@ <define name="_WIN32_WINNT">0x0600</define> <library>ntfslib</library> <library>ntdll</library> + <pch>precomp.h</pch> <file>untfs.c</file> <file>untfs.rc</file> </module> Modified: trunk/reactos/dll/win32/ws2help/ws2help.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/ws2help.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -5,6 +5,7 @@ <library>ntdll</library> <library>kernel32</library> <library>ws2_32</library> + <pch>ws2help.h</pch> <file>ws2help.c</file> <file>ws2help.rc</file> </module> Modified: trunk/reactos/dll/win32/wshirda/wshirda.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshirda/wshirda.… ============================================================================== --- trunk/reactos/dll/win32/wshirda/wshirda.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshirda/wshirda.rbuild [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -5,6 +5,7 @@ <library>ntdll</library> <library>kernel32</library> <library>ws2_32</library> + <pch>wshirda.h</pch> <file>wshirda.c</file> <file>wshirda.rc</file> </module> Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/wshtcpi… ============================================================================== --- trunk/reactos/dll/win32/wshtcpip/wshtcpip.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshtcpip/wshtcpip.rbuild [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -6,6 +6,7 @@ <library>ntdll</library> <library>kernel32</library> <library>ws2_32</library> + <pch>wshtcpip.h</pch> <file>wshtcpip.c</file> <file>wshtcpip.rc</file> </module> Modified: trunk/reactos/dll/win32/wsock32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wsock32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/wsock32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wsock32/stubs.c [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock DLL * FILE: stubs.c @@ -7,9 +6,8 @@ * PROGRAMMERS: Ge van Geldorp (ge(a)gse.nl) * REVISIONS: */ -#include <winsock2.h> -#include <windows.h> -//#include <stdlib.h> + +#include "wsock32.h" /* * @unimplemented Added: trunk/reactos/dll/win32/wsock32/wsock32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wsock32/wsock32.… ============================================================================== --- trunk/reactos/dll/win32/wsock32/wsock32.h (added) +++ trunk/reactos/dll/win32/wsock32/wsock32.h [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -1,0 +1,2 @@ +#include <winsock2.h> +#include <windows.h> Propchange: trunk/reactos/dll/win32/wsock32/wsock32.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wsock32/wsock32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wsock32/wsock32.… ============================================================================== --- trunk/reactos/dll/win32/wsock32/wsock32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wsock32/wsock32.rbuild [iso-8859-1] Fri Aug 1 09:27:43 2008 @@ -4,6 +4,7 @@ <library>ntdll</library> <library>kernel32</library> <library>ws2_32</library> + <pch>wsock32.h</pch> <file>stubs.c</file> <file>wsock32.rc</file> </module>

1 0

[sginsberg] 35007: - Fix 2 warnings
by sginsberg＠svn.reactos.org 01 Aug '08

01 Aug '08

Author: sginsberg Date: Fri Aug 1 09:19:05 2008 New Revision: 35007 URL: http://svn.reactos.org/svn/reactos?rev=35007&view=rev Log: - Fix 2 warnings Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] Fri Aug 1 09:19:05 2008 @@ -138,7 +138,7 @@ else WINE_ERR("-Unable to peruse .DBG file %s (%s)\n", dbg_name, debugstr_a(tmp)); - if (dbg_mapping) UnmapViewOfFile(dbg_mapping); + if (dbg_mapping) UnmapViewOfFile((PVOID)dbg_mapping); if (hMap) CloseHandle(hMap); if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); return ret; @@ -266,7 +266,7 @@ for (j = 0; j < exports->NumberOfNames; j++) if ((ordinals[j] == i) && names[j]) break; if (j < exports->NumberOfNames) continue; - snprintf(buffer, sizeof(buffer), "%d", i + exports->Base); + snprintf(buffer, sizeof(buffer), "%lu", i + exports->Base); symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1, TRUE /* FIXME */, TRUE /* FIXME */); }

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