Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[pschweitzer] 30742: Improved check for log directory
by pschweitzer＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: pschweitzer Date: Sun Nov 25 19:45:02 2007 New Revision: 30742 URL: http://svn.reactos.org/svn/reactos?rev=30742&view=rev Log: Improved check for log directory Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Sun Nov 25 19:45:02 2007 @@ -5,6 +5,7 @@ - Updated RosBE Configuration Tool. (Pierre Schweitzer) - Added help strings when mouse is over a control. (Pierre Schweitzer) + - Improved check for log directory (Pierre Schweitzer) - Fix a bug in reladdr2line.cmd. (Peter Ward) - Change the default ReactOS source directory from APPDATA\RosBE\Source to PROFILE\reactos. (Peter Ward) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Sun Nov 25 19:45:02 2007 @@ -17,7 +17,7 @@ { INT foreground, background; BOOL showtime, writelog, useccache, strip, objstate, outstate; - WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH], checklog[MAX_PATH], optionsfile[MAX_PATH]; + WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH], optionsfile[MAX_PATH]; WCHAR msgerror[256]; HANDLE hFile; FILE *pFile; @@ -37,18 +37,13 @@ if (writelog && (logdir[0] != 0)) { - DWORD ret = GetCurrentDirectoryW(MAX_PATH, checklog); - if (ret != 0 && ret < MAX_PATH) - { - if (!SetCurrentDirectoryW(logdir)) - { - SetCurrentDirectoryW(checklog); - if (CreateDirectoryW(logdir, NULL) == 0) - { - if (LoadStringW(hInstance, MSG_DIREFAILED, msgerror, 256)) - MessageBoxW(NULL, msgerror, NULL, MB_ICONERROR); - return FALSE; - } + if (GetFileAttributes(logdir) == 0xFFFFFFFF) + { + if (CreateDirectoryW(logdir, NULL) == 0) + { + LoadStringW(hInstance, MSG_DIREFAILED, msgerror, 256); + MessageBoxW(NULL, msgerror, NULL, MB_ICONERROR); + return FALSE; } } }

1 0

[dreimer] 30741: German Translation fixes by Gregor Schneider (grschneiderATgmailDTcom)
by dreimer＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: dreimer Date: Sun Nov 25 18:57:20 2007 New Revision: 30741 URL: http://svn.reactos.org/svn/reactos?rev=30741&view=rev Log: German Translation fixes by Gregor Schneider (grschneiderATgmailDTcom) Modified: trunk/reactos/base/applications/games/winemine/lang/de-DE.rc trunk/reactos/base/system/winlogon/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc Modified: trunk/reactos/base/applications/games/winemine/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/de-DE.rc Sun Nov 25 18:57:20 2007 @@ -11,7 +11,7 @@ POPUP "&Optionen" { MENUITEM "&Neu", IDM_NEW MENUITEM SEPARATOR - MENUITEM "&Mark Question", IDM_MARKQ + MENUITEM "&Merker (?)", IDM_MARKQ MENUITEM SEPARATOR MENUITEM "&Anfänger", IDM_BEGINNER MENUITEM "&Fortgeschrittene", IDM_ADVANCED Modified: trunk/reactos/base/system/winlogon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… ============================================================================== --- trunk/reactos/base/system/winlogon/lang/de-DE.rc (original) +++ trunk/reactos/base/system/winlogon/lang/de-DE.rc Sun Nov 25 18:57:20 2007 @@ -31,11 +31,11 @@ IDS_APPLYINGYOURPERSONALSETTINGS "Ihre persönlichen Einstellungen setzen..." IDS_RUNNINGLOGOFFSCRIPTS "Skripte um abzumelden ausführen..." IDS_RUNNINGLOGONSCRIPTS "Skripte um anzumelden ausführen..." - IDS_LOADINGYOURPERSONALSETTINGS "Ihr persönlichen Einstellungen laden..." + IDS_LOADINGYOURPERSONALSETTINGS "Ihre persönlichen Einstellungen laden..." IDS_CLOSINGNETWORKCONNECTIONS "Netzwerkverbindungen schliessen..." IDS_REACTOSISSHUTTINGDOWN "ReactOS fährt herunter..." IDS_PREPARETOSTANDBY "Vorbereiten für den StandBy Modus..." - IDS_PREPARETOHIBERNATE "Vorbereiten für den Nachtmodus..." + IDS_PREPARETOHIBERNATE "Vorbereiten für den Ruhezustand..." IDS_SAVEYOURSETTINGS "Speichern Ihrer persönlichen Einstellungen..." IDS_REACTOSISSTARTINGUP "ReactOS startet..." END Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc Sun Nov 25 18:57:20 2007 @@ -270,9 +270,9 @@ IDS_VARIABLE "Variable" IDS_VALUE "Value" IDS_NO_DUMP "(Keine)" - IDS_MINI_DUMP "Kleines Speicherabild (64KB)" - IDS_KERNEL_DUMP "Kernelspeicherabild" - IDS_FULL_DUMP "Vollständiges Speicherabild" + IDS_MINI_DUMP "Kleines Speicherabbild (64KB)" + IDS_KERNEL_DUMP "Kernelspeicherabbild" + IDS_FULL_DUMP "Vollständiges Speicherabbild" IDS_USERPROFILE_NAME "Name" IDS_USERPROFILE_SIZE "Größe" IDS_USERPROFILE_TYPE "Typ"

