Ros-diffs December 2006

ros-diffs@reactos.org

16 participants
168 discussions

[janderwald] 25138: Part 1/2 of WDK compability fixes - add struct CONSOLE_READCONSOLE_CONTROL to wincon.h - add missing pointer typedef - fix declaration of ReadConsoleA ReadConsoleW FindFirstVolumeA FindFirstVolumeW FindFirstVolumeMountPointA FindFirstVolumeMountPointW FindNextVolumeA GetApplicationRecoveryCallback RegisterApplicationRecoveryCallback SystemTimeToTzSpecificLocalTime - fix typedef of WIN32_FIND_STREAM_DATA
by janderwald＠svn.reactos.org 12 Dec '06

12 Dec '06

Author: janderwald Date: Wed Dec 13 02:52:02 2006 New Revision: 25138 URL: http://svn.reactos.org/svn/reactos?rev=25138&view=rev Log: Part 1/2 of WDK compability fixes - add struct CONSOLE_READCONSOLE_CONTROL to wincon.h - add missing pointer typedef - fix declaration of ReadConsoleA ReadConsoleW FindFirstVolumeA FindFirstVolumeW FindFirstVolumeMountPointA FindFirstVolumeMountPointW FindNextVolumeA GetApplicationRecoveryCallback RegisterApplicationRecoveryCallback SystemTimeToTzSpecificLocalTime - fix typedef of WIN32_FIND_STREAM_DATA Modified: trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/wincon.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Wed Dec 13 02:52:02 2006 @@ -830,7 +830,7 @@ typedef struct _WIN32_FIND_STREAM_DATAW { LARGE_INTEGER StreamSize; WCHAR cStreamName[MAX_PATH + 36]; -} WIN32_FIND_STREAM_DATAW, *PWIN32_FIND_STREAM_DATAW, *LPWIN32_FIND_STREAM_DATAW; +} WIN32_FIND_STREAM_DATA, *PWIN32_FIND_STREAM_DATA; #endif typedef struct _WIN32_STREAM_ID { DWORD dwStreamId; @@ -1347,10 +1347,10 @@ #endif BOOL WINAPI FindFirstFreeAce(PACL,PVOID*); #if (_WIN32_WINNT >= 0x0500) -HANDLE WINAPI FindFirstVolumeA(LPCSTR,DWORD); -HANDLE WINAPI FindFirstVolumeW(LPCWSTR,DWORD); -HANDLE WINAPI FindFirstVolumeMountPointA(LPSTR,LPSTR,DWORD); -HANDLE WINAPI FindFirstVolumeMountPointW(LPWSTR,LPWSTR,DWORD); +HANDLE WINAPI FindFirstVolumeA(LPSTR,DWORD); +HANDLE WINAPI FindFirstVolumeW(LPWSTR,DWORD); +HANDLE WINAPI FindFirstVolumeMountPointA(LPCSTR,LPSTR,DWORD); +HANDLE WINAPI FindFirstVolumeMountPointW(LPCWSTR,LPWSTR,DWORD); #endif BOOL WINAPI FindNextChangeNotification(HANDLE); BOOL WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA); @@ -1359,7 +1359,7 @@ BOOL WINAPI FindNextStreamW(HANDLE,LPVOID); #endif #if (_WIN32_WINNT >= 0x0500) -BOOL WINAPI FindNextVolumeA(HANDLE,LPCSTR,DWORD); +BOOL WINAPI FindNextVolumeA(HANDLE,LPSTR,DWORD); BOOL WINAPI FindNextVolumeW(HANDLE,LPWSTR,DWORD); BOOL WINAPI FindNextVolumeMountPointA(HANDLE,LPSTR,DWORD); BOOL WINAPI FindNextVolumeMountPointW(HANDLE,LPWSTR,DWORD); @@ -1396,7 +1396,7 @@ BOOL WINAPI GetAce(PACL,DWORD,LPVOID*); BOOL WINAPI GetAclInformation(PACL,PVOID,DWORD,ACL_INFORMATION_CLASS); #if (_WIN32_WINNT >= 0x0600) -HRESULT WINAPI GetApplicationRecoveryCallback(HANDLE,APPLICATION_RECOVERY_CALLBACK*,PVOID*); +HRESULT WINAPI GetApplicationRecoveryCallback(HANDLE,APPLICATION_RECOVERY_CALLBACK*,PVOID*, DWORD*, DWORD*); HRESULT WINAPI GetApplicationRestart(HANDLE,PWSTR,PDWORD,PDWORD); #endif UINT WINAPI GetAtomNameA(ATOM,LPSTR,int); @@ -1856,7 +1856,7 @@ #if (_WIN32_WINNT >= 0x0600) VOID WINAPI RecoveryFinished(BOOL); HRESULT WINAPI RecoveryInProgress(OUT PBOOL); -HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK,PVOID); +HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK,PVOID, DWORD, DWORD); HRESULT WINAPI RegisterApplicationRestart(PCWSTR,DWORD); #endif HANDLE WINAPI RegisterEventSourceA (LPCSTR,LPCSTR); @@ -2002,7 +2002,7 @@ void WINAPI SwitchToFiber(PVOID); BOOL WINAPI SwitchToThread(void); BOOL WINAPI SystemTimeToFileTime(const SYSTEMTIME*,LPFILETIME); -BOOL WINAPI SystemTimeToTzSpecificLocalTime(LPTIME_ZONE_INFORMATION,LPSYSTEMTIME,LPSYSTEMTIME); +BOOL WINAPI SystemTimeToTzSpecificLocalTime(CONST TIME_ZONE_INFORMATION*,CONST SYSTEMTIME*,LPSYSTEMTIME); BOOL WINAPI TerminateProcess(HANDLE,UINT); BOOL WINAPI TerminateThread(HANDLE,DWORD); DWORD WINAPI TlsAlloc(VOID); Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wincon.h (original) +++ trunk/reactos/include/psdk/wincon.h Wed Dec 13 02:52:02 2006 @@ -51,6 +51,13 @@ #define DOUBLE_CLICK 2 #define MOUSE_WHEELED 4 +typedef struct _CONSOLE_READCONSOLE_CONTROL { + ULONG nLength; + ULONG nInitialChars; + ULONG dwCtrlWakeupMask; + ULONG dwControlKeyState; +} CONSOLE_READCONSOLE_CONTROL, *PCONSOLE_READCONSOLE_CONTROL; + typedef struct _CHAR_INFO { union { WCHAR UnicodeChar; @@ -71,7 +78,7 @@ typedef struct _COORD { SHORT X; SHORT Y; -} COORD; +} COORD, *PCOORD; typedef struct _CONSOLE_SELECTION_INFO { DWORD dwFlags; COORD dwSelectionAnchor; @@ -183,8 +190,8 @@ BOOL WINAPI GetNumberOfConsoleMouseButtons(PDWORD); BOOL WINAPI PeekConsoleInputA(HANDLE,PINPUT_RECORD,DWORD,PDWORD); BOOL WINAPI PeekConsoleInputW(HANDLE,PINPUT_RECORD,DWORD,PDWORD); -BOOL WINAPI ReadConsoleA(HANDLE,PVOID,DWORD,PDWORD,PVOID); -BOOL WINAPI ReadConsoleW(HANDLE,PVOID,DWORD,PDWORD,PVOID); +BOOL WINAPI ReadConsoleA(HANDLE,PVOID,DWORD,PDWORD,PCONSOLE_READCONSOLE_CONTROL); +BOOL WINAPI ReadConsoleW(HANDLE,PVOID,DWORD,PDWORD,PCONSOLE_READCONSOLE_CONTROL); BOOL WINAPI ReadConsoleInputA(HANDLE,PINPUT_RECORD,DWORD,PDWORD); BOOL WINAPI ReadConsoleInputW(HANDLE,PINPUT_RECORD,DWORD,PDWORD); BOOL WINAPI ReadConsoleOutputAttribute(HANDLE,LPWORD,DWORD,COORD,LPDWORD);

