Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[jimtabor] 16909: Correct build name. Should be Edit.exe.

by jimtabor＠svn.reactos.com

Correct build name. Should be Edit.exe. Modified: trunk/rosapps/dflat32/dflat32.xml _____ Modified: trunk/rosapps/dflat32/dflat32.xml --- trunk/rosapps/dflat32/dflat32.xml 2005-07-30 23:57:14 UTC (rev 16908) +++ trunk/rosapps/dflat32/dflat32.xml 2005-07-31 00:17:57 UTC (rev 16909) @@ -1,4 +1,4 @@ -<module name="dflat32" type="win32cui" installbase="system32" installname="dflat32.exe" warnings="true"> +<module name="dflat32" type="win32cui" installbase="system32" installname="edit.exe" warnings="true"> <include base="ReactOS">include/wine</include> <include base="dflat32">.</include> <define name="__USE_W32API" />

19 years, 5 months

[ion] 16908: Don't use CSRSS handles if we alreay have some (so we can inherit file handles, etc)

by ion＠svn.reactos.com

Don't use CSRSS handles if we alreay have some (so we can inherit file handles, etc) Modified: trunk/reactos/lib/kernel32/misc/dllmain.c Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c _____ Modified: trunk/reactos/lib/kernel32/misc/dllmain.c --- trunk/reactos/lib/kernel32/misc/dllmain.c 2005-07-30 23:43:45 UTC (rev 16907) +++ trunk/reactos/lib/kernel32/misc/dllmain.c 2005-07-30 23:57:14 UTC (rev 16908) @@ -167,18 +167,28 @@ /* We got the handles, let's set them */ Parameters->ConsoleHandle = Request.Data.AllocConsoleRequest.Console; - SetStdHandle(STD_INPUT_HANDLE, Request.Data.AllocConsoleRequest.InputHandle); - SetStdHandle(STD_OUTPUT_HANDLE, Request.Data.AllocConsoleRequest.OutputHandle); - SetStdHandle(STD_ERROR_HANDLE, - DuplicateConsoleHandle(Request.Data.AllocConsoleRequest.OutputHandle, - 0, - TRUE, - DUPLICATE_SAME_ACCESS)); + /* If we already had some, don't use the new ones */ + if (!Parameters->StandardInput) + { + Parameters->StandardInput = Request.Data.AllocConsoleRequest.InputHandle; + } + if (!Parameters->StandardOutput) + { + Parameters->StandardOutput = Request.Data.AllocConsoleRequest.OutputHandle; + } + if (!Parameters->StandardError) + { + Parameters->StandardError = DuplicateConsoleHandle(Request.Data.AllocConsoleRequest.OutputHandle, + 0, + TRUE, + DUPLICATE_SAME_ACCESS); + } + DPRINT1("Console setup: %lx, %lx, %lx\n", - Request.Data.AllocConsoleRequest.Console, - Request.Data.AllocConsoleRequest.InputHandle, - Request.Data.AllocConsoleRequest.OutputHandle); + Parameters->ConsoleHandle, + Parameters->StandardInput, + Parameters->StandardOutput); return TRUE; } _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-07-30 23:43:45 UTC (rev 16907) +++ trunk/reactos/lib/kernel32/process/create.c 2005-07-30 23:57:14 UTC (rev 16908) @@ -308,10 +308,13 @@ IN PRTL_USER_PROCESS_PARAMETERS PebParams, IN BOOL InheritHandles) { + DPRINT1("BasepCopyHandles %p %p, %d\n", Params, PebParams, InheritHandles); + /* Copy the handle if we are inheriting or if it's a console handle */ if (InheritHandles || IsConsoleHandle(PebParams->StandardInput)) { Params->StandardInput = PebParams->StandardInput; + DPRINT1("Standard Input: %x\n", Params->StandardInput); } if (InheritHandles || IsConsoleHandle(PebParams->StandardOutput)) { @@ -349,7 +352,7 @@ UNICODE_STRING Desktop, Shell, Runtime, Title; PPEB OurPeb = NtCurrentPeb(); - DPRINT("BasepInitializeEnvironment\n"); + DPRINT1("BasepInitializeEnvironment\n"); /* Get the full path name */ RetVal = GetFullPathNameW(ApplicationPathName, @@ -478,6 +481,7 @@ /* Write the handles only if we have to */ if (StartupInfo->dwFlags & STARTF_USESTDHANDLES) { + DPRINT1("Using Standard Handles\n"); ProcessParameters->StandardInput = StartupInfo->hStdInput; ProcessParameters->StandardOutput = StartupInfo->hStdOutput; ProcessParameters->StandardError = StartupInfo->hStdError; @@ -506,6 +510,7 @@ (STARTF_USESTDHANDLES | STARTF_USEHOTKEY | STARTF_SHELLPRIVATE))) { /* Use handles from PEB, if inheriting or they are console */ + DPRINT1("Copying handles from parent\n"); BasepCopyHandles(ProcessParameters, OurPeb->ProcessParameters, InheritHandles); _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-07-30 23:43:45 UTC (rev 16907) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-07-30 23:57:14 UTC (rev 16908) @@ -342,11 +342,7 @@ Priority = Thread->Priority - (Thread->PriorityDecrement + 1); /* Normalize it if we've gone too low */ - if (Priority < Thread->BasePriority) - { - /* Normalize it if we've gone too low */ - Priority = Thread->BasePriority; - } + if (Priority < Thread->BasePriority) Priority = Thread->BasePriority; /* Reset the priority decrement, we've done it */ Thread->PriorityDecrement = 0; @@ -354,12 +350,15 @@ /* Set the new priority, if needed */ if (Priority != Thread->Priority) { - /* HACK HACK This isn't nice, but it's the only way with our current codebase */ + /* + * HACK HACK This isn't nice, but it's the only way with our + * current codebase + */ Thread->Priority = Priority; } else { - /* Priority hasn't changed, find a new thread */ + /* FIXME: Priority hasn't changed, find a new thread */ } } }

19 years, 5 months

[ion] 16907: Decrease quantum during wait and during no-wait... mentionned by Shmuel Baron

by ion＠svn.reactos.com

Decrease quantum during wait and during no-wait... mentionned by Shmuel Baron Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/wait.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-07-30 23:16:03 UTC (rev 16906) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-07-30 23:43:45 UTC (rev 16907) @@ -81,6 +81,10 @@ FASTCALL KiSwapContext(PKTHREAD NewThread); +VOID +STDCALL +KiAdjustQuantumThread(IN PKTHREAD Thread); + /* gmutex.c ********************************************************************/ VOID _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-07-30 23:16:03 UTC (rev 16906) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-07-30 23:43:45 UTC (rev 16907) @@ -274,6 +274,9 @@ Thread->PriorityDecrement = Increment; } + /* Also decrease quantum */ + Thread->Quantum--; + } else { Thread->Quantum = Thread->QuantumReset; @@ -321,6 +324,53 @@ VOID STDCALL +KiAdjustQuantumThread(IN PKTHREAD Thread) +{ + KPRIORITY Priority; + + /* Don't adjust for RT threads */ + if ((Thread->Priority < LOW_REALTIME_PRIORITY) && + Thread->BasePriority < LOW_REALTIME_PRIORITY - 2) + { + /* Decrease Quantum by one and see if we've ran out */ + if (--Thread->Quantum <= 0) + { + /* Return quantum */ + Thread->Quantum = Thread->QuantumReset; + + /* Calculate new Priority */ + Priority = Thread->Priority - (Thread->PriorityDecrement + 1); + + /* Normalize it if we've gone too low */ + if (Priority < Thread->BasePriority) + { + /* Normalize it if we've gone too low */ + Priority = Thread->BasePriority; + } + + /* Reset the priority decrement, we've done it */ + Thread->PriorityDecrement = 0; + + /* Set the new priority, if needed */ + if (Priority != Thread->Priority) + { + /* HACK HACK This isn't nice, but it's the only way with our current codebase */ + Thread->Priority = Priority; + } + else + { + /* Priority hasn't changed, find a new thread */ + } + } + } + + /* Nothing to do... */ + return; +} + + +VOID +STDCALL KiSuspendThreadKernelRoutine(PKAPC Apc, PKNORMAL_ROUTINE* NormalRoutine, PVOID* NormalContext, _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-07-30 23:16:03 UTC (rev 16906) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-07-30 23:43:45 UTC (rev 16907) @@ -250,7 +250,7 @@ /* It has a normal signal state, so unwait it and return */ KiSatisfyObjectWait(CurrentObject, CurrentThread); Status = STATUS_WAIT_0; - goto WaitDone; + goto DontWait; } else { @@ -285,7 +285,7 @@ /* Return a timeout */ Status = STATUS_TIMEOUT; - goto WaitDone; + goto DontWait; } /* Point to Timer Wait Block and Thread Timer */ @@ -311,7 +311,7 @@ /* Return a timeout if we couldn't insert the timer for some reason */ Status = STATUS_TIMEOUT; - goto WaitDone; + goto DontWait; } } @@ -344,11 +344,19 @@ } while (TRUE); -WaitDone: /* Release the Lock, we are done */ DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n", KeGetCurrentThread(), Status); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); return Status; + +DontWait: + /* Adjust the Quantum */ + KiAdjustQuantumThread(CurrentThread); + + /* Release & Return */ + DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n. We did not wait.", KeGetCurrentThread(), Status); + KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); + return Status; } /* @@ -460,7 +468,7 @@ /* It has a normal signal state, so unwait it and return */ KiSatisfyObjectWait(CurrentObject, CurrentThread); Status = STATUS_WAIT_0 | WaitIndex; - goto WaitDone; + goto DontWait; } else { @@ -504,7 +512,7 @@ /* Satisfy their Waits and return to the caller */ KiSatisifyMultipleObjectWaits(WaitBlock); Status = STATUS_WAIT_0; - goto WaitDone; + goto DontWait; } /* Make sure we can satisfy the Alertable request */ @@ -521,7 +529,7 @@ /* Return a timeout */ Status = STATUS_TIMEOUT; - goto WaitDone; + goto DontWait; } /* Point to Timer Wait Block and Thread Timer */ @@ -546,7 +554,7 @@ /* Return a timeout if we couldn't insert the timer for some reason */ Status = STATUS_TIMEOUT; - goto WaitDone; + goto DontWait; } } @@ -590,11 +598,19 @@ } while (TRUE); -WaitDone: /* Release the Lock, we are done */ DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n", KeGetCurrentThread(), Status); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); return Status; + +DontWait: + /* Adjust the Quantum */ + KiAdjustQuantumThread(CurrentThread); + + /* Release & Return */ + DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n. We did not wait.", KeGetCurrentThread(), Status); + KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); + return Status; } VOID

