Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[fireball] 31280: - Add shared->Exclusive promotion support to value cache routines as well. - Implement CmpCompareNewValueDataAgainstKCBCache as an optimization during Set Value Key operations, so that if the value is already identical, it will not be written again.
by fireball＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: fireball Date: Sun Dec 16 18:41:48 2007 New Revision: 31280 URL: http://svn.reactos.org/svn/reactos?rev=31280&view=rev Log: - Add shared->Exclusive promotion support to value cache routines as well. - Implement CmpCompareNewValueDataAgainstKCBCache as an optimization during Set Value Key operations, so that if the value is already identical, it will not be written again. Modified: trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmvalche.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Sun Dec 16 18:41:48 2007 @@ -296,7 +296,11 @@ } /* Search for the value */ - SearchResult = SearchFail; + SearchResult = CmpCompareNewValueDataAgainstKCBCache(Kcb, + ValueName, + Type, + Data, + DataLength); if (SearchResult == SearchNeedExclusiveLock) { /* Try again with the exclusive lock */ Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c (original) +++ trunk/reactos/ntoskrnl/config/cmvalche.c Sun Dec 16 18:41:48 2007 @@ -55,12 +55,10 @@ *ValueListToRelease = HCELL_NIL; *IndexIsCached = FALSE; - /* Get the hive */ + /* Get the hive and value ceche */ Hive = Kcb->KeyHive; + ChildList = &Kcb->ValueCache; KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); - - /* Get the child value cache */ - //ChildList = &Kcb->ValueCache; ChildList = (PCACHED_CHILD_LIST)&KeyNode->ValueList; /* Check if the value is cached */ @@ -73,10 +71,20 @@ } else { + /* Make sure the KCB is locked exclusive */ + if (!(CmpIsKcbLockedExclusive(Kcb)) && + !(CmpTryToConvertKcbSharedToExclusive(Kcb))) + { + /* We need the exclusive lock */ + return SearchNeedExclusiveLock; + } + /* Select the value list as our cell, and get the actual list array */ CellToRelease = ChildList->ValueList; *CellData = (PCELL_DATA)HvGetCell(Hive, CellToRelease); if (!(*CellData)) return SearchFail; + + /* FIXME: Here we would cache the value */ /* Return the cell to be released */ *ValueListToRelease = CellToRelease; @@ -210,12 +218,10 @@ *CellToRelease = HCELL_NIL; *Value = NULL; - /* Get the hive */ + /* Get the hive and child list */ Hive = Kcb->KeyHive; + ChildList = &Kcb->ValueCache; KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); - - /* Get the child value cache */ - //ChildList = &Kcb->ValueCache; ChildList = (PCACHED_CHILD_LIST)&KeyNode->ValueList; /* Check if the child list has any entries */ @@ -226,7 +232,13 @@ &CellData, &IndexIsCached, &Cell); - if (SearchResult != SearchSuccess) return SearchResult; + if (SearchResult != SearchSuccess) + { + /* We either failed or need the exclusive lock */ + ASSERT((SearchResult == SearchFail) || !(CmpIsKcbLockedExclusive(Kcb))); + ASSERT(Cell == HCELL_NIL); + return SearchResult; + } /* The index shouldn't be cached right now */ if (IndexIsCached) ASSERT_VALUE_CACHE(); @@ -251,7 +263,13 @@ IndexIsCached, ValueIsCached, CellToRelease); - if (SearchResult != SearchSuccess) return SearchResult; + if (SearchResult != SearchSuccess) + { + /* We either failed or need the exclusive lock */ + ASSERT((SearchResult == SearchFail) || !(CmpIsKcbLockedExclusive(Kcb))); + ASSERT(Cell == HCELL_NIL); + return SearchResult; + } /* Check if the both the index and the value are cached */ if ((IndexIsCached) && (*ValueIsCached)) @@ -647,3 +665,143 @@ /* Return the search result as well */ return Result; } + +VALUE_SEARCH_RETURN_TYPE +NTAPI +CmpCompareNewValueDataAgainstKCBCache(IN PCM_KEY_CONTROL_BLOCK Kcb, + IN PUNICODE_STRING ValueName, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataSize) +{ + VALUE_SEARCH_RETURN_TYPE SearchResult; + PCM_KEY_NODE KeyNode; + PCM_CACHED_VALUE *CachedValue; + ULONG Index; + PCM_KEY_VALUE Value; + BOOLEAN ValueCached, BufferAllocated = FALSE; + PVOID Buffer; + HCELL_INDEX ValueCellToRelease = HCELL_NIL, CellToRelease = HCELL_NIL; + BOOLEAN IsSmall; + ULONG CompareResult; + PAGED_CODE(); + + /* Check if this is a symlink */ + if (Kcb->Flags & KEY_SYM_LINK) + { + /* We need the exclusive lock */ + if (!(CmpIsKcbLockedExclusive(Kcb)) && + !(CmpTryToConvertKcbSharedToExclusive(Kcb))) + { + /* We need the exclusive lock */ + return SearchNeedExclusiveLock; + } + + /* Otherwise, get the key node */ + KeyNode = (PCM_KEY_NODE)HvGetCell(Kcb->KeyHive, Kcb->KeyCell); + if (!KeyNode) return SearchFail; + + /* Cleanup the KCB cache */ + CmpCleanUpKcbValueCache(Kcb); + + /* Sanity checks */ + ASSERT(!(CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))); + ASSERT(!(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND)); + + /* Set the value cache */ + Kcb->ValueCache.Count = KeyNode->ValueList.Count; + Kcb->ValueCache.ValueList = KeyNode->ValueList.List; + + /* Release the cell */ + HvReleaseCell(Kcb->KeyHive, Kcb->KeyCell); + } + + /* Do the search */ + SearchResult = CmpFindValueByNameFromCache(Kcb, + ValueName, + &CachedValue, + &Index, + &Value, + &ValueCached, + &ValueCellToRelease); + if (SearchResult == SearchNeedExclusiveLock) + { + /* We need the exclusive lock */ + ASSERT(!CmpIsKcbLockedExclusive(Kcb)); + ASSERT(ValueCellToRelease == HCELL_NIL); + ASSERT(Value == NULL); + goto Quickie; + } + else if (SearchResult == SearchSuccess) + { + /* Sanity check */ + ASSERT(Value); + + /* First of all, check if the key size and type matches */ + if ((Type == Value->Type) && + (DataSize == (Value->DataLength & ~CM_KEY_VALUE_SPECIAL_SIZE))) + { + /* Check if this is a small key */ + IsSmall = (DataSize <= CM_KEY_VALUE_SMALL) ? TRUE: FALSE; + if (IsSmall) + { + /* Compare against the data directly */ + Buffer = &Value->Data; + } + else + { + /* Do a search */ + SearchResult = CmpGetValueDataFromCache(Kcb, + CachedValue, + (PCELL_DATA)Value, + ValueCached, + &Buffer, + &BufferAllocated, + &CellToRelease); + if (SearchResult != SearchSuccess) + { + /* Sanity checks */ + ASSERT(Buffer == NULL); + ASSERT(BufferAllocated == FALSE); + goto Quickie; + } + } + + /* Now check the data size */ + if (DataSize) + { + /* Do the compare */ + CompareResult = RtlCompareMemory(Buffer, + Data, + DataSize & + ~CM_KEY_VALUE_SPECIAL_SIZE); + } + else + { + /* It's equal */ + CompareResult = 0; + } + + /* Now check if the compare wasn't equal */ + if (CompareResult != DataSize) SearchResult = SearchFail; + } + else + { + /* The length or type isn't equal */ + SearchResult = SearchFail; + } + } + +Quickie: + /* Release the value cell */ + if (ValueCellToRelease) HvReleaseCell(Kcb->KeyHive, ValueCellToRelease); + + /* Free the buffer */ + if (BufferAllocated) ExFreePool(Buffer); + + /* Free the cell */ + if (CellToRelease) HvReleaseCell(Kcb->KeyHive, CellToRelease); + + /* Return the search result */ + return SearchResult; +}

1 0

[pschweitzer] 31279: Fixed some details
by pschweitzer＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: pschweitzer Date: Sun Dec 16 18:25:17 2007 New Revision: 31279 URL: http://svn.reactos.org/svn/reactos?rev=31279&view=rev Log: Fixed some details Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Sun Dec 16 18:25:17 2007 @@ -176,7 +176,7 @@ { 6, 6, - "Licence:", + "Licence :", TEXT_HIGHLIGHT }, { @@ -254,7 +254,7 @@ { 8, 22, - "Warranty:", + "Garantie :", TEXT_HIGHLIGHT }, { @@ -300,31 +300,31 @@ { 8, 11, - " Ordinateur:", + " Ordinateur :", TEXT_NORMAL }, { 8, 12, - " Affichage:", + " Affichage :", TEXT_NORMAL, }, { 8, 13, - " Clavier:", + " Clavier :", TEXT_NORMAL }, { 8, 14, - "Réglage Clavier:", + "Réglage Clavier :", TEXT_NORMAL }, { 8, 16, - " Accepter:", + " Accepter :", TEXT_NORMAL }, {

1 0

[spetreolle] 31278: fix typo
by spetreolle＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: spetreolle Date: Sun Dec 16 17:55:48 2007 New Revision: 31278 URL: http://svn.reactos.org/svn/reactos?rev=31278&view=rev Log: fix typo Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c Sun Dec 16 17:55:48 2007 @@ -644,7 +644,7 @@ PollBuffer = HeapAlloc(GlobalHeap, 0, PollBufferSize); if (!PollBuffer) { - if (*lpErrno) *lpErrno = WSAEFAULT; + if (lpErrno) *lpErrno = WSAEFAULT; NtClose(SockEvent); return SOCKET_ERROR; }

1 0

[hpoussin] 31277: Fix typo spotted by Usurp
by hpoussin＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: hpoussin Date: Sun Dec 16 17:44:01 2007 New Revision: 31277 URL: http://svn.reactos.org/svn/reactos?rev=31277&view=rev Log: Fix typo spotted by Usurp Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c Sun Dec 16 17:44:01 2007 @@ -757,18 +757,18 @@ HeapFree( GlobalHeap, 0, PollBuffer ); NtClose( SockEvent ); - AFD_DbgPrint(MID_TRACE,("lpErrno = %x\n", lpErrno)); if( lpErrno ) { - switch( IOSB.Status ) { - case STATUS_SUCCESS: - case STATUS_TIMEOUT: *lpErrno = 0; break; - default: *lpErrno = WSAEINVAL; break; - } + switch( IOSB.Status ) { + case STATUS_SUCCESS: + case STATUS_TIMEOUT: *lpErrno = 0; break; + default: *lpErrno = WSAEINVAL; break; + } + AFD_DbgPrint(MID_TRACE,("*lpErrno = %x\n", *lpErrno)); } AFD_DbgPrint(MID_TRACE,("%d events\n", OutCount)); - + return OutCount; }

1 0

