Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[pschweitzer] 69487: [CSQ] Add a sanity check

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Oct 10 14:01:01 2015 New Revision: 69487 URL: http://svn.reactos.org/svn/reactos?rev=69487&view=rev Log: [CSQ] Add a sanity check Modified: trunk/reactos/lib/drivers/csq/csq.c Modified: trunk/reactos/lib/drivers/csq/csq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/csq/csq.c?rev=… ============================================================================== --- trunk/reactos/lib/drivers/csq/csq.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/csq/csq.c [iso-8859-1] Sat Oct 10 14:01:01 2015 @@ -353,8 +353,12 @@ Context = (PIO_CSQ_IRP_CONTEXT)InterlockedExchangePointer(&Irp->Tail.Overlay.DriverContext[3], NULL); - if(Context && Context->Type == IO_TYPE_CSQ_IRP_CONTEXT) + if (Context && Context->Type == IO_TYPE_CSQ_IRP_CONTEXT) + { Context->Irp = NULL; + + ASSERT(Context->Csq == Csq); + } } while(0);

9 years, 2 months

[ekohl] 69486: [INTL] - Add the SystemLCID to the GlobalData variable and use it in the Advanced page. - Add a stub for storing font linking settings. CORE-10075

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Oct 10 13:54:00 2015 New Revision: 69486 URL: http://svn.reactos.org/svn/reactos?rev=69486&view=rev Log: [INTL] - Add the SystemLCID to the GlobalData variable and use it in the Advanced page. - Add a stub for storing font linking settings. CORE-10075 Modified: trunk/reactos/dll/cpl/intl/advanced.c trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h Modified: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] Sat Oct 10 13:54:00 2015 @@ -203,7 +203,9 @@ } static VOID -InitLanguagesList(HWND hwndDlg) +InitLanguagesList( + HWND hwndDlg, + PGLOBALDATA pGlobalData) { WCHAR langSel[255]; @@ -213,7 +215,7 @@ EnumSystemLocalesW(LocalesEnumProc, LCID_SUPPORTED); /* Select current locale */ - GetLocaleInfoW(GetSystemDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)/sizeof(WCHAR)); + GetLocaleInfoW(pGlobalData->SystemLCID, LOCALE_SLANGUAGE, langSel, sizeof(langSel)/sizeof(WCHAR)); SendMessageW(hLangList, CB_SELECTSTRING, -1, (LPARAM)langSel); } @@ -248,14 +250,17 @@ RegCloseKey(hKey); } +static VOID -SetNonUnicodeLang(HWND hwnd, LCID lcid) +SaveFontSubstitutionSettings( + HWND hwnd, + PGLOBALDATA pGlobalData) { WCHAR szDefCP[5 + 1], szSection[MAX_PATH], szDPI[3 + 1]; HINF hFontInf; UINT Count; - GetLocaleInfoW(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, szDefCP, sizeof(szDefCP) / sizeof(WCHAR)); + GetLocaleInfoW(MAKELCID(pGlobalData->SystemLCID, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, szDefCP, sizeof(szDefCP) / sizeof(WCHAR)); GetCurrentDPI(szDPI); wsprintf(szSection, L"Font.CP%s.%s", szDefCP, szDPI); @@ -285,8 +290,18 @@ static VOID +SaveFontLinkingSettings( + HWND hwnd, + PGLOBALDATA pGlobalData) +{ + /* TODO */ +} + + +static +VOID SaveSystemSettings( - LCID lcid) + PGLOBALDATA pGlobalData) { WCHAR ACPPage[9]; WCHAR OEMPage[9]; @@ -295,14 +310,14 @@ WCHAR value[5]; DWORD valuesize; - ret = GetLocaleInfoW(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, OEMPage, sizeof(OEMPage)/sizeof(WCHAR)); + ret = GetLocaleInfoW(MAKELCID(pGlobalData->SystemLCID, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, OEMPage, sizeof(OEMPage)/sizeof(WCHAR)); if (ret == 0) { PrintErrorMsgBox(IDS_ERROR_OEM_CODE_PAGE); return; } - ret = GetLocaleInfoW(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, ACPPage, sizeof(ACPPage)/sizeof(WCHAR)); + ret = GetLocaleInfoW(MAKELCID(pGlobalData->SystemLCID, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, ACPPage, sizeof(ACPPage)/sizeof(WCHAR)); if (ret == 0) { PrintErrorMsgBox(IDS_ERROR_ANSI_CODE_PAGE); @@ -323,7 +338,7 @@ RegCloseKey(langKey); - wsprintf(value, L"%04hX", LANGIDFROMLCID(lcid)); + wsprintf(value, L"%04hX", LANGIDFROMLCID(pGlobalData->SystemLCID)); valuesize = (wcslen(value) + 1) * sizeof(WCHAR); /* Set language */ @@ -356,7 +371,7 @@ pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); - InitLanguagesList(hwndDlg); + InitLanguagesList(hwndDlg, pGlobalData); InitCodePagesList(hwndDlg); break; @@ -366,6 +381,19 @@ case IDC_LANGUAGE_COMBO: if (HIWORD(wParam) == CBN_SELCHANGE) { + LCID lcid; + INT iIndex; + + iIndex = SendMessage(hLangList, CB_GETCURSEL, 0, 0); + if (iIndex == CB_ERR) + break; + + lcid = SendMessage(hLangList, CB_GETITEMDATA, iIndex, 0); + if (lcid == (LCID)CB_ERR) + break; + + pGlobalData->SystemLCID = lcid; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; @@ -398,21 +426,11 @@ if (lpnm->code == (UINT)PSN_APPLY) { - LCID lcid; - INT iIndex; - PropSheet_UnChanged(GetParent(hwndDlg), hwndDlg); - iIndex = SendMessage(hLangList, CB_GETCURSEL, 0, 0); - if (iIndex == CB_ERR) - break; - - lcid = SendMessage(hLangList, CB_GETITEMDATA, iIndex, 0); - if (lcid == (LCID)CB_ERR) - break; - - SetNonUnicodeLang(hwndDlg, lcid); - SaveSystemSettings(lcid); + SaveSystemSettings(pGlobalData); + SaveFontSubstitutionSettings(hwndDlg, pGlobalData); + SaveFontLinkingSettings(hwndDlg, pGlobalData); } } break; Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=69… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] Sat Oct 10 13:54:00 2015 @@ -164,6 +164,10 @@ } pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBALDATA)); + if (pGlobalData == NULL) + return FALSE; + + pGlobalData->SystemLCID = GetSystemDefaultLCID(); LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=69… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] Sat Oct 10 13:54:00 2015 @@ -107,6 +107,7 @@ INT nMiscCountry; LCID UserLCID; + LCID SystemLCID; BOOL fUserLocaleChanged; BOOL bApplyToDefaultUser;