19 years, 5 months

[navaraf] 16906: Remove code that I accidently commited in revision 16905.

by navaraf＠svn.reactos.com

Remove code that I accidently commited in revision 16905. Modified: trunk/reactos/lib/rtl/image.c _____ Modified: trunk/reactos/lib/rtl/image.c --- trunk/reactos/lib/rtl/image.c 2005-07-30 23:08:26 UTC (rev 16905) +++ trunk/reactos/lib/rtl/image.c 2005-07-30 23:16:03 UTC (rev 16906) @@ -27,11 +27,8 @@ if (DosHeader && DosHeader->e_magic != IMAGE_DOS_SIGNATURE) { - extern ULONG KdDebuggerEnabled; DPRINT1("DosHeader->e_magic %x\n", DosHeader->e_magic); DPRINT1("NtHeader 0x%p\n", ((ULONG_PTR)BaseAddress + DosHeader->e_lfanew)); - if (KdDebuggerEnabled) - DbgBreakPoint(); } if (DosHeader && DosHeader->e_magic == IMAGE_DOS_SIGNATURE)

19 years, 5 months

[navaraf] 16905: Ignore the "magic flag" in RtlImageDirectoryEntryToData.

by navaraf＠svn.reactos.com

Ignore the "magic flag" in RtlImageDirectoryEntryToData. Modified: trunk/reactos/lib/rtl/image.c _____ Modified: trunk/reactos/lib/rtl/image.c --- trunk/reactos/lib/rtl/image.c 2005-07-30 23:06:46 UTC (rev 16904) +++ trunk/reactos/lib/rtl/image.c 2005-07-30 23:08:26 UTC (rev 16905) @@ -27,8 +27,11 @@ if (DosHeader && DosHeader->e_magic != IMAGE_DOS_SIGNATURE) { + extern ULONG KdDebuggerEnabled; DPRINT1("DosHeader->e_magic %x\n", DosHeader->e_magic); DPRINT1("NtHeader 0x%p\n", ((ULONG_PTR)BaseAddress + DosHeader->e_lfanew)); + if (KdDebuggerEnabled) + DbgBreakPoint(); } if (DosHeader && DosHeader->e_magic == IMAGE_DOS_SIGNATURE) @@ -57,6 +60,10 @@ PIMAGE_NT_HEADERS NtHeader; ULONG Va; + /* Magic flag for non-mapped images. */ + if ((ULONG_PTR)BaseAddress & 1) + BaseAddress = (PVOID)((ULONG_PTR)BaseAddress & ~1); + NtHeader = RtlImageNtHeader (BaseAddress); if (NtHeader == NULL) return NULL;

