Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 32492: only get the last error code when it is needed
by cwittich＠svn.reactos.org 26 Feb '08

26 Feb '08

Author: cwittich Date: Tue Feb 26 17:04:35 2008 New Revision: 32492 URL: http://svn.reactos.org/svn/reactos?rev=32492&view=rev Log: only get the last error code when it is needed Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/tcps… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.c (original) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.c Tue Feb 26 17:04:35 2008 @@ -37,7 +37,7 @@ { #ifdef DEBUG DWORD eMsgLen; - DWORD ErrNum = GetLastError(); + DWORD ErrNum; LPTSTR lpvSysMsg; TCHAR MessageBuffer[512]; FILE *hLogFile = NULL; @@ -47,6 +47,7 @@ if (PrintErrorMsg) { + ErrNum = GetLastError(); eMsgLen = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, ErrNum,

1 0

[cwittich] 32491: fix formatting
by cwittich＠svn.reactos.org 26 Feb '08

26 Feb '08

Author: cwittich Date: Tue Feb 26 16:54:12 2008 New Revision: 32491 URL: http://svn.reactos.org/svn/reactos?rev=32491&view=rev Log: fix formatting Modified: trunk/reactos/base/services/tcpsvcs/skelserver.c Modified: trunk/reactos/base/services/tcpsvcs/skelserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/skel… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/skelserver.c (original) +++ trunk/reactos/base/services/tcpsvcs/skelserver.c Tue Feb 26 16:54:12 2008 @@ -59,53 +59,53 @@ while (!bShutDown) { - INT SelRet = 0; + INT SelRet = 0; - FD_ZERO(&ReadFDS); - FD_SET(ListeningSocket, &ReadFDS); + FD_ZERO(&ReadFDS); + FD_SET(ListeningSocket, &ReadFDS); - SelRet = select(0, &ReadFDS, NULL, NULL, &TimeVal); + SelRet = select(0, &ReadFDS, NULL, NULL, &TimeVal); if (SelRet == SOCKET_ERROR) { LogEvent(_T("select failed\n"), 0, TRUE); return; } - else if (SelRet > 0) - { - /* don't call FD_ISSET if bShutDown flag is set */ - if ((! bShutDown) || (FD_ISSET(ListeningSocket, &ReadFDS))) - { - Sock = accept(ListeningSocket, (SOCKADDR*)&Client, &nAddrSize); - if (Sock != INVALID_SOCKET) - { - _stprintf(buf, _T("Accepted connection to %s server from %s:%d\n"), - Name, inet_ntoa(Client.sin_addr), ntohs(Client.sin_port)); - LogEvent(buf, 0, FALSE); - _stprintf(buf, _T("Creating new thread for %s\n"), Name); - LogEvent(buf, 0, FALSE); + else if (SelRet > 0) + { + /* don't call FD_ISSET if bShutDown flag is set */ + if ((! bShutDown) || (FD_ISSET(ListeningSocket, &ReadFDS))) + { + Sock = accept(ListeningSocket, (SOCKADDR*)&Client, &nAddrSize); + if (Sock != INVALID_SOCKET) + { + _stprintf(buf, _T("Accepted connection to %s server from %s:%d\n"), + Name, inet_ntoa(Client.sin_addr), ntohs(Client.sin_port)); + LogEvent(buf, 0, FALSE); + _stprintf(buf, _T("Creating new thread for %s\n"), Name); + LogEvent(buf, 0, FALSE); - hThread = CreateThread(0, 0, Service, (void*)Sock, 0, &ThreadID); + hThread = CreateThread(0, 0, Service, (void*)Sock, 0, &ThreadID); - /* Check the return value for success. */ - if (hThread == NULL) - { - _stprintf(buf, _T("Failed to start worker thread for " - "the %s server....\n"), Name); - LogEvent(buf, 0, TRUE); - } - else - { - WaitForSingleObject(hThread, INFINITE); - CloseHandle(hThread); - } - } - else - { - LogEvent(_T("accept failed\n"), 0, TRUE); - return; - } - } - } + /* Check the return value for success. */ + if (hThread == NULL) + { + _stprintf(buf, _T("Failed to start worker thread for " + "the %s server....\n"), Name); + LogEvent(buf, 0, TRUE); + } + else + { + WaitForSingleObject(hThread, INFINITE); + CloseHandle(hThread); + } + } + else + { + LogEvent(_T("accept failed\n"), 0, TRUE); + return; + } + } + } } }

