Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[frik85] 27207: RosCMS v3 update: several major improvements (including archive function, and more)

by frik85＠svn.reactos.org

17 years, 6 months

[greatlrd] 27206: rewrite lite of Create_DirectDraw and add reenble options.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 16 22:18:04 2007 New Revision: 27206 URL: http://svn.reactos.org/svn/reactos?rev=27206&view=rev Log: rewrite lite of Create_DirectDraw and add reenble options. Modified: trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Sat Jun 16 22:18:04 2007 @@ -53,7 +53,7 @@ } else { - retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, &IID_IDirectDraw, TRUE); + retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, &IID_IDirectDraw, FALSE); } } _SEH_HANDLE @@ -97,7 +97,7 @@ } else { - retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, id, TRUE); + retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, id, FALSE); } /* Create our DirectDraw interface */ 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 Sat Jun 16 22:18:04 2007 @@ -20,7 +20,7 @@ HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, - REFIID id, BOOL ex) + REFIID id, BOOL reenable) { LPDDRAWI_DIRECTDRAW_INT This; @@ -101,7 +101,39 @@ *pIface = (LPDIRECTDRAW)This; /* Get right interface we whant */ - if (Main_DirectDraw_QueryInterface((LPDIRECTDRAW7)This, id, (void**)&pIface) == DD_OK) + + This->lpVtbl = 0; + if (IsEqualGUID(&IID_IDirectDraw7, id)) + { + /* DirectDraw7 Vtable */ + This->lpVtbl = &DirectDraw7_Vtable; + This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags + DDRAWILCL_DIRECTDRAW7; + *pIface = (LPDIRECTDRAW)&This->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + } + else if (IsEqualGUID(&IID_IDirectDraw4, id)) + { + /* DirectDraw4 Vtable */ + This->lpVtbl = &DirectDraw4_Vtable; + *pIface = (LPDIRECTDRAW)&This->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + } + else if (IsEqualGUID(&IID_IDirectDraw2, id)) + { + /* DirectDraw2 Vtable */ + This->lpVtbl = &DirectDraw2_Vtable; + *pIface = (LPDIRECTDRAW)&This->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + } + else if (IsEqualGUID(&IID_IDirectDraw, id)) + { + /* DirectDraw4 Vtable */ + This->lpVtbl = &DirectDraw_Vtable; + *pIface = (LPDIRECTDRAW)&This->lpVtbl; + Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + } + + if ( This->lpVtbl != 0) { DX_STUB_str("Got iface\n");

17 years, 6 months

