Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 50141: [Win32k] - Fixes bug 5792 and Get/PeekMessage tests. I noticed co_IntPostOrSendMessage to co_IntSendMessageNoWait changes when it should have been changed to co_IntSendMessage. Sa...
by jimtabor＠svn.reactos.org 26 Dec '10

26 Dec '10

Author: jimtabor Date: Sun Dec 26 11:11:27 2010 New Revision: 50141 URL: http://svn.reactos.org/svn/reactos?rev=50141&view=rev Log: [Win32k] - Fixes bug 5792 and Get/PeekMessage tests. I noticed co_IntPostOrSendMessage to co_IntSendMessageNoWait changes when it should have been changed to co_IntSendMessage. Same as co_IntSendMessage to co_IntSendMessageNoWait when it should have not changed.... I'm sorting it out. ATM win test locks up and the system shutdown box is not present only the text message. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sun Dec 26 11:11:27 2010 @@ -708,22 +708,20 @@ PDESKTOP Desktop = IntGetActiveDesktop(); HWND* HwndList; - static UINT MsgType = 0; - - if (!MsgType) + if (!gpsi->uiShellMsg) { /* Too bad, this doesn't work.*/ #if 0 UNICODE_STRING Str; RtlInitUnicodeString(&Str, L"SHELLHOOK"); - MsgType = UserRegisterWindowMessage(&Str); + gpsi->uiShellMsg = UserRegisterWindowMessage(&Str); #endif - MsgType = IntAddAtom(L"SHELLHOOK"); - - DPRINT("MsgType = %x\n", MsgType); - if (!MsgType) + gpsi->uiShellMsg = IntAddAtom(L"SHELLHOOK"); + + DPRINT("MsgType = %x\n", gpsi->uiShellMsg); + if (!gpsi->uiShellMsg) DPRINT1("LastError: %x\n", EngGetLastError()); } @@ -740,7 +738,7 @@ for (; *cursor; cursor++) { - co_IntSendMessageNoWait(*cursor, MsgType, Message, lParam); + UserPostMessage(*cursor, gpsi->uiShellMsg, Message, lParam); } ExFreePool(HwndList);

1 0

[tkreuzer] 50140: [CALC] Initialize next field. Fixes CID 11063
by tkreuzer＠svn.reactos.org 26 Dec '10

26 Dec '10

Author: tkreuzer Date: Sun Dec 26 09:39:31 2010 New Revision: 50140 URL: http://svn.reactos.org/svn/reactos?rev=50140&view=rev Log: [CALC] Initialize next field. Fixes CID 11063 Modified: trunk/reactos/base/applications/calc/rpn.c Modified: trunk/reactos/base/applications/calc/rpn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rpn… ============================================================================== --- trunk/reactos/base/applications/calc/rpn.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/rpn.c [iso-8859-1] Sun Dec 26 09:39:31 2010 @@ -351,7 +351,7 @@ } else { push(op); break; - } + } } if(ip.node.operation != RPN_OPERATOR_EQUAL && ip.node.operation != RPN_OPERATOR_PERCENT) @@ -380,6 +380,7 @@ tmp.node.number = *number; tmp.node.base = calc.base; tmp.node.operation = func; + tmp.next = NULL; push(&tmp); @@ -446,7 +447,7 @@ while (!is_stack_empty()) pop(); /* clear prev and last typed operators */ - calc.prev_operator = + calc.prev_operator = calc.last_operator = 0; }

1 0

[tkreuzer] 50139: [WIN32K] Remove SetLastWin32Error and use EngSetLastError instead
by tkreuzer＠svn.reactos.org 25 Dec '10

25 Dec '10

Author: tkreuzer Date: Sat Dec 25 11:01:14 2010 New Revision: 50139 URL: http://svn.reactos.org/svn/reactos?rev=50139&view=rev Log: [WIN32K] Remove SetLastWin32Error and use EngSetLastError instead Removed: trunk/reactos/subsystems/win32/win32k/include/error.h trunk/reactos/subsystems/win32/win32k/misc/err.c Modified: trunk/reactos/subsystems/win32/win32k/eng/alphablend.c trunk/reactos/subsystems/win32/win32k/eng/error.c trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/include/win32kp.h trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c trunk/reactos/subsystems/win32/win32k/objects/dcstate.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/drawing.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/icm.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/metafile.c trunk/reactos/subsystems/win32/win32k/objects/palette.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/pen.c trunk/reactos/subsystems/win32/win32k/objects/print.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/objects/wingl.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Removed: trunk/reactos/subsystems/win32/win32k/include/error.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Removed: trunk/reactos/subsystems/win32/win32k/misc/err.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi…

1 0

[tkreuzer] 50138: [WIN32K] Fix EngGetLastError and EngSetLastError
by tkreuzer＠svn.reactos.org 25 Dec '10

25 Dec '10

Author: tkreuzer Date: Sat Dec 25 10:37:55 2010 New Revision: 50138 URL: http://svn.reactos.org/svn/reactos?rev=50138&view=rev Log: [WIN32K] Fix EngGetLastError and EngSetLastError Modified: trunk/reactos/subsystems/win32/win32k/eng/error.c Modified: trunk/reactos/subsystems/win32/win32k/eng/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/error.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/error.c [iso-8859-1] Sat Dec 25 10:37:55 2010 @@ -5,22 +5,28 @@ /* * @implemented + * http://msdn.microsoft.com/en-us/library/ff564940%28VS.85%29.aspx */ ULONG APIENTRY -EngGetLastError ( VOID ) +EngGetLastError(VOID) { - // www.osr.com/ddk/graphics/gdifncs_3non.htm - return GetLastNtError(); + PTEB pTeb = NtCurrentTeb(); + if (pTeb) + return NtCurrentTeb()->LastErrorValue; + else + return ERROR_SUCCESS; } /* * @implemented + * http://msdn.microsoft.com/en-us/library/ff565015%28VS.85%29.aspx */ VOID APIENTRY -EngSetLastError ( IN ULONG iError ) +EngSetLastError(IN ULONG iError) { - // www.osr.com/ddk/graphics/gdifncs_95m0.htm - SetLastNtError ( iError ); + PTEB pTeb = NtCurrentTeb(); + if (pTeb) + pTeb->LastErrorValue = iError; }

1 0

[janderwald] 50137: [AUDIO-BRINGUP] - Fix pci / swenum group key - Remove swenum from reactos.dff - Put swenum in bootstrap base
by janderwald＠svn.reactos.org 25 Dec '10

25 Dec '10

Author: janderwald Date: Sat Dec 25 09:12:20 2010 New Revision: 50137 URL: http://svn.reactos.org/svn/reactos?rev=50137&view=rev Log: [AUDIO-BRINGUP] - Fix pci / swenum group key - Remove swenum from reactos.dff - Put swenum in bootstrap base Modified: branches/audio-bringup/boot/bootdata/hivesys_i386.inf branches/audio-bringup/boot/bootdata/packages/reactos.dff branches/audio-bringup/drivers/ksfilter/swenum/swenum.rbuild Modified: branches/audio-bringup/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/boot/bootdata/hiv… ============================================================================== --- branches/audio-bringup/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/audio-bringup/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Dec 25 09:12:20 2010 @@ -1257,12 +1257,12 @@ ; Software BUS Driver HKLM,"SYSTEM\CurrentControlSet\Services\SWENUM","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\SWENUM","Group",0x00000000,"Boot Bus +HKLM,"SYSTEM\CurrentControlSet\Services\SWENUM","Group",0x00000000,"Boot Bus" HKLM,"SYSTEM\CurrentControlSet\Services\SWENUM","Tag",0x00010001,0x00000002 ; PCI Bus driver HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus +HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus" HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C621",0x00030003,04,00,00,00,00,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950640",0x00030003,04,00,00,00,00,00,00,00 Modified: branches/audio-bringup/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/boot/bootdata/pac… ============================================================================== --- branches/audio-bringup/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/audio-bringup/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Dec 25 09:12:20 2010 @@ -514,7 +514,6 @@ drivers\input\sermouse\sermouse.sys 2 drivers\ksfilter\ks\ks.sys 2 -drivers\ksfilter\swenum\swenum.sys 2 ;drivers\multimedia\bdasup\bdasup.sys 2 drivers\network\afd\afd.sys 2 Modified: branches/audio-bringup/drivers/ksfilter/swenum/swenum.rbuild URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/swenum/swenum.rbuild [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/swenum/swenum.rbuild [iso-8859-1] Sat Dec 25 09:12:20 2010 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="swenum" type="kernelmodedriver" installbase="system32/drivers" installname="swenum.sys"> + <bootstrap installbase="$(CDOUTPUT)" /> <library>ntoskrnl</library> <library>ks</library> <file>swenum.c</file>