[greatlrd] 31276: patch from Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) add d3d COM interface to ddraw.dll Fixed smaller bugs as well
by greatlrd＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: greatlrd Date: Sun Dec 16 17:07:33 2007 New Revision: 31276 URL: http://svn.reactos.org/svn/reactos?rev=31276&view=rev Log: patch from Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) add d3d COM interface to ddraw.dll Fixed smaller bugs as well Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D2_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D3_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D7_Vtable.c (with props) Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c trunk/reactos/dll/directx/ddraw/Surface/surface.h trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c trunk/reactos/dll/directx/ddraw/d3d/DirectD3D_main.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h Sun Dec 16 17:07:33 2007 @@ -68,6 +68,22 @@ HRESULT WINAPI Main_DirectDraw_EnumSurfaces( + LPDDRAWI_DIRECTDRAW_INT This, + DWORD dwFlags, + LPDDSURFACEDESC lpDDSD2, + LPVOID context, + LPDDENUMSURFACESCALLBACK callback); + +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces4( + LPDDRAWI_DIRECTDRAW_INT This, + DWORD dwFlags, + LPDDSURFACEDESC2 lpDDSD2, + LPVOID context, + LPDDENUMSURFACESCALLBACK2 callback); + +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces7( LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, @@ -217,3 +233,4 @@ + Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Sun Dec 16 17:07:33 2007 @@ -40,6 +40,24 @@ HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, + LPDDSURFACEDESC lpDDSD, LPVOID context, + LPDDENUMSURFACESCALLBACK callback) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces4(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, + LPDDSURFACEDESC2 lpDDSD2, LPVOID context, + LPDDENUMSURFACESCALLBACK2 callback) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces7(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, LPVOID context, LPDDENUMSURFACESCALLBACK7 callback) { Modified: trunk/reactos/dll/directx/ddraw/Surface/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface.h (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface.h Sun Dec 16 17:07:33 2007 @@ -1,56 +1,56 @@ // public interfaces ULONG WINAPI Main_DDrawSurface_AddRef(LPDDRAWI_DDRAWSURFACE_INT); -ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7); +ULONG WINAPI Main_DDrawSurface_Release(LPDDRAWI_DDRAWSURFACE_INT); HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDDRAWI_DDRAWSURFACE_INT, REFIID, LPVOID*); -HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX); -HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7, LPDDBLTBATCH, DWORD, DWORD); -HRESULT WINAPI Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE7, DWORD, DWORD, LPDIRECTDRAWSURFACE7, LPRECT, DWORD); -HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE7, DWORD, LPDIRECTDRAWSURFACE7); -HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE7, LPVOID, LPDDENUMSURFACESCALLBACK7); -HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE7, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK7); -HRESULT WINAPI Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 , LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7, REFGUID); -HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7, LPDDSCAPS2, LPDIRECTDRAWSURFACE7*); -HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7, DWORD dwFlags); -HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7, LPDDSCAPS2 pCaps); -HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7, LPDIRECTDRAWCLIPPER*); -HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7, DWORD, LPDDCOLORKEY); -HRESULT WINAPI Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7, HDC *); -HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7, LPVOID*); -HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7, LPDWORD); -HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7, LPLONG, LPLONG); -HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7, LPDIRECTDRAWPALETTE*); -HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE7, LPDDPIXELFORMAT); -HRESULT WINAPI Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7, LPDWORD); -HRESULT WINAPI Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE7, REFGUID, LPVOID, LPDWORD); -HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7, LPDDSURFACEDESC2); -HRESULT WINAPI Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7, LPDWORD); -HRESULT WINAPI Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7); -HRESULT WINAPI Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7, HDC); -HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7, LPDIRECTDRAWCLIPPER); -HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7, DWORD, LPDDCOLORKEY); -HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE7, LONG, LONG); -HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7, LPDIRECTDRAWPALETTE); -HRESULT WINAPI Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE7, REFGUID, LPVOID, DWORD, DWORD); -HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7, DWORD, LPDIRECTDRAWSURFACE7); -HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7, DDSURFACEDESC2 *, DWORD); -HRESULT WINAPI Main_DDrawSurface_SetLOD(LPDIRECTDRAWSURFACE7, DWORD); -HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7, LPRECT); -HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7, LPDIRECTDRAW, LPDDSURFACEDESC2); -HRESULT WINAPI Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7, LPRECT, LPDDSURFACEDESC2, DWORD, HANDLE); -HRESULT WINAPI Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7); -HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, +HRESULT WINAPI Main_DDrawSurface_Blt(LPDDRAWI_DDRAWSURFACE_INT, LPRECT, LPDDRAWI_DDRAWSURFACE_INT, LPRECT, DWORD, LPDDBLTFX); +HRESULT WINAPI Main_DDrawSurface_BltBatch(LPDDRAWI_DDRAWSURFACE_INT, LPDDBLTBATCH, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_BltFast(LPDDRAWI_DDRAWSURFACE_INT, DWORD, DWORD, LPDDRAWI_DDRAWSURFACE_INT, LPRECT, DWORD); +HRESULT WINAPI Main_DDrawSurface_DeleteAttachedSurface(LPDDRAWI_DDRAWSURFACE_INT, DWORD, LPDDRAWI_DDRAWSURFACE_INT); +HRESULT WINAPI Main_DDrawSurface_EnumAttachedSurfaces(LPDDRAWI_DDRAWSURFACE_INT, LPVOID, LPDDENUMSURFACESCALLBACK7); +HRESULT WINAPI Main_DDrawSurface_EnumOverlayZOrders(LPDDRAWI_DDRAWSURFACE_INT, DWORD, LPVOID,LPDDENUMSURFACESCALLBACK7); +HRESULT WINAPI Main_DDrawSurface_Flip(LPDDRAWI_DDRAWSURFACE_INT , LPDDRAWI_DDRAWSURFACE_INT, DWORD); +HRESULT WINAPI Main_DDrawSurface_FreePrivateData(LPDDRAWI_DDRAWSURFACE_INT, REFGUID); +HRESULT WINAPI Main_DDrawSurface_GetAttachedSurface(LPDDRAWI_DDRAWSURFACE_INT, LPDDSCAPS2, LPDDRAWI_DDRAWSURFACE_INT*); +HRESULT WINAPI Main_DDrawSurface_GetBltStatus(LPDDRAWI_DDRAWSURFACE_INT, DWORD dwFlags); +HRESULT WINAPI Main_DDrawSurface_GetCaps(LPDDRAWI_DDRAWSURFACE_INT, LPDDSCAPS2 pCaps); +HRESULT WINAPI Main_DDrawSurface_GetClipper(LPDDRAWI_DDRAWSURFACE_INT, LPDIRECTDRAWCLIPPER*); +HRESULT WINAPI Main_DDrawSurface_GetColorKey(LPDDRAWI_DDRAWSURFACE_INT, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_GetDC(LPDDRAWI_DDRAWSURFACE_INT, HDC *); +HRESULT WINAPI Main_DDrawSurface_GetDDInterface(LPDDRAWI_DDRAWSURFACE_INT, LPVOID*); +HRESULT WINAPI Main_DDrawSurface_GetFlipStatus(LPDDRAWI_DDRAWSURFACE_INT, DWORD); +HRESULT WINAPI Main_DDrawSurface_GetLOD(LPDDRAWI_DDRAWSURFACE_INT, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_GetOverlayPosition(LPDDRAWI_DDRAWSURFACE_INT, LPLONG, LPLONG); +HRESULT WINAPI Main_DDrawSurface_GetPalette(LPDDRAWI_DDRAWSURFACE_INT, LPDIRECTDRAWPALETTE*); +HRESULT WINAPI Main_DDrawSurface_GetPixelFormat(LPDDRAWI_DDRAWSURFACE_INT, LPDDPIXELFORMAT); +HRESULT WINAPI Main_DDrawSurface_GetPriority(LPDDRAWI_DDRAWSURFACE_INT, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_GetPrivateData(LPDDRAWI_DDRAWSURFACE_INT, REFGUID, LPVOID, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDDRAWI_DDRAWSURFACE_INT, LPDDSURFACEDESC2); +HRESULT WINAPI Main_DDrawSurface_GetUniquenessValue(LPDDRAWI_DDRAWSURFACE_INT, LPDWORD); +HRESULT WINAPI Main_DDrawSurface_IsLost(LPDDRAWI_DDRAWSURFACE_INT); +HRESULT WINAPI Main_DDrawSurface_PageLock(LPDDRAWI_DDRAWSURFACE_INT, DWORD); +HRESULT WINAPI Main_DDrawSurface_PageUnlock(LPDDRAWI_DDRAWSURFACE_INT, DWORD); +HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDDRAWI_DDRAWSURFACE_INT, HDC); +HRESULT WINAPI Main_DDrawSurface_SetClipper (LPDDRAWI_DDRAWSURFACE_INT, LPDIRECTDRAWCLIPPER); +HRESULT WINAPI Main_DDrawSurface_SetColorKey (LPDDRAWI_DDRAWSURFACE_INT, DWORD, LPDDCOLORKEY); +HRESULT WINAPI Main_DDrawSurface_SetOverlayPosition (LPDDRAWI_DDRAWSURFACE_INT, LONG, LONG); +HRESULT WINAPI Main_DDrawSurface_SetPalette (LPDDRAWI_DDRAWSURFACE_INT, LPDIRECTDRAWPALETTE); +HRESULT WINAPI Main_DDrawSurface_SetPriority (LPDDRAWI_DDRAWSURFACE_INT, DWORD); +HRESULT WINAPI Main_DDrawSurface_SetPrivateData (LPDDRAWI_DDRAWSURFACE_INT, REFGUID, LPVOID, DWORD, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayDisplay (LPDDRAWI_DDRAWSURFACE_INT, DWORD); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDDRAWI_DDRAWSURFACE_INT, DWORD, LPDDRAWI_DDRAWSURFACE_INT); +HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDDRAWI_DDRAWSURFACE_INT, DDSURFACEDESC2 *, DWORD); +HRESULT WINAPI Main_DDrawSurface_SetLOD(LPDDRAWI_DDRAWSURFACE_INT, DWORD); +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDDRAWI_DDRAWSURFACE_INT, LPRECT); +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDDRAWI_DDRAWSURFACE_INT, LPDIRECTDRAW, LPDDSURFACEDESC2); +HRESULT WINAPI Main_DDrawSurface_Lock (LPDDRAWI_DDRAWSURFACE_INT, LPRECT, LPDDSURFACEDESC2, DWORD, HANDLE); +HRESULT WINAPI Main_DDrawSurface_Restore(LPDDRAWI_DDRAWSURFACE_INT); +HRESULT WINAPI Main_DDrawSurface_UpdateOverlay (LPDDRAWI_DDRAWSURFACE_INT, LPRECT, LPDDRAWI_DDRAWSURFACE_INT, LPRECT, DWORD, LPDDOVERLAYFX); -HRESULT WINAPI Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface); -HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 pAttach); -HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect); -HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD); -HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, DDSURFACEDESC2 *DDSD, DWORD Flags); +HRESULT WINAPI Main_DDrawSurface_ChangeUniquenessValue(LPDDRAWI_DDRAWSURFACE_INT iface); +HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDDRAWI_DDRAWSURFACE_INT iface, LPDDRAWI_DDRAWSURFACE_INT pAttach); +HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDDRAWI_DDRAWSURFACE_INT iface, LPRECT pRect); +HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDDRAWI_DDRAWSURFACE_INT iface, LPDDSURFACEDESC2 pDDSD); +HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDDRAWI_DDRAWSURFACE_INT iface, DDSURFACEDESC2 *DDSD, DWORD Flags); @@ -68,3 +68,4 @@ + 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 Sun Dec 16 17:07:33 2007 @@ -33,14 +33,13 @@ return newThis; } -HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDDRAWI_DDRAWSURFACE_INT iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) { return DDERR_ALREADYINITIALIZED; } -ULONG WINAPI Main_DDrawSurface_AddRef(LPDDRAWI_DDRAWSURFACE_INT iface) -{ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; +ULONG WINAPI Main_DDrawSurface_AddRef(LPDDRAWI_DDRAWSURFACE_INT This) +{ DX_WINDBG_trace(); @@ -203,7 +202,51 @@ *ppObj = This; Main_DDrawSurface_AddRef(This); } - + else if (IsEqualGUID(&IID_IDirect3D2, riid)) + { + if (This->lpVtbl != &IDirect3D2_Vtbl) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &IDirect3D2_Vtbl; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirect3D3, riid)) + { + if (This->lpVtbl != &IDirect3D3_Vtbl) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &IDirect3D3_Vtbl; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } + else if (IsEqualGUID(&IID_IDirect3D7, riid)) + { + if (This->lpVtbl != &IDirect3D7_Vtbl) + { + This = internal_directdrawsurface_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH_LEAVE; + } + } + This->lpVtbl = &IDirect3D7_Vtbl; + *ppObj = This; + Main_DDrawSurface_AddRef(This); + } else { DX_STUB_str("E_NOINTERFACE"); @@ -219,9 +262,8 @@ -ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7 iface) -{ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; +ULONG WINAPI Main_DDrawSurface_Release(LPDDRAWI_DDRAWSURFACE_INT This) +{ /* FIXME This is not right exiame how it should be done @@ -230,11 +272,9 @@ return This->dwIntRefCnt; } -HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, - LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) -{ - LPDDRAWI_DDRAWSURFACE_INT ThisDest = (LPDDRAWI_DDRAWSURFACE_INT)iface; - LPDDRAWI_DDRAWSURFACE_INT ThisSrc = (LPDDRAWI_DDRAWSURFACE_INT)src; +HRESULT WINAPI Main_DDrawSurface_Blt(LPDDRAWI_DDRAWSURFACE_INT ThisDest, LPRECT rdst, + LPDDRAWI_DDRAWSURFACE_INT ThisSrc, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) +{ DDHAL_BLTDATA mDdBlt; @@ -347,10 +387,9 @@ HRESULT WINAPI -Main_DDrawSurface_Lock (LPDIRECTDRAWSURFACE7 iface, LPRECT prect, +Main_DDrawSurface_Lock (LPDDRAWI_DDRAWSURFACE_INT This, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE events) { - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DDHAL_LOCKDATA mdLock; DX_WINDBG_trace(); @@ -433,9 +472,8 @@ } -HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) -{ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; +HRESULT WINAPI Main_DDrawSurface_Unlock (LPDDRAWI_DDRAWSURFACE_INT This, LPRECT pRect) +{ DDHAL_UNLOCKDATA mdUnLock; DX_WINDBG_trace(); @@ -467,8 +505,8 @@ } HRESULT WINAPI -Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, - LPDIRECTDRAWSURFACE7 pAttach) +Main_DDrawSurface_AddAttachedSurface(LPDDRAWI_DDRAWSURFACE_INT iface, + LPDDRAWI_DDRAWSURFACE_INT pAttach) { // LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; @@ -480,26 +518,24 @@ } HRESULT WINAPI -Main_DDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetAttachedSurface(LPDDRAWI_DDRAWSURFACE_INT This, LPDDSCAPS2 pCaps, - LPDIRECTDRAWSURFACE7* ppSurface) + LPDDRAWI_DDRAWSURFACE_INT* ppSurface) { /* FIXME hacked */ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DX_WINDBG_trace(); - *ppSurface = (LPDIRECTDRAWSURFACE7) This->lpLcl->lpGbl->lpDD->dsList; + *ppSurface = This->lpLcl->lpGbl->lpDD->dsList; return DD_OK; } HRESULT WINAPI -Main_DDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; +Main_DDrawSurface_GetBltStatus(LPDDRAWI_DDRAWSURFACE_INT This, DWORD dwFlags) +{ DX_WINDBG_trace(); @@ -512,13 +548,12 @@ } HRESULT WINAPI -Main_DDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7 iface, LPDDSCAPS2 pCaps) -{ - LPDDRAWI_DDRAWSURFACE_INT This; - - DX_WINDBG_trace(); - - if (iface == NULL) +Main_DDrawSurface_GetCaps(LPDDRAWI_DDRAWSURFACE_INT This, LPDDSCAPS2 pCaps) +{ + + DX_WINDBG_trace(); + + if (This == NULL) { return DDERR_INVALIDOBJECT; } @@ -528,8 +563,6 @@ return DDERR_INVALIDPARAMS; } - This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - RtlZeroMemory(pCaps,sizeof(DDSCAPS2)); pCaps->dwCaps = This->lpLcl->ddsCaps.dwCaps; @@ -538,10 +571,9 @@ } HRESULT WINAPI -Main_DDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetClipper(LPDDRAWI_DDRAWSURFACE_INT This, LPDIRECTDRAWCLIPPER* ppClipper) { - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DX_WINDBG_trace(); @@ -566,10 +598,9 @@ } HRESULT WINAPI -Main_DDrawSurface_SetClipper (LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_SetClipper (LPDDRAWI_DDRAWSURFACE_INT This, LPDIRECTDRAWCLIPPER pDDClipper) { - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DX_WINDBG_trace(); @@ -597,13 +628,12 @@ } HRESULT WINAPI -Main_DDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC) -{ - LPDDRAWI_DDRAWSURFACE_INT This; - - DX_WINDBG_trace(); - - if (iface == NULL) +Main_DDrawSurface_GetDC(LPDDRAWI_DDRAWSURFACE_INT This, HDC *phDC) +{ + + DX_WINDBG_trace(); + + if (This == NULL) { return DDERR_INVALIDOBJECT; } @@ -613,7 +643,6 @@ return DDERR_INVALIDPARAMS; } - This = (LPDDRAWI_DDRAWSURFACE_INT)iface; *phDC = (HDC)This->lpLcl->lpSurfMore->lpDD_lcl->hDC; @@ -621,10 +650,9 @@ } HRESULT WINAPI -Main_DDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetPixelFormat(LPDDRAWI_DDRAWSURFACE_INT This, LPDDPIXELFORMAT pDDPixelFormat) { - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; HRESULT retVale = DDERR_INVALIDPARAMS; DX_WINDBG_trace(); @@ -647,13 +675,11 @@ } HRESULT WINAPI -Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetSurfaceDesc(LPDDRAWI_DDRAWSURFACE_INT This, LPDDSURFACEDESC2 pDDSD) { DWORD dwSize; - - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DX_WINDBG_trace(); dwSize = pDDSD->dwSize; @@ -749,12 +775,11 @@ } HRESULT WINAPI -Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7 iface, HDC hDC) -{ - LPDDRAWI_DDRAWSURFACE_INT This; - DX_WINDBG_trace(); - - if (iface == NULL) +Main_DDrawSurface_ReleaseDC(LPDDRAWI_DDRAWSURFACE_INT This, HDC hDC) +{ + DX_WINDBG_trace(); + + if (This == NULL) { return DDERR_INVALIDOBJECT; } @@ -764,8 +789,6 @@ return DDERR_INVALIDPARAMS; } - This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - /* FIXME check if surface exits or not */ @@ -778,10 +801,9 @@ } HRESULT WINAPI -Main_DDrawSurface_SetColorKey (LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_SetColorKey (LPDDRAWI_DDRAWSURFACE_INT This, DWORD dwFlags, LPDDCOLORKEY pCKey) { - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DDHAL_SETCOLORKEYDATA ColorKeyData; @@ -813,9 +835,8 @@ HRESULT WINAPI -Main_DDrawSurface_SetOverlayPosition (LPDIRECTDRAWSURFACE7 iface, LONG X, LONG Y) -{ - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; +Main_DDrawSurface_SetOverlayPosition (LPDDRAWI_DDRAWSURFACE_INT This, LONG X, LONG Y) +{ DDHAL_SETOVERLAYPOSITIONDATA OverLayPositionData; 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 Sun Dec 16 17:07:33 2007 @@ -15,7 +15,7 @@ /* MSDN: "not currently implemented." */ HRESULT WINAPI -Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_AddOverlayDirtyRect(LPDDRAWI_DDRAWSURFACE_INT iface, LPRECT pRect) { DX_WINDBG_trace(); @@ -24,8 +24,8 @@ } HRESULT WINAPI -Main_DDrawSurface_BltFast(LPDIRECTDRAWSURFACE7 iface, DWORD dstx, - DWORD dsty, LPDIRECTDRAWSURFACE7 src, +Main_DDrawSurface_BltFast(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dstx, + DWORD dsty, LPDDRAWI_DDRAWSURFACE_INT src, LPRECT rsrc, DWORD trans) { DX_WINDBG_trace(); @@ -34,7 +34,7 @@ } HRESULT WINAPI -Main_DDrawSurface_Restore(LPDIRECTDRAWSURFACE7 iface) +Main_DDrawSurface_Restore(LPDDRAWI_DDRAWSURFACE_INT iface) { DX_WINDBG_trace(); @@ -43,7 +43,7 @@ /* MSDN: "not currently implemented." */ HRESULT WINAPI -Main_DDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_BltBatch(LPDDRAWI_DDRAWSURFACE_INT iface, LPDDBLTBATCH pBatch, DWORD dwCount, DWORD dwFlags) { @@ -53,25 +53,25 @@ } HRESULT WINAPI -Main_DDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_ChangeUniquenessValue(LPDDRAWI_DDRAWSURFACE_INT iface) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_DeleteAttachedSurface(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dwFlags, - LPDIRECTDRAWSURFACE7 pAttach) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE7 iface, + LPDDRAWI_DDRAWSURFACE_INT pAttach) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_EnumAttachedSurfaces(LPDDRAWI_DDRAWSURFACE_INT iface, LPVOID context, LPDDENUMSURFACESCALLBACK7 cb) { @@ -81,7 +81,7 @@ } HRESULT WINAPI -Main_DDrawSurface_EnumOverlayZOrders(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_EnumOverlayZOrders(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dwFlags, LPVOID context, LPDDENUMSURFACESCALLBACK7 cb) { @@ -91,23 +91,23 @@ } HRESULT WINAPI -Main_DDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, - LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7 iface, REFGUID tag) -{ - DX_WINDBG_trace(); - - DX_STUB; -} -HRESULT WINAPI -Main_DDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, +Main_DDrawSurface_Flip(LPDDRAWI_DDRAWSURFACE_INT iface, + LPDDRAWI_DDRAWSURFACE_INT lpDDSurfaceTargetOverride, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_FreePrivateData(LPDDRAWI_DDRAWSURFACE_INT iface, REFGUID tag) +{ + DX_WINDBG_trace(); + + DX_STUB; +} +HRESULT WINAPI +Main_DDrawSurface_GetColorKey(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dwFlags, LPDDCOLORKEY pCKey) { //LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; @@ -118,30 +118,30 @@ } HRESULT WINAPI -Main_DDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7 iface, LPVOID* pDD) -{ - DX_WINDBG_trace(); - - DX_STUB; -} -HRESULT WINAPI -Main_DDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7 iface, LPDWORD pdwMaxLOD) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_GetOverlayPosition(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetDDInterface(LPDDRAWI_DDRAWSURFACE_INT iface, LPVOID* pDD) +{ + DX_WINDBG_trace(); + + DX_STUB; +} +HRESULT WINAPI +Main_DDrawSurface_GetFlipStatus(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetLOD(LPDDRAWI_DDRAWSURFACE_INT iface, LPDWORD pdwMaxLOD) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_GetOverlayPosition(LPDDRAWI_DDRAWSURFACE_INT iface, LPLONG pX, LPLONG pY) { DX_WINDBG_trace(); @@ -149,7 +149,7 @@ DX_STUB; } HRESULT WINAPI -Main_DDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetPalette(LPDDRAWI_DDRAWSURFACE_INT iface, LPDIRECTDRAWPALETTE* ppPalette) { DX_WINDBG_trace(); @@ -158,7 +158,7 @@ } HRESULT WINAPI -Main_DDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetPriority(LPDDRAWI_DDRAWSURFACE_INT iface, LPDWORD pdwPriority) { DX_WINDBG_trace(); @@ -167,7 +167,7 @@ } HRESULT WINAPI -Main_DDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetPrivateData(LPDDRAWI_DDRAWSURFACE_INT iface, REFGUID tag, LPVOID pBuffer, LPDWORD pcbBufferSize) { @@ -177,7 +177,7 @@ } HRESULT WINAPI -Main_DDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_GetUniquenessValue(LPDDRAWI_DDRAWSURFACE_INT iface, LPDWORD pValue) { DX_WINDBG_trace(); @@ -186,7 +186,7 @@ } HRESULT WINAPI -Main_DDrawSurface_IsLost(LPDIRECTDRAWSURFACE7 iface) +Main_DDrawSurface_IsLost(LPDDRAWI_DDRAWSURFACE_INT iface) { DX_WINDBG_trace(); @@ -196,23 +196,23 @@ } HRESULT WINAPI -Main_DDrawSurface_PageLock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_PageUnlock(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetPalette (LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_PageLock(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_PageUnlock(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_SetPalette (LPDDRAWI_DDRAWSURFACE_INT iface, LPDIRECTDRAWPALETTE pPalette) { DX_WINDBG_trace(); @@ -221,7 +221,7 @@ } HRESULT WINAPI -Main_DDrawSurface_SetPriority (LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_SetPriority (LPDDRAWI_DDRAWSURFACE_INT iface, DWORD dwPriority) { DX_WINDBG_trace(); @@ -230,7 +230,7 @@ } HRESULT WINAPI -Main_DDrawSurface_SetPrivateData (LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_SetPrivateData (LPDDRAWI_DDRAWSURFACE_INT iface, REFGUID tag, LPVOID pData, DWORD cbSize, DWORD dwFlags) { @@ -240,9 +240,9 @@ } HRESULT WINAPI -Main_DDrawSurface_UpdateOverlay (LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_UpdateOverlay (LPDDRAWI_DDRAWSURFACE_INT iface, LPRECT pSrcRect, - LPDIRECTDRAWSURFACE7 pDstSurface, + LPDDRAWI_DDRAWSURFACE_INT pDstSurface, LPRECT pDstRect, DWORD dwFlags, LPDDOVERLAYFX pFX) { @@ -254,10 +254,9 @@ /* MSDN: "not currently implemented." */ HRESULT WINAPI -Main_DDrawSurface_UpdateOverlayDisplay (LPDIRECTDRAWSURFACE7 iface, +Main_DDrawSurface_UpdateOverlayDisplay (LPDDRAWI_DDRAWSURFACE_INT This, DWORD dwFlags) { - LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; DX_WINDBG_trace(); @@ -270,27 +269,28 @@ } -HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDIRECTDRAWSURFACE7 iface, - DWORD dwFlags, LPDIRECTDRAWSURFACE7 pDDSRef) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, DDSURFACEDESC2 *DDSD, DWORD Flags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DDrawSurface_SetLOD(LPDIRECTDRAWSURFACE7 iface, DWORD MaxLOD) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - +HRESULT WINAPI Main_DDrawSurface_UpdateOverlayZOrder (LPDDRAWI_DDRAWSURFACE_INT iface, + DWORD dwFlags, LPDDRAWI_DDRAWSURFACE_INT pDDSRef) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_SetSurfaceDesc(LPDDRAWI_DDRAWSURFACE_INT iface, DDSURFACEDESC2 *DDSD, DWORD Flags) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +HRESULT WINAPI +Main_DDrawSurface_SetLOD(LPDDRAWI_DDRAWSURFACE_INT iface, DWORD MaxLOD) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + + Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D2_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D2_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D2_Vtable.c Sun Dec 16 17:07:33 2007 @@ -1,0 +1,41 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +HRESULT WINAPI Main_D3D_QueryInterface(LPDIRECT3D2 iface, REFIID riid, LPVOID * ppvObj); +ULONG WINAPI Main_D3D_AddRef(LPDIRECT3D2 iface); +ULONG WINAPI Main_D3D_Release(LPDIRECT3D2 iface); +HRESULT WINAPI Main_D3D_EnumDevices(LPDIRECT3D2 iface, LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg); +HRESULT WINAPI Main_D3D_CreateLight(LPDIRECT3D2 iface, LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter); +HRESULT WINAPI Main_D3D_CreateMaterial(LPDIRECT3D2 iface, LPDIRECT3DMATERIAL2 *lplpDirect3DMaterial2, IUnknown *pUnkOuter); +HRESULT WINAPI Main_D3D_CreateViewport(LPDIRECT3D2 iface, LPDIRECT3DVIEWPORT2 *lplpD3DViewport2, IUnknown *pUnkOuter); +HRESULT WINAPI Main_D3D_FindDevice(LPDIRECT3D2 iface, LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR); +HRESULT WINAPI Main_D3D_CreateDevice2(LPDIRECT3D2 iface, REFCLSID rclsid, LPDIRECTDRAWSURFACE lpDDS, LPDIRECT3DDEVICE2 *lplpD3DDevice2); + +IDirect3D2Vtbl IDirect3D2_Vtbl = +{ + Main_D3D_QueryInterface, + Main_D3D_AddRef, + Main_D3D_Release, + Main_D3D_EnumDevices, + Main_D3D_CreateLight, + Main_D3D_CreateMaterial, + Main_D3D_CreateViewport, + Main_D3D_FindDevice, + Main_D3D_CreateDevice2, +}; + + Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D2_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D3_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D3_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D3_Vtable.c Sun Dec 16 17:07:33 2007 @@ -1,0 +1,47 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +HRESULT WINAPI Main_D3D_QueryInterface(LPDIRECT3D3 iface, REFIID riid, LPVOID * ppvObj); +ULONG WINAPI Main_D3D_AddRef(LPDIRECT3D3 iface); +ULONG WINAPI Main_D3D_Release(LPDIRECT3D3 iface); +HRESULT WINAPI Main_D3D_EnumDevices(LPDIRECT3D3 iface, LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg); +HRESULT WINAPI Main_D3D_CreateLight(LPDIRECT3D3 iface, LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter); +HRESULT WINAPI Main_D3D_CreateMaterial(LPDIRECT3D3 iface, LPDIRECT3DMATERIAL3 *lplpDirect3DMaterial3, IUnknown *pUnkOuter); +HRESULT WINAPI Main_D3D_CreateViewport(LPDIRECT3D3 iface, LPDIRECT3DVIEWPORT3 *lplpD3DViewport3, IUnknown *pUnkOuter); +HRESULT WINAPI Main_D3D_FindDevice(LPDIRECT3D3 iface, LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR); +HRESULT WINAPI Main_D3D_CreateDevice3(LPDIRECT3D3 iface, REFCLSID rclsid,LPDIRECTDRAWSURFACE4 lpDDS, LPDIRECT3DDEVICE3 *lplpD3DDevice3,LPUNKNOWN lpUnk); +HRESULT WINAPI Main_D3D_CreateVertexBuffer3(LPDIRECT3D3 iface, LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc, LPDIRECT3DVERTEXBUFFER *lplpD3DVertBuf,DWORD dwFlags,LPUNKNOWN lpUnk); +HRESULT WINAPI Main_D3D_EnumZBufferFormats(LPDIRECT3D3 iface, REFCLSID riidDevice, LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext); +HRESULT WINAPI Main_D3D_EvictManagedTextures(LPDIRECT3D3 iface); + +IDirect3D3Vtbl IDirect3D3_Vtbl = +{ + Main_D3D_QueryInterface, + Main_D3D_AddRef, + Main_D3D_Release, + Main_D3D_EnumDevices, + Main_D3D_CreateLight, + Main_D3D_CreateMaterial, + Main_D3D_CreateViewport, + Main_D3D_FindDevice, + Main_D3D_CreateDevice3, + Main_D3D_CreateVertexBuffer3, + Main_D3D_EnumZBufferFormats, + Main_D3D_EvictManagedTextures +}; + + Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D3_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D7_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D7_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D7_Vtable.c Sun Dec 16 17:07:33 2007 @@ -1,0 +1,38 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +HRESULT WINAPI Main_D3D_QueryInterface(LPDIRECT3D7 iface, REFIID riid, LPVOID * ppvObject); +ULONG WINAPI Main_D3D_AddRef(LPDIRECT3D7 iface); +ULONG WINAPI Main_D3D_Release(LPDIRECT3D7 iface); +HRESULT WINAPI Main_D3D_EnumDevices(LPDIRECT3D7 iface, LPD3DENUMDEVICESCALLBACK7 lpEnumDevicesCallback, LPVOID lpUserArg); +HRESULT WINAPI Main_D3D_CreateDevice7(LPDIRECT3D7 iface, REFCLSID rclsid,LPDIRECTDRAWSURFACE7 lpDDS, LPDIRECT3DDEVICE7 *lplpD3DDevice); +HRESULT WINAPI Main_D3D_CreateVertexBuffer7(LPDIRECT3D7 iface, LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc, LPDIRECT3DVERTEXBUFFER7 *lplpD3DVertBuf,DWORD dwFlags); +HRESULT WINAPI Main_D3D_EnumZBufferFormats(LPDIRECT3D7 iface, REFCLSID riidDevice, LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext); +HRESULT WINAPI Main_D3D_EvictManagedTextures(LPDIRECT3D7 iface); + +IDirect3D7Vtbl IDirect3D7_Vtbl = +{ + Main_D3D_QueryInterface, + Main_D3D_AddRef, + Main_D3D_Release, + Main_D3D_EnumDevices, + Main_D3D_CreateDevice7, + Main_D3D_CreateVertexBuffer7, + Main_D3D_EnumZBufferFormats, + Main_D3D_EvictManagedTextures +}; + Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectD3D7_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c Sun Dec 16 17:07:33 2007 @@ -67,7 +67,7 @@ LPDDENUMMODESCALLBACK2 pCallback); HRESULT WINAPI -Main_DirectDraw_EnumSurfaces( +Main_DirectDraw_EnumSurfaces4( LPDIRECTDRAW4 iface, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, @@ -183,7 +183,7 @@ Main_DirectDraw_CreateSurface4, Main_DirectDraw_DuplicateSurface, Main_DirectDraw_EnumDisplayModes4, - Main_DirectDraw_EnumSurfaces, + Main_DirectDraw_EnumSurfaces4, Main_DirectDraw_FlipToGDISurface, Main_DirectDraw_GetCaps, Main_DirectDraw_GetDisplayMode4, Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c Sun Dec 16 17:07:33 2007 @@ -71,7 +71,7 @@ LPDDENUMMODESCALLBACK2 pCallback); HRESULT WINAPI -Main_DirectDraw_EnumSurfaces( +Main_DirectDraw_EnumSurfaces7( LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, @@ -198,7 +198,7 @@ Main_DirectDraw_CreateSurface4, /* (CreateSurface4 testing / devloping) */ Main_DirectDraw_DuplicateSurface, Main_DirectDraw_EnumDisplayModes4, /* (EnumDisplayModes testing / devloping) */ - Main_DirectDraw_EnumSurfaces, + Main_DirectDraw_EnumSurfaces7, Main_DirectDraw_FlipToGDISurface, Main_DirectDraw_GetCaps, /* (GetCaps done) */ Main_DirectDraw_GetDisplayMode4, /* (GetDisplayMode testing / devloping) */ @@ -222,3 +222,4 @@ }; + Modified: trunk/reactos/dll/directx/ddraw/d3d/DirectD3D_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/d3d/Dire… ============================================================================== --- trunk/reactos/dll/directx/ddraw/d3d/DirectD3D_main.c (original) +++ trunk/reactos/dll/directx/ddraw/d3d/DirectD3D_main.c Sun Dec 16 17:07:33 2007 @@ -68,3 +68,59 @@ DX_STUB; } +HRESULT WINAPI +Main_D3D_CreateDevice2(LPDIRECT3D2 iface, REFCLSID rclsid, LPDIRECTDRAWSURFACE lpDDS, + LPDIRECT3DDEVICE2 *lplpD3DDevice2) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_D3D_CreateDevice3(LPDIRECT3D3 iface, REFCLSID rclsid,LPDIRECTDRAWSURFACE4 lpDDS, + LPDIRECT3DDEVICE3 *lplpD3DDevice3,LPUNKNOWN lpUnk) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_D3D_CreateVertexBuffer3(LPDIRECT3D3 iface, LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc, + LPDIRECT3DVERTEXBUFFER *lplpD3DVertBuf,DWORD dwFlags,LPUNKNOWN lpUnk) +{ + DX_WINDBG_trace(); + DX_STUB; +} + + +HRESULT WINAPI +Main_D3D_CreateDevice7(LPDIRECT3D7 iface, REFCLSID rclsid,LPDIRECTDRAWSURFACE7 lpDDS, + LPDIRECT3DDEVICE7 *lplpD3DDevice) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_D3D_CreateVertexBuffer7(LPDIRECT3D7 iface, LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc, + LPDIRECT3DVERTEXBUFFER7 *lplpD3DVertBuf,DWORD dwFlags) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_D3D_EnumZBufferFormats(LPDIRECT3D7 iface, REFCLSID riidDevice, LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +HRESULT WINAPI +Main_D3D_EvictManagedTextures(LPDIRECT3D7 iface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + + 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 Sun Dec 16 17:07:33 2007 @@ -71,5 +71,8 @@ <file>DirectDrawSurface2_Vtable.c</file> <file>DirectDrawSurface_Vtable.c</file> <file>DirectD3D_Vtable.c</file> + <file>DirectD3D2_Vtable.c</file> + <file>DirectD3D3_Vtable.c</file> + <file>DirectD3D7_Vtable.c</file> </directory> </module> Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sun Dec 16 17:07:33 2007 @@ -40,11 +40,9 @@ extern IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable; extern IDirect3DVtbl IDirect3D_Vtbl; -/* extern IDirect3D2Vtbl IDirect3D2_Vtbl; extern IDirect3D3Vtbl IDirect3D3_Vtbl; extern IDirect3D7Vtbl IDirect3D7_Vtbl; -*/ /* Start up direct hal or hel * iface = a pointer to the com object