[greatlrd] 27205: adding allot of fix and partly implement 1. Adding table lockup for directdraw 1-6 but they are not complete 2. remove out GetDevicreIdentifer to own file it is a large functions 3. Fixed DirectDrawCreate works now 4. found out bit more how DirectDraw_QueryInterface works and comment the new found 5. add the new table to QueryInterface they are partly support now, the new IID is IID_IDirectDraw4, IID_IDirectDraw2 and IID_IDirectDraw it partly support now.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 16 20:42:50 2007 New Revision: 27205 URL: http://svn.reactos.org/svn/reactos?rev=27205&view=rev Log: adding allot of fix and partly implement 1. Adding table lockup for directdraw 1-6 but they are not complete 2. remove out GetDevicreIdentifer to own file it is a large functions 3. Fixed DirectDrawCreate works now 4. found out bit more how DirectDraw_QueryInterface works and comment the new found 5. add the new table to QueryInterface they are partly support now, the new IID is IID_IDirectDraw4, IID_IDirectDraw2 and IID_IDirectDraw it partly support now. Added: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c (with props) Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/main.c Added: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c (added) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c Sat Jun 16 20:42:50 2007 @@ -1,0 +1,190 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DirectX + * FILE: ddraw/ddraw/GetDeviceIdentifier.c + * PURPOSE: IDirectDraw7 Implementation + * PROGRAMMER: Magnus Olsen + * + */ + +/* TODO + * We need adding digtial signarture detections for the drivers + * and count out which level the signtature driver got, the value + * shall be save to pDDDI->dwWHQLLevel, But I do not known how todo + * this part yet, That is only missing feature in this functions + * + * Write a UML digram for this api + */ + +#include "rosdraw.h" + +#include <string.h> + +/* PSEH for SEH Support */ +#include <pseh/pseh.h> +/* For DirectDraw 4 - 6 */ +HRESULT WINAPI +Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW4 iface, + LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags) +{ + HRESULT retVal = DD_OK; + DDDEVICEIDENTIFIER2 pDDDI2; + + ZeroMemory(&pDDDI2,sizeof(DDDEVICEIDENTIFIER2)); + + _SEH_TRY + { + memcpy(&pDDDI2 , pDDDI, sizeof(DDDEVICEIDENTIFIER)); + + retVal = Main_DirectDraw_GetDeviceIdentifier7((LPDIRECTDRAW7)iface, &pDDDI2, dwFlags); + + if (IsBadWritePtr(pDDDI, sizeof(DDDEVICEIDENTIFIER))) + { + retVal = DDERR_INVALIDPARAMS; + } + else + { + memcpy(pDDDI , &pDDDI2, sizeof(DDDEVICEIDENTIFIER) ); + } + } + _SEH_HANDLE + { + retVal = DD_FALSE; + } + _SEH_END; + + return retVal; +} + +HRESULT WINAPI +Main_DirectDraw_GetDeviceIdentifier7(LPDIRECTDRAW7 iface, + LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) +{ + HRESULT retVal = DDERR_INVALIDPARAMS; + + BOOL found = FALSE; + DWORD iDevNum = 0; + DISPLAY_DEVICEA DisplayDeviceA; + HKEY hKey; + DWORD lpType = 0; + DWORD strSize = MAX_DDDEVICEID_STRING; + char *pdest; + char* pcCnvEnd; + long *lpdata; + + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; + + DX_WINDBG_trace(); + + _SEH_TRY + { + if ( (IsBadWritePtr( pDDDI, sizeof(DDDEVICEIDENTIFIER2) ) ) || + (dwFlags & ~DDGDI_GETHOSTIDENTIFIER)) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + /* now we can start getting the driver data */ + + while (1) + { + ZeroMemory(&DisplayDeviceA,sizeof(DISPLAY_DEVICEA)); + + DisplayDeviceA.cb = sizeof(DISPLAY_DEVICEA); + + if ( EnumDisplayDevicesA( NULL, iDevNum, &DisplayDeviceA, 0) == 0) + { + retVal = DDERR_INVALIDPARAMS; + break; + } + + if (!_stricmp(DisplayDeviceA.DeviceName, This->lpLcl->lpGbl->cDriverName)) + { + /* if we got another device like hardware mpeg decoder or video card or another drv */ + found = TRUE; + } + else if (DisplayDeviceA.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + /* double check if it primary driver we just found */ + if (!_stricmp( This->lpLcl->lpGbl->cDriverName, "DISPLAY")) + { + /* yeah we found it */ + found = TRUE; + } + } + + if (found == TRUE) + { + /* we found our driver now we start setup it */ + if (!_strnicmp(DisplayDeviceA.DeviceKey,"\\REGISTRY\\Machine\\",18)) + { + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, &DisplayDeviceA.DeviceKey[18], 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS ) + { + + if (RegQueryValueExA(hKey, "InstalledDisplayDrivers",0, &lpType, (LPBYTE)pDDDI->szDriver, &strSize) != ERROR_SUCCESS) + { + ZeroMemory(pDDDI->szDriver,MAX_DDDEVICEID_STRING); + } + else + { + strcat(pDDDI->szDriver,".dll"); + } + RegCloseKey(hKey); + } + + strcpy( pDDDI->szDescription, DisplayDeviceA.DeviceString); + pDDDI->liDriverVersion.HighPart = 0; + pDDDI->liDriverVersion.LowPart = 0; + + pdest = strstr(DisplayDeviceA.DeviceID,"REV_"); + pDDDI->dwRevision = strtol ( &pdest[4], &pcCnvEnd, 16); + + pdest = strstr(DisplayDeviceA.DeviceID,"SUBSYS_"); + pDDDI->dwSubSysId = strtol ( &pdest[7], &pcCnvEnd, 16); + + pdest = strstr(DisplayDeviceA.DeviceID,"DEV_"); + pDDDI->dwDeviceId = strtol ( &pdest[4], &pcCnvEnd, 16); + + pdest = strstr(DisplayDeviceA.DeviceID,"VEN_"); + pDDDI->dwVendorId =strtol ( &pdest[4], &pcCnvEnd, 16); + + /* Count out the guidDeviceIdentifier */ + memcpy(&pDDDI->guidDeviceIdentifier, &CLSID_DirectDraw,sizeof(GUID)); + + pDDDI->guidDeviceIdentifier.Data1 ^= pDDDI->dwVendorId; + + lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data2; + *lpdata ^= pDDDI->dwDeviceId; + + lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4; + *lpdata = (*lpdata ^ pDDDI->dwSubSysId) ^ pDDDI->liDriverVersion.LowPart; + + lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4[4]; + *lpdata = (*lpdata ^ pDDDI->dwRevision) ^ pDDDI->liDriverVersion.HighPart; + + /* FIXME pDDDI->dwWHQLLevel + * we leave this with no informations, I do not known + * if program care for it, I mark this api done, and + * tested, no bugs was found in it + */ + pDDDI->dwWHQLLevel = 0; + retVal = DD_OK; + } + + break; + } + + iDevNum++; + } + + } + _SEH_HANDLE + { + retVal = DD_FALSE; + } + _SEH_END; + + return retVal; +} Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision 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 Sat Jun 16 20:42:50 2007 @@ -8,6 +8,11 @@ * */ +/* TODO + * add warper functions for dx 1 - 6 + * map the DirectDraw4_Vtable, DirectDraw2_Vtable, DirectDraw_Vtable + * table to right version of the functions + */ #include "rosdraw.h" @@ -34,9 +39,42 @@ */ if (IsEqualGUID(&IID_IDirectDraw7, id)) { + /* FIXME linking */ + /* DirectDraw7 Vtable */ This->lpVtbl = &DirectDraw7_Vtable; This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags + DDRAWILCL_DIRECTDRAW7; + *obj = &This->lpVtbl; + Main_DirectDraw_AddRef(iface); + } + else if (IsEqualGUID(&IID_IDirectDraw4, id)) + { + /* FIXME linking */ + + /* DirectDraw4 Vtable */ + This->lpVtbl = &DirectDraw4_Vtable; + This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags; + *obj = &This->lpVtbl; + Main_DirectDraw_AddRef(iface); + } + else if (IsEqualGUID(&IID_IDirectDraw2, id)) + { + /* FIXME linking */ + + + /* DirectDraw4 Vtable */ + This->lpVtbl = &DirectDraw2_Vtable; + This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags; + *obj = &This->lpVtbl; + Main_DirectDraw_AddRef(iface); + } + else if (IsEqualGUID(&IID_IDirectDraw, id)) + { + /* FIXME linking */ + + /* DirectDraw4 Vtable */ + This->lpVtbl = &DirectDraw_Vtable; + This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags; *obj = &This->lpVtbl; Main_DirectDraw_AddRef(iface); } @@ -415,171 +453,7 @@ return ret; } -/* For DirectDraw 4 - 6 */ -HRESULT WINAPI -Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW4 iface, - LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags) -{ - HRESULT retVal = DD_OK; - DDDEVICEIDENTIFIER2 pDDDI2; - - ZeroMemory(&pDDDI2,sizeof(DDDEVICEIDENTIFIER2)); - - _SEH_TRY - { - memcpy(&pDDDI2 , pDDDI, sizeof(DDDEVICEIDENTIFIER)); - - retVal = Main_DirectDraw_GetDeviceIdentifier7((LPDIRECTDRAW7)iface, &pDDDI2, dwFlags); - - if (IsBadWritePtr(pDDDI, sizeof(DDDEVICEIDENTIFIER))) - { - retVal = DDERR_INVALIDPARAMS; - } - else - { - memcpy(pDDDI , &pDDDI2, sizeof(DDDEVICEIDENTIFIER) ); - } - } - _SEH_HANDLE - { - retVal = DD_FALSE; - } - _SEH_END; - - return retVal; -} - -HRESULT WINAPI -Main_DirectDraw_GetDeviceIdentifier7(LPDIRECTDRAW7 iface, - LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) -{ - HRESULT retVal = DDERR_INVALIDPARAMS; - - BOOL found = FALSE; - DWORD iDevNum = 0; - DISPLAY_DEVICEA DisplayDeviceA; - HKEY hKey; - DWORD lpType = 0; - DWORD strSize = MAX_DDDEVICEID_STRING; - char *pdest; - char* pcCnvEnd; - long *lpdata; - - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; - - DX_WINDBG_trace(); - - _SEH_TRY - { - if ( (IsBadWritePtr( pDDDI, sizeof(DDDEVICEIDENTIFIER2) ) ) || - (dwFlags & ~DDGDI_GETHOSTIDENTIFIER)) - { - retVal = DDERR_INVALIDPARAMS; - _SEH_LEAVE; - } - - /* now we can start getting the driver data */ - - while (1) - { - ZeroMemory(&DisplayDeviceA,sizeof(DISPLAY_DEVICEA)); - - DisplayDeviceA.cb = sizeof(DISPLAY_DEVICEA); - - if ( EnumDisplayDevicesA( NULL, iDevNum, &DisplayDeviceA, 0) == 0) - { - retVal = DDERR_INVALIDPARAMS; - break; - } - - if (!_stricmp(DisplayDeviceA.DeviceName, This->lpLcl->lpGbl->cDriverName)) - { - /* if we got another device like hardware mpeg decoder or video card or another drv */ - found = TRUE; - } - else if (DisplayDeviceA.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - { - /* double check if it primary driver we just found */ - if (!_stricmp( This->lpLcl->lpGbl->cDriverName, "DISPLAY")) - { - /* yeah we found it */ - found = TRUE; - } - } - - if (found == TRUE) - { - /* we found our driver now we start setup it */ - if (!_strnicmp(DisplayDeviceA.DeviceKey,"\\REGISTRY\\Machine\\",18)) - { - if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, &DisplayDeviceA.DeviceKey[18], 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS ) - { - - if (RegQueryValueExA(hKey, "InstalledDisplayDrivers",0, &lpType, (LPBYTE)pDDDI->szDriver, &strSize) != ERROR_SUCCESS) - { - ZeroMemory(pDDDI->szDriver,MAX_DDDEVICEID_STRING); - } - else - { - strcat(pDDDI->szDriver,".dll"); - } - RegCloseKey(hKey); - } - - strcpy( pDDDI->szDescription, DisplayDeviceA.DeviceString); - pDDDI->liDriverVersion.HighPart = 0; - pDDDI->liDriverVersion.LowPart = 0; - - pdest = strstr(DisplayDeviceA.DeviceID,"REV_"); - pDDDI->dwRevision = strtol ( &pdest[4], &pcCnvEnd, 16); - - pdest = strstr(DisplayDeviceA.DeviceID,"SUBSYS_"); - pDDDI->dwSubSysId = strtol ( &pdest[7], &pcCnvEnd, 16); - - pdest = strstr(DisplayDeviceA.DeviceID,"DEV_"); - pDDDI->dwDeviceId = strtol ( &pdest[4], &pcCnvEnd, 16); - - pdest = strstr(DisplayDeviceA.DeviceID,"VEN_"); - pDDDI->dwVendorId =strtol ( &pdest[4], &pcCnvEnd, 16); - - /* Count out the guidDeviceIdentifier */ - memcpy(&pDDDI->guidDeviceIdentifier, &CLSID_DirectDraw,sizeof(GUID)); - - pDDDI->guidDeviceIdentifier.Data1 ^= pDDDI->dwVendorId; - - lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data2; - *lpdata ^= pDDDI->dwDeviceId; - - lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4; - *lpdata = (*lpdata ^ pDDDI->dwSubSysId) ^ pDDDI->liDriverVersion.LowPart; - - lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4[4]; - *lpdata = (*lpdata ^ pDDDI->dwRevision) ^ pDDDI->liDriverVersion.HighPart; - - /* FIXME pDDDI->dwWHQLLevel - * we leave this with no informations, I do not known - * if program care for it, I mark this api done, and - * tested, no bugs was found in it - */ - pDDDI->dwWHQLLevel = 0; - retVal = DD_OK; - } - - break; - } - - iDevNum++; - } - - } - _SEH_HANDLE - { - retVal = DD_FALSE; - } - _SEH_END; - - return retVal; -} + /* 5 of 31 DirectDraw7_Vtable api are working simluare to windows */ /* 8 of 31 DirectDraw7_Vtable api are under devloping / testing */ @@ -617,3 +491,94 @@ Main_DirectDraw_StartModeTest, Main_DirectDraw_EvaluateMode }; + + +IDirectDraw4Vtbl DirectDraw4_Vtable = +{ + Main_DirectDraw_QueryInterface, + Main_DirectDraw_AddRef, + Main_DirectDraw_Release, + Main_DirectDraw_Compact, + Main_DirectDraw_CreateClipper, + Main_DirectDraw_CreatePalette, + Main_DirectDraw_CreateSurface4, + Main_DirectDraw_DuplicateSurface, + Main_DirectDraw_EnumDisplayModes, + Main_DirectDraw_EnumSurfaces, + Main_DirectDraw_FlipToGDISurface, + Main_DirectDraw_GetCaps, + Main_DirectDraw_GetDisplayMode, + Main_DirectDraw_GetFourCCCodes, + Main_DirectDraw_GetGDISurface, + Main_DirectDraw_GetMonitorFrequency, + Main_DirectDraw_GetScanLine, + Main_DirectDraw_GetVerticalBlankStatus, + Main_DirectDraw_Initialize, + Main_DirectDraw_RestoreDisplayMode, + Main_DirectDraw_SetCooperativeLevel, + Main_DirectDraw_SetDisplayMode, + Main_DirectDraw_WaitForVerticalBlank, + Main_DirectDraw_GetAvailableVidMem4, + Main_DirectDraw_GetSurfaceFromDC, + Main_DirectDraw_RestoreAllSurfaces, + Main_DirectDraw_TestCooperativeLevel, + Main_DirectDraw_GetDeviceIdentifier +}; + +IDirectDraw2Vtbl DirectDraw2_Vtable = +{ + Main_DirectDraw_QueryInterface, + Main_DirectDraw_AddRef, + Main_DirectDraw_Release, + Main_DirectDraw_Compact, + Main_DirectDraw_CreateClipper, + Main_DirectDraw_CreatePalette, + Main_DirectDraw_CreateSurface, + Main_DirectDraw_DuplicateSurface, + Main_DirectDraw_EnumDisplayModes, + Main_DirectDraw_EnumSurfaces, + Main_DirectDraw_FlipToGDISurface, + Main_DirectDraw_GetCaps, + Main_DirectDraw_GetDisplayMode, + Main_DirectDraw_GetFourCCCodes, + Main_DirectDraw_GetGDISurface, + Main_DirectDraw_GetMonitorFrequency, + Main_DirectDraw_GetScanLine, + Main_DirectDraw_GetVerticalBlankStatus, + Main_DirectDraw_Initialize, + Main_DirectDraw_RestoreDisplayMode, + Main_DirectDraw_SetCooperativeLevel, + Main_DirectDraw_SetDisplayMode, + Main_DirectDraw_WaitForVerticalBlank, + Main_DirectDraw_GetAvailableVidMem +}; + +IDirectDrawVtbl DirectDraw_Vtable = +{ + Main_DirectDraw_QueryInterface, + Main_DirectDraw_AddRef, + Main_DirectDraw_Release, + Main_DirectDraw_Compact, + Main_DirectDraw_CreateClipper, + Main_DirectDraw_CreatePalette, + Main_DirectDraw_CreateSurface, + Main_DirectDraw_DuplicateSurface, + Main_DirectDraw_EnumDisplayModes, + Main_DirectDraw_EnumSurfaces, + Main_DirectDraw_FlipToGDISurface, + Main_DirectDraw_GetCaps, + Main_DirectDraw_GetDisplayMode, + Main_DirectDraw_GetFourCCCodes, + Main_DirectDraw_GetGDISurface, + Main_DirectDraw_GetMonitorFrequency, + Main_DirectDraw_GetScanLine, + Main_DirectDraw_GetVerticalBlankStatus, + Main_DirectDraw_Initialize, + Main_DirectDraw_RestoreDisplayMode, + Main_DirectDraw_SetCooperativeLevel, + Main_DirectDraw_SetDisplayMode, + Main_DirectDraw_WaitForVerticalBlank +}; + + + Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Sat Jun 16 20:42:50 2007 @@ -45,6 +45,18 @@ return This->dwIntRefCnt; } + +HRESULT WINAPI +Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid, + LPVOID* ppObj) +{ + DX_WINDBG_trace(); + + DX_STUB_str("Unimplement\n"); + + return E_NOINTERFACE; +} + ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7 iface) @@ -670,7 +682,7 @@ { /*** IUnknown ***/ Main_DDrawSurface_QueryInterface, - Main_DDrawSurface_AddRef, + Main_DDrawSurface_AddRef, /* (Compact done) */ Main_DDrawSurface_Release, /*** IDirectDrawSurface ***/ Main_DDrawSurface_AddAttachedSurface, Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c Sat Jun 16 20:42:50 2007 @@ -10,16 +10,7 @@ #include "rosdraw.h" -HRESULT WINAPI -Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid, - LPVOID* ppObj) -{ - DX_WINDBG_trace(); - - DX_STUB_str("Unimplement\n"); - - return E_NOINTERFACE; -} + /* MSDN: "not currently implemented." */ 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 Sat Jun 16 20:42:50 2007 @@ -27,6 +27,7 @@ <file>ddraw_main.c</file> <file>ddraw_displaymode.c</file> <file>ddraw_setcooperativelevel.c</file> + <file>GetDeviceIdentifier.c</file> <file>ddraw_stubs.c</file> <file>callbacks_dd_hel.c</file> </directory> Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Sat Jun 16 20:42:50 2007 @@ -37,13 +37,31 @@ LPDIRECTDRAW* lplpDD, LPUNKNOWN pUnkOuter) { + HRESULT retVal = DDERR_GENERIC; /* remove this when UML digram are in place this api is finish and is working as it should */ DX_WINDBG_trace(); - return DirectDrawCreateEx(lpGUID, (LPVOID*)lplpDD, &IID_IDirectDraw2, pUnkOuter); + _SEH_TRY + { + /* check see if pUnkOuter is null or not */ + if (pUnkOuter) + { + retVal = CLASS_E_NOAGGREGATION; + } + else + { + retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, &IID_IDirectDraw, TRUE); + } + } + _SEH_HANDLE + { + } + _SEH_END; + + return retVal; } /*

