Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[cfinck] 33357: Filip Navara: - Only increment VideoPortDeviceNumber, when IntVideoPortCreateAdapterDeviceObject and IntVideoPortFindAdapter succeeded. This fixes loading the CL54xx miniport driver. But it still isn't usable, because win32k cannot find the DDI driver for it.
by cfinck＠svn.reactos.org 07 May '08

07 May '08

Author: cfinck Date: Wed May 7 16:51:39 2008 New Revision: 33357 URL: http://svn.reactos.org/svn/reactos?rev=33357&view=rev Log: Filip Navara: - Only increment VideoPortDeviceNumber, when IntVideoPortCreateAdapterDeviceObject and IntVideoPortFindAdapter succeeded. This fixes loading the CL54xx miniport driver. But it still isn't usable, because win32k cannot find the DDI driver for it. Modified: trunk/reactos/drivers/video/videoprt/dispatch.c trunk/reactos/drivers/video/videoprt/videoprt.c trunk/reactos/drivers/video/videoprt/videoprt.h Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] Wed May 7 16:51:39 2008 @@ -81,6 +81,8 @@ DriverExtension, PhysicalDeviceObject, &DeviceObject); + if (NT_SUCCESS(Status)) + VideoPortDeviceNumber++; return Status; } Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] Wed May 7 16:51:39 2008 @@ -187,7 +187,7 @@ * object names and symlinks. */ - DeviceNumber = VideoPortDeviceNumber++; + DeviceNumber = VideoPortDeviceNumber; if (DeviceNumber == 0xFFFFFFFF) { WARN_(VIDEOPRT, "Can't find free device number\n"); @@ -721,6 +721,8 @@ return Status; Status = IntVideoPortFindAdapter(DriverObject, DriverExtension, DeviceObject); INFO_(VIDEOPRT, "IntVideoPortFindAdapter returned 0x%x\n", Status); + if (NT_SUCCESS(Status)) + VideoPortDeviceNumber++; return Status; } else Modified: trunk/reactos/drivers/video/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] Wed May 7 16:51:39 2008 @@ -196,6 +196,7 @@ extern ULONG CsrssInitialized; extern PKPROCESS Csrss; +extern ULONG VideoPortDeviceNumber; VOID FASTCALL IntAttachToCSRSS(PKPROCESS *CallingProcess, PKAPC_STATE ApcState);

1 0

[cfinck] 33356: Fix circles build
by cfinck＠svn.reactos.org 07 May '08

07 May '08

Author: cfinck Date: Wed May 7 16:11:12 2008 New Revision: 33356 URL: http://svn.reactos.org/svn/reactos?rev=33356&view=rev Log: Fix circles build Modified: trunk/rosapps/applications/screensavers/circles/circles.c Modified: trunk/rosapps/applications/screensavers/circles/circles.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.c [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/circles/circles.c [iso-8859-1] Wed May 7 16:11:12 2008 @@ -83,7 +83,6 @@ ReleaseDC (hwnd, hdc); return 0; - } } return DefScreenSaverProc (hwnd, iMsg, wparam, lparam);

1 0

[mpiulachs] 33355: -try to fix linux build
by mpiulachs＠svn.reactos.org 07 May '08

07 May '08

Author: mpiulachs Date: Wed May 7 16:08:40 2008 New Revision: 33355 URL: http://svn.reactos.org/svn/reactos?rev=33355&view=rev Log: -try to fix linux build Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/dxsdk.rbuild [iso-8859-1] Wed May 7 16:08:40 2008 @@ -18,5 +18,4 @@ <file>strmif.idl</file> <file>dvdif.idl</file> <file>devenum.idl</file> - <file>d3dvec.idl</file> </module>

1 0

[mpiulachs] 33354: -fix linux build
by mpiulachs＠svn.reactos.org 07 May '08

07 May '08

Author: mpiulachs Date: Wed May 7 15:58:06 2008 New Revision: 33354 URL: http://svn.reactos.org/svn/reactos?rev=33354&view=rev Log: -fix linux build Modified: trunk/reactos/include/dxsdk/strmif.idl Modified: trunk/reactos/include/dxsdk/strmif.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/strmif.idl?r… ============================================================================== --- trunk/reactos/include/dxsdk/strmif.idl [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/strmif.idl [iso-8859-1] Wed May 7 15:58:06 2008 @@ -6,4 +6,4 @@ #include <axextend.idl> #include <dvdif.idl> #include <dyngraph.idl> -#include "VMRender.idl" +#include "Vmrender.idl"