1 0

[cfinck] 31275: Fix a typo
by cfinck＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: cfinck Date: Sun Dec 16 15:38:18 2007 New Revision: 31275 URL: http://svn.reactos.org/svn/reactos?rev=31275&view=rev Log: Fix a typo Modified: trunk/web/reactos.org/htdocs/paste/inc/paste.php Modified: trunk/web/reactos.org/htdocs/paste/inc/paste.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/p… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/paste.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/paste.php Sun Dec 16 15:38:18 2007 @@ -79,7 +79,7 @@ } ?> | <a href="<?php echo $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/text/'; ?>" target="_blank">Download as Text</a> - <a href="<?php echo $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/textw/'; ?>" target="_blank">(word-warp)</a> | + <a href="<?php echo $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/textw/'; ?>" target="_blank">(word-wrap)</a> | <a href="<?php echo $ros_paste_SET_path_ex . 'recent/'; ?>">Other recent pastes</a> | <a href="<?php echo $ros_paste_SET_path; ?>">Create new paste</a> </p> <?php

1 0

[fireball] 31274: - ARC hardware device tree passed to the kernel contains only partial descriptors (contents of full descriptors was ignored anyway).
by fireball＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: fireball Date: Sun Dec 16 13:04:04 2007 New Revision: 31274 URL: http://svn.reactos.org/svn/reactos?rev=31274&view=rev Log: - ARC hardware device tree passed to the kernel contains only partial descriptors (contents of full descriptors was ignored anyway). Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Sun Dec 16 13:04:04 2007 @@ -198,7 +198,7 @@ static VOID DetectPnpBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PNP_BIOS_DEVICE_NODE DeviceNode; PCM_PNP_BIOS_INSTALLATION_CHECK InstData; PCONFIGURATION_COMPONENT_DATA BusKey; @@ -255,28 +255,26 @@ FldrSetIdentifier(BusKey, L"PNP BIOS"); /* Set 'Configuration Data' value */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + (NodeSize * NodeCount); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + (NodeSize * NodeCount); + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); return; } - memset(FullResourceDescriptor, 0, Size); + memset(PartialResourceList, 0, Size); /* Initialize resource descriptor */ - FullResourceDescriptor->InterfaceType = Internal; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 1; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type = + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; + PartialResourceList->PartialDescriptors[0].Type = CmResourceTypeDeviceSpecific; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].ShareDisposition = + PartialResourceList->PartialDescriptors[0].ShareDisposition = CmResourceShareUndetermined; - Ptr = (char *)(((ULONG_PTR)&FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]) + + Ptr = (char *)(((ULONG_PTR)&PartialResourceList->PartialDescriptors[0]) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); /* Set instalation check data */ @@ -315,15 +313,15 @@ } /* Set real data size */ - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.DeviceSpecificData.DataSize = + PartialResourceList->PartialDescriptors[0].u.DeviceSpecificData.DataSize = PnpBufferSize; - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + PnpBufferSize; + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + PnpBufferSize; DbgPrint((DPRINT_HWDETECT, "Real buffer size: %u\n", PnpBufferSize)); DbgPrint((DPRINT_HWDETECT, "Resource size: %u\n", Size)); - FldrSetConfigurationData(BusKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(BusKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); } @@ -332,38 +330,36 @@ SetHarddiskConfigurationData(PCONFIGURATION_COMPONENT_DATA DiskKey, ULONG DriveNumber) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; EXTENDED_GEOMETRY ExtGeometry; GEOMETRY Geometry; ULONG Size; /* Set 'Configuration Data' value */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + sizeof(CM_DISK_GEOMETRY_DEVICE_DATA); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate a full resource descriptor\n")); return; } - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 1; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type = + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; + PartialResourceList->PartialDescriptors[0].Type = CmResourceTypeDeviceSpecific; -// FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].ShareDisposition = -// FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Flags = - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.DeviceSpecificData.DataSize = +// PartialResourceList->PartialDescriptors[0].ShareDisposition = +// PartialResourceList->PartialDescriptors[0].Flags = + PartialResourceList->PartialDescriptors[0].u.DeviceSpecificData.DataSize = sizeof(CM_DISK_GEOMETRY_DEVICE_DATA); /* Get pointer to geometry data */ - DiskGeometry = (PVOID)(((ULONG_PTR)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); + DiskGeometry = (PVOID)(((ULONG_PTR)PartialResourceList) + sizeof(CM_PARTIAL_RESOURCE_LIST)); /* Get the disk geometry */ ExtGeometry.Size = sizeof(EXTENDED_GEOMETRY); @@ -384,7 +380,7 @@ else { DbgPrint((DPRINT_HWDETECT, "Reading disk geometry failed\n")); - MmFreeMemory(FullResourceDescriptor); + MmFreeMemory(PartialResourceList); return; } DbgPrint((DPRINT_HWDETECT, @@ -395,8 +391,8 @@ DiskGeometry->SectorsPerTrack, DiskGeometry->BytesPerSector)); - FldrSetConfigurationData(DiskKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(DiskKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); } @@ -512,7 +508,7 @@ static VOID DetectBiosFloppyPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_FLOPPY_DEVICE_DATA FloppyData; WCHAR Identifier[20]; @@ -547,29 +543,27 @@ FloppyNumber, 0xFFFFFFFF); - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + sizeof(CM_FLOPPY_DEVICE_DATA); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); return; } - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 1; - - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; + + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypeDeviceSpecific; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->u.DeviceSpecificData.DataSize = sizeof(CM_FLOPPY_DEVICE_DATA); - FloppyData = (PVOID)(((ULONG_PTR)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); + FloppyData = (PVOID)(((ULONG_PTR)PartialResourceList) + sizeof(CM_PARTIAL_RESOURCE_LIST)); FloppyData->Version = 2; FloppyData->Revision = 0; FloppyData->MaxDensity = MaxDensity[FloppyType]; @@ -581,8 +575,8 @@ FloppyData->DataTransferRate = 0; /* Set 'Configuration Data' value */ - FldrSetConfigurationData(PeripheralKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(PeripheralKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); /* Set 'Identifier' value */ swprintf(Identifier, L"FLOPPY%u", FloppyNumber + 1); @@ -595,7 +589,7 @@ DetectBiosFloppyController(PCONFIGURATION_COMPONENT_DATA BusKey, PCONFIGURATION_COMPONENT_DATA ControllerKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; ULONG Size; ULONG FloppyCount; @@ -605,26 +599,24 @@ "Floppy count: %u\n", FloppyCount)); - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); return; } - memset(FullResourceDescriptor, 0, Size); + memset(PartialResourceList, 0, Size); /* Initialize resource descriptor */ - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 3; + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 3; /* Set IO Port */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; @@ -633,7 +625,7 @@ PartialDescriptor->u.Port.Length = 8; /* Set Interrupt */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[1]; PartialDescriptor->Type = CmResourceTypeInterrupt; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; @@ -642,7 +634,7 @@ PartialDescriptor->u.Interrupt.Affinity = 0xFFFFFFFF; /* Set DMA channel */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[2]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[2]; PartialDescriptor->Type = CmResourceTypeDma; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->Flags = 0; @@ -650,8 +642,8 @@ PartialDescriptor->u.Dma.Port = 0; /* Set 'Configuration Data' value */ - FldrSetConfigurationData(ControllerKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(ControllerKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); if (FloppyCount) DetectBiosFloppyPeripheral(ControllerKey); } @@ -660,7 +652,7 @@ DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, PCONFIGURATION_COMPONENT_DATA BusKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_INT13_DRIVE_PARAMETER Int13Drives; GEOMETRY Geometry; PCONFIGURATION_COMPONENT_DATA DiskKey, ControllerKey; @@ -716,10 +708,10 @@ DetectBiosFloppyController(BusKey, ControllerKey); /* Allocate resource descriptor */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount; - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); @@ -727,20 +719,18 @@ } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = InterfaceTypeUndefined; - FullResourceDescriptor->BusNumber = -1; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 1; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type = CmResourceTypeDeviceSpecific; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].ShareDisposition = 0; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Flags = 0; - FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.DeviceSpecificData.DataSize = + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; + PartialResourceList->PartialDescriptors[0].Type = CmResourceTypeDeviceSpecific; + PartialResourceList->PartialDescriptors[0].ShareDisposition = 0; + PartialResourceList->PartialDescriptors[0].Flags = 0; + PartialResourceList->PartialDescriptors[0].u.DeviceSpecificData.DataSize = sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount; /* Get harddisk Int13 geometry data */ - Int13Drives = (PVOID)(((ULONG_PTR)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); + Int13Drives = (PVOID)(((ULONG_PTR)PartialResourceList) + sizeof(CM_PARTIAL_RESOURCE_LIST)); for (i = 0; i < DiskCount; i++) { if (MachDiskGetDriveGeometry(0x80 + i, &Geometry)) @@ -762,8 +752,8 @@ } /* Set 'Configuration Data' value */ - FldrSetConfigurationData(SystemKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(SystemKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); /* Create and fill subkey for each harddisk */ for (i = 0; i < DiskCount; i++) @@ -964,7 +954,7 @@ DetectSerialPointerPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey, ULONG Base) { - CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + CM_PARTIAL_RESOURCE_LIST PartialResourceList; char Buffer[256]; WCHAR Identifier[256]; PCONFIGURATION_COMPONENT_DATA PeripheralKey; @@ -1116,16 +1106,14 @@ 0xFFFFFFFF); /* Set 'Configuration Data' value */ - memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); - FullResourceDescriptor.InterfaceType = Isa; - FullResourceDescriptor.BusNumber = 0; - FullResourceDescriptor.PartialResourceList.Version = 1; - FullResourceDescriptor.PartialResourceList.Revision = 1; - FullResourceDescriptor.PartialResourceList.Count = 0; + memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); + PartialResourceList.Version = 1; + PartialResourceList.Revision = 1; + PartialResourceList.Count = 0; FldrSetConfigurationData(PeripheralKey, - &FullResourceDescriptor, - sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + &PartialResourceList, + sizeof(CM_PARTIAL_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); /* Set 'Identifier' value */ @@ -1137,7 +1125,7 @@ static VOID DetectSerialPorts(PCONFIGURATION_COMPONENT_DATA BusKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_SERIAL_DEVICE_DATA SerialDeviceData; ULONG Irq[4] = {4, 3, 4, 3}; @@ -1179,27 +1167,25 @@ 0xFFFFFFFF); /* Build full device descriptor */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + sizeof(CM_SERIAL_DEVICE_DATA); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); continue; } - memset(FullResourceDescriptor, 0, Size); + memset(PartialResourceList, 0, Size); /* Initialize resource descriptor */ - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 3; + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 3; /* Set IO Port */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; @@ -1208,7 +1194,7 @@ PartialDescriptor->u.Port.Length = 7; /* Set Interrupt */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[1]; PartialDescriptor->Type = CmResourceTypeInterrupt; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; @@ -1217,20 +1203,20 @@ PartialDescriptor->u.Interrupt.Affinity = 0xFFFFFFFF; /* Set serial data (device specific) */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[2]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[2]; PartialDescriptor->Type = CmResourceTypeDeviceSpecific; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->Flags = 0; PartialDescriptor->u.DeviceSpecificData.DataSize = sizeof(CM_SERIAL_DEVICE_DATA); SerialDeviceData = - (PCM_SERIAL_DEVICE_DATA)&FullResourceDescriptor->PartialResourceList.PartialDescriptors[3]; + (PCM_SERIAL_DEVICE_DATA)&PartialResourceList->PartialDescriptors[3]; SerialDeviceData->BaudClock = 1843200; /* UART Clock frequency (Hertz) */ /* Set 'Configuration Data' value */ - FldrSetConfigurationData(ControllerKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); - + FldrSetConfigurationData(ControllerKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); + /* Set 'Identifier' value */ swprintf(Buffer, L"COM%u", i + 1); FldrSetIdentifier(ControllerKey, Buffer); @@ -1252,7 +1238,7 @@ static VOID DetectParallelPorts(PCONFIGURATION_COMPONENT_DATA BusKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; ULONG Irq[3] = {7, 5, (ULONG)-1}; WCHAR Buffer[80]; @@ -1293,28 +1279,26 @@ 0xFFFFFFFF); /* Build full device descriptor */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR); + Size = sizeof(CM_PARTIAL_RESOURCE_LIST); if (Irq[i] != (ULONG)-1) Size += sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); continue; } - memset(FullResourceDescriptor, 0, Size); + memset(PartialResourceList, 0, Size); /* Initialize resource descriptor */ - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = (Irq[i] != (ULONG)-1) ? 2 : 1; + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = (Irq[i] != (ULONG)-1) ? 2 : 1; /* Set IO Port */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; @@ -1325,7 +1309,7 @@ /* Set Interrupt */ if (Irq[i] != (ULONG)-1) { - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[1]; PartialDescriptor->Type = CmResourceTypeInterrupt; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; @@ -1335,8 +1319,8 @@ } /* Set 'Configuration Data' value */ - FldrSetConfigurationData(ControllerKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(ControllerKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); /* Set 'Identifier' value */ swprintf(Buffer, L"PARALLEL%u", i + 1); @@ -1426,7 +1410,7 @@ static VOID DetectKeyboardPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_KEYBOARD_DEVICE_DATA KeyboardData; PCONFIGURATION_COMPONENT_DATA PeripheralKey; @@ -1451,10 +1435,10 @@ 0xFFFFFFFF); /* Set 'Configuration Data' value */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + sizeof(CM_KEYBOARD_DEVICE_DATA); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); @@ -1462,14 +1446,12 @@ } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 1; - - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; + + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypeDeviceSpecific; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->u.DeviceSpecificData.DataSize = sizeof(CM_KEYBOARD_DEVICE_DATA); @@ -1482,8 +1464,8 @@ KeyboardData->KeyboardFlags = 0x20; /* Set 'Configuration Data' value */ - FldrSetConfigurationData(PeripheralKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(PeripheralKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); /* Set 'Identifier' value */ FldrSetIdentifier(PeripheralKey, L"PCAT_ENHANCED"); @@ -1494,7 +1476,7 @@ static VOID DetectKeyboardController(PCONFIGURATION_COMPONENT_DATA BusKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCONFIGURATION_COMPONENT_DATA ControllerKey; ULONG Size; @@ -1515,10 +1497,10 @@ 0xFFFFFFFF); /* Set 'Configuration Data' value */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); @@ -1526,15 +1508,13 @@ } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 3; + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 3; /* Set Interrupt */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypeInterrupt; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; @@ -1543,7 +1523,7 @@ PartialDescriptor->u.Interrupt.Affinity = 0xFFFFFFFF; /* Set IO Port 0x60 */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[1]; PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; @@ -1552,7 +1532,7 @@ PartialDescriptor->u.Port.Length = 1; /* Set IO Port 0x64 */ - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[2]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[2]; PartialDescriptor->Type = CmResourceTypePort; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->Flags = CM_RESOURCE_PORT_IO; @@ -1561,8 +1541,8 @@ PartialDescriptor->u.Port.Length = 1; /* Set 'Configuration Data' value */ - FldrSetConfigurationData(ControllerKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(ControllerKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); DetectKeyboardPeripheral(ControllerKey); } @@ -1680,7 +1660,7 @@ static VOID DetectPS2Mouse(PCONFIGURATION_COMPONENT_DATA BusKey) { - CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + CM_PARTIAL_RESOURCE_LIST PartialResourceList; PCONFIGURATION_COMPONENT_DATA ControllerKey; PCONFIGURATION_COMPONENT_DATA PeripheralKey; @@ -1703,27 +1683,25 @@ 0, 0xFFFFFFFF); - memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); + memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); /* Initialize resource descriptor */ - FullResourceDescriptor.InterfaceType = Isa; - FullResourceDescriptor.BusNumber = 0; - FullResourceDescriptor.PartialResourceList.Version = 1; - FullResourceDescriptor.PartialResourceList.Revision = 1; - FullResourceDescriptor.PartialResourceList.Count = 1; + PartialResourceList.Version = 1; + PartialResourceList.Revision = 1; + PartialResourceList.Count = 1; /* Set Interrupt */ - FullResourceDescriptor.PartialResourceList.PartialDescriptors[0].Type = CmResourceTypeInterrupt; - FullResourceDescriptor.PartialResourceList.PartialDescriptors[0].ShareDisposition = CmResourceShareUndetermined; - FullResourceDescriptor.PartialResourceList.PartialDescriptors[0].Flags = CM_RESOURCE_INTERRUPT_LATCHED; - FullResourceDescriptor.PartialResourceList.PartialDescriptors[0].u.Interrupt.Level = 12; - FullResourceDescriptor.PartialResourceList.PartialDescriptors[0].u.Interrupt.Vector = 0; - FullResourceDescriptor.PartialResourceList.PartialDescriptors[0].u.Interrupt.Affinity = 0xFFFFFFFF; + PartialResourceList.PartialDescriptors[0].Type = CmResourceTypeInterrupt; + PartialResourceList.PartialDescriptors[0].ShareDisposition = CmResourceShareUndetermined; + PartialResourceList.PartialDescriptors[0].Flags = CM_RESOURCE_INTERRUPT_LATCHED; + PartialResourceList.PartialDescriptors[0].u.Interrupt.Level = 12; + PartialResourceList.PartialDescriptors[0].u.Interrupt.Vector = 0; + PartialResourceList.PartialDescriptors[0].u.Interrupt.Affinity = 0xFFFFFFFF; /* Set 'Configuration Data' value */ FldrSetConfigurationData(ControllerKey, - &FullResourceDescriptor, - sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); + &PartialResourceList, + sizeof(CM_PARTIAL_RESOURCE_LIST)); if (DetectPS2AuxDevice()) { @@ -1745,17 +1723,15 @@ 0xFFFFFFFF); /* Initialize resource descriptor */ - memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); - FullResourceDescriptor.InterfaceType = Isa; - FullResourceDescriptor.BusNumber = 0; - FullResourceDescriptor.PartialResourceList.Version = 1; - FullResourceDescriptor.PartialResourceList.Revision = 1; - FullResourceDescriptor.PartialResourceList.Count = 0; + memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); + PartialResourceList.Version = 1; + PartialResourceList.Revision = 1; + PartialResourceList.Count = 0; /* Set 'Configuration Data' value */ FldrSetConfigurationData(PeripheralKey, - &FullResourceDescriptor, - sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + &PartialResourceList, + sizeof(CM_PARTIAL_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); /* Set 'Identifier' value */ @@ -1823,7 +1799,7 @@ static VOID DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCONFIGURATION_COMPONENT_DATA BusKey; ULONG Size; @@ -1848,10 +1824,10 @@ FldrSetIdentifier(BusKey, L"ISA"); /* Set 'Configuration Data' value */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); @@ -1859,16 +1835,14 @@ } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Isa; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 0; + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 0; /* Set 'Configuration Data' value */ - FldrSetConfigurationData(BusKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(BusKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); /* Detect ISA/BIOS devices */ DetectBiosDisks(SystemKey, BusKey); 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 Sun Dec 16 13:04:04 2007 @@ -52,7 +52,7 @@ DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { PCONFIGURATION_COMPONENT_DATA BiosKey; - CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + CM_PARTIAL_RESOURCE_LIST PartialResourceList; if (FindAcpiBios()) { @@ -73,15 +73,13 @@ 0xFFFFFFFF); /* Set 'Configuration Data' value */ - memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); - FullResourceDescriptor.InterfaceType = Internal; - FullResourceDescriptor.BusNumber = *BusNumber; - FullResourceDescriptor.PartialResourceList.Version = 0; - FullResourceDescriptor.PartialResourceList.Revision = 0; - FullResourceDescriptor.PartialResourceList.Count = 0; + memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); + PartialResourceList.Version = 0; + PartialResourceList.Revision = 0; + PartialResourceList.Count = 0; FldrSetConfigurationData(BiosKey, - &FullResourceDescriptor, - sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + &PartialResourceList, + sizeof(CM_PARTIAL_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); /* Increment bus number */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c Sun Dec 16 13:04:04 2007 @@ -57,7 +57,7 @@ DetectApmBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { PCONFIGURATION_COMPONENT_DATA BiosKey; - CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + CM_PARTIAL_RESOURCE_LIST PartialResourceList; if (FindApmBios()) { @@ -74,27 +74,25 @@ 0x0, 0x0, 0xFFFFFFFF); - + /* Set 'Configuration Data' value */ - memset(&FullResourceDescriptor, 0, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); - FullResourceDescriptor.InterfaceType = Internal; - FullResourceDescriptor.BusNumber = *BusNumber; - FullResourceDescriptor.PartialResourceList.Version = 0; - FullResourceDescriptor.PartialResourceList.Revision = 0; - FullResourceDescriptor.PartialResourceList.Count = 0; + memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); + PartialResourceList.Version = 0; + PartialResourceList.Revision = 0; + PartialResourceList.Count = 0; FldrSetConfigurationData(BiosKey, - &FullResourceDescriptor, - sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - + &PartialResourceList, + sizeof(CM_PARTIAL_RESOURCE_LIST) - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - + /* Increment bus number */ (*BusNumber)++; - + /* Set 'Identifier' value */ FldrSetIdentifier(BiosKey, L"APM"); } - - /* FIXME: Add congiguration data */ + + /* FIXME: Add configuration data */ } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Sun Dec 16 13:04:04 2007 @@ -143,7 +143,7 @@ static VOID DetectPciIrqRoutingTable(PCONFIGURATION_COMPONENT_DATA BusKey) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PPCI_IRQ_ROUTING_TABLE Table; PCONFIGURATION_COMPONENT_DATA TableKey; @@ -171,42 +171,39 @@ FldrSetIdentifier(TableKey, L"PCI Real-mode IRQ Routing Table"); /* Set 'Configuration Data' value */ - Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors) + - 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + Table->Size; - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) - { - DbgPrint((DPRINT_HWDETECT, - "Failed to allocate resource descriptor\n")); - return; - } + Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors) + + 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + Table->Size; + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) + { + DbgPrint((DPRINT_HWDETECT, + "Failed to allocate resource descriptor\n")); + return; + } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Internal; - FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 2; - - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 2; + + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypeBusNumber; PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; PartialDescriptor->u.BusNumber.Start = 0; PartialDescriptor->u.BusNumber.Length = 1; - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1]; + PartialDescriptor = &PartialResourceList->PartialDescriptors[1]; PartialDescriptor->Type = CmResourceTypeDeviceSpecific; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->u.DeviceSpecificData.DataSize = Table->Size; - memcpy(&FullResourceDescriptor->PartialResourceList.PartialDescriptors[2], - Table, - Table->Size); + memcpy(&PartialResourceList->PartialDescriptors[2], + Table, Table->Size); /* Set 'Configuration Data' value */ - FldrSetConfigurationData(TableKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(TableKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); } } @@ -214,7 +211,7 @@ VOID DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { - PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCI_REGISTRY_INFO BusData; PCONFIGURATION_COMPONENT_DATA BiosKey; @@ -247,10 +244,10 @@ FldrSetIdentifier(BiosKey, L"PCI BIOS"); /* Set 'Configuration Data' value */ - Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, - PartialResourceList.PartialDescriptors); - FullResourceDescriptor = MmAllocateMemory(Size); - if (FullResourceDescriptor == NULL) + Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, + PartialDescriptors); + PartialResourceList = MmAllocateMemory(Size); + if (PartialResourceList == NULL) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); @@ -258,13 +255,11 @@ } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = Internal; - FullResourceDescriptor->BusNumber = 0; + memset(PartialResourceList, 0, Size); /* Set 'Configuration Data' value */ - FldrSetConfigurationData(BiosKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(BiosKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); DetectPciIrqRoutingTable(BiosKey); @@ -289,12 +284,12 @@ if (i == 0) { /* Set 'Configuration Data' value */ - Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, - PartialResourceList.PartialDescriptors) + + Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, + PartialDescriptors) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + sizeof(PCI_REGISTRY_INFO); - FullResourceDescriptor = MmAllocateMemory(Size); - if (!FullResourceDescriptor) + PartialResourceList = MmAllocateMemory(Size); + if (!PartialResourceList) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); @@ -302,31 +297,29 @@ } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = PCIBus; - FullResourceDescriptor->BusNumber = i; - FullResourceDescriptor->PartialResourceList.Version = 1; - FullResourceDescriptor->PartialResourceList.Revision = 1; - FullResourceDescriptor->PartialResourceList.Count = 1; - PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; PartialDescriptor->Type = CmResourceTypeDeviceSpecific; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->u.DeviceSpecificData.DataSize = sizeof(PCI_REGISTRY_INFO); - memcpy(&FullResourceDescriptor->PartialResourceList.PartialDescriptors[1], + memcpy(&PartialResourceList->PartialDescriptors[1], &BusData, sizeof(PCI_REGISTRY_INFO)); /* Set 'Configuration Data' value */ - FldrSetConfigurationData(BusKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(BusKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); } else { /* Set 'Configuration Data' value */ - Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, - PartialResourceList.PartialDescriptors); - FullResourceDescriptor = MmAllocateMemory(Size); - if (!FullResourceDescriptor) + Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, + PartialDescriptors); + PartialResourceList = MmAllocateMemory(Size); + if (!PartialResourceList) { DbgPrint((DPRINT_HWDETECT, "Failed to allocate resource descriptor\n")); @@ -334,13 +327,11 @@ } /* Initialize resource descriptor */ - memset(FullResourceDescriptor, 0, Size); - FullResourceDescriptor->InterfaceType = PCIBus; - FullResourceDescriptor->BusNumber = i; + memset(PartialResourceList, 0, Size); /* Set 'Configuration Data' value */ - FldrSetConfigurationData(BusKey, FullResourceDescriptor, Size); - MmFreeMemory(FullResourceDescriptor); + FldrSetConfigurationData(BusKey, PartialResourceList, Size); + MmFreeMemory(PartialResourceList); } /* Increment bus number */ Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/hardware.h Sun Dec 16 13:04:04 2007 @@ -75,7 +75,7 @@ NTAPI FldrSetConfigurationData( IN PCONFIGURATION_COMPONENT_DATA ComponentKey, - IN PCM_FULL_RESOURCE_DESCRIPTOR ConfigurationData, + IN PCM_PARTIAL_RESOURCE_LIST ResourceList, IN ULONG Size ); Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c Sun Dec 16 13:04:04 2007 @@ -167,7 +167,7 @@ VOID NTAPI FldrSetConfigurationData(IN PCONFIGURATION_COMPONENT_DATA ComponentData, - IN PCM_FULL_RESOURCE_DESCRIPTOR Data, + IN PCM_PARTIAL_RESOURCE_LIST ResourceList, IN ULONG Size) { PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; @@ -178,11 +178,9 @@ if (!ConfigurationData) return; /* Copy component information */ - RtlCopyMemory(ConfigurationData, &Data->PartialResourceList.Version, Size); - + RtlCopyMemory(ConfigurationData, ResourceList, Size); + /* Set component information */ ComponentData->ConfigurationData = ConfigurationData; - Component->ConfigurationDataLength = Size - - FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, - PartialResourceList); + Component->ConfigurationDataLength = Size; }

