Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[greatlrd] 14225: start add hardware interface to hal

by greatlrd＠svn.reactos.com

start add hardware interface to hal we now map the hal to directdraw follow api are implement in the ddraw for hal but all hal api are not implement in the kernel if you got louky it maby working with nvida driver now. untested yet. Modified: trunk/reactos/lib/ddraw/ddraw_hal.c _____ Modified: trunk/reactos/lib/ddraw/ddraw_hal.c --- trunk/reactos/lib/ddraw/ddraw_hal.c 2005-03-20 17:22:24 UTC (rev 14224) +++ trunk/reactos/lib/ddraw/ddraw_hal.c 2005-03-20 17:24:11 UTC (rev 14225) @@ -37,9 +37,9 @@ This->create_primary = HAL_DirectDraw_create_primary; This->create_backbuffer = HAL_DirectDraw_create_backbuffer; - This->create_texture = HAL_DirectDraw_create_texture; + This->create_texture = HAL_DirectDraw_create_texture; - ICOM_INIT_INTERFACE(This, IDirectDraw7, HAL_DirectDraw_VTable); + // ICOM_INIT_INTERFACE(This, IDirectDraw7, HAL_DirectDraw_VTable); return S_OK; } @@ -290,7 +290,8 @@ { HRESULT hr; - IDirectDrawImpl* This; + IDirectDrawImpl* This; + HDC desktop; /* This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -312,9 +313,15 @@ hr = HAL_DirectDraw_Construct(This, ex); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, This); - else - *pIface = ICOM_INTERFACE(This, IDirectDraw7); + else *pIface = ICOM_INTERFACE(This, IDirectDraw7); + /* create a scaner that check which driver we should get the HDC from */ + /* for now we always asume it is the active dirver that should be use. */ + + desktop = GetWindowDC(GetDesktopWindow()); + *pIface = OsThunkDdCreateDirectDrawObject(desktop); + if (pIface == NULL) hr == DDERR_NODIRECTDRAWHW; + return hr; }

19 years, 6 months

[gdalsnes] 14224: init StaticUnicodeString

by gdalsnes＠svn.reactos.com