9 years, 2 months

[tfaber] 69485: [WIN32K:NTUSER] - Remove some DECLARE_RETURN()/RETURN() - Add asserts for the user lock - Annotate window property functions and use consistent parameter names

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Oct 10 13:48:08 2015 New Revision: 69485 URL: http://svn.reactos.org/svn/reactos?rev=69485&view=rev Log: [WIN32K:NTUSER] - Remove some DECLARE_RETURN()/RETURN() - Add asserts for the user lock - Annotate window property functions and use consistent parameter names Modified: trunk/reactos/win32ss/user/ntuser/prop.c trunk/reactos/win32ss/user/ntuser/prop.h Modified: trunk/reactos/win32ss/user/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Sat Oct 10 13:48:08 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Window properties - * FILE: subsys/win32k/ntuser/prop.c + * FILE: win32ss/user/ntuser/prop.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ @@ -14,13 +14,14 @@ PPROPERTY FASTCALL IntGetProp( - PWND Window, - ATOM Atom) + _In_ PWND Window, + _In_ ATOM Atom) { PLIST_ENTRY ListEntry; PPROPERTY Property; UINT i; + NT_ASSERT(UserIsEntered()); ListEntry = Window->PropListHead.Flink; for (i = 0; i < Window->PropListItems; i++) @@ -46,22 +47,26 @@ HANDLE FASTCALL UserGetProp( - PWND pWnd, - ATOM Atom) -{ - PPROPERTY Prop; - Prop = IntGetProp(pWnd, Atom); + _In_ PWND Window, + _In_ ATOM Atom) +{ + PPROPERTY Prop; + + NT_ASSERT(UserIsEntered()); + Prop = IntGetProp(Window, Atom); return Prop ? Prop->Data : NULL; } +_Success_(return) BOOL FASTCALL IntRemoveProp( - PWND Window, - ATOM Atom) -{ - PPROPERTY Prop; - + _In_ PWND Window, + _In_ ATOM Atom) +{ + PPROPERTY Prop; + + NT_ASSERT(UserIsEnteredExclusive()); Prop = IntGetProp(Window, Atom); if (Prop == NULL) { @@ -74,16 +79,18 @@ return TRUE; } +_Success_(return) BOOL FASTCALL IntSetProp( - PWND pWnd, - ATOM Atom, - HANDLE Data) -{ - PPROPERTY Prop; - - Prop = IntGetProp(pWnd, Atom); + _In_ PWND Window, + _In_ ATOM Atom, + _In_ HANDLE Data) +{ + PPROPERTY Prop; + + NT_ASSERT(UserIsEnteredExclusive()); + Prop = IntGetProp(Window, Atom); if (Prop == NULL) { Prop = UserHeapAlloc(sizeof(PROPERTY)); @@ -92,8 +99,8 @@ return FALSE; } Prop->Atom = Atom; - InsertTailList(&pWnd->PropListHead, &Prop->PropListEntry); - pWnd->PropListItems++; + InsertTailList(&Window->PropListHead, &Prop->PropListEntry); + Window->PropListItems++; } Prop->Data = Data; @@ -103,11 +110,12 @@ VOID FASTCALL IntRemoveWindowProp( - PWND Window) + _In_ PWND Window) { PLIST_ENTRY ListEntry; PPROPERTY Property; + NT_ASSERT(UserIsEnteredExclusive()); while (!IsListEmpty(&Window->PropListHead)) { ListEntry = Window->PropListHead.Flink; @@ -124,10 +132,10 @@ NTSTATUS APIENTRY NtUserBuildPropList( - HWND hWnd, - LPVOID Buffer, - DWORD BufferSize, - DWORD *Count) + _In_ HWND hWnd, + _Out_writes_bytes_to_opt_(BufferSize, *Count * sizeof(PROPLISTITEM)) LPVOID Buffer, + _In_ DWORD BufferSize, + _Out_opt_ DWORD *Count) { PWND Window; PPROPERTY Property; @@ -135,21 +143,23 @@ PROPLISTITEM listitem, *li; NTSTATUS Status; DWORD Cnt = 0; - DECLARE_RETURN(NTSTATUS); TRACE("Enter NtUserBuildPropList\n"); UserEnterShared(); - if (!(Window = UserGetWindowObject(hWnd))) - { - RETURN(STATUS_INVALID_HANDLE); + Window = UserGetWindowObject(hWnd); + if (Window == NULL) + { + Status = STATUS_INVALID_HANDLE; + goto Exit; } if (Buffer) { if (!BufferSize || (BufferSize % sizeof(PROPLISTITEM) != 0)) { - RETURN(STATUS_INVALID_PARAMETER); + Status = STATUS_INVALID_PARAMETER; + goto Exit; } /* Copy list */ @@ -165,7 +175,7 @@ Status = MmCopyToCaller(li, &listitem, sizeof(PROPLISTITEM)); if (!NT_SUCCESS(Status)) { - RETURN(Status); + goto Exit; } BufferSize -= sizeof(PROPLISTITEM); @@ -185,41 +195,42 @@ Status = MmCopyToCaller(Count, &Cnt, sizeof(DWORD)); if (!NT_SUCCESS(Status)) { - RETURN(Status); - } - } - - RETURN(STATUS_SUCCESS); - -CLEANUP: - TRACE("Leave NtUserBuildPropList, ret=%i\n", _ret_); + goto Exit; + } + } + + Status = STATUS_SUCCESS; + +Exit: + TRACE("Leave NtUserBuildPropList, ret=%lx\n", Status); UserLeave(); - END_CLEANUP; + + return Status; } HANDLE APIENTRY NtUserRemoveProp( - HWND hWnd, - ATOM Atom) + _In_ HWND hWnd, + _In_ ATOM Atom) { PWND Window; PPROPERTY Prop; - HANDLE Data; - DECLARE_RETURN(HANDLE); + HANDLE Data = NULL; TRACE("Enter NtUserRemoveProp\n"); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(hWnd))) - { - RETURN(NULL); + Window = UserGetWindowObject(hWnd); + if (Window == NULL) + { + goto Exit; } Prop = IntGetProp(Window, Atom); if (Prop == NULL) { - RETURN(NULL); + goto Exit; } Data = Prop->Data; @@ -227,38 +238,40 @@ UserHeapFree(Prop); Window->PropListItems--; - RETURN(Data); - -CLEANUP: - TRACE("Leave NtUserRemoveProp, ret=%p\n", _ret_); +Exit: + TRACE("Leave NtUserRemoveProp, ret=%p\n", Data); UserLeave(); - END_CLEANUP; + + return Data; } BOOL APIENTRY NtUserSetProp( - HWND hWnd, - ATOM Atom, - HANDLE Data) + _In_ HWND hWnd, + _In_ ATOM Atom, + _In_ HANDLE Data) { PWND Window; - DECLARE_RETURN(BOOL); + BOOL Ret; TRACE("Enter NtUserSetProp\n"); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(hWnd))) - { - RETURN(FALSE); - } - - RETURN(IntSetProp(Window, Atom, Data)); - -CLEANUP: - TRACE("Leave NtUserSetProp, ret=%i\n", _ret_); + Window = UserGetWindowObject(hWnd); + if (Window == NULL) + { + Ret = FALSE; + goto Exit; + } + + Ret = IntSetProp(Window, Atom, Data); + +Exit: + TRACE("Leave NtUserSetProp, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + + return Ret; } /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/prop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] Sat Oct 10 13:48:08 2015 @@ -1,7 +1,33 @@ #pragma once -PPROPERTY FASTCALL IntGetProp(PWND,ATOM); -BOOL FASTCALL IntRemoveProp(PWND,ATOM); -BOOL FASTCALL IntSetProp(PWND, ATOM, HANDLE); -HANDLE FASTCALL UserGetProp(PWND, ATOM); -VOID FASTCALL IntRemoveWindowProp(PWND Window); +PPROPERTY +FASTCALL +IntGetProp( + _In_ PWND Window, + _In_ ATOM Atom); + +HANDLE +FASTCALL +UserGetProp( + _In_ PWND Window, + _In_ ATOM Atom); + +_Success_(return) +BOOL +FASTCALL +IntRemoveProp( + _In_ PWND Window, + _In_ ATOM Atom); + +_Success_(return) +BOOL +FASTCALL +IntSetProp( + _In_ PWND Window, + _In_ ATOM Atom, + _In_ HANDLE Data); + +VOID +FASTCALL +IntRemoveWindowProp( + _In_ PWND Window);

9 years, 2 months

[tfaber] 69484: [WIN32K:FORMATTING] - Indentation and whitespace fixes for ntuser/prop.c. No functional changes.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Oct 10 13:06:57 2015 New Revision: 69484 URL: http://svn.reactos.org/svn/reactos?rev=69484&view=rev Log: [WIN32K:FORMATTING] - Indentation and whitespace fixes for ntuser/prop.c. No functional changes. Modified: trunk/reactos/win32ss/user/ntuser/prop.c Modified: trunk/reactos/win32ss/user/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Sat Oct 10 13:06:57 2015 @@ -11,230 +11,254 @@ /* STATIC FUNCTIONS **********************************************************/ -PPROPERTY FASTCALL -IntGetProp(PWND Window, ATOM Atom) -{ - PLIST_ENTRY ListEntry; - PPROPERTY Property; - UINT i; - - ListEntry = Window->PropListHead.Flink; - - for (i = 0; i < Window->PropListItems; i++ ) - { - Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); - - if (ListEntry == NULL) - { - ERR("Corrupted (or uninitialized?) property list for window %p. Prop count %u. Atom %u.\n", - Window, Window->PropListItems, Atom); - return NULL; - } - - if (Property->Atom == Atom) - { - return(Property); - } - ListEntry = ListEntry->Flink; - } - return(NULL); +PPROPERTY +FASTCALL +IntGetProp( + PWND Window, + ATOM Atom) +{ + PLIST_ENTRY ListEntry; + PPROPERTY Property; + UINT i; + + ListEntry = Window->PropListHead.Flink; + + for (i = 0; i < Window->PropListItems; i++) + { + Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); + + if (ListEntry == NULL) + { + ERR("Corrupted (or uninitialized?) property list for window %p. Prop count %u. Atom %u.\n", + Window, Window->PropListItems, Atom); + return NULL; + } + + if (Property->Atom == Atom) + { + return(Property); + } + ListEntry = ListEntry->Flink; + } + return(NULL); } HANDLE FASTCALL -UserGetProp(PWND pWnd, ATOM Atom) -{ - PPROPERTY Prop; - Prop = IntGetProp(pWnd, Atom); - return Prop ? Prop->Data : NULL; -} - -BOOL FASTCALL -IntRemoveProp(PWND Window, ATOM Atom) -{ - PPROPERTY Prop; - Prop = IntGetProp(Window, Atom); - - if (Prop == NULL) - { - return FALSE; - } - RemoveEntryList(&Prop->PropListEntry); - UserHeapFree(Prop); - Window->PropListItems--; - return TRUE; -} - -BOOL FASTCALL -IntSetProp(PWND pWnd, ATOM Atom, HANDLE Data) -{ - PPROPERTY Prop; - - Prop = IntGetProp(pWnd, Atom); - - if (Prop == NULL) - { - Prop = UserHeapAlloc(sizeof(PROPERTY)); - if (Prop == NULL) - { - return FALSE; - } - Prop->Atom = Atom; - InsertTailList(&pWnd->PropListHead, &Prop->PropListEntry); - pWnd->PropListItems++; - } - - Prop->Data = Data; - return TRUE; -} - -VOID FASTCALL -IntRemoveWindowProp(PWND Window) -{ - PLIST_ENTRY ListEntry; - PPROPERTY Property; - - while (!IsListEmpty(&Window->PropListHead)) - { - ListEntry = Window->PropListHead.Flink; - Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); - RemoveEntryList(&Property->PropListEntry); - UserHeapFree(Property); - Window->PropListItems--; - } - return; +UserGetProp( + PWND pWnd, + ATOM Atom) +{ + PPROPERTY Prop; + Prop = IntGetProp(pWnd, Atom); + return Prop ? Prop->Data : NULL; +} + +BOOL +FASTCALL +IntRemoveProp( + PWND Window, + ATOM Atom) +{ + PPROPERTY Prop; + + Prop = IntGetProp(Window, Atom); + if (Prop == NULL) + { + return FALSE; + } + + RemoveEntryList(&Prop->PropListEntry); + UserHeapFree(Prop); + Window->PropListItems--; + return TRUE; +} + +BOOL +FASTCALL +IntSetProp( + PWND pWnd, + ATOM Atom, + HANDLE Data) +{ + PPROPERTY Prop; + + Prop = IntGetProp(pWnd, Atom); + if (Prop == NULL) + { + Prop = UserHeapAlloc(sizeof(PROPERTY)); + if (Prop == NULL) + { + return FALSE; + } + Prop->Atom = Atom; + InsertTailList(&pWnd->PropListHead, &Prop->PropListEntry); + pWnd->PropListItems++; + } + + Prop->Data = Data; + return TRUE; +} + +VOID +FASTCALL +IntRemoveWindowProp( + PWND Window) +{ + PLIST_ENTRY ListEntry; + PPROPERTY Property; + + while (!IsListEmpty(&Window->PropListHead)) + { + ListEntry = Window->PropListHead.Flink; + Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); + RemoveEntryList(&Property->PropListEntry); + UserHeapFree(Property); + Window->PropListItems--; + } + return; } /* FUNCTIONS *****************************************************************/ -NTSTATUS APIENTRY -NtUserBuildPropList(HWND hWnd, - LPVOID Buffer, - DWORD BufferSize, - DWORD *Count) -{ - PWND Window; - PPROPERTY Property; - PLIST_ENTRY ListEntry; - PROPLISTITEM listitem, *li; - NTSTATUS Status; - DWORD Cnt = 0; - DECLARE_RETURN(NTSTATUS); - - TRACE("Enter NtUserBuildPropList\n"); - UserEnterShared(); - - if (!(Window = UserGetWindowObject(hWnd))) - { - RETURN( STATUS_INVALID_HANDLE); - } - - if(Buffer) - { - if(!BufferSize || (BufferSize % sizeof(PROPLISTITEM) != 0)) - { - RETURN( STATUS_INVALID_PARAMETER); - } - - /* Copy list */ - li = (PROPLISTITEM *)Buffer; - ListEntry = Window->PropListHead.Flink; - while((BufferSize >= sizeof(PROPLISTITEM)) && (ListEntry != &Window->PropListHead)) - { - Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); - listitem.Atom = Property->Atom; - listitem.Data = Property->Data; - - Status = MmCopyToCaller(li, &listitem, sizeof(PROPLISTITEM)); - if(!NT_SUCCESS(Status)) - { - RETURN( Status); - } - - BufferSize -= sizeof(PROPLISTITEM); - Cnt++; - li++; - ListEntry = ListEntry->Flink; - } - - } - else - { - Cnt = Window->PropListItems * sizeof(PROPLISTITEM); - } - - if(Count) - { - Status = MmCopyToCaller(Count, &Cnt, sizeof(DWORD)); - if(!NT_SUCCESS(Status)) - { - RETURN( Status); - } - } - - RETURN( STATUS_SUCCESS); +NTSTATUS +APIENTRY +NtUserBuildPropList( + HWND hWnd, + LPVOID Buffer, + DWORD BufferSize, + DWORD *Count) +{ + PWND Window; + PPROPERTY Property; + PLIST_ENTRY ListEntry; + PROPLISTITEM listitem, *li; + NTSTATUS Status; + DWORD Cnt = 0; + DECLARE_RETURN(NTSTATUS); + + TRACE("Enter NtUserBuildPropList\n"); + UserEnterShared(); + + if (!(Window = UserGetWindowObject(hWnd))) + { + RETURN(STATUS_INVALID_HANDLE); + } + + if (Buffer) + { + if (!BufferSize || (BufferSize % sizeof(PROPLISTITEM) != 0)) + { + RETURN(STATUS_INVALID_PARAMETER); + } + + /* Copy list */ + li = (PROPLISTITEM *)Buffer; + ListEntry = Window->PropListHead.Flink; + while ((BufferSize >= sizeof(PROPLISTITEM)) && + (ListEntry != &Window->PropListHead)) + { + Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); + listitem.Atom = Property->Atom; + listitem.Data = Property->Data; + + Status = MmCopyToCaller(li, &listitem, sizeof(PROPLISTITEM)); + if (!NT_SUCCESS(Status)) + { + RETURN(Status); + } + + BufferSize -= sizeof(PROPLISTITEM); + Cnt++; + li++; + ListEntry = ListEntry->Flink; + } + + } + else + { + Cnt = Window->PropListItems * sizeof(PROPLISTITEM); + } + + if (Count) + { + Status = MmCopyToCaller(Count, &Cnt, sizeof(DWORD)); + if (!NT_SUCCESS(Status)) + { + RETURN(Status); + } + } + + RETURN(STATUS_SUCCESS); CLEANUP: - TRACE("Leave NtUserBuildPropList, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - -HANDLE APIENTRY -NtUserRemoveProp(HWND hWnd, ATOM Atom) -{ - PWND Window; - PPROPERTY Prop; - HANDLE Data; - DECLARE_RETURN(HANDLE); - - TRACE("Enter NtUserRemoveProp\n"); - UserEnterExclusive(); - - if (!(Window = UserGetWindowObject(hWnd))) - { - RETURN( NULL); - } - - Prop = IntGetProp(Window, Atom); - - if (Prop == NULL) - { - RETURN(NULL); - } - Data = Prop->Data; - RemoveEntryList(&Prop->PropListEntry); - UserHeapFree(Prop); - Window->PropListItems--; - - RETURN(Data); + TRACE("Leave NtUserBuildPropList, ret=%i\n", _ret_); + UserLeave(); + END_CLEANUP; +} + +HANDLE +APIENTRY +NtUserRemoveProp( + HWND hWnd, + ATOM Atom) +{ + PWND Window; + PPROPERTY Prop; + HANDLE Data; + DECLARE_RETURN(HANDLE); + + TRACE("Enter NtUserRemoveProp\n"); + UserEnterExclusive(); + + if (!(Window = UserGetWindowObject(hWnd))) + { + RETURN(NULL); + } + + Prop = IntGetProp(Window, Atom); + if (Prop == NULL) + { + RETURN(NULL); + } + + Data = Prop->Data; + RemoveEntryList(&Prop->PropListEntry); + UserHeapFree(Prop); + Window->PropListItems--; + + RETURN(Data); CLEANUP: - TRACE("Leave NtUserRemoveProp, ret=%p\n", _ret_); - UserLeave(); - END_CLEANUP; -} - -BOOL APIENTRY -NtUserSetProp(HWND hWnd, ATOM Atom, HANDLE Data) -{ - PWND Window; - DECLARE_RETURN(BOOL); - - TRACE("Enter NtUserSetProp\n"); - UserEnterExclusive(); - - if (!(Window = UserGetWindowObject(hWnd))) - { - RETURN( FALSE); - } - - RETURN( IntSetProp(Window, Atom, Data)); + TRACE("Leave NtUserRemoveProp, ret=%p\n", _ret_); + UserLeave(); + END_CLEANUP; +} + +BOOL +APIENTRY +NtUserSetProp( + HWND hWnd, + ATOM Atom, + HANDLE Data) +{ + PWND Window; + DECLARE_RETURN(BOOL); + + TRACE("Enter NtUserSetProp\n"); + UserEnterExclusive(); + + if (!(Window = UserGetWindowObject(hWnd))) + { + RETURN(FALSE); + } + + RETURN(IntSetProp(Window, Atom, Data)); CLEANUP: - TRACE("Leave NtUserSetProp, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; + TRACE("Leave NtUserSetProp, ret=%i\n", _ret_); + UserLeave(); + END_CLEANUP; } /* EOF */

