Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 26864: Fixing another memory crash bug this time for GetFourCCCodes
by greatlrd＠svn.reactos.org 22 May '07

22 May '07

Author: greatlrd Date: Tue May 22 14:46:17 2007 New Revision: 26864 URL: http://svn.reactos.org/svn/reactos?rev=26864&view=rev Log: Fixing another memory crash bug this time for GetFourCCCodes Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Tue May 22 14:46:17 2007 @@ -11,6 +11,9 @@ #include "rosdraw.h" +/* PSEH for SEH Support */ +#include <pseh/pseh.h> + HRESULT WINAPI Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface, REFIID id, @@ -150,26 +153,33 @@ DX_WINDBG_trace(); - /* FIXME protect with SEH or something else if lpCodes or lpNumCodes for bad user pointers */ - EnterCriticalSection(&ddcs); - - if(!lpNumCodes) - { - retVal = DDERR_INVALIDPARAMS; - } - else - { - if ((lpCodes) && (*lpCodes)) - { - memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)* min(This->lpLcl->lpGbl->dwNumFourCC, *lpNumCodes)); - } - else - { - *lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC; - } - } - - LeaveCriticalSection(&ddcs); + + // EnterCriticalSection(&ddcs); + + _SEH_TRY + { + if(IsBadWritePtr(lpNumCodes,sizeof(LPDWORD))) + { + retVal = DDERR_INVALIDPARAMS; + } + else + { + if(!IsBadWritePtr(lpCodes,sizeof(LPDWORD))) + { + memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)* min(This->lpLcl->lpGbl->dwNumFourCC, *lpNumCodes)); + } + else + { + *lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC; + } + } + } + _SEH_HANDLE + { + } + _SEH_END; + + //LeaveCriticalSection(&ddcs); return retVal; } Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Tue May 22 14:46:17 2007 @@ -16,6 +16,7 @@ <library>user32</library> <library>advapi32</library> <library>msvcrt</library> + <library>pseh</library> <file>ddraw.rc</file> <file>main.c</file>

1 0

[hpoussin] 26863: Add installation path for VMware 6.0
by hpoussin＠svn.reactos.org 22 May '07

22 May '07

Author: hpoussin Date: Tue May 22 14:40:57 2007 New Revision: 26863 URL: http://svn.reactos.org/svn/reactos?rev=26863&view=rev Log: Add installation path for VMware 6.0 Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.c (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.c Tue May 22 14:40:57 2007 @@ -42,6 +42,7 @@ static WCHAR DestinationDriversPath[MAX_PATH+1]; static WCHAR CDDrive = L'\0'; +static WCHAR PathToVideoDrivers60[MAX_PATH+1] = L"X:\\program files\\VMWare\\VMWare Tools\\Drivers\\video\\2k\\32bit\\"; static WCHAR PathToVideoDrivers55[MAX_PATH+1] = L"X:\\program files\\VMware\\VMware Tools\\Drivers\\video\\winnt2k\\32Bit\\"; static WCHAR PathToVideoDrivers45[MAX_PATH+1] = L"X:\\program files\\VMware\\VMware Tools\\Drivers\\video\\winnt2k\\"; static WCHAR PathToVideoDrivers40[MAX_PATH+1] = L"X:\\video\\winnt2k\\"; @@ -164,9 +165,12 @@ if(GetDriveType(Drive) == DRIVE_CDROM) { #endif + PathToVideoDrivers60[0] = Current; PathToVideoDrivers55[0] = Current; PathToVideoDrivers40[0] = Current; PathToVideoDrivers45[0] = Current; + if(SetCurrentDirectory(PathToVideoDrivers60)) + SrcPath = PathToVideoDrivers60; if(SetCurrentDirectory(PathToVideoDrivers55)) SrcPath = PathToVideoDrivers55; else if(SetCurrentDirectory(PathToVideoDrivers45))

1 0

[gedmurphy] 26862: turn debugging off
by gedmurphy＠svn.reactos.org 22 May '07

22 May '07

Author: gedmurphy Date: Tue May 22 14:17:07 2007 New Revision: 26862 URL: http://svn.reactos.org/svn/reactos?rev=26862&view=rev Log: turn debugging off Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Tue May 22 14:17:07 2007 @@ -14,8 +14,7 @@ #include <advapi32.h> -//#define NDEBUG -#undef NDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS *****************************************************************/

1 0