init StaticUnicodeString Modified: trunk/reactos/lib/ntdll/ldr/utils.c _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-03-20 15:54:22 UTC (rev 14223) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-03-20 17:22:24 UTC (rev 14224) @@ -186,9 +186,14 @@ PTLS_DATA TlsInfo; PVOID TlsData; ULONG i; - + PTEB Teb = NtCurrentTeb(); + DPRINT("LdrpInitializeTlsForThread() called for %wZ\n", &ExeModule->BaseDllName); + Teb->StaticUnicodeString.Length = 0; + Teb->StaticUnicodeString.MaximumLength = sizeof(Teb->StaticUnicodeBuffer); + Teb->StaticUnicodeString.Buffer = Teb->StaticUnicodeBuffer; + if (LdrpTlsCount > 0) { TlsPointers = RtlAllocateHeap(RtlGetProcessHeap(), @@ -201,7 +206,7 @@ } TlsData = (PVOID)TlsPointers + LdrpTlsCount * sizeof(PVOID); - NtCurrentTeb()->ThreadLocalStoragePointer = TlsPointers; + Teb->ThreadLocalStoragePointer = TlsPointers; TlsInfo = LdrpTlsArray; for (i = 0; i < LdrpTlsCount; i++, TlsInfo++)

19 years, 6 months

[weiden] 14223: - fixed access rights and shared access checks in IoSetShareAccess()

by weiden＠svn.reactos.com

- fixed access rights and shared access checks in IoSetShareAccess() - remove obsolete checks in IoCheckShareAccess() and IoUpdateShareAccess() to simplify them Modified: trunk/reactos/ntoskrnl/io/share.c _____ Modified: trunk/reactos/ntoskrnl/io/share.c --- trunk/reactos/ntoskrnl/io/share.c 2005-03-20 13:53:54 UTC (rev 14222) +++ trunk/reactos/ntoskrnl/io/share.c 2005-03-20 15:54:22 UTC (rev 14223) @@ -22,44 +22,21 @@ IoUpdateShareAccess(PFILE_OBJECT FileObject, PSHARE_ACCESS ShareAccess) { - if ((FileObject->ReadAccess == FALSE) && - (FileObject->WriteAccess == FALSE) && - (FileObject->DeleteAccess == FALSE)) + PAGED_CODE(); + + if (FileObject->ReadAccess || + FileObject->WriteAccess || + FileObject->DeleteAccess) { - return; - } + ShareAccess->OpenCount++; - ShareAccess->OpenCount++; - - if (FileObject->ReadAccess == TRUE) - { - ShareAccess->Readers++; + ShareAccess->Readers += FileObject->ReadAccess; + ShareAccess->Writers += FileObject->WriteAccess; + ShareAccess->Deleters += FileObject->DeleteAccess; + ShareAccess->SharedRead += FileObject->SharedRead; + ShareAccess->SharedWrite += FileObject->SharedWrite; + ShareAccess->SharedDelete += FileObject->SharedDelete; } - - if (FileObject->WriteAccess == TRUE) - { - ShareAccess->Writers++; - } - - if (FileObject->DeleteAccess == TRUE) - { - ShareAccess->Deleters++; - } - - if (FileObject->SharedRead == TRUE) - { - ShareAccess->SharedRead++; - } - - if (FileObject->SharedWrite == TRUE) - { - ShareAccess->SharedWrite++; - } - - if (FileObject->SharedDelete == TRUE) - { - ShareAccess->SharedDelete++; - } } @@ -79,87 +56,50 @@ BOOLEAN SharedRead; BOOLEAN SharedWrite; BOOLEAN SharedDelete; + + PAGED_CODE(); - ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)); - WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)); - DeleteAccess = (DesiredAccess & DELETE); + ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; + WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; + DeleteAccess = (DesiredAccess & DELETE) != 0; FileObject->ReadAccess = ReadAccess; FileObject->WriteAccess = WriteAccess; FileObject->DeleteAccess = DeleteAccess; - if (!ReadAccess && !WriteAccess && !DeleteAccess) + if (ReadAccess || WriteAccess || DeleteAccess) { - return(STATUS_SUCCESS); - } + SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; + SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; + SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; - SharedRead = (DesiredShareAccess & FILE_SHARE_READ); - SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE); - SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE); + FileObject->SharedRead = SharedRead; + FileObject->SharedWrite = SharedWrite; + FileObject->SharedDelete = SharedDelete; - FileObject->SharedRead = SharedRead; - FileObject->SharedWrite = SharedWrite; - FileObject->SharedDelete = SharedDelete; + if ((ReadAccess && (ShareAccess->SharedRead < ShareAccess->OpenCount)) || + (WriteAccess && (ShareAccess->SharedWrite < ShareAccess->OpenCount)) || + (DeleteAccess && (ShareAccess->SharedDelete < ShareAccess->OpenCount)) || + ((ShareAccess->Readers != 0) && !SharedRead) || + ((ShareAccess->Writers != 0) && !SharedWrite) || + ((ShareAccess->Deleters != 0) && !SharedDelete)) + { + return(STATUS_SHARING_VIOLATION); + } - if (ReadAccess) - { - if (ShareAccess->SharedRead < ShareAccess->OpenCount) - return(STATUS_SHARING_VIOLATION); - } + if (Update) + { + ShareAccess->OpenCount++; - if (WriteAccess) - { - if (ShareAccess->SharedWrite < ShareAccess->OpenCount) - return(STATUS_SHARING_VIOLATION); + ShareAccess->Readers += ReadAccess; + ShareAccess->Writers += WriteAccess; + ShareAccess->Deleters += DeleteAccess; + ShareAccess->SharedRead += SharedRead; + ShareAccess->SharedWrite += SharedWrite; + ShareAccess->SharedDelete += SharedDelete; + } } - if (DeleteAccess) - { - if (ShareAccess->SharedDelete < ShareAccess->OpenCount) - return(STATUS_SHARING_VIOLATION); - } - - if (ShareAccess->Readers != 0) - { - if (SharedRead == FALSE) - return(STATUS_SHARING_VIOLATION); - } - - if (ShareAccess->Writers != 0) - { - if (SharedWrite == FALSE) - return(STATUS_SHARING_VIOLATION); - } - - if (ShareAccess->Deleters != 0) - { - if (SharedDelete == FALSE) - return(STATUS_SHARING_VIOLATION); - } - - if (Update == TRUE) - { - ShareAccess->OpenCount++; - - if (ReadAccess == TRUE) - ShareAccess->Readers++; - - if (WriteAccess == TRUE) - ShareAccess->Writers++; - - if (DeleteAccess == TRUE) - ShareAccess->Deleters++; - - if (SharedRead == TRUE) - ShareAccess->SharedRead++; - - if (SharedWrite == TRUE) - ShareAccess->SharedWrite++; - - if (SharedDelete == TRUE) - ShareAccess->SharedDelete++; - } - return(STATUS_SUCCESS); } @@ -171,44 +111,21 @@ IoRemoveShareAccess(IN PFILE_OBJECT FileObject, IN PSHARE_ACCESS ShareAccess) { - if ((FileObject->ReadAccess == FALSE) && - (FileObject->WriteAccess == FALSE) && - (FileObject->DeleteAccess == FALSE)) - { - return; - } + PAGED_CODE(); - ShareAccess->OpenCount--; - - if (FileObject->ReadAccess == TRUE) + if (FileObject->ReadAccess || + FileObject->WriteAccess || + FileObject->DeleteAccess) { - ShareAccess->Readers--; - } + ShareAccess->OpenCount--; - if (FileObject->WriteAccess == TRUE) - { - ShareAccess->Writers--; + ShareAccess->Readers -= FileObject->ReadAccess; + ShareAccess->Writers -= FileObject->WriteAccess; + ShareAccess->Deleters -= FileObject->DeleteAccess; + ShareAccess->SharedRead -= FileObject->SharedRead; + ShareAccess->SharedWrite -= FileObject->SharedWrite; + ShareAccess->SharedDelete -= FileObject->SharedDelete; } - - if (FileObject->DeleteAccess == TRUE) - { - ShareAccess->Deleters--; - } - - if (FileObject->SharedRead == TRUE) - { - ShareAccess->SharedRead--; - } - - if (FileObject->SharedWrite == TRUE) - { - ShareAccess->SharedWrite--; - } - - if (FileObject->SharedDelete == TRUE) - { - ShareAccess->SharedDelete--; - } } @@ -227,10 +144,12 @@ BOOLEAN SharedRead; BOOLEAN SharedWrite; BOOLEAN SharedDelete; + + PAGED_CODE(); - ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)); - WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)); - DeleteAccess = (DesiredAccess & DELETE); + ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; + WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; + DeleteAccess = (DesiredAccess & DELETE) != 0; FileObject->ReadAccess = ReadAccess; FileObject->WriteAccess = WriteAccess; @@ -238,10 +157,6 @@ if (!ReadAccess && !WriteAccess && !DeleteAccess) { - FileObject->SharedRead = FALSE; - FileObject->SharedWrite = FALSE; - FileObject->SharedDelete = FALSE; - ShareAccess->OpenCount = 0; ShareAccess->Readers = 0; ShareAccess->Writers = 0; @@ -253,22 +168,22 @@ } else { - SharedRead = (DesiredShareAccess & FILE_SHARE_READ); - SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE); - SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE); + SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; + SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; + SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; FileObject->SharedRead = SharedRead; FileObject->SharedWrite = SharedWrite; FileObject->SharedDelete = SharedDelete; ShareAccess->OpenCount = 1; - ShareAccess->Readers = (ReadAccess) ? 1 : 0; - ShareAccess->Writers = (WriteAccess) ? 1 : 0; - ShareAccess->Deleters = (DeleteAccess) ? 1 : 0; + ShareAccess->Readers = ReadAccess; + ShareAccess->Writers = WriteAccess; + ShareAccess->Deleters = DeleteAccess; - ShareAccess->SharedRead = (SharedRead) ? 1 : 0; - ShareAccess->SharedWrite = (SharedWrite) ? 1 : 0; - ShareAccess->SharedDelete = (SharedDelete) ? 1 : 0; + ShareAccess->SharedRead = SharedRead; + ShareAccess->SharedWrite = SharedWrite; + ShareAccess->SharedDelete = SharedDelete; } } @@ -346,7 +261,7 @@ Status = ObReferenceObjectByPointer(FileObject, - FILE_WRITE_ATTRIBUTES, + 0, /* FIXME - depends on the information class */ IoFileObjectType, KernelMode); if (!NT_SUCCESS(Status))

19 years, 6 months

[weiden] 14222: - only mask out the generic rights flags in RtlMapGenericMask()

by weiden＠svn.reactos.com

