Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 27183: Fixing some bugs in startup.c 1. check for DDHALINFO_GETDRIVERINFOSET before using of DdGetDriverInfo, it exists two diffent version of DdGetDriverInfo2 2. Adding a fixme for fixing CreateSurfaceEx, GetDriverState and DestroyDDLocal callbacks for HAL, and adding partly code in the fixme.
by greatlrd＠svn.reactos.org 15 Jun '07

15 Jun '07

Author: greatlrd Date: Fri Jun 15 13:54:52 2007 New Revision: 27183 URL: http://svn.reactos.org/svn/reactos?rev=27183&view=rev Log: Fixing some bugs in startup.c 1. check for DDHALINFO_GETDRIVERINFOSET before using of DdGetDriverInfo, it exists two diffent version of DdGetDriverInfo2 2. Adding a fixme for fixing CreateSurfaceEx, GetDriverState and DestroyDDLocal callbacks for HAL, and adding partly code in the fixme. Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Fri Jun 15 13:54:52 2007 @@ -532,22 +532,57 @@ // DxHeapMemFree( mpTextures); /* FIXME D3D setup mD3dCallbacks and mD3dDriverData */ + DDHAL_GETDRIVERINFODATA DdGetDriverInfo = { 0 }; - DdGetDriverInfo.dwSize = sizeof (DDHAL_GETDRIVERINFODATA); - DdGetDriverInfo.guidInfo = GUID_MiscellaneousCallbacks; - - DdGetDriverInfo.lpvData = (PVOID)&ddgbl.lpDDCBtmp->HALDDMiscellaneous; - - DdGetDriverInfo.dwExpectedSize = sizeof (DDHAL_DDMISCELLANEOUSCALLBACKS); - - if(mHALInfo.GetDriverInfo (&DdGetDriverInfo) == DDHAL_DRIVER_NOTHANDLED || DdGetDriverInfo.ddRVal != DD_OK) - { - DxHeapMemFree(mpFourCC); - DxHeapMemFree(mpTextures); - DxHeapMemFree(ddgbl.lpDDCBtmp); - // FIXME Close DX fristcall and second call - return DD_FALSE; - } + + + if (mHALInfo.dwFlags & DDHALINFO_GETDRIVERINFOSET) + { + DdGetDriverInfo.dwSize = sizeof (DDHAL_GETDRIVERINFODATA); + DdGetDriverInfo.guidInfo = GUID_MiscellaneousCallbacks; + DdGetDriverInfo.lpvData = (PVOID)&ddgbl.lpDDCBtmp->HALDDMiscellaneous; + DdGetDriverInfo.dwExpectedSize = sizeof (DDHAL_DDMISCELLANEOUSCALLBACKS); + + if(mHALInfo.GetDriverInfo (&DdGetDriverInfo) == DDHAL_DRIVER_NOTHANDLED || DdGetDriverInfo.ddRVal != DD_OK) + { + DxHeapMemFree(mpFourCC); + DxHeapMemFree(mpTextures); + DxHeapMemFree(ddgbl.lpDDCBtmp); + // FIXME Close DX fristcall and second call + return DD_FALSE; + } + + RtlZeroMemory(&DdGetDriverInfo, sizeof(DDHAL_GETDRIVERINFODATA)); + DdGetDriverInfo.dwSize = sizeof (DDHAL_GETDRIVERINFODATA); + DdGetDriverInfo.guidInfo = GUID_Miscellaneous2Callbacks; + + /* FIXME + DdGetDriverInfo.lpvData = (PVOID)&ddgbl.lpDDCBtmp->HALDDMiscellaneous; + DdGetDriverInfo.dwExpectedSize = sizeof (DDHAL_DDMISCELLANEOUS2CALLBACKS); + + if(mHALInfo.GetDriverInfo (&DdGetDriverInfo) == DDHAL_DRIVER_NOTHANDLED || DdGetDriverInfo.ddRVal != DD_OK) + { + DxHeapMemFree(mpFourCC); + DxHeapMemFree(mpTextures); + DxHeapMemFree(ddgbl.lpDDCBtmp); + // FIXME Close DX fristcall and second call + return DD_FALSE; + } + DD_MISCELLANEOUS2CALLBACKS + { + DWORD dwSize; + DWORD dwFlags; + PDD_ALPHABLT AlphaBlt; // unsuse acoding msdn and always set to NULL + PDD_CREATESURFACEEX CreateSurfaceEx; + PDD_GETDRIVERSTATE GetDriverState; + PDD_DESTROYDDLOCAL DestroyDDLocal; + } + DDHAL_MISC2CB32_CREATESURFACEEX + DDHAL_MISC2CB32_GETDRIVERSTATE + DDHAL_MISC2CB32_DESTROYDDLOCAL + */ + } + return DD_OK; }

1 0

[dreimer] 27182: Hopefully fixed the bug with not set Back Window Titles.
by dreimer＠svn.reactos.org 14 Jun '07

14 Jun '07