1 0

[greatlrd] 25137: do not crash if we call lock and unlock but something are wrong. we manger getting a lock but ms sdk font sample does not showing the font why ??
by greatlrd＠svn.reactos.org 12 Dec '06

12 Dec '06

Author: greatlrd Date: Wed Dec 13 01:03:49 2006 New Revision: 25137 URL: http://svn.reactos.org/svn/reactos?rev=25137&view=rev Log: do not crash if we call lock and unlock but something are wrong. we manger getting a lock but ms sdk font sample does not showing the font why ?? Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Wed Dec 13 01:03:49 2006 @@ -215,43 +215,73 @@ LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE events) { LPDDRAWI_DDRAWSURFACE_INT This = (LPDDRAWI_DDRAWSURFACE_INT)iface; - DDHAL_LOCKDATA LockData; - - DX_WINDBG_trace(); - - if (events != NULL) - { - return DDERR_INVALIDPARAMS; - } - - RtlZeroMemory(&LockData,sizeof(DDHAL_LOCKDATA)); - LockData.ddRVal = DDERR_GENERIC; - - - - if (This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_LOCK) - { - LockData.lpDD = This->lpLcl->lpGbl->lpDD; - LockData.Lock = This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.Lock; - - - - //LockData.lpDDSurface; - //LockData.bHasRect; - //LockData.rArea; - //LockData.lpSurfData; - - LockData.dwFlags = flags; - - if (LockData.Lock(&LockData) == DDHAL_DRIVER_HANDLED) - { - return LockData.ddRVal; - } - } - - - return DDERR_GENERIC; -} + DDHAL_LOCKDATA mdLock; + + DX_WINDBG_trace(); + + /* FIXME add a check see if lock suport or not */ + + if (prect!=NULL) + { + mdLock.bHasRect = TRUE; + memcpy(&mdLock.rArea,prect,sizeof(RECTL)); + } + else + { + mdLock.bHasRect = FALSE; + } + + mdLock.ddRVal = DDERR_NOTPALETTIZED; + mdLock.Lock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.Lock; + mdLock.dwFlags = flags; + mdLock.lpDDSurface = This->lpLcl->lpSurfMore->slist[0]; + mdLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; + mdLock.lpSurfData = NULL; + + if (!DdResetVisrgn(This->lpLcl->lpSurfMore->slist[0], NULL)) + { + DX_STUB_str("Here DdResetVisrgn lock"); + return DDERR_UNSUPPORTED; + } + + if (mdLock.Lock(&mdLock)!= DDHAL_DRIVER_HANDLED) + { + DX_STUB_str("Here DDHAL_DRIVER_HANDLED lock"); + return DDERR_UNSUPPORTED; + } + + if (mdLock.ddRVal!= DD_OK) + { + DX_STUB_str("Here ddRVal lock"); + return mdLock.ddRVal; + } + + // FIXME ??? is this right ?? + if (pDDSD != NULL) + { + ZeroMemory(pDDSD,sizeof(DDSURFACEDESC2)); + pDDSD->dwSize = sizeof(DDSURFACEDESC2); + + //if (pDDSD->dwSize == sizeof(DDSURFACEDESC2)) + //{ + // ZeroMemory(pDDSD,sizeof(DDSURFACEDESC2)); + // // FIXME the interanl mddsdPrimary shall be DDSURFACEDESC2 + // memcpy(pDDSD,&This->Surf->mddsdPrimary,sizeof(DDSURFACEDESC)); + // pDDSD->dwSize = sizeof(DDSURFACEDESC2); + //} + //if (pDDSD->dwSize == sizeof(DDSURFACEDESC)) + //{ + // RtlZeroMemory(pDDSD,sizeof(DDSURFACEDESC)); + // memcpy(pDDSD,&This->Surf->mddsdPrimary,sizeof(DDSURFACEDESC)); + // pDDSD->dwSize = sizeof(DDSURFACEDESC); + //} + + pDDSD->lpSurface = (LPVOID) mdLock.lpSurfData; + } + + return DD_OK; +} + HRESULT WINAPI Main_DDrawSurface_Unlock (LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) { @@ -260,30 +290,34 @@ DX_WINDBG_trace(); - if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UNLOCK) + if (!This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UNLOCK) { + DX_STUB_str("DDERR_UNSUPPORTED"); return DDERR_UNSUPPORTED; } unLock.ddRVal = DDERR_NOTPALETTIZED; - unLock.lpDD = This->lpLcl->lpGbl->lpDD; - unLock.lpDDSurface = This->lpLcl; - unLock.Unlock = This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.Unlock; + unLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; + unLock.lpDDSurface = This->lpLcl->lpSurfMore->slist[0]; + unLock.Unlock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.Unlock; if (!DdResetVisrgn( unLock.lpDDSurface, NULL)) { - return DDERR_UNSUPPORTED; + DX_STUB_str("DDERR_UNSUPPORTED"); + return DDERR_UNSUPPORTED; } if (unLock.Unlock(&unLock)!= DDHAL_DRIVER_HANDLED) { + DX_STUB_str("unLock fail"); return DDERR_UNSUPPORTED; } if (unLock.ddRVal!= DD_OK) { + DX_STUB_str("ddRVal errror"); return unLock.ddRVal; }