1 0

[pschweitzer] 31273: Removed an used var
by pschweitzer＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: pschweitzer Date: Sun Dec 16 12:59:16 2007 New Revision: 31273 URL: http://svn.reactos.org/svn/reactos?rev=31273&view=rev Log: Removed an used var 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 Dec 16 12:59:16 2007 @@ -1,4 +1,7 @@ *** XXX XXth, 2008 - RosBE 1.2 Released + +- Updated RosBE Configuration Tool. (Pierre Schweitzer) + - Removed an used var. (Pierre Schweitzer) - Added a "all" switch to clean.cmd to do both jobs, deleting Compiler Output AND Logs in one process. (Daniel Reimer) - Added a Security Prompt to clean.cmd to not accidentally delete all Built stuff. (Daniel Reimer) 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 Dec 16 12:59:16 2007 @@ -86,7 +86,6 @@ VOID LoadSettings(HWND hwnd, PSETTINGS LoadedSettings) { FILE *pFile; - INT NbLines = 0; WCHAR optionsfile[MAX_PATH]; WCHAR *ptr, *ptr2; WCHAR WTempLine[25+MAX_PATH]; @@ -132,7 +131,6 @@ wcsncpy(LoadedSettings->outdir, ptr2, wcslen(ptr2)-1); } free(WTempLine); - NbLines++; } fclose(pFile); free(WTempLine);