- only mask out the generic rights flags in RtlMapGenericMask() - only deny access when requested rights can't be granted in IoCheckDesiredAccess() Modified: trunk/reactos/ntoskrnl/io/share.c Modified: trunk/reactos/ntoskrnl/se/access.c _____ Modified: trunk/reactos/ntoskrnl/io/share.c --- trunk/reactos/ntoskrnl/io/share.c 2005-03-20 13:32:27 UTC (rev 14221) +++ trunk/reactos/ntoskrnl/io/share.c 2005-03-20 13:53:54 UTC (rev 14222) @@ -280,12 +280,15 @@ IoCheckDesiredAccess(IN OUT PACCESS_MASK DesiredAccess, IN ACCESS_MASK GrantedAccess) { + PAGED_CODE(); + RtlMapGenericMask(DesiredAccess, IoFileObjectType->Mapping); - if ((*DesiredAccess & GrantedAccess) != GrantedAccess) - return(STATUS_ACCESS_DENIED); - return(STATUS_SUCCESS); + if ((~(*DesiredAccess) & GrantedAccess) != 0) + return STATUS_ACCESS_DENIED; + else + return STATUS_SUCCESS; } _____ Modified: trunk/reactos/ntoskrnl/se/access.c --- trunk/reactos/ntoskrnl/se/access.c 2005-03-20 13:32:27 UTC (rev 14221) +++ trunk/reactos/ntoskrnl/se/access.c 2005-03-20 13:53:54 UTC (rev 14222) @@ -72,7 +72,7 @@ if (*AccessMask & GENERIC_ALL) *AccessMask |= GenericMapping->GenericAll; - *AccessMask &= 0x0FFFFFFF; + *AccessMask &= ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } /*

19 years, 6 months

[greatlrd] 14221: this waring break the head for me

by greatlrd＠svn.reactos.com

this waring break the head for me pnp.c:141: warning: 'Affinity' might be used uninitialized in this function {standard input}: Assembler messages: initialized it with Affinity = 0; Modified: trunk/reactos/drivers/dd/serial/pnp.c _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-03-20 13:10:57 UTC (rev 14220) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-03-20 13:32:27 UTC (rev 14221) @@ -138,7 +138,7 @@ ULONG Vector = 0; ULONG i, j; KIRQL Dirql; - KAFFINITY Affinity; + KAFFINITY Affinity = 0; KINTERRUPT_MODE InterruptMode = Latched; BOOLEAN ShareInterrupt = TRUE; OBJECT_ATTRIBUTES objectAttributes;

19 years, 6 months

[navaraf] 14220: Fix a cut & paste error.

by navaraf＠svn.reactos.com

