Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[cfinck] 33439: Delete win32k-gdi-dx branch on Fireball's request
by cfinck＠svn.reactos.org 11 May '08

11 May '08

Author: cfinck Date: Sun May 11 07:38:07 2008 New Revision: 33439 URL: http://svn.reactos.org/svn/reactos?rev=33439&view=rev Log: Delete win32k-gdi-dx branch on Fireball's request Removed: branches/win32k-gdi-dx/

1 0

[navaraf] 33438: Temporary disable part of the SEH code in NtReplyWaitReceivePortEx to get trunk working again.
by navaraf＠svn.reactos.org 11 May '08

11 May '08

Author: navaraf Date: Sun May 11 07:22:51 2008 New Revision: 33438 URL: http://svn.reactos.org/svn/reactos?rev=33438&view=rev Log: Temporary disable part of the SEH code in NtReplyWaitReceivePortEx to get trunk working again. Modified: trunk/reactos/ntoskrnl/lpc/reply.c Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Sun May 11 07:22:51 2008 @@ -165,7 +165,7 @@ PETHREAD Thread = PsGetCurrentThread(), WakeupThread; PLPCP_CONNECTION_MESSAGE ConnectMessage; ULONG ConnectionInfoLength; - PORT_MESSAGE CapturedReplyMessage; + //PORT_MESSAGE CapturedReplyMessage; LARGE_INTEGER CapturedTimeout; PAGED_CODE(); @@ -183,8 +183,8 @@ if (ReplyMessage != NULL) { ProbeForRead(ReplyMessage, sizeof(PORT_MESSAGE), sizeof(ULONG)); - RtlCopyMemory(&CapturedReplyMessage, ReplyMessage, sizeof(PORT_MESSAGE)); - ReplyMessage = &CapturedReplyMessage; + /*RtlCopyMemory(&CapturedReplyMessage, ReplyMessage, sizeof(PORT_MESSAGE)); + ReplyMessage = &CapturedReplyMessage;*/ } if (Timeout != NULL) @@ -199,6 +199,8 @@ } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { + DPRINT1("SEH crash [1]\n"); + DbgBreakPoint(); Status = _SEH_GetExceptionCode(); } _SEH_END; @@ -492,6 +494,8 @@ } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { + DPRINT1("SEH crash [2]\n"); + DbgBreakPoint(); Status = _SEH_GetExceptionCode(); } _SEH_END;

1 0

[hpoussin] 33437: Use LONG BreakPointNr, as in other breakpoint-related functions
by hpoussin＠svn.reactos.org 11 May '08

11 May '08

Author: hpoussin Date: Sun May 11 06:44:55 2008 New Revision: 33437 URL: http://svn.reactos.org/svn/reactos?rev=33437&view=rev Log: Use LONG BreakPointNr, as in other breakpoint-related functions Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/kdbg/kdb.h Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=33… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Sun May 11 06:44:55 2008 @@ -540,7 +540,7 @@ IN KDB_ACCESS_TYPE AccessType OPTIONAL, IN PCHAR ConditionExpression OPTIONAL, IN BOOLEAN Global, - OUT PULONG BreakPointNumber OPTIONAL) + OUT PLONG BreakPointNr OPTIONAL) { LONG i; PVOID Condition; @@ -636,8 +636,8 @@ KdbpEnableBreakPoint(i, NULL); /* Return the breakpoint number */ - if (BreakPointNumber != NULL) - *BreakPointNumber = i; + if (BreakPointNr != NULL) + *BreakPointNr = i; return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.h?rev=33… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.h [iso-8859-1] Sun May 11 06:44:55 2008 @@ -196,7 +196,7 @@ IN KDB_ACCESS_TYPE AccessType OPTIONAL, IN PCHAR ConditionExpression OPTIONAL, IN BOOLEAN Global, - OUT PULONG BreakPointNumber OPTIONAL); + OUT PLONG BreakPointNr OPTIONAL); BOOLEAN KdbpDeleteBreakPoint(

