Ros-diffs July 2018

ros-diffs@reactos.org

17 participants
89 discussions

02/03: [WIN32K:NTUSER] Add diagnostic asserts in IntLinkWindow() and IntUnlinkWindow(). Don't link a window to itself in IntLinkWindow()! Add diagnostic traces for this situation, as well as in IntLinkHwnd().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee0511b49db6197897386… commit ee0511b49db6197897386df44078c8048a49c821 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 8 02:24:13 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 8 15:39:50 2018 +0200 [WIN32K:NTUSER] Add diagnostic asserts in IntLinkWindow() and IntUnlinkWindow(). Don't link a window to itself in IntLinkWindow()! Add diagnostic traces for this situation, as well as in IntLinkHwnd(). Helps in correctly fixing CORE-12071 and CORE-12085. --- win32ss/user/ntuser/window.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 027dec2a63..838d854f8f 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -861,19 +861,28 @@ IntLinkWindow( PWND WndInsertAfter /* Set to NULL if top sibling */ ) { + if (Wnd == WndInsertAfter) + { + ERR("IntLinkWindow -- Trying to link window 0x%p to itself!!\n", Wnd); + return; + } + Wnd->spwndPrev = WndInsertAfter; if (Wnd->spwndPrev) { /* Link after WndInsertAfter */ + ASSERT(Wnd != WndInsertAfter->spwndNext); Wnd->spwndNext = WndInsertAfter->spwndNext; if (Wnd->spwndNext) Wnd->spwndNext->spwndPrev = Wnd; + ASSERT(Wnd != Wnd->spwndPrev); Wnd->spwndPrev->spwndNext = Wnd; } else { /* Link at the top */ + ASSERT(Wnd != Wnd->spwndParent->spwndChild); Wnd->spwndNext = Wnd->spwndParent->spwndChild; if (Wnd->spwndNext) Wnd->spwndNext->spwndPrev = Wnd; @@ -956,6 +965,8 @@ VOID FASTCALL IntLinkHwnd(PWND Wnd, HWND hWndPrev) return; } + if (Wnd == WndInsertAfter) + ERR("IntLinkHwnd -- Trying to link window 0x%p to itself!!\n", Wnd); IntLinkWindow(Wnd, WndInsertAfter); /* Fix the WS_EX_TOPMOST flag */ @@ -1254,6 +1265,9 @@ co_UserSetParent(HWND hWndChild, HWND hWndNewParent) VOID FASTCALL IntUnlinkWindow(PWND Wnd) { + ASSERT(Wnd != Wnd->spwndNext); + ASSERT(Wnd != Wnd->spwndPrev); + if (Wnd->spwndNext) Wnd->spwndNext->spwndPrev = Wnd->spwndPrev;

6 years, 5 months

01/03: [WIN32K:NTUSER] Formatting only!

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d057cf6267bcbe7be325… commit 4d057cf6267bcbe7be3253fa3caa59f5b1feeb87 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 8 02:23:52 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 8 15:39:48 2018 +0200 [WIN32K:NTUSER] Formatting only! --- win32ss/user/ntuser/window.c | 75 +++++++++++++++++++++++--------------------- win32ss/user/ntuser/winpos.c | 2 -- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 06dabf37cb..027dec2a63 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -854,32 +854,32 @@ IntIsChildWindow(PWND Parent, PWND BaseWindow) } //// -/* - Link the window into siblings list - children and parent are kept in place. -*/ +/* Link the window into siblings list. Children and parent are kept in place. */ VOID FASTCALL IntLinkWindow( - PWND Wnd, - PWND WndInsertAfter /* set to NULL if top sibling */ + PWND Wnd, + PWND WndInsertAfter /* Set to NULL if top sibling */ ) { - if ((Wnd->spwndPrev = WndInsertAfter)) - { - /* link after WndInsertAfter */ - if ((Wnd->spwndNext = WndInsertAfter->spwndNext)) - Wnd->spwndNext->spwndPrev = Wnd; + Wnd->spwndPrev = WndInsertAfter; + if (Wnd->spwndPrev) + { + /* Link after WndInsertAfter */ + Wnd->spwndNext = WndInsertAfter->spwndNext; + if (Wnd->spwndNext) + Wnd->spwndNext->spwndPrev = Wnd; - Wnd->spwndPrev->spwndNext = Wnd; - } - else - { - /* link at top */ - if ((Wnd->spwndNext = Wnd->spwndParent->spwndChild)) - Wnd->spwndNext->spwndPrev = Wnd; + Wnd->spwndPrev->spwndNext = Wnd; + } + else + { + /* Link at the top */ + Wnd->spwndNext = Wnd->spwndParent->spwndChild; + if (Wnd->spwndNext) + Wnd->spwndNext->spwndPrev = Wnd; - Wnd->spwndParent->spwndChild = Wnd; - } + Wnd->spwndParent->spwndChild = Wnd; + } } /* @@ -889,8 +889,8 @@ VOID FASTCALL IntLinkHwnd(PWND Wnd, HWND hWndPrev) { if (hWndPrev == HWND_NOTOPMOST) { - if (!(Wnd->ExStyle & WS_EX_TOPMOST) && - (Wnd->ExStyle2 & WS_EX2_LINKED)) return; /* nothing to do */ + if (!(Wnd->ExStyle & WS_EX_TOPMOST) && (Wnd->ExStyle2 & WS_EX2_LINKED)) + return; /* nothing to do */ Wnd->ExStyle &= ~WS_EX_TOPMOST; hWndPrev = HWND_TOP; /* fallback to the HWND_TOP case */ } @@ -903,8 +903,10 @@ VOID FASTCALL IntLinkHwnd(PWND Wnd, HWND hWndPrev) PWND WndInsertAfter; WndInsertAfter = Wnd->spwndParent->spwndChild; - while( WndInsertAfter && WndInsertAfter->spwndNext) + while (WndInsertAfter && WndInsertAfter->spwndNext) + { WndInsertAfter = WndInsertAfter->spwndNext; + } IntLinkWindow(Wnd, WndInsertAfter); Wnd->ExStyle &= ~WS_EX_TOPMOST; @@ -913,7 +915,6 @@ VOID FASTCALL IntLinkHwnd(PWND Wnd, HWND hWndPrev) { /* Link in the top of the list */ IntLinkWindow(Wnd, NULL); - Wnd->ExStyle |= WS_EX_TOPMOST; } else if (hWndPrev == HWND_TOP) @@ -927,7 +928,9 @@ VOID FASTCALL IntLinkHwnd(PWND Wnd, HWND hWndPrev) { while (WndInsertBefore != NULL && WndInsertBefore->spwndNext != NULL) { - if (!(WndInsertBefore->ExStyle & WS_EX_TOPMOST)) break; + if (!(WndInsertBefore->ExStyle & WS_EX_TOPMOST)) + break; + if (WndInsertBefore == Wnd->spwndOwner) /* keep it above owner */ { Wnd->ExStyle |= WS_EX_TOPMOST; @@ -946,7 +949,7 @@ VOID FASTCALL IntLinkHwnd(PWND Wnd, HWND hWndPrev) WndInsertAfter = UserGetWindowObject(hWndPrev); /* Are we called with an erroneous handle */ - if(WndInsertAfter == NULL) + if (WndInsertAfter == NULL) { /* Link in a default position */ IntLinkHwnd(Wnd, HWND_TOP); @@ -962,8 +965,8 @@ VOID FASTCALL IntLinkHwnd(PWND Wnd, HWND hWndPrev) } else { - if(WndInsertAfter->spwndNext && - WndInsertAfter->spwndNext->ExStyle & WS_EX_TOPMOST) + if (WndInsertAfter->spwndNext && + (WndInsertAfter->spwndNext->ExStyle & WS_EX_TOPMOST)) { Wnd->ExStyle |= WS_EX_TOPMOST; } @@ -1247,20 +1250,20 @@ co_UserSetParent(HWND hWndChild, HWND hWndNewParent) return( hWndOldParent); } -/* Unlink the window from siblings. children and parent are kept in place. */ +/* Unlink the window from siblings. Children and parent are kept in place. */ VOID FASTCALL IntUnlinkWindow(PWND Wnd) { - if (Wnd->spwndNext) - Wnd->spwndNext->spwndPrev = Wnd->spwndPrev; + if (Wnd->spwndNext) + Wnd->spwndNext->spwndPrev = Wnd->spwndPrev; - if (Wnd->spwndPrev) - Wnd->spwndPrev->spwndNext = Wnd->spwndNext; + if (Wnd->spwndPrev) + Wnd->spwndPrev->spwndNext = Wnd->spwndNext; - if (Wnd->spwndParent && Wnd->spwndParent->spwndChild == Wnd) - Wnd->spwndParent->spwndChild = Wnd->spwndNext; + if (Wnd->spwndParent && Wnd->spwndParent->spwndChild == Wnd) + Wnd->spwndParent->spwndChild = Wnd->spwndNext; - Wnd->spwndPrev = Wnd->spwndNext = NULL; + Wnd->spwndPrev = Wnd->spwndNext = NULL; } /* FUNCTIONS *****************************************************************/ diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 370a0ff0ad..d1f975ef42 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -30,8 +30,6 @@ DBG_DEFAULT_CHANNEL(UserWinpos); #define PLACE_MAX 0x0002 #define PLACE_RECT 0x0004 -VOID FASTCALL IntLinkWindow(PWND Wnd,PWND WndInsertAfter); - /* FUNCTIONS *****************************************************************/ #if DBG

6 years, 5 months

01/01: [ROSAPPS] Fix 64 bit issues

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9cab5b549d2ab671f14e7… commit 9cab5b549d2ab671f14e77b9a824248d9bae290f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Mar 4 16:11:41 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 8 10:59:16 2018 +0200 [ROSAPPS] Fix 64 bit issues --- modules/rosapps/applications/devutils/gdihv/gdi.h | 2 +- .../rosapps/applications/devutils/gdihv/handlelist.c | 10 +++++----- .../applications/devutils/syscalldump/syscalldump.c | 10 +++++----- .../applications/devutils/vgafontedit/editglyphdlg.c | 18 +++++++++--------- .../applications/devutils/vgafontedit/fontboxeswnd.c | 6 +++--- .../applications/devutils/vgafontedit/fontwnd.c | 6 +++--- .../applications/devutils/vgafontedit/mainwnd.c | 6 +++--- .../rosapps/applications/sysutils/utils/stats/stats.c | 2 +- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/modules/rosapps/applications/devutils/gdihv/gdi.h b/modules/rosapps/applications/devutils/gdihv/gdi.h index 60eed9d18f..341bc9aaef 100644 --- a/modules/rosapps/applications/devutils/gdihv/gdi.h +++ b/modules/rosapps/applications/devutils/gdihv/gdi.h @@ -23,7 +23,7 @@ typedef PGDI_TABLE_ENTRY (CALLBACK * GDIQUERYPROC) (void); /* Handle macros */ #define GDI_HANDLE_CREATE(i, t) \ - ((HANDLE)(((i) & GDI_HANDLE_INDEX_MASK) | ((t) << 16))) + ((HANDLE)(((ULONG_PTR)(i) & GDI_HANDLE_INDEX_MASK) | ((t) << 16))) #define GDI_HANDLE_GET_INDEX(h) \ (((ULONG_PTR)(h)) & GDI_HANDLE_INDEX_MASK) diff --git a/modules/rosapps/applications/devutils/gdihv/handlelist.c b/modules/rosapps/applications/devutils/gdihv/handlelist.c index 63bf241962..98f11fe844 100644 --- a/modules/rosapps/applications/devutils/gdihv/handlelist.c +++ b/modules/rosapps/applications/devutils/gdihv/handlelist.c @@ -87,7 +87,7 @@ HandleList_Update(HWND hHandleListCtrl, HANDLE ProcessId) (ProcessId == (HANDLE)2) ) { if (ProcessId == (HANDLE)1 || ProcessId == (HANDLE)2 || - ((LONG)ProcessId & 0xfffc) == ((ULONG)pEntry->ProcessId & 0xfffc)) + ((LONG_PTR)ProcessId & 0xfffc) == ((LONG_PTR)pEntry->ProcessId & 0xfffc)) { handle = GDI_HANDLE_CREATE(i, pEntry->Type); index = ListView_GetItemCount(hHandleListCtrl); @@ -101,19 +101,19 @@ HandleList_Update(HWND hHandleListCtrl, HANDLE ProcessId) wsprintf(strText, L"%d", i); ListView_SetItemText(hHandleListCtrl, index, 1, strText); - wsprintf(strText, L"%#08x", handle); + wsprintf(strText, L"%#08Ix", handle); ListView_SetItemText(hHandleListCtrl, index, 2, strText); str2 = GetTypeName(handle); ListView_SetItemText(hHandleListCtrl, index, 3, str2); - wsprintf(strText, L"%#08x", (UINT)pEntry->ProcessId); + wsprintf(strText, L"%#08Ix", (UINT_PTR)pEntry->ProcessId); ListView_SetItemText(hHandleListCtrl, index, 4, strText); - wsprintf(strText, L"%#08x", (UINT)pEntry->KernelData); + wsprintf(strText, L"%#08Ix", (UINT_PTR)pEntry->KernelData); ListView_SetItemText(hHandleListCtrl, index, 5, strText); - wsprintf(strText, L"%#08x", (UINT)pEntry->UserData); + wsprintf(strText, L"%#08Ix", (UINT_PTR)pEntry->UserData); ListView_SetItemText(hHandleListCtrl, index, 6, strText); wsprintf(strText, L"%#08x", (UINT)pEntry->Type); diff --git a/modules/rosapps/applications/devutils/syscalldump/syscalldump.c b/modules/rosapps/applications/devutils/syscalldump/syscalldump.c index 141eb1e41d..8b35ce7553 100644 --- a/modules/rosapps/applications/devutils/syscalldump/syscalldump.c +++ b/modules/rosapps/applications/devutils/syscalldump/syscalldump.c @@ -55,7 +55,7 @@ BOOL CALLBACK EnumSymbolsProc( ULONG SymbolSize, PVOID UserContext) { - if ((UINT)UserContext == -1) + if ((INT_PTR)UserContext == -1) { printf("%s ", pSymInfo->Name); } @@ -63,11 +63,11 @@ BOOL CALLBACK EnumSymbolsProc( { if (!bX64) { - printf("%s@%d ", pSymInfo->Name, (UINT)UserContext); + printf("%s@%Iu ", pSymInfo->Name, (UINT_PTR)UserContext); } else { - printf("%s <+ %d> ", pSymInfo->Name, (UINT)UserContext); + printf("%s <+ %Iu> ", pSymInfo->Name, (UINT_PTR)UserContext); } } return TRUE; @@ -173,7 +173,7 @@ cont: for (i = 0; i < dwServiceLimit; i++) { printf("0x%x:", i+0x1000); - SymEnumSymbolsForAddr(hProcess, (DWORD64)pdwEntries32[i], EnumSymbolsProc, (PVOID)(DWORD)pW32pArgumentTable[i]); + SymEnumSymbolsForAddr(hProcess, (DWORD64)pdwEntries32[i], EnumSymbolsProc, (PVOID)(DWORD_PTR)pW32pArgumentTable[i]); printf("\n"); } } @@ -184,7 +184,7 @@ cont: for (i = 0; i < dwServiceLimit; i++) { printf("0x%x:", i+0x1000); - SymEnumSymbolsForAddr(hProcess, (DWORD64)pdwEntries64[i], EnumSymbolsProc, (PVOID)(DWORD)pW32pArgumentTable[i]); + SymEnumSymbolsForAddr(hProcess, (DWORD64)pdwEntries64[i], EnumSymbolsProc, (PVOID)(DWORD_PTR)pW32pArgumentTable[i]); printf("\n"); } } diff --git a/modules/rosapps/applications/devutils/vgafontedit/editglyphdlg.c b/modules/rosapps/applications/devutils/vgafontedit/editglyphdlg.c index 632957319d..ef027fa2bc 100644 --- a/modules/rosapps/applications/devutils/vgafontedit/editglyphdlg.c +++ b/modules/rosapps/applications/devutils/vgafontedit/editglyphdlg.c @@ -104,9 +104,9 @@ EditGlyphCommand(IN INT idCommand, IN PEDIT_GLYPH_INFO Info) else Info->FontWndInfo->LastEditGlyphWnd = Info->PrevEditGlyphWnd; - SetWindowLongW(Info->hSelf, GWLP_USERDATA, 0); - SetWindowLongW(Info->hEdit, GWLP_USERDATA, 0); - SetWindowLongW(Info->hPreview, GWLP_USERDATA, 0 ); + SetWindowLongPtrW(Info->hSelf, GWLP_USERDATA, 0); + SetWindowLongPtrW(Info->hEdit, GWLP_USERDATA, 0); + SetWindowLongPtrW(Info->hPreview, GWLP_USERDATA, 0 ); HeapFree(hProcessHeap, 0, Info); return TRUE; @@ -120,7 +120,7 @@ EditGlyphDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PEDIT_GLYPH_INFO Info; - Info = (PEDIT_GLYPH_INFO) GetWindowLongW(hwnd, GWLP_USERDATA); + Info = (PEDIT_GLYPH_INFO) GetWindowLongPtrW(hwnd, GWLP_USERDATA); if(Info || uMsg == WM_INITDIALOG) { @@ -135,9 +135,9 @@ EditGlyphDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Info->hEdit = GetDlgItem(hwnd, IDC_EDIT_GLYPH_EDIT); Info->hPreview = GetDlgItem(hwnd, IDC_EDIT_GLYPH_PREVIEW); - SetWindowLongW(hwnd, GWLP_USERDATA, (LONG)Info); - SetWindowLongW(Info->hEdit, GWLP_USERDATA, (LONG)Info); - SetWindowLongW(Info->hPreview, GWLP_USERDATA, (LONG)Info); + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)Info); + SetWindowLongPtrW(Info->hEdit, GWLP_USERDATA, (LONG_PTR)Info); + SetWindowLongPtrW(Info->hPreview, GWLP_USERDATA, (LONG_PTR)Info); InitToolbox(Info); @@ -153,7 +153,7 @@ EditGlyphEditWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PEDIT_GLYPH_INFO Info; - Info = (PEDIT_GLYPH_INFO) GetWindowLongW(hwnd, GWLP_USERDATA); + Info = (PEDIT_GLYPH_INFO) GetWindowLongPtrW(hwnd, GWLP_USERDATA); if(Info) { @@ -231,7 +231,7 @@ EditGlyphPreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PEDIT_GLYPH_INFO Info; - Info = (PEDIT_GLYPH_INFO) GetWindowLongW(hwnd, GWLP_USERDATA); + Info = (PEDIT_GLYPH_INFO) GetWindowLongPtrW(hwnd, GWLP_USERDATA); if(Info) { diff --git a/modules/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c b/modules/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c index d12fa6f545..ec5f57fd62 100644 --- a/modules/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c +++ b/modules/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c @@ -249,7 +249,7 @@ FontBoxesWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PFONT_WND_INFO Info; - Info = (PFONT_WND_INFO) GetWindowLongW(hwnd, GWLP_USERDATA); + Info = (PFONT_WND_INFO) GetWindowLongPtrW(hwnd, GWLP_USERDATA); if(Info || uMsg == WM_CREATE) { @@ -257,7 +257,7 @@ FontBoxesWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { case WM_CREATE: Info = (PFONT_WND_INFO)( ( (LPCREATESTRUCT)lParam )->lpCreateParams ); - SetWindowLongW(hwnd, GWLP_USERDATA, (LONG)Info); + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)Info); // Set a fixed window size SetWindowPos(hwnd, NULL, 0, 0, FONT_BOXES_WND_WIDTH, FONT_BOXES_WND_HEIGHT, SWP_NOZORDER | SWP_NOMOVE); @@ -265,7 +265,7 @@ FontBoxesWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; case WM_DESTROY: - SetWindowLongW(hwnd, GWLP_USERDATA, 0); + SetWindowLongPtrW(hwnd, GWLP_USERDATA, 0); return 0; case WM_KEYDOWN: diff --git a/modules/rosapps/applications/devutils/vgafontedit/fontwnd.c b/modules/rosapps/applications/devutils/vgafontedit/fontwnd.c index 70c5d58518..fc865c2585 100644 --- a/modules/rosapps/applications/devutils/vgafontedit/fontwnd.c +++ b/modules/rosapps/applications/devutils/vgafontedit/fontwnd.c @@ -98,7 +98,7 @@ FontWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PFONT_WND_INFO Info; - Info = (PFONT_WND_INFO) GetWindowLongW(hwnd, GWLP_USERDATA); + Info = (PFONT_WND_INFO) GetWindowLongPtrW(hwnd, GWLP_USERDATA); if(Info || uMsg == WM_CREATE) { @@ -114,7 +114,7 @@ FontWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Info = (PFONT_WND_INFO)( ( (LPMDICREATESTRUCT) ( (LPCREATESTRUCT)lParam )->lpCreateParams )->lParam ); Info->hSelf = hwnd; - SetWindowLongW(hwnd, GWLP_USERDATA, (LONG)Info); + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)Info); CreateFontBoxesWindow(Info); @@ -198,7 +198,7 @@ FontWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) HeapFree(hProcessHeap, 0, Info->OpenInfo); HeapFree(hProcessHeap, 0, Info); - SetWindowLongW(hwnd, GWLP_USERDATA, 0); + SetWindowLongPtrW(hwnd, GWLP_USERDATA, 0); return 0; case WM_SETFOCUS: diff --git a/modules/rosapps/applications/devutils/vgafontedit/mainwnd.c b/modules/rosapps/applications/devutils/vgafontedit/mainwnd.c index ff7590254d..cde135a357 100644 --- a/modules/rosapps/applications/devutils/vgafontedit/mainwnd.c +++ b/modules/rosapps/applications/devutils/vgafontedit/mainwnd.c @@ -442,7 +442,7 @@ MainWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) PMAIN_WND_INFO Info; - Info = (PMAIN_WND_INFO) GetWindowLongW(hwnd, GWLP_USERDATA); + Info = (PMAIN_WND_INFO) GetWindowLongPtrW(hwnd, GWLP_USERDATA); if(Info || uMsg == WM_CREATE) { @@ -489,7 +489,7 @@ MainWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Info = (PMAIN_WND_INFO)( ( (LPCREATESTRUCT)lParam )->lpCreateParams ); Info->hMainWnd = hwnd; Info->hMenu = GetMenu(hwnd); - SetWindowLongW(hwnd, GWLP_USERDATA, (LONG)Info); + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)Info); hNextClipboardViewer = SetClipboardViewer(hwnd); @@ -503,7 +503,7 @@ MainWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) UnInitResources(Info); HeapFree(hProcessHeap, 0, Info); - SetWindowLongW(hwnd, GWLP_USERDATA, 0); + SetWindowLongPtrW(hwnd, GWLP_USERDATA, 0); PostQuitMessage(0); return 0; diff --git a/modules/rosapps/applications/sysutils/utils/stats/stats.c b/modules/rosapps/applications/sysutils/utils/stats/stats.c index d69b81a1f3..0a8c45f3c3 100644 --- a/modules/rosapps/applications/sysutils/utils/stats/stats.c +++ b/modules/rosapps/applications/sysutils/utils/stats/stats.c @@ -82,7 +82,7 @@ AddExtension(LPTSTR ExtName, return NULL; for(t = ExtName; *t != _T('\0'); t += _tcslen(t) + 1); - ln = (DWORD)t - (DWORD)ExtName; + ln = (DWORD_PTR)t - (DWORD_PTR)ExtName; ZeroMemory (ExtInfo, sizeof (EXTENSION_INFO)); memcpy (ExtInfo->ExtName, ExtName, ln);

6 years, 5 months

01/01: [KERNEL32] Use NULL for pointers.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7022c1b0c9b8e991aed1… commit c7022c1b0c9b8e991aed113464253fd78ae4ee48 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 7 18:56:40 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jul 7 18:58:03 2018 +0200 [KERNEL32] Use NULL for pointers. --- dll/win32/kernel32/client/proc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index 649dcd4f41..551723e3b7 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -1395,9 +1395,9 @@ GetStartupInfoA(IN LPSTARTUPINFOA lpStartupInfo) if (StartupInfo) { /* Zero out string pointers in case we fail to create them */ - StartupInfo->lpReserved = 0; - StartupInfo->lpDesktop = 0; - StartupInfo->lpTitle = 0; + StartupInfo->lpReserved = NULL; + StartupInfo->lpDesktop = NULL; + StartupInfo->lpTitle = NULL; /* Set the size */ StartupInfo->cb = sizeof(*StartupInfo); @@ -2425,7 +2425,7 @@ CreateProcessInternalW(IN HANDLE hUserToken, DebuggerCmdLine = NULL; PathBuffer = NULL; SearchPath = NULL; - NullBuffer = 0; + NullBuffer = NULL; FreeBuffer = NULL; NameBuffer = NULL; CurrentDirectory = NULL;

6 years, 5 months

03/03: [BLUE] Use ByteOffset.QuadPrt instead of ByteOffset.LowPart

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a85d2764cb38a85c749f… commit 3a85d2764cb38a85c749f3d2f03451af06ccfabe Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 1 10:47:48 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 7 16:15:58 2018 +0200 [BLUE] Use ByteOffset.QuadPrt instead of ByteOffset.LowPart --- drivers/setup/blue/font.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/setup/blue/font.c b/drivers/setup/blue/font.c index dcbb600702..0312b005d7 100644 --- a/drivers/setup/blue/font.c +++ b/drivers/setup/blue/font.c @@ -146,15 +146,13 @@ ExtractFont( FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); - - ByteOffset.LowPart = ByteOffset.HighPart = 0; - if (!NT_SUCCESS(Status)) { DPRINT1("Error: Cannot open vgafonts.cab (0x%lx)\n", Status); return Status; } + ByteOffset.QuadPart = 0; Status = ZwReadFile(Handle, NULL, NULL, @@ -173,14 +171,14 @@ ExtractFont( if (CabFileHeader.Signature != CAB_SIGNATURE) { - DPRINT1("Error: CAB signature is missing!\n"); + DPRINT1("Invalid CAB signature: 0x%lx!\n", CabFileHeader.Signature); Status = STATUS_UNSUCCESSFUL; goto Exit; } // We have a valid CAB file! // Read the file table now and decrement the file count on every file. When it's zero, we read the complete table. - ByteOffset.LowPart = CabFileHeader.FileTableOffset; + ByteOffset.QuadPart = CabFileHeader.FileTableOffset; while (CabFileHeader.FileCount) { @@ -196,7 +194,7 @@ ExtractFont( if (NT_SUCCESS(Status)) { - ByteOffset.LowPart += sizeof(CabFile); + ByteOffset.QuadPart += sizeof(CabFile); // We assume here that the file name is max. 19 characters (+ 1 NULL character) long. // This should be enough for our purpose. @@ -224,7 +222,7 @@ ExtractFont( } } - ByteOffset.LowPart += strlen(FileName) + 1; + ByteOffset.QuadPart += strlen(FileName) + 1; } } @@ -232,8 +230,8 @@ ExtractFont( } // 8 = Size of a CFFOLDER structure (see cabman). As we don't need the values of that structure, just increase the offset here. - ByteOffset.LowPart += 8; - ByteOffset.LowPart += CabFileOffset; + ByteOffset.QuadPart += 8; + ByteOffset.QuadPart += CabFileOffset; // ByteOffset now contains the offset of the actual data, so we can read the RAW font Status = ZwReadFile(Handle,

6 years, 5 months

02/03: [BLUE] Reformat and add missing success checks + DPRINTs on failure

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=741c3c00220508cfdf284… commit 741c3c00220508cfdf2843274a2455358001c0f6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 1 10:24:22 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 7 16:15:58 2018 +0200 [BLUE] Reformat and add missing success checks + DPRINTs on failure --- drivers/setup/blue/font.c | 216 ++++++++++++++++++++++++++-------------------- 1 file changed, 121 insertions(+), 95 deletions(-) diff --git a/drivers/setup/blue/font.c b/drivers/setup/blue/font.c index 4f9ffc1031..dcbb600702 100644 --- a/drivers/setup/blue/font.c +++ b/drivers/setup/blue/font.c @@ -33,25 +33,34 @@ ScrLoadFontTable( NTSTATUS Status = STATUS_SUCCESS; FontBitfield = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, 2048, TAG_BLUE); - if (FontBitfield) + if (FontBitfield == NULL) { - /* open bit plane for font table access */ - OpenBitPlane(); - - /* get pointer to video memory */ - BaseAddress.QuadPart = BITPLANE_BASE; - Bitplane = (PUCHAR)MmMapIoSpace(BaseAddress, 0xFFFF, MmNonCached); + DPRINT1("ExAllocatePoolWithTag failed\n"); + return; + } - Status = ExtractFont(CodePage, FontBitfield); - if (NT_SUCCESS(Status)) - LoadFont(Bitplane, FontBitfield); + /* open bit plane for font table access */ + OpenBitPlane(); - MmUnmapIoSpace(Bitplane, 0xFFFF); - ExFreePool(FontBitfield); + /* get pointer to video memory */ + BaseAddress.QuadPart = BITPLANE_BASE; + Bitplane = (PUCHAR)MmMapIoSpace(BaseAddress, 0xFFFF, MmNonCached); - /* close bit plane */ - CloseBitPlane(); + Status = ExtractFont(CodePage, FontBitfield); + if (NT_SUCCESS(Status)) + { + LoadFont(Bitplane, FontBitfield); } + else + { + DPRINT1("ExtractFont failed with Status 0x%lx\n", Status); + } + + MmUnmapIoSpace(Bitplane, 0xFFFF); + ExFreePool(FontBitfield); + + /* close bit plane */ + CloseBitPlane(); } /* PRIVATE FUNCTIONS *********************************************************/ @@ -93,7 +102,10 @@ ExtractFont( &ObjectAttributes); if (!NT_SUCCESS(Status)) - return(Status); + { + DPRINT1("ZwOpenSymbolicLinkObject failed with Status 0x%lx\n", Status); + return Status; + } SourceName.Length = 0; SourceName.MaximumLength = MAX_PATH * sizeof(WCHAR); @@ -104,7 +116,19 @@ ExtractFont( NULL); ZwClose(Handle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwQuerySymbolicLinkObject failed with Status 0x%lx\n", Status); + return Status; + } + Status = RtlAppendUnicodeToString(&SourceName, L"\\vgafonts.cab"); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlAppendUnicodeToString failed with Status 0x%lx\n", Status); + return Status; + } + InitializeObjectAttributes(&ObjectAttributes, &SourceName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, @@ -125,109 +149,111 @@ ExtractFont( ByteOffset.LowPart = ByteOffset.HighPart = 0; - if (NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error: Cannot open vgafonts.cab (0x%lx)\n", Status); + return Status; + } + + Status = ZwReadFile(Handle, + NULL, + NULL, + NULL, + &IoStatusBlock, + &CabFileHeader, + sizeof(CabFileHeader), + &ByteOffset, + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error: Cannot read from file (0x%lx)\n", Status); + goto Exit; + } + + if (CabFileHeader.Signature != CAB_SIGNATURE) + { + DPRINT1("Error: CAB signature is missing!\n"); + Status = STATUS_UNSUCCESSFUL; + goto Exit; + } + + // We have a valid CAB file! + // Read the file table now and decrement the file count on every file. When it's zero, we read the complete table. + ByteOffset.LowPart = CabFileHeader.FileTableOffset; + + while (CabFileHeader.FileCount) { Status = ZwReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, - &CabFileHeader, - sizeof(CabFileHeader), + &CabFile, + sizeof(CabFile), &ByteOffset, NULL); if (NT_SUCCESS(Status)) { - if (CabFileHeader.Signature == CAB_SIGNATURE) + ByteOffset.LowPart += sizeof(CabFile); + + // We assume here that the file name is max. 19 characters (+ 1 NULL character) long. + // This should be enough for our purpose. + Status = ZwReadFile(Handle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FileName, + sizeof(FileName), + &ByteOffset, + NULL); + + if (NT_SUCCESS(Status)) { - // We have a valid CAB file! - // Read the file table now and decrement the file count on every file. When it's zero, we read the complete table. - ByteOffset.LowPart = CabFileHeader.FileTableOffset; - - while (CabFileHeader.FileCount) + if (!bFoundFile) { - Status = ZwReadFile(Handle, - NULL, - NULL, - NULL, - &IoStatusBlock, - &CabFile, - sizeof(CabFile), - &ByteOffset, - NULL); - - if (NT_SUCCESS(Status)) + Status = RtlCharToInteger(FileName, 0, &ReadCP); + if (NT_SUCCESS(Status) && ReadCP == CodePage) { - ByteOffset.LowPart += sizeof(CabFile); - - // We assume here that the file name is max. 19 characters (+ 1 NULL character) long. - // This should be enough for our purpose. - Status = ZwReadFile(Handle, - NULL, - NULL, - NULL, - &IoStatusBlock, - FileName, - sizeof(FileName), - &ByteOffset, - NULL); - - if (NT_SUCCESS(Status)) - { - if (!bFoundFile) - { - Status = RtlCharToInteger(FileName, 0, &ReadCP); - if (NT_SUCCESS(Status) && ReadCP == CodePage) - { - // We got the correct file. - // Save the offset and loop through the rest of the file table to find the position, where the actual data starts. - CabFileOffset = CabFile.FileOffset; - bFoundFile = TRUE; - } - } - - ByteOffset.LowPart += strlen(FileName) + 1; - } + // We got the correct file. + // Save the offset and loop through the rest of the file table to find the position, where the actual data starts. + CabFileOffset = CabFile.FileOffset; + bFoundFile = TRUE; } - - CabFileHeader.FileCount--; } - // 8 = Size of a CFFOLDER structure (see cabman). As we don't need the values of that structure, just increase the offset here. - ByteOffset.LowPart += 8; - ByteOffset.LowPart += CabFileOffset; - - // ByteOffset now contains the offset of the actual data, so we can read the RAW font - Status = ZwReadFile(Handle, - NULL, - NULL, - NULL, - &IoStatusBlock, - FontBitField, - 2048, - &ByteOffset, - NULL); - ZwClose(Handle); - return STATUS_SUCCESS; - } - else - { - DPRINT1("Error: CAB signature is missing!\n"); - Status = STATUS_UNSUCCESSFUL; + ByteOffset.LowPart += strlen(FileName) + 1; } } - else - DPRINT1("Error: Cannot read from file\n"); - ZwClose(Handle); - return Status; + CabFileHeader.FileCount--; } - else + + // 8 = Size of a CFFOLDER structure (see cabman). As we don't need the values of that structure, just increase the offset here. + ByteOffset.LowPart += 8; + ByteOffset.LowPart += CabFileOffset; + + // ByteOffset now contains the offset of the actual data, so we can read the RAW font + Status = ZwReadFile(Handle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FontBitField, + 2048, + &ByteOffset, + NULL); + if (!NT_SUCCESS(Status)) { - DPRINT1("Error: Cannot open vgafonts.cab\n"); - return Status; + DPRINT1("ZwReadFile failed with Status 0x%lx\n", Status); } + +Exit: + + ZwClose(Handle); + return Status; } /* Font-load specific funcs */

6 years, 5 months

01/03: [BLUE] Formatting, no code change

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64f46045af5e79ab4b47a… commit 64f46045af5e79ab4b47a9624b27e9d6660cab26 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 1 10:13:18 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 7 16:15:58 2018 +0200 [BLUE] Formatting, no code change --- drivers/setup/blue/font.c | 139 +++++++++++++++++++++++++++++----------------- 1 file changed, 89 insertions(+), 50 deletions(-) diff --git a/drivers/setup/blue/font.c b/drivers/setup/blue/font.c index 9ab0acdbc0..4f9ffc1031 100644 --- a/drivers/setup/blue/font.c +++ b/drivers/setup/blue/font.c @@ -24,22 +24,23 @@ VOID LoadFont(PUCHAR Bitplane, PUCHAR FontBitfield); /* FUNCTIONS ****************************************************************/ VOID -ScrLoadFontTable(UINT32 CodePage) +ScrLoadFontTable( + UINT32 CodePage) { PHYSICAL_ADDRESS BaseAddress; PUCHAR Bitplane; PUCHAR FontBitfield = NULL; NTSTATUS Status = STATUS_SUCCESS; - FontBitfield = (PUCHAR) ExAllocatePoolWithTag(NonPagedPool, 2048, TAG_BLUE); - if(FontBitfield) + FontBitfield = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, 2048, TAG_BLUE); + if (FontBitfield) { /* open bit plane for font table access */ OpenBitPlane(); /* get pointer to video memory */ BaseAddress.QuadPart = BITPLANE_BASE; - Bitplane = (PUCHAR)MmMapIoSpace (BaseAddress, 0xFFFF, MmNonCached); + Bitplane = (PUCHAR)MmMapIoSpace(BaseAddress, 0xFFFF, MmNonCached); Status = ExtractFont(CodePage, FontBitfield); if (NT_SUCCESS(Status)) @@ -55,7 +56,10 @@ ScrLoadFontTable(UINT32 CodePage) /* PRIVATE FUNCTIONS *********************************************************/ -NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField) +NTSTATUS +ExtractFont( + UINT32 CodePage, + PUCHAR FontBitField) { BOOLEAN bFoundFile = FALSE; HANDLE Handle; @@ -69,10 +73,10 @@ NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField) CFFILE CabFile; ULONG CabFileOffset = 0; LARGE_INTEGER ByteOffset; - WCHAR SourceBuffer[MAX_PATH] = {L'\0'}; + WCHAR SourceBuffer[MAX_PATH] = { L'\0' }; ULONG ReadCP; - if(KeGetCurrentIrql() != PASSIVE_LEVEL) + if (KeGetCurrentIrql() != PASSIVE_LEVEL) return STATUS_INVALID_DEVICE_STATE; RtlInitUnicodeString(&LinkName, @@ -96,56 +100,82 @@ NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField) SourceName.Buffer = SourceBuffer; Status = ZwQuerySymbolicLinkObject(Handle, - &SourceName, - NULL); + &SourceName, + NULL); ZwClose(Handle); Status = RtlAppendUnicodeToString(&SourceName, L"\\vgafonts.cab"); - InitializeObjectAttributes(&ObjectAttributes, &SourceName, + InitializeObjectAttributes(&ObjectAttributes, + &SourceName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, - NULL, NULL); + NULL, + NULL); Status = ZwCreateFile(&Handle, GENERIC_READ, - &ObjectAttributes, &IoStatusBlock, NULL, + &ObjectAttributes, + &IoStatusBlock, + NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, - NULL, 0); + NULL, + 0); ByteOffset.LowPart = ByteOffset.HighPart = 0; - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { - Status = ZwReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, - &CabFileHeader, sizeof(CabFileHeader), &ByteOffset, NULL); + Status = ZwReadFile(Handle, + NULL, + NULL, + NULL, + &IoStatusBlock, + &CabFileHeader, + sizeof(CabFileHeader), + &ByteOffset, + NULL); - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { - if(CabFileHeader.Signature == CAB_SIGNATURE) + if (CabFileHeader.Signature == CAB_SIGNATURE) { // We have a valid CAB file! // Read the file table now and decrement the file count on every file. When it's zero, we read the complete table. ByteOffset.LowPart = CabFileHeader.FileTableOffset; - while(CabFileHeader.FileCount) + while (CabFileHeader.FileCount) { - Status = ZwReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, - &CabFile, sizeof(CabFile), &ByteOffset, NULL); - - if(NT_SUCCESS(Status)) + Status = ZwReadFile(Handle, + NULL, + NULL, + NULL, + &IoStatusBlock, + &CabFile, + sizeof(CabFile), + &ByteOffset, + NULL); + + if (NT_SUCCESS(Status)) { ByteOffset.LowPart += sizeof(CabFile); // We assume here that the file name is max. 19 characters (+ 1 NULL character) long. // This should be enough for our purpose. - Status = ZwReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, - FileName, sizeof(FileName), &ByteOffset, NULL); - - if(NT_SUCCESS(Status)) + Status = ZwReadFile(Handle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FileName, + sizeof(FileName), + &ByteOffset, + NULL); + + if (NT_SUCCESS(Status)) { - if(!bFoundFile) + if (!bFoundFile) { Status = RtlCharToInteger(FileName, 0, &ReadCP); if (NT_SUCCESS(Status) && ReadCP == CodePage) @@ -169,8 +199,15 @@ NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField) ByteOffset.LowPart += CabFileOffset; // ByteOffset now contains the offset of the actual data, so we can read the RAW font - Status = ZwReadFile(Handle, NULL, NULL, NULL, &IoStatusBlock, - FontBitField, 2048, &ByteOffset, NULL); + Status = ZwReadFile(Handle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FontBitField, + 2048, + &ByteOffset, + NULL); ZwClose(Handle); return STATUS_SUCCESS; } @@ -201,15 +238,15 @@ OpenBitPlane(VOID) _disable(); /* sequence reg */ - WRITE_PORT_UCHAR (SEQ_COMMAND, SEQ_RESET); WRITE_PORT_UCHAR (SEQ_DATA, 0x01); - WRITE_PORT_UCHAR (SEQ_COMMAND, SEQ_ENABLE_WRT_PLANE); WRITE_PORT_UCHAR (SEQ_DATA, 0x04); - WRITE_PORT_UCHAR (SEQ_COMMAND, SEQ_MEM_MODE); WRITE_PORT_UCHAR (SEQ_DATA, 0x07); - WRITE_PORT_UCHAR (SEQ_COMMAND, SEQ_RESET); WRITE_PORT_UCHAR (SEQ_DATA, 0x03); + WRITE_PORT_UCHAR(SEQ_COMMAND, SEQ_RESET); WRITE_PORT_UCHAR(SEQ_DATA, 0x01); + WRITE_PORT_UCHAR(SEQ_COMMAND, SEQ_ENABLE_WRT_PLANE); WRITE_PORT_UCHAR(SEQ_DATA, 0x04); + WRITE_PORT_UCHAR(SEQ_COMMAND, SEQ_MEM_MODE); WRITE_PORT_UCHAR(SEQ_DATA, 0x07); + WRITE_PORT_UCHAR(SEQ_COMMAND, SEQ_RESET); WRITE_PORT_UCHAR(SEQ_DATA, 0x03); /* graphic reg */ - WRITE_PORT_UCHAR (GCT_COMMAND, GCT_READ_PLANE); WRITE_PORT_UCHAR (GCT_DATA, 0x02); - WRITE_PORT_UCHAR (GCT_COMMAND, GCT_RW_MODES); WRITE_PORT_UCHAR (GCT_DATA, 0x00); - WRITE_PORT_UCHAR (GCT_COMMAND, GCT_GRAPH_MODE); WRITE_PORT_UCHAR (GCT_DATA, 0x00); + WRITE_PORT_UCHAR(GCT_COMMAND, GCT_READ_PLANE); WRITE_PORT_UCHAR(GCT_DATA, 0x02); + WRITE_PORT_UCHAR(GCT_COMMAND, GCT_RW_MODES); WRITE_PORT_UCHAR(GCT_DATA, 0x00); + WRITE_PORT_UCHAR(GCT_COMMAND, GCT_GRAPH_MODE); WRITE_PORT_UCHAR(GCT_DATA, 0x00); /* enable interrupts */ _enable(); @@ -222,35 +259,37 @@ CloseBitPlane(VOID) _disable(); /* sequence reg */ - WRITE_PORT_UCHAR (SEQ_COMMAND, SEQ_RESET); WRITE_PORT_UCHAR (SEQ_DATA, 0x01); - WRITE_PORT_UCHAR (SEQ_COMMAND, SEQ_ENABLE_WRT_PLANE); WRITE_PORT_UCHAR (SEQ_DATA, 0x03); - WRITE_PORT_UCHAR (SEQ_COMMAND, SEQ_MEM_MODE); WRITE_PORT_UCHAR (SEQ_DATA, 0x03); - WRITE_PORT_UCHAR (SEQ_COMMAND, SEQ_RESET); WRITE_PORT_UCHAR (SEQ_DATA, 0x03); + WRITE_PORT_UCHAR(SEQ_COMMAND, SEQ_RESET); WRITE_PORT_UCHAR(SEQ_DATA, 0x01); + WRITE_PORT_UCHAR(SEQ_COMMAND, SEQ_ENABLE_WRT_PLANE); WRITE_PORT_UCHAR(SEQ_DATA, 0x03); + WRITE_PORT_UCHAR(SEQ_COMMAND, SEQ_MEM_MODE); WRITE_PORT_UCHAR(SEQ_DATA, 0x03); + WRITE_PORT_UCHAR(SEQ_COMMAND, SEQ_RESET); WRITE_PORT_UCHAR(SEQ_DATA, 0x03); /* graphic reg */ - WRITE_PORT_UCHAR (GCT_COMMAND, GCT_READ_PLANE); WRITE_PORT_UCHAR (GCT_DATA, 0x00); - WRITE_PORT_UCHAR (GCT_COMMAND, GCT_RW_MODES); WRITE_PORT_UCHAR (GCT_DATA, 0x10); - WRITE_PORT_UCHAR (GCT_COMMAND, GCT_GRAPH_MODE); WRITE_PORT_UCHAR (GCT_DATA, 0x0e); + WRITE_PORT_UCHAR(GCT_COMMAND, GCT_READ_PLANE); WRITE_PORT_UCHAR(GCT_DATA, 0x00); + WRITE_PORT_UCHAR(GCT_COMMAND, GCT_RW_MODES); WRITE_PORT_UCHAR(GCT_DATA, 0x10); + WRITE_PORT_UCHAR(GCT_COMMAND, GCT_GRAPH_MODE); WRITE_PORT_UCHAR(GCT_DATA, 0x0e); /* enable interrupts */ _enable(); } VOID -LoadFont(PUCHAR Bitplane, PUCHAR FontBitfield) +LoadFont( + PUCHAR Bitplane, + PUCHAR FontBitfield) { - UINT32 i,j; + UINT32 i, j; - for (i=0; i<256; i++) + for (i = 0; i < 256; i++) { - for (j=0; j<8; j++) + for (j = 0; j < 8; j++) { - *Bitplane = FontBitfield[i*8+j]; + *Bitplane = FontBitfield[i * 8 + j]; Bitplane++; } // padding - for (j=8; j<32; j++) + for (j = 8; j < 32; j++) { *Bitplane = 0; Bitplane++;

6 years, 5 months

01/01: [SHELL32] Ensure OpenAs_RunDLL does not loop to infinity and beyond. This should fix a timeout on the apitests.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3904fd6257f97ed9528db… commit 3904fd6257f97ed9528db09f097400c35f1229d9 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Jul 6 21:43:57 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Jul 6 21:51:24 2018 +0200 [SHELL32] Ensure OpenAs_RunDLL does not loop to infinity and beyond. This should fix a timeout on the apitests. --- dll/win32/shell32/COpenWithMenu.cpp | 28 +++++++++------------------- dll/win32/shell32/shlexec.cpp | 3 ++- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dll/win32/shell32/COpenWithMenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp index 3cf5da3b7d..485623fe3a 100644 --- a/dll/win32/shell32/COpenWithMenu.cpp +++ b/dll/win32/shell32/COpenWithMenu.cpp @@ -1035,7 +1035,7 @@ VOID COpenWithDialog::Accept() if (m_pInfo->oaifInFlags & OAIF_EXEC) m_pAppList->Execute(pApp, m_pInfo->pcszFile); - DestroyWindow(m_hDialog); + EndDialog(m_hDialog, 1); } } @@ -1066,7 +1066,7 @@ INT_PTR CALLBACK COpenWithDialog::DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wPa return TRUE; } case IDCANCEL: /* cancel */ - DestroyWindow(hwndDlg); + EndDialog(hwndDlg, 0); return TRUE; default: break; @@ -1085,7 +1085,7 @@ INT_PTR CALLBACK COpenWithDialog::DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wPa } break; case WM_CLOSE: - DestroyWindow(hwndDlg); + EndDialog(hwndDlg, 0); return TRUE; default: break; @@ -1427,8 +1427,7 @@ COpenWithMenu::Initialize(LPCITEMIDLIST pidlFolder, HRESULT WINAPI SHOpenWithDialog(HWND hwndParent, const OPENASINFO *poainfo) { - MSG msg; - HWND hwnd; + INT_PTR ret; TRACE("SHOpenWithDialog hwndParent %p poainfo %p\n", hwndParent, poainfo); @@ -1439,25 +1438,16 @@ SHOpenWithDialog(HWND hwndParent, const OPENASINFO *poainfo) COpenWithDialog pDialog(poainfo); - hwnd = CreateDialogParam(shell32_hInstance, MAKEINTRESOURCE(IDD_OPEN_WITH), hwndParent, COpenWithDialog::DialogProc, (LPARAM)&pDialog); - if (hwnd == NULL) - { - ERR("Failed to create dialog\n"); - return E_FAIL; - } - if (pDialog.IsNoOpen(hwndParent)) return S_OK; - ShowWindow(hwnd, SW_SHOWNORMAL); + ret = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCE(IDD_OPEN_WITH), hwndParent, + COpenWithDialog::DialogProc, (LPARAM)&pDialog); - while (GetMessage(&msg, NULL, 0, 0) && IsWindow(hwnd)) + if (ret == (INT_PTR)-1) { - if (!IsDialogMessage(hwnd, &msg)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } + ERR("Failed to create dialog: %u\n", GetLastError()); + return E_FAIL; } return S_OK; diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 67c10f317c..e8885f6fa1 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -2314,7 +2314,8 @@ OpenAs_RunDLLA(HWND hwnd, HINSTANCE hinst, LPCSTR cmdline, int cmdshow) LPWSTR pszCmdLineW = NULL; TRACE("%p, %p, %s, %d\n", hwnd, hinst, debugstr_a(cmdline), cmdshow); - __SHCloneStrAtoW(&pszCmdLineW, cmdline); + if (cmdline) + __SHCloneStrAtoW(&pszCmdLineW, cmdline); OpenAs_RunDLLW(hwnd, hinst, pszCmdLineW, cmdshow); SHFree(pszCmdLineW); }

