Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 50011: [CMAKE] Revert some idl changes from r49286 and r49293, that broke mouse and keyboard in 2nd stage.
by tkreuzer＠svn.reactos.org 11 Dec '10

11 Dec '10

Author: tkreuzer Date: Sat Dec 11 17:04:24 2010 New Revision: 50011 URL: http://svn.reactos.org/svn/reactos?rev=50011&view=rev Log: [CMAKE] Revert some idl changes from r49286 and r49293, that broke mouse and keyboard in 2nd stage. Modified: branches/cmake-bringup/base/system/services/rpcserver.c branches/cmake-bringup/include/reactos/idl/svcctl.idl Modified: branches/cmake-bringup/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi… ============================================================================== --- branches/cmake-bringup/base/system/services/rpcserver.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/services/rpcserver.c [iso-8859-1] Sat Dec 11 17:04:24 2010 @@ -2600,10 +2600,11 @@ /* Function 17 */ DWORD RQueryServiceConfigW( SC_RPC_HANDLE hService, - LPQUERY_SERVICE_CONFIGW lpServiceConfig, + LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGW lpServiceConfig, DWORD cbBufSize, LPBOUNDED_DWORD_8K pcbBytesNeeded) { + LPQUERY_SERVICE_CONFIGW lpServiceConfig = (LPQUERY_SERVICE_CONFIGW)lpBuf; DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; @@ -3777,10 +3778,11 @@ /* Function 29 */ DWORD RQueryServiceConfigA( SC_RPC_HANDLE hService, - LPQUERY_SERVICE_CONFIGA lpServiceConfig, + LPBYTE lpBuf, //LPQUERY_SERVICE_CONFIGA lpServiceConfig, DWORD cbBufSize, LPBOUNDED_DWORD_8K pcbBytesNeeded) { + LPQUERY_SERVICE_CONFIGA lpServiceConfig = (LPQUERY_SERVICE_CONFIGA)lpBuf; DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; Modified: branches/cmake-bringup/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/svcctl.idl [iso-8859-1] Sat Dec 11 17:04:24 2010 @@ -434,7 +434,8 @@ /* Function 17 */ DWORD RQueryServiceConfigW( [in] SC_RPC_HANDLE hService, - [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig, + [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, + /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig, */ [in, range(0, 1024*8)] DWORD cbBufSize, [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); @@ -545,7 +546,8 @@ /* Function 29 */ DWORD RQueryServiceConfigA( [in] SC_RPC_HANDLE hService, - [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, + [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, + /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, */ [in, range(0, 1024*8)] DWORD cbBufSize, [out] LPBOUNDED_DWORD_8K pcbBytesNeeded);

1 0

[greatlrd] 50010: update edd_directx_global
by greatlrd＠svn.reactos.org 11 Dec '10

11 Dec '10

Author: greatlrd Date: Sat Dec 11 13:09:06 2010 New Revision: 50010 URL: http://svn.reactos.org/svn/reactos?rev=50010&view=rev Log: update edd_directx_global Modified: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h Modified: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Sat Dec 11 13:09:06 2010 @@ -145,7 +145,7 @@ /* 0x298 */ DD_CALLBACKS ddCallbacks; // 0x298 <-- verified to match Windows XP, ddCallbacks /* 0x2C4 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C4 <-- verified to match Windows XP, ddSurfaceCallbacks /* 0x304 */ DD_PALETTECALLBACKS ddPaletteCallbacks; // 0x304 <-- verified to match Windows XP, ddPaletteCallbacks -/* 0x314 */ ULONG unk_314[46]; +/* 0x314 */ D3DNTHAL_GLOBALDRIVERDATA d3dNtGlobalDriverData; // 0x304 <-- verified to match Windows XP, d3dNtGlobalDriverData /* 0x3D4 */ D3DNTHAL_CALLBACKS d3dNtHalCallbacks; /* 0x460 */ ULONG unk_460[9]; /* 0x47C */ D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2;

1 0

[greatlrd] 50009: remove few debug msg
by greatlrd＠svn.reactos.org 11 Dec '10

11 Dec '10