1 0

[hpoussin] 33436: Implement SHGetFolderPathAndSubDirA/W, taken from Wine See issue #3238 for more details.
by hpoussin＠svn.reactos.org 11 May '08

11 May '08

Author: hpoussin Date: Sun May 11 06:33:49 2008 New Revision: 33436 URL: http://svn.reactos.org/svn/reactos?rev=33436&view=rev Log: Implement SHGetFolderPathAndSubDirA/W, taken from Wine See issue #3238 for more details. Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shellpath.c trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Sun May 11 06:33:49 2008 @@ -349,6 +349,8 @@ @ stdcall SHGetFileInfoW(ptr long ptr long long) @ stdcall SHGetFolderLocation(long long long long ptr) @ stdcall SHGetFolderPathA(long long long long ptr) +@ stdcall SHGetFolderPathAndSubDirA(long long long long str ptr) +@ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) @ stdcall SHGetFolderPathW(long long long long ptr) @ stub SHGetFreeDiskSpace @ stub SHGetIconOverlayIndexA @@ -376,7 +378,7 @@ @ stdcall SHQueryRecycleBinA(str ptr) @ stdcall SHQueryRecycleBinW(wstr ptr) @ stdcall SHSetLocalizedName(wstr wstr long) -@ stub SHUpdateRecycleBinIcon +@ stdcall SHUpdateRecycleBinIcon() @ stdcall SheChangeDirA(str) @ stub SheChangeDirExA @ stub SheChangeDirExW Modified: trunk/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] Sun May 11 06:33:49 2008 @@ -1625,17 +1625,12 @@ * Most values can be overridden in either * HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders * or in the same location in HKLM. - * The registry usage is explained by the following tech note: - * http://www.microsoft.com/windows2000/techinfo/reskit/en-us/default.asp?url=… * The "Shell Folders" registry key was used in NT4 and earlier systems. * Beginning with Windows 2000, the "User Shell Folders" key is used, so * changes made to it are made to the former key too. This synchronization is * done on-demand: not until someone requests the value of one of these paths * (by calling one of the SHGet functions) is the value synchronized. - * Furthermore, as explained here: - * http://www.microsoft.com/windows2000/techinfo/reskit/en-us/default.asp?url=… - * the HKCU paths take precedence over the HKLM paths. - * + * Furthermore, the HKCU paths take precedence over the HKLM paths. */ HRESULT WINAPI SHGetFolderPathW( HWND hwndOwner, /* [I] owner window */ @@ -1644,20 +1639,85 @@ DWORD dwFlags, /* [I] which path to return */ LPWSTR pszPath) /* [O] converted path */ { + HRESULT hr = SHGetFolderPathAndSubDirW(hwndOwner, nFolder, hToken, dwFlags, NULL, pszPath); + if(HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == hr) + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + return hr; +} + +HRESULT WINAPI SHGetFolderPathAndSubDirA( + HWND hwndOwner, /* [I] owner window */ + int nFolder, /* [I] CSIDL identifying the folder */ + HANDLE hToken, /* [I] access token */ + DWORD dwFlags, /* [I] which path to return */ + LPCSTR pszSubPath, /* [I] sub directory of the specified folder */ + LPSTR pszPath) /* [O] converted path */ +{ + int length; + HRESULT hr = S_OK; + LPWSTR pszSubPathW = NULL; + LPWSTR pszPathW = NULL; + TRACE("%08x,%08x,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW)); + + if(pszPath) { + pszPathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + if(!pszPathW) { + hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + } + TRACE("%08x,%08x,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW)); + + /* SHGetFolderPathAndSubDirW does not distinguish if pszSubPath isn't + * set (null), or an empty string.therefore call it without the parameter set + * if pszSubPath is an empty string + */ + if (pszSubPath && pszSubPath[0]) { + length = MultiByteToWideChar(CP_ACP, 0, pszSubPath, -1, NULL, 0); + pszSubPathW = HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR)); + if(!pszSubPathW) { + hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, pszSubPath, -1, pszSubPathW, length); + } + + hr = SHGetFolderPathAndSubDirW(hwndOwner, nFolder, hToken, dwFlags, pszSubPathW, pszPathW); + + if (SUCCEEDED(hr) && pszPath) + WideCharToMultiByte(CP_ACP, 0, pszPathW, -1, pszPath, MAX_PATH, NULL, NULL); + +cleanup: + HeapFree(GetProcessHeap(), 0, pszPathW); + HeapFree(GetProcessHeap(), 0, pszSubPathW); + return hr; +} + +HRESULT WINAPI SHGetFolderPathAndSubDirW( + HWND hwndOwner, /* [I] owner window */ + int nFolder, /* [I] CSIDL identifying the folder */ + HANDLE hToken, /* [I] access token */ + DWORD dwFlags, /* [I] which path to return */ + LPCWSTR pszSubPath,/* [I] sub directory of the specified folder */ + LPWSTR pszPath) /* [O] converted path */ +{ HRESULT hr; WCHAR szBuildPath[MAX_PATH], szTemp[MAX_PATH]; DWORD folder = nFolder & CSIDL_FOLDER_MASK; CSIDL_Type type; int ret; - TRACE("%p,%p,nFolder=0x%04x\n", hwndOwner,pszPath,nFolder); + TRACE("%p,%p,nFolder=0x%04x,%s\n", hwndOwner,pszPath,nFolder,debugstr_w(pszSubPath)); /* Windows always NULL-terminates the resulting path regardless of success * or failure, so do so first */ if (pszPath) *pszPath = '\0'; + if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + return E_INVALIDARG; + if ((SHGFP_TYPE_CURRENT != dwFlags) && (SHGFP_TYPE_DEFAULT != dwFlags)) return E_INVALIDARG; szTemp[0] = 0; type = CSIDL_Data[folder].type; @@ -1711,11 +1771,22 @@ hr = _SHExpandEnvironmentStrings(szTemp, szBuildPath); else strcpyW(szBuildPath, szTemp); + + if (FAILED(hr)) goto end; + + if(pszSubPath) { + /* make sure the new path does not exceed th bufferlength + * rememebr to backslash and the termination */ + if(MAX_PATH < (lstrlenW(szBuildPath) + lstrlenW(pszSubPath) + 2)) { + hr = HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); + goto end; + } + PathAppendW(szBuildPath, pszSubPath); + PathRemoveBackslashW(szBuildPath); + } /* Copy the path if it's available before we might return */ if (SUCCEEDED(hr) && pszPath) strcpyW(pszPath, szBuildPath); - - if (FAILED(hr)) goto end; /* if we don't care about existing directories we are ready */ if(nFolder & CSIDL_FLAG_DONT_VERIFY) goto end; @@ -1727,7 +1798,7 @@ */ if (!(nFolder & CSIDL_FLAG_CREATE)) { - hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + hr = HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); goto end; } Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Sun May 11 06:33:49 2008 @@ -53,6 +53,9 @@ void WINAPI SHFree(LPVOID); BOOL WINAPI GetFileNameFromBrowse(HWND,LPSTR,DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR); HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); +HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); +HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); +#define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir); BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); #define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList)

