Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[fireball] 23078: [AUDIT] - Doxyfile: not a code file at all - ntdll.h / ntdllp.h: nothing copyrightable or reversengineerable in these files, it's a few functions prototypes only. Thus clean.
by fireball＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: fireball Date: Sun Jul 16 17:55:11 2006 New Revision: 23078 URL: http://svn.reactos.org/svn/reactos?rev=23078&view=rev Log: [AUDIT] - Doxyfile: not a code file at all - ntdll.h / ntdllp.h: nothing copyrightable or reversengineerable in these files, it's a few functions prototypes only. Thus clean. Modified: trunk/reactos/dll/ntdll/Doxyfile (props changed) trunk/reactos/dll/ntdll/inc/ntdll.h (props changed) trunk/reactos/dll/ntdll/inc/ntdllp.h (props changed) Propchange: trunk/reactos/dll/ntdll/Doxyfile ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/ntdll/inc/ntdll.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/ntdll/inc/ntdllp.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[fireball] 23077: [AUDIT] - setup.c: This is a fully ReactOS-specific code, thus clean
by fireball＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: fireball Date: Sun Jul 16 17:51:13 2006 New Revision: 23077 URL: http://svn.reactos.org/svn/reactos?rev=23077&view=rev Log: [AUDIT] - setup.c: This is a fully ReactOS-specific code, thus clean Modified: trunk/reactos/base/setup/setup/setup.c (props changed) Propchange: trunk/reactos/base/setup/setup/setup.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[fireball] 23076: [AUDIT] - setup.rc / lsass.rc: nothing copyrightable exists in this files - lsass.c: some partly #if 0...#endif'ed stub. Doesn't implement any functionality, thus clean (and useless probably) - win32err.c: a small error-printing function taken from Mark Russinovich's chkdskx source code. Contains nothing which could be thought as copyright-infringement, and the function overall is a few lines only
by fireball＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: fireball Date: Sun Jul 16 17:46:47 2006 New Revision: 23076 URL: http://svn.reactos.org/svn/reactos?rev=23076&view=rev Log: [AUDIT] - setup.rc / lsass.rc: nothing copyrightable exists in this files - lsass.c: some partly #if 0...#endif'ed stub. Doesn't implement any functionality, thus clean (and useless probably) - win32err.c: a small error-printing function taken from Mark Russinovich's chkdskx source code. Contains nothing which could be thought as copyright-infringement, and the function overall is a few lines only Modified: trunk/reactos/base/applications/sm/resource.h (props changed) trunk/reactos/base/applications/sm/win32err.c (props changed) trunk/reactos/base/setup/setup/setup.rc (props changed) trunk/reactos/base/system/lsass/lsass.c (props changed) trunk/reactos/base/system/lsass/lsass.rc (props changed) Propchange: trunk/reactos/base/applications/sm/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/applications/sm/win32err.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/setup/setup/setup.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/lsass/lsass.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/lsass/lsass.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[janderwald] 23075: * dont succeed if found Class is local and hInstance is NULL * set hInstance to input value given when nonzero, zero for global classes and to the actual value of class when its local * reduces the user32_winetest.exe failures by 20 error to 44
by janderwald＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: janderwald Date: Sun Jul 16 16:24:09 2006 New Revision: 23075 URL: http://svn.reactos.org/svn/reactos?rev=23075&view=rev Log: * dont succeed if found Class is local and hInstance is NULL * set hInstance to input value given when nonzero, zero for global classes and to the actual value of class when its local * reduces the user32_winetest.exe failures by 20 error to 44 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Sun Jul 16 16:24:09 2006 @@ -1772,7 +1772,8 @@ static BOOL UserGetClassInfo(IN PWINDOWCLASS Class, OUT PWNDCLASSEXW lpwcx, - IN BOOL Ansi) + IN BOOL Ansi, + HINSTANCE hInstance) { lpwcx->style = Class->Style; @@ -1783,7 +1784,6 @@ lpwcx->cbClsExtra = Class->ClsExtra; lpwcx->cbWndExtra = Class->WndExtra; - lpwcx->hInstance = Class->hInstance; lpwcx->hIcon = Class->hIcon; /* FIXME - get handle from pointer */ lpwcx->hCursor = Class->hCursor; /* FIXME - get handle from pointer */ lpwcx->hbrBackground = Class->hbrBackground; @@ -1792,6 +1792,13 @@ ((PWNDCLASSEXA)lpwcx)->lpszMenuName = Class->AnsiMenuName; else lpwcx->lpszMenuName = Class->MenuName; + + if (hInstance) + lpwcx->hInstance = hInstance; + else if (Class->Global) + lpwcx->hInstance = NULL; + else + lpwcx->hInstance = Class->hInstance; lpwcx->lpszClassName = (LPCWSTR)((ULONG_PTR)Class->Atom); /* FIXME - return the string? */ @@ -2154,7 +2161,8 @@ { Ret = UserGetClassInfo(Class, lpWndClassEx, - Ansi); + Ansi, + hInstance); if (Ret) { @@ -2173,6 +2181,11 @@ /* Undocumented behavior! Return the class atom as a BOOL! */ Ret = (BOOL)ClassAtom; + + if (!(Class->Global || Class->System) && hInstance == NULL) + { + Ret = FALSE; + } } } }