1 0

[janderwald] 50136: [INF] - Fix PCI group key
by janderwald＠svn.reactos.org 25 Dec '10

25 Dec '10

Author: janderwald Date: Sat Dec 25 09:08:44 2010 New Revision: 50136 URL: http://svn.reactos.org/svn/reactos?rev=50136&view=rev Log: [INF] - Fix PCI group key Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Dec 25 09:08:44 2010 @@ -1257,7 +1257,7 @@ ; PCI Bus driver HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus +HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus " HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C621",0x00030003,04,00,00,00,00,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950640",0x00030003,04,00,00,00,00,00,00,00

1 0

[rmessiant] 50135: [WIN32K] - IntCreateWindow: Fill out MaximumLength field of the window name. Fixes potential buffer overflow in at least NtUserDefSetText.
by rmessiant＠svn.reactos.org 25 Dec '10

25 Dec '10

Author: rmessiant Date: Sat Dec 25 05:27:01 2010 New Revision: 50135 URL: http://svn.reactos.org/svn/reactos?rev=50135&view=rev Log: [WIN32K] - IntCreateWindow: Fill out MaximumLength field of the window name. Fixes potential buffer overflow in at least NtUserDefSetText. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Dec 25 05:27:01 2010 @@ -1759,6 +1759,7 @@ RtlCopyMemory(pWnd->strName.Buffer, WindowName->Buffer, WindowName->Length); pWnd->strName.Buffer[WindowName->Length / sizeof(WCHAR)] = L'\0'; pWnd->strName.Length = WindowName->Length; + pWnd->strName.MaximumLength = WindowName->Length + sizeof(UNICODE_NULL); } /* Correct the window style. */

1 0

[arty] 50134: Make sure to initialize our page operation mutex. Scan the whole range of the MemoryArea for pages to evict. This fixes cache section page eviction.
by arty＠svn.reactos.org 24 Dec '10

24 Dec '10

Author: arty Date: Fri Dec 24 22:54:24 2010 New Revision: 50134 URL: http://svn.reactos.org/svn/reactos?rev=50134&view=rev Log: Make sure to initialize our page operation mutex. Scan the whole range of the MemoryArea for pages to evict. This fixes cache section page eviction. Modified: trunk/reactos/ntoskrnl/cache/fssup.c trunk/reactos/ntoskrnl/cache/section/swapout.c Modified: trunk/reactos/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/fssup.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] Fri Dec 24 22:54:24 2010 @@ -25,6 +25,7 @@ extern VOID NTAPI CcpLazyWriteThread(PVOID Unused); HANDLE CcUnmapThreadHandle, CcLazyWriteThreadHandle; CLIENT_ID CcUnmapThreadId, CcLazyWriteThreadId; +FAST_MUTEX GlobalPageOperation; typedef struct _NOCC_PRIVATE_CACHE_MAP { @@ -98,6 +99,7 @@ CcCacheBitmap->SizeOfBitMap = ROUND_UP(CACHE_NUM_SECTIONS, 32); DPRINT("Cache has %d entries\n", CcCacheBitmap->SizeOfBitMap); ExInitializeFastMutex(&CcMutex); + ExInitializeFastMutex(&GlobalPageOperation); // MM stub KeInitializeEvent(&MmWaitPageEvent, SynchronizationEvent, FALSE); Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Fri Dec 24 22:54:24 2010 @@ -480,8 +480,8 @@ MmLockCacheSectionSegment(Segment); for (i = 0; - i < Segment->Length.QuadPart - - MemoryArea->Data.CacheData.ViewOffset.QuadPart && + i < ((ULONG_PTR)MemoryArea->EndingAddress) - + ((ULONG_PTR)MemoryArea->StartingAddress) && Result < Target; i += PAGE_SIZE) { Offset.QuadPart = MemoryArea->Data.CacheData.ViewOffset.QuadPart + i;

1 0

[jgardou] 50133: [GDI32] - remove useless memory reallocation : the buffer size must be dword aligned, we have no way to guarantee the buffer location will be. - pass BITMAPINFO pointer size to NtG...
by jgardou＠svn.reactos.org 24 Dec '10

24 Dec '10

Author: jgardou Date: Fri Dec 24 20:29:25 2010 New Revision: 50133 URL: http://svn.reactos.org/svn/reactos?rev=50133&view=rev Log: [GDI32] - remove useless memory reallocation : the buffer size must be dword aligned, we have no way to guarantee the buffer location will be. - pass BITMAPINFO pointer size to NtGdiGetDIBitsInternal [WIN32K] - Improve "not enough memory" check when creating a bitmap - use correct function to set the last error. Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Fri Dec 24 20:29:25 2010 @@ -2,6 +2,36 @@ #define NDEBUG #include <debug.h> + +/* + * DIB_BitmapInfoSize + * + * Return the size of the bitmap info structure including color table. + * 11/16/1999 (RJJ) lifted from wine + */ + +INT FASTCALL DIB_BitmapInfoSize(const BITMAPINFO * info, WORD coloruse) +{ + unsigned int colors, size, masks = 0; + + if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)info; + colors = (core->bcBitCount <= 8) ? 1 << core->bcBitCount : 0; + return sizeof(BITMAPCOREHEADER) + colors * + ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBTRIPLE) : sizeof(WORD)); + } + else /* assume BITMAPINFOHEADER */ + { + colors = info->bmiHeader.biClrUsed; + if (colors > 256) colors = 256; + if (!colors && (info->bmiHeader.biBitCount <= 8)) + colors = 1 << info->bmiHeader.biBitCount; + if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; + size = max( info->bmiHeader.biSize, sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) ); + return size + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); + } +} /* * Return the full scan size for a bitmap. @@ -391,59 +421,40 @@ LPBITMAPINFO lpbmi, UINT uUsage) { - INT Ret = 0; - UINT cjBmpScanSize; - PVOID pvSafeBits = lpvBits; - - if (!hDC || !GdiIsHandleValid((HGDIOBJ)hDC)) - { - GdiSetLastError(ERROR_INVALID_PARAMETER); - return Ret; - } - - cjBmpScanSize = DIB_BitmapMaxBitsSize(lpbmi, cScanLines); - - if ( lpvBits ) - { - if ( lpbmi ) - { + UINT cjBmpScanSize; + UINT cjInfoSize; + + if (!hDC || !GdiIsHandleValid((HGDIOBJ)hDC) || !lpbmi) + { + GdiSetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + cjBmpScanSize = DIB_BitmapMaxBitsSize(lpbmi, cScanLines); + cjInfoSize = DIB_BitmapInfoSize(lpbmi, uUsage); + + if ( lpvBits ) + { if ( lpbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) { - if ( lpbmi->bmiHeader.biCompression == BI_JPEG || - lpbmi->bmiHeader.biCompression == BI_PNG ) - { - SetLastError(ERROR_INVALID_PARAMETER); - return Ret; - } + if ( lpbmi->bmiHeader.biCompression == BI_JPEG || + lpbmi->bmiHeader.biCompression == BI_PNG ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } } - } - - if ((ULONG)lpvBits & (sizeof(DWORD) - 1)) - { - pvSafeBits = RtlAllocateHeap(RtlGetProcessHeap(), 0, cjBmpScanSize); - if (!pvSafeBits) - return Ret; - } - } - - Ret = NtGdiGetDIBitsInternal(hDC, + } + + return NtGdiGetDIBitsInternal(hDC, hbmp, uStartScan, cScanLines, - pvSafeBits, + lpvBits, lpbmi, uUsage, cjBmpScanSize, - 0); - if (lpvBits != pvSafeBits) - { - if (Ret) - { - RtlCopyMemory(lpvBits, pvSafeBits, cjBmpScanSize); - } - RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); - } - return Ret; + cjInfoSize); } /* Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Fri Dec 24 20:29:25 2010 @@ -170,11 +170,18 @@ iFormat = BitmapFormat(cBitsPixel, BI_RGB); /* Check parameters */ - if (iFormat == 0 || nWidth <= 0 || nWidth >= 0x8000000 || nHeight <= 0) + if (iFormat == 0 || nWidth <= 0 || nHeight <= 0) { DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", nWidth, nHeight, cBitsPixel); - EngSetLastError(ERROR_INVALID_PARAMETER); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return NULL; + } + + if(WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel)*nHeight >= 0x8000000) + { + /* I just can't get enough, I just can't get enough */ + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; }

