Author: rnaumann
Date: Mon Feb 8 23:16:36 2016
New Revision: 70703
URL: http://svn.reactos.org/svn/reactos?rev=70703&view=rev
Log:
[EXPLORER] Stubplement Customize Notifications dialog. Patch by Jared Smudde. CORE-10725
Added:
trunk/reactos/base/shell/explorer/notifyiconscust.cpp (with props)
Modified:
trunk/reactos/base/shell/explorer/CMakeLists.txt
trunk/reactos/base/shell/explorer/precomp.h
trunk/reactos/base/shell/explorer/trayprop.cpp
Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL…
==============================================================================
--- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Mon Feb 8 23:16:36 2016
@@ -7,6 +7,7 @@
list(APPEND SOURCE
desktop.cpp
explorer.cpp
+ notifyiconscust.cpp
rshell.cpp
settings.cpp
shellservice.cpp
Added: trunk/reactos/base/shell/explorer/notifyiconscust.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/notify…
==============================================================================
--- trunk/reactos/base/shell/explorer/notifyiconscust.cpp (added)
+++ trunk/reactos/base/shell/explorer/notifyiconscust.cpp [iso-8859-1] Mon Feb 8 23:16:36 2016
@@ -0,0 +1,50 @@
+/*
+ * ReactOS Explorer
+ *
+ * Copyright 2015 Jared Smudde <computerwhiz02(a)hotmail.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
+ */
+
+#include "precomp.h"
+
+INT_PTR CALLBACK CustomizeNotifyIconsProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
+{
+ switch(Message)
+ {
+ case WM_INITDIALOG:
+
+ return TRUE;
+ case WM_COMMAND:
+ switch(LOWORD(wParam))
+ {
+ case IDOK:
+ EndDialog(hwnd, IDOK);
+ break;
+ case IDCANCEL:
+ EndDialog(hwnd, IDCANCEL);
+ break;
+ }
+ break;
+ default:
+ return FALSE;
+ }
+ return TRUE;
+}
+
+VOID ShowCustomizeNotifyIcons(HINSTANCE hInst, HWND hExplorer)
+{
+ DialogBox(hInst, MAKEINTRESOURCE(IDD_NOTIFICATIONS_CUSTOMIZE), hExplorer, CustomizeNotifyIconsProc);
+}
Propchange: trunk/reactos/base/shell/explorer/notifyiconscust.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/shell/explorer/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom…
==============================================================================
--- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Mon Feb 8 23:16:36 2016
@@ -223,6 +223,13 @@
VOID
DesktopDestroyShellWindow(IN HANDLE hDesktop);
+
+/*
+ * notifyiconscust.cpp
+ */
+VOID
+ShowCustomizeNotifyIcons(HINSTANCE, HWND);
+
/*
* taskband.cpp
*/
Modified: trunk/reactos/base/shell/explorer/trayprop.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traypr…
==============================================================================
--- trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/trayprop.cpp [iso-8859-1] Mon Feb 8 23:16:36 2016
@@ -234,6 +234,9 @@
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
}
break;
+ case IDC_TASKBARPROP_ICONCUST:
+ ShowCustomizeNotifyIcons(hExplorerInstance, hwndDlg);
+ break;
}
break;
Author: tfaber
Date: Sun Feb 7 09:38:47 2016
New Revision: 70697
URL: http://svn.reactos.org/svn/reactos?rev=70697&view=rev
Log:
[KERNEL32]
- Hide STATUS_SXS_INVALID_ACTCTXDATA_FORMAT in BasepProbeForDllManifest and fake a manifest not found status instead. Windows's RtlCreateActivationContext will always return this code since we call it with a completely invalid structure. Should fix boot on VMware-Hybrid testbot.
CORE-10843
Modified:
trunk/reactos/dll/win32/kernel32/client/actctx.c
Modified: trunk/reactos/dll/win32/kernel32/client/actctx.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/client/actctx.c [iso-8859-1] Sun Feb 7 09:38:47 2016
@@ -170,6 +170,18 @@
/* Store activation context pointer if it was created successfully */
if (NT_SUCCESS(Status)) *ActCtx = Result;
+
+ /* CORE-10843: Windows always returns this since we pass the wrong struct */
+ if (Status == STATUS_SXS_INVALID_ACTCTXDATA_FORMAT)
+ {
+ /* Fake "Manifest not found" so the load doesn't fail */
+ static int Once;
+ if (Once++)
+ {
+ DPRINT1("HACK: Passed invalid ACTIVATION_CONTEXT_DATA!\n");
+ }
+ Status = STATUS_RESOURCE_DATA_NOT_FOUND;
+ }
}
return Status;