wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 379342 - Remove Win95/Win98 support code in XPCom; r=bsmedberg a=removal

Browse Source
This commit is contained in:
Javi Rueda 2011-12-13 14:17:58 +00:00
parent c37b2e0523
commit 313b993b78
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xpcom/base/nsStackWalk.cpp
View File

@ -306,8 +306,6 @@ extern SYMGETLINEFROMADDRPROC64 _SymGetLineFromAddr64;
extern HANDLE hStackWalkMutex;
HANDLE GetCurrentPIDorHandle();
bool EnsureSymInitialized();
bool EnsureImageHlpInitialized();
@ -1072,15 +1070,6 @@ BOOL SymGetModuleInfoEspecial64(HANDLE aProcess, DWORD64 aAddr, PIMAGEHLP_MODULE
}
#endif
HANDLE
GetCurrentPIDorHandle()
{
if (_SymGetModuleBase64)
return GetCurrentProcess(); // winxp and friends use process handle
return (HANDLE) GetCurrentProcessId(); // winme win98 win95 etc use process identifier
}
bool
EnsureSymInitialized()
{
@ -1096,7 +1085,7 @@ EnsureSymInitialized()
return false;
_SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_UNDNAME);
retStat = _SymInitialize(GetCurrentPIDorHandle(), NULL, TRUE);
retStat = _SymInitialize(GetCurrentProcess(), NULL, TRUE);
if (!retStat)
PrintError("SymInitialize");

8
xpcom/io/nsAppFileLocationProvider.cpp
View File

@ -355,14 +355,6 @@ NS_METHOD nsAppFileLocationProvider::GetProductDirectory(nsILocalFile **aLocalFi
if (NS_FAILED(rv)) return rv;
const char* prop = aLocal ? NS_WIN_LOCAL_APPDATA_DIR : NS_WIN_APPDATA_DIR;
rv = directoryService->Get(prop, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir));
if (NS_SUCCEEDED(rv))
rv = localDir->Exists(&exists);
if (NS_FAILED(rv) || !exists)
{
// On some Win95 machines, NS_WIN_APPDATA_DIR does not exist - revert to NS_WIN_WINDOWS_DIR
localDir = nsnull;
rv = directoryService->Get(NS_WIN_WINDOWS_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir));
}
if (NS_FAILED(rv)) return rv;
#elif defined(XP_UNIX)
rv = NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), true, getter_AddRefs(localDir));