Author: greatlrd Date: Sat Dec 11 12:26:12 2010 New Revision: 50009 URL: http://svn.reactos.org/svn/reactos?rev=50009&view=rev Log: remove few debug msg Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Sat Dec 11 12:26:12 2010 @@ -283,12 +283,6 @@ DWORD_PTR retVal = 0; PPDEVOBJ PDev = (PPDEVOBJ)hDev; - DPRINT1("ReactX Calling : DxEngGetHdevData DXEGSHDEVDATA : %ld\n", Type); - -#if 1 - DPRINT1("HDEV hDev %08lx\n", hDev); -#endif - switch ( Type ) { case DxEGShDevData_Surface: @@ -372,10 +366,6 @@ default: break; } - -#if 1 - DPRINT1("return value %08lx\n", retVal); -#endif return retVal; @@ -743,7 +733,7 @@ if (pDC) { if (SetType == 1) - { + { if ( Set ) pDC->fs |= DC_FLAG_FULLSCREEN; else

1 0

[greatlrd] 50008: fix few dx bugs and comment how dxg calling order
by greatlrd＠svn.reactos.org 11 Dec '10

11 Dec '10

Author: greatlrd Date: Sat Dec 11 12:24:59 2010 New Revision: 50008 URL: http://svn.reactos.org/svn/reactos?rev=50008&view=rev Log: fix few dx bugs and comment how dxg calling order Modified: branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c Modified: branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c [iso-8859-1] Sat Dec 11 12:24:59 2010 @@ -62,7 +62,7 @@ // pCallBacks->WaitForVerticalBlank = (PDD_WAITFORVERTICALBLANK) DdWaitForVerticalBlank; // pCallBacks->CreatePalette = (PDD_CREATEPALETTE) DdCreatePalette; // pCallBacks->GetScanLine = (PDD_GETSCANLINE) DdGetScanLine; - + /* Unused on Microsoft Windows 2000 and later and should be ignored by the driver. ' pCallBacks->DestroyDriver @@ -76,7 +76,7 @@ memset(pSurfaceCallBacks,0,sizeof(DD_SURFACECALLBACKS)); /* FILL pSurfaceCallBacks with hal stuff */ - // pSurfaceCallBacks->dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); + pSurfaceCallBacks->dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); // DDHAL_SURFCB32_DESTROYSURFACE | // DDHAL_SURFCB32_FLIP | // DDHAL_SURFCB32_LOCK | @@ -111,6 +111,23 @@ return ppdev->bDDInitialized; } +/* + * Note DrvGetDirectDrawInfo + * ms dxg.sys call DrvGetDirectDrawInfo before it call DrvEnableDirectDraw + * so we can not check if the drv have enable the directx or not + * + * Optimze tip ms dxg.sys frist time it call on this api the + * pdwNumHeaps and pdwFourCC is NULL, + * next time it call it have alloc memmory for them + * in the EDD_DIRECTDRAW_GLOBAL in their memory + * pdwFourCC have pool tag 'fddG' and + * pvmList have pool tag 'vddG' + * so we only need fill pHalInfo,pdwNumHeaps,pdwNumFourCCCodes in the + * frist call. + * + * Importet do not forget to fill in pHalInfo->vmiData.pvPrimary if we + * forget that no directx hardware acclartions. + */ BOOL APIENTRY DrvGetDirectDrawInfo( IN DHPDEV dhpdev, @@ -121,39 +138,33 @@ OUT DWORD *pdwFourCC) { PPDEV ppdev = (PPDEV)dhpdev; - DWORD heap = 1; /* we always alloc one heap */ - BOOL bDDrawHeap = FALSE; - - if (ppdev->bDDInitialized == FALSE); - { - return FALSE; - } - - /* Setup heap */ - if ( (ppdev->ScreenWidth < ppdev->MemWidth) || (ppdev->ScreenHeight < ppdev->MemHeight)) - { - bDDrawHeap = TRUE; - heap++; - } - - ppdev->dwHeap = heap; - *pdwNumHeaps = heap; - - /* We do not support other fourcc */ - *pdwNumFourCCCodes = 0; /* - check see if pvmList and pdwFourCC are frist call - or frist. Secon call we fill in pHalInfo info + check see if it is our frist call + if it is fill pHalInfo and pdwNumHeaps and pdwNumFourCCCodes. + + if it our second call we must fill in pdwFourCC or pvmList + if one or two of them have been set. + + But we do not support heap or any fourcc so we skipp it */ - if(!(pvmList && pdwFourCC)) - { + if( (!pvmList) && (!pdwFourCC) ) + { + /* Setup heap */ + ppdev->dwHeap = 0; + *pdwNumHeaps = 0; + + /* We do not support other fourcc */ + *pdwNumFourCCCodes = 0; + + + /* not document ms dxg.sys call this api twice, frist time it call, the pvmList and pdwFourCC is NULL */ RtlZeroMemory(pHalInfo, sizeof(DD_HALINFO)); pHalInfo->dwSize = sizeof(DD_HALINFO); - pHalInfo->ddCaps.dwCaps = DDCAPS_NOHARDWARE; + pHalInfo->ddCaps.dwCaps = 0; /* we do not support all this caps pHalInfo->ddCaps.dwCaps = DDCAPS_BLT | DDCAPS_BLTQUEUE | DDCAPS_BLTCOLORFILL | DDCAPS_READSCANLINE | DDCAPS_BLTSTRETCH | DDCAPS_COLORKEY | DDCAPS_CANBLTSYSMEM; @@ -180,6 +191,8 @@ pHalInfo->ddCaps.dwVidMemTotal = (ppdev->MemHeight - ppdev->ScreenHeight) * ppdev->ScreenDelta; /* fill in some basic info that we need */ + + /* if we do not fill in pHalInfo->vmiData.pvPrimary dxg.sys will not activate the dx */ pHalInfo->vmiData.pvPrimary = ppdev->ScreenPtr; pHalInfo->vmiData.dwDisplayWidth = ppdev->ScreenWidth; pHalInfo->vmiData.dwDisplayHeight = ppdev->ScreenHeight; @@ -203,29 +216,6 @@ } } - /* Now build pvmList info */ - if(pvmList) - { - ppdev->pvmList = pvmList; - - if ( bDDrawHeap == TRUE) - { - pvmList->dwFlags = VIDMEM_ISLINEAR ; - pvmList->fpStart = ppdev->ScreenHeight * ppdev->ScreenDelta; - pvmList->fpEnd = ppdev->MemHeight * ppdev->ScreenDelta - 1; - pvmList->ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - pvmList++; - } - - pvmList->fpStart = 0; - pvmList->fpEnd = (ppdev->MemHeight * ppdev->ScreenDelta) - 1; - pvmList->dwFlags = VIDMEM_ISNONLOCAL | VIDMEM_ISLINEAR | VIDMEM_ISWC; - pvmList->ddsCaps.dwCaps = DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER ; - pvmList->ddsCapsAlt.dwCaps = DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER; - - pvmList = ppdev->pvmList; - } - return TRUE; }