1 0

[ekohl] 23074: Implement CM_Get_First_Log_Conf[_Ex] and add PNP_GetFirstLogConf stub.
by ekohl＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: ekohl Date: Sun Jul 16 16:11:26 2006 New Revision: 23074 URL: http://svn.reactos.org/svn/reactos?rev=23074&view=rev Log: Implement CM_Get_First_Log_Conf[_Ex] and add PNP_GetFirstLogConf stub. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/include/reactos/idl/pnp.idl trunk/reactos/include/reactos/wine/cfgmgr32.h Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Sun Jul 16 16:11:26 2006 @@ -1284,6 +1284,26 @@ } +/* Function 42 */ +CONFIGRET +PNP_GetFirstLogConf(handle_t BindingHandle, + wchar_t *DeviceInstance, + ULONG ulPriority, + ULONG *pulLogConfTag, + ULONG ulFlags) +{ + CONFIGRET ret = CR_SUCCESS; + + DPRINT1("PNP_GetFirstLogConf() called\n"); + + *pulLogConfTag = 0; /* FIXME */ + + DPRINT1("PNP_GetFirstLogConf() done (returns %lx)\n", ret); + + return ret; +} + + /* Function 58 */ CONFIGRET PNP_RunDetection(handle_t BindingHandle, Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Sun Jul 16 16:11:26 2006 @@ -119,8 +119,8 @@ ;CM_Get_Device_Interface_List_SizeW ;CM_Get_Device_Interface_List_Size_ExA ;CM_Get_Device_Interface_List_Size_ExW -;CM_Get_First_Log_Conf -;CM_Get_First_Log_Conf_Ex +CM_Get_First_Log_Conf=SETUPAPI.CM_Get_First_Log_Conf +CM_Get_First_Log_Conf_Ex=SETUPAPI.CM_Get_First_Log_Conf_Ex CM_Get_Global_State=SETUPAPI.CM_Get_Global_State CM_Get_Global_State_Ex=SETUPAPI.CM_Get_Global_State_Ex CM_Get_HW_Prof_FlagsA=SETUPAPI.CM_Get_HW_Prof_FlagsA Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Sun Jul 16 16:11:26 2006 @@ -1940,6 +1940,84 @@ } *pulLen = lstrlenW(DeviceId); + + return CR_SUCCESS; +} + + +/*********************************************************************** + * CM_Get_First_Log_Conf [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_First_Log_Conf( + PLOG_CONF plcLogConf, DEVINST dnDevInst, ULONG ulFlags) +{ + TRACE("%p %lx %lx\n", plcLogConf, dnDevInst, ulFlags); + return CM_Get_First_Log_Conf_Ex(plcLogConf, dnDevInst, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Get_First_Log_Conf_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_First_Log_Conf_Ex( + PLOG_CONF plcLogConf, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + LPWSTR lpDevInst = NULL; + CONFIGRET ret = CR_SUCCESS; + ULONG ulTag; + PLOG_CONF_INFO pLogConfInfo; + + FIXME("%p %lx %lx %lx\n", plcLogConf, dnDevInst, ulFlags, hMachine); + + if (dnDevInst == 0) + return CR_INVALID_DEVINST; + + if (ulFlags & ~LOG_CONF_BITS) + return CR_INVALID_FLAG; + + if (plcLogConf) + *plcLogConf = 0; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + ret = PNP_GetFirstLogConf(BindingHandle, + lpDevInst, + ulFlags, + &ulTag, + ulFlags); + if (ret != CR_SUCCESS) + return ret; + + pLogConfInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_CONF_INFO)); + if (pLogConfInfo == NULL) + return CR_OUT_OF_MEMORY; + + pLogConfInfo->ulMagic = LOG_CONF_MAGIC; + pLogConfInfo->dnDevInst = dnDevInst; + pLogConfInfo->ulFlags = ulFlags; + pLogConfInfo->ulTag = ulTag; + + *plcLogConf = (LOG_CONF)pLogConfInfo; return CR_SUCCESS; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Sun Jul 16 16:11:26 2006 @@ -97,8 +97,8 @@ @ stub CM_Get_Device_Interface_List_SizeW @ stub CM_Get_Device_Interface_List_Size_ExA @ stub CM_Get_Device_Interface_List_Size_ExW -@ stub CM_Get_First_Log_Conf -@ stub CM_Get_First_Log_Conf_Ex +@ stdcall CM_Get_First_Log_Conf(ptr long long) +@ stdcall CM_Get_First_Log_Conf_Ex(ptr long long long) @ stdcall CM_Get_Global_State(ptr long) @ stdcall CM_Get_Global_State_Ex(ptr long long) @ stdcall CM_Get_HW_Prof_FlagsA(str long ptr long) Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl (original) +++ trunk/reactos/include/reactos/idl/pnp.idl Sun Jul 16 16:11:26 2006 @@ -212,6 +212,13 @@ [in] ULONG ulLogConfTag, [in] ULONG ulFlags); + /* Function 44 */ + CONFIGRET PNP_GetFirstLogConf(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] ULONG ulPriority, + [out] ULONG *pulLogConfTag, + [in] ULONG ulFlags); + /* Function 58 */ CONFIGRET PNP_RunDetection(handle_t BindingHandle, [in] unsigned long Flags); Modified: trunk/reactos/include/reactos/wine/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/cfgmg… ============================================================================== --- trunk/reactos/include/reactos/wine/cfgmgr32.h (original) +++ trunk/reactos/include/reactos/wine/cfgmgr32.h Sun Jul 16 16:11:26 2006 @@ -297,6 +297,8 @@ #define CM_Get_Device_ID_List_Size_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Size_Ex) CONFIGRET WINAPI CM_Get_Device_ID_Size( PULONG, DEVINST, ULONG ); CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex( PULONG, DEVINST, ULONG, HMACHINE ); +CONFIGRET WINAPI CM_Get_First_Log_Conf( PLOG_CONF, DEVINST, ULONG ); +CONFIGRET WINAPI CM_Get_First_Log_Conf_Ex( PLOG_CONF, DEVINST, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Global_State( PULONG, ULONG ); CONFIGRET WINAPI CM_Get_Global_State_Ex( PULONG, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_HW_Prof_FlagsA( DEVINSTID_A, ULONG, PULONG, ULONG );

1 0

[greatlrd] 23073: Clean up NtGdiDdCreateDirectDrawObject and confirm it working. 1. Fix create hdc when it is NULL that is need to get ms windows xp d3dx.dll working in ReactOS, if some want try it.
by greatlrd＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: greatlrd Date: Sun Jul 16 16:03:41 2006 New Revision: 23073 URL: http://svn.reactos.org/svn/reactos?rev=23073&view=rev Log: Clean up NtGdiDdCreateDirectDrawObject and confirm it working. 1. Fix create hdc when it is NULL that is need to get ms windows xp d3dx.dll working in ReactOS, if some want try it. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sun Jul 16 16:03:41 2006 @@ -12,11 +12,14 @@ #define NDEBUG #include <debug.h> +GDIDEVICE IntGetPrimarySurface(VOID); /* swtich this off to get rid of all dx debug msg */ #define DX_DEBUG #define DdHandleTable GdiHandleTable + + /************************************************************************/ @@ -55,9 +58,8 @@ BOOL success; HANDLE hDirectDraw; PDD_DIRECTDRAW pDirectDraw; -#ifdef DX_DEBUG + DPRINT1("NtGdiDdCreateDirectDrawObject\n"); -#endif RtlZeroMemory(&callbacks, sizeof(DD_CALLBACKS)); callbacks.dwSize = sizeof(DD_CALLBACKS); @@ -70,29 +72,30 @@ /* we need create it, if in that case */ if (hdc == NULL) { + DPRINT1("FIXME hdc is NULL \n"); return NULL; } pDC = DC_LockDc(hdc); if (!pDC) + { return NULL; - - if (!pDC->DriverFunctions.EnableDirectDraw) - { - // Driver doesn't support DirectDraw + } + + if (pDC->DriverFunctions.EnableDirectDraw == NULL) + { + /* Driver doesn't support DirectDraw */ DC_UnlockDc(pDC); return NULL; } success = pDC->DriverFunctions.EnableDirectDraw( - pDC->PDev, &callbacks, &surface_callbacks, &palette_callbacks); + pDC->PDev, &callbacks, &surface_callbacks, &palette_callbacks); if (!success) { -#ifdef DX_DEBUG DPRINT1("DirectDraw creation failed\n"); -#endif - // DirectDraw creation failed + /* DirectDraw creation failed */ DC_UnlockDc(pDC); return NULL; } @@ -101,9 +104,6 @@ if (!hDirectDraw) { /* No more memmory */ -#ifdef DX_DEBUG - DPRINT1("No more memmory\n"); -#endif DC_UnlockDc(pDC); return NULL; } @@ -112,14 +112,10 @@ if (!pDirectDraw) { /* invalid handle */ -#ifdef DX_DEBUG - DPRINT1("invalid handle\n"); -#endif DC_UnlockDc(pDC); return NULL; } - pDirectDraw->Global.dhpdev = pDC->PDev; pDirectDraw->Local.lpGbl = &pDirectDraw->Global; @@ -128,16 +124,17 @@ /* DD_CALLBACKS setup */ RtlMoveMemory(&pDirectDraw->DD, &callbacks, sizeof(DD_CALLBACKS)); - - /* DD_SURFACECALLBACKS setup*/ + + /* DD_SURFACECALLBACKS setup*/ RtlMoveMemory(&pDirectDraw->Surf, &surface_callbacks, sizeof(DD_SURFACECALLBACKS)); - + /* DD_PALETTECALLBACKS setup*/ - RtlMoveMemory(&pDirectDraw->Pal, &surface_callbacks, sizeof(DD_PALETTECALLBACKS)); - + RtlMoveMemory(&pDirectDraw->Pal, &palette_callbacks, sizeof(DD_PALETTECALLBACKS)); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); DC_UnlockDc(pDC); + DPRINT1("DirectDraw return handler\n"); return hDirectDraw; }