Author: dreimer Date: Fri Jun 15 02:13:27 2007 New Revision: 27182 URL: http://svn.reactos.org/svn/reactos?rev=27182&view=rev Log: Hopefully fixed the bug with not set Back Window Titles. Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/SVN.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Mul… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Multi.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Multi.cmd Fri Jun 15 02:13:27 2007 @@ -36,3 +36,5 @@ :: Execute the shared build commands :: call "%ROSBEBASEDIR%\Build-Shared.cmd" %2 + +title ReactOS Build Environment 0.3.7 Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Fri Jun 15 02:13:27 2007 @@ -38,7 +38,7 @@ echo *** aborting build. Please check for changes and *** echo *** update your config.rbuild. *** echo. - goto :EOF + goto :EOB ) ) @@ -55,4 +55,9 @@ :: :: highlight the fact that building has ended :: -::call "%ROSBEBASEDIR%\Tools\flash.exe" +call "%ROSBEBASEDIR%\Tools\flash.exe" + +goto :EOB + +:EOB +title ReactOS Build Environment 0.3.7 Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Fri Jun 15 02:13:27 2007 @@ -21,3 +21,5 @@ :: Execute the shared build commands :: call "%ROSBEBASEDIR%\Build-Shared.cmd" %2 + +title ReactOS Build Environment 0.3.7 Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Clean.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Clean.cmd Fri Jun 15 02:13:27 2007 @@ -91,7 +91,7 @@ ) else ( echo There is nothing to clean. ) - goto :EOF + goto :EOC ) if "%1" == "logs" ( :: @@ -106,9 +106,12 @@ ) else ( echo There are no logs to clean. ) - goto :EOF + goto :EOC ) if not "%1" == "" ( echo Unknown parameter specified. Try 'help [COMMAND]'. - goto :EOF + goto :EOC ) + +:EOC +title ReactOS Build Environment 0.3.7 Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Fri Jun 15 02:13:27 2007 @@ -166,4 +166,7 @@ del %ROSBEBASEDIR%\Tools\*.tmp copy %ROSBEBASEDIR%\Tools\config.rbuild %_ROSSOURCEDIR%\config.rbuild +goto :NOK + :NOK +title ReactOS Build Environment 0.3.7 Modified: trunk/tools/RosBE-Windows/Root/SVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/SVN.cmd?r… ============================================================================== --- trunk/tools/RosBE-Windows/Root/SVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/SVN.cmd Fri Jun 15 02:13:27 2007 @@ -50,6 +50,8 @@ ) if exist "%_ROSSOURCEDIR%\*.*" ( echo Folder is not empty. Continuing is dangerous and can cause errors. + echo Press Strg+C to abort. + pause goto :SVN ) @@ -59,4 +61,3 @@ :ExitSVN title ReactOS Build Environment 0.3.7 -pause

1 0

[greatlrd] 27181: more rewriting of setcooperlevel, it start working simluare as windows ddraw. and it start setup same value as well in the private struct.
by greatlrd＠svn.reactos.org 14 Jun '07

14 Jun '07

