Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-16 08:29:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DXGI]

Browse source 
* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
* Improve header inclusions.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61723
This commit is contained in:
Amine Khaldi 2014-01-20 11:34:21 +00:00
parent f27d6ca001
commit 1c6e5a90d1
12 changed files with 35 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/directx/wine/dxgi/CMakeLists.txt
View file

@ -13,6 +13,7 @@ list(APPEND SOURCE
surface.c
swapchain.c
utils.c
guid.c
${CMAKE_CURRENT_BINARY_DIR}/dxgi.def)
add_library(dxgi SHARED ${SOURCE} version.rc)

5
reactos/dll/directx/wine/dxgi/adapter.c
View file

@ -17,13 +17,8 @@
*
*/
#include "config.h"
#include "wine/port.h"
#include "dxgi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
static inline struct dxgi_adapter *impl_from_IWineDXGIAdapter(IWineDXGIAdapter *iface)
{
return CONTAINING_RECORD(iface, struct dxgi_adapter, IWineDXGIAdapter_iface);

5
reactos/dll/directx/wine/dxgi/device.c
View file

@ -17,13 +17,8 @@
*
*/
#include "config.h"
#include "wine/port.h"
#include "dxgi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
static inline struct dxgi_device *impl_from_IWineDXGIDevice(IWineDXGIDevice *iface)
{
return CONTAINING_RECORD(iface, struct dxgi_device, IWineDXGIDevice_iface);

6
reactos/dll/directx/wine/dxgi/dxgi_main.c
View file

@ -17,14 +17,8 @@
*
*/
#include "config.h"
#include "wine/port.h"
#define DXGI_INIT_GUID
#include "dxgi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
static CRITICAL_SECTION_DEBUG dxgi_cs_debug =
{
0, 0, &dxgi_cs,

28
reactos/dll/directx/wine/dxgi/dxgi_private.h
View file

@ -19,26 +19,30 @@
#ifndef __WINE_DXGI_PRIVATE_H
#define __WINE_DXGI_PRIVATE_H
#include <wine/config.h>
#include <wine/port.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include "wine/debug.h"
#define COBJMACROS
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "objbase.h"
#include "winnls.h"
#include "dxgi.h"
#ifdef DXGI_INIT_GUID
#include "initguid.h"
#endif
#include "wine/wined3d.h"
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
#include <winuser.h>
#include <objbase.h>
#include <winnls.h>
#include <wine/debug.h>
#include <wine/wined3d.h>
#include <wine/winedxgi.h>
WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
extern CRITICAL_SECTION dxgi_cs DECLSPEC_HIDDEN;
/* Layered device */

5
reactos/dll/directx/wine/dxgi/factory.c
View file

@ -17,13 +17,8 @@
*
*/
#include "config.h"
#include "wine/port.h"
#include "dxgi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
static inline struct dxgi_factory *impl_from_IWineDXGIFactory(IWineDXGIFactory *iface)
{
return CONTAINING_RECORD(iface, struct dxgi_factory, IWineDXGIFactory_iface);

17
reactos/dll/directx/wine/dxgi/guid.c Normal file
View file

@ -0,0 +1,17 @@
/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
#include <objbase.h>
#include <wine/wined3d.h>
#include <initguid.h>
#include <wine/winedxgi.h>
/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

5
reactos/dll/directx/wine/dxgi/output.c
View file

@ -16,13 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include "dxgi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
static inline struct dxgi_output *impl_from_IDXGIOutput(IDXGIOutput *iface)
{
return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput_iface);

5
reactos/dll/directx/wine/dxgi/surface.c
View file

@ -17,13 +17,8 @@
*
*/
#include "config.h"
#include "wine/port.h"
#include "dxgi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
/* Inner IUnknown methods */
static inline struct dxgi_surface *impl_from_IUnknown(IUnknown *iface)

5
reactos/dll/directx/wine/dxgi/swapchain.c
View file

@ -17,13 +17,8 @@
*
*/
#include "config.h"
#include "wine/port.h"
#include "dxgi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
static inline struct dxgi_swapchain *impl_from_IDXGISwapChain(IDXGISwapChain *iface)
{
return CONTAINING_RECORD(iface, struct dxgi_swapchain, IDXGISwapChain_iface);

5
reactos/dll/directx/wine/dxgi/utils.c
View file

@ -17,13 +17,8 @@
*
*/
#include "config.h"
#include "wine/port.h"
#include "dxgi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
#define WINE_DXGI_TO_STR(x) case x: return #x
const char *debug_dxgi_format(DXGI_FORMAT format)

2
reactos/dll/directx/wine/dxgi/version.rc
View file

@ -23,4 +23,4 @@
#define WINE_PRODUCTVERSION 6,0,6000,16386
#define WINE_PRODUCTVERSION_STR "6.0.6000.16386"
#include "wine/wine_common_ver.rc"
#include <wine/wine_common_ver.rc>