1 0

[greatlrd] 25136: now we are back in track, we are almost same state as we got with the old desgin of ddraw.dll bltblt working again for HAL
by greatlrd＠svn.reactos.org 12 Dec '06

12 Dec '06

Author: greatlrd Date: Tue Dec 12 23:35:12 2006 New Revision: 25136 URL: http://svn.reactos.org/svn/reactos?rev=25136&view=rev Log: now we are back in track, we are almost same state as we got with the old desgin of ddraw.dll bltblt working again for HAL Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Tue Dec 12 23:35:12 2006 @@ -77,43 +77,137 @@ DX_WINDBG_trace(); - mDdBlt.lpDDDestSurface = ThisDest->lpLcl->lpSurfMore->slist[0]; + if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags + & DDHAL_SURFCB32_BLT) != DDHAL_SURFCB32_BLT) + { + return DDERR_GENERIC; + } + + ZeroMemory(&mDdBlt, sizeof(DDHAL_BLTDATA)); + ZeroMemory(&mDdBlt.bltFX, sizeof(DDBLTFX)); + if (!DdResetVisrgn( ThisDest->lpLcl->lpSurfMore->slist[0], NULL)) { - // derr(L"DirectDrawImpl[%08x]::_clear DdResetVisrgn failed", this); + DX_STUB_str("DdResetVisrgn failed"); } - ZeroMemory(&mDdBlt, sizeof(DDHAL_BLTDATA)); - ZeroMemory(&mDdBlt.bltFX, sizeof(DDBLTFX)); - mDdBlt.bltFX.dwSize = sizeof(DDBLTFX); - - mDdBlt.lpDD = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; + mDdBlt.lpDD = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; mDdBlt.Blt = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.Blt; mDdBlt.lpDDDestSurface = ThisDest->lpLcl->lpSurfMore->slist[0]; - - ThisDest->lpLcl->lpSurfMore->slist[0]->hDC = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->hDC; // This->lpLcl->hWnd; - mDdBlt.rDest.top = 50; - mDdBlt.rDest.bottom = 100; - mDdBlt.rDest.left = 0; - mDdBlt.rDest.right = 100; - mDdBlt.lpDDSrcSurface = NULL; - mDdBlt.IsClipped = FALSE; - mDdBlt.bltFX.dwFillColor = 0xFFFF00; - mDdBlt.dwFlags = DDBLT_COLORFILL | DDBLT_WAIT; - + + ThisDest->lpLcl->lpSurfMore->slist[0]->hDC = + ThisDest->lpLcl->lpSurfMore->lpDD_lcl->hDC; + + /* Setup Src */ + if (ThisSrc != NULL) + { + mDdBlt.lpDDSrcSurface = ThisSrc->lpLcl->lpSurfMore->slist[0]; + + ThisSrc->lpLcl->lpSurfMore->slist[0]->hDC = + ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->hDC; + + if (rsrc != NULL) + { + memmove(&mDdBlt.rSrc, rsrc, sizeof (RECTL)); + } + else + { + if ( ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->dwLocalFlags & + DDRAWILCL_ISFULLSCREEN) + { + mDdBlt.rSrc.top = 0; + mDdBlt.rSrc.left = 0; + mDdBlt.rSrc.right = ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->lpGbl-> + vmiData.dwDisplayWidth; + + mDdBlt.rSrc.bottom = ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->lpGbl-> + vmiData.lDisplayPitch; + } + else + { + if(!GetWindowRect((HWND)ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->hWnd, + (RECT *)&mDdBlt.rSrc)) + { + DX_STUB_str("GetWindowRect failed"); + } + } + } + + /* FIXME + * compare so we do not write to far + * ThisDest->lpLcl->lpGbl->wWidth; <- surface max width + * ThisDest->lpLcl->lpGbl->wHeight <- surface max heght + * ThisDest->lpLcl->lpGbl->lPitch <- surface bpp + */ + + } + + /* Setup dest */ + if (rdst != NULL) + { + memmove(&mDdBlt.rDest, rdst, sizeof (RECTL)); + } + else + { + if ( ThisDest->lpLcl->lpSurfMore->lpDD_lcl->dwLocalFlags & + DDRAWILCL_ISFULLSCREEN) + { + mDdBlt.rDest.top = 0; + mDdBlt.rDest.left = 0; + mDdBlt.rDest.right = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl-> + vmiData.dwDisplayWidth; + + mDdBlt.rDest.bottom = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl-> + vmiData.lDisplayPitch; + } + else + { + + if(!GetWindowRect((HWND)ThisDest->lpLcl->lpSurfMore->lpDD_lcl->hWnd, + (RECT *)&mDdBlt.rDest)) + { + DX_STUB_str("GetWindowRect failed"); + } + } + } + + /* FIXME + * compare so we do not write to far + * ThisDest->lpLcl->lpGbl->wWidth; <- surface max width + * ThisDest->lpLcl->lpGbl->wHeight <- surface max heght + * ThisDest->lpLcl->lpGbl->lPitch <- surface bpp + */ + + + /* setup bltFX */ + if (lpbltfx != NULL) + { + memmove(&mDdBlt.bltFX, lpbltfx, sizeof (DDBLTFX)); + } + + /* setup value that are not config yet */ + mDdBlt.dwFlags = dwFlags; + mDdBlt.IsClipped = FALSE; + mDdBlt.bltFX.dwSize = sizeof(DDBLTFX); + + + /* FIXME + BltData.dwRectCnt + BltData.dwROPFlags + BltData.IsClipped + BltData.prDestRects + BltData.rOrigDest + BltData.rOrigSrc + BltData.ddRVal + */ + if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) { - //printf("Fail to mDdBlt = DDHAL_DRIVER_HANDLED\n"); - return DDHAL_DRIVER_HANDLED; + DX_STUB_str("mDdBlt DDHAL_DRIVER_HANDLED"); + return DDERR_NOBLTHW; } - if (mDdBlt.ddRVal!=DD_OK) - { - //printf("Fail to mDdBlt mDdBlt.ddRVal = %d:%s\n",(int)mDdBlt.ddRVal,DDErrorString(mDdBlt.ddRVal)); - return mDdBlt.ddRVal; - } - - return DDERR_GENERIC; + return mDdBlt.ddRVal; }

