Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[ekohl] 17158: Support size_is(*Length) attributes for strings.

by ekohl＠svn.reactos.com

Support size_is(*Length) attributes for strings. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-08-07 11:25:36 UTC (rev 17157) +++ trunk/reactos/tools/widl/ChangeLog 2005-08-07 11:44:41 UTC (rev 17158) @@ -1,5 +1,11 @@ ChangeLog +2005-08-07 ekohl + + tools/widl/server.c + +- Support size_is(*Length) attributes for strings. + 2005-07-30 ekohl tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-08-07 11:25:36 UTC (rev 17157) +++ trunk/reactos/tools/widl/server.c 2005-08-07 11:44:41 UTC (rev 17158) @@ -833,7 +833,11 @@ var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR) { - print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name); + if (((var_t *)sizeis_attr)->ptr_level == 0) + print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name); + else + print_server("_StubMsg.MaxCount = %s ? *%s : 0;\n", + ((var_t *)sizeis_attr)->name, ((var_t *)sizeis_attr)->name); fprintf(server, "\n"); print_server("NdrConformantStringBufferSize(\n"); indent++; @@ -1232,7 +1236,11 @@ if (string_attr) { fprintf(server, "\n"); - print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name); + if (((var_t *)sizeis_attr)->ptr_level == 0) + print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name); + else + print_server("_StubMsg.MaxCount = %s ? *%s : 0;\n", + ((var_t *)sizeis_attr)->name, ((var_t *)sizeis_attr)->name); fprintf(server, "\n"); print_server("NdrConformantStringMarshall(\n"); indent++; @@ -1452,7 +1460,11 @@ indent++; if (string_attr) { - print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name); + if (((var_t *)sizeis_attr)->ptr_level == 0) + print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name); + else + print_server("_StubMsg.MaxCount = %s ? *%s : 0;\n", + ((var_t *)sizeis_attr)->name, ((var_t *)sizeis_attr)->name); fprintf(server, "\n"); print_server("NdrPointerFree(\n"); indent++;

19 years, 1 month

[navaraf] 17157: Readd check that I accidently removed.

by navaraf＠svn.reactos.com

Readd check that I accidently removed. 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 10:56:57 UTC (rev 17156) +++ trunk/reactos/drivers/fs/np/rw.c 2005-08-07 11:25:36 UTC (rev 17157) @@ -411,6 +411,12 @@ ASSERT(Fcb->OtherSide != NULL); KeSetEvent(&Fcb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); + if (Information > 0 && + Fcb->Pipe->ReadMode != FILE_PIPE_BYTE_STREAM_MODE) + { + break; + } + ExReleaseFastMutex(&Fcb->DataListLock); if (IoIsOperationSynchronous(Irp)) {

19 years, 1 month

[navaraf] 17156: Correctly set internal state in NpfsDisconnectPipe and fix some return values in NpfsRead.

by navaraf＠svn.reactos.com

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)) {

19 years, 1 month

[mbosma] 17155: A simple test app for DirectDraw.

by mbosma＠svn.reactos.com

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>

19 years, 1 month

[navaraf] 17154: Fix mutex unlocking in NpfsWaiterThread and add ASSERT.

by navaraf＠svn.reactos.com

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 &&

19 years, 1 month

[weiden] 17153: SVN maintainance

by weiden＠svn.reactos.com

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

19 years, 1 month

[weiden] 17152: fixed uninitialized variable warning

by weiden＠svn.reactos.com

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)

19 years, 1 month

[weiden] 17151: fixed uninitialized variables warnings

by weiden＠svn.reactos.com

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 {

19 years, 1 month

[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

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 */

19 years, 1 month

[weiden] 17149: added a newline at the end of the file to fix a warning

by weiden＠svn.reactos.com

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> +

19 years, 1 month

← Newer
1
...
42
43
44
45
46
47
48
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005