6 years, 5 months

01/01: [TRANSLATION][TIMEOUT] Created Polish translation of timeout

by Paweł Cholewa

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed4eb9c7c337a19783f58… commit ed4eb9c7c337a19783f58a919da2efc1e26b0d85 Author: Paweł Cholewa <MCPlayG(a)wp.pl> AuthorDate: Sun Jul 1 23:05:48 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jul 2 14:02:23 2018 +0200 [TRANSLATION][TIMEOUT] Created Polish translation of timeout --- base/applications/cmdutils/timeout/lang/pl-PL.rc | 33 ++++++++++++++++++++++++ base/applications/cmdutils/timeout/timeout.rc | 3 +++ 2 files changed, 36 insertions(+) diff --git a/base/applications/cmdutils/timeout/lang/pl-PL.rc b/base/applications/cmdutils/timeout/lang/pl-PL.rc new file mode 100644 index 0000000000..66a11fd76c --- /dev/null +++ b/base/applications/cmdutils/timeout/lang/pl-PL.rc @@ -0,0 +1,33 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "Narzędzie Timeout systemu ReactOS\n\ +\n\ +TIMEOUT [/?] [/T] limit_czasu [/NOBREAK]\n\ +\n\ +Opis:\n\ + To narzędzie oczekuje przez określony czas (w sekundach) lub do\n\ + momentu naciśnięcia dowolnego klawisza. Akceptuje również parametr,\n\ + który powoduje ignorowanie naciśnięć klawiszy.\n\ +\n\ +Lista parametrów:\n\ + /? Wyświetla ten komunikat pomocy.\n\ +\n\ + /T limit_czasu Określa czas oczekiwania w sekundach (w zakresie od -1 do 99999).\n\ + Wartość -1 oznacza, że program będzie oczekiwać do momentu naciśnięcia klawisza.\n\ + Parametr ""/T"" jest opcjonalny, możliwe jest określenie\n\ + czasu oczekiwania bez niego.\n\ +\n\ + /NOBREAK Ignoruje naciśnięcia klawiszy oprócz kombinacji CTRL+C.\n\ +" + IDS_ERROR_OUT_OF_RANGE "BŁĄD: Prawidłowy zakres limitu czasu to zakres od -1 do 99999.\n" + IDS_ERROR_INVALID_HANDLE_VALUE "BŁĄD: Nie można otrzymać standardowego uchwytu konsoli (błąd %lu).\n" + IDS_ERROR_READ_INPUT "BŁĄD: Nie można odczytać wejścia z konsoli (błąd %lu).\n" + IDS_ERROR_NO_TIMER_VALUE "BŁĄD: Czas oczekiwania musi być określony (od -1 do 99999).\n" + IDS_ERROR_ONE_TIME "BŁĄD: Tylko czas oczekiwania jest wymagany.\n" + IDS_NOBREAK_INPUT "Wciśnij klawisze CTRL+C, aby zakończyć..." + IDS_USER_INPUT "Naciśnij dowolny klawisz, aby kontynuować..." + IDS_NOBREAK_INPUT_COUNT "Oczekiwanie przez %d s, wciśnij klawisze CTRL+C, aby zakończyć..." + IDS_USER_INPUT_COUNT "Oczekiwanie przez %d s, naciśnij dowolny klawisz, aby kontynuować..." +END diff --git a/base/applications/cmdutils/timeout/timeout.rc b/base/applications/cmdutils/timeout/timeout.rc index 9515ce3888..a9cdfe9853 100644 --- a/base/applications/cmdutils/timeout/timeout.rc +++ b/base/applications/cmdutils/timeout/timeout.rc @@ -22,6 +22,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif

6 years, 5 months

01/01: [TRANSLATION][WHOAMI] Add Polish translation (#653)

by Paweł Cholewa

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a13890cd35a85120d2a87… commit a13890cd35a85120d2a8704109960fc71582a8f5 Author: Paweł Cholewa <MCPlayG(a)wp.pl> AuthorDate: Sun Jul 1 23:20:57 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 1 23:20:57 2018 +0200 [TRANSLATION][WHOAMI] Add Polish translation (#653) --- base/applications/cmdutils/whoami/lang/pl-PL.rc | 56 +++++++++++++++++++++++++ base/applications/cmdutils/whoami/whoami.rc | 3 ++ 2 files changed, 59 insertions(+) diff --git a/base/applications/cmdutils/whoami/lang/pl-PL.rc b/base/applications/cmdutils/whoami/lang/pl-PL.rc new file mode 100644 index 0000000000..140457e2c9 --- /dev/null +++ b/base/applications/cmdutils/whoami/lang/pl-PL.rc @@ -0,0 +1,56 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USER_HEADER "INFORMACJE O UŻYTKOWNIKU" + IDS_GROU_HEADER "INFORMACJE O GRUPIE" + IDS_PRIV_HEADER "INFORMACJE O UPRAWNIENIACH" + IDS_COL_USER_NAME "Nazwa użytkownika" + IDS_COL_GROUP_NAME "Nazwa grupy" + IDS_COL_TYPE "Typ" + IDS_COL_SID "Identyfikator SID" + IDS_COL_ATTRIB "Atrybuty" + IDS_COL_PRIV_NAME "Nazwa uprawnienia" + IDS_COL_DESCRIPTION "Opis" + IDS_COL_STATE "Stan" + IDS_TP_WELL_KNOWN_GROUP "Dobrze znana grupa" + IDS_TP_ALIAS "Alias" + IDS_TP_LABEL "Etykieta" + + /* [!] important note from the programmer: the program tries to remove + the last ', ' after concatenating, so keep than in mind when translating. + + you can test your translation of these attributes by using 'whoami /groups' */ + + IDS_ATTR_GROUP_MANDATORY "Grupa obowiązkowa, " + IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "Włączono domyślnie, " + IDS_ATTR_GROUP_ENABLED "Włączona grupa, " + IDS_ATTR_GROUP_OWNER "Właściciel grupy, " + IDS_UNKNOWN_DESCRIPTION "???" + IDS_STATE_ENABLED "Włączone" + IDS_STATE_DISABLED "Wyłączone" + IDS_ERROR_UPN "BŁĄD: Nie można uzyskać głównej nazwy użytkownika (UPN), ponieważ bieżący\nzalogowany użytkownik nie jest użytkownikiem domeny.\n" + IDS_ERROR_FQDN "BŁĄD: Nie można uzyskać w pełni kwalifikowanej nazwy wyróżniającej (FQDN),\nponieważ bieżący zalogowany użytkownik nie jest użytkownikiem domeny.\n" + IDS_ERROR_VALUEXPECTED "BŁĄD: Nieprawidłowa składnia. Brak obowiązkowej opcji '/fo'.\nWpisz polecenie ""WHOAMI /?"", aby zobaczyć sposób użycia.\n" + IDS_ERROR_VALUENOTALLOWED "BŁĄD: Nieprawidłowa składnia. Wartość '%s' nie jest dozwolona dla opcji '/fo'.\nWpisz polecenie ""WHOAMI /?"", aby zobaczyć sposób użycia.\n" + IDS_ERROR_1TIMES "BŁĄD: Nieprawidłowa składnia. Opcja '%s' nie jest dozwolona więcej niż '1' raz(y).\nWpisz polecenie ""WHOAMI /?"", aby zobaczyć sposób użycia.\n" + IDS_ERROR_INVALIDSYNTAX "BŁĄD: Nieprawidłowa składnia.\nWpisz polecenie ""WHOAMI /?"", aby zobaczyć sposób użycia.\n" + IDS_ERROR_INVALIDARG "BŁĄD: Nieprawidłowy argument/opcja - '%s'.\nWpisz polecenie ""WHOAMI /?"", aby zobaczyć sposób użycia.\n" + IDS_ERROR_NH_LIST "BŁĄD: Przełącznika /NH nie można używać w formacie LIST.\nWpisz polecenie ""WHOAMI /?"", aby zobaczyć sposób użycia.\n" + IDS_HELP "OPIS:\n\ + Wyświetla informacje użytkownika, grupy i uprawnień dla lokalnie zalogowanego użytkownika\n\ + Jeżeli nie podano żadnych parametrów, wyświetla aktualną domenę i nazwę użytkownika.\n\ +\n\ + Dostępnymi formatami wyjściowymi dla opcji '/fo' są 'csv', 'list' i 'table'.\n\ + Użyj opcji '/nh', żeby ukryć nagłówki. Domyślnie dane są wyświetlone w tabeli.\n\ +\n\ +SKŁADNIA:\n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ + whoami /all [/fo <Format>] [/nh] \n\ +\n\ +PRZYKŁADY: \n\ + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" +END diff --git a/base/applications/cmdutils/whoami/whoami.rc b/base/applications/cmdutils/whoami/whoami.rc index 0b75f08a31..ebae2e6153 100644 --- a/base/applications/cmdutils/whoami/whoami.rc +++ b/base/applications/cmdutils/whoami/whoami.rc @@ -28,6 +28,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif

6 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2018