1 0

[greatlrd] 23072: Start adding basic directdraw hal 2d interface, so we have a directdraw hal interface to test with, for vmware server does not come with directdraw interface for the the driver. for now everthing is stubed.
by greatlrd＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: greatlrd Date: Sun Jul 16 15:46:30 2006 New Revision: 23072 URL: http://svn.reactos.org/svn/reactos?rev=23072&view=rev Log: Start adding basic directdraw hal 2d interface, so we have a directdraw hal interface to test with, for vmware server does not come with directdraw interface for the the driver. for now everthing is stubed. Added: trunk/reactos/drivers/video/displays/framebuf/dd.c (with props) trunk/reactos/drivers/video/displays/framebuf/ddenable.c (with props) Modified: trunk/reactos/drivers/video/displays/framebuf/enable.c trunk/reactos/drivers/video/displays/framebuf/framebuf.h trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild Added: trunk/reactos/drivers/video/displays/framebuf/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/dd.c (added) +++ trunk/reactos/drivers/video/displays/framebuf/dd.c Sun Jul 16 15:46:30 2006 @@ -1,0 +1,24 @@ +/* + * ReactOS Generic Framebuffer display driver directdraw interface + * + * Copyright (C) 2006 Magnus Olsen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/* Here we put in all 2d api for directdraw and redirect some of them to GDI api */ + +#include "framebuf.h" + Propchange: trunk/reactos/drivers/video/displays/framebuf/dd.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/video/displays/framebuf/ddenable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/ddenable.c (added) +++ trunk/reactos/drivers/video/displays/framebuf/ddenable.c Sun Jul 16 15:46:30 2006 @@ -1,0 +1,82 @@ +/* + * ReactOS Generic Framebuffer display driver directdraw interface + * + * Copyright (C) 2006 Magnus Olsen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "framebuf.h" + +VOID DDKAPI +DrvDisableDirectDraw( IN DHPDEV dhpdev) +{ + PPDEV ppdev = (PPDEV)dhpdev; + ppdev->bDDInitialized = FALSE; + /* Add Clean up code here if we need it + when we shout down directx interface */ +} + +BOOL DDKAPI +DrvEnableDirectDraw( + IN DHPDEV dhpdev, + OUT DD_CALLBACKS *pCallBacks, + OUT DD_SURFACECALLBACKS *pSurfaceCallBacks, + OUT DD_PALETTECALLBACKS *pPaletteCallBacks) +{ + PPDEV ppdev = (PPDEV)dhpdev; + + if (ppdev->bDDInitialized == TRUE) + { + return TRUE; + } + + if (pCallBacks !=NULL) + { + memset(pCallBacks,0,sizeof(DD_CALLBACKS)); + + /* FILL pCallBacks with hal stuff */ + } + + if (pSurfaceCallBacks !=NULL) + { + memset(pSurfaceCallBacks,0,sizeof(DD_SURFACECALLBACKS)); + + /* FILL pSurfaceCallBacks with hal stuff */ + } + + if (pPaletteCallBacks !=NULL) + { + memset(pPaletteCallBacks,0,sizeof(DD_PALETTECALLBACKS)); + + /* FILL pPaletteCallBacks with hal stuff */ + } + + ppdev->bDDInitialized = TRUE; + return ppdev->bDDInitialized; +} + +BOOL DDKAPI +DrvGetDirectDrawInfo( + IN DHPDEV dhpdev, + OUT DD_HALINFO *pHalInfo, + OUT DWORD *pdwNumHeaps, + OUT VIDEOMEMORY *pvmList, + OUT DWORD *pdwNumFourCCCodes, + OUT DWORD *pdwFourCC) +{ + return FALSE; +} + Propchange: trunk/reactos/drivers/video/displays/framebuf/ddenable.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/video/displays/framebuf/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/enable.c (original) +++ trunk/reactos/drivers/video/displays/framebuf/enable.c Sun Jul 16 15:46:30 2006 @@ -31,7 +31,12 @@ {INDEX_DrvGetModes, (PFN)DrvGetModes}, {INDEX_DrvSetPalette, (PFN)DrvSetPalette}, {INDEX_DrvSetPointerShape, (PFN)DrvSetPointerShape}, - {INDEX_DrvMovePointer, (PFN)DrvMovePointer} + {INDEX_DrvMovePointer, (PFN)DrvMovePointer}, + {INDEX_DrvGetDirectDrawInfo, (PFN) DrvGetDirectDrawInfo }, + {INDEX_DrvEnableDirectDraw, (PFN) DrvEnableDirectDraw }, + {INDEX_DrvDisableDirectDraw, (PFN) DrvDisableDirectDraw } + + }; /* Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h Sun Jul 16 15:46:30 2006 @@ -52,7 +52,7 @@ PVOID ScreenPtr; HPALETTE DefaultPalette; PALETTEENTRY *PaletteEntries; - + #ifdef EXPERIMENTAL_MOUSE_CURSOR_SUPPORT VIDEO_POINTER_ATTRIBUTES PointerAttributes; XLATEOBJ *PointerXlateObject; @@ -61,12 +61,38 @@ HSURF PointerSaveSurface; POINTL PointerHotSpot; #endif + + /* DirectX Support */ + BOOL bDDInitialized; } PDEV, *PPDEV; #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define DEVICE_NAME L"framebuf" #define ALLOC_TAG TAG('F','B','U','F') + +VOID STDCALL +DrvDisableDirectDraw( + IN DHPDEV dhpdev); + + +BOOL STDCALL +DrvEnableDirectDraw( + IN DHPDEV dhpdev, + OUT DD_CALLBACKS *pCallBacks, + OUT DD_SURFACECALLBACKS *pSurfaceCallBacks, + OUT DD_PALETTECALLBACKS *pPaletteCallBacks); + + +BOOL STDCALL +DrvGetDirectDrawInfo( + IN DHPDEV dhpdev, + OUT DD_HALINFO *pHalInfo, + OUT DWORD *pdwNumHeaps, + OUT VIDEOMEMORY *pvmList, + OUT DWORD *pdwNumFourCCCodes, + OUT DWORD *pdwFourCC); + DHPDEV STDCALL DrvEnablePDEV( @@ -157,4 +183,7 @@ IN ULONG iStart, IN ULONG cColors); + + #endif /* FRAMEBUF_H */ + Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild Sun Jul 16 15:46:30 2006 @@ -9,5 +9,7 @@ <file>pointer.c</file> <file>screen.c</file> <file>surface.c</file> + <file>ddenable.c</file> + <file>dd.c</file> <file>framebuf.rc</file> </module>