17 years, 6 months

[fireball] 27204: - Fix a typo.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jun 16 16:48:04 2007 New Revision: 27204 URL: http://svn.reactos.org/svn/reactos?rev=27204&view=rev Log: - Fix a typo. Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s Sat Jun 16 16:48:04 2007 @@ -9,6 +9,7 @@ .globl _atan .globl _cos .globl _sin +.globl _tan .intel_syntax noprefix

17 years, 6 months

[spetreolle] 27203: revert previous r27194 ntoskrnl already exports InterlockedDe/Increment spotted by hpoussin still fails to link, thans to heisspiter for win32 test

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Jun 16 16:45:02 2007 New Revision: 27203 URL: http://svn.reactos.org/svn/reactos?rev=27203&view=rev Log: revert previous r27194 ntoskrnl already exports InterlockedDe/Increment spotted by hpoussin still fails to link, thans to heisspiter for win32 test Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild Sat Jun 16 16:45:02 2007 @@ -8,7 +8,6 @@ <library>ntoskrnl</library> <library>ks</library> <library>drmk</library> - <library>kernel32</library> <file>dll.c</file> <file>adapter.c</file>

17 years, 6 months

[fireball] 27202: - Finally, removing frame pointer was a bad idea (think of exceptions / etc).

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jun 16 16:28:56 2007 New Revision: 27202 URL: http://svn.reactos.org/svn/reactos?rev=27202&view=rev Log: - Finally, removing frame pointer was a bad idea (think of exceptions / etc). Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s Sat Jun 16 16:28:56 2007 @@ -3,13 +3,47 @@ * PROJECT: ReactOS kernel * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/fabs.S - * PROGRAMER: Magnus Olsen (greatlord(a)greatlord.com) -*/ + * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) + * + * Copyright (C) 2002 Michael Ringgaard. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + .globl _fabs + .intel_syntax noprefix + +/* FUNCTIONS ***************************************************************/ + _fabs: - - fld qword ptr [esp+8] - fabs + push ebp + mov ebp,esp + fld qword ptr [ebp+8] // Load real from stack + fabs // Take the absolute value + pop ebp ret Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s Sat Jun 16 16:28:56 2007 @@ -3,14 +3,49 @@ * PROJECT: ReactOS kernel * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/log.S - * PROGRAMER: Magnus Olsen (greatlord(a)greatlord.com) + * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) + * + * Copyright (C) 2002 Michael Ringgaard. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ + .globl _log + .intel_syntax noprefix +/* FUNCTIONS ***************************************************************/ + _log: - fld qword ptr [esp+8] - fldln2 - fxch st(1) - fyl2x + push ebp + mov ebp,esp + fld qword ptr [ebp+8] // Load real from stack + fldln2 // Load log base e of 2 + fxch st(1) // Exchange st, st(1) + fyl2x // Compute the natural log(x) + pop ebp ret Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s Sat Jun 16 16:28:56 2007 @@ -3,15 +3,47 @@ * PROJECT: ReactOS kernel * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/sqrt.S - * PROGRAMER: Magnus Olsen (greatlord(a)greatlord.com) + * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) + * + * Copyright (C) 2002 Michael Ringgaard. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ - .globl _sqrt .intel_syntax noprefix +/* FUNCTIONS ***************************************************************/ + _sqrt: - fld qword ptr [esp+8] - fsqrt + push ebp + mov ebp,esp + fld qword ptr [ebp+8] // Load real from stack + fsqrt // Take the square root + pop ebp ret Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s Sat Jun 16 16:28:56 2007 @@ -4,33 +4,49 @@ * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/trig_asm.s * PROGRAMER: Aleksey Bragin (aleksey reactos org) -*/ - + * + */ .globl _atan .globl _cos .globl _sin -.globl _tan - + .intel_syntax noprefix +/* FUNCTIONS ***************************************************************/ + _atan: - fld qword ptr [esp+8] + push ebp + mov ebp,esp + fld qword ptr [ebp+8] fld1 fpatan + pop ebp ret _cos: - fld qword ptr [esp+8] + push ebp + mov ebp,esp + fld qword ptr [ebp+8] fcos + pop ebp ret _sin: - fld qword ptr [esp+8] + push ebp + mov ebp,esp + fld qword ptr [ebp+8] fsin + pop ebp ret _tan: - fld qword ptr [esp+8] + push ebp + mov ebp,esp + sub esp,4 + fld qword ptr [ebp+8] fptan - fstp dword ptr [esp-4] + fstp dword ptr [ebp-4] + mov esp,ebp + pop ebp ret +

