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
March 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
21 participants
276 discussions
Start a n
N
ew thread
[osiejka] 51206: [DESK] - Translation patch by Adam "Saibamen" Stachowicz. See issue #6057 for more details. [EXPLORER] - Translation patch by Adam "Saibamen" Stachowicz. [SERVMAN] - Translation pa...
by osiejka@svn.reactos.org
Author: osiejka Date: Wed Mar 30 18:49:01 2011 New Revision: 51206 URL:
http://svn.reactos.org/svn/reactos?rev=51206&view=rev
Log: [DESK] - Translation patch by Adam "Saibamen" Stachowicz. See issue #6057 for more details. [EXPLORER] - Translation patch by Adam "Saibamen" Stachowicz. [SERVMAN] - Translation patch by Adam "Saibamen" Stachowicz. [SHELL32] - Translation patch by Adam "Saibamen" Stachowicz. See issue #6060 for more details. Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc trunk/reactos/base/shell/explorer/explorer-pl.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc [iso-8859-1] Wed Mar 30 18:49:01 2011 @@ -4,6 +4,7 @@ *
https://sourceforge.net/projects/reactospl
* * updated by Caemyr - Olaf Siejka (Jan, 2008) + * updated by Saibamen - Adam Stachowicz (Mar, 2011) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -46,7 +47,7 @@ POPUP "Pomoc" BEGIN MENUITEM "Pomoc", ID_HELP - MENUITEM "Servman - informacje", ID_ABOUT + MENUITEM "O programie", ID_ABOUT END END @@ -72,11 +73,11 @@ END IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "Service Manager - informacje" +CAPTION "Mened¿er Us³ug - informacje" FONT 8, "MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 135, 26 + LTEXT "Mened¿er Us³ug v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 135, 26 PUSHBUTTON "Zamknij", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -198,8 +199,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Numer us³ugi: %d" - IDS_STOP_DEPENDS "When %s stops, these other services will also stop" - IDS_NO_DEPENDS "<No Dependencies>" + IDS_STOP_DEPENDS "Kiedy %s siê zatrzyma, inne us³ugi równie¿ siê zatrzymaj¹" + IDS_NO_DEPENDS "<Brak zale¿noci>" IDS_LICENSE "Niniejszy program jest wolnym oprogramowaniem; mo¿esz go rozprowadzaæ dalej i/lub modyfikowaæ na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundacjê Wolnego Oprogramowania - wed³ug wersji 2 tej Licencji lub (wed³ug Twojego wyboru) której z póniejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadziej¹, i¿ bêdzie on u¿yteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domylnej gwarancji PRZYDATNOCI HANDLOWEJ albo PRZYDATNOCI DO OKRELONYCH ZASTOSOWAÑ. W celu uzyskania bli¿szych informacji siêgnij do Powszechnej Licencji Publicznej GNU.\r\n\r\nZ pewnoci¹ wraz z niniejszym programem otrzyma³e te¿ egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); jeli nie - napisz do Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END Modified: trunk/reactos/base/shell/explorer/explorer-pl.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
============================================================================== --- trunk/reactos/base/shell/explorer/explorer-pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-pl.rc [iso-8859-1] Wed Mar 30 18:49:01 2011 @@ -381,8 +381,8 @@ IDS_DESKTOPBAR_SETTINGS "W³aciwoci pulpitu" IDS_DESKTOP "Pulpit" IDS_TASKBAR "Pasek zadañ" - IDS_NAMECOLUMN "Name" - IDS_PATHCOLUMN "Path" + IDS_NAMECOLUMN "Nazwa" + IDS_PATHCOLUMN "cie¿ka" IDS_MENUCOLUMN "Menu path" END Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc…
============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] Wed Mar 30 18:49:01 2011 @@ -7,6 +7,7 @@ * Use ReactOS forum PM or IRC to contact me *
http://www.reactos.org
* IRC:
irc.freenode.net
#reactos-pl; +* update by Saibamen saibamenppl(a)gmail.com (29.03.2011) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -217,11 +218,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_COLOR_4BIT "16 kolorów (4 Bity)" - IDS_COLOR_8BIT "256 kolorów (8 Bitów)" - IDS_COLOR_16BIT "65,536 kolorów (16 Bitów)" - IDS_COLOR_24BIT "16,777,216 kolorów (24 Bitów)" - IDS_COLOR_32BIT "16,777,216 kolorów (32 Bity)" + IDS_COLOR_4BIT "16 kolorów" + IDS_COLOR_8BIT "256 kolorów" + IDS_COLOR_16BIT "High Color (16 Bitów)" + IDS_COLOR_24BIT "True Color (24 Bitów)" + IDS_COLOR_32BIT "True Color (32 Bity)" IDS_PIXEL "%lux%lu pikseli" END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-…
============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Wed Mar 30 18:49:01 2011 @@ -223,7 +223,7 @@ LTEXT "", 14011, 68, 93, 160, 10 LTEXT "Utworzony:", 14014, 8, 118, 45, 10 LTEXT "", 14015, 68, 118, 160, 10 - AUTOCHECKBOX "&Tylko-do-odczytu", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Tylko do odczytu", 14021, 45, 150, 67, 10 AUTOCHECKBOX "&Ukryty", 14022, 126, 150, 50, 10 END
13 years, 8 months
1
0
0
0
[ilardig] 51205: [CMD] Fix a typo in dir that led to omitting the last character in the AM/PM time format. See issue #6061 for more details.
by ilardig@svn.reactos.org
Author: ilardig Date: Wed Mar 30 13:02:57 2011 New Revision: 51205 URL:
http://svn.reactos.org/svn/reactos?rev=51205&view=rev
Log: [CMD] Fix a typo in dir that led to omitting the last character in the AM/PM time format. See issue #6061 for more details. Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=5…
============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Wed Mar 30 13:02:57 2011 @@ -680,10 +680,10 @@ { case 0: /* 12 hour format */ default: - return _stprintf(lpTime,_T("%02d%c%02u%c"), + return _stprintf(lpTime,_T("%02d%c%02u %cM"), (dt->wHour == 0 ? 12 : (dt->wHour <= 12 ? dt->wHour : dt->wHour - 12)), cTimeSeparator, - dt->wMinute, (dt->wHour <= 11 ? _T('a') : _T('p'))); + dt->wMinute, (dt->wHour <= 11 ? _T('A') : _T('P'))); break; case 1: /* 24 hour format */
13 years, 8 months
1
0
0
0
[fireball] 51204: [NTOS/KE] - Clear KernelApcPending flag every time the Kernel APCs queue is not empty.
by fireball@svn.reactos.org
Author: fireball Date: Wed Mar 30 11:05:40 2011 New Revision: 51204 URL:
http://svn.reactos.org/svn/reactos?rev=51204&view=rev
Log: [NTOS/KE] - Clear KernelApcPending flag every time the Kernel APCs queue is not empty. Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/apc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=5120…
============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Wed Mar 30 11:05:40 2011 @@ -340,6 +340,9 @@ break; } + /* Kernel APC is not pending anymore */ + Thread->ApcState.KernelApcPending = FALSE; + /* Get the next Entry */ ApcListEntry = Thread->ApcState.ApcListHead[KernelMode].Flink; Apc = CONTAINING_RECORD(ApcListEntry, KAPC, ApcListEntry);
13 years, 8 months
1
0
0
0
[jimtabor] 51203: [User32|Win32k] - Move EnableWindow to Win32k. - Fix sign in class function.
by jimtabor@svn.reactos.org
Author: jimtabor Date: Wed Mar 30 08:19:52 2011 New Revision: 51203 URL:
http://svn.reactos.org/svn/reactos?rev=51203&view=rev
Log: [User32|Win32k] - Move EnableWindow to Win32k. - Fix sign in class function. Modified: trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/class.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Wed Mar 30 08:19:52 2011 @@ -933,7 +933,7 @@ WCHAR tmpbuf[MAX_ATOM_LEN + 1]; UINT len; - if (cchType <= 0) return 0; + if ((INT)cchType <= 0) return 0; if (!RealGetWindowClassW( hwnd, tmpbuf, sizeof(tmpbuf)/sizeof(WCHAR) )) return 0; RtlUnicodeToMultiByteN( pszType, cchType - 1, (PULONG)&len, tmpbuf, strlenW(tmpbuf) * sizeof(WCHAR) ); pszType[len] = 0; Modified: trunk/reactos/dll/win32/user32/windows/input.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Wed Mar 30 08:19:52 2011 @@ -100,7 +100,6 @@ #endif } - /* * @implemented */ @@ -108,42 +107,8 @@ EnableWindow(HWND hWnd, BOOL bEnable) { - // This will soon be moved to win32k. - BOOL Update; - LONG Style = GetWindowLongPtrW(hWnd, GWL_STYLE); - /* check if updating is needed */ - UINT bIsDisabled = (Style & WS_DISABLED); - Update = bIsDisabled; - - if (bEnable) - { - Style &= ~WS_DISABLED; - } - else - { - Update = !bIsDisabled; - - SendMessageW( hWnd, WM_CANCELMODE, 0, 0); - - /* Remove keyboard focus from that window if it had focus */ - if (hWnd == GetFocus()) - { - SetFocus(NULL); - } - Style |= WS_DISABLED; - } - - NtUserSetWindowLong(hWnd, GWL_STYLE, Style, FALSE); - - if (Update) - { - IntNotifyWinEvent(EVENT_OBJECT_STATECHANGE, hWnd, OBJID_WINDOW, CHILDID_SELF, 0); - SendMessageW(hWnd, WM_ENABLE, (LPARAM)bEnable, 0); - } - // Return nonzero if it was disabled, or zero if it wasn't: - return bIsDisabled; -} - + return NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)bEnable, TWOPARAM_ROUTINE_ENABLEWINDOW); +} /* * @implemented Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Wed Mar 30 08:19:52 2011 @@ -111,4 +111,6 @@ PWND FASTCALL co_UserCreateWindowEx(CREATESTRUCTW*, PUNICODE_STRING, PLARGE_STRING); WNDPROC FASTCALL IntGetWindowProc(PWND,BOOL); +BOOL FASTCALL IntEnableWindow(HWND,BOOL); + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Wed Mar 30 08:19:52 2011 @@ -436,8 +436,7 @@ } case TWOPARAM_ROUTINE_ENABLEWINDOW: - UNIMPLEMENTED - RETURN( 0); + RETURN( IntEnableWindow((HWND)Param1, (BOOL)Param2)); case TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS: { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Mar 30 08:19:52 2011 @@ -174,6 +174,50 @@ } return NULL; +} + +BOOL +FASTCALL +IntEnableWindow( HWND hWnd, BOOL bEnable ) +{ + BOOL Update; + PWND pWnd; + UINT bIsDisabled; + + if(!(pWnd = UserGetWindowObject(hWnd))) + { + return FALSE; + } + + /* check if updating is needed */ + bIsDisabled = (pWnd->style & WS_DISABLED); + Update = bIsDisabled; + + if (bEnable) + { + pWnd->style &= ~WS_DISABLED; + } + else + { + Update = !bIsDisabled; + + co_IntSendMessage( hWnd, WM_CANCELMODE, 0, 0); + + /* Remove keyboard focus from that window if it had focus */ + if (hWnd == IntGetThreadFocusWindow()) + { + co_UserSetFocus(NULL); + } + pWnd->style |= WS_DISABLED; + } + + if (Update) + { + IntNotifyWinEvent(EVENT_OBJECT_STATECHANGE, pWnd, OBJID_WINDOW, CHILDID_SELF, 0); + co_IntSendMessage(hWnd, WM_ENABLE, (LPARAM)bEnable, 0); + } + // Return nonzero if it was disabled, or zero if it wasn't: + return bIsDisabled; } /*
13 years, 8 months
1
0
0
0
[jimtabor] 51202: [User32] - Connect the rest of the pump hooks and start tracking from application testing.
by jimtabor@svn.reactos.org
Author: jimtabor Date: Wed Mar 30 01:26:54 2011 New Revision: 51202 URL:
http://svn.reactos.org/svn/reactos?rev=51202&view=rev
Log: [User32] - Connect the rest of the pump hooks and start tracking from application testing. Modified: trunk/reactos/dll/win32/user32/windows/message.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Wed Mar 30 01:26:54 2011 @@ -2491,11 +2491,13 @@ } typedef DWORD (WINAPI * RealGetQueueStatusProc)(UINT flags); typedef DWORD (WINAPI * RealMsgWaitForMultipleObjectsExProc)(DWORD nCount, CONST HANDLE *lpHandles, DWORD dwMilliseconds, DWORD dwWakeMask, DWORD dwFlags); +typedef BOOL (WINAPI * RealInternalGetMessageProc)(LPMSG,HWND,UINT,UINT,UINT,BOOL); +typedef BOOL (WINAPI * RealWaitMessageExProc)(DWORD,UINT); typedef struct _USER_MESSAGE_PUMP_ADDRESSES { DWORD cbSize; - //NtUserRealInternalGetMessageProc NtUserRealInternalGetMessage; - //NtUserRealWaitMessageExProc NtUserRealWaitMessageEx; + RealInternalGetMessageProc NtUserRealInternalGetMessage; + RealWaitMessageExProc NtUserRealWaitMessageEx; RealGetQueueStatusProc RealGetQueueStatus; RealMsgWaitForMultipleObjectsExProc RealMsgWaitForMultipleObjectsEx; } USER_MESSAGE_PUMP_ADDRESSES, * PUSER_MESSAGE_PUMP_ADDRESSES; @@ -2515,8 +2517,8 @@ MESSAGEPUMPHOOKPROC gpfnInitMPH; DWORD gcLoadMPH = 0; USER_MESSAGE_PUMP_ADDRESSES gmph = {sizeof(USER_MESSAGE_PUMP_ADDRESSES), - //NtUserRealInternalGetMessage, - //NtUserRealInternalWaitMessageEx, + NtUserRealInternalGetMessage, + NtUserRealWaitMessageEx, RealGetQueueStatus, RealMsgWaitForMultipleObjectsEx }; @@ -2532,8 +2534,8 @@ void WINAPI ResetMessagePumpHook(PUSER_MESSAGE_PUMP_ADDRESSES Addresses) { Addresses->cbSize = sizeof(USER_MESSAGE_PUMP_ADDRESSES); - //Addresses->NtUserRealInternalGetMessage = (NtUserRealInternalGetMessageProc)NtUserRealInternalGetMessage; - //Addresses->NtUserRealWaitMessageEx = (NtUserRealWaitMessageExProc)NtUserRealInternalWaitMessageEx; + Addresses->NtUserRealInternalGetMessage = NtUserRealInternalGetMessage; + Addresses->NtUserRealWaitMessageEx = NtUserRealWaitMessageEx; Addresses->RealGetQueueStatus = RealGetQueueStatus; Addresses->RealMsgWaitForMultipleObjectsEx = RealMsgWaitForMultipleObjectsEx; }
13 years, 8 months
1
0
0
0
[jimtabor] 51201: [User32|Win32k] - Update NtUser pump functions, based on known values. Move one more function to the right place.
by jimtabor@svn.reactos.org
Author: jimtabor Date: Wed Mar 30 01:00:28 2011 New Revision: 51201 URL:
http://svn.reactos.org/svn/reactos?rev=51201&view=rev
Log: [User32|Win32k] - Update NtUser pump functions, based on known values. Move one more function to the right place. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu…
============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Mar 30 01:00:28 2011 @@ -2404,28 +2404,28 @@ HWND hWnd, DWORD Index); -DWORD +BOOL NTAPI NtUserRealInternalGetMessage( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5, - DWORD dwUnknown6); - -DWORD + LPMSG lpMsg, + HWND hWnd, + UINT wMsgFilterMin, + UINT wMsgFilterMax, + UINT wRemoveMsg, + BOOL bGMSG); + +HWND NTAPI NtUserRealChildWindowFromPoint( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2); - -DWORD + HWND Parent, + LONG x, + LONG y); + +BOOL NTAPI NtUserRealWaitMessageEx( - DWORD dwUnknown1, - DWORD dwUnknown2); + DWORD dwWakeMask, + UINT uTimeout); BOOL NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Wed Mar 30 01:00:28 2011 @@ -935,25 +935,25 @@ return 0; } -DWORD +BOOL APIENTRY NtUserRealInternalGetMessage( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5, - DWORD dwUnknown6) -{ - UNIMPLEMENTED; - return 0; -} - -DWORD + LPMSG lpMsg, + HWND hWnd, + UINT wMsgFilterMin, + UINT wMsgFilterMax, + UINT wRemoveMsg, + BOOL bGMSG) +{ + UNIMPLEMENTED; + return 0; +} + +BOOL APIENTRY NtUserRealWaitMessageEx( - DWORD dwUnknown1, - DWORD dwUnknown2) + DWORD dwWakeMask, + UINT uTimeout) { UNIMPLEMENTED; return 0; @@ -1252,10 +1252,10 @@ /* * @unimplemented */ -DWORD APIENTRY -NtUserRealChildWindowFromPoint(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) +HWND APIENTRY +NtUserRealChildWindowFromPoint(HWND Parent, + LONG x, + LONG y) { UNIMPLEMENTED Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Mar 30 01:00:28 2011 @@ -1476,73 +1476,6 @@ *pBufSize = dwCount; return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -HWND APIENTRY -NtUserChildWindowFromPointEx(HWND hwndParent, - LONG x, - LONG y, - UINT uiFlags) -{ - PWND Parent; - POINTL Pt; - HWND Ret; - HWND *List, *phWnd; - - if(!(Parent = UserGetWindowObject(hwndParent))) - { - return NULL; - } - - Pt.x = x; - Pt.y = y; - - if(Parent->head.h != IntGetDesktopWindow()) - { - Pt.x += Parent->rcClient.left; - Pt.y += Parent->rcClient.top; - } - - if(!IntPtInWindow(Parent, Pt.x, Pt.y)) - { - return NULL; - } - - Ret = Parent->head.h; - if((List = IntWinListChildren(Parent))) - { - for(phWnd = List; *phWnd; phWnd++) - { - PWND Child; - if((Child = UserGetWindowObject(*phWnd))) - { - if(!(Child->style & WS_VISIBLE) && (uiFlags & CWP_SKIPINVISIBLE)) - { - continue; - } - if((Child->style & WS_DISABLED) && (uiFlags & CWP_SKIPDISABLED)) - { - continue; - } - if((Child->ExStyle & WS_EX_TRANSPARENT) && (uiFlags & CWP_SKIPTRANSPARENT)) - { - continue; - } - if(IntPtInWindow(Child, Pt.x, Pt.y)) - { - Ret = Child->head.h; - break; - } - } - } - ExFreePool(List); - } - - return Ret; } static void IntSendParentNotify( PWND pWindow, UINT msg ) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Wed Mar 30 01:00:28 2011 @@ -1800,6 +1800,72 @@ /* * @implemented */ +HWND APIENTRY +NtUserChildWindowFromPointEx(HWND hwndParent, + LONG x, + LONG y, + UINT uiFlags) +{ + PWND Parent; + POINTL Pt; + HWND Ret; + HWND *List, *phWnd; + + if(!(Parent = UserGetWindowObject(hwndParent))) + { + return NULL; + } + + Pt.x = x; + Pt.y = y; + + if(Parent->head.h != IntGetDesktopWindow()) + { + Pt.x += Parent->rcClient.left; + Pt.y += Parent->rcClient.top; + } + + if(!IntPtInWindow(Parent, Pt.x, Pt.y)) + { + return NULL; + } + + Ret = Parent->head.h; + if((List = IntWinListChildren(Parent))) + { + for(phWnd = List; *phWnd; phWnd++) + { + PWND Child; + if((Child = UserGetWindowObject(*phWnd))) + { + if(!(Child->style & WS_VISIBLE) && (uiFlags & CWP_SKIPINVISIBLE)) + { + continue; + } + if((Child->style & WS_DISABLED) && (uiFlags & CWP_SKIPDISABLED)) + { + continue; + } + if((Child->ExStyle & WS_EX_TRANSPARENT) && (uiFlags & CWP_SKIPTRANSPARENT)) + { + continue; + } + if(IntPtInWindow(Child, Pt.x, Pt.y)) + { + Ret = Child->head.h; + break; + } + } + } + ExFreePool(List); + } + + return Ret; +} + +/* + * @implemented + */ BOOL APIENTRY NtUserEndDeferWindowPosEx(HDWP WinPosInfo, DWORD Unknown1)
13 years, 8 months
1
0
0
0
[jimtabor] 51200: [Win32k] - Move IntGdiSetBrushOwner and IntGdiSetRegionOwner out of the export section.
by jimtabor@svn.reactos.org
Author: jimtabor Date: Tue Mar 29 23:44:22 2011 New Revision: 51200 URL:
http://svn.reactos.org/svn/reactos?rev=51200&view=rev
Log: [Win32k] - Move IntGdiSetBrushOwner and IntGdiSetRegionOwner out of the export section. Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Tue Mar 29 23:44:22 2011 @@ -162,6 +162,54 @@ return; } +BOOL +FASTCALL +IntGdiSetBrushOwner(PBRUSH pbr, DWORD OwnerMask) +{ + HBRUSH hBR; + PEPROCESS Owner = NULL; + PGDI_TABLE_ENTRY pEntry = NULL; + + if (!pbr) return FALSE; + + hBR = pbr->BaseObject.hHmgr; + + if (!hBR || (GDI_HANDLE_GET_TYPE(hBR) != GDI_OBJECT_TYPE_BRUSH)) + return FALSE; + else + { + INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hBR); + pEntry = &GdiHandleTable->Entries[Index]; + } + + if (pbr->flAttrs & GDIBRUSH_IS_GLOBAL) + { + GDIOBJ_ShareUnlockObjByPtr((POBJ)pbr); + return TRUE; + } + + if ((OwnerMask == GDI_OBJ_HMGR_PUBLIC) || OwnerMask == GDI_OBJ_HMGR_NONE) + { + // Set this Brush to inaccessible mode and to an Owner of NONE. +// if (OwnerMask == GDI_OBJ_HMGR_NONE) Owner = OwnerMask; + + if (!GDIOBJ_SetOwnership((HGDIOBJ) hBR, Owner)) + return FALSE; + + // Deny user access to User Data. + pEntry->UserData = NULL; // This hBR is inaccessible! + } + + if (OwnerMask == GDI_OBJ_HMGR_POWNED) + { + if (!GDIOBJ_SetOwnership((HGDIOBJ) hBR, PsGetCurrentProcess() )) + return FALSE; + + // Allow user access to User Data. + pEntry->UserData = pbr->pBrushAttr; + } + return TRUE; +} BOOL INTERNAL_CALL @@ -573,53 +621,4 @@ return TRUE; } -BOOL -FASTCALL -IntGdiSetBrushOwner(PBRUSH pbr, DWORD OwnerMask) -{ - HBRUSH hBR; - PEPROCESS Owner = NULL; - PGDI_TABLE_ENTRY pEntry = NULL; - - if (!pbr) return FALSE; - - hBR = pbr->BaseObject.hHmgr; - - if (!hBR || (GDI_HANDLE_GET_TYPE(hBR) != GDI_OBJECT_TYPE_BRUSH)) - return FALSE; - else - { - INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hBR); - pEntry = &GdiHandleTable->Entries[Index]; - } - - if (pbr->flAttrs & GDIBRUSH_IS_GLOBAL) - { - GDIOBJ_ShareUnlockObjByPtr((POBJ)pbr); - return TRUE; - } - - if ((OwnerMask == GDI_OBJ_HMGR_PUBLIC) || OwnerMask == GDI_OBJ_HMGR_NONE) - { - // Set this Brush to inaccessible mode and to an Owner of NONE. -// if (OwnerMask == GDI_OBJ_HMGR_NONE) Owner = OwnerMask; - - if (!GDIOBJ_SetOwnership((HGDIOBJ) hBR, Owner)) - return FALSE; - - // Deny user access to User Data. - pEntry->UserData = NULL; // This hBR is inaccessible! - } - - if (OwnerMask == GDI_OBJ_HMGR_POWNED) - { - if (!GDIOBJ_SetOwnership((HGDIOBJ) hBR, PsGetCurrentProcess() )) - return FALSE; - - // Allow user access to User Data. - pEntry->UserData = pbr->pBrushAttr; - } - return TRUE; -} - /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Tue Mar 29 23:44:22 2011 @@ -2294,6 +2294,34 @@ } } +BOOL +FASTCALL +IntGdiSetRegionOwner(HRGN hRgn, DWORD OwnerMask) +{ + INT Index; + PGDI_TABLE_ENTRY Entry; +/* + System Regions: + These regions do not use attribute sections and when allocated, use gdiobj + level functions. + */ + // FIXME! HAX!!! Remove this once we get everything right! + Index = GDI_HANDLE_GET_INDEX(hRgn); + Entry = &GdiHandleTable->Entries[Index]; + if (Entry->UserData) FreeObjectAttr(Entry->UserData); + Entry->UserData = NULL; + // + if ((OwnerMask == GDI_OBJ_HMGR_PUBLIC) || OwnerMask == GDI_OBJ_HMGR_NONE) + { + return GDIOBJ_SetOwnership(hRgn, NULL); + } + if (OwnerMask == GDI_OBJ_HMGR_POWNED) + { + return GDIOBJ_SetOwnership((HGDIOBJ) hRgn, PsGetCurrentProcess() ); + } + return FALSE; +} + INT FASTCALL IntGdiCombineRgn(PROSRGNDATA destRgn, @@ -3942,32 +3970,4 @@ return size + sizeof(RGNDATAHEADER); } -BOOL -FASTCALL -IntGdiSetRegionOwner(HRGN hRgn, DWORD OwnerMask) -{ - INT Index; - PGDI_TABLE_ENTRY Entry; -/* - System Regions: - These regions do not use attribute sections and when allocated, use gdiobj - level functions. - */ - // FIXME! HAX!!! Remove this once we get everything right! - Index = GDI_HANDLE_GET_INDEX(hRgn); - Entry = &GdiHandleTable->Entries[Index]; - if (Entry->UserData) FreeObjectAttr(Entry->UserData); - Entry->UserData = NULL; - // - if ((OwnerMask == GDI_OBJ_HMGR_PUBLIC) || OwnerMask == GDI_OBJ_HMGR_NONE) - { - return GDIOBJ_SetOwnership(hRgn, NULL); - } - if (OwnerMask == GDI_OBJ_HMGR_POWNED) - { - return GDIOBJ_SetOwnership((HGDIOBJ) hRgn, PsGetCurrentProcess() ); - } - return FALSE; -} - /* EOF */
13 years, 8 months
1
0
0
0
[osiejka] 51199: [SHELL32] - Fix a bug, by Johannes Anderwald
by osiejka@svn.reactos.org
Author: osiejka Date: Tue Mar 29 21:59:57 2011 New Revision: 51199 URL:
http://svn.reactos.org/svn/reactos?rev=51199&view=rev
Log: [SHELL32] - Fix a bug, by Johannes Anderwald Modified: trunk/reactos/dll/win32/shell32/shlfileop.c Modified: trunk/reactos/dll/win32/shell32/shlfileop.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo…
============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] Tue Mar 29 21:59:57 2011 @@ -593,7 +593,7 @@ /* get current file */ from = &Context->from->feFiles[Context->Index]; - if (Context->op->req->fFlags != FO_DELETE) + if (Context->op->req->wFunc != FO_DELETE) to = &Context->to->feFiles[Context->Index]; /* update status */
13 years, 8 months
1
0
0
0
[osiejka] 51198: [SHELL32] - Fix build, borked by copypasta
by osiejka@svn.reactos.org
Author: osiejka Date: Tue Mar 29 21:48:30 2011 New Revision: 51198 URL:
http://svn.reactos.org/svn/reactos?rev=51198&view=rev
Log: [SHELL32] - Fix build, borked by copypasta Modified: trunk/reactos/dll/win32/shell32/shlfileop.c Modified: trunk/reactos/dll/win32/shell32/shlfileop.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo…
============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] Tue Mar 29 21:48:30 2011 @@ -584,7 +584,7 @@ QueueFile( FILE_OPERATION_CONTEXT * Context) { - FILE_ENTRY * from, *too = NULL; + FILE_ENTRY * from, *to = NULL; BOOL bRet = FALSE; if (Context->Index >= Context->from->dwNumFiles)
13 years, 8 months
1
0
0
0
[fireball] 51197: [KERNEL32] - Rename global vars to some better names (some of the names seen in Windows 2003 asserts and text messages). - Add BaseDefaultPath initialization, which will be needed...
by fireball@svn.reactos.org
Author: fireball Date: Tue Mar 29 21:48:13 2011 New Revision: 51197 URL:
http://svn.reactos.org/svn/reactos?rev=51197&view=rev
Log: [KERNEL32] - Rename global vars to some better names (some of the names seen in Windows 2003 asserts and text messages). - Add BaseDefaultPath initialization, which will be needed but the new kernel32/ldr code, which is in turn required by the new ntdll/ldr code. - Add some beginnings of BasepGetDllPath(), but it returns NULL anyway now so no change in execution. Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c trunk/reactos/dll/win32/kernel32/file/dir.c trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/dll/win32/kernel32/misc/dllmain.c trunk/reactos/dll/win32/kernel32/process/procsup.c Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cu…
============================================================================== --- trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] Tue Mar 29 21:48:13 2011 @@ -28,6 +28,8 @@ UNICODE_STRING SystemDirectory; UNICODE_STRING WindowsDirectory; +UNICODE_STRING BaseDefaultPathAppend; +UNICODE_STRING BaseDefaultPath; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di…
============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Tue Mar 29 21:48:13 2011 @@ -20,7 +20,7 @@ #include <debug.h> DEBUG_CHANNEL(kernel32file); -UNICODE_STRING DllDirectory = {0, 0, NULL}; +UNICODE_STRING BaseDllDirectory = {0, 0, NULL}; /* FUNCTIONS *****************************************************************/ @@ -1079,35 +1079,35 @@ RtlInitUnicodeString(&PathName, lpPathName); - RtlEnterCriticalSection(&DllLock); + RtlEnterCriticalSection(&BaseDllDirectoryLock); if(PathName.Length > 0) { - if(PathName.Length + sizeof(WCHAR) <= DllDirectory.MaximumLength) - { - RtlCopyUnicodeString(&DllDirectory, &PathName); + if(PathName.Length + sizeof(WCHAR) <= BaseDllDirectory.MaximumLength) + { + RtlCopyUnicodeString(&BaseDllDirectory, &PathName); } else { - RtlFreeUnicodeString(&DllDirectory); - if(!(DllDirectory.Buffer = (PWSTR)RtlAllocateHeap(RtlGetProcessHeap(), - 0, - PathName.Length + sizeof(WCHAR)))) + RtlFreeUnicodeString(&BaseDllDirectory); + if(!(BaseDllDirectory.Buffer = (PWSTR)RtlAllocateHeap(RtlGetProcessHeap(), + 0, + PathName.Length + sizeof(WCHAR)))) { - RtlLeaveCriticalSection(&DllLock); + RtlLeaveCriticalSection(&BaseDllDirectoryLock); SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - DllDirectory.Length = 0; - DllDirectory.MaximumLength = PathName.Length + sizeof(WCHAR); - - RtlCopyUnicodeString(&DllDirectory, &PathName); + BaseDllDirectory.Length = 0; + BaseDllDirectory.MaximumLength = PathName.Length + sizeof(WCHAR); + + RtlCopyUnicodeString(&BaseDllDirectory, &PathName); } } else { - RtlFreeUnicodeString(&DllDirectory); + RtlFreeUnicodeString(&BaseDllDirectory); } - RtlLeaveCriticalSection(&DllLock); + RtlLeaveCriticalSection(&BaseDllDirectoryLock); return TRUE; } @@ -1144,10 +1144,10 @@ { DWORD Ret; - RtlEnterCriticalSection(&DllLock); + RtlEnterCriticalSection(&BaseDllDirectoryLock); if(nBufferLength > 0) { - Ret = DllDirectory.Length / sizeof(WCHAR); + Ret = BaseDllDirectory.Length / sizeof(WCHAR); if(Ret > nBufferLength - 1) { Ret = nBufferLength - 1; @@ -1155,16 +1155,16 @@ if(Ret > 0) { - RtlCopyMemory(lpBuffer, DllDirectory.Buffer, Ret * sizeof(WCHAR)); + RtlCopyMemory(lpBuffer, BaseDllDirectory.Buffer, Ret * sizeof(WCHAR)); } lpBuffer[Ret] = L'\0'; } else { /* include termination character, even if the string is empty! */ - Ret = (DllDirectory.Length / sizeof(WCHAR)) + 1; + Ret = (BaseDllDirectory.Length / sizeof(WCHAR)) + 1; } - RtlLeaveCriticalSection(&DllLock); + RtlLeaveCriticalSection(&BaseDllDirectoryLock); return Ret; } Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include…
============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Tue Mar 29 21:48:13 2011 @@ -91,9 +91,9 @@ extern HANDLE hBaseDir; extern HMODULE hCurrentModule; -extern RTL_CRITICAL_SECTION DllLock; - -extern UNICODE_STRING DllDirectory; +extern RTL_CRITICAL_SECTION BaseDllDirectoryLock; + +extern UNICODE_STRING BaseDllDirectory; extern LPTOP_LEVEL_EXCEPTION_FILTER GlobalTopLevelExceptionFilter; @@ -211,6 +211,12 @@ OUT PHANDLE hSection, IN PUNICODE_STRING ApplicationName); +LPWSTR +WINAPI +BasepGetDllPath(LPWSTR FullPath, + PVOID Environment); + + PCODEPAGE_ENTRY FASTCALL IntGetCodePageEntry(UINT CodePage); Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co…
============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Tue Mar 29 21:48:13 2011 @@ -3524,7 +3524,7 @@ { BOOL Ret; - RtlEnterCriticalSection(&DllLock); + RtlEnterCriticalSection(&BaseDllDirectoryLock); if (Add) { Ret = AddConsoleCtrlHandler(HandlerRoutine); @@ -3534,7 +3534,7 @@ Ret = RemoveConsoleCtrlHandler(HandlerRoutine); } - RtlLeaveCriticalSection(&DllLock); + RtlLeaveCriticalSection(&BaseDllDirectoryLock); return(Ret); } Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dl…
============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] Tue Mar 29 21:48:13 2011 @@ -5,6 +5,7 @@ * FILE: lib/kernel32/misc/dllmain.c * PURPOSE: Initialization * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * Aleksey Bragin (aleksey(a)reactos.org) * UPDATE HISTORY: * Created 01/11/98 */ @@ -20,6 +21,10 @@ extern UNICODE_STRING SystemDirectory; extern UNICODE_STRING WindowsDirectory; +extern UNICODE_STRING BaseDefaultPath; +extern UNICODE_STRING BaseDefaultPathAppend; + +WCHAR BaseDefaultPathBuffer[6140]; HANDLE hProcessHeap = NULL; HMODULE hCurrentModule = NULL; @@ -36,7 +41,7 @@ LPVOID lpReserved); /* Critical section for various kernel32 data structures */ -RTL_CRITICAL_SECTION DllLock; +RTL_CRITICAL_SECTION BaseDllDirectoryLock; RTL_CRITICAL_SECTION ConsoleLock; extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); @@ -275,6 +280,9 @@ /* Don't bother us for each thread */ LdrDisableThreadCalloutsForDll((PVOID)hDll); + /* Initialize default path to NULL */ + RtlInitUnicodeString(&BaseDefaultPath, NULL); + /* Setup the right Object Directory path */ if (!SessionId) { @@ -332,10 +340,24 @@ SystemDirectory.MaximumLength); if(SystemDirectory.Buffer == NULL) { + DPRINT1("Failure allocating SystemDirectory buffer\n"); return FALSE; } wcscpy(SystemDirectory.Buffer, WindowsDirectory.Buffer); wcscat(SystemDirectory.Buffer, L"\\System32"); + + /* Construct the default path (using the static buffer) */ + _snwprintf(BaseDefaultPathBuffer, sizeof(BaseDefaultPathBuffer) / sizeof(WCHAR), + L".;%wZ;%wZ\\system;%wZ;", &SystemDirectory, &WindowsDirectory, &WindowsDirectory); + + BaseDefaultPath.Buffer = BaseDefaultPathBuffer; + BaseDefaultPath.Length = wcslen(BaseDefaultPathBuffer) * sizeof(WCHAR); + BaseDefaultPath.MaximumLength = sizeof(BaseDefaultPathBuffer); + + /* Use remaining part of the default path buffer for the append path */ + BaseDefaultPathAppend.Buffer = (PWSTR)((ULONG_PTR)BaseDefaultPathBuffer + BaseDefaultPath.Length); + BaseDefaultPathAppend.Length = 0; + BaseDefaultPathAppend.MaximumLength = BaseDefaultPath.MaximumLength - BaseDefaultPath.Length; /* Initialize command line */ InitCommandLines(); @@ -349,7 +371,7 @@ } /* Initialize the DLL critical section */ - RtlInitializeCriticalSection(&DllLock); + RtlInitializeCriticalSection(&BaseDllDirectoryLock); /* Initialize the National Language Support routines */ if (!NlsInit()) @@ -395,7 +417,7 @@ ConsoleInitialized = FALSE; RtlDeleteCriticalSection (&ConsoleLock); } - RtlDeleteCriticalSection (&DllLock); + RtlDeleteCriticalSection (&BaseDllDirectoryLock); /* Close object base directory */ NtClose(hBaseDir); Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process…
============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Tue Mar 29 21:48:13 2011 @@ -13,6 +13,9 @@ #define NDEBUG #include <debug.h> + +UNICODE_STRING BasePathVariableName = RTL_CONSTANT_STRING(L"PATH"); +UNICODE_STRING BaseDefaultPath; #define CMD_STRING L"cmd /c " @@ -354,11 +357,44 @@ LPWSTR WINAPI +BasepGetProcessPath(DWORD Reserved, + LPWSTR FullPath, + PVOID Environment) +{ + return NULL; +} + +LPWSTR +WINAPI BasepGetDllPath(LPWSTR FullPath, PVOID Environment) { - /* FIXME: Not yet implemented */ - return NULL; + LPWSTR DllPath = NULL; + + /* Acquire DLL directory lock */ + RtlEnterCriticalSection(&BaseDllDirectoryLock); + + /* Check if we have a base dll directory */ + if (BaseDllDirectory.Buffer) + { + /* Then get process path */ + DllPath = BasepGetProcessPath(0, FullPath, Environment); + + /* Release DLL directory lock */ + RtlLeaveCriticalSection(&BaseDllDirectoryLock); + + /* Return dll path */ + return DllPath; + } + + /* Release DLL directory lock */ + RtlLeaveCriticalSection(&BaseDllDirectoryLock); + + /* There is no base DLL directory */ + UNIMPLEMENTED; + + /* Return dll path */ + return DllPath; } VOID
13 years, 8 months
1
0
0
0
← Newer
1
2
3
4
5
...
28
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
Results per page:
10
25
50
100
200