1 0

[janderwald] 25135: - fix bug in IntChangeDisplaySettings
by janderwald＠svn.reactos.org 12 Dec '06

12 Dec '06

Author: janderwald Date: Tue Dec 12 23:22:07 2006 New Revision: 25135 URL: http://svn.reactos.org/svn/reactos?rev=25135&view=rev Log: - fix bug in IntChangeDisplaySettings Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Dec 12 23:22:07 2006 @@ -2933,7 +2933,7 @@ HDC hDC; hWnd = IntGetDesktopWindow(); - if (hWnd && !(Wnd = UserGetWindowObject(hWnd))) + if (!hWnd || !(Wnd = UserGetWindowObject(hWnd))) { return FALSE; }

1 0

[greatlrd] 25134: bltblt is hacked now. but it draw a yellow surface now
by greatlrd＠svn.reactos.org 12 Dec '06

12 Dec '06

Author: greatlrd Date: Tue Dec 12 22:34:33 2006 New Revision: 25134 URL: http://svn.reactos.org/svn/reactos?rev=25134&view=rev Log: bltblt is hacked now. but it draw a yellow surface now Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Tue Dec 12 22:34:33 2006 @@ -73,59 +73,45 @@ LPDDRAWI_DDRAWSURFACE_INT ThisDest = (LPDDRAWI_DDRAWSURFACE_INT)iface; LPDDRAWI_DDRAWSURFACE_INT ThisSrc = (LPDDRAWI_DDRAWSURFACE_INT)src; - DDHAL_BLTDATA BltData; + DDHAL_BLTDATA mDdBlt; DX_WINDBG_trace(); - - RtlZeroMemory(&BltData,sizeof(DDHAL_BLTDATA)); - BltData.ddRVal = DDERR_GENERIC; - - if (ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_BLT) - { - BltData.lpDD = ThisDest->lpLcl->lpGbl->lpDD; - BltData.Blt = ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.Blt; - - BltData.lpDDDestSurface = ThisDest->lpLcl; - BltData.lpDDSrcSurface = ThisSrc ? ThisSrc->lpLcl : 0; - BltData.dwFlags = dwFlags; - - if (rdst != NULL) - { - memmove (&BltData.rSrc, rdst, sizeof (RECTL)); - } - - if (rsrc != NULL) - { - memmove (&BltData.rDest, rsrc, sizeof (RECTL)); - } - - if (lpbltfx != NULL) - { - memmove (&BltData.bltFX, lpbltfx, sizeof (DDBLTFX)); - } - - DX_STUB_str("FIXME : Fill the BltData member dwRectCnt, dwROPFlags, IsClipped, prDestRects, rOrigDest, rOrigSrc before calling Blt\n"); - - /* FIXME - - // BltData.dwRectCnt - // BltData.dwROPFlags - // BltData.IsClipped - // BltData.prDestRects - // BltData.rOrigDest - // BltData.rOrigSrc - */ - - if (!DdResetVisrgn( ThisDest->lpLcl, NULL)) - { - return DDERR_NOGDI; - } - - if (BltData.Blt(&BltData) == DDHAL_DRIVER_HANDLED) - { - return BltData.ddRVal; - } - } + + mDdBlt.lpDDDestSurface = ThisDest->lpLcl->lpSurfMore->slist[0]; + if (!DdResetVisrgn( ThisDest->lpLcl->lpSurfMore->slist[0], NULL)) + { + // derr(L"DirectDrawImpl[%08x]::_clear DdResetVisrgn failed", this); + } + + ZeroMemory(&mDdBlt, sizeof(DDHAL_BLTDATA)); + ZeroMemory(&mDdBlt.bltFX, sizeof(DDBLTFX)); + mDdBlt.bltFX.dwSize = sizeof(DDBLTFX); + + mDdBlt.lpDD = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; + mDdBlt.Blt = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.Blt; + mDdBlt.lpDDDestSurface = ThisDest->lpLcl->lpSurfMore->slist[0]; + + ThisDest->lpLcl->lpSurfMore->slist[0]->hDC = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->hDC; // This->lpLcl->hWnd; + mDdBlt.rDest.top = 50; + mDdBlt.rDest.bottom = 100; + mDdBlt.rDest.left = 0; + mDdBlt.rDest.right = 100; + mDdBlt.lpDDSrcSurface = NULL; + mDdBlt.IsClipped = FALSE; + mDdBlt.bltFX.dwFillColor = 0xFFFF00; + mDdBlt.dwFlags = DDBLT_COLORFILL | DDBLT_WAIT; + + if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) + { + //printf("Fail to mDdBlt = DDHAL_DRIVER_HANDLED\n"); + return DDHAL_DRIVER_HANDLED; + } + + if (mDdBlt.ddRVal!=DD_OK) + { + //printf("Fail to mDdBlt mDdBlt.ddRVal = %d:%s\n",(int)mDdBlt.ddRVal,DDErrorString(mDdBlt.ddRVal)); + return mDdBlt.ddRVal; + } return DDERR_GENERIC; }