17 years, 6 months

[fireball] 27201: - Uhh.. Doing it properly now. - Also gathered trigonometric function into one file.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jun 16 15:55:21 2007 New Revision: 27201 URL: http://svn.reactos.org/svn/reactos?rev=27201&view=rev Log: - Uhh.. Doing it properly now. - Also gathered trigonometric function into one file. Added: trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s (with props) Removed: trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s Modified: trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s Modified: trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/libcntpr.… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild (original) +++ trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild Sat Jun 16 15:55:21 2007 @@ -26,21 +26,18 @@ <file>allrem_asm.s</file> <file>allshl_asm.s</file> <file>allshr_asm.s</file> - <file>atan_asm.s</file> <file>aulldiv_asm.s</file> <file>aulldvrm_asm.s</file> <file>aullrem_asm.s</file> <file>aullshr_asm.s</file> <file>ceil_asm.s</file> - <file>cos_asm.s</file> <file>fabs_asm.s</file> <file>floor_asm.s</file> <file>ftol_asm.s</file> <file>log_asm.s</file> <file>pow_asm.s</file> - <file>sin_asm.s</file> <file>sqrt_asm.s</file> - <file>tan_asm.s</file> + <file>trig_asm.s</file> </directory> </if> <file>abs.c</file> Removed: trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s (removed) @@ -1,17 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Run-Time Library - * FILE: lib/rtl/i386/atan.S - * PROGRAMER: Magnus Olsen (greatlord(a)greatlord.com) -*/ - -.globl _atan - -.intel_syntax noprefix - -_atan: - fld qword ptr [esp+4] - fld1 - fpatan - ret Removed: trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s (removed) @@ -1,16 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Run-Time Library - * FILE: lib/rtl/i386/cos.S - * PROGRAMER: Magnus Olsen (greatlord(a)greatlord.com) -*/ - -.globl _cos - -.intel_syntax noprefix - -_cos: - fld qword ptr [esp+4] - fcos - ret Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s Sat Jun 16 15:55:21 2007 @@ -10,6 +10,6 @@ .intel_syntax noprefix _fabs: - fld qword ptr [esp+4] + fld qword ptr [esp+8] fabs ret Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s Sat Jun 16 15:55:21 2007 @@ -9,7 +9,7 @@ .intel_syntax noprefix _log: - fld qword ptr [esp+4] + fld qword ptr [esp+8] fldln2 fxch st(1) fyl2x Removed: trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s (removed) @@ -1,14 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Run-Time Library - * FILE: lib/rtl/i386/sin.S - * PROGRAMER: Magnus Olsen (greatlord(a)greatlord.com) - */ - -.globl _sin -.intel_syntax noprefix -_sin: - fld qword ptr [esp+4] - fsin - ret Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s Sat Jun 16 15:55:21 2007 @@ -12,6 +12,6 @@ .intel_syntax noprefix _sqrt: - fld qword ptr [esp+4] + fld qword ptr [esp+8] fsqrt ret Removed: trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s (removed) @@ -1,16 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Run-Time Library - * FILE: lib/rtl/i386/tan.S - * PROGRAMER: Magnus Olsen (magnus(a)greatlord.com) - */ -.globl _tan -.intel_syntax noprefix -_tan: - sub esp,4 - fld qword ptr [ebp+8] - fptan - fstp dword ptr [ebp+4] - add esp,4; - ret Added: trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s (added) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s Sat Jun 16 15:55:21 2007 @@ -1,0 +1,36 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Run-Time Library + * FILE: lib/rtl/i386/trig_asm.s + * PROGRAMER: Aleksey Bragin (aleksey reactos org) +*/ + +.globl _atan +.globl _cos +.globl _sin +.globl _tan + +.intel_syntax noprefix + +_atan: + fld qword ptr [esp+8] + fld1 + fpatan + ret + +_cos: + fld qword ptr [esp+8] + fcos + ret + +_sin: + fld qword ptr [esp+8] + fsin + ret + +_tan: + fld qword ptr [esp+8] + fptan + fstp dword ptr [esp-4] + ret Propchange: trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 6 months

[greatlrd] 27200: rewrite atan, cos, fabs, sin, sqrt, tan, it will give us better speed as well the old version was slow

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 16 15:19:30 2007 New Revision: 27200 URL: http://svn.reactos.org/svn/reactos?rev=27200&view=rev Log: rewrite atan, cos, fabs, sin, sqrt, tan, it will give us better speed as well the old version was slow Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s Sat Jun 16 15:19:30 2007 @@ -3,48 +3,15 @@ * PROJECT: ReactOS kernel * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/atan.S - * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * - * Copyright (C) 2002 Michael Ringgaard. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ + * PROGRAMER: Magnus Olsen (greatlord(a)greatlord.com) +*/ .globl _atan .intel_syntax noprefix -/* FUNCTIONS ***************************************************************/ - _atan: - push ebp - mov ebp,esp - fld qword ptr [ebp+8] // Load real from stack - fld1 // Load constant 1 - fpatan // Take the arctangent - pop ebp + fld qword ptr [esp+4] + fld1 + fpatan ret Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s Sat Jun 16 15:19:30 2007 @@ -3,47 +3,14 @@ * PROJECT: ReactOS kernel * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/cos.S - * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * - * Copyright (C) 2002 Michael Ringgaard. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * PROGRAMER: Magnus Olsen (greatlord(a)greatlord.com) +*/ - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - .globl _cos .intel_syntax noprefix -/* FUNCTIONS ***************************************************************/ - _cos: - push ebp - mov ebp,esp // Point to the stack frame - fld qword ptr [ebp+8] // Load real from stack - fcos // Take the cosine - pop ebp + fld qword ptr [esp+4] + fcos ret Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s Sat Jun 16 15:19:30 2007 @@ -3,47 +3,13 @@ * PROJECT: ReactOS kernel * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/fabs.S - * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * - * Copyright (C) 2002 Michael Ringgaard. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * PROGRAMER: Magnus Olsen (greatlord(a)greatlord.com) +*/ - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - .globl _fabs - .intel_syntax noprefix +_fabs: -/* FUNCTIONS ***************************************************************/ - -_fabs: - push ebp - mov ebp,esp - fld qword ptr [ebp+8] // Load real from stack - fabs // Take the absolute value - pop ebp + fld qword ptr [esp+4] + fabs ret Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s Sat Jun 16 15:19:30 2007 @@ -3,49 +3,14 @@ * PROJECT: ReactOS kernel * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/log.S - * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * - * Copyright (C) 2002 Michael Ringgaard. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * PROGRAMER: Magnus Olsen (greatlord(a)greatlord.com) */ - .globl _log - .intel_syntax noprefix -/* FUNCTIONS ***************************************************************/ - _log: - push ebp - mov ebp,esp - fld qword ptr [ebp+8] // Load real from stack - fldln2 // Load log base e of 2 - fxch st(1) // Exchange st, st(1) - fyl2x // Compute the natural log(x) - pop ebp + fld qword ptr [esp+4] + fldln2 + fxch st(1) + fyl2x ret Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s Sat Jun 16 15:19:30 2007 @@ -3,47 +3,12 @@ * PROJECT: ReactOS kernel * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/sin.S - * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * - * Copyright (C) 2002 Michael Ringgaard. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * PROGRAMER: Magnus Olsen (greatlord(a)greatlord.com) */ .globl _sin - .intel_syntax noprefix - -/* FUNCTIONS ***************************************************************/ - _sin: - push ebp // Save register bp - mov ebp,esp // Point to the stack frame - fld qword ptr [ebp+8] // Load real from stack - fsin // Take the sine - pop ebp // Restore register bp + fld qword ptr [esp+4] + fsin ret Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s Sat Jun 16 15:19:30 2007 @@ -3,47 +3,15 @@ * PROJECT: ReactOS kernel * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/sqrt.S - * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * - * Copyright (C) 2002 Michael Ringgaard. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * PROGRAMER: Magnus Olsen (greatlord(a)greatlord.com) + */ - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ .globl _sqrt .intel_syntax noprefix -/* FUNCTIONS ***************************************************************/ - _sqrt: - push ebp - mov ebp,esp - fld qword ptr [ebp+8] // Load real from stack - fsqrt // Take the square root - pop ebp + fld qword ptr [esp+4] + fsqrt ret Modified: trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s Sat Jun 16 15:19:30 2007 @@ -3,50 +3,14 @@ * PROJECT: ReactOS kernel * PURPOSE: Run-Time Library * FILE: lib/rtl/i386/tan.S - * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * - * Copyright (C) 2002 Michael Ringgaard. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * PROGRAMER: Magnus Olsen (magnus(a)greatlord.com) */ - .globl _tan - .intel_syntax noprefix - -/* FUNCTIONS ***************************************************************/ - _tan: - push ebp - mov ebp,esp - sub esp,4 // Allocate temporary space - fld qword ptr [ebp+8] // Load real from stack - fptan // Take the tangent - fstp dword ptr [ebp-4] // Throw away the constant 1 - mov esp,ebp // Deallocate temporary space - pop ebp + sub esp,4 + fld qword ptr [ebp+8] + fptan + fstp dword ptr [ebp+4] + add esp,4; ret

17 years, 6 months

[dgorbachev] 27199: Unable to reproduce that bug (#2047). Apply r27177 patch again.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sat Jun 16 12:27:02 2007 New Revision: 27199 URL: http://svn.reactos.org/svn/reactos?rev=27199&view=rev Log: Unable to reproduce that bug (#2047). Apply r27177 patch again. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Sat Jun 16 12:27:02 2007 @@ -2574,11 +2574,19 @@ if (! ConioGetIntersection(&SrcRegion, &ScreenBuffer, &ScrollRectangle)) { ConioUnlockScreenBuffer(Buff); + if (NULL != Console) + { + ConioUnlockConsole(Console); + } return Request->Status = STATUS_INVALID_PARAMETER; } if (UseClipRectangle && ! ConioGetIntersection(&SrcRegion, &SrcRegion, &ClipRectangle)) { + if (NULL != Console) + { + ConioUnlockConsole(Console); + } ConioUnlockScreenBuffer(Buff); return Request->Status = STATUS_SUCCESS; } @@ -2593,6 +2601,10 @@ /* Make sure destination rectangle is inside the screen buffer */ if (! ConioGetIntersection(&DstRegion, &DstRegion, &ScreenBuffer)) { + if (NULL != Console) + { + ConioUnlockConsole(Console); + } ConioUnlockScreenBuffer(Buff); return Request->Status = STATUS_INVALID_PARAMETER; } @@ -2663,6 +2675,10 @@ Status = ConioLockScreenBuffer(ProcessData, Request->Data.ReadConsoleOutputCharRequest.ConsoleHandle, &Buff); if (! NT_SUCCESS(Status)) { + if (NULL != Console) + { + ConioUnlockConsole(Console); + } return Request->Status = Status; }

17 years, 6 months

[greatlrd] 27198: adding one missing stub

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jun 16 05:32:59 2007 New Revision: 27198 URL: http://svn.reactos.org/svn/reactos?rev=27198&view=rev Log: adding one missing stub Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.def trunk/reactos/dll/win32/gdiplus/gdiplus/path.c Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.def (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.def Sat Jun 16 05:32:59 2007 @@ -268,6 +268,7 @@ GdipGetImageEncoders@12 GdipComment@12 GdipComment@12 +GdipCreatePath@8 GdipCreatePath2@20 GdipCreatePath2I@20 GdipClonePath@8 Modified: trunk/reactos/dll/win32/gdiplus/gdiplus/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus/… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus/path.c (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus/path.c Sat Jun 16 05:32:59 2007 @@ -1,6 +1,18 @@ #include <windows.h> #include <gdiplusprivate.h> #include <debug.h> + + +/* + * @unimplemented + */ +GpStatus WINGDIPAPI +GdipCreatePath( GpFillMode brushMode,GpPath **path) +{ + return NotImplemented; +} + + /* * @unimplemented

17 years, 6 months

← Newer
1
...
12
13
14
15
16
17
18
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2007