mirror of https://github.com/PCSX2/pcsx2.git
GSdx: Remove ddraw.h references, which were long since obsolete anyway.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3270 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine
parent
3d9c63b0f0
commit
fddc5afe38
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="windows-1250"?>
|
<?xml version="1.0" encoding="windows-1250"?>
|
||||||
<VisualStudioProject
|
<VisualStudioProject
|
||||||
ProjectType="Visual C++"
|
ProjectType="Visual C++"
|
||||||
Version="9,00"
|
Version="9.00"
|
||||||
Name="GSdx"
|
Name="GSdx"
|
||||||
ProjectGUID="{18E42F6F-3A62-41EE-B42F-79366C4F1E95}"
|
ProjectGUID="{18E42F6F-3A62-41EE-B42F-79366C4F1E95}"
|
||||||
RootNamespace="GSdx"
|
RootNamespace="GSdx"
|
||||||
|
|
@ -2447,122 +2447,6 @@
|
||||||
RelativePath=".\baseclasses\ctlutil.h"
|
RelativePath=".\baseclasses\ctlutil.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath=".\baseclasses\ddmm.cpp"
|
|
||||||
>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Debug SSE2|Win32"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Debug SSE2|x64"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Release SSE2|Win32"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Release SSE2|x64"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Release SSSE3|Win32"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Release SSSE3|x64"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Debug SSSE3|Win32"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Debug SSSE3|x64"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Debug SSE4|Win32"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Debug SSE4|x64"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Release SSE4|Win32"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Release SSE4|x64"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Debug|x64"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
<FileConfiguration
|
|
||||||
Name="Release|x64"
|
|
||||||
>
|
|
||||||
<Tool
|
|
||||||
Name="VCCLCompilerTool"
|
|
||||||
UsePrecompiledHeader="0"
|
|
||||||
/>
|
|
||||||
</FileConfiguration>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath=".\baseclasses\ddmm.h"
|
RelativePath=".\baseclasses\ddmm.h"
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -1,129 +0,0 @@
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
// File: DDMM.cpp
|
|
||||||
//
|
|
||||||
// Desc: DirectShow base classes - implements routines for using DirectDraw
|
|
||||||
// on a multimonitor system.
|
|
||||||
//
|
|
||||||
// Copyright (c) Microsoft Corporation. All rights reserved.
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
|
|
||||||
#include "streams.h"
|
|
||||||
#include <ddraw.h>
|
|
||||||
#include "ddmm.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* FindDeviceCallback
|
|
||||||
*/
|
|
||||||
typedef struct {
|
|
||||||
LPSTR szDevice;
|
|
||||||
GUID* lpGUID;
|
|
||||||
GUID GUID;
|
|
||||||
BOOL fFound;
|
|
||||||
} FindDeviceData;
|
|
||||||
|
|
||||||
BOOL CALLBACK FindDeviceCallback(GUID* lpGUID, LPSTR szName, LPSTR szDevice, LPVOID lParam)
|
|
||||||
{
|
|
||||||
FindDeviceData *p = (FindDeviceData*)lParam;
|
|
||||||
|
|
||||||
if (lstrcmpiA(p->szDevice, szDevice) == 0) {
|
|
||||||
if (lpGUID) {
|
|
||||||
p->GUID = *lpGUID;
|
|
||||||
p->lpGUID = &p->GUID;
|
|
||||||
} else {
|
|
||||||
p->lpGUID = NULL;
|
|
||||||
}
|
|
||||||
p->fFound = TRUE;
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
BOOL CALLBACK FindDeviceCallbackEx(GUID* lpGUID, LPSTR szName, LPSTR szDevice, LPVOID lParam, HMONITOR hMonitor)
|
|
||||||
{
|
|
||||||
FindDeviceData *p = (FindDeviceData*)lParam;
|
|
||||||
|
|
||||||
if (lstrcmpiA(p->szDevice, szDevice) == 0) {
|
|
||||||
if (lpGUID) {
|
|
||||||
p->GUID = *lpGUID;
|
|
||||||
p->lpGUID = &p->GUID;
|
|
||||||
} else {
|
|
||||||
p->lpGUID = NULL;
|
|
||||||
}
|
|
||||||
p->fFound = TRUE;
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* DirectDrawCreateFromDevice
|
|
||||||
*
|
|
||||||
* create a DirectDraw object for a particular device
|
|
||||||
*/
|
|
||||||
IDirectDraw * DirectDrawCreateFromDevice(LPSTR szDevice, PDRAWCREATE DirectDrawCreateP, PDRAWENUM DirectDrawEnumerateP)
|
|
||||||
{
|
|
||||||
IDirectDraw* pdd = NULL;
|
|
||||||
FindDeviceData find;
|
|
||||||
|
|
||||||
if (szDevice == NULL) {
|
|
||||||
DirectDrawCreateP(NULL, &pdd, NULL);
|
|
||||||
return pdd;
|
|
||||||
}
|
|
||||||
|
|
||||||
find.szDevice = szDevice;
|
|
||||||
find.fFound = FALSE;
|
|
||||||
DirectDrawEnumerateP(FindDeviceCallback, (LPVOID)&find);
|
|
||||||
|
|
||||||
if (find.fFound)
|
|
||||||
{
|
|
||||||
//
|
|
||||||
// In 4bpp mode the following DDraw call causes a message box to be popped
|
|
||||||
// up by DDraw (!?!). It's DDraw's fault, but we don't like it. So we
|
|
||||||
// make sure it doesn't happen.
|
|
||||||
//
|
|
||||||
UINT ErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS);
|
|
||||||
DirectDrawCreateP(find.lpGUID, &pdd, NULL);
|
|
||||||
SetErrorMode(ErrorMode);
|
|
||||||
}
|
|
||||||
|
|
||||||
return pdd;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* DirectDrawCreateFromDeviceEx
|
|
||||||
*
|
|
||||||
* create a DirectDraw object for a particular device
|
|
||||||
*/
|
|
||||||
IDirectDraw * DirectDrawCreateFromDeviceEx(LPSTR szDevice, PDRAWCREATE DirectDrawCreateP, LPDIRECTDRAWENUMERATEEXA DirectDrawEnumerateExP)
|
|
||||||
{
|
|
||||||
IDirectDraw* pdd = NULL;
|
|
||||||
FindDeviceData find;
|
|
||||||
|
|
||||||
if (szDevice == NULL) {
|
|
||||||
DirectDrawCreateP(NULL, &pdd, NULL);
|
|
||||||
return pdd;
|
|
||||||
}
|
|
||||||
|
|
||||||
find.szDevice = szDevice;
|
|
||||||
find.fFound = FALSE;
|
|
||||||
DirectDrawEnumerateExP(FindDeviceCallbackEx, (LPVOID)&find,
|
|
||||||
DDENUM_ATTACHEDSECONDARYDEVICES);
|
|
||||||
|
|
||||||
if (find.fFound)
|
|
||||||
{
|
|
||||||
//
|
|
||||||
// In 4bpp mode the following DDraw call causes a message box to be popped
|
|
||||||
// up by DDraw (!?!). It's DDraw's fault, but we don't like it. So we
|
|
||||||
// make sure it doesn't happen.
|
|
||||||
//
|
|
||||||
UINT ErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS);
|
|
||||||
DirectDrawCreateP(find.lpGUID, &pdd, NULL);
|
|
||||||
SetErrorMode(ErrorMode);
|
|
||||||
}
|
|
||||||
|
|
||||||
return pdd;
|
|
||||||
}
|
|
||||||
|
|
@ -40,7 +40,6 @@
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <windowsx.h>
|
#include <windowsx.h>
|
||||||
#include <olectl.h>
|
#include <olectl.h>
|
||||||
#include <ddraw.h>
|
|
||||||
|
|
||||||
// Disable warning message for C4201 - use of nameless struct/union
|
// Disable warning message for C4201 - use of nameless struct/union
|
||||||
// Otherwise, strmif.h will generate warnings for Win32 debug builds
|
// Otherwise, strmif.h will generate warnings for Win32 debug builds
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,7 @@ typedef signed long long int64;
|
||||||
|
|
||||||
// directx
|
// directx
|
||||||
|
|
||||||
#include <ddraw.h>
|
//#include <ddraw.h>
|
||||||
#include <d3d11.h>
|
#include <d3d11.h>
|
||||||
#include <d3dx11.h>
|
#include <d3dx11.h>
|
||||||
#include <d3d9.h>
|
#include <d3d9.h>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue