mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Rebase against 6fd36314d051ceff8dbb0f2d442f57983e0bcd65.
[dsound-DSCAPS_CERTIFIED] Removed patch to pretend that the dsound driver is certified (accepted upstream). [hid-HidP_TranslateUsagesToI8042ScanCodes] Removed patch to stub HidP_TranslateUsagesToI8042ScanCodes (accepted upstream).
This commit is contained in:
Sebastian Lackner
parent
dd166155b5
commit
1281216a26
@ -1,42 +0,0 @@
|
||||
From 3af51650f1b1dae29edd145610b2698780674ab2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Mon, 29 Feb 2016 13:55:20 +0100
|
||||
Subject: dsound: Pretend that our driver is certified.
|
||||
|
||||
---
|
||||
dlls/dsound/dsound.c | 3 +++
|
||||
dlls/dsound/tests/dsound.c | 4 ++++
|
||||
2 files changed, 7 insertions(+)
|
||||
|
||||
diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
|
||||
index ccefd1f..fa36d3f 100644
|
||||
--- a/dlls/dsound/dsound.c
|
||||
+++ b/dlls/dsound/dsound.c
|
||||
@@ -371,6 +371,9 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU
|
||||
device->drvcaps.dwFlags |= DSCAPS_SECONDARYMONO | DSCAPS_SECONDARYSTEREO;
|
||||
device->drvcaps.dwFlags |= DSCAPS_CONTINUOUSRATE;
|
||||
|
||||
+ /* the driver is certified */
|
||||
+ device->drvcaps.dwFlags |= DSCAPS_CERTIFIED;
|
||||
+
|
||||
device->drvcaps.dwPrimaryBuffers = 1;
|
||||
device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN;
|
||||
device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX;
|
||||
diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c
|
||||
index 78364ed..8449ed7 100644
|
||||
--- a/dlls/dsound/tests/dsound.c
|
||||
+++ b/dlls/dsound/tests/dsound.c
|
||||
@@ -129,6 +129,10 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized,
|
||||
rc=IDirectSound_GetCaps(dso,&dscaps);
|
||||
ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc);
|
||||
|
||||
+ /* All modern WDM drivers are 'certified' */
|
||||
+ ok(dscaps.dwFlags & DSCAPS_CERTIFIED, "Expected driver to have "
|
||||
+ "DSCAPS_CERTIFIED flag set\n");
|
||||
+
|
||||
rc=IDirectSound_Compact(dso);
|
||||
ok(rc==DSERR_PRIOLEVELNEEDED,"IDirectSound_Compact() failed: %08x\n", rc);
|
||||
|
||||
--
|
||||
2.7.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: Set DSCAPS_CERTIFIED flags in dsound
|
||||
@ -1,88 +0,0 @@
|
||||
From 830e882a471628e15ac3e6d14ffc864e2d448153 Mon Sep 17 00:00:00 2001
|
||||
From: Aric Stewart <aric@codeweavers.com>
|
||||
Date: Wed, 14 Oct 2015 10:53:42 -0500
|
||||
Subject: hid: Stub HidP_TranslateUsagesToI8042ScanCodes
|
||||
|
||||
My whole patch did not send last time for some reason. Here is the whole patch.
|
||||
|
||||
For Bug 39447
|
||||
|
||||
Signed-off-by: Aric Stewart <aric@codeweavers.com>
|
||||
---
|
||||
dlls/hid/hid.spec | 2 +-
|
||||
dlls/hid/hidp.c | 13 +++++++++++++
|
||||
include/ddk/hidpi.h | 11 +++++++++++
|
||||
3 files changed, 25 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec
|
||||
index e416762..76df40d 100644
|
||||
--- a/dlls/hid/hid.spec
|
||||
+++ b/dlls/hid/hid.spec
|
||||
@@ -39,6 +39,6 @@
|
||||
@ stub HidP_SetUsageValue
|
||||
@ stub HidP_SetUsageValueArray
|
||||
@ stub HidP_SetUsages
|
||||
-@ stub HidP_TranslateUsagesToI8042ScanCodes
|
||||
+@ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr)
|
||||
@ stub HidP_UnsetUsages
|
||||
@ stub HidP_UsageListDifference
|
||||
diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c
|
||||
index 3d7a12e..91d4fbe 100644
|
||||
--- a/dlls/hid/hidp.c
|
||||
+++ b/dlls/hid/hidp.c
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <stdarg.h>
|
||||
|
||||
#define NONAMELESSUNION
|
||||
+#include "ntstatus.h"
|
||||
#define WIN32_NO_STATUS
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
@@ -519,3 +520,15 @@ ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePag
|
||||
}
|
||||
return count;
|
||||
}
|
||||
+
|
||||
+NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(PUSAGE ChangedUsageList, ULONG UsageListLength,
|
||||
+ HIDP_KEYBOARD_DIRECTION KeyAction,
|
||||
+ PHIDP_KEYBOARD_MODIFIER_STATE ModifierState,
|
||||
+ PHIDP_INSERT_SCANCODES InsertCodesProcedure,
|
||||
+ PVOID InsertCodesContext)
|
||||
+{
|
||||
+ ERR("(%p, %i, %i, %p, %p, %p): stub\n", ChangedUsageList, UsageListLength,
|
||||
+ KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext);
|
||||
+
|
||||
+ return STATUS_NOT_IMPLEMENTED;
|
||||
+}
|
||||
diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h
|
||||
index 4cfac61..a14ff80 100644
|
||||
--- a/include/ddk/hidpi.h
|
||||
+++ b/include/ddk/hidpi.h
|
||||
@@ -136,6 +136,16 @@ typedef struct _HIDP_CAPS
|
||||
USHORT NumberFeatureDataIndices;
|
||||
} HIDP_CAPS, *PHIDP_CAPS;
|
||||
|
||||
+typedef enum _HIDP_KEYBOARD_DIRECTION
|
||||
+{
|
||||
+ HidP_Keyboard_Break,
|
||||
+ HidP_Keyboard_Make
|
||||
+} HIDP_KEYBOARD_DIRECTION;
|
||||
+
|
||||
+typedef struct _HIDP_KEYBOARD_MODIFIER_STATE HIDP_KEYBOARD_MODIFIER_STATE, *PHIDP_KEYBOARD_MODIFIER_STATE;
|
||||
+
|
||||
+typedef BOOLEAN (WINAPI *PHIDP_INSERT_SCANCODES)(PVOID Context, PCHAR NewScanCodes, ULONG Length);
|
||||
+
|
||||
NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData);
|
||||
NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities);
|
||||
NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength);
|
||||
@@ -144,6 +154,7 @@ NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS
|
||||
NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength);
|
||||
ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData);
|
||||
NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength);
|
||||
+NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(PUSAGE ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, PHIDP_INSERT_SCANCODES InsertCodesProcedure, PVOID InsertCodesContext);
|
||||
|
||||
#ifndef FACILITY_HID_ERROR_CODE
|
||||
#define FACILITY_HID_ERROR_CODE 0x11
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [39447] Implement stub for hid.HidP_TranslateUsagesToI8042ScanCodes
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "e6e8ed47e6d6d245e4bbda13691eb714cf95a675"
|
||||
echo "6fd36314d051ceff8dbb0f2d442f57983e0bcd65"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -136,7 +136,6 @@ patch_enable_all ()
|
||||
enable_ddraw_d3d_execute_buffer="$1"
|
||||
enable_dinput_Initialize="$1"
|
||||
enable_dmusic_SynthPort_IKsControl="$1"
|
||||
enable_dsound_DSCAPS_CERTIFIED="$1"
|
||||
enable_dsound_EAX="$1"
|
||||
enable_dsound_Fast_Mixer="$1"
|
||||
enable_dsound_Revert_Cleanup="$1"
|
||||
@ -154,7 +153,6 @@ patch_enable_all ()
|
||||
enable_gdi32_Symbol_Truetype_Font="$1"
|
||||
enable_gdiplus_Grayscale_PNG="$1"
|
||||
enable_hal_KeQueryPerformanceCounter="$1"
|
||||
enable_hid_HidP_TranslateUsagesToI8042ScanCodes="$1"
|
||||
enable_hnetcfg_INetFwAuthorizedApplication="$1"
|
||||
enable_ieframe_IViewObject_Draw="$1"
|
||||
enable_iexplore_Revert_ProductVersion="$1"
|
||||
@ -592,9 +590,6 @@ patch_enable ()
|
||||
dmusic-SynthPort_IKsControl)
|
||||
enable_dmusic_SynthPort_IKsControl="$2"
|
||||
;;
|
||||
dsound-DSCAPS_CERTIFIED)
|
||||
enable_dsound_DSCAPS_CERTIFIED="$2"
|
||||
;;
|
||||
dsound-EAX)
|
||||
enable_dsound_EAX="$2"
|
||||
;;
|
||||
@ -646,9 +641,6 @@ patch_enable ()
|
||||
hal-KeQueryPerformanceCounter)
|
||||
enable_hal_KeQueryPerformanceCounter="$2"
|
||||
;;
|
||||
hid-HidP_TranslateUsagesToI8042ScanCodes)
|
||||
enable_hid_HidP_TranslateUsagesToI8042ScanCodes="$2"
|
||||
;;
|
||||
hnetcfg-INetFwAuthorizedApplication)
|
||||
enable_hnetcfg_INetFwAuthorizedApplication="$2"
|
||||
;;
|
||||
@ -3538,18 +3530,6 @@ if test "$enable_dmusic_SynthPort_IKsControl" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset dsound-DSCAPS_CERTIFIED
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/dsound/dsound.c, dlls/dsound/tests/dsound.c
|
||||
# |
|
||||
if test "$enable_dsound_DSCAPS_CERTIFIED" -eq 1; then
|
||||
patch_apply dsound-DSCAPS_CERTIFIED/0001-dsound-Pretend-that-our-driver-is-certified.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "dsound: Pretend that our driver is certified.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset dsound-Fast_Mixer
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -3913,21 +3893,6 @@ if test "$enable_hal_KeQueryPerformanceCounter" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset hid-HidP_TranslateUsagesToI8042ScanCodes
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#39447] Implement stub for hid.HidP_TranslateUsagesToI8042ScanCodes
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/hid/hid.spec, dlls/hid/hidp.c, include/ddk/hidpi.h
|
||||
# |
|
||||
if test "$enable_hid_HidP_TranslateUsagesToI8042ScanCodes" -eq 1; then
|
||||
patch_apply hid-HidP_TranslateUsagesToI8042ScanCodes/0001-hid-Stub-HidP_TranslateUsagesToI8042ScanCodes.patch
|
||||
(
|
||||
echo '+ { "Aric Stewart", "hid: Stub HidP_TranslateUsagesToI8042ScanCodes.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset hnetcfg-INetFwAuthorizedApplication
|
||||
# |
|
||||
# | Modified files:
|
||||
|
||||
@ -8173,7 +8173,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN;
|
||||
BOOL context_apply_draw_state(struct wined3d_context *context,
|
||||
const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN;
|
||||
@@ -2353,7 +2411,11 @@ struct wined3d_stream_state
|
||||
@@ -2354,7 +2412,11 @@ struct wined3d_stream_state
|
||||
struct wined3d_state
|
||||
{
|
||||
DWORD flags;
|
||||
@ -8185,7 +8185,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
|
||||
struct wined3d_vertex_declaration *vertex_declaration;
|
||||
struct wined3d_stream_output stream_output[MAX_STREAM_OUT];
|
||||
@@ -2400,6 +2462,16 @@ struct wined3d_state
|
||||
@@ -2401,6 +2463,16 @@ struct wined3d_state
|
||||
struct wined3d_rasterizer_state *rasterizer_state;
|
||||
};
|
||||
|
||||
@ -8202,7 +8202,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
#define WINED3D_UNMAPPED_STAGE ~0U
|
||||
|
||||
/* Multithreaded flag. Removed from the public header to signal that
|
||||
@@ -2452,16 +2524,21 @@ struct wined3d_device
|
||||
@@ -2453,16 +2525,21 @@ struct wined3d_device
|
||||
struct wined3d_rendertarget_view *back_buffer_view;
|
||||
struct wined3d_swapchain **swapchains;
|
||||
UINT swapchain_count;
|
||||
@ -8224,7 +8224,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
/* For rendering to a texture using glCopyTexImage */
|
||||
GLuint depth_blt_texture;
|
||||
|
||||
@@ -2510,9 +2587,23 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
|
||||
@@ -2511,9 +2588,23 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
|
||||
UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN;
|
||||
void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
|
||||
void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
|
||||
@ -8248,7 +8248,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
|
||||
static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)
|
||||
{
|
||||
@@ -2557,7 +2648,11 @@ struct wined3d_resource
|
||||
@@ -2558,7 +2649,11 @@ struct wined3d_resource
|
||||
UINT depth;
|
||||
UINT size;
|
||||
DWORD priority;
|
||||
@ -8260,7 +8260,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
struct list resource_list_entry;
|
||||
LONG access_count;
|
||||
|
||||
@@ -2604,6 +2699,9 @@ void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HI
|
||||
@@ -2605,6 +2700,9 @@ void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HI
|
||||
GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN;
|
||||
GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN;
|
||||
BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
|
||||
@ -8270,7 +8270,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
|
||||
|
||||
/* Tests show that the start address of resources is 32 byte aligned */
|
||||
@@ -2665,6 +2763,9 @@ struct wined3d_texture
|
||||
@@ -2666,6 +2764,9 @@ struct wined3d_texture
|
||||
DWORD flags;
|
||||
GLenum target;
|
||||
DWORD update_map_binding;
|
||||
@ -8280,7 +8280,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
|
||||
GLuint rb_multisample;
|
||||
GLuint rb_resolved;
|
||||
@@ -2701,7 +2802,12 @@ struct wined3d_texture
|
||||
@@ -2702,7 +2803,12 @@ struct wined3d_texture
|
||||
|
||||
unsigned int map_count;
|
||||
DWORD locations;
|
||||
@ -8293,7 +8293,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
} sub_resources[1];
|
||||
};
|
||||
|
||||
@@ -2752,11 +2858,23 @@ void wined3d_texture_bind(struct wined3d_texture *texture,
|
||||
@@ -2753,11 +2859,23 @@ void wined3d_texture_bind(struct wined3d_texture *texture,
|
||||
struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN;
|
||||
void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture,
|
||||
struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN;
|
||||
@ -8317,7 +8317,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(struct wined3d_texture *texture,
|
||||
unsigned int sub_resource_idx) DECLSPEC_HIDDEN;
|
||||
void wined3d_texture_invalidate_location(struct wined3d_texture *texture,
|
||||
@@ -2769,13 +2887,26 @@ void *wined3d_texture_map_bo_address(const struct wined3d_bo_address *data, size
|
||||
@@ -2770,13 +2888,26 @@ void *wined3d_texture_map_bo_address(const struct wined3d_bo_address *data, size
|
||||
const struct wined3d_gl_info *gl_info, GLenum binding, DWORD flags) DECLSPEC_HIDDEN;
|
||||
BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx,
|
||||
struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN;
|
||||
@ -8344,7 +8344,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx,
|
||||
const struct wined3d_context *context, const struct wined3d_const_bo_address *data,
|
||||
unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN;
|
||||
@@ -2884,7 +3015,11 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru
|
||||
@@ -2885,7 +3016,11 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru
|
||||
unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN;
|
||||
void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb,
|
||||
struct wined3d_context *context) DECLSPEC_HIDDEN;
|
||||
@ -8356,7 +8356,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN;
|
||||
void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN;
|
||||
void surface_set_compatible_renderbuffer(struct wined3d_surface *surface,
|
||||
@@ -2895,6 +3030,11 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
|
||||
@@ -2896,6 +3031,11 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
|
||||
void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info,
|
||||
const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point,
|
||||
BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;
|
||||
@ -8368,7 +8368,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
|
||||
void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context,
|
||||
const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN;
|
||||
@@ -2909,6 +3049,12 @@ struct wined3d_sampler
|
||||
@@ -2910,6 +3050,12 @@ struct wined3d_sampler
|
||||
GLuint name;
|
||||
};
|
||||
|
||||
@ -8381,7 +8381,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
struct wined3d_vertex_declaration_element
|
||||
{
|
||||
const struct wined3d_format *format;
|
||||
@@ -3004,6 +3150,7 @@ struct wined3d_stateblock
|
||||
@@ -3005,6 +3151,7 @@ struct wined3d_stateblock
|
||||
void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN;
|
||||
|
||||
void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN;
|
||||
@ -8389,7 +8389,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb,
|
||||
const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info,
|
||||
DWORD flags) DECLSPEC_HIDDEN;
|
||||
@@ -3017,54 +3164,150 @@ enum wined3d_push_constants
|
||||
@@ -3018,54 +3165,150 @@ enum wined3d_push_constants
|
||||
WINED3D_PUSH_CONSTANTS_PS_I,
|
||||
WINED3D_PUSH_CONSTANTS_VS_B,
|
||||
WINED3D_PUSH_CONSTANTS_PS_B,
|
||||
@ -8540,7 +8540,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
void wined3d_cs_emit_set_rasterizer_state(struct wined3d_cs *cs,
|
||||
struct wined3d_rasterizer_state *rasterizer_state) DECLSPEC_HIDDEN;
|
||||
void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs,
|
||||
@@ -3094,6 +3337,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform
|
||||
@@ -3095,6 +3338,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform
|
||||
void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs,
|
||||
struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN;
|
||||
void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN;
|
||||
@ -8548,7 +8548,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
|
||||
HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx,
|
||||
struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) DECLSPEC_HIDDEN;
|
||||
@@ -3105,6 +3349,24 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d
|
||||
@@ -3106,6 +3350,24 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d
|
||||
{
|
||||
cs->ops->push_constants(cs, p, start_idx, count, constants);
|
||||
}
|
||||
@ -8573,7 +8573,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
|
||||
/* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other
|
||||
* fixed function semantics as D3DCOLOR or FLOAT16 */
|
||||
@@ -3131,6 +3393,9 @@ struct wined3d_buffer
|
||||
@@ -3132,6 +3394,9 @@ struct wined3d_buffer
|
||||
GLenum buffer_object_usage;
|
||||
GLenum buffer_type_hint;
|
||||
DWORD flags;
|
||||
@ -8583,7 +8583,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
void *map_ptr;
|
||||
|
||||
struct wined3d_map_range *maps;
|
||||
@@ -3155,11 +3420,19 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co
|
||||
@@ -3156,11 +3421,19 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co
|
||||
BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN;
|
||||
void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context,
|
||||
const struct wined3d_state *state) DECLSPEC_HIDDEN;
|
||||
@ -8603,7 +8603,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
|
||||
struct wined3d_rendertarget_view
|
||||
{
|
||||
@@ -3221,7 +3494,12 @@ struct wined3d_unordered_access_view
|
||||
@@ -3222,7 +3495,12 @@ struct wined3d_unordered_access_view
|
||||
struct wined3d_swapchain_ops
|
||||
{
|
||||
void (*swapchain_present)(struct wined3d_swapchain *swapchain,
|
||||
@ -8616,7 +8616,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
|
||||
void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swapchain);
|
||||
};
|
||||
|
||||
@@ -3258,6 +3536,10 @@ struct wined3d_swapchain
|
||||
@@ -3259,6 +3537,10 @@ struct wined3d_swapchain
|
||||
|
||||
void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN;
|
||||
struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 70d43790faf45a7ba68101bc770f89fed707a112 Mon Sep 17 00:00:00 2001
|
||||
From 80a3e2c7b41b6504805e91065058072bc83c4ac4 Mon Sep 17 00:00:00 2001
|
||||
From: Damjan Jovanovic <damjan.jov@gmail.com>
|
||||
Date: Fri, 8 Aug 2014 20:05:54 +0200
|
||||
Subject: winex11.drv: Import X11's "text/html" as "HTML Format". (try 3)
|
||||
@ -15,10 +15,10 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
|
||||
1 file changed, 201 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c
|
||||
index f2062f0..0caf5b5 100644
|
||||
index dcb1403..058ee53 100644
|
||||
--- a/dlls/winex11.drv/clipboard.c
|
||||
+++ b/dlls/winex11.drv/clipboard.c
|
||||
@@ -133,6 +133,7 @@ static HANDLE import_image_bmp( Atom type, const void *data, size_t size );
|
||||
@@ -134,6 +134,7 @@ static HANDLE import_image_bmp( Atom type, const void *data, size_t size );
|
||||
static HANDLE import_string( Atom type, const void *data, size_t size );
|
||||
static HANDLE import_utf8_string( Atom type, const void *data, size_t size );
|
||||
static HANDLE import_compound_text( Atom type, const void *data, size_t size );
|
||||
@ -26,16 +26,16 @@ index f2062f0..0caf5b5 100644
|
||||
static HANDLE import_text_uri_list( Atom type, const void *data, size_t size );
|
||||
|
||||
static BOOL export_data( Display *display, Window win, Atom prop, Atom target, HANDLE handle );
|
||||
@@ -203,7 +204,7 @@ static const struct
|
||||
@@ -205,7 +206,7 @@ static const struct
|
||||
{ JFIFW, 0, XATOM_image_jpeg, import_data, export_data },
|
||||
{ PNGW, 0, XATOM_image_png, import_data, export_data },
|
||||
{ HTMLFormatW, 0, XATOM_HTML_Format, import_data, export_data },
|
||||
- { HTMLFormatW, 0, XATOM_text_html, import_data, export_text_html },
|
||||
+ { HTMLFormatW, 0, XATOM_text_html, import_text_html, export_text_html },
|
||||
{ 0, 0, XATOM_TARGETS, NULL, export_targets },
|
||||
{ 0, 0, XATOM_MULTIPLE, NULL, export_multiple },
|
||||
};
|
||||
|
||||
static struct list format_list = LIST_INIT( format_list );
|
||||
@@ -1132,6 +1133,205 @@ static HANDLE import_enhmetafile( Atom type, const void *data, size_t size )
|
||||
@@ -1136,6 +1137,205 @@ static HANDLE import_enhmetafile( Atom type, const void *data, size_t size )
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user