1 0

[cwittich] 32490: don't try to wait on a NULL handle don't try to close a NULL handle
by cwittich＠svn.reactos.org 26 Feb '08

26 Feb '08

Author: cwittich Date: Tue Feb 26 16:48:22 2008 New Revision: 32490 URL: http://svn.reactos.org/svn/reactos?rev=32490&view=rev Log: don't try to wait on a NULL handle don't try to close a NULL handle Modified: trunk/reactos/base/services/tcpsvcs/skelserver.c trunk/reactos/base/services/tcpsvcs/tcpsvcs.c Modified: trunk/reactos/base/services/tcpsvcs/skelserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/skel… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/skelserver.c (original) +++ trunk/reactos/base/services/tcpsvcs/skelserver.c Tue Feb 26 16:48:22 2008 @@ -93,10 +93,11 @@ "the %s server....\n"), Name); LogEvent(buf, 0, TRUE); } - - WaitForSingleObject(hThread, INFINITE); - - CloseHandle(hThread); + else + { + WaitForSingleObject(hThread, INFINITE); + CloseHandle(hThread); + } } else { Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/tcps… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.c (original) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.c Tue Feb 26 16:48:22 2008 @@ -239,7 +239,8 @@ for(i = 0; i < NUM_SERVICES; i++) { - CloseHandle(hThread[i]); + if (hThread[i] != NULL) + CloseHandle(hThread[i]); } LogEvent(_T("Detaching Winsock2"), 0, FALSE);

1 0

[hpoussin] 32489: Fix indentation, broken in r32487
by hpoussin＠svn.reactos.org 26 Feb '08

26 Feb '08

Author: hpoussin Date: Tue Feb 26 16:39:22 2008 New Revision: 32489 URL: http://svn.reactos.org/svn/reactos?rev=32489&view=rev Log: Fix indentation, broken in r32487 Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Tue Feb 26 16:39:22 2008 @@ -1740,8 +1740,8 @@ if (Status == STATUS_BUFFER_TOO_SMALL) { PnpEventSize += 0x400; - HeapFree(GetProcessHeap(), 0, PnpEvent); - PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize); + HeapFree(GetProcessHeap(), 0, PnpEvent); + PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize); if (PnpEvent == NULL) return ERROR_OUTOFMEMORY; continue;

1 0

[cwittich] 32488: fix some format strings
by cwittich＠svn.reactos.org 26 Feb '08

26 Feb '08

Author: cwittich Date: Tue Feb 26 16:09:41 2008 New Revision: 32488 URL: http://svn.reactos.org/svn/reactos?rev=32488&view=rev Log: fix some format strings Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c (original) +++ trunk/reactos/base/services/eventlog/eventlog.c Tue Feb 26 16:09:41 2008 @@ -332,7 +332,7 @@ DPRINT("EventType = EVENTLOG_AUDIT_FAILURE\n"); break; default: - DPRINT("EventType = %x\n"); + DPRINT("EventType = %d\n", pRec->EventType); } DPRINT("NumStrings = %d\n", pRec->NumStrings); Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c (original) +++ trunk/reactos/base/services/eventlog/file.c Tue Feb 26 16:09:41 2008 @@ -205,7 +205,7 @@ if (*pdwRecSize2 != dwRecSize) { - DPRINT1("Invalid size2 of record %d (%x) in %s\n", + DPRINT1("Invalid size2 of record %d (%x) in %S\n", dwRecordsNumber, *pdwRecSize2, LogFile->LogName); HeapFree(MyHeap, 0, RecBuf); break;