Author: greatlrd Date: Fri Jun 15 02:04:32 2007 New Revision: 27181 URL: http://svn.reactos.org/svn/reactos?rev=27181&view=rev Log: more rewriting of setcooperlevel, it start working simluare as windows ddraw. and it start setup same value as well in the private struct. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Fri Jun 15 02:04:32 2007 @@ -161,7 +161,7 @@ _SEH_TRY { - if (This->lpLcl->lpGbl->lpExclusiveOwner == This->lpLcl) + if (This->lpLcl->lpGbl->lpExclusiveOwner != This->lpLcl) { retVal = DDERR_NOEXCLUSIVEMODE; } Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c Fri Jun 15 02:04:32 2007 @@ -26,20 +26,121 @@ _SEH_TRY { + + if (hwnd && !IsWindow(hwnd)) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + // FIXME test if 0x20 exists as a flag and what thuse it do - if ( ( cooplevel & (~(DDSCL_FPUPRESERVE | DDSCL_FPUSETUP | DDSCL_MULTITHREADED | DDSCL_CREATEDEVICEWINDOW | + if ( cooplevel & (~(DDSCL_FPUPRESERVE | DDSCL_FPUSETUP | DDSCL_MULTITHREADED | DDSCL_CREATEDEVICEWINDOW | DDSCL_SETDEVICEWINDOW | DDSCL_SETFOCUSWINDOW | DDSCL_ALLOWMODEX | DDSCL_EXCLUSIVE | - DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES | DDSCL_ALLOWREBOOT | DDSCL_FULLSCREEN))) || - (!( cooplevel & (DDSCL_NORMAL | DDSCL_EXCLUSIVE | DDSCL_SETFOCUSWINDOW))) || - ((cooplevel & DDSCL_FPUSETUP) && (cooplevel & DDSCL_FPUPRESERVE))) - { - return DDERR_INVALIDPARAMS; - } - - - - - + DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES | DDSCL_ALLOWREBOOT | DDSCL_FULLSCREEN))) + { + + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + if (!( cooplevel & (DDSCL_NORMAL | DDSCL_EXCLUSIVE | DDSCL_SETFOCUSWINDOW))) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + if ((cooplevel & DDSCL_FPUSETUP) && (cooplevel & DDSCL_FPUPRESERVE)) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + if ((cooplevel & DDSCL_EXCLUSIVE) && (!(cooplevel & DDSCL_FULLSCREEN))) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + if ((cooplevel & DDSCL_ALLOWMODEX) && (!(cooplevel & DDSCL_FULLSCREEN))) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + if ((cooplevel & (DDSCL_CREATEDEVICEWINDOW | DDSCL_SETFOCUSWINDOW))) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + if (!cooplevel) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + + /* NORMAL MODE */ + if(!(cooplevel & (~DDSCL_NORMAL))) + { + /* FIXME in setup.c set DDRAWI_UMODELOADED | DDRAWI_DISPLAYDRV | DDRAWI_EMULATIONINITIALIZED | DDRAWI_GDIDRV | DDRAWI_ATTACHEDTODESKTOP */ + /* FIXME in setup.c This->lpLcl->lpGbl->dwFlags = */ + + This->lpLcl->dwLocalFlags = DDRAWILCL_SETCOOPCALLED | DDRAWILCL_DIRECTDRAW7 | DDRAWILCL_HOOKEDHWND; + This->lpLcl->hWnd = (ULONG_PTR) hwnd; + This->lpLcl->hFocusWnd = (ULONG_PTR) hwnd; + This->lpLcl->lpGbl->lpExclusiveOwner=NULL; + + retVal = DD_OK; + _SEH_LEAVE; + } + + /* FULLSCREEN */ + if ((!(cooplevel & (~(DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN)))) || + (!(cooplevel & (~(DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_ALLOWMODEX))))) + + { + /* FIXME in setup.c This->lpLcl->lpGbl->dwFlags = */ + + if (hwnd == NULL) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + if( (GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD) ) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + if( (This->lpLcl->lpGbl->lpExclusiveOwner != NULL) && + (This->lpLcl->lpGbl->lpExclusiveOwner != This->lpLcl) ) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + This->lpLcl->lpGbl->lpExclusiveOwner = This-> lpLcl; + + This->lpLcl->dwLocalFlags = DDRAWILCL_SETCOOPCALLED | DDRAWILCL_DIRECTDRAW7 | DDRAWILCL_HOOKEDHWND | + DDRAWILCL_HASEXCLUSIVEMODE | DDRAWILCL_ISFULLSCREEN | DDRAWILCL_ACTIVEYES | + DDRAWILCL_CURSORCLIPPED; + + if (cooplevel & DDSCL_ALLOWMODEX) + { + This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags | DDRAWILCL_ALLOWMODEX; + } + + This->lpLcl->hWnd = (ULONG_PTR) hwnd; + This->lpLcl->hFocusWnd = (ULONG_PTR) hwnd; + + + /* FIXME fullscreen are not finuish */ + + retVal = DD_OK; + _SEH_LEAVE; + } /* * Code from wine, this functions have been cut and paste from wine 0.9.35 @@ -47,139 +148,134 @@ * msdn document struct and flags */ - if(hwnd && !IsWindow(hwnd)) - { - retVal = DDERR_INVALIDPARAMS; - _SEH_LEAVE; - } - - - /* Handle those levels first which set various hwnds */ - if(cooplevel & DDSCL_SETFOCUSWINDOW) - { - - - if(This->lpLcl->dwLocalFlags & DDRAWILCL_SETCOOPCALLED) - { - retVal = DDERR_HWNDALREADYSET; - _SEH_LEAVE; - } - else if( (This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) && window) - { - retVal = DDERR_HWNDALREADYSET; - _SEH_LEAVE; - } - - This->lpLcl->hFocusWnd = (ULONG_PTR) hwnd; - - - /* Won't use the hwnd param for anything else */ - hwnd = NULL; - - /* Use the focus window for drawing too */ - This->lpLcl->hWnd = This->lpLcl->hFocusWnd; - - } - - /* DDSCL_NORMAL or DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE */ - if(cooplevel & DDSCL_NORMAL) - { - /* Can't coexist with fullscreen or exclusive */ - if(cooplevel & (DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) ) - { - retVal = DDERR_INVALIDPARAMS; - _SEH_LEAVE; - } - - /* Switching from fullscreen? */ - if(This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) - { - /* Restore the display mode */ - Main_DirectDraw_RestoreDisplayMode(iface); - - This->lpLcl->dwLocalFlags &= ~DDRAWILCL_ISFULLSCREEN; - This->lpLcl->dwLocalFlags &= ~DDRAWILCL_HASEXCLUSIVEMODE; - This->lpLcl->dwLocalFlags &= ~DDRAWILCL_ALLOWMODEX; - } - - /* Don't override focus windows or private device windows */ - if( hwnd && - !(This->lpLcl->hFocusWnd) && - !(This->lpLcl->dwObsolete1) && - (hwnd != window) ) - { - This->lpLcl->hWnd = (ULONG_PTR)hwnd; - } - - /* FIXME GL - IWineD3DDevice_SetFullscreen(This->wineD3DDevice, - FALSE); - */ - } - else if(cooplevel & DDSCL_FULLSCREEN) - { - /* Needs DDSCL_EXCLUSIVE */ - if(!(cooplevel & DDSCL_EXCLUSIVE) ) - { - retVal = DDERR_INVALIDPARAMS; - _SEH_LEAVE; - } - - /* Switch from normal to full screen mode? */ - if (!(This->lpLcl->dwLocalFlags & DDRAWILCL_HASEXCLUSIVEMODE)) - { - /* FIXME GL - IWineD3DDevice_SetFullscreen(This->wineD3DDevice, - TRUE); - */ - } - - /* Don't override focus windows or private device windows */ - if( hwnd && - !(This->lpLcl->hFocusWnd) && - !(This->lpLcl->dwObsolete1) && - (hwnd != window) ) - { - This->lpLcl->hWnd = (ULONG_PTR) hwnd; - } - } - else if(cooplevel & DDSCL_EXCLUSIVE) - { - retVal = DDERR_INVALIDPARAMS; - _SEH_LEAVE; - } - - if(cooplevel & DDSCL_CREATEDEVICEWINDOW) - { - /* Don't create a device window if a focus window is set */ - if( !This->lpLcl->hFocusWnd) - { - HWND devicewindow = CreateWindowExW(0, classname, L"DDraw device window", - WS_POPUP, 0, 0, - GetSystemMetrics(SM_CXSCREEN), - GetSystemMetrics(SM_CYSCREEN), - NULL, NULL, GetModuleHandleW(0), NULL); - - ShowWindow(devicewindow, SW_SHOW); /* Just to be sure */ - - This->lpLcl->dwObsolete1 = (DWORD)devicewindow; - } - } - - if(cooplevel & DDSCL_MULTITHREADED && !(This->lpLcl->dwLocalFlags & DDRAWILCL_MULTITHREADED)) - { - /* FIXME GL - * IWineD3DDevice_SetMultithreaded(This->wineD3DDevice); - */ - } - - - - /* Store the cooperative_level */ - - /* FIXME GL - * This->cooperative_level |= cooplevel; - */ + + + ///* Handle those levels first which set various hwnds */ + //if(cooplevel & DDSCL_SETFOCUSWINDOW) + //{ + // + + // if(This->lpLcl->dwLocalFlags & DDRAWILCL_SETCOOPCALLED) + // { + // retVal = DDERR_HWNDALREADYSET; + // _SEH_LEAVE; + // } + // else if( (This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) && window) + // { + // retVal = DDERR_HWNDALREADYSET; + // _SEH_LEAVE; + // } + + // This->lpLcl->hFocusWnd = (ULONG_PTR) hwnd; + + + // /* Won't use the hwnd param for anything else */ + // hwnd = NULL; + + // /* Use the focus window for drawing too */ + // This->lpLcl->hWnd = This->lpLcl->hFocusWnd; + + //} + + ///* DDSCL_NORMAL or DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE */ + //if(cooplevel & DDSCL_NORMAL) + //{ + // /* Can't coexist with fullscreen or exclusive */ + // if(cooplevel & (DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) ) + // { + // retVal = DDERR_INVALIDPARAMS; + // _SEH_LEAVE; + // } + + // /* Switching from fullscreen? */ + // if(This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) + // { + // /* Restore the display mode */ + // Main_DirectDraw_RestoreDisplayMode(iface); + + // This->lpLcl->dwLocalFlags &= ~DDRAWILCL_ISFULLSCREEN; + // This->lpLcl->dwLocalFlags &= ~DDRAWILCL_HASEXCLUSIVEMODE; + // This->lpLcl->dwLocalFlags &= ~DDRAWILCL_ALLOWMODEX; + // } + + // /* Don't override focus windows or private device windows */ + // if( hwnd && + // !(This->lpLcl->hFocusWnd) && + // !(This->lpLcl->dwObsolete1) && + // (hwnd != window) ) + // { + // This->lpLcl->hWnd = (ULONG_PTR)hwnd; + // } + + // /* FIXME GL + // IWineD3DDevice_SetFullscreen(This->wineD3DDevice, + // FALSE); + // */ + // } + // else if(cooplevel & DDSCL_FULLSCREEN) + // { + // /* Needs DDSCL_EXCLUSIVE */ + // if(!(cooplevel & DDSCL_EXCLUSIVE) ) + // { + // retVal = DDERR_INVALIDPARAMS; + // _SEH_LEAVE; + // } + + // /* Switch from normal to full screen mode? */ + // if (!(This->lpLcl->dwLocalFlags & DDRAWILCL_HASEXCLUSIVEMODE)) + // { + // /* FIXME GL + // IWineD3DDevice_SetFullscreen(This->wineD3DDevice, + // TRUE); + // */ + // } + + // /* Don't override focus windows or private device windows */ + // if( hwnd && + // !(This->lpLcl->hFocusWnd) && + // !(This->lpLcl->dwObsolete1) && + // (hwnd != window) ) + // { + // This->lpLcl->hWnd = (ULONG_PTR) hwnd; + // } + // } + // else if(cooplevel & DDSCL_EXCLUSIVE) + // { + // retVal = DDERR_INVALIDPARAMS; + // _SEH_LEAVE; + // } + + // if(cooplevel & DDSCL_CREATEDEVICEWINDOW) + // { + // /* Don't create a device window if a focus window is set */ + // if( !This->lpLcl->hFocusWnd) + // { + // HWND devicewindow = CreateWindowExW(0, classname, L"DDraw device window", + // WS_POPUP, 0, 0, + // GetSystemMetrics(SM_CXSCREEN), + // GetSystemMetrics(SM_CYSCREEN), + // NULL, NULL, GetModuleHandleW(0), NULL); + + // ShowWindow(devicewindow, SW_SHOW); /* Just to be sure */ + + // This->lpLcl->dwObsolete1 = (DWORD)devicewindow; + // } + // } + + // if(cooplevel & DDSCL_MULTITHREADED && !(This->lpLcl->dwLocalFlags & DDRAWILCL_MULTITHREADED)) + // { + // /* FIXME GL + // * IWineD3DDevice_SetMultithreaded(This->wineD3DDevice); + // */ + // } + + + + // /* Store the cooperative_level */ + + // /* FIXME GL + // * This->cooperative_level |= cooplevel; + // */ } _SEH_HANDLE {