9 years, 2 months

[pschweitzer] 69483: [MSFS] Fix a FIXME: properly reset timer when re-using a queued IRP for reading. Also fix a possible race condition between time out DPC and IRP re-use. Thanks to Thomas for hi...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Oct 10 12:50:33 2015 New Revision: 69483 URL: http://svn.reactos.org/svn/reactos?rev=69483&view=rev Log: [MSFS] Fix a FIXME: properly reset timer when re-using a queued IRP for reading. Also fix a possible race condition between time out DPC and IRP re-use. Thanks to Thomas for his help with DPC & timers. CORE-10245 Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h trunk/reactos/drivers/filesystems/msfs/msfssup.c trunk/reactos/drivers/filesystems/msfs/rw.c Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] Sat Oct 10 12:50:33 2015 @@ -46,6 +46,7 @@ KTIMER Timer; KDPC Dpc; PIO_CSQ Csq; + KEVENT Event; IO_CSQ_IRP_CONTEXT CsqContext; } MSFS_DPC_CTX, *PMSFS_DPC_CTX; Modified: trunk/reactos/drivers/filesystems/msfs/msfssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfssup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfssup.c [iso-8859-1] Sat Oct 10 12:50:33 2015 @@ -117,14 +117,20 @@ Context = (PMSFS_DPC_CTX)DeferredContext; + /* Try to get the IRP */ Irp = IoCsqRemoveIrp(Context->Csq, &Context->CsqContext); if (Irp != NULL) { + /* It timed out, complete it (it's ours) and free context */ Irp->IoStatus.Status = STATUS_IO_TIMEOUT; IoCompleteRequest(Irp, IO_NO_INCREMENT); + ExFreePoolWithTag(Context, 'NFsM'); } - - ExFreePool(Context); + else + { + /* We were racing with writing and failed, signal we're done */ + KeSetEvent(&Context->Event, IO_NO_INCREMENT, FALSE); + } } /* EOF */ Modified: trunk/reactos/drivers/filesystems/msfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Sat Oct 10 12:50:33 2015 @@ -107,10 +107,12 @@ return STATUS_INSUFFICIENT_RESOURCES; } + KeInitializeEvent(&Context->Event, SynchronizationEvent, FALSE); IoCsqInsertIrp(&Fcb->CancelSafeQueue, Irp, &Context->CsqContext); Timer = &Context->Timer; Dpc = &Context->Dpc; Context->Csq = &Fcb->CancelSafeQueue; + Irp->Tail.Overlay.DriverContext[0] = Context; /* No timer for INFINITY_WAIT */ if (Timeout.QuadPart != -1) @@ -139,6 +141,7 @@ ULONG Length; PVOID Buffer; PIRP CsqIrp; + PMSFS_DPC_CTX Context; DPRINT("MsfsWrite(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -193,7 +196,16 @@ CsqIrp = IoCsqRemoveNextIrp(&Fcb->CancelSafeQueue, NULL); if (CsqIrp != NULL) { - /* FIXME: It is necessary to reset the timers. */ + /* Get the context */ + Context = CsqIrp->Tail.Overlay.DriverContext[0]; + /* DPC was queued, wait for it to fail (IRP is ours) */ + if (Fcb->TimeOut.QuadPart != -1 && !KeCancelTimer(&Context->Timer)) + { + KeWaitForSingleObject(&Context->Event, Executive, KernelMode, FALSE, NULL); + } + + /* Free context & attempt read */ + ExFreePoolWithTag(Context, 'NFsM'); MsfsRead(DeviceObject, CsqIrp); }