1 0

[cwittich] 32487: fix a possible memory leak
by cwittich＠svn.reactos.org 26 Feb '08

26 Feb '08

Author: cwittich Date: Tue Feb 26 15:52:59 2008 New Revision: 32487 URL: http://svn.reactos.org/svn/reactos?rev=32487&view=rev Log: fix a possible memory leak Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Tue Feb 26 15:52:59 2008 @@ -1740,7 +1740,8 @@ if (Status == STATUS_BUFFER_TOO_SMALL) { PnpEventSize += 0x400; - PnpEvent = HeapReAlloc(GetProcessHeap(), 0, PnpEvent, PnpEventSize); + HeapFree(GetProcessHeap(), 0, PnpEvent); + PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize); if (PnpEvent == NULL) return ERROR_OUTOFMEMORY; continue;

1 0

[dchapyshev] 32486: - Update Russian translation
by dchapyshev＠svn.reactos.org 26 Feb '08

26 Feb '08

Author: dchapyshev Date: Tue Feb 26 08:51:04 2008 New Revision: 32486 URL: http://svn.reactos.org/svn/reactos?rev=32486&view=rev Log: - Update Russian translation Modified: trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc Modified: trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc Tue Feb 26 08:51:04 2008 @@ -47,12 +47,12 @@ MENUITEM "Âûõîä\tAlt+F4", ID_FILE_EXIT END - POPUP "&Edit" + POPUP "&Ïðàâêà" BEGIN - MENUITEM "Copy\tCtrl+C", ID_EDIT_COPY - MENUITEM "Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM "Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY + MENUITEM "Âñòàâèòü\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "Edit Glyph...", ID_EDIT_GLYPH + MENUITEM "Èçìåíèòü ñèìâîë...", ID_EDIT_GLYPH END POPUP "&Îêíà" @@ -83,12 +83,12 @@ IDS_DOCNAME, "Øðèôò %1!u!" IDS_SAVEPROMPT, "Ôàéë ""%1"" áûë èçìåíåí è èçìåíåíèÿ íå áûëè ñîõðàíåíû.\n\nÑîõðàíèòü?" IDS_APPTITLE, "Ðåäàêòîð VGA-øðèôòîâ ReactOS" - IDS_CLOSEEDIT, "Please close all open Edit windows first!" + IDS_CLOSEEDIT, "Ïîæàëóéñòà, çàêðîéòå ñíà÷àëà âñå îòêðûòûå îêíà ðåäàêòèðîâàíèÿ!" IDS_TOOLTIP_NEW, "Íîâûé" IDS_TOOLTIP_OPEN, "Îòêðûòü" IDS_TOOLTIP_SAVE, "Ñîõðàíèòü" IDS_TOOLTIP_EDIT_GLYPH, "Ðåäàêòèðîâàòü ñèìâîë" - IDS_TOOLTIP_COPY, "Copy" - IDS_TOOLTIP_PASTE, "Paste" + IDS_TOOLTIP_COPY, "Êîïèðîâàòü" + IDS_TOOLTIP_PASTE, "Âñòàâèòü" END

1 0

[tkreuzer] 32485: - add BASEOBJECT to brush, palette, font and region structures- fix debug output
by tkreuzer＠svn.reactos.org 26 Feb '08

26 Feb '08

Author: tkreuzer Date: Tue Feb 26 04:00:34 2008 New Revision: 32485 URL: http://svn.reactos.org/svn/reactos?rev=32485&view=rev Log: - add BASEOBJECT to brush, palette, font and region structures- fix debug output Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/brush.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h Tue Feb 26 04:00:34 2008 @@ -23,10 +23,9 @@ typedef struct { -// HGDIOBJ hHmgr; -// PVOID pvEntry; -// ULONG lucExcLock; -// ULONG Tid; + /* Header for all gdi objects in the handle table. + Do not (re)move this. */ + BASEOBJECT BaseObject; ULONG ulStyle; HBITMAP hbmPattern; Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Feb 26 04:00:34 2008 @@ -35,6 +35,8 @@ /* The DC object structure */ typedef struct _DC { + /* Header for all gdi objects in the handle table. + Do not (re)move this. */ BASEOBJECT BaseObject; DHPDEV PDev; // <- GDIDEVICE.hPDev DHPDEV for device. Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h Tue Feb 26 04:00:34 2008 @@ -31,17 +31,18 @@ #define PAL_RGB16_565 0x00400000 // 16-bit RGB in 565 format #define PAL_GAMMACORRECTION 0x00800000 // Correct colors -typedef struct { +typedef struct +{ int shift; int scale; int max; } ColorShifts; -typedef struct _PALGDI { -// HGDIOBJ hHmgr; -// PVOID pvEntry; -// ULONG lucExcLock; -// ULONG Tid; +typedef struct _PALGDI +{ + /* Header for all gdi objects in the handle table. + Do not (re)move this. */ + BASEOBJECT BaseObject; PALOBJ PalObj; XLATEOBJ *logicalToSystem; @@ -79,4 +80,4 @@ PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID); -#endif /* _WIN32K_PALETTE_H */ +#endif /* not _WIN32K_PALETTE_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/region.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h Tue Feb 26 04:00:34 2008 @@ -4,26 +4,30 @@ #include "gdiobj.h" -/* Internal region data. Can't use RGNDATA structure because buffer is allocated statically */ -typedef struct _ROSRGNDATA { -// HGDIOBJ hHmgr; -// PVOID pvEntry; -// ULONG lucExcLock; -// ULONG Tid; +/* Type definitions ***********************************************************/ + +/* Internal region data. + Can't use RGNDATA structure because buffer is allocated statically */ +typedef struct _ROSRGNDATA +{ + /* Header for all gdi objects in the handle table. + Do not (re)move this. */ + BASEOBJECT BaseObject; RGNDATAHEADER rdh; PRECT Buffer; } ROSRGNDATA, *PROSRGNDATA, *LPROSRGNDATA; +/* Functions ******************************************************************/ + #define RGNDATA_FreeRgn(hRgn) GDIOBJ_FreeObj(GdiHandleTable, (HGDIOBJ)hRgn, GDI_OBJECT_TYPE_REGION) #define RGNDATA_LockRgn(hRgn) ((PROSRGNDATA)GDIOBJ_LockObj(GdiHandleTable, (HGDIOBJ)hRgn, GDI_OBJECT_TYPE_REGION)) #define RGNDATA_UnlockRgn(pRgn) GDIOBJ_UnlockObjByPtr(GdiHandleTable, pRgn) + HRGN FASTCALL RGNDATA_AllocRgn(INT n); BOOL INTERNAL_CALL RGNDATA_Cleanup(PVOID ObjectBody); - BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN ); HRGN FASTCALL GdiCreatePolyPolygonRgn(CONST PPOINT, CONST PINT, INT, INT ); -#endif - +#endif /* not __WIN32K_REGION_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h Tue Feb 26 04:00:34 2008 @@ -20,7 +20,7 @@ #define TO_SYS_PARTITION 0x1000 // // Extended STROBJ -// +// typedef struct _STRGDI { STROBJ StrObj; // Text string object header. @@ -51,12 +51,16 @@ INT cDefGlyphs; INT cNumFaceNameGlyphs; PVOID pacFaceNameGlyphs; - ULONG acFaceNameGlyphs[8]; + ULONG acFaceNameGlyphs[8]; } STRGDI, *PSTRGDI; /* GDI logical font object */ typedef struct { + /* Header for all gdi objects in the handle table. + Do not (re)move this. */ + BASEOBJECT BaseObject; + ENUMLOGFONTEXDVW logfont; //LOGFONTW logfont; FONTOBJ *Font; BOOLEAN Initialized; /* Don't reinitialize for each DC */ Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Tue Feb 26 04:00:34 2008 @@ -311,7 +311,7 @@ static void FASTCALL LockErrorDebugOutput(HGDIOBJ hObj, PGDI_TABLE_ENTRY Entry, LPSTR Function) { - if (Entry->KernelData == NULL) + if ((Entry->Type & GDI_ENTRY_BASETYPE_MASK) == 0) { DPRINT1("%s: Attempted to lock object 0x%x that is deleted!\n", Function, hObj); }

