Ros-diffs July 2018

ros-diffs@reactos.org

17 participants
89 discussions

01/01: [PSDK] Add SymTagENum to dbghelp.h and imagehlp.h
by Timo Kreuzer 14 Jul '18

14 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82b2aef0910d8cae18ab1… commit 82b2aef0910d8cae18ab17effdb78472e9fdb149 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Nov 3 08:12:29 2017 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 14 15:48:23 2018 +0200 [PSDK] Add SymTagENum to dbghelp.h and imagehlp.h --- sdk/include/psdk/dbghelp.h | 49 +++++++++++++++++++++++++++++++++++++++++++++ sdk/include/psdk/imagehlp.h | 48 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/sdk/include/psdk/dbghelp.h b/sdk/include/psdk/dbghelp.h index a8fdf38e0a..7a379466e9 100644 --- a/sdk/include/psdk/dbghelp.h +++ b/sdk/include/psdk/dbghelp.h @@ -173,6 +173,55 @@ typedef enum NumSymTypes } SYM_TYPE; +#ifdef _NO_CVCONST_H +enum SymTagEnum +{ + SymTagNull, + SymTagExe, + SymTagCompiland, + SymTagCompilandDetails, + SymTagCompilandEnv, + SymTagFunction, + SymTagBlock, + SymTagData, + SymTagAnnotation, + SymTagLabel, + SymTagPublicSymbol, + SymTagUDT, + SymTagEnum, + SymTagFunctionType, + SymTagPointerType, + SymTagArrayType, + SymTagBaseType, + SymTagTypedef, + SymTagBaseClass, + SymTagFriend, + SymTagFunctionArgType, + SymTagFuncDebugStart, + SymTagFuncDebugEnd, + SymTagUsingNamespace, + SymTagVTableShape, + SymTagVTable, + SymTagCustom, + SymTagThunk, + SymTagCustomType, + SymTagManagedType, + SymTagDimension, + SymTagCallSite, + SymTagInlineSite, + SymTagBaseInterface, + SymTagVectorType, + SymTagMatrixType, + SymTagHLSLType, + SymTagCaller, + SymTagCallee, + SymTagExport, + SymTagHeapAllocationSite, + SymTagCoffGroup, + SymTagMax +}; +#endif // _NO_CVCONST_H + #if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) #define IMAGEHLP_SYMBOL IMAGEHLP_SYMBOL64 #define IMAGEHLP_SYMBOLW IMAGEHLP_SYMBOLW64 diff --git a/sdk/include/psdk/imagehlp.h b/sdk/include/psdk/imagehlp.h index 38d9bd2b96..bed6492d6b 100644 --- a/sdk/include/psdk/imagehlp.h +++ b/sdk/include/psdk/imagehlp.h @@ -214,6 +214,54 @@ typedef enum { SymDeferred, SymSym } SYM_TYPE; +#ifdef _NO_CVCONST_H +enum SymTagEnum +{ + SymTagNull, + SymTagExe, + SymTagCompiland, + SymTagCompilandDetails, + SymTagCompilandEnv, + SymTagFunction, + SymTagBlock, + SymTagData, + SymTagAnnotation, + SymTagLabel, + SymTagPublicSymbol, + SymTagUDT, + SymTagEnum, + SymTagFunctionType, + SymTagPointerType, + SymTagArrayType, + SymTagBaseType, + SymTagTypedef, + SymTagBaseClass, + SymTagFriend, + SymTagFunctionArgType, + SymTagFuncDebugStart, + SymTagFuncDebugEnd, + SymTagUsingNamespace, + SymTagVTableShape, + SymTagVTable, + SymTagCustom, + SymTagThunk, + SymTagCustomType, + SymTagManagedType, + SymTagDimension, + SymTagCallSite, + SymTagInlineSite, + SymTagBaseInterface, + SymTagVectorType, + SymTagMatrixType, + SymTagHLSLType, + SymTagCaller, + SymTagCallee, + SymTagExport, + SymTagHeapAllocationSite, + SymTagCoffGroup, + SymTagMax +}; +#endif // _NO_CVCONST_H typedef struct _IMAGEHLP_SYMBOL { DWORD SizeOfStruct; DWORD Address;

1 0