[gedmurphy] 26861: - fix the release build for Colin. - clean up formatting of a file I was playing with.
by gedmurphy＠svn.reactos.org 21 May '07

21 May '07

Author: gedmurphy Date: Tue May 22 03:12:16 2007 New Revision: 26861 URL: http://svn.reactos.org/svn/reactos?rev=26861&view=rev Log: - fix the release build for Colin. - clean up formatting of a file I was playing with. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/include/debug.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Tue May 22 03:12:16 2007 @@ -19,8 +19,6 @@ */ #include <freeldr.h> - -#define NDEBUG #include <debug.h> BOOLEAN AcpiPresent = FALSE; @@ -28,49 +26,49 @@ static BOOLEAN FindAcpiBios(VOID) { - PUCHAR Ptr; + PUCHAR Ptr; - /* Find the 'Root System Descriptor Table Pointer' */ - Ptr = (PUCHAR)0xE0000; - while ((ULONG)Ptr < 0x100000) + /* Find the 'Root System Descriptor Table Pointer' */ + Ptr = (PUCHAR)0xE0000; + while ((ULONG)Ptr < 0x100000) { - if (!memcmp(Ptr, "RSD PTR ", 8)) - { - DbgPrint((DPRINT_HWDETECT, "ACPI supported\n")); + if (!memcmp(Ptr, "RSD PTR ", 8)) + { + DbgPrint((DPRINT_HWDETECT, "ACPI supported\n")); - return TRUE; - } + return TRUE; + } - Ptr = (PUCHAR)((ULONG)Ptr + 0x10); + Ptr = (PUCHAR)((ULONG)Ptr + 0x10); } - DbgPrint((DPRINT_HWDETECT, "ACPI not supported\n")); + DbgPrint((DPRINT_HWDETECT, "ACPI not supported\n")); - return FALSE; + return FALSE; } VOID DetectAcpiBios(FRLDRHKEY SystemKey, ULONG *BusNumber) { - WCHAR Buffer[80]; - FRLDRHKEY BiosKey; - LONG Error; + WCHAR Buffer[80]; + FRLDRHKEY BiosKey; + LONG Error; - if (FindAcpiBios()) + if (FindAcpiBios()) { - AcpiPresent = TRUE; - /* Create new bus key */ - swprintf(Buffer, - L"MultifunctionAdapter\\%u", *BusNumber); - Error = RegCreateKey(SystemKey, - Buffer, - &BiosKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } + AcpiPresent = TRUE; + /* Create new bus key */ + swprintf(Buffer, + L"MultifunctionAdapter\\%u", *BusNumber); + Error = RegCreateKey(SystemKey, + Buffer, + &BiosKey); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); + return; + } #if 0 /* Set 'Component Information' */ @@ -80,20 +78,20 @@ 0xFFFFFFFF); #endif - /* Increment bus number */ - (*BusNumber)++; + /* Increment bus number */ + (*BusNumber)++; - /* Set 'Identifier' value */ - Error = RegSetValue(BiosKey, - L"Identifier", - REG_SZ, - (PCHAR)L"ACPI BIOS", - 10 * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - return; - } + /* Set 'Identifier' value */ + Error = RegSetValue(BiosKey, + L"Identifier", + REG_SZ, + (PCHAR)L"ACPI BIOS", + 10 * sizeof(WCHAR)); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); + return; + } } } Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h Tue May 22 03:12:16 2007 @@ -35,15 +35,16 @@ #define DPRINT_HWDETECT 0x00000400 // OR this with DebugPrintMask to enable hardware detection messages #define DPRINT_WINDOWS 0x00000800 // OR this with DebugPrintMask to enable messages from Windows loader +VOID DebugPrint(ULONG Mask, char *format, ...); + #ifdef DBG VOID DebugInit(VOID); - VOID DebugPrint(ULONG Mask, char *format, ...); VOID DebugPrint1(char *format, ...); VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length); #define DbgPrint(_x_) DebugPrint _x_ ; - #define DPRINT1 DebugPrint1 + #define DPRINT1 DebugPrint1 #define BugCheck(_x_) { DebugPrint(DPRINT_WARNING, "Fatal Error: %s:%d(%s)\n", __FILE__, __LINE__, __FUNCTION__); DebugPrint _x_ ; for (;;); } #define DbgDumpBuffer(_x_, _y_, _z_) DebugDumpBuffer(_x_, _y_, _z_) @@ -77,7 +78,7 @@ #else #define DebugInit() - #define DbgPrint(_x_) { if (0) DebugPrint _x_; } + #define DbgPrint(_x_) { if (0) DebugPrint _x_; } #define DPRINT1(_x_) { if (0) printf _x_; } #define BugCheck(_x_) #define DbgDumpBuffer(_x_, _y_, _z_)