1 0

[fireball] 25133: - Improve debug output
by fireball＠svn.reactos.org 12 Dec '06

12 Dec '06

Author: fireball Date: Tue Dec 12 22:08:32 2006 New Revision: 25133 URL: http://svn.reactos.org/svn/reactos?rev=25133&view=rev Log: - Improve debug output Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Tue Dec 12 22:08:32 2006 @@ -854,7 +854,11 @@ QueryTable, &Context, NULL))) + { + DPRINT("VideoPortGetRegistryParameters could not find the " + "requested parameter\n"); return ERROR_INVALID_PARAMETER; + } if (IsParameterFileName) { @@ -876,15 +880,22 @@ IN PVOID ValueData, IN ULONG ValueLength) { - DPRINT("VideoPortSetRegistryParameters\n"); + VP_STATUS Status; + + DPRINT("VideoPortSetRegistryParameters ParameterName %S\n", ValueName); ASSERT_IRQL(PASSIVE_LEVEL); - return RtlWriteRegistryValue( + Status = RtlWriteRegistryValue( RTL_REGISTRY_ABSOLUTE, VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension)->RegistryPath.Buffer, ValueName, REG_BINARY, ValueData, ValueLength); + + if (Status != ERROR_SUCCESS) + DPRINT("VideoPortSetRegistryParameters error 0x%x\n", Status); + + return Status; } /*

