Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 47648: [DHCP/FTP]: Fix building on OS X hosts.
by sir_richard＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: sir_richard Date: Mon Jun 7 02:58:55 2010 New Revision: 47648 URL: http://svn.reactos.org/svn/reactos?rev=47648&view=rev Log: [DHCP/FTP]: Fix building on OS X hosts. Modified: trunk/reactos/base/applications/network/ftp/ftp.rbuild trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild Modified: trunk/reactos/base/applications/network/ftp/ftp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] Mon Jun 7 02:58:55 2010 @@ -3,6 +3,17 @@ <module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe"> <include base="ftp">.</include> <define name="lint" /> + +  + <define name="chdir">_chdir</define> + <define name="getcwd">_getcwd</define> + <define name="mktemp">_mktemp</define> + <define name="unlink">_unlink</define> + <define name="close">_close</define> + <define name="fileno">_fileno</define> + <define name="read">_read</define> + <define name="write">_write</define> + <define name="lseek">_lseek</define> <library>ws2_32</library> <library>iphlpapi</library> Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcpcsv… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild [iso-8859-1] Mon Jun 7 02:58:55 2010 @@ -7,6 +7,10 @@ <library>iphlpapi</library> <library>advapi32</library> <library>oldnames</library> + +  + <define name="tzset">_tzset</define> + <directory name="dhcp"> <file>adapter.c</file> <file>alloc.c</file>

1 0

[cgutman] 47647: I hate making the same mistake twice in one day
by cgutman＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: cgutman Date: Mon Jun 7 02:44:00 2010 New Revision: 47647 URL: http://svn.reactos.org/svn/reactos?rev=47647&view=rev Log: I hate making the same mistake twice in one day Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Jun 7 02:44:00 2010 @@ -22,7 +22,6 @@ HANDLE GlobalHeap; WSPUPCALLTABLE Upcalls; LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest; -ULONG SocketCount = 0; PSOCKET_INFORMATION SocketListHead = NULL; LIST_ENTRY SockHelpersListHead = { NULL, NULL }; ULONG SockAsyncThreadRefCount; @@ -2267,6 +2266,9 @@ { PSOCKET_INFORMATION CurrentSocket; + if (!SocketListHead) + return NULL; + /* This is a special case */ if (SocketListHead->Handle == Handle) return SocketListHead;

1 0

[cgutman] 47646: [MSAFD] - Use a linked list to store the socket information instead of allocating a massive array (1024 elements!) for each process in DllMain to hold all of the pointers - Fix a massive memory leak (free the socket information which we leaked for every socket we allocated) - This improves performance because we don't have to look through an array of stale socket information pointers (which we never actually removed from the socket information array in the old code) and the new
by cgutman＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: cgutman Date: Mon Jun 7 02:24:27 2010 New Revision: 47646 URL: http://svn.reactos.org/svn/reactos?rev=47646&view=rev Log: [MSAFD] - Use a linked list to store the socket information instead of allocating a massive array (1024 elements!) for each process in DllMain to hold all of the pointers - Fix a massive memory leak (free the socket information which we leaked for every socket we allocated) - This improves performance because we don't have to look through an array of stale socket information pointers (which we never actually removed from the socket information array in the old code) and the new code queues the socket information at the head of the list which makes newer sockets faster to access Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/msafd.h Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Jun 7 02:24:27 2010 @@ -23,7 +23,7 @@ WSPUPCALLTABLE Upcalls; LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest; ULONG SocketCount = 0; -PSOCKET_INFORMATION *Sockets = NULL; +PSOCKET_INFORMATION SocketListHead = NULL; LIST_ENTRY SockHelpersListHead = { NULL, NULL }; ULONG SockAsyncThreadRefCount; HANDLE SockAsyncHelperAfdHandle; @@ -292,8 +292,8 @@ NULL); /* Save in Process Sockets List */ - Sockets[SocketCount] = Socket; - SocketCount ++; + Socket->NextSocket = SocketListHead; + SocketListHead = Socket; /* Create the Socket Context */ CreateContext(Socket); @@ -423,7 +423,7 @@ OUT LPINT lpErrno) { IO_STATUS_BLOCK IoStatusBlock; - PSOCKET_INFORMATION Socket = NULL; + PSOCKET_INFORMATION Socket = NULL, CurrentSocket; NTSTATUS Status; HANDLE SockEvent; AFD_DISCONNECT_INFO DisconnectInfo; @@ -561,6 +561,27 @@ Socket->TdiAddressHandle = NULL; NtClose(Socket->TdiConnectionHandle); Socket->TdiConnectionHandle = NULL; + + if (SocketListHead == Socket) + { + SocketListHead = SocketListHead->NextSocket; + } + else + { + CurrentSocket = SocketListHead; + while (CurrentSocket->NextSocket) + { + if (CurrentSocket->NextSocket == Socket) + { + CurrentSocket->NextSocket = CurrentSocket->NextSocket->NextSocket; + break; + } + + CurrentSocket = CurrentSocket->NextSocket; + } + } + + HeapFree(GlobalHeap, 0, Socket); /* Close the handle */ NtClose((HANDLE)Handle); @@ -2244,16 +2265,22 @@ PSOCKET_INFORMATION GetSocketStructure(SOCKET Handle) { - ULONG i; - - for (i=0; i<SocketCount; i++) - { - if (Sockets[i]->Handle == Handle) - { - return Sockets[i]; - } - } - return 0; + PSOCKET_INFORMATION CurrentSocket; + + /* This is a special case */ + if (SocketListHead->Handle == Handle) + return SocketListHead; + + CurrentSocket = SocketListHead; + while (CurrentSocket->NextSocket) + { + if (CurrentSocket->Handle == Handle) + return CurrentSocket; + + CurrentSocket = CurrentSocket->NextSocket; + } + + return NULL; } int CreateContext(PSOCKET_INFORMATION Socket) @@ -2771,10 +2798,6 @@ /* Heap to use when allocating */ GlobalHeap = GetProcessHeap(); - /* Allocate Heap for 1024 Sockets, can be expanded later */ - Sockets = HeapAlloc(GetProcessHeap(), 0, sizeof(PSOCKET_INFORMATION) * 1024); - if (!Sockets) return FALSE; - AFD_DbgPrint(MAX_TRACE, ("MSAFD.DLL has been loaded\n")); break; Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Mon Jun 7 02:24:27 2010 @@ -100,6 +100,7 @@ BOOL TrySAN; SOCKADDR WSLocalAddress; SOCKADDR WSRemoteAddress; + struct _SOCKET_INFORMATION *NextSocket; } SOCKET_INFORMATION, *PSOCKET_INFORMATION;

1 0

[cgutman] 47645: Remove an unintended change
by cgutman＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: cgutman Date: Mon Jun 7 01:49:27 2010 New Revision: 47645 URL: http://svn.reactos.org/svn/reactos?rev=47645&view=rev Log: Remove an unintended change Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Mon Jun 7 01:49:27 2010 @@ -208,9 +208,6 @@ /* Return the Flags */ *ReceiveFlags = 0; - - if (Status == STATUS_PENDING) - return MsafdReturnWithErrno(Status, lpErrno, IOSB->Information, lpNumberOfBytesRead); switch (Status) { @@ -358,9 +355,6 @@ /* Return the Flags */ *ReceiveFlags = 0; - - if (Status == STATUS_PENDING) - return MsafdReturnWithErrno(Status, lpErrno, IOSB->Information, lpNumberOfBytesRead); switch (Status) {

1 0