1 0

[greatlrd] 26860: Fixing another memory crash bug this time for GetFourCCCodes
by greatlrd＠svn.reactos.org 21 May '07

21 May '07

Author: greatlrd Date: Tue May 22 00:51:55 2007 New Revision: 26860 URL: http://svn.reactos.org/svn/reactos?rev=26860&view=rev Log: Fixing another memory crash bug this time for GetFourCCCodes Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Tue May 22 00:51:55 2007 @@ -146,28 +146,31 @@ Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD lpNumCodes, LPDWORD lpCodes) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + HRESULT retVal = DD_OK; + DX_WINDBG_trace(); /* FIXME protect with SEH or something else if lpCodes or lpNumCodes for bad user pointers */ EnterCriticalSection(&ddcs); - if(!lpNumCodes) - { - LeaveCriticalSection(&ddcs); - return DDERR_INVALIDPARAMS; - } - - if(lpCodes) - { - memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)* min(This->lpLcl->lpGbl->dwNumFourCC, *lpNumCodes)); - } - else - { - *lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC; - } + if(!lpNumCodes) + { + retVal = DDERR_INVALIDPARAMS; + } + else + { + if ((lpCodes) && (*lpCodes)) + { + memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)* min(This->lpLcl->lpGbl->dwNumFourCC, *lpNumCodes)); + } + else + { + *lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC; + } + } LeaveCriticalSection(&ddcs); - return DD_OK; + return retVal; } HRESULT WINAPI Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Tue May 22 00:51:55 2007 @@ -188,7 +188,7 @@ if (reenable == FALSE) { - if (This->lpLink == NULL) + if ((!IsBadReadPtr(This->lpLink,sizeof(LPDIRECTDRAW))) && (This->lpLink == NULL)) { RtlZeroMemory(&ddgbl, sizeof(DDRAWI_DIRECTDRAW_GBL)); This->lpLcl->lpGbl->dwRefCnt++; @@ -470,6 +470,8 @@ // FIXME Close DX fristcall and second call return DD_FALSE; } + + DX_STUB_str("Here\n"); /* Alloc mpFourCC */ mpFourCC = NULL;

1 0

[greatlrd] 26859: hacking so we manger only create one directdraw interface, the linked code for create one is offline.
by greatlrd＠svn.reactos.org 21 May '07

21 May '07