9 years, 2 months

[pschweitzer] 69482: [MSFS] - Remove an useless (and unsafe!) counter - Use the message counter in a thread-safe way in RW operations

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Oct 10 12:33:22 2015 New Revision: 69482 URL: http://svn.reactos.org/svn/reactos?rev=69482&view=rev Log: [MSFS] - Remove an useless (and unsafe!) counter - Use the message counter in a thread-safe way in RW operations Modified: trunk/reactos/drivers/filesystems/msfs/create.c trunk/reactos/drivers/filesystems/msfs/msfs.h trunk/reactos/drivers/filesystems/msfs/rw.c Modified: trunk/reactos/drivers/filesystems/msfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] Sat Oct 10 12:33:22 2015 @@ -181,7 +181,6 @@ InitializeListHead(&Fcb->MessageListHead); KeInitializeSpinLock(&Fcb->MessageListLock); - Fcb->WaitCount = 0; KeInitializeSpinLock(&Fcb->QueueLock); InitializeListHead(&Fcb->PendingIrpQueue); IoCsqInitialize(&Fcb->CancelSafeQueue, Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] Sat Oct 10 12:33:22 2015 @@ -38,7 +38,6 @@ IO_CSQ CancelSafeQueue; KSPIN_LOCK QueueLock; LIST_ENTRY PendingIrpQueue; - ULONG WaitCount; } MSFS_FCB, *PMSFS_FCB; Modified: trunk/reactos/drivers/filesystems/msfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Sat Oct 10 12:33:22 2015 @@ -62,10 +62,11 @@ Buffer = Irp->UserBuffer; + KeAcquireSpinLock(&Fcb->MessageListLock, &oldIrql); if (Fcb->MessageCount > 0) { - KeAcquireSpinLock(&Fcb->MessageListLock, &oldIrql); Entry = RemoveHeadList(&Fcb->MessageListHead); + Fcb->MessageCount--; KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); /* copy current message into buffer */ @@ -74,13 +75,16 @@ LengthRead = Message->Size; ExFreePoolWithTag(Message, 'rFsM'); - Fcb->MessageCount--; Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = LengthRead; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; + } + else + { + KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); } Timeout = Fcb->TimeOut; @@ -116,7 +120,6 @@ KeSetTimer(Timer, Timeout, Dpc); } - Fcb->WaitCount++; IoMarkIrpPending(Irp); return STATUS_PENDING; @@ -184,16 +187,14 @@ KeAcquireSpinLock(&Fcb->MessageListLock, &oldIrql); InsertTailList(&Fcb->MessageListHead, &Message->MessageListEntry); + Fcb->MessageCount++; KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); - Fcb->MessageCount++; - - if (Fcb->WaitCount > 0) - { - CsqIrp = IoCsqRemoveNextIrp(&Fcb->CancelSafeQueue, NULL); + CsqIrp = IoCsqRemoveNextIrp(&Fcb->CancelSafeQueue, NULL); + if (CsqIrp != NULL) + { /* FIXME: It is necessary to reset the timers. */ MsfsRead(DeviceObject, CsqIrp); - Fcb->WaitCount--; } Irp->IoStatus.Status = STATUS_SUCCESS;