1 0

[mpiulachs] 33353: - add missing idl files to build
by mpiulachs＠svn.reactos.org 07 May '08

07 May '08

Author: mpiulachs Date: Wed May 7 15:54:42 2008 New Revision: 33353 URL: http://svn.reactos.org/svn/reactos?rev=33353&view=rev Log: - add missing idl files to build Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/dxsdk.rbuild [iso-8859-1] Wed May 7 15:54:42 2008 @@ -15,4 +15,8 @@ <file>vidcap.idl</file> <file>Videoacc.idl</file> <file>Vmrender.idl</file> + <file>strmif.idl</file> + <file>dvdif.idl</file> + <file>devenum.idl</file> + <file>d3dvec.idl</file> </module>

1 0

[mpiulachs] 33352: -autogenerate dxsdk headers as part of the build as requested
by mpiulachs＠svn.reactos.org 07 May '08

07 May '08

Author: mpiulachs Date: Wed May 7 15:49:15 2008 New Revision: 33352 URL: http://svn.reactos.org/svn/reactos?rev=33352&view=rev Log: -autogenerate dxsdk headers as part of the build as requested Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Wed May 7 15:49:15 2008 @@ -2301,8 +2301,12 @@ if ( module.host == HostTrue ) return; - if ( module.name != "psdk" ) + if (module.name != "psdk" && + module.name != "dxsdk") + { dependencies.push_back ( "$(PSDK_TARGET) $(psdk_HEADERS)" ); + dependencies.push_back ( "$(DXSDK_TARGET) $(dxsdk_HEADERS)" ); + } /* Check if any dependent library relies on the generated headers */ for ( size_t i = 0; i < module.project.modules.size (); i++ )

1 0

[cfinck] 33351: Fix indentation :)
by cfinck＠svn.reactos.org 07 May '08

07 May '08

Author: cfinck Date: Wed May 7 15:19:43 2008 New Revision: 33351 URL: http://svn.reactos.org/svn/reactos?rev=33351&view=rev Log: Fix indentation :) Modified: trunk/rosapps/applications/screensavers/circles/circles.c Modified: trunk/rosapps/applications/screensavers/circles/circles.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.c [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/circles/circles.c [iso-8859-1] Wed May 7 15:19:43 2008 @@ -23,79 +23,70 @@ #define RANDOM_COLOR (rand () % 256) -#define APPNAME _T("Circles") -#define APP_TIMER 1 -#define APP_TIMER_INTERVAL 100 -#define MAX_CIRCLES 50 +#define APPNAME _T("Circles") +#define APP_TIMER 1 +#define APP_TIMER_INTERVAL 100 +#define MAX_CIRCLES 50 int circlesCount; int width, x, y; -LRESULT WINAPI ScreenSaverProc (HWND hwnd, UINT iMsg, WPARAM wparam, - LPARAM lparam) +LRESULT WINAPI ScreenSaverProc (HWND hwnd, UINT iMsg, WPARAM wparam, LPARAM lparam) { - HDC hdc; - RECT rect; - HBRUSH hbrush, hbrushOld; + HDC hdc; + RECT rect; + HBRUSH hbrush, hbrushOld; - switch (iMsg) - { - case WM_CREATE: - { - SetTimer ( - hwnd, - APP_TIMER, - APP_TIMER_INTERVAL, - NULL); - } - break; - case WM_DESTROY: - { - KillTimer (hwnd, APP_TIMER); - PostQuitMessage (0); - return 0; - } - break; - case WM_TIMER: - { - hdc = GetDC (hwnd); - GetClientRect (hwnd, &rect); - hbrush = CreateSolidBrush (RGB (RANDOM_COLOR, RANDOM_COLOR, RANDOM_COLOR)); - hbrushOld = SelectObject (hdc, hbrush); + switch (iMsg) + { + case WM_CREATE: + SetTimer (hwnd, APP_TIMER, APP_TIMER_INTERVAL, NULL); + break; - x = rand () % rect.right; - y = rand () % rect.bottom; + case WM_DESTROY: + KillTimer (hwnd, APP_TIMER); + PostQuitMessage (0); + return 0; - /* the circle will be 10% of total screen */ - width = rect.right / 10; - if (rect.bottom / 10 < width) - width = rect.bottom / 10; + case WM_TIMER: + hdc = GetDC (hwnd); + GetClientRect (hwnd, &rect); + hbrush = CreateSolidBrush (RGB (RANDOM_COLOR, RANDOM_COLOR, RANDOM_COLOR)); + hbrushOld = SelectObject (hdc, hbrush); - /* Draw circle on screen */ - Ellipse ( - hdc, - x, - y, - x + width, - y + width); + x = rand () % rect.right; + y = rand () % rect.bottom; - //Track the number of painted circles on scren - circlesCount++; - if (circlesCount == MAX_CIRCLES) - { - InvalidateRect (hwnd, NULL, TRUE); - circlesCount = 0; - } + /* the circle will be 10% of total screen */ + width = rect.right / 10; + if (rect.bottom / 10 < width) + width = rect.bottom / 10; - SelectObject (hdc, hbrushOld); - DeleteObject (hbrush); - ReleaseDC (hwnd, hdc); + /* Draw circle on screen */ + Ellipse ( + hdc, + x, + y, + x + width, + y + width); - return 0; - } - } + //Track the number of painted circles on scren + circlesCount++; + if (circlesCount == MAX_CIRCLES) + { + InvalidateRect (hwnd, NULL, TRUE); + circlesCount = 0; + } - return DefScreenSaverProc (hwnd, iMsg, wparam, lparam); + SelectObject (hdc, hbrushOld); + DeleteObject (hbrush); + ReleaseDC (hwnd, hdc); + + return 0; + } + } + + return DefScreenSaverProc (hwnd, iMsg, wparam, lparam); }

