Author: akhaldi
Date: Sat Mar 14 14:55:41 2015
New Revision: 66700
URL: http://svn.reactos.org/svn/reactos?rev=66700&view=rev
Log:
[CMAKE] Disable PCH when the host system is Apple OS X.
Modified:
trunk/reactos/cmake/gcc.cmake
Modified: trunk/reactos/cmake/gcc.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=66700&…
==============================================================================
--- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Mar 14 14:55:41 2015
@@ -368,7 +368,7 @@
set(PSEH_LIB "pseh")
# Macros
-if(PCH AND (NOT ENABLE_CCACHE))
+if(PCH AND (NOT ENABLE_CCACHE) AND (NOT CMAKE_HOST_APPLE))
add_compile_flags("-Winvalid-pch -Werror=invalid-pch")
macro(add_pch _target _pch _sources)
# When including x.h GCC looks for x.h.gch first
Author: tkreuzer
Date: Sat Mar 14 12:45:21 2015
New Revision: 66694
URL: http://svn.reactos.org/svn/reactos?rev=66694&view=rev
Log:
[FONTVIEW]
In WinMain, higher the scope of szFileName to ensure that it and all variables that point to it are valid
throughout the program.
Should fix CID 731447.
Patch by Ricardo Hanke
CORE-9360 #resolve
Modified:
trunk/reactos/base/applications/fontview/fontview.c
Modified: trunk/reactos/base/applications/fontview/fontview.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] Sat Mar 14 12:45:21 2015
@@ -93,12 +93,13 @@
{
int argc;
WCHAR** argv;
+ WCHAR szFileName[MAX_PATH] = L"";
DWORD dwSize;
HWND hMainWnd;
MSG msg;
WNDCLASSEXW wincl;
LPCWSTR fileName;
-
+
switch (GetUserDefaultUILanguage())
{
case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT):
@@ -108,7 +109,7 @@
default:
break;
}
-
+
g_hInstance = hThisInstance;
/* Get unicode command line */
@@ -116,7 +117,6 @@
if (argc < 2)
{
OPENFILENAMEW fontOpen;
- WCHAR szFileName[MAX_PATH] = L"";
HLOCAL dialogTitle = NULL;
/* Gets the title for the dialog box ready */