01/01: [WINDOWSCODECS] Fix an MSVC warning about get_decoder_info() (#684)
by Serge Gautherie 14 Jul '18

14 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=246005c6250f906f69322… commit 246005c6250f906f693224c0da5a366b3009d338 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jul 14 02:50:23 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jul 14 02:50:23 2018 +0200 [WINDOWSCODECS] Fix an MSVC warning about get_decoder_info() (#684) "...\info.c(2163) : warning C4028: formal parameter 1 different from declaration" Cherry-pick https://source.winehq.org/git/wine.git/commit/90518ebd2ca14568879831a5a8768… CORE-7538 --- dll/win32/windowscodecs/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/windowscodecs/info.c b/dll/win32/windowscodecs/info.c index 33d3c3030d..0a86266396 100644 --- a/dll/win32/windowscodecs/info.c +++ b/dll/win32/windowscodecs/info.c @@ -2159,7 +2159,7 @@ void ReleaseComponentInfos(void) IWICComponentInfo_Release(&info->IWICComponentInfo_iface); } -HRESULT get_decoder_info(const CLSID *clsid, IWICBitmapDecoderInfo **info) +HRESULT get_decoder_info(REFCLSID clsid, IWICBitmapDecoderInfo **info) { IWICComponentInfo *compinfo; HRESULT hr;

1 0

01/01: [USER32][WIN32SS] Fix display of owned popup windows (#683)
by Katayama Hirofumi MZ 13 Jul '18

13 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42353ecbadd096358f250… commit 42353ecbadd096358f250a9dd931d4cf0981b417 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 13 23:03:45 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jul 13 16:03:45 2018 +0200 [USER32][WIN32SS] Fix display of owned popup windows (#683) An owned popup window should be hidden when its owner window was minimized. - Add IntWinListOwnedPopups function. - Fix ShowWindow and ShowOwnedPopups functions. CORE-14818 See also: CORE-3326, CORE-12252, CORE-13168, and CORE-14824. --- win32ss/user/ntuser/defwnd.c | 8 -------- win32ss/user/ntuser/window.c | 40 ++++++++++++++++++++++++++++++++++++++-- win32ss/user/ntuser/window.h | 1 + win32ss/user/ntuser/winpos.c | 6 +++--- 4 files changed, 42 insertions(+), 13 deletions(-) diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index 367c5faac9..eb7284150c 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -619,14 +619,6 @@ IntDefWindowProc( if (!Wnd->spwndOwner) break; if (LOWORD(lParam)) { - if (wParam) - { - if (!(Wnd->state & WNDS_HIDDENPOPUP)) break; - Wnd->state &= ~WNDS_HIDDENPOPUP; - } - else - Wnd->state |= WNDS_HIDDENPOPUP; - co_WinPosShowWindow(Wnd, wParam ? SW_SHOWNOACTIVATE : SW_HIDE); } break; diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 838d854f8f..95ffa02fb7 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -279,6 +279,39 @@ IntWinListChildren(PWND Window) return List; } +HWND* FASTCALL +IntWinListOwnedPopups(PWND Window) +{ + PWND Child, Desktop; + HWND *List; + UINT Index, NumChildren = 0; + + Desktop = co_GetDesktopWindow(Window); + if (!Desktop) + return NULL; + + for (Child = Desktop->spwndChild; Child; Child = Child->spwndNext) + ++NumChildren; + + List = ExAllocatePoolWithTag(PagedPool, (NumChildren + 1) * sizeof(HWND), USERTAG_WINDOWLIST); + if (!List) + { + ERR("Failed to allocate memory for children array\n"); + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + Index = 0; + for (Child = Desktop->spwndChild; Child; Child = Child->spwndNext) + { + if (Child->spwndOwner == Window) + List[Index++] = Child->head.h; + } + List[Index] = NULL; + + return List; +} + PWND FASTCALL IntGetNonChildAncestor(PWND pWnd) { @@ -4400,7 +4433,9 @@ IntShowOwnedPopups(PWND OwnerWnd, BOOL fShow ) // ASSERT(OwnerWnd); TRACE("Enter ShowOwnedPopups Show: %s\n", (fShow ? "TRUE" : "FALSE")); - win_array = IntWinListChildren(OwnerWnd); + + /* NOTE: Popups are not children */ + win_array = IntWinListOwnedPopups(OwnerWnd); if (!win_array) return TRUE; @@ -4423,6 +4458,7 @@ IntShowOwnedPopups(PWND OwnerWnd, BOOL fShow ) * regardless of the state of the owner */ co_IntSendMessage(win_array[count], WM_SHOWWINDOW, SW_SHOWNORMAL, SW_PARENTOPENING); + pWnd->state &= ~WNDS_HIDDENPOPUP; continue; } } @@ -4435,10 +4471,10 @@ IntShowOwnedPopups(PWND OwnerWnd, BOOL fShow ) * regardless of the state of the owner */ co_IntSendMessage(win_array[count], WM_SHOWWINDOW, SW_HIDE, SW_PARENTCLOSING); + pWnd->state |= WNDS_HIDDENPOPUP; continue; } } - } ExFreePoolWithTag(win_array, USERTAG_WINDOWLIST); TRACE("Leave ShowOwnedPopups\n"); diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index 6c811914af..24b6021422 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -41,6 +41,7 @@ PWND FASTCALL ValidateHwndNoErr(HWND); BOOL FASTCALL UserUpdateUiState(PWND Wnd, WPARAM wParam); BOOL FASTCALL IntIsWindow(HWND hWnd); HWND* FASTCALL IntWinListChildren(PWND Window); +HWND* FASTCALL IntWinListOwnedPopups(PWND Window); VOID FASTCALL IntGetClientRect (PWND WindowObject, RECTL *Rect); INT FASTCALL IntMapWindowPoints(PWND FromWnd, PWND ToWnd, LPPOINT lpPoints, UINT cPoints); BOOL FASTCALL IntIsChildWindow (PWND Parent, PWND Child); diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index d1f975ef42..b805e9f25a 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -2275,11 +2275,11 @@ co_WinPosMinMaximize(PWND Wnd, UINT ShowFlag, RECT* NewPos) WinPosFindIconPos(Wnd, &wpl.ptMinPosition); - /*if (!(old_style & WS_MINIMIZE)) + if (!(old_style & WS_MINIMIZE)) { SwpFlags |= SWP_STATECHANGED; IntShowOwnedPopups(Wnd, FALSE); - }*/ + } RECTL_vSetRect(NewPos, wpl.ptMinPosition.x, wpl.ptMinPosition.y, wpl.ptMinPosition.x + UserGetSystemMetrics(SM_CXMINIMIZED), @@ -2325,7 +2325,7 @@ co_WinPosMinMaximize(PWND Wnd, UINT ShowFlag, RECT* NewPos) old_style = IntSetStyle( Wnd, 0, WS_MINIMIZE | WS_MAXIMIZE ); if (old_style & WS_MINIMIZE) { - //IntShowOwnedPopups(Wnd, TRUE); + IntShowOwnedPopups(Wnd, TRUE); if (Wnd->InternalPos.flags & WPF_RESTORETOMAXIMIZED) {

1 0

01/01: [EXPLORER][SHELL32][USER32] Implement 'Show the Desktop' action of Task Bar (#668)
by Katayama Hirofumi MZ 13 Jul '18

13 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75b09f3f88b214149305f… commit 75b09f3f88b214149305faedd13b832ec5b99f16 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 13 17:34:42 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jul 13 10:34:42 2018 +0200 [EXPLORER][SHELL32][USER32] Implement 'Show the Desktop' action of Task Bar (#668) The keyboard shortcuts Win+D and Win+M are also enabled. - Implement IShellDispatch4::ToggleDesktop(). - Implement some commands in CTrayWindow. - Add "sdk/include/reactos/traycmd.h" for tray commands. - Fix task window switching. - Improve the user32!SwitchToThisWindow() function and use it. CORE-14318, CORE-13157 See also: CORE-14806 and CORE-8723 --- base/shell/explorer/lang/bg-BG.rc | 1 + base/shell/explorer/lang/cs-CZ.rc | 1 + base/shell/explorer/lang/de-DE.rc | 1 + base/shell/explorer/lang/en-US.rc | 1 + base/shell/explorer/lang/es-ES.rc | 1 + base/shell/explorer/lang/et-EE.rc | 1 + base/shell/explorer/lang/fi-FI.rc | 1 + base/shell/explorer/lang/fr-FR.rc | 1 + base/shell/explorer/lang/he-IL.rc | 1 + base/shell/explorer/lang/it-IT.rc | 1 + base/shell/explorer/lang/ja-JP.rc | 1 + base/shell/explorer/lang/ko-KR.rc | 1 + base/shell/explorer/lang/lt-LT.rc | 1 + base/shell/explorer/lang/ms-MY.rc | 1 + base/shell/explorer/lang/nl-NL.rc | 1 + base/shell/explorer/lang/no-NO.rc | 1 + base/shell/explorer/lang/pl-PL.rc | 1 + base/shell/explorer/lang/pt-BR.rc | 1 + base/shell/explorer/lang/ro-RO.rc | 1 + base/shell/explorer/lang/ru-RU.rc | 1 + base/shell/explorer/lang/sk-SK.rc | 1 + base/shell/explorer/lang/sq-AL.rc | 1 + base/shell/explorer/lang/tr-TR.rc | 1 + base/shell/explorer/lang/uk-UA.rc | 1 + base/shell/explorer/lang/zh-CN.rc | 1 + base/shell/explorer/lang/zh-TW.rc | 1 + base/shell/explorer/precomp.h | 1 + base/shell/explorer/resource.h | 2 + base/shell/explorer/taskswnd.cpp | 18 +- base/shell/explorer/traywnd.cpp | 319 +++++++++++++++++++++++++++++++---- dll/win32/shell32/CShellDispatch.cpp | 8 +- sdk/include/reactos/traycmd.h | 49 ++++++ win32ss/user/user32/windows/window.c | 20 ++- 33 files changed, 391 insertions(+), 52 deletions(-) diff --git a/base/shell/explorer/lang/bg-BG.rc b/base/shell/explorer/lang/bg-BG.rc index aed0ade10a..821b4ba935 100644 --- a/base/shell/explorer/lang/bg-BG.rc +++ b/base/shell/explorer/lang/bg-BG.rc @@ -197,4 +197,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Свойства на задачната лента и на пусковия изборник" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/cs-CZ.rc b/base/shell/explorer/lang/cs-CZ.rc index 784ba327d6..52b9e27506 100644 --- a/base/shell/explorer/lang/cs-CZ.rc +++ b/base/shell/explorer/lang/cs-CZ.rc @@ -203,4 +203,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Vlastnosti hlavního panelu a Start menu" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/de-DE.rc b/base/shell/explorer/lang/de-DE.rc index 9e49bb9c0a..b904f31582 100644 --- a/base/shell/explorer/lang/de-DE.rc +++ b/base/shell/explorer/lang/de-DE.rc @@ -197,4 +197,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskleisten- und Startmenüeinstellungen" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/en-US.rc b/base/shell/explorer/lang/en-US.rc index 0f81474a1f..abf909a89a 100644 --- a/base/shell/explorer/lang/en-US.rc +++ b/base/shell/explorer/lang/en-US.rc @@ -197,4 +197,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar and Start Menu" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/es-ES.rc b/base/shell/explorer/lang/es-ES.rc index 7cc3d6cf5a..c37a5fca98 100644 --- a/base/shell/explorer/lang/es-ES.rc +++ b/base/shell/explorer/lang/es-ES.rc @@ -207,4 +207,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Propiedades de la Barra de tareas y del Menú Inicio" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/et-EE.rc b/base/shell/explorer/lang/et-EE.rc index 8176660b2f..7f057af7ce 100644 --- a/base/shell/explorer/lang/et-EE.rc +++ b/base/shell/explorer/lang/et-EE.rc @@ -204,4 +204,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Tegumiriba ja Menüü Start" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/fi-FI.rc b/base/shell/explorer/lang/fi-FI.rc index 20a0aaf4c0..adfaeb4ad5 100644 --- a/base/shell/explorer/lang/fi-FI.rc +++ b/base/shell/explorer/lang/fi-FI.rc @@ -197,4 +197,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Tehtäväpalkki ja Käynnistä Valikko" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/fr-FR.rc b/base/shell/explorer/lang/fr-FR.rc index 55782f54d7..6654292abe 100644 --- a/base/shell/explorer/lang/fr-FR.rc +++ b/base/shell/explorer/lang/fr-FR.rc @@ -197,4 +197,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Barrre des tâches et menu démarrer" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/he-IL.rc b/base/shell/explorer/lang/he-IL.rc index ba0d8e2f1c..8791b8face 100644 --- a/base/shell/explorer/lang/he-IL.rc +++ b/base/shell/explorer/lang/he-IL.rc @@ -197,4 +197,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "שורת המשימות ושולחן העבודה" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/it-IT.rc b/base/shell/explorer/lang/it-IT.rc index 8f6adba5e3..4d1638c037 100644 --- a/base/shell/explorer/lang/it-IT.rc +++ b/base/shell/explorer/lang/it-IT.rc @@ -197,4 +197,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Proprietà della Barra delle applicazioni e del Menú di avvio" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/ja-JP.rc b/base/shell/explorer/lang/ja-JP.rc index f7036c1263..3e67534f21 100644 --- a/base/shell/explorer/lang/ja-JP.rc +++ b/base/shell/explorer/lang/ja-JP.rc @@ -197,4 +197,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "タスクバーとスタートメニュー" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/ko-KR.rc b/base/shell/explorer/lang/ko-KR.rc index 7223055cbd..33c1e95998 100644 --- a/base/shell/explorer/lang/ko-KR.rc +++ b/base/shell/explorer/lang/ko-KR.rc @@ -199,4 +199,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar and Start Menu" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/lt-LT.rc b/base/shell/explorer/lang/lt-LT.rc index b2b432c85c..347af775ee 100644 --- a/base/shell/explorer/lang/lt-LT.rc +++ b/base/shell/explorer/lang/lt-LT.rc @@ -200,4 +200,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar and Start Menu" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/ms-MY.rc b/base/shell/explorer/lang/ms-MY.rc index 09e8cd7f03..5e97a7281b 100644 --- a/base/shell/explorer/lang/ms-MY.rc +++ b/base/shell/explorer/lang/ms-MY.rc @@ -199,4 +199,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Bar Tugas dan Menu Mula" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/nl-NL.rc b/base/shell/explorer/lang/nl-NL.rc index e72f7ef130..713b31161f 100644 --- a/base/shell/explorer/lang/nl-NL.rc +++ b/base/shell/explorer/lang/nl-NL.rc @@ -197,4 +197,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taakbalk en menu Start eigenschappen" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/no-NO.rc b/base/shell/explorer/lang/no-NO.rc index 3709a2875d..3ceb3c1556 100644 --- a/base/shell/explorer/lang/no-NO.rc +++ b/base/shell/explorer/lang/no-NO.rc @@ -198,4 +198,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Egenskaper for oppgavelinjen og startmeny" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/pl-PL.rc b/base/shell/explorer/lang/pl-PL.rc index 48231d2653..edd5f4df2c 100644 --- a/base/shell/explorer/lang/pl-PL.rc +++ b/base/shell/explorer/lang/pl-PL.rc @@ -207,4 +207,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Właściwości paska zadań i menu Start" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/pt-BR.rc b/base/shell/explorer/lang/pt-BR.rc index 4055b5b07a..0bf04738ac 100644 --- a/base/shell/explorer/lang/pt-BR.rc +++ b/base/shell/explorer/lang/pt-BR.rc @@ -199,4 +199,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Propriedades do Barra de Tarefas e Menu Iniciar" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/ro-RO.rc b/base/shell/explorer/lang/ro-RO.rc index 211837f5bc..c7fb6e4cd7 100644 --- a/base/shell/explorer/lang/ro-RO.rc +++ b/base/shell/explorer/lang/ro-RO.rc @@ -199,4 +199,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Bara de activități și meniul „Pornire”" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/ru-RU.rc b/base/shell/explorer/lang/ru-RU.rc index 0804d1d9e6..03f6bae5f6 100644 --- a/base/shell/explorer/lang/ru-RU.rc +++ b/base/shell/explorer/lang/ru-RU.rc @@ -199,4 +199,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Меню ""Пуск"" и панель задач" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/sk-SK.rc b/base/shell/explorer/lang/sk-SK.rc index b49077b6d4..f6b28dbf1a 100644 --- a/base/shell/explorer/lang/sk-SK.rc +++ b/base/shell/explorer/lang/sk-SK.rc @@ -202,4 +202,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Vlastnosti panela úloh a ponuky Štart" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/sq-AL.rc b/base/shell/explorer/lang/sq-AL.rc index 4961764652..a561a2f850 100644 --- a/base/shell/explorer/lang/sq-AL.rc +++ b/base/shell/explorer/lang/sq-AL.rc @@ -201,4 +201,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar dhe Start Menu" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/tr-TR.rc b/base/shell/explorer/lang/tr-TR.rc index 80ba2a30f3..59e924afb1 100644 --- a/base/shell/explorer/lang/tr-TR.rc +++ b/base/shell/explorer/lang/tr-TR.rc @@ -199,4 +199,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Görev Çubuğu ve Başlat Seçkesi" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/uk-UA.rc b/base/shell/explorer/lang/uk-UA.rc index a634995c0e..865528b68f 100644 --- a/base/shell/explorer/lang/uk-UA.rc +++ b/base/shell/explorer/lang/uk-UA.rc @@ -205,4 +205,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "Властивості меню Пуск та Панелі завдань" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/zh-CN.rc b/base/shell/explorer/lang/zh-CN.rc index 90d6032533..25cdb9ea14 100644 --- a/base/shell/explorer/lang/zh-CN.rc +++ b/base/shell/explorer/lang/zh-CN.rc @@ -206,4 +206,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "任务栏和开始菜单属性" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/lang/zh-TW.rc b/base/shell/explorer/lang/zh-TW.rc index c0bef072b1..84390ad32c 100644 --- a/base/shell/explorer/lang/zh-TW.rc +++ b/base/shell/explorer/lang/zh-TW.rc @@ -205,4 +205,5 @@ END STRINGTABLE BEGIN IDS_TASKBAR_STARTMENU_PROP_CAPTION "工作列及開始功能表" + IDS_RESTORE_ALL "&Show Open Windows" END diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index 914add0a3e..ea56448db0 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -29,6 +29,7 @@ #include <atlwin.h> #include <atlstr.h> #include <atlcoll.h> +#include <atlsimpcoll.h> #include <shellapi.h> #include <shlobj.h> #include <shlwapi.h> diff --git a/base/shell/explorer/resource.h b/base/shell/explorer/resource.h index aed1e08a60..b773da61f9 100644 --- a/base/shell/explorer/resource.h +++ b/base/shell/explorer/resource.h @@ -101,6 +101,7 @@ #define IDS_PROPERTIES 720 #define IDS_HELP_COMMAND 732 #define IDS_TASKBAR_STARTMENU_PROP_CAPTION 810 +#define IDS_RESTORE_ALL 811 /*******************************************************************************\ |* Control Resources *| @@ -191,3 +192,4 @@ #define ID_SHELL_CMD_CASCADE_WND (410) #define ID_SHELL_CMD_CUST_NOTIF (411) #define ID_SHELL_CMD_ADJUST_DAT (412) +#define ID_SHELL_CMD_RESTORE_ALL (413) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index fe8ec05ac6..3cadd4980f 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -1582,25 +1582,13 @@ public: if (!bIsMinimized && bIsActive) { - ::PostMessage(TaskItem->hWnd, - WM_SYSCOMMAND, - SC_MINIMIZE, - 0); + ::ShowWindowAsync(TaskItem->hWnd, SW_MINIMIZE); TRACE("Valid button clicked. App window Minimized.\n"); } else { - if (bIsMinimized) - { - ::PostMessage(TaskItem->hWnd, - WM_SYSCOMMAND, - SC_RESTORE, - 0); - TRACE("Valid button clicked. App window Restored.\n"); - } - - SetForegroundWindow(TaskItem->hWnd); - TRACE("Valid button clicked. App window Activated.\n"); + ::SwitchToThisWindow(TaskItem->hWnd, TRUE); + TRACE("Valid button clicked. App window Restored.\n"); } } } diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index aec731d22d..8fd6c55f19 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -21,6 +21,7 @@ #include "precomp.h" #include <commoncontrols.h> +#include <traycmd.h> HRESULT TrayWindowCtxMenuCreator(ITrayWindow * TrayWnd, IN HWND hWndOwner, IContextMenu ** ppCtxMenu); @@ -56,6 +57,78 @@ HRESULT TrayWindowCtxMenuCreator(ITrayWindow * TrayWnd, IN HWND hWndOwner, ICont static const WCHAR szTrayWndClass[] = L"Shell_TrayWnd"; +struct EFFECTIVE_INFO +{ + HWND hwndFound; + HWND hwndDesktop; + HWND hwndProgman; + HWND hTrayWnd; + BOOL bMustBeInMonitor; +}; + +static BOOL CALLBACK +FindEffectiveProc(HWND hwnd, LPARAM lParam) +{ + EFFECTIVE_INFO *pei = (EFFECTIVE_INFO *)lParam; + + if (!IsWindowVisible(hwnd) || IsIconic(hwnd)) + return TRUE; // continue + + if (pei->hTrayWnd == hwnd || pei->hwndDesktop == hwnd || + pei->hwndProgman == hwnd) + { + return TRUE; // continue + } + + if (pei->bMustBeInMonitor) + { + // is the window in the nearest monitor? + HMONITOR hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); + if (hMon) + { + MONITORINFO info; + ZeroMemory(&info, sizeof(info)); + info.cbSize = sizeof(info); + if (GetMonitorInfoW(hMon, &info)) + { + RECT rcWindow, rcMonitor, rcIntersect; + rcMonitor = info.rcMonitor; + + GetWindowRect(hwnd, &rcWindow); + + if (!IntersectRect(&rcIntersect, &rcMonitor, &rcWindow)) + return TRUE; // continue + } + } + } + + pei->hwndFound = hwnd; + return FALSE; // stop if found +} + +static BOOL +IsThereAnyEffectiveWindow(BOOL bMustBeInMonitor) +{ + EFFECTIVE_INFO ei; + ei.hwndFound = NULL; + ei.hwndDesktop = GetDesktopWindow(); + ei.hTrayWnd = FindWindowW(L"Shell_TrayWnd", NULL); + ei.hwndProgman = FindWindowW(L"Progman", NULL); + ei.bMustBeInMonitor = bMustBeInMonitor; + + EnumWindows(FindEffectiveProc, (LPARAM)&ei); + if (ei.hwndFound && FALSE) + { + WCHAR szClass[64], szText[64]; + GetClassNameW(ei.hwndFound, szClass, _countof(szClass)); + GetWindowTextW(ei.hwndFound, szText, _countof(szText)); + MessageBoxW(NULL, szText, szClass, 0); + } + return ei.hwndFound != NULL; +} + +CSimpleArray<HWND> g_MinimizedAll; + /* * ITrayWindow */ @@ -486,6 +559,18 @@ public: SW_SHOWNORMAL); } + VOID ToggleDesktop() + { + if (::IsThereAnyEffectiveWindow(TRUE)) + { + ShowDesktop(); + } + else + { + RestoreAll(); + } + } + BOOL STDMETHODCALLTYPE ExecContextMenuCmd(IN UINT uiCmd) { switch (uiCmd) @@ -519,6 +604,7 @@ public: break; case ID_SHELL_CMD_SHOW_DESKTOP: + ShowDesktop(); break; case ID_SHELL_CMD_TILE_WND_H: @@ -542,6 +628,10 @@ public: ShellExecuteW(m_hWnd, NULL, L"timedate.cpl", NULL, NULL, SW_NORMAL); break; + case ID_SHELL_CMD_RESTORE_ALL: + RestoreAll(); + break; + default: TRACE("ITrayWindow::ExecContextMenuCmd(%u): Unhandled Command ID!\n", uiCmd); return FALSE; @@ -580,10 +670,13 @@ public: case IDHK_PREV_TASK: break; case IDHK_MINIMIZE_ALL: + MinimizeAll(); break; case IDHK_RESTORE_ALL: + RestoreAll(); break; case IDHK_DESKTOP: + ToggleDesktop(); break; case IDHK_PAGER: break; @@ -596,35 +689,80 @@ public: { switch (uCommand) { - case IDM_TASKBARANDSTARTMENU: - DisplayProperties(); - break; - - case IDM_SEARCH: - SHFindFiles(NULL, NULL); - break; - - case IDM_HELPANDSUPPORT: - ExecResourceCmd(IDS_HELP_COMMAND); - break; - - case IDM_RUN: - DisplayRunFileDlg(); - break; - - /* FIXME: Handle these commands as well */ - case IDM_SYNCHRONIZE: - case IDM_DISCONNECT: - case IDM_UNDOCKCOMPUTER: - break; - - case IDM_LOGOFF: - LogoffWindowsDialog(m_hWnd); // FIXME: Maybe handle it in a similar way as DoExitWindows? - break; + case TRAYCMD_STARTMENU: + // TODO: + break; + case TRAYCMD_RUN_DIALOG: + DisplayRunFileDlg(); + break; + case TRAYCMD_LOGOFF_DIALOG: + LogoffWindowsDialog(m_hWnd); // FIXME: Maybe handle it in a similar way as DoExitWindows? + break; + case TRAYCMD_CASCADE: + CascadeWindows(NULL, MDITILE_SKIPDISABLED, NULL, 0, NULL); + break; + case TRAYCMD_TILE_H: + TileWindows(NULL, MDITILE_HORIZONTAL, NULL, 0, NULL); + break; + case TRAYCMD_TILE_V: + TileWindows(NULL, MDITILE_VERTICAL, NULL, 0, NULL); + break; + case TRAYCMD_TOGGLE_DESKTOP: + ToggleDesktop(); + break; + case TRAYCMD_DATE_AND_TIME: + ShellExecuteW(m_hWnd, NULL, L"timedate.cpl", NULL, NULL, SW_NORMAL); + break; + case TRAYCMD_TASKBAR_PROPERTIES: + DisplayProperties(); + break; + case TRAYCMD_MINIMIZE_ALL: + MinimizeAll(); + break; + case TRAYCMD_RESTORE_ALL: + RestoreAll(); + break; + case TRAYCMD_SHOW_DESKTOP: + ShowDesktop(); + break; + case TRAYCMD_SHOW_TASK_MGR: + OpenTaskManager(m_hWnd); + break; + case TRAYCMD_CUSTOMIZE_TASKBAR: + break; + case TRAYCMD_LOCK_TASKBAR: + if (SHRestricted(REST_CLASSICSHELL) == 0) + { + Lock(!g_TaskbarSettings.bLock); + } + break; + case TRAYCMD_HELP_AND_SUPPORT: + ExecResourceCmd(IDS_HELP_COMMAND); + break; + case TRAYCMD_CONTROL_PANEL: + // TODO: + break; + case TRAYCMD_SHUTDOWN_DIALOG: + DoExitWindows(); + break; + case TRAYCMD_PRINTERS_AND_FAXES: + // TODO: + break; + case TRAYCMD_LOCK_DESKTOP: + // TODO: + break; + case TRAYCMD_SWITCH_USER_DIALOG: + // TODO: + break; + case TRAYCMD_SEARCH_FILES: + SHFindFiles(NULL, NULL); + break; + case TRAYCMD_SEARCH_COMPUTERS: + SHFindComputer(NULL, NULL); + break; - case IDM_SHUTDOWN: - DoExitWindows(); - break; + default: + break; } return FALSE; @@ -2668,6 +2806,88 @@ HandleTrayContextMenu: return HandleHotKey(wParam); } + struct MINIMIZE_INFO + { + HWND hwndDesktop; + HWND hTrayWnd; + HWND hwndProgman; + BOOL bRet; + CSimpleArray<HWND> *pMinimizedAll; + BOOL bShowDesktop; + }; + + static BOOL IsDialog(HWND hwnd) + { + WCHAR szClass[32]; + GetClassNameW(hwnd, szClass, _countof(szClass)); + return wcscmp(szClass, L"#32770") == 0; + } + + static BOOL CALLBACK MinimizeWindowsProc(HWND hwnd, LPARAM lParam) + { + MINIMIZE_INFO *info = (MINIMIZE_INFO *)lParam; + if (hwnd == info->hwndDesktop || hwnd == info->hTrayWnd || + hwnd == info->hwndProgman) + { + return TRUE; + } + if (!info->bShowDesktop) + { + if (!::IsWindowEnabled(hwnd) || IsDialog(hwnd)) + return TRUE; + HWND hwndOwner = ::GetWindow(hwnd, GW_OWNER); + if (hwndOwner && !::IsWindowEnabled(hwndOwner)) + return TRUE; + } + if (::IsWindowVisible(hwnd) && !::IsIconic(hwnd)) + { + ::ShowWindowAsync(hwnd, SW_MINIMIZE); + info->bRet = TRUE; + info->pMinimizedAll->Add(hwnd); + } + return TRUE; + } + + VOID MinimizeAll(BOOL bShowDesktop = FALSE) + { + MINIMIZE_INFO info; + info.hwndDesktop = GetDesktopWindow();; + info.hTrayWnd = FindWindowW(L"Shell_TrayWnd", NULL); + info.hwndProgman = FindWindowW(L"Progman", NULL); + info.bRet = FALSE; + info.pMinimizedAll = &g_MinimizedAll; + info.bShowDesktop = bShowDesktop; + EnumWindows(MinimizeWindowsProc, (LPARAM)&info); + + // invalid handles should be cleared to avoid mismatch of handles + for (INT i = 0; i < g_MinimizedAll.GetSize(); ++i) + { + if (!::IsWindow(g_MinimizedAll[i])) + g_MinimizedAll[i] = NULL; + } + + ::SetForegroundWindow(m_DesktopWnd); + ::SetFocus(m_DesktopWnd); + } + + VOID ShowDesktop() + { + MinimizeAll(TRUE); + } + + VOID RestoreAll() + { + for (INT i = g_MinimizedAll.GetSize() - 1; i >= 0; --i) + { + HWND hwnd = g_MinimizedAll[i]; + if (::IsWindowVisible(hwnd) && ::IsIconic(hwnd)) + { + ::ShowWindow(hwnd, SW_RESTORE); + } + } + g_MinimizedAll.RemoveAll(); + } + LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { LRESULT Ret = FALSE; @@ -2738,6 +2958,24 @@ HandleTrayContextMenu: return 0; } + LRESULT OnInitMenuPopup(INT code, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + HMENU hMenu = (HMENU)wParam; + if (::IsThereAnyEffectiveWindow(FALSE)) + { + ::EnableMenuItem(hMenu, ID_SHELL_CMD_CASCADE_WND, MF_BYCOMMAND | MF_ENABLED); + ::EnableMenuItem(hMenu, ID_SHELL_CMD_TILE_WND_H, MF_BYCOMMAND | MF_ENABLED); + ::EnableMenuItem(hMenu, ID_SHELL_CMD_TILE_WND_V, MF_BYCOMMAND | MF_ENABLED); + } + else + { + ::EnableMenuItem(hMenu, ID_SHELL_CMD_CASCADE_WND, MF_BYCOMMAND | MF_GRAYED); + ::EnableMenuItem(hMenu, ID_SHELL_CMD_TILE_WND_H, MF_BYCOMMAND | MF_GRAYED); + ::EnableMenuItem(hMenu, ID_SHELL_CMD_TILE_WND_V, MF_BYCOMMAND | MF_GRAYED); + } + return 0; + } + LRESULT OnRebarAutoSize(INT code, LPNMHDR nmhdr, BOOL& bHandled) { #if 0 @@ -2877,6 +3115,7 @@ HandleTrayContextMenu: MESSAGE_HANDLER(WM_CLOSE, OnDoExitWindows) MESSAGE_HANDLER(WM_HOTKEY, OnHotkey) MESSAGE_HANDLER(WM_NCCALCSIZE, OnNcCalcSize) + MESSAGE_HANDLER(WM_INITMENUPOPUP, OnInitMenuPopup) MESSAGE_HANDLER(TWM_SETTINGSCHANGED, OnTaskbarSettingsChanged) MESSAGE_HANDLER(TWM_OPENSTARTMENU, OnOpenStartMenu) MESSAGE_HANDLER(TWM_DOEXITWINDOWS, OnDoExitWindows) @@ -3027,8 +3266,22 @@ public: UINT idCmdLast, UINT uFlags) { - HMENU menubase = LoadPopupMenu(hExplorerInstance, MAKEINTRESOURCEW(IDM_TRAYWND)); - if (!menubase) + HMENU hMenuBase; + + hMenuBase = LoadPopupMenu(hExplorerInstance, MAKEINTRESOURCEW(IDM_TRAYWND)); + + if (g_MinimizedAll.GetSize() != 0 && !::IsThereAnyEffectiveWindow(TRUE)) + { + CStringW strRestoreAll(MAKEINTRESOURCEW(IDS_RESTORE_ALL)); + MENUITEMINFOW mii = { sizeof(mii) }; + mii.fMask = MIIM_ID | MIIM_TYPE; + mii.wID = ID_SHELL_CMD_RESTORE_ALL; + mii.fType = MFT_STRING; + mii.dwTypeData = const_cast<LPWSTR>(&strRestoreAll[0]); + SetMenuItemInfoW(hMenuBase, ID_SHELL_CMD_SHOW_DESKTOP, FALSE, &mii); + } + + if (!hMenuBase) return HRESULT_FROM_WIN32(GetLastError()); if (SHRestricted(REST_CLASSICSHELL) != 0) @@ -3038,15 +3291,15 @@ public: MF_BYCOMMAND); } - CheckMenuItem(menubase, + CheckMenuItem(hMenuBase, ID_LOCKTASKBAR, MF_BYCOMMAND | (g_TaskbarSettings.bLock ? MF_CHECKED : MF_UNCHECKED)); UINT idCmdNext; - idCmdNext = Shell_MergeMenus(hPopup, menubase, indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS | MM_ADDSEPARATOR); + idCmdNext = Shell_MergeMenus(hPopup, hMenuBase, indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS | MM_ADDSEPARATOR); m_idCmdCmFirst = idCmdNext - idCmdFirst; - ::DestroyMenu(menubase); + ::DestroyMenu(hMenuBase); if (TrayWnd->m_TrayBandSite != NULL) { diff --git a/dll/win32/shell32/CShellDispatch.cpp b/dll/win32/shell32/CShellDispatch.cpp index 259b891997..b07a42f89d 100644 --- a/dll/win32/shell32/CShellDispatch.cpp +++ b/dll/win32/shell32/CShellDispatch.cpp @@ -3,10 +3,12 @@ * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) * PURPOSE: IShellDispatch implementation * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2018 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "precomp.h" #include "winsvc.h" +#include <traycmd.h> // tray commands WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -370,7 +372,11 @@ HRESULT STDMETHODCALLTYPE CShellDispatch::WindowsSecurity() HRESULT STDMETHODCALLTYPE CShellDispatch::ToggleDesktop() { TRACE("(%p)\n", this); - return E_NOTIMPL; + + HWND hTrayWnd = FindWindowW(L"Shell_TrayWnd", NULL); + PostMessageW(hTrayWnd, WM_COMMAND, TRAYCMD_TOGGLE_DESKTOP, 0); + + return S_OK; } HRESULT STDMETHODCALLTYPE CShellDispatch::ExplorerPolicy(BSTR policy, VARIANT *value) diff --git a/sdk/include/reactos/traycmd.h b/sdk/include/reactos/traycmd.h new file mode 100644 index 0000000000..7273caaa37 --- /dev/null +++ b/sdk/include/reactos/traycmd.h @@ -0,0 +1,49 @@ +/* + * Tray Commands + * + * Copyright 2018 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * + * this library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * this library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef TRAYCMD_H_ +#define TRAYCMD_H_ + +/* TODO: Add more and implement them */ +#define TRAYCMD_STARTMENU 305 /* Same as IDMA_START. */ +#define TRAYCMD_RUN_DIALOG 401 /* Implemented. Same as IDM_RUN. */ +#define TRAYCMD_LOGOFF_DIALOG 402 /* Implemented. Same as IDM_LOGOFF. */ +#define TRAYCMD_CASCADE 403 /* */ +#define TRAYCMD_TILE_H 404 /* */ +#define TRAYCMD_TILE_V 405 /* */ +#define TRAYCMD_TOGGLE_DESKTOP 407 /* Implemented. */ +#define TRAYCMD_DATE_AND_TIME 408 /* Implemented. */ +#define TRAYCMD_TASKBAR_PROPERTIES 413 /* Implemented. Same as IDM_TASKBARANDSTARTMENU. */ +#define TRAYCMD_MINIMIZE_ALL 415 /* Implemented. */ +#define TRAYCMD_RESTORE_ALL 416 /* Implemented. Same as IDMA_RESTORE_OPEN. */ +#define TRAYCMD_SHOW_DESKTOP 419 /* Implemented. */ +#define TRAYCMD_SHOW_TASK_MGR 420 /* Implemented. */ +#define TRAYCMD_CUSTOMIZE_TASKBAR 421 /* */ +#define TRAYCMD_LOCK_TASKBAR 424 /* Implemented. */ +#define TRAYCMD_HELP_AND_SUPPORT 503 /* Implemented. Same as IDM_HELPANDSUPPORT. */ +#define TRAYCMD_CONTROL_PANEL 505 /* Same as IDM_CONTROLPANEL. */ +#define TRAYCMD_SHUTDOWN_DIALOG 506 /* Implemented. Same as IDM_SHUTDOWN. */ +#define TRAYCMD_PRINTERS_AND_FAXES 510 /* Same as IDM_PRINTERSANDFAXES. */ +#define TRAYCMD_LOCK_DESKTOP 517 /* */ +#define TRAYCMD_SWITCH_USER_DIALOG 5000 /* */ +#define TRAYCMD_SEARCH_FILES 41093 /* Implemented. Same as IDMA_SEARCH. */ +#define TRAYCMD_SEARCH_COMPUTERS 41094 /* Implemented. */ + +#endif /* ndef TRAYCMD_H_ */ diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index c95b8dfbcc..227ab9cb33 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -3,7 +3,8 @@ * PROJECT: ReactOS user32.dll * FILE: win32ss/user/user32/windows/window.c * PURPOSE: Window management - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) * UPDATE HISTORY: * 06-06-2001 CSH Created */ @@ -78,9 +79,22 @@ BringWindowToTop(HWND hWnd) VOID WINAPI -SwitchToThisWindow(HWND hwnd, BOOL fUnknown) +SwitchToThisWindow(HWND hwnd, BOOL fAltTab) { - ShowWindow(hwnd, SW_SHOW); + HWND hwndFG; + if (fAltTab) + { + if (IsIconic(hwnd)) + ShowWindowAsync(hwnd, SW_RESTORE); + SetForegroundWindow(hwnd); + } + else + { + hwndFG = GetForegroundWindow(); + ShowWindow(hwnd, SW_RESTORE | SW_SHOWNA); + SetWindowPos(hwnd, hwndFG, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + SetWindowPos(hwndFG, hwnd, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); + } }

1 0

01/01: [CMD] "del /s directory" command doesn't show the directories or files names in the confirmation message (#680)
by Katayama Hirofumi MZ 12 Jul '18

12 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=706a1c5132030adfbdc20… commit 706a1c5132030adfbdc20dc17f2a8dbd6b6b7acd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 13 08:47:45 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jul 13 01:47:45 2018 +0200 [CMD] "del /s directory" command doesn't show the directories or files names in the confirmation message (#680) CORE-14059 --- base/shell/cmd/del.c | 1 + 1 file changed, 1 insertion(+) diff --git a/base/shell/cmd/del.c b/base/shell/cmd/del.c index 4c0dc3a876..7f2d2a63db 100644 --- a/base/shell/cmd/del.c +++ b/base/shell/cmd/del.c @@ -180,6 +180,7 @@ DeleteFiles(LPTSTR FileName, DWORD* dwFlags, DWORD dwAttrFlags) if (!((*dwFlags & DEL_YES) || (*dwFlags & DEL_QUIET) || (*dwFlags & DEL_PROMPT))) { + ConOutPrintf (_T("Delete %s, "),szFileName); res = FilePromptYNA (STRING_DEL_HELP2); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) return 0x80000000;

1 0

02/02: [CMAKE] Update all base addresses, taking into account the reserved user32 address from CORE-12752 CORE-11382
by Mark Jansen 12 Jul '18

12 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80bac790709e4417983df… commit 80bac790709e4417983dfa69f73029c7bff8b54a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Jul 2 22:45:35 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Jul 12 21:55:21 2018 +0200 [CMAKE] Update all base addresses, taking into account the reserved user32 address from CORE-12752 CORE-11382 --- sdk/cmake/baseaddress.cmake | 734 +++++++++++++++++++------------------ sdk/cmake/baseaddress_dwarf.cmake | 736 +++++++++++++++++++------------------- sdk/cmake/baseaddress_msvc.cmake | 736 +++++++++++++++++++------------------- 3 files changed, 1100 insertions(+), 1106 deletions(-) diff --git a/sdk/cmake/baseaddress.cmake b/sdk/cmake/baseaddress.cmake index dae966b723..4c9a08c176 100644 --- a/sdk/cmake/baseaddress.cmake +++ b/sdk/cmake/baseaddress.cmake @@ -4,372 +4,370 @@ set(baseaddress_kernel32 0x7c6b0000) set(baseaddress_msvcrt 0x7c5f0000) set(baseaddress_advapi32 0x7c540000) set(baseaddress_gdi32 0x7c490000) -set(baseaddress_user32 0x7c310000) -set(baseaddress_dhcpcsvc 0x7c2c0000) -set(baseaddress_dnsapi 0x7c270000) -set(baseaddress_icmp 0x7c240000) -set(baseaddress_iphlpapi 0x7c1f0000) -set(baseaddress_ws2_32 0x7c1a0000) -set(baseaddress_ws2help 0x7c170000) -set(baseaddress_shlwapi 0x7c0c0000) -set(baseaddress_rpcrt4 0x7bff0000) -set(baseaddress_comctl32 0x7be10000) -set(baseaddress_ole32 0x7bc30000) -set(baseaddress_winspool 0x7bbe0000) -set(baseaddress_winmm 0x7bb20000) -set(baseaddress_comdlg32 0x7ba10000) -set(baseaddress_shell32 0x7b150000) -set(baseaddress_lz32 0x7b130000) -set(baseaddress_version 0x7b100000) -set(baseaddress_oleaut32 0x7af20000) -set(baseaddress_setupapi 0x7ada0000) -set(baseaddress_mpr 0x7ad60000) -set(baseaddress_crypt32 0x7ac50000) -set(baseaddress_wininet 0x7ab90000) -set(baseaddress_urlmon 0x7aa90000) -set(baseaddress_psapi 0x7aa60000) -set(baseaddress_imm32 0x7aa20000) -set(baseaddress_msvfw32 0x7a9d0000) -set(baseaddress_dbghelp 0x7a920000) -set(baseaddress_devmgr 0x7a840000) -set(baseaddress_msacm32 0x7a800000) -set(baseaddress_netapi32 0x7a780000) -set(baseaddress_powrprof 0x7a750000) -set(baseaddress_secur32 0x7a700000) -set(baseaddress_wintrust 0x7a6a0000) -set(baseaddress_avicap32 0x7a670000) -set(baseaddress_cabinet 0x7a620000) -set(baseaddress_dsound 0x7a5a0000) -set(baseaddress_glu32 0x7a4a0000) -set(baseaddress_opengl32 0x7a290000) -set(baseaddress_riched20 0x7a1c0000) -set(baseaddress_smdll 0x7a1a0000) -set(baseaddress_userenv 0x7a150000) -set(baseaddress_uxtheme 0x7a0f0000) -set(baseaddress_cryptui 0x7a040000) -set(baseaddress_csrsrv 0x7a010000) -set(baseaddress_basesrv 0x79fe0000) -set(baseaddress_winsrv 0x79f30000) -set(baseaddress_dplayx 0x79ec0000) -set(baseaddress_gdiplus 0x79de0000) -set(baseaddress_msimg32 0x79db0000) -set(baseaddress_mswsock 0x79d80000) -set(baseaddress_oledlg 0x79d30000) -set(baseaddress_rasapi32 0x79d00000) -set(baseaddress_rsaenh 0x79c90000) -set(baseaddress_samlib 0x79c50000) -set(baseaddress_sensapi 0x79c20000) -set(baseaddress_sfc_os 0x79bf0000) -set(baseaddress_snmpapi 0x79bc0000) -set(baseaddress_spoolss 0x79b80000) -set(baseaddress_usp10 0x79b00000) -# Extra dlls -set(baseaddress_acgenral 0x79ad0000) -set(baseaddress_aclayers 0x79aa0000) -set(baseaddress_acledit 0x79a70000) -set(baseaddress_aclui 0x79a30000) -set(baseaddress_acppage 0x799c0000) -set(baseaddress_activeds 0x79990000) -set(baseaddress_actxprxy 0x79780000) -set(baseaddress_advapi32_vista 0x79760000) -set(baseaddress_advpack 0x79720000) -set(baseaddress_amstream 0x796c0000) -set(baseaddress_apphelp 0x79680000) -set(baseaddress_atl 0x79640000) -set(baseaddress_atl100 0x79600000) -set(baseaddress_atl80 0x795c0000) -set(baseaddress_authz 0x79590000) -set(baseaddress_avifil32 0x79510000) -set(baseaddress_batt 0x794e0000) -set(baseaddress_bcrypt 0x794b0000) -set(baseaddress_beepmidi 0x79480000) -set(baseaddress_browseui 0x792f0000) -set(baseaddress_cards 0x79230000) -set(baseaddress_cfgmgr32 0x79200000) -set(baseaddress_clusapi 0x791d0000) -set(baseaddress_comcat 0x791a0000) -set(baseaddress_compstui 0x79170000) -set(baseaddress_console 0x79110000) -set(baseaddress_credui 0x790d0000) -set(baseaddress_crtdll 0x79060000) -set(baseaddress_cryptdlg 0x79030000) -set(baseaddress_cryptdll 0x79000000) -set(baseaddress_cryptnet 0x78fd0000) -set(baseaddress_custom 0x78fa0000) -set(baseaddress_d3d8 0x78f40000) -set(baseaddress_d3d8thk 0x78f20000) -set(baseaddress_d3d9 0x78eb0000) -set(baseaddress_d3dcompiler_43 0x78e00000) -set(baseaddress_d3drm 0x78d60000) -set(baseaddress_d3dwine 0x78b50000) -set(baseaddress_d3dx9_24 0x78b20000) -set(baseaddress_d3dx9_25 0x78ae0000) -set(baseaddress_d3dx9_26 0x78ab0000) -set(baseaddress_d3dx9_27 0x78a80000) -set(baseaddress_d3dx9_28 0x78a50000) -set(baseaddress_d3dx9_29 0x78a20000) -set(baseaddress_d3dx9_30 0x789f0000) -set(baseaddress_d3dx9_31 0x789c0000) -set(baseaddress_d3dx9_32 0x78990000) -set(baseaddress_d3dx9_33 0x78960000) -set(baseaddress_d3dx9_34 0x78930000) -set(baseaddress_d3dx9_35 0x78900000) -set(baseaddress_d3dx9_36 0x78800000) -set(baseaddress_d3dx9_37 0x787d0000) -set(baseaddress_d3dx9_38 0x787a0000) -set(baseaddress_d3dx9_39 0x78770000) -set(baseaddress_d3dx9_40 0x78740000) -set(baseaddress_d3dx9_41 0x78710000) -set(baseaddress_d3dx9_42 0x786e0000) -set(baseaddress_d3dx9_43 0x786b0000) -set(baseaddress_d3dxof 0x78670000) -set(baseaddress_dciman32 0x78640000) -set(baseaddress_ddraw 0x78580000) -set(baseaddress_deskadp 0x78550000) -set(baseaddress_deskmon 0x78520000) -set(baseaddress_devcpux 0x784f0000) -set(baseaddress_devenum 0x784a0000) -set(baseaddress_dinput 0x78440000) -set(baseaddress_dinput8 0x78410000) -set(baseaddress_dmusic 0x783c0000) -set(baseaddress_dplay 0x78390000) -set(baseaddress_dxdiagn 0x78340000) -set(baseaddress_dxtn 0x78320000) -set(baseaddress_esent 0x782f0000) -set(baseaddress_faultrep 0x782c0000) -set(baseaddress_fltlib 0x78290000) -set(baseaddress_fmifs 0x78270000) -set(baseaddress_fontext 0x78240000) -set(baseaddress_fontsub 0x78210000) -set(baseaddress_framebuf 0x781f0000) -set(baseaddress_framebuf_new 0x781d0000) -set(baseaddress_framedyn 0x78190000) -set(baseaddress_genincdata 0x78160000) -set(baseaddress_getuname 0x77860000) -set(baseaddress_hid 0x77830000) -set(baseaddress_hlink 0x777f0000) -set(baseaddress_hnetcfg 0x777b0000) -set(baseaddress_httpapi 0x77780000) -set(baseaddress_iccvid 0x77750000) -set(baseaddress_ieframe 0x77650000) -set(baseaddress_iernonce 0x77620000) -set(baseaddress_imagehlp 0x775f0000) -set(baseaddress_inetcomm 0x77580000) -set(baseaddress_inetmib1 0x77550000) -set(baseaddress_initpki 0x77520000) -set(baseaddress_input 0x774c0000) -set(baseaddress_inseng 0x77480000) -set(baseaddress_iologmsg 0x77460000) -set(baseaddress_itircl 0x77430000) -set(baseaddress_itss 0x773f0000) -set(baseaddress_jscript 0x772e0000) -set(baseaddress_jsproxy 0x772b0000) -set(baseaddress_kbdeo 0x77290000) -set(baseaddress_kbsdll 0x77260000) -set(baseaddress_kernel32_vista 0x77240000) -set(baseaddress_ksuser 0x77210000) -set(baseaddress_libjpeg 0x77180000) -set(baseaddress_libpng 0x770f0000) -set(baseaddress_libtiff 0x77020000) -set(baseaddress_libtirpc 0x76fc0000) -set(baseaddress_libxslt 0x76cf0000) -set(baseaddress_loadperf 0x76cc0000) -set(baseaddress_localmon 0x76c90000) -set(baseaddress_localspl 0x76c50000) -set(baseaddress_localspl_apitest 0x76c20000) -set(baseaddress_localui 0x76bf0000) -set(baseaddress_lpk 0x76bb0000) -set(baseaddress_lsasrv 0x76b40000) -set(baseaddress_mapi32 0x76b00000) -set(baseaddress_mbedtls 0x76a70000) -set(baseaddress_mciavi32 0x76a30000) -set(baseaddress_mcicda 0x76a00000) -set(baseaddress_mciqtz32 0x769c0000) -set(baseaddress_mciseq 0x76990000) -set(baseaddress_mciwave 0x76960000) -set(baseaddress_mgmtapi 0x76930000) -set(baseaddress_midimap 0x76900000) -set(baseaddress_mlang 0x768c0000) -set(baseaddress_mmdrv 0x76890000) -set(baseaddress_modemui 0x76820000) -set(baseaddress_mprapi 0x767f0000) -set(baseaddress_msafd 0x767b0000) -set(baseaddress_mscat32 0x76780000) -set(baseaddress_mscms 0x76750000) -set(baseaddress_mscoree 0x76700000) -set(baseaddress_msctf 0x766a0000) -set(baseaddress_msdmo 0x76670000) -set(baseaddress_msftedit 0x76640000) -set(baseaddress_msgina 0x765a0000) -set(baseaddress_mshtml 0x76290000) -set(baseaddress_msi 0x760e0000) -set(baseaddress_msimtf 0x760b0000) -set(baseaddress_msisip 0x76080000) -set(baseaddress_mspatcha 0x76050000) -set(baseaddress_msports 0x76020000) -set(baseaddress_msrle32 0x75ff0000) -set(baseaddress_mssign32 0x75fc0000) -set(baseaddress_mssip32 0x75f90000) -set(baseaddress_mstask 0x75f50000) -set(baseaddress_msv1_0 0x75f20000) -set(baseaddress_msvcrt20 0x75e50000) -set(baseaddress_msvcrt40 0x75d80000) -set(baseaddress_msvcrt_crt_dll_startup 0x75d50000) -set(baseaddress_msvidc32 0x75d20000) -set(baseaddress_msxml 0x75cf0000) -set(baseaddress_msxml2 0x75cc0000) -set(baseaddress_msxml3 0x758e0000) -set(baseaddress_msxml4 0x758a0000) -set(baseaddress_msxml6 0x75860000) -set(baseaddress_mycomput 0x75840000) -set(baseaddress_nddeapi 0x75810000) -set(baseaddress_netcfgx 0x75780000) -set(baseaddress_netevent 0x75760000) -set(baseaddress_netid 0x75710000) -set(baseaddress_netshell 0x75660000) -set(baseaddress_newdev 0x75600000) -set(baseaddress_nfs41_np 0x755d0000) -set(baseaddress_normaliz 0x755a0000) -set(baseaddress_notifyhook 0x75570000) -set(baseaddress_npptools 0x75540000) -set(baseaddress_ntdll_vista 0x75520000) -set(baseaddress_ntdsapi 0x754f0000) -set(baseaddress_ntlanman 0x754c0000) -set(baseaddress_ntmarta 0x75490000) -set(baseaddress_ntobjshex 0x753f0000) -set(baseaddress_objsel 0x753c0000) -set(baseaddress_odbc32 0x75380000) -set(baseaddress_odbccp32 0x75350000) -set(baseaddress_oleacc 0x752c0000) -set(baseaddress_olecli32 0x75290000) -set(baseaddress_olepro32 0x75260000) -set(baseaddress_olesvr32 0x75230000) -set(baseaddress_olethk32 0x75200000) -set(baseaddress_pdh 0x751c0000) -set(baseaddress_pidgen 0x75190000) -set(baseaddress_pifmgr 0x75120000) -set(baseaddress_printui 0x750f0000) -set(baseaddress_propsys 0x750b0000) -set(baseaddress_pstorec 0x75080000) -set(baseaddress_qedit 0x75030000) -set(baseaddress_qmgr 0x74ff0000) -set(baseaddress_qmgrprxy 0x74f90000) -set(baseaddress_quartz 0x74e10000) -set(baseaddress_query 0x74de0000) -set(baseaddress_rasadhlp 0x74db0000) -set(baseaddress_rasdlg 0x74be0000) -set(baseaddress_rasman 0x74bb0000) -set(baseaddress_redirtest1 0x74b80000) -set(baseaddress_redirtest2 0x74b50000) -set(baseaddress_resutils 0x74b20000) -set(baseaddress_riched32 0x74af0000) -set(baseaddress_rsabase 0x74ad0000) -set(baseaddress_rshell 0x74a30000) -set(baseaddress_samsrv 0x749c0000) -set(baseaddress_sccbase 0x74990000) -set(baseaddress_schannel 0x74950000) -set(baseaddress_schedsvc 0x74920000) -set(baseaddress_scrrun 0x748c0000) -set(baseaddress_security 0x748a0000) -set(baseaddress_serialui 0x74870000) -set(baseaddress_sfc 0x74840000) -set(baseaddress_shdoclc 0x74800000) -set(baseaddress_shdocvw 0x747b0000) -set(baseaddress_shellbtrfs 0x74650000) -set(baseaddress_shfolder 0x74630000) -set(baseaddress_shimgvw 0x745e0000) -set(baseaddress_shsvcs 0x745b0000) -set(baseaddress_slbcsp 0x74580000) -set(baseaddress_sndblst 0x74550000) -set(baseaddress_softpub 0x74530000) -set(baseaddress_srclient 0x74500000) -set(baseaddress_srvsvc 0x744d0000) -set(baseaddress_sti 0x74490000) -set(baseaddress_stobject 0x74400000) -set(baseaddress_streamci 0x743d0000) -set(baseaddress_sxs 0x743a0000) -set(baseaddress_syssetup 0x742b0000) -set(baseaddress_t2embed 0x74280000) -set(baseaddress_tapi32 0x74240000) -set(baseaddress_tapiui 0x741c0000) -set(baseaddress_testvdd 0x74190000) -set(baseaddress_themeui 0x74170000) -set(baseaddress_traffic 0x74140000) -set(baseaddress_twain_32 0x74110000) -set(baseaddress_ubtrfs 0x740e0000) -set(baseaddress_ucdfs 0x740c0000) -set(baseaddress_uext2 0x74080000) -set(baseaddress_ufat 0x74040000) -set(baseaddress_ufatx 0x74020000) -set(baseaddress_uffs 0x74000000) -set(baseaddress_umpnpmgr 0x73fd0000) -set(baseaddress_untfs 0x73fb0000) -set(baseaddress_updspapi 0x73f80000) -set(baseaddress_ureiserfs 0x73f60000) -set(baseaddress_url 0x73f30000) -set(baseaddress_vbscript 0x73e80000) -set(baseaddress_vdmdbg 0x73e50000) -set(baseaddress_verifier 0x73e30000) -set(baseaddress_vfd 0x73dd0000) -set(baseaddress_vssapi 0x73da0000) -set(baseaddress_wbemdisp 0x73d50000) -set(baseaddress_wbemprox 0x73cf0000) -set(baseaddress_win32u 0x73cc0000) -set(baseaddress_win32u_2k3sp2 0x73c90000) -set(baseaddress_win32u_xpsp2 0x73c60000) -set(baseaddress_windowscodecs 0x73b20000) -set(baseaddress_windowscodecsext 0x73af0000) -set(baseaddress_winfax 0x73ac0000) -set(baseaddress_wing32 0x73a90000) -set(baseaddress_winhttp 0x73a20000) -set(baseaddress_winprint 0x739f0000) -set(baseaddress_winscard 0x739c0000) -set(baseaddress_winsta 0x73990000) -set(baseaddress_wkssvc 0x73960000) -set(baseaddress_wlanapi 0x73930000) -set(baseaddress_wldap32 0x738f0000) -set(baseaddress_wmi 0x738d0000) -set(baseaddress_wmisvc 0x738a0000) -set(baseaddress_wmiutils 0x73860000) -set(baseaddress_wmvcore 0x73810000) -set(baseaddress_wshirda 0x737e0000) -set(baseaddress_wshtcpip 0x737b0000) -set(baseaddress_wsock32 0x73780000) -set(baseaddress_wtsapi32 0x73750000) -set(baseaddress_wuapi 0x73710000) -set(baseaddress_xinput1_1 0x736e0000) -set(baseaddress_xinput1_2 0x736b0000) -set(baseaddress_xinput1_3 0x73680000) -set(baseaddress_xinput9_1_0 0x73650000) -set(baseaddress_xmllite 0x73610000) -set(baseaddress_zipfldr 0x73570000) -# Extra files -set(baseaddress_access 0x734f0000) -set(baseaddress_appwiz 0x73470000) -set(baseaddress_cmicpl 0x73430000) -set(baseaddress_desk 0x73390000) -set(baseaddress_hdwwiz 0x73310000) -set(baseaddress_hhctrl 0x732b0000) -set(baseaddress_imaadp32.acm 0x73280000) -set(baseaddress_inetcpl 0x73220000) -set(baseaddress_intl 0x731b0000) -set(baseaddress_joy 0x73170000) -set(baseaddress_main 0x730d0000) -set(baseaddress_mmsys 0x73000000) -set(baseaddress_msacm32.drv 0x72fd0000) -set(baseaddress_msadp32.acm 0x72fa0000) -set(baseaddress_msg711.acm 0x72f70000) -set(baseaddress_msgsm32.acm 0x72f40000) -set(baseaddress_msisys 0x72f10000) -set(baseaddress_ncpa 0x72ee0000) -set(baseaddress_odbccp32i 0x72eb0000) -set(baseaddress_openglcfg 0x72e80000) -set(baseaddress_powercfg 0x72e20000) -set(baseaddress_sysdm 0x72d40000) -set(baseaddress_telephon 0x72d10000) -set(baseaddress_timedate 0x72c90000) -set(baseaddress_usrmgr 0x72c40000) +set(baseaddress_user32 0x77a20000) # reserved +set(baseaddress_dhcpcsvc 0x7c440000) +set(baseaddress_dnsapi 0x7c3f0000) +set(baseaddress_icmp 0x7c3c0000) +set(baseaddress_iphlpapi 0x7c370000) +set(baseaddress_ws2_32 0x7c320000) +set(baseaddress_ws2help 0x7c2f0000) +set(baseaddress_shlwapi 0x7c240000) +set(baseaddress_rpcrt4 0x7c170000) +set(baseaddress_comctl32 0x7bf90000) +set(baseaddress_ole32 0x7bdb0000) +set(baseaddress_winspool 0x7bd60000) +set(baseaddress_winmm 0x7bca0000) +set(baseaddress_comdlg32 0x7bb90000) +set(baseaddress_shell32 0x7b2d0000) +set(baseaddress_lz32 0x7b2b0000) +set(baseaddress_version 0x7b280000) +set(baseaddress_oleaut32 0x7b0a0000) +set(baseaddress_setupapi 0x7af20000) +set(baseaddress_mpr 0x7aee0000) +set(baseaddress_crypt32 0x7add0000) +set(baseaddress_wininet 0x7ad10000) +set(baseaddress_urlmon 0x7ac10000) +set(baseaddress_psapi 0x7abe0000) +set(baseaddress_imm32 0x7aba0000) +set(baseaddress_msvfw32 0x7ab50000) +set(baseaddress_dbghelp 0x7aaa0000) +set(baseaddress_devmgr 0x7a9c0000) +set(baseaddress_msacm32 0x7a980000) +set(baseaddress_netapi32 0x7a900000) +set(baseaddress_powrprof 0x7a8d0000) +set(baseaddress_secur32 0x7a880000) +set(baseaddress_wintrust 0x7a820000) +set(baseaddress_avicap32 0x7a7f0000) +set(baseaddress_cabinet 0x7a7a0000) +set(baseaddress_dsound 0x7a720000) +set(baseaddress_glu32 0x7a620000) +set(baseaddress_opengl32 0x7a410000) +set(baseaddress_riched20 0x7a340000) +set(baseaddress_smdll 0x7a320000) +set(baseaddress_userenv 0x7a2d0000) +set(baseaddress_uxtheme 0x7a270000) +set(baseaddress_cryptui 0x7a1c0000) +set(baseaddress_csrsrv 0x7a190000) +set(baseaddress_basesrv 0x7a160000) +set(baseaddress_winsrv 0x7a0b0000) +set(baseaddress_dplayx 0x7a040000) +set(baseaddress_gdiplus 0x79f60000) +set(baseaddress_msimg32 0x79f30000) +set(baseaddress_mswsock 0x79f00000) +set(baseaddress_oledlg 0x79eb0000) +set(baseaddress_rasapi32 0x79e80000) +set(baseaddress_rsaenh 0x79e10000) +set(baseaddress_samlib 0x79dd0000) +set(baseaddress_sensapi 0x79da0000) +set(baseaddress_sfc_os 0x79d70000) +set(baseaddress_snmpapi 0x79d40000) +set(baseaddress_spoolss 0x79d00000) +set(baseaddress_usp10 0x79c80000) +set(baseaddress_access 0x79c00000) +set(baseaddress_acgenral 0x79bd0000) +set(baseaddress_aclayers 0x79ba0000) +set(baseaddress_acledit 0x79b70000) +set(baseaddress_aclui 0x79b30000) +set(baseaddress_acppage 0x79ac0000) +set(baseaddress_activeds 0x79a90000) +set(baseaddress_actxprxy 0x79880000) +set(baseaddress_advapi32_vista 0x79860000) +set(baseaddress_advpack 0x79820000) +set(baseaddress_amstream 0x797c0000) +set(baseaddress_apphelp 0x79780000) +set(baseaddress_appwiz 0x79700000) +set(baseaddress_atl 0x796c0000) +set(baseaddress_atl100 0x79680000) +set(baseaddress_atl80 0x79640000) +set(baseaddress_authz 0x79610000) +set(baseaddress_avifil32 0x79590000) +set(baseaddress_batt 0x79560000) +set(baseaddress_bcrypt 0x79530000) +set(baseaddress_beepmidi 0x79500000) +set(baseaddress_browseui 0x79370000) +set(baseaddress_cards 0x792b0000) +set(baseaddress_cfgmgr32 0x79280000) +set(baseaddress_clusapi 0x79250000) +set(baseaddress_cmicpl 0x79210000) +set(baseaddress_comcat 0x791e0000) +set(baseaddress_compstui 0x791b0000) +set(baseaddress_console 0x79150000) +set(baseaddress_credui 0x79110000) +set(baseaddress_crtdll 0x790a0000) +set(baseaddress_cryptdlg 0x79070000) +set(baseaddress_cryptdll 0x79040000) +set(baseaddress_cryptnet 0x79010000) +set(baseaddress_custom 0x78fe0000) +set(baseaddress_d3d8 0x78f80000) +set(baseaddress_d3d8thk 0x78f60000) +set(baseaddress_d3d9 0x78ef0000) +set(baseaddress_d3dcompiler_43 0x78e40000) +set(baseaddress_d3drm 0x78da0000) +set(baseaddress_d3dwine 0x78b90000) +set(baseaddress_d3dx9_24 0x78b60000) +set(baseaddress_d3dx9_25 0x78b20000) +set(baseaddress_d3dx9_26 0x78af0000) +set(baseaddress_d3dx9_27 0x78ac0000) +set(baseaddress_d3dx9_28 0x78a90000) +set(baseaddress_d3dx9_29 0x78a60000) +set(baseaddress_d3dx9_30 0x78a30000) +set(baseaddress_d3dx9_31 0x78a00000) +set(baseaddress_d3dx9_32 0x789d0000) +set(baseaddress_d3dx9_33 0x789a0000) +set(baseaddress_d3dx9_34 0x78970000) +set(baseaddress_d3dx9_35 0x78940000) +set(baseaddress_d3dx9_36 0x78840000) +set(baseaddress_d3dx9_37 0x78810000) +set(baseaddress_d3dx9_38 0x787e0000) +set(baseaddress_d3dx9_39 0x787b0000) +set(baseaddress_d3dx9_40 0x78780000) +set(baseaddress_d3dx9_41 0x78750000) +set(baseaddress_d3dx9_42 0x78720000) +set(baseaddress_d3dx9_43 0x786f0000) +set(baseaddress_d3dxof 0x786b0000) +set(baseaddress_dciman32 0x78680000) +set(baseaddress_ddraw 0x785c0000) +set(baseaddress_desk 0x78520000) +set(baseaddress_deskadp 0x784f0000) +set(baseaddress_deskmon 0x784c0000) +set(baseaddress_devcpux 0x78490000) +set(baseaddress_devenum 0x78440000) +set(baseaddress_dinput 0x783e0000) +set(baseaddress_dinput8 0x783b0000) +set(baseaddress_dmusic 0x78360000) +set(baseaddress_dplay 0x78330000) +set(baseaddress_dxdiagn 0x782e0000) +set(baseaddress_dxtn 0x782c0000) +set(baseaddress_esent 0x78290000) +set(baseaddress_faultrep 0x78260000) +set(baseaddress_fltlib 0x78230000) +set(baseaddress_fmifs 0x78210000) +set(baseaddress_fontext 0x781e0000) +set(baseaddress_fontsub 0x781b0000) +set(baseaddress_framebuf 0x78190000) +set(baseaddress_framebuf_new 0x78170000) +set(baseaddress_framedyn 0x78130000) +set(baseaddress_genincdata 0x78100000) +set(baseaddress_getuname 0x76f00000) +set(baseaddress_hdwwiz 0x76e80000) +set(baseaddress_hhctrl 0x76e20000) +set(baseaddress_hid 0x76df0000) +set(baseaddress_hlink 0x76db0000) +set(baseaddress_hnetcfg 0x76d70000) +set(baseaddress_httpapi 0x76d40000) +set(baseaddress_iccvid 0x76d10000) +set(baseaddress_ieframe 0x76c10000) +set(baseaddress_iernonce 0x76be0000) +set(baseaddress_imaadp32.acm 0x76bb0000) +set(baseaddress_imagehlp 0x76b80000) +set(baseaddress_inetcomm 0x76b10000) +set(baseaddress_inetcpl 0x76ab0000) +set(baseaddress_inetmib1 0x76a80000) +set(baseaddress_initpki 0x76a50000) +set(baseaddress_input 0x769f0000) +set(baseaddress_inseng 0x769b0000) +set(baseaddress_intl 0x76940000) +set(baseaddress_iologmsg 0x76920000) +set(baseaddress_itircl 0x768f0000) +set(baseaddress_itss 0x768b0000) +set(baseaddress_joy 0x76870000) +set(baseaddress_jscript 0x76760000) +set(baseaddress_jsproxy 0x76730000) +set(baseaddress_kbdeo 0x76710000) +set(baseaddress_kbsdll 0x766e0000) +set(baseaddress_kernel32_vista 0x766c0000) +set(baseaddress_ksuser 0x76690000) +set(baseaddress_libjpeg 0x76600000) +set(baseaddress_libpng 0x76570000) +set(baseaddress_libtiff 0x764a0000) +set(baseaddress_libtirpc 0x76440000) +set(baseaddress_libxslt 0x76170000) +set(baseaddress_loadperf 0x76140000) +set(baseaddress_localmon 0x76110000) +set(baseaddress_localspl 0x760d0000) +set(baseaddress_localspl_apitest 0x760a0000) +set(baseaddress_localui 0x76070000) +set(baseaddress_lpk 0x76030000) +set(baseaddress_lsasrv 0x75fc0000) +set(baseaddress_main 0x75f20000) +set(baseaddress_mapi32 0x75ee0000) +set(baseaddress_mbedtls 0x75e50000) +set(baseaddress_mciavi32 0x75e10000) +set(baseaddress_mcicda 0x75de0000) +set(baseaddress_mciqtz32 0x75da0000) +set(baseaddress_mciseq 0x75d70000) +set(baseaddress_mciwave 0x75d40000) +set(baseaddress_mgmtapi 0x75d10000) +set(baseaddress_midimap 0x75ce0000) +set(baseaddress_mlang 0x75ca0000) +set(baseaddress_mmdrv 0x75c70000) +set(baseaddress_mmsys 0x75ba0000) +set(baseaddress_modemui 0x75b30000) +set(baseaddress_mprapi 0x75b00000) +set(baseaddress_msacm32.drv 0x75ad0000) +set(baseaddress_msadp32.acm 0x75aa0000) +set(baseaddress_msafd 0x75a60000) +set(baseaddress_mscat32 0x75a30000) +set(baseaddress_mscms 0x75a00000) +set(baseaddress_mscoree 0x759b0000) +set(baseaddress_msctf 0x75950000) +set(baseaddress_msdmo 0x75920000) +set(baseaddress_msftedit 0x758f0000) +set(baseaddress_msg711.acm 0x758c0000) +set(baseaddress_msgina 0x75820000) +set(baseaddress_msgsm32.acm 0x757f0000) +set(baseaddress_mshtml 0x754e0000) +set(baseaddress_msi 0x75330000) +set(baseaddress_msimtf 0x75300000) +set(baseaddress_msisip 0x752d0000) +set(baseaddress_msisys 0x752a0000) +set(baseaddress_mspatcha 0x75270000) +set(baseaddress_msports 0x75240000) +set(baseaddress_msrle32 0x75210000) +set(baseaddress_mssign32 0x751e0000) +set(baseaddress_mssip32 0x751b0000) +set(baseaddress_mstask 0x75170000) +set(baseaddress_msv1_0 0x75140000) +set(baseaddress_msvcrt20 0x75070000) +set(baseaddress_msvcrt40 0x74fa0000) +set(baseaddress_msvcrt_crt_dll_startup 0x74f70000) +set(baseaddress_msvidc32 0x74f40000) +set(baseaddress_msxml 0x74f10000) +set(baseaddress_msxml2 0x74ee0000) +set(baseaddress_msxml3 0x74b00000) +set(baseaddress_msxml4 0x74ac0000) +set(baseaddress_msxml6 0x74a80000) +set(baseaddress_mycomput 0x74a60000) +set(baseaddress_ncpa 0x74a30000) +set(baseaddress_nddeapi 0x74a00000) +set(baseaddress_netcfgx 0x74970000) +set(baseaddress_netevent 0x74950000) +set(baseaddress_netid 0x74900000) +set(baseaddress_netshell 0x74850000) +set(baseaddress_newdev 0x747f0000) +set(baseaddress_nfs41_np 0x747c0000) +set(baseaddress_normaliz 0x74790000) +set(baseaddress_notifyhook 0x74760000) +set(baseaddress_npptools 0x74730000) +set(baseaddress_ntdll_vista 0x74710000) +set(baseaddress_ntdsapi 0x746e0000) +set(baseaddress_ntlanman 0x746b0000) +set(baseaddress_ntmarta 0x74680000) +set(baseaddress_ntobjshex 0x745e0000) +set(baseaddress_objsel 0x745b0000) +set(baseaddress_odbc32 0x74570000) +set(baseaddress_odbccp32 0x74540000) +set(baseaddress_odbccp32i 0x74510000) +set(baseaddress_oleacc 0x74480000) +set(baseaddress_olecli32 0x74450000) +set(baseaddress_olepro32 0x74420000) +set(baseaddress_olesvr32 0x743f0000) +set(baseaddress_olethk32 0x743c0000) +set(baseaddress_openglcfg 0x74390000) +set(baseaddress_pdh 0x74350000) +set(baseaddress_pidgen 0x74320000) +set(baseaddress_pifmgr 0x742b0000) +set(baseaddress_powercfg 0x74250000) +set(baseaddress_printui 0x74220000) +set(baseaddress_propsys 0x741e0000) +set(baseaddress_pstorec 0x741b0000) +set(baseaddress_qedit 0x74160000) +set(baseaddress_qmgr 0x74120000) +set(baseaddress_qmgrprxy 0x740c0000) +set(baseaddress_quartz 0x73f40000) +set(baseaddress_query 0x73f10000) +set(baseaddress_rasadhlp 0x73ee0000) +set(baseaddress_rasdlg 0x73d10000) +set(baseaddress_rasman 0x73ce0000) +set(baseaddress_redirtest1 0x73cb0000) +set(baseaddress_redirtest2 0x73c80000) +set(baseaddress_resutils 0x73c50000) +set(baseaddress_riched32 0x73c20000) +set(baseaddress_rsabase 0x73c00000) +set(baseaddress_rshell 0x73b60000) +set(baseaddress_samsrv 0x73af0000) +set(baseaddress_sccbase 0x73ac0000) +set(baseaddress_schannel 0x73a80000) +set(baseaddress_schedsvc 0x73a50000) +set(baseaddress_scrrun 0x739f0000) +set(baseaddress_security 0x739d0000) +set(baseaddress_serialui 0x739a0000) +set(baseaddress_sfc 0x73970000) +set(baseaddress_shdoclc 0x73930000) +set(baseaddress_shdocvw 0x738e0000) +set(baseaddress_shellbtrfs 0x73780000) +set(baseaddress_shfolder 0x73760000) +set(baseaddress_shimgvw 0x73710000) +set(baseaddress_shsvcs 0x736e0000) +set(baseaddress_slbcsp 0x736b0000) +set(baseaddress_sndblst 0x73680000) +set(baseaddress_softpub 0x73660000) +set(baseaddress_srclient 0x73630000) +set(baseaddress_srvsvc 0x73600000) +set(baseaddress_sti 0x735c0000) +set(baseaddress_stobject 0x73530000) +set(baseaddress_streamci 0x73500000) +set(baseaddress_sxs 0x734d0000) +set(baseaddress_sysdm 0x733f0000) +set(baseaddress_syssetup 0x73300000) +set(baseaddress_t2embed 0x732d0000) +set(baseaddress_tapi32 0x73290000) +set(baseaddress_tapiui 0x73210000) +set(baseaddress_telephon 0x731e0000) +set(baseaddress_testvdd 0x731b0000) +set(baseaddress_themeui 0x73190000) +set(baseaddress_timedate 0x73110000) +set(baseaddress_traffic 0x730e0000) +set(baseaddress_twain_32 0x730b0000) +set(baseaddress_ubtrfs 0x73080000) +set(baseaddress_ucdfs 0x73060000) +set(baseaddress_uext2 0x73020000) +set(baseaddress_ufat 0x72fe0000) +set(baseaddress_ufatx 0x72fc0000) +set(baseaddress_uffs 0x72fa0000) +set(baseaddress_umpnpmgr 0x72f70000) +set(baseaddress_untfs 0x72f50000) +set(baseaddress_updspapi 0x72f20000) +set(baseaddress_ureiserfs 0x72f00000) +set(baseaddress_url 0x72ed0000) +set(baseaddress_usrmgr 0x72e80000) +set(baseaddress_vbscript 0x72dd0000) +set(baseaddress_vdmdbg 0x72da0000) +set(baseaddress_verifier 0x72d80000) +set(baseaddress_vfd 0x72d20000) +set(baseaddress_vssapi 0x72cf0000) +set(baseaddress_wbemdisp 0x72ca0000) +set(baseaddress_wbemprox 0x72c40000) set(baseaddress_wdmaud.drv 0x72a80000) -set(baseaddress_wined3dcfg 0x72a50000) -set(baseaddress_winemp3.acm 0x729d0000) -set(baseaddress_wshom 0x72980000) +set(baseaddress_win32u 0x72a50000) +set(baseaddress_win32u_2k3sp2 0x72a20000) +set(baseaddress_win32u_xpsp2 0x729f0000) +set(baseaddress_windowscodecs 0x728b0000) +set(baseaddress_windowscodecsext 0x72880000) +set(baseaddress_wined3dcfg 0x72850000) +set(baseaddress_winemp3.acm 0x727d0000) +set(baseaddress_winfax 0x727a0000) +set(baseaddress_wing32 0x72770000) +set(baseaddress_winhttp 0x72700000) +set(baseaddress_winprint 0x726d0000) +set(baseaddress_winscard 0x726a0000) +set(baseaddress_winsta 0x72670000) +set(baseaddress_wkssvc 0x72640000) +set(baseaddress_wlanapi 0x72610000) +set(baseaddress_wldap32 0x725d0000) +set(baseaddress_wmi 0x725b0000) +set(baseaddress_wmisvc 0x72580000) +set(baseaddress_wmiutils 0x72540000) +set(baseaddress_wmvcore 0x724f0000) +set(baseaddress_wshirda 0x724c0000) +set(baseaddress_wshom 0x72470000) +set(baseaddress_wshtcpip 0x72440000) +set(baseaddress_wsock32 0x72410000) +set(baseaddress_wtsapi32 0x723e0000) +set(baseaddress_wuapi 0x723a0000) +set(baseaddress_xinput1_1 0x72370000) +set(baseaddress_xinput1_2 0x72340000) +set(baseaddress_xinput1_3 0x72310000) +set(baseaddress_xinput9_1_0 0x722e0000) +set(baseaddress_xmllite 0x722a0000) +set(baseaddress_zipfldr 0x72200000) diff --git a/sdk/cmake/baseaddress_dwarf.cmake b/sdk/cmake/baseaddress_dwarf.cmake index 98d98b2eee..e0f26a2fdb 100644 --- a/sdk/cmake/baseaddress_dwarf.cmake +++ b/sdk/cmake/baseaddress_dwarf.cmake @@ -4,372 +4,370 @@ set(baseaddress_kernel32 0x7c650000) set(baseaddress_msvcrt 0x7c530000) set(baseaddress_advapi32 0x7c430000) set(baseaddress_gdi32 0x7c350000) -set(baseaddress_user32 0x7c160000) -set(baseaddress_dhcpcsvc 0x7c100000) -set(baseaddress_dnsapi 0x7c090000) -set(baseaddress_icmp 0x7c060000) -set(baseaddress_iphlpapi 0x7c000000) -set(baseaddress_ws2_32 0x7bf90000) -set(baseaddress_ws2help 0x7bf60000) -set(baseaddress_shlwapi 0x7be80000) -set(baseaddress_rpcrt4 0x7bd70000) -set(baseaddress_comctl32 0x7bb30000) -set(baseaddress_ole32 0x7b860000) -set(baseaddress_winspool 0x7b7f0000) -set(baseaddress_winmm 0x7b720000) -set(baseaddress_comdlg32 0x7b600000) -set(baseaddress_shell32 0x7abb0000) -set(baseaddress_lz32 0x7ab90000) -set(baseaddress_version 0x7ab50000) -set(baseaddress_oleaut32 0x7a8e0000) -set(baseaddress_setupapi 0x7a730000) -set(baseaddress_mpr 0x7a6e0000) -set(baseaddress_crypt32 0x7a570000) -set(baseaddress_wininet 0x7a470000) -set(baseaddress_urlmon 0x7a300000) -set(baseaddress_psapi 0x7a2c0000) -set(baseaddress_imm32 0x7a270000) -set(baseaddress_msvfw32 0x7a220000) -set(baseaddress_dbghelp 0x7a120000) -set(baseaddress_devmgr 0x7a020000) -set(baseaddress_msacm32 0x79fd0000) -set(baseaddress_netapi32 0x79f20000) -set(baseaddress_powrprof 0x79ee0000) -set(baseaddress_secur32 0x79e70000) -set(baseaddress_wintrust 0x79e00000) -set(baseaddress_avicap32 0x79dd0000) -set(baseaddress_cabinet 0x79d70000) -set(baseaddress_dsound 0x79cd0000) -set(baseaddress_glu32 0x79b70000) -set(baseaddress_opengl32 0x79860000) -set(baseaddress_riched20 0x79770000) -set(baseaddress_smdll 0x79750000) -set(baseaddress_userenv 0x796f0000) -set(baseaddress_uxtheme 0x79670000) -set(baseaddress_cryptui 0x795b0000) -set(baseaddress_csrsrv 0x79570000) -set(baseaddress_basesrv 0x79530000) -set(baseaddress_winsrv 0x79460000) -set(baseaddress_dplayx 0x793d0000) -set(baseaddress_gdiplus 0x792a0000) -set(baseaddress_msimg32 0x79270000) -set(baseaddress_mswsock 0x79230000) -set(baseaddress_oledlg 0x791d0000) -set(baseaddress_rasapi32 0x79190000) -set(baseaddress_rsaenh 0x79110000) -set(baseaddress_samlib 0x790c0000) -set(baseaddress_sensapi 0x79090000) -set(baseaddress_sfc_os 0x79060000) -set(baseaddress_snmpapi 0x79020000) -set(baseaddress_spoolss 0x78fd0000) -set(baseaddress_usp10 0x78f30000) -# Extra dlls -set(baseaddress_acgenral 0x78f00000) -set(baseaddress_aclayers 0x78ec0000) -set(baseaddress_acledit 0x78e90000) -set(baseaddress_aclui 0x78e40000) -set(baseaddress_acppage 0x78db0000) -set(baseaddress_activeds 0x78d80000) -set(baseaddress_actxprxy 0x78a90000) -set(baseaddress_advapi32_vista 0x78a70000) -set(baseaddress_advpack 0x78a20000) -set(baseaddress_amstream 0x789b0000) -set(baseaddress_apphelp 0x78950000) -set(baseaddress_atl 0x788f0000) -set(baseaddress_atl100 0x788a0000) -set(baseaddress_atl80 0x78840000) -set(baseaddress_authz 0x78810000) -set(baseaddress_avifil32 0x78780000) -set(baseaddress_batt 0x78750000) -set(baseaddress_bcrypt 0x78710000) -set(baseaddress_beepmidi 0x786e0000) -set(baseaddress_browseui 0x784b0000) -set(baseaddress_cards 0x783e0000) -set(baseaddress_cfgmgr32 0x783b0000) -set(baseaddress_clusapi 0x78370000) -set(baseaddress_comcat 0x78340000) -set(baseaddress_compstui 0x78310000) -set(baseaddress_console 0x782b0000) -set(baseaddress_credui 0x78260000) -set(baseaddress_crtdll 0x781e0000) -set(baseaddress_cryptdlg 0x781a0000) -set(baseaddress_cryptdll 0x78170000) -set(baseaddress_cryptnet 0x78130000) -set(baseaddress_custom 0x78100000) -set(baseaddress_d3d8 0x78080000) -set(baseaddress_d3d8thk 0x78060000) -set(baseaddress_d3d9 0x77fc0000) -set(baseaddress_d3dcompiler_43 0x77ee0000) -set(baseaddress_d3drm 0x77e10000) -set(baseaddress_d3dwine 0x77b30000) -set(baseaddress_d3dx9_24 0x77b00000) -set(baseaddress_d3dx9_25 0x77ab0000) -set(baseaddress_d3dx9_26 0x77a80000) -set(baseaddress_d3dx9_27 0x77a50000) -set(baseaddress_d3dx9_28 0x77a20000) -set(baseaddress_d3dx9_29 0x779f0000) -set(baseaddress_d3dx9_30 0x779b0000) -set(baseaddress_d3dx9_31 0x77980000) -set(baseaddress_d3dx9_32 0x77950000) -set(baseaddress_d3dx9_33 0x77920000) -set(baseaddress_d3dx9_34 0x778f0000) -set(baseaddress_d3dx9_35 0x778c0000) -set(baseaddress_d3dx9_36 0x77760000) -set(baseaddress_d3dx9_37 0x77730000) -set(baseaddress_d3dx9_38 0x77700000) -set(baseaddress_d3dx9_39 0x776d0000) -set(baseaddress_d3dx9_40 0x776a0000) -set(baseaddress_d3dx9_41 0x77670000) -set(baseaddress_d3dx9_42 0x77640000) -set(baseaddress_d3dx9_43 0x77610000) -set(baseaddress_d3dxof 0x775c0000) -set(baseaddress_dciman32 0x77590000) -set(baseaddress_ddraw 0x77490000) -set(baseaddress_deskadp 0x77450000) -set(baseaddress_deskmon 0x77410000) -set(baseaddress_devcpux 0x773e0000) -set(baseaddress_devenum 0x77380000) -set(baseaddress_dinput 0x77300000) -set(baseaddress_dinput8 0x772c0000) -set(baseaddress_dmusic 0x77250000) -set(baseaddress_dplay 0x77220000) -set(baseaddress_dxdiagn 0x771c0000) -set(baseaddress_dxtn 0x77190000) -set(baseaddress_esent 0x77150000) -set(baseaddress_faultrep 0x77120000) -set(baseaddress_fltlib 0x770f0000) -set(baseaddress_fmifs 0x770c0000) -set(baseaddress_fontext 0x77090000) -set(baseaddress_fontsub 0x77060000) -set(baseaddress_framebuf 0x77030000) -set(baseaddress_framebuf_new 0x77000000) -set(baseaddress_framedyn 0x76fb0000) -set(baseaddress_genincdata 0x76f80000) -set(baseaddress_getuname 0x76670000) -set(baseaddress_hid 0x76640000) -set(baseaddress_hlink 0x765f0000) -set(baseaddress_hnetcfg 0x76590000) -set(baseaddress_httpapi 0x76550000) -set(baseaddress_iccvid 0x76510000) -set(baseaddress_ieframe 0x763d0000) -set(baseaddress_iernonce 0x76390000) -set(baseaddress_imagehlp 0x76350000) -set(baseaddress_inetcomm 0x762c0000) -set(baseaddress_inetmib1 0x76280000) -set(baseaddress_initpki 0x76250000) -set(baseaddress_input 0x761e0000) -set(baseaddress_inseng 0x76190000) -set(baseaddress_iologmsg 0x76170000) -set(baseaddress_itircl 0x76140000) -set(baseaddress_itss 0x760e0000) -set(baseaddress_jscript 0x75f50000) -set(baseaddress_jsproxy 0x75f10000) -set(baseaddress_kbdeo 0x75ef0000) -set(baseaddress_kbsdll 0x75ec0000) -set(baseaddress_kernel32_vista 0x75e90000) -set(baseaddress_ksuser 0x75e60000) -set(baseaddress_libjpeg 0x75da0000) -set(baseaddress_libpng 0x75cf0000) -set(baseaddress_libtiff 0x75c00000) -set(baseaddress_libtirpc 0x75b80000) -set(baseaddress_libxslt 0x75800000) -set(baseaddress_loadperf 0x757d0000) -set(baseaddress_localmon 0x75790000) -set(baseaddress_localspl 0x75730000) -set(baseaddress_localspl_apitest 0x75700000) -set(baseaddress_localui 0x756c0000) -set(baseaddress_lpk 0x75680000) -set(baseaddress_lsasrv 0x755f0000) -set(baseaddress_mapi32 0x75590000) -set(baseaddress_mbedtls 0x754c0000) -set(baseaddress_mciavi32 0x75470000) -set(baseaddress_mcicda 0x75430000) -set(baseaddress_mciqtz32 0x753e0000) -set(baseaddress_mciseq 0x753a0000) -set(baseaddress_mciwave 0x75360000) -set(baseaddress_mgmtapi 0x75330000) -set(baseaddress_midimap 0x75300000) -set(baseaddress_mlang 0x752b0000) -set(baseaddress_mmdrv 0x75280000) -set(baseaddress_modemui 0x75200000) -set(baseaddress_mprapi 0x751c0000) -set(baseaddress_msafd 0x75170000) -set(baseaddress_mscat32 0x75140000) -set(baseaddress_mscms 0x75100000) -set(baseaddress_mscoree 0x75090000) -set(baseaddress_msctf 0x75010000) -set(baseaddress_msdmo 0x74fd0000) -set(baseaddress_msftedit 0x74fa0000) -set(baseaddress_msgina 0x74ef0000) -set(baseaddress_mshtml 0x74a40000) -set(baseaddress_msi 0x747c0000) -set(baseaddress_msimtf 0x74780000) -set(baseaddress_msisip 0x74750000) -set(baseaddress_mspatcha 0x74720000) -set(baseaddress_msports 0x746e0000) -set(baseaddress_msrle32 0x746a0000) -set(baseaddress_mssign32 0x74670000) -set(baseaddress_mssip32 0x74640000) -set(baseaddress_mstask 0x745f0000) -set(baseaddress_msv1_0 0x745c0000) -set(baseaddress_msvcrt20 0x74490000) -set(baseaddress_msvcrt40 0x74350000) -set(baseaddress_msvcrt_crt_dll_startup 0x74320000) -set(baseaddress_msvidc32 0x742e0000) -set(baseaddress_msxml 0x742a0000) -set(baseaddress_msxml2 0x74260000) -set(baseaddress_msxml3 0x73d40000) -set(baseaddress_msxml4 0x73cf0000) -set(baseaddress_msxml6 0x73ca0000) -set(baseaddress_mycomput 0x73c80000) -set(baseaddress_nddeapi 0x73c50000) -set(baseaddress_netcfgx 0x73bb0000) -set(baseaddress_netevent 0x73b90000) -set(baseaddress_netid 0x73b40000) -set(baseaddress_netshell 0x73a80000) -set(baseaddress_newdev 0x73a10000) -set(baseaddress_nfs41_np 0x739e0000) -set(baseaddress_normaliz 0x739b0000) -set(baseaddress_notifyhook 0x73980000) -set(baseaddress_npptools 0x73950000) -set(baseaddress_ntdll_vista 0x73920000) -set(baseaddress_ntdsapi 0x738e0000) -set(baseaddress_ntlanman 0x738b0000) -set(baseaddress_ntmarta 0x73880000) -set(baseaddress_ntobjshex 0x737b0000) -set(baseaddress_objsel 0x73770000) -set(baseaddress_odbc32 0x73720000) -set(baseaddress_odbccp32 0x736e0000) -set(baseaddress_oleacc 0x73630000) -set(baseaddress_olecli32 0x735f0000) -set(baseaddress_olepro32 0x735c0000) -set(baseaddress_olesvr32 0x73590000) -set(baseaddress_olethk32 0x73560000) -set(baseaddress_pdh 0x73520000) -set(baseaddress_pidgen 0x734f0000) -set(baseaddress_pifmgr 0x73480000) -set(baseaddress_printui 0x73450000) -set(baseaddress_propsys 0x73400000) -set(baseaddress_pstorec 0x733c0000) -set(baseaddress_qedit 0x73350000) -set(baseaddress_qmgr 0x73300000) -set(baseaddress_qmgrprxy 0x73280000) -set(baseaddress_quartz 0x73060000) -set(baseaddress_query 0x73030000) -set(baseaddress_rasadhlp 0x73000000) -set(baseaddress_rasdlg 0x72e20000) -set(baseaddress_rasman 0x72de0000) -set(baseaddress_redirtest1 0x72db0000) -set(baseaddress_redirtest2 0x72d80000) -set(baseaddress_resutils 0x72d40000) -set(baseaddress_riched32 0x72d10000) -set(baseaddress_rsabase 0x72cf0000) -set(baseaddress_rshell 0x72c00000) -set(baseaddress_samsrv 0x72b70000) -set(baseaddress_sccbase 0x72b40000) -set(baseaddress_schannel 0x72af0000) -set(baseaddress_schedsvc 0x72ab0000) -set(baseaddress_scrrun 0x72a40000) -set(baseaddress_security 0x72a20000) -set(baseaddress_serialui 0x729f0000) -set(baseaddress_sfc 0x729c0000) -set(baseaddress_shdoclc 0x72980000) -set(baseaddress_shdocvw 0x72920000) -set(baseaddress_shellbtrfs 0x72790000) -set(baseaddress_shfolder 0x72770000) -set(baseaddress_shimgvw 0x72720000) -set(baseaddress_shsvcs 0x726f0000) -set(baseaddress_slbcsp 0x726c0000) -set(baseaddress_sndblst 0x72680000) -set(baseaddress_softpub 0x72660000) -set(baseaddress_srclient 0x72630000) -set(baseaddress_srvsvc 0x725f0000) -set(baseaddress_sti 0x725a0000) -set(baseaddress_stobject 0x724f0000) -set(baseaddress_streamci 0x724c0000) -set(baseaddress_sxs 0x72480000) -set(baseaddress_syssetup 0x72380000) -set(baseaddress_t2embed 0x72350000) -set(baseaddress_tapi32 0x72300000) -set(baseaddress_tapiui 0x72280000) -set(baseaddress_testvdd 0x72250000) -set(baseaddress_themeui 0x72230000) -set(baseaddress_traffic 0x72200000) -set(baseaddress_twain_32 0x721c0000) -set(baseaddress_ubtrfs 0x72190000) -set(baseaddress_ucdfs 0x72170000) -set(baseaddress_uext2 0x72130000) -set(baseaddress_ufat 0x720f0000) -set(baseaddress_ufatx 0x720c0000) -set(baseaddress_uffs 0x720a0000) -set(baseaddress_umpnpmgr 0x72060000) -set(baseaddress_untfs 0x72040000) -set(baseaddress_updspapi 0x72010000) -set(baseaddress_ureiserfs 0x71ff0000) -set(baseaddress_url 0x71fc0000) -set(baseaddress_vbscript 0x71ee0000) -set(baseaddress_vdmdbg 0x71eb0000) -set(baseaddress_verifier 0x71e80000) -set(baseaddress_vfd 0x71e10000) -set(baseaddress_vssapi 0x71dd0000) -set(baseaddress_wbemdisp 0x71d70000) -set(baseaddress_wbemprox 0x71ce0000) -set(baseaddress_win32u 0x71cb0000) -set(baseaddress_win32u_2k3sp2 0x71c80000) -set(baseaddress_win32u_xpsp2 0x71c50000) -set(baseaddress_windowscodecs 0x71a80000) -set(baseaddress_windowscodecsext 0x71a40000) -set(baseaddress_winfax 0x71a10000) -set(baseaddress_wing32 0x719e0000) -set(baseaddress_winhttp 0x71960000) -set(baseaddress_winprint 0x71930000) -set(baseaddress_winscard 0x718f0000) -set(baseaddress_winsta 0x718b0000) -set(baseaddress_wkssvc 0x71870000) -set(baseaddress_wlanapi 0x71830000) -set(baseaddress_wldap32 0x717d0000) -set(baseaddress_wmi 0x717b0000) -set(baseaddress_wmisvc 0x71780000) -set(baseaddress_wmiutils 0x71730000) -set(baseaddress_wmvcore 0x716d0000) -set(baseaddress_wshirda 0x716a0000) -set(baseaddress_wshtcpip 0x71670000) -set(baseaddress_wsock32 0x71640000) -set(baseaddress_wtsapi32 0x71600000) -set(baseaddress_wuapi 0x715b0000) -set(baseaddress_xinput1_1 0x71580000) -set(baseaddress_xinput1_2 0x71550000) -set(baseaddress_xinput1_3 0x71520000) -set(baseaddress_xinput9_1_0 0x714f0000) -set(baseaddress_xmllite 0x71490000) -set(baseaddress_zipfldr 0x713a0000) -# Extra files -set(baseaddress_access 0x71310000) -set(baseaddress_appwiz 0x71290000) -set(baseaddress_cmicpl 0x71250000) -set(baseaddress_desk 0x71190000) -set(baseaddress_hdwwiz 0x71110000) -set(baseaddress_hhctrl 0x710a0000) -set(baseaddress_imaadp32.acm 0x71060000) -set(baseaddress_inetcpl 0x71000000) -set(baseaddress_intl 0x70f80000) -set(baseaddress_joy 0x70f40000) -set(baseaddress_main 0x70ea0000) -set(baseaddress_mmsys 0x70dc0000) -set(baseaddress_msacm32.drv 0x70d80000) -set(baseaddress_msadp32.acm 0x70d50000) -set(baseaddress_msg711.acm 0x70d20000) -set(baseaddress_msgsm32.acm 0x70cf0000) -set(baseaddress_msisys 0x70cc0000) -set(baseaddress_ncpa 0x70c90000) -set(baseaddress_odbccp32i 0x70c60000) -set(baseaddress_openglcfg 0x70c20000) -set(baseaddress_powercfg 0x70bb0000) -set(baseaddress_sysdm 0x70ac0000) -set(baseaddress_telephon 0x70a90000) -set(baseaddress_timedate 0x70a10000) -set(baseaddress_usrmgr 0x709b0000) -set(baseaddress_wdmaud.drv 0x707e0000) -set(baseaddress_wined3dcfg 0x707a0000) -set(baseaddress_winemp3.acm 0x70700000) -set(baseaddress_wshom 0x706a0000) +set(baseaddress_user32 0x77a20000) # reserved +set(baseaddress_dhcpcsvc 0x7c2f0000) +set(baseaddress_dnsapi 0x7c280000) +set(baseaddress_icmp 0x7c250000) +set(baseaddress_iphlpapi 0x7c1f0000) +set(baseaddress_ws2_32 0x7c180000) +set(baseaddress_ws2help 0x7c150000) +set(baseaddress_shlwapi 0x7c070000) +set(baseaddress_rpcrt4 0x7bf60000) +set(baseaddress_comctl32 0x7bd20000) +set(baseaddress_ole32 0x7ba50000) +set(baseaddress_winspool 0x7b9e0000) +set(baseaddress_winmm 0x7b910000) +set(baseaddress_comdlg32 0x7b7f0000) +set(baseaddress_shell32 0x7ada0000) +set(baseaddress_lz32 0x7ad80000) +set(baseaddress_version 0x7ad40000) +set(baseaddress_oleaut32 0x7aad0000) +set(baseaddress_setupapi 0x7a920000) +set(baseaddress_mpr 0x7a8d0000) +set(baseaddress_crypt32 0x7a760000) +set(baseaddress_wininet 0x7a660000) +set(baseaddress_urlmon 0x7a4f0000) +set(baseaddress_psapi 0x7a4b0000) +set(baseaddress_imm32 0x7a460000) +set(baseaddress_msvfw32 0x7a410000) +set(baseaddress_dbghelp 0x7a310000) +set(baseaddress_devmgr 0x7a210000) +set(baseaddress_msacm32 0x7a1c0000) +set(baseaddress_netapi32 0x7a110000) +set(baseaddress_powrprof 0x7a0d0000) +set(baseaddress_secur32 0x7a060000) +set(baseaddress_wintrust 0x79ff0000) +set(baseaddress_avicap32 0x79fc0000) +set(baseaddress_cabinet 0x79f60000) +set(baseaddress_dsound 0x79ec0000) +set(baseaddress_glu32 0x79d60000) +set(baseaddress_opengl32 0x79a50000) +set(baseaddress_riched20 0x79960000) +set(baseaddress_smdll 0x79940000) +set(baseaddress_userenv 0x798e0000) +set(baseaddress_uxtheme 0x79860000) +set(baseaddress_cryptui 0x797a0000) +set(baseaddress_csrsrv 0x79760000) +set(baseaddress_basesrv 0x79720000) +set(baseaddress_winsrv 0x79650000) +set(baseaddress_dplayx 0x795c0000) +set(baseaddress_gdiplus 0x79490000) +set(baseaddress_msimg32 0x79460000) +set(baseaddress_mswsock 0x79420000) +set(baseaddress_oledlg 0x793c0000) +set(baseaddress_rasapi32 0x79380000) +set(baseaddress_rsaenh 0x79300000) +set(baseaddress_samlib 0x792b0000) +set(baseaddress_sensapi 0x79280000) +set(baseaddress_sfc_os 0x79250000) +set(baseaddress_snmpapi 0x79210000) +set(baseaddress_spoolss 0x791c0000) +set(baseaddress_usp10 0x79120000) +set(baseaddress_access 0x79090000) +set(baseaddress_acgenral 0x79060000) +set(baseaddress_aclayers 0x79020000) +set(baseaddress_acledit 0x78ff0000) +set(baseaddress_aclui 0x78fa0000) +set(baseaddress_acppage 0x78f10000) +set(baseaddress_activeds 0x78ee0000) +set(baseaddress_actxprxy 0x78bf0000) +set(baseaddress_advapi32_vista 0x78bd0000) +set(baseaddress_advpack 0x78b80000) +set(baseaddress_amstream 0x78b10000) +set(baseaddress_apphelp 0x78ab0000) +set(baseaddress_appwiz 0x78a30000) +set(baseaddress_atl 0x789d0000) +set(baseaddress_atl100 0x78980000) +set(baseaddress_atl80 0x78920000) +set(baseaddress_authz 0x788f0000) +set(baseaddress_avifil32 0x78860000) +set(baseaddress_batt 0x78830000) +set(baseaddress_bcrypt 0x787f0000) +set(baseaddress_beepmidi 0x787c0000) +set(baseaddress_browseui 0x78590000) +set(baseaddress_cards 0x784c0000) +set(baseaddress_cfgmgr32 0x78490000) +set(baseaddress_clusapi 0x78450000) +set(baseaddress_cmicpl 0x78410000) +set(baseaddress_comcat 0x783e0000) +set(baseaddress_compstui 0x783b0000) +set(baseaddress_console 0x78350000) +set(baseaddress_credui 0x78300000) +set(baseaddress_crtdll 0x78280000) +set(baseaddress_cryptdlg 0x78240000) +set(baseaddress_cryptdll 0x78210000) +set(baseaddress_cryptnet 0x781d0000) +set(baseaddress_custom 0x781a0000) +set(baseaddress_d3d8 0x78120000) +set(baseaddress_d3d8thk 0x78100000) +set(baseaddress_d3d9 0x78060000) +set(baseaddress_d3dcompiler_43 0x77f80000) +set(baseaddress_d3drm 0x77eb0000) +set(baseaddress_d3dwine 0x77740000) +set(baseaddress_d3dx9_24 0x77710000) +set(baseaddress_d3dx9_25 0x776c0000) +set(baseaddress_d3dx9_26 0x77690000) +set(baseaddress_d3dx9_27 0x77660000) +set(baseaddress_d3dx9_28 0x77630000) +set(baseaddress_d3dx9_29 0x77600000) +set(baseaddress_d3dx9_30 0x775c0000) +set(baseaddress_d3dx9_31 0x77590000) +set(baseaddress_d3dx9_32 0x77560000) +set(baseaddress_d3dx9_33 0x77530000) +set(baseaddress_d3dx9_34 0x77500000) +set(baseaddress_d3dx9_35 0x774d0000) +set(baseaddress_d3dx9_36 0x77370000) +set(baseaddress_d3dx9_37 0x77340000) +set(baseaddress_d3dx9_38 0x77310000) +set(baseaddress_d3dx9_39 0x772e0000) +set(baseaddress_d3dx9_40 0x772b0000) +set(baseaddress_d3dx9_41 0x77280000) +set(baseaddress_d3dx9_42 0x77250000) +set(baseaddress_d3dx9_43 0x77220000) +set(baseaddress_d3dxof 0x771d0000) +set(baseaddress_dciman32 0x771a0000) +set(baseaddress_ddraw 0x770a0000) +set(baseaddress_desk 0x76fe0000) +set(baseaddress_deskadp 0x76fa0000) +set(baseaddress_deskmon 0x76f60000) +set(baseaddress_devcpux 0x76f30000) +set(baseaddress_devenum 0x76ed0000) +set(baseaddress_dinput 0x76e50000) +set(baseaddress_dinput8 0x76e10000) +set(baseaddress_dmusic 0x76da0000) +set(baseaddress_dplay 0x76d70000) +set(baseaddress_dxdiagn 0x76d10000) +set(baseaddress_dxtn 0x76ce0000) +set(baseaddress_esent 0x76ca0000) +set(baseaddress_faultrep 0x76c70000) +set(baseaddress_fltlib 0x76c40000) +set(baseaddress_fmifs 0x76c10000) +set(baseaddress_fontext 0x76be0000) +set(baseaddress_fontsub 0x76bb0000) +set(baseaddress_framebuf 0x76b80000) +set(baseaddress_framebuf_new 0x76b50000) +set(baseaddress_framedyn 0x76b00000) +set(baseaddress_genincdata 0x76ad0000) +set(baseaddress_getuname 0x761c0000) +set(baseaddress_hdwwiz 0x76140000) +set(baseaddress_hhctrl 0x760d0000) +set(baseaddress_hid 0x760a0000) +set(baseaddress_hlink 0x76050000) +set(baseaddress_hnetcfg 0x75ff0000) +set(baseaddress_httpapi 0x75fb0000) +set(baseaddress_iccvid 0x75f70000) +set(baseaddress_ieframe 0x75e30000) +set(baseaddress_iernonce 0x75df0000) +set(baseaddress_imaadp32.acm 0x75db0000) +set(baseaddress_imagehlp 0x75d70000) +set(baseaddress_inetcomm 0x75ce0000) +set(baseaddress_inetcpl 0x75c80000) +set(baseaddress_inetmib1 0x75c40000) +set(baseaddress_initpki 0x75c10000) +set(baseaddress_input 0x75ba0000) +set(baseaddress_inseng 0x75b50000) +set(baseaddress_intl 0x75ad0000) +set(baseaddress_iologmsg 0x75ab0000) +set(baseaddress_itircl 0x75a80000) +set(baseaddress_itss 0x75a20000) +set(baseaddress_joy 0x759e0000) +set(baseaddress_jscript 0x75850000) +set(baseaddress_jsproxy 0x75810000) +set(baseaddress_kbdeo 0x757f0000) +set(baseaddress_kbsdll 0x757c0000) +set(baseaddress_kernel32_vista 0x75790000) +set(baseaddress_ksuser 0x75760000) +set(baseaddress_libjpeg 0x756a0000) +set(baseaddress_libpng 0x755f0000) +set(baseaddress_libtiff 0x75500000) +set(baseaddress_libtirpc 0x75480000) +set(baseaddress_libxslt 0x75100000) +set(baseaddress_loadperf 0x750d0000) +set(baseaddress_localmon 0x75090000) +set(baseaddress_localspl 0x75030000) +set(baseaddress_localspl_apitest 0x75000000) +set(baseaddress_localui 0x74fc0000) +set(baseaddress_lpk 0x74f80000) +set(baseaddress_lsasrv 0x74ef0000) +set(baseaddress_main 0x74e50000) +set(baseaddress_mapi32 0x74df0000) +set(baseaddress_mbedtls 0x74d20000) +set(baseaddress_mciavi32 0x74cd0000) +set(baseaddress_mcicda 0x74c90000) +set(baseaddress_mciqtz32 0x74c40000) +set(baseaddress_mciseq 0x74c00000) +set(baseaddress_mciwave 0x74bc0000) +set(baseaddress_mgmtapi 0x74b90000) +set(baseaddress_midimap 0x74b60000) +set(baseaddress_mlang 0x74b10000) +set(baseaddress_mmdrv 0x74ae0000) +set(baseaddress_mmsys 0x74a00000) +set(baseaddress_modemui 0x74980000) +set(baseaddress_mprapi 0x74940000) +set(baseaddress_msacm32.drv 0x74900000) +set(baseaddress_msadp32.acm 0x748d0000) +set(baseaddress_msafd 0x74880000) +set(baseaddress_mscat32 0x74850000) +set(baseaddress_mscms 0x74810000) +set(baseaddress_mscoree 0x747a0000) +set(baseaddress_msctf 0x74720000) +set(baseaddress_msdmo 0x746e0000) +set(baseaddress_msftedit 0x746b0000) +set(baseaddress_msg711.acm 0x74680000) +set(baseaddress_msgina 0x745d0000) +set(baseaddress_msgsm32.acm 0x745a0000) +set(baseaddress_mshtml 0x740f0000) +set(baseaddress_msi 0x73e70000) +set(baseaddress_msimtf 0x73e30000) +set(baseaddress_msisip 0x73e00000) +set(baseaddress_msisys 0x73dd0000) +set(baseaddress_mspatcha 0x73da0000) +set(baseaddress_msports 0x73d60000) +set(baseaddress_msrle32 0x73d20000) +set(baseaddress_mssign32 0x73cf0000) +set(baseaddress_mssip32 0x73cc0000) +set(baseaddress_mstask 0x73c70000) +set(baseaddress_msv1_0 0x73c40000) +set(baseaddress_msvcrt20 0x73b10000) +set(baseaddress_msvcrt40 0x739d0000) +set(baseaddress_msvcrt_crt_dll_startup 0x739a0000) +set(baseaddress_msvidc32 0x73960000) +set(baseaddress_msxml 0x73920000) +set(baseaddress_msxml2 0x738e0000) +set(baseaddress_msxml3 0x733c0000) +set(baseaddress_msxml4 0x73370000) +set(baseaddress_msxml6 0x73320000) +set(baseaddress_mycomput 0x73300000) +set(baseaddress_ncpa 0x732d0000) +set(baseaddress_nddeapi 0x732a0000) +set(baseaddress_netcfgx 0x73200000) +set(baseaddress_netevent 0x731e0000) +set(baseaddress_netid 0x73190000) +set(baseaddress_netshell 0x730d0000) +set(baseaddress_newdev 0x73060000) +set(baseaddress_nfs41_np 0x73030000) +set(baseaddress_normaliz 0x73000000) +set(baseaddress_notifyhook 0x72fd0000) +set(baseaddress_npptools 0x72fa0000) +set(baseaddress_ntdll_vista 0x72f70000) +set(baseaddress_ntdsapi 0x72f30000) +set(baseaddress_ntlanman 0x72f00000) +set(baseaddress_ntmarta 0x72ed0000) +set(baseaddress_ntobjshex 0x72e00000) +set(baseaddress_objsel 0x72dc0000) +set(baseaddress_odbc32 0x72d70000) +set(baseaddress_odbccp32 0x72d30000) +set(baseaddress_odbccp32i 0x72d00000) +set(baseaddress_oleacc 0x72c50000) +set(baseaddress_olecli32 0x72c10000) +set(baseaddress_olepro32 0x72be0000) +set(baseaddress_olesvr32 0x72bb0000) +set(baseaddress_olethk32 0x72b80000) +set(baseaddress_openglcfg 0x72b40000) +set(baseaddress_pdh 0x72b00000) +set(baseaddress_pidgen 0x72ad0000) +set(baseaddress_pifmgr 0x72a60000) +set(baseaddress_powercfg 0x729f0000) +set(baseaddress_printui 0x729c0000) +set(baseaddress_propsys 0x72970000) +set(baseaddress_pstorec 0x72930000) +set(baseaddress_qedit 0x728c0000) +set(baseaddress_qmgr 0x72870000) +set(baseaddress_qmgrprxy 0x727f0000) +set(baseaddress_quartz 0x725d0000) +set(baseaddress_query 0x725a0000) +set(baseaddress_rasadhlp 0x72570000) +set(baseaddress_rasdlg 0x72390000) +set(baseaddress_rasman 0x72350000) +set(baseaddress_redirtest1 0x72320000) +set(baseaddress_redirtest2 0x722f0000) +set(baseaddress_resutils 0x722b0000) +set(baseaddress_riched32 0x72280000) +set(baseaddress_rsabase 0x72260000) +set(baseaddress_rshell 0x72170000) +set(baseaddress_samsrv 0x720e0000) +set(baseaddress_sccbase 0x720b0000) +set(baseaddress_schannel 0x72060000) +set(baseaddress_schedsvc 0x72020000) +set(baseaddress_scrrun 0x71fb0000) +set(baseaddress_security 0x71f90000) +set(baseaddress_serialui 0x71f60000) +set(baseaddress_sfc 0x71f30000) +set(baseaddress_shdoclc 0x71ef0000) +set(baseaddress_shdocvw 0x71e90000) +set(baseaddress_shellbtrfs 0x71d00000) +set(baseaddress_shfolder 0x71ce0000) +set(baseaddress_shimgvw 0x71c90000) +set(baseaddress_shsvcs 0x71c60000) +set(baseaddress_slbcsp 0x71c30000) +set(baseaddress_sndblst 0x71bf0000) +set(baseaddress_softpub 0x71bd0000) +set(baseaddress_srclient 0x71ba0000) +set(baseaddress_srvsvc 0x71b60000) +set(baseaddress_sti 0x71b10000) +set(baseaddress_stobject 0x71a60000) +set(baseaddress_streamci 0x71a30000) +set(baseaddress_sxs 0x719f0000) +set(baseaddress_sysdm 0x71900000) +set(baseaddress_syssetup 0x71800000) +set(baseaddress_t2embed 0x717d0000) +set(baseaddress_tapi32 0x71780000) +set(baseaddress_tapiui 0x71700000) +set(baseaddress_telephon 0x716d0000) +set(baseaddress_testvdd 0x716a0000) +set(baseaddress_themeui 0x71680000) +set(baseaddress_timedate 0x71600000) +set(baseaddress_traffic 0x715d0000) +set(baseaddress_twain_32 0x71590000) +set(baseaddress_ubtrfs 0x71560000) +set(baseaddress_ucdfs 0x71540000) +set(baseaddress_uext2 0x71500000) +set(baseaddress_ufat 0x714c0000) +set(baseaddress_ufatx 0x71490000) +set(baseaddress_uffs 0x71470000) +set(baseaddress_umpnpmgr 0x71430000) +set(baseaddress_untfs 0x71410000) +set(baseaddress_updspapi 0x713e0000) +set(baseaddress_ureiserfs 0x713c0000) +set(baseaddress_url 0x71390000) +set(baseaddress_usrmgr 0x71330000) +set(baseaddress_vbscript 0x71250000) +set(baseaddress_vdmdbg 0x71220000) +set(baseaddress_verifier 0x711f0000) +set(baseaddress_vfd 0x71180000) +set(baseaddress_vssapi 0x71140000) +set(baseaddress_wbemdisp 0x710e0000) +set(baseaddress_wbemprox 0x71050000) +set(baseaddress_wdmaud.drv 0x70e80000) +set(baseaddress_win32u 0x70e50000) +set(baseaddress_win32u_2k3sp2 0x70e20000) +set(baseaddress_win32u_xpsp2 0x70df0000) +set(baseaddress_windowscodecs 0x70c20000) +set(baseaddress_windowscodecsext 0x70be0000) +set(baseaddress_wined3dcfg 0x70ba0000) +set(baseaddress_winemp3.acm 0x70b00000) +set(baseaddress_winfax 0x70ad0000) +set(baseaddress_wing32 0x70aa0000) +set(baseaddress_winhttp 0x70a20000) +set(baseaddress_winprint 0x709f0000) +set(baseaddress_winscard 0x709b0000) +set(baseaddress_winsta 0x70970000) +set(baseaddress_wkssvc 0x70930000) +set(baseaddress_wlanapi 0x708f0000) +set(baseaddress_wldap32 0x70890000) +set(baseaddress_wmi 0x70870000) +set(baseaddress_wmisvc 0x70840000) +set(baseaddress_wmiutils 0x707f0000) +set(baseaddress_wmvcore 0x70790000) +set(baseaddress_wshirda 0x70760000) +set(baseaddress_wshom 0x70700000) +set(baseaddress_wshtcpip 0x706d0000) +set(baseaddress_wsock32 0x706a0000) +set(baseaddress_wtsapi32 0x70660000) +set(baseaddress_wuapi 0x70610000) +set(baseaddress_xinput1_1 0x705e0000) +set(baseaddress_xinput1_2 0x705b0000) +set(baseaddress_xinput1_3 0x70580000) +set(baseaddress_xinput9_1_0 0x70550000) +set(baseaddress_xmllite 0x704f0000) +set(baseaddress_zipfldr 0x70400000) diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake index fc9d2cd7a1..84a545a276 100644 --- a/sdk/cmake/baseaddress_msvc.cmake +++ b/sdk/cmake/baseaddress_msvc.cmake @@ -4,372 +4,370 @@ set(baseaddress_kernel32 0x7c700000) set(baseaddress_msvcrt 0x7c680000) set(baseaddress_advapi32 0x7c5f0000) set(baseaddress_gdi32 0x7c590000) -set(baseaddress_user32 0x7c480000) -set(baseaddress_dhcpcsvc 0x7c440000) -set(baseaddress_dnsapi 0x7c400000) -set(baseaddress_icmp 0x7c3e0000) -set(baseaddress_iphlpapi 0x7c3a0000) -set(baseaddress_ws2_32 0x7c370000) -set(baseaddress_ws2help 0x7c350000) -set(baseaddress_shlwapi 0x7c2e0000) -set(baseaddress_rpcrt4 0x7c250000) -set(baseaddress_comctl32 0x7c100000) -set(baseaddress_ole32 0x7bfc0000) -set(baseaddress_winspool 0x7bf80000) -set(baseaddress_winmm 0x7bee0000) -set(baseaddress_comdlg32 0x7be00000) -set(baseaddress_shell32 0x7b630000) -set(baseaddress_lz32 0x7b610000) -set(baseaddress_version 0x7b5e0000) -set(baseaddress_oleaut32 0x7b4a0000) -set(baseaddress_setupapi 0x7b370000) -set(baseaddress_mpr 0x7b340000) -set(baseaddress_crypt32 0x7b270000) -set(baseaddress_wininet 0x7b1e0000) -set(baseaddress_urlmon 0x7b130000) -set(baseaddress_psapi 0x7b110000) -set(baseaddress_imm32 0x7b0e0000) -set(baseaddress_msvfw32 0x7b0a0000) -set(baseaddress_dbghelp 0x7b020000) -set(baseaddress_devmgr 0x7af70000) -set(baseaddress_msacm32 0x7af30000) -set(baseaddress_netapi32 0x7aed0000) -set(baseaddress_powrprof 0x7aeb0000) -set(baseaddress_secur32 0x7ae70000) -set(baseaddress_wintrust 0x7ae30000) -set(baseaddress_avicap32 0x7ae10000) -set(baseaddress_cabinet 0x7add0000) -set(baseaddress_dsound 0x7ad70000) -set(baseaddress_glu32 0x7acf0000) -set(baseaddress_opengl32 0x7ab40000) -set(baseaddress_riched20 0x7aab0000) -set(baseaddress_smdll 0x7aa90000) -set(baseaddress_userenv 0x7aa50000) -set(baseaddress_uxtheme 0x7aa00000) -set(baseaddress_cryptui 0x7a970000) -set(baseaddress_csrsrv 0x7a940000) -set(baseaddress_basesrv 0x7a910000) -set(baseaddress_winsrv 0x7a8a0000) -set(baseaddress_dplayx 0x7a850000) -set(baseaddress_gdiplus 0x7a7b0000) -set(baseaddress_msimg32 0x7a790000) -set(baseaddress_mswsock 0x7a770000) -set(baseaddress_oledlg 0x7a730000) -set(baseaddress_rasapi32 0x7a700000) -set(baseaddress_rsaenh 0x7a6b0000) -set(baseaddress_samlib 0x7a680000) -set(baseaddress_sensapi 0x7a660000) -set(baseaddress_sfc_os 0x7a640000) -set(baseaddress_snmpapi 0x7a620000) -set(baseaddress_spoolss 0x7a5f0000) -set(baseaddress_usp10 0x7a590000) -# Extra dlls -set(baseaddress_acgenral 0x7a570000) -set(baseaddress_aclayers 0x7a550000) -set(baseaddress_acledit 0x7a530000) -set(baseaddress_aclui 0x7a500000) -set(baseaddress_acppage 0x7a4c0000) -set(baseaddress_activeds 0x7a4a0000) -set(baseaddress_actxprxy 0x7a320000) -set(baseaddress_advapi32_vista 0x7a300000) -set(baseaddress_advpack 0x7a2d0000) -set(baseaddress_amstream 0x7a2a0000) -set(baseaddress_apphelp 0x7a260000) -set(baseaddress_atl 0x7a230000) -set(baseaddress_atl100 0x7a200000) -set(baseaddress_atl80 0x7a1d0000) -set(baseaddress_authz 0x7a1b0000) -set(baseaddress_avifil32 0x7a150000) -set(baseaddress_batt 0x7a130000) -set(baseaddress_bcrypt 0x7a100000) -set(baseaddress_beepmidi 0x7a0e0000) -set(baseaddress_browseui 0x79fe0000) -set(baseaddress_cards 0x79f20000) -set(baseaddress_cfgmgr32 0x79f00000) -set(baseaddress_clusapi 0x79ed0000) -set(baseaddress_comcat 0x79eb0000) -set(baseaddress_compstui 0x79e90000) -set(baseaddress_console 0x79e40000) -set(baseaddress_credui 0x79e00000) -set(baseaddress_crtdll 0x79dc0000) -set(baseaddress_cryptdlg 0x79d90000) -set(baseaddress_cryptdll 0x79d70000) -set(baseaddress_cryptnet 0x79d40000) -set(baseaddress_custom 0x79d20000) -set(baseaddress_d3d8 0x79ce0000) -set(baseaddress_d3d8thk 0x79cc0000) -set(baseaddress_d3d9 0x79c70000) -set(baseaddress_d3dcompiler_43 0x79be0000) -set(baseaddress_d3drm 0x79b70000) -set(baseaddress_d3dwine 0x799c0000) -set(baseaddress_d3dx9_24 0x799a0000) -set(baseaddress_d3dx9_25 0x79970000) -set(baseaddress_d3dx9_26 0x79950000) -set(baseaddress_d3dx9_27 0x79930000) -set(baseaddress_d3dx9_28 0x79910000) -set(baseaddress_d3dx9_29 0x798f0000) -set(baseaddress_d3dx9_30 0x798d0000) -set(baseaddress_d3dx9_31 0x798b0000) -set(baseaddress_d3dx9_32 0x79890000) -set(baseaddress_d3dx9_33 0x79870000) -set(baseaddress_d3dx9_34 0x79850000) -set(baseaddress_d3dx9_35 0x79830000) -set(baseaddress_d3dx9_36 0x79770000) -set(baseaddress_d3dx9_37 0x79750000) -set(baseaddress_d3dx9_38 0x79730000) -set(baseaddress_d3dx9_39 0x79710000) -set(baseaddress_d3dx9_40 0x796f0000) -set(baseaddress_d3dx9_41 0x796d0000) -set(baseaddress_d3dx9_42 0x796b0000) -set(baseaddress_d3dx9_43 0x79690000) -set(baseaddress_d3dxof 0x79660000) -set(baseaddress_dciman32 0x79640000) -set(baseaddress_ddraw 0x795b0000) -set(baseaddress_deskadp 0x79580000) -set(baseaddress_deskmon 0x79560000) -set(baseaddress_devcpux 0x79540000) -set(baseaddress_devenum 0x79510000) -set(baseaddress_dinput 0x794d0000) -set(baseaddress_dinput8 0x794b0000) -set(baseaddress_dmusic 0x79480000) -set(baseaddress_dplay 0x79460000) -set(baseaddress_dxdiagn 0x79430000) -set(baseaddress_dxtn 0x79410000) -set(baseaddress_esent 0x793e0000) -set(baseaddress_faultrep 0x793c0000) -set(baseaddress_fltlib 0x793a0000) -set(baseaddress_fmifs 0x79380000) -set(baseaddress_fontext 0x79360000) -set(baseaddress_fontsub 0x79340000) -set(baseaddress_framebuf 0x79320000) -set(baseaddress_framebuf_new 0x79300000) -set(baseaddress_framedyn 0x792e0000) -set(baseaddress_genincdata 0x792b0000) -set(baseaddress_getuname 0x789b0000) -set(baseaddress_hid 0x78990000) -set(baseaddress_hlink 0x78960000) -set(baseaddress_hnetcfg 0x78930000) -set(baseaddress_httpapi 0x78910000) -set(baseaddress_iccvid 0x788f0000) -set(baseaddress_ieframe 0x78860000) -set(baseaddress_iernonce 0x78830000) -set(baseaddress_imagehlp 0x78800000) -set(baseaddress_inetcomm 0x787b0000) -set(baseaddress_inetmib1 0x78790000) -set(baseaddress_initpki 0x78770000) -set(baseaddress_input 0x78710000) -set(baseaddress_inseng 0x786e0000) -set(baseaddress_iologmsg 0x786c0000) -set(baseaddress_itircl 0x786a0000) -set(baseaddress_itss 0x78670000) -set(baseaddress_jscript 0x785d0000) -set(baseaddress_jsproxy 0x785b0000) -set(baseaddress_kbdeo 0x78590000) -set(baseaddress_kbsdll 0x78570000) -set(baseaddress_kernel32_vista 0x78550000) -set(baseaddress_ksuser 0x78530000) -set(baseaddress_libjpeg 0x784d0000) -set(baseaddress_libpng 0x78470000) -set(baseaddress_libtiff 0x783d0000) -set(baseaddress_libtirpc 0x78390000) -set(baseaddress_libxslt 0x78250000) -set(baseaddress_loadperf 0x78230000) -set(baseaddress_localmon 0x78210000) -set(baseaddress_localspl 0x781d0000) -set(baseaddress_localspl_apitest 0x781b0000) -set(baseaddress_localui 0x78180000) -set(baseaddress_lpk 0x78150000) -set(baseaddress_lsasrv 0x780f0000) -set(baseaddress_mapi32 0x780c0000) -set(baseaddress_mbedtls 0x78050000) -set(baseaddress_mciavi32 0x78020000) -set(baseaddress_mcicda 0x77ff0000) -set(baseaddress_mciqtz32 0x77fc0000) -set(baseaddress_mciseq 0x77f90000) -set(baseaddress_mciwave 0x77f60000) -set(baseaddress_mgmtapi 0x77f40000) -set(baseaddress_midimap 0x77f20000) -set(baseaddress_mlang 0x77ef0000) -set(baseaddress_mmdrv 0x77ed0000) -set(baseaddress_modemui 0x77e60000) -set(baseaddress_mprapi 0x77e30000) -set(baseaddress_msafd 0x77e00000) -set(baseaddress_mscat32 0x77de0000) -set(baseaddress_mscms 0x77db0000) -set(baseaddress_mscoree 0x77d70000) -set(baseaddress_msctf 0x77d30000) -set(baseaddress_msdmo 0x77d10000) -set(baseaddress_msftedit 0x77cf0000) -set(baseaddress_msgina 0x77c70000) -set(baseaddress_mshtml 0x77ae0000) -set(baseaddress_msi 0x779b0000) -set(baseaddress_msimtf 0x77990000) -set(baseaddress_msisip 0x77970000) -set(baseaddress_mspatcha 0x77950000) -set(baseaddress_msports 0x77920000) -set(baseaddress_msrle32 0x778f0000) -set(baseaddress_mssign32 0x778d0000) -set(baseaddress_mssip32 0x778b0000) -set(baseaddress_mstask 0x77880000) -set(baseaddress_msv1_0 0x77860000) -set(baseaddress_msvcrt20 0x777d0000) -set(baseaddress_msvcrt40 0x77740000) -set(baseaddress_msvcrt_crt_dll_startup 0x77720000) -set(baseaddress_msvidc32 0x77700000) -set(baseaddress_msxml 0x776d0000) -set(baseaddress_msxml2 0x776a0000) -set(baseaddress_msxml3 0x774a0000) -set(baseaddress_msxml4 0x77460000) -set(baseaddress_msxml6 0x77420000) -set(baseaddress_mycomput 0x77400000) -set(baseaddress_nddeapi 0x773e0000) -set(baseaddress_netcfgx 0x77370000) -set(baseaddress_netevent 0x77350000) -set(baseaddress_netid 0x77310000) -set(baseaddress_netshell 0x77290000) -set(baseaddress_newdev 0x77240000) -set(baseaddress_nfs41_np 0x77220000) -set(baseaddress_normaliz 0x77200000) -set(baseaddress_notifyhook 0x771e0000) -set(baseaddress_npptools 0x771c0000) -set(baseaddress_ntdll_vista 0x771a0000) -set(baseaddress_ntdsapi 0x77170000) -set(baseaddress_ntlanman 0x77150000) -set(baseaddress_ntmarta 0x77130000) -set(baseaddress_ntobjshex 0x770d0000) -set(baseaddress_objsel 0x770b0000) -set(baseaddress_odbc32 0x77080000) -set(baseaddress_odbccp32 0x77050000) -set(baseaddress_oleacc 0x77000000) -set(baseaddress_olecli32 0x76fe0000) -set(baseaddress_olepro32 0x76fc0000) -set(baseaddress_olesvr32 0x76fa0000) -set(baseaddress_olethk32 0x76f80000) -set(baseaddress_pdh 0x76f50000) -set(baseaddress_pidgen 0x76f30000) -set(baseaddress_pifmgr 0x76ec0000) -set(baseaddress_printui 0x76ea0000) -set(baseaddress_propsys 0x76e70000) -set(baseaddress_pstorec 0x76e50000) -set(baseaddress_qedit 0x76e20000) -set(baseaddress_qmgr 0x76df0000) -set(baseaddress_qmgrprxy 0x76da0000) -set(baseaddress_quartz 0x76c90000) -set(baseaddress_query 0x76c70000) -set(baseaddress_rasadhlp 0x76c50000) -set(baseaddress_rasdlg 0x76a90000) -set(baseaddress_rasman 0x76a60000) -set(baseaddress_redirtest1 0x76a40000) -set(baseaddress_redirtest2 0x76a20000) -set(baseaddress_resutils 0x76a00000) -set(baseaddress_riched32 0x769e0000) -set(baseaddress_rsabase 0x769c0000) -set(baseaddress_rshell 0x76960000) -set(baseaddress_samsrv 0x76900000) -set(baseaddress_sccbase 0x768e0000) -set(baseaddress_schannel 0x768b0000) -set(baseaddress_schedsvc 0x76890000) -set(baseaddress_scrrun 0x76850000) -set(baseaddress_security 0x76830000) -set(baseaddress_serialui 0x76810000) -set(baseaddress_sfc 0x767f0000) -set(baseaddress_shdoclc 0x767b0000) -set(baseaddress_shdocvw 0x76770000) -set(baseaddress_shellbtrfs 0x766e0000) -set(baseaddress_shfolder 0x766c0000) -set(baseaddress_shimgvw 0x76680000) -set(baseaddress_shsvcs 0x76660000) -set(baseaddress_slbcsp 0x76640000) -set(baseaddress_sndblst 0x76610000) -set(baseaddress_softpub 0x765f0000) -set(baseaddress_srclient 0x765d0000) -set(baseaddress_srvsvc 0x765a0000) -set(baseaddress_sti 0x76570000) -set(baseaddress_stobject 0x76510000) -set(baseaddress_streamci 0x764f0000) -set(baseaddress_sxs 0x764d0000) -set(baseaddress_syssetup 0x763f0000) -set(baseaddress_t2embed 0x763d0000) -set(baseaddress_tapi32 0x763a0000) -set(baseaddress_tapiui 0x76320000) -set(baseaddress_testvdd 0x76300000) -set(baseaddress_themeui 0x762e0000) -set(baseaddress_traffic 0x762c0000) -set(baseaddress_twain_32 0x762a0000) -set(baseaddress_ubtrfs 0x76280000) -set(baseaddress_ucdfs 0x76260000) -set(baseaddress_uext2 0x76230000) -set(baseaddress_ufat 0x76200000) -set(baseaddress_ufatx 0x761e0000) -set(baseaddress_uffs 0x761c0000) -set(baseaddress_umpnpmgr 0x76190000) -set(baseaddress_untfs 0x76170000) -set(baseaddress_updspapi 0x76150000) -set(baseaddress_ureiserfs 0x76130000) -set(baseaddress_url 0x76110000) -set(baseaddress_vbscript 0x760a0000) -set(baseaddress_vdmdbg 0x76080000) -set(baseaddress_verifier 0x76060000) -set(baseaddress_vfd 0x76020000) -set(baseaddress_vssapi 0x75ff0000) -set(baseaddress_wbemdisp 0x75fc0000) -set(baseaddress_wbemprox 0x75f80000) -set(baseaddress_win32u 0x75f60000) -set(baseaddress_win32u_2k3sp2 0x75f40000) -set(baseaddress_win32u_xpsp2 0x75f20000) -set(baseaddress_windowscodecs 0x75e50000) -set(baseaddress_windowscodecsext 0x75e30000) -set(baseaddress_winfax 0x75e10000) -set(baseaddress_wing32 0x75df0000) -set(baseaddress_winhttp 0x75db0000) -set(baseaddress_winprint 0x75d90000) -set(baseaddress_winscard 0x75d70000) -set(baseaddress_winsta 0x75d40000) -set(baseaddress_wkssvc 0x75d20000) -set(baseaddress_wlanapi 0x75d00000) -set(baseaddress_wldap32 0x75cd0000) -set(baseaddress_wmi 0x75cb0000) -set(baseaddress_wmisvc 0x75c90000) -set(baseaddress_wmiutils 0x75c60000) -set(baseaddress_wmvcore 0x75c30000) -set(baseaddress_wshirda 0x75c10000) -set(baseaddress_wshtcpip 0x75bf0000) -set(baseaddress_wsock32 0x75bd0000) -set(baseaddress_wtsapi32 0x75bb0000) -set(baseaddress_wuapi 0x75b80000) -set(baseaddress_xinput1_1 0x75b60000) -set(baseaddress_xinput1_2 0x75b40000) -set(baseaddress_xinput1_3 0x75b20000) -set(baseaddress_xinput9_1_0 0x75b00000) -set(baseaddress_xmllite 0x75ad0000) -set(baseaddress_zipfldr 0x75a80000) -# Extra files -set(baseaddress_access 0x75a00000) -set(baseaddress_appwiz 0x75990000) -set(baseaddress_cmicpl 0x75960000) -set(baseaddress_desk 0x758d0000) -set(baseaddress_hdwwiz 0x75860000) -set(baseaddress_hhctrl 0x75820000) -set(baseaddress_imaadp32.acm 0x75800000) -set(baseaddress_inetcpl 0x757b0000) -set(baseaddress_intl 0x75750000) -set(baseaddress_joy 0x75710000) -set(baseaddress_main 0x75690000) -set(baseaddress_mmsys 0x755c0000) -set(baseaddress_msacm32.drv 0x75590000) -set(baseaddress_msadp32.acm 0x75570000) -set(baseaddress_msg711.acm 0x75550000) -set(baseaddress_msgsm32.acm 0x75530000) -set(baseaddress_msisys 0x75510000) -set(baseaddress_ncpa 0x754f0000) -set(baseaddress_odbccp32i 0x754d0000) -set(baseaddress_openglcfg 0x754a0000) -set(baseaddress_powercfg 0x75440000) -set(baseaddress_sysdm 0x75370000) -set(baseaddress_telephon 0x75350000) -set(baseaddress_timedate 0x752e0000) -set(baseaddress_usrmgr 0x75290000) -set(baseaddress_wdmaud.drv 0x75100000) -set(baseaddress_wined3dcfg 0x750d0000) -set(baseaddress_winemp3.acm 0x75060000) -set(baseaddress_wshom 0x75030000) +set(baseaddress_user32 0x77a20000) # reserved +set(baseaddress_dhcpcsvc 0x7c550000) +set(baseaddress_dnsapi 0x7c510000) +set(baseaddress_icmp 0x7c4f0000) +set(baseaddress_iphlpapi 0x7c4b0000) +set(baseaddress_ws2_32 0x7c480000) +set(baseaddress_ws2help 0x7c460000) +set(baseaddress_shlwapi 0x7c3f0000) +set(baseaddress_rpcrt4 0x7c360000) +set(baseaddress_comctl32 0x7c210000) +set(baseaddress_ole32 0x7c0d0000) +set(baseaddress_winspool 0x7c090000) +set(baseaddress_winmm 0x7bff0000) +set(baseaddress_comdlg32 0x7bf10000) +set(baseaddress_shell32 0x7b740000) +set(baseaddress_lz32 0x7b720000) +set(baseaddress_version 0x7b6f0000) +set(baseaddress_oleaut32 0x7b5b0000) +set(baseaddress_setupapi 0x7b480000) +set(baseaddress_mpr 0x7b450000) +set(baseaddress_crypt32 0x7b380000) +set(baseaddress_wininet 0x7b2f0000) +set(baseaddress_urlmon 0x7b240000) +set(baseaddress_psapi 0x7b220000) +set(baseaddress_imm32 0x7b1f0000) +set(baseaddress_msvfw32 0x7b1b0000) +set(baseaddress_dbghelp 0x7b130000) +set(baseaddress_devmgr 0x7b080000) +set(baseaddress_msacm32 0x7b040000) +set(baseaddress_netapi32 0x7afe0000) +set(baseaddress_powrprof 0x7afc0000) +set(baseaddress_secur32 0x7af80000) +set(baseaddress_wintrust 0x7af40000) +set(baseaddress_avicap32 0x7af20000) +set(baseaddress_cabinet 0x7aee0000) +set(baseaddress_dsound 0x7ae80000) +set(baseaddress_glu32 0x7ae00000) +set(baseaddress_opengl32 0x7ac50000) +set(baseaddress_riched20 0x7abc0000) +set(baseaddress_smdll 0x7aba0000) +set(baseaddress_userenv 0x7ab60000) +set(baseaddress_uxtheme 0x7ab10000) +set(baseaddress_cryptui 0x7aa80000) +set(baseaddress_csrsrv 0x7aa50000) +set(baseaddress_basesrv 0x7aa20000) +set(baseaddress_winsrv 0x7a9b0000) +set(baseaddress_dplayx 0x7a960000) +set(baseaddress_gdiplus 0x7a8c0000) +set(baseaddress_msimg32 0x7a8a0000) +set(baseaddress_mswsock 0x7a880000) +set(baseaddress_oledlg 0x7a840000) +set(baseaddress_rasapi32 0x7a810000) +set(baseaddress_rsaenh 0x7a7c0000) +set(baseaddress_samlib 0x7a790000) +set(baseaddress_sensapi 0x7a770000) +set(baseaddress_sfc_os 0x7a750000) +set(baseaddress_snmpapi 0x7a730000) +set(baseaddress_spoolss 0x7a700000) +set(baseaddress_usp10 0x7a6a0000) +set(baseaddress_access 0x7a620000) +set(baseaddress_acgenral 0x7a600000) +set(baseaddress_aclayers 0x7a5e0000) +set(baseaddress_acledit 0x7a5c0000) +set(baseaddress_aclui 0x7a590000) +set(baseaddress_acppage 0x7a550000) +set(baseaddress_activeds 0x7a530000) +set(baseaddress_actxprxy 0x7a3b0000) +set(baseaddress_advapi32_vista 0x7a390000) +set(baseaddress_advpack 0x7a360000) +set(baseaddress_amstream 0x7a330000) +set(baseaddress_apphelp 0x7a2f0000) +set(baseaddress_appwiz 0x7a280000) +set(baseaddress_atl 0x7a250000) +set(baseaddress_atl100 0x7a220000) +set(baseaddress_atl80 0x7a1f0000) +set(baseaddress_authz 0x7a1d0000) +set(baseaddress_avifil32 0x7a170000) +set(baseaddress_batt 0x7a150000) +set(baseaddress_bcrypt 0x7a120000) +set(baseaddress_beepmidi 0x7a100000) +set(baseaddress_browseui 0x7a000000) +set(baseaddress_cards 0x79f40000) +set(baseaddress_cfgmgr32 0x79f20000) +set(baseaddress_clusapi 0x79ef0000) +set(baseaddress_cmicpl 0x79ec0000) +set(baseaddress_comcat 0x79ea0000) +set(baseaddress_compstui 0x79e80000) +set(baseaddress_console 0x79e30000) +set(baseaddress_credui 0x79df0000) +set(baseaddress_crtdll 0x79db0000) +set(baseaddress_cryptdlg 0x79d80000) +set(baseaddress_cryptdll 0x79d60000) +set(baseaddress_cryptnet 0x79d30000) +set(baseaddress_custom 0x79d10000) +set(baseaddress_d3d8 0x79cd0000) +set(baseaddress_d3d8thk 0x79cb0000) +set(baseaddress_d3d9 0x79c60000) +set(baseaddress_d3dcompiler_43 0x79bd0000) +set(baseaddress_d3drm 0x79b60000) +set(baseaddress_d3dwine 0x799b0000) +set(baseaddress_d3dx9_24 0x79990000) +set(baseaddress_d3dx9_25 0x79960000) +set(baseaddress_d3dx9_26 0x79940000) +set(baseaddress_d3dx9_27 0x79920000) +set(baseaddress_d3dx9_28 0x79900000) +set(baseaddress_d3dx9_29 0x798e0000) +set(baseaddress_d3dx9_30 0x798c0000) +set(baseaddress_d3dx9_31 0x798a0000) +set(baseaddress_d3dx9_32 0x79880000) +set(baseaddress_d3dx9_33 0x79860000) +set(baseaddress_d3dx9_34 0x79840000) +set(baseaddress_d3dx9_35 0x79820000) +set(baseaddress_d3dx9_36 0x79760000) +set(baseaddress_d3dx9_37 0x79740000) +set(baseaddress_d3dx9_38 0x79720000) +set(baseaddress_d3dx9_39 0x79700000) +set(baseaddress_d3dx9_40 0x796e0000) +set(baseaddress_d3dx9_41 0x796c0000) +set(baseaddress_d3dx9_42 0x796a0000) +set(baseaddress_d3dx9_43 0x79680000) +set(baseaddress_d3dxof 0x79650000) +set(baseaddress_dciman32 0x79630000) +set(baseaddress_ddraw 0x795a0000) +set(baseaddress_desk 0x79510000) +set(baseaddress_deskadp 0x794e0000) +set(baseaddress_deskmon 0x794c0000) +set(baseaddress_devcpux 0x794a0000) +set(baseaddress_devenum 0x79470000) +set(baseaddress_dinput 0x79430000) +set(baseaddress_dinput8 0x79410000) +set(baseaddress_dmusic 0x793e0000) +set(baseaddress_dplay 0x793c0000) +set(baseaddress_dxdiagn 0x79390000) +set(baseaddress_dxtn 0x79370000) +set(baseaddress_esent 0x79340000) +set(baseaddress_faultrep 0x79320000) +set(baseaddress_fltlib 0x79300000) +set(baseaddress_fmifs 0x792e0000) +set(baseaddress_fontext 0x792c0000) +set(baseaddress_fontsub 0x792a0000) +set(baseaddress_framebuf 0x79280000) +set(baseaddress_framebuf_new 0x79260000) +set(baseaddress_framedyn 0x79240000) +set(baseaddress_genincdata 0x79210000) +set(baseaddress_getuname 0x78910000) +set(baseaddress_hdwwiz 0x788a0000) +set(baseaddress_hhctrl 0x78860000) +set(baseaddress_hid 0x78840000) +set(baseaddress_hlink 0x78810000) +set(baseaddress_hnetcfg 0x787e0000) +set(baseaddress_httpapi 0x787c0000) +set(baseaddress_iccvid 0x787a0000) +set(baseaddress_ieframe 0x78710000) +set(baseaddress_iernonce 0x786e0000) +set(baseaddress_imaadp32.acm 0x786c0000) +set(baseaddress_imagehlp 0x78690000) +set(baseaddress_inetcomm 0x78640000) +set(baseaddress_inetcpl 0x785f0000) +set(baseaddress_inetmib1 0x785d0000) +set(baseaddress_initpki 0x785b0000) +set(baseaddress_input 0x78550000) +set(baseaddress_inseng 0x78520000) +set(baseaddress_intl 0x784c0000) +set(baseaddress_iologmsg 0x784a0000) +set(baseaddress_itircl 0x78480000) +set(baseaddress_itss 0x78450000) +set(baseaddress_joy 0x78410000) +set(baseaddress_jscript 0x78370000) +set(baseaddress_jsproxy 0x78350000) +set(baseaddress_kbdeo 0x78330000) +set(baseaddress_kbsdll 0x78310000) +set(baseaddress_kernel32_vista 0x782f0000) +set(baseaddress_ksuser 0x782d0000) +set(baseaddress_libjpeg 0x78270000) +set(baseaddress_libpng 0x78210000) +set(baseaddress_libtiff 0x78170000) +set(baseaddress_libtirpc 0x78130000) +set(baseaddress_libxslt 0x77ff0000) +set(baseaddress_loadperf 0x77fd0000) +set(baseaddress_localmon 0x77fb0000) +set(baseaddress_localspl 0x77f70000) +set(baseaddress_localspl_apitest 0x77f50000) +set(baseaddress_localui 0x77f20000) +set(baseaddress_lpk 0x77ef0000) +set(baseaddress_lsasrv 0x77e90000) +set(baseaddress_main 0x77e10000) +set(baseaddress_mapi32 0x77de0000) +set(baseaddress_mbedtls 0x77d70000) +set(baseaddress_mciavi32 0x77d40000) +set(baseaddress_mcicda 0x77d10000) +set(baseaddress_mciqtz32 0x77ce0000) +set(baseaddress_mciseq 0x77cb0000) +set(baseaddress_mciwave 0x77c80000) +set(baseaddress_mgmtapi 0x77c60000) +set(baseaddress_midimap 0x77c40000) +set(baseaddress_mlang 0x77c10000) +set(baseaddress_mmdrv 0x77bf0000) +set(baseaddress_mmsys 0x77b20000) +set(baseaddress_modemui 0x779b0000) +set(baseaddress_mprapi 0x77980000) +set(baseaddress_msacm32.drv 0x77950000) +set(baseaddress_msadp32.acm 0x77930000) +set(baseaddress_msafd 0x77900000) +set(baseaddress_mscat32 0x778e0000) +set(baseaddress_mscms 0x778b0000) +set(baseaddress_mscoree 0x77870000) +set(baseaddress_msctf 0x77830000) +set(baseaddress_msdmo 0x77810000) +set(baseaddress_msftedit 0x777f0000) +set(baseaddress_msg711.acm 0x777d0000) +set(baseaddress_msgina 0x77750000) +set(baseaddress_msgsm32.acm 0x77730000) +set(baseaddress_mshtml 0x775a0000) +set(baseaddress_msi 0x77470000) +set(baseaddress_msimtf 0x77450000) +set(baseaddress_msisip 0x77430000) +set(baseaddress_msisys 0x77410000) +set(baseaddress_mspatcha 0x773f0000) +set(baseaddress_msports 0x773c0000) +set(baseaddress_msrle32 0x77390000) +set(baseaddress_mssign32 0x77370000) +set(baseaddress_mssip32 0x77350000) +set(baseaddress_mstask 0x77320000) +set(baseaddress_msv1_0 0x77300000) +set(baseaddress_msvcrt20 0x77270000) +set(baseaddress_msvcrt40 0x771e0000) +set(baseaddress_msvcrt_crt_dll_startup 0x771c0000) +set(baseaddress_msvidc32 0x771a0000) +set(baseaddress_msxml 0x77170000) +set(baseaddress_msxml2 0x77140000) +set(baseaddress_msxml3 0x76f40000) +set(baseaddress_msxml4 0x76f00000) +set(baseaddress_msxml6 0x76ec0000) +set(baseaddress_mycomput 0x76ea0000) +set(baseaddress_ncpa 0x76e80000) +set(baseaddress_nddeapi 0x76e60000) +set(baseaddress_netcfgx 0x76df0000) +set(baseaddress_netevent 0x76dd0000) +set(baseaddress_netid 0x76d90000) +set(baseaddress_netshell 0x76d10000) +set(baseaddress_newdev 0x76cc0000) +set(baseaddress_nfs41_np 0x76ca0000) +set(baseaddress_normaliz 0x76c80000) +set(baseaddress_notifyhook 0x76c60000) +set(baseaddress_npptools 0x76c40000) +set(baseaddress_ntdll_vista 0x76c20000) +set(baseaddress_ntdsapi 0x76bf0000) +set(baseaddress_ntlanman 0x76bd0000) +set(baseaddress_ntmarta 0x76bb0000) +set(baseaddress_ntobjshex 0x76b50000) +set(baseaddress_objsel 0x76b30000) +set(baseaddress_odbc32 0x76b00000) +set(baseaddress_odbccp32 0x76ad0000) +set(baseaddress_odbccp32i 0x76ab0000) +set(baseaddress_oleacc 0x76a60000) +set(baseaddress_olecli32 0x76a40000) +set(baseaddress_olepro32 0x76a20000) +set(baseaddress_olesvr32 0x76a00000) +set(baseaddress_olethk32 0x769e0000) +set(baseaddress_openglcfg 0x769b0000) +set(baseaddress_pdh 0x76980000) +set(baseaddress_pidgen 0x76960000) +set(baseaddress_pifmgr 0x768f0000) +set(baseaddress_powercfg 0x76890000) +set(baseaddress_printui 0x76870000) +set(baseaddress_propsys 0x76840000) +set(baseaddress_pstorec 0x76820000) +set(baseaddress_qedit 0x767f0000) +set(baseaddress_qmgr 0x767c0000) +set(baseaddress_qmgrprxy 0x76770000) +set(baseaddress_quartz 0x76660000) +set(baseaddress_query 0x76640000) +set(baseaddress_rasadhlp 0x76620000) +set(baseaddress_rasdlg 0x76460000) +set(baseaddress_rasman 0x76430000) +set(baseaddress_redirtest1 0x76410000) +set(baseaddress_redirtest2 0x763f0000) +set(baseaddress_resutils 0x763d0000) +set(baseaddress_riched32 0x763b0000) +set(baseaddress_rsabase 0x76390000) +set(baseaddress_rshell 0x76330000) +set(baseaddress_samsrv 0x762d0000) +set(baseaddress_sccbase 0x762b0000) +set(baseaddress_schannel 0x76280000) +set(baseaddress_schedsvc 0x76260000) +set(baseaddress_scrrun 0x76220000) +set(baseaddress_security 0x76200000) +set(baseaddress_serialui 0x761e0000) +set(baseaddress_sfc 0x761c0000) +set(baseaddress_shdoclc 0x76180000) +set(baseaddress_shdocvw 0x76140000) +set(baseaddress_shellbtrfs 0x760b0000) +set(baseaddress_shfolder 0x76090000) +set(baseaddress_shimgvw 0x76050000) +set(baseaddress_shsvcs 0x76030000) +set(baseaddress_slbcsp 0x76010000) +set(baseaddress_sndblst 0x75fe0000) +set(baseaddress_softpub 0x75fc0000) +set(baseaddress_srclient 0x75fa0000) +set(baseaddress_srvsvc 0x75f70000) +set(baseaddress_sti 0x75f40000) +set(baseaddress_stobject 0x75ee0000) +set(baseaddress_streamci 0x75ec0000) +set(baseaddress_sxs 0x75ea0000) +set(baseaddress_sysdm 0x75dd0000) +set(baseaddress_syssetup 0x75cf0000) +set(baseaddress_t2embed 0x75cd0000) +set(baseaddress_tapi32 0x75ca0000) +set(baseaddress_tapiui 0x75c20000) +set(baseaddress_telephon 0x75c00000) +set(baseaddress_testvdd 0x75be0000) +set(baseaddress_themeui 0x75bc0000) +set(baseaddress_timedate 0x75b50000) +set(baseaddress_traffic 0x75b30000) +set(baseaddress_twain_32 0x75b10000) +set(baseaddress_ubtrfs 0x75af0000) +set(baseaddress_ucdfs 0x75ad0000) +set(baseaddress_uext2 0x75aa0000) +set(baseaddress_ufat 0x75a70000) +set(baseaddress_ufatx 0x75a50000) +set(baseaddress_uffs 0x75a30000) +set(baseaddress_umpnpmgr 0x75a00000) +set(baseaddress_untfs 0x759e0000) +set(baseaddress_updspapi 0x759c0000) +set(baseaddress_ureiserfs 0x759a0000) +set(baseaddress_url 0x75980000) +set(baseaddress_usrmgr 0x75930000) +set(baseaddress_vbscript 0x758c0000) +set(baseaddress_vdmdbg 0x758a0000) +set(baseaddress_verifier 0x75880000) +set(baseaddress_vfd 0x75840000) +set(baseaddress_vssapi 0x75810000) +set(baseaddress_wbemdisp 0x757e0000) +set(baseaddress_wbemprox 0x757a0000) +set(baseaddress_wdmaud.drv 0x75610000) +set(baseaddress_win32u 0x755f0000) +set(baseaddress_win32u_2k3sp2 0x755d0000) +set(baseaddress_win32u_xpsp2 0x755b0000) +set(baseaddress_windowscodecs 0x754e0000) +set(baseaddress_windowscodecsext 0x754c0000) +set(baseaddress_wined3dcfg 0x75490000) +set(baseaddress_winemp3.acm 0x75420000) +set(baseaddress_winfax 0x75400000) +set(baseaddress_wing32 0x753e0000) +set(baseaddress_winhttp 0x753a0000) +set(baseaddress_winprint 0x75380000) +set(baseaddress_winscard 0x75360000) +set(baseaddress_winsta 0x75330000) +set(baseaddress_wkssvc 0x75310000) +set(baseaddress_wlanapi 0x752f0000) +set(baseaddress_wldap32 0x752c0000) +set(baseaddress_wmi 0x752a0000) +set(baseaddress_wmisvc 0x75280000) +set(baseaddress_wmiutils 0x75250000) +set(baseaddress_wmvcore 0x75220000) +set(baseaddress_wshirda 0x75200000) +set(baseaddress_wshom 0x751d0000) +set(baseaddress_wshtcpip 0x751b0000) +set(baseaddress_wsock32 0x75190000) +set(baseaddress_wtsapi32 0x75170000) +set(baseaddress_wuapi 0x75140000) +set(baseaddress_xinput1_1 0x75120000) +set(baseaddress_xinput1_2 0x75100000) +set(baseaddress_xinput1_3 0x750e0000) +set(baseaddress_xinput9_1_0 0x750c0000) +set(baseaddress_xmllite 0x75090000) +set(baseaddress_zipfldr 0x75040000)

1 0

01/02: [SDK] Update gen_baseaddress.py for reserved base addresses. CORE-11382
by Mark Jansen 12 Jul '18

12 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b92dd732348fdb82aa0d… commit 6b92dd732348fdb82aa0d73611c0e2d30708daa7 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Jul 2 22:32:03 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Jul 12 21:55:21 2018 +0200 [SDK] Update gen_baseaddress.py for reserved base addresses. CORE-11382 --- sdk/tools/gen_baseaddress.py | 152 ++++++++++++++++++++++++++++++------------- 1 file changed, 106 insertions(+), 46 deletions(-) diff --git a/sdk/tools/gen_baseaddress.py b/sdk/tools/gen_baseaddress.py index 204cfe23f2..3d8605b7a8 100644 --- a/sdk/tools/gen_baseaddress.py +++ b/sdk/tools/gen_baseaddress.py @@ -5,11 +5,10 @@ PURPOSE: Update baseaddresses of all modules COPYRIGHT: Copyright 2017,2018 Mark Jansen (mark.jansen(a)reactos.org) ''' -# FIXME: user32 always at 0x77a20000 - import os import struct import sys + try: import pefile except ImportError: @@ -17,12 +16,8 @@ except ImportError: print '# Using fallback' print -DLL_EXTENSIONS = ( - '.dll' -) - -OTHER_EXTENSIONS = ( - '.acm', '.ax', '.cpl', '.drv', '.ocx' +ALL_EXTENSIONS = ( + '.dll', '.acm', '.ax', '.cpl', '.drv', '.ocx' ) PRIORITIES = ( @@ -221,50 +216,115 @@ def size_of_image(filename): return pefile.PE(filename, fast_load=True).OPTIONAL_HEADER.SizeOfImage return size_of_image_fallback(filename) -def onefile(current_address, filename, size): - name, ext = os.path.splitext(filename) - postfix = '' - if ext in('.acm', '.drv') and filename != 'winspool.drv': - name = filename - if current_address == 0: - current_address = 0x7c920000 - postfix = ' # should be above 0x%08x' % current_address - else: - current_address = (current_address - size - 0x2000 - 0xffff) & 0xffff0000 - print 'set(baseaddress_%-30s 0x%08x)%s' % (name, current_address, postfix) - return current_address + +class Module(object): + def __init__(self, name, address, size): + self._name = name + self.address = address + self.size = size + self._reserved = address != 0 + + def gen_baseaddress(self): + name, ext = os.path.splitext(self._name) + postfix = '' + if ext in('.acm', '.drv') and self._name != 'winspool.drv': + name = self._name + if name == 'ntdll': + postfix = ' # should be above 0x%08x' % self.address + elif self._reserved: + postfix = ' # reserved' + print 'set(baseaddress_%-30s 0x%08x)%s' % (name, self.address, postfix) + + def end(self): + return self.address + self.size + + def __repr__(self): + return '%s (0x%08x - 0x%08x)' % (self._name, self.address, self.end()) + +class MemoryLayout(object): + def __init__(self, startaddress): + self.addresses = [] + self.found = {} + self.reserved = {} + self.initial = startaddress + self.start_at = 0 + self.module_padding = 0x2000 + + def add_reserved(self, name, address): + self.reserved[name] = (address, 0) + + def add(self, filename, name): + size = size_of_image(filename) + addr = 0 + if name in self.found: + return # Assume duplicate files (rshell, ...) are 1:1 copies + if name in self.reserved: + addr = self.reserved[name][0] + self.reserved[name] = (addr, size) + self.found[name] = Module(name, addr, size) + + def _next_address(self, size): + if self.start_at: + addr = (self.start_at - size - self.module_padding - 0xffff) & 0xffff0000 + self.start_at = addr + else: + addr = self.start_at = self.initial + return addr + + def next_address(self, size): + while True: + current_start = self._next_address(size) + current_end = current_start + size + self.module_padding + # Is there overlap with reserved modules? + for key, reserved in self.reserved.iteritems(): + res_start = reserved[0] + res_end = res_start + reserved[1] + self.module_padding + if (res_start <= current_start <= res_end) or \ + (res_start <= current_end <= res_end) or \ + (current_start < res_start and current_end > res_end): + # We passed this reserved item, we can remove it now + self.start_at = min(res_start, current_start) + del self.reserved[key] + current_start = 0 + break + # No overlap with a reserved module? + if current_start: + return current_start + + def update(self, priorities): + # sort addresses, should only contain reserved modules at this point! + for key, reserved in self.reserved.iteritems(): + assert reserved[1] != 0, key + for curr in priorities: + if not curr in self.found: + print '# Did not find', curr, '!' + else: + obj = self.found[curr] + del self.found[curr] + if not obj.address: + obj.address = self.next_address(obj.size) + self.addresses.append(obj) + # We handled all known modules now, run over the rest we found + for key in sorted(self.found): + obj = self.found[key] + obj.address = self.next_address(obj.size) + self.addresses.append(obj) + + def gen_baseaddress(self): + for obj in self.addresses: + obj.gen_baseaddress() def run_dir(target): print '# Generated from', target print '# Generated by sdk/tools/gen_baseaddress.py' - found_dlls = {} - found_files = {} + layout = MemoryLayout(0x7c920000) + layout.add_reserved('user32.dll', 0x77a20000) for root, _, files in os.walk(target): - for dll in [filename for filename in files if filename.endswith(DLL_EXTENSIONS)]: + for dll in [filename for filename in files if filename.endswith(ALL_EXTENSIONS)]: if not dll in EXCLUDE and not dll.startswith('api-ms-win-'): - found_dlls[dll] = size_of_image(os.path.join(root, dll)) - extrafiles = [filename for filename in files if filename.endswith(OTHER_EXTENSIONS)] - for extrafile in extrafiles: - if not extrafile in EXCLUDE: - found_files[extrafile] = size_of_image(os.path.join(root, extrafile)) - - current_address = 0 - for curr in PRIORITIES: - if curr in found_dlls: - current_address = onefile(current_address, curr, found_dlls[curr]) - del found_dlls[curr] - elif curr in found_files: - current_address = onefile(current_address, curr, found_files[curr]) - del found_files[curr] - else: - print '# Did not find', curr, '!' - - print '# Extra dlls' - for curr in sorted(found_dlls): - current_address = onefile(current_address, curr, found_dlls[curr]) - print '# Extra files' - for curr in sorted(found_files): - current_address = onefile(current_address, curr, found_files[curr]) + layout.add(os.path.join(root, dll), dll) + layout.update(PRIORITIES) + layout.gen_baseaddress() def main(dirs): if len(dirs) < 1:

1 0

01/01: [TRANSLATIONS][DISPLAY] Translate to spanish some strings on the display (#667)
by Julio Carchi 12 Jul '18

12 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5943bbb8b434a7c336d6c… commit 5943bbb8b434a7c336d6ceb7c11a8311f3bf420b Author: Julio Carchi <contacto(a)julcar.info.tm> AuthorDate: Thu Jul 12 10:48:57 2018 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jul 12 17:48:57 2018 +0200 [TRANSLATIONS][DISPLAY] Translate to spanish some strings on the display (#667) CORE-14767 --- dll/cpl/desk/lang/es-ES.rc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dll/cpl/desk/lang/es-ES.rc b/dll/cpl/desk/lang/es-ES.rc index 25f2c9e44a..3229eeda2d 100644 --- a/dll/cpl/desk/lang/es-ES.rc +++ b/dll/cpl/desk/lang/es-ES.rc @@ -1,4 +1,11 @@ -/* Spanish translation by Patricio Martínez Ros, Javier Remacha */ +/* + * PROJECT: ReactOS display control panel + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Spanish locale file + * COPYRIGHT: Patricio Martínez Ros + * Javier Remacha + * Julio Carchi Ruiz + */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -156,12 +163,12 @@ END IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Display Settings" +CAPTION "Configuración de pantalla" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "¿Desea mantener ésta configuración de pantalla?", IDC_STATIC, 7, 7, 219, 8 LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 - PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 + PUSHBUTTON "&Sí", IDYES, 121, 36, 50, 14 DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 END @@ -269,5 +276,5 @@ BEGIN IDS_DISPLAY_SETTINGS "Configuración del monitor" IDS_APPLY_FAILED "Error al aplicar la nueva configuración..." IDS_APPLY_NEEDS_RESTART "Necesita reiniciar el equipo para aplicar los cambios." - IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." + IDS_TIMEOUTTEXT "Regresar a la última configuraciín en %d segundos." END

1 0

01/01: [SHELL32] lpDirectory must have priority in ShellExecuteEx (#681)
by Katayama Hirofumi MZ 12 Jul '18

12 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e018ccea4b1c7186e1ff9… commit e018ccea4b1c7186e1ff93d457ae8e57760b1194 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 13 00:45:43 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jul 12 17:45:43 2018 +0200 [SHELL32] lpDirectory must have priority in ShellExecuteEx (#681) Based on a patch by Mark Jansen. CORE-14469 --- dll/win32/shell32/shlexec.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index e8885f6fa1..478a3c20b4 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -179,7 +179,7 @@ static void ParseTildeEffect(PWSTR &res, LPCWSTR &args, DWORD &len, DWORD &used, * - use rules from here http://www.autohotkey.net/~deleyd/parameters/parameters.htm */ -static BOOL SHELL_ArgifyW(WCHAR* out, DWORD len, const WCHAR* fmt, const WCHAR* lpFile, LPITEMIDLIST pidl, LPCWSTR args, DWORD* out_len) +static BOOL SHELL_ArgifyW(WCHAR* out, DWORD len, const WCHAR* fmt, const WCHAR* lpFile, LPITEMIDLIST pidl, LPCWSTR args, DWORD* out_len, const WCHAR* lpDir) { WCHAR xlpFile[1024]; BOOL done = FALSE; @@ -266,7 +266,7 @@ static BOOL SHELL_ArgifyW(WCHAR* out, DWORD len, const WCHAR* fmt, const WCHAR* if (!done || (*fmt == '1')) { /*FIXME Is the call to SearchPathW() really needed? We already have separated out the parameter string in args. */ - if (SearchPathW(NULL, lpFile, wszExe, sizeof(xlpFile) / sizeof(WCHAR), xlpFile, NULL)) + if (SearchPathW(lpDir, lpFile, wszExe, sizeof(xlpFile) / sizeof(WCHAR), xlpFile, NULL)) cmd = xlpFile; else cmd = lpFile; @@ -829,7 +829,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, if (retval > 32) { DWORD finishedLen; - SHELL_ArgifyW(lpResult, resultLen, command, xlpFile, pidl, args, &finishedLen); + SHELL_ArgifyW(lpResult, resultLen, command, xlpFile, pidl, args, &finishedLen, lpPath); if (finishedLen > resultLen) ERR("Argify buffer not large enough.. truncated\n"); /* Remove double quotation marks and command line arguments */ @@ -1062,11 +1062,11 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec } } - SHELL_ArgifyW(static_res, sizeof(static_res)/sizeof(WCHAR), exec, lpFile, pidl, szCommandline, &resultLen); + SHELL_ArgifyW(static_res, sizeof(static_res)/sizeof(WCHAR), exec, lpFile, pidl, szCommandline, &resultLen, NULL); if (resultLen > sizeof(static_res)/sizeof(WCHAR)) { res = dynamic_res = static_cast<WCHAR *>(HeapAlloc(GetProcessHeap(), 0, resultLen * sizeof(WCHAR))); - SHELL_ArgifyW(dynamic_res, resultLen, exec, lpFile, pidl, szCommandline, NULL); + SHELL_ArgifyW(dynamic_res, resultLen, exec, lpFile, pidl, szCommandline, NULL, NULL); } else res = static_res; @@ -1132,7 +1132,8 @@ static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, if (cmdlen >= sizeof(cmd) / sizeof(WCHAR)) cmdlen = sizeof(cmd) / sizeof(WCHAR) - 1; cmd[cmdlen] = '\0'; - SHELL_ArgifyW(param, sizeof(param) / sizeof(WCHAR), cmd, lpFile, (LPITEMIDLIST)psei->lpIDList, szCommandline, &resultLen); + SHELL_ArgifyW(param, sizeof(param) / sizeof(WCHAR), cmd, lpFile, (LPITEMIDLIST)psei->lpIDList, szCommandline, &resultLen, + (psei->lpDirectory && *psei->lpDirectory) ? psei->lpDirectory : NULL); if (resultLen > sizeof(param) / sizeof(WCHAR)) ERR("Argify buffer not large enough, truncating\n"); } @@ -1512,7 +1513,8 @@ static UINT_PTR SHELL_execute_class(LPCWSTR wszApplicationName, LPSHELLEXECUTEIN TRACE("SEE_MASK_CLASSNAME->%s, doc->%s\n", debugstr_w(execCmd), debugstr_w(wszApplicationName)); wcmd[0] = '\0'; - done = SHELL_ArgifyW(wcmd, sizeof(wcmd) / sizeof(WCHAR), execCmd, wszApplicationName, (LPITEMIDLIST)psei->lpIDList, NULL, &resultLen); + done = SHELL_ArgifyW(wcmd, sizeof(wcmd) / sizeof(WCHAR), execCmd, wszApplicationName, (LPITEMIDLIST)psei->lpIDList, NULL, &resultLen, + (psei->lpDirectory && *psei->lpDirectory) ? psei->lpDirectory : NULL); if (!done && wszApplicationName[0]) { strcatW(wcmd, L" "); @@ -1578,7 +1580,8 @@ static BOOL SHELL_translate_idlist(LPSHELLEXECUTEINFOW sei, LPWSTR wszParameters sei->lpVerb, buffer, sizeof(buffer))) { SHELL_ArgifyW(wszApplicationName, dwApplicationNameLen, - buffer, target, (LPITEMIDLIST)sei->lpIDList, NULL, &resultLen); + buffer, target, (LPITEMIDLIST)sei->lpIDList, NULL, &resultLen, + (sei->lpDirectory && *sei->lpDirectory) ? sei->lpDirectory : NULL); if (resultLen > dwApplicationNameLen) ERR("Argify buffer not large enough... truncating\n"); appKnownSingular = FALSE;

1 0

01/01: [TRANSLATION][CLIP] Implement Italian translation (#682)
by Bișoc George 12 Jul '18

12 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a637150f0dedef751b1b… commit 5a637150f0dedef751b1b23fe5d1bc391df9e40a Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Thu Jul 12 17:41:20 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jul 12 17:41:20 2018 +0200 [TRANSLATION][CLIP] Implement Italian translation (#682) --- base/applications/cmdutils/clip/clip.rc | 3 +++ base/applications/cmdutils/clip/lang/it-IT.rc | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/base/applications/cmdutils/clip/clip.rc b/base/applications/cmdutils/clip/clip.rc index 8fe786e38d..ed784f03e5 100644 --- a/base/applications/cmdutils/clip/clip.rc +++ b/base/applications/cmdutils/clip/clip.rc @@ -24,6 +24,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/base/applications/cmdutils/clip/lang/it-IT.rc b/base/applications/cmdutils/clip/lang/it-IT.rc new file mode 100644 index 0000000000..0e723cac90 --- /dev/null +++ b/base/applications/cmdutils/clip/lang/it-IT.rc @@ -0,0 +1,16 @@ +/* + * PROJECT: ReactOS Clip Command + * LICENSE: See COPYING in the top level directory + * PURPOSE: Italian resource file + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\nInserisci ""CLIP /?"" per leggere le informazioni sull'uso.\n" + IDS_HELP "\nReindirizza verso la clipboard l'output dei programmi a riga di comando.\n\n\ +CLIP [/?]\n\n\ + /? Mostra questo messaggio.\n" +END

1 0

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

2025

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