1 0

[akhaldi] 50132: [CMAKE] - Delete more useless definition files. - Improve more modules.
by akhaldi＠svn.reactos.org 24 Dec '10

24 Dec '10

Author: akhaldi Date: Fri Dec 24 19:07:09 2010 New Revision: 50132 URL: http://svn.reactos.org/svn/reactos?rev=50132&view=rev Log: [CMAKE] - Delete more useless definition files. - Improve more modules. Removed: branches/cmake-bringup/dll/win32/wing32/wing32.def branches/cmake-bringup/dll/win32/winhttp/winhttp.def branches/cmake-bringup/dll/win32/winspool/winspool_winspool.auto.def branches/cmake-bringup/dll/win32/winspool/winspool_winspool.stubs.c branches/cmake-bringup/dll/win32/winsta/winsta.def branches/cmake-bringup/dll/win32/wmi/wmi.def branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def branches/cmake-bringup/dll/win32/ws2help/ws2help.def branches/cmake-bringup/dll/win32/wshirda/wshirda.def branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def branches/cmake-bringup/dll/win32/wuapi/wuapi.def branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def Modified: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wing32/… ============================================================================== --- branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -1,14 +1,16 @@ set_unicode() -add_library(wing32 SHARED wing32.c wing32.def) +spec2def(wing32.dll wing32.spec) -if(NOT MSVC) - set_source_files_properties(wing32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + wing32.c + ${CMAKE_CURRENT_BINARY_DIR}/wing32.def) + +add_library(wing32 SHARED ${SOURCE}) set_entrypoint(wing32 0) + add_importlibs(wing32 user32 gdi32) add_dependencies(wing32 psdk) - -add_cab_target(wing32 1) +add_cab_target(wing32 1) Removed: branches/cmake-bringup/dll/win32/wing32/wing32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wing32/… ============================================================================== --- branches/cmake-bringup/dll/win32/wing32/wing32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wing32/wing32.def (removed) @@ -1,14 +1,0 @@ - -LIBRARY wing32.dll - -EXPORTS - WinGBitBlt@32 @1 - WinGCreateBitmap@12 @2 - WinGCreateDC@0 @3 - WinGCreateHalfToneBrush@12 @4 - WinGCreateHalfTonePalette@0 @5 - WinGGetDIBColorTable@16 @6 - WinGGetDIBPointer@8 @7 - WinGRecommendDIBFormat@4 @8 - WinGSetDIBColorTable@16 @9 - WinGStretchBlt@40 @10 Modified: branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp… ============================================================================== --- branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -4,7 +4,7 @@ spec2def(winhttp.dll winhttp.spec) -add_library(winhttp SHARED +list(APPEND SOURCE cookie.c handle.c main.c @@ -14,6 +14,8 @@ url.c ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def) +add_library(winhttp SHARED ${SOURCE}) + set_module_type(winhttp win32dll) target_link_libraries(winhttp wine) add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt crypt32 advapi32 kernel32 ntdll) Removed: branches/cmake-bringup/dll/win32/winhttp/winhttp.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp… ============================================================================== --- branches/cmake-bringup/dll/win32/winhttp/winhttp.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winhttp/winhttp.def (removed) @@ -1,35 +1,0 @@ - -LIBRARY winhttp.dll - -EXPORTS - DllCanUnloadNow@0 @1 PRIVATE - DllGetClassObject@12 @2 PRIVATE - DllRegisterServer@0 @3 PRIVATE - DllUnregisterServer@0 @4 PRIVATE - WinHttpAddRequestHeaders@16 @5 - WinHttpCheckPlatform@0 @6 - WinHttpCloseHandle@4 @7 - WinHttpConnect@16 @8 - WinHttpCrackUrl@16 @9 - WinHttpCreateUrl@16 @10 - WinHttpDetectAutoProxyConfigUrl@8 @11 - WinHttpGetDefaultProxyConfiguration@4 @12 - WinHttpGetIEProxyConfigForCurrentUser@4 @13 - WinHttpGetProxyForUrl@16 @14 - WinHttpOpen@20 @15 - WinHttpOpenRequest@28 @16 - WinHttpQueryAuthSchemes@16 @17 - WinHttpQueryDataAvailable@8 @18 - WinHttpQueryHeaders@24 @19 - WinHttpQueryOption@16 @20 - WinHttpReadData@16 @21 - WinHttpReceiveResponse@8 @22 - WinHttpSendRequest@28 @23 - WinHttpSetCredentials@24 @24 - WinHttpSetDefaultProxyConfiguration@4 @25 - WinHttpSetOption@16 @26 - WinHttpSetStatusCallback@16 @27 - WinHttpSetTimeouts@20 @28 - WinHttpTimeFromSystemTime@8 @29 - WinHttpTimeToSystemTime@8 @30 - WinHttpWriteData@16 @31 Modified: branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -1,11 +1,11 @@ - -spec2def(winspool.drv winspool.spec) set_unicode() include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() + +spec2def(winspool.drv winspool.spec) list(APPEND SOURCE info.c @@ -16,11 +16,9 @@ add_library(winspool SHARED ${SOURCE}) set_target_properties(winspool PROPERTIES SUFFIX ".drv") + set_module_type(winspool win32dll) - target_link_libraries(winspool wine) - add_importlibs(winspool advapi32 shlwapi msvcrt kernel32 ntdll) - add_cab_target(winspool 1) add_importlib_target(winspool.spec winspool.drv) Removed: branches/cmake-bringup/dll/win32/winspool/winspool_winspool.auto.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/winspool_winspool.auto.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winspool/winspool_winspool.auto.def (removed) @@ -1,197 +1,0 @@ -; File generated automatically from dll\win32\winspool\winspool.spec; do not edit! - -LIBRARY winspool.drv - -EXPORTS - EnumPrinterPropertySheets=__wine_stub_winspool_drv_100 @100 NONAME - ClusterSplOpen=__wine_stub_winspool_drv_101 @101 NONAME - ClusterSplClose=__wine_stub_winspool_drv_102 @102 NONAME - ClusterSplIsAlive=__wine_stub_winspool_drv_103 @103 NONAME - PerfClose=__wine_stub_winspool_drv_104 @104 - PerfCollect=__wine_stub_winspool_drv_105 @105 - PerfOpen=__wine_stub_winspool_drv_106 @106 - GetDefaultPrinterA@8 @201 - SetDefaultPrinterA@4 @202 - GetDefaultPrinterW@8 @203 - SetDefaultPrinterW@4 @204 - SplReadPrinter=__wine_stub_winspool_drv_205 @205 NONAME - AddPerMachineConnectionA=__wine_stub_winspool_drv_206 @206 NONAME - AddPerMachineConnectionW=__wine_stub_winspool_drv_207 @207 NONAME - DeletePerMachineConnectionA=__wine_stub_winspool_drv_208 @208 NONAME - DeletePerMachineConnectionW=__wine_stub_winspool_drv_209 @209 NONAME - EnumPerMachineConnectionsA=__wine_stub_winspool_drv_210 @210 NONAME - EnumPerMachineConnectionsW=__wine_stub_winspool_drv_211 @211 NONAME - LoadPrinterDriver=__wine_stub_winspool_drv_212 @212 NONAME - RefCntLoadDriver=__wine_stub_winspool_drv_213 @213 NONAME - RefCntUnloadDriver=__wine_stub_winspool_drv_214 @214 NONAME - ForceUnloadDriver=__wine_stub_winspool_drv_215 @215 NONAME - PublishPrinterA=__wine_stub_winspool_drv_216 @216 NONAME - PublishPrinterW=__wine_stub_winspool_drv_217 @217 NONAME - CallCommonPropertySheetUI=__wine_stub_winspool_drv_218 @218 NONAME - PrintUIQueueCreate=__wine_stub_winspool_drv_219 @219 NONAME - PrintUIPrinterPropPages=__wine_stub_winspool_drv_220 @220 NONAME - PrintUIDocumentDefaults=__wine_stub_winspool_drv_221 @221 NONAME - SendRecvBidiData=__wine_stub_winspool_drv_222 @222 NONAME - RouterFreeBidiResponseContainer=__wine_stub_winspool_drv_223 @223 NONAME - ExternalConnectToLd64In32Server=__wine_stub_winspool_drv_224 @224 NONAME - PrintUIWebPnpEntry=__wine_stub_winspool_drv_226 @226 NONAME - PrintUIWebPnpPostEntry=__wine_stub_winspool_drv_227 @227 NONAME - PrintUICreateInstance=__wine_stub_winspool_drv_228 @228 NONAME - PrintUIDocumentPropertiesWrap=__wine_stub_winspool_drv_229 @229 NONAME - PrintUIPrinterSetup=__wine_stub_winspool_drv_230 @230 NONAME - PrintUIServerPropPages=__wine_stub_winspool_drv_231 @231 NONAME - AddDriverCatalog=__wine_stub_winspool_drv_232 @232 NONAME - ADVANCEDSETUPDIALOG=__wine_stub_winspool_drv_107 @107 - AbortPrinter@4 @108 - AddFormA@12 @109 - AddFormW@12 @110 - AddJobA@20 @111 - AddJobW@20 @112 - AddMonitorA@12 @113 - AddMonitorW@12 @114 - AddPortA@12 @115 - AddPortExA@16 @116 - AddPortExW@16 @117 - AddPortW@12 @118 - AddPrinterA@12 @119 - AddPrinterConnectionA@4 @120 - AddPrinterConnectionW@4 @121 - AddPrinterDriverA@12 @122 - AddPrinterDriverExA@16 @123 - AddPrinterDriverExW@16 @124 - AddPrinterDriverW@12 @125 - AddPrinterW@12 @126 - AddPrintProcessorA@16 @127 - AddPrintProcessorW@16 @128 - AddPrintProvidorA@12 @129 - AddPrintProvidorW@12 @130 - AdvancedDocumentPropertiesA@20 @131 - AdvancedDocumentPropertiesW@20 @132 - AdvancedSetupDialog=__wine_stub_winspool_drv_133 @133 - ClosePrinter@4 @134 - CloseSpoolFileHandle=__wine_stub_winspool_drv_135 @135 - ConfigurePortA@12 @136 - ConfigurePortW@12 @137 - ConnectToPrinterDlg@8 @138 - ConvertAnsiDevModeToUnicodeDevMode=__wine_stub_winspool_drv_139 @139 - ConvertUnicodeDevModeToAnsiDevMode=__wine_stub_winspool_drv_140 @140 - CommitSpoolData=__wine_stub_winspool_drv_141 @141 - CreatePrinterIC=__wine_stub_winspool_drv_142 @142 - DEVICECAPABILITIES=__wine_stub_winspool_drv_143 @143 - DEVICEMODE=__wine_stub_winspool_drv_144 @144 - DeleteFormA@8 @145 - DeleteFormW@8 @146 - DeleteMonitorA@12 @147 - DeleteMonitorW@12 @148 - DeletePortA@12 @149 - DeletePortW@12 @150 - DeletePrinter@4 @151 - DeletePrinterConnectionA@4 @152 - DeletePrinterConnectionW@4 @153 - DeletePrinterDataExA@12 @154 - DeletePrinterDataExW@12 @155 - DeletePrinterDataA@8 @156 - DeletePrinterDataW@8 @157 - DeletePrinterDriverA@12 @158 - DeletePrinterDriverExA@20 @159 - DeletePrinterDriverExW@20 @160 - DeletePrinterDriverW@12 @161 - DeletePrinterIC=__wine_stub_winspool_drv_162 @162 - DevQueryPrint=__wine_stub_winspool_drv_163 @163 - DeletePrintProcessorA@12 @164 - DeletePrintProcessorW@12 @165 - DeletePrintProvidorA@12 @166 - DeletePrintProvidorW@12 @167 - DeviceCapabilitiesA@20 @168 - DeviceCapabilitiesW@20 @169 - DeviceMode=__wine_stub_winspool_drv_170 @170 - DocumentEvent=__wine_stub_winspool_drv_171 @171 - DllMain@12 @172 - DocumentPropertiesA@24 @173 - DocumentPropertiesW@24 @174 - EXTDEVICEMODE=__wine_stub_winspool_drv_175 @175 - EndDocPrinter@4 @176 - EndPagePrinter@4 @177 - EnumFormsA@24 @178 - EnumFormsW@24 @179 - EnumJobsA@32 @180 - EnumJobsW@32 @181 - EnumMonitorsA@24 @182 - EnumMonitorsW@24 @183 - EnumPortsA@24 @184 - EnumPortsW@24 @185 - EnumPrinterDataA@36 @186 - EnumPrinterDataExA@24 @187 - EnumPrinterDataExW@24 @188 - EnumPrinterDataW@36 @189 - EnumPrinterDriversA@28 @190 - EnumPrinterDriversW@28 @191 - EnumPrintersA@28 @192 - EnumPrintersW@28 @193 - EnumPrinterKeyA@20 @194 - EnumPrinterKeyW@20 @195 - ExtDeviceMode@32 @196 - EnumPrintProcessorDatatypesA@28 @197 - EnumPrintProcessorDatatypesW@28 @198 - EnumPrintProcessorsA@28 @199 - EnumPrintProcessorsW@28 @200 - FindClosePrinterChangeNotification@4 @225 - FindFirstPrinterChangeNotification@16 @233 - FindNextPrinterChangeNotification@16 @234 - FreePrinterNotifyInfo@4 @235 - GetFormA@24 @236 - GetFormW@24 @237 - GetJobA@24 @238 - GetJobW@24 @239 - GetPrinterA@20 @240 - GetPrinterDataA@24 @241 - GetPrinterDataExA@28 @242 - GetPrinterDataExW@28 @243 - GetPrinterDataW@24 @244 - GetPrinterDriverA@24 @245 - GetPrinterDriverDirectoryA@24 @246 - GetPrinterDriverDirectoryW@24 @247 - GetPrinterDriverW@24 @248 - GetPrinterW@20 @249 - GetPrintProcessorDirectoryA@24 @250 - GetPrintProcessorDirectoryW@24 @251 - GetSpoolFileHandle=__wine_stub_winspool_drv_252 @252 - IsValidDevmodeA=__wine_stub_winspool_drv_253 @253 - IsValidDevmodeW=__wine_stub_winspool_drv_254 @254 - OpenPrinterA@12 @255 - OpenPrinterW@12 @256 - PlayGdiScriptOnPrinterIC=__wine_stub_winspool_drv_257 @257 - PrinterMessageBoxA@24 @258 - PrinterMessageBoxW@24 @259 - PrinterProperties@8 @260 - QueryColorProfile=__wine_stub_winspool_drv_261 @261 - QuerySpoolMode=__wine_stub_winspool_drv_262 @262 - QueryRemoteFonts=__wine_stub_winspool_drv_263 @263 - ReadPrinter@16 @264 - ResetPrinterA@8 @265 - ResetPrinterW@8 @266 - ScheduleJob@8 @267 - SeekPrinter=__wine_stub_winspool_drv_268 @268 - SetAllocFailCount=__wine_stub_winspool_drv_269 @269 - SetFormA@16 @270 - SetFormW@16 @271 - SetJobA@20 @272 - SetJobW@20 @273 - SetPrinterA@16 @274 - SetPrinterDataA@20 @275 - SetPrinterDataExA@24 @276 - SetPrinterDataExW@24 @277 - SetPrinterDataW@20 @278 - SetPrinterW@16 @279 - SplDriverUnloadComplete=__wine_stub_winspool_drv_280 @280 - SpoolerDevQueryPrintW=__wine_stub_winspool_drv_281 @281 - SpoolerInit@0 @282 - SpoolerPrinterEvent=__wine_stub_winspool_drv_283 @283 - StartDocDlgA=__wine_stub_winspool_drv_284 @284 - StartDocDlgW=__wine_stub_winspool_drv_285 @285 - StartDocPrinterA@12 @286 - StartDocPrinterW@12 @287 - StartPagePrinter@4 @288 - WaitForPrinterChange@8 @289 - WritePrinter@16 @290 - XcvDataW@32 @291 Removed: branches/cmake-bringup/dll/win32/winspool/winspool_winspool.stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/winspool_winspool.stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winspool/winspool_winspool.stubs.c (removed) @@ -1,82 +1,0 @@ -/* File generated automatically from dll\win32\winspool\winspool.spec; do not edit! */ -/* This file can be copied, modified and distributed without restriction. */ - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wine/config.h" -#include "wine/exception.h" - -void __wine_spec_unimplemented_stub( const char *module, const char *function ) -{ - ULONG_PTR args[2]; - - args[0] = (ULONG_PTR)module; - args[1] = (ULONG_PTR)function; - RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); -} - -static const char __wine_spec_file_name[] = "winspool.drv"; - -void __wine_stub_winspool_drv_100(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EnumPrinterPropertySheets"); } -void __wine_stub_winspool_drv_101(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ClusterSplOpen"); } -void __wine_stub_winspool_drv_102(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ClusterSplClose"); } -void __wine_stub_winspool_drv_103(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ClusterSplIsAlive"); } -void __wine_stub_winspool_drv_104(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PerfClose"); } -void __wine_stub_winspool_drv_105(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PerfCollect"); } -void __wine_stub_winspool_drv_106(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PerfOpen"); } -void __wine_stub_winspool_drv_205(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SplReadPrinter"); } -void __wine_stub_winspool_drv_206(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AddPerMachineConnectionA"); } -void __wine_stub_winspool_drv_207(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AddPerMachineConnectionW"); } -void __wine_stub_winspool_drv_208(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeletePerMachineConnectionA"); } -void __wine_stub_winspool_drv_209(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeletePerMachineConnectionW"); } -void __wine_stub_winspool_drv_210(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EnumPerMachineConnectionsA"); } -void __wine_stub_winspool_drv_211(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EnumPerMachineConnectionsW"); } -void __wine_stub_winspool_drv_212(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "LoadPrinterDriver"); } -void __wine_stub_winspool_drv_213(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RefCntLoadDriver"); } -void __wine_stub_winspool_drv_214(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RefCntUnloadDriver"); } -void __wine_stub_winspool_drv_215(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ForceUnloadDriver"); } -void __wine_stub_winspool_drv_216(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PublishPrinterA"); } -void __wine_stub_winspool_drv_217(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PublishPrinterW"); } -void __wine_stub_winspool_drv_218(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CallCommonPropertySheetUI"); } -void __wine_stub_winspool_drv_219(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIQueueCreate"); } -void __wine_stub_winspool_drv_220(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIPrinterPropPages"); } -void __wine_stub_winspool_drv_221(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIDocumentDefaults"); } -void __wine_stub_winspool_drv_222(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SendRecvBidiData"); } -void __wine_stub_winspool_drv_223(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RouterFreeBidiResponseContainer"); } -void __wine_stub_winspool_drv_224(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ExternalConnectToLd64In32Server"); } -void __wine_stub_winspool_drv_226(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIWebPnpEntry"); } -void __wine_stub_winspool_drv_227(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIWebPnpPostEntry"); } -void __wine_stub_winspool_drv_228(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUICreateInstance"); } -void __wine_stub_winspool_drv_229(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIDocumentPropertiesWrap"); } -void __wine_stub_winspool_drv_230(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIPrinterSetup"); } -void __wine_stub_winspool_drv_231(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIServerPropPages"); } -void __wine_stub_winspool_drv_232(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AddDriverCatalog"); } -void __wine_stub_winspool_drv_107(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ADVANCEDSETUPDIALOG"); } -void __wine_stub_winspool_drv_133(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AdvancedSetupDialog"); } -void __wine_stub_winspool_drv_135(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CloseSpoolFileHandle"); } -void __wine_stub_winspool_drv_139(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ConvertAnsiDevModeToUnicodeDevMode"); } -void __wine_stub_winspool_drv_140(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ConvertUnicodeDevModeToAnsiDevMode"); } -void __wine_stub_winspool_drv_141(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CommitSpoolData"); } -void __wine_stub_winspool_drv_142(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CreatePrinterIC"); } -void __wine_stub_winspool_drv_143(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DEVICECAPABILITIES"); } -void __wine_stub_winspool_drv_144(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DEVICEMODE"); } -void __wine_stub_winspool_drv_162(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeletePrinterIC"); } -void __wine_stub_winspool_drv_163(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DevQueryPrint"); } -void __wine_stub_winspool_drv_170(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeviceMode"); } -void __wine_stub_winspool_drv_171(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DocumentEvent"); } -void __wine_stub_winspool_drv_175(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EXTDEVICEMODE"); } -void __wine_stub_winspool_drv_252(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "GetSpoolFileHandle"); } -void __wine_stub_winspool_drv_253(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "IsValidDevmodeA"); } -void __wine_stub_winspool_drv_254(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "IsValidDevmodeW"); } -void __wine_stub_winspool_drv_257(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PlayGdiScriptOnPrinterIC"); } -void __wine_stub_winspool_drv_261(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "QueryColorProfile"); } -void __wine_stub_winspool_drv_262(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "QuerySpoolMode"); } -void __wine_stub_winspool_drv_263(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "QueryRemoteFonts"); } -void __wine_stub_winspool_drv_268(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SeekPrinter"); } -void __wine_stub_winspool_drv_269(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SetAllocFailCount"); } -void __wine_stub_winspool_drv_280(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SplDriverUnloadComplete"); } -void __wine_stub_winspool_drv_281(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SpoolerDevQueryPrintW"); } -void __wine_stub_winspool_drv_283(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SpoolerPrinterEvent"); } -void __wine_stub_winspool_drv_284(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "StartDocDlgA"); } -void __wine_stub_winspool_drv_285(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "StartDocDlgW"); } Modified: branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winsta/… ============================================================================== --- branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -1,3 +1,5 @@ + +spec2def(winsta.dll winsta.spec) list(APPEND SOURCE logon.c @@ -8,21 +10,14 @@ server.c ws.c winsta.rc - winsta.def) - -if(NOT MSVC) - set_source_files_properties(winsta.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/winsta.def) add_library(winsta SHARED ${CMAKE_CURRENT_BINARY_DIR}/winsta_winsta.h.gch ${SOURCE}) set_module_type(winsta win32dll) - target_link_libraries(winsta wine) - add_importlibs(winsta msvcrt kernel32 ntdll) add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE}) - add_cab_target(winsta 1) Removed: branches/cmake-bringup/dll/win32/winsta/winsta.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winsta/… ============================================================================== --- branches/cmake-bringup/dll/win32/winsta/winsta.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winsta/winsta.def (removed) @@ -1,124 +1,0 @@ - -LIBRARY winsta.dll - -EXPORTS - LogonIdFromWinStationNameA@12 @1 - LogonIdFromWinStationNameW@12 @2 - RemoteAssistancePrepareSystemRestore@4 @3 - ServerGetInternetConnectorStatus@12 @4 - ServerLicensingClose@4 @5 - ServerLicensingDeactivateCurrentPolicy@4 @6 - ServerLicensingFreePolicyInformation@4 @7 - ServerLicensingGetAvailablePolicyIds@12 @8 - ServerLicensingGetPolicy@8 @9 - ServerLicensingGetPolicyInformationA@16 @10 - ServerLicensingGetPolicyInformationW@16 @11 - ServerLicensingLoadPolicy@8 @12 - ServerLicensingOpenA@4 @13 - ServerLicensingOpenW@4 @14 - ServerLicensingSetPolicy@12 @15 - ServerLicensingUnloadPolicy@8 @16 - ServerQueryInetConnectorInformationA@16 @17 - ServerQueryInetConnectorInformationW@16 @18 - ServerSetInternetConnectorStatus@12 @19 - WinStationActivateLicense@16 @20 - WinStationAutoReconnect@4 @21 - WinStationBroadcastSystemMessage@40 @22 - WinStationCheckAccess@12 @23 - WinStationCheckLoopBack@16 @24 - WinStationCloseServer@16 @25 - WinStationConnectA@4 @26 - WinStationConnectCallback@20 @27 - WinStationConnectEx@8 @28 - WinStationConnectW@20 @29 - WinStationDisconnect@12 @30 - WinStationDynVirtualChanRead@20 @31 - WinStationDynVirtualChanWrite@16 @32 - WinStationEnumerateA@12 @33 - WinStationEnumerateLicenses@12 @34 - WinStationEnumerateProcesses@8 @35 - WinStationEnumerateW@12 @36 - WinStationEnumerate_IndexedA@20 @37 - WinStationEnumerate_IndexedW@20 @38 - WinStationFreeGAPMemory@12 @39 - WinStationFreeMemory@4 @40 - WinStationFreeUserCertificates@4 @41 - WinStationFreeUserCredentials@4 @42 - WinStationGenerateLicense@16 @43 - WinStationGetAllProcesses@16 @44 - WinStationGetConnectionProperty@12 @45 - WinStationGetInitialApplication@20 @46 - WinStationGetLanAdapterNameA@24 @47 - WinStationGetLanAdapterNameW@24 @48 - WinStationGetLoggedOnCount@8 @49 - WinStationGetMachinePolicy@8 @50 - WinStationGetProcessSid@24 @51 - WinStationGetTermSrvCountersValue@12 @52 - WinStationGetUserCertificates@4 @53 - WinStationGetUserCredentials@4 @54 - WinStationGetUserProfile@16 @55 - WinStationInstallLicense@12 @56 - WinStationIsHelpAssistantSession@8 @57 - WinStationIsSessionPermitted@0 @58 - WinStationNameFromLogonIdA@12 @59 - WinStationNameFromLogonIdW@12 @60 - WinStationNtsdDebug@20 @61 - WinStationOpenServerA@4 @62 - WinStationOpenServerW@4 @63 - WinStationQueryAllowConcurrentConnections@0 @64 - WinStationQueryEnforcementCore@24 @65 - WinStationQueryInformationA@24 @66 - WinStationQueryInformationW@24 @67 - WinStationQueryLicense@12 @68 - WinStationQueryLogonCredentialsW@4 @69 - WinStationQueryUpdateRequired@8 @70 - WinStationRegisterConsoleNotification@12 @71 - WinStationRegisterConsoleNotificationEx@16 @72 - WinStationRegisterNotificationEvent@16 @73 - WinStationRemoveLicense@12 @74 - WinStationRenameA@12 @75 - WinStationRenameW@12 @76 - WinStationRequestSessionsList@12 @77 - WinStationReset@12 @78 - WinStationSendMessageA@40 @79 - WinStationSendMessageW@40 @80 - WinStationSendWindowMessage@32 @81 - WinStationServerPing@4 @82 - WinStationSetInformationA@20 @83 - WinStationSetInformationW@20 @84 - WinStationSetPoolCount@12 @85 - WinStationShadow@20 @86 - WinStationShadowStop@12 @87 - WinStationShutdownSystem@8 @88 - WinStationSwitchToServicesSession@0 @89 - WinStationSystemShutdownStarted@0 @90 - WinStationSystemShutdownWait@8 @91 - WinStationTerminateProcess@12 @92 - WinStationUnRegisterConsoleNotification@8 @93 - WinStationUnRegisterNotificationEvent@4 @94 - WinStationUserLoginAccessCheck@16 @95 - WinStationVirtualOpen@12 @96 - WinStationVirtualOpenEx@16 @97 - WinStationWaitSystemEvent@12 @98 - _NWLogonQueryAdmin@12 @99 - _NWLogonSetAdmin@12 @100 - _WinStationAnnoyancePopup@8 @101 - _WinStationBeepOpen@12 @102 - _WinStationBreakPoint@12 @103 - _WinStationCallback@12 @104 - _WinStationCheckForApplicationName@48 @105 - _WinStationFUSCanRemoteUserDisconnect@12 @106 - _WinStationGetApplicationInfo@16 @107 - _WinStationNotifyDisconnectPipe@0 @108 - _WinStationNotifyLogoff@0 @109 - _WinStationNotifyLogon@32 @110 - _WinStationNotifyNewSession@8 @111 - _WinStationReInitializeSecurity@4 @112 - _WinStationReadRegistry@4 @113 - _WinStationSessionInitialized@0 @114 - _WinStationShadowTarget@40 @115 - _WinStationShadowTargetSetup@8 @116 - _WinStationUpdateClientCachedCredentials@28 @117 - _WinStationUpdateSettings@12 @118 - _WinStationUpdateUserConfig@4 @119 - _WinStationWaitForConnect@0 @120 Modified: branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wmi/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -1,13 +1,14 @@ -add_library(wmi SHARED wmi.rc wmi.def) +spec2def(wmi.dll wmi.spec) -if(NOT MSVC) - set_source_files_properties(wmi.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + wmi.rc + ${CMAKE_CURRENT_BINARY_DIR}/wmi.def) + +add_library(wmi SHARED ${SOURCE}) set_entrypoint(wmi 0) add_importlibs(wmi advapi32) add_dependencies(wmi psdk buildno_header) - -add_cab_target(wmi 1) +add_cab_target(wmi 1) Removed: branches/cmake-bringup/dll/win32/wmi/wmi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wmi/wmi… ============================================================================== --- branches/cmake-bringup/dll/win32/wmi/wmi.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wmi/wmi.def (removed) @@ -1,49 +1,0 @@ - -LIBRARY wmi.dll - -EXPORTS - CloseTrace(a)4=advapi32.CloseTrace @1 - ControlTraceA(a)16=advapi32.ControlTraceA @2 - ControlTraceW(a)16=advapi32.ControlTraceW @3 - CreateTraceInstanceId(a)8=advapi32.CreateTraceInstanceId @4 - EnableTrace(a)20=advapi32.EnableTrace @5 - GetTraceEnableFlags(a)4=advapi32.GetTraceEnableFlags @6 - GetTraceEnableLevel(a)4=advapi32.GetTraceEnableLevel @7 - GetTraceLoggerHandle(a)4=advapi32.GetTraceLoggerHandle @8 - OpenTraceA(a)4=advapi32.OpenTraceA @9 - OpenTraceW(a)4=advapi32.OpenTraceW @10 - ProcessTrace(a)16=advapi32.ProcessTrace @11 - QueryAllTracesA(a)12=advapi32.QueryAllTracesA @12 - QueryAllTracesW(a)12=advapi32.QueryAllTracesW @13 - RegisterTraceGuidsA(a)32=advapi32.RegisterTraceGuidsA @14 - RegisterTraceGuidsW(a)32=advapi32.RegisterTraceGuidsW @15 - RemoveTraceCallback(a)4=advapi32.RemoveTraceCallback @16 - SetTraceCallback(a)8=advapi32.SetTraceCallback @17 - StartTraceA(a)12=advapi32.StartTraceA @18 - StartTraceW(a)12=advapi32.StartTraceW @19 - TraceEvent(a)8=advapi32.TraceEvent @20 - TraceEventInstance(a)16=advapi32.TraceEventInstance @21 - UnregisterTraceGuids(a)4=advapi32.UnregisterTraceGuids @22 - WmiCloseBlock(a)0=advapi32.WmiCloseBlock @23 - WmiDevInstToInstanceNameA(a)0=advapi32.WmiDevInstToInstanceNameA @24 - WmiDevInstToInstanceNameW(a)0=advapi32.WmiDevInstToInstanceNameW @25 - WmiEnumerateGuids(a)0=advapi32.WmiEnumerateGuids @26 - WmiExecuteMethodA(a)0=advapi32.WmiExecuteMethodA @27 - WmiExecuteMethodW(a)0=advapi32.WmiExecuteMethodW @28 - WmiFileHandleToInstanceNameA(a)0=advapi32.WmiFileHandleToInstanceNameA @29 - WmiFileHandleToInstanceNameW(a)0=advapi32.WmiFileHandleToInstanceNameW @30 - WmiFreeBuffer(a)0=advapi32.WmiFreeBuffer @31 - WmiMofEnumerateResourcesA(a)0=advapi32.WmiMofEnumerateResourcesA @32 - WmiMofEnumerateResourcesW(a)0=advapi32.WmiMofEnumerateResourcesW @33 - WmiNotificationRegistrationA(a)0=advapi32.WmiNotificationRegistrationA @34 - WmiNotificationRegistrationW(a)0=advapi32.WmiNotificationRegistrationW @35 - WmiOpenBlock(a)0=advapi32.WmiOpenBlock @36 - WmiQueryAllDataA(a)0=advapi32.WmiQueryAllDataA @37 - WmiQueryAllDataW(a)0=advapi32.WmiQueryAllDataW @38 - WmiQueryGuidInformation(a)0=advapi32.WmiQueryGuidInformation @39 - WmiQuerySingleInstanceA(a)0=advapi32.WmiQuerySingleInstanceA @40 - WmiQuerySingleInstanceW(a)0=advapi32.WmiQuerySingleInstanceW @41 - WmiSetSingleInstanceA(a)0=advapi32.WmiSetSingleInstanceA @42 - WmiSetSingleInstanceW(a)0=advapi32.WmiSetSingleInstanceW @43 - WmiSetSingleItemA(a)0=advapi32.WmiSetSingleItemA @44 - WmiSetSingleItemW(a)0=advapi32.WmiSetSingleItemW @45 Modified: branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32_… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -5,7 +5,9 @@ inc ${REACTOS_SOURCE_DIR}/include/reactos/winsock) -add_library(ws2_32_new SHARED +spec2def(ws2_32_new.dll ws2_32.spec) + +list(APPEND SOURCE src/addrconv.c src/addrinfo.c src/async.c @@ -43,16 +45,11 @@ src/startup.c src/wsautil.c ws2_32.rc - ws2_32.def) + ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def) -if(NOT MSVC) - set_source_files_properties(ws2_32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(ws2_32_new SHARED ${SOURCE}) set_module_type(ws2_32_new win32dll) - target_link_libraries(ws2_32_new wine) - add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) - add_cab_target(ws2_32_new 1) Removed: branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32_… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def (removed) @@ -1,121 +1,0 @@ - -LIBRARY ws2_32_new.dll - -EXPORTS - WEP@0 @500 - WPUCompleteOverlappedRequest@20 @24 - WSAAccept@20 @25 - WSAAddressToStringA@20 @26 - WSAAddressToStringW@20 @27 - WSAAsyncGetHostByAddr@28 @102 - WSAAsyncGetHostByName@20 @103 - WSAAsyncGetProtoByName@20 @105 - WSAAsyncGetProtoByNumber@20 @104 - WSAAsyncGetServByName@24 @107 - WSAAsyncGetServByPort@24 @106 - WSAAsyncSelect@16 @101 - WSACancelAsyncRequest@4 @108 - WSACancelBlockingCall@0 @113 - WSACleanup@0 @116 - WSACloseEvent@4 @28 - WSAConnect@28 @29 - WSACreateEvent@0 @30 - WSADuplicateSocketA@12 @31 - WSADuplicateSocketW@12 @32 - WSAEnumNameSpaceProvidersA@8 @33 - WSAEnumNameSpaceProvidersW@8 @34 - WSAEnumNetworkEvents@12 @35 - WSAEnumProtocolsA@12 @36 - WSAEnumProtocolsW@12 @37 - WSAEventSelect@12 @38 - WSAGetLastError@0 @111 - WSAGetOverlappedResult@20 @39 - WSAGetQOSByName@12 @40 - WSAGetServiceClassInfoA@16 @41 - WSAGetServiceClassInfoW@16 @42 - WSAGetServiceClassNameByClassIdA@12 @43 - WSAGetServiceClassNameByClassIdW@12 @44 - WSAHtonl@12 @45 - WSAHtons@12 @46 - WSAInstallServiceClassA@4 @47 - WSAInstallServiceClassW@4 @48 - WSAIoctl@36 @49 - WSAIsBlocking@0 @114 - WSAJoinLeaf@32 @50 - WSALookupServiceBeginA@12 @58 - WSALookupServiceBeginW@12 @59 - WSALookupServiceEnd@4 @60 - WSALookupServiceNextA@16 @61 - WSALookupServiceNextW@16 @62 - WSANSPIoctl@32 @63 - WSANtohl@12 @64 - WSANtohs@12 @65 - WSAProviderConfigChange@12 @66 - WSARecv@28 @67 - WSARecvDisconnect@8 @68 - WSARecvFrom@36 @69 - WSARemoveServiceClass@4 @70 - WSAResetEvent@4 @71 - WSASend@28 @72 - WSASendDisconnect@8 @73 - WSASendTo@36 @74 - WSASetBlockingHook@4 @109 - WSASetEvent@4 @75 - WSASetLastError@4 @112 - WSASetServiceA@12 @76 - WSASetServiceW@12 @77 - WSASocketA@24 @78 - WSASocketW@24 @79 - WSAStartup@8 @115 - WSAStringToAddressA@20 @80 - WSAStringToAddressW@20 @81 - WSAUnhookBlockingHook@0 @110 - WSAWaitForMultipleEvents@20 @82 - WSApSetPostRoutine@4 @83 - FreeAddrInfoW@4=freeaddrinfo@4 @84 - WSCDeinstallProvider@8 @85 - WSCEnableNSProvider@8 @86 - WSCEnumProtocols@16 @87 - WSCGetProviderPath@16 @88 - WSCInstallNameSpace@20 @89 - WSCInstallProvider@20 @90 - WSCUnInstallNameSpace@4 @91 - WSCUpdateProvider@20 @92 - WSCWriteNameSpaceOrder@8 @93 - WSCWriteProviderOrder@8 @94 - __WSAFDIsSet@8 @151 - accept@12 @1 - bind@12 @2 - closesocket@4 @3 - connect@12 @4 - freeaddrinfo@4 @95 - getaddrinfo@16 @96 - gethostbyaddr@12 @51 - gethostbyname@4 @52 - gethostname@8 @57 - getnameinfo@28 @97 - getpeername@12 @5 - getprotobyname@4 @53 - getprotobynumber@4 @54 - getservbyname@8 @55 - getservbyport@8 @56 - getsockname@12 @6 - getsockopt@20 @7 - htonl@4 @8 - htons@4 @9 - inet_addr@4 @11 - inet_ntoa@4 @12 - ioctlsocket@12 @10 - listen@8 @13 - ntohl@4 @14 - ntohs@4 @15 - recv@16 @16 - recvfrom@24 @17 - select@20 @18 - send@16 @19 - sendto@24 @20 - setsockopt@20 @21 - shutdown@8 @22 - socket@12 @23 - GetAddrInfoW@16 @98 - GetNameInfoW@28 @99 Modified: branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2help… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -1,9 +1,9 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) spec2def(ws2help.dll ws2help.spec) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) - -add_library(ws2help SHARED +list(APPEND SOURCE apc.c context.c dllmain.c @@ -11,9 +11,9 @@ notify.c ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def) +add_library(ws2help SHARED ${SOURCE}) + set_module_type(ws2help win32dll) - add_importlibs(ws2help advapi32 ws2_32 msvcrt kernel32 ntdll) - add_cab_target(ws2help 1) add_importlib_target(ws2help.spec) Removed: branches/cmake-bringup/dll/win32/ws2help/ws2help.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2help… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2help/ws2help.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2help/ws2help.def (removed) @@ -1,27 +1,0 @@ - -LIBRARY ws2help.dll - -EXPORTS - WahCloseApcHelper@4 @1 - WahCloseHandleHelper@4 @2 - WahCloseNotificationHandleHelper@4 @3 - WahCloseSocketHandle@8 @4 - WahCloseThread@8 @5 - WahCompleteRequest@20 @6 - WahCreateHandleContextTable@4 @7 - WahCreateNotificationHandle@8 @8 - WahCreateSocketHandle@8 @9 - WahDestroyHandleContextTable@4 @10 - WahDisableNonIFSHandleSupport@0 @11 - WahEnableNonIFSHandleSupport@0 @12 - WahEnumerateHandleContexts@12 @13 - WahInsertHandleContext@8 @14 - WahNotifyAllProcesses@4 @15 - WahOpenApcHelper@4 @16 - WahOpenCurrentThread@8 @17 - WahOpenHandleHelper@4 @18 - WahOpenNotificationHandleHelper@4 @19 - WahQueueUserApc@16 @20 - WahReferenceContextByHandle@8 @21 - WahRemoveHandleContext@8 @22 - WahWaitForNotification@16 @23 Modified: branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshirda… ============================================================================== --- branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -1,14 +1,15 @@ set_unicode() -add_library(wshirda SHARED wshirda.c wshirda.rc wshirda.def) +spec2def(wshirda.dll wshirda.spec) -if(NOT MSVC) - set_source_files_properties(wshirda.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + wshirda.c + wshirda.rc + ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def) + +add_library(wshirda SHARED ${SOURCE}) set_module_type(wshirda win32dll) - add_importlibs(wshirda ws2_32 msvcrt kernel32 ntdll) - add_cab_target(wshirda 1) Removed: branches/cmake-bringup/dll/win32/wshirda/wshirda.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshirda… ============================================================================== --- branches/cmake-bringup/dll/win32/wshirda/wshirda.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshirda/wshirda.def (removed) @@ -1,15 +1,0 @@ - -LIBRARY wshirda.dll - -EXPORTS - WSHEnumProtocols@16 @1 - WSHGetProviderGuid@8 @2 - WSHGetSockaddrType@12 @3 - WSHGetSocketInformation@32 @4 - WSHGetWSAProtocolInfo@12 @5 - WSHGetWildcardSockaddr@12 @6 - WSHGetWinsockMapping@8 @7 - WSHIoctl@52 @8 - WSHNotify@20 @9 - WSHOpenSocket@24 @10 - WSHSetSocketInformation@32 @11 Modified: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpi… ============================================================================== --- branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -3,17 +3,18 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib) -add_library(wshtcpip SHARED wshtcpip.c wshtcpip.rc wshtcpip.def) +spec2def(wshtcpip.dll wshtcpip.spec) -if(NOT MSVC) - set_source_files_properties(wshtcpip.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + wshtcpip.c + wshtcpip.rc + ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def) + +add_library(wshtcpip SHARED ${SOURCE}) set_entrypoint(wshtcpip 0) target_link_libraries(wshtcpip tdilib) - add_importlibs(wshtcpip ws2_32 kernel32 ntdll) add_dependencies(wshtcpip psdk buildno_header) - -add_cab_target(wshtcpip 1) +add_cab_target(wshtcpip 1) Removed: branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpi… ============================================================================== --- branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def (removed) @@ -1,20 +1,0 @@ - -LIBRARY wshtcpip.dll - -EXPORTS - WSHAddressToString@20 @1 - WSHEnumProtocols@16 @2 - WSHGetBroadcastSockaddr@12 @3 - WSHGetProviderGuid@8 @4 - WSHGetSockaddrType@12 @5 - WSHGetSocketInformation@32 @6 - WSHGetWildcardSockaddr@12 @7 - WSHGetWinsockMapping@8 @8 - WSHGetWSAProtocolInfo@12 @9 - WSHIoctl@52 @10 - WSHJoinLeaf@52 @11 - WSHNotify@20 @12 - WSHOpenSocket@24 @13 - WSHOpenSocket2@32 @14 - WSHSetSocketInformation@32 @15 - WSHStringToAddress@20 @16 Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -6,7 +6,9 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(wuapi SHARED +spec2def(wuapi.dll wuapi.spec) + +list(APPEND SOURCE downloader.c installer.c main.c @@ -14,18 +16,11 @@ searcher.c session.c updates.c - wuapi.def) + ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def) -if(NOT MSVC) - set_source_files_properties(wuapi.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(wuapi SHARED ${SOURCE}) set_module_type(wuapi win32dll) - -target_link_libraries(wuapi - wine - uuid) - +target_link_libraries(wuapi uuid wine) add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll) - add_cab_target(wuapi 1) Removed: branches/cmake-bringup/dll/win32/wuapi/wuapi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/w… ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/wuapi.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wuapi/wuapi.def (removed) @@ -1,8 +1,0 @@ - -LIBRARY wuapi.dll - -EXPORTS - DllCanUnloadNow@0 @1 PRIVATE - DllGetClassObject@12 @2 PRIVATE - DllRegisterServer@0 @3 PRIVATE - DllUnregisterServer@0 @4 PRIVATE Modified: branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -2,14 +2,15 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(xinput1_1 SHARED xinput1_1_main.c version.rc xinput1_1.def) +spec2def(xinput1_1.dll xinput1_1.spec) -if(NOT MSVC) - set_source_files_properties(xinput1_1.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + xinput1_1_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def) + +add_library(xinput1_1 SHARED ${SOURCE}) set_module_type(xinput1_1 win32dll) - add_importlibs(xinput1_1 msvcrt kernel32) - add_cab_target(xinput1_1 1) Removed: branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def (removed) @@ -1,9 +1,0 @@ - -LIBRARY xinput1_1.dll - -EXPORTS - XInputEnable(a)4=xinput1_3.XInputEnable @1 - XInputGetCapabilities(a)12=xinput1_3.XInputGetCapabilities @2 - XInputGetDSoundAudioDeviceGuids(a)12=xinput1_3.XInputGetDSoundAudioDeviceGuids @3 - XInputSetState(a)8=xinput1_3.XInputSetState @4 - XInputGetState(a)8=xinput1_3.XInputGetState @5 Modified: branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -2,14 +2,15 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(xinput1_2 SHARED xinput1_2_main.c version.rc xinput1_2.def) +spec2def(xinput1_2.dll xinput1_2.spec) -if(NOT MSVC) - set_source_files_properties(xinput1_2.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + xinput1_2_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def) + +add_library(xinput1_2 SHARED ${SOURCE}) set_module_type(xinput1_2 win32dll) - add_importlibs(xinput1_2 msvcrt kernel32) - add_cab_target(xinput1_2 1) Removed: branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def (removed) @@ -1,9 +1,0 @@ - -LIBRARY xinput1_2.dll - -EXPORTS - XInputEnable(a)4=xinput1_3.XInputEnable @1 - XInputGetCapabilities(a)12=xinput1_3.XInputGetCapabilities @2 - XInputGetDSoundAudioDeviceGuids(a)12=xinput1_3.XInputGetDSoundAudioDeviceGuids @3 - XInputSetState(a)8=xinput1_3.XInputSetState @4 - XInputGetState(a)8=xinput1_3.XInputGetState @5 Modified: branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -2,16 +2,16 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(xinput1_3 SHARED xinput1_3_main.c version.rc xinput1_3.def) +spec2def(xinput1_3.dll xinput1_3.spec) -if(NOT MSVC) - set_source_files_properties(xinput1_3.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + xinput1_3_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def) + +add_library(xinput1_3 SHARED ${SOURCE}) set_module_type(xinput1_3 win32dll) - target_link_libraries(xinput1_3 wine) - add_importlibs(xinput1_3 msvcrt kernel32 ntdll) - add_cab_target(xinput1_3 1) Removed: branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def (removed) @@ -1,12 +1,0 @@ - -LIBRARY xinput1_3.dll - -EXPORTS - DllMain@12 @1 - XInputGetState@8 @2 - XInputSetState@8 @3 - XInputGetCapabilities@12 @4 - XInputEnable@4 @5 - XInputGetDSoundAudioDeviceGuids@12 @6 - XInputGetBatteryInformation@12 @7 - XInputGetKeystroke@12 @8 Modified: branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -2,14 +2,15 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(xinput9_1_0 SHARED xinput9_1_0_main.c version.rc xinput9_1_0.def) +spec2def(xinput9_1_0.dll xinput9_1_0.spec) -if(NOT MSVC) - set_source_files_properties(xinput9_1_0.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + xinput9_1_0_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def) + +add_library(xinput9_1_0 SHARED ${SOURCE}) set_module_type(xinput9_1_0 win32dll) - add_importlibs(xinput9_1_0 msvcrt kernel32) - add_cab_target(xinput9_1_0 1) Removed: branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def (removed) @@ -1,8 +1,0 @@ - -LIBRARY xinput9_1_0.dll - -EXPORTS - XInputGetCapabilities(a)12=xinput1_3.XInputGetCapabilities @1 - XInputGetDSoundAudioDeviceGuids(a)12=xinput1_3.XInputGetDSoundAudioDeviceGuids @2 - XInputSetState(a)8=xinput1_3.XInputSetState @3 - XInputGetState(a)8=xinput1_3.XInputGetState @4

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