[dreimer] 47644: Add Opera 9 to rapps. Update OOo to 3.2.1 and the last time... fix the FF2 link.
by dreimer＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: dreimer Date: Mon Jun 7 01:45:20 2010 New Revision: 47644 URL: http://svn.reactos.org/svn/reactos?rev=47644&view=rev Log: Add Opera 9 to rapps. Update OOo to 3.2.1 and the last time... fix the FF2 link. Added: trunk/reactos/base/applications/rapps/rapps/opera9.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] Mon Jun 7 01:45:20 2010 @@ -8,35 +8,20 @@ Size = 5.8M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://194.71.11.70/pub/www/clients/mozilla.org/firefox/releases/2.0.0.20/w… +URLDownload = http://svn.reactos.org/packages/Firefox%20Setup%202.0.0.20.exe CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. -Size = 5.5M -URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://194.71.11.70/pub/www/clients/mozilla.org/firefox/releases/2.0.0.20/w… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. -Size = 5.6M -URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://194.71.11.70/pub/www/clients/mozilla.org/firefox/releases/2.0.0.20/w… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. -Size = 5.6M -URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://194.71.11.70/pub/www/clients/mozilla.org/firefox/releases/2.0.0.20/w… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. -Size = 6.3M -URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://194.71.11.70/pub/www/clients/mozilla.org/firefox/releases/2.0.0.20/w… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². -Size = 6.4M -URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://194.71.11.70/pub/www/clients/mozilla.org/firefox/releases/2.0.0.20/w… Modified: trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] Mon Jun 7 01:45:20 2010 @@ -2,30 +2,29 @@ [Section] Name = OpenOffice 3.0 -Version = 3.2.0 +Version = 3.2.1 Licence = LGPL Description = THE Open Source Office Suite. -Size = 135.4MB +Size = 134.0MB Category = 6 URLSite = http://www.openoffice.org/ -URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.2.0/OOo_3.2.0_Win32Intel_… +URLDownload = http://ftp3.gwdg.de/pub/openoffice/stable/3.2.1/OOo_3.2.1_Win_x86_install_e… CDPath = none [Section.0407] Description = DIE Open Source Office Suite. URLSite = http://de.openoffice.org/ -Size = 145.8MB -URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/3.2.0/OOo_3.2.0_Win32… +Size = 144.0MB +URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/de/3.2.1/OOo_3.2.1_Win_x86_ins… [Section.040a] Description = La suite de ofimÃ¡tica de cÃ³digo abierto. URLSite = http://es.openoffice.org/ -Version = 3.1.0 -Size = 119.4MB -URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/es/3.2.0/OOo_3.2.0_Win32… +Size = 144.0MB +URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/es/3.2.1/OOo_3.2.1_Win_x86_ins… [Section.0415] Description = Otwarty pakiet biurowy. URLSite = http://pl.openoffice.org/ -Size = 133.2MB -URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/pl/3.2.0/OOo_3.2.0_Win32… +Size = 130.0MB +URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/pl/3.2.1/OOo_3.2.1_Win_x86_ins… Added: trunk/reactos/base/applications/rapps/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera9.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/opera9.txt [iso-8859-1] Mon Jun 7 01:45:20 2010 @@ -1,0 +1,24 @@ +ï»¿; UTF-8 + +[Section] +Name = Opera +Version = 9.64 +Licence = Freeware +Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client. +Size = 7.2M +Category = 5 +URLSite = http://www.opera.com/ +URLDownload = http://get4.opera.com/pub/opera/win/964/int/Opera_964_int_Setup.exe +CDPath = none + +[Section.0407] +Description = Der populÃ¤re Opera Browser mit vielen fortschrittlichen Eigenschaften, enthÃ¤lt einen Mail und BitTorrent Client. + +[Section.040a] +Description = Popular navegador web con muchas caracterÃsticas avanzadas e incluye un cliente de correo y BitTorrent. + +[Section.0415] +Description = Popularna przeglÄdarka internetowa z wieloma zaawansowanymi funkcjami, zawierajÄca klientÃ³w: poczty oraz BitTorrent. + +[Section.0419] +Description = ÐÐ¾Ð¿ÑÐ»ÑÑÐ½ÑÐ¹ Ð±ÑÐ°ÑÐ·ÐµÑ ÑÐ¾ Ð¼Ð½Ð¾Ð³Ð¸Ð¼Ð¸ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐ¼Ð¸ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑÐ¼Ð¸, Ð²ÐºÐ»ÑÑÐ°ÑÑÐ¸Ð¹ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð² Ð¿Ð¾ÑÑÑ Ð¸ BitTorrent. Propchange: trunk/reactos/base/applications/rapps/rapps/opera9.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 47643: [MSAFD] - Fix many times where we wait for an operation but don't update our status and return if it failed - Fix the overlapped pending case in writing which was completely broken (callers would detect an error but GetLastError would return 0 because we didn't store the error in the lpErrno variable) - Fix many times where we pass a pointer to an event that we close without waiting - Fix a bug in WSPEnumNetworkEvents when we would set WSAEINVAL in the lpErrno variable but not r
by cgutman＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: cgutman Date: Mon Jun 7 01:07:26 2010 New Revision: 47643 URL: http://svn.reactos.org/svn/reactos?rev=47643&view=rev Log: [MSAFD] - Fix many times where we wait for an operation but don't update our status and return if it failed - Fix the overlapped pending case in writing which was completely broken (callers would detect an error but GetLastError would return 0 because we didn't store the error in the lpErrno variable) - Fix many times where we pass a pointer to an event that we close without waiting - Fix a bug in WSPEnumNetworkEvents when we would set WSAEINVAL in the lpErrno variable but not return SOCKET_ERROR so the error got ignored Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/event.c trunk/reactos/dll/win32/msafd/misc/sndrcv.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Jun 7 01:07:26 2010 @@ -566,7 +566,7 @@ NtClose((HANDLE)Handle); NtClose(SockEvent); - return NO_ERROR; + return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); } @@ -666,13 +666,17 @@ Status = IOSB.Status; } + NtClose( SockEvent ); + HeapFree(GlobalHeap, 0, BindData); + + if (Status != STATUS_SUCCESS) + return MsafdReturnWithErrno ( Status, lpErrno, 0, NULL ); + /* Set up Socket Data */ Socket->SharedData.State = SocketBound; Socket->TdiAddressHandle = (HANDLE)IOSB.Information; - NtClose( SockEvent ); - HeapFree(GlobalHeap, 0, BindData); - if (Status == STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_BIND)) + if (Socket->HelperEvents & WSH_NOTIFY_BIND) { Status = Socket->HelperData->WSHNotify(Socket->HelperContext, Socket->Handle, @@ -739,14 +743,17 @@ { WaitForSingleObject(SockEvent, INFINITE); Status = IOSB.Status; - } + } + + NtClose( SockEvent ); + + if (Status != STATUS_SUCCESS) + return MsafdReturnWithErrno ( Status, lpErrno, 0, NULL ); /* Set to Listening */ Socket->SharedData.Listening = TRUE; - NtClose( SockEvent ); - - if (Status == STATUS_SUCCESS && (Socket->HelperEvents & WSH_NOTIFY_LISTEN)) + if (Socket->HelperEvents & WSH_NOTIFY_LISTEN) { Status = Socket->HelperData->WSHNotify(Socket->HelperContext, Socket->Handle, @@ -907,6 +914,7 @@ if (Status == STATUS_PENDING) { WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; } /* Clear the Structures */ @@ -1440,6 +1448,9 @@ WaitForSingleObject(SockEvent, INFINITE); Status = IOSB.Status; } + + if (Status != STATUS_SUCCESS) + goto notify; } /* Dynamic Structure...ugh */ @@ -1485,6 +1496,9 @@ WaitForSingleObject(SockEvent, INFINITE); Status = IOSB.Status; } + + if (Status != STATUS_SUCCESS) + goto notify; } /* AFD doesn't seem to care if these are invalid, but let's 0 them anyways */ @@ -1515,6 +1529,9 @@ WaitForSingleObject(SockEvent, INFINITE); Status = IOSB.Status; } + + if (Status != STATUS_SUCCESS) + goto notify; Socket->TdiConnectionHandle = (HANDLE)IOSB.Information; @@ -1539,13 +1556,14 @@ } } + AFD_DbgPrint(MID_TRACE,("Ending\n")); + +notify: /* Re-enable Async Event */ SockReenableAsyncSelectEvent(Socket, FD_WRITE); /* FIXME: THIS IS NOT RIGHT!!! HACK HACK HACK! */ SockReenableAsyncSelectEvent(Socket, FD_CONNECT); - - AFD_DbgPrint(MID_TRACE,("Ending\n")); NtClose( SockEvent ); @@ -2139,7 +2157,11 @@ if (Status == STATUS_PENDING) { WaitForSingleObject(SockEvent, INFINITE); - } + Status = IOSB.Status; + } + + if (Status != STATUS_SUCCESS) + return -1; /* Return Information */ if (Ulong != NULL) @@ -2210,11 +2232,12 @@ if (Status == STATUS_PENDING) { WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; } NtClose( SockEvent ); - return 0; + return Status == STATUS_SUCCESS ? 0 : -1; } @@ -2275,11 +2298,12 @@ if (Status == STATUS_PENDING) { WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; } NtClose( SockEvent ); - return 0; + return Status == STATUS_SUCCESS ? 0 : -1; } BOOLEAN SockCreateOrReferenceAsyncThread(VOID) Modified: trunk/reactos/dll/win32/msafd/misc/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/event… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] Mon Jun 7 01:07:26 2010 @@ -104,11 +104,15 @@ /* Wait for return */ if (Status == STATUS_PENDING) { WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; } AFD_DbgPrint(MID_TRACE,("Waited\n")); NtClose( SockEvent ); + + if (Status != STATUS_SUCCESS) + return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); AFD_DbgPrint(MID_TRACE,("Closed event\n")); @@ -168,12 +172,15 @@ /* Wait for return */ if (Status == STATUS_PENDING) { WaitForSingleObject(SockEvent, INFINITE); - Status = STATUS_SUCCESS; + Status = IOSB.Status; } AFD_DbgPrint(MID_TRACE,("Waited\n")); NtClose( SockEvent ); + + if (Status != STATUS_SUCCESS) + return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); AFD_DbgPrint(MID_TRACE,("Closed event\n")); AFD_DbgPrint(MID_TRACE,("About to touch struct at %x (%d)\n", @@ -226,12 +233,9 @@ lpNetworkEvents->iErrorCode[FD_GROUP_QOS_BIT] = TranslateNtStatusError(EnumReq.EventStatus[FD_GROUP_QOS_BIT]); } - if( NT_SUCCESS(Status) ) *lpErrno = 0; - else *lpErrno = WSAEINVAL; - AFD_DbgPrint(MID_TRACE,("Leaving\n")); - return 0; + return MsafdReturnWithErrno(STATUS_SUCCESS, lpErrno, 0, NULL); } /* EOF */ Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Mon Jun 7 01:07:26 2010 @@ -182,7 +182,7 @@ /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Handle, - Event ? Event : SockEvent, + Event, APCFunction, APCContext, IOSB, @@ -208,6 +208,9 @@ /* Return the Flags */ *ReceiveFlags = 0; + + if (Status == STATUS_PENDING) + return MsafdReturnWithErrno(Status, lpErrno, IOSB->Information, lpNumberOfBytesRead); switch (Status) { @@ -223,7 +226,7 @@ } /* Re-enable Async Event */ - if (*ReceiveFlags == MSG_OOB) + if (*ReceiveFlags & MSG_OOB) { SockReenableAsyncSelectEvent(Socket, FD_OOB); } @@ -334,7 +337,7 @@ /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Handle, - Event ? Event : SockEvent, + Event, APCFunction, APCContext, IOSB, @@ -355,6 +358,9 @@ /* Return the Flags */ *ReceiveFlags = 0; + + if (Status == STATUS_PENDING) + return MsafdReturnWithErrno(Status, lpErrno, IOSB->Information, lpNumberOfBytesRead); switch (Status) { @@ -461,7 +467,7 @@ /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Handle, - Event ? Event : SockEvent, + Event, APCFunction, APCContext, IOSB, @@ -483,7 +489,7 @@ if (Status == STATUS_PENDING) { AFD_DbgPrint(MID_TRACE,("Leaving (Pending)\n")); - return WSA_IO_PENDING; + return MsafdReturnWithErrno(Status, lpErrno, IOSB->Information, lpNumberOfBytesSent); } /* Re-enable Async Event */ @@ -613,7 +619,7 @@ /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Handle, - Event ? Event : SockEvent, + Event, APCFunction, APCContext, IOSB, @@ -638,11 +644,8 @@ HeapFree(GlobalHeap, 0, BindAddress); } - if (Status == STATUS_PENDING) - return WSA_IO_PENDING; - - /* Re-enable Async Event */ - SockReenableAsyncSelectEvent(Socket, FD_WRITE); + if (Status != STATUS_PENDING) + SockReenableAsyncSelectEvent(Socket, FD_WRITE); return MsafdReturnWithErrno(Status, lpErrno, IOSB->Information, lpNumberOfBytesSent); }