1 0

[mpiulachs] 33350: -Implement reconnect on connection lost as requested. Techbot will now try to re-connect every 60 seconds when a connection lost is detected.
by mpiulachs＠svn.reactos.org 07 May '08

07 May '08

Author: mpiulachs Date: Wed May 7 14:53:14 2008 New Revision: 33350 URL: http://svn.reactos.org/svn/reactos?rev=33350&view=rev Log: -Implement reconnect on connection lost as requested. Techbot will now try to re-connect every 60 seconds when a connection lost is detected. Modified: trunk/irc/TechBot/TechBot.IRCLibrary/IrcClient.cs trunk/irc/TechBot/TechBot.Library/TechBotIrcService.cs trunk/irc/TechBot/TechBot/TechBotService.cs Modified: trunk/irc/TechBot/TechBot.IRCLibrary/IrcClient.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.IRCLibrary/Irc… ============================================================================== --- trunk/irc/TechBot/TechBot.IRCLibrary/IrcClient.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.IRCLibrary/IrcClient.cs [iso-8859-1] Wed May 7 14:53:14 2008 @@ -15,6 +15,10 @@ /// Delegate that notifies if the user database for a channel has changed. /// </summary> public delegate void ChannelUserDatabaseChangedHandler(IrcChannel channel); + + public delegate void OnConnectHandler (); + public delegate void OnDisconnectHandler(); + public delegate void OnConnectionLostHandler(); /// <summary> /// An IRC client. @@ -202,6 +206,10 @@ public event ChannelUserDatabaseChangedHandler ChannelUserDatabaseChanged; + public event OnConnectHandler OnConnect; + public event OnConnectionLostHandler OnConnectionLost; + public event OnDisconnectHandler OnDisconnect; + #endregion #region Public properties @@ -291,20 +299,39 @@ /// <param name="ar">IAsyncResult object.</param> private void ReadComplete(IAsyncResult ar) { - StateObject stateObject = (StateObject) ar.AsyncState; - if (stateObject.Stream.CanRead) - { - int bytesReceived = stateObject.Stream.EndRead(ar); - if (bytesReceived > 0) - { - messageStream.Write(Encoding.GetString(stateObject.Buffer, 0, bytesReceived)); - while (messageStream.DataAvailable) - { - OnMessageReceived(new IrcMessage(messageStream.Read())); - } - } - } - Receive(); + try + { + StateObject stateObject = (StateObject)ar.AsyncState; + if (stateObject.Stream.CanRead) + { + int bytesReceived = stateObject.Stream.EndRead(ar); + if (bytesReceived > 0) + { + messageStream.Write(Encoding.GetString(stateObject.Buffer, 0, bytesReceived)); + while (messageStream.DataAvailable) + { + OnMessageReceived(new IrcMessage(messageStream.Read())); + } + } + } + + Receive(); + } + catch (SocketException) + { + if (OnConnectionLost != null) + OnConnectionLost(); + } + catch (IOException) + { + if (OnConnectionLost != null) + OnConnectionLost(); + } + catch (Exception) + { + if (OnConnectionLost != null) + OnConnectionLost(); + } } /// <summary> @@ -498,6 +525,9 @@ connected = false; tcpClient.Close(); tcpClient = null; + + if (OnDisconnect != null) + OnDisconnect(); } } @@ -507,19 +537,37 @@ /// <param name="message">The message to be sent.</param> public void SendMessage(IrcMessage message) { - if (!connected) - { - throw new NotConnectedException(); - } - - /* Serialize sending messages */ - lock (typeof(IrcClient)) - { - NetworkStream networkStream = tcpClient.GetStream(); - byte[] bytes = Encoding.GetBytes(message.Line); - networkStream.Write(bytes, 0, bytes.Length); - networkStream.Flush(); - } + try + { + if (!connected) + { + throw new NotConnectedException(); + } + + /* Serialize sending messages */ + lock (typeof(IrcClient)) + { + NetworkStream networkStream = tcpClient.GetStream(); + byte[] bytes = Encoding.GetBytes(message.Line); + networkStream.Write(bytes, 0, bytes.Length); + networkStream.Flush(); + } + } + catch (SocketException) + { + if (OnConnectionLost != null) + OnConnectionLost(); + } + catch (IOException) + { + if (OnConnectionLost != null) + OnConnectionLost(); + } + catch (Exception) + { + if (OnConnectionLost != null) + OnConnectionLost(); + } } /// <summary> Modified: trunk/irc/TechBot/TechBot.Library/TechBotIrcService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/TechBo… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/TechBotIrcService.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/TechBotIrcService.cs [iso-8859-1] Wed May 7 14:53:14 2008 @@ -71,13 +71,27 @@ m_IrcClient = new IrcClient(); m_IrcClient.Encoding = Encoding.GetEncoding("iso-8859-1"); + m_IrcClient.OnConnect += new OnConnectHandler(m_IrcClient_OnConnect); + m_IrcClient.OnConnectionLost += new OnConnectionLostHandler(m_IrcClient_OnConnectionLost); + m_IrcClient.OnDisconnect += new OnDisconnectHandler(m_IrcClient_OnDisconnect); m_IrcClient.MessageReceived += new MessageReceivedHandler(client_MessageReceived); m_IrcClient.ChannelUserDatabaseChanged += new ChannelUserDatabaseChangedHandler(client_ChannelUserDatabaseChanged); + + Connect(); + } + + void m_IrcClient_OnConnect() + { + Console.WriteLine("Connected..."); + } + + private void Connect() + { Console.WriteLine("Connecting to {0} port {1}", hostname, port); m_IrcClient.Connect(hostname, port); - Console.WriteLine("Connected..."); + m_IrcClient.Register(botname, password, null); Console.WriteLine("Registered as {0}...", botname); JoinChannels(); @@ -89,7 +103,35 @@ PartChannels(); m_IrcClient.Diconnect(); + } + + void m_IrcClient_OnDisconnect() + { Console.WriteLine("Disconnected..."); + } + + void m_IrcClient_OnConnectionLost() + { + //Dispose old connection + Disconnect(); + + //Sleep for 1 minute + Thread.Sleep(1000 * 60); + + //Try to reconnect + Connect(); + } + + private void Disconnect() + { + try + { + m_IrcClient.Diconnect(); + } + catch (Exception) + { + // + } } public void Stop() Modified: trunk/irc/TechBot/TechBot/TechBotService.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot/TechBotService… ============================================================================== --- trunk/irc/TechBot/TechBot/TechBotService.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot/TechBotService.cs [iso-8859-1] Wed May 7 14:53:14 2008 @@ -9,7 +9,7 @@ namespace TechBot { - public class TechBotService : System.ServiceProcess.ServiceBase + public class TechBotService : ServiceBase { private Thread thread; private ServiceThread threadWorker;

