Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[weiden] 18188: check for and write new lines as ascii only in copy /A, regardless of whether cmd was compiled as unicode or ansi

by weiden＠svn.reactos.com

check for and write new lines as ascii only in copy /A, regardless of whether cmd was compiled as unicode or ansi Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-10-01 12:21:55 UTC (rev 18187) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-10-01 12:50:16 UTC (rev 18188) @@ -240,7 +240,8 @@ { for (i = 0; i < dwRead; i++) { - if (((LPTSTR)buffer)[i] == 0x1A) + /* we're dealing with ASCII files! */ + if (((LPSTR)buffer)[i] == 0x1A) { bEof = TRUE; break; @@ -273,12 +274,13 @@ if (lpdwFlags & COPY_ASCII) { - ((LPTSTR)buffer)[0] = 0x1A; - ((LPTSTR)buffer)[1] = _T('\0'); + /* we're dealing with ASCII files! */ + ((LPSTR)buffer)[0] = 0x1A; + ((LPSTR)buffer)[1] = '\0'; #ifdef _DEBUG DebugPrintf (_T("appending ^Z\n")); #endif - WriteFile (hFileDest, buffer, sizeof(TCHAR), &dwWritten, NULL); + WriteFile (hFileDest, buffer, sizeof(CHAR), &dwWritten, NULL); } free (buffer);

19 years, 2 months

[weiden] 18187: fixed possible buffer overflow bug: pass correct buffer length (in characters, not bytes) to FileGetString()

by weiden＠svn.reactos.com

fixed possible buffer overflow bug: pass correct buffer length (in characters, not bytes) to FileGetString() Modified: trunk/reactos/subsys/system/cmd/batch.c Modified: trunk/reactos/subsys/system/cmd/goto.c Modified: trunk/reactos/subsys/system/cmd/misc.c _____ Modified: trunk/reactos/subsys/system/cmd/batch.c --- trunk/reactos/subsys/system/cmd/batch.c 2005-10-01 10:10:39 UTC (rev 18186) +++ trunk/reactos/subsys/system/cmd/batch.c 2005-10-01 12:21:55 UTC (rev 18187) @@ -408,7 +408,7 @@ return textline; } - if (!FileGetString (bc->hBatchFile, textline, sizeof (textline))) + if (!FileGetString (bc->hBatchFile, textline, sizeof (textline) / sizeof (textline[0]))) { #ifdef _DEBUG DebugPrintf (_T("ReadBatchLine(): Reached EOF!\n")); _____ Modified: trunk/reactos/subsys/system/cmd/goto.c --- trunk/reactos/subsys/system/cmd/goto.c 2005-10-01 10:10:39 UTC (rev 18186) +++ trunk/reactos/subsys/system/cmd/goto.c 2005-10-01 12:21:55 UTC (rev 18187) @@ -85,7 +85,7 @@ /* jump to begin of the file */ SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_BEGIN); - while (FileGetString (bc->hBatchFile, textline, sizeof(textline))) + while (FileGetString (bc->hBatchFile, textline, sizeof(textline) / sizeof(textline[0]))) { int pos; int size; _____ Modified: trunk/reactos/subsys/system/cmd/misc.c --- trunk/reactos/subsys/system/cmd/misc.c 2005-10-01 10:10:39 UTC (rev 18186) +++ trunk/reactos/subsys/system/cmd/misc.c 2005-10-01 12:21:55 UTC (rev 18187) @@ -381,13 +381,12 @@ while ((--nBufferLength > 0) && ReadFile(hFile, &ch, 1, &dwRead, NULL) && dwRead) { - if ((ch == '\n') || (ch == '\r')) + lpString[len++] = ch; + if ((ch == '\n') || (ch == '\r')) { - /* read it*/ - lpString[len++] = ch; + /* break at new line*/ break; } - lpString[len++] = ch; } if (!dwRead && !len)

19 years, 2 months

[mf] 18186: sync with Wine:

by mf＠svn.reactos.com

sync with Wine: Alexandre Julliard, 2005-09-07: Replace a few more direct lpVtbl accesses by the proper macros. (patch applied only partly - the remaining COBJ macros are nonstandard, and don't exist in MSDN) Alexandre Julliard, 2005-09-09: Use Get/SetWindowLongPtr instead of Get/SetWindowLong where appropriate. Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-10-01 08:58:49 UTC (rev 18185) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-10-01 10:10:39 UTC (rev 18186) @@ -28,6 +28,8 @@ #include <dirent.h> #endif +#define COBJMACROS + #include "winefile.h" #include "resource.h" @@ -306,10 +308,10 @@ DestroyIcon(entry->hicon); if (entry->folder && entry->folder!=Globals.iDesktop) - (*entry->folder->lpVtbl->Release)(entry->folder); + IShellFolder_Release(entry->folder); if (entry->pidl) - (*Globals.iMalloc->lpVtbl->Free)(Globals.iMalloc, entry->pidl); + IMalloc_Free(Globals.iMalloc, entry->pidl); #endif free(entry); @@ -664,7 +666,7 @@ static void free_strret(STRRET* str) { if (str->uType == STRRET_WSTR) - (*Globals.iMalloc->lpVtbl->Free)(Globals.iMalloc, str->UNION_MEMBER(pOleStr)); + IMalloc_Free(Globals.iMalloc, str->UNION_MEMBER(pOleStr)); } @@ -702,7 +704,7 @@ STRRET str; /* SHGDN_FORPARSING: get full path of id list */ - HRESULT hr = (*folder->lpVtbl->GetDisplayNameOf)(folder, pidl, SHGDN_FORPARSING, &str); + HRESULT hr = IShellFolder_GetDisplayNameOf(folder, pidl, SHGDN_FORPARSING, &str); if (SUCCEEDED(hr)) { get_strretA(&str, &pidl->mkid, buffer, len); @@ -747,7 +749,7 @@ { STRRET str; - HRESULT hr = (*folder->lpVtbl->GetDisplayNameOf)(folder, pidl, flags, &str); + HRESULT hr = IShellFolder_GetDisplayNameOf(folder, pidl, flags, &str); if (SUCCEEDED(hr)) { get_strret(&str, &pidl->mkid, buffer, len); @@ -764,7 +766,7 @@ STRRET str; /* SHGDN_FORPARSING: get full path of id list */ - HRESULT hr = (*folder->lpVtbl->GetDisplayNameOf)(folder, pidl, SHGDN_FORPARSING, &str); + HRESULT hr = IShellFolder_GetDisplayNameOf(folder, pidl, SHGDN_FORPARSING, &str); if (SUCCEEDED(hr)) { get_strretW(&str, &pidl->mkid, buffer, len); @@ -791,7 +793,7 @@ MultiByteToWideChar(CP_ACP, 0, path, -1, buffer, MAX_PATH); #endif - hr = (*Globals.iDesktop->lpVtbl->ParseDisplayName)(Globals.iDesktop, hwnd, NULL, buffer, &len, &pidl, NULL); + hr = IShellFolder_ParseDisplayName(Globals.iDesktop, hwnd, NULL, buffer, &len, &pidl, NULL); if (FAILED(hr)) return NULL; @@ -813,7 +815,7 @@ LPITEMIDLIST pidl; ULONG len; - hr = (*Globals.iDesktop->lpVtbl->ParseDisplayName)(Globals.iDesktop, hwnd, NULL, buffer, &len, &pidl, NULL); + hr = IShellFolder_ParseDisplayName(Globals.iDesktop, hwnd, NULL, buffer, &len, &pidl, NULL); if (SUCCEEDED(hr)) return pidl; @@ -835,7 +837,7 @@ { IExtractIcon* pExtract; - if (SUCCEEDED((*folder->lpVtbl->GetUIObjectOf)(folder, 0, 1, (LPCITEMIDLIST*)&pidl, &IID_IExtractIcon, 0, (LPVOID*)&pExtract))) { + if (SUCCEEDED(IShellFolder_GetUIObjectOf(folder, 0, 1, (LPCITEMIDLIST*)&pidl, &IID_IExtractIcon, 0, (LPVOID*)&pExtract))) { TCHAR path[_MAX_PATH]; unsigned flags; HICON hicon; @@ -903,11 +905,11 @@ break; /* copy first element of item idlist */ - next_pidl = (*Globals.iMalloc->lpVtbl->Alloc)(Globals.iMalloc, pidl->mkid.cb+sizeof(USHORT)); + next_pidl = IMalloc_Alloc(Globals.iMalloc, pidl->mkid.cb+sizeof(USHORT)); memcpy(next_pidl, pidl, pidl->mkid.cb); ((LPITEMIDLIST)((LPBYTE)next_pidl+pidl->mkid.cb))->mkid.cb = 0; - hr = (*folder->lpVtbl->BindToObject)(folder, next_pidl, 0, &IID_IShellFolder, (void**)&child); + hr = IShellFolder_BindToObject(folder, next_pidl, 0, &IID_IShellFolder, (void**)&child); if (!SUCCEEDED(hr)) break; @@ -943,12 +945,12 @@ STGMEDIUM medium = {0, {0}, 0}; FORMATETC fmt = {Globals.cfStrFName, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL}; - HRESULT hr = (*folder->lpVtbl->GetUIObjectOf)(folder, 0, 1, &pidl, &IID_IDataObject, 0, (LPVOID*)&pDataObj); + HRESULT hr = IShellFolder_GetUIObjectOf(folder, 0, 1, &pidl, &IID_IDataObject, 0, (LPVOID*)&pDataObj); if (SUCCEEDED(hr)) { - hr = (*pDataObj->lpVtbl->GetData)(pDataObj, &fmt, &medium); + hr = IDataObject_GetData(pDataObj, &fmt, &medium); - (*pDataObj->lpVtbl->Release)(pDataObj); + IDataObject_Release(pDataObj); if (SUCCEEDED(hr)) { LPCTSTR path = (LPCTSTR)GlobalLock(medium.UNION_MEMBER(hGlobal)); @@ -1001,7 +1003,7 @@ if (!folder) return; - hr = (*folder->lpVtbl->EnumObjects)(folder, hwnd, SHCONTF_FOLDERS|SHCONTF_NONFOLDERS|SHCONTF_INCLUDEHIDDEN|SHCONTF_SHAREAB LE|SHCONTF_STORAGE, &idlist); + hr = IShellFolder_EnumObjects(folder, hwnd, SHCONTF_FOLDERS|SHCONTF_NONFOLDERS|SHCONTF_INCLUDEHIDDEN|SHCONTF_SHAREAB LE|SHCONTF_STORAGE, &idlist); if (SUCCEEDED(hr)) { for(;;) { @@ -1013,7 +1015,7 @@ memset(pidls, 0, sizeof(pidls)); - hr = (*idlist->lpVtbl->Next)(idlist, FETCH_ITEM_COUNT, pidls, &cnt); + hr = IEnumIDList_Next(idlist, FETCH_ITEM_COUNT, pidls, &cnt); if (!SUCCEEDED(hr)) break; @@ -1034,7 +1036,7 @@ attribs = ~SFGAO_FILESYSTEM; /*SFGAO_HASSUBFOLDER|SFGAO_FOLDER; SFGAO_FILESYSTEM sorgt daf³r, da? "My Documents" anstatt von "Martin's Documents" angezeigt wird */ - hr = (*folder->lpVtbl->GetAttributesOf)(folder, 1, (LPCITEMIDLIST*)&pidls[n], &attribs); + hr = IShellFolder_GetAttributesOf(folder, 1, (LPCITEMIDLIST*)&pidls[n], &attribs); if (SUCCEEDED(hr)) { if (attribs != (SFGAOF)~SFGAO_FILESYSTEM) { @@ -1049,7 +1051,7 @@ entry->pidl = pidls[n]; if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - hr = (*folder->lpVtbl->BindToObject)(folder, pidls[n], 0, &IID_IShellFolder, (void**)&child); + hr = IShellFolder_BindToObject(folder, pidls[n], 0, &IID_IShellFolder, (void**)&child); if (SUCCEEDED(hr)) entry->folder = child; @@ -1086,7 +1088,7 @@ } } - (*idlist->lpVtbl->Release)(idlist); + IEnumIDList_Release(idlist); } if (last) @@ -1491,7 +1493,7 @@ attribs = 0; if (dir->folder) - hr = (*dir->folder->lpVtbl->GetAttributesOf)(dir->folder, 1, (LPCITEMIDLIST*)&dir->pidl, &attribs); + hr = IShellFolder_GetAttributesOf(dir->folder, 1, (LPCITEMIDLIST*)&dir->pidl, &attribs); if (SUCCEEDED(hr) && (attribs&SFGAO_FILESYSTEM)) { IShellFolder* parent = dir->up? dir->up->folder: Globals.iDesktop; @@ -1617,7 +1619,7 @@ newchild = NULL; child->hwnd = (HWND) wparam; - SetWindowLong(child->hwnd, GWL_USERDATA, (LPARAM)child); + SetWindowLongPtr(child->hwnd, GWLP_USERDATA, (LPARAM)child); } return CallNextHookEx(hcbthook, code, wparam, lparam); @@ -1697,7 +1699,7 @@ switch(nmsg) { case WM_INITDIALOG: - SetWindowLong(hwnd, GWL_USERDATA, lparam); + SetWindowLongPtr(hwnd, GWLP_USERDATA, lparam); SetWindowText(GetDlgItem(hwnd, 201), (LPCTSTR)lparam); return 1; @@ -1706,7 +1708,7 @@ switch(id) { case IDOK: { - LPTSTR dest = (LPTSTR) GetWindowLong(hwnd, GWL_USERDATA); + LPTSTR dest = (LPTSTR) GetWindowLongPtr(hwnd, GWLP_USERDATA); GetWindowText(GetDlgItem(hwnd, 201), dest, MAX_PATH); EndDialog(hwnd, id); break;} @@ -2084,7 +2086,7 @@ /* search for a already open window for the same drive */ for(child_wnd=GetNextWindow(Globals.hmdiclient,GW_CHILD); child_wnd; child_wnd=GetNextWindow(child_wnd, GW_HWNDNEXT)) { - ChildWnd* child = (ChildWnd*) GetWindowLong(child_wnd, GWL_USERDATA); + ChildWnd* child = (ChildWnd*) GetWindowLongPtr(child_wnd, GWLP_USERDATA); if (child) { _tsplitpath(child->root.path, drv2, 0, 0, 0); @@ -2109,7 +2111,7 @@ /* search for a already open window of the given file system name */ for(child_wnd=GetNextWindow(Globals.hmdiclient,GW_CHILD); child_wnd; child_wnd=GetNextWindow(child_wnd, GW_HWNDNEXT)) { - ChildWnd* child = (ChildWnd*) GetWindowLong(child_wnd, GWL_USERDATA); + ChildWnd* child = (ChildWnd*) GetWindowLongPtr(child_wnd, GWLP_USERDATA); if (child) { if (!lstrcmpi(child->root.fs, filesys)) { @@ -2256,7 +2258,7 @@ /* change font in all open child windows */ for(childWnd=GetWindow(Globals.hmdiclient,GW_CHILD); childWnd; childWnd=GetNextWindow(childWnd,GW_HWNDNEXT)) { - ChildWnd* child = (ChildWnd*) GetWindowLong(childWnd, GWL_USERDATA); + ChildWnd* child = (ChildWnd*) GetWindowLongPtr(childWnd, GWLP_USERDATA); SetWindowFont(child->left.hwnd, Globals.hfont, TRUE); SetWindowFont(child->right.hwnd, Globals.hfont, TRUE); ListBox_SetItemHeight(child->left.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); @@ -2869,7 +2871,7 @@ LBS_DISABLENOSCROLL|LBS_NOINTEGRALHEIGHT|LBS_OWNERDRAWFIXED|LBS_NOTIFY, 0, 0, 0, 0, parent, (HMENU)id, Globals.hInstance, 0); - SetWindowLong(pane->hwnd, GWL_USERDATA, (LPARAM)pane); + SetWindowLongPtr(pane->hwnd, GWLP_USERDATA, (LPARAM)pane); g_orgTreeWndProc = SubclassWindow(pane->hwnd, TreeWndProc); SetWindowFont(pane->hwnd, Globals.hfont, FALSE); @@ -3881,7 +3883,7 @@ } if (shexinfo.lpIDList != entry->pidl) - (*Globals.iMalloc->lpVtbl->Free)(Globals.iMalloc, shexinfo.lpIDList); + IMalloc_Free(Globals.iMalloc, shexinfo.lpIDList); return ret; } @@ -4081,15 +4083,15 @@ CtxMenu_reset(); #ifndef __MINGW32__ /* IContextMenu3 missing in MinGW (as of 6.2.2005) */ - if ((*pcm1->lpVtbl->QueryInterface)(pcm1, &IID_IContextMenu3, (void**)&pcm) == NOERROR) + if (IUnknown_QueryInterface(pcm1, &IID_IContextMenu3, (void**)&pcm) == NOERROR) s_pctxmenu3 = (LPCONTEXTMENU3)pcm; else #endif - if ((*pcm1->lpVtbl->QueryInterface)(pcm1, &IID_IContextMenu2, (void**)&pcm) == NOERROR) + if (IUnknown_QueryInterface(pcm1, &IID_IContextMenu2, (void**)&pcm) == NOERROR) s_pctxmenu2 = (LPCONTEXTMENU2)pcm; if (pcm) { - (*pcm1->lpVtbl->Release)(pcm1); + IUnknown_Release(pcm1); return pcm; } else return pcm1; @@ -4117,7 +4119,7 @@ IContextMenu* pcm; BOOL executed = FALSE; - HRESULT hr = (*shell_folder->lpVtbl->GetUIObjectOf)(shell_folder, hwndParent, cidl, apidl, &IID_IContextMenu, NULL, (LPVOID*)&pcm); + HRESULT hr = IShellFolder_GetUIObjectOf(shell_folder, hwndParent, cidl, apidl, &IID_IContextMenu, NULL, (LPVOID*)&pcm); /* HRESULT hr = CDefFolderMenu_Create2(dir?dir->_pidl:DesktopFolder(), hwndParent, 1, &pidl, shell_folder, NULL, 0, NULL, &pcm); */ if (SUCCEEDED(hr)) { @@ -4153,7 +4155,7 @@ CtxMenu_reset(); } - (*pcm->lpVtbl->Release)(pcm); + IUnknown_Release(pcm); } return FAILED(hr)? hr: executed? S_OK: S_FALSE; @@ -4162,7 +4164,7 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { - ChildWnd* child = (ChildWnd*) GetWindowLong(hwnd, GWL_USERDATA); + ChildWnd* child = (ChildWnd*) GetWindowLongPtr(hwnd, GWLP_USERDATA); ASSERT(child); switch(nmsg) { @@ -4185,7 +4187,7 @@ case WM_NCDESTROY: free_child_window(child); - SetWindowLong(hwnd, GWL_USERDATA, 0); + SetWindowLongPtr(hwnd, GWLP_USERDATA, 0); break; case WM_PAINT: { @@ -4494,10 +4496,10 @@ if (ShellFolderContextMenu(parentFolder, hwnd, 1, &pidlLast, pt.x, pt.y) == S_OK) refresh_child(child); - (*parentFolder->lpVtbl->Release)(parentFolder); + IShellFolder_Release(parentFolder); } - (*Globals.iMalloc->lpVtbl->Free)(Globals.iMalloc, pidl_abs); + IMalloc_Free(Globals.iMalloc, pidl_abs); } } break;} @@ -4546,8 +4548,8 @@ static LRESULT CALLBACK TreeWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { - ChildWnd* child = (ChildWnd*) GetWindowLong(GetParent(hwnd), GWL_USERDATA); - Pane* pane = (Pane*) GetWindowLong(hwnd, GWL_USERDATA); + ChildWnd* child = (ChildWnd*) GetWindowLongPtr(GetParent(hwnd), GWLP_USERDATA); + Pane* pane = (Pane*) GetWindowLongPtr(hwnd, GWLP_USERDATA); ASSERT(child); switch(nmsg) { @@ -4773,8 +4775,8 @@ static void ExitInstance(void) { #ifdef _SHELL_FOLDERS - (*Globals.iDesktop->lpVtbl->Release)(Globals.iDesktop); - (*Globals.iMalloc->lpVtbl->Release)(Globals.iMalloc); + IShellFolder_Release(Globals.iDesktop); + IMalloc_Release(Globals.iMalloc); CoUninitialize(); #endif

19 years, 2 months

[ion] 18185: - Remove some duplicated/useless code and use internal forward exports instead.

by ion＠svn.reactos.com

- Remove some duplicated/useless code and use internal forward exports instead. - Set kernel apc pending flag when needed in KeReleaseMutant - Optimize check for kernel apc delivery in KeReleaseMutant - Raise right exception in KeReleaseMutant - Simplify KeInitializeMutant and remove some duplicated operations. - Remove duplicated listhead initialization in KeInitiializeMutex - Use correct increment in KeReleaseMutex Modified: trunk/reactos/ntoskrnl/ke/mutex.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def _____ Modified: trunk/reactos/ntoskrnl/ke/mutex.c --- trunk/reactos/ntoskrnl/ke/mutex.c 2005-10-01 08:20:12 UTC (rev 18184) +++ trunk/reactos/ntoskrnl/ke/mutex.c 2005-10-01 08:58:49 UTC (rev 18185) @@ -27,33 +27,30 @@ KeInitializeMutant(IN PKMUTANT Mutant, IN BOOLEAN InitialOwner) { - ULONG Signaled = TRUE; - PKTHREAD CurrentThread = NULL; + PKTHREAD CurrentThread; KIRQL OldIrql; - DPRINT("KeInitializeMutant: %x\n", Mutant); /* Check if we have an initial owner */ - if (InitialOwner == TRUE) { - - /* In this case, the object is not signaled */ - Signaled = FALSE; - + if (InitialOwner == TRUE) + { /* We also need to associate a thread */ CurrentThread = KeGetCurrentThread(); + Mutant->OwnerThread = CurrentThread; /* We're about to touch the Thread, so lock the Dispatcher */ OldIrql = KeAcquireDispatcherDatabaseLock(); /* And insert it into its list */ - InsertTailList(&CurrentThread->MutantListHead, &Mutant->MutantListEntry); + InsertTailList(&CurrentThread->MutantListHead, + &Mutant->MutantListEntry); /* Release Dispatcher Lock */ KeReleaseDispatcherDatabaseLock(OldIrql); DPRINT("Mutant with Initial Owner\n"); - - } else { - + } + else + { /* In this case, we don't have an owner yet */ Mutant->OwnerThread = NULL; } @@ -62,10 +59,9 @@ KeInitializeDispatcherHeader(&Mutant->Header, MutantObject, sizeof(KMUTANT) / sizeof(ULONG), - Signaled); + InitialOwner ? FALSE : TRUE); /* Initialize the default data */ - Mutant->OwnerThread = CurrentThread; Mutant->Abandoned = FALSE; Mutant->ApcDisable = 0; } @@ -80,18 +76,16 @@ { DPRINT("KeInitializeMutex: %x\n", Mutex); - /* Set up the Dispatcher Header */ KeInitializeDispatcherHeader(&Mutex->Header, MutantObject, sizeof(KMUTEX) / sizeof(ULONG), - 1); + TRUE); /* Initialize the default data */ Mutex->OwnerThread = NULL; Mutex->Abandoned = FALSE; Mutex->ApcDisable = 1; - InitializeListHead(&Mutex->Header.WaitListHead); } /* @@ -110,17 +104,6 @@ */ LONG STDCALL -KeReadStateMutex(IN PKMUTEX Mutex) -{ - /* Return the Signal State */ - return(Mutex->Header.SignalState); -} - -/* - * @implemented - */ -LONG -STDCALL KeReleaseMutant(IN PKMUTANT Mutant, IN KPRIORITY Increment, IN BOOLEAN Abandon, @@ -129,7 +112,6 @@ KIRQL OldIrql; LONG PreviousState; PKTHREAD CurrentThread = KeGetCurrentThread(); - DPRINT("KeReleaseMutant: %x\n", Mutant); /* Lock the Dispatcher Database */ @@ -139,22 +121,26 @@ PreviousState = Mutant->Header.SignalState; /* Check if it is to be abandonned */ - if (Abandon == FALSE) { - + if (Abandon == FALSE) + { /* Make sure that the Owner Thread is the current Thread */ - if (Mutant->OwnerThread != CurrentThread) { + if (Mutant->OwnerThread != CurrentThread) + { + DPRINT1("Trying to touch a Mutant that the caller doesn't own!\n"); + /* Release the lock */ KeReleaseDispatcherDatabaseLock(OldIrql); - DPRINT1("Trying to touch a Mutant that the caller doesn't own!\n"); - ExRaiseStatus(STATUS_MUTANT_NOT_OWNED); + /* Raise an exception */ + ExRaiseStatus(Mutant->Abandoned ? STATUS_ABANDONED : + STATUS_MUTANT_NOT_OWNED); } /* If the thread owns it, then increase the signal state */ Mutant->Header.SignalState++; - - } else { - + } + else + { /* It's going to be abandonned */ DPRINT("Abandonning the Mutant\n"); Mutant->Header.SignalState = 1; @@ -162,25 +148,28 @@ } /* Check if the signal state is only single */ - if (Mutant->Header.SignalState == 1) { - + if (Mutant->Header.SignalState == 1) + { /* Check if it's below 0 now */ - if (PreviousState <= 0) { - + if (PreviousState <= 0) + { /* Remove the mutant from the list */ - DPRINT("Removing Mutant\n"); + DPRINT("Removing Mutant %p\n", Mutant); RemoveEntryList(&Mutant->MutantListEntry); /* Reenable APCs */ DPRINT("Re-enabling APCs\n"); CurrentThread->KernelApcDisable += Mutant->ApcDisable; - /* Force an Interrupt if Apcs are pending */ - if (!IsListEmpty(&CurrentThread->ApcState.ApcListHead[KernelMode])) { + /* Check if the thread has APCs enabled */ + if (!CurrentThread->KernelApcDisable) + { + /* Check if any are pending */ + if (!IsListEmpty(&CurrentThread->ApcState.ApcListHead[KernelMode])) + { + /* Set Kernel APC Pending */ + CurrentThread->ApcState.KernelApcPending = TRUE; - /* Make sure they aren't disabled though */ - if (!CurrentThread->KernelApcDisable) { - /* Request the Interrupt */ DPRINT("Requesting APC Interupt\n"); HalRequestSoftwareInterrupt(APC_LEVEL); @@ -193,8 +182,8 @@ /* Check if the Wait List isn't empty */ DPRINT("Checking whether to wake the Mutant\n"); - if (!IsListEmpty(&Mutant->Header.WaitListHead)) { - + if (!IsListEmpty(&Mutant->Header.WaitListHead)) + { /* Wake the Mutant */ DPRINT("Waking the Mutant\n"); KiWaitTest(&Mutant->Header, Increment); @@ -202,13 +191,13 @@ } /* If the Wait is true, then return with a Wait and don't unlock the Dispatcher Database */ - if (Wait == FALSE) { - + if (Wait == FALSE) + { /* Release the Lock */ KeReleaseDispatcherDatabaseLock(OldIrql); - - } else { - + } + else + { /* Set a wait */ CurrentThread->WaitNext = TRUE; CurrentThread->WaitIrql = OldIrql; @@ -226,28 +215,8 @@ KeReleaseMutex(IN PKMUTEX Mutex, IN BOOLEAN Wait) { - /* There's no difference at this level between the two */ - return KeReleaseMutant(Mutex, IO_NO_INCREMENT, FALSE, Wait); + return KeReleaseMutant(Mutex, 1, FALSE, Wait); } -/* - * @implemented - */ -NTSTATUS -STDCALL -KeWaitForMutexObject(IN PKMUTEX Mutex, - IN KWAIT_REASON WaitReason, - IN KPROCESSOR_MODE WaitMode, - IN BOOLEAN Alertable, - IN PLARGE_INTEGER Timeout) -{ - /* This is a simple macro. Export the function here though */ - return KeWaitForSingleObject(Mutex, - WaitReason, - WaitMode, - Alertable, - Timeout); -} - /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-10-01 08:20:12 UTC (rev 18184) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-10-01 08:58:49 UTC (rev 18185) @@ -588,7 +588,7 @@ KeRaiseUserException@4 KeReadStateEvent@4 KeReadStateMutant@4 -KeReadStateMutex@4 +KeReadStateMutex@4=KeReadStateMutant@4 KeReadStateQueue@4 KeReadStateSemaphore@4 KeReadStateTimer@4 @@ -645,7 +645,7 @@ KeUnstackDetachProcess@4 KeUserModeCallback@20 KeWaitForMultipleObjects@32 -KeWaitForMutexObject@20 +KeWaitForMutexObject@20=KeWaitForSingleObject@20 KeWaitForSingleObject@20 @KefAcquireSpinLockAtDpcLevel@4 @KefReleaseSpinLockFromDpcLevel@4

19 years, 2 months

[mf] 18184: sync with Wine:

by mf＠svn.reactos.com

sync with Wine: - Fix warnings in 64bit. (Kevin Koltzau <kevin(a)plop.org>) - simplify 'sei' structure initialization in ShellExecuteA/W Modified: trunk/reactos/lib/shell32/shell32_main.h Modified: trunk/reactos/lib/shell32/shlexec.c _____ Modified: trunk/reactos/lib/shell32/shell32_main.h --- trunk/reactos/lib/shell32/shell32_main.h 2005-10-01 07:37:13 UTC (rev 18183) +++ trunk/reactos/lib/shell32/shell32_main.h 2005-10-01 08:20:12 UTC (rev 18184) @@ -210,7 +210,7 @@ #define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) #define HINSTANCE_16(h32) (LOWORD(h32)) -typedef UINT (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, +typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, LPSHELLEXECUTEINFOW sei, LPSHELLEXECUTEINFOW sei_out); BOOL WINAPI ShellExecuteExW32(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc); _____ Modified: trunk/reactos/lib/shell32/shlexec.c --- trunk/reactos/lib/shell32/shlexec.c 2005-10-01 07:37:13 UTC (rev 18183) +++ trunk/reactos/lib/shell32/shlexec.c 2005-10-01 08:20:12 UTC (rev 18184) @@ -334,12 +334,12 @@ * SHELL_ExecuteW [Internal] * */ -static UINT SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, +static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) { STARTUPINFOW startup; PROCESS_INFORMATION info; - UINT retval = 31; + UINT_PTR retval = 31; UINT gcdret = 0; WCHAR curdir[MAX_PATH]; @@ -864,13 +864,13 @@ /*********************************************************************** ** * execute_from_key [Internal] */ -static UINT execute_from_key(LPWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWSTR szCommandline, +static UINT_PTR execute_from_key(LPWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWSTR szCommandline, SHELL_ExecuteW32 execfunc, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) { WCHAR cmd[1024]; LONG cmdlen = sizeof(cmd); - UINT retval = 31; + UINT_PTR retval = 31; cmd[0] = '\0'; @@ -936,7 +936,7 @@ */ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpResult) { - UINT retval = 31; /* default - 'No association was found' */ + UINT_PTR retval = 31; /* default - 'No association was found' */ WCHAR old_dir[1024]; TRACE("File %s, Dir %s\n", @@ -989,7 +989,7 @@ WCHAR *env; WCHAR lpstrProtocol[256]; LPCWSTR lpFile; - UINT retval = 31; + UINT_PTR retval = 31; WCHAR wcmd[1024]; WCHAR buffer[MAX_PATH]; const WCHAR* ext; @@ -1360,7 +1360,6 @@ LPCSTR lpParameters,LPCSTR lpDirectory, INT iShowCmd) { SHELLEXECUTEINFOA sei; - HANDLE hProcess = 0; TRACE("%p,%s,%s,%s,%s,%d\n", hWnd, debugstr_a(lpOperation), debugstr_a(lpFile), @@ -1378,7 +1377,7 @@ sei.lpClass = 0; sei.hkeyClass = 0; sei.dwHotKey = 0; - sei.hProcess = hProcess; + sei.hProcess = 0; ShellExecuteExA (&sei); return sei.hInstApp; @@ -1450,7 +1449,6 @@ LPCWSTR lpParameters, LPCWSTR lpDirectory, INT nShowCmd) { SHELLEXECUTEINFOW sei; - HANDLE hProcess = 0; TRACE("\n"); sei.cbSize = sizeof(sei); @@ -1465,7 +1463,7 @@ sei.lpClass = 0; sei.hkeyClass = 0; sei.dwHotKey = 0; - sei.hProcess = hProcess; + sei.hProcess = 0; ShellExecuteExW32 (&sei, SHELL_ExecuteW); return sei.hInstApp;

19 years, 2 months

[ion] 18183: - KeRundownThread:

by ion＠svn.reactos.com

- KeRundownThread: - Optimize to reduce contention - Add bugcheck instead of ASSERT - Add debug message to simplify finding errors like Bug 821 (type/size show 0xCC, which means the mutant has been already freed). Modified: trunk/reactos/ntoskrnl/ke/kthread.c _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-10-01 00:36:17 UTC (rev 18182) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-10-01 07:37:13 UTC (rev 18183) @@ -456,22 +456,40 @@ { KIRQL OldIrql; PKTHREAD Thread = KeGetCurrentThread(); - PLIST_ENTRY CurrentEntry; + PLIST_ENTRY NextEntry, ListHead; PKMUTANT Mutant; - DPRINT("KeRundownThread: %x\n", Thread); + /* Optimized path if nothing is on the list at the moment */ + if (IsListEmpty(&Thread->MutantListHead)) return; + /* Lock the Dispatcher Database */ OldIrql = KeAcquireDispatcherDatabaseLock(); - while (!IsListEmpty(&Thread->MutantListHead)) { - + /* Get the List Pointers */ + ListHead = &Thread->MutantListHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { /* Get the Mutant */ - CurrentEntry = RemoveHeadList(&Thread->MutantListHead); - Mutant = CONTAINING_RECORD(CurrentEntry, KMUTANT, MutantListEntry); - ASSERT(Mutant->ApcDisable == 0); + Mutant = CONTAINING_RECORD(NextEntry, KMUTANT, MutantListEntry); + DPRINT1("Mutant: %p. Type, Size %x %x\n", Mutant, Mutant->Header.Type, Mutant->Header.Size); - /* Uncondtionally abandon it */ + /* Make sure it's not terminating with APCs off */ + if (Mutant->ApcDisable) + { + /* Bugcheck the system */ + KEBUGCHECKEX(0,//THREAD_TERMINATE_HELD_MUTEX, + (ULONG_PTR)Thread, + (ULONG_PTR)Mutant, + 0, + 0); + } + + /* Now we can remove it */ + RemoveEntryList(&Mutant->MutantListEntry); + + /* Unconditionally abandon it */ DPRINT("Abandonning the Mutant\n"); Mutant->Header.SignalState = 1; Mutant->Abandoned = TRUE; @@ -479,12 +497,15 @@ /* Check if the Wait List isn't empty */ DPRINT("Checking whether to wake the Mutant\n"); - if (!IsListEmpty(&Mutant->Header.WaitListHead)) { - + if (!IsListEmpty(&Mutant->Header.WaitListHead)) + { /* Wake the Mutant */ DPRINT("Waking the Mutant\n"); KiWaitTest(&Mutant->Header, MUTANT_INCREMENT); } + + /* Move on */ + NextEntry = NextEntry->Flink; } /* Release the Lock */

19 years, 2 months

[npwoods] 18182: Notepad:

by npwoods＠svn.reactos.com

Notepad: 1. Fixed bug in Goto line command 2. Wrap long lines setting is persisted in the registry 3. Fixed length limit bug when wrap long lines is toggled Modified: trunk/reactos/subsys/system/notepad/dialog.c Modified: trunk/reactos/subsys/system/notepad/main.c Modified: trunk/reactos/subsys/system/notepad/main.h Modified: trunk/reactos/subsys/system/notepad/settings.c _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-09-30 23:32:24 UTC (rev 18181) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-10-01 00:36:17 UTC (rev 18182) @@ -624,6 +624,8 @@ DWORD size; LPWSTR pTemp; + Globals.bWrapLongLines = !Globals.bWrapLongLines; + size = GetWindowTextLength(Globals.hEdit) + 1; pTemp = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); if (!pTemp) @@ -639,13 +641,10 @@ 0, 0, rc.right, rc.bottom, Globals.hMainWnd, NULL, Globals.hInstance, NULL); SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)FALSE); + SendMessage(Globals.hEdit, EM_LIMITTEXT, 0, 0); SetWindowTextW(Globals.hEdit, pTemp); SetFocus(Globals.hEdit); HeapFree(GetProcessHeap(), 0, pTemp); - - Globals.bWrapLongLines = !Globals.bWrapLongLines; - CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_WRAP, - MF_BYCOMMAND | (Globals.bWrapLongLines ? MF_CHECKED : MF_UNCHECKED)); } VOID DIALOG_SelectFont(VOID) @@ -770,7 +769,7 @@ if (nLine >= 1) { - for (i = 0; pszText[i] && (nLine > 1) && (i < dwStart - 1); i++) + for (i = 0; pszText[i] && (nLine > 1) && (i < nLength - 1); i++) { if (pszText[i] == '\n') nLine--; _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2005-09-30 23:32:24 UTC (rev 18181) +++ trunk/reactos/subsys/system/notepad/main.c 2005-10-01 00:36:17 UTC (rev 18182) @@ -258,6 +258,9 @@ { int enable; + CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_WRAP, + MF_BYCOMMAND | (Globals.bWrapLongLines ? MF_CHECKED : MF_UNCHECKED)); + EnableMenuItem(menu, CMD_UNDO, SendMessage(Globals.hEdit, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); EnableMenuItem(menu, CMD_PASTE, @@ -286,7 +289,7 @@ static const WCHAR editW[] = { 'e','d','i','t',0 }; RECT rc; GetClientRect(hWnd, &rc); - Globals.hEdit = CreateWindowEx(EDIT_EXSTYLE, editW, NULL, EDIT_STYLE, + Globals.hEdit = CreateWindowEx(EDIT_EXSTYLE, editW, NULL, Globals.bWrapLongLines ? EDIT_STYLE_WRAP : EDIT_STYLE, 0, 0, rc.right, rc.bottom, hWnd, NULL, Globals.hInstance, NULL); if (!Globals.hEdit) _____ Modified: trunk/reactos/subsys/system/notepad/main.h --- trunk/reactos/subsys/system/notepad/main.h 2005-09-30 23:32:24 UTC (rev 18181) +++ trunk/reactos/subsys/system/notepad/main.h 2005-10-01 00:36:17 UTC (rev 18182) @@ -23,9 +23,9 @@ #include "notepad_res.h" -#define EDIT_STYLE (WS_CHILD | WS_VISIBLE | WS_VSCROLL \ +#define EDIT_STYLE_WRAP (WS_CHILD | WS_VISIBLE | WS_VSCROLL \ | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL) -#define EDIT_STYLE_WRAP (EDIT_STYLE | WS_HSCROLL | ES_AUTOHSCROLL) +#define EDIT_STYLE (EDIT_STYLE_WRAP | WS_HSCROLL | ES_AUTOHSCROLL) #define EDIT_EXSTYLE (WS_EX_CLIENTEDGE) #define MAX_STRING_LEN 255 _____ Modified: trunk/reactos/subsys/system/notepad/settings.c --- trunk/reactos/subsys/system/notepad/settings.c 2005-09-30 23:32:24 UTC (rev 18181) +++ trunk/reactos/subsys/system/notepad/settings.c 2005-10-01 00:36:17 UTC (rev 18182) @@ -117,6 +117,15 @@ return TRUE; } +static BOOL QueryBool(HKEY hKey, LPCSTR pszValueName, BOOL *pbResult) +{ + DWORD dwResult; + if (!QueryDword(hKey, pszValueName, &dwResult)) + return FALSE; + *pbResult = dwResult ? TRUE : FALSE; + return TRUE; +} + static BOOL QueryString(HKEY hKey, LPCSTR pszValueName, LPTSTR pszResult, DWORD dwResultSize) { return QueryGeneric(hKey, pszValueName, REG_SZ, pszResult, dwResultSize * sizeof(*pszResult)); @@ -143,6 +152,7 @@ QueryByte(hKey, "lfUnderline", &Globals.lfFont.lfUnderline); QueryDword(hKey, "lfWeight", (DWORD*)&Globals.lfFont.lfWeight); QueryDword(hKey, "iPointSize", &dwPointSize); + QueryBool(hKey, "fWrap", &Globals.bWrapLongLines); if (dwPointSize != 0) Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); @@ -210,6 +220,7 @@ SaveDword(hKey, "lfUnderline", Globals.lfFont.lfUnderline); SaveDword(hKey, "lfWeight", Globals.lfFont.lfWeight); SaveDword(hKey, "iPointSize", PointSizeFromHeight(Globals.lfFont.lfHeight)); + SaveDword(hKey, "fWrap", Globals.bWrapLongLines ? 1 : 0); RegCloseKey(hKey); }

19 years, 2 months

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 October 2005