ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
October 2011
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
18 participants
369 discussions
Start a n
N
ew thread
[jimtabor] 54250: [User32] - Fix class window procedure checks, prevents misbehaving applications from calling wrong class procs.
by jimtabor@svn.reactos.org
Author: jimtabor Date: Mon Oct 24 14:49:25 2011 New Revision: 54250 URL:
http://svn.reactos.org/svn/reactos?rev=54250&view=rev
Log: [User32] - Fix class window procedure checks, prevents misbehaving applications from calling wrong class procs. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Mon Oct 24 14:49:25 2011 @@ -1801,7 +1801,15 @@ { NtUserSetWindowFNID(Wnd, FNID_MENU); } - } + else + { + if (pWnd->fnid != FNID_MENU) + { + ERR("Wrong window class for Menu!\n"); + return 0; + } + } + } #endif TRACE("YES! hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam); @@ -1890,7 +1898,15 @@ { NtUserSetWindowFNID(Wnd, FNID_MENU); } - } + else + { + if (pWnd->fnid != FNID_MENU) + { + ERR("Wrong window class for Menu!\n"); + return 0; + } + } + } #endif TRACE("hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam);
13 years, 2 months
1
0
0
0
[jimtabor] 54249: [User32] - Fix class window procedure checks, prevents misbehaving applications from calling wrong class procs. - Fixed callout for static control color brush.
by jimtabor@svn.reactos.org
Author: jimtabor Date: Mon Oct 24 14:47:59 2011 New Revision: 54249 URL:
http://svn.reactos.org/svn/reactos?rev=54249&view=rev
Log: [User32] - Fix class window procedure checks, prevents misbehaving applications from calling wrong class procs. - Fixed callout for static control color brush. Modified: trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/icontitle.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/controls/static.c Modified: trunk/reactos/dll/win32/user32/controls/button.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] Mon Oct 24 14:47:59 2011 @@ -266,6 +266,14 @@ { NtUserSetWindowFNID(hWnd, FNID_BUTTON); } + else + { + if (pWnd->fnid != FNID_BUTTON) + { + ERR("Wrong window class for Button!\n"); + return 0; + } + } } #endif Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Mon Oct 24 14:47:59 2011 @@ -1842,6 +1842,14 @@ if (!pWnd->fnid) { NtUserSetWindowFNID(hwnd, FNID_COMBOBOX); + } + else + { + if (pWnd->fnid != FNID_COMBOBOX) + { + ERR("Wrong window class for ComboBox!\n"); + return 0; + } } } #endif Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Mon Oct 24 14:47:59 2011 @@ -4477,6 +4477,14 @@ { NtUserSetWindowFNID(hwnd, FNID_EDIT); } + else + { + if (pWnd->fnid != FNID_EDIT) + { + ERR("Wrong window class for Edit!\n"); + return 0; + } + } } #endif Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] Mon Oct 24 14:47:59 2011 @@ -21,6 +21,7 @@ #include <user32.h> #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(user32); static BOOL bMultiLineTitle; static HFONT hIconTitleFont; @@ -197,6 +198,14 @@ if (!pWnd->fnid) { NtUserSetWindowFNID(hWnd, FNID_ICONTITLE); + } + else + { + if (pWnd->fnid != FNID_ICONTITLE) + { + ERR("Wrong window class for IconTitle!\n"); + return 0; + } } } #endif Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Mon Oct 24 14:47:59 2011 @@ -2583,6 +2583,14 @@ if (!pWnd->fnid) { NtUserSetWindowFNID(hwnd, FNID_LISTBOX); // Could be FNID_COMBOLBOX by class. + } + else + { + if (pWnd->fnid != FNID_LISTBOX) + { + ERR("Wrong window class for listbox!\n"); + return 0; + } } } #endif Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Mon Oct 24 14:47:59 2011 @@ -1253,6 +1253,14 @@ { NtUserSetWindowFNID(Wnd, FNID_SCROLLBAR); } + else + { + if (pWnd->fnid != FNID_SCROLLBAR) + { + ERR("Wrong window class for Scrollbar!\n"); + return 0; + } + } } #endif Modified: trunk/reactos/dll/win32/user32/controls/static.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] Mon Oct 24 14:47:59 2011 @@ -324,15 +324,26 @@ } } +BOOL WINAPI GdiValidateHandle(HGDIOBJ hobj); + static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) { + PWND pwnd; HBRUSH hBrush; HWND parent = GetParent(hwnd); if (!parent) parent = hwnd; + // ReactOS + pwnd = ValidateHwnd(parent); + if (pwnd && !TestWindowProcess(pwnd)) + { + return (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); + } + //// hBrush = (HBRUSH) SendMessageW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); - if (!hBrush) /* did the app forget to call DefWindowProc ? */ + if (!hBrush || /* did the app forget to call DefWindowProc ? */ + !GdiValidateHandle(hBrush)) // ReactOS { /* FIXME: DefWindowProc should return different colors if a manifest is present */ @@ -387,6 +398,14 @@ if (!pWnd->fnid) { NtUserSetWindowFNID(hwnd, FNID_STATIC); + } + else + { + if (pWnd->fnid != FNID_STATIC) + { + ERR("Wrong window class for Static!\n"); + return 0; + } } } #endif @@ -505,10 +524,10 @@ if (HIWORD(lParam)) { if(unicode) - lResult = DefWindowProcW( hwnd, uMsg, wParam, lParam ); + lResult = DefWindowProcW( hwnd, uMsg, wParam, lParam ); else lResult = DefWindowProcA( hwnd, uMsg, wParam, lParam ); - STATIC_TryPaintFcn( hwnd, full_style ); + STATIC_TryPaintFcn( hwnd, full_style ); } } break;
13 years, 2 months
1
0
0
0
[jimtabor] 54248: [User32] - Use SetWindowTextA/W so that it passes through defwnd to be processed for themes. - Fix validation of the dialog window and procedure.
by jimtabor@svn.reactos.org
Author: jimtabor Date: Mon Oct 24 14:16:53 2011 New Revision: 54248 URL:
http://svn.reactos.org/svn/reactos?rev=54248&view=rev
Log: [User32] - Use SetWindowTextA/W so that it passes through defwnd to be processed for themes. - Fix validation of the dialog window and procedure. Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Mon Oct 24 14:16:53 2011 @@ -138,27 +138,34 @@ PWND pWindow; DIALOGINFO* dlgInfo = (DIALOGINFO *)GetWindowLongPtrW( hWnd, DWLP_ROS_DIALOGINFO ); - if(!dlgInfo && create) - { - pWindow = ValidateHwnd( hWnd ); - if (!pWindow) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + pWindow = ValidateHwnd( hWnd ); + if (!pWindow) + { + return NULL; + } + + if (!dlgInfo && create) + { + if (pWindow && pWindow->cbwndExtra >= DLGWINDOWEXTRA && hWnd != GetDesktopWindow()) + { + if (!(dlgInfo = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dlgInfo) ))) + return NULL; + + SETDLGINFO( hWnd, dlgInfo ); + + NtUserxSetDialogPointer( hWnd, dlgInfo ); + } + else + { return NULL; - } - - if (pWindow && pWindow->cbwndExtra >= DLGWINDOWEXTRA && hWnd != GetDesktopWindow()) - { - if (!(dlgInfo = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dlgInfo) ))) - return NULL; - - SETDLGINFO( hWnd, dlgInfo ); - - NtUserxSetDialogPointer( hWnd, dlgInfo ); - } - else - { - return NULL; + } + } + else + { + if (!(pWindow->state & WNDS_DIALOGWINDOW) || pWindow->fnid != FNID_DIALOG) + { + ERR("Wrong window class for Dialog!\n"); + return NULL; } } return dlgInfo; @@ -2573,6 +2580,7 @@ WPARAM wParam, LPARAM lParam) { + if ( hDlg == HWND_TOPMOST || hDlg == HWND_BROADCAST ) return 0; // ReactOS HWND hwndCtrl = GetDlgItem( hDlg, nIDDlgItem ); if (hwndCtrl) return SendMessageA( hwndCtrl, Msg, wParam, lParam ); else return 0; @@ -2591,6 +2599,7 @@ WPARAM wParam, LPARAM lParam) { + if ( hDlg == HWND_TOPMOST || hDlg == HWND_BROADCAST ) return 0; // ReactOS HWND hwndCtrl = GetDlgItem( hDlg, nIDDlgItem ); if (hwndCtrl) return SendMessageW( hwndCtrl, Msg, wParam, lParam ); else return 0; @@ -2627,7 +2636,9 @@ int nIDDlgItem, LPCSTR lpString) { - return SendDlgItemMessageA( hDlg, nIDDlgItem, WM_SETTEXT, 0, (LPARAM)lpString ); + HWND hwndCtrl = GetDlgItem( hDlg, nIDDlgItem ); // ReactOS Themes + if (hwndCtrl) return SetWindowTextA( hwndCtrl, lpString ); + return FALSE; } @@ -2641,7 +2652,9 @@ int nIDDlgItem, LPCWSTR lpString) { - return SendDlgItemMessageW( hDlg, nIDDlgItem, WM_SETTEXT, 0, (LPARAM)lpString ); + HWND hwndCtrl = GetDlgItem( hDlg, nIDDlgItem ); // ReactOS Themes + if (hwndCtrl) return SetWindowTextW( hwndCtrl, lpString ); + return FALSE; }
13 years, 2 months
1
0
0
0
[jimtabor] 54247: [User32] - Fix SetWindowTextA/W so that it passes through defwnd to be processed for themes. - Fix desktop checks. - Add create window flags.
by jimtabor@svn.reactos.org
Author: jimtabor Date: Mon Oct 24 14:13:19 2011 New Revision: 54247 URL:
http://svn.reactos.org/svn/reactos?rev=54247&view=rev
Log: [User32] - Fix SetWindowTextA/W so that it passes through defwnd to be processed for themes. - Fix desktop checks. - Add create window flags. Modified: trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/dll/win32/user32/windows/winpos.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Mon Oct 24 14:13:19 2011 @@ -168,13 +168,14 @@ HMENU hMenu, HINSTANCE hInstance, LPVOID lpParam, - BOOL Unicode) + DWORD dwFlags) { LARGE_STRING WindowName; LARGE_STRING lstrClassName, *plstrClassName; UNICODE_STRING ClassName; WNDCLASSEXA wceA; WNDCLASSEXW wceW; + BOOL Unicode; HWND Handle = NULL; #if 0 @@ -186,6 +187,8 @@ ERR("User32CreateWindowEx RegisterSystemControls\n"); RegisterSystemControls(); } + + Unicode = !(dwFlags & NUCWE_ANSI); if (IS_ATOM(lpClassName)) { @@ -278,7 +281,7 @@ hMenu, hInstance, lpParam, - 0, + dwFlags, NULL); #if 0 @@ -417,7 +420,7 @@ hMenu, hInstance, lpParam, - FALSE); + NUCWE_ANSI); return hwnd; } @@ -540,7 +543,7 @@ hMenu, hInstance, lpParam, - TRUE); + 0); return hwnd; } @@ -955,15 +958,26 @@ { PWND Wnd = ValidateHwnd(hWnd); - if (Wnd != NULL) - { - lpRect->left = lpRect->top = 0; + if (!Wnd) return FALSE; + if ( hWnd != GetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP ) + { +/* lpRect->left = lpRect->top = 0; lpRect->right = Wnd->rcClient.right - Wnd->rcClient.left; lpRect->bottom = Wnd->rcClient.bottom - Wnd->rcClient.top; - return TRUE; - } - - return FALSE; +*/ + *lpRect = Wnd->rcClient; + OffsetRect(lpRect, -Wnd->rcClient.left, -Wnd->rcClient.top); + } + else + { + lpRect->left = lpRect->top = 0; + lpRect->right = Wnd->rcClient.right; + lpRect->bottom = Wnd->rcClient.bottom; +/* Do this until Init bug is fixed. This sets 640x480, see InitMetrics. + lpRect->right = GetSystemMetrics(SM_CXSCREEN); + lpRect->bottom = GetSystemMetrics(SM_CYSCREEN); +*/ } + return TRUE; } @@ -1242,13 +1256,21 @@ { PWND Wnd = ValidateHwnd(hWnd); - if (Wnd != NULL) + if (!Wnd) return FALSE; + if ( hWnd != GetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP ) { *lpRect = Wnd->rcWindow; - return TRUE; - } - - return FALSE; + } + else + { + lpRect->left = lpRect->top = 0; + lpRect->right = Wnd->rcWindow.right; + lpRect->bottom = Wnd->rcWindow.bottom; +/* Do this until Init bug is fixed. This sets 640x480, see InitMetrics. + lpRect->right = GetSystemMetrics(SM_CXSCREEN); + lpRect->bottom = GetSystemMetrics(SM_CYSCREEN); +*/ } + return TRUE; } @@ -1693,26 +1715,19 @@ SetWindowTextA(HWND hWnd, LPCSTR lpString) { - DWORD ProcessId; - if(!GetWindowThreadProcessId(hWnd, &ProcessId)) - { - return FALSE; - } - - if(ProcessId != GetCurrentProcessId()) - { + PWND pwnd; + + pwnd = ValidateHwnd(hWnd); + if (pwnd) + { + if (!TestWindowProcess(pwnd)) + { /* do not send WM_GETTEXT messages to other processes */ - - DefSetText(hWnd, (PCWSTR)lpString, TRUE); - - if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) - { - DefWndNCPaint(hWnd, HRGN_WINDOW, -1); - } - return TRUE; - } - - return SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)lpString); + return (DefWindowProcA(hWnd, WM_SETTEXT, 0, (LPARAM)lpString) >= 0); + } + return (SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)lpString) >= 0); + } + return FALSE; } @@ -1723,26 +1738,19 @@ SetWindowTextW(HWND hWnd, LPCWSTR lpString) { - DWORD ProcessId; - if(!GetWindowThreadProcessId(hWnd, &ProcessId)) - { - return FALSE; - } - - if(ProcessId != GetCurrentProcessId()) - { + PWND pwnd; + + pwnd = ValidateHwnd(hWnd); + if (pwnd) + { + if (!TestWindowProcess(pwnd)) + { /* do not send WM_GETTEXT messages to other processes */ - - DefSetText(hWnd, lpString, FALSE); - - if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) - { - DefWndNCPaint(hWnd, HRGN_WINDOW, -1); - } - return TRUE; - } - - return SendMessageW(hWnd, WM_SETTEXT, 0, (LPARAM)lpString); + return (DefWindowProcW(hWnd, WM_SETTEXT, 0, (LPARAM)lpString) >= 0); + } + return (SendMessageW(hWnd, WM_SETTEXT, 0, (LPARAM)lpString) >= 0); + } + return FALSE; } Modified: trunk/reactos/dll/win32/user32/windows/winpos.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] Mon Oct 24 14:13:19 2011 @@ -151,7 +151,7 @@ Delta.x = Delta.y = 0; mirror_from = mirror_to = FALSE; - if (FromWnd && FromWnd->fnid != FNID_DESKTOP) + if (FromWnd && hWndFrom != GetDesktopWindow()) // FromWnd->fnid != FNID_DESKTOP) { if (FromWnd->ExStyle & WS_EX_LAYOUTRTL) { @@ -163,7 +163,7 @@ Delta.y = FromWnd->rcClient.top; } - if (ToWnd && ToWnd->fnid != FNID_DESKTOP) + if (ToWnd && hWndTo != GetDesktopWindow()) // ToWnd->fnid != FNID_DESKTOP) { if (ToWnd->ExStyle & WS_EX_LAYOUTRTL) { @@ -207,7 +207,7 @@ if (!Wnd) return FALSE; - if (Wnd->fnid != FNID_DESKTOP) + if (hWnd != GetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP ) { if (Wnd->ExStyle & WS_EX_LAYOUTRTL) lpPoint->x = Wnd->rcClient.right - lpPoint->x; @@ -231,7 +231,7 @@ if (!Wnd) return FALSE; - if (Wnd->fnid != FNID_DESKTOP) + if ( hWnd != GetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP ) { if (Wnd->ExStyle & WS_EX_LAYOUTRTL) lpPoint->x = Wnd->rcClient.right - lpPoint->x;
13 years, 2 months
1
0
0
0
[cgutman] 54246: [NDIS] - Stub and export NdisMSetupDmaTransfer and NdisMCompleteDmaTransfer
by cgutman@svn.reactos.org
Author: cgutman Date: Mon Oct 24 09:33:29 2011 New Revision: 54246 URL:
http://svn.reactos.org/svn/reactos?rev=54246&view=rev
Log: [NDIS] - Stub and export NdisMSetupDmaTransfer and NdisMCompleteDmaTransfer Modified: trunk/reactos/drivers/network/ndis/ndis.spec trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.…
============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis.spec [iso-8859-1] Mon Oct 24 09:33:29 2011 @@ -175,6 +175,7 @@ @ stdcall NdisMCoIndicateReceivePacket(ptr ptr long) @ stdcall NdisMCoIndicateStatus(ptr ptr long ptr long) @ stdcall NdisMCompleteBufferPhysicalMapping(ptr ptr long) + @ stdcall NdisMCompleteDmaTransfer(ptr ptr ptr long long long) @ stdcall NdisMCoReceiveComplete(ptr) @ stdcall NdisMCoRequestComplete(long ptr ptr) @ stdcall NdisMCoSendComplete(ptr ptr ptr) @@ -217,6 +218,7 @@ @ stdcall NdisMSetMiniportSecondary(ptr ptr) @ stdcall NdisMSetPeriodicTimer(ptr long) @ stdcall NdisMSetTimer(ptr long) + @ stdcall NdisMSetupDmaTransfer(ptr ptr ptr long long long) @ stdcall NdisMSleep(long) @ stdcall NdisMStartBufferPhysicalMapping(ptr ptr long long ptr ptr) @ stdcall NdisMSynchronizeWithInterrupt(ptr ptr ptr) Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Mon Oct 24 09:33:29 2011 @@ -396,6 +396,38 @@ return NDIS_STATUS_SUCCESS; } + +/* + * @unimplemented + */ +VOID +EXPORT +NdisMSetupDmaTransfer(OUT PNDIS_STATUS Status, + IN NDIS_HANDLE MiniportDmaHandle, + IN PNDIS_BUFFER Buffer, + IN ULONG Offset, + IN ULONG Length, + IN BOOLEAN WriteToDevice) +{ + UNIMPLEMENTED + *Status = NDIS_STATUS_FAILURE; +} + +/* + * @unimplemented + */ +VOID +EXPORT +NdisMCompleteDmaTransfer(OUT PNDIS_STATUS Status, + IN NDIS_HANDLE MiniportDmaHandle, + IN PNDIS_BUFFER Buffer, + IN ULONG Offset, + IN ULONG Length, + IN BOOLEAN WriteToDevice) +{ + UNIMPLEMENTED + *Status = NDIS_STATUS_FAILURE; +} /* * @implemented
13 years, 2 months
1
0
0
0
[cgutman] 54245: [NDIS] - Fix addressing constraints for slave DMA devices that don't have 32-bit address support
by cgutman@svn.reactos.org
Author: cgutman Date: Mon Oct 24 09:12:34 2011 New Revision: 54245 URL:
http://svn.reactos.org/svn/reactos?rev=54245&view=rev
Log: [NDIS] - Fix addressing constraints for slave DMA devices that don't have 32-bit address support Modified: trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Mon Oct 24 09:12:34 2011 @@ -708,11 +708,11 @@ DeviceDesc.Version = DEVICE_DESCRIPTION_VERSION; DeviceDesc.Master = (Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER); - DeviceDesc.ScatterGather = FALSE; //Is this correct? + DeviceDesc.ScatterGather = FALSE; DeviceDesc.DemandMode = DmaDescription->DemandMode; DeviceDesc.AutoInitialize = DmaDescription->AutoInitialize; DeviceDesc.Dma32BitAddresses = Dma32BitAddresses; - DeviceDesc.Dma64BitAddresses = !Dma32BitAddresses; //Is this correct? + DeviceDesc.Dma64BitAddresses = FALSE; DeviceDesc.BusNumber = Adapter->NdisMiniportBlock.BusNumber; DeviceDesc.DmaChannel = DmaDescription->DmaChannel; DeviceDesc.InterfaceType = Adapter->NdisMiniportBlock.BusType;
13 years, 2 months
1
0
0
0
[cgutman] 54244: [NDIS] - Demote some debug prints
by cgutman@svn.reactos.org
Author: cgutman Date: Mon Oct 24 08:22:56 2011 New Revision: 54244 URL:
http://svn.reactos.org/svn/reactos?rev=54244&view=rev
Log: [NDIS] - Demote some debug prints Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Mon Oct 24 08:22:56 2011 @@ -895,7 +895,7 @@ *_FirstBufferVA = MmGetSystemAddressForMdl(Buffer); Buffer = Buffer->Next; } else { - NDIS_DbgPrint(MIN_TRACE, ("No buffers linked to this packet\n")); + NDIS_DbgPrint(MID_TRACE, ("No buffers linked to this packet\n")); *_FirstBufferLength = 0; *_FirstBufferVA = NULL; } @@ -932,7 +932,7 @@ *_FirstBufferVA = MmGetSystemAddressForMdlSafe(Buffer, Priority); Buffer = Buffer->Next; } else { - NDIS_DbgPrint(MIN_TRACE, ("No buffers linked to this packet\n")); + NDIS_DbgPrint(MID_TRACE, ("No buffers linked to this packet\n")); *_FirstBufferLength = 0; *_FirstBufferVA = NULL; } @@ -1035,7 +1035,7 @@ &NdisBuffer, NULL); if (!NdisBuffer) { - NDIS_DbgPrint(MIN_TRACE, ("No buffer to unchain\n")); + NDIS_DbgPrint(MID_TRACE, ("No buffer to unchain\n")); *Buffer = NULL; return; } @@ -1084,7 +1084,7 @@ &NdisBuffer, NULL); if (!NdisBuffer) { - NDIS_DbgPrint(MIN_TRACE, ("No buffer to unchain\n")); + NDIS_DbgPrint(MID_TRACE, ("No buffer to unchain\n")); *Buffer = NULL; return; }
13 years, 2 months
1
0
0
0
[spetreolle] 54243: [ROSAPPS] Add rosapps to build.
by spetreolle@svn.reactos.org
Author: spetreolle Date: Sun Oct 23 12:30:42 2011 New Revision: 54243 URL:
http://svn.reactos.org/svn/reactos?rev=54243&view=rev
Log: [ROSAPPS] Add rosapps to build. Modified: trunk/reactos/modules/CMakeLists.txt Modified: trunk/reactos/modules/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/modules/CMakeLists.txt?rev…
============================================================================== --- trunk/reactos/modules/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/modules/CMakeLists.txt [iso-8859-1] Sun Oct 23 12:30:42 2011 @@ -2,3 +2,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rostests/) add_subdirectory(rostests) endif() + +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rosapps/) +add_subdirectory(rosapps) +endif()
13 years, 2 months
1
0
0
0
[spetreolle] 54242: [ROSAPPS] Add cmake base files with ssstars.
by spetreolle@svn.reactos.org
Author: spetreolle Date: Sun Oct 23 12:30:27 2011 New Revision: 54242 URL:
http://svn.reactos.org/svn/reactos?rev=54242&view=rev
Log: [ROSAPPS] Add cmake base files with ssstars. Added: trunk/rosapps/CMakeLists.txt (with props) trunk/rosapps/applications/CMakeLists.txt (with props) trunk/rosapps/applications/screensavers/CMakeLists.txt (with props) Added: trunk/rosapps/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/CMakeLists.txt?rev=54242&v…
============================================================================== --- trunk/rosapps/CMakeLists.txt (added) +++ trunk/rosapps/CMakeLists.txt [iso-8859-1] Sun Oct 23 12:30:27 2011 @@ -1,0 +1,1 @@ +add_subdirectory(applications) Propchange: trunk/rosapps/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/CMakeLists.tx…
============================================================================== --- trunk/rosapps/applications/CMakeLists.txt (added) +++ trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] Sun Oct 23 12:30:27 2011 @@ -1,0 +1,8 @@ +#add_subdirectory(cmdutils) +#add_subdirectory(devutils) +#add_subdirectory(fraginator) +#add_subdirectory(net) +#add_subdirectory(notevil) +add_subdirectory(screensavers) +#add_subdirectory(sysutils) +#add_subdirectory(winfile) Propchange: trunk/rosapps/applications/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
============================================================================== --- trunk/rosapps/applications/screensavers/CMakeLists.txt (added) +++ trunk/rosapps/applications/screensavers/CMakeLists.txt [iso-8859-1] Sun Oct 23 12:30:27 2011 @@ -1,0 +1,1 @@ +add_subdirectory(ssstars) Propchange: trunk/rosapps/applications/screensavers/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
13 years, 2 months
1
0
0
0
[ekohl] 54241: [DISKPART] - Add a simple usage function (/? option). - Simplify the interpreter loop a little bit.
by ekohl@svn.reactos.org
Author: ekohl Date: Sun Oct 23 12:04:48 2011 New Revision: 54241 URL:
http://svn.reactos.org/svn/reactos?rev=54241&view=rev
Log: [DISKPART] - Add a simple usage function (/? option). - Simplify the interpreter loop a little bit. Modified: trunk/reactos/base/system/diskpart/diskpart.c trunk/reactos/base/system/diskpart/diskpart.h trunk/reactos/base/system/diskpart/interpreter.c trunk/reactos/base/system/diskpart/lang/en-US.rc trunk/reactos/base/system/diskpart/resource.h Modified: trunk/reactos/base/system/diskpart/diskpart.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp…
============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] Sun Oct 23 12:04:48 2011 @@ -66,7 +66,6 @@ { WCHAR szComputerName[MAX_STRING_SIZE]; DWORD comp_size = MAX_STRING_SIZE; - BOOL interpreter_running = TRUE; LPCWSTR file_name = NULL; int i; int timeout = 0; @@ -121,6 +120,11 @@ timeout = _wtoi(argv[i]); } } + else if (wcscmp(&argv[i][1], L"?") == 0) + { + PrintResourceString(IDS_APP_USAGE); + return EXIT_SUCCESS; + } } } @@ -132,8 +136,7 @@ } else { - while (interpreter_running) - interpreter_running = interpret_main(); + interpret_main(); } /* Let the user know the program is exiting */ Modified: trunk/reactos/base/system/diskpart/diskpart.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp…
============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] Sun Oct 23 12:04:48 2011 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/diskpart/diskpart.c * PURPOSE: Manages all the partitions of the OS in - * an interactive way + * an interactive way * PROGRAMMERS: Lee Schroeder */ #ifndef DISKPART_H @@ -139,8 +139,8 @@ /* interpreter.c */ BOOL interpret_script(WCHAR *line); -BOOL interpret_main(VOID); BOOL interpret_cmd(INT argc, WCHAR **argv); +VOID interpret_main(VOID); /* list.c */ BOOL list_main(INT argc, WCHAR **argv); Modified: trunk/reactos/base/system/diskpart/interpreter.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/inter…
============================================================================== --- trunk/reactos/base/system/diskpart/interpreter.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/interpreter.c [iso-8859-1] Sun Oct 23 12:04:48 2011 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/diskpart/interpreter.c * PURPOSE: Reads the user input and then envokes the selected - * command by the user. + * command by the user. * PROGRAMMERS: Lee Schroeder */ @@ -52,7 +52,7 @@ {L"setid", setid_main, help_setid}, {L"shrink", shrink_main, help_shrink}, {L"uniqueid", uniqueid_main, help_uniqueid}, - {NULL, NULL, NULL} + {NULL, NULL, NULL} }; @@ -144,45 +144,49 @@ * it sends the string to interpret_line, where it determines what * command to use. */ -BOOL +VOID interpret_main(VOID) { WCHAR input_line[MAX_STRING_SIZE]; WCHAR *args_vector[MAX_ARGS_COUNT]; INT args_count = 0; BOOL bWhiteSpace = TRUE; + BOOL bRun = TRUE; WCHAR *ptr; - memset(args_vector, 0, sizeof(args_vector)); + while (bRun == TRUE) + { + memset(args_vector, 0, sizeof(args_vector)); - /* shown just before the input where the user places commands */ - PrintResourceString(IDS_APP_PROMPT); + /* shown just before the input where the user places commands */ + PrintResourceString(IDS_APP_PROMPT); - /* gets input from the user. */ - fgetws(input_line, MAX_STRING_SIZE, stdin); + /* gets input from the user. */ + fgetws(input_line, MAX_STRING_SIZE, stdin); - ptr = input_line; - while (*ptr != 0) - { - if (iswspace(*ptr) || *ptr == L'\n') + ptr = input_line; + while (*ptr != 0) { - *ptr = 0; - bWhiteSpace = TRUE; - } - else - { - if ((bWhiteSpace == TRUE) && (args_count < MAX_ARGS_COUNT)) + if (iswspace(*ptr) || *ptr == L'\n') { - args_vector[args_count] = ptr; - args_count++; + *ptr = 0; + bWhiteSpace = TRUE; + } + else + { + if ((bWhiteSpace == TRUE) && (args_count < MAX_ARGS_COUNT)) + { + args_vector[args_count] = ptr; + args_count++; + } + + bWhiteSpace = FALSE; } - bWhiteSpace = FALSE; + ptr++; } - ptr++; + /* sends the string to find the command */ + bRun = interpret_cmd(args_count, args_vector); } - - /* sends the string to find the command */ - return interpret_cmd(args_count, args_vector); } Modified: trunk/reactos/base/system/diskpart/lang/en-US.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/…
============================================================================== --- trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] Sun Oct 23 12:04:48 2011 @@ -14,6 +14,11 @@ STRINGTABLE DISCARDABLE BEGIN IDS_APP_HEADER, "\nReactOS DiskPart version %s\n" + IDS_APP_USAGE, "Diskpart command line syntax:\ndiskpart [/s <script file>] [/t <timeout value>] [/?]\n\ +/s <script file> - Runs the given script file.\n\ +/t <timeout value> - Waits for the given time (in seconds) after running a\n\ + script file.\n\ +/? - Shows this help text." IDS_APP_LICENSE, "Licensed under the GNU GPLv2\n" IDS_APP_CURR_COMPUTER, "On computer: %s\n\n" IDS_APP_LEAVING, "\nLeaving DiskPart...\n" Modified: trunk/reactos/base/system/diskpart/resource.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/resou…
============================================================================== --- trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] Sun Oct 23 12:04:48 2011 @@ -3,13 +3,14 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/diskpart/lang/resource.h * PURPOSE: Manages all the partitions of the OS in - * an interactive way + * an interactive way * PROGRAMMERS: Lee Schroeder */ #ifndef RESOURCE_H #define RESOURCE_H #define IDS_APP_HEADER 0 +#define IDS_APP_USAGE 1 #define IDS_APP_LICENSE 2 #define IDS_APP_CURR_COMPUTER 3 #define IDS_APP_LEAVING 4
13 years, 2 months
1
0
0
0
← Newer
1
2
3
4
5
6
7
...
37
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
Results per page:
10
25
50
100
200