1 0

[greatlrd] 32484: implemet follow for the callback interface videoport in gdi32.dll/win32/gdi32/misc/gdientry.c DvpCreateVideoPort, DvpDestroyVideoPort, DvpFlipVideoPort Bugfix : DdGetDriverInfo for the videoport callback interface set the pUserDvdPort->dwFlags right 8not tested in windows yet) Bugfix : DdQueryDirectDrawObject forget two d3d* callbacks to setup propert to user mode.
by greatlrd＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: greatlrd Date: Tue Feb 26 01:21:33 2008 New Revision: 32484 URL: http://svn.reactos.org/svn/reactos?rev=32484&view=rev Log: implemet follow for the callback interface videoport in gdi32.dll/win32/gdi32/misc/gdientry.c DvpCreateVideoPort, DvpDestroyVideoPort, DvpFlipVideoPort Bugfix : DdGetDriverInfo for the videoport callback interface set the pUserDvdPort->dwFlags right 8not tested in windows yet) Bugfix : DdQueryDirectDrawObject forget two d3d* callbacks to setup propert to user mode. Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Tue Feb 26 01:21:33 2008 @@ -484,6 +484,51 @@ (PDD_GETSCANLINEDATA)pGetScanLine); } + +/* + * @implemented + * + * DvpCreateVideoPort + */ +BOOL +WINAPI +DvpCreateVideoPort(LPDDHAL_CREATEVPORTDATA pDvdCreatePort) +{ + pDvdCreatePort->lpVideoPort->hDDVideoPort = + NtGdiDvpCreateVideoPort(GetDdHandle(pDvdCreatePort->lpDD->lpGbl->hDD), + (PDD_CREATEVPORTDATA) pDvdCreatePort); + + return TRUE; +} + +/* + * @implemented + * + * DvpCreateVideoPort + */ +DWORD +WINAPI +DvpDestroyVideoPort(LPDDHAL_DESTROYVPORTDATA pDvdDestoryPort) +{ + return NtGdiDvpDestroyVideoPort(pDvdDestoryPort->lpVideoPort->hDDVideoPort, (PDD_DESTROYVPORTDATA)pDvdDestoryPort); +} + +/* + * @implemented + * + * DvpCreateVideoPort + */ +DWORD +WINAPI +DvpFlipVideoPort(LPDDHAL_FLIPVPORTDATA pDvdPortFlip) +{ + return NtGdiDvpFlipVideoPort(pDvdPortFlip->lpVideoPort->hDDVideoPort, + (HANDLE)pDvdPortFlip->lpSurfCurr->hDDSurface, + (HANDLE)pDvdPortFlip->lpSurfTarg->hDDSurface, + (PDD_FLIPVPORTDATA) pDvdPortFlip); +} + + DWORD WINAPI DdGetDriverInfo(LPDDHAL_GETDRIVERINFODATA pData) @@ -519,13 +564,16 @@ /* Setup user out buffer and convert kmode callbacks to user mode */ pUserDvdPort->dwSize = DDVIDEOPORTCALLBACKSSIZE; - - // FIXME setup the flags - // pUserDvdPort->dwFlags = eax; + + pUserDvdPort->dwFlags = (pDvdPortInfo.dwFlags & ~(DDHAL_VPORT32_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | + DDHAL_VPORT32_DESTROY | DDHAL_VPORT32_UPDATE | DDHAL_VPORT32_WAITFORSYNC)) | + (DDHAL_VPORT32_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | + DDHAL_VPORT32_DESTROY | DDHAL_VPORT32_UPDATE); + pData->dwActualSize = DDVIDEOPORTCALLBACKSSIZE; - pUserDvdPort->CreateVideoPort = (LPDDHALVPORTCB_CREATEVIDEOPORT) NULL; // FIXME : DvpCreateVideoPort - pUserDvdPort->FlipVideoPort = (LPDDHALVPORTCB_FLIP) NULL; // FIXME : DvpFlipVideoPort - pUserDvdPort->DestroyVideoPort = (LPDDHALVPORTCB_DESTROYVPORT) NULL; // FIXME : DvpDestroyVideoPort + pUserDvdPort->CreateVideoPort = (LPDDHALVPORTCB_CREATEVIDEOPORT) DvpCreateVideoPort; + pUserDvdPort->FlipVideoPort = (LPDDHALVPORTCB_FLIP) DvpFlipVideoPort; + pUserDvdPort->DestroyVideoPort = (LPDDHALVPORTCB_DESTROYVPORT) DvpDestroyVideoPort; pUserDvdPort->UpdateVideoPort = (LPDDHALVPORTCB_UPDATE) NULL; // FIXME : DvpUpdateVideoPort if (pDvdPort.CanCreateVideoPort) @@ -1120,7 +1168,7 @@ if ( D3dBufferCallbacks.DestroyD3DBuffer ) { - pD3dBufferCallbacks->DestroyExecuteBuffer = (LPDDHALEXEBUFCB_DESTROYEXEBUF) NULL; //DdDestroyD3DBuffer; + pD3dBufferCallbacks->DestroyExecuteBuffer = (LPDDHALEXEBUFCB_DESTROYEXEBUF) DdDestroyD3DBuffer; } if ( D3dBufferCallbacks.LockD3DBuffer ) @@ -1130,7 +1178,7 @@ if ( D3dBufferCallbacks.UnlockD3DBuffer ) { - pD3dBufferCallbacks->UnlockExecuteBuffer = (LPDDHALEXEBUFCB_UNLOCKEXEBUF) NULL; //DdUnlockD3D; + pD3dBufferCallbacks->UnlockExecuteBuffer = (LPDDHALEXEBUFCB_UNLOCKEXEBUF) DdUnlockD3D; } }