Author: greatlrd Date: Tue May 22 00:25:23 2007 New Revision: 26859 URL: http://svn.reactos.org/svn/reactos?rev=26859&view=rev Log: hacking so we manger only create one directdraw interface, the linked code for create one is offline. Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Tue May 22 00:25:23 2007 @@ -36,6 +36,8 @@ This = (LPDDRAWI_DIRECTDRAW_INT)*pIface; +#if 0 + /* fixme linking too second link when we shall not doing it */ if (IsBadReadPtr(This,sizeof(LPDIRECTDRAW))) { DX_STUB_str("1. no linking\n"); @@ -76,7 +78,7 @@ } /* step 2 check if it not DDCREATE_HARDWAREONLY we got if so we fail */ - if (pGUID != (LPGUID)DDCREATE_HARDWAREONLY) + if ((pGUID) && (pGUID != (LPGUID)DDCREATE_HARDWAREONLY)) { if (pGUID !=NULL) { @@ -100,6 +102,29 @@ This = newThis; } +#else + /* FIXME HACK linking does not working we need figout why */ + LPDDRAWI_DIRECTDRAW_INT memThis; + + memThis = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); + This = memThis; + if (This == NULL) + { + if (memThis != NULL) + DxHeapMemFree(memThis); + + DX_STUB_str("DDERR_OUTOFMEMORY"); + return DDERR_OUTOFMEMORY; + } + + /* Fixme release memory alloc if we fail */ + This->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); + if (This->lpLcl == NULL) + { + DX_STUB_str("DDERR_OUTOFMEMORY"); + return DDERR_OUTOFMEMORY; + } +#endif This->lpLcl->lpGbl = &ddgbl; @@ -172,19 +197,20 @@ ddgbl.lpDDCBtmp = (LPDDHAL_CALLBACKS) DxHeapMemAlloc(sizeof(DDHAL_CALLBACKS)); if (ddgbl.lpDDCBtmp == NULL) { - DX_STUB_str("Out of memmory"); + DX_STUB_str("Out of memmory\n"); return DD_FALSE; } } } } - DX_STUB_str("here"); + DX_STUB_str("here\n"); if (reenable == FALSE) { if (lpGuid == NULL) { + DX_STUB_str("lpGuid == NULL\n"); devicetypes= 1; /* Create HDC for default, hal and hel driver */ @@ -195,6 +221,8 @@ RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7); RtlCopyMemory(&ddgbl.cDriverName,&"DISPLAY",7); dwFlags |= DDRAWI_DISPLAYDRV | DDRAWI_GDIDRV; + + } else if (lpGuid == (LPGUID) DDCREATE_HARDWAREONLY) { @@ -234,7 +262,7 @@ if ( (HDC)This->lpLcl->hDC == NULL) { - DX_STUB_str("DDERR_OUTOFMEMORY"); + DX_STUB_str("DDERR_OUTOFMEMORY\n"); return DDERR_OUTOFMEMORY ; } } @@ -262,11 +290,13 @@ hel_ret = StartDirectDrawHel(iface, reenable); } + DX_STUB_str("return\n"); + if (hal_ret!=DD_OK) { if (hel_ret!=DD_OK) { - DX_STUB_str("DDERR_NODIRECTDRAWSUPPORT"); + DX_STUB_str("DDERR_NODIRECTDRAWSUPPORT\n"); return DDERR_NODIRECTDRAWSUPPORT; } dwFlags |= DDRAWI_NOHARDWARE; @@ -453,8 +483,10 @@ return DD_FALSE; } } + DX_STUB_str("Here\n"); /* Alloc mpTextures */ +#if 0 mpTextures = NULL; if (mD3dDriverData.dwNumTextureFormats > 0) { @@ -466,7 +498,11 @@ // FIXME Close DX fristcall and second call } } +#else + mpTextures = NULL; +#endif + DX_STUB_str("Here\n"); /* Get all basic data from the driver */ if (!DdQueryDirectDrawObject( @@ -502,6 +538,8 @@ This->lpLcl->lpGbl->dwNumModes = mHALInfo.dwNumModes; This->lpLcl->lpGbl->lpModeInfo = mHALInfo.lpModeInfo; + DX_STUB_str("Here\n"); + /* FIXME convert mpTextures to DDHALMODEINFO */ // DxHeapMemFree( mpTextures); @@ -520,5 +558,6 @@ return DD_FALSE; } + DX_STUB_str("Return DD_OK\n"); return DD_OK; }

1 0

[gedmurphy] 26858: revert 26844 to fall back in line with widl
by gedmurphy＠svn.reactos.org 21 May '07

21 May '07

Author: gedmurphy Date: Mon May 21 23:48:47 2007 New Revision: 26858 URL: http://svn.reactos.org/svn/reactos?rev=26858&view=rev Log: revert 26844 to fall back in line with widl Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.h (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.h Mon May 21 23:48:47 2007 @@ -61,7 +61,7 @@ typedef struct ConnectionPoint ConnectionPoint; -struct WebBrowser { +typedef struct { /* Interfaces available via WebBrowser object */ const IWebBrowser2Vtbl *lpWebBrowser2Vtbl; @@ -115,7 +115,7 @@ ConnectionPoint *cp_wbe2; ConnectionPoint *cp_wbe; ConnectionPoint *cp_pns; -}; +} WebBrowser; #define WEBBROWSER(x) ((IWebBrowser*) &(x)->lpWebBrowser2Vtbl) #define WEBBROWSER2(x) ((IWebBrowser2*) &(x)->lpWebBrowser2Vtbl)

1 0

[greatlrd] 26857: Thx DrFred notice I did take wrong struct at alloc, I also comment up the code bit.
by greatlrd＠svn.reactos.org 21 May '07

21 May '07