1 0

[fireball] 33435: Creating a branch for Magnus Olsen's work in win32k, GDI and DirectX area. Finished parts will be merged back to trunk.
by fireball＠svn.reactos.org 11 May '08

11 May '08

Author: fireball Date: Sun May 11 06:03:57 2008 New Revision: 33435 URL: http://svn.reactos.org/svn/reactos?rev=33435&view=rev Log: Creating a branch for Magnus Olsen's work in win32k, GDI and DirectX area. Finished parts will be merged back to trunk. Added: branches/win32k-gdi-dx/ - copied from r33434, /

1 0

[greatlrd] 33434: adding SetLastError(ERROR_INVALID_PARAMETER) when CreateBitmapIndirect fail, sugestion from filip we should do that as well. thx filip.
by greatlrd＠svn.reactos.org 11 May '08

11 May '08

Author: greatlrd Date: Sun May 11 05:41:06 2008 New Revision: 33434 URL: http://svn.reactos.org/svn/reactos?rev=33434&view=rev Log: adding SetLastError(ERROR_INVALID_PARAMETER) when CreateBitmapIndirect fail, sugestion from filip we should do that as well. thx filip. Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Sun May 11 05:41:06 2008 @@ -200,6 +200,10 @@ pbm->bmPlanes, pbm->bmBitsPixel, pbm->bmBits); + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); } return bitmap;

1 0

[greatlrd] 33433: Adding simple test for CreateBitmapIndrect and show it care if bmWidthBytes is align or not this test have done on windows xp sp2 and pass it fine.
by greatlrd＠svn.reactos.org 11 May '08

11 May '08

Author: greatlrd Date: Sun May 11 05:35:09 2008 New Revision: 33433 URL: http://svn.reactos.org/svn/reactos?rev=33433&view=rev Log: Adding simple test for CreateBitmapIndrect and show it care if bmWidthBytes is align or not this test have done on windows xp sp2 and pass it fine. Added: trunk/rostests/apitests/gdi32api/tests/CreateBitmapIndirect.c (with props) Modified: trunk/rostests/apitests/gdi32api/testlist.c Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Sun May 11 05:35:09 2008 @@ -6,6 +6,7 @@ /* include the tests */ #include "tests/AddFontResource.c" #include "tests/AddFontResourceEx.c" +#include "tests/CreateBitmapIndirect.c" #include "tests/CreateCompatibleDC.c" #include "tests/CreateFont.c" #include "tests/CreatePen.c" @@ -21,11 +22,14 @@ #include "tests/SetSysColors.c" #include "tests/SetWorldTransform.c" + + /* The List of tests */ TESTENTRY TestList[] = { { L"AddFontResourceA", Test_AddFontResourceA }, { L"AddFontResourceEx", Test_AddFontResourceEx }, + { L"CreateBitmapIndirect", Test_CreateBitmapIndirect }, { L"CreateCompatibleDC", Test_CreateCompatibleDC }, { L"CreateFont", Test_CreateFont }, { L"CreatePen", Test_CreatePen }, Added: trunk/rostests/apitests/gdi32api/tests/CreateBitmapIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/CreateBitmapIndirect.c (added) +++ trunk/rostests/apitests/gdi32api/tests/CreateBitmapIndirect.c [iso-8859-1] Sun May 11 05:35:09 2008 @@ -1,0 +1,58 @@ + + + +INT +Test_CreateBitmapIndirect(PTESTINFO pti) +{ + HBITMAP win_hBmp; + BITMAP win_bitmap; + + win_bitmap.bmBits = 0; + win_bitmap.bmBitsPixel = 1; + win_bitmap.bmHeight = 0; + win_bitmap.bmPlanes = 1; + win_bitmap.bmType = 1; + win_bitmap.bmWidth = 0; + win_bitmap.bmWidthBytes = 2; + win_hBmp = CreateBitmapIndirect(&win_bitmap); + RTEST(win_hBmp != 0); + + DeleteObject(win_hBmp); + + RtlZeroMemory(&win_bitmap,sizeof(BITMAP)); + win_bitmap.bmBits = 0; + win_bitmap.bmBitsPixel = 1; + win_bitmap.bmHeight = 0; + win_bitmap.bmPlanes = 1; + win_bitmap.bmType = 1; + win_bitmap.bmWidth = 0; + win_bitmap.bmWidthBytes = 1; + win_hBmp = CreateBitmapIndirect(&win_bitmap); + RTEST(win_hBmp == 0); + + RtlZeroMemory(&win_bitmap,sizeof(BITMAP)); + win_bitmap.bmBits = 0; + win_bitmap.bmBitsPixel = 1; + win_bitmap.bmHeight = 0; + win_bitmap.bmPlanes = 1; + win_bitmap.bmType = 1; + win_bitmap.bmWidth = 0; + win_bitmap.bmWidthBytes = 3; + win_hBmp = CreateBitmapIndirect(&win_bitmap); + RTEST(win_hBmp == 0); + + RtlZeroMemory(&win_bitmap,sizeof(BITMAP)); + win_bitmap.bmBits = 0; + win_bitmap.bmBitsPixel = 1; + win_bitmap.bmHeight = 0; + win_bitmap.bmPlanes = 1; + win_bitmap.bmType = 1; + win_bitmap.bmWidth = 0; + win_bitmap.bmWidthBytes = 4; + win_hBmp = CreateBitmapIndirect(&win_bitmap); + RTEST(win_hBmp != 0); + + DeleteObject(win_hBmp); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/CreateBitmapIndirect.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 33432: Kamil Hornicek <tykef@atlas.cz> - Update PSDK headers.
by fireball＠svn.reactos.org 11 May '08

