Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[gedmurphy] 20843: icons are now 16x16, 24x24, 32x32, 48x48

by gedmurphy＠svn.reactos.org

icons are now 16x16, 24x24, 32x32, 48x48 Modified: trunk/reactos/subsys/system/explorer/res/administration.ico Modified: trunk/reactos/subsys/system/explorer/res/config.ico Modified: trunk/reactos/subsys/system/explorer/res/control-panel.ico Modified: trunk/reactos/subsys/system/explorer/res/desktop-settings.ico Modified: trunk/reactos/subsys/system/explorer/res/favorites.ico Modified: trunk/reactos/subsys/system/explorer/res/info.ico Modified: trunk/reactos/subsys/system/explorer/res/logoff.ico Modified: trunk/reactos/subsys/system/explorer/res/minimize.ico Modified: trunk/reactos/subsys/system/explorer/res/network-conns.ico Modified: trunk/reactos/subsys/system/explorer/res/network.ico Modified: trunk/reactos/subsys/system/explorer/res/printer.ico Modified: trunk/reactos/subsys/system/explorer/res/shutdown.ico _____ Modified: trunk/reactos/subsys/system/explorer/res/administration.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/config.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/control-panel.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/desktop-settings.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/favorites.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/info.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/logoff.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/minimize.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/network-conns.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/network.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/printer.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/shutdown.ico (Binary files differ)

18 years, 8 months

[gedmurphy] 20842: Separate mydocs and recent docs resources

by gedmurphy＠svn.reactos.org

Separate mydocs and recent docs resources Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Modified: trunk/reactos/subsys/system/explorer/globals.h Modified: trunk/reactos/subsys/system/explorer/res/documents.ico Added: trunk/reactos/subsys/system/explorer/res/recent-documents.ico Modified: trunk/reactos/subsys/system/explorer/resource.h Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-13 23:28:08 UTC (rev 20841) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-13 23:31:21 UTC (rev 20842) @@ -399,6 +399,7 @@ _icons[ICID_DESKSETTING] = Icon(ICID_DESKSETTING, IDI_DESKSETTING); _icons[ICID_NETCONNS] = Icon(ICID_NETCONNS, IDI_NETCONNS); _icons[ICID_ADMINISTRATION] = Icon(ICID_ADMINISTRATION, IDI_ADMINISTRATION); + _icons[ICID_RECENT] = Icon(ICID_RECENT, IDI_RECENT); } _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-13 23:28:08 UTC (rev 20841) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-13 23:31:21 UTC (rev 20842) @@ -170,8 +170,8 @@ IDI_DESKSETTING ICON DISCARDABLE "res/desktop-settings.ico" IDI_NETCONNS ICON DISCARDABLE "res/network-conns.ico" IDI_ADMINISTRATION ICON DISCARDABLE "res/administration.ico" +IDI_RECENT ICON DISCARDABLE "res/recent-documents.ico" - #endif // Neutral resources //////////////////////////////////////////////////////////////////////// ///// _____ Modified: trunk/reactos/subsys/system/explorer/globals.h --- trunk/reactos/subsys/system/explorer/globals.h 2006-01-13 23:28:08 UTC (rev 20841) +++ trunk/reactos/subsys/system/explorer/globals.h 2006-01-13 23:31:21 UTC (rev 20842) @@ -87,6 +87,7 @@ ICID_DESKSETTING, ICID_NETCONNS, ICID_ADMINISTRATION, + ICID_RECENT, ICID_DYNAMIC }; _____ Modified: trunk/reactos/subsys/system/explorer/res/documents.ico (Binary files differ) _____ Added: trunk/reactos/subsys/system/explorer/res/recent-documents.ico (Binary files differ) Property changes on: trunk/reactos/subsys/system/explorer/res/recent-documents.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Modified: trunk/reactos/subsys/system/explorer/resource.h --- trunk/reactos/subsys/system/explorer/resource.h 2006-01-13 23:28:08 UTC (rev 20841) +++ trunk/reactos/subsys/system/explorer/resource.h 2006-01-13 23:31:21 UTC (rev 20842) @@ -122,6 +122,7 @@ #define IDI_DESKSETTING 174 #define IDI_NETCONNS 175 #define IDI_ADMINISTRATION 176 +#define IDI_RECENT 178 #define ID_VIEW_NAME 401 #define ID_VIEW_ALL_ATTRIBUTES 402 #define ID_VIEW_SELECTED_ATTRIBUTES 403 _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-13 23:28:08 UTC (rev 20841) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-13 23:31:21 UTC (rev 20842) @@ -1712,7 +1712,7 @@ #else if (IS_VALUE_ZERO(hkey, _T("NoRecentDocsMenu"))) #endif - AddButton(ResString(IDS_RECENT), ICID_DOCUMENTS, true, IDC_RECENT); + AddButton(ResString(IDS_RECENT), ICID_RECENT, true, IDC_RECENT); AddButton(ResString(IDS_FAVORITES), ICID_FAVORITES, true, IDC_FAVORITES); @@ -2148,14 +2148,14 @@ AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, false, IDC_CONNECTIONS); #else //TODO AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, true, IDC_PRINTERS_MENU); - AddButton(ResString(IDS_CONNECTIONS), ICID_NETCONNS, true, IDC_CONNECTIONS); + AddButton(ResString(IDS_CONNECTIONS), ICID_NETCONNS, false, IDC_CONNECTIONS); #endif AddButton(ResString(IDS_ADMIN), ICID_ADMINISTRATION, true, IDC_ADMIN); #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCONTROLPANEL)) #endif - AddButton(ResString(IDS_SETTINGS_MENU), ICID_CONFIG, true, IDC_SETTINGS_MENU); + AddButton(ResString(IDS_SETTINGS_MENU), ICID_CONFIG, true, IDC_SETTINGS_MENU); AddButton(ResString(IDS_DESKTOPBAR_SETTINGS), ICID_DESKSETTING, false, ID_DESKTOPBAR_SETTINGS);