1 0

[pschweitzer] 30740: Use a default path if there are no settings
by pschweitzer＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: pschweitzer Date: Sun Nov 25 18:46:06 2007 New Revision: 30740 URL: http://svn.reactos.org/svn/reactos?rev=30740&view=rev Log: Use a default path if there are no settings Modified: trunk/rosapps/downloader/download.c Modified: trunk/rosapps/downloader/download.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/download.c?rev=… ============================================================================== --- trunk/rosapps/downloader/download.c (original) +++ trunk/rosapps/downloader/download.c Sun Nov 25 18:46:06 2007 @@ -229,30 +229,50 @@ BOOL bCancelled = FALSE; BOOL bTempfile = FALSE; HKEY hKey; + DWORD dwSize = MAX_PATH; /* built the path for the download */ p = wcsrchr(SelectedApplication->Location, L'/'); if (NULL == p) - { - goto end; - } - if (RegOpenKey(HKEY_LOCAL_MACHINE, - TEXT("Software\\ReactOS\\Downloader"), - &hKey) != ERROR_SUCCESS) { goto end; } - - DWORD dwSize = MAX_PATH; - if (RegQueryValueEx(hKey, + + /* Create default download path */ + if (GetWindowsDirectory(path, sizeof(path) / sizeof(WCHAR))) + { + WCHAR DPath[256]; + int i; + for (i = 0; i < 4; i++) + { + if (i == 3) + { + DPath[i] = '\0'; + break; + } + DPath[i] = path[i]; + } + LoadString(GetModuleHandle(NULL), IDS_DOWNLOAD_FOLDER, path, sizeof(path) / sizeof(WCHAR)); + wcscat((LPWSTR)DPath, path); + wcscpy(path, DPath); + } + + if (RegOpenKey(HKEY_LOCAL_MACHINE, + TEXT("Software\\ReactOS\\Downloader"), + &hKey) == ERROR_SUCCESS) + { + if ((RegQueryValueEx(hKey, L"DownloadFolder", NULL, NULL, (LPBYTE)&path, - &dwSize) != ERROR_SUCCESS) - { - goto end; + &dwSize) != ERROR_SUCCESS) && (path[0] == 0)) + { + goto end; + } } + + if (GetFileAttributes(path) == 0xFFFFFFFF) if (!CreateDirectory((LPCTSTR)path,NULL))

1 0

[peterw] 30739: - Forgot to pass parameters when I changed to subs :P.
by peterw＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: peterw Date: Sun Nov 25 18:42:42 2007 New Revision: 30739 URL: http://svn.reactos.org/svn/reactos?rev=30739&view=rev Log: - Forgot to pass parameters when I changed to subs :P. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Sun Nov 25 18:42:42 2007 @@ -92,9 +92,9 @@ :: title Started: %TIMERAW%, Building... if "%1" == "multi" ( - call :BUILDMULTI + call :BUILDMULTI %* ) else ( - call :BUILD + call :BUILD %* ) goto :EOC

1 0

[peterw] 30738: - Change BUILD and BUILDMULTI into subs, little cleaner this way.
by peterw＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: peterw Date: Sun Nov 25 18:25:44 2007 New Revision: 30738 URL: http://svn.reactos.org/svn/reactos?rev=30738&view=rev Log: - Change BUILD and BUILDMULTI into subs, little cleaner this way. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Sun Nov 25 18:25:44 2007 @@ -92,10 +92,11 @@ :: title Started: %TIMERAW%, Building... if "%1" == "multi" ( - goto :BUILDMULTI + call :BUILDMULTI ) else ( - goto :BUILD + call :BUILD ) +goto :EOC :BUILD if %_ROSBE_SHOWTIME% == 1 ( @@ -111,7 +112,7 @@ "%_ROSBE_MINGWMAKE%" %* ) ) -goto :EOC +goto :EOF :BUILDMULTI :: @@ -136,6 +137,7 @@ "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 ) ) +goto :EOF :EOC ::