1 0

[cgutman] 47642: [NDIS] - Hold the miniport lock when we work with the timer queue - Use the return value of KeSetTimer(Ex) to determine whether we need to queue the timer in our queue, otherwise we just use the entry that is already there - Add more assertions
by cgutman＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: cgutman Date: Mon Jun 7 00:08:40 2010 New Revision: 47642 URL: http://svn.reactos.org/svn/reactos?rev=47642&view=rev Log: [NDIS] - Hold the miniport lock when we work with the timer queue - Use the return value of KeSetTimer(Ex) to determine whether we need to queue the timer in our queue, otherwise we just use the entry that is already there - Add more assertions Modified: trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Mon Jun 7 00:08:40 2010 @@ -98,6 +98,8 @@ BOOLEAN DequeueMiniportTimer(PNDIS_MINIPORT_TIMER Timer) { PNDIS_MINIPORT_TIMER CurrentTimer; + + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); if (!Timer->Miniport->TimerQueue) return FALSE; @@ -143,13 +145,21 @@ * - call at IRQL <= DISPATCH_LEVEL */ { + KIRQL OldIrql; + ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(TimerCancelled); ASSERT(Timer); *TimerCancelled = KeCancelTimer (&Timer->Timer); - DequeueMiniportTimer(Timer); + if (*TimerCancelled) + { + KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); + /* If it's somebody already dequeued it, something is wrong (maybe a double-cancel?) */ + if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE); + KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); + } } VOID NTAPI @@ -166,7 +176,13 @@ SystemArgument2); /* Only dequeue if the timer has a period of 0 */ - if (!Timer->Timer.Period) DequeueMiniportTimer(Timer); + if (!Timer->Timer.Period) + { + KeAcquireSpinLockAtDpcLevel(&Timer->Miniport->Lock); + /* If someone already dequeued it, something is wrong (borked timer implementation?) */ + if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE); + KeReleaseSpinLockFromDpcLevel(&Timer->Miniport->Lock); + } } @@ -224,6 +240,7 @@ */ { LARGE_INTEGER Timeout; + KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(Timer); @@ -231,14 +248,15 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsPeriod, -10000); - /* Dequeue the timer if it is queued already */ - DequeueMiniportTimer(Timer); - - /* Add the timer at the head of the timer queue */ - Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; - Timer->Miniport->TimerQueue = Timer; - - KeSetTimerEx (&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc); + KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); + /* If KeSetTimer(Ex) returns FALSE then the timer is not in the system's queue (and not in ours either) */ + if (!KeSetTimerEx(&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc)) + { + /* Add the timer at the head of the timer queue */ + Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; + Timer->Miniport->TimerQueue = Timer; + } + KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); } @@ -262,6 +280,7 @@ */ { LARGE_INTEGER Timeout; + KIRQL OldIrql; ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(Timer); @@ -269,14 +288,15 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsToDelay, -10000); - /* Dequeue the timer if it is queued already */ - DequeueMiniportTimer(Timer); - - /* Add the timer at the head of the timer queue */ - Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; - Timer->Miniport->TimerQueue = Timer; - - KeSetTimer (&Timer->Timer, Timeout, &Timer->Dpc); + KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); + /* If KeSetTimer(Ex) returns FALSE then the timer is not in the system's queue (and not in ours either) */ + if (!KeSetTimer(&Timer->Timer, Timeout, &Timer->Dpc)) + { + /* Add the timer at the head of the timer queue */ + Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; + Timer->Miniport->TimerQueue = Timer; + } + KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); }

1 0