1 0

[greatlrd] 27180: commit more test for setcooperlevel, not all test are in that we need.
by greatlrd＠svn.reactos.org 14 Jun '07

14 Jun '07

Author: greatlrd Date: Fri Jun 15 02:01:22 2007 New Revision: 27180 URL: http://svn.reactos.org/svn/reactos?rev=27180&view=rev Log: commit more test for setcooperlevel, not all test are in that we need. Modified: trunk/rostests/dxtest/ddraw/DDraw/create.cpp Modified: trunk/rostests/dxtest/ddraw/DDraw/create.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/create… ============================================================================== --- trunk/rostests/dxtest/ddraw/DDraw/create.cpp (original) +++ trunk/rostests/dxtest/ddraw/DDraw/create.cpp Fri Jun 15 02:01:22 2007 @@ -60,6 +60,11 @@ /* The Test */ TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_FULLSCREEN) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN) == DDERR_INVALIDPARAMS ); + + TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL) == DD_OK ); + TEST ( DirectDraw->Compact() == DDERR_NOEXCLUSIVEMODE ); + + TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN) == DDERR_INVALIDPARAMS); TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL | DDSCL_ALLOWMODEX) == DDERR_INVALIDPARAMS ); @@ -68,7 +73,9 @@ TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) == DD_OK); TEST ( DirectDraw->Compact() == DD_OK ); TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_ALLOWMODEX) == DD_OK); + TEST ( DirectDraw->Compact() == DD_OK ); TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_NORMAL) == DD_OK ); + TEST ( DirectDraw->Compact() == DDERR_NOEXCLUSIVEMODE ); TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL) == DD_OK ); TEST ( DirectDraw->Compact() == DDERR_NOEXCLUSIVEMODE );

1 0

[dreimer] 27179: - Added some comments. - Prettify Config's delete Parameter output. - Prevent stupid behavior when unspecified Parameter si set. - Add support for selecting the rv to be updated to in SVN Tool.
by dreimer＠svn.reactos.org 14 Jun '07

14 Jun '07