1 0

[mbosma] 25132: Check if This and ThisSrc are NULL.
by mbosma＠svn.reactos.org 12 Dec '06

12 Dec '06

Author: mbosma Date: Tue Dec 12 21:54:50 2006 New Revision: 25132 URL: http://svn.reactos.org/svn/reactos?rev=25132&view=rev Log: Check if This and ThisSrc are NULL. Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/main/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Tue Dec 12 21:54:50 2006 @@ -109,7 +109,7 @@ } } } - return This->dwIntRefCnt; + return This ? This->dwIntRefCnt : 0; } /* Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Tue Dec 12 21:54:50 2006 @@ -86,7 +86,7 @@ BltData.Blt = ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.Blt; BltData.lpDDDestSurface = ThisDest->lpLcl; - BltData.lpDDSrcSurface = ThisSrc->lpLcl; + BltData.lpDDSrcSurface = ThisSrc ? ThisSrc->lpLcl : 0; BltData.dwFlags = dwFlags; if (rdst != NULL)

1 0

[greatlrd] 25131: remove fireball hack in changedisplay, do not hard code the display number, with this patch we are now extract the display number from the desktop and use it patch was wroten by me and janderwald. I was to lazy finish it so janderwald did finish it thanks janderwald.
by greatlrd＠svn.reactos.org 12 Dec '06