1 0

[greatlrd] 30737: add directdraw3 guid to dxguid
by greatlrd＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: greatlrd Date: Sun Nov 25 17:43:36 2007 New Revision: 30737 URL: http://svn.reactos.org/svn/reactos?rev=30737&view=rev Log: add directdraw3 guid to dxguid Modified: trunk/reactos/lib/sdk/dxguid/dxguid-mingw.c Modified: trunk/reactos/lib/sdk/dxguid/dxguid-mingw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/dxguid/dxguid-ming… ============================================================================== --- trunk/reactos/lib/sdk/dxguid/dxguid-mingw.c (original) +++ trunk/reactos/lib/sdk/dxguid/dxguid-mingw.c Sun Nov 25 17:43:36 2007 @@ -22,6 +22,7 @@ DEFINE_GUID(IID_IDsDriverBuffer, 0x8C4233C1l, 0xB4CC, 0x11CE, 0x92, 0x94, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); // +DEFINE_GUID(IID_IDirectDraw3, 0x618F8AD4,0x8b7A,0x11D0,0x8F,0xCC,0x00,0xC0,0x4F,0xd9,0x18,0x9D); // ok DEFINE_GUID(CLSID_CDirect3DRM,0x4516ec41,0x8f20,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);

1 0

[greatlrd] 30736: fix a header issue with wine d3d.h
by greatlrd＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: greatlrd Date: Sun Nov 25 16:35:45 2007 New Revision: 30736 URL: http://svn.reactos.org/svn/reactos?rev=30736&view=rev Log: fix a header issue with wine d3d.h Modified: trunk/reactos/include/psdk/d3d.h Modified: trunk/reactos/include/psdk/d3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d.h?rev=307… ============================================================================== --- trunk/reactos/include/psdk/d3d.h (original) +++ trunk/reactos/include/psdk/d3d.h Sun Nov 25 16:35:45 2007 @@ -202,6 +202,7 @@ /***************************************************************************** * IDirect3D interface */ +#undef INTERFACE #define INTERFACE IDirect3D DECLARE_INTERFACE_(IDirect3D,IUnknown) {

1 0