19 years, 5 months

[navaraf] 16904: Fix a race condition in quantum code. Spotted by Shmuel Baron.

by navaraf＠svn.reactos.com

Fix a race condition in quantum code. Spotted by Shmuel Baron. Modified: trunk/reactos/ntoskrnl/ke/clock.c _____ Modified: trunk/reactos/ntoskrnl/ke/clock.c --- trunk/reactos/ntoskrnl/ke/clock.c 2005-07-30 19:31:52 UTC (rev 16903) +++ trunk/reactos/ntoskrnl/ke/clock.c 2005-07-30 23:06:46 UTC (rev 16904) @@ -305,14 +305,22 @@ /* FIXME: Do DPC rate adjustments */ + /* + * RACE CONDITION WARNING. If one stays at DISPATCH_LEVEL for a long + * time the DPC routine which checks for quantum end will not be executed + * and decrementing the quantum here would result in overflow. + */ + if (CurrentThread->Quantum < 0) + return; + /* * If we're at end of quantum request software interrupt. The rest * is handled in KiDispatchInterrupt. */ if ((CurrentThread->Quantum -= 3) <= 0) { - Prcb->QuantumEnd = TRUE; - HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + Prcb->QuantumEnd = TRUE; + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); } }

19 years, 5 months

[ekohl] 16903: - Support conformant arrays as in and out parameters.

by ekohl＠svn.reactos.com