11 May '08

Author: fireball Date: Sun May 11 05:16:10 2008 New Revision: 33432 URL: http://svn.reactos.org/svn/reactos?rev=33432&view=rev Log: Kamil Hornicek <tykef(a)atlas.cz> - Update PSDK headers. Modified: trunk/reactos/include/psdk/wininet.h trunk/reactos/include/psdk/winternl.h Modified: trunk/reactos/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wininet.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wininet.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wininet.h [iso-8859-1] Sun May 11 05:16:10 2008 @@ -581,6 +581,7 @@ #define INTERNET_STATUS_CONNECTION_CLOSED 51 #define INTERNET_STATUS_HANDLE_CREATED 60 #define INTERNET_STATUS_HANDLE_CLOSING 70 +#define INTERNET_STATUS_DETECTING_PROXY 80 #define INTERNET_STATUS_REQUEST_COMPLETE 100 #define INTERNET_STATUS_REDIRECT 110 #define INTERNET_STATUS_INTERMEDIATE_RESPONSE 120 Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Sun May 11 05:16:10 2008 @@ -1621,6 +1621,11 @@ typedef enum _IO_COMPLETION_INFORMATION_CLASS { IoCompletionBasicInformation } IO_COMPLETION_INFORMATION_CLASS, *PIO_COMPLETION_INFORMATION_CLASS; + +typedef struct _FILE_COMPLETION_INFORMATION { + HANDLE CompletionPort; + ULONG_PTR CompletionKey; +} FILE_COMPLETION_INFORMATION, *PFILE_COMPLETION_INFORMATION; typedef enum _HARDERROR_RESPONSE_OPTION { OptionAbortRetryIgnore,

1 0

[hpoussin] 33431: Fix indentation, to match mouclass one.
by hpoussin＠svn.reactos.org 11 May '08

11 May '08

Author: hpoussin Date: Sun May 11 05:03:52 2008 New Revision: 33431 URL: http://svn.reactos.org/svn/reactos?rev=33431&view=rev Log: Fix indentation, to match mouclass one. Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Sun May 11 05:03:52 2008 @@ -729,8 +729,10 @@ ASSERT(ClassDeviceExtension->Common.IsClassDO); - IoReleaseCancelSpinLock(Irp->CancelIrql); + IoReleaseCancelSpinLock(Irp->CancelIrql); + KeAcquireSpinLock(&ClassDeviceExtension->SpinLock, &OldIrql); + if (ClassDeviceExtension->PendingIrp == Irp) { ClassDeviceExtension->PendingIrp = NULL;

1 0