[greatlrd] 30735: make our ddraw.h better that ms. add the DirectDraw3 interface, I did not found any doc of it from ms. so I did look at wine headers see if they got it, so I using that info into our ddraw.h DirectDraw3 are being use of ms iexplorer according some devs from wine
by greatlrd＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: greatlrd Date: Sun Nov 25 15:59:30 2007 New Revision: 30735 URL: http://svn.reactos.org/svn/reactos?rev=30735&view=rev Log: make our ddraw.h better that ms. add the DirectDraw3 interface, I did not found any doc of it from ms. so I did look at wine headers see if they got it, so I using that info into our ddraw.h DirectDraw3 are being use of ms iexplorer according some devs from wine Modified: trunk/reactos/include/dxsdk/ddraw.h Modified: trunk/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/ddraw.h (original) +++ trunk/reactos/include/dxsdk/ddraw.h Sun Nov 25 15:59:30 2007 @@ -673,6 +673,7 @@ DEFINE_GUID( CLSID_DirectDrawClipper, 0x593817A0,0x7DB3,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 ); DEFINE_GUID( IID_IDirectDraw, 0x6C14DB80,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 ); DEFINE_GUID( IID_IDirectDraw2, 0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 ); +DEFINE_GUID( IID_IDirectDraw3, 0x618F8AD4,0x8b7A,0x11D0,0x8F,0xCC,0x00,0xC0,0x4F,0xd9,0x18,0x9D ); DEFINE_GUID( IID_IDirectDraw4, 0x9C59509A,0x39BD,0x11D1,0x8c,0x4A,0x00,0xC0,0x4F,0xd9,0x30,0xC5 ); DEFINE_GUID( IID_IDirectDraw7, 0x15E65EC0,0x3B9C,0x11D2,0xb9,0x2F,0x00,0x60,0x97,0x97,0xEA,0x5B ); DEFINE_GUID( IID_IDirectDrawSurface, 0x6C14DB81,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 ); @@ -694,6 +695,7 @@ typedef struct IDirectDraw *LPDIRECTDRAW; typedef struct IDirectDraw2 *LPDIRECTDRAW2; +typedef struct IDirectDraw3 *LPDIRECTDRAW3; typedef struct IDirectDraw4 *LPDIRECTDRAW4; typedef struct IDirectDraw7 *LPDIRECTDRAW7; typedef struct IDirectDrawSurface *LPDIRECTDRAWSURFACE; @@ -1542,6 +1544,92 @@ #define IDirectDraw2_WaitForVerticalBlank(p, a, b) (p)->WaitForVerticalBlank(a, b) #define IDirectDraw2_GetAvailableVidMem(p, a, b, c) (p)->GetAvailableVidMem(a, b, c) #endif +#endif + +#if defined( _WIN32 ) && !defined( _NO_COM ) + #undef INTERFACE + #define INTERFACE IDirectDraw3 + DECLARE_INTERFACE_(IDirectDraw3,IUnknown) + { + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(Compact)(THIS) PURE; + STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE *lplpDDSurface, IUnknown *pUnkOuter) PURE; + STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE lpDDSurface, LPDIRECTDRAWSURFACE *lplpDupDDSurface) PURE; + STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE; + STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; + STDMETHOD(FlipToGDISurface)(THIS) PURE; + STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; + STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; + STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; + STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE *lplpGDIDDSurface) PURE; + STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; + STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE; + STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE; + STDMETHOD(Initialize)(THIS_ GUID *lpGUID) PURE; + STDMETHOD(RestoreDisplayMode)(THIS) PURE; + STDMETHOD(SetCooperativeLevel)(THIS_ HWND hWnd, DWORD dwFlags) PURE; + STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; + STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; + STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; + STDMETHOD(GetSurfaceFromDC)(THIS_ HDC hdc, LPDIRECTDRAWSURFACE *pSurf) PURE; + }; + #if !defined(__cplusplus) || defined(CINTERFACE) + #define IDirectDraw3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) + #define IDirectDraw3_AddRef(p) (p)->lpVtbl->AddRef(p) + #define IDirectDraw3_Release(p) (p)->lpVtbl->Release(p) + #define IDirectDraw3_Compact(p) (p)->lpVtbl->Compact(p) + #define IDirectDraw3_CreateClipper(p,a,b,c) (p)->lpVtbl->CreateClipper(p,a,b,c) + #define IDirectDraw3_CreatePalette(p,a,b,c,d) (p)->lpVtbl->CreatePalette(p,a,b,c,d) + #define IDirectDraw3_CreateSurface(p,a,b,c) (p)->lpVtbl->CreateSurface(p,a,b,c) + #define IDirectDraw3_DuplicateSurface(p,a,b) (p)->lpVtbl->DuplicateSurface(p,a,b) + #define IDirectDraw3_EnumDisplayModes(p,a,b,c,d) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d) + #define IDirectDraw3_EnumSurfaces(p,a,b,c,d) (p)->lpVtbl->EnumSurfaces(p,a,b,c,d) + #define IDirectDraw3_FlipToGDISurface(p) (p)->lpVtbl->FlipToGDISurface(p) + #define IDirectDraw3_GetCaps(p,a,b) (p)->lpVtbl->GetCaps(p,a,b) + #define IDirectDraw3_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a) + #define IDirectDraw3_GetFourCCCodes(p,a,b) (p)->lpVtbl->GetFourCCCodes(p,a,b) + #define IDirectDraw3_GetGDISurface(p,a) (p)->lpVtbl->GetGDISurface(p,a) + #define IDirectDraw3_GetMonitorFrequency(p,a) (p)->lpVtbl->GetMonitorFrequency(p,a) + #define IDirectDraw3_GetScanLine(p,a) (p)->lpVtbl->GetScanLine(p,a) + #define IDirectDraw3_GetVerticalBlankStatus(p,a) (p)->lpVtbl->GetVerticalBlankStatus(p,a) + #define IDirectDraw3_Initialize(p,a) (p)->lpVtbl->Initialize(p,a) + #define IDirectDraw3_RestoreDisplayMode(p) (p)->lpVtbl->RestoreDisplayMode(p) + #define IDirectDraw3_SetCooperativeLevel(p,a,b) (p)->lpVtbl->SetCooperativeLevel(p,a,b) + #define IDirectDraw3_SetDisplayMode(p,a,b,c,d,e) (p)->lpVtbl->SetDisplayMode(p,a,b,c,d,e) + #define IDirectDraw3_WaitForVerticalBlank(p,a,b) (p)->lpVtbl->WaitForVerticalBlank(p,a,b) + #define IDirectDraw3_GetAvailableVidMem(p,a,b,c) (p)->lpVtbl->GetAvailableVidMem(p,a,b,c) + #define IDirectDraw3_GetSurfaceFromDC(p,a,b) (p)->lpVtbl->GetSurfaceFromDC(p,a,b) + #else + #define IDirectDraw3_QueryInterface(p,a,b) (p)->QueryInterface(a,b) + #define IDirectDraw3_AddRef(p) (p)->AddRef() + #define IDirectDraw3_Release(p) (p)->Release() + #define IDirectDraw3_Compact(p) (p)->Compact() + #define IDirectDraw3_CreateClipper(p,a,b,c) (p)->CreateClipper(a,b,c) + #define IDirectDraw3_CreatePalette(p,a,b,c,d) (p)->CreatePalette(a,b,c,d) + #define IDirectDraw3_CreateSurface(p,a,b,c) (p)->CreateSurface(a,b,c) + #define IDirectDraw3_DuplicateSurface(p,a,b) (p)->DuplicateSurface(a,b) + #define IDirectDraw3_EnumDisplayModes(p,a,b,c,d) (p)->EnumDisplayModes(a,b,c,d) + #define IDirectDraw3_EnumSurfaces(p,a,b,c,d) (p)->EnumSurfaces(a,b,c,d) + #define IDirectDraw3_FlipToGDISurface(p) (p)->FlipToGDISurface() + #define IDirectDraw3_GetCaps(p,a,b) (p)->GetCaps(a,b) + #define IDirectDraw3_GetDisplayMode(p,a) (p)->GetDisplayMode(a) + #define IDirectDraw3_GetFourCCCodes(p,a,b) (p)->GetFourCCCodes(a,b) + #define IDirectDraw3_GetGDISurface(p,a) (p)->GetGDISurface(a) + #define IDirectDraw3_GetMonitorFrequency(p,a) (p)->GetMonitorFrequency(a) + #define IDirectDraw3_GetScanLine(p,a) (p)->GetScanLine(a) + #define IDirectDraw3_GetVerticalBlankStatus(p,a) (p)->GetVerticalBlankStatus(a) + #define IDirectDraw3_Initialize(p,a) (p)->Initialize(a) + #define IDirectDraw3_RestoreDisplayMode(p) (p)->RestoreDisplayMode() + #define IDirectDraw3_SetCooperativeLevel(p,a,b) (p)->SetCooperativeLevel(a,b) + #define IDirectDraw3_SetDisplayMode(p,a,b,c,d,e) (p)->SetDisplayMode(a,b,c,d,e) + #define IDirectDraw3_WaitForVerticalBlank(p,a,b) (p)->WaitForVerticalBlank(a,b) + #define IDirectDraw3_GetAvailableVidMem(p,a,b,c) (p)->GetAvailableVidMem(a,b,c) + #define IDirectDraw3_GetSurfaceFromDC(p,a,b) (p)->GetSurfaceFromDC(a,b) + #endif #endif #if defined( _WIN32 ) && !defined( _NO_COM )