18 years, 8 months

[navaraf] 20841: Copy the correct number of bytes.

by navaraf＠svn.reactos.org

Copy the correct number of bytes. Modified: trunk/reactos/lib/crt/process/process.c _____ Modified: trunk/reactos/lib/crt/process/process.c --- trunk/reactos/lib/crt/process/process.c 2006-01-13 23:24:39 UTC (rev 20840) +++ trunk/reactos/lib/crt/process/process.c 2006-01-13 23:28:08 UTC (rev 20841) @@ -126,7 +126,7 @@ for(i = 0; argv[i]; i++) { len = _tcslen(argv[i]); - memcpy(ptr, argv[i], len); + memcpy(ptr, argv[i], len * sizeof(_TCHAR)); ptr += len; *ptr++ = delim; } @@ -162,7 +162,7 @@ do { len = _tcslen(arg0); - memcpy(ptr, arg0, len); + memcpy(ptr, arg0, len * sizeof(_TCHAR)); ptr += len; *ptr++ = delim; arg0 = va_arg(alist2, _TCHAR*);

18 years, 8 months

[gedmurphy] 20840: - new icons for all control panel applets.

by gedmurphy＠svn.reactos.org

- new icons for all control panel applets. - icons now include 16x16, 24x24, 32x32 and 48x48 Modified: trunk/reactos/lib/cpl/access/resources/applet.ico Modified: trunk/reactos/lib/cpl/appwiz/resources/applet.ico Modified: trunk/reactos/lib/cpl/control/resources/config.ico Modified: trunk/reactos/lib/cpl/desk/resources/applet.ico Modified: trunk/reactos/lib/cpl/intl/resources/applet.ico Modified: trunk/reactos/lib/cpl/main/resources/keyboard.ico Modified: trunk/reactos/lib/cpl/main/resources/mouse.ico Modified: trunk/reactos/lib/cpl/mmsys/resources/mmsys.ico Modified: trunk/reactos/lib/cpl/ncpa/resources/applet.ico Modified: trunk/reactos/lib/cpl/sysdm/resources/applet.ico Modified: trunk/reactos/lib/cpl/sysdm/resources/devmgr.ico Modified: trunk/reactos/lib/cpl/timedate/resources/applet.ico _____ Modified: trunk/reactos/lib/cpl/access/resources/applet.ico (Binary files differ) _____ Modified: trunk/reactos/lib/cpl/appwiz/resources/applet.ico (Binary files differ) _____ Modified: trunk/reactos/lib/cpl/control/resources/config.ico (Binary files differ) _____ Modified: trunk/reactos/lib/cpl/desk/resources/applet.ico (Binary files differ) _____ Modified: trunk/reactos/lib/cpl/intl/resources/applet.ico (Binary files differ) _____ Modified: trunk/reactos/lib/cpl/main/resources/keyboard.ico (Binary files differ) _____ Modified: trunk/reactos/lib/cpl/main/resources/mouse.ico (Binary files differ) _____ Modified: trunk/reactos/lib/cpl/mmsys/resources/mmsys.ico (Binary files differ) _____ Modified: trunk/reactos/lib/cpl/ncpa/resources/applet.ico (Binary files differ) _____ Modified: trunk/reactos/lib/cpl/sysdm/resources/applet.ico (Binary files differ) _____ Modified: trunk/reactos/lib/cpl/sysdm/resources/devmgr.ico (Binary files differ) _____ Modified: trunk/reactos/lib/cpl/timedate/resources/applet.ico (Binary files differ)

18 years, 8 months

[ion] 20839: - Fix one more leak when converting from non-gui to GUI thread stack.

by ion＠svn.reactos.org

- Fix one more leak when converting from non-gui to GUI thread stack. Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/win32.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-13 21:56:51 UTC (rev 20838) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-13 22:23:31 UTC (rev 20839) @@ -358,6 +358,26 @@ .endfunc +/*++ + * @name KeSwitchKernelStack + * + * The KeSwitchKernelStack routine switches from the current thread's stack + * to the new specified base and limit. + * + * @param StackBase + * Pointer to the new Stack Base of the thread. + * + * @param StackLimit + * Pointer to the new Stack Limit of the thread. + * + * @return The previous Stack Limit of the thread. + * + * @remark This routine should typically only be used when converting from a + * non-GUI to a GUI Thread. The caller is responsible for freeing the + * previous stack. The new stack values MUST be valid before calling + * this routine. + * + *--*/ .globl _KeSwitchKernelStack@8 .func KeSwitchKernelStack@8 _KeSwitchKernelStack@8: @@ -400,7 +420,7 @@ pop edi /* Save old stack base and get new limit/base */ - mov eax, [edx+KTHREAD_STACK_BASE] + mov eax, [edx+KTHREAD_STACK_LIMIT] mov ecx, [esp+12] mov esi, [esp+16] _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2006-01-13 21:56:51 UTC (rev 20838) +++ trunk/reactos/ntoskrnl/ps/kill.c 2006-01-13 22:23:31 UTC (rev 20839) @@ -194,7 +194,7 @@ if(Thread->Tcb.Win32Thread != NULL) ExFreePool (Thread->Tcb.Win32Thread); /* Release the Kernel Stack */ - MmDeleteKernelStack((PVOID)Thread->Tcb.StackLimit, Thread->Tcb.StackLimit); + MmDeleteKernelStack((PVOID)Thread->Tcb.StackLimit, Thread->Tcb.LargeStack); /* Dereference the Process */ ObDereferenceObject(Process); _____ Modified: trunk/reactos/ntoskrnl/ps/win32.c --- trunk/reactos/ntoskrnl/ps/win32.c 2006-01-13 21:56:51 UTC (rev 20838) +++ trunk/reactos/ntoskrnl/ps/win32.c 2006-01-13 22:23:31 UTC (rev 20839) @@ -122,7 +122,7 @@ KeLeaveCriticalRegion(); /* Delete the old stack */ - //MmDeleteKernelStack(OldStack, FALSE); + MmDeleteKernelStack(OldStack, FALSE); } /* This check is bizare. Check out win32k later */

18 years, 8 months

[ion] 20838: - Properly create, grow and delete the kernel stack. Fixes potential memory leaks introduced in 20806. Thanks to Filip for verifying my math.

by ion＠svn.reactos.org

- Properly create, grow and delete the kernel stack. Fixes potential memory leaks introduced in 20806. Thanks to Filip for verifying my math. Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ps/idle.c Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/ps/win32.c _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-13 20:37:55 UTC (rev 20837) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-13 21:56:51 UTC (rev 20838) @@ -853,9 +853,9 @@ Thread->Teb = Teb; /* Set the Thread Stacks */ - Thread->InitialStack = (PCHAR)KernelStack + KERNEL_STACK_SIZE; - Thread->StackBase = (PCHAR)KernelStack + KERNEL_STACK_SIZE; - Thread->StackLimit = (ULONG_PTR)KernelStack; + Thread->InitialStack = (PCHAR)KernelStack; + Thread->StackBase = (PCHAR)KernelStack; + Thread->StackLimit = (ULONG_PTR)KernelStack - KERNEL_STACK_SIZE; Thread->KernelStackResident = TRUE; /* _____ Modified: trunk/reactos/ntoskrnl/ps/idle.c --- trunk/reactos/ntoskrnl/ps/idle.c 2006-01-13 20:37:55 UTC (rev 20837) +++ trunk/reactos/ntoskrnl/ps/idle.c 2006-01-13 21:56:51 UTC (rev 20838) @@ -63,7 +63,7 @@ BOOLEAN First) { PETHREAD Thread; - PVOID KernelStack; + ULONG_PTR KernelStack; extern unsigned int init_stack; Thread = ExAllocatePool(NonPagedPool, sizeof(ETHREAD)); @@ -71,11 +71,11 @@ Thread->ThreadsProcess = Process; if (First) { - KernelStack = (PVOID)init_stack; + KernelStack = init_stack; } else { - KernelStack = MmCreateKernelStack(FALSE); + KernelStack = (ULONG_PTR)MmCreateKernelStack(FALSE) + KERNEL_STACK_SIZE; } KeInitializeThread(&Process->Pcb, &Thread->Tcb, @@ -84,8 +84,7 @@ NULL, NULL, NULL, - KernelStack); - Thread->Tcb.ApcQueueable = TRUE; + (PVOID)KernelStack); InitializeListHead(&Thread->IrpList); *ThreadPtr = Thread; return STATUS_SUCCESS; _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2006-01-13 20:37:55 UTC (rev 20837) +++ trunk/reactos/ntoskrnl/ps/kill.c 2006-01-13 21:56:51 UTC (rev 20838) @@ -194,7 +194,7 @@ if(Thread->Tcb.Win32Thread != NULL) ExFreePool (Thread->Tcb.Win32Thread); /* Release the Kernel Stack */ - //MmDeleteKernelStack((PVOID)Thread->Tcb.StackLimit, FALSE); + MmDeleteKernelStack((PVOID)Thread->Tcb.StackLimit, Thread->Tcb.StackLimit); /* Dereference the Process */ ObDereferenceObject(Process); _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2006-01-13 20:37:55 UTC (rev 20837) +++ trunk/reactos/ntoskrnl/ps/thread.c 2006-01-13 21:56:51 UTC (rev 20838) @@ -116,7 +116,7 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; HANDLE_TABLE_ENTRY CidEntry; - PVOID KernelStack; + ULONG_PTR KernelStack; /* Reference the Process by handle or pointer, depending on what we got */ DPRINT("PspCreateThread: %x, %x, %x\n", ProcessHandle, TargetProcess, ThreadContext); @@ -206,7 +206,7 @@ /* Allocate Stack for non-GUI Thread */ DPRINT("Initialliazing Thread Stack\n"); - KernelStack = MmCreateKernelStack(FALSE); + KernelStack = (ULONG_PTR)MmCreateKernelStack(FALSE) + KERNEL_STACK_SIZE; /* Set the Process CID */ DPRINT("Initialliazing Thread PID and Parent Process\n"); @@ -236,7 +236,7 @@ NULL, ThreadContext, TebBase, - KernelStack); + (PVOID)KernelStack); } else { @@ -254,7 +254,7 @@ StartContext, NULL, NULL, - KernelStack); + (PVOID)KernelStack); } /* @@ -269,10 +269,6 @@ DPRINT("Running Thread Notify \n"); PspRunCreateThreadNotifyRoutines(Thread, TRUE); - /* FIXME: Use Lock */ - DPRINT("Apcs Queueable: %d \n", Thread->Tcb.ApcQueueable); - Thread->Tcb.ApcQueueable = TRUE; - /* Suspend the Thread if we have to */ if (CreateSuspended) { _____ Modified: trunk/reactos/ntoskrnl/ps/win32.c --- trunk/reactos/ntoskrnl/ps/win32.c 2006-01-13 20:37:55 UTC (rev 20837) +++ trunk/reactos/ntoskrnl/ps/win32.c 2006-01-13 21:56:51 UTC (rev 20838) @@ -71,7 +71,8 @@ NTAPI PsConvertToGuiThread(VOID) { - PVOID NewStack, OldStack; + ULONG_PTR NewStack; + PVOID OldStack; PETHREAD Thread = PsGetCurrentThread(); PEPROCESS Process = PsGetCurrentProcess(); NTSTATUS Status; @@ -102,7 +103,7 @@ if (!Thread->Tcb.LargeStack) { /* We don't create one */ - NewStack = MmCreateKernelStack(TRUE); + NewStack = (ULONG_PTR)MmCreateKernelStack(TRUE) + KERNEL_LARGE_STACK_SIZE; if (!NewStack) { /* Panic in user-mode */ @@ -114,8 +115,8 @@ KeEnterCriticalRegion(); /* Switch stacks */ - OldStack = KeSwitchKernelStack((PVOID)((ULONG_PTR)NewStack + 0x3000), - NewStack); + OldStack = KeSwitchKernelStack((PVOID)NewStack, + (PVOID)(NewStack - KERNEL_STACK_SIZE)); /* Leave the critical region */ KeLeaveCriticalRegion();

18 years, 8 months

[gedmurphy] 20837: don't forget the ibrowser toolbar :)

by gedmurphy＠svn.reactos.org

don't forget the ibrowser toolbar :) Modified: trunk/reactos/subsys/system/ibrowser/res/toolbar.bmp _____ Modified: trunk/reactos/subsys/system/ibrowser/res/toolbar.bmp (Binary files differ)

18 years, 8 months

[gedmurphy] 20836: some new toolbar icons

by gedmurphy＠svn.reactos.org

some new toolbar icons Modified: trunk/reactos/subsys/system/explorer/res/toolbar.bmp _____ Modified: trunk/reactos/subsys/system/explorer/res/toolbar.bmp (Binary files differ)

18 years, 8 months

[weiden] 20835: revert my last change

by weiden＠svn.reactos.org

revert my last change Modified: trunk/reactos/lib/crt/crt.xml Modified: trunk/reactos/lib/crt/include/internal/tls.h Modified: trunk/reactos/lib/crt/misc/tls.c Modified: trunk/reactos/lib/crt/process/thread.c Added: trunk/reactos/lib/crt/wine/thread.c _____ Modified: trunk/reactos/lib/crt/crt.xml --- trunk/reactos/lib/crt/crt.xml 2006-01-13 17:32:59 UTC (rev 20834) +++ trunk/reactos/lib/crt/crt.xml 2006-01-13 17:54:37 UTC (rev 20835) @@ -385,6 +385,7 @@ <file>cppexcept.c</file> <file>heap.c</file> <file>scanf.c</file> + <file>thread.c</file> <file>undname.c</file> </directory> </module> _____ Modified: trunk/reactos/lib/crt/include/internal/tls.h --- trunk/reactos/lib/crt/include/internal/tls.h 2006-01-13 17:32:59 UTC (rev 20834) +++ trunk/reactos/lib/crt/include/internal/tls.h 2006-01-13 17:54:37 UTC (rev 20835) @@ -17,10 +17,6 @@ typedef struct _ThreadData { - HANDLE hThread; /* handle to the current thread */ - void (__cdecl *start_address)(void*); /* the start address supplied by _beginthread() */ - void* arglist; /* the argument list supplied by _beginthread() */ - int terrno; /* *nix error code */ unsigned long tdoserrno; /* Win32 error code (for I/O only) */ unsigned __int64 tnext; /* used by rand/srand */ @@ -45,8 +41,7 @@ int CreateThreadData(void); void DestroyThreadData(void); -int SetThreadData(PTHREADDATA ThreadData); -void FreeThreadData(PTHREADDATA ThreadData); +void FreeThreadData(PTHREADDATA ptd); PTHREADDATA GetThreadData(void); #endif /* __MSVCRT_INTERNAL_TLS_H */ _____ Modified: trunk/reactos/lib/crt/misc/tls.c --- trunk/reactos/lib/crt/misc/tls.c 2006-01-13 17:32:59 UTC (rev 20834) +++ trunk/reactos/lib/crt/misc/tls.c 2006-01-13 17:54:37 UTC (rev 20835) @@ -4,7 +4,7 @@ #include <internal/rterror.h> -static DWORD TlsIndex = TLS_OUT_OF_INDEXES; +static unsigned long TlsIndex = (unsigned long)-1; static void InitThreadData(PTHREADDATA ThreadData) @@ -19,38 +19,40 @@ } -int SetThreadData(PTHREADDATA ThreadData) +int CreateThreadData(void) { - if(TlsIndex == TLS_OUT_OF_INDEXES || - !TlsSetValue(TlsIndex, ThreadData)) + PTHREADDATA ThreadData; + + TlsIndex = TlsAlloc(); + if (TlsIndex == (unsigned long)-1) return FALSE; + ThreadData = (PTHREADDATA)calloc(1, sizeof(THREADDATA)); + if (ThreadData == NULL) + return FALSE; + + if(!TlsSetValue(TlsIndex, (LPVOID)ThreadData)) + return FALSE; + InitThreadData(ThreadData); return TRUE; } -int CreateThreadData(void) -{ - TlsIndex = TlsAlloc(); - return (TlsIndex != TLS_OUT_OF_INDEXES); -} - - void DestroyThreadData(void) { - if (TlsIndex != TLS_OUT_OF_INDEXES) + if (TlsIndex != (unsigned long)-1) { TlsFree(TlsIndex); - TlsIndex = TLS_OUT_OF_INDEXES; + TlsIndex = (unsigned long)-1; } } void FreeThreadData(PTHREADDATA ThreadData) { - if (TlsIndex != TLS_OUT_OF_INDEXES) + if (TlsIndex != (unsigned long)-1) { if (ThreadData == NULL) ThreadData = TlsGetValue(TlsIndex); @@ -82,8 +84,6 @@ TlsSetValue(TlsIndex, (LPVOID)ThreadData); InitThreadData(ThreadData); - - ThreadData->hThread = GetCurrentThread(); } else { _____ Modified: trunk/reactos/lib/crt/process/thread.c --- trunk/reactos/lib/crt/process/thread.c 2006-01-13 17:32:59 UTC (rev 20834) +++ trunk/reactos/lib/crt/process/thread.c 2006-01-13 17:54:37 UTC (rev 20835) @@ -1,102 +1,23 @@ #include <precomp.h> -void _endthread(void); - -static DWORD WINAPI -_beginthread_start(PVOID lpParameter) -{ - PTHREADDATA ThreadData = (PTHREADDATA)lpParameter; - - if (SetThreadData(ThreadData)) - { - /* FIXME - wrap start_address in SEH! */ - ThreadData->start_address(ThreadData->arglist); - - _endthread(); - } - else - { - /* couldn't set the thread data, free it before terminating */ - free(ThreadData); - } - - ExitThread(0); -} - - +#if 0 /* - * @implemented - * - * FIXME: the return type should be uintptr_t + * @unimplemented */ unsigned long _beginthread( void (__cdecl *start_address)(void*), unsigned stack_size, void* arglist) { - HANDLE hThread; - PTHREADDATA ThreadData; - - if (start_address == NULL) { - __set_errno(EINVAL); - return (unsigned long)-1; - } - - /* allocate the thread data structure already here instead of allocating the - thread data structure in the thread itself. this way we can pass an error - code to the caller in case we don't have sufficient resources */ - ThreadData = malloc(sizeof(THREADDATA)); - if (ThreadData == NULL) - { - __set_errno(EAGAIN); - return (unsigned long)-1; - } - - ThreadData->start_address = start_address; - ThreadData->arglist = arglist; - - hThread = CreateThread(NULL, - stack_size, - _beginthread_start, - ThreadData, - CREATE_SUSPENDED, - NULL); - if (hThread == NULL) - { - free(ThreadData); - __set_errno(EAGAIN); - return (unsigned long)-1; - } - - ThreadData->hThread = hThread; - - if (ResumeThread(hThread) == (DWORD)-1) - { - CloseHandle(hThread); - - /* freeing the ThreadData _could_ cause a crash, but only in case someone - else resumed the thread and it got to free the context before we actually - get here, but that's _very_ unlikely! */ - free(ThreadData); - __set_errno(EAGAIN); - return (unsigned long)-1; - } - - return (unsigned long)hThread; + __set_errno ( ENOSYS ); + return (unsigned long)-1; } - +#endif /* - * @implemented + * @unimplemented */ void _endthread(void) { - PTHREADDATA ThreadData = GetThreadData(); - - /* close the thread handle */ - CloseHandle(ThreadData->hThread); - - /* NOTE: the thread data will be freed in the thread detach routine that will - call FreeThreadData */ - - ExitThread(0); } + +/* EOF */ _____ Copied: trunk/reactos/lib/crt/wine/thread.c (from rev 20833, trunk/reactos/lib/crt/wine/thread.c)

18 years, 8 months

[weiden] 20834: remove wine's broken _beginthread() and _endthread() and implement them properly

by weiden＠svn.reactos.org

remove wine's broken _beginthread() and _endthread() and implement them properly Modified: trunk/reactos/lib/crt/crt.xml Modified: trunk/reactos/lib/crt/include/internal/tls.h Modified: trunk/reactos/lib/crt/misc/tls.c Modified: trunk/reactos/lib/crt/process/thread.c Deleted: trunk/reactos/lib/crt/wine/thread.c _____ Modified: trunk/reactos/lib/crt/crt.xml --- trunk/reactos/lib/crt/crt.xml 2006-01-13 17:24:06 UTC (rev 20833) +++ trunk/reactos/lib/crt/crt.xml 2006-01-13 17:32:59 UTC (rev 20834) @@ -385,7 +385,6 @@ <file>cppexcept.c</file> <file>heap.c</file> <file>scanf.c</file> - <file>thread.c</file> <file>undname.c</file> </directory> </module> _____ Modified: trunk/reactos/lib/crt/include/internal/tls.h --- trunk/reactos/lib/crt/include/internal/tls.h 2006-01-13 17:24:06 UTC (rev 20833) +++ trunk/reactos/lib/crt/include/internal/tls.h 2006-01-13 17:32:59 UTC (rev 20834) @@ -17,6 +17,10 @@ typedef struct _ThreadData { + HANDLE hThread; /* handle to the current thread */ + void (__cdecl *start_address)(void*); /* the start address supplied by _beginthread() */ + void* arglist; /* the argument list supplied by _beginthread() */ + int terrno; /* *nix error code */ unsigned long tdoserrno; /* Win32 error code (for I/O only) */ unsigned __int64 tnext; /* used by rand/srand */ @@ -41,7 +45,8 @@ int CreateThreadData(void); void DestroyThreadData(void); -void FreeThreadData(PTHREADDATA ptd); +int SetThreadData(PTHREADDATA ThreadData); +void FreeThreadData(PTHREADDATA ThreadData); PTHREADDATA GetThreadData(void); #endif /* __MSVCRT_INTERNAL_TLS_H */ _____ Modified: trunk/reactos/lib/crt/misc/tls.c --- trunk/reactos/lib/crt/misc/tls.c 2006-01-13 17:24:06 UTC (rev 20833) +++ trunk/reactos/lib/crt/misc/tls.c 2006-01-13 17:32:59 UTC (rev 20834) @@ -4,7 +4,7 @@ #include <internal/rterror.h> -static unsigned long TlsIndex = (unsigned long)-1; +static DWORD TlsIndex = TLS_OUT_OF_INDEXES; static void InitThreadData(PTHREADDATA ThreadData) @@ -19,40 +19,38 @@ } -int CreateThreadData(void) +int SetThreadData(PTHREADDATA ThreadData) { - PTHREADDATA ThreadData; - - TlsIndex = TlsAlloc(); - if (TlsIndex == (unsigned long)-1) + if(TlsIndex == TLS_OUT_OF_INDEXES || + !TlsSetValue(TlsIndex, ThreadData)) return FALSE; - ThreadData = (PTHREADDATA)calloc(1, sizeof(THREADDATA)); - if (ThreadData == NULL) - return FALSE; - - if(!TlsSetValue(TlsIndex, (LPVOID)ThreadData)) - return FALSE; - InitThreadData(ThreadData); return TRUE; } +int CreateThreadData(void) +{ + TlsIndex = TlsAlloc(); + return (TlsIndex != TLS_OUT_OF_INDEXES); +} + + void DestroyThreadData(void) { - if (TlsIndex != (unsigned long)-1) + if (TlsIndex != TLS_OUT_OF_INDEXES) { TlsFree(TlsIndex); - TlsIndex = (unsigned long)-1; + TlsIndex = TLS_OUT_OF_INDEXES; } } void FreeThreadData(PTHREADDATA ThreadData) { - if (TlsIndex != (unsigned long)-1) + if (TlsIndex != TLS_OUT_OF_INDEXES) { if (ThreadData == NULL) ThreadData = TlsGetValue(TlsIndex); @@ -84,6 +82,8 @@ TlsSetValue(TlsIndex, (LPVOID)ThreadData); InitThreadData(ThreadData); + + ThreadData->hThread = GetCurrentThread(); } else { _____ Modified: trunk/reactos/lib/crt/process/thread.c --- trunk/reactos/lib/crt/process/thread.c 2006-01-13 17:24:06 UTC (rev 20833) +++ trunk/reactos/lib/crt/process/thread.c 2006-01-13 17:32:59 UTC (rev 20834) @@ -1,23 +1,102 @@ #include <precomp.h> -#if 0 +void _endthread(void); + +static DWORD WINAPI +_beginthread_start(PVOID lpParameter) +{ + PTHREADDATA ThreadData = (PTHREADDATA)lpParameter; + + if (SetThreadData(ThreadData)) + { + /* FIXME - wrap start_address in SEH! */ + ThreadData->start_address(ThreadData->arglist); + + _endthread(); + } + else + { + /* couldn't set the thread data, free it before terminating */ + free(ThreadData); + } + + ExitThread(0); +} + + /* - * @unimplemented + * @implemented + * + * FIXME: the return type should be uintptr_t */ unsigned long _beginthread( void (__cdecl *start_address)(void*), unsigned stack_size, void* arglist) { - __set_errno ( ENOSYS ); - return (unsigned long)-1; + HANDLE hThread; + PTHREADDATA ThreadData; + + if (start_address == NULL) { + __set_errno(EINVAL); + return (unsigned long)-1; + } + + /* allocate the thread data structure already here instead of allocating the + thread data structure in the thread itself. this way we can pass an error + code to the caller in case we don't have sufficient resources */ + ThreadData = malloc(sizeof(THREADDATA)); + if (ThreadData == NULL) + { + __set_errno(EAGAIN); + return (unsigned long)-1; + } + + ThreadData->start_address = start_address; + ThreadData->arglist = arglist; + + hThread = CreateThread(NULL, + stack_size, + _beginthread_start, + ThreadData, + CREATE_SUSPENDED, + NULL); + if (hThread == NULL) + { + free(ThreadData); + __set_errno(EAGAIN); + return (unsigned long)-1; + } + + ThreadData->hThread = hThread; + + if (ResumeThread(hThread) == (DWORD)-1) + { + CloseHandle(hThread); + + /* freeing the ThreadData _could_ cause a crash, but only in case someone + else resumed the thread and it got to free the context before we actually + get here, but that's _very_ unlikely! */ + free(ThreadData); + __set_errno(EAGAIN); + return (unsigned long)-1; + } + + return (unsigned long)hThread; } -#endif + /* - * @unimplemented + * @implemented */ void _endthread(void) { + PTHREADDATA ThreadData = GetThreadData(); + + /* close the thread handle */ + CloseHandle(ThreadData->hThread); + + /* NOTE: the thread data will be freed in the thread detach routine that will + call FreeThreadData */ + + ExitThread(0); } - -/* EOF */ _____ Deleted: trunk/reactos/lib/crt/wine/thread.c --- trunk/reactos/lib/crt/wine/thread.c 2006-01-13 17:24:06 UTC (rev 20833) +++ trunk/reactos/lib/crt/wine/thread.c 2006-01-13 17:32:59 UTC (rev 20834) @@ -1,108 +0,0 @@ -/* - * msvcrt.dll thread functions - * - * Copyright 2000 Jon Griffiths - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <precomp.h> -#include <internal/wine/msvcrt.h> - -#include <malloc.h> -#include <process.h> - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); - -void _amsg_exit (int errnum); -/* Index to TLS */ -DWORD MSVCRT_tls_index; - -typedef void (*_beginthread_start_routine_t)(void *); -typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *); - -/********************************************************************/ - -typedef struct { - _beginthread_start_routine_t start_address; - void *arglist; -} _beginthread_trampoline_t; - -/********************************************************************* - * msvcrt_get_thread_data - * - * Return the thread local storage structure. - */ -MSVCRT_thread_data *msvcrt_get_thread_data(void) -{ - MSVCRT_thread_data *ptr; - DWORD err = GetLastError(); /* need to preserve last error */ - - if (!(ptr = TlsGetValue( MSVCRT_tls_index ))) - { - if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) - _amsg_exit( _RT_THREAD ); - if (!TlsSetValue( MSVCRT_tls_index, ptr )) - _amsg_exit( _RT_THREAD ); - if (!TlsSetValue( MSVCRT_tls_index, ptr )) - _amsg_exit( _RT_THREAD ); - } - SetLastError( err ); - return ptr; -} - -/********************************************************************* - * _beginthread_trampoline - */ -static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) -{ - _beginthread_trampoline_t local_trampoline; - - /* Maybe it's just being paranoid, but freeing arg right - * away seems safer. - */ - memcpy(&local_trampoline,arg,sizeof(local_trampoline)); - free(arg); - - local_trampoline.start_address(local_trampoline.arglist); - return 0; -} - -/********************************************************************* - * _beginthread (MSVCRT.@) - */ -unsigned long _beginthread( - _beginthread_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ - unsigned int stack_size, /* [in] Stack size for new thread or 0 */ - void *arglist) /* [in] Argument list to be passed to new thread or NULL */ -{ - _beginthread_trampoline_t* trampoline; - - TRACE("(%p, %d, %p)\n", start_address, stack_size, arglist); - - /* Allocate the trampoline here so that it is still valid when the thread - * starts... typically after this function has returned. - * _beginthread_trampoline is responsible for freeing the trampoline - */ - trampoline=malloc(sizeof(*trampoline)); - trampoline->start_address = start_address; - trampoline->arglist = arglist; - - /* FIXME */ - return (unsigned long)CreateThread(NULL, stack_size, _beginthread_trampoline, - trampoline, 0, NULL); -}

18 years, 8 months

← Newer
1
...
22
23
24
25
26
27
28
...
59
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 January 2006