Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 17156: Correctly set internal state in NpfsDisconnectPipe and fix some return values in NpfsRead.
by navaraf＠svn.reactos.com 07 Aug '05

07 Aug '05

Correctly set internal state in NpfsDisconnectPipe and fix some return values in NpfsRead. Modified: trunk/reactos/drivers/fs/np/fsctrl.c Modified: trunk/reactos/drivers/fs/np/rw.c _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2005-08-07 10:13:46 UTC (rev 17155) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-08-07 10:56:57 UTC (rev 17156) @@ -187,6 +187,7 @@ Server = (Fcb->PipeEnd == FILE_PIPE_SERVER_END); OtherSide = Fcb->OtherSide; Fcb->OtherSide = NULL; + Fcb->PipeState = FILE_PIPE_DISCONNECTED_STATE; /* Lock the server first */ if (Server) { _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2005-08-07 10:13:46 UTC (rev 17155) +++ trunk/reactos/drivers/fs/np/rw.c 2005-08-07 10:56:57 UTC (rev 17156) @@ -27,7 +27,7 @@ DbgPrint("---------------\n"); - for (i = 0; i < ROUND_UP(Length, 16); i+= 16) + for (i = 0; i < Length; i+= 16) { memset(Line, ' ', 64); Line[64] = 0; @@ -398,23 +398,19 @@ { if (Fcb->ReadDataAvailable == 0) { - if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE) - { - ASSERT(Fcb->OtherSide != NULL); - KeSetEvent(&Fcb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); - } - if (Information > 0 && - (Fcb->Pipe->ReadMode != FILE_PIPE_BYTE_STREAM_MODE || - Fcb->PipeState != FILE_PIPE_CONNECTED_STATE)) - { - break; - } if (Fcb->PipeState != FILE_PIPE_CONNECTED_STATE) { DPRINT("PipeState: %x\n", Fcb->PipeState); - Status = STATUS_PIPE_BROKEN; + if (Fcb->PipeState == FILE_PIPE_LISTENING_STATE) + Status = STATUS_PIPE_LISTENING; + else + Status = STATUS_PIPE_DISCONNECTED; break; } + + ASSERT(Fcb->OtherSide != NULL); + KeSetEvent(&Fcb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); + ExReleaseFastMutex(&Fcb->DataListLock); if (IoIsOperationSynchronous(Irp)) {

1 0

[mbosma] 17155: A simple test app for DirectDraw.
by mbosma＠svn.reactos.com 07 Aug '05

07 Aug '05

A simple test app for DirectDraw. Added: trunk/rosapps/demos/ddraw/ Added: trunk/rosapps/demos/ddraw/ddraw.xml Added: trunk/rosapps/demos/ddraw/main.cpp Added: trunk/rosapps/demos/ddraw/main.h Modified: trunk/rosapps/demos/directory.xml _____ Added: trunk/rosapps/demos/ddraw/ddraw.xml --- trunk/rosapps/demos/ddraw/ddraw.xml 2005-08-07 10:08:25 UTC (rev 17154) +++ trunk/rosapps/demos/ddraw/ddraw.xml 2005-08-07 10:13:46 UTC (rev 17155) @@ -0,0 +1,13 @@ +<module name="ddraw_demo" type="win32gui" installbase="system32" installname="ddraw.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + <library>ddraw</library> + <library>dxguid</library> + <library>string</library> + + <file>main.cpp</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/demos/ddraw/main.cpp --- trunk/rosapps/demos/ddraw/main.cpp 2005-08-07 10:08:25 UTC (rev 17154) +++ trunk/rosapps/demos/ddraw/main.cpp 2005-08-07 10:13:46 UTC (rev 17155) @@ -0,0 +1,303 @@ +#include <windows.h> +#include <ddraw.h> +#include "main.h" + + +bool Init (void) +{ + DDSURFACEDESC2 ddsd; + + // Create the main object + OutputDebugString("=> DirectDrawCreateEx\n"); + ddrval = DirectDrawCreateEx(NULL, (VOID**)&pDD, IID_IDirectDraw7, NULL); + + if (ddrval != DD_OK) + { + MessageBox(0,DDErrorString(ddrval), "DirectDrawCreateEx", 0); + return 0; + } + + // set fullscreen or not + OutputDebugString("=> DDraw->SetCooperativeLevel\n"); + + if(fullscreen) + ddrval = pDD->SetCooperativeLevel (hwnd, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + else + ddrval = pDD->SetCooperativeLevel (hwnd, DDSCL_NORMAL); + + if (ddrval != DD_OK) + { + MessageBox(0,DDErrorString(ddrval), "DDraw->SetCooperativeLevel", 0); + return 0; + } + + // set the new resolution + if(fullscreen) + { + OutputDebugString("=> DDraw->SetDisplayMode\n"); + ddrval = pDD->SetDisplayMode (800, 600, 32, 0, 0); + + if (ddrval != DD_OK) + { + MessageBox(0,DDErrorString(ddrval), "DDraw->SetDisplayMode", 0); + return 0; + } + } + + // create the primary surface + memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); + + ddsd.dwSize = sizeof(DDSURFACEDESC2); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + + OutputDebugString("=> DDraw->CreateSurface\n"); + ddrval = pDD->CreateSurface(&ddsd, &lpddsPrimary, NULL); + + if (ddrval != DD_OK) + { + MessageBox(0,DDErrorString(ddrval), "DDraw->CreateSurface", 0); + return 0; + } + + return true; +} + +void Draw (void) +{ + // make the windows or hole screen green + RECT rect; + GetWindowRect(hwnd, &rect); + + DDBLTFX ddbltfx; + ddbltfx.dwSize = sizeof(DDBLTFX); + ddbltfx.dwFillColor = RGB(0, 255, 0); + + OutputDebugString("=> Surface->Blt (DDBLT_COLORFILL)\n"); + + if(fullscreen) + lpddsPrimary->Blt(NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); + else + lpddsPrimary->Blt(&rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); +} + +void CleanUp (void) +{ + if (lpddsPrimary != NULL) + { + OutputDebugString("=> Surface->Release\n"); + lpddsPrimary->Release(); + lpddsPrimary = NULL; + } + + if (pDD != NULL) + { + OutputDebugString("=> DDraw->Release\n"); + pDD->Release(); + pDD = NULL; + } +} + +int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, + LPSTR lpCmdLine, int nCmdShow) +{ + MSG msg; + WNDCLASS wndclass; + + // ask + fullscreen = MessageBox(0, "Do you want to me to run in fullscreen ?", 0, MB_YESNO) == IDYES; + + // create windnow + wndclass.style = CS_HREDRAW | CS_VREDRAW; + wndclass.lpfnWndProc = WndProc; + wndclass.cbClsExtra = 0; + wndclass.cbWndExtra = 0; + wndclass.hInstance = hInst; + wndclass.hIcon = LoadIcon (NULL, IDI_APPLICATION); + wndclass.hCursor = LoadCursor (NULL, IDC_ARROW); + wndclass.hbrBackground = (HBRUSH)GetStockObject (LTGRAY_BRUSH); + wndclass.lpszMenuName = NULL; + wndclass.lpszClassName = "ddrawdemo"; + + RegisterClass(&wndclass); + + hwnd = CreateWindow("ddrawdemo", + "ReactOS DirectDraw Demo", + WS_POPUP, + CW_USEDEFAULT, + CW_USEDEFAULT, + 800, + 600, + NULL, NULL, + hInst, NULL); + + // Inizalize Ddraw + if(Init()) + { + running = true; + + ShowWindow(hwnd, nCmdShow); + UpdateWindow(hwnd); + } + + // Go into main loop + while (running) + { + if(fullscreen) + Draw(); + + if (PeekMessage(&msg,NULL,0,0,PM_REMOVE)) + { + if (msg.message == WM_QUIT) break; + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + // the end + CleanUp(); + + return 0; +} + + +LONG WINAPI WndProc (HWND hwnd, UINT message, + UINT wParam, LONG lParam) +{ + switch (message) + { + case WM_PAINT: + { + if(!fullscreen) + Draw(); + } break; + + case WM_KEYDOWN: + { + switch (wParam) + { + case VK_ESCAPE: + running=false; + return 0; + } break; + } + + case WM_DESTROY: + { + PostQuitMessage (0); + return 0; + } break; + } + + return DefWindowProc (hwnd, message, wParam, lParam); +} + +char* DDErrorString (HRESULT hr) +{ + switch (hr) + { + case DD_OK: return "DD_OK"; + case DDERR_ALREADYINITIALIZED: return "DDERR_ALREADYINITIALIZED"; + case DDERR_CANNOTATTACHSURFACE: return "DDERR_CANNOTATTACHSURFACE"; + case DDERR_CANNOTDETACHSURFACE: return "DDERR_CANNOTDETACHSURFACE"; + case DDERR_CURRENTLYNOTAVAIL: return "DDERR_CURRENTLYNOTAVAIL"; + case DDERR_EXCEPTION: return "DDERR_EXCEPTION"; + case DDERR_GENERIC: return "DDERR_GENERIC"; + case DDERR_HEIGHTALIGN: return "DDERR_HEIGHTALIGN"; + case DDERR_INCOMPATIBLEPRIMARY: return "DDERR_INCOMPATIBLEPRIMARY"; + case DDERR_INVALIDCAPS: return "DDERR_INVALIDCAPS"; + case DDERR_INVALIDCLIPLIST: return "DDERR_INVALIDCLIPLIST"; + case DDERR_INVALIDMODE: return "DDERR_INVALIDMODE"; + case DDERR_INVALIDOBJECT: return "DDERR_INVALIDOBJECT"; + case DDERR_INVALIDPARAMS: return "DDERR_INVALIDPARAMS"; + case DDERR_INVALIDPIXELFORMAT: return "DDERR_INVALIDPIXELFORMAT"; + case DDERR_INVALIDRECT: return "DDERR_INVALIDRECT"; + case DDERR_LOCKEDSURFACES: return "DDERR_LOCKEDSURFACES"; + case DDERR_NO3D: return "DDERR_NO3D"; + case DDERR_NOALPHAHW: return "DDERR_NOALPHAHW"; + case DDERR_NOCLIPLIST: return "DDERR_NOCLIPLIST"; + case DDERR_NOCOLORCONVHW: return "DDERR_NOCOLORCONVHW"; + case DDERR_NOCOOPERATIVELEVELSET: return "DDERR_NOCOOPERATIVELEVELSET"; + case DDERR_NOCOLORKEY: return "DDERR_NOCOLORKEY"; + case DDERR_NOCOLORKEYHW: return "DDERR_NOCOLORKEYHW"; + case DDERR_NODIRECTDRAWSUPPORT: return "DDERR_NODIRECTDRAWSUPPORT"; + case DDERR_NOEXCLUSIVEMODE: return "DDERR_NOEXCLUSIVEMODE"; + case DDERR_NOFLIPHW: return "DDERR_NOFLIPHW"; + case DDERR_NOGDI: return "DDERR_NOGDI"; + case DDERR_NOMIRRORHW: return "DDERR_NOMIRRORHW"; + case DDERR_NOTFOUND: return "DDERR_NOTFOUND"; + case DDERR_NOOVERLAYHW: return "DDERR_NOOVERLAYHW"; + case DDERR_NORASTEROPHW: return "DDERR_NORASTEROPHW"; + case DDERR_NOROTATIONHW: return "DDERR_NOROTATIONHW"; + case DDERR_NOSTRETCHHW: return "DDERR_NOSTRETCHHW"; + case DDERR_NOT4BITCOLOR: return "DDERR_NOT4BITCOLOR"; + case DDERR_NOT4BITCOLORINDEX: return "DDERR_NOT4BITCOLORINDEX"; + case DDERR_NOT8BITCOLOR: return "DDERR_NOT8BITCOLOR"; + case DDERR_NOTEXTUREHW: return "DDERR_NOTEXTUREHW"; + case DDERR_NOVSYNCHW: return "DDERR_NOVSYNCHW"; + case DDERR_NOZBUFFERHW: return "DDERR_NOZBUFFERHW"; + case DDERR_NOZOVERLAYHW: return "DDERR_NOZOVERLAYHW"; + case DDERR_OUTOFCAPS: return "DDERR_OUTOFCAPS"; + case DDERR_OUTOFMEMORY: return "DDERR_OUTOFMEMORY"; + case DDERR_OUTOFVIDEOMEMORY: return "DDERR_OUTOFVIDEOMEMORY"; + case DDERR_OVERLAYCANTCLIP: return "DDERR_OVERLAYCANTCLIP"; + case DDERR_OVERLAYCOLORKEYONLYONEACTIVE: return "DDERR_OVERLAYCOLORKEYONLYONEACTIVE"; + case DDERR_PALETTEBUSY: return "DDERR_PALETTEBUSY"; + case DDERR_COLORKEYNOTSET: return "DDERR_COLORKEYNOTSET"; + case DDERR_SURFACEALREADYATTACHED: return "DDERR_SURFACEALREADYATTACHED"; + case DDERR_SURFACEALREADYDEPENDENT: return "DDERR_SURFACEALREADYDEPENDENT"; + case DDERR_SURFACEBUSY: return "DDERR_SURFACEBUSY"; + case DDERR_CANTLOCKSURFACE: return "DDERR_CANTLOCKSURFACE"; + case DDERR_SURFACEISOBSCURED: return "DDERR_SURFACEISOBSCURED"; + case DDERR_SURFACELOST: return "DDERR_SURFACELOST"; + case DDERR_SURFACENOTATTACHED: return "DDERR_SURFACENOTATTACHED"; + case DDERR_TOOBIGHEIGHT: return "DDERR_TOOBIGHEIGHT"; + case DDERR_TOOBIGSIZE: return "DDERR_TOOBIGSIZE"; + case DDERR_TOOBIGWIDTH: return "DDERR_TOOBIGWIDTH"; + case DDERR_UNSUPPORTED: return "DDERR_UNSUPPORTED"; + case DDERR_UNSUPPORTEDFORMAT: return "DDERR_UNSUPPORTEDFORMAT"; + case DDERR_UNSUPPORTEDMASK: return "DDERR_UNSUPPORTEDMASK"; + case DDERR_VERTICALBLANKINPROGRESS: return "DDERR_VERTICALBLANKINPROGRESS"; + case DDERR_WASSTILLDRAWING: return "DDERR_WASSTILLDRAWING"; + case DDERR_XALIGN: return "DDERR_XALIGN"; + case DDERR_INVALIDDIRECTDRAWGUID: return "DDERR_INVALIDDIRECTDRAWGUID"; + case DDERR_DIRECTDRAWALREADYCREATED: return "DDERR_DIRECTDRAWALREADYCREATED"; + case DDERR_NODIRECTDRAWHW: return "DDERR_NODIRECTDRAWHW"; + case DDERR_PRIMARYSURFACEALREADYEXISTS: return "DDERR_PRIMARYSURFACEALREADYEXISTS"; + case DDERR_NOEMULATION: return "DDERR_NOEMULATION"; + case DDERR_REGIONTOOSMALL: return "DDERR_REGIONTOOSMALL"; + case DDERR_CLIPPERISUSINGHWND: return "DDERR_CLIPPERISUSINGHWND"; + case DDERR_NOCLIPPERATTACHED: return "DDERR_NOCLIPPERATTACHED"; + case DDERR_NOHWND: return "DDERR_NOHWND"; + case DDERR_HWNDSUBCLASSED: return "DDERR_HWNDSUBCLASSED"; + case DDERR_HWNDALREADYSET: return "DDERR_HWNDALREADYSET"; + case DDERR_NOPALETTEATTACHED: return "DDERR_NOPALETTEATTACHED"; + case DDERR_NOPALETTEHW: return "DDERR_NOPALETTEHW"; + case DDERR_BLTFASTCANTCLIP: return "DDERR_BLTFASTCANTCLIP"; + case DDERR_NOBLTHW: return "DDERR_NOBLTHW"; + case DDERR_NODDROPSHW: return "DDERR_NODDROPSHW"; + case DDERR_OVERLAYNOTVISIBLE: return "DDERR_OVERLAYNOTVISIBLE"; + case DDERR_NOOVERLAYDEST: return "DDERR_NOOVERLAYDEST"; + case DDERR_INVALIDPOSITION: return "DDERR_INVALIDPOSITION"; + case DDERR_NOTAOVERLAYSURFACE: return "DDERR_NOTAOVERLAYSURFACE"; + case DDERR_EXCLUSIVEMODEALREADYSET: return "DDERR_EXCLUSIVEMODEALREADYSET"; + case DDERR_NOTFLIPPABLE: return "DDERR_NOTFLIPPABLE"; + case DDERR_CANTDUPLICATE: return "DDERR_CANTDUPLICATE"; + case DDERR_NOTLOCKED: return "DDERR_NOTLOCKED"; + case DDERR_CANTCREATEDC: return "DDERR_CANTCREATEDC"; + case DDERR_NODC: return "DDERR_NODC"; + case DDERR_WRONGMODE: return "DDERR_WRONGMODE"; + case DDERR_IMPLICITLYCREATED: return "DDERR_IMPLICITLYCREATED"; + case DDERR_NOTPALETTIZED: return "DDERR_NOTPALETTIZED"; + case DDERR_UNSUPPORTEDMODE: return "DDERR_UNSUPPORTEDMODE"; + case DDERR_NOMIPMAPHW: return "DDERR_NOMIPMAPHW"; + case DDERR_INVALIDSURFACETYPE: return "DDERR_INVALIDSURFACETYPE"; + case DDERR_DCALREADYCREATED: return "DDERR_DCALREADYCREATED"; + case DDERR_CANTPAGELOCK: return "DDERR_CANTPAGELOCK"; + case DDERR_CANTPAGEUNLOCK: return "DDERR_CANTPAGEUNLOCK"; + case DDERR_NOTPAGELOCKED: return "DDERR_NOTPAGELOCKED"; + case DDERR_NOTINITIALIZED: return "DDERR_NOTINITIALIZED"; + } + return "Unknown Error"; +} + Property changes on: trunk/rosapps/demos/ddraw/main.cpp ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/rosapps/demos/ddraw/main.h --- trunk/rosapps/demos/ddraw/main.h 2005-08-07 10:08:25 UTC (rev 17154) +++ trunk/rosapps/demos/ddraw/main.h 2005-08-07 10:13:46 UTC (rev 17155) @@ -0,0 +1,13 @@ + +LPDIRECTDRAW7 pDD; +LPDIRECTDRAWSURFACE7 lpddsPrimary; //, lpddsBack; +HRESULT ddrval; +HWND hwnd; + +bool running, fullscreen; + +void ddRelease (); +char* DDErrorString (HRESULT hr); +LONG WINAPI WndProc (HWND hwnd, UINT message, UINT wParam, LONG lParam); + +extern "C" bool HookAPICalls(); Property changes on: trunk/rosapps/demos/ddraw/main.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/rosapps/demos/directory.xml --- trunk/rosapps/demos/directory.xml 2005-08-07 10:08:25 UTC (rev 17154) +++ trunk/rosapps/demos/directory.xml 2005-08-07 10:13:46 UTC (rev 17155) @@ -1,3 +1,7 @@ <directory name="maze"> <xi:include href="maze/maze.xml" /> -</directory> \ No newline at end of file +</directory> + +<directory name="ddraw"> + <xi:include href="ddraw/ddraw.xml" /> +</directory>

1 0

[navaraf] 17154: Fix mutex unlocking in NpfsWaiterThread and add ASSERT.
by navaraf＠svn.reactos.com 07 Aug '05

07 Aug '05

Fix mutex unlocking in NpfsWaiterThread and add ASSERT. Modified: trunk/reactos/drivers/fs/np/rw.c _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2005-08-07 09:55:54 UTC (rev 17153) +++ trunk/reactos/drivers/fs/np/rw.c 2005-08-07 10:08:25 UTC (rev 17154) @@ -184,6 +184,7 @@ ThreadContext->Count++; ThreadContext->DeviceExt->EmptyWaiterCount--; } + KeUnlockMutex(&ThreadContext->DeviceExt->PipeListLock); break; default: KEBUGCHECK(0); @@ -204,7 +205,6 @@ Terminate = TRUE; } } - KeUnlockMutex(&ThreadContext->DeviceExt->PipeListLock); ExFreePool(ThreadContext); } @@ -400,6 +400,7 @@ { if (Fcb->PipeState == FILE_PIPE_CONNECTED_STATE) { + ASSERT(Fcb->OtherSide != NULL); KeSetEvent(&Fcb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); } if (Information > 0 &&

1 0

[weiden] 17153: SVN maintainance
by weiden＠svn.reactos.com 07 Aug '05

07 Aug '05

SVN maintainance Property changes on: trunk/reactos/regtests/winetests/gdi32 ___________________________________________________________________ Name: svn:ignore + temp.exp *.d *.a *.o *.dll *.coff *.sym *.tmp *.gch *.pch *.map makefile Property changes on: trunk/reactos/regtests/winetests/kernel32 ___________________________________________________________________ Name: svn:ignore + temp.exp *.d *.a *.o *.dll *.coff *.sym *.tmp *.gch *.pch *.map makefile Property changes on: trunk/reactos/regtests/winetests/ntdll ___________________________________________________________________ Name: svn:ignore + temp.exp *.d *.a *.o *.dll *.coff *.sym *.tmp *.gch *.pch *.map makefile Property changes on: trunk/reactos/regtests/winetests/psapi ___________________________________________________________________ Name: svn:ignore - *.o *.a *.exe *.map *.sym + temp.exp *.d *.a *.o *.dll *.coff *.sym *.tmp *.gch *.pch *.map makefile Property changes on: trunk/reactos/regtests/winetests/shlwapi ___________________________________________________________________ Name: svn:ignore + temp.exp *.d *.a *.o *.dll *.coff *.sym *.tmp *.gch *.pch *.map makefile Property changes on: trunk/reactos/regtests/winetests/shlwapi/shlwapi_test.xml ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/reactos/regtests/winetests/user32 ___________________________________________________________________ Name: svn:ignore + temp.exp *.d *.a *.o *.dll *.coff *.sym *.tmp *.gch *.pch *.map makefile

1 0

[weiden] 17152: fixed uninitialized variable warning
by weiden＠svn.reactos.com 07 Aug '05

07 Aug '05

fixed uninitialized variable warning Modified: trunk/reactos/subsys/csrss/win32csr/conio.c _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-08-07 09:48:38 UTC (rev 17151) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-08-07 09:55:08 UTC (rev 17152) @@ -1545,7 +1545,7 @@ CSR_API(CsrWriteConsoleOutputChar) { NTSTATUS Status; - PCHAR tmpString, String; + PCHAR String; PBYTE Buffer; PCSRSS_CONSOLE Console; PCSRSS_SCREEN_BUFFER Buff; @@ -1577,7 +1577,7 @@ (PWCHAR)Request->Data.WriteConsoleOutputCharRequest.String, Request->Data.WriteConsoleOutputCharRequest.Length, NULL, 0, NULL, NULL); - tmpString = String = RtlAllocateHeap(GetProcessHeap(), 0, Length); + String = RtlAllocateHeap(GetProcessHeap(), 0, Length); if (String) { WideCharToMultiByte(Console->CodePage, 0, @@ -1635,7 +1635,7 @@ } if (Request->Data.WriteConsoleRequest.Unicode) { - RtlFreeHeap(GetProcessHeap(), 0, tmpString); + RtlFreeHeap(GetProcessHeap(), 0, String); } } if (NULL != Console)

1 0

[weiden] 17151: fixed uninitialized variables warnings
by weiden＠svn.reactos.com 07 Aug '05

07 Aug '05

fixed uninitialized variables warnings Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-08-07 09:40:00 UTC (rev 17150) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-08-07 09:48:38 UTC (rev 17151) @@ -567,10 +567,10 @@ /* Class 5 - Process Information */ QSI_DEF(SystemProcessInformation) { - ULONG ovlSize=0, nThreads; - PEPROCESS pr, syspr; + ULONG ovlSize = 0, nThreads; + PEPROCESS pr = NULL, syspr; unsigned char *pCur; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; _SEH_TRY {

1 0

[ion] 17150: Fix NtSignalAndwaitForSingleObject: Use SEH when appropriate, use direct Mutant release call, query handle info and write fixmes when permission checking needed, optimize failure cases, fix horrid tab/space formatting mismatches
by ion＠svn.reactos.com 07 Aug '05

07 Aug '05

Fix NtSignalAndwaitForSingleObject: Use SEH when appropriate, use direct Mutant release call, query handle info and write fixmes when permission checking needed, optimize failure cases, fix horrid tab/space formatting mismatches Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/ntoskrnl/ob/wait.c _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-08-07 09:24:10 UTC (rev 17149) +++ trunk/reactos/include/ndk/extypes.h 2005-08-07 09:40:00 UTC (rev 17150) @@ -22,6 +22,9 @@ #define INVALID_HANDLE_VALUE (HANDLE)-1 +/* Increments */ +#define MUTANT_INCREMENT 1 + /* Callback Object Access Rights */ #define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x0001) #define CALLBACK_EXECUTE (STANDARD_RIGHTS_EXECUTE|SYNCHRONIZE|0x0001) _____ Modified: trunk/reactos/ntoskrnl/ob/wait.c --- trunk/reactos/ntoskrnl/ob/wait.c 2005-08-07 09:24:10 UTC (rev 17149) +++ trunk/reactos/ntoskrnl/ob/wait.c 2005-08-07 09:40:00 UTC (rev 17150) @@ -196,105 +196,135 @@ } -NTSTATUS STDCALL +NTSTATUS +STDCALL NtSignalAndWaitForSingleObject(IN HANDLE ObjectHandleToSignal, - IN HANDLE WaitableObjectHandle, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER TimeOut OPTIONAL) + IN HANDLE WaitableObjectHandle, + IN BOOLEAN Alertable, + IN PLARGE_INTEGER TimeOut OPTIONAL) { - KPROCESSOR_MODE PreviousMode; - DISPATCHER_HEADER* hdr; - PVOID SignalObj; - PVOID WaitObj; - LARGE_INTEGER SafeTimeOut; - NTSTATUS Status = STATUS_SUCCESS; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PDISPATCHER_HEADER Header; + PVOID SignalObj; + PVOID WaitObj; + LARGE_INTEGER SafeTimeOut; + OBJECT_HANDLE_INFORMATION HandleInfo; + NTSTATUS Status = STATUS_SUCCESS; - PreviousMode = ExGetPreviousMode(); + /* Capture timeout */ + if(!TimeOut && PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForRead(TimeOut, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + /* Make a copy on the stack */ + SafeTimeOut = *TimeOut; + TimeOut = &SafeTimeOut; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - if(TimeOut != NULL && PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForRead(TimeOut, - sizeof(LARGE_INTEGER), - sizeof(ULONG)); - /* make a copy on the stack */ - SafeTimeOut = *TimeOut; - TimeOut = &SafeTimeOut; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + if(!NT_SUCCESS(Status)) return Status; + } - if(!NT_SUCCESS(Status)) - { - return Status; - } - } + /* Start by getting the signal object*/ + Status = ObReferenceObjectByHandle(ObjectHandleToSignal, + 0, + NULL, + PreviousMode, + &SignalObj, + &HandleInfo); + if (!NT_SUCCESS(Status)) + { + return Status; + } - Status = ObReferenceObjectByHandle(ObjectHandleToSignal, - 0, - NULL, - PreviousMode, - &SignalObj, - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } + /* Now get the wait object */ + Status = ObReferenceObjectByHandle(WaitableObjectHandle, + SYNCHRONIZE, + NULL, + PreviousMode, + &WaitObj, + NULL); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(SignalObj); + return Status; + } - Status = ObReferenceObjectByHandle(WaitableObjectHandle, - SYNCHRONIZE, - NULL, - PreviousMode, - &WaitObj, - NULL); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(SignalObj); - return Status; - } + /* FIXME: Use DefaultObject from ObjectHeader */ + Header = (PDISPATCHER_HEADER)SignalObj; + + /* Check dispatcher type */ + /* FIXME: Check Object Type instead! */ + switch (Header->Type) + { + case EventNotificationObject: + case EventSynchronizationObject: + /* Set the Event */ + /* FIXME: Check permissions */ + KeSetEvent(SignalObj, EVENT_INCREMENT, TRUE); + break; - hdr = (DISPATCHER_HEADER *)SignalObj; - switch (hdr->Type) - { - case EventNotificationObject: - case EventSynchronizationObject: - KeSetEvent(SignalObj, - EVENT_INCREMENT, - TRUE); - break; + case MutantObject: + /* Release the Mutant. This can raise an exception*/ + _SEH_TRY + { + KeReleaseMutant(SignalObj, MUTANT_INCREMENT, FALSE, TRUE); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + goto Quickie; + } + _SEH_END; + break; - case MutantObject: - KeReleaseMutex(SignalObj, - TRUE); - break; + case SemaphoreObject: + /* Release the Semaphore. This can raise an exception*/ + /* FIXME: Check permissions */ + _SEH_TRY + { + KeReleaseSemaphore(SignalObj, SEMAPHORE_INCREMENT, 1, TRUE); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + goto Quickie; + } + _SEH_END; + break; - case SemaphoreObject: - KeReleaseSemaphore(SignalObj, - SEMAPHORE_INCREMENT, - 1, - TRUE); - break; + default: + Status = STATUS_OBJECT_TYPE_MISMATCH; + goto Quickie; + } - default: - ObDereferenceObject(SignalObj); - ObDereferenceObject(WaitObj); - return STATUS_OBJECT_TYPE_MISMATCH; - } + /* Now wait. Also SEH this since it can also raise an exception */ + _SEH_TRY + { + Status = KeWaitForSingleObject(WaitObj, + UserRequest, + PreviousMode, + Alertable, + TimeOut); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - Status = KeWaitForSingleObject(WaitObj, - UserRequest, - PreviousMode, - Alertable, - TimeOut); - - ObDereferenceObject(SignalObj); - ObDereferenceObject(WaitObj); - - return Status; + /* We're done here */ +Quickie: + ObDereferenceObject(SignalObj); + ObDereferenceObject(WaitObj); + return Status; } /* EOF */

1 0

[weiden] 17149: added a newline at the end of the file to fix a warning
by weiden＠svn.reactos.com 07 Aug '05

07 Aug '05

added a newline at the end of the file to fix a warning Modified: trunk/reactos/lib/kbdbe/kbdbe.rc _____ Modified: trunk/reactos/lib/kbdbe/kbdbe.rc --- trunk/reactos/lib/kbdbe/kbdbe.rc 2005-08-07 09:12:10 UTC (rev 17148) +++ trunk/reactos/lib/kbdbe/kbdbe.rc 2005-08-07 09:24:10 UTC (rev 17149) @@ -2,4 +2,5 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Belgian Keyboard Layout\0" #define REACTOS_STR_INTERNAL_NAME "kbdbe\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdbe.dll\0" -#include <reactos/version.rc> \ No newline at end of file +#include <reactos/version.rc> +

1 0

[navaraf] 17148: - Fix size check in SystemBasicInformation and SystemTimeOfDayInformation.
by navaraf＠svn.reactos.com 07 Aug '05

07 Aug '05

- Fix size check in SystemBasicInformation and SystemTimeOfDayInformation. - Add SEH protection to SystemProcessInformation. - Implement SystemKernelDebuggerInformation. - Fix returning of ResultLength in NtQuerySystemInformation. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-08-07 09:03:35 UTC (rev 17147) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-08-07 09:12:10 UTC (rev 17148) @@ -57,7 +57,7 @@ TotalTime = Prcb->KernelTime + Prcb->UserTime; if (TotalTime != 0) *CpuUsage = 100 - (ScaledIdle / TotalTime); - else + else *CpuUsage = 0; } @@ -360,7 +360,7 @@ /* * Check user buffer's size */ - if (Size < sizeof (SYSTEM_BASIC_INFORMATION)) + if (Size != sizeof (SYSTEM_BASIC_INFORMATION)) { return (STATUS_INFO_LENGTH_MISMATCH); } @@ -539,7 +539,7 @@ *ReqSize = sizeof (SYSTEM_TIMEOFDAY_INFORMATION); /* Check user buffer's size */ - if (Size < sizeof (SYSTEM_TIMEOFDAY_INFORMATION)) + if (Size != sizeof (SYSTEM_TIMEOFDAY_INFORMATION)) { return STATUS_INFO_LENGTH_MISMATCH; } @@ -570,131 +570,141 @@ ULONG ovlSize=0, nThreads; PEPROCESS pr, syspr; unsigned char *pCur; + NTSTATUS Status; - /* scan the process list */ - - PSYSTEM_PROCESS_INFORMATION Spi - = (PSYSTEM_PROCESS_INFORMATION) Buffer; - - *ReqSize = sizeof(SYSTEM_PROCESS_INFORMATION); - - if (Size < sizeof(SYSTEM_PROCESS_INFORMATION)) + _SEH_TRY { - return (STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small - } + /* scan the process list */ - syspr = PsGetNextProcess(NULL); - pr = syspr; - pCur = (unsigned char *)Spi; + PSYSTEM_PROCESS_INFORMATION Spi + = (PSYSTEM_PROCESS_INFORMATION) Buffer; - do - { - PSYSTEM_PROCESS_INFORMATION SpiCur; - int curSize, i = 0; - ANSI_STRING imgName; - int inLen=32; // image name len in bytes - PLIST_ENTRY current_entry; - PETHREAD current; + *ReqSize = sizeof(SYSTEM_PROCESS_INFORMATION); - SpiCur = (PSYSTEM_PROCESS_INFORMATION)pCur; - - nThreads = 0; - current_entry = pr->ThreadListHead.Flink; - while (current_entry != &pr->ThreadListHead) + if (Size < sizeof(SYSTEM_PROCESS_INFORMATION)) { - nThreads++; - current_entry = current_entry->Flink; + return (STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small } - // size of the structure for every process - curSize = sizeof(SYSTEM_PROCESS_INFORMATION)-sizeof(SYSTEM_THREAD_INFORMATION)+siz eof(SYSTEM_THREAD_INFORMATION)*nThreads; - ovlSize += curSize+inLen; + syspr = PsGetNextProcess(NULL); + pr = syspr; + pCur = (unsigned char *)Spi; - if (ovlSize > Size) + do { - *ReqSize = ovlSize; - ObDereferenceObject(pr); + PSYSTEM_PROCESS_INFORMATION SpiCur; + int curSize, i = 0; + ANSI_STRING imgName; + int inLen=32; // image name len in bytes + PLIST_ENTRY current_entry; + PETHREAD current; - return (STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small - } + SpiCur = (PSYSTEM_PROCESS_INFORMATION)pCur; - // fill system information - SpiCur->NextEntryOffset = curSize+inLen; // relative offset to the beginnnig of the next structure - SpiCur->NumberOfThreads = nThreads; - SpiCur->CreateTime = pr->CreateTime; - SpiCur->UserTime.QuadPart = pr->Pcb.UserTime * 100000LL; - SpiCur->KernelTime.QuadPart = pr->Pcb.KernelTime * 100000LL; - SpiCur->ImageName.Length = strlen(pr->ImageFileName) * sizeof(WCHAR); - SpiCur->ImageName.MaximumLength = inLen; - SpiCur->ImageName.Buffer = (void*)(pCur+curSize); + nThreads = 0; + current_entry = pr->ThreadListHead.Flink; + while (current_entry != &pr->ThreadListHead) + { + nThreads++; + current_entry = current_entry->Flink; + } - // copy name to the end of the struct - if(pr != PsIdleProcess) - { - RtlInitAnsiString(&imgName, pr->ImageFileName); - RtlAnsiStringToUnicodeString(&SpiCur->ImageName, &imgName, FALSE); - } - else - { - RtlInitUnicodeString(&SpiCur->ImageName, NULL); - } + // size of the structure for every process + curSize = sizeof(SYSTEM_PROCESS_INFORMATION)-sizeof(SYSTEM_THREAD_INFORMATION)+siz eof(SYSTEM_THREAD_INFORMATION)*nThreads; + ovlSize += curSize+inLen; - SpiCur->BasePriority = pr->Pcb.BasePriority; - SpiCur->UniqueProcessId = pr->UniqueProcessId; - SpiCur->InheritedFromUniqueProcessId = pr->InheritedFromUniqueProcessId; - SpiCur->HandleCount = (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0); - SpiCur->PeakVirtualSize = pr->PeakVirtualSize; - SpiCur->VirtualSize = pr->VirtualSize; - SpiCur->PageFaultCount = pr->Vm.PageFaultCount; - SpiCur->PeakWorkingSetSize = pr->Vm.PeakWorkingSetSize; // Is this right using ->Vm. here ? - SpiCur->WorkingSetSize = pr->Vm.WorkingSetSize; // Is this right using ->Vm. here ? - SpiCur->QuotaPeakPagedPoolUsage = pr->QuotaPeak[0]; - SpiCur->QuotaPagedPoolUsage = pr->QuotaUsage[0]; - SpiCur->QuotaPeakNonPagedPoolUsage = pr->QuotaPeak[1]; - SpiCur->QuotaNonPagedPoolUsage = pr->QuotaUsage[1]; - SpiCur->PagefileUsage = pr->QuotaUsage[3]; - SpiCur->PeakPagefileUsage = pr->QuotaPeak[3]; - SpiCur->PrivateUsage = pr->CommitCharge; + if (ovlSize > Size) + { + *ReqSize = ovlSize; + ObDereferenceObject(pr); - current_entry = pr->ThreadListHead.Flink; - while (current_entry != &pr->ThreadListHead) - { - current = CONTAINING_RECORD(current_entry, ETHREAD, - ThreadListEntry); + return (STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small + } - SpiCur->TH[i].KernelTime.QuadPart = current->Tcb.KernelTime * 100000LL; - SpiCur->TH[i].UserTime.QuadPart = current->Tcb.UserTime * 100000LL; -// SpiCur->TH[i].CreateTime = current->CreateTime; - SpiCur->TH[i].WaitTime = current->Tcb.WaitTime; - SpiCur->TH[i].StartAddress = (PVOID) current->StartAddress; - SpiCur->TH[i].ClientId = current->Cid; - SpiCur->TH[i].Priority = current->Tcb.Priority; - SpiCur->TH[i].BasePriority = current->Tcb.BasePriority; - SpiCur->TH[i].ContextSwitches = current->Tcb.ContextSwitches; - SpiCur->TH[i].ThreadState = current->Tcb.State; - SpiCur->TH[i].WaitReason = current->Tcb.WaitReason; - i++; - current_entry = current_entry->Flink; - } + // fill system information + SpiCur->NextEntryOffset = curSize+inLen; // relative offset to the beginnnig of the next structure + SpiCur->NumberOfThreads = nThreads; + SpiCur->CreateTime = pr->CreateTime; + SpiCur->UserTime.QuadPart = pr->Pcb.UserTime * 100000LL; + SpiCur->KernelTime.QuadPart = pr->Pcb.KernelTime * 100000LL; + SpiCur->ImageName.Length = strlen(pr->ImageFileName) * sizeof(WCHAR); + SpiCur->ImageName.MaximumLength = inLen; + SpiCur->ImageName.Buffer = (void*)(pCur+curSize); - pr = PsGetNextProcess(pr); - nThreads = 0; - if ((pr == syspr) || (pr == NULL)) - { - SpiCur->NextEntryOffset = 0; - break; - } - else - pCur = pCur + curSize + inLen; - } while ((pr != syspr) && (pr != NULL)); + // copy name to the end of the struct + if(pr != PsIdleProcess) + { + RtlInitAnsiString(&imgName, pr->ImageFileName); + RtlAnsiStringToUnicodeString(&SpiCur->ImageName, &imgName, FALSE); + } + else + { + RtlInitUnicodeString(&SpiCur->ImageName, NULL); + } - if(pr != NULL) + SpiCur->BasePriority = pr->Pcb.BasePriority; + SpiCur->UniqueProcessId = pr->UniqueProcessId; + SpiCur->InheritedFromUniqueProcessId = pr->InheritedFromUniqueProcessId; + SpiCur->HandleCount = (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0); + SpiCur->PeakVirtualSize = pr->PeakVirtualSize; + SpiCur->VirtualSize = pr->VirtualSize; + SpiCur->PageFaultCount = pr->Vm.PageFaultCount; + SpiCur->PeakWorkingSetSize = pr->Vm.PeakWorkingSetSize; + SpiCur->WorkingSetSize = pr->Vm.WorkingSetSize; + SpiCur->QuotaPeakPagedPoolUsage = pr->QuotaPeak[0]; + SpiCur->QuotaPagedPoolUsage = pr->QuotaUsage[0]; + SpiCur->QuotaPeakNonPagedPoolUsage = pr->QuotaPeak[1]; + SpiCur->QuotaNonPagedPoolUsage = pr->QuotaUsage[1]; + SpiCur->PagefileUsage = pr->QuotaUsage[3]; + SpiCur->PeakPagefileUsage = pr->QuotaPeak[3]; + SpiCur->PrivateUsage = pr->CommitCharge; + + current_entry = pr->ThreadListHead.Flink; + while (current_entry != &pr->ThreadListHead) + { + current = CONTAINING_RECORD(current_entry, ETHREAD, + ThreadListEntry); + + SpiCur->TH[i].KernelTime.QuadPart = current->Tcb.KernelTime * 100000LL; + SpiCur->TH[i].UserTime.QuadPart = current->Tcb.UserTime * 100000LL; +// SpiCur->TH[i].CreateTime = current->CreateTime; + SpiCur->TH[i].WaitTime = current->Tcb.WaitTime; + SpiCur->TH[i].StartAddress = (PVOID) current->StartAddress; + SpiCur->TH[i].ClientId = current->Cid; + SpiCur->TH[i].Priority = current->Tcb.Priority; + SpiCur->TH[i].BasePriority = current->Tcb.BasePriority; + SpiCur->TH[i].ContextSwitches = current->Tcb.ContextSwitches; + SpiCur->TH[i].ThreadState = current->Tcb.State; + SpiCur->TH[i].WaitReason = current->Tcb.WaitReason; + i++; + current_entry = current_entry->Flink; + } + + pr = PsGetNextProcess(pr); + nThreads = 0; + if ((pr == syspr) || (pr == NULL)) + { + SpiCur->NextEntryOffset = 0; + break; + } + else + pCur = pCur + curSize + inLen; + } while ((pr != syspr) && (pr != NULL)); + + if(pr != NULL) + ObDereferenceObject(pr); + Status = STATUS_SUCCESS; + } + _SEH_HANDLE { - ObDereferenceObject(pr); + if(pr != NULL) + ObDereferenceObject(pr); + Status = _SEH_GetExceptionCode(); } + _SEH_END *ReqSize = ovlSize; - return (STATUS_SUCCESS); + return Status; } /* Class 6 - Call Count Information */ @@ -1213,9 +1223,18 @@ /* Class 35 - Kernel Debugger Information */ QSI_DEF(SystemKernelDebuggerInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemKernelDebuggerInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + PSYSTEM_KERNEL_DEBUGGER_INFORMATION skdi = (PSYSTEM_KERNEL_DEBUGGER_INFORMATION) Buffer; + + *ReqSize = sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION); + if (Size < sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + skdi->KernelDebuggerEnabled = KD_DEBUGGER_ENABLED; + skdi->KernelDebuggerNotPresent = KD_DEBUGGER_NOT_PRESENT; + + return STATUS_SUCCESS; } /* Class 36 - Context Switch Information */ @@ -1551,11 +1570,10 @@ FStatus = CallQS [SystemInformationClass].Query(SystemInformation, Length, &ResultLength); - if (NT_SUCCESS(FStatus) && UnsafeResultLength != NULL) + if (UnsafeResultLength != NULL) { if (PreviousMode != KernelMode) { - FStatus = STATUS_SUCCESS; _SEH_TRY { *UnsafeResultLength = ResultLength;

1 0

[ekohl] 17147: Fix CM_Get_Registry_Property_ExW.
by ekohl＠svn.reactos.com 07 Aug '05

07 Aug '05

Fix CM_Get_Registry_Property_ExW. Implement CM_Set_Registry_Property_ExA. Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-08-07 08:06:56 UTC (rev 17146) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-08-07 09:03:35 UTC (rev 17147) @@ -148,7 +148,6 @@ ULONG ulClassIndex, LPGUID ClassGuid, ULONG ulFlags) { TRACE("%lx %p %lx\n", ulClassIndex, ClassGuid, ulFlags); - return CM_Enumerate_Classes_Ex(ulClassIndex, ClassGuid, ulFlags, NULL); } @@ -192,10 +191,16 @@ { HKEY hRelativeKey, hKey; DWORD rc; - WCHAR Buffer[39]; + WCHAR Buffer[MAX_GUID_STRING_LEN]; TRACE("%lx %p %lx %p\n", ulClassIndex, ClassGuid, ulFlags, hMachine); + if (ClassGuid == NULL) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + if (hMachine != NULL) { FIXME("hMachine argument ignored\n"); @@ -224,7 +229,7 @@ if (rc == ERROR_SUCCESS) { /* Remove the {} */ - Buffer[37] = UNICODE_NULL; + Buffer[MAX_GUID_STRING_LEN - 2] = UNICODE_NULL; /* Convert the buffer to a GUID */ if (UuidFromStringW(&Buffer[1], ClassGuid) != RPC_S_OK) return CR_FAILURE; @@ -476,6 +481,7 @@ if (lpDevInst == NULL) return CR_INVALID_DEVNODE; + ulTransferLength = *pulLength; ret = PNP_GetDeviceRegProp(BindingHandle, lpDevInst, ulProperty, @@ -1332,9 +1338,129 @@ DEVINST dnDevInst, ULONG ulProperty, PCVOID Buffer, ULONG ulLength, ULONG ulFlags, HMACHINE hMachine) { + CONFIGRET ret = CR_SUCCESS; + LPWSTR lpBuffer; + ULONG ulType; + FIXME("%lx %lu %p %lx %lx %lx\n", dnDevInst, ulProperty, Buffer, ulLength, ulFlags, hMachine); - return CR_CALL_NOT_IMPLEMENTED; + + if (Buffer == NULL && ulLength != 0) + return CR_INVALID_POINTER; + + if (Buffer == NULL) + { + ret = CM_Set_DevNode_Registry_Property_ExW(dnDevInst, + ulProperty, + NULL, + 0, + ulFlags, + hMachine); + } + else + { + /* Get property type */ + switch (ulProperty) + { + case CM_DRP_DEVICEDESC: + ulType = REG_SZ; + break; + + case CM_DRP_HARDWAREID: + ulType = REG_MULTI_SZ; + break; + + case CM_DRP_COMPATIBLEIDS: + ulType = REG_MULTI_SZ; + break; + + case CM_DRP_SERVICE: + ulType = REG_SZ; + break; + + case CM_DRP_CLASS: + ulType = REG_SZ; + break; + + case CM_DRP_CLASSGUID: + ulType = REG_SZ; + break; + + case CM_DRP_DRIVER: + ulType = REG_SZ; + break; + + case CM_DRP_CONFIGFLAGS: + ulType = REG_DWORD; + break; + + case CM_DRP_MFG: + ulType = REG_SZ; + break; + + case CM_DRP_FRIENDLYNAME: + ulType = REG_SZ; + break; + + case CM_DRP_LOCATION_INFORMATION: + ulType = REG_SZ; + break; + + case CM_DRP_UPPERFILTERS: + ulType = REG_MULTI_SZ; + break; + + case CM_DRP_LOWERFILTERS: + ulType = REG_MULTI_SZ; + break; + + default: + return CR_INVALID_PROPERTY; + } + + /* Allocate buffer if needed */ + if (ulType == REG_SZ || + ulType == REG_MULTI_SZ) + { + lpBuffer = MyMalloc(ulLength * sizeof(WCHAR)); + if (lpBuffer == NULL) + { + ret = CR_OUT_OF_MEMORY; + } + else + { + if (!MultiByteToWideChar(CP_ACP, 0, Buffer, + ulLength, lpBuffer, ulLength)) + { + MyFree(lpBuffer); + ret = CR_FAILURE; + } + else + { + ret = CM_Set_DevNode_Registry_Property_ExW(dnDevInst, + ulProperty, + lpBuffer, + ulLength * sizeof(WCHAR), + ulFlags, + hMachine); + MyFree(lpBuffer); + } + } + } + else + { + ret = CM_Set_DevNode_Registry_Property_ExW(dnDevInst, + ulProperty, + Buffer, + ulLength, + ulFlags, + hMachine); + } + + ret = CR_CALL_NOT_IMPLEMENTED; + } + + return ret; } @@ -1350,7 +1476,7 @@ LPWSTR lpDevInst; ULONG ulType; - FIXME("%lx %lu %p %lx %lx %lx\n", + TRACE("%lx %lu %p %lx %lx %lx\n", dnDevInst, ulProperty, Buffer, ulLength, ulFlags, hMachine); if (dnDevInst == 0) _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-08-07 08:06:56 UTC (rev 17146) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-08-07 09:03:35 UTC (rev 17147) @@ -457,11 +457,13 @@ unsigned long *Length, DWORD Flags) { + PLUGPLAY_CONTROL_PROPERTY_DATA PlugPlayData; CONFIGRET ret = CR_SUCCESS; LPWSTR lpValueName = NULL; - ULONG Data; + HKEY hKey = 0; + NTSTATUS Status; - DPRINT1("PNP_GetDeviceRegProp() called\n"); + DPRINT("PNP_GetDeviceRegProp() called\n"); switch (Property) { @@ -518,6 +520,7 @@ break; case CM_DRP_UI_NUMBER: + lpValueName = NULL; break; case CM_DRP_UPPERFILTERS: @@ -529,41 +532,104 @@ break; case CM_DRP_BUSTYPEGUID: + lpValueName = NULL; break; case CM_DRP_LEGACYBUSTYPE: + lpValueName = NULL; break; case CM_DRP_BUSNUMBER: + lpValueName = NULL; break; case CM_DRP_ENUMERATOR_NAME: + lpValueName = NULL; break; default: return CR_INVALID_PROPERTY; } - DPRINT1("Value name: %S\n", lpValueName); + DPRINT("Value name: %S\n", lpValueName); if (lpValueName) { /* Retrieve information from the Registry */ + if (RegOpenKeyExW(hEnumKey, + DeviceInstance, + 0, + KEY_ALL_ACCESS, + &hKey)) + return CR_INVALID_DEVNODE; + if (RegQueryValueExW(hKey, + lpValueName, + NULL, + DataType, + (LPBYTE)Buffer, + Length)) + ret = CR_REGISTRY_ERROR; + + /* FIXME: Check buffer size */ + + RegCloseKey(hKey); } else { /* Retrieve information from the Device Node */ + RtlInitUnicodeString(&PlugPlayData.DeviceInstance, + DeviceInstance); + PlugPlayData.Buffer = Buffer; + PlugPlayData.BufferSize = *TransferLen; - } + switch (Property) + { +#if 0 + case CM_DRP_PHYSICAL_DEVICE_OBJECT_NAME: + PlugPlayData.Property = DevicePropertyPhysicalDeviceObjectName; + break; + case CM_DRP_UI_NUMBER: + PlugPlayData.Property = DevicePropertyUINumber; + break; - Data = 0xbaadf00d; - memcpy(Buffer, &Data, sizeof(ULONG)); - *Length = sizeof(ULONG); + case CM_DRP_BUSTYPEGUID: + PlugPlayData.Property = DevicePropertyBusTypeGuid; + break; - DPRINT1("PNP_GetDeviceRegProp() done (returns %lx)\n", ret); + case CM_DRP_LEGACYBUSTYPE: + PlugPlayData.Property = DevicePropertyLegacyBusType; + break; + case CM_DRP_BUSNUMBER: + PlugPlayData.Property = DevicePropertyBusNumber; + break; + + case CM_DRP_ENUMERATOR_NAME: + PlugPlayData.Property = DevicePropertyEnumeratorName; + break; +#endif + + default: + return CR_INVALID_PROPERTY; + } + + Status = NtPlugPlayControl(PlugPlayControlProperty, + (PVOID)&PlugPlayData, + sizeof(PLUGPLAY_CONTROL_PROPERTY_DATA)); + if (NT_SUCCESS(Status)) + { + *Length = PlugPlayData.BufferSize; + } + else + { + ret = CR_FAILURE; /* FIXME */ + } + } + + DPRINT("PNP_GetDeviceRegProp() done (returns %lx)\n", ret); + return ret; }

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