1 0

[greatlrd] 30734: include wine d3d9 to bootcd
by greatlrd＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: greatlrd Date: Sun Nov 25 15:42:13 2007 New Revision: 30734 URL: http://svn.reactos.org/svn/reactos?rev=30734&view=rev Log: include wine d3d9 to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sun Nov 25 15:42:13 2007 @@ -127,7 +127,7 @@ dll\directx\d3d8thk\d3d8thk.dll 1 dll\directx\wine\d3d8\d3d8.dll 1 dll\directx\wine\wined3d\wined3d.dll 1 -dll\directx\d3d9\d3d9.dll 1 +dll\directx\wine\d3d9\d3d9.dll 1 dll\directx\devenum\devenum.dll 1 dll\keyboard\kbdbe\kbdbe.dll 1

1 0

[greatlrd] 30733: do not build our stub d3d9 build wine instead
by greatlrd＠svn.reactos.org 25 Nov '07

25 Nov '07

Author: greatlrd Date: Sun Nov 25 15:41:00 2007 New Revision: 30733 URL: http://svn.reactos.org/svn/reactos?rev=30733&view=rev Log: do not build our stub d3d9 build wine instead Modified: trunk/reactos/dll/directx/directx.rbuild Modified: trunk/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild… ============================================================================== --- trunk/reactos/dll/directx/directx.rbuild (original) +++ trunk/reactos/dll/directx/directx.rbuild Sun Nov 25 15:41:00 2007 @@ -32,7 +32,4 @@ <directory name="wine"> <xi:include href="wine/wine.rbuild" /> </directory> - <directory name="d3d9"> - <xi:include href="d3d9/d3d9.rbuild" /> - </directory> </group>

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
89
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 November 2007