Author: dreimer Date: Fri Jun 15 00:10:54 2007 New Revision: 27179 URL: http://svn.reactos.org/svn/reactos?rev=27179&view=rev Log: - Added some comments. - Prettify Config's delete Parameter output. - Prevent stupid behavior when unspecified Parameter si set. - Add support for selecting the rv to be updated to in SVN Tool. Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/SVN.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Fri Jun 15 00:10:54 2007 @@ -12,6 +12,9 @@ title Building... +:: +:: Take over the 2nd parameter of Build.cmd, which enables/disables stripping +:: if "%1" == "strip" ( set ROS_LEAN_AND_MEAN = yes goto :Build Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Fri Jun 15 00:10:54 2007 @@ -10,14 +10,28 @@ title ReactOS Build Configurator +if "%1" == "delete" ( + if exist "%_ROSSOURCEDIR%\config.rbuild" ( + del %_ROSSOURCEDIR%\config.rbuild + echo Main Configuration File was found and deleted. + ) else ( + echo Main Configuration File was not found in ReactOS Source Tree. + ) + if exist "%ROSBEBASEDIR%\Tools\config.rbuild" ( + del %ROSBEBASEDIR%\Tools\config.rbuild + echo Working Configuration File was found and deleted. + ) else ( + echo Working Configuration File was not found in ReactOS Source Tree. + ) +goto :NOK +) +if not "%1" == "" ( + echo Unknown parameter specified. Try 'help [COMMAND]'. + goto :NOK +) + if not exist "%ROSBEBASEDIR%\Tools\config.rbuild" ( copy "%_ROSSOURCEDIR%\config.template.rbuild" "%ROSBEBASEDIR%\Tools\config.rbuild" -) - -if "%1" == "delete" ( - del %_ROSSOURCEDIR%\config.rbuild - del %ROSBEBASEDIR%\Tools\config.rbuild - goto :NOK ) echo WARNING: Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Fri Jun 15 00:10:54 2007 @@ -26,7 +26,7 @@ echo help [COMMAND] - Display the available commands or help on a echo specific command. echo svn [OPTIONS] - Create, Update or clean up your ReactOS Source - echo tree. + echo Tree. echo config [OPTIONS]- Configures the way, ReactOS will be built. echo. echo basedir - Switch back to the ReactOS source directory. @@ -62,9 +62,10 @@ ) if "%1" == "svn" ( echo Usage: svn [OPTIONS] - echo Creates, Updates or cleans up your ReactOS Source tree. + echo Creates, Updates or cleans up your ReactOS Source Tree. echo. - echo update - Updates to HEAD Revision. + echo update - Updates to HEAD Revision or to a specific one when + echo second parameter specifies one. echo create - Creates a new ReactOS Tree. echo cleanup - Cleans up and fixes errors in Tree. goto :EOF Modified: trunk/tools/RosBE-Windows/Root/SVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/SVN.cmd?r… ============================================================================== --- trunk/tools/RosBE-Windows/Root/SVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/SVN.cmd Fri Jun 15 00:10:54 2007 @@ -9,12 +9,20 @@ @echo off :: -:: Execute the Build command +:: Receive the first Parameter and decide what to do. :: +if "%1" == "" ( + echo No parameter specified. Try 'help [COMMAND]'. + goto :ExitSVN +) if "%1" == "update" ( title Updating... - %ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% %2 - goto :ExitSVN + if not "%2" == "" ( + %ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% -r %2 + ) else ( + %ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% + ) +goto :ExitSVN ) if "%1" == "cleanup" ( title Cleaning... @@ -28,6 +36,14 @@ goto :SVN ) ) +if not "%1" == "" ( + echo Unknown parameter specified. Try 'help [COMMAND]'. + goto :ExitSVN +) + +:: +:: Check if the Folder is empty. If not, output an error. +:: if exist "%_ROSSOURCEDIR%\.svn\." ( echo Folder already cotains a Reposority. Exiting goto :ExitSVN

1 0

[greatlrd] 27178: fixing ddrawi is compatible with vs
by greatlrd＠svn.reactos.org 14 Jun '07

14 Jun '07

Author: greatlrd Date: Fri Jun 15 00:02:51 2007 New Revision: 27178 URL: http://svn.reactos.org/svn/reactos?rev=27178&view=rev Log: fixing ddrawi is compatible with vs Modified: trunk/reactos/include/ddk/ddrawi.h Modified: trunk/reactos/include/ddk/ddrawi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawi.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/ddrawi.h (original) +++ trunk/reactos/include/ddk/ddrawi.h Fri Jun 15 00:02:51 2007 @@ -2181,10 +2181,11 @@ typedef struct IDirectDrawGammaControlVtbl DIRECTDRAWGAMMACONTROLCALLBACKS; -typedef DIRECTDRAWCLIPPERCALLBACKS FAR *LPDIRECTDRAWCLIPPERCALLBACKS; -typedef DIRECTDRAWPALETTECALLBACKS FAR *LPDIRECTDRAWPALETTECALLBACKS; -typedef DIRECTDRAWSURFACECALLBACKS FAR *LPDIRECTDRAWSURFACECALLBACKS; -typedef DIRECTDRAWCALLBACKS FAR *LPDIRECTDRAWCALLBACKS; +typedef DIRECTDRAWCLIPPERCALLBACKS *LPDIRECTDRAWCLIPPERCALLBACKS; +typedef DIRECTDRAWPALETTECALLBACKS *LPDIRECTDRAWPALETTECALLBACKS; +typedef DIRECTDRAWSURFACECALLBACKS *LPDIRECTDRAWSURFACECALLBACKS; +typedef DIRECTDRAWCALLBACKS *LPDIRECTDRAWCALLBACKS; + HRESULT CALLBACK D3DParseUnknownCommand (LPVOID lpvCommands,

1 0

[janderwald] 27177: - release lock on error
by janderwald＠svn.reactos.org 14 Jun '07

14 Jun '07

Author: janderwald Date: Thu Jun 14 23:51:19 2007 New Revision: 27177 URL: http://svn.reactos.org/svn/reactos?rev=27177&view=rev Log: - release lock on error Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Thu Jun 14 23:51:19 2007 @@ -2574,11 +2574,19 @@ if (! ConioGetIntersection(&SrcRegion, &ScreenBuffer, &ScrollRectangle)) { ConioUnlockScreenBuffer(Buff); + if (NULL != Console) + { + ConioUnlockConsole(Console); + } return Request->Status = STATUS_INVALID_PARAMETER; } if (UseClipRectangle && ! ConioGetIntersection(&SrcRegion, &SrcRegion, &ClipRectangle)) { + if (NULL != Console) + { + ConioUnlockConsole(Console); + } ConioUnlockScreenBuffer(Buff); return Request->Status = STATUS_SUCCESS; } @@ -2593,6 +2601,10 @@ /* Make sure destination rectangle is inside the screen buffer */ if (! ConioGetIntersection(&DstRegion, &DstRegion, &ScreenBuffer)) { + if (NULL != Console) + { + ConioUnlockConsole(Console); + } ConioUnlockScreenBuffer(Buff); return Request->Status = STATUS_INVALID_PARAMETER; } @@ -2663,6 +2675,10 @@ Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputCharRequest.ConsoleHandle, &Buff); if (! NT_SUCCESS(Status)) { + if (NULL != Console) + { + ConioUnlockConsole(Console); + } return Request->Status = Status; }

1 0

[dgorbachev] 27176: - Do not leak ports. - Use threads. This should allow shutdown. - Fix indentation.
by dgorbachev＠svn.reactos.org 14 Jun '07

14 Jun '07

Author: dgorbachev Date: Thu Jun 14 23:09:32 2007 New Revision: 27176 URL: http://svn.reactos.org/svn/reactos?rev=27176&view=rev Log: - Do not leak ports. - Use threads. This should allow shutdown. - Fix indentation. Modified: trunk/reactos/subsystems/win32/csrss/api/process.c trunk/reactos/subsystems/win32/csrss/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrss.rbuild trunk/reactos/subsystems/win32/csrss/include/api.h trunk/reactos/subsystems/win32/csrss/init.c Modified: trunk/reactos/subsystems/win32/csrss/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/process.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/process.c Thu Jun 14 23:09:32 2007 @@ -174,6 +174,10 @@ { NtUnmapViewOfSection(NtCurrentProcess(), pProcessData->CsrSectionViewBase); } + if (pProcessData->ServerCommunicationPort) + { + NtClose(pProcessData->ServerCommunicationPort); + } if (pPrevProcessData) { pPrevProcessData->next = pProcessData->next; Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/wapi.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/wapi.c Thu Jun 14 23:09:32 2007 @@ -18,6 +18,8 @@ #include <debug.h> /* GLOBALS *******************************************************************/ + +extern HANDLE hApiPort; HANDLE CsrssApiHeap = (HANDLE) 0; @@ -132,13 +134,8 @@ DPRINT("CSR: %s: Handling: %p\n", __FUNCTION__, Request); Status = NtAcceptConnectPort(&ServerPort, -#ifdef NTLPC NULL, Request, -#else - hApiListenPort, - NULL, -#endif TRUE, 0, & LpcRead); @@ -163,6 +160,7 @@ ProcessData->CsrSectionViewBase = LpcRead.ViewBase; ProcessData->CsrSectionViewSize = LpcRead.ViewSize; + ProcessData->ServerCommunicationPort = ServerPort; Status = NtCompleteConnectPort(ServerPort); if (!NT_SUCCESS(Status)) @@ -171,7 +169,6 @@ return Status; } -#if !defined(NTLPC) /* ReactOS LPC */ HANDLE ServerThread = (HANDLE) 0; Status = RtlCreateUserThread(NtCurrentProcess(), NULL, @@ -190,7 +187,6 @@ } NtClose(ServerThread); -#endif Status = STATUS_SUCCESS; DPRINT("CSR: %s done\n", __FUNCTION__); @@ -216,7 +212,7 @@ for (;;) { /* Send the reply and wait for a new request */ - Status = NtReplyWaitReceivePort(ServerPort, + Status = NtReplyWaitReceivePort(hApiPort, 0, &Reply->Header, &Request->Header); @@ -231,10 +227,7 @@ { DPRINT("Port died, oh well\n"); CsrFreeProcessData( Request->Header.ClientId.UniqueProcess ); - //NtClose() - Reply = NULL; - continue; - //break; + break; } if (Request->Header.u2.s2.Type == LPC_CONNECTION_REQUEST) @@ -296,7 +289,7 @@ } /* Close the port and exit the thread */ - NtClose(ServerPort); + // NtClose(ServerPort); DPRINT("CSR: %s done\n", __FUNCTION__); RtlExitUserThread(STATUS_SUCCESS); @@ -310,6 +303,7 @@ * Handle connection requests from clients to the port * "\Windows\ApiPort". */ +#if 0 DWORD STDCALL ServerApiPortThread (HANDLE hApiListenPort) { @@ -344,6 +338,7 @@ NtTerminateThread(NtCurrentThread(), Status); return 0; } +#endif /********************************************************************** * NAME @@ -357,88 +352,85 @@ DWORD STDCALL ServerSbApiPortThread (HANDLE hSbApiPortListen) { - HANDLE hConnectedPort = (HANDLE) 0; - PORT_MESSAGE Request; - PVOID Context = NULL; - NTSTATUS Status = STATUS_SUCCESS; + HANDLE hConnectedPort = (HANDLE) 0; + PORT_MESSAGE Request; + PVOID Context = NULL; + NTSTATUS Status = STATUS_SUCCESS; PPORT_MESSAGE Reply = NULL; - DPRINT("CSR: %s called\n", __FUNCTION__); + DPRINT("CSR: %s called\n", __FUNCTION__); RtlZeroMemory(&Request, sizeof(PORT_MESSAGE)); - Status = NtListenPort (hSbApiPortListen, & Request); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR: %s: NtListenPort(SB) failed (Status=0x%08lx)\n", - __FUNCTION__, Status); - } else { -DPRINT("-- 1\n"); - Status = NtAcceptConnectPort (& hConnectedPort, -#ifdef NTLPC - NULL, - &Request, -#else - hSbApiPortListen, - NULL, -#endif - TRUE, - NULL, - NULL); - if(!NT_SUCCESS(Status)) - { - DPRINT1("CSR: %s: NtAcceptConnectPort() failed (Status=0x%08lx)\n", - __FUNCTION__, Status); - } else { -DPRINT("-- 2\n"); - Status = NtCompleteConnectPort (hConnectedPort); - if(!NT_SUCCESS(Status)) - { - DPRINT1("CSR: %s: NtCompleteConnectPort() failed (Status=0x%08lx)\n", - __FUNCTION__, Status); - } else { -DPRINT("-- 3\n"); - - /* - * Tell the init thread the SM gave the - * green light for boostrapping. - */ - Status = NtSetEvent (hBootstrapOk, NULL); - if(!NT_SUCCESS(Status)) - { - DPRINT1("CSR: %s: NtSetEvent failed (Status=0x%08lx)\n", - __FUNCTION__, Status); - } - /* Wait for messages from the SM */ -DPRINT("-- 4\n"); - while (TRUE) - { - Status = NtReplyWaitReceivePort(hConnectedPort, - Context, - Reply, - & Request); - if(!NT_SUCCESS(Status)) - { - DPRINT1("CSR: %s: NtReplyWaitReceivePort failed (Status=0x%08lx)\n", - __FUNCTION__, Status); - break; - } - switch (Request.u2.s2.Type)//fix .h PORT_MESSAGE_TYPE(Request)) - { - /* TODO */ - default: - DPRINT1("CSR: %s received message (type=%d)\n", - __FUNCTION__, Request.u2.s2.Type); - } -DPRINT("-- 5\n"); - } - } - } - } - DPRINT("CSR: %s: terminating!\n", __FUNCTION__); - if(hConnectedPort) NtClose (hConnectedPort); - NtClose (hSbApiPortListen); - NtTerminateThread (NtCurrentThread(), Status); - return 0; + Status = NtListenPort (hSbApiPortListen, & Request); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSR: %s: NtListenPort(SB) failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + } else { + DPRINT("-- 1\n"); + Status = NtAcceptConnectPort(&hConnectedPort, + NULL, + &Request, + TRUE, + NULL, + NULL); + if(!NT_SUCCESS(Status)) + { + DPRINT1("CSR: %s: NtAcceptConnectPort() failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + } else { + DPRINT("-- 2\n"); + Status = NtCompleteConnectPort (hConnectedPort); + if(!NT_SUCCESS(Status)) + { + DPRINT1("CSR: %s: NtCompleteConnectPort() failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + } else { + DPRINT("-- 3\n"); + /* + * Tell the init thread the SM gave the + * green light for boostrapping. + */ + Status = NtSetEvent (hBootstrapOk, NULL); + if(!NT_SUCCESS(Status)) + { + DPRINT1("CSR: %s: NtSetEvent failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + } + /* Wait for messages from the SM */ + DPRINT("-- 4\n"); + while (TRUE) + { + Status = NtReplyWaitReceivePort(hConnectedPort, + Context, + Reply, + &Request); + if(!NT_SUCCESS(Status)) + { + DPRINT1("CSR: %s: NtReplyWaitReceivePort failed (Status=0x%08lx)\n", + __FUNCTION__, Status); + break; + } + + switch (Request.u2.s2.Type) //fix .h PORT_MESSAGE_TYPE(Request)) + { + /* TODO */ + default: + DPRINT1("CSR: %s received message (type=%d)\n", + __FUNCTION__, Request.u2.s2.Type); + } + DPRINT("-- 5\n"); + } + } + } + } + + DPRINT("CSR: %s: terminating!\n", __FUNCTION__); + if(hConnectedPort) NtClose (hConnectedPort); + NtClose (hSbApiPortListen); + NtTerminateThread (NtCurrentThread(), Status); + return 0; } /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/csrss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.rbuild (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.rbuild Thu Jun 14 23:09:32 2007 @@ -6,9 +6,6 @@ <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0501</define> - <if property="NTLPC" value="1"> - <define name="NTLPC" /> - </if> <library>nt</library> <library>ntdll</library> <library>smdll</library> Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h Thu Jun 14 23:09:32 2007 @@ -47,6 +47,7 @@ HANDLE ConsoleEvent; PVOID CsrSectionViewBase; ULONG CsrSectionViewSize; + HANDLE ServerCommunicationPort; struct _CSRSS_PROCESS_DATA * next; LIST_ENTRY ProcessEntry; PCONTROLDISPATCHER CtrlDispatcher; Modified: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/init.c (original) +++ trunk/reactos/subsystems/win32/csrss/init.c Thu Jun 14 23:09:32 2007 @@ -530,13 +530,8 @@ CsrInitProcessData(); - return CsrpCreateListenPort (L"\\Windows\\ApiPort", - & hApiPort, -#ifdef NTLPC - (PTHREAD_START_ROUTINE)ClientConnectionThread); -#else - ServerApiPortThread); -#endif + return CsrpCreateListenPort(L"\\Windows\\ApiPort", &hApiPort, + (PTHREAD_START_ROUTINE)ClientConnectionThread); } /**********************************************************************

