Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[greatlrd] 19023: Filling in two more member, and they should be using when u create a new dc with CreateDCA

by greatlrd＠svn.reactos.com

Filling in two more member, and they should be using when u create a new dc with CreateDCA Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-05 22:13:59 UTC (rev 19022) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-05 23:10:43 UTC (rev 19023) @@ -21,6 +21,14 @@ This->InitializeDraw = TRUE; + RtlZeroMemory(&This->DirectDrawGlobal, sizeof(DDRAWI_DIRECTDRAW_GBL)); + + + + /* cObsolete is undoc in msdn it being use in CreateDCA */ + RtlCopyMemory(&This->DirectDrawGlobal.cObsolete,&"DISPLAY",7); + RtlCopyMemory(&This->DirectDrawGlobal.cDriverName,&"DISPLAY",7); + /* Setup the lpExclusiveOwner struct in msdn this struct member is undoc I am using there name to figout which info it should be fild with My hardware drv does not support call to SetExusive so I can not

18 years, 10 months

[turner] 19022: Send Ctrl signals to child process correctly. We can now use CTRL+C to close programs in cmd!

by turner＠svn.reactos.com

Send Ctrl signals to child process correctly. We can now use CTRL+C to close programs in cmd! Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-11-05 22:03:47 UTC (rev 19021) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-11-05 22:13:59 UTC (rev 19022) @@ -469,11 +469,12 @@ NULL, NULL, TRUE, - CREATE_NEW_PROCESS_GROUP, + 0, /* CREATE_NEW_PROCESS_GROUP */ NULL, NULL, &stui, &prci)) + { if (IsConsoleProcess(prci.hProcess)) { @@ -1295,12 +1296,12 @@ ReadCommand (readline, CMDLINE_LENGTH); ip = readline; bEchoThisLine = FALSE; - bIsBatch = FALSE; + bIsBatch = FALSE; } - else - { - bIsBatch = TRUE; - } + else + { + bIsBatch = TRUE; + } /* skip leading blanks */ while ( _istspace(*ip) ) @@ -1426,20 +1427,33 @@ BOOL WINAPI BreakHandler (DWORD dwCtrlType) { + static BOOL SelfGenerated = FALSE; + if ((dwCtrlType != CTRL_C_EVENT) && (dwCtrlType != CTRL_BREAK_EVENT)) + { return FALSE; - + } + else + { + if(SelfGenerated) + { + SelfGenerated = FALSE; + return TRUE; + } + } + if (bChildProcessRunning == TRUE) { - GenerateConsoleCtrlEvent (CTRL_C_EVENT, - dwChildProcessId); + SelfGenerated = TRUE; + GenerateConsoleCtrlEvent (dwCtrlType, 0); return TRUE; } + bCtrlBreak = TRUE; /* FIXME: Handle batch files */ - /* FIXME: Print "^C" */ + //ConOutPrintf(_T("^C")); return TRUE;

18 years, 10 months

[hbirr] 19021: Use the share disposition to detect the direction of a pipe.

by hbirr＠svn.reactos.com

Use the share disposition to detect the direction of a pipe. Modified: trunk/reactos/drivers/fs/np/create.c Modified: trunk/reactos/lib/kernel32/file/npipe.c Modified: trunk/reactos/lib/kernel32/file/pipe.c _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-11-05 21:28:27 UTC (rev 19020) +++ trunk/reactos/drivers/fs/np/create.c 2005-11-05 22:03:47 UTC (rev 19021) @@ -329,6 +329,14 @@ Irp->IoStatus.Information = 0; + if (!(IoStack->Parameters.CreatePipe.ShareAccess & (FILE_SHARE_READ|FILE_SHARE_WRITE)) || + (IoStack->Parameters.CreatePipe.ShareAccess & ~(FILE_SHARE_READ|FILE_SHARE_WRITE))) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + Fcb = ExAllocatePool(NonPagedPool, sizeof(NPFS_FCB)); if (Fcb == NULL) { @@ -411,12 +419,23 @@ Pipe->WriteMode = Buffer->ReadMode; Pipe->ReadMode = Buffer->ReadMode; Pipe->CompletionMode = Buffer->CompletionMode; - Pipe->PipeConfiguration = IoStack->Parameters.CreatePipe.Options & 0x3; + switch (IoStack->Parameters.CreatePipe.ShareAccess & (FILE_SHARE_READ|FILE_SHARE_WRITE)) + { + case FILE_SHARE_READ: + Pipe->PipeConfiguration = FILE_PIPE_OUTBOUND; + break; + case FILE_SHARE_WRITE: + Pipe->PipeConfiguration = FILE_PIPE_INBOUND; + break; + case FILE_SHARE_READ|FILE_SHARE_WRITE: + Pipe->PipeConfiguration = FILE_PIPE_FULL_DUPLEX; + break; + } Pipe->MaximumInstances = Buffer->MaximumInstances; Pipe->CurrentInstances = 0; Pipe->TimeOut = Buffer->DefaultTimeout; - if (!(IoStack->Parameters.CreatePipe.Options & FILE_PIPE_OUTBOUND) || - IoStack->Parameters.CreatePipe.Options & FILE_PIPE_FULL_DUPLEX) + if (!(Pipe->PipeConfiguration & FILE_PIPE_OUTBOUND) || + Pipe->PipeConfiguration & FILE_PIPE_FULL_DUPLEX) { if (Buffer->InboundQuota == 0) { @@ -440,7 +459,7 @@ Pipe->InboundQuota = 0; } - if (IoStack->Parameters.CreatePipe.Options & (FILE_PIPE_FULL_DUPLEX|FILE_PIPE_OUTBOUND)) + if (Pipe->PipeConfiguration & (FILE_PIPE_FULL_DUPLEX|FILE_PIPE_OUTBOUND)) { if (Buffer->OutboundQuota == 0) { _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-11-05 21:28:27 UTC (rev 19020) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-11-05 22:03:47 UTC (rev 19021) @@ -123,27 +123,16 @@ if (!(dwOpenMode & FILE_FLAG_OVERLAPPED)) CreateOptions = CreateOptions | FILE_SYNCHRONOUS_IO_NONALERT; - switch (dwOpenMode & PIPE_ACCESS_DUPLEX) - { - case PIPE_ACCESS_INBOUND: - CreateOptions |= FILE_PIPE_INBOUND; - ShareAccess |= FILE_SHARE_WRITE; - DesiredAccess |= GENERIC_READ; - break; - - case PIPE_ACCESS_OUTBOUND: - CreateOptions |= FILE_PIPE_OUTBOUND; - ShareAccess |= FILE_SHARE_READ; - DesiredAccess |= GENERIC_WRITE; - break; - - case PIPE_ACCESS_DUPLEX: - CreateOptions |= FILE_PIPE_FULL_DUPLEX; - ShareAccess |= (FILE_SHARE_READ | FILE_SHARE_WRITE); - DesiredAccess |= (GENERIC_READ | GENERIC_WRITE); - break; - } - + if (dwOpenMode & PIPE_ACCESS_OUTBOUND) + { + ShareAccess |= FILE_SHARE_READ; + DesiredAccess |= GENERIC_WRITE; + } + if (dwOpenMode & PIPE_ACCESS_INBOUND) + { + ShareAccess |= FILE_SHARE_WRITE; + DesiredAccess |= GENERIC_READ; + } if (dwPipeMode & PIPE_TYPE_MESSAGE) WriteModeMessage = FILE_PIPE_MESSAGE_MODE; else _____ Modified: trunk/reactos/lib/kernel32/file/pipe.c --- trunk/reactos/lib/kernel32/file/pipe.c 2005-11-05 21:28:27 UTC (rev 19020) +++ trunk/reactos/lib/kernel32/file/pipe.c 2005-11-05 22:03:47 UTC (rev 19021) @@ -41,11 +41,11 @@ ULONG Attributes; PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; - DefaultTimeout.QuadPart = 300000000; /* 30 seconds */ + DefaultTimeout.QuadPart = -300000000; /* 30 seconds */ PipeId = (ULONG)InterlockedIncrement((LONG*)&ProcessPipeId); swprintf(Buffer, - L"\\Device\\NamedPipe\\Win32Pipes.%08x.%08x", + L"\\\\.\\PIPE\\Win32Pipes.%08x.%08x", NtCurrentTeb()->Cid.UniqueProcess, PipeId); RtlInitUnicodeString (&PipeName, @@ -73,7 +73,7 @@ FILE_GENERIC_READ |FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &ObjectAttributes, &StatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SHARE_WRITE, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, FALSE, @@ -93,8 +93,8 @@ FILE_GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &StatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) { NtClose(ReadPipeHandle);

18 years, 10 months

[hbirr] 19020: Creat the symbolic links case-insensitive.

by hbirr＠svn.reactos.com

Creat the symbolic links case-insensitive. Modified: trunk/reactos/subsys/smss/initdosdev.c _____ Modified: trunk/reactos/subsys/smss/initdosdev.c --- trunk/reactos/subsys/smss/initdosdev.c 2005-11-05 16:11:31 UTC (rev 19019) +++ trunk/reactos/subsys/smss/initdosdev.c 2005-11-05 21:28:27 UTC (rev 19020) @@ -67,7 +67,7 @@ /* create symbolic link */ InitializeObjectAttributes(&ObjectAttributes, &LinkName, - OBJ_PERMANENT, + OBJ_PERMANENT|OBJ_CASE_INSENSITIVE, NULL, NULL); Status = NtCreateSymbolicLinkObject(&LinkHandle,

18 years, 10 months

[ekohl] 19019: Reapply a modified r18883 patch (by Thomas Weidenmueller) that doesn't break named pipes.

by ekohl＠svn.reactos.com

Reapply a modified r18883 patch (by Thomas Weidenmueller) that doesn't break named pipes. Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-11-05 16:11:02 UTC (rev 19018) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-11-05 16:11:31 UTC (rev 19019) @@ -72,7 +72,6 @@ HANDLE PipeHandle; ACCESS_MASK DesiredAccess; ULONG CreateOptions; - ULONG CreateDisposition; ULONG WriteModeMessage; ULONG ReadModeMessage; ULONG NonBlocking; @@ -81,6 +80,12 @@ LARGE_INTEGER DefaultTimeOut; PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; + if (nMaxInstances == 0 || nMaxInstances > PIPE_UNLIMITED_INSTANCES) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + Result = RtlDosPathNameToNtPathName_U((LPWSTR)lpName, &NamedPipeName, NULL, @@ -108,78 +113,52 @@ NULL, SecurityDescriptor); - DesiredAccess = 0; + DesiredAccess = SYNCHRONIZE | (dwOpenMode & (WRITE_DAC | WRITE_OWNER | ACCESS_SYSTEM_SECURITY)); ShareAccess = 0; - CreateDisposition = FILE_OPEN_IF; CreateOptions = 0; + if (dwOpenMode & FILE_FLAG_WRITE_THROUGH) - { - CreateOptions = CreateOptions | FILE_WRITE_THROUGH; - } + CreateOptions = CreateOptions | FILE_WRITE_THROUGH; + if (!(dwOpenMode & FILE_FLAG_OVERLAPPED)) - { - CreateOptions = CreateOptions | FILE_SYNCHRONOUS_IO_NONALERT; - } - if (dwOpenMode & PIPE_ACCESS_DUPLEX) - { - CreateOptions = CreateOptions | FILE_PIPE_FULL_DUPLEX; - DesiredAccess |= (FILE_GENERIC_READ | FILE_GENERIC_WRITE); - } - else if (dwOpenMode & PIPE_ACCESS_INBOUND) - { - CreateOptions = CreateOptions | FILE_PIPE_INBOUND; - DesiredAccess |= FILE_GENERIC_READ; - } - else if (dwOpenMode & PIPE_ACCESS_OUTBOUND) - { - CreateOptions = CreateOptions | FILE_PIPE_OUTBOUND; - DesiredAccess |= FILE_GENERIC_WRITE; - } + CreateOptions = CreateOptions | FILE_SYNCHRONOUS_IO_NONALERT; - if (dwPipeMode & PIPE_TYPE_BYTE) - { - WriteModeMessage = FILE_PIPE_BYTE_STREAM_MODE; - } - else if (dwPipeMode & PIPE_TYPE_MESSAGE) - { - WriteModeMessage = FILE_PIPE_MESSAGE_MODE; - } + switch (dwOpenMode & PIPE_ACCESS_DUPLEX) + { + case PIPE_ACCESS_INBOUND: + CreateOptions |= FILE_PIPE_INBOUND; + ShareAccess |= FILE_SHARE_WRITE; + DesiredAccess |= GENERIC_READ; + break; + + case PIPE_ACCESS_OUTBOUND: + CreateOptions |= FILE_PIPE_OUTBOUND; + ShareAccess |= FILE_SHARE_READ; + DesiredAccess |= GENERIC_WRITE; + break; + + case PIPE_ACCESS_DUPLEX: + CreateOptions |= FILE_PIPE_FULL_DUPLEX; + ShareAccess |= (FILE_SHARE_READ | FILE_SHARE_WRITE); + DesiredAccess |= (GENERIC_READ | GENERIC_WRITE); + break; + } + + if (dwPipeMode & PIPE_TYPE_MESSAGE) + WriteModeMessage = FILE_PIPE_MESSAGE_MODE; else - { - WriteModeMessage = FILE_PIPE_BYTE_STREAM_MODE; - } + WriteModeMessage = FILE_PIPE_BYTE_STREAM_MODE; - if (dwPipeMode & PIPE_READMODE_BYTE) - { - ReadModeMessage = FILE_PIPE_BYTE_STREAM_MODE; - } - else if (dwPipeMode & PIPE_READMODE_MESSAGE) - { - ReadModeMessage = FILE_PIPE_MESSAGE_MODE; - } + if (dwPipeMode & PIPE_READMODE_MESSAGE) + ReadModeMessage = FILE_PIPE_MESSAGE_MODE; else - { - ReadModeMessage = FILE_PIPE_BYTE_STREAM_MODE; - } + ReadModeMessage = FILE_PIPE_BYTE_STREAM_MODE; - if (dwPipeMode & PIPE_WAIT) - { - NonBlocking = FILE_PIPE_QUEUE_OPERATION; - } - else if (dwPipeMode & PIPE_NOWAIT) - { - NonBlocking = FILE_PIPE_COMPLETE_OPERATION; - } + if (dwPipeMode & PIPE_NOWAIT) + NonBlocking = FILE_PIPE_COMPLETE_OPERATION; else - { - NonBlocking = FILE_PIPE_QUEUE_OPERATION; - } + NonBlocking = FILE_PIPE_QUEUE_OPERATION; - if (nMaxInstances >= PIPE_UNLIMITED_INSTANCES) - { - nMaxInstances = 0xFFFFFFFF; - } - DefaultTimeOut.QuadPart = nDefaultTimeOut * -10000LL; Status = NtCreateNamedPipeFile(&PipeHandle, @@ -187,7 +166,7 @@ &ObjectAttributes, &Iosb, ShareAccess, - CreateDisposition, + FILE_OPEN_IF, CreateOptions, WriteModeMessage, ReadModeMessage, @@ -371,7 +350,7 @@ /* * @implemented */ -BOOL +BOOL STDCALL SetNamedPipeHandleState(HANDLE hNamedPipe, LPDWORD lpMode, @@ -394,7 +373,7 @@ Settings.ReadMode = (*lpMode & PIPE_READMODE_MESSAGE) ? FILE_PIPE_MESSAGE_MODE: FILE_PIPE_BYTE_STREAM_MODE; - /* Send the changes to the Driver */ + /* Send the changes to the Driver */ Status = NtSetInformationFile(hNamedPipe, &Iosb, &Settings, @@ -406,7 +385,7 @@ return(FALSE); } } - + /* Check if the Collection count or Timeout are being changed */ if (lpMaxCollectionCount || lpCollectDataTimeout) { @@ -428,9 +407,9 @@ } } - /* Now set the new settings */ - RemoteSettings.MaximumCollectionCount = (lpMaxCollectionCount) ? - *lpMaxCollectionCount : + /* Now set the new settings */ + RemoteSettings.MaximumCollectionCount = (lpMaxCollectionCount) ? + *lpMaxCollectionCount : RemoteSettings.MaximumCollectionCount; if (lpCollectDataTimeout) {

18 years, 10 months

[ekohl] 19018: Reapply a modified r18883 patch (by Thomas Weidenmueller) that doesn't break named pipes.

by ekohl＠svn.reactos.com

Reapply a modified r18883 patch (by Thomas Weidenmueller) that doesn't break named pipes. Modified: trunk/reactos/lib/kernel32/file/pipe.c _____ Modified: trunk/reactos/lib/kernel32/file/pipe.c --- trunk/reactos/lib/kernel32/file/pipe.c 2005-11-05 16:08:41 UTC (rev 19017) +++ trunk/reactos/lib/kernel32/file/pipe.c 2005-11-05 16:11:02 UTC (rev 19018) @@ -59,6 +59,10 @@ Attributes |= OBJ_INHERIT; } + /* use default buffer size if desired */ + if (nSize == 0) + nSize = 0x1000; + InitializeObjectAttributes(&ObjectAttributes, &PipeName, Attributes, @@ -66,7 +70,7 @@ SecurityDescriptor); Status = NtCreateNamedPipeFile(&ReadPipeHandle, - FILE_GENERIC_READ, + FILE_GENERIC_READ |FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &ObjectAttributes, &StatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -86,10 +90,10 @@ } Status = NtOpenFile(&WritePipeHandle, - FILE_GENERIC_WRITE, + FILE_GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &StatusBlock, - 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) {

18 years, 10 months

[ekohl] 19017: Open pipe in 'passive' mode if the desired access right is FILE_READ_ATTRIBUTES.

by ekohl＠svn.reactos.com

Open pipe in 'passive' mode if the desired access right is FILE_READ_ATTRIBUTES. Modified: trunk/reactos/drivers/fs/np/create.c _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-11-05 15:32:23 UTC (rev 19016) +++ trunk/reactos/drivers/fs/np/create.c 2005-11-05 16:08:41 UTC (rev 19017) @@ -114,18 +114,20 @@ PNPFS_FCB ServerFcb = NULL; PNPFS_DEVICE_EXTENSION DeviceExt; BOOLEAN SpecialAccess; + ACCESS_MASK DesiredAccess; DPRINT("NpfsCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp); DeviceExt = (PNPFS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; IoStack = (PEXTENDED_IO_STACK_LOCATION)IoGetCurrentIrpStackLocation(Irp); FileObject = IoStack->FileObject; + DesiredAccess = IoStack->Parameters.CreatePipe.SecurityContext->DesiredAccess; DPRINT("FileObject %p\n", FileObject); DPRINT("FileName %wZ\n", &FileObject->FileName); Irp->IoStatus.Information = 0; - SpecialAccess = ((IoStack->Parameters.CreatePipe.ShareAccess & 3) == 3); + SpecialAccess = ((DesiredAccess & SPECIFIC_RIGHTS_ALL) == FILE_READ_ATTRIBUTES); if (SpecialAccess) { DPRINT("NpfsCreate() open client end for special use!\n");

18 years, 10 months

[greatlrd] 19016: Small hack for Getting monitor freq right.

by greatlrd＠svn.reactos.com

Small hack for Getting monitor freq right. Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c _____ Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c --- trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-11-05 15:05:31 UTC (rev 19015) +++ trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-11-05 15:32:23 UTC (rev 19016) @@ -77,7 +77,7 @@ This->More.dmiDDrawReserved7.wWidth = This->Global.wWidth; This->More.dmiDDrawReserved7.wHeight = This->Global.wHeight; This->More.dmiDDrawReserved7.wBPP = This->owner->Bpp; - //This->More.dmiDDrawReserved7.wRefreshRate = ; + This->More.dmiDDrawReserved7.wRefreshRate = This->owner->DirectDrawGlobal.dwMonitorFrequency; //This->More.dmiDDrawReserved7.wMonitorsAttachedToDesktop = 2; /* ToDo: fill ddsCapsEx */ @@ -86,7 +86,7 @@ This->Local.lpGbl = &This->Global; This->Local.lpSurfMore = &This->More; This->Local.ddsCaps.dwCaps = pDDSD2->ddsCaps.dwCaps; - This->Local.dwProcessId = GetCurrentProcessId(); + This->Local.dwProcessId = This->owner->ExclusiveOwner.dwProcessId; /* for the double pointer below */ This->pLocal[0] = &This->Local; _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-05 15:05:31 UTC (rev 19015) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-05 15:32:23 UTC (rev 19016) @@ -37,7 +37,7 @@ This->Height = GetDeviceCaps((HDC)This->DirectDrawGlobal.lpExclusiveOwner->hDC , VERTRES); This->Width = GetDeviceCaps((HDC)This->DirectDrawGlobal.lpExclusiveOwner->hDC , HORZRES); - This->Bpp = GetDeviceCaps((HDC)This->DirectDrawGlobal.lpExclusiveOwner->hDC , BITSPIXEL); + This->Bpp = GetDeviceCaps((HDC)This->DirectDrawGlobal.lpExclusiveOwner->hDC , BITSPIXEL); // call software first if((ret = Hal_DirectDraw_Initialize (iface)) != DD_OK) @@ -46,6 +46,10 @@ // ... then overwrite with hal if((ret = Hel_DirectDraw_Initialize (iface)) != DD_OK) return ret; + + /* Hack to set right freq */ + + This->DirectDrawGlobal.dwMonitorFrequency = GetDeviceCaps((HDC)This->DirectDrawGlobal.lpExclusiveOwner->hDC , VREFRESH); return DD_OK; }

18 years, 10 months

[greatlrd] 19015: Remove hwnd and hdc, so it being store to right struct.

by greatlrd＠svn.reactos.com

Remove hwnd and hdc, so it being store to right struct. Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-05 14:21:39 UTC (rev 19014) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-05 15:05:31 UTC (rev 19015) @@ -19,12 +19,9 @@ This->DirectDrawGlobal.lp16DD = &This->DirectDrawGlobal; /* get the object */ - if(!DdCreateDirectDrawObject (&This->DirectDrawGlobal, This->hdc)) + if(!DdCreateDirectDrawObject (&This->DirectDrawGlobal, (HDC)This->DirectDrawGlobal.lpExclusiveOwner->hDC )) return DDERR_INVALIDPARAMS; - - BOOL dummy; - DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy); - + /* alloc all the space */ This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDHAL_CALLBACKS)); @@ -267,12 +264,14 @@ This->HalInfo.GetDriverInfo(&DriverInfo); /* Get the ZPixelFormats */ + /* take off this it until we figout how lpexluisev should be fild in This->DirectDrawGlobal.lpZPixelFormats = (LPDDPIXELFORMAT) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDPIXELFORMAT) * This->DirectDrawGlobal.dwNumZPixelFormats); DriverInfo.guidInfo = GUID_ZPixelFormats; DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpZPixelFormats; DriverInfo.dwExpectedSize = sizeof(DDPIXELFORMAT); This->HalInfo.GetDriverInfo(&DriverInfo); + */ /* Setup some info from the callbacks we got */ DDHAL_GETAVAILDRIVERMEMORYDATA mem; _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-05 14:21:39 UTC (rev 19014) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-05 15:05:31 UTC (rev 19015) @@ -21,14 +21,23 @@ This->InitializeDraw = TRUE; - + /* Setup the lpExclusiveOwner struct in msdn this struct member is undoc + I am using there name to figout which info it should be fild with + My hardware drv does not support call to SetExusive so I can not + debug it see how it should be fild + */ + + This->DirectDrawGlobal.lpExclusiveOwner = &This->ExclusiveOwner; + memset(&This->ExclusiveOwner, 0, sizeof(DDRAWI_DIRECTDRAW_LCL)); - - // get the HDC - This->hdc = GetWindowDC(GetDesktopWindow()); - This->Height = GetDeviceCaps(This->hdc, VERTRES); - This->Width = GetDeviceCaps(This->hdc, HORZRES); - This->Bpp = GetDeviceCaps(This->hdc, BITSPIXEL); + This->DirectDrawGlobal.lpExclusiveOwner->dwProcessId = GetCurrentProcessId(); + This->DirectDrawGlobal.lpExclusiveOwner->hDC = ((ULONG_PTR)GetWindowDC(GetDesktopWindow())); + This->DirectDrawGlobal.lpExclusiveOwner->hWnd = ((ULONG_PTR)GetDesktopWindow()); + This->DirectDrawGlobal.lpExclusiveOwner->lpGbl = &This->DirectDrawGlobal; + + This->Height = GetDeviceCaps((HDC)This->DirectDrawGlobal.lpExclusiveOwner->hDC , VERTRES); + This->Width = GetDeviceCaps((HDC)This->DirectDrawGlobal.lpExclusiveOwner->hDC , HORZRES); + This->Bpp = GetDeviceCaps((HDC)This->DirectDrawGlobal.lpExclusiveOwner->hDC , BITSPIXEL); // call software first if((ret = Hal_DirectDraw_Initialize (iface)) != DD_OK) @@ -51,12 +60,9 @@ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; // check the parameters - if (This->cooperative_level == cooplevel && This->window == hwnd) + if ((This->cooperative_level == cooplevel) && ((HWND)This->DirectDrawGlobal.lpExclusiveOwner->hWnd == hwnd)) return DD_OK; - - if (This->window) - return DDERR_HWNDALREADYSET; - + if (This->cooperative_level) return DDERR_EXCLUSIVEMODEALREADYSET; @@ -67,8 +73,8 @@ return DDERR_INVALIDPARAMS; // set the data - This->window = hwnd; - This->hdc = GetDC(hwnd); + This->DirectDrawGlobal.lpExclusiveOwner->hWnd = (ULONG_PTR) hwnd; + This->DirectDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC(hwnd); This->cooperative_level = cooplevel; if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE) _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-11-05 14:21:39 UTC (rev 19014) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-11-05 15:05:31 UTC (rev 19015) @@ -14,23 +14,28 @@ typedef struct { + /* Setup the Vtbl COM table */ IDirectDraw7Vtbl* lpVtbl; IDirectDraw4Vtbl* lpVtbl_v4; IDirectDraw2Vtbl* lpVtbl_v2; IDirectDrawVtbl* lpVtbl_v1; + /* The main struct that contain all info from the HAL and HEL */ DDRAWI_DIRECTDRAW_GBL DirectDrawGlobal; + + /* ExclusiveOwner */ + DDRAWI_DIRECTDRAW_LCL ExclusiveOwner; + + /* MISC info that will be remove in futuer */ DDHAL_DDMISCELLANEOUSCALLBACKS Misc2Callback; DDHALINFO HalInfo; - - HWND window; - DWORD cooperative_level; - HDC hdc; + + DWORD cooperative_level; int Height, Width, Bpp; - GUID InGUID; BOOL InitializeDraw; + } IDirectDrawImpl; /******** Surface Object ********/

18 years, 10 months

[hpoussin] 19014: Add some debug messages, and disable them (#define NDEBUG)

by hpoussin＠svn.reactos.com

Add some debug messages, and disable them (#define NDEBUG) Modified: trunk/reactos/lib/netcfgx/netcfgx.c _____ Modified: trunk/reactos/lib/netcfgx/netcfgx.c --- trunk/reactos/lib/netcfgx/netcfgx.c 2005-11-05 11:51:30 UTC (rev 19013) +++ trunk/reactos/lib/netcfgx/netcfgx.c 2005-11-05 14:21:39 UTC (rev 19014) @@ -7,7 +7,7 @@ * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) */ -//#define NDEBUG +#define NDEBUG #include <debug.h> #include "netcfgx.h" @@ -21,7 +21,6 @@ IN HKEY hKey, IN PCWSTR ValueName, IN PCWSTR ValueToAppend) - { PWSTR Buffer = NULL; DWORD dwRegType; @@ -114,6 +113,8 @@ if (InstallFunction != DIF_INSTALLDEVICE) return ERROR_DI_DO_DEFAULT; + DPRINT("%lu %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); + /* Create a new UUID */ RpcStatus = UuidCreate(&Uuid); if (RpcStatus != RPC_S_OK && RpcStatus != RPC_S_UUID_LOCAL_ONLY) @@ -280,13 +281,22 @@ } rc = AppendStringToMultiSZ(hKey, L"Bind", DeviceName); if (rc != ERROR_SUCCESS) + { + DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); goto cleanup; + } rc = AppendStringToMultiSZ(hKey, L"Export", ExportName); if (rc != ERROR_SUCCESS) + { + DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); goto cleanup; + } rc = AppendStringToMultiSZ(hKey, L"Route", UuidString); if (rc != ERROR_SUCCESS) + { + DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); goto cleanup; + } rc = ERROR_SUCCESS; @@ -305,5 +315,8 @@ if (hConnectionKey != INVALID_HANDLE_VALUE) RegCloseKey(hConnectionKey); - return rc == ERROR_SUCCESS ? ERROR_DI_DO_DEFAULT : rc; + if (rc == ERROR_SUCCESS) + rc = ERROR_DI_DO_DEFAULT; + DPRINT("Returning 0x%lx\n", rc); + return rc; }

18 years, 10 months

← Newer
1
...
75
76
77
78
79
80
81
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005