- Support conformant arrays as in and out parameters. - Fix message buffer size calculation for client and server. 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-07-30 19:06:53 UTC (rev 16902) +++ trunk/reactos/tools/widl/ChangeLog 2005-07-30 19:31:52 UTC (rev 16903) @@ -1,5 +1,13 @@ ChangeLog +2005-07-30 ekohl + + tools/widl/client.c + tools/widl/server.c + +- Support conformant arrays as in and out parameters. +- Fix message buffer size calculation for client and server. + 2005-07-25 ekohl tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-07-30 19:06:53 UTC (rev 16902) +++ trunk/reactos/tools/widl/client.c 2005-07-30 19:31:52 UTC (rev 16903) @@ -518,7 +518,7 @@ if (ptr_attr + ref_attr + unique_attr == 0) ref_attr = 1; - if (sizeis_attr && out_attr) + if (sizeis_attr) { unsigned char type_type = 0; @@ -553,12 +553,17 @@ print_client("0x%02x,\n", get_type_alignment(var->type) - 1); print_client("NdrFcShort(0x%02x),\n", get_type_size(var->type, 1)); print_client("0x%02x,\n", 0x20 + type_type); - print_client("0x00,\n"); + if (out_attr) + print_client("0x54, /* FC_DEREFERENCE */\n"); + else + print_client("0x00, /* */\n"); fprintf(client, "#ifndef _ALPHA_\n"); - print_client("NdrFcShort(0x04),\n"); + print_client("NdrFcShort(0x%02X),\n", + get_var_stack_offset_32(func, ((var_t *)sizeis_attr)->name)); fprintf(client, "#else\n"); - print_client("NdrFcShort(0x08),\n"); + print_client("NdrFcShort(0x%02X),\n", + get_var_stack_offset_64(func, ((var_t *)sizeis_attr)->name)); fprintf(client, "#endif\n"); print_client("0x%02x,\n", get_base_type(var->type->type)); print_client("0x5b, /* FC_END */\n"); @@ -566,16 +571,23 @@ } else if (is_base_type(var->type)) { - if (out_attr) - print_client("0x11, 0x0c, /* FC_RP [allocated_on_stack] [simple_pointer] */\n"); + if (out_attr && !in_attr) + { + if (ref_attr) + print_client("0x11, 0x0c, /* FC_RP [allocated_on_stack] [simple_pointer] */\n"); + else if (unique_attr) + print_client("0x12, 0x0c, /* FC_FP [allocated_on_stack] [simple_pointer] */\n"); + else if (ptr_attr) + print_client("0x14, 0x0c, /* FC_FP [allocated_on_stack] [simple_pointer] */\n"); + } else { - if (ptr_attr) - print_client("0x14, 0x08, /* FC_FP [simple_pointer] */\n"); - else if (ref_attr) + if (ref_attr) print_client("0x11, 0x08, /* FC_RP [simple_pointer] */\n"); else if (unique_attr) print_client("0x12, 0x08, /* FC_UP [simple_pointer] */\n"); + else if (ptr_attr) + print_client("0x14, 0x08, /* FC_FP [simple_pointer] */\n"); } if (string_attr) @@ -614,6 +626,7 @@ static void print_message_buffer_size(func_t *func, unsigned int *type_offset) { + unsigned int local_type_offset = *type_offset; unsigned int alignment; int size; int last_size = -1; @@ -622,8 +635,9 @@ int string_attr; int nothing_printed = 1; int ptr_attr, ref_attr, unique_attr; + int padding = 0, first_padding = 0; + void *sizeis_attr; var_t *var; - unsigned int local_type_offset = *type_offset; print_client("_StubMsg.BufferLength ="); if (func->args) @@ -634,7 +648,6 @@ { out_attr = is_attr(var->attrs, ATTR_OUT); in_attr = is_attr(var->attrs, ATTR_IN); - string_attr = is_attr(var->attrs, ATTR_STRING); /* set 'in' attribute if neither 'in' nor 'out' is found */ if (!out_attr && !in_attr) @@ -651,45 +664,34 @@ if (!in_attr) continue; + string_attr = is_attr(var->attrs, ATTR_STRING); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); + if (var->ptr_level == 1) { - if (unique_attr) + if (string_attr && !sizeis_attr) { - if (string_attr && - (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + /* non-sized conformant string */ + if (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR) { - size = 16; + size = (unique_attr) ? 16 : 12; alignment = 0; - if (last_size != -1) - fprintf(client, " +"); - fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); - nothing_printed = 0; } - else - { - size = 8; - alignment = 0; - if (last_size != -1) - fprintf(client, " +"); - fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); - nothing_printed = 0; - } } - else if (ref_attr) + else if (sizeis_attr && !string_attr) { - if (string_attr && - (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + /* conformant arrays */ + size = 4; + alignment = 0; + if (padding != 0) + padding = 1; + } + else if (!sizeis_attr && !string_attr) + { + /* simple pointers */ + if (is_base_type(var->type)) { - size = 12; alignment = 0; - if (last_size != -1) - fprintf(client, " +"); - fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); - nothing_printed = 0; - } - else - { - alignment = 0; switch (var->type->type) { case RPC_FC_BYTE: @@ -726,28 +728,18 @@ size = 0; break; - case 0: - printf("%s\n", __FUNCTION__); - printf("ptr_level %d\n", var->ptr_level); - printf("Type %p\n", var->type); - printf("Type %x\n", var->type->type); - printf("Type name: %s\n", var->type->name); - printf("Tref %p\n", var->type->ref); - printf("Tref->name %s\n", var->type->ref->name); - printf("Tref->ref %p\n", var->type->ref->ref); - return; - default: error("%s:%d Unknown/unsupported type 0x%x\n", __FUNCTION__,__LINE__, var->type->type); return; } - - if (last_size != -1) - fprintf(client, " +"); - fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); - nothing_printed = 0; } + else + { + /* simple pointer to a struct */ + size = 8; + alignment = 0; + } } } else @@ -800,11 +792,33 @@ __FUNCTION__,__LINE__, var->type->type); return; } + } - if (last_size != -1) - fprintf(client, " +"); - fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); - nothing_printed = 0; + if (last_size != -1) + fprintf(client, " +"); + fprintf(client, " %dU", (size == 0) ? 0 : size + alignment + first_padding + padding); + nothing_printed = 0; + if (first_padding != 0) + first_padding = 0; + + /* set paddings */ + if (var->ptr_level == 1) + { + if (string_attr && !sizeis_attr) + { + /* non-sized conformant string */ + if (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR) + { + first_padding = 3; + padding = 3; + } + } + else if (sizeis_attr && !string_attr) + { + /* conformant arrays */ + first_padding = 4; + padding = 3; + } } last_size = size; @@ -827,9 +841,8 @@ { out_attr = is_attr(var->attrs, ATTR_OUT); in_attr = is_attr(var->attrs, ATTR_IN); - string_attr = is_attr(var->attrs, ATTR_STRING); - /* set 'in' attribute if neither 'in' nor 'out' is found */ + /* default to 'in' attribute */ if (!out_attr && !in_attr) in_attr = 1; @@ -841,12 +854,15 @@ if (ptr_attr + ref_attr + unique_attr == 0) ref_attr = 1; + string_attr = is_attr(var->attrs, ATTR_STRING); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); + if (in_attr) { - if (var->ptr_level == 0 && - var->type->type == RPC_FC_RP) + if (var->ptr_level == 0) { - if (var->type->ref->ref->type == RPC_FC_STRUCT) + if (var->type->type == RPC_FC_RP && + var->type->ref->ref->type == RPC_FC_STRUCT) { print_client("NdrSimpleStructBufferSize(\n"); indent++; @@ -858,36 +874,60 @@ indent--; } } - else if (var->ptr_level == 1 && - string_attr && - (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + else if (var->ptr_level == 1) { - if (ptr_attr) + if (string_attr) { - /* FIXME: not supported yet */ + if ((var->type->type == RPC_FC_CHAR || + var->type->type == RPC_FC_WCHAR)) + { + if (ptr_attr) + { + /* FIXME: not supported yet */ + } + if (ref_attr) + { + 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--; + } + else if (unique_attr) + { + print_client("NdrPointerBufferSize(\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); + nothing_printed = 1; + indent--; + } + } } - if (ref_attr) + else { - 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 (sizeis_attr) + { + fprintf(client, "\n"); + print_client("_StubMsg.MaxCount = %s;\n", + ((var_t *)sizeis_attr)->name); + fprintf(client, "\n"); + + print_client("NdrConformantArrayBufferSize(\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 + 4); + indent--; + nothing_printed = 1; + } } - else if (unique_attr) - { - print_client("NdrPointerBufferSize(\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); - nothing_printed = 1; - indent--; - } } } @@ -903,6 +943,7 @@ static void marshall_in_arguments(func_t *func, unsigned int *type_offset) { + unsigned int local_type_offset = *type_offset; unsigned int alignment; unsigned int size; unsigned int last_size = 0; @@ -910,8 +951,8 @@ int out_attr; int string_attr; int ptr_attr, ref_attr, unique_attr; + void *sizeis_attr; var_t *var; - unsigned int local_type_offset = *type_offset; if (!func->args) return; @@ -922,7 +963,6 @@ { out_attr = is_attr(var->attrs, ATTR_OUT); in_attr = is_attr(var->attrs, ATTR_IN); - string_attr = is_attr(var->attrs, ATTR_STRING); /* set 'in' attribute if neither 'in' nor 'out' is set */ if (!out_attr && !in_attr) @@ -945,8 +985,28 @@ if (ptr_attr + ref_attr + unique_attr == 0) ref_attr = 1; - if (ref_attr) + string_attr = is_attr(var->attrs, ATTR_STRING); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); + + if (sizeis_attr) { + print_client("_StubMsg.MaxCount = %s;\n", + ((var_t *)sizeis_attr)->name); + fprintf(client, "\n"); + + print_client("NdrConformantArrayMarshall(\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 + 4); + indent--; + fprintf(client, "\n"); + print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(client, "\n"); + } + else if (ref_attr) + { if (string_attr && (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) { @@ -1192,6 +1252,8 @@ print_client("(unsigned char)0);\n"); indent--; fprintf(client, "\n"); + print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(client, "\n"); } } else if (is_base_type(var->type)) _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-07-30 19:06:53 UTC (rev 16902) +++ trunk/reactos/tools/widl/server.c 2005-07-30 19:31:52 UTC (rev 16903) @@ -515,7 +515,7 @@ if (ptr_attr + ref_attr + unique_attr == 0) ref_attr = 1; - if (sizeis_attr != NULL && out_attr) + if (sizeis_attr) { unsigned char type_type = 0; @@ -550,12 +550,17 @@ print_server("0x%02x,\n", get_type_alignment(var->type) - 1); print_server("NdrFcShort(0x%02x),\n", get_type_size(var->type, 1)); print_server("0x%02x,\n", 0x20 + type_type); - print_server("0x00,\n"); + if (out_attr) + print_server("0x54 /* FC_DEREFERENCE */,\n"); + else + print_server("0x00 /* */,\n"); fprintf(server, "#ifndef _ALPHA_\n"); - print_server("NdrFcShort(0x04),\n"); + print_server("NdrFcShort(0x%02X),\n", + get_var_stack_offset_32(func, ((var_t *)sizeis_attr)->name)); fprintf(server, "#else\n"); - print_server("NdrFcShort(0x08),\n"); + print_server("NdrFcShort(0x%02X),\n", + get_var_stack_offset_64(func, ((var_t *)sizeis_attr)->name)); fprintf(server, "#endif\n"); print_server("0x%02x,\n", get_base_type(var->type->type)); print_server("0x5b, /* FC_END */\n"); @@ -563,16 +568,23 @@ } else if (is_base_type(var->type)) { - if (out_attr) - print_server("0x11, 0x0c, /* FC_RP [allocated_on_stack] [simple_pointer] */\n"); + if (out_attr && !in_attr) + { + if (ref_attr) + print_server("0x11, 0x0c, /* FC_RP [allocated_on_stack] [simple_pointer] */\n"); + else if (unique_attr) + print_server("0x12, 0x0c, /* FC_FP [allocated_on_stack] [simple_pointer] */\n"); + else if (ptr_attr) + print_server("0x14, 0x0c, /* FC_FP [allocated_on_stack] [simple_pointer] */\n"); + } else { - if (ptr_attr) - print_server("0x14, 0x08, /* FC_FP [simple_pointer] */\n"); - else if (ref_attr) + if (ref_attr) print_server("0x11, 0x08, /* FC_RP [simple_pointer] */\n"); else if (unique_attr) print_server("0x12, 0x08, /* FC_UP [simple_pointer] */\n"); + else if (ptr_attr) + print_server("0x14, 0x08, /* FC_FP [simple_pointer] */\n"); } if (string_attr) @@ -623,8 +635,8 @@ int empty_line; var_t *var; - int add_return = 0; - int start_new_line = 0; + int first_padding = 0; + int padding = 0; int add_plus = 0; unsigned int local_type_offset = *type_offset; @@ -643,97 +655,104 @@ if (out_attr) { - if (var->ptr_level == 1 && - string_attr && - sizeis_attr != NULL && - (var->type->type == RPC_FC_BYTE || - var->type->type == RPC_FC_CHAR || - var->type->type == RPC_FC_WCHAR)) + if (var->ptr_level == 1) { - fprintf(server, " 12U"); - add_return = 6; - if (var->type->type == RPC_FC_BYTE || - var->type->type == RPC_FC_CHAR) - add_return++; - add_plus = 1; - } - else if (is_base_type(var->type)) - { - if (start_new_line) + if (sizeis_attr) { - print_server("_StubMsg.BufferLength +="); + if (string_attr && + (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR || + var->type->type == RPC_FC_WCHAR)) + { + size =12; + } + else + { + size = 4; + } } - - alignment = 0; - switch (var->type->type) + else if (is_base_type(var->type)) { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - size = 1; 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; - default: - error("%s:%d Unknown/unsupported type 0x%x\n", - __FUNCTION__,__LINE__, var->type->type); - return; + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; + } } + } + else if (var->type->type == RPC_FC_RP) + { + size = 12; + } + if (size != 0) + { if (add_plus) fprintf(server, " +"); - fprintf(server, " %dU", (size == 0) ? 0 : size + alignment); + fprintf(server, " %dU", size + alignment + first_padding + padding); + if (first_padding != 0) + first_padding = 0; + last_size = size; - start_new_line = 0; add_plus = 1; } - else if (var->type->type == RPC_FC_RP) + + /* set paddings */ + if (var->ptr_level == 1) { - if (size == 0) + if (sizeis_attr) { - fprintf(server, " 12U;\n"); + if (string_attr && + (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR || + var->type->type == RPC_FC_WCHAR)) + { + first_padding = 3; + if (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR) + first_padding++; + padding = 3; + } + else + { + first_padding = 4; + padding = 3; + } } - else if (last_size != 0) - { - fprintf(server, " + 12U;\n"); - last_size = 0; - } - - fprintf(server,"\n"); - print_server("NdrSimpleStructBufferSize(\n"); - indent++; - print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_server("(unsigned char __RPC_FAR *)%s,\n", var->name); - print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", - local_type_offset + 4); /* FIXME */ - indent--; - fprintf(server,"\n"); - - start_new_line = 1; } /* calculate the next type offset */ @@ -745,12 +764,6 @@ /* return value size */ if (!is_void(func->def->type, NULL)) { - if (start_new_line) - { - print_server("_StubMsg.BufferLength +="); - add_plus = 0; - } - switch(func->def->type->type) { case RPC_FC_BYTE: @@ -783,8 +796,12 @@ if (add_plus) fprintf(server, " +"); - fprintf(server, " %dU", (size == 0) ? 0 : size + alignment + add_return); + fprintf(server, " %dU", size + alignment + first_padding + padding); } + + if (size == 0) + fprintf(server, "0U"); + fprintf(server, ";\n"); @@ -808,24 +825,55 @@ if (out_attr) { - if (var->ptr_level == 1 && - string_attr && - sizeis_attr != NULL && - (var->type->type == RPC_FC_BYTE || - var->type->type == RPC_FC_CHAR || - var->type->type == RPC_FC_WCHAR)) + if (var->ptr_level == 1 && sizeis_attr != NULL) { - print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name); - fprintf(server, "\n"); - print_server("NdrConformantStringBufferSize(\n"); + if (string_attr) + { + if (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR || + var->type->type == RPC_FC_WCHAR) + { + print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name); + fprintf(server, "\n"); + print_server("NdrConformantStringBufferSize(\n"); + indent++; + print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_server("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset + 4); + indent--; + } + } + else + { + if (((var_t *)sizeis_attr)->ptr_level == 0) + print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name); + else + print_server("_StubMsg.MaxCount = %s ? *%s : 0;\n", + ((var_t *)sizeis_attr)->name, ((var_t *)sizeis_attr)->name); + fprintf(server, "\n"); + print_server("NdrConformantArrayBufferSize(\n"); + indent++; + print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_server("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset + 4); + indent--; + } + + empty_line = 1; + } + else if (var->type->type == RPC_FC_RP) + { + fprintf(server,"\n"); + print_server("NdrSimpleStructBufferSize(\n"); indent++; print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_server("(unsigned char __RPC_FAR *)%s,\n", var->name); print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", - local_type_offset + 4); + local_type_offset + 4); /* FIXME */ indent--; - - empty_line = 1; + fprintf(server,"\n"); } } @@ -873,6 +921,7 @@ static void init_pointers (func_t *func) { var_t *var; + int count = 0; if (!func->args) return; @@ -888,13 +937,15 @@ print_server("*("); write_type(server, var->type, NULL, var->tname); fprintf(server, "*)&%s = NULL;\n", var->name); + count++; } } else if (var->ptr_level == 1) { - fprintf(server, "%s = (", var->name); + print_server("%s = (", var->name); write_type(server, var->type, NULL, var->tname); - print_server(" __RPC_FAR *)0;\n"); + fprintf(server, " __RPC_FAR *)0;\n"); + count++; } else if (var->ptr_level > 1) { @@ -904,12 +955,15 @@ var = PREV_LINK(var); } - fprintf(server, "\n"); + + if (count > 0) + fprintf(server, "\n"); } static void unmarshall_in_arguments(func_t *func, unsigned int *type_offset) { + unsigned int local_type_offset = *type_offset; unsigned int alignment; unsigned int size; unsigned int last_size = 0; @@ -917,7 +971,7 @@ int in_attr, out_attr; int string_attr; int ptr_attr, ref_attr, unique_attr; - unsigned int local_type_offset = *type_offset; + void *sizeis_attr; if (!func->args) return; @@ -928,12 +982,14 @@ { out_attr = is_attr(var->attrs, ATTR_OUT); in_attr = is_attr(var->attrs, ATTR_IN); - string_attr = is_attr(var->attrs, ATTR_STRING); /* set 'in' attribute if neither 'in' nor 'out' is set */ if (!out_attr && !in_attr) in_attr = 1; + string_attr = is_attr(var->attrs, ATTR_STRING); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); + if (in_attr) { if (var->ptr_level == 1) @@ -946,21 +1002,37 @@ if (ref_attr) { - if (string_attr && - (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + if (string_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", - local_type_offset + 2); - print_server("(unsigned char)0);\n"); - indent--; - fprintf(server, "\n"); - print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); - fprintf(server, "\n"); + if (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR) + { + 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", + local_type_offset + 2); + print_server("(unsigned char)0);\n"); + indent--; + fprintf(server, "\n"); + print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(server, "\n"); + } } + else if (sizeis_attr) + { + print_server("NdrConformantArrayUnmarshall(\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", + local_type_offset + 4); + print_server("(unsigned char)0);\n"); + indent--; + fprintf(server, "\n"); + print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(server, "\n"); + } else { alignment = 0; @@ -1173,6 +1245,26 @@ print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); fprintf(server, "\n"); } + else + { + fprintf(server, "\n"); + if (((var_t *)sizeis_attr)->ptr_level == 0) + print_server("_StubMsg.MaxCount = %s;\n", ((var_t *)sizeis_attr)->name); + else + print_server("_StubMsg.MaxCount = %s ? *%s : 0;\n", + ((var_t *)sizeis_attr)->name, ((var_t *)sizeis_attr)->name); + fprintf(server, "\n"); + print_server("NdrConformantArrayMarshall(\n"); + indent++; + print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_server("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset + 4); + indent--; + fprintf(server, "\n"); + print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(server, "\n"); + } } else if (is_base_type(var->type)) { @@ -1575,8 +1667,12 @@ { print_server(""); write_name(server, var); - fprintf(server, " = NdrAllocate(&_StubMsg, %s * %d);\n", - ((var_t *)sizeis_attr)->name, get_type_size(var->type, 1)); + if (((var_t *)sizeis_attr)->ptr_level == 0) + fprintf(server, " = NdrAllocate(&_StubMsg, %s * %d);\n", + ((var_t *)sizeis_attr)->name, get_type_size(var->type, 1)); + else if (((var_t *)sizeis_attr)->ptr_level == 1) + fprintf(server, " = NdrAllocate(&_StubMsg, *%s * %d);\n", + ((var_t *)sizeis_attr)->name, get_type_size(var->type, 1)); sep = 1; } else

19 years, 5 months

[fireball] 16902: Move NDEBUG higher so it actually works and doesn't output all debug messages (fix suggested by hpoussin).

by fireball＠svn.reactos.com

Move NDEBUG higher so it actually works and doesn't output all debug messages (fix suggested by hpoussin). Modified: trunk/reactos/hal/halx86/xbox/font.c Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c Modified: trunk/reactos/hal/halx86/xbox/pci_xbox.c _____ Modified: trunk/reactos/hal/halx86/xbox/font.c --- trunk/reactos/hal/halx86/xbox/font.c 2005-07-30 19:03:34 UTC (rev 16901) +++ trunk/reactos/hal/halx86/xbox/font.c 2005-07-30 19:06:53 UTC (rev 16902) @@ -11,11 +11,12 @@ * Note: Converted from the XFree vga.bdf font */ +#define NDEBUG + #include <ddk/ntddk.h> #include "halxbox.h" #include <internal/debug.h> -#define NDEBUG #include <debug.h> BYTE XboxFont8x16[256 * 16] = _____ Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c --- trunk/reactos/hal/halx86/xbox/halinit_xbox.c 2005-07-30 19:03:34 UTC (rev 16901) +++ trunk/reactos/hal/halx86/xbox/halinit_xbox.c 2005-07-30 19:06:53 UTC (rev 16902) @@ -11,12 +11,13 @@ /* INCLUDES *****************************************************************/ +#define NDEBUG + #include <ddk/ntddk.h> #include <hal.h> #include "halxbox.h" #include <internal/debug.h> -#define NDEBUG #include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c --- trunk/reactos/hal/halx86/xbox/part_xbox.c 2005-07-30 19:03:34 UTC (rev 16901) +++ trunk/reactos/hal/halx86/xbox/part_xbox.c 2005-07-30 19:06:53 UTC (rev 16902) @@ -11,12 +11,13 @@ /* INCLUDES *****************************************************************/ +#define NDEBUG + #include <hal.h> #include <ddk/ntdddisk.h> #include "halxbox.h" #include <internal/debug.h> -#define NDEBUG #include <debug.h> #define XBOX_SIGNATURE_SECTOR 3 _____ Modified: trunk/reactos/hal/halx86/xbox/pci_xbox.c --- trunk/reactos/hal/halx86/xbox/pci_xbox.c 2005-07-30 19:03:34 UTC (rev 16901) +++ trunk/reactos/hal/halx86/xbox/pci_xbox.c 2005-07-30 19:06:53 UTC (rev 16902) @@ -17,13 +17,14 @@ /* INCLUDES *****************************************************************/ +#define NDEBUG + #include <ddk/ntddk.h> #include <hal.h> #include <bus.h> #include "halxbox.h" #include <internal/debug.h> -#define NDEBUG #include <debug.h> /* VARIABLES ***************************************************************/

19 years, 5 months

[hbirr] 16901: If a mutex already exist, open it instead of create.

by hbirr＠svn.reactos.com

If a mutex already exist, open it instead of create. Modified: trunk/reactos/lib/kernel32/synch/mutex.c _____ Modified: trunk/reactos/lib/kernel32/synch/mutex.c --- trunk/reactos/lib/kernel32/synch/mutex.c 2005-07-30 19:00:33 UTC (rev 16900) +++ trunk/reactos/lib/kernel32/synch/mutex.c 2005-07-30 19:03:34 UTC (rev 16901) @@ -92,10 +92,24 @@ MUTEX_ALL_ACCESS, &ObjectAttributes, (BOOLEAN)bInitialOwner); + if (Status == STATUS_OBJECT_NAME_COLLISION) + { + Status = NtOpenMutant(&MutantHandle, + MUTEX_ALL_ACCESS, + &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + if(bInitialOwner) + { + WaitForSingleObject(MutantHandle, INFINITE); + } + SetLastError(ERROR_ALREADY_EXISTS); + } + } if (!NT_SUCCESS(Status)) { - SetLastErrorByStatus(Status); - return NULL; + SetLastErrorByStatus(Status); + return NULL; } return MutantHandle;

19 years, 5 months

[hbirr] 16900: Initialized Basep8BitStringToUnicodeString

by hbirr＠svn.reactos.com

Initialized Basep8BitStringToUnicodeString Modified: trunk/reactos/lib/kernel32/misc/utils.c _____ Modified: trunk/reactos/lib/kernel32/misc/utils.c --- trunk/reactos/lib/kernel32/misc/utils.c 2005-07-30 18:55:25 UTC (rev 16899) +++ trunk/reactos/lib/kernel32/misc/utils.c 2005-07-30 19:00:33 UTC (rev 16900) @@ -15,7 +15,7 @@ /* GLOBALS ******************************************************************/ -PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; +PRTL_CONVERT_STRING Basep8BitStringToUnicodeString = RtlAnsiStringToUnicodeString; /* FUNCTIONS ****************************************************************/ @@ -94,11 +94,11 @@ Status = Basep8BitStringToUnicodeString(UnicodeString, &AnsiString, TRUE); /* Handle failure */ - /* Return Status */ if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status); } + /* Return Status */ return Status; }

19 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005