Fix a cut & paste error. Modified: trunk/reactos/lib/kernel32/file/dir.c _____ Modified: trunk/reactos/lib/kernel32/file/dir.c --- trunk/reactos/lib/kernel32/file/dir.c 2005-03-20 13:10:11 UTC (rev 14219) +++ trunk/reactos/lib/kernel32/file/dir.c 2005-03-20 13:10:57 UTC (rev 14220) @@ -54,7 +54,7 @@ PWCHAR NewDirectoryW = NULL; BOOL ret; - if (TemplateDirectoryW != NULL && + if (lpTemplateDirectory != NULL && !(TemplateDirectoryW = FilenameA2W(lpTemplateDirectory, FALSE))) return FALSE;

19 years, 6 months

[navaraf] 14219: Allow the lpTemplateDirectory parameter to be NULL in CreateDirectoryExA.

by navaraf＠svn.reactos.com

Allow the lpTemplateDirectory parameter to be NULL in CreateDirectoryExA. Modified: trunk/reactos/lib/kernel32/file/dir.c _____ Modified: trunk/reactos/lib/kernel32/file/dir.c --- trunk/reactos/lib/kernel32/file/dir.c 2005-03-20 13:06:11 UTC (rev 14218) +++ trunk/reactos/lib/kernel32/file/dir.c 2005-03-20 13:10:11 UTC (rev 14219) @@ -50,11 +50,12 @@ LPCSTR lpNewDirectory, LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - PWCHAR TemplateDirectoryW; - PWCHAR NewDirectoryW; + PWCHAR TemplateDirectoryW = NULL; + PWCHAR NewDirectoryW = NULL; BOOL ret; - if (!(TemplateDirectoryW = FilenameA2W(lpTemplateDirectory, FALSE))) + if (TemplateDirectoryW != NULL && + !(TemplateDirectoryW = FilenameA2W(lpTemplateDirectory, FALSE))) return FALSE; if (!(NewDirectoryW = FilenameA2W(lpNewDirectory, TRUE)))

19 years, 6 months

[ekohl] 14218: Improve error messages.

by ekohl＠svn.reactos.com

Improve error messages. Don't start counting the type_offset for each new fuction. It is a global offset. Use only basic types in type- and proc-strings (e.g. unsigned long -> long). Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-03-20 12:30:06 UTC (rev 14217) +++ trunk/reactos/tools/widl/ChangeLog 2005-03-20 13:06:11 UTC (rev 14218) @@ -1,5 +1,15 @@ ChangeLog +2005-03-20 ekohl + + tools/widl/client.c + tools/widl/server.c + +Improve error messages. +Don't start counting the type_offset for each new fuction. It is a global offset. +Use only basic types in type- and proc-strings (e.g. unsigned long -> long). + + 2005-03-13 ekohl tools/widl/server.c @@ -23,7 +33,6 @@ -Wall -Werror and fix warnings - 2005-03-13 ekohl tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-03-20 12:30:06 UTC (rev 14217) +++ trunk/reactos/tools/widl/client.c 2005-03-20 13:06:11 UTC (rev 14218) @@ -56,6 +56,25 @@ } +static unsigned char +get_base_type(unsigned char type) +{ + + switch (type) + { + case RPC_FC_USHORT: + type = RPC_FC_SHORT; + break; + + case RPC_FC_ULONG: + type = RPC_FC_LONG; + break; + } + + return type; +} + + static void write_procformatstring(type_t *iface) { func_t *func = iface->funcs; @@ -92,11 +111,12 @@ if (is_base_type(var->type)) { print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_<type> */\n", var->type->type); + print_client("0x%02x, /* FC_<type> */\n", get_base_type(var->type->type)); } else { - error("Unknown/unsupported type\n"); + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); return; } } @@ -120,7 +140,8 @@ } else { - error("Unknown/unsupported type\n"); + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); return; } } @@ -139,11 +160,12 @@ else if (is_base_type(var->type)) { print_client("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_<type> */\n", var->type->type); + print_client("0x%02x, /* FC_<type> */\n", get_base_type(var->type->type)); } else { - error("Unknown/unsupported type\n"); + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); return; } @@ -214,7 +236,7 @@ } } else - print_client("0x%02x, /* FC_<type> */\n", var->type->type); + print_client("0x%02x, /* FC_<type> */\n", get_base_type(var->type->type)); print_client("0x5c, /* FC_PAD */\n"); } } @@ -237,7 +259,7 @@ } -static void print_message_buffer_size(func_t *func) +static void print_message_buffer_size(func_t *func, unsigned int *type_offset) { unsigned int alignment; int size; @@ -247,7 +269,7 @@ int string_attr; int nothing_printed = 1; var_t *var; - unsigned int type_offset = 2; + unsigned int local_type_offset = *type_offset; print_client("_StubMsg.BufferLength ="); if (func->args) @@ -318,7 +340,8 @@ break; default: - error("Unknown/unsupported type!"); + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); return; } @@ -354,30 +377,28 @@ if (!out_attr && !in_attr) in_attr = 1; - if (!in_attr) - continue; + if (in_attr) + { + if (var->ptr_level == 1 && + string_attr && + (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + { + print_client("NdrConformantStringBufferSize(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset + 2); + nothing_printed = 1; + indent--; + } + } - if (var->ptr_level == 1 && - string_attr && - (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + /* calculate the next type offset */ + if (var->ptr_level == 1) { - print_client("NdrConformantStringBufferSize(\n"); - indent++; - print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); - print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", type_offset + 2); - nothing_printed = 1; - indent--; + local_type_offset += 4; } - - /* calculate the next type offset */ - if (var->ptr_level == 1) - { - if (is_base_type(var->type)) - { - type_offset += 4; - } - } } if (nothing_printed) @@ -386,9 +407,8 @@ } -static void marshall_in_arguments(func_t *func) +static void marshall_in_arguments(func_t *func, unsigned int *type_offset) { - unsigned int type_offset = 2; unsigned int alignment; unsigned int size; unsigned int last_size = 0; @@ -412,96 +432,95 @@ if (!out_attr && !in_attr) in_attr = 1; - if (!in_attr) - continue; - - if (var->ptr_level > 1) + if (in_attr) { - error("Function '%s' argument '%s': Pointer level %d not supported!\n", - func->def->name, var->name, var->ptr_level); - return; - } + if (var->ptr_level > 1) + { + error("Function '%s' argument '%s': Pointer level %d not supported!\n", + func->def->name, var->name, var->ptr_level); + return; + } - if (var->ptr_level == 1 && - string_attr && - (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) - { - print_client("NdrConformantStringMarshall(\n"); - indent++; - print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); - print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", type_offset + 2); - indent--; - fprintf(client, "\n"); - } - else - { - alignment = 0; - switch (var->type->type) + if (var->ptr_level == 1 && + string_attr && + (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - size = 1; + print_client("NdrConformantStringMarshall(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", *type_offset + 2); + indent--; + fprintf(client, "\n"); + } + else + { alignment = 0; - break; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + alignment = 0; + break; - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - if (last_size > 0 && last_size < 2) - alignment = (2 - last_size); - break; + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size > 0 && last_size < 2) + alignment = (2 - last_size); + break; - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - size = 4; - if (last_size > 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + if (last_size > 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - if (last_size > 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size > 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_IGNORE: - size = 0; - break; + case RPC_FC_IGNORE: + size = 0; + break; - default: - error("Unknown/unsupported type!"); - } + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; + } - if (size != 0) - { - if (alignment != 0) - print_client("_StubMsg.Buffer += %u;\n", alignment); + if (size != 0) + { + if (alignment != 0) + print_client("_StubMsg.Buffer += %u;\n", alignment); - print_client("*(("); - write_type(client, var->type, NULL, var->tname); - fprintf(client, " __RPC_FAR*)_StubMsg.Buffer)++ = "); - if (var->ptr_level == 1) - fprintf(client, "*"); - write_name(client, var); - fprintf(client, ";\n"); - fprintf(client, "\n"); + print_client("*(("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, " __RPC_FAR*)_StubMsg.Buffer)++ = "); + if (var->ptr_level == 1) + fprintf(client, "*"); + write_name(client, var); + fprintf(client, ";\n"); + fprintf(client, "\n"); - last_size = size; + last_size = size; + } } } /* calculate the next type offset */ if (var->ptr_level == 1) { - if (is_base_type(var->type)) - { - type_offset += 4; - } + *type_offset += 4; } } } @@ -574,7 +593,9 @@ break; default: - error("Unknown/unsupported type!"); + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; } if (size != 0) @@ -625,7 +646,9 @@ break; default: - error("Unknown/unsupported type!"); + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; } fprintf(client, "\n"); @@ -703,6 +726,7 @@ var_t* explicit_handle_var; int method_count = 0; unsigned int proc_offset = 0; + unsigned int type_offset = 2; while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) @@ -783,7 +807,7 @@ } /* emit the message buffer size */ - print_message_buffer_size(func); + print_message_buffer_size(func, &type_offset); print_client("NdrGetBuffer(\n"); indent++; @@ -797,7 +821,7 @@ fprintf(client, "\n"); /* marshal in arguments */ - marshall_in_arguments(func); + marshall_in_arguments(func, &type_offset); /* send/recieve message */ print_client("NdrSendReceive(\n"); _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-03-20 12:30:06 UTC (rev 14217) +++ trunk/reactos/tools/widl/server.c 2005-03-20 13:06:11 UTC (rev 14218) @@ -61,6 +61,25 @@ } +static unsigned char +get_base_type(unsigned char type) +{ + + switch (type) + { + case RPC_FC_USHORT: + type = RPC_FC_SHORT; + break; + + case RPC_FC_ULONG: + type = RPC_FC_LONG; + break; + } + + return type; +} + + static void write_procformatstring(type_t *iface) { func_t *func = iface->funcs; @@ -97,11 +116,12 @@ if (is_base_type(var->type)) { print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_<type> */\n", var->type->type); + print_server("0x%02x, /* FC_<type> */\n", get_base_type(var->type->type)); } else { - error("Unknown/unsupported type\n"); + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); return; } } @@ -125,7 +145,8 @@ } else { - error("Unknown/unsupported type\n"); + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); return; } } @@ -144,11 +165,12 @@ else if (is_base_type(var->type)) { print_server("0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_<type> */\n", var->type->type); + print_server("0x%02x, /* FC_<type> */\n", get_base_type(var->type->type)); } else { - error("Unknown/unsupported type\n"); + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); return; } @@ -219,7 +241,7 @@ } } else - print_server("0x%02x, /* FC_<type> */\n", var->type->type); + print_server("0x%02x, /* FC_<type> */\n", get_base_type(var->type->type)); print_server("0x5c, /* FC_PAD */\n"); } } @@ -299,7 +321,9 @@ break; default: - error("Unknown/unsupported type!"); + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; } if (last_size != -1) @@ -337,7 +361,8 @@ break; default: - error("Unknown/unsupported type: %s\n", func->def->type->name); + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, func->def->type->type); return; } @@ -364,9 +389,6 @@ if (!out_attr && !in_attr) in_attr = 1; - if (!in_attr) - continue; - if (var->ptr_level == 1 && string_attr && (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) @@ -411,9 +433,8 @@ } -static void unmarshall_in_arguments(func_t *func) +static void unmarshall_in_arguments(func_t *func, unsigned int *type_offset) { - unsigned int type_offset = 2; unsigned int alignment; unsigned int size; unsigned int last_size = 0; @@ -437,108 +458,107 @@ if (!out_attr && !in_attr) in_attr = 1; - if (!in_attr) - continue; - - if (var->ptr_level == 1 && - string_attr && - (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + if (in_attr) { - print_server("NdrConformantStringUnmarshall(\n"); - indent++; - print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_server("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); - print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", type_offset + 2); - print_server("(unsigned char)0);\n"); - indent--; - fprintf(server, "\n"); - } - else - { - alignment = 0; - switch (var->type->type) + if (var->ptr_level == 1 && + string_attr && + (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - size = 1; + print_server("NdrConformantStringUnmarshall(\n"); + indent++; + print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_server("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); + print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", *type_offset + 2); + print_server("(unsigned char)0);\n"); + indent--; + fprintf(server, "\n"); + } + else + { alignment = 0; - break; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + alignment = 0; + break; - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - if (last_size != 0 && last_size < 2) - alignment = (2 - last_size); - break; + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size != 0 && last_size < 2) + alignment = (2 - last_size); + break; - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - size = 4; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_IGNORE: - size = 0; - break; + case RPC_FC_IGNORE: + size = 0; + break; - default: - error("Unknown/unsupported type!"); - } + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; + } - if (size != 0) - { - if (alignment != 0) - print_server("_StubMsg.Buffer += %u;\n", alignment); + if (size != 0) + { + if (alignment != 0) + print_server("_StubMsg.Buffer += %u;\n", alignment); - if (var->ptr_level == 0) - { - print_server(""); - write_name(server, var); - fprintf(server, " = *(("); - write_type(server, var->type, NULL, var->tname); - fprintf(server, " __RPC_FAR*)_StubMsg.Buffer)++;\n"); - fprintf(server, "\n"); + if (var->ptr_level == 0) + { + print_server(""); + write_name(server, var); + fprintf(server, " = *(("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, " __RPC_FAR*)_StubMsg.Buffer)++;\n"); + fprintf(server, "\n"); + } + else if (var->ptr_level == 1) + { + print_server(""); + write_name(server, var); + fprintf(server, " = ("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, " __RPC_FAR*)_StubMsg.Buffer;\n"); + print_server("_StubMsg.Buffer += sizeof("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, ");\n"); + fprintf(server, "\n"); + } + else + { + error("Pointer level %d is not supported!\n", var->ptr_level); + return; + } + + last_size = size; } - else if (var->ptr_level == 1) - { - print_server(""); - write_name(server, var); - fprintf(server, " = ("); - write_type(server, var->type, NULL, var->tname); - fprintf(server, " __RPC_FAR*)_StubMsg.Buffer;\n"); - print_server("_StubMsg.Buffer += sizeof("); - write_type(server, var->type, NULL, var->tname); - fprintf(server, ");\n"); - fprintf(server, "\n"); - } - else - { - error("Pointer level %d is not supported!\n", var->ptr_level); - return; - } - - last_size = size; } } /* calculate the next type offset */ if (var->ptr_level == 1) { - if (is_base_type(var->type)) - { - type_offset += 4; - } + *type_offset += 4; } } } @@ -604,7 +624,9 @@ break; default: - error("Unknown/unsupported type!"); + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; } if (size != 0) @@ -660,7 +682,9 @@ break; default: - error("Unknown/unsupported type!"); + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; } fprintf(server, "\n"); @@ -704,6 +728,7 @@ var_t *var; var_t* explicit_handle_var; unsigned int proc_offset = 0; + unsigned int type_offset = 2; unsigned int i; int in_attr; int out_attr; @@ -822,7 +847,7 @@ indent -= 2; fprintf(server, "\n"); - unmarshall_in_arguments(func); + unmarshall_in_arguments(func, &type_offset); } print_server("if (_StubMsg.Buffer > _StubMsg.BufferEnd)\n");

19 years, 6 months

[navaraf] 14217: - Rename bitblt.c to more generic bitmap.c.

by navaraf＠svn.reactos.com

- Rename bitblt.c to more generic bitmap.c. - Normalize BITMAPINFO structure in CreateDIBSection before sending it to win32k. Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/lib/gdi32/include/precomp.h Modified: trunk/reactos/lib/gdi32/makefile Deleted: trunk/reactos/lib/gdi32/objects/bitblt.c Added: trunk/reactos/lib/gdi32/objects/bitmap.c Modified: trunk/reactos/lib/gdi32/objects/utils.c _____ Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2005-03-20 12:15:51 UTC (rev 14216) +++ trunk/reactos/lib/gdi32/gdi32.def 2005-03-20 12:30:06 UTC (rev 14217) @@ -58,7 +58,7 @@ CreateDCW@16 CreateDIBPatternBrush@8 CreateDIBPatternBrushPt@8 -CreateDIBSection@24=NtGdiCreateDIBSection@24 +CreateDIBSection@24 CreateDIBitmap@24=NtGdiCreateDIBitmap@24 CreateDiscardableBitmap@12=NtGdiCreateDiscardableBitmap@12 CreateEllipticRgn@16=NtGdiCreateEllipticRgn@16 _____ Modified: trunk/reactos/lib/gdi32/include/precomp.h --- trunk/reactos/lib/gdi32/include/precomp.h 2005-03-20 12:15:51 UTC (rev 14216) +++ trunk/reactos/lib/gdi32/include/precomp.h 2005-03-20 12:30:06 UTC (rev 14217) @@ -59,7 +59,7 @@ /* == BITMAP UTILITY FUNCTIONS ============================================== */ -BOOL STDCALL CalculateColorTableSize(LPBITMAPINFOHEADER BitmapInfoHeader, UINT *ColorSpec, UINT *ColorTableSize); -LPBITMAPINFO STDCALL ConvertBitmapInfo(LPBITMAPINFO BitmapInfo, UINT ColorSpec, UINT *BitmapInfoSize, BOOL FollowedByData); +BOOL STDCALL CalculateColorTableSize(CONST BITMAPINFOHEADER *BitmapInfoHeader, UINT *ColorSpec, UINT *ColorTableSize); +LPBITMAPINFO STDCALL ConvertBitmapInfo(CONST BITMAPINFO *BitmapInfo, UINT ColorSpec, UINT *BitmapInfoSize, BOOL FollowedByData); /* EOF */ _____ Modified: trunk/reactos/lib/gdi32/makefile --- trunk/reactos/lib/gdi32/makefile 2005-03-20 12:15:51 UTC (rev 14216) +++ trunk/reactos/lib/gdi32/makefile 2005-03-20 12:30:06 UTC (rev 14217) @@ -39,7 +39,7 @@ misc/win32k.o OBJECTS_OBJECTS = \ - objects/bitblt.o \ + objects/bitmap.o \ objects/utils.o \ objects/brush.o \ objects/dc.o \ _____ Deleted: trunk/reactos/lib/gdi32/objects/bitblt.c --- trunk/reactos/lib/gdi32/objects/bitblt.c 2005-03-20 12:15:51 UTC (rev 14216) +++ trunk/reactos/lib/gdi32/objects/bitblt.c 2005-03-20 12:30:06 UTC (rev 14217) @@ -1,42 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/gdi32/object/bitblt.c - * PURPOSE: - * PROGRAMMER: - */ - -#include "precomp.h" - -#include <debug.h> - - -/* - * @implemented - */ -BOOL -STDCALL -StretchBlt( - HDC hdcDest, // handle to destination DC - int nXOriginDest, // x-coord of destination upper-left corner - int nYOriginDest, // y-coord of destination upper-left corner - int nWidthDest, // width of destination rectangle - int nHeightDest, // height of destination rectangle - HDC hdcSrc, // handle to source DC - int nXOriginSrc, // x-coord of source upper-left corner - int nYOriginSrc, // y-coord of source upper-left corner - int nWidthSrc, // width of source rectangle - int nHeightSrc, // height of source rectangle - DWORD dwRop // raster operation code - ) -{ - if ((nWidthDest != nWidthSrc) || (nHeightDest != nHeightSrc)) - { - return NtGdiStretchBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, - hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, dwRop); - } - - return NtGdiBitBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, hdcSrc, - nXOriginSrc, nYOriginSrc, dwRop); -} _____ Added: trunk/reactos/lib/gdi32/objects/bitmap.c --- trunk/reactos/lib/gdi32/objects/bitmap.c 2005-03-20 12:15:51 UTC (rev 14216) +++ trunk/reactos/lib/gdi32/objects/bitmap.c 2005-03-20 12:30:06 UTC (rev 14217) @@ -0,0 +1,59 @@ +#include "precomp.h" + +/* + * @implemented + */ +HBITMAP STDCALL +CreateDIBSection( + HDC hDC, + CONST BITMAPINFO *BitmapInfo, + UINT Usage, + VOID **Bits, + HANDLE hSection, + DWORD dwOffset) +{ + PBITMAPINFO pConvertedInfo; + UINT ConvertedInfoSize; + HBITMAP hBitmap = NULL; + + pConvertedInfo = ConvertBitmapInfo(BitmapInfo, Usage, + &ConvertedInfoSize, FALSE); + if (pConvertedInfo) + { + hBitmap = NtGdiCreateDIBSection(hDC, pConvertedInfo, Usage, Bits, + hSection, dwOffset); + if (BitmapInfo != pConvertedInfo) + RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); + } + + return hBitmap; +} + +/* + * @implemented + */ +BOOL STDCALL +StretchBlt( + HDC hdcDest, /* handle to destination DC */ + int nXOriginDest, /* x-coord of destination upper-left corner */ + int nYOriginDest, /* y-coord of destination upper-left corner */ + int nWidthDest, /* width of destination rectangle */ + int nHeightDest, /* height of destination rectangle */ + HDC hdcSrc, /* handle to source DC */ + int nXOriginSrc, /* x-coord of source upper-left corner */ + int nYOriginSrc, /* y-coord of source upper-left corner */ + int nWidthSrc, /* width of source rectangle */ + int nHeightSrc, /* height of source rectangle */ + DWORD dwRop) /* raster operation code */ + +{ + if ((nWidthDest != nWidthSrc) || (nHeightDest != nHeightSrc)) + { + return NtGdiStretchBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, + nHeightDest, hdcSrc, nXOriginSrc, nYOriginSrc, + nWidthSrc, nHeightSrc, dwRop); + } + + return NtGdiBitBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, + nHeightDest, hdcSrc, nXOriginSrc, nYOriginSrc, dwRop); +} _____ Modified: trunk/reactos/lib/gdi32/objects/utils.c --- trunk/reactos/lib/gdi32/objects/utils.c 2005-03-20 12:15:51 UTC (rev 14216) +++ trunk/reactos/lib/gdi32/objects/utils.c 2005-03-20 12:30:06 UTC (rev 14217) @@ -24,7 +24,7 @@ BOOL STDCALL CalculateColorTableSize( - LPBITMAPINFOHEADER BitmapInfoHeader, + CONST BITMAPINFOHEADER *BitmapInfoHeader, UINT *ColorSpec, UINT *ColorTableSize) { @@ -170,12 +170,12 @@ LPBITMAPINFO STDCALL ConvertBitmapInfo( - LPBITMAPINFO BitmapInfo, + CONST BITMAPINFO *BitmapInfo, UINT ColorSpec, UINT *BitmapInfoSize, BOOL FollowedByData) { - LPBITMAPINFO NewBitmapInfo = BitmapInfo; + LPBITMAPINFO NewBitmapInfo = (LPBITMAPINFO)BitmapInfo; LPBITMAPCOREINFO CoreBitmapInfo = (LPBITMAPCOREINFO)BitmapInfo; DWORD Size = 0; ULONG DataSize = 0;

