Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 42389: - Hardcode the return value of OID_GEN_HARDWARE_STATUS again due to media detection issues on certain pcnet adapters (such as vmware's emulated pcnet adapter)
by cgutman＠svn.reactos.org 04 Aug '09

04 Aug '09

Author: cgutman Date: Tue Aug 4 21:04:08 2009 New Revision: 42389 URL: http://svn.reactos.org/svn/reactos?rev=42389&view=rev Log: - Hardcode the return value of OID_GEN_HARDWARE_STATUS again due to media detection issues on certain pcnet adapters (such as vmware's emulated pcnet adapter) Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/r… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] Tue Aug 4 21:04:08 2009 @@ -139,7 +139,8 @@ case OID_GEN_HARDWARE_STATUS: { - GenericULONG = (ULONG)((Adapter->MediaState == NdisMediaStateConnected) ? NdisHardwareStatusReady : NdisHardwareStatusNotReady); + GenericULONG = (ULONG)NdisHardwareStatusReady; + /* ((Adapter->MediaState == NdisMediaStateConnected) ? NdisHardwareStatusReady : NdisHardwareStatusNotReady); */ break; }

1 0

[dchapyshev] 42388: - Add "ReactOS Application Manager". This program is replacement "Download !" and appwiz.cpl.
by dchapyshev＠svn.reactos.org 04 Aug '09

04 Aug '09

Author: dchapyshev Date: Tue Aug 4 21:02:56 2009 New Revision: 42388 URL: http://svn.reactos.org/svn/reactos?rev=42388&view=rev Log: - Add "ReactOS Application Manager". This program is replacement "Download !" and appwiz.cpl. Added: trunk/reactos/base/applications/rapps/ (with props) trunk/reactos/base/applications/rapps/CreateCabFile.bat (with props) trunk/reactos/base/applications/rapps/README.RUS (with props) trunk/reactos/base/applications/rapps/aboutdlg.c (with props) trunk/reactos/base/applications/rapps/available.c (with props) trunk/reactos/base/applications/rapps/installdlg.c (with props) trunk/reactos/base/applications/rapps/installed.c (with props) trunk/reactos/base/applications/rapps/lang/ (with props) trunk/reactos/base/applications/rapps/lang/en-US.rc (with props) trunk/reactos/base/applications/rapps/listview.c (with props) trunk/reactos/base/applications/rapps/loaddlg.c (with props) trunk/reactos/base/applications/rapps/manifest.xml (with props) trunk/reactos/base/applications/rapps/misc.c (with props) trunk/reactos/base/applications/rapps/parser.c (with props) trunk/reactos/base/applications/rapps/rapps/ (with props) trunk/reactos/base/applications/rapps/rapps.h (with props) trunk/reactos/base/applications/rapps/rapps.rbuild (with props) trunk/reactos/base/applications/rapps/rapps.rc (with props) trunk/reactos/base/applications/rapps/rapps/abiword.txt (with props) trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt (with props) trunk/reactos/base/applications/rapps/rapps/audiograbber.txt (with props) trunk/reactos/base/applications/rapps/rapps/diablo2.txt (with props) trunk/reactos/base/applications/rapps/rapps/dosbox.txt (with props) trunk/reactos/base/applications/rapps/rapps/firefox2.txt (with props) trunk/reactos/base/applications/rapps/rapps/firefox3.txt (with props) trunk/reactos/base/applications/rapps/rapps/freebasic.txt (with props) trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt (with props) trunk/reactos/base/applications/rapps/rapps/irfanview.txt (with props) trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt (with props) trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt (with props) trunk/reactos/base/applications/rapps/rapps/lgeneral.txt (with props) trunk/reactos/base/applications/rapps/rapps/lmarbles.txt (with props) trunk/reactos/base/applications/rapps/rapps/mfc40.txt (with props) trunk/reactos/base/applications/rapps/rapps/mingw.txt (with props) trunk/reactos/base/applications/rapps/rapps/mirandaim.txt (with props) trunk/reactos/base/applications/rapps/rapps/mirc.txt (with props) trunk/reactos/base/applications/rapps/rapps/msxml3.txt (with props) trunk/reactos/base/applications/rapps/rapps/offbyone.txt (with props) trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt (with props) trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt (with props) trunk/reactos/base/applications/rapps/rapps/openttd.txt (with props) trunk/reactos/base/applications/rapps/rapps/opera.txt (with props) trunk/reactos/base/applications/rapps/rapps/putty.txt (with props) trunk/reactos/base/applications/rapps/rapps/rosbe.txt (with props) trunk/reactos/base/applications/rapps/rapps/sambatng.txt (with props) trunk/reactos/base/applications/rapps/rapps/scummvm.txt (with props) trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt (with props) trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt (with props) trunk/reactos/base/applications/rapps/rapps/seamonkey.txt (with props) trunk/reactos/base/applications/rapps/rapps/smplayer.txt (with props) trunk/reactos/base/applications/rapps/rapps/thunderbird.txt (with props) trunk/reactos/base/applications/rapps/rapps/tileworld.txt (with props) trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt (with props) trunk/reactos/base/applications/rapps/rapps/utorrent.txt (with props) trunk/reactos/base/applications/rapps/rapps/vb5run.txt (with props) trunk/reactos/base/applications/rapps/rapps/vb6run.txt (with props) trunk/reactos/base/applications/rapps/rapps/vc2005run.txt (with props) trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt (with props) trunk/reactos/base/applications/rapps/rapps/vc2008run.txt (with props) trunk/reactos/base/applications/rapps/rapps/vc6run.txt (with props) trunk/reactos/base/applications/rapps/rapps/winboard.txt (with props) trunk/reactos/base/applications/rapps/res/ (with props) trunk/reactos/base/applications/rapps/res/apps.ico (with props) trunk/reactos/base/applications/rapps/res/appupd.ico (with props) trunk/reactos/base/applications/rapps/res/cat.ico (with props) trunk/reactos/base/applications/rapps/res/cats/ (with props) trunk/reactos/base/applications/rapps/res/cats/audio.ico (with props) trunk/reactos/base/applications/rapps/res/cats/devel.ico (with props) trunk/reactos/base/applications/rapps/res/cats/drivers.ico (with props) trunk/reactos/base/applications/rapps/res/cats/edu.ico (with props) trunk/reactos/base/applications/rapps/res/cats/engineer.ico (with props) trunk/reactos/base/applications/rapps/res/cats/finance.ico (with props) trunk/reactos/base/applications/rapps/res/cats/games.ico (with props) trunk/reactos/base/applications/rapps/res/cats/graphics.ico (with props) trunk/reactos/base/applications/rapps/res/cats/internet.ico (with props) trunk/reactos/base/applications/rapps/res/cats/libs.ico (with props) trunk/reactos/base/applications/rapps/res/cats/office.ico (with props) trunk/reactos/base/applications/rapps/res/cats/other.ico (with props) trunk/reactos/base/applications/rapps/res/cats/science.ico (with props) trunk/reactos/base/applications/rapps/res/cats/tools.ico (with props) trunk/reactos/base/applications/rapps/res/cats/video.ico (with props) trunk/reactos/base/applications/rapps/res/exit.ico (with props) trunk/reactos/base/applications/rapps/res/install.ico (with props) trunk/reactos/base/applications/rapps/res/main.ico (with props) trunk/reactos/base/applications/rapps/res/modify.ico (with props) trunk/reactos/base/applications/rapps/res/refresh.ico (with props) trunk/reactos/base/applications/rapps/res/settings.ico (with props) trunk/reactos/base/applications/rapps/res/uninstall.ico (with props) trunk/reactos/base/applications/rapps/resource.h (with props) trunk/reactos/base/applications/rapps/richedit.c (with props) trunk/reactos/base/applications/rapps/rsrc.rc (with props) trunk/reactos/base/applications/rapps/settingsdlg.c (with props) trunk/reactos/base/applications/rapps/splitter.c (with props) trunk/reactos/base/applications/rapps/statusbar.c (with props) trunk/reactos/base/applications/rapps/toolbar.c (with props) trunk/reactos/base/applications/rapps/treeview.c (with props) trunk/reactos/base/applications/rapps/winmain.c (with props) Modified: trunk/reactos/base/applications/applications.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… Added: trunk/reactos/base/applications/rapps/CreateCabFile.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/Cr… Added: trunk/reactos/base/applications/rapps/README.RUS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/RE… Added: trunk/reactos/base/applications/rapps/aboutdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ab… Added: trunk/reactos/base/applications/rapps/available.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/av… Added: trunk/reactos/base/applications/rapps/installdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… Added: trunk/reactos/base/applications/rapps/installed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/in… Added: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Added: trunk/reactos/base/applications/rapps/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/li… Added: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… Added: trunk/reactos/base/applications/rapps/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ma… Added: trunk/reactos/base/applications/rapps/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/mi… Added: trunk/reactos/base/applications/rapps/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/pa… Added: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/mingw.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/vc2005run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/vc2008run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Added: trunk/reactos/base/applications/rapps/res/apps.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/appupd.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cat.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/audio.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/devel.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/drivers.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/edu.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/engineer.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/finance.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/games.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/graphics.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/internet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/libs.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/office.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/other.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/science.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/tools.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/cats/video.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/exit.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/install.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/main.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/modify.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/refresh.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/settings.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/res/uninstall.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Added: trunk/reactos/base/applications/rapps/richedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ri… Added: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… Added: trunk/reactos/base/applications/rapps/settingsdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/se… Added: trunk/reactos/base/applications/rapps/splitter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/sp… Added: trunk/reactos/base/applications/rapps/statusbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/st… Added: trunk/reactos/base/applications/rapps/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/to… Added: trunk/reactos/base/applications/rapps/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/tr… Added: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi…

1 0

[cgutman] 42387: - Finally get IRP_MJ_CLOSE working properly - Remove handling of IRP_MJ_CLEANUP and move the code to the DispatchClose routine - Remove the hack (holding an extra reference and not closing the handle) which hid these bugs - Fixes some memory and handle leaks too
by cgutman＠svn.reactos.org 04 Aug '09

04 Aug '09

Author: cgutman Date: Tue Aug 4 20:56:56 2009 New Revision: 42387 URL: http://svn.reactos.org/svn/reactos?rev=42387&view=rev Log: - Finally get IRP_MJ_CLOSE working properly - Remove handling of IRP_MJ_CLEANUP and move the code to the DispatchClose routine - Remove the hack (holding an extra reference and not closing the handle) which hid these bugs - Fixes some memory and handle leaks too Modified: trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/tcpip/include/fileobjs.h trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/drivers/network/tcpip/tcpip/main.c Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Tue Aug 4 20:56:56 2009 @@ -32,11 +32,6 @@ FCB->LocalAddress, &FCB->AddressFile.Handle, &FCB->AddressFile.Object ); - - if (NT_SUCCESS(Status)) - { - ObReferenceObject(FCB->AddressFile.Object); - } AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Tue Aug 4 20:56:56 2009 @@ -29,11 +29,6 @@ FCB->Connection.Object ); } - if (NT_SUCCESS(Status)) - { - ObReferenceObject(FCB->Connection.Object); - } - return Status; } Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Tue Aug 4 20:56:56 2009 @@ -96,6 +96,8 @@ FCB->DeviceExt = DeviceExt; FCB->Recv.Size = DEFAULT_RECEIVE_WINDOW_SIZE; FCB->Send.Size = DEFAULT_SEND_WINDOW_SIZE; + FCB->AddressFile.Handle = INVALID_HANDLE_VALUE; + FCB->Connection.Handle = INVALID_HANDLE_VALUE; KeInitializeSpinLock( &FCB->SpinLock ); ExInitializeFastMutex( &FCB->Mutex ); @@ -167,13 +169,19 @@ return Status; } -VOID CleanupSocket( PAFD_FCB FCB ) { +static NTSTATUS NTAPI +AfdCloseSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp) +{ + PFILE_OBJECT FileObject = IrpSp->FileObject; + PAFD_FCB FCB = FileObject->FsContext; UINT i; PAFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; - AFD_DbgPrint(MIN_TRACE,("Called (%x)\n", FCB)); - - if( !SocketAcquireStateLock( FCB ) ) return; + AFD_DbgPrint(MID_TRACE, + ("AfdClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp)); + + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; FCB->State = SOCKET_STATE_CLOSED; @@ -191,104 +199,53 @@ } } - FCB->State = SOCKET_STATE_CREATED; - - if( FCB->EventSelect ) { + KillSelectsForFCB( FCB->DeviceExt, FileObject, FALSE ); + + SocketStateUnlock( FCB ); + + if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect ); - FCB->EventSelect = NULL; - } - if( FCB->Context ) { + + if( FCB->Context ) ExFreePool( FCB->Context ); - FCB->Context = NULL; - } - if( FCB->Recv.Window ) { + + if( FCB->Recv.Window ) ExFreePool( FCB->Recv.Window ); - FCB->Recv.Window = NULL; - } - if( FCB->Send.Window ) { + + if( FCB->Send.Window ) ExFreePool( FCB->Send.Window ); - FCB->Send.Window = NULL; - } - if( FCB->AddressFrom ) { + + if( FCB->AddressFrom ) ExFreePool( FCB->AddressFrom ); - FCB->AddressFrom = NULL; - } - if( FCB->LocalAddress ) { + + if( FCB->LocalAddress ) ExFreePool( FCB->LocalAddress ); - FCB->LocalAddress = NULL; - } - if( FCB->RemoteAddress ) { + + if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); - FCB->RemoteAddress = NULL; - } - if( FCB->Connection.Object ) { - ZwClose(FCB->Connection.Handle); + + if( FCB->Connection.Object ) ObDereferenceObject(FCB->Connection.Object); - FCB->Connection.Object = NULL; - } - if( FCB->AddressFile.Object ) { - ZwClose(FCB->AddressFile.Handle); + + if( FCB->AddressFile.Object ) ObDereferenceObject(FCB->AddressFile.Object); - FCB->AddressFile.Object = NULL; - } - - SocketStateUnlock( FCB ); -} - -VOID DestroySocket( PAFD_FCB FCB ) { + + if( FCB->AddressFile.Handle != INVALID_HANDLE_VALUE ) + ZwClose(FCB->AddressFile.Handle); + + if( FCB->Connection.Handle != INVALID_HANDLE_VALUE ) + ZwClose(FCB->Connection.Handle); + if( FCB->TdiDeviceName.Buffer ) ExFreePool(FCB->TdiDeviceName.Buffer); ExFreePool(FCB); - AFD_DbgPrint(MIN_TRACE,("Deleted (%x)\n", FCB)); -} - -static NTSTATUS NTAPI -AfdCloseSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp) -{ - PFILE_OBJECT FileObject = IrpSp->FileObject; - PAFD_FCB FCB = FileObject->FsContext; - - AFD_DbgPrint(MID_TRACE, - ("AfdClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp)); - - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - - AFD_DbgPrint(MID_TRACE,("FCB %x\n", FCB)); - - FileObject->FsContext = NULL; - SocketStateUnlock( FCB ); - - DestroySocket( FCB ); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); AFD_DbgPrint(MID_TRACE, ("Returning success.\n")); - - return STATUS_SUCCESS; -} - -static NTSTATUS NTAPI -AfdCleanupSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp) -{ - PFILE_OBJECT FileObject = IrpSp->FileObject; - PAFD_FCB FCB = FileObject->FsContext; - - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - - CleanupSocket( FCB ); - - KillSelectsForFCB( FCB->DeviceExt, FileObject, FALSE ); - - SocketStateUnlock( FCB ); - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); return STATUS_SUCCESS; } @@ -373,9 +330,6 @@ /* Ditto the borrowing */ return AfdCloseSocket(DeviceObject, Irp, IrpSp); - case IRP_MJ_CLEANUP: - return AfdCleanupSocket(DeviceObject, Irp, IrpSp); - /* write data */ case IRP_MJ_WRITE: return AfdConnectedSocketWriteData( DeviceObject, Irp, IrpSp, TRUE ); @@ -550,7 +504,6 @@ /* register driver routines */ DriverObject->MajorFunction[IRP_MJ_CLOSE] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_CREATE] = AfdDispatch; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_WRITE] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_READ] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = AfdDispatch; Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Tue Aug 4 20:56:56 2009 @@ -146,13 +146,12 @@ } if (!NT_SUCCESS(Status)) { - *Handle = NULL; + *Handle = INVALID_HANDLE_VALUE; *Object = NULL; } return Status; } - NTSTATUS TdiOpenAddressFile( PUNICODE_STRING DeviceName, Modified: trunk/reactos/drivers/network/tcpip/include/fileobjs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/fileobjs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/fileobjs.h [iso-8859-1] Tue Aug 4 20:56:56 2009 @@ -23,9 +23,6 @@ NTSTATUS FileCloseAddress( PTDI_REQUEST Request); -NTSTATUS FileFreeAddress( - PTDI_REQUEST Request); - NTSTATUS FileOpenConnection( PTDI_REQUEST Request, PVOID ClientContext); @@ -35,13 +32,10 @@ NTSTATUS FileCloseConnection( PTDI_REQUEST Request); -NTSTATUS FileFreeConnection( - PTDI_REQUEST Request); - NTSTATUS FileOpenControlChannel( PTDI_REQUEST Request); -NTSTATUS FileFreeControlChannel( +NTSTATUS FileCloseControlChannel( PTDI_REQUEST Request); #endif /* __FILEOBJS_H */ Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Tue Aug 4 20:56:56 2009 @@ -284,17 +284,21 @@ NTSTATUS FileCloseAddress( PTDI_REQUEST Request) { - KIRQL OldIrql; PADDRESS_FILE AddrFile; NTSTATUS Status = STATUS_SUCCESS; + KIRQL OldIrql; + PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; PDATAGRAM_SEND_REQUEST SendRequest; - PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; - PLIST_ENTRY CurrentEntry; - PLIST_ENTRY NextEntry; + PLIST_ENTRY CurrentEntry, NextEntry; + + AddrFile = Request->Handle.AddressHandle; TI_DbgPrint(MID_TRACE, ("Called.\n")); - AddrFile = Request->Handle.AddressHandle; + /* Remove address file from the global list */ + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + RemoveEntryList(&AddrFile->ListEntry); + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); @@ -311,7 +315,7 @@ ReceiveRequest = CONTAINING_RECORD(CurrentEntry, DATAGRAM_RECEIVE_REQUEST, ListEntry); /* Abort the request and free its resources */ TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - (*ReceiveRequest->Complete)(ReceiveRequest->Context, STATUS_ADDRESS_CLOSED, 0); + (*ReceiveRequest->Complete)(ReceiveRequest->Context, STATUS_CANCELLED, 0); TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); CurrentEntry = NextEntry; } @@ -326,42 +330,13 @@ DATAGRAM_SEND_REQUEST, ListEntry); /* Abort the request and free its resources */ TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - (*SendRequest->Complete)(SendRequest->Context, STATUS_ADDRESS_CLOSED, 0); + (*SendRequest->Complete)(SendRequest->Context, STATUS_CANCELLED, 0); exFreePool(SendRequest); TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); CurrentEntry = NextEntry; } TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return Status; -} - - -/* - * FUNCTION: Closes an address file object - * ARGUMENTS: - * Request = Pointer to TDI request structure for this request - * RETURNS: - * Status of operation - */ -NTSTATUS FileFreeAddress( - PTDI_REQUEST Request) -{ - PADDRESS_FILE AddrFile; - NTSTATUS Status = STATUS_SUCCESS; - KIRQL OldIrql; - - AddrFile = Request->Handle.AddressHandle; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - /* Remove address file from the global list */ - TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); - RemoveEntryList(&AddrFile->ListEntry); - TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); /* Protocol specific handling */ switch (AddrFile->Protocol) { @@ -474,42 +449,20 @@ PTDI_REQUEST Request) { PCONNECTION_ENDPOINT Connection; + KIRQL OldIrql; TI_DbgPrint(MID_TRACE, ("Called.\n")); Connection = Request->Handle.ConnectionContext; + + TcpipAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql); + RemoveEntryList(&Connection->ListEntry); + TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); TcpipRecursiveMutexEnter( &TCPLock, TRUE ); TCPClose( Connection ); TcpipRecursiveMutexLeave( &TCPLock ); - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return STATUS_SUCCESS; -} - - -/* - * FUNCTION: Frees an connection file object - * ARGUMENTS: - * Request = Pointer to TDI request structure for this request - * RETURNS: - * Status of operation - */ -NTSTATUS FileFreeConnection( - PTDI_REQUEST Request) -{ - KIRQL OldIrql; - PCONNECTION_ENDPOINT Connection; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - Connection = Request->Handle.ConnectionContext; - - TcpipAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql); - RemoveEntryList(&Connection->ListEntry); - TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); - TCPFreeConnectionEndpoint(Connection); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); @@ -565,7 +518,7 @@ * RETURNS: * Status of operation */ -NTSTATUS FileFreeControlChannel( +NTSTATUS FileCloseControlChannel( PTDI_REQUEST Request) { PCONTROL_CHANNEL ControlChannel = Request->Handle.ControlChannel; Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Tue Aug 4 20:56:56 2009 @@ -252,74 +252,6 @@ return Status; } -/* - * FUNCTION: Prepares a file object for close - * ARGUMENTS: - * DeviceObject = Pointer to a device object for this driver - * Irp = Pointer to a I/O request packet - * RETURNS: - * Status of the operation - * NOTES: - * This function does not pend - */ -NTSTATUS TiCleanupFileObject( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - PIO_STACK_LOCATION IrpSp; - PTRANSPORT_CONTEXT Context; - TDI_REQUEST Request; - NTSTATUS Status; - KIRQL OldIrql; - - IrpSp = IoGetCurrentIrpStackLocation(Irp); - Context = IrpSp->FileObject->FsContext; - if (!Context) { - TI_DbgPrint(MIN_TRACE, ("Parameters are invalid.\n")); - return STATUS_INVALID_PARAMETER; - } - - IoAcquireCancelSpinLock(&OldIrql); - - Context->CancelIrps = TRUE; - - IoReleaseCancelSpinLock(OldIrql); - - switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { - case TDI_TRANSPORT_ADDRESS_FILE: - Request.Handle.AddressHandle = Context->Handle.AddressHandle; - Status = FileCloseAddress(&Request); - break; - - case TDI_CONNECTION_FILE: - Request.Handle.ConnectionContext = Context->Handle.ConnectionContext; - Status = FileCloseConnection(&Request); - break; - - case TDI_CONTROL_CHANNEL_FILE: - Request.Handle.ControlChannel = Context->Handle.ControlChannel; - /* Nothing to do to close */ - Status = STATUS_SUCCESS; - break; - - default: - /* This should never happen */ - - TI_DbgPrint(MIN_TRACE, ("Unknown transport context.\n")); - - IoAcquireCancelSpinLock(&OldIrql); - Context->CancelIrps = FALSE; - IoReleaseCancelSpinLock(OldIrql); - - Status = STATUS_INVALID_PARAMETER; - - } - - Irp->IoStatus.Status = Status; - - return Irp->IoStatus.Status; -} - /* * FUNCTION: Releases resources used by a file object @@ -339,7 +271,6 @@ PTRANSPORT_CONTEXT Context; TDI_REQUEST Request; NTSTATUS Status; - KIRQL OldIrql; IrpSp = IoGetCurrentIrpStackLocation(Irp); Context = IrpSp->FileObject->FsContext; @@ -348,39 +279,26 @@ return STATUS_INVALID_PARAMETER; } - IoAcquireCancelSpinLock(&OldIrql); - - Context->CancelIrps = TRUE; - - IoReleaseCancelSpinLock(OldIrql); - switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { case TDI_TRANSPORT_ADDRESS_FILE: Request.Handle.AddressHandle = Context->Handle.AddressHandle; - Status = FileFreeAddress(&Request); + Status = FileCloseAddress(&Request); break; case TDI_CONNECTION_FILE: Request.Handle.ConnectionContext = Context->Handle.ConnectionContext; - Status = FileFreeConnection(&Request); + Status = FileCloseConnection(&Request); break; case TDI_CONTROL_CHANNEL_FILE: Request.Handle.ControlChannel = Context->Handle.ControlChannel; - Status = FileFreeControlChannel(&Request); + Status = FileCloseControlChannel(&Request); break; default: - /* This should never happen */ - - TI_DbgPrint(MIN_TRACE, ("Unknown transport context.\n")); - - IoAcquireCancelSpinLock(&OldIrql); - Context->CancelIrps = FALSE; - IoReleaseCancelSpinLock(OldIrql); - + DbgPrint("Unknown type %d\n", (ULONG_PTR)IrpSp->FileObject->FsContext2); Status = STATUS_INVALID_PARAMETER; - + break; } Irp->IoStatus.Status = Status; @@ -422,12 +340,6 @@ case IRP_MJ_CLOSE: Context = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; Status = TiCloseFileObject(DeviceObject, Irp); - break; - - /* Release resources bound to an address file, connection endpoint, - or control connection */ - case IRP_MJ_CLEANUP: - Status = TiCleanupFileObject(DeviceObject, Irp); break; default: @@ -912,7 +824,6 @@ /* Initialize the driver object with this driver's entry points */ DriverObject->MajorFunction[IRP_MJ_CREATE] = TiDispatchOpenClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = TiDispatchOpenClose; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = TiDispatchOpenClose; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = TiDispatchInternal; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = TiDispatch;

1 0

[sginsberg] 42386: - Follow up to 41644: Get rid of the Wine headers using include_next as the definitions are now in the PSDK, wrapped under _WINE. Also define _WINE for the modules using those types. - Move MCI_OPEN_DRIVER and MCI_CLOSE_DRIVER to mmddk.h as this is where they belong. Also move them out of the _WINE guard as those defines are present in the official headers. - Add GetDriverFlags to mmsystem.h (missed this one in 41644). - Most Wine code now compiles fine in MSVC. - Wrap include
by sginsberg＠svn.reactos.org 04 Aug '09

04 Aug '09

Author: sginsberg Date: Tue Aug 4 20:34:06 2009 New Revision: 42386 URL: http://svn.reactos.org/svn/reactos?rev=42386&view=rev Log: - Follow up to 41644: Get rid of the Wine headers using include_next as the definitions are now in the PSDK, wrapped under _WINE. Also define _WINE for the modules using those types. - Move MCI_OPEN_DRIVER and MCI_CLOSE_DRIVER to mmddk.h as this is where they belong. Also move them out of the _WINE guard as those defines are present in the official headers. - Add GetDriverFlags to mmsystem.h (missed this one in 41644). - Most Wine code now compiles fine in MSVC. - Wrap include_next in crt/float.h under a __GNUC__ guard -- not quite correct as the included float.h defines some stuff that should be in the "real" float.h. - winnt.h: Remove duplicated LANG* defines that are already defined there and present in the official headers. Remove the _WINE guard from the rest as we may want to provide translations for those languages too. Removed: trunk/reactos/include/reactos/wine/dlgs.h trunk/reactos/include/reactos/wine/mmddk.h trunk/reactos/include/reactos/wine/mmsystem.h trunk/reactos/include/reactos/wine/prsht.h trunk/reactos/include/reactos/wine/sys/ trunk/reactos/include/reactos/wine/winbase.h trunk/reactos/include/reactos/wine/windef.h trunk/reactos/include/reactos/wine/winnetwk.h trunk/reactos/include/reactos/wine/winnls.h trunk/reactos/include/reactos/wine/winnt.h trunk/reactos/include/reactos/wine/winspool.h trunk/reactos/include/reactos/wine/winuser.h Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild trunk/reactos/dll/win32/cryptui/cryptui.rbuild trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild trunk/reactos/dll/win32/mciwave/mciwave.rbuild trunk/reactos/dll/win32/mpr/mpr.rbuild trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild trunk/reactos/dll/win32/msxml3/msxml3.rbuild trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/wininet/wininet.rbuild trunk/reactos/dll/win32/winmm/winmm.rbuild trunk/reactos/include/crt/float.h trunk/reactos/include/psdk/mmddk.h trunk/reactos/include/psdk/mmsystem.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/wine/config.h trunk/reactos/include/reactos/wine/port.h trunk/reactos/include/reactos/wine/winbase16.h Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound.… ============================================================================== --- trunk/reactos/dll/directx/dsound/dsound.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound/dsound.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -5,6 +5,7 @@ <importlibrary definition="dsound.spec" /> <include base="dsound">.</include> <include base="ReactOS">include/reactos/wine</include> + <define name="_WINE" /> <library>wine</library> <library>uuid</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -7,6 +7,7 @@ <include base="comctl32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <file>animate.c</file> <file>comboex.c</file> <file>comctl32undoc.c</file> Modified: trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -6,6 +6,7 @@ <include base="comdlg32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <file>cdlg32.c</file> <file>colordlg.c</file> <file>filedlg.c</file> Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -7,6 +7,7 @@ <include base="cryptui">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <file>main.c</file> <file>cryptui.rc</file> <file>cryptui_De.rc</file> Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -6,6 +6,7 @@ <include base="dbghelp">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <define name="HAVE_REGEX_H" /> <file>coff.c</file> <file>dbghelp.c</file> Modified: trunk/reactos/dll/win32/mciwave/mciwave.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciwave/mciwave.… ============================================================================== --- trunk/reactos/dll/win32/mciwave/mciwave.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciwave/mciwave.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -3,6 +3,7 @@ <include base="mciwave">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <file>mciwave.c</file> <library>wine</library> <library>winmm</library> Modified: trunk/reactos/dll/win32/mpr/mpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -6,6 +6,7 @@ <include base="mpr">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <file>auth.c</file> <file>mpr_main.c</file> <file>multinet.c</file> Modified: trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvfw32.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -6,6 +6,7 @@ <include base="msvfw32">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <file>mciwnd.c</file> <file>msvideo_main.c</file> <file>drawdib.c</file> Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -7,6 +7,7 @@ <include base="msxml3" root="intermediate">.</include> <dependency>msxml3_v1</dependency> <define name="__WINESRC__" /> + <define name="_WINE" /> <redefine name="_WIN32_WINNT">0x601</redefine> <define name="LIBXML_STATIC" /> <library>libxml2</library> Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -7,6 +7,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="_SHELL32_" /> <define name="COM_NO_WINDOWS_H" /> + <define name="_WINE" /> <redefine name="_WIN32_WINNT">0x600</redefine> <library>wine</library> <library>uuid</library> Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -7,6 +7,7 @@ <include base="wininet">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="_WINE" /> <library>wine</library> <library>mpr</library> <library>shlwapi</library> Modified: trunk/reactos/dll/win32/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.rbui… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -8,6 +8,7 @@ <importlibrary definition="winmm.spec" /> <include base="winmm">.</include> <include base="ReactOS">include/reactos/wine</include> + <define name="_WINE" /> <library>wine</library> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=42… ============================================================================== --- trunk/reactos/include/crt/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/float.h [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -16,7 +16,9 @@ * */ +#ifdef __GNUC__ #include_next<float.h> +#endif #ifndef _MINGW_FLOAT_H_ #define _MINGW_FLOAT_H_ Modified: trunk/reactos/include/psdk/mmddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmddk.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/mmddk.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmddk.h [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -91,7 +91,7 @@ #define DRV_QUERYSTRINGID (DRV_RESERVED + 14) #define DRV_QUERYSTRINGIDSIZE (DRV_RESERVED + 15) #define DRV_QUERYIDFROMSTRINGID (DRV_RESERVED + 16) -#ifdef __WINESRC__ +#ifdef _WINE #define DRV_QUERYDSOUNDIFACE (DRV_RESERVED + 20) #define DRV_QUERYDSOUNDDESC (DRV_RESERVED + 21) #define DRV_QUERYDSOUNDGUID (DRV_RESERVED + 22) @@ -330,6 +330,9 @@ #define MCI_MAX_DEVICE_TYPE_LENGTH 80 +#define MCI_OPEN_DRIVER 0x0801 +#define MCI_CLOSE_DRIVER 0x0802 + #define MCI_FALSE (MCI_STRING_OFFSET + 19) #define MCI_TRUE (MCI_STRING_OFFSET + 20) Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re… ============================================================================== --- trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -911,8 +911,6 @@ #define MCI_OVLY_WHERE_FRAME 0x80000 #define MCI_OVLY_WHERE_VIDEO 0x100000 #ifdef _WINE -#define MCI_OPEN_DRIVER 0x0801 -#define MCI_CLOSE_DRIVER 0x0802 #define MCI_SOUND 0x0812 #define MCI_SOUND_NAME 0x00000100L #endif @@ -1883,6 +1881,10 @@ BOOL WINAPI mciSetYieldProc(MCIDEVICEID,YIELDPROC,DWORD); HTASK WINAPI mciGetCreatorTask(MCIDEVICEID); YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD); + +#ifdef _WINE +DWORD WINAPI GetDriverFlags(HDRVR hDriver); +#endif typedef struct tagMCI_SEQ_SET_PARMS { DWORD dwCallback; Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -884,25 +884,17 @@ #define LANG_YORUBA 0x6a #define LANG_ZULU 0x35 -#ifdef _WINE +/* FIXME: non-standard */ #define LANG_ESPERANTO 0x8f #define LANG_WALON 0x90 #define LANG_CORNISH 0x91 +/* FIXME: not present in the official headers */ #define LANG_GAELIC 0x94 -#define LANG_MALTESE 0x3a -#define LANG_ROMANSH 0x17 #define LANG_SAAMI 0x3b -#define LANG_LOWER_SORBIAN 0x2e -#define LANG_UPPER_SORBIAN 0x2e #define LANG_SUTU 0x30 -#define LANG_TAJIK 0x28 #define LANG_TSONGA 0x31 -#define LANG_TSWANA 0x32 #define LANG_VENDA 0x33 -#define LANG_XHOSA 0x34 -#define LANG_ZULU 0x35 -#endif #define SUBLANG_CUSTOM_UNSPECIFIED 0x04 #define SUBLANG_CUSTOM_DEFAULT 0x03 Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -443,9 +443,7 @@ #define HAVE_PCLOSE 1 /* Define to 1 if the system has the type `pid_t'. */ -#if !defined(_MSC_VER) #define HAVE_PID_T 1 -#endif /* Define to 1 if you have the <poll.h> header file. */ /* #undef HAVE_POLL_H */ Removed: trunk/reactos/include/reactos/wine/dlgs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/dlgs.… ============================================================================== --- trunk/reactos/include/reactos/wine/dlgs.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/dlgs.h (removed) @@ -1,20 +1,0 @@ -/* - * Compatibility header - * - * This header is wrapper to allow compilation of Wine DLLs under ReactOS - * build system. It contains definitions commonly refered to as Wineisms - * and definitions that are missing in w32api. - */ - -#ifndef __WINE_DLGS_H -#define __WINE_DLGS_H - -#define OFN_DONTADDTORECENT 0x02000000 -#define OFN_ENABLEINCLUDENOTIFY 0x00400000 -#define NEWFILEOPENORD 1547 - -#if !defined (_MSC_VER) -#include_next <dlgs.h> -#endif - -#endif /* __WINE_DLGS_H */ Removed: trunk/reactos/include/reactos/wine/mmddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/mmddk… ============================================================================== --- trunk/reactos/include/reactos/wine/mmddk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/mmddk.h (removed) @@ -1,18 +1,0 @@ -/* $Id $ - * - * Compatibility header - * - * This header is wrapper to allow compilation of Wine DLLs under ReactOS - * build system. It contains definitions commonly refered to as Wineisms - * and definitions that are missing in w32api. - */ - -#include_next <mmddk.h> - -#ifndef __WINE_MMDDK_H -#define __WINE_MMDDK_H - -#define DRV_QUERYDSOUNDIFACE (DRV_RESERVED + 20) -#define DRV_QUERYDSOUNDDESC (DRV_RESERVED + 21) - -#endif /* __WINE_MMDDK_H */ Removed: trunk/reactos/include/reactos/wine/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/mmsys… ============================================================================== --- trunk/reactos/include/reactos/wine/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/mmsystem.h (removed) @@ -1,64 +1,0 @@ -/* - * MMSYSTEM - Multimedia Wine Extension ... :-) - * - * Copyright (C) the Wine project - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_MMSYSTEM_H -#define __WINE_MMSYSTEM_H - -#include_next <mmsystem.h> - -#define DRV_SUCCESS 0x0001 -#define DRV_FAILURE 0x0000 -#define DRV_EXITAPPLICATION 0x000C - -#define MAXWAVEDRIVERS 10 -#define MAXMIDIDRIVERS 10 -#define MAXAUXDRIVERS 10 -#define MAXMCIDRIVERS 32 -#define MAXMIXERDRIVERS 10 - -#define MCI_OPEN_DRIVER 0x0801 -#define MCI_CLOSE_DRIVER 0x0802 -#define MCI_SOUND 0x0812 - -#define MCI_SOUND_NAME 0x00000100L - -typedef LPCSTR HPCSTR; /* a huge version of LPCSTR */ - -typedef struct tagMCI_SOUND_PARMSA { - DWORD_PTR dwCallback; - LPCSTR lpstrSoundName; -} MCI_SOUND_PARMSA, *LPMCI_SOUND_PARMSA; - -typedef struct tagMCI_SOUND_PARMSW { - DWORD_PTR dwCallback; - LPCWSTR lpstrSoundName; -} MCI_SOUND_PARMSW, *LPMCI_SOUND_PARMSW; - -#ifdef UNICODE -typedef MCI_SOUND_PARMSW MCI_SOUND_PARMS; -#else -typedef MCI_SOUND_PARMSA MCI_SOUND_PARMS; -#endif - -typedef struct midievent_tag *LPMIDIEVENT; - -DWORD WINAPI GetDriverFlags(HDRVR hDriver); - -#endif /* __WINE_WINNT_H */ Modified: trunk/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/port.… ============================================================================== --- trunk/reactos/include/reactos/wine/port.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/port.h [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -242,10 +242,6 @@ size_t getpagesize(void); #endif /* HAVE_GETPAGESIZE */ -#ifndef HAVE_GETTID -pid_t gettid(void); -#endif /* HAVE_GETTID */ - #ifndef HAVE_LSTAT int lstat(const char *file_name, struct stat *buf); #endif /* HAVE_LSTAT */ Removed: trunk/reactos/include/reactos/wine/prsht.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/prsht… ============================================================================== --- trunk/reactos/include/reactos/wine/prsht.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/prsht.h (removed) @@ -1,27 +1,0 @@ -/* - * Copyright (C) the Wine project - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include_next <prsht.h> - -#ifndef __WINE_PRSHT_H -#define __WINE_PRSHT_H - -#define PSH_WIZARD97_OLD 0x00002000 /* for IE < 5 */ -#define PSH_WIZARD97_NEW 0x01000000 /* for IE >= 5 */ - -#endif /* __WINE_PRSHT_H */ Removed: trunk/reactos/include/reactos/wine/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winba… ============================================================================== --- trunk/reactos/include/reactos/wine/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winbase.h (removed) @@ -1,15 +1,0 @@ -#ifndef __WINE_WINBASE_H -#define __WINE_WINBASE_H - -#include_next <winbase.h> - -/* undocumented functions */ - -typedef struct tagSYSLEVEL -{ - CRITICAL_SECTION crst; - INT level; -} SYSLEVEL; - - -#endif /* __WINE_WINBASE_H */ Modified: trunk/reactos/include/reactos/wine/winbase16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winba… ============================================================================== --- trunk/reactos/include/reactos/wine/winbase16.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winbase16.h [iso-8859-1] Tue Aug 4 20:34:06 2009 @@ -316,6 +316,13 @@ #define __AHSHIFT 3 /* don't change! */ #define __AHINCR (1 << __AHSHIFT) + + +typedef struct tagSYSLEVEL +{ + CRITICAL_SECTION crst; + INT level; +} SYSLEVEL; /* undocumented functions */ WORD WINAPI AllocCStoDSAlias16(WORD); Removed: trunk/reactos/include/reactos/wine/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winde… ============================================================================== --- trunk/reactos/include/reactos/wine/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/windef.h (removed) @@ -1,1 +1,0 @@ -#include "../../psdk/windef.h" Removed: trunk/reactos/include/reactos/wine/winnetwk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winne… ============================================================================== --- trunk/reactos/include/reactos/wine/winnetwk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winnetwk.h (removed) @@ -1,31 +1,0 @@ -/* $Id: winnetwk.h 20909 2006-01-15 22:25:16Z gvg $ - * - * Compatibility header - * - * This header is wrapper to allow compilation of Wine DLLs under ReactOS - * build system. It contains definitions commonly refered to as Wineisms - * and definitions that are missing in w32api. - */ - -#include_next <winnetwk.h> - -#ifndef __WINE_WINNETWK_H -#define __WINE_WINNETWK_H - -/* WNetEnumCachedPasswords */ -typedef struct tagPASSWORD_CACHE_ENTRY -{ - WORD cbEntry; - WORD cbResource; - WORD cbPassword; - BYTE iEntry; - BYTE nType; - BYTE abResource[1]; -} PASSWORD_CACHE_ENTRY; - -typedef BOOL (CALLBACK *ENUMPASSWORDPROC)(PASSWORD_CACHE_ENTRY *, DWORD); -DWORD WINAPI WNetCachePassword( LPSTR, WORD, LPSTR, WORD, BYTE, WORD ); -UINT WINAPI WNetEnumCachedPasswords( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD); -DWORD WINAPI WNetGetCachedPassword( LPSTR, WORD, LPSTR, LPWORD, BYTE ); - -#endif /* __WINE_WINNETWK_H */ Removed: trunk/reactos/include/reactos/wine/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winnl… ============================================================================== --- trunk/reactos/include/reactos/wine/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winnls.h (removed) @@ -1,27 +1,0 @@ -/* - * Copyright (C) the Wine project - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_WINNLS_H -#define __WINE_WINNLS_H - -#include_next <winnls.h> - -#define CP_UNIXCP CP_ACP - - -#endif /* __WINE_WINNLS_H */ Removed: trunk/reactos/include/reactos/wine/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winnt… ============================================================================== --- trunk/reactos/include/reactos/wine/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winnt.h (removed) @@ -1,54 +1,0 @@ -/* - * Win32 definitions for Windows NT - * - * Copyright 1996 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_WINNT_H -#define __WINE_WINNT_H - -#include_next <winnt.h> - -#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) -#define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) -#else -#define __WINE_ALLOC_SIZE(x) -#endif - -/* non standard; keep the number high enough (but < 0xff) */ -#define LANG_ESPERANTO 0x8f -#define LANG_WALON 0x90 -#define LANG_CORNISH 0x91 - -/* FIXME: these are not in the Windows header */ -#define LANG_GAELIC 0x94 -#define LANG_MALTESE 0x3a -#define LANG_ROMANSH 0x17 -#define LANG_SAAMI 0x3b -#define LANG_LOWER_SORBIAN 0x2e -#define LANG_UPPER_SORBIAN 0x2e -#define LANG_SUTU 0x30 -#define LANG_TAJIK 0x28 -#define LANG_TSONGA 0x31 -#define LANG_TSWANA 0x32 -#define LANG_VENDA 0x33 -#define LANG_XHOSA 0x34 -#define LANG_ZULU 0x35 - -#define WINE_UNUSED __attribute__((unused)) - -#endif /* __WINE_WINNT_H */ Removed: trunk/reactos/include/reactos/wine/winspool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winsp… ============================================================================== --- trunk/reactos/include/reactos/wine/winspool.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winspool.h (removed) @@ -1,48 +1,0 @@ -/* Definitions for printing - * - * Copyright 1998 Huw Davies, Andreas Mohr - * - * Portions Copyright (c) 1999 Corel Corporation - * (Paul Quinn, Albert Den Haan) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#ifndef __WINE_WINSPOOL_H -#define __WINE_WINSPOOL_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * Compatibility header - */ - -#if !defined(_MSC_VER) -#include_next "winspool.h" -#endif - - -/* DECLARATIONS */ - -LPSTR WINAPI StartDocDlgA(HANDLE hPrinter, DOCINFOA *doc); -LPWSTR WINAPI StartDocDlgW(HANDLE hPrinter, DOCINFOW *doc); -#define StartDocDlg WINELIB_NAME_AW(StartDocDlg) - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __WINE_WINSPOOL_H */ Removed: trunk/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winuser.h (removed) @@ -1,15 +1,0 @@ -#ifndef __WINE_WINUSER_H -#define __WINE_WINUSER_H - -/* - * Compatibility header - */ - -#if !defined(_MSC_VER) -#include_next "winuser.h" -#endif - -#define DCX_USESTYLE 0x00010000 -#define LB_CARETOFF 0x01a4 - -#endif /* __WINE_WINUSER_H */

1 0

[dchapyshev] 42385: - Sync FreeLibrary with Wine. Fixes an exception at installation Firefox 3.5.x
by dchapyshev＠svn.reactos.org 04 Aug '09

04 Aug '09

Author: dchapyshev Date: Tue Aug 4 18:43:37 2009 New Revision: 42385 URL: http://svn.reactos.org/svn/reactos?rev=42385&view=rev Log: - Sync FreeLibrary with Wine. Fixes an exception at installation Firefox 3.5.x Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Tue Aug 4 18:43:37 2009 @@ -340,28 +340,25 @@ /* * @implemented */ -BOOL -WINAPI -FreeLibrary( HMODULE hLibModule ) -{ - PVOID Module = (PVOID)((ULONG_PTR)hLibModule & ~1); +BOOL WINAPI FreeLibrary(HINSTANCE hLibModule) +{ NTSTATUS Status; + if (!hLibModule) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if ((ULONG_PTR)hLibModule & 1) { - if (!RtlImageNtHeader(Module)) - { - SetLastErrorByStatus(STATUS_INVALID_IMAGE_FORMAT); - return FALSE; - } - - Status = NtUnmapViewOfSection(NtCurrentProcess(), Module); - } - else - { - Status = LdrUnloadDll(hLibModule); - } - + /* this is a LOAD_LIBRARY_AS_DATAFILE module */ + char *ptr = (char *)hLibModule - 1; + UnmapViewOfFile(ptr); + return TRUE; + } + + Status = LdrUnloadDll(hLibModule); if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status);

1 0

[cgutman] 42384: - Add a debug print
by cgutman＠svn.reactos.org 04 Aug '09

04 Aug '09

Author: cgutman Date: Tue Aug 4 18:22:12 2009 New Revision: 42384 URL: http://svn.reactos.org/svn/reactos?rev=42384&view=rev Log: - Add a debug print Modified: trunk/reactos/base/services/dhcp/adapter.c Modified: trunk/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter… ============================================================================== --- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Tue Aug 4 18:22:12 2009 @@ -222,6 +222,7 @@ IfEntry.dwOperStatus == IF_OPER_STATUS_OPERATIONAL) return 1; + DH_DbgPrint(MID_TRACE,("Interface %d is down\n", IfEntry.dwIndex)); return 0; }

1 0

[gschneider] 42383: _ecvt: - Rewrite the function, getting rid of alloca and unneeded code parts - Relies on working sprintf, especially allows to detect the decimal point position independent of wanted precision - Fixes all msvcrt printf winetests
by gschneider＠svn.reactos.org 04 Aug '09

04 Aug '09

Author: gschneider Date: Tue Aug 4 17:17:00 2009 New Revision: 42383 URL: http://svn.reactos.org/svn/reactos?rev=42383&view=rev Log: _ecvt: - Rewrite the function, getting rid of alloca and unneeded code parts - Relies on working sprintf, especially allows to detect the decimal point position independent of wanted precision - Fixes all msvcrt printf winetests Removed: trunk/reactos/lib/sdk/crt/stdlib/ecvtbuf.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/stdlib/ecvt.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Tue Aug 4 17:17:00 2009 @@ -317,7 +317,6 @@ <file>abort.c</file> <file>atexit.c</file> <file>ecvt.c</file> - <file>ecvtbuf.c</file> <file>errno.c</file> <file>fcvt.c</file> <file>fcvtbuf.c</file> Modified: trunk/reactos/lib/sdk/crt/stdlib/ecvt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/ecvt.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/ecvt.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/ecvt.c [iso-8859-1] Tue Aug 4 17:17:00 2009 @@ -1,7 +1,12 @@ -/* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ +/* + * PROJECT: ReactOS CRT + * LICENSE: See COPYING in the top level directory + * PURPOSE: CRT's ecvt + * FILE: lib/sdk/crt/stdlib/ecvt.c + * PROGRAMERS: Gregor Schneider (parts based on ecvtbuf.c by DJ Delorie) + */ + #include <precomp.h> - -char *ecvtbuf (double, int, int *, int *, char *); /* * @implemented @@ -9,6 +14,98 @@ char * _ecvt (double value, int ndigits, int *decpt, int *sign) { - static char ecvt_buf[DBL_MAX_10_EXP + 10]; - return ecvtbuf (value, ndigits, decpt, sign, ecvt_buf); + char *ecvtbuf, *cvtbuf; + char *s, *d; + + s = cvtbuf = (char*)malloc(ndigits + 18); /* sign, dot, null, 15 for alignment */ + d = ecvtbuf = (char*)malloc(DBL_MAX_10_EXP + 10); + + *sign = 0; + *decpt = 0; + + if (cvtbuf == NULL || ecvtbuf == NULL) + { + return NULL; + } + + sprintf(cvtbuf, "%-+.*E", ndigits, value); + /* Treat special values */ + if (strncmp(s, "NaN", 3) == 0) + { + memcpy(ecvtbuf, s, 4); + } + else if (strncmp(s + 1, "Inf", 3) == 0) + { + memcpy(ecvtbuf, s, 5); + } + else + { + /* Set the sign */ + if (*s && *s == '-') + { + *sign = 1; + } + s++; + /* Copy the first digit */ + if (*s && *s != '.') + { + if (d - ecvtbuf < ndigits) + { + *d++ = *s++; + } + else + { + s++; + } + } + /* Skip the decimal point */ + if (*s && *s == '.') + { + s++; + } + /* Copy fractional digits */ + while (*s && *s != 'E') + { + if (d - ecvtbuf < ndigits) + { + *d++ = *s++; + } + else + { + s++; + } + } + /* Skip the exponent */ + if (*s && *s == 'E') + { + s++; + } + /* Set the decimal point to the exponent value plus the one digit we copied */ + *decpt = atoi(s) + 1; + /* Handle special decimal point cases */ + if (cvtbuf[1] == '0') + { + *decpt = 0; + } + if (ndigits < 1) + { + /* Need enhanced precision*/ + char* tbuf = (char*)malloc(ndigits + 18); + sprintf(tbuf, "%-+.*E", ndigits + 2, value); + if (tbuf[1] >= '5') + { + (*decpt)++; + } + free(tbuf); + } + /* Pad with zeroes */ + while (d - ecvtbuf < ndigits) + { + *d++ = '0'; + } + /* Terminate */ + *d = '\0'; + } + free(cvtbuf); + return ecvtbuf; } Removed: trunk/reactos/lib/sdk/crt/stdlib/ecvtbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/ecvtbuf… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/ecvtbuf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/ecvtbuf.c (removed) @@ -1,108 +1,0 @@ -/* Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details */ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <float.h> -#include <malloc.h> -// #include <msvcrt/locale.h> - -void __ecvround (char *, char *, const char *, int *); - -void -__ecvround (char *numbuf, char *last_digit, const char *after_last, int *decpt) -{ - char *p; - int carry = 0; - - /* Do we have at all to round the last digit? */ - if (*after_last > '4') - { - p = last_digit; - carry = 1; - - /* Propagate the rounding through trailing '9' digits. */ - do { - int sum = *p + carry; - carry = sum > '9'; - *p-- = sum - carry * 10; - } while (carry && p >= numbuf); - - /* We have 9999999... which needs to be rounded to 100000.. */ - if (carry && p == numbuf) - { - *p = '1'; - *decpt += 1; - } - } -} - -char * -ecvtbuf (double value, int ndigits, int *decpt, int *sign, char *buf) -{ - static char INFINITY[] = "Infinity"; - char decimal = '.' /* localeconv()->decimal_point[0] */; - char *cvtbuf = (char *)_alloca (ndigits + 20); /* +3 for sign, dot, null; */ - /* two extra for rounding */ - /* 15 extra for alignment */ - char *s = cvtbuf, *d = buf; - - /* Produce two extra digits, so we could round properly. */ - sprintf (cvtbuf, "%-+.*E", ndigits + 2, value); - *decpt = 0; - - /* The sign. */ - if (*s++ == '-') - *sign = 1; - else - *sign = 0; - - /* Special values get special treatment. */ - if (strncmp (s, "Inf", 3) == 0) - { - /* SunOS docs says we have return "Infinity" for NDIGITS >= 8. */ - memcpy (buf, INFINITY, ndigits >= 8 ? 9 : 3); - if (ndigits < 8) - buf[3] = '\0'; - } - else if (strcmp (s, "NaN") == 0) - memcpy (buf, s, 4); - else - { - char *last_digit, *digit_after_last; - - /* Copy (the single) digit before the decimal. */ - while (*s && *s != decimal && d - buf < ndigits) - *d++ = *s++; - - /* If we don't see any exponent, here's our decimal point. */ - *decpt = d - buf; - if (*s) - s++; - - /* Copy the fraction digits. */ - while (*s && *s != 'E' && d - buf < ndigits) - *d++ = *s++; - - /* Remember the last digit copied and the one after it. */ - last_digit = d > buf ? d - 1 : d; - digit_after_last = s; - - /* Get past the E in exponent field. */ - while (*s && *s++ != 'E') - ; - - /* Adjust the decimal point by the exponent value. */ - *decpt += atoi (s); - - /* Pad with zeroes if needed. */ - while (d - buf < ndigits) - *d++ = '0'; - - /* Zero-terminate. */ - *d = '\0'; - - /* Round if necessary. */ - __ecvround (buf, last_digit, digit_after_last, decpt); - } - return buf; -}

1 0

[gschneider] 42382: sprintf: - Implement higher precision exponent selection, checked against ecvt test cases to match wanted behavior - msvcrt printf winetests up by ~10 because current ecvt relies on non-correct behavior - Cleanup unneeded checks, wrong variable usages, add new header
by gschneider＠svn.reactos.org 04 Aug '09

04 Aug '09

Author: gschneider Date: Tue Aug 4 17:09:47 2009 New Revision: 42382 URL: http://svn.reactos.org/svn/reactos?rev=42382&view=rev Log: sprintf: - Implement higher precision exponent selection, checked against ecvt test cases to match wanted behavior - msvcrt printf winetests up by ~10 because current ecvt relies on non-correct behavior - Cleanup unneeded checks, wrong variable usages, add new header Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_spri… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] Tue Aug 4 17:09:47 2009 @@ -1,22 +1,18 @@ /* - * PROGRAMMERS: - * David Welch - * Eric Kohl - * Gregor Schneider - * + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: CRT's vsnprintf + * FILE: lib/sdk/crt/stdio/lnx_printf.c + * PROGRAMERS: David Welch + Eric Kohl + Gregor Schneider * TODO: * - Verify the implementation of '%Z'. */ -/* - * linux/lib/vsprintf.c - * - * Copyright (C) 1991, 1992 Linus Torvalds - */ - -/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ -/* - * Wirzenius wrote this portably, Torvalds fucked it up :-) +/* + * Parts from linux/lib/vsprintf.c + * Lars Wirzenius & Linus Torvalds + * Wirzenius wrote this portably, Torvalds fucked it up :-) */ #include <precomp.h> @@ -156,11 +152,49 @@ unsigned int sign:1; } ieee_double_t; +static __inline void fracrnd(double *number, int prec) +{ + /* Shifts fractional digits to decimal places and compares to round table */ + /* Only suitable to determine the exponent with more precision, not for normal rounding */ + /* Incoming numbers are expected to range from approx -10.0 to 10.0 */ + int lpos = 1, ubound, sign = 1; + long decimal = abs((long)*number); + double frac = (*number - decimal) * 10; + long rt[] = + { + 0, + 9, + 99, + 999, + 9999, + 99999, + 999999, + 9999999, + 99999999, + 999999999 + }; + + if (*number < 0) + { + sign = -1; + } + ubound = min(prec, sizeof(rt)/sizeof(*rt) - 1); + while ((long)frac % 10 != 0 && lpos < ubound) + { + frac *= 10; + lpos++; + } + if (abs((long)frac) == rt[lpos]) + { + *number = sign * (decimal + 1); + } +} + static char * numberf(char * buf, char * end, double num, char exp_sign, int size, int precision, int type) { double exponent = 0.0; - double e; + double e = 0.0; long ie; int i = 0; @@ -185,9 +219,7 @@ if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) { ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); - if (*n.__n == 0.0) - exponent = 0.0; - else + if (num != 0.0) { exponent = ie/3.321928; } @@ -205,28 +237,25 @@ if ( exp_sign == 'e' || exp_sign == 'E' ) { - frac = modf(exponent,&e); - if (num < 0.0) - e--; - if (frac >= 0.5) - e++; - else if (frac < -0.5) - e--; - - num2 = num/pow(10.0L,(long double)e); - if (num2 < 1.0 && num2 > -1.0) - { - e--; - num2 = num/pow(10.0L,(long double)e); - } - else if (num2 < -10.0 && num2 > 10.0) - { - e++; - num2 = num/pow(10.0L,(long double)e); - } + if (num != 0.0) + { + /* Find a suitable exponent */ + frac = modf(exponent, &e); + num2 = num/pow(10.0L, (long double)e); + /* Check if rounding is possible */ + fracrnd(&num2, precision); + if (num2 < 1.0 && num2 > -1.0) + { + e--; + } + else if (num2 <= -10.0 || num2 >= 10.0) + { + e++; + } + } /* size-5 because "e+abc" is going to follow */ - buf = numberf(buf, end, num2, 'f', size-5, precision, type); + buf = numberf(buf, end, num/pow(10.0L,(long double)e), 'f', size-5, precision, type); isize = 4; while(*(buf-1) == ' ') {

1 0

[fireball] 42381: - Uncomment missing surface unlocks.
by fireball＠svn.reactos.org 04 Aug '09

04 Aug '09

Author: fireball Date: Tue Aug 4 16:07:15 2009 New Revision: 42381 URL: http://svn.reactos.org/svn/reactos?rev=42381&view=rev Log: - Uncomment missing surface unlocks. Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engblt.c branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engblt.c [iso-8859-1] Tue Aug 4 16:07:15 2009 @@ -146,8 +146,8 @@ } } - //if (psurfPattern) - // SURFACE_UnlockSurface(psurfPattern); + if (psurfPattern) + SURFACE_Unlock(psurfPattern); return TRUE; } @@ -228,7 +228,7 @@ /* Pattern brush */ if (psurfPattern != NULL) { - //SURFACE_UnlockSurface(psurfPattern); + SURFACE_Unlock(psurfPattern); } return Result; Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engpoint.c [iso-8859-1] Tue Aug 4 16:07:15 2009 @@ -291,7 +291,7 @@ pgp->psurfColor->pvBits = 0; EngDeleteSurface(pgp->psurfColor->hsurf); - //SURFACE_ShareUnlockSurface(pgp->psurfColor); + SURFACE_ShareUnlock(pgp->psurfColor); pgp->psurfColor = NULL; } @@ -302,14 +302,14 @@ pgp->psurfMask->pvBits = 0; EngDeleteSurface(pgp->psurfMask->hsurf); - //SURFACE_ShareUnlockSurface(pgp->psurfMask); + SURFACE_ShareUnlock(pgp->psurfMask); pgp->psurfMask = NULL; } if (pgp->psurfSave != NULL) { EngDeleteSurface(pgp->psurfSave->hsurf); - //SURFACE_ShareUnlockSurface(pgp->psurfSave); + SURFACE_ShareUnlock(pgp->psurfSave); pgp->psurfSave = NULL; }

1 0

[fireball] 42380: - Use a precreated stock bitmap.
by fireball＠svn.reactos.org 04 Aug '09

04 Aug '09

Author: fireball Date: Tue Aug 4 14:20:45 2009 New Revision: 42380 URL: http://svn.reactos.org/svn/reactos?rev=42380&view=rev Log: - Use a precreated stock bitmap. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Tue Aug 4 14:20:45 2009 @@ -77,8 +77,6 @@ HGDIOBJ hNewDC; PDC pNewDC; XFORM xformWorld2Vport, xformVport2World; - HBITMAP hStockBitmap; - SIZEL slSize; /* TESTING: Create primary surface */ if (!PrimarySurface.pSurface && !IntCreatePrimarySurface()) @@ -118,9 +116,7 @@ if (dc->dwType == OBJ_MEMDC) { DPRINT("Creating a memory DC %x\n", hNewDC); - slSize.cx = 1; slSize.cy = 1; - hStockBitmap = GreCreateBitmap(slSize, 1, 1, 0, NULL); - pNewDC->pBitmap = SURFACE_ShareLock(hStockBitmap); + pNewDC->pBitmap = SURFACE_ShareLock(hStockBmp); /* Set DC rectangles */ pNewDC->rcDcRect.left = 0; pNewDC->rcDcRect.top = 0;

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