1 0

[pschweitzer] 31272: Updated French translations for calc, shell32, syssetup
by pschweitzer＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: pschweitzer Date: Sun Dec 16 12:53:56 2007 New Revision: 31272 URL: http://svn.reactos.org/svn/reactos?rev=31272&view=rev Log: Updated French translations for calc, shell32, syssetup Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/calc/lang/fr-FR.rc Sun Dec 16 12:53:56 2007 @@ -139,11 +139,12 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,120,82 +DLG_ABOUT DIALOG 12,0,175,90 CAPTION "À propos de GNU winecalc" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END WHATS_THIS_MENU MENU DISCARDABLE Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Sun Dec 16 12:53:56 2007 @@ -358,193 +358,193 @@ FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - -GROUPBOX "Tasks", -1, 7, 10, 249, 45 +CAPTION "Général" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +GROUPBOX "Tâches", -1, 7, 10, 249, 45 //ICON -AUTORADIOBUTTON "Show common tasks in &folders", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Use Windows class&ic folders", 14002, 40, 37, 120, 10, WS_TABSTOP -GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP +AUTORADIOBUTTON "Montrer les tâches communes dans les dossiers", 14001, 40, 25, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Utilisez les dossiers Windows class&iques", 14002, 40, 37, 120, 10, WS_TABSTOP +GROUPBOX "Parcourir les dossiers", -1, 7, 60, 249, 45, WS_TABSTOP //ICON -AUTORADIOBUTTON "Open each folder in the sa&me window", 14004, 40, 70, 140, 10, WS_TABSTOP -AUTORADIOBUTTON "Open each folder in its own &window", 14005, 40, 82, 140, 10, WS_TABSTOP -GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 +AUTORADIOBUTTON "Ouvrir tous les dossiers dans la &même fenêtre", 14004, 40, 70, 140, 10, WS_TABSTOP +AUTORADIOBUTTON "Ouvrir chaque dossier dans sa propre fenêtre", 14005, 40, 82, 140, 10, WS_TABSTOP +GROUPBOX "Cliquer sur les éléments de la façon suivante", -1, 7, 110, 249, 60 //ICON -AUTORADIOBUTTON "&Single-click to open an item (point to select)", 14007, 40, 120, 170, 10, WS_TABSTOP -AUTORADIOBUTTON "Underline icon titles consistent with my &browser", 14008, 50, 132, 170, 10, WS_TABSTOP -AUTORADIOBUTTON "Underline icon titles only when I &point at them", 14009, 50, 144, 170, 10, WS_TABSTOP -AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", 14010, 40, 156, 170, 10, WS_TABSTOP -PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP +AUTORADIOBUTTON "Clic unique pour ouvrir un élément (pointer pour sélectionner)", 14007, 40, 120, 170, 10, WS_TABSTOP +AUTORADIOBUTTON "Toujours souligner les titres des icônes avec mon navigateur", 14008, 50, 132, 170, 10, WS_TABSTOP +AUTORADIOBUTTON "Souligner les titres des icônes seulement quand je les &pointe", 14009, 50, 144, 170, 10, WS_TABSTOP +AUTORADIOBUTTON "&Double-cliquer pour ouvrir un élément (clic unique pour sélectionner)", 14010, 40, 156, 170, 10, WS_TABSTOP +PUSHBUTTON "Pa&ramètres par défaut", 14011, 180, 180, 60, 14, WS_TABSTOP END FOLDER_OPTIONS_VIEW_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "View" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN -GROUPBOX "Folder views", -1, 7, 10, 249, 60 +CAPTION "Affichage" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +GROUPBOX "Affichage des dossiers", -1, 7, 10, 249, 60 //ICON -LTEXT "You can apply the view(such as Details or Tiles) that\nyou are using for this folder to all folders.", -1, 60, 20, 180, 20 -PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP -PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP -LTEXT "Advanced settings:", -1, 7, 80, 100, 10 +LTEXT "Vous pouvez appliquer l'affichage (tel que Détails ou Miniatures) que\nvous utilisez pour ce dossier à tous les dossiers.", -1, 60, 20, 180, 20 +PUSHBUTTON "Appliquer à tous les dossiers", 14001, 60, 50, 80, 14, WS_TABSTOP +PUSHBUTTON "&Réinitialiser tous les dossiers", 14002, 150, 50, 80, 14, WS_TABSTOP +LTEXT "Paramètres avancés :", -1, 7, 80, 100, 10 CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120 -PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP +PUSHBUTTON "Paramètres par &défaut", 14004, 180, 210, 80, 14, WS_TABSTOP END FOLDER_OPTIONS_FILETYPES_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "File Types" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN -LTEXT "Registered file &types:", -1, 7, 10, 70, 10 +CAPTION "Types de fichier" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN +LTEXT "&Types de fichier enregistrés :", -1, 7, 10, 70, 10 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 -PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP -PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP -GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 -LTEXT "Opens with:", -1, 12, 140, 40, 10 +PUSHBUTTON "&Nouveau", 14001, 120, 110, 50, 14, WS_TABSTOP +PUSHBUTTON "Supprimer", 14002, 180, 110, 50, 14, WS_TABSTOP +GROUPBOX "Détails pour l'extension '%s'", 14003, 7, 130, 249, 70 +LTEXT "Ouvrir avec :", -1, 12, 140, 40, 10 //ICON -LTEXT "Appname", 14005, 100, 140, 40, 10 -PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 -PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP +LTEXT "Nom de l'application", 14005, 100, 140, 40, 10 +PUSHBUTTON "&Changer...", 14006, 180, 140, 50, 14, WS_TABSTOP +LTEXT "Les fichiers avec l'extension '%s' sont du type '%s'. Pour\nchanger les paramètres qui concernent tous les fichiers '%s', cliquez\nsur Avancé.", 14007, 12, 155, 160, 30 +PUSHBUTTON "A&vancé", 14008, 180, 175, 50, 14, WS_TABSTOP END CONFIRM_FILE_REPLACE_DLG DIALOGEX 0, 0, 282, 143 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Confirm File Replace" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Yes", IDYES, 20, 122, 60, 14 - PUSHBUTTON "Yes to &All", 12807, 85, 122, 60, 14 - PUSHBUTTON "&No", IDNO, 150, 122, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 215, 122, 60, 14 +CAPTION "Confirmer le remplacement de fichier" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Oui", IDYES, 20, 122, 60, 14 + PUSHBUTTON "Oui pour tous", 12807, 85, 122, 60, 14 + PUSHBUTTON "&Non", IDNO, 150, 122, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 215, 122, 60, 14 ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "This folder already contains a file named '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX - LTEXT "This folder already contains a read-only file named '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX - LTEXT "This folder already contains a system file named '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX - LTEXT "Would you like to replace the existing file", -1, 44, 35, 228, 10, SS_NOPREFIX - LTEXT "(unknown date and size)", 12302, 79, 51, 198, 20, SS_NOPREFIX + LTEXT "Ce dossier contient déjà un fichier nommé '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX + LTEXT "Ce dossier contient déjà un fichier en lecture-seule nommé '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX + LTEXT "Ce dossier contient déjà un fichier système nommé '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX + LTEXT "Désirez-vous remplacer le fichier existant", -1, 44, 35, 228, 10, SS_NOPREFIX + LTEXT "(date et taille inconnues)", 12302, 79, 51, 198, 20, SS_NOPREFIX ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL - LTEXT "with this one?", -1, 44, 75, 228, 10, SS_NOPREFIX - LTEXT "(unknown date and size)", 12303, 79, 91, 198, 20, SS_NOPREFIX + LTEXT "par celui-ci ?", -1, 44, 75, 228, 10, SS_NOPREFIX + LTEXT "(date et taille inconnues)", 12303, 79, 91, 198, 20, SS_NOPREFIX ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END LOGOFF_DLG DIALOGEX 0, 0, 190, 60 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Log Off ReactOS" +CAPTION "Fermer ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 - DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + LTEXT "Êtes-vous sûr de vouloir fermer ReactOS ?", -1, 43, 11, 140, 22 + DEFPUSHBUTTON "Fermer", IDOK, 57, 40, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 122, 40, 60, 14 END DISCONNECT_DLG DIALOGEX 0, 0, 190, 60 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Disconnect ReactOS" +CAPTION "Déconnecter ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON 49, 14346, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to disconnect?", -1, 49, 12, 137, 23 - DEFPUSHBUTTON "&Disconnect", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 123, 40, 60, 14 + LTEXT "Êtes-vous sûr de vouloir vous déconnecter ?", -1, 49, 12, 137, 23 + DEFPUSHBUTTON "&Déconnecter", IDOK, 57, 40, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 123, 40, 60, 14 END AUTOPLAY1_DLG DIALOGEX 0, 0, 227, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "AutoPlay" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Select a content type, then choose an action for ReactOS to perform automatically when that type is used in this device:", 1000, 7, 7, 215, 20 +CAPTION "Exécution automatique" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Sélectionnez un type de contenu, puis choisissez une action que ReactOS réalisera automatiquement que ce type sera utilisé dans ce périphérique :", 1000, 7, 7, 215, 20 CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200 GROUPBOX "Actions", -1, 7, 45, 212, 146 - AUTORADIOBUTTON "Select an action to &perform:", 1005, 14, 54, 202, 10, WS_GROUP + AUTORADIOBUTTON "Sélectionnez une action à réaliser :", 1005, 14, 54, 202, 10, WS_GROUP CONTROL "LIST2", 1002, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 22, 66, 192, 107 - AUTORADIOBUTTON "Prompt me each time to &choose an action", 1006, 14, 177, 202, 10 - PUSHBUTTON "&Restore Defaults", 1008, 108, 197, 110, 14, WS_DISABLED + AUTORADIOBUTTON "M'interroger à chaque fois pour &choisir une action", 1006, 14, 177, 202, 10 + PUSHBUTTON "Pa&ramètres par défaut", 1008, 108, 197, 110, 14, WS_DISABLED END MIXED_CONTENT1_DLG DIALOG 0, 0, 227, 207 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Mixed Content" +CAPTION "Contenu mixte" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "This disk or device contains more than one type of content.", 1001, 32, 7, 191, 20 - LTEXT "What do you want ReactOS to do?", 1002, 32, 31, 188, 8 + LTEXT "Ce disque ou dispositif contient plus d'un type de fichier.", 1001, 32, 7, 191, 20 + LTEXT "Que voulez-vous que ReactOS fasse ?", 1002, 32, 31, 188, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139 DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 186, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 160, 186, 60, 14 END MIXED_CONTENT2_DLG DIALOG 0, 0, 227, 206 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Mixed Content" +CAPTION "Contenu mixte" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS can perform the same action each time you insert a disk or connect a device with this kind of file:", 1001, 30, 7, 193, 20 + LTEXT "ReactOS peut réaliser la même action chaque fois que vous insérez un disque ou connectez un dispositif avec ce type de fichiers :", 1001, 30, 7, 193, 20 ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "What do you want ReactOS to do?", 1002, 32, 41, 190, 8 + LTEXT "Que voulez-vous que ReactOS fasse ?", 1002, 32, 41, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112 - AUTOCHECKBOX "Always do the selected action.", 1004, 32, 171, 190, 10 + AUTOCHECKBOX "Toujours réaliser l'action sélectionnée.", 1004, 32, 171, 190, 10 DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 185, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 160, 185, 60, 14 END AUTOPLAY2_DLG DIALOG 0, 0, 227, 181 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Autoplay" +CAPTION "Exécution automatique" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS can perform the same action each time you connect this device.", 1001, 32, 7, 190, 22 - LTEXT "&What do you want ReactOS to do?", 1002, 32, 31, 190, 8 + LTEXT "ReactOS peut réaliser la même action chaque fois que vous connectez ce dispositif.", 1001, 32, 7, 190, 22 + LTEXT "Que voulez-vous que ReactOS fasse ?", 1002, 32, 31, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96 - AUTOCHECKBOX "&Always perform the selected action", 1004, 32, 143, 190, 8 + AUTOCHECKBOX "Toujours réaliser l'action sélectionnée", 1004, 32, 143, 190, 8 DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 159, 160, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 159, 160, 60, 14 END SHUTDOWN_DLG DIALOG 0, 0, 211, 103 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Shut Down ReactOS" +CAPTION "Fermer ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP - LTEXT "What do you want the computer to do?", -1, 39, 7, 167, 10 + LTEXT "Que voulez-vous que l'ordinateur fasse ?", -1, 39, 7, 167, 10 COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL - LTEXT "Maintains your session, keeping the computer running on low power with data still in memory. The computer wakes up when you press a key or move the mouse.", 8225, 39, 40, 167, 37 + LTEXT "Maintenir votre session, garder votre ordinateur lancé avec peu d'énergie et les données toujours en mémoire. L'ordinateur se réveille lorsque vous pressez une touche ou que vous bougez la souris.", 8225, 39, 40, 167, 37 DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 75, 82, 60, 14 - PUSHBUTTON "&Help", IDHELP, 144, 82, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 75, 82, 60, 14 + PUSHBUTTON "Aide", IDHELP, 144, 82, 60, 14 END FORMAT_DLG DIALOGEX 50, 50, 184, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Format" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Start", IDOK, 53, 198, 60, 14 - PUSHBUTTON "&Close", IDCANCEL, 118, 198, 60, 14 - LTEXT "Ca&pacity:", -1, 7, 6, 169, 9 +CAPTION "Formater" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Démarrer", IDOK, 53, 198, 60, 14 + PUSHBUTTON "Fermer", IDCANCEL, 118, 198, 60, 14 + LTEXT "Ca&pacité :", -1, 7, 6, 169, 9 COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&File system", -1, 7, 35, 170, 9 + LTEXT "Système de fichier", -1, 7, 35, 170, 9 COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8 - LTEXT "&Allocation unit size", -1, 7, 64, 170, 9 + LTEXT "Taille d'unité d'&allocation", -1, 7, 64, 170, 9 COMBOBOX 28680, 7, 75, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Volume &label", -1, 7, 93, 170, 9 + LTEXT "Nom du volume", -1, 7, 93, 170, 9 EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL - GROUPBOX "Format &options", 4610, 7, 121, 170, 49 - AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 - AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 + GROUPBOX "&Options de formatage", 4610, 7, 121, 170, 49 + AUTOCHECKBOX "Formatage rapide", 28674, 16, 135, 155, 10 + AUTOCHECKBOX "Activer la compression", 28675, 16, 152, 155, 10 END STRINGTABLE DISCARDABLE @@ -631,7 +631,7 @@ IDS_COMMON_VIDEO "Documents\\Mes vidéos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_NEWFOLDER "New Folder" + IDS_NEWFOLDER "Nouveau dossier" IDS_DRIVE_FIXED "Disque local" IDS_DRIVE_CDROM "CDROM" @@ -642,8 +642,8 @@ IDS_SHELL_ABOUT_AUTHORS "&Auteurs" IDS_SHELL_ABOUT_BACK "< Précédent" - FCIDM_SHVIEW_NEW "Nouveau" - FCIDM_SHVIEW_NEWFOLDER "Nouveau d&ossier" - FCIDM_SHVIEW_NEWLINK "Nouveau &lien" - IDS_FOLDER_OPTIONS "Folder Options" -END + FCIDM_SHVIEW_NEW "Nouveau" + FCIDM_SHVIEW_NEWFOLDER "Nouveau d&ossier" + FCIDM_SHVIEW_NEWLINK "Nouveau &lien" + IDS_FOLDER_OPTIONS "Options du dossier" +END Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Sun Dec 16 12:53:56 2007 @@ -76,16 +76,16 @@ "Si vous êtes sur un réseau, le nom saisi doit être unique.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Nom de l'ordinateur :", IDC_STATIC, 54, 38, 75, 8 - EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE LTEXT "L'assistant va créer un compte utilisateur sur votre ordinateur appelé Administrateur. "\ "Vous pourrez utiliser ce compte pour avoir un accès complet à votre ordinateur.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Entrez le mot de passe Administrateur (14 caractères ou moins).", IDC_STATIC, 54, 87, 250, 8 - LTEXT "&Mot de passe :", IDC_STATIC, 54, 104, 75, 8 - EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "Confirmation :", IDC_STATIC, 54, 123, 75, 8 - EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "&Mot de passe :", IDC_STATIC, 54, 104, 105, 8 + EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "Confirmation :", IDC_STATIC, 54, 123, 105, 8 + EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -100,13 +100,13 @@ LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "Pour changer la localisation système, cliquez sur Modifier.", IDC_STATIC, 53, 60, 184, 8 - PUSHBUTTON "&Modifier...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + PUSHBUTTON "&Modifier...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 LTEXT "La configuration clavier contrôle la saisie des touches quand vous tapez.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "Pour changer la configuration clavier, cliquez sur Modifier.", IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "M&odifier...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 + PUSHBUTTON "M&odifier...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 END @@ -115,12 +115,12 @@ CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Date et Heure", IDC_STATIC, 53, 7, 253, 8 + LTEXT "Date et Heure :", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 - LTEXT "Fuseau horaire", IDC_STATIC, 53, 42, 253, 8 + LTEXT "Fuseau horaire :", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Ajuster automatiquement l'horloge pour l'heure &d'été",

1 0

[tkreuzer] 31271: fix export definition
by tkreuzer＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: tkreuzer Date: Sun Dec 16 05:45:59 2007 New Revision: 31271 URL: http://svn.reactos.org/svn/reactos?rev=31271&view=rev Log: fix export definition Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def Sun Dec 16 05:45:59 2007 @@ -668,7 +668,7 @@ NtGdiUpdateTransform@4 NtGdiSetPUMPDOBJ@16 NtGdiBRUSHOBJ_DeleteRbrush@8 -NtGdiUnmapMemFont@4 +NtGdiUMPDEngFreeUserMem@4 NtGdiDrawStream@12 UMPDDrvQuerySpoolType@8 DefaultHTCallBack@4

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
61
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 December 2007