9 years, 2 months

[pschweitzer] 69481: [MSFS] MessageEvent is no longer used, remove it

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Oct 10 12:16:17 2015 New Revision: 69481 URL: http://svn.reactos.org/svn/reactos?rev=69481&view=rev Log: [MSFS] MessageEvent is no longer used, remove it Modified: trunk/reactos/drivers/filesystems/msfs/create.c trunk/reactos/drivers/filesystems/msfs/msfs.h trunk/reactos/drivers/filesystems/msfs/rw.c Modified: trunk/reactos/drivers/filesystems/msfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/create.c [iso-8859-1] Sat Oct 10 12:16:17 2015 @@ -177,9 +177,6 @@ Fcb->MaxMessageSize = Buffer->MaximumMessageSize; Fcb->MessageCount = 0; Fcb->TimeOut = Buffer->ReadTimeout; - KeInitializeEvent(&Fcb->MessageEvent, - NotificationEvent, - FALSE); InitializeListHead(&Fcb->MessageListHead); KeInitializeSpinLock(&Fcb->MessageListLock); Modified: trunk/reactos/drivers/filesystems/msfs/msfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/msfs.h [iso-8859-1] Sat Oct 10 12:16:17 2015 @@ -31,7 +31,6 @@ struct _MSFS_CCB *ServerCcb; ULONG ReferenceCount; LARGE_INTEGER TimeOut; - KEVENT MessageEvent; ULONG MaxMessageSize; ULONG MessageCount; KSPIN_LOCK MessageListLock; Modified: trunk/reactos/drivers/filesystems/msfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Sat Oct 10 12:16:17 2015 @@ -75,10 +75,6 @@ ExFreePoolWithTag(Message, 'rFsM'); Fcb->MessageCount--; - if (Fcb->MessageCount == 0) - { - KeClearEvent(&Fcb->MessageEvent); - } Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = LengthRead; @@ -191,12 +187,6 @@ KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); Fcb->MessageCount++; - if (Fcb->MessageCount == 1) - { - KeSetEvent(&Fcb->MessageEvent, - 0, - FALSE); - } if (Fcb->WaitCount > 0) {