1 0

[greatlrd] 50007: update some dx driver header some info are not inuse yet
by greatlrd＠svn.reactos.org 11 Dec '10

11 Dec '10

Author: greatlrd Date: Sat Dec 11 12:22:30 2010 New Revision: 50007 URL: http://svn.reactos.org/svn/reactos?rev=50007&view=rev Log: update some dx driver header some info are not inuse yet Modified: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Modified: branches/reactx/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Sat Dec 11 12:22:30 2010 @@ -108,7 +108,7 @@ typedef struct _EDD_DIRECTDRAW_GLOBAL { -/* 0x000 */ PVOID dhpdev; // 0x000 <-- verified to match Windows XP, dhpdev, the drv hPDev --> +/* 0x000 */ PVOID dhpdev; // 0x000 PDev->dhpdev <-- verified to match Windows XP, dhpdev, the drv hPDev --> /* 0x004 */ DWORD dwReserved1; /* 0x008 */ DWORD dwReserved2; /* 0x00C */ ULONG unk_000c[3]; @@ -127,8 +127,9 @@ /* 0x024 */ ULONG unk_024; -/* 0x028 */ LARGE_INTEGER llAssertModeTimeout; /* 0x028 <-- verified to match Windows XP, llAssertModeTimeout, it - using regkey +/* 0x028 */ LPVOID llAssertModeTimeout; /* 0x028 <-- verified to match Windows XP, llAssertModeTimeout, + it it is a function u can call on. + it using regkey HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI Specifies how long a DirectDraw application can keep a graphics-device frame-buffer locked in second, if this value are set to 0 it disable directdraw acclatrions. @@ -163,7 +164,7 @@ /* 0x5B8 */ PKEVENT pAssertModeEvent; /* 0x5Bc */ EDD_SURFACE *peSurfaceCurrent; /* 0x5C0 */ EDD_SURFACE *peSurfacePrimary; -/* 0x5C4 */ BOOL bSuspended; // 0x5C4 <-- verified to match Windows XP, tells dxg to use driver's own api or return error code instead +/* 0x5C4 */ BOOL bSuspended; // 0x5C4 <-- verified to match Windows XP, tells dxg to use driver's own api or return error code instead /* 0x5C8 */ ULONG unk_5c8[12]; /* 0x5F8 */ RECTL rcbounds; /* 0x608 */ ULONG unk_608; Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Sat Dec 11 12:22:30 2010 @@ -77,6 +77,7 @@ PDC NTAPI DxEngLockDC(HDC hDC); BOOLEAN NTAPI DxEngUnlockDC(PDC pDC); DWORD_PTR NTAPI DxEngGetHdevData(HDEV, DXEGSHDEVDATA); + BOOLEAN NTAPI DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD_PTR); BOOLEAN NTAPI DxEngLockHdev(HDEV hdev); BOOLEAN NTAPI DxEngUnlockHdev(HDEV hdev); @@ -120,4 +121,16 @@ DWORD NTAPI DxEngGetRedirectionBitmap(DWORD x1); DWORD NTAPI DxEngLoadImage(DWORD x1,DWORD x2); +/***********************************************************************************/ +/* Driver Functions Protypes */ +/***********************************************************************************/ +typedef BOOLEAN (NTAPI *PGD_DXENGNUISTERMSRV)(); +typedef PDC (NTAPI *PGD_DXENGLOCKDC)(HDC hDC); +typedef BOOLEAN (NTAPI *PGD_DXENGUNLOCKDC)(PDC pDC); +typedef DWORD_PTR (NTAPI *PGD_DXENGGETHDEVDATA)(HDEV, DXEGSHDEVDATA); + +/***********************************************************************************/ +/* DxEGShDevData_dd_flags value */ +/***********************************************************************************/ +#define DDFLAG_DIRECTX_3D_ON 0x04