1 0

[cfinck] 32483: Don't return if no keyboard or mouse is present. Instead continue detecting the devices. The returns were replaced by INFO's for debug output. Fireball or hpoussin, please review if this fix is ok or if we need to add some more handling for these cases. See issue #2790 for more details.
by cfinck＠svn.reactos.org 25 Feb '08

25 Feb '08

Author: cfinck Date: Tue Feb 26 00:59:19 2008 New Revision: 32483 URL: http://svn.reactos.org/svn/reactos?rev=32483&view=rev Log: Don't return if no keyboard or mouse is present. Instead continue detecting the devices. The returns were replaced by INFO's for debug output. Fireball or hpoussin, please review if this fix is ok or if we need to add some more handling for these cases. See issue #2790 for more details. Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c Tue Feb 26 00:59:19 2008 @@ -398,10 +398,12 @@ } TRACE_(I8042PRT, "Detecting keyboard\n"); if (!i8042DetectKeyboard(DeviceExtension)) - return STATUS_UNSUCCESSFUL; + INFO_(I8042PRT, "No keyboard detected!\n"); + TRACE_(I8042PRT, "Detecting mouse\n"); if (!i8042DetectMouse(DeviceExtension)) - return STATUS_UNSUCCESSFUL; + INFO_(I8042PRT, "No mouse detected!\n"); + INFO_(I8042PRT, "Keyboard present: %s\n", DeviceExtension->Flags & KEYBOARD_PRESENT ? "YES" : "NO"); INFO_(I8042PRT, "Mouse present : %s\n", DeviceExtension->Flags & MOUSE_PRESENT ? "YES" : "NO"); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs