Author: akhaldi
Date: Mon Sep 16 15:06:48 2013
New Revision: 60167
URL:
http://svn.reactos.org/svn/reactos?rev=60167&view=rev
Log:
[FAULTREP]
* Sync with Wine 1.7.1.
Modified:
trunk/reactos/dll/win32/faultrep/CMakeLists.txt
trunk/reactos/dll/win32/faultrep/faultrep.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/faultrep/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/faultrep/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/faultrep/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/faultrep/CMakeLists.txt [iso-8859-1] Mon Sep 16 15:06:48 2013
@@ -1,7 +1,7 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-spec2def(faultrep.dll faultrep.spec)
+spec2def(faultrep.dll faultrep.spec ADD_IMPORTLIB)
list(APPEND SOURCE
faultrep.c
Modified: trunk/reactos/dll/win32/faultrep/faultrep.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/faultrep/faultre…
==============================================================================
--- trunk/reactos/dll/win32/faultrep/faultrep.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/faultrep/faultrep.c [iso-8859-1] Mon Sep 16 15:06:48 2013
@@ -53,14 +53,13 @@
* Wine doesn't use this data but stores it in the registry (in the same place
* as Windows would) in case it will be useful in a future version
*
- * According to MSDN this function should succeed even if the user has no write
- * access to HKLM. This probably means that there is no error checking.
*/
BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName)
{
WCHAR *bslash;
DWORD value = 1;
HKEY hkey;
+ LONG res;
TRACE("(%s)\n", wine_dbgstr_w(lpAppFileName));
bslash = strrchrW(lpAppFileName, '\\');
@@ -72,13 +71,14 @@
return FALSE;
}
- if (!RegCreateKeyW(HKEY_LOCAL_MACHINE, SZ_EXCLUSIONLIST_KEY, &hkey))
+ res = RegCreateKeyW(HKEY_LOCAL_MACHINE, SZ_EXCLUSIONLIST_KEY, &hkey);
+ if (!res)
{
RegSetValueExW(hkey, lpAppFileName, 0, REG_DWORD, (LPBYTE)&value,
sizeof(value));
RegCloseKey(hkey);
}
- return TRUE;
+ return !res;
}
/*************************************************************************
@@ -123,8 +123,6 @@
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(inst);
break;
- case DLL_PROCESS_DETACH:
- break;
}
return TRUE;
}
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Sep 16 15:06:48 2013
@@ -71,7 +71,7 @@
reactos/dll/win32/dbghelp # Synced to Wine-1.7.1
reactos/dll/win32/dciman32 # Synced to Wine-1.7.1
reactos/dll/win32/dwmapi # Synced to Wine-1.7.1
-reactos/dll/win32/faultrep # Synced to Wine-1.5.4
+reactos/dll/win32/faultrep # Synced to Wine-1.7.1
reactos/dll/win32/fusion # Synced to Wine-1.5.26
reactos/dll/win32/gdiplus # Synced to Wine-1.5.26
reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.5.26