[hpoussin] 33430: serial: Fix FileStandardInformation and FilePositionInformation classes serial: Add FileNetworkOpenInformation class serenum: Pass all requests to next driver, even unknown ones
by hpoussin＠svn.reactos.org 11 May '08

11 May '08

Author: hpoussin Date: Sun May 11 04:51:46 2008 New Revision: 33430 URL: http://svn.reactos.org/svn/reactos?rev=33430&view=rev Log: serial: Fix FileStandardInformation and FilePositionInformation classes serial: Add FileNetworkOpenInformation class serenum: Pass all requests to next driver, even unknown ones Modified: trunk/reactos/drivers/serial/serenum/serenum.c trunk/reactos/drivers/serial/serial/info.c Modified: trunk/reactos/drivers/serial/serenum/serenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/ser… ============================================================================== --- trunk/reactos/drivers/serial/serenum/serenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serenum/serenum.c [iso-8859-1] Sun May 11 04:51:46 2008 @@ -47,6 +47,7 @@ case IRP_MJ_CREATE: case IRP_MJ_CLOSE: case IRP_MJ_CLEANUP: + case IRP_MJ_QUERY_INFORMATION: case IRP_MJ_READ: case IRP_MJ_WRITE: case IRP_MJ_DEVICE_CONTROL: @@ -56,7 +57,7 @@ WARN_(SERENUM, "FDO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); ASSERT(FALSE); - Status = Irp->IoStatus.Status; + return ForwardIrpToLowerDeviceAndForget(DeviceObject, Irp); } } } @@ -77,7 +78,7 @@ WARN_(SERENUM, "PDO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); ASSERT(FALSE); - Status = Irp->IoStatus.Status; + return ForwardIrpToAttachedFdoAndForget(DeviceObject, Irp); } } } Modified: trunk/reactos/drivers/serial/serial/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/info… ============================================================================== --- trunk/reactos/drivers/serial/serial/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/info.c [iso-8859-1] Sun May 11 04:51:46 2008 @@ -44,6 +44,7 @@ StandardInfo->Directory = FALSE; StandardInfo->NumberOfLinks = 0; StandardInfo->DeletePending = FALSE; /* FIXME: should be TRUE sometimes */ + Information = sizeof(FILE_STANDARD_INFORMATION); Status = STATUS_SUCCESS; } break; @@ -55,13 +56,34 @@ ASSERT(PositionInfo); TRACE_(SERIAL, "IRP_MJ_QUERY_INFORMATION / FilePositionInformation\n"); - if (BufferLength < sizeof(PFILE_POSITION_INFORMATION)) + if (BufferLength < sizeof(FILE_POSITION_INFORMATION)) Status = STATUS_BUFFER_OVERFLOW; else if (!PositionInfo) Status = STATUS_INVALID_PARAMETER; else { PositionInfo->CurrentByteOffset.QuadPart = 0; + Information = sizeof(FILE_POSITION_INFORMATION); + Status = STATUS_SUCCESS; + } + break; + } + case FileNetworkOpenInformation: + { + PFILE_NETWORK_OPEN_INFORMATION NetworkOpenInfo = (PFILE_NETWORK_OPEN_INFORMATION)SystemBuffer; + + ASSERT(NetworkOpenInfo); + + TRACE_(SERIAL, "IRP_MJ_QUERY_INFORMATION / FileNetworkInformation\n"); + DbgBreakPoint(); + if (BufferLength < sizeof(FILE_NETWORK_OPEN_INFORMATION)) + Status = STATUS_BUFFER_OVERFLOW; + else if (!NetworkOpenInfo) + Status = STATUS_INVALID_PARAMETER; + else + { + RtlZeroMemory(NetworkOpenInfo, sizeof(FILE_NETWORK_OPEN_INFORMATION)); + Information = sizeof(FILE_NETWORK_OPEN_INFORMATION); Status = STATUS_SUCCESS; } break;

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
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