Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[chorns] 18709: Have pre-compiled header rule depend on widl generated headers
by chorns＠svn.reactos.com 23 Oct '05

23 Oct '05

Have pre-compiled header rule depend on widl generated headers Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-10-23 14:44:12 UTC (rev 18708) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-10-23 14:51:35 UTC (rev 18709) @@ -1565,10 +1565,15 @@ const string& baseHeaderFilename = module.pch->file.name; const string& pchFilename = GetPrecompiledHeaderFilename (); CLEAN_FILE(pchFilename); + string dependencies = baseHeaderFilename; + /* WIDL generated headers may be used */ + vector<string> rpcDependencies; + GetRpcHeaderDependencies ( rpcDependencies ); + dependencies += " " + v2s ( rpcDependencies, 5 ); fprintf ( fMakefile, "%s: %s\n", pchFilename.c_str(), - baseHeaderFilename.c_str() ); + dependencies.c_str() ); fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); fprintf ( fMakefile, "\t%s -o %s %s -g %s\n\n",

1 0

[cwittich] 18708: german translation
by cwittich＠svn.reactos.com 23 Oct '05

23 Oct '05

german translation Modified: trunk/reactos/lib/syssetup/syssetup_De.rc _____ Modified: trunk/reactos/lib/syssetup/syssetup_De.rc --- trunk/reactos/lib/syssetup/syssetup_De.rc 2005-10-23 14:39:51 UTC (rev 18707) +++ trunk/reactos/lib/syssetup/syssetup_De.rc 2005-10-23 14:44:12 UTC (rev 18708) @@ -205,7 +205,7 @@ STRINGTABLE BEGIN - IDS_GAMES "Games" + IDS_GAMES "Spiele" IDS_CMT_SOLITAIRE "Solitaire" IDS_CMT_WINEMINE "WineMine" END

1 0

[ros-diffs] [gedmurphy] 18707: - Now that WineMine is working again, put it in the start menu
by gedmurphy＠svn.reactos.com 23 Oct '05

23 Oct '05

- Now that WineMine is working again, put it in the start menu - All rc files currently in English Modified: trunk/reactos/lib/syssetup/install.c Modified: trunk/reactos/lib/syssetup/syssetup_Cz.rc Modified: trunk/reactos/lib/syssetup/syssetup_De.rc Modified: trunk/reactos/lib/syssetup/syssetup_En.rc Modified: trunk/reactos/lib/syssetup/syssetup_Fr.rc Modified: trunk/reactos/lib/syssetup/syssetup_Ja.rc Modified: trunk/reactos/lib/syssetup/syssetup_Nl.rc _____ Modified: trunk/reactos/lib/syssetup/install.c --- trunk/reactos/lib/syssetup/install.c 2005-10-23 13:11:31 UTC (rev 18706) +++ trunk/reactos/lib/syssetup/install.c 2005-10-23 14:39:51 UTC (rev 18707) @@ -401,6 +401,7 @@ TCHAR sAccessories[256]; TCHAR sGames[256]; TCHAR Sys[MAX_PATH]; + TCHAR GamePath[MAX_PATH]; # if 0 @@ -453,11 +454,15 @@ /* create Games subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) { if(GetSystemDirectory(Sys, MAX_PATH)) { - if((_taccess(_tcscat(Sys, _T("\\sol.exe")), 0 )) != -1) + /* copy system dir */ + _tcscpy(GamePath, Sys); + /* concatonate full file path and check for existance */ + if((_taccess(_tcscat(GamePath, _T("\\sol.exe")), 0 )) != -1) CreateShortcut(CSIDL_PROGRAMS, sGames, _T("Solitaire.lnk"), _T("sol.exe"), IDS_CMT_SOLITAIRE); - /* winemine is broken - if((_taccess(_tcscat(Sys, _T("\\winemine.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, sGames, _T("winemine.lnk"), _T("winemine.exe"), IDS_CMT_WINEMINE); */ + + _tcscpy(GamePath, Sys); + if((_taccess(_tcscat(GamePath, _T("\\winemine.exe")), 0 )) != -1) + CreateShortcut(CSIDL_PROGRAMS, sGames, _T("winemine.lnk"), _T("winemine.exe"), IDS_CMT_WINEMINE); } } _____ Modified: trunk/reactos/lib/syssetup/syssetup_Cz.rc --- trunk/reactos/lib/syssetup/syssetup_Cz.rc 2005-10-23 13:11:31 UTC (rev 18706) +++ trunk/reactos/lib/syssetup/syssetup_Cz.rc 2005-10-23 14:39:51 UTC (rev 18707) @@ -189,4 +189,21 @@ IDS_PROCESSSUBTITLE "Process page subtitle" END +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Accessories" + IDS_CMT_CMD "Open command prompt" + IDS_CMT_EXPLORER "Launch Explorer" + IDS_CMT_WINEFILE "Launch Winefile" + IDS_CMT_NOTEPAD "Launch Text Editor" + IDS_CMT_REGEDIT "Launch Registry Editor" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Games" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" +END + /* EOF */ _____ Modified: trunk/reactos/lib/syssetup/syssetup_De.rc --- trunk/reactos/lib/syssetup/syssetup_De.rc 2005-10-23 13:11:31 UTC (rev 18706) +++ trunk/reactos/lib/syssetup/syssetup_De.rc 2005-10-23 14:39:51 UTC (rev 18707) @@ -203,4 +203,11 @@ IDS_CMT_REGEDIT "Starte Registry Editor" END +STRINGTABLE +BEGIN + IDS_GAMES "Games" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" +END + /* EOF */ _____ Modified: trunk/reactos/lib/syssetup/syssetup_En.rc --- trunk/reactos/lib/syssetup/syssetup_En.rc 2005-10-23 13:11:31 UTC (rev 18706) +++ trunk/reactos/lib/syssetup/syssetup_En.rc 2005-10-23 14:39:51 UTC (rev 18707) @@ -208,6 +208,7 @@ BEGIN IDS_GAMES "Games" IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" END _____ Modified: trunk/reactos/lib/syssetup/syssetup_Fr.rc --- trunk/reactos/lib/syssetup/syssetup_Fr.rc 2005-10-23 13:11:31 UTC (rev 18706) +++ trunk/reactos/lib/syssetup/syssetup_Fr.rc 2005-10-23 14:39:51 UTC (rev 18707) @@ -194,4 +194,21 @@ IDS_PROCESSSUBTITLE "Process page subtitle" END +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Accessories" + IDS_CMT_CMD "Open command prompt" + IDS_CMT_EXPLORER "Launch Explorer" + IDS_CMT_WINEFILE "Launch Winefile" + IDS_CMT_NOTEPAD "Launch Text Editor" + IDS_CMT_REGEDIT "Launch Registry Editor" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Games" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" +END + /* EOF */ _____ Modified: trunk/reactos/lib/syssetup/syssetup_Ja.rc --- trunk/reactos/lib/syssetup/syssetup_Ja.rc 2005-10-23 13:11:31 UTC (rev 18706) +++ trunk/reactos/lib/syssetup/syssetup_Ja.rc 2005-10-23 14:39:51 UTC (rev 18707) @@ -194,4 +194,21 @@ IDS_PROCESSSUBTITLE "Process page subtitle" END +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Accessories" + IDS_CMT_CMD "Open command prompt" + IDS_CMT_EXPLORER "Launch Explorer" + IDS_CMT_WINEFILE "Launch Winefile" + IDS_CMT_NOTEPAD "Launch Text Editor" + IDS_CMT_REGEDIT "Launch Registry Editor" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Games" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" +END + /* EOF */ _____ Modified: trunk/reactos/lib/syssetup/syssetup_Nl.rc --- trunk/reactos/lib/syssetup/syssetup_Nl.rc 2005-10-23 13:11:31 UTC (rev 18706) +++ trunk/reactos/lib/syssetup/syssetup_Nl.rc 2005-10-23 14:39:51 UTC (rev 18707) @@ -193,4 +193,22 @@ IDS_PROCESSTITLE "Process page title" IDS_PROCESSSUBTITLE "Process page subtitle" END + +STRINGTABLE +BEGIN + IDS_ACCESSORIES "Accessories" + IDS_CMT_CMD "Open command prompt" + IDS_CMT_EXPLORER "Launch Explorer" + IDS_CMT_WINEFILE "Launch Winefile" + IDS_CMT_NOTEPAD "Launch Text Editor" + IDS_CMT_REGEDIT "Launch Registry Editor" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Games" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" +END + /* EOF */

1 0

[gvg] 18706: Can't have a release without WineMine:
by gvg＠svn.reactos.com 23 Oct '05

23 Oct '05

Can't have a release without WineMine: Add resource file, makes winemine playable again Modified: branches/ros-branch-0_2_8/rosapps/games/winemine/winemine.xml _____ Modified: branches/ros-branch-0_2_8/rosapps/games/winemine/winemine.xml --- branches/ros-branch-0_2_8/rosapps/games/winemine/winemine.xml 2005-10-23 13:06:34 UTC (rev 18705) +++ branches/ros-branch-0_2_8/rosapps/games/winemine/winemine.xml 2005-10-23 13:11:31 UTC (rev 18706) @@ -7,4 +7,5 @@ <library>gdi32</library> <file>main.c</file> <file>dialog.c</file> + <file>winemine.rc</file> </module>

1 0

[gvg] 18705: Add resource file, makes winemine playable again
by gvg＠svn.reactos.com 23 Oct '05

23 Oct '05

Add resource file, makes winemine playable again Modified: trunk/rosapps/games/winemine/winemine.xml _____ Modified: trunk/rosapps/games/winemine/winemine.xml --- trunk/rosapps/games/winemine/winemine.xml 2005-10-23 12:41:54 UTC (rev 18704) +++ trunk/rosapps/games/winemine/winemine.xml 2005-10-23 13:06:34 UTC (rev 18705) @@ -7,4 +7,5 @@ <library>gdi32</library> <file>main.c</file> <file>dialog.c</file> + <file>winemine.rc</file> </module>

1 0

[hpoussin] 18704: Implement SetupDiSetDeviceRegistryPropertyW (not tested)
by hpoussin＠svn.reactos.com 23 Oct '05

23 Oct '05

Implement SetupDiSetDeviceRegistryPropertyW (not tested) Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-23 12:36:40 UTC (rev 18703) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-23 12:41:54 UTC (rev 18704) @@ -2247,6 +2247,7 @@ case SPDRP_SECURITY: case SPDRP_SERVICE: case SPDRP_UI_NUMBER: + case SPDRP_UI_NUMBER_DESC_FORMAT: case SPDRP_UPPERFILTERS: { LPCWSTR RegistryPropertyName; @@ -2284,6 +2285,8 @@ RegistryPropertyName = L"Service"; break; case SPDRP_UI_NUMBER: RegistryPropertyName = L"UINumber"; break; + case SPDRP_UI_NUMBER_DESC_FORMAT: + RegistryPropertyName = L"UINumberDescFormat"; break; case SPDRP_UPPERFILTERS: RegistryPropertyName = L"UpperFilters"; break; default: @@ -2367,7 +2370,6 @@ case SPDRP_EXCLUSIVE: case SPDRP_CHARACTERISTICS: case SPDRP_ADDRESS: - case SPDRP_UI_NUMBER_DESC_FORMAT: case SPDRP_DEVICE_POWER_DATA:*/ #if (WINVER >= 0x501) /*case SPDRP_REMOVAL_POLICY: @@ -2388,8 +2390,156 @@ return ret; } +/********************************************************************** * + * SetupDiSetDeviceRegistryPropertyA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetDeviceRegistryPropertyA( + IN HDEVINFO DeviceInfoSet, + IN OUT PSP_DEVINFO_DATA DeviceInfoData, + IN DWORD Property, + IN CONST BYTE *PropertyBuffer, + IN DWORD PropertyBufferSize) +{ + FIXME("%p %p 0x%lx %p 0x%lx\n", DeviceInfoSet, DeviceInfoData, + Property, PropertyBuffer, PropertyBufferSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} /*********************************************************************** + * SetupDiSetDeviceRegistryPropertyW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetDeviceRegistryPropertyW( + IN HDEVINFO DeviceInfoSet, + IN OUT PSP_DEVINFO_DATA DeviceInfoData, + IN DWORD Property, + IN const BYTE *PropertyBuffer, + IN DWORD PropertyBufferSize) +{ + struct DeviceInfoSet *list; + BOOL ret = FALSE; + + TRACE("%p %p 0x%lx %p 0x%lx\n", DeviceInfoSet, DeviceInfoData, + Property, PropertyBuffer, PropertyBufferSize); + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_HANDLE); + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoData) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + switch (Property) + { + case SPDRP_COMPATIBLEIDS: + case SPDRP_CONFIGFLAGS: + case SPDRP_FRIENDLYNAME: + case SPDRP_HARDWAREID: + case SPDRP_LOCATION_INFORMATION: + case SPDRP_LOWERFILTERS: + case SPDRP_SECURITY: + case SPDRP_SERVICE: + case SPDRP_UI_NUMBER_DESC_FORMAT: + case SPDRP_UPPERFILTERS: + { + LPCWSTR RegistryPropertyName; + DWORD RegistryDataType; + HKEY hKey; + LONG rc; + + switch (Property) + { + case SPDRP_COMPATIBLEIDS: + RegistryPropertyName = L"CompatibleIDs"; + RegistryDataType = REG_MULTI_SZ; + break; + case SPDRP_CONFIGFLAGS: + RegistryPropertyName = L"ConfigFlags"; + RegistryDataType = REG_DWORD; + break; + case SPDRP_FRIENDLYNAME: + RegistryPropertyName = L"FriendlyName"; + RegistryDataType = REG_SZ; + break; + case SPDRP_HARDWAREID: + RegistryPropertyName = L"HardwareID"; + RegistryDataType = REG_MULTI_SZ; + break; + case SPDRP_LOCATION_INFORMATION: + RegistryPropertyName = L"LocationInformation"; + RegistryDataType = REG_SZ; + break; + case SPDRP_LOWERFILTERS: + RegistryPropertyName = L"LowerFilters"; + RegistryDataType = REG_MULTI_SZ; + break; + case SPDRP_SECURITY: + RegistryPropertyName = L"Security"; + RegistryDataType = REG_BINARY; + break; + case SPDRP_SERVICE: + RegistryPropertyName = L"Service"; + RegistryDataType = REG_SZ; + break; + case SPDRP_UI_NUMBER_DESC_FORMAT: + RegistryPropertyName = L"UINumberDescFormat"; + RegistryDataType = REG_SZ; + break; + case SPDRP_UPPERFILTERS: + RegistryPropertyName = L"UpperFilters"; + RegistryDataType = REG_MULTI_SZ; + break; + default: + /* Should not happen */ + RegistryPropertyName = NULL; + RegistryDataType = REG_BINARY; + break; + } + /* Open device registry key */ + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_SET_VALUE); + if (hKey != INVALID_HANDLE_VALUE) + { + /* Write new data */ + rc = RegSetValueExW( + hKey, + RegistryPropertyName, + 0, /* Reserved */ + RegistryDataType, + PropertyBuffer, + PropertyBufferSize); + if (rc == ERROR_SUCCESS) + ret = TRUE; + else + SetLastError(rc); + RegCloseKey(hKey); + } + break; + } + + /*case SPDRP_CHARACTERISTICS: + case SPDRP_DEVTYPE: + case SPDRP_EXCLUSIVE:*/ +#if (WINVER >= 0x501) + //case SPDRP_REMOVAL_POLICY_OVERRIDE: +#endif + //case SPDRP_SECURITY_SDS: + + default: + { + FIXME("Property 0x%lx not implemented\n", Property); + SetLastError(ERROR_NOT_SUPPORTED); + } + } + } + + TRACE("Returning %d\n", ret); + return ret; +} + +/********************************************************************** * * SetupDiInstallClassA (SETUPAPI.@) */ BOOL WINAPI SetupDiInstallClassA( _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-10-23 12:36:40 UTC (rev 18703) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-10-23 12:41:54 UTC (rev 18704) @@ -376,8 +376,8 @@ @ stub SetupDiSetClassInstallParamsW @ stub SetupDiSetDeviceInstallParamsA @ stdcall SetupDiSetDeviceInstallParamsW(ptr ptr ptr) -@ stub SetupDiSetDeviceRegistryPropertyA -@ stub SetupDiSetDeviceRegistryPropertyW +@ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr long) +@ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr long) @ stub SetupDiSetDriverInstallParamsA @ stub SetupDiSetDriverInstallParamsW @ stub SetupDiSetSelectedDevice

1 0

[greatlrd] 18703: fix some typo error in DD_VIDEOPORTCALLBACKS
by greatlrd＠svn.reactos.com 23 Oct '05

23 Oct '05

fix some typo error in DD_VIDEOPORTCALLBACKS Modified: trunk/reactos/w32api/include/ddk/ddrawint.h _____ Modified: trunk/reactos/w32api/include/ddk/ddrawint.h --- trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-23 11:55:49 UTC (rev 18702) +++ trunk/reactos/w32api/include/ddk/ddrawint.h 2005-10-23 12:36:40 UTC (rev 18703) @@ -303,7 +303,7 @@ } DD_UPDATEOVERLAYDATA, *PDD_UPDATEOVERLAYDATA; typedef DWORD (STDCALL *PDD_SURFCB_UPDATEOVERLAY)(PDD_UPDATEOVERLAYDATA); -typedef struct +typedef struct _DD_SETOVERLAYPOSITIONDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpDDSrcSurface; @@ -315,7 +315,7 @@ } DD_SETOVERLAYPOSITIONDATA, *PDD_SETOVERLAYPOSITIONDATA; typedef DWORD (STDCALL *PDD_SURFCB_SETOVERLAYPOSITION)(PDD_SETOVERLAYPOSITIONDATA); -typedef struct +typedef struct _DD_SETPALETTEDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpDDSurface; @@ -326,7 +326,7 @@ } DD_SETPALETTEDATA, *PDD_SETPALETTEDATA; typedef DWORD (STDCALL *PDD_SURFCB_SETPALETTE)(PDD_SETPALETTEDATA); -typedef struct +typedef struct _DD_FLIPDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpSurfCurr; @@ -339,7 +339,7 @@ } DD_FLIPDATA, *PDD_FLIPDATA; typedef DWORD (STDCALL *PDD_SURFCB_FLIP)(PDD_FLIPDATA); -typedef struct +typedef struct _DD_DESTROYSURFACEDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpDDSurface; @@ -348,7 +348,7 @@ } DD_DESTROYSURFACEDATA, *PDD_DESTROYSURFACEDATA; typedef DWORD (STDCALL *PDD_SURFCB_DESTROYSURFACE)(PDD_DESTROYSURFACEDATA); -typedef struct +typedef struct _DD_SETCLIPLISTDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpDDSurface; @@ -357,7 +357,7 @@ } DD_SETCLIPLISTDATA, *PDD_SETCLIPLISTDATA; typedef DWORD (STDCALL *PDD_SURFCB_SETCLIPLIST)(PDD_SETCLIPLISTDATA); -typedef struct +typedef struct _DD_ADDATTACHEDSURFACEDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpDDSurface; @@ -367,7 +367,7 @@ } DD_ADDATTACHEDSURFACEDATA, *PDD_ADDATTACHEDSURFACEDATA; typedef DWORD (STDCALL *PDD_SURFCB_ADDATTACHEDSURFACE)(PDD_ADDATTACHEDSURFACEDATA); -typedef struct +typedef struct _DD_SETCOLORKEYDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpDDSurface; @@ -378,7 +378,7 @@ } DD_SETCOLORKEYDATA, *PDD_SETCOLORKEYDATA; typedef DWORD (STDCALL *PDD_SURFCB_SETCOLORKEY)(PDD_SETCOLORKEYDATA); -typedef struct +typedef struct _DD_GETBLTSTATUSDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpDDSurface; @@ -388,7 +388,7 @@ } DD_GETBLTSTATUSDATA, *PDD_GETBLTSTATUSDATA; typedef DWORD (STDCALL *PDD_SURFCB_GETBLTSTATUS)(PDD_GETBLTSTATUSDATA); -typedef struct +typedef struct _DD_GETFLIPSTATUSDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpDDSurface; @@ -398,7 +398,7 @@ } DD_GETFLIPSTATUSDATA, *PDD_GETFLIPSTATUSDATA; typedef DWORD (STDCALL *PDD_SURFCB_GETFLIPSTATUS)(PDD_GETFLIPSTATUSDATA); -typedef struct +typedef struct DD_SURFACECALLBACKS { DWORD dwSize; DWORD dwFlags; @@ -437,7 +437,7 @@ /* IDirectDraw callbacks */ /*********************************************************************** */ -typedef struct +typedef struct _DD_CREATESURFACEDATA { PDD_DIRECTDRAW_GLOBAL lpDD; DDSURFACEDESC *lpDDSurfaceDesc; @@ -448,7 +448,7 @@ } DD_CREATESURFACEDATA, *PDD_CREATESURFACEDATA; typedef DWORD (STDCALL *PDD_CREATESURFACE)(PDD_CREATESURFACEDATA); -typedef struct +typedef struct _DD_DRVSETCOLORKEYDATA { PDD_SURFACE_LOCAL lpDDSurface; DWORD dwFlags; @@ -460,7 +460,7 @@ #define DDWAITVB_I_TESTVB 0x80000006 -typedef struct +typedef struct _DD_WAITFORVERTICALBLANKDATA { PDD_DIRECTDRAW_GLOBAL lpDD; DWORD dwFlags; @@ -471,7 +471,7 @@ } DD_WAITFORVERTICALBLANKDATA, *PDD_WAITFORVERTICALBLANKDATA; typedef DWORD (STDCALL *PDD_WAITFORVERTICALBLANK)(PDD_WAITFORVERTICALBLANKDATA); -typedef struct +typedef struct _DD_CANCREATESURFACEDATA { PDD_DIRECTDRAW_GLOBAL lpDD; DDSURFACEDESC *lpDDSurfaceDesc; @@ -481,7 +481,7 @@ } DD_CANCREATESURFACEDATA, *PDD_CANCREATESURFACEDATA; typedef DWORD (STDCALL *PDD_CANCREATESURFACE)(PDD_CANCREATESURFACEDATA); -typedef struct +typedef struct _DD_CREATEPALETTEDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_PALETTE_GLOBAL lpDDPalette; @@ -492,7 +492,7 @@ } DD_CREATEPALETTEDATA, *PDD_CREATEPALETTEDATA; typedef DWORD (STDCALL *PDD_CREATEPALETTE)(PDD_CREATEPALETTEDATA); -typedef struct +typedef struct _DD_GETSCANLINEDATA { PDD_DIRECTDRAW_GLOBAL lpDD; DWORD dwScanLine; @@ -501,7 +501,7 @@ } DD_GETSCANLINEDATA, *PDD_GETSCANLINEDATA; typedef DWORD (STDCALL *PDD_GETSCANLINE)(PDD_GETSCANLINEDATA); -typedef struct +typedef struct _DD_MAPMEMORYDATA { PDD_DIRECTDRAW_GLOBAL lpDD; BOOL bMap; @@ -512,6 +512,8 @@ typedef DWORD (STDCALL *PDD_MAPMEMORY)(PDD_MAPMEMORYDATA); + + typedef struct _DD_DESTROYDRIVERDATA *PDD_DESTROYDRIVERDATA; typedef struct _DD_SETMODEDATA *PDD_SETMODEDATA; @@ -545,7 +547,7 @@ #define DDHAL_CB32_GETSCANLINE 0x00000080l #define DDHAL_CB32_MAPMEMORY 0x80000000l -typedef struct +typedef struct _DD_GETAVAILDRIVERMEMORYDATA { PDD_DIRECTDRAW_GLOBAL lpDD; DDSCAPS DDSCaps; @@ -556,9 +558,7 @@ } DD_GETAVAILDRIVERMEMORYDATA, *PDD_GETAVAILDRIVERMEMORYDATA; typedef DWORD (STDCALL *PDD_GETAVAILDRIVERMEMORY)(PDD_GETAVAILDRIVERMEMORYDATA); -DEFINE_GUID(GUID_MiscellaneousCallbacks, 0xEFD60CC0, 0x49E7, 0x11D0, 0x88, 0x9D, 0x00, 0xAA, 0x00, 0xBB, 0xB7, 0x6A); - -typedef struct +typedef struct _DD_MISCELLANEOUSCALLBACKS { DWORD dwSize; DWORD dwFlags; @@ -569,7 +569,7 @@ typedef DWORD (STDCALL *PDD_ALPHABLT)(PDD_BLTDATA); -typedef struct +typedef struct _DD_CREATESURFACEEXDATA { DWORD dwFlags; PDD_DIRECTDRAW_LOCAL lpDDLcl; @@ -578,7 +578,7 @@ } DD_CREATESURFACEEXDATA, *PDD_CREATESURFACEEXDATA; typedef DWORD (STDCALL *PDD_CREATESURFACEEX)(PDD_CREATESURFACEEXDATA); -typedef struct +typedef struct _DD_GETDRIVERSTATEDATA { DWORD dwFlags; union @@ -592,7 +592,7 @@ } DD_GETDRIVERSTATEDATA, *PDD_GETDRIVERSTATEDATA; typedef DWORD (STDCALL *PDD_GETDRIVERSTATE)(PDD_GETDRIVERSTATEDATA); -typedef struct +typedef struct _DD_DESTROYDDLOCALDATA { DWORD dwFlags; PDD_DIRECTDRAW_LOCAL pDDLcl; @@ -600,9 +600,9 @@ } DD_DESTROYDDLOCALDATA, *PDD_DESTROYDDLOCALDATA; typedef DWORD (STDCALL *PDD_DESTROYDDLOCAL)(PDD_DESTROYDDLOCALDATA); -DEFINE_GUID(GUID_Miscellaneous2Callbacks, 0x406B2F00, 0x3E5A, 0x11D1, 0xB6, 0x40, 0x00, 0xAA, 0x00, 0xA1, 0xF9, 0x6A); -typedef struct + +typedef struct _DD_MISCELLANEOUS2CALLBACKS { DWORD dwSize; DWORD dwFlags; @@ -619,7 +619,7 @@ #define DDHAL_MISC2CB32_DESTROYDDLOCAL 0x00000008 -typedef struct +typedef struct _DD_FREEDRIVERMEMORYDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_SURFACE_LOCAL lpDDSurface; @@ -628,7 +628,7 @@ } DD_FREEDRIVERMEMORYDATA, *PDD_FREEDRIVERMEMORYDATA; typedef DWORD (STDCALL *PDD_FREEDRIVERMEMORY)(PDD_FREEDRIVERMEMORYDATA); -typedef struct +typedef struct _DD_SETEXCLUSIVEMODEDATA { PDD_DIRECTDRAW_GLOBAL lpDD; DWORD dwEnterExcl; @@ -638,7 +638,7 @@ } DD_SETEXCLUSIVEMODEDATA, *PDD_SETEXCLUSIVEMODEDATA; typedef DWORD (STDCALL *PDD_SETEXCLUSIVEMODE)(PDD_SETEXCLUSIVEMODEDATA); -typedef struct +typedef struct _DD_FLIPTOGDISURFACEDATA { PDD_DIRECTDRAW_GLOBAL lpDD; DWORD dwToGDI; @@ -648,9 +648,9 @@ } DD_FLIPTOGDISURFACEDATA, *PDD_FLIPTOGDISURFACEDATA; typedef DWORD (STDCALL *PDD_FLIPTOGDISURFACE)(PDD_FLIPTOGDISURFACEDATA); -DEFINE_GUID(GUID_NTCallbacks, 0x6FE9ECDE, 0xDF89, 0x11D1, 0x9D, 0xB0, 0x00, 0x60, 0x08, 0x27, 0x71, 0xBA); -typedef struct + +typedef struct _DD_NTCALLBACKS { DWORD dwSize; DWORD dwFlags; @@ -659,18 +659,16 @@ PDD_FLIPTOGDISURFACE FlipToGDISurface; } DD_NTCALLBACKS, *PDD_NTCALLBACKS; -enum -{ - DDHAL_NTCB32_FREEDRIVERMEMORY = 1<<0, - DDHAL_NTCB32_SETEXCLUSIVEMODE = 1<<1, - DDHAL_NTCB32_FLIPTOGDISURFACE = 1<<2, -}; +#define DDHAL_NTCB32_FREEDRIVERMEMORY 0x00000001 +#define DDHAL_NTCB32_SETEXCLUSIVEMODE 0x00000002 +#define DDHAL_NTCB32_FLIPTOGDISURFACE 0x00000004 + /*********************************************************************** */ /* IDirectDrawPalette callbacks */ /*********************************************************************** */ -typedef struct +typedef struct _DD_DESTROYPALETTEDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_PALETTE_GLOBAL lpDDPalette; @@ -679,7 +677,7 @@ } DD_DESTROYPALETTEDATA, *PDD_DESTROYPALETTEDATA; typedef DWORD (STDCALL *PDD_PALCB_DESTROYPALETTE)(PDD_DESTROYPALETTEDATA); -typedef struct +typedef struct _DD_SETENTRIESDATA { PDD_DIRECTDRAW_GLOBAL lpDD; PDD_PALETTE_GLOBAL lpDDPalette; @@ -691,7 +689,7 @@ } DD_SETENTRIESDATA, *PDD_SETENTRIESDATA; typedef DWORD (STDCALL *PDD_PALCB_SETENTRIES)(PDD_SETENTRIESDATA); -typedef struct +typedef struct DD_PALETTECALLBACKS { DWORD dwSize; DWORD dwFlags; @@ -706,7 +704,7 @@ /* IDirectDrawVideoport callbacks */ /*********************************************************************** */ -typedef struct +typedef struct _DD_CANCREATEVPORTDATA { PDD_DIRECTDRAW_LOCAL lpDD; LPDDVIDEOPORTDESC lpDDVideoPortDesc; @@ -715,7 +713,7 @@ } DD_CANCREATEVPORTDATA, *PDD_CANCREATEVPORTDATA; typedef DWORD (STDCALL *PDD_VPORTCB_CANCREATEVIDEOPORT)(PDD_CANCREATEVPORTDATA); -typedef struct +typedef struct _DD_CREATEVPORTDATA { PDD_DIRECTDRAW_LOCAL lpDD; LPDDVIDEOPORTDESC lpDDVideoPortDesc; @@ -725,7 +723,7 @@ } DD_CREATEVPORTDATA, *PDD_CREATEVPORTDATA; typedef DWORD (STDCALL *PDD_VPORTCB_CREATEVIDEOPORT)(PDD_CREATEVPORTDATA); -typedef struct +typedef struct _DD_FLIPVPORTDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_VIDEOPORT_LOCAL lpVideoPort; @@ -736,7 +734,7 @@ } DD_FLIPVPORTDATA, *PDD_FLIPVPORTDATA; typedef DWORD (STDCALL *PDD_VPORTCB_FLIP)(PDD_FLIPVPORTDATA); -typedef struct +typedef struct _DD_GETVPORTBANDWIDTHDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_VIDEOPORT_LOCAL lpVideoPort; @@ -750,7 +748,7 @@ } DD_GETVPORTBANDWIDTHDATA, *PDD_GETVPORTBANDWIDTHDATA; typedef DWORD (STDCALL *PDD_VPORTCB_GETBANDWIDTH)(PDD_GETVPORTBANDWIDTHDATA); -typedef struct +typedef struct _DD_GETVPORTINPUTFORMATDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_VIDEOPORT_LOCAL lpVideoPort; @@ -762,7 +760,7 @@ } DD_GETVPORTINPUTFORMATDATA, *PDD_GETVPORTINPUTFORMATDATA; typedef DWORD (STDCALL *PDD_VPORTCB_GETINPUTFORMATS)(PDD_GETVPORTINPUTFORMATDATA); -typedef struct +typedef struct _DD_GETVPORTOUTPUTFORMATDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_VIDEOPORT_LOCAL lpVideoPort; @@ -775,7 +773,7 @@ } DD_GETVPORTOUTPUTFORMATDATA, *PDD_GETVPORTOUTPUTFORMATDATA; typedef DWORD (STDCALL *PDD_VPORTCB_GETOUTPUTFORMATS)(PDD_GETVPORTOUTPUTFORMATDATA); -typedef struct +typedef struct _DD_GETVPORTFIELDDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_VIDEOPORT_LOCAL lpVideoPort; @@ -785,7 +783,7 @@ } DD_GETVPORTFIELDDATA, *PDD_GETVPORTFIELDDATA; typedef DWORD (STDCALL *PDD_VPORTCB_GETFIELD)(PDD_GETVPORTFIELDDATA); -typedef struct +typedef struct _DD_GETVPORTLINEDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_VIDEOPORT_LOCAL lpVideoPort; @@ -795,7 +793,7 @@ } DD_GETVPORTLINEDATA, *PDD_GETVPORTLINEDATA; typedef DWORD (STDCALL *PDD_VPORTCB_GETLINE)(PDD_GETVPORTLINEDATA); -typedef struct +typedef struct _DD_GETVPORTCONNECTDATA { PDD_DIRECTDRAW_LOCAL lpDD; DWORD dwPortId; @@ -806,7 +804,7 @@ } DD_GETVPORTCONNECTDATA, *PDD_GETVPORTCONNECTDATA; typedef DWORD (STDCALL *PDD_VPORTCB_GETVPORTCONNECT)(PDD_GETVPORTCONNECTDATA); -typedef struct +typedef struct _DD_DESTROYVPORTDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_VIDEOPORT_LOCAL lpVideoPort; @@ -815,7 +813,7 @@ } DD_DESTROYVPORTDATA, *PDD_DESTROYVPORTDATA; typedef DWORD (STDCALL *PDD_VPORTCB_DESTROYVPORT)(PDD_DESTROYVPORTDATA); -typedef struct +typedef struct _DD_GETVPORTFLIPSTATUSDATA { PDD_DIRECTDRAW_LOCAL lpDD; FLATPTR fpSurface; @@ -826,7 +824,7 @@ -typedef struct +typedef struct _DD_UPDATEVPORTDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_VIDEOPORT_LOCAL lpVideoPort; @@ -841,7 +839,7 @@ } DD_UPDATEVPORTDATA, *PDD_UPDATEVPORTDATA; typedef DWORD (STDCALL *PDD_VPORTCB_UPDATE)(PDD_UPDATEVPORTDATA); -typedef struct +typedef struct _DD_WAITFORVPORTSYNCDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_VIDEOPORT_LOCAL lpVideoPort; @@ -853,7 +851,7 @@ } DD_WAITFORVPORTSYNCDATA, *PDD_WAITFORVPORTSYNCDATA; typedef DWORD (STDCALL *PDD_VPORTCB_WAITFORSYNC)(PDD_WAITFORVPORTSYNCDATA); -typedef struct +typedef struct _DD_GETVPORTSIGNALDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_VIDEOPORT_LOCAL lpVideoPort; @@ -865,7 +863,7 @@ -typedef struct +typedef struct _DD_VPORTCOLORDATA { PDD_DIRECTDRAW_LOCAL lpDD; PDD_VIDEOPORT_LOCAL lpVideoPort; @@ -876,9 +874,8 @@ } DD_VPORTCOLORDATA, *PDD_VPORTCOLORDATA; typedef DWORD (STDCALL *PDD_VPORTCB_COLORCONTROL)(PDD_VPORTCOLORDATA); -DEFINE_GUID(GUID_VideoPortCallbacks, 0xEFD60CC1, 0x49E7, 0x11D0, 0x88, 0x9D, 0x00, 0xAA, 0x00, 0xBB, 0xB7, 0x6A); -typedef struct +typedef struct DD_VIDEOPORTCALLBACKS { DWORD dwSize; DWORD dwFlags; @@ -888,7 +885,7 @@ PDD_VPORTCB_GETBANDWIDTH GetVideoPortBandwidth; PDD_VPORTCB_GETINPUTFORMATS GetVideoPortInputFormats; PDD_VPORTCB_GETOUTPUTFORMATS GetVideoPortOutputFormats; - PVOID Reserved; + PVOID lpReserved1; PDD_VPORTCB_GETFIELD GetVideoPortField; PDD_VPORTCB_GETLINE GetVideoPortLine; PDD_VPORTCB_GETVPORTCONNECT GetVideoPortConnectInfo;

1 0

[gedmurphy] 18702: _MAX_PATH > MAXPATH
by gedmurphy＠svn.reactos.com 23 Oct '05

23 Oct '05

_MAX_PATH > MAXPATH Shortcut to winemine, but commented out as winemine is broken. Modified: trunk/reactos/lib/syssetup/install.c Modified: trunk/reactos/lib/syssetup/resource.h _____ Modified: trunk/reactos/lib/syssetup/install.c --- trunk/reactos/lib/syssetup/install.c 2005-10-23 11:35:58 UTC (rev 18701) +++ trunk/reactos/lib/syssetup/install.c 2005-10-23 11:55:49 UTC (rev 18702) @@ -400,7 +400,7 @@ { TCHAR sAccessories[256]; TCHAR sGames[256]; - TCHAR Sys[_MAX_PATH]; + TCHAR Sys[MAX_PATH]; # if 0 @@ -449,16 +449,15 @@ CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("regedit.lnk"), _T("regedit.exe"), IDS_CMT_REGEDIT); } - if(!GetSystemDirectory(Sys, _MAX_PATH)) - Sys[0] = L'\0'; /* create Games subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) { - if (Sys[0] != L'\0') { + if(GetSystemDirectory(Sys, MAX_PATH)) { if((_taccess(_tcscat(Sys, _T("\\sol.exe")), 0 )) != -1) CreateShortcut(CSIDL_PROGRAMS, sGames, _T("Solitaire.lnk"), _T("sol.exe"), IDS_CMT_SOLITAIRE); - - /* winemine etc .... */ + /* winemine is broken + if((_taccess(_tcscat(Sys, _T("\\winemine.exe")), 0 )) != -1) + CreateShortcut(CSIDL_PROGRAMS, sGames, _T("winemine.lnk"), _T("winemine.exe"), IDS_CMT_WINEMINE); */ } } _____ Modified: trunk/reactos/lib/syssetup/resource.h --- trunk/reactos/lib/syssetup/resource.h 2005-10-23 11:35:58 UTC (rev 18701) +++ trunk/reactos/lib/syssetup/resource.h 2005-10-23 11:55:49 UTC (rev 18702) @@ -20,20 +20,20 @@ #define RESOURCE_H #define IDB_WATERMARK 100 -#define IDB_HEADER 101 +#define IDB_HEADER 101 -#define IDC_STATIC -1 +#define IDC_STATIC -1 #define IDD_WELCOMEPAGE 1000 #define IDC_WELCOMETITLE 1001 -#define IDD_ACKPAGE 1010 +#define IDD_ACKPAGE 1010 #define IDC_PROJECTS 1011 -#define IDC_VIEWGPL 1012 +#define IDC_VIEWGPL 1012 #define IDD_OWNERPAGE 1020 #define IDC_OWNERNAME 1021 -#define IDC_OWNERORGANIZATION 1022 +#define IDC_OWNERORGANIZATION 1022 #define IDD_COMPUTERPAGE 1030 #define IDC_COMPUTERNAME 1031 @@ -59,11 +59,11 @@ #define IDC_FINISHTITLE 1071 -#define IDD_RESTART 2000 -#define IDC_RESTART_PROGRESS 2001 +#define IDD_RESTART 2000 +#define IDC_RESTART_PROGRESS 2001 -#define IDD_GPL 2100 -#define IDC_GPL_TEXT 2101 +#define IDD_GPL 2100 +#define IDC_GPL_TEXT 2101 #define IDS_ACKTITLE 3010 #define IDS_ACKSUBTITLE 3011 @@ -94,7 +94,8 @@ #define IDS_CMT_NOTEPAD 3213 #define IDS_CMT_REGEDIT 3214 #define IDS_CMT_SOLITAIRE 3215 +#define IDS_CMT_WINEMINE 3216 -#define IDR_GPL 4000 +#define IDR_GPL 4000 #endif /* RESOURCE_H */

1 0

[hpoussin] 18701: Create and open device/driver registry keys with right access mask
by hpoussin＠svn.reactos.com 23 Oct '05

23 Oct '05

Create and open device/driver registry keys with right access mask Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-23 11:33:45 UTC (rev 18700) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-23 11:35:58 UTC (rev 18701) @@ -3326,7 +3326,11 @@ 0, NULL, REG_OPTION_NON_VOLATILE, +#if _WIN32_WINNT >= 0x502 KEY_READ | KEY_WRITE, +#else + KEY_ALL_ACCESS, +#endif NULL, &hKey, &Disposition); @@ -5310,7 +5314,11 @@ lpFullGuidString[RequiredSize + 2] = '\0'; /* Open/Create driver key information */ - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_SET_VALUE); +#if _WIN32_WINNT >= 0x502 + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ | KEY_WRITE); +#else + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); +#endif if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); if (hKey == INVALID_HANDLE_VALUE)

1 0

[gvg] 18700: Merge from trunk:
by gvg＠svn.reactos.com 23 Oct '05

23 Oct '05

Merge from trunk: Don't issue KBD_LINE_TEST, the results are unreliable. Fixes reopen of #688. Modified: branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/i8042prt.c _____ Modified: branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/i8042prt.c --- branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/i8042prt.c 2005-10-23 11:32:52 UTC (rev 18699) +++ branches/ros-branch-0_2_8/reactos/drivers/input/i8042prt/i8042prt.c 2005-10-23 11:33:45 UTC (rev 18700) @@ -577,12 +577,12 @@ return FALSE; } - if (I8042Write(DevExt, I8042_CTRL_PORT, KBD_LINE_TEST)) - { - Status = I8042ReadDataWait(DevExt, &Value); - if (NT_SUCCESS(Status) && Value == 0) - DevExt->KeyboardExists = TRUE; - } + /* + * We used to send a KBD_LINE_TEST command here, but on at least HP + * Pavilion notebooks the response to that command was incorrect. + * So now we just assume that a keyboard is attached. + */ + DevExt->KeyboardExists = TRUE; if (I8042Write(DevExt, I8042_CTRL_PORT, MOUSE_LINE_TEST)) {

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
74
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 October 2005