Author: greatlrd Date: Mon May 21 22:49:28 2007 New Revision: 26857 URL: http://svn.reactos.org/svn/reactos?rev=26857&view=rev Log: Thx DrFred notice I did take wrong struct at alloc, I also comment up the code bit. Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Mon May 21 22:49:28 2007 @@ -60,7 +60,6 @@ DX_STUB_str("DDERR_OUTOFMEMORY"); return DDERR_OUTOFMEMORY; } - This->lpLcl->lpGbl = &ddgbl; } else { @@ -68,6 +67,7 @@ /* We got the DirectDraw interface alloc and we need create the link */ LPDDRAWI_DIRECTDRAW_INT newThis; + /* step 1.Alloc the new DDRAWI_DIRECTDRAW_INT for the lnking */ newThis = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); if (newThis == NULL) { @@ -75,7 +75,7 @@ return DDERR_OUTOFMEMORY; } - /* we need check the GUID lpGUID what type it is */ + /* step 2 check if it not DDCREATE_HARDWAREONLY we got if so we fail */ if (pGUID != (LPGUID)DDCREATE_HARDWAREONLY) { if (pGUID !=NULL) @@ -85,22 +85,23 @@ return DDERR_INVALIDDIRECTDRAWGUID; } } + + /* step 3 do the link the old interface are store in the new one */ newThis->lpLink = This; - newThis->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); + /* step 4 we need create new local directdraw struct for the new linked interface */ + newThis->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_LCL)); if (newThis->lpLcl == NULL) { This = newThis; DX_STUB_str("DDERR_OUTOFMEMORY"); return DDERR_OUTOFMEMORY; } - RtlCopyMemory(newThis->lpLcl, This->lpLcl, sizeof(DDRAWI_DIRECTDRAW_LCL)); This = newThis; - - DX_STUB_str("here\n"); - - } + } + + This->lpLcl->lpGbl = &ddgbl; *pIface = (LPDIRECTDRAW)This; @@ -111,8 +112,6 @@ if (StartDirectDraw((LPDIRECTDRAW)This, pGUID, FALSE) == DD_OK); { - DX_STUB_str("here"); - /* RtlZeroMemory(&wnd_class, sizeof(wnd_class)); wnd_class.style = CS_HREDRAW | CS_VREDRAW;

1 0

[ekohl] 26856: Revert latest update due to unexpected bug in compiled files.
by ekohl＠svn.reactos.org 21 May '07

21 May '07

Author: ekohl Date: Mon May 21 22:28:00 2007 New Revision: 26856 URL: http://svn.reactos.org/svn/reactos?rev=26856&view=rev Log: Revert latest update due to unexpected bug in compiled files. Modified: trunk/reactos/tools/widl/ChangeLog trunk/reactos/tools/widl/Makefile.in trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/hash.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/lex.yy.c trunk/reactos/tools/widl/parser.h trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typegen.h trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typelib.h trunk/reactos/tools/widl/typelib_struct.h trunk/reactos/tools/widl/utils.c trunk/reactos/tools/widl/utils.h trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/widl.h trunk/reactos/tools/widl/widl.man.in trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/widl/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/ChangeLog?rev=2… Modified: trunk/reactos/tools/widl/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/Makefile.in?rev… Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=26… Modified: trunk/reactos/tools/widl/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/hash.c?rev=2685… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=26… Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=26… Modified: trunk/reactos/tools/widl/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/lex.yy.c?rev=26… Modified: trunk/reactos/tools/widl/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.h?rev=26… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=26… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=26… Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=268… Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=26… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=2… Modified: trunk/reactos/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.h?rev=2… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=2… Modified: trunk/reactos/tools/widl/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.h?rev=2… Modified: trunk/reactos/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib_struct.… Modified: trunk/reactos/tools/widl/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.c?rev=268… Modified: trunk/reactos/tools/widl/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.h?rev=268… Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=2685… Modified: trunk/reactos/tools/widl/widl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.h?rev=2685… Modified: trunk/reactos/tools/widl/widl.man.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.man.in?rev… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re…

1 0

[mbosma] 26855: MIN => min
by mbosma＠svn.reactos.org 21 May '07

21 May '07

Author: mbosma Date: Mon May 21 22:25:17 2007 New Revision: 26855 URL: http://svn.reactos.org/svn/reactos?rev=26855&view=rev Log: MIN => min Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Mon May 21 22:25:17 2007 @@ -159,7 +159,7 @@ if(lpCodes) { - memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)* MIN(This->lpLcl->lpGbl->dwNumFourCC, *lpNumCodes)); + memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)* min(This->lpLcl->lpGbl->dwNumFourCC, *lpNumCodes)); } else {

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