12 Dec '06

Author: greatlrd Date: Tue Dec 12 20:56:27 2006 New Revision: 25131 URL: http://svn.reactos.org/svn/reactos?rev=25131&view=rev Log: remove fireball hack in changedisplay, do not hard code the display number, with this patch we are now extract the display number from the desktop and use it patch was wroten by me and janderwald. I was to lazy finish it so janderwald did finish it thanks janderwald. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Dec 12 20:56:27 2006 @@ -2925,9 +2925,30 @@ /* Check if pDeviceName is NULL, we need to retrieve it */ if (pDeviceName == NULL) - { - /* FIXME: It is a hack, but there is no proper way right now */ - RtlInitUnicodeString(&InDeviceName, L"\\\\.\\DISPLAY1"); + { + WCHAR szBuffer[MAX_DRIVER_NAME]; + PDC DC; + PWINDOW_OBJECT Wnd=NULL; + HWND hWnd; + HDC hDC; + + hWnd = IntGetDesktopWindow(); + if (hWnd && !(Wnd = UserGetWindowObject(hWnd))) + { + return FALSE; + } + + hDC = (HDC)UserGetWindowDC(Wnd); + + DC = DC_LockDc(hDC); + if (NULL == DC) + { + return FALSE; + } + swprintf (szBuffer, L"\\\\.\\DISPLAY%lu", ((GDIDEVICE *)DC->GDIDevice)->DisplayNumber); + DC_UnlockDc(DC); + + RtlInitUnicodeString(&InDeviceName, szBuffer); pDeviceName = &InDeviceName; }

1 0

[mbosma] 25130: Make it a compile time choice, whether you want to use a clipper or not, because our ddraw does not support it yet.
by mbosma＠svn.reactos.org 12 Dec '06

12 Dec '06