[tkreuzer] 47641: [WIN32K] Rewrite the bitmap API. There were a lot of bugs. NtGdiCreateBitmap allowed a negative height, leading to either topdown or bottomup bitmaps, a behaviour that Windows doesn't have. The function copied the bitmap bits directly from the caller to the bitmap using RtlCopyMemory, ignoring different scanline length and direction (resulting in bitmaps being upside down), not SEH protected. This function (IntSetBitmapBits) is replaced by a better solution UnsafeSetBitmapBits,
by tkreuzer＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: tkreuzer Date: Mon Jun 7 00:01:41 2010 New Revision: 47641 URL: http://svn.reactos.org/svn/reactos?rev=47641&view=rev Log: [WIN32K] Rewrite the bitmap API. There were a lot of bugs. NtGdiCreateBitmap allowed a negative height, leading to either topdown or bottomup bitmaps, a behaviour that Windows doesn't have. The function copied the bitmap bits directly from the caller to the bitmap using RtlCopyMemory, ignoring different scanline length and direction (resulting in bitmaps being upside down), not SEH protected. This function (IntSetBitmapBits) is replaced by a better solution UnsafeSetBitmapBits, that takes these things into account. The name is chosen to give a hint that the function can/should be SEH protected. IntSetBitmapBits is still there, as its retarded behaviour is actually required in some places. There were also IntCreateBitmap and IntGdiCreateBitmap, now both being replaced by GreCreateBitmap. The code that set the palette is removed, as it's already done in SURFACE_AllocSurface, here gpalRGB is replaced with gpalBGR, fixing some inverted color issues. The alignment correction in SURFACE_bSetBitmapBits is reapplied, now that the callers are behaving as they are supposed to do. Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c branches/reactos-yarotows/subsystems/win32/win32k/objects/stockobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -171,8 +171,8 @@ break; case 24: case 32: - psurfBmp->ppal = &gpalRGB; - GDIOBJ_IncrementShareCount((POBJ)&gpalRGB); + psurfBmp->ppal = &gpalBGR; + GDIOBJ_IncrementShareCount(&gpalBGR.BaseObject); break; default: DPRINT1("Could not determine palette for bit depth %u.\n", cBitsPixel); @@ -233,7 +233,7 @@ if (ulWidth) { /* Align the width (Windows compatibility) */ - //ulWidth = ((((ulWidth << 3) / cBitsPixel) * cBitsPixel + 31) & ~31) >> 3; + ulWidth = ((((ulWidth << 3) / cBitsPixel) * cBitsPixel + 31) & ~31) >> 3; } else { @@ -544,68 +544,4 @@ } } -HBITMAP -FASTCALL -IntCreateBitmap( - IN SIZEL Size, - IN LONG Width, - IN ULONG Format, - IN ULONG Flags, - IN PVOID Bits) -{ - HBITMAP hbmp; - SURFOBJ *pso; - PSURFACE psurf; - PVOID UncompressedBits; - ULONG UncompressedFormat; - - if (Format == 0) - return 0; - - /* Allocate a surface */ - psurf = SURFACE_AllocSurface(STYPE_BITMAP, Size.cx, Size.cy, Format); - if (!psurf) - { - DPRINT1("SURFACE_AllocSurface failed.\n"); - return NULL; - } - - /* Get the handle for the bitmap and the surfobj */ - hbmp = (HBITMAP)psurf->SurfObj.hsurf; - pso = &psurf->SurfObj; - - if (Format == BMF_4RLE) - { - UncompressedFormat = BMF_4BPP; - UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); - Decompress4bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pso->lDelta); - Flags |= BMF_RLE_HACK; - } - else if (Format == BMF_8RLE) - { - UncompressedFormat = BMF_8BPP; - UncompressedBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); - Decompress8bpp(Size, (BYTE *)Bits, (BYTE *)UncompressedBits, pso->lDelta); - Flags |= BMF_RLE_HACK; - } - else - { - UncompressedBits = Bits; - UncompressedFormat = Format; - } - - /* Set the bitmap bits */ - if (!SURFACE_bSetBitmapBits(psurf, Flags, Width, UncompressedBits)) - { - /* Bail out if that failed */ - DPRINT1("SURFACE_bSetBitmapBits failed.\n"); - SURFACE_FreeSurfaceByHandle(hbmp); - return NULL; - } - - /* Unlock the surface and return */ - SURFACE_UnlockSurface(psurf); - return hbmp; -} - /* EOF */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -10,3 +10,13 @@ HBITMAP FASTCALL BITMAP_CopyBitmap (HBITMAP hBitmap); UINT FASTCALL BITMAP_GetRealBitsPixel(UINT nBitsPixel); INT FASTCALL BITMAP_GetWidthBytes (INT bmWidth, INT bpp); + + +HBITMAP +APIENTRY +GreCreateBitmap( + IN INT nWidth, + IN INT nHeight, + IN UINT cPlanes, + IN UINT cBitsPixel, + IN OPTIONAL PVOID pvBits); Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/surface.h [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -116,6 +116,14 @@ IN ULONG cy, IN ULONG iFormat); +BOOL +NTAPI +SURFACE_bSetBitmapBits( + IN PSURFACE psurf, + IN USHORT fjBitmap, + IN ULONG ulWidth, + IN PVOID pvBits OPTIONAL); + #define GDIDEV(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev)) #define GDIDEVFUNCS(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev))->DriverFunctions Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -22,141 +22,206 @@ #define NDEBUG #include <debug.h> -HBITMAP APIENTRY -IntGdiCreateBitmap( - INT Width, - INT Height, - UINT Planes, - UINT BitsPixel, - IN OPTIONAL LPBYTE pBits) -{ - HBITMAP hBitmap; - SIZEL Size; - LONG WidthBytes; - PSURFACE psurfBmp; +LONG APIENTRY +IntSetBitmapBits( + PSURFACE psurf, + DWORD Bytes, + IN PBYTE Bits) +{ + /* Don't copy more bytes than the buffer has */ + Bytes = min(Bytes, psurf->SurfObj.cjBits); + + RtlCopyMemory(psurf->SurfObj.pvBits, Bits, Bytes); + + return Bytes; +} + +void +NTAPI +UnsafeSetBitmapBits( + PSURFACE psurf, + IN ULONG cjBits, + IN PVOID pvBits) +{ + PUCHAR pjDst, pjSrc; + LONG lDeltaDst, lDeltaSrc; + ULONG nWidth, nHeight, cBitsPixel; + + nWidth = psurf->SurfObj.sizlBitmap.cx; + nHeight = psurf->SurfObj.sizlBitmap.cy; + cBitsPixel = BitsPerFormat(psurf->SurfObj.iBitmapFormat); + + /* Get pointers */ + pjDst = psurf->SurfObj.pvScan0; + pjSrc = pvBits; + lDeltaDst = psurf->SurfObj.lDelta; + lDeltaSrc = BITMAP_GetWidthBytes(nWidth, cBitsPixel); + + while (nHeight--) + { + /* Copy one line */ + memcpy(pjDst, pjSrc, lDeltaSrc); + pjSrc += lDeltaSrc; + pjDst += lDeltaDst; + } + +} + +HBITMAP +APIENTRY +GreCreateBitmap( + IN INT nWidth, + IN INT nHeight, + IN UINT cPlanes, + IN UINT cBitsPixel, + IN OPTIONAL PVOID pvBits) +{ + PSURFACE psurf; + SURFOBJ *pso; + HBITMAP hbmp; + PVOID pvCompressedBits; + SIZEL sizl; + FLONG fl = 0; + ULONG iFormat; + + /* Calculate bitmap format */ + iFormat = BitmapFormat(cBitsPixel * cPlanes, BI_RGB); + + /* Verify format */ + if (iFormat < BMF_1BPP || iFormat > BMF_PNG) return NULL; + + /* Allocate a surface */ + psurf = SURFACE_AllocSurface(STYPE_BITMAP, nWidth, nHeight, iFormat); + if (!psurf) + { + DPRINT1("SURFACE_AllocSurface failed.\n"); + return NULL; + } + + /* Get the handle for the bitmap and the surfobj */ + hbmp = (HBITMAP)psurf->SurfObj.hsurf; + pso = &psurf->SurfObj; + + /* The infamous RLE hack */ + if (iFormat == BMF_4RLE) + { + sizl.cx = nWidth; sizl.cy = nHeight; + pvCompressedBits = pvBits; + pvBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); + Decompress4bpp(sizl, pvCompressedBits, pvBits, pso->lDelta); + fl |= BMF_RLE_HACK; + } + else if (iFormat == BMF_8RLE) + { + sizl.cx = nWidth; sizl.cy = nHeight; + pvCompressedBits = pvBits; + pvBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); + Decompress8bpp(sizl, pvCompressedBits, pvBits, pso->lDelta); + fl |= BMF_RLE_HACK; + } + + /* Set the bitmap bits */ + if (!SURFACE_bSetBitmapBits(psurf, fl, 0, pvBits)) + { + /* Bail out if that failed */ + DPRINT1("SURFACE_bSetBitmapBits failed.\n"); + SURFACE_FreeSurfaceByHandle(hbmp); + return NULL; + } + + /* Mark as API bitmap */ + psurf->flags |= API_BITMAP; + + /* Unlock the surface and return */ + SURFACE_UnlockSurface(psurf); + return hbmp; +} + +HBITMAP +APIENTRY +NtGdiCreateBitmap( + IN INT nWidth, + IN INT nHeight, + IN UINT cPlanes, + IN UINT cBitsPixel, + IN OPTIONAL LPBYTE pUnsafeBits) +{ + PSURFACE psurf; + SURFOBJ *pso; + HBITMAP hbmp; + FLONG fl = 0; + ULONG cjWidthBytes, iFormat; /* NOTE: Windows also doesn't store nr. of planes separately! */ - BitsPixel = BITMAP_GetRealBitsPixel(BitsPixel * Planes); + cBitsPixel = BITMAP_GetRealBitsPixel(cBitsPixel * cPlanes); + + /* Calculate bitmap format */ + iFormat = BitmapFormat(cBitsPixel, BI_RGB); /* Check parameters */ - if (BitsPixel == 0 || Width <= 0 || Width >= 0x8000000 || Height == 0) + if (iFormat == 0 || nWidth <= 0 || nWidth >= 0x8000000 || nHeight <= 0) { DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", - Width, Height, BitsPixel); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } - - WidthBytes = BITMAP_GetWidthBytes(Width, BitsPixel); - - Size.cx = Width; - Size.cy = abs(Height); + nWidth, nHeight, cBitsPixel); + EngSetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } /* Make sure that cjBits will not overflow */ - if ((ULONGLONG)WidthBytes * Size.cy >= 0x100000000ULL) + cjWidthBytes = DIB_GetDIBWidthBytes(nWidth, cBitsPixel); + if ((ULONGLONG)cjWidthBytes * nHeight >= 0x100000000ULL) { DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", - Width, Height, BitsPixel); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } - - /* Create the bitmap object. */ - hBitmap = IntCreateBitmap(Size, WidthBytes, - BitmapFormat(BitsPixel, BI_RGB), - (Height < 0 ? BMF_TOPDOWN : 0) | - (NULL == pBits ? 0 : BMF_NOZEROINIT), NULL); - if (!hBitmap) - { - DPRINT("IntGdiCreateBitmap: returned 0\n"); - return 0; - } - - psurfBmp = SURFACE_LockSurface(hBitmap); - if (psurfBmp == NULL) - { - GreDeleteObject(hBitmap); + nWidth, nHeight, cBitsPixel); + EngSetLastError(ERROR_INVALID_PARAMETER); return NULL; } - psurfBmp->flags = API_BITMAP; - psurfBmp->hdc = NULL; // Fixme - - if (NULL != pBits) - { - IntSetBitmapBits(psurfBmp, psurfBmp->SurfObj.cjBits, pBits); - } - - /* Find a suitable palette for this bitmap - * Increment internal objects share count - * so we can call PALETTE_ShareUnlockPalette - * or GDIOBJ_IncrementShareCount safely */ - switch(BitsPixel) - { - case 1: - psurfBmp->ppal = &gpalMono; - GDIOBJ_IncrementShareCount((POBJ)&gpalMono); - break; - case 4: - case 8: - psurfBmp->ppal = PALETTE_ShareLockPalette(StockObjects[DEFAULT_PALETTE]); - break; - case 15: - psurfBmp->ppal = &gpalRGB555; - GDIOBJ_IncrementShareCount((POBJ)&gpalRGB555); - break; - case 16: - psurfBmp->ppal = &gpalRGB565; - GDIOBJ_IncrementShareCount((POBJ)&gpalRGB565); - break; - case 24: - case 32: - psurfBmp->ppal = &gpalRGB; - GDIOBJ_IncrementShareCount((POBJ)&gpalRGB); - break; - default: - DPRINT1("Could not determine palette for bit depth %u.\n", BitsPixel); - break; - } - - SURFACE_UnlockSurface(psurfBmp); - - DPRINT("IntGdiCreateBitmap : %dx%d, %d BPP colors, topdown %d, returning %08x\n", - Size.cx, Size.cy, BitsPixel, (Height < 0 ? 1 : 0), hBitmap); - - return hBitmap; -} - - -HBITMAP APIENTRY -NtGdiCreateBitmap( - INT Width, - INT Height, - UINT Planes, - UINT BitsPixel, - IN OPTIONAL LPBYTE pUnsafeBits) -{ + /* Allocate a surface */ + psurf = SURFACE_AllocSurface(STYPE_BITMAP, nWidth, nHeight, iFormat); + if (!psurf) + { + DPRINT1("SURFACE_AllocSurface failed.\n"); + EngSetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + + /* Get the handle for the bitmap and the surfobj */ + hbmp = (HBITMAP)psurf->SurfObj.hsurf; + pso = &psurf->SurfObj; + + /* Allocate the bitmap bits */ + if (!SURFACE_bSetBitmapBits(psurf, fl, 0, NULL)) + { + /* Bail out if that failed */ + DPRINT1("SURFACE_bSetBitmapBits failed.\n"); + SURFACE_FreeSurfaceByHandle(hbmp); + return NULL; + } + if (pUnsafeBits) { - BOOL Hit = FALSE; - UINT cjBits = BITMAP_GetWidthBytes(Width, BitsPixel) * abs(Height); - - // FIXME: Use MmSecureVirtualMemory _SEH2_TRY { - ProbeForRead(pUnsafeBits, cjBits, 1); + ProbeForRead(pUnsafeBits, cjWidthBytes * nHeight, 1); + UnsafeSetBitmapBits(psurf, 0, pUnsafeBits); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = TRUE; + SURFACE_FreeSurfaceByHandle(hbmp); + _SEH2_YIELD(return NULL;) } _SEH2_END - - if (Hit) return 0; - } - - return IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); -} + } + + /* Mark as API bitmap */ + psurf->flags |= API_BITMAP; + + /* Unlock the surface and return */ + SURFACE_UnlockSurface(psurf); + return hbmp; +} + HBITMAP FASTCALL IntCreateCompatibleBitmap( @@ -180,13 +245,11 @@ size.cx = abs(Width); size.cy = abs(Height); - - Bmp = IntCreateBitmap(size, - BITMAP_GetWidthBytes(Width, Dc->ppdev->gdiinfo.cBitsPixel), - Dc->ppdev->pSurface->SurfObj.iBitmapFormat, - 0, + Bmp = GreCreateBitmap(abs(Width), + abs(Height), + 1, + Dc->ppdev->gdiinfo.cBitsPixel, NULL); - psurf = SURFACE_LockSurface(Bmp); ASSERT(psurf); /* Set palette */ @@ -211,11 +274,11 @@ PSURFACE psurfBmp; size.cx = abs(Width); size.cy = abs(Height); - Bmp = IntCreateBitmap(size, - BITMAP_GetWidthBytes(Width, dibs.dsBm.bmBitsPixel), - psurf->SurfObj.iBitmapFormat, - 0, - NULL); + Bmp = GreCreateBitmap(abs(Width), + abs(Height), + 1, + dibs.dsBm.bmBitsPixel, + NULL); psurfBmp = SURFACE_LockSurface(Bmp); ASSERT(psurfBmp); /* Assign palette */ @@ -321,7 +384,7 @@ } if (!hDC) - return IntGdiCreateBitmap(Width, Height, 1, 1, 0); + return GreCreateBitmap(Width, Height, 1, 1, 0); Dc = DC_LockDc(hDC); @@ -464,7 +527,7 @@ 0, 0); - //HBITMAP hBmpTmp = IntGdiCreateBitmap(1, 1, 1, 32, NULL); + //HBITMAP hBmpTmp = GreCreateBitmap(1, 1, 1, 32, NULL); if (hBmpTmp) { HBITMAP hBmpOld = (HBITMAP)NtGdiSelectBitmap(hDCTmp, hBmpTmp); @@ -588,46 +651,6 @@ LONG APIENTRY -IntSetBitmapBits( - PSURFACE psurf, - DWORD Bytes, - IN PBYTE Bits) -{ - LONG ret; - - /* Don't copy more bytes than the buffer has */ - Bytes = min(Bytes, psurf->SurfObj.cjBits); - -#if 0 - /* FIXME: call DDI specific function here if available */ - if (psurf->DDBitmap) - { - DPRINT("Calling device specific BitmapBits\n"); - if (psurf->DDBitmap->funcs->pBitmapBits) - { - ret = psurf->DDBitmap->funcs->pBitmapBits(hBitmap, - (void *)Bits, - Bytes, - DDB_SET); - } - else - { - DPRINT("BitmapBits == NULL??\n"); - ret = 0; - } - } - else -#endif - { - RtlCopyMemory(psurf->SurfObj.pvBits, Bits, Bytes); - ret = Bytes; - } - - return ret; -} - - -LONG APIENTRY NtGdiSetBitmapBits( HBITMAP hBitmap, DWORD Bytes, @@ -651,7 +674,8 @@ _SEH2_TRY { ProbeForRead(pUnsafeBits, Bytes, 1); - ret = IntSetBitmapBits(psurf, Bytes, pUnsafeBits); + UnsafeSetBitmapBits(psurf, Bytes, pUnsafeBits); + ret = 1; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -898,11 +922,11 @@ Size.cx = abs(bm.bmWidth); Size.cy = abs(bm.bmHeight); - res = IntCreateBitmap(Size, - bm.bmWidthBytes, - BitmapFormat(bm.bmBitsPixel * bm.bmPlanes, BI_RGB), - (bm.bmHeight < 0 ? BMF_TOPDOWN : 0) | BMF_NOZEROINIT, - NULL); + res = GreCreateBitmap(abs(bm.bmWidth), + abs(bm.bmHeight), + 1, + bm.bmBitsPixel, + NULL); if (res) { Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -405,7 +405,7 @@ else DataPtr += PaletteEntryCount * sizeof(USHORT); - hPattern = IntGdiCreateBitmap(BitmapInfo->bmiHeader.biWidth, + hPattern = GreCreateBitmap(BitmapInfo->bmiHeader.biWidth, BitmapInfo->bmiHeader.biHeight, BitmapInfo->bmiHeader.biPlanes, BitmapInfo->bmiHeader.biBitCount, @@ -459,7 +459,7 @@ return 0; } - hPattern = IntGdiCreateBitmap(8, 8, 1, 1, (LPBYTE)HatchBrushes[Style]); + hPattern = GreCreateBitmap(8, 8, 1, 1, (LPBYTE)HatchBrushes[Style]); if (hPattern == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -1178,11 +1178,11 @@ } else { - handle = IntGdiCreateBitmap(width, - height, - 1, - 1, - NULL); + handle = GreCreateBitmap(width, + height, + 1, + 1, + NULL); } if (height < 0) Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -125,27 +125,27 @@ case PS_ALTERNATE: pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; - pbrushPen->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); break; case PS_DOT: pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; - pbrushPen->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDot); + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDot); break; case PS_DASH: pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; - pbrushPen->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDash); + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDash); break; case PS_DASHDOT: pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; - pbrushPen->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDot); + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDot); break; case PS_DASHDOTDOT: pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; - pbrushPen->hbmPattern = IntGdiCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDotDot); + pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDotDot); break; case PS_INSIDEFRAME: Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Mon Jun 7 00:01:41 2010 @@ -180,7 +180,7 @@ StockObjects[NULL_PEN] = IntCreateStockPen(NullPen.lopnStyle, NullPen.lopnWidth.x, BS_SOLID, NullPen.lopnColor); StockObjects[20] = NULL; /* TODO: Unknown internal stock object */ - StockObjects[DEFAULT_BITMAP] = IntGdiCreateBitmap(1, 1, 1, 1, NULL); + StockObjects[DEFAULT_BITMAP] = GreCreateBitmap(1, 1, 1, 1, NULL); (void) TextIntCreateFontIndirect(&OEMFixedFont, (HFONT*)&StockObjects[OEM_FIXED_FONT]); (void) TextIntCreateFontIndirect(&AnsiFixedFont, (HFONT*)&StockObjects[ANSI_FIXED_FONT]);