9 years, 2 months

[pschweitzer] 69480: [MSFS] Prevent a race condition on reading message from list. Spotted by Thomas

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Oct 10 12:08:45 2015 New Revision: 69480 URL: http://svn.reactos.org/svn/reactos?rev=69480&view=rev Log: [MSFS] Prevent a race condition on reading message from list. Spotted by Thomas Modified: trunk/reactos/drivers/filesystems/msfs/rw.c Modified: trunk/reactos/drivers/filesystems/msfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/rw.c [iso-8859-1] Sat Oct 10 12:08:45 2015 @@ -33,6 +33,7 @@ PKTIMER Timer; PMSFS_DPC_CTX Context; PKDPC Dpc; + PLIST_ENTRY Entry; DPRINT("MsfsRead(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -63,17 +64,14 @@ if (Fcb->MessageCount > 0) { + KeAcquireSpinLock(&Fcb->MessageListLock, &oldIrql); + Entry = RemoveHeadList(&Fcb->MessageListHead); + KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); + /* copy current message into buffer */ - Message = CONTAINING_RECORD(Fcb->MessageListHead.Flink, - MSFS_MESSAGE, - MessageListEntry); - + Message = CONTAINING_RECORD(Entry, MSFS_MESSAGE, MessageListEntry); memcpy(Buffer, &Message->Buffer, min(Message->Size,Length)); LengthRead = Message->Size; - - KeAcquireSpinLock(&Fcb->MessageListLock, &oldIrql); - RemoveHeadList(&Fcb->MessageListHead); - KeReleaseSpinLock(&Fcb->MessageListLock, oldIrql); ExFreePoolWithTag(Message, 'rFsM'); Fcb->MessageCount--;