Author: mbosma Date: Tue Dec 12 20:51:50 2006 New Revision: 25130 URL: http://svn.reactos.org/svn/reactos?rev=25130&view=rev Log: Make it a compile time choice, whether you want to use a clipper or not, because our ddraw does not support it yet. Modified: trunk/rosapps/demos/ddraw/main.cpp Modified: trunk/rosapps/demos/ddraw/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/ddraw/main.cpp?rev=2… ============================================================================== --- trunk/rosapps/demos/ddraw/main.cpp (original) +++ trunk/rosapps/demos/ddraw/main.cpp Tue Dec 12 20:51:50 2006 @@ -1,15 +1,15 @@ #include <windows.h> #include <ddraw.h> -LPDIRECTDRAW7 DirectDraw; -LPDIRECTDRAWSURFACE7 FrontBuffer; -LPDIRECTDRAWCLIPPER Clipper; +LPDIRECTDRAW7 DirectDraw = NULL; +LPDIRECTDRAWSURFACE7 FrontBuffer = NULL; +LPDIRECTDRAWCLIPPER Clipper = NULL; PCHAR DDErrorString (HRESULT hResult); LONG WINAPI WndProc (HWND hwnd, UINT message, UINT wParam, LONG lParam); bool Fullscreen, Running; - +//#define USE_CLIPPER bool Init (HWND hwnd) { @@ -69,6 +69,7 @@ return 0; } +#ifdef USE_CLIPPER // Set up the clipper OutputDebugString("=> DDraw->CreateClipper\n"); @@ -94,13 +95,16 @@ MessageBox(0,DDErrorString(hResult), "FrontBuffer->SetClipper", 0); return 0; } +#endif return true; } -void Draw (void) -{ - // Make the fronbuffer pink +void Draw (HWND hwnd) +{ + // Make the frontbuffer pink + RECT rect; + GetWindowRect(hwnd, &rect); // this is not necessary when clippper is used DDBLTFX ddbltfx; ddbltfx.dwSize = sizeof(DDBLTFX); @@ -108,8 +112,8 @@ OutputDebugString("=> Surface->Blt (DDBLT_COLORFILL)\n"); - FrontBuffer->Blt(NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); -} + FrontBuffer->Blt(&rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); +} void CleanUp (void) { @@ -158,7 +162,11 @@ HWND hwnd = CreateWindow("DDrawDemo", "ReactOS DirectDraw Demo", - Fullscreen ? WS_POPUP :WS_OVERLAPPEDWINDOW, +#ifdef USE_CLIPPER + Fullscreen ? WS_POPUP : WS_OVERLAPPEDWINDOW, +#else + WS_POPUP, +#endif CW_USEDEFAULT, CW_USEDEFAULT, 800, @@ -179,7 +187,7 @@ while (Running) { if(Fullscreen) - Draw(); + Draw(hwnd); if (PeekMessage(&msg,NULL,0,0,PM_REMOVE)) { @@ -203,7 +211,7 @@ case WM_PAINT: { if(!Fullscreen) - Draw(); + Draw(hwnd); } break; case WM_KEYDOWN:

1 0

[fireball] 25129: ChangeDisplaySettingsEx() can be called with NULL DeviceName. In this case, we should look it up, instead of BSODing. Right now, this case is fixed by substituting the value to a hardcoded one "\\.\DISPLAY1" in case of NULL and call is made to store the values in registry.
by fireball＠svn.reactos.org 12 Dec '06

12 Dec '06

Author: fireball Date: Tue Dec 12 15:18:17 2006 New Revision: 25129 URL: http://svn.reactos.org/svn/reactos?rev=25129&view=rev Log: ChangeDisplaySettingsEx() can be called with NULL DeviceName. In this case, we should look it up, instead of BSODing. Right now, this case is fixed by substituting the value to a hardcoded one "\\.\DISPLAY1" in case of NULL and call is made to store the values in registry. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Dec 12 15:18:17 2006 @@ -2914,6 +2914,7 @@ UNICODE_STRING DeviceName; UNICODE_STRING RegistryKey; + UNICODE_STRING InDeviceName; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE DevInstRegKey; ULONG NewValue; @@ -2921,6 +2922,14 @@ DPRINT1("set CDS_UPDATEREGISTRY \n"); dwflags &= ~CDS_UPDATEREGISTRY; + + /* Check if pDeviceName is NULL, we need to retrieve it */ + if (pDeviceName == NULL) + { + /* FIXME: It is a hack, but there is no proper way right now */ + RtlInitUnicodeString(&InDeviceName, L"\\\\.\\DISPLAY1"); + pDeviceName = &InDeviceName; + } Status = GetVideoDeviceName(&DeviceName, pDeviceName); if (!NT_SUCCESS(Status))

1 0

← Newer
1
2
3
4
5
6
7
8
...
17
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 2006