1 0

[fireball] 50006: - Return time difference to the next timeout as a 64 bit integer instead of 32 bit which sometimes could "overlap" in case of big timeouts. See issue #5758 for more details.
by fireball＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: fireball Date: Fri Dec 10 21:17:49 2010 New Revision: 50006 URL: http://svn.reactos.org/svn/reactos?rev=50006&view=rev Log: - Return time difference to the next timeout as a 64 bit integer instead of 32 bit which sometimes could "overlap" in case of big timeouts. See issue #5758 for more details. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/timeout.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/timeout.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/timeout.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/timeout.c [iso-8859-1] Fri Dec 10 21:17:49 2010 @@ -113,7 +113,7 @@ } /* process pending timeouts and return the time until the next timeout, in milliseconds */ -static int get_next_timeout(void) +static void get_next_timeout(LARGE_INTEGER *result) { timeout_t current_time; get_current_time(&current_time); @@ -150,27 +150,32 @@ if ((ptr = list_head( &timeout_list )) != NULL) { struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); - //int diff = (timeout->when - current_time + 9999) / 10000; - int diff = timeout->when - current_time + 1; - if (diff < 0) diff = 0; - return diff; - } - } - return -1; /* no pending timeouts */ + LARGE_INTEGER diff; + diff.QuadPart = timeout->when - current_time; + //DPRINT1("diff %d, when %I64d, current %I64d\n", diff, timeout->when, current_time); + if (diff.QuadPart < 0) diff.QuadPart = 0; + + result->QuadPart = diff.QuadPart; + return; + } + } + + result->QuadPart = -1LL; + return; /* no pending timeouts */ } VOID ProcessTimers() { - int timeout; + LARGE_INTEGER timeout; LARGE_INTEGER DueTime; - timeout = get_next_timeout(); - - if (timeout != -1) + get_next_timeout(&timeout); + DPRINT("ProcessTimers() timeout %I64d\n", timeout.QuadPart); + if (timeout.QuadPart != -1LL) { /* Wait for the next time out */ - DueTime.QuadPart = -timeout; + DueTime.QuadPart = -timeout.QuadPart; KeSetTimer(MasterTimer, DueTime, NULL); } else

1 0