1 0

[dgorbachev] 27175: - Do not create process data twice. - Check message type.
by dgorbachev＠svn.reactos.org 14 Jun '07

14 Jun '07

Author: dgorbachev Date: Thu Jun 14 20:47:24 2007 New Revision: 27175 URL: http://svn.reactos.org/svn/reactos?rev=27175&view=rev Log: - Do not create process data twice. - Check message type. Modified: trunk/reactos/subsystems/win32/csrss/api/process.c trunk/reactos/subsystems/win32/csrss/api/wapi.c trunk/reactos/subsystems/win32/csrss/init.c Modified: trunk/reactos/subsystems/win32/csrss/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/process.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/process.c Thu Jun 14 20:47:24 2007 @@ -107,7 +107,7 @@ } else { - DPRINT("Process data for pid %d already exist\n", ProcessId); + DPRINT1("Process data for pid %d already exist\n", ProcessId); } UNLOCK; if (pProcessData == NULL) @@ -249,7 +249,7 @@ Status = CsrDuplicateHandleTable(ProcessData, NewProcessData); } } - + /* Set default shutdown parameters */ NewProcessData->ShutdownLevel = 0x280; NewProcessData->ShutdownFlags = 0; Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/wapi.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/wapi.c Thu Jun 14 20:47:24 2007 @@ -33,7 +33,7 @@ PCSRSS_API_DEFINITION Scan; PCSRSS_API_DEFINITION New; - DPRINT("CSR: %s called", __FUNCTION__); + DPRINT("CSR: %s called\n", __FUNCTION__); NewCount = 0; for (Scan = NewDefinitions; 0 != Scan->Handler; Scan++) @@ -148,13 +148,17 @@ return Status; } - ProcessData = CsrCreateProcessData(Request->ClientId.UniqueProcess); + ProcessData = CsrGetProcessData(Request->ClientId.UniqueProcess); if (ProcessData == NULL) { - DPRINT1("Unable to allocate or find data for process 0x%x\n", - Request->ClientId.UniqueProcess); - Status = STATUS_UNSUCCESSFUL; - return Status; + ProcessData = CsrCreateProcessData(Request->ClientId.UniqueProcess); + if (ProcessData == NULL) + { + DPRINT1("Unable to allocate or find data for process 0x%x\n", + Request->ClientId.UniqueProcess); + Status = STATUS_UNSUCCESSFUL; + return Status; + } } ProcessData->CsrSectionViewBase = LpcRead.ViewBase; @@ -203,7 +207,7 @@ PCSR_API_MESSAGE Reply; PCSRSS_PROCESS_DATA ProcessData; - DPRINT("CSR: %s called", __FUNCTION__); + DPRINT("CSR: %s called\n", __FUNCTION__); /* Reply must be NULL at the first call to NtReplyWaitReceivePort */ Reply = NULL; @@ -242,7 +246,15 @@ if (Request->Header.u2.s2.Type == LPC_CLIENT_DIED) { - DPRINT("Clietn died, oh well\n"); + DPRINT("Client died, oh well\n"); + Reply = NULL; + continue; + } + + if ((Request->Header.u2.s2.Type != LPC_ERROR_EVENT) && + (Request->Header.u2.s2.Type != LPC_REQUEST)) + { + DPRINT1("CSR: received message %d\n", Request->Header.u2.s2.Type); Reply = NULL; continue; } @@ -285,6 +297,8 @@ /* Close the port and exit the thread */ NtClose(ServerPort); + + DPRINT("CSR: %s done\n", __FUNCTION__); RtlExitUserThread(STATUS_SUCCESS); } Modified: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/init.c (original) +++ trunk/reactos/subsystems/win32/csrss/init.c Thu Jun 14 20:47:24 2007 @@ -528,7 +528,8 @@ { DPRINT("CSR: %s called\n", __FUNCTION__); - CsrInitProcessData(); + CsrInitProcessData(); + return CsrpCreateListenPort (L"\\Windows\\ApiPort", & hApiPort, #ifdef NTLPC