19 years, 6 months

[hpoussin] 14216: Add legacy detection of COM3 and COM4

by hpoussin＠svn.reactos.com

Add legacy detection of COM3 and COM4 Be ready for PnP serial ports Don't hardcode base addresses and irq twice Modified: trunk/reactos/drivers/dd/serial/legacy.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/serial.h _____ Modified: trunk/reactos/drivers/dd/serial/legacy.c --- trunk/reactos/drivers/dd/serial/legacy.c 2005-03-20 12:15:33 UTC (rev 14215) +++ trunk/reactos/drivers/dd/serial/legacy.c 2005-03-20 12:15:51 UTC (rev 14216) @@ -77,7 +77,11 @@ { ULONG ResourceListSize; PCM_RESOURCE_LIST ResourceList; + PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; BOOLEAN ConflictDetected, FoundPort; + PDEVICE_OBJECT Pdo = NULL; + PDEVICE_OBJECT Fdo; + KIRQL Dirql; NTSTATUS Status; /* Create resource list */ @@ -91,18 +95,23 @@ ResourceList->List[0].PartialResourceList.Version = 1; ResourceList->List[0].PartialResourceList.Revision = 1; ResourceList->List[0].PartialResourceList.Count = 2; - ResourceList->List[0].PartialResourceList.PartialDescriptors[0].Type = CmResourceTypePort; - ResourceList->List[0].PartialResourceList.PartialDescriptors[0].ShareDis position = CmResourceShareDriverExclusive; - ResourceList->List[0].PartialResourceList.PartialDescriptors[0].Flags = CM_RESOURCE_PORT_IO; - // FIXME ResourceList->List[0].PartialResourceList.PartialDescriptors[0].u.Port.S tart = ComPortBase; - ResourceList->List[0].PartialResourceList.PartialDescriptors[0].u.Port.L ength = 8; + ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[0]; + ResourceDescriptor->Type = CmResourceTypePort; + ResourceDescriptor->ShareDisposition = CmResourceShareDriverExclusive; + ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; + ResourceDescriptor->u.Port.Start.u.HighPart = 0; + ResourceDescriptor->u.Port.Start.u.LowPart = ComPortBase; + ResourceDescriptor->u.Port.Length = 8; - ResourceList->List[0].PartialResourceList.PartialDescriptors[1].Type = CmResourceTypeInterrupt; - ResourceList->List[0].PartialResourceList.PartialDescriptors[1].ShareDis position = CmResourceShareDriverExclusive; - ResourceList->List[0].PartialResourceList.PartialDescriptors[1].Flags = CM_RESOURCE_INTERRUPT_LATCHED; - /* FIXME: ResourceList->List[0].PartialResourceList.PartialDescriptors[1].u.Interr upt.Level = ; - ResourceList->List[0].PartialResourceList.PartialDescriptors[1].u.Interr upt.Vector = ; - ResourceList->List[0].PartialResourceList.PartialDescriptors[1].u.Interr upt.Affinity = ;*/ + ResourceDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[1]; + ResourceDescriptor->Type = CmResourceTypeInterrupt; + ResourceDescriptor->ShareDisposition = CmResourceShareShared; + ResourceDescriptor->Flags = CM_RESOURCE_INTERRUPT_LATCHED; + ResourceDescriptor->u.Interrupt.Vector = HalGetInterruptVector( + Internal, 0, 0, Irq, + &Dirql, + &ResourceDescriptor->u.Interrupt.Affinity); + ResourceDescriptor->u.Interrupt.Level = (ULONG)Dirql; /* Report resource list */ Status = IoReportResourceForDetection( @@ -125,7 +134,15 @@ ResourceList->List[0].InterfaceType, ResourceList->List[0].BusNumber, -1/*FIXME*/, ResourceList, NULL, TRUE, - NULL); + &Pdo); + if (NT_SUCCESS(Status)) + { + Status = SerialAddDeviceInternal(DriverObject, Pdo, &Fdo); + if (NT_SUCCESS(Status)) + { + Status = SerialPnpStartDevice(Fdo, ResourceList); + } + } } else { @@ -143,20 +160,19 @@ DetectLegacyDevices( IN PDRIVER_OBJECT DriverObject) { - ULONG ComPortBase[] = { 0x3f8, 0x2f8 }; - ULONG Irq[] = { 4, 3 }; + ULONG ComPortBase[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; + ULONG Irq[] = { 4, 3, 4, 3 }; ULONG i; NTSTATUS Status; + NTSTATUS ReturnedStatus = STATUS_SUCCESS; for (i = 0; i < sizeof(ComPortBase)/sizeof(ComPortBase[0]); i++) { Status = DetectLegacyDevice(DriverObject, ComPortBase[i], Irq[i]); - DPRINT("Serial: Legacy device at 0x%x (IRQ %lu): status = 0x%08x\n", ComPortBase[i], Irq[i], Status); - if (Status == STATUS_DEVICE_NOT_CONNECTED) - Status = STATUS_SUCCESS; - else if (!NT_SUCCESS(Status)) - break; + if (!NT_SUCCESS(Status) && Status != STATUS_DEVICE_NOT_CONNECTED) + ReturnedStatus = Status; + DPRINT("Serial: Legacy device at 0x%x (IRQ %lu): status = 0x%08lx\n", ComPortBase[i], Irq[i], Status); } - return Status; + return ReturnedStatus; } _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-03-20 12:15:33 UTC (rev 14215) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-03-20 12:15:51 UTC (rev 14216) @@ -14,9 +14,10 @@ #include "serial.h" NTSTATUS STDCALL -SerialAddDevice( +SerialAddDeviceInternal( IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT Pdo) + IN PDEVICE_OBJECT Pdo, + OUT PDEVICE_OBJECT* pFdo OPTIONAL) { PDEVICE_OBJECT Fdo = NULL; PSERIAL_DEVICE_EXTENSION DeviceExtension = NULL; @@ -26,7 +27,7 @@ //UNICODE_STRING SymbolicLinkName; static ULONG DeviceNumber = 0; - DPRINT("Serial: SerialAddDevice called\n"); + DPRINT("Serial: SerialAddDeviceInternal called\n"); /* Create new device object */ swprintf(DeviceNameBuffer, L"\\Device\\Serial%lu", DeviceNumber); @@ -81,6 +82,10 @@ goto ByeBye; } Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + if (pFdo) + { + *pFdo = Fdo; + } return STATUS_SUCCESS; @@ -95,12 +100,34 @@ } NTSTATUS STDCALL +SerialAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT Pdo) +{ + /* Serial.sys is a legacy driver. AddDevice is called once + * with a NULL Pdo just after the driver initialization. + * Detect this case and return success. + */ + if (Pdo == NULL) + return STATUS_SUCCESS; + + /* We have here a PDO that does not correspond to a legacy + * serial port. So call the internal AddDevice function. + */ + DPRINT1("Serial: SerialAddDevice() called. Pdo 0x%p (should be NULL)\n", Pdo); + /* FIXME: due to a bug, previously described AddDevice is + * not called with a NULL Pdo. Block this call (blocks + * unfortunately all the other PnP serial ports devices). + */ + //return SerialAddDeviceInternal(DriverObject, Pdo, NULL); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS STDCALL SerialPnpStartDevice( IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PCM_RESOURCE_LIST ResourceList) { - PIO_STACK_LOCATION Stack; - //PCM_RESOURCE_LIST ResourceList; PSERIAL_DEVICE_EXTENSION DeviceExtension; WCHAR DeviceNameBuffer[32]; UNICODE_STRING DeviceName; @@ -108,16 +135,17 @@ UNICODE_STRING LinkName; WCHAR ComPortBuffer[32]; UNICODE_STRING ComPort; - ULONG Vector; - //ULONG i, j; + ULONG Vector = 0; + ULONG i, j; KIRQL Dirql; KAFFINITY Affinity; + KINTERRUPT_MODE InterruptMode = Latched; + BOOLEAN ShareInterrupt = TRUE; OBJECT_ATTRIBUTES objectAttributes; UNICODE_STRING KeyName; HANDLE hKey; NTSTATUS Status; - Stack = IoGetCurrentIrpStackLocation(Irp); DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* FIXME: actually, IRP_MN_START_DEVICE is sent twice to each serial device: @@ -128,66 +156,47 @@ */ if (DeviceExtension->PnpState == dsStarted) return STATUS_SUCCESS; -#if 1 - /* FIXME: PnP isn't correctly implemented and doesn't give us a list - * of our own resources. Use default values instead. - */ - switch (DeviceExtension->SerialPortNumber) - { - case 0: - DPRINT("Serial: creating COM1:\n"); - DeviceExtension->ComPort = 1; - DeviceExtension->BaudRate = 19200 | SERIAL_BAUD_USER; - DeviceExtension->BaseAddress = 0x3F8; - DeviceExtension->Irq = 4; - break; - case 1: - DPRINT("Serial: creating COM2:\n"); - DeviceExtension->ComPort = 2; - DeviceExtension->BaudRate = 19200 | SERIAL_BAUD_USER; - DeviceExtension->BaseAddress = 0x2F8; - DeviceExtension->Irq = 3; - break; - default: - DPRINT1("Serial: too much ports detected. Forgetting this one...\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } -#else - DPRINT1("Serial: ResourceList %p, ResourceListTranslated %p\n", - Stack->Parameters.StartDevice.AllocatedResources, - Stack->Parameters.StartDevice.AllocatedResourcesTranslated); - ResourceList = Stack->Parameters.StartDevice.AllocatedResourcesTranslated; + DeviceExtension->ComPort = DeviceExtension->SerialPortNumber + 1; + DeviceExtension->BaudRate = 19200 | SERIAL_BAUD_USER; + DeviceExtension->BaseAddress = 0; + Dirql = 0; for (i = 0; i < ResourceList->Count; i++) { - DPRINT1("Serial: Interface type = 0x%x\n", ResourceList->List[i].InterfaceType); - DPRINT1("Serial: Bus number = 0x%x\n", ResourceList->List[i].BusNumber); - for (j = 0; i < ResourceList->List[i].PartialResourceList.Count; j++) + for (j = 0; j < ResourceList->List[i].PartialResourceList.Count; j++) { PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor = &ResourceList->List[i].PartialResourceList.PartialDescriptors[j]; - DPRINT1("Serial: Type 0x%x, Share disposition 0x%x, Flags 0x%x\n", - PartialDescriptor->Type, - PartialDescriptor->ShareDisposition, - PartialDescriptor->Flags); switch (PartialDescriptor->Type) { case CmResourceTypePort: + if (PartialDescriptor->u.Port.Length < 8) + return STATUS_INSUFFICIENT_RESOURCES; + if (DeviceExtension->BaseAddress != 0) + return STATUS_UNSUCCESSFUL; DeviceExtension->BaseAddress = PartialDescriptor->u.Port.Start.u.LowPart; - DPRINT1("Serial: CmResourceTypePort = %lu\n", DeviceExtension->BaseAddress); break; case CmResourceTypeInterrupt: - /* FIXME: Detect if interrupt is shareable and/or latched */ - /* FIXME: use also ->u.Interrupt.Vector and ->u.Interrupt.Affinity - * to remove call to HalGetInterruptVector(...) */ - DeviceExtension->Irq = PartialDescriptor->u.Interrupt.Level; - DPRINT1("Serial: Irq = %lu\n", DeviceExtension->Irq); + if (Dirql != 0) + return STATUS_UNSUCCESSFUL; + Dirql = (KIRQL)PartialDescriptor->u.Interrupt.Level; + Vector = PartialDescriptor->u.Interrupt.Vector; + Affinity = PartialDescriptor->u.Interrupt.Affinity; + if (PartialDescriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED) + InterruptMode = Latched; + else + InterruptMode = LevelSensitive; + ShareInterrupt = (PartialDescriptor->ShareDisposition == CmResourceShareShared); break; } } } - DeviceExtension->BaudRate = 19200 | SERIAL_BAUD_USER; - /* FIXME: use polling if no interrupt was found? */ - DeviceExtension->ComPort = 5; /* FIXME: use incremental value, or find it in resource list */ -#endif + DPRINT("Serial: New COM port. Base = 0x%lx, Irql = %u\n", + DeviceExtension->BaseAddress, Dirql); + if (!DeviceExtension->BaseAddress) + return STATUS_INSUFFICIENT_RESOURCES; + /* FIXME: we should be able to continue and use polling method + * for read/write if we don't have an interrupt */ + if (!Dirql) + return STATUS_INSUFFICIENT_RESOURCES; /* Get current settings */ DeviceExtension->IER = READ_PORT_UCHAR(SER_IER((PUCHAR)DeviceExtension->BaseAddress)); @@ -229,11 +238,11 @@ } /* Connect interrupt and enable them */ - Vector = HalGetInterruptVector(Internal, 0, 0, DeviceExtension->Irq, &Dirql, &Affinity); Status = IoConnectInterrupt( &DeviceExtension->Interrupt, SerialInterruptService, - DeviceObject, NULL, Vector, Dirql, Dirql, Latched, - FALSE /* FIXME: or TRUE to share interrupt on PCI bus? */, + DeviceObject, NULL, + Vector, Dirql, Dirql, + InterruptMode, ShareInterrupt, Affinity, FALSE); if (!NT_SUCCESS(Status)) { @@ -288,7 +297,9 @@ /* Call lower driver */ Status = ForwardIrpAndWait(DeviceObject, Irp); if (NT_SUCCESS(Status)) - Status = SerialPnpStartDevice(DeviceObject, Irp); + Status = SerialPnpStartDevice( + DeviceObject, + Stack->Parameters.StartDevice.AllocatedResources); break; } /* IRP_MN_QUERY_STOP_DEVICE (FIXME: required) */ _____ Modified: trunk/reactos/drivers/dd/serial/serial.h --- trunk/reactos/drivers/dd/serial/serial.h 2005-03-20 12:15:33 UTC (rev 14215) +++ trunk/reactos/drivers/dd/serial/serial.h 2005-03-20 12:15:51 UTC (rev 14216) @@ -70,7 +70,6 @@ ULONG ComPort; ULONG BaudRate; ULONG BaseAddress; - ULONG Irq; PKINTERRUPT Interrupt; SERIAL_LINE_CONTROL SerialLineControl; @@ -235,11 +234,22 @@ /************************************ pnp.c */ NTSTATUS STDCALL +SerialAddDeviceInternal( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT Pdo, + OUT PDEVICE_OBJECT* pFdo OPTIONAL); + +NTSTATUS STDCALL SerialAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo); NTSTATUS STDCALL +SerialPnpStartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PCM_RESOURCE_LIST ResourceList); + +NTSTATUS STDCALL SerialPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp);

19 years, 6 months

← Newer
1
...
15
16
17
18
19
20
21
...
61
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 March 2005