[akhaldi] 50005: [CMAKE] - Add some importlib targets.
by akhaldi＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: akhaldi Date: Fri Dec 10 16:08:35 2010 New Revision: 50005 URL: http://svn.reactos.org/svn/reactos?rev=50005&view=rev Log: [CMAKE] - Add some importlib targets. Modified: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt branches/cmake-bringup/dll/win32/credui/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/atl/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -22,9 +22,7 @@ set_module_type(atl win32dll) -target_link_libraries(atl - uuid - wine) +target_link_libraries(atl uuid wine) add_importlibs(atl msvcrt @@ -36,5 +34,7 @@ kernel32 ntdll) +add_importlib_target(atl.spec) + add_dependencies(atl atl_atliface_header) add_cab_target(atl 1) Modified: branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3… ============================================================================== --- branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -6,6 +6,8 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(avifil32.dll avifil32.spec) add_library(avifil32 SHARED acmstream.c @@ -20,17 +22,11 @@ tmpfile.c wavfile.c rsrc.rc - avifil32.def) - -if(NOT MSVC) - set_source_files_properties(avifil32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def) set_module_type(avifil32 win32dll) -target_link_libraries(avifil32 - uuid - wine) +target_link_libraries(avifil32 uuid wine) add_importlibs(avifil32 msvcrt @@ -43,4 +39,5 @@ kernel32 ntdll) +add_importlib_target(avifil32.spec) add_cab_target(avifil32 1) Modified: branches/cmake-bringup/dll/win32/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/credui/… ============================================================================== --- branches/cmake-bringup/dll/win32/credui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/credui/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -18,5 +18,6 @@ target_link_libraries(credui wine) add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll) +add_importlib_target(credui.spec) add_cab_target(credui 1) Modified: branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptne… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -21,5 +21,5 @@ kernel32 ntdll) - +add_importlib_target(cryptnet.spec) add_cab_target(cryptnet 1) Modified: branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hlink/C… ============================================================================== --- branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hlink/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -28,5 +28,5 @@ kernel32 ntdll) - +add_importlib_target(hlink.spec) add_cab_target(hlink 1) Modified: branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/icmp/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/icmp/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -16,5 +16,5 @@ target_link_libraries(icmp wine) add_importlibs(icmp ws2_32 msvcrt kernel32 ntdll) -add_dependencies(icmp psdk) +add_importlib_target(icmp.spec) add_cab_target(icmp 1) Modified: branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/inetcom… ============================================================================== --- branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/inetcomm/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -21,9 +21,7 @@ set_module_type(inetcomm win32dll) -target_link_libraries(inetcomm - uuid - wine) +target_link_libraries(inetcomm uuid wine) add_importlibs(inetcomm ole32 @@ -35,4 +33,5 @@ kernel32 ntdll) +add_importlib_target(inetcomm.spec) add_cab_target(inetcomm 1) Modified: branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntdsapi… ============================================================================== --- branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ntdsapi/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -14,5 +14,6 @@ target_link_libraries(ntdsapi wine) add_importlibs(ntdsapi user32 kernel32 ntdll) +add_importlib_target(ntdsapi.spec) add_dependencies(ntdsapi psdk buildno_header) add_cab_target(ntdsapi 1) Modified: branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/odbccp3… ============================================================================== --- branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/odbccp32/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -1,6 +1,7 @@ -add_definitions(-D__WINESRC__) -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions( + -D__WINESRC__ + -D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -13,9 +14,7 @@ add_library(odbccp32 SHARED ${SOURCE}) set_entrypoint(odbccp32 0) -target_link_libraries(odbccp32 - uuid - wine) +target_link_libraries(odbccp32 uuid wine) add_importlibs(odbccp32 msvcrt @@ -23,5 +22,5 @@ kernel32 ntdll) - +add_importlib_target(odbccp32.spec) add_cab_target(odbccp32 1) Modified: branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleacc/… ============================================================================== --- branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -6,7 +6,8 @@ spec2def(oleacc.dll oleacc.spec) list(APPEND SOURCE - main.c oleacc.rc + main.c + oleacc.rc ${CMAKE_CURRENT_BINARY_DIR}/oleacc.def) add_library(oleacc SHARED ${SOURCE}) @@ -20,5 +21,5 @@ kernel32 ntdll) - -add_cab_target(oleacc 1) +add_importlib_target(oleacc.spec) +add_cab_target(oleacc 1) Modified: branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pdh/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/pdh/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -18,5 +18,6 @@ target_link_libraries(pdh wine) add_importlibs(pdh kernel32 ntdll) +add_importlib_target(pdh.spec) add_cab_target(pdh 1) Modified: branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/powrpro… ============================================================================== --- branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -13,6 +13,5 @@ target_link_libraries(powrprof wine) add_importlibs(powrprof advapi32 user32 comctl32 msvcrt kernel32 ntdll) - +add_importlib_target(powrprof.spec) add_cab_target(powrprof 1) -add_importlib_target(powrprof.spec) Modified: branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp… ============================================================================== --- branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -1,6 +1,8 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(winhttp.dll winhttp.spec) add_library(winhttp SHARED cookie.c @@ -10,16 +12,10 @@ request.c session.c url.c - winhttp.def) - -if(NOT MSVC) - set_source_files_properties(winhttp.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def) set_module_type(winhttp win32dll) - target_link_libraries(winhttp wine) - add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt crypt32 advapi32 kernel32 ntdll) - +add_importlib_target(winhttp.spec) add_cab_target(winhttp 1) Modified: branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi… ============================================================================== --- branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -17,6 +17,7 @@ ${PSEH_LIB}) add_importlibs(wlanapi rpcrt4 kernel32 ntdll) +add_importlib_target(wlanapi.spec) + add_dependencies(wlanapi psdk buildno_header) - -add_cab_target(wlanapi 1) +add_cab_target(wlanapi 1) Modified: branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wldap32… ============================================================================== --- branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -36,5 +36,5 @@ target_link_libraries(wldap32 wine) add_importlibs(wldap32 user32 msvcrt kernel32 ntdll) - +add_importlib_target(wldap32.spec) add_cab_target(wldap32 1) Modified: branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xmllite… ============================================================================== --- branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] Fri Dec 10 16:08:35 2010 @@ -13,9 +13,8 @@ set_module_type(xmllite win32dll) -target_link_libraries(xmllite - wine) +target_link_libraries(xmllite wine) add_importlibs(xmllite msvcrt kernel32 ntdll) - +add_importlib_target(xmllite.spec) add_cab_target(xmllite 1)

1 0

[greatlrd] 50004: vbe drv now accpect any linear video mode with res 300x200 or higher
by greatlrd＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: greatlrd Date: Fri Dec 10 13:42:03 2010 New Revision: 50004 URL: http://svn.reactos.org/svn/reactos?rev=50004&view=rev Log: vbe drv now accpect any linear video mode with res 300x200 or higher Modified: branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c Modified: branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/mi… ============================================================================== --- branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Fri Dec 10 13:42:03 2010 @@ -350,8 +350,8 @@ /* Is this mode acceptable? */ if (VBE_GETRETURNCODE(BiosRegisters.Eax) == VBE_SUCCESS && - VbeModeInfo->XResolution >= 640 && - VbeModeInfo->YResolution >= 480 && + VbeModeInfo->XResolution >= 300 && + VbeModeInfo->YResolution >= 200 && (VbeModeInfo->MemoryModel == VBE_MEMORYMODEL_PACKEDPIXEL || VbeModeInfo->MemoryModel == VBE_MEMORYMODEL_DIRECTCOLOR) && VbeModeInfo->PhysBasePtr != 0)

1 0

[greatlrd] 50003: remove some debug msg, not need it any more
by greatlrd＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: greatlrd Date: Fri Dec 10 13:34:51 2010 New Revision: 50003 URL: http://svn.reactos.org/svn/reactos?rev=50003&view=rev Log: remove some debug msg, not need it any more Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Fri Dec 10 13:34:51 2010 @@ -45,7 +45,6 @@ Status = DxDdStartupDxGraphics(0,NULL,0,NULL,NULL, Proc); if (!NT_SUCCESS(Status)) { - DPRINT1("Warning : Failed to create the directx interface\n"); return FALSE; } } @@ -53,7 +52,6 @@ pDC = DC_LockDc(hdc); if (pDC == NULL) { - DPRINT1("Warning : Failed to lock hdc\n"); return FALSE; } @@ -66,7 +64,6 @@ pDev->pEDDgpl = ExAllocatePoolWithTag(PagedPool, sizeof(EDD_DIRECTDRAW_GLOBAL), TAG_EDDGBL); if (!pDev->pEDDgpl) { - DPRINT1("Warning : Failed to allocate memmory for EDD_DIRECTDRAW_GLOBAL\n"); DC_UnlockDc(pDC); return FALSE; } @@ -74,12 +71,8 @@ } /* test see if drv got a dx interface or not */ - if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || - ( pDev->DriverFunctions.EnableDirectDraw == NULL)) - { - DPRINT1("Waring : DisableDirectDraw and EnableDirectDraw are NULL, no dx driver \n"); - } - else + if ( ( pDev->DriverFunctions.DisableDirectDraw != NULL) && + ( pDev->DriverFunctions.EnableDirectDraw != NULL)) { /* Check see if dx have been enable or not */ if ( pDev->pEDDgpl->pvmList == NULL) @@ -89,13 +82,8 @@ pDev->pEDDgpl->ddPaletteCallbacks.dwSize = sizeof(DD_PALETTECALLBACKS); pfnDdEnableDirectDraw = (PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn; - if (pfnDdEnableDirectDraw == NULL) + if (pfnDdEnableDirectDraw != NULL) { - DPRINT1("Warning: no pfnDdEnableDirectDraw\n"); - } - else - { - DPRINT1(" call to pfnDdEnableDirectDraw \n "); /* Note it is the hdev struct it want, not the drv hPDev aka pdc->PDev */ success = pfnDdEnableDirectDraw(pDC->ppdev, TRUE); @@ -105,14 +93,10 @@ } else { - DPRINT1(" The dxg.sys and graphic card driver interface is enabled \n "); success = TRUE; } } - - DPRINT1("Return value : 0x%08x\n",success); DC_UnlockDc(pDC); - DPRINT1(" end call to pfnDdEnableDirectDraw \n "); return success; } @@ -148,12 +132,10 @@ /* Loading the kernel interface of directx for win32k */ - DPRINT1("Warning: trying loading xp/2003/windows7/reactos dxg.sys\n"); ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); if ( ghDxGraphics == NULL) { Status = STATUS_DLL_NOT_FOUND; - DPRINT1("Warning: no ReactX or DirectX kernel driver found\n"); } else { @@ -187,7 +169,6 @@ EngUnloadImage( ghDxGraphics); ghDxGraphics = NULL; } - DPRINT1("Warning: DirectX graphics interface can not be initialized\n"); } else {

