Changeset 35713 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/include

Timestamp:

Jan 25, 2011 2:15:16 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

69654

Message:

wined3d/xpdm: fix crashes for apps using WPF, doesn't render correctly though. (public #4587)

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/include

Files:

• wine/wined3d.h (modified) (5 diffs)
• wingdi.h (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wined3d.h ¶

@@ -2110 +2110 @@
     WINED3DFORMAT Format;
 } WINED3DDISPLAYMODE;
+typedef enum _WINED3DSCANLINEORDERING {
+  WINED3DSCANLINEORDERING_UNKNOWN    = 0, 
+  WINED3DSCANLINEORDERING_PROGRESSIVE   = 1,
+  WINED3DSCANLINEORDERING_INTERLACED    = 2 
+} WINED3DSCANLINEORDERING;
+typedef struct _WINED3DDISPLAYMODEEX {
+    UINT Size;
+    UINT Width;
+    UINT Height;
+    UINT RefreshRate;
+    WINED3DFORMAT Format;
+    WINED3DSCANLINEORDERING ScanLineOrdering;
+} WINED3DDISPLAYMODEEX;
+typedef enum _WINED3DDISPLAYROTATION {
+  WINED3DDISPLAYROTATION_IDENTITY   = 1,
+  WINED3DDISPLAYROTATION_90         = 2,
+  WINED3DDISPLAYROTATION_180        = 3,
+  WINED3DDISPLAYROTATION_270        = 4 
+} WINED3DDISPLAYROTATION;
 typedef struct _WINED3DCOLORVALUE {
     float r;
@@ -2939 +2958 @@
         WINED3DDISPLAYMODE *mode) = 0;
 
+    virtual HRESULT STDMETHODCALLTYPE GetAdapterDisplayModeEx(
+        UINT adapter_idx,
+        WINED3DDISPLAYMODEEX *mode,
+        WINED3DDISPLAYROTATION *rotation) = 0;
+
     virtual HRESULT STDMETHODCALLTYPE GetAdapterIdentifier(
         UINT adapter_idx,
@@ -3045 +3069 @@
         UINT adapter_idx,
         WINED3DDISPLAYMODE *mode);
+
+    HRESULT (STDMETHODCALLTYPE *GetAdapterDisplayModeEx)(
+        IWineD3D* This,
+        UINT adapter_idx,
+        WINED3DDISPLAYMODEEX *mode,
+        WINED3DDISPLAYROTATION *rotation);
 
     HRESULT (STDMETHODCALLTYPE *GetAdapterIdentifier)(
@@ -3130 +3160 @@
 #define IWineD3D_EnumAdapterModes(This,adapter_idx,format,mode_idx,mode) (This)->lpVtbl->EnumAdapterModes(This,adapter_idx,format,mode_idx,mode)
 #define IWineD3D_GetAdapterDisplayMode(This,adapter_idx,mode) (This)->lpVtbl->GetAdapterDisplayMode(This,adapter_idx,mode)
+#define IWineD3D_GetAdapterDisplayModeEx(This,adapter_idx,mode,rotation) (This)->lpVtbl->GetAdapterDisplayModeEx(This,adapter_idx,mode,rotation)
 #define IWineD3D_GetAdapterIdentifier(This,adapter_idx,flags,identifier) (This)->lpVtbl->GetAdapterIdentifier(This,adapter_idx,flags,identifier)
 #define IWineD3D_CheckDeviceMultiSampleType(This,adapter_idx,device_type,surface_format,windowed,multisample_type,quality_levels) (This)->lpVtbl->CheckDeviceMultiSampleType(This,adapter_idx,device_type,surface_format,windowed,multisample_type,quality_levels)
@@ -3190 +3221 @@
     WINED3DDISPLAYMODE *mode);
 void __RPC_STUB IWineD3D_GetAdapterDisplayMode_Stub(
+    IRpcStubBuffer* This,
+    IRpcChannelBuffer* pRpcChannelBuffer,
+    PRPC_MESSAGE pRpcMessage,
+    DWORD* pdwStubPhase);
+HRESULT STDMETHODCALLTYPE IWineD3D_GetAdapterDisplayModeEx_Proxy(
+    IWineD3D* This,
+    UINT adapter_idx,
+    WINED3DDISPLAYMODEEX *mode,
+    WINED3DDISPLAYROTATION *rotation);
+void __RPC_STUB IWineD3D_GetAdapterDisplayModeEx_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,

trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wingdi.h ¶

@@ -2904 +2904 @@
         DWORD dmDisplayFixedOutput;
       } DUMMYSTRUCTNAME2;
-    } DUMMYUNIONNAME1;
+    } DUMMYUNIONNAME;
     short  dmColor;
     short  dmDuplex;
@@ -2951 +2951 @@
 #define DM_SCALE                0x00000010L
 #define DM_POSITION             0x00000020L
+#define DM_DISPLAYORIENTATION   0x00000080L
 #define DM_COPIES               0x00000100L
 #define DM_DEFAULTSOURCE        0x00000200L
@@ -3136 +3137 @@
 #define DMCOLLATE_FALSE         0
 #define DMCOLLATE_TRUE          1
+
+/* DEVMODE dmDisplayOrientation specifiations */
+#define DMDO_DEFAULT    0
+#define DMDO_90         1
+#define DMDO_180        2
+#define DMDO_270        3
+
+/* DEVMODE dmDisplayFlags flags */
+#define DM_INTERLACED           0x00000002
+#define DMDISPLAYFLAGS_TEXTMODE 0x00000004
 
 #define DMICMMETHOD_NONE        1