1 0

[jimtabor] 23071: Fix typo
by jimtabor＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: jimtabor Date: Sun Jul 16 05:40:36 2006 New Revision: 23071 URL: http://svn.reactos.org/svn/reactos?rev=23071&view=rev Log: Fix typo Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Sun Jul 16 05:40:36 2006 @@ -4073,7 +4073,7 @@ if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) &miiW, FALSE)) return FALSE; - RtlCopyMemory(mii, &miiW, miiW.cbSize); // looks okay to over right user data. + RtlCopyMemory(mii, &miiW, miiW.cbSize); // looks okay to over write user data. if (!String || !Count) {

1 0

[jimtabor] 23070: User32: Menu.c I found a small problem with drawing menu popups. This fixes the problem.
by jimtabor＠svn.reactos.org 16 Jul '06

16 Jul '06

Author: jimtabor Date: Sun Jul 16 04:33:50 2006 New Revision: 23070 URL: http://svn.reactos.org/svn/reactos?rev=23070&view=rev Log: User32: Menu.c I found a small problem with drawing menu popups. This fixes the problem. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Sun Jul 16 04:33:50 2006 @@ -4008,9 +4008,12 @@ if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO)&miiW, FALSE)) return FALSE; + RtlCopyMemory(mii, &miiW, miiW.cbSize); + if (!AnsiBuffer || !Count) { if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); + mii->dwTypeData = AnsiBuffer; mii->cch = miiW.cch; return TRUE; } @@ -4022,7 +4025,6 @@ } RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); - RtlCopyMemory(mii, &miiW, miiW.cbSize); mii->dwTypeData = AnsiBuffer; mii->cch = strlen(AnsiBuffer); return TRUE; @@ -4071,9 +4073,12 @@ if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) &miiW, FALSE)) return FALSE; + RtlCopyMemory(mii, &miiW, miiW.cbSize); // looks okay to over right user data. + if (!String || !Count) { if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); + mii->dwTypeData = String; // may not be zero. mii->cch = miiW.cch; return TRUE; } @@ -4084,7 +4089,6 @@ } RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); - RtlCopyMemory(mii, &miiW, miiW.cbSize); mii->dwTypeData = String; mii->cch = strlenW(String); return TRUE;

1 0

[greatlrd] 23069: disable the screensaver from bootcd and livecd reason : qemu and vmware 5.0 / 5.5 is afacted by same bug, it does not reading the timeout value right. I need figout why, it is working in vmware server as it should
by greatlrd＠svn.reactos.org 15 Jul '06

15 Jul '06

Author: greatlrd Date: Sun Jul 16 03:50:51 2006 New Revision: 23069 URL: http://svn.reactos.org/svn/reactos?rev=23069&view=rev Log: disable the screensaver from bootcd and livecd reason : qemu and vmware 5.0 / 5.5 is afacted by same bug, it does not reading the timeout value right. I need figout why, it is working in vmware server as it should Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf (original) +++ trunk/reactos/boot/bootdata/hivedef.inf Sun Jul 16 03:50:51 2006 @@ -10,7 +10,7 @@ HKCU,"Control Panel\Desktop","DragFullWindows",0x00000002,"0" HKCU,"Control Panel\Desktop","PaintDesktopVersion",0x00010001,"0" HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000" -HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"matrix.scr" +HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" HKCU,"Control Panel\International",,0x00000012

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006