1 0

[fireball] 47640: - Remove my implementation of SWM cursor icons which turned out to be similar to creating an elephant from a fly. Instead use a much simpler, updated and fail-proof implementation by Giannis Adamopoulos. Arwinss is back on track.
by fireball＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: fireball Date: Sun Jun 6 23:40:11 2010 New Revision: 47640 URL: http://svn.reactos.org/svn/reactos?rev=47640&view=rev Log: - Remove my implementation of SWM cursor icons which turned out to be similar to creating an elephant from a fly. Instead use a much simpler, updated and fail-proof implementation by Giannis Adamopoulos. Arwinss is back on track. Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h branches/arwinss/reactos/include/reactos/win32k/rosuser.h branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c branches/arwinss/reactos/subsystems/win32/win32k/main/init.c branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -1,5 +1,5 @@ /* - * X11 mouse driver + * NTDRV mouse driver * * Copyright 1998 Ulrich Weigand * Copyright 2007 Henri Verbeet @@ -69,41 +69,8 @@ MOUSEEVENTF_XUP }; -static HWND cursor_window; static BYTE TrackSysKey = 0; /* determine whether ALT key up will cause a WM_SYSKEYUP or a WM_KEYUP message */ - -VOID create_cursor( HANDLE handle ); - -/*********************************************************************** - * set_window_cursor - */ -void set_window_cursor( HWND hwnd, HCURSOR handle ) -{ - struct ntdrv_win_data *data; - - if (!(data = NTDRV_get_win_data( hwnd ))) return; - - if (!handle) - { - // FIXME: Special case for removing the cursor - FIXME("TODO: Cursor should be removed!\n"); - data->cursor = handle; - return; - } - - /* Try to set the cursor */ - if (!SwmDefineCursor(hwnd, handle)) - { - /* This cursor doesn't exist yet, create it */ - create_cursor(handle); - - /* Set it for this window */ - SwmDefineCursor(hwnd, handle); - } - - data->cursor = handle; -} /*********************************************************************** * get_key_state @@ -165,12 +132,6 @@ cursor = (reply->count >= 0) ? wine_server_ptr_handle(reply->cursor) : 0; } SERVER_END_REQ; - - if (hwnd) - { - struct ntdrv_win_data *data = NTDRV_get_win_data( hwnd ); - if (data && cursor != data->cursor) set_window_cursor( hwnd, cursor ); - } } /*********************************************************************** @@ -233,7 +194,6 @@ /* get the window handle from cursor position */ hwnd = SwmGetWindowFromPoint(pt.x, pt.y); - cursor_window = hwnd; if (flags & MOUSEEVENTF_MOVE) { @@ -424,208 +384,24 @@ } /*********************************************************************** - * get_bitmap_width_bytes - * - * Return number of bytes taken by a scanline of 16-bit aligned Windows DDB - * data. - * from user32/cursoricon.c:168 - */ -static int get_bitmap_width_bytes( int width, int bpp ) -{ - switch(bpp) - { - case 1: - return 2 * ((width+15) / 16); - case 4: - return 2 * ((width+3) / 4); - case 24: - width *= 3; - /* fall through */ - case 8: - return width + (width & 1); - case 16: - case 15: - return width * 2; - case 32: - return width * 4; - default: - WARN("Unknown depth %d, please report.\n", bpp ); - } - return -1; -} - -VOID CDECL RosDrv_GetIconInfo(CURSORICONINFO *ciconinfo, PICONINFO iconinfo) -{ - INT height; - BITMAP bitmap; - PVOID pbits; - static const WORD ICON_HOTSPOT = 0x4242; /* From user32/cursoricon.c:128 */ - - //TRACE("%p => %dx%d, %d bpp\n", ciconinfo, - // ciconinfo->nWidth, ciconinfo->nHeight, ciconinfo->bBitsPerPixel); - - if ( (ciconinfo->ptHotSpot.x == ICON_HOTSPOT) && - (ciconinfo->ptHotSpot.y == ICON_HOTSPOT) ) - { - iconinfo->fIcon = TRUE; - iconinfo->xHotspot = ciconinfo->nWidth / 2; - iconinfo->yHotspot = ciconinfo->nHeight / 2; + * DestroyCursorIcon (NTDRV.@) + */ +void CDECL RosDrv_DestroyCursorIcon( HCURSOR handle ) +{ +} + +void CDECL RosDrv_SetCursor( HCURSOR handle ) +{ + ICONINFO iconinfo; + + if(handle == NULL) + { + RosUserSetCursor(NULL); } else { - iconinfo->fIcon = FALSE; - iconinfo->xHotspot = ciconinfo->ptHotSpot.x; - iconinfo->yHotspot = ciconinfo->ptHotSpot.y; - } - - height = ciconinfo->nHeight; - - if (ciconinfo->bBitsPerPixel > 1) - { - pbits = (char *)(ciconinfo + 1) + ciconinfo->nHeight * get_bitmap_width_bytes (ciconinfo->nWidth,1); - - iconinfo->hbmColor = CreateBitmap( ciconinfo->nWidth, ciconinfo->nHeight, - ciconinfo->bPlanes, ciconinfo->bBitsPerPixel, - pbits); - if(GetObjectW(iconinfo->hbmColor, sizeof(bitmap), &bitmap)) - RosGdiCreateBitmap(NULL, iconinfo->hbmColor, &bitmap, pbits); - } - else - { - iconinfo->hbmColor = 0; - height *= 2; - } - - pbits = (char *)(ciconinfo + 1); - - /* Create the mask bitmap */ - iconinfo->hbmMask = CreateBitmap ( ciconinfo->nWidth, height, - 1, 1, pbits); - if( GetObjectW(iconinfo->hbmMask, sizeof(bitmap), &bitmap)) - { - RosGdiCreateBitmap(NULL, iconinfo->hbmMask, &bitmap, pbits); - } -} - -/*********************************************************************** - * create_cursor - * - * Create a client cursor from a Windows one. - */ -VOID create_cursor( HANDLE handle ) -{ - HDC hdc; - ICONINFO icon; - BITMAP bm; - - //if (!handle) return get_empty_cursor(); - - if (!(hdc = CreateCompatibleDC( 0 ))) return; - if (!GetIconInfo( handle, &icon )) - { - DeleteDC( hdc ); - return; - } - - GetObjectW( icon.hbmMask, sizeof(bm), &bm ); - if (!icon.hbmColor) bm.bmHeight /= 2; - - /* make sure hotspot is valid */ - if (icon.xHotspot >= bm.bmWidth || icon.yHotspot >= bm.bmHeight) - { - icon.xHotspot = bm.bmWidth / 2; - icon.yHotspot = bm.bmHeight / 2; - } - - // help for debugging -#if 0 - { - BITMAPINFO *info; - unsigned int *color_bits = NULL; - unsigned char *mask_bits = NULL; - int width = bm.bmWidth; - int height = bm.bmHeight; - unsigned int width_bytes = (width + 31) / 32 * 4; - BITMAP bitmap; - - - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) - return; - - info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - info->bmiHeader.biWidth = width; - info->bmiHeader.biHeight = -height; - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = 1; - info->bmiHeader.biCompression = BI_RGB; - info->bmiHeader.biSizeImage = width_bytes * height; - info->bmiHeader.biXPelsPerMeter = 0; - info->bmiHeader.biYPelsPerMeter = 0; - info->bmiHeader.biClrUsed = 0; - info->bmiHeader.biClrImportant = 0; - - if (!(mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; - if (!GetDIBits( hdc, icon.hbmMask, 0, height, mask_bits, info, DIB_RGB_COLORS )) goto done; - - /* HACK: Create the mask bitmap */ - DeleteObject( icon.hbmMask ); - icon.hbmMask = CreateBitmap ( width, height, - 1, 1, NULL); - if( GetObjectW(icon.hbmMask, sizeof(bitmap), &bitmap)) - { - RosGdiCreateBitmap(NULL, icon.hbmMask, &bitmap, NULL); - mask_bits[0] = 0xFF; mask_bits[1] = 0xFF; mask_bits[2] = 0xFF; - SetDIBits( hdc, icon.hbmMask, 0, height, mask_bits, info, DIB_RGB_COLORS ); - } - - info->bmiHeader.biBitCount = 32; - info->bmiHeader.biSizeImage = width * height * 4; - if (!(color_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto done; - GetDIBits( hdc, icon.hbmColor, 0, height, color_bits, info, DIB_RGB_COLORS ); - -done: - HeapFree( GetProcessHeap(), 0, info ); - HeapFree( GetProcessHeap(), 0, color_bits ); - HeapFree( GetProcessHeap(), 0, mask_bits ); - } -#endif - - /* Create the cursor icon */ - RosUserCreateCursorIcon( &icon, handle ); - - //DeleteObject( icon.hbmMask ); - DeleteDC( hdc ); -} - -/*********************************************************************** - * DestroyCursorIcon (NTDRV.@) - */ -void CDECL RosDrv_DestroyCursorIcon( HCURSOR handle ) -{ - ICONINFO IconInfo = {0}; - - FIXME( "Destroying cursor %p\n", handle ); - - /* Destroy kernel mode part of the cursor icon */ - RosUserDestroyCursorIcon( &IconInfo, handle ); - - /* Destroy usermode-created bitmaps */ - // FIXME: Will it delete kernelmode bitmaps?! - // HACK - //if (IconInfo.hbmColor) DeleteObject( IconInfo.hbmColor ); - //if (IconInfo.hbmMask) DeleteObject( IconInfo.hbmMask ); -} - -void CDECL RosDrv_SetCursor( HCURSOR handle ) -{ - - // HACK - if (!cursor_window) - { - cursor_window = SwmGetWindowFromPoint(200, 200); - } - - if (cursor_window) SendNotifyMessageW( cursor_window, WM_NTDRV_SET_CURSOR, 0, (LPARAM)handle ); - FIXME("handle %x, cursor_window %x\n", handle, cursor_window); -} - + GetIconInfo(handle, &iconinfo); + RosUserSetCursor(&iconinfo); + } +} + Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -763,9 +763,6 @@ { switch(msg) { - case WM_NTDRV_SET_CURSOR: - set_window_cursor( hwnd, (HCURSOR)lparam ); - return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wparam, lparam ); return 0; Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -14,12 +14,6 @@ NTDRV_GET_GLX_DRAWABLE, /* get current glx drawable for a DC */ NTDRV_SYNC_PIXMAP, /* sync the dibsection to its pixmap */ NTDRV_FLUSH_GL_DRAWABLE /* flush changes made to the gl drawable */ -}; - -/* NT driver private messages, must be in the range 0x80001000..0x80001fff */ -enum ntdrv_window_messages -{ - WM_NTDRV_SET_CURSOR = 0x80001000 }; struct ntdrv_escape_set_drawable Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -46,6 +46,7 @@ BOOL NTAPI RosUserClipCursor( LPCRECT clip ); +#if 0 void NTAPI RosUserSetCursor( ICONINFO* IconInfo ); @@ -56,6 +57,11 @@ VOID APIENTRY RosUserDestroyCursorIcon(ICONINFO* IconInfoUnsafe, HCURSOR Handle); +#endif + +VOID +APIENTRY +RosUserSetCursor( ICONINFO* IconInfoUnsafe ); LONG APIENTRY @@ -167,9 +173,6 @@ VOID NTAPI SwmAddDesktopWindow(HWND hWnd, UINT Width, UINT Height); -BOOL NTAPI -SwmDefineCursor(HWND hWnd, HCURSOR hCursor); - VOID NTAPI SwmRemoveWindow(HWND hWnd); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/cursoricon.c [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -13,7 +13,7 @@ extern PDEVOBJ PrimarySurface; VOID NTAPI -GreMovePointer( +IntEngMovePointer( IN SURFOBJ *pso, IN LONG x, IN LONG y, @@ -27,8 +27,30 @@ SURFACE_UnlockBitmapBits(pSurf); } +VOID +NTAPI +GreMovePointer( + HDC hdc, + LONG x, + LONG y) +{ + PRECTL prcl; + SURFOBJ *pso; + + pso = EngLockSurface(PrimarySurface.pSurface); + + /* Store the cursor exclude position in the PDEV */ + prcl = &(GDIDEV(pso)->Pointer.Exclude); + + /* Call Eng/Drv function */ + IntEngMovePointer(pso, x, y, prcl); + + EngUnlockSurface(pso); +} + + ULONG NTAPI -GreSetPointerShape( +IntSetPointerShape( IN SURFOBJ *pso, IN SURFOBJ *psoMask, IN SURFOBJ *psoColor, @@ -90,37 +112,23 @@ return ulResult; } - - -BOOL +ULONG NTAPI -GreSetCursor(ICONINFO* NewCursor, PSYSTEM_CURSORINFO CursorInfo) +GreSetPointerShape( + HDC hdc, + HBITMAP hbmMask, + HBITMAP hbmColor, + LONG xHot, + LONG yHot, + LONG x, + LONG y) { SURFOBJ *pso; - HBITMAP hbmMask, hbmColor; PSURFACE psurfMask, psurfColor; XLATEOBJ *XlateObj = NULL; ULONG Status; pso = EngLockSurface(PrimarySurface.pSurface); - - if (!NewCursor) - { - if (CursorInfo->ShowingCursor) - { - DPRINT("Removing pointer!\n"); - /* Remove the cursor if it was displayed */ - GreMovePointer(pso, -1, -1, NULL); - } - CursorInfo->ShowingCursor = 0; - EngUnlockSurface(pso); - return TRUE; - } - - CursorInfo->ShowingCursor = TRUE; - - hbmMask = NewCursor->hbmMask; - hbmColor = NewCursor->hbmColor; /* Lock the mask bitmap */ if (hbmMask) @@ -133,7 +141,7 @@ { /* We have one, lock it */ psurfColor = SURFACE_ShareLock(hbmColor); - + if (psurfColor) { /* Create an XLATEOBJ, no mono support */ @@ -144,14 +152,14 @@ else psurfColor = NULL; - Status = GreSetPointerShape(pso, + Status = IntSetPointerShape(pso, psurfMask ? &psurfMask->SurfObj : NULL, psurfColor ? &psurfColor->SurfObj : NULL, XlateObj, - NewCursor->xHotspot, - NewCursor->yHotspot, - CursorInfo->CursorPos.x, - CursorInfo->CursorPos.y, + xHot, + yHot, + x, + y, &(GDIDEV(pso)->Pointer.Exclude), SPS_CHANGE); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/cursor.h [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -31,8 +31,5 @@ extern SYSTEM_CURSORINFO CursorInfo; -VOID NTAPI USER_InitCursorIcons(); -VOID USER_LockCursorIcons(); -VOID USER_UnlockCursorIcons(); PCURSORICONENTRY NTAPI USER_GetCursorIcon(HCURSOR Handle); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -366,15 +366,23 @@ /* Mouse pointer */ -BOOL NTAPI -GreSetCursor(ICONINFO* NewCursor, PSYSTEM_CURSORINFO CursorInfo); - -VOID NTAPI +ULONG +NTAPI +GreSetPointerShape( + HDC hdc, + HBITMAP hbmMask, + HBITMAP hbmColor, + LONG xHot, + LONG yHot, + LONG x, + LONG y); + +VOID +NTAPI GreMovePointer( - SURFOBJ *pso, + HDC hdc, LONG x, - LONG y, - RECTL *prcl); + LONG y); INT FASTCALL MouseSafetyOnDrawStart(SURFOBJ *pso, Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -17,6 +17,6 @@ PSWM_WINDOW NTAPI SwmFindByHwnd(HWND hWnd); VOID NTAPI SwmAcquire(VOID); VOID NTAPI SwmRelease(VOID); - +HDC SwmGetScreenDC(); #endif Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/cursor.c [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -10,10 +10,6 @@ #define NDEBUG #include <debug.h> -/* Cursor icons list */ -LIST_ENTRY CursorIcons; -ERESOURCE CursorIconsLock; - SYSTEM_CURSORINFO CursorInfo; extern PDEVOBJ PrimarySurface; @@ -22,8 +18,6 @@ APIENTRY RosUserGetCursorPos(LPPOINT pt) { - NTSTATUS Status = STATUS_SUCCESS; - _SEH2_TRY { ProbeForWrite(pt, sizeof(POINT), 1); @@ -31,11 +25,11 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(return FALSE); } _SEH2_END; - return NT_SUCCESS(Status); + return TRUE; } static void NTAPI clip_point_to_rect(LPCRECT rect, LPPOINT pt) @@ -51,7 +45,6 @@ RosUserSetCursorPos(INT x, INT y) { POINT pos; - SURFOBJ *pso; pos.x = x; pos.y = y; @@ -63,9 +56,10 @@ if (CursorInfo.ShowingCursor) { - pso = EngLockSurface(PrimarySurface.pSurface); - GreMovePointer(pso, pos.x, pos.y, &(GDIDEV(pso)->Pointer.Exclude)); - EngUnlockSurface(pso); + HDC hDCscreen = SwmGetScreenDC(); + if (!hDCscreen) return FALSE; + + GreMovePointer(hDCscreen, pos.x, pos.y); } CursorInfo.CursorPos = pos; @@ -77,7 +71,6 @@ APIENTRY RosUserClipCursor( LPCRECT UnsafeRect ) { - NTSTATUS Status = STATUS_SUCCESS; RECT Rect; if (!UnsafeRect) @@ -93,15 +86,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + _SEH2_YIELD(return FALSE); } _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } CursorInfo.IsClipped = TRUE; CursorInfo.ClipRect = Rect; @@ -111,166 +99,66 @@ return TRUE; } +VOID UserSetCursor( ICONINFO* IconInfo ) +{ + HDC hDCscreen; + + hDCscreen = SwmGetScreenDC(); + if (!hDCscreen) return; + + if (!IconInfo) + { + if (CursorInfo.ShowingCursor == FALSE) + return; + + DPRINT("Removing pointer!\n"); + /* Remove the cursor if it was displayed */ + GreMovePointer(hDCscreen, -1, -1); + + CursorInfo.ShowingCursor = FALSE; + return; + } + + IconInfo->hbmMask = GDI_MapUserHandle(IconInfo->hbmMask); + IconInfo->hbmColor = GDI_MapUserHandle(IconInfo->hbmColor); + + DPRINT("hbmMask = 0x%x, hbmColor = 0x%x\n", IconInfo->hbmMask, IconInfo->hbmColor); + + GreSetPointerShape( hDCscreen, + IconInfo->hbmMask, + IconInfo->hbmColor, + IconInfo->xHotspot, + IconInfo->yHotspot, + CursorInfo.CursorPos.x, + CursorInfo.CursorPos.y); + + CursorInfo.ShowingCursor = TRUE; +} + VOID APIENTRY RosUserSetCursor( ICONINFO* IconInfoUnsafe ) { ICONINFO IconInfo; - NTSTATUS Status = STATUS_SUCCESS; - /* Special case for removing a pointer */ - if (!IconInfoUnsafe) + if(IconInfoUnsafe == NULL) { - GreSetCursor(NULL, &CursorInfo); - return; + UserSetCursor(NULL); } + else + { + _SEH2_TRY + { + ProbeForRead(IconInfoUnsafe, sizeof(ICONINFO), 1); + RtlCopyMemory(&IconInfo, IconInfoUnsafe , sizeof(ICONINFO)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return;) + } + _SEH2_END; - _SEH2_TRY - { - ProbeForRead(IconInfoUnsafe, sizeof(ICONINFO), 1); - RtlCopyMemory(&IconInfo, IconInfoUnsafe , sizeof(ICONINFO)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (NT_SUCCESS(Status)) - { - IconInfo.hbmMask = GDI_MapUserHandle(IconInfo.hbmMask); - IconInfo.hbmColor = GDI_MapUserHandle(IconInfo.hbmColor); - GreSetCursor(&IconInfo, &CursorInfo); + UserSetCursor(&IconInfo); } } -VOID -APIENTRY -RosUserCreateCursorIcon(ICONINFO* IconInfoUnsafe, - HCURSOR Handle) -{ - PCURSORICONENTRY pCursorIcon; - - // FIXME: SEH! - - /* Allocate an entry in the cursor icons list */ - pCursorIcon = ExAllocatePool(PagedPool, sizeof(CURSORICONENTRY)); - RtlZeroMemory(pCursorIcon, sizeof(CURSORICONENTRY)); - - /* Save the usermode handle and other fields */ - pCursorIcon->Self = Handle; - pCursorIcon->IconInfo = *IconInfoUnsafe; - pCursorIcon->hbmMaskUser = IconInfoUnsafe->hbmMask; - pCursorIcon->hbmColorUser = IconInfoUnsafe->hbmColor; - - /* Map handles */ - pCursorIcon->IconInfo.hbmMask = GDI_MapUserHandle(pCursorIcon->IconInfo.hbmMask); - if (pCursorIcon->IconInfo.hbmColor) - pCursorIcon->IconInfo.hbmColor = GDI_MapUserHandle(pCursorIcon->IconInfo.hbmColor); - - /* Make those bitmaps "system" objects */ - GDIOBJ_SetOwnership(pCursorIcon->IconInfo.hbmMask, NULL); - if (pCursorIcon->IconInfo.hbmColor) - GDIOBJ_SetOwnership(pCursorIcon->IconInfo.hbmColor, NULL); - - /* Acquire lock */ - USER_LockCursorIcons(); - - /* Add it to the list */ - InsertTailList(&CursorIcons, &pCursorIcon->Entry); - - /* Release lock */ - USER_UnlockCursorIcons(); -} - -VOID -APIENTRY -RosUserDestroyCursorIcon(ICONINFO* IconInfoUnsafe, - HCURSOR Handle) -{ - PLIST_ENTRY Current; - PCURSORICONENTRY pCursorIcon; - - /* Acquire lock */ - USER_LockCursorIcons(); - - /* Traverse the list to find our mapping */ - Current = CursorIcons.Flink; - while(Current != &CursorIcons) - { - pCursorIcon = CONTAINING_RECORD(Current, CURSORICONENTRY, Entry); - - /* Check if it's our entry */ - if (pCursorIcon->Self == Handle) - { - /* Remove it from the list */ - RemoveEntryList(Current); - - /* Get handles back to the user for proper disposal */ - IconInfoUnsafe->hbmColor = pCursorIcon->hbmColorUser; - IconInfoUnsafe->hbmMask = pCursorIcon->hbmMaskUser; - - // TODO: Go through all windows and remove this cursor from them! - DPRINT1("Hitting a TODO!\n"); - - /* Free memory */ - ExFreePool(pCursorIcon); - break; - } - - /* Advance to the next pair */ - Current = Current->Flink; - } - - /* Release lock */ - USER_UnlockCursorIcons(); -} - -PCURSORICONENTRY -NTAPI -USER_GetCursorIcon(HCURSOR Handle) -{ - PLIST_ENTRY Current; - PCURSORICONENTRY pCursorIcon; - - /* Traverse the list to find our mapping */ - Current = CursorIcons.Flink; - while(Current != &CursorIcons) - { - pCursorIcon = CONTAINING_RECORD(Current, CURSORICONENTRY, Entry); - - /* Check if it's our entry */ - if (pCursorIcon->Self == Handle) return pCursorIcon; - - /* Advance to the next pair */ - Current = Current->Flink; - } - - return NULL; -} - -VOID NTAPI -USER_InitCursorIcons() -{ - NTSTATUS Status; - - /* Initialize cursor icons list and a spinlock */ - InitializeListHead(&CursorIcons); - Status = ExInitializeResourceLite(&CursorIconsLock); - if (!NT_SUCCESS(Status)) - DPRINT1("Initializing cursor icons lock failed with Status 0x%08X\n", Status); -} - -VOID USER_LockCursorIcons() -{ - /* Acquire lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CursorIconsLock, TRUE); -} - -VOID USER_UnlockCursorIcons() -{ - /* Release lock */ - ExReleaseResourceLite(&CursorIconsLock); - KeLeaveCriticalRegion(); -} Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -357,9 +357,6 @@ /* Initialize handle-mapping */ GDI_InitHandleMapping(); - /* Initialize cursor icons */ - USER_InitCursorIcons(); - /* Create stock objects */ CreateStockBitmap(); PALETTE_Init(); Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -35,7 +35,6 @@ LIST_ENTRY SwmWindows; ERESOURCE SwmLock; HDC SwmDc; /* Screen DC for copying operations */ -PCURSORICONENTRY SwmLastCursor; /* FUNCTIONS *****************************************************************/ @@ -87,6 +86,14 @@ GDIOBJ_SetOwnership(SwmDc, NULL); } +HDC SwmGetScreenDC() +{ + /* Lazily create a global screen DC */ + if (!SwmDc) SwmCreateScreenDc(); + + return SwmDc; +} + VOID NTAPI SwmInvalidateRegion(PSWM_WINDOW Window, struct region *Region, rectangle_t *Rect) @@ -785,37 +792,11 @@ if (point_in_region(Window->Visible, x, y)) { - /* Acquire CI lock */ - USER_LockCursorIcons(); - - /* Check if cursor needs to be changed */ - if (Window->Cursor != SwmLastCursor) - { - if (Window->Cursor) - { - /* Set the new cursor */ - DPRINT1("Setting cursor bitmap %p for hwnd %p\n", Window->Cursor->IconInfo.hbmMask, Window->hwnd); - GreSetCursor(&Window->Cursor->IconInfo, &CursorInfo); - } - else - { - /* This window should have no cursor */ - GreSetCursor(NULL, &CursorInfo); - } - - /* Update the last cursor */ - SwmLastCursor = Window->Cursor; - } - - /* Release CI lock */ - USER_UnlockCursorIcons(); - /* Release the lock */ SwmRelease(); return Window->hwnd; } - /* Advance to the next window */ Current = Current->Flink; } @@ -826,63 +807,6 @@ return 0; } -BOOL -NTAPI -SwmDefineCursor(HWND hWnd, HCURSOR hCursor) -{ - PCURSORICONENTRY pCursorIcon; - PSWM_WINDOW pSwmWindow; - - /* Acquire CI lock */ - USER_LockCursorIcons(); - - /* Try to find this cursor */ - pCursorIcon = USER_GetCursorIcon(hCursor); - - /* Release CI lock */ - USER_UnlockCursorIcons(); - - if (!pCursorIcon) return FALSE; - - /* Acquire the SWM lock */ - SwmAcquire(); - - if (!hWnd) - { - /* Special case for setting default cursor */ - DPRINT1("Setting cursor bitmap uh%p\n", pCursorIcon->hbmMaskUser); - GreSetCursor(&pCursorIcon->IconInfo, &CursorInfo); - - /* Update current cursor */ - SwmLastCursor = hCursor; - - /* Release the SWM lock */ - SwmRelease(); - - return TRUE; - } - - /* Now find the window */ - pSwmWindow = SwmFindByHwnd(hWnd); - - /* Success is returned in this case */ - if (!pSwmWindow) - { - /* Release the SWM lock */ - SwmRelease(); - - return TRUE; - } - - /* Set a cursor for this window */ - pSwmWindow->Cursor = pCursorIcon; - - /* Release the SWM lock */ - SwmRelease(); - - return TRUE; -} - VOID NTAPI SwmInitialize() @@ -900,10 +824,7 @@ DPRINT1("Failure initializing SWM resource!\n"); } - /* Cursor is hidden by default */ - SwmLastCursor = NULL; - - SwmTest(); + //SwmTest(); } VOID Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sun Jun 6 23:40:11 2010 @@ -64,12 +64,10 @@ RosGdiSwapBuffers 1 RosGdiUnrealizePalette 1 RosUserConnectCsrss 0 -RosUserCreateCursorIcon 2 -RosUserDestroyCursorIcon 2 +RosUserSetCursor 1 RosUserGetCursorPos 1 RosUserSetCursorPos 2 RosUserClipCursor 1 -RosUserSetCursor 1 RosUserChangeDisplaySettings 5 RosUserEnumDisplayMonitors 3 RosUserEnumDisplaySettings 4 @@ -88,7 +86,6 @@ RosUserGetAsyncKeyState 1 SwmAddWindow 2 SwmAddDesktopWindow 3 -SwmDefineCursor 2 SwmRemoveWindow 1 SwmSetForeground 1 SwmPosChanging 2

1 0

[cgutman] 47639: Forgot to remove this ASSERT for r47636
by cgutman＠svn.reactos.org 06 Jun '10

06 Jun '10

Author: cgutman Date: Sun Jun 6 23:31:58 2010 New Revision: 47639 URL: http://svn.reactos.org/svn/reactos?rev=47639&view=rev Log: Forgot to remove this ASSERT for r47636 Modified: trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun Jun 6 23:31:58 2010 @@ -99,7 +99,8 @@ { PNDIS_MINIPORT_TIMER CurrentTimer; - ASSERT(Timer->Miniport->TimerQueue); + if (!Timer->Miniport->TimerQueue) + return FALSE; if (Timer->Miniport->TimerQueue == Timer) {

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