[FAULTREP]

* Sync with Wine 1.7.1.

svn path=/trunk/; revision=60167
This commit is contained in:
Amine Khaldi 2013-09-16 15:06:48 +00:00
parent f1b2e471f6
commit f7bba7d1b0
3 changed files with 6 additions and 8 deletions

View file

@ -1,7 +1,7 @@
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(faultrep.dll faultrep.spec) spec2def(faultrep.dll faultrep.spec ADD_IMPORTLIB)
list(APPEND SOURCE list(APPEND SOURCE
faultrep.c faultrep.c

View file

@ -53,14 +53,13 @@ static const WCHAR SZ_EXCLUSIONLIST_KEY[] = {
* Wine doesn't use this data but stores it in the registry (in the same place * 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 * 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) BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName)
{ {
WCHAR *bslash; WCHAR *bslash;
DWORD value = 1; DWORD value = 1;
HKEY hkey; HKEY hkey;
LONG res;
TRACE("(%s)\n", wine_dbgstr_w(lpAppFileName)); TRACE("(%s)\n", wine_dbgstr_w(lpAppFileName));
bslash = strrchrW(lpAppFileName, '\\'); bslash = strrchrW(lpAppFileName, '\\');
@ -72,13 +71,14 @@ BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName)
return FALSE; 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)); RegSetValueExW(hkey, lpAppFileName, 0, REG_DWORD, (LPBYTE)&value, sizeof(value));
RegCloseKey(hkey); RegCloseKey(hkey);
} }
return TRUE; return !res;
} }
/************************************************************************* /*************************************************************************
@ -123,8 +123,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(inst); DisableThreadLibraryCalls(inst);
break; break;
case DLL_PROCESS_DETACH:
break;
} }
return TRUE; return TRUE;
} }

View file

@ -71,7 +71,7 @@ reactos/dll/win32/cryptui # Synced to Wine-1.7.1
reactos/dll/win32/dbghelp # Synced to Wine-1.7.1 reactos/dll/win32/dbghelp # Synced to Wine-1.7.1
reactos/dll/win32/dciman32 # 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/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/fusion # Synced to Wine-1.5.26
reactos/dll/win32/gdiplus # 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 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.5.26