1 0

[greatlrd] 50002: intEnableReactXDriver Primary surface have been rewriten in win32k ppdev does not alloc edd_directx_global struct any more, that is not a problem we doing it here instead. it allo...
by greatlrd＠svn.reactos.org 10 Dec '10

10 Dec '10

Author: greatlrd Date: Fri Dec 10 11:08:37 2010 New Revision: 50002 URL: http://svn.reactos.org/svn/reactos?rev=50002&view=rev Log: intEnableReactXDriver Primary surface have been rewriten in win32k ppdev does not alloc edd_directx_global struct any more, that is not a problem we doing it here instead. it alloc it when it is need it. not before Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Fri Dec 10 11:08:37 2010 @@ -39,8 +39,6 @@ PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = NULL; BOOL success = FALSE; - /* FIXME get the process data */ - /* Do not try load dxg.sys when it have already been load once */ if (gpfnStartupDxGraphics == NULL) { @@ -60,6 +58,20 @@ } pDev = pDC->ppdev; + + /* This code should be where primary surface is create + but we save some memory use to alloc it when it is need it */ + if (pDev->pEDDgpl == NULL) + { + pDev->pEDDgpl = ExAllocatePoolWithTag(PagedPool, sizeof(EDD_DIRECTDRAW_GLOBAL), TAG_EDDGBL); + if (!pDev->pEDDgpl) + { + DPRINT1("Warning : Failed to allocate memmory for EDD_DIRECTDRAW_GLOBAL\n"); + DC_UnlockDc(pDC); + return FALSE; + } + RtlZeroMemory( pDev->pEDDgpl ,sizeof(EDD_DIRECTDRAW_GLOBAL)); + } /* test see if drv got a dx interface or not */ if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || @@ -69,8 +81,7 @@ } else { - - /* CHeck see if dx have been enable or not */ + /* Check see if dx have been enable or not */ if ( pDev->pEDDgpl->pvmList == NULL) { pDev->pEDDgpl->ddCallbacks.dwSize = sizeof(DD_CALLBACKS); @@ -98,7 +109,6 @@ success = TRUE; } } - DPRINT1("Return value : 0x%08x\n",success); DC_UnlockDc(pDC);

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