9 years, 2 months

[ekohl] 69479: [NOTEPAD] Goto menu item should be disabled when wrap is on #CORE-10278 #resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Oct 10 10:13:46 2015 New Revision: 69479 URL: http://svn.reactos.org/svn/reactos?rev=69479&view=rev Log: [NOTEPAD] Goto menu item should be disabled when wrap is on #CORE-10278 #resolve Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Sat Oct 10 10:13:46 2015 @@ -986,6 +986,16 @@ VOID DIALOG_EditWrap(VOID) { Globals.bWrapLongLines = !Globals.bWrapLongLines; + + if (Globals.bWrapLongLines) + { + EnableMenuItem(Globals.hMenu, CMD_GOTO, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); + } + else + { + EnableMenuItem(Globals.hMenu, CMD_GOTO, MF_BYCOMMAND | MF_ENABLED); + } + DoCreateEditWindow(); }

9 years, 2 months

[jimtabor] 69478: [Win32k] - Fix repaint from off screen. See CORE-10098.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Oct 10 10:10:15 2015 New Revision: 69478 URL: http://svn.reactos.org/svn/reactos?rev=69478&view=rev Log: [Win32k] - Fix repaint from off screen. See CORE-10098. Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Sat Oct 10 10:10:15 2015 @@ -497,7 +497,7 @@ // Only the windows that overlap will be redrawn. if (RECTL_bIntersectRect( &rect, &pwnd->rcWindow, &pwndTemp->rcWindow )) { - co_UserRedrawWindow( pwndTemp, NULL, NULL, RDW_UPDATENOW | RDW_NOCHILDREN); + co_UserRedrawWindow( pwndTemp, NULL, NULL, RDW_UPDATENOW | RDW_ALLCHILDREN); } } }

9 years, 2 months

← Newer
1
...
26
27
28
29
30
31
32
...
35
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 October 2015