1 0

[gbrunmar] 33349: Implemented IDirect3DDevice9::GetCreationParameters()
by gbrunmar＠svn.reactos.org 07 May '08

07 May '08

Author: gbrunmar Date: Wed May 7 13:23:46 2008 New Revision: 33349 URL: http://svn.reactos.org/svn/reactos?rev=33349&view=rev Log: Implemented IDirect3DDevice9::GetCreationParameters() Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Wed May 7 13:23:46 2008 @@ -239,10 +239,43 @@ return D3D_OK; } -static HRESULT WINAPI IDirect3DDevice9Impl_GetCreationParameters(LPDIRECT3DDEVICE9 iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) -{ - UNIMPLEMENTED - +/*++ +* @name IDirect3DDevice9::GetCreationParameters +* @implemented +* +* The function IDirect3DDevice9Impl_GetCreationParameters fills the pParameters argument with the +* parameters the device was created with. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() +* +* @param D3DDEVICE_CREATION_PARAMETERS* pParameters +* Pointer to a D3DDEVICE_CREATION_PARAMETERS structure to be filled with the creation parameter +* information for this device. +* +* @return HRESULT +* If the method successfully fills the pParameters structure, the return value is D3D_OK. +* If pParameters is a bad pointer, the return value will be D3DERR_INVALIDCALL. +* +*/ +static HRESULT WINAPI IDirect3DDevice9Impl_GetCreationParameters(LPDIRECT3DDEVICE9 iface, D3DDEVICE_CREATION_PARAMETERS* pParameters) +{ + LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); + LOCK_D3DDEVICE9(); + + if (IsBadWritePtr(pParameters, sizeof(D3DDEVICE_CREATION_PARAMETERS))) + { + DPRINT1("Invalid pParameters parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + pParameters->AdapterOrdinal = This->AdapterIndexInGroup[0]; + pParameters->DeviceType = This->DeviceType; + pParameters->hFocusWindow = This->hWnd; + pParameters->BehaviorFlags = This->BehaviourFlags; + + UNLOCK_D3DDEVICE9(); return D3D_OK; }