1 0

[dgorbachev] 27174: - Hackish solution of issue #2062. - Turn off title change, as it can cause a deadlock.
by dgorbachev＠svn.reactos.org 14 Jun '07

14 Jun '07

Author: dgorbachev Date: Thu Jun 14 20:41:55 2007 New Revision: 27174 URL: http://svn.reactos.org/svn/reactos?rev=27174&view=rev Log: - Hackish solution of issue #2062. - Turn off title change, as it can cause a deadlock. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Thu Jun 14 20:41:55 2007 @@ -13,6 +13,9 @@ #define NDEBUG #include <debug.h> +extern NTSTATUS FASTCALL +Win32CsrInsertObject2(PCSRSS_PROCESS_DATA, PHANDLE, Object_t *); + /* GLOBALS *******************************************************************/ #define ConioInitRect(Rect, Top, Left, Bottom, Right) \ @@ -36,14 +39,16 @@ static NTSTATUS FASTCALL ConioConsoleFromProcessData(PCSRSS_PROCESS_DATA ProcessData, PCSRSS_CONSOLE *Console) { - if (NULL == ProcessData->Console) + PCSRSS_CONSOLE ProcessConsole = ProcessData->Console; + + if (!ProcessConsole) { *Console = NULL; return STATUS_SUCCESS; } - EnterCriticalSection(&(ProcessData->Console->Header.Lock)); - *Console = ProcessData->Console; + EnterCriticalSection(&(ProcessConsole->Header.Lock)); + *Console = ProcessConsole; return STATUS_SUCCESS; } @@ -219,7 +224,6 @@ return Status; } - /* copy buffer contents to screen */ ConioDrawConsole(Console); @@ -305,9 +309,9 @@ if (NewConsole || !ProcessData->bInheritHandles) { /* Insert the Objects */ - Status = Win32CsrInsertObject(ProcessData, - &Request->Data.AllocConsoleRequest.InputHandle, - &Console->Header); + Status = Win32CsrInsertObject2(ProcessData, + &Request->Data.AllocConsoleRequest.InputHandle, + &Console->Header); if (! NT_SUCCESS(Status)) { DPRINT1("Failed to insert object\n"); @@ -316,9 +320,9 @@ return Request->Status = Status; } - Status = Win32CsrInsertObject(ProcessData, - &Request->Data.AllocConsoleRequest.OutputHandle, - &Console->ActiveBuffer->Header); + Status = Win32CsrInsertObject2(ProcessData, + &Request->Data.AllocConsoleRequest.OutputHandle, + &Console->ActiveBuffer->Header); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to insert object\n"); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Thu Jun 14 20:41:55 2007 @@ -104,6 +104,14 @@ } NTSTATUS FASTCALL +Win32CsrInsertObject2(PCSRSS_PROCESS_DATA ProcessData, + PHANDLE Handle, + Object_t *Object) +{ + return (CsrExports.CsrInsertObjectProc)(ProcessData, Handle, Object); +} + +NTSTATUS FASTCALL Win32CsrGetObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Thu Jun 14 20:41:55 2007 @@ -1916,7 +1916,10 @@ { Title = L""; } - SendMessageW(Console->hWindow, WM_SETTEXT, 0, (LPARAM) Title); + + /* FIXME: deadlock */ + //SendMessageW(Console->hWindow, WM_SETTEXT, 0, (LPARAM) Title); + if (NULL != Buffer) { HeapFree(Win32CsrApiHeap, 0, Buffer);

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