1 0

[jimtabor] 33348: Adding more than one video device.. We need to fix NtGdiCreateCompatibleDC and DceCreateDisplayDC so they can access the device name from the default PDev or PrimarySurface. ATM we use L"DISPLAY" not L"\\??\\DISPLAY%d"(<-display number) to create a new HDC. In Gdi32 IntCreateDICW we basicly do the same w/o the display number. This code is correct and please leave it alone. I add some code in win32k dc.c, so we can start the changes.
by jimtabor＠svn.reactos.org 07 May '08

07 May '08

Author: jimtabor Date: Wed May 7 13:12:19 2008 New Revision: 33348 URL: http://svn.reactos.org/svn/reactos?rev=33348&view=rev Log: Adding more than one video device.. We need to fix NtGdiCreateCompatibleDC and DceCreateDisplayDC so they can access the device name from the default PDev or PrimarySurface. ATM we use L"DISPLAY" not L"\\??\\DISPLAY%d"(<-display number) to create a new HDC. In Gdi32 IntCreateDICW we basicly do the same w/o the display number. This code is correct and please leave it alone. I add some code in win32k dc.c, so we can start the changes. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Wed May 7 13:12:19 2008 @@ -28,7 +28,10 @@ #define NDEBUG #include <debug.h> +// --------------------------------------------------------- File Statics + static GDIDEVICE PrimarySurface; +static PGDIDEVICE pPrimarySurface = NULL; static KEVENT VideoDriverNeedsPreparation; static KEVENT VideoDriverPrepared; static PDC defaultDCstate = NULL; @@ -43,8 +46,6 @@ } /* FIXME: DCs should probably be thread safe */ - -// --------------------------------------------------------- File Statics // ----------------------------------------------------- Public Functions @@ -361,6 +362,8 @@ DPRINT("Trying to load display driver no. %d\n", DisplayNumber); RtlZeroMemory(&PrimarySurface, sizeof(PrimarySurface)); + + if (!pPrimarySurface) pPrimarySurface = ExAllocatePoolWithTag(PagedPool, sizeof(GDIDEVICE), TAG_GDIPDEV); PrimarySurface.VideoFileObject = DRIVER_FindMPDriver(DisplayNumber);

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008