mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against c76c7d85d0be45edf72e63ae7eae51c018383070.
This commit is contained in:
Sebastian Lackner
parent
b52328c75a
commit
78c9cb74ff
@ -1,4 +1,4 @@
|
||||
From a5a9755806495033845a8dd1fd4fa0cba1a5df01 Mon Sep 17 00:00:00 2001
|
||||
From d0c465d355d6110e6f92478e9b4ccf18cd1bc89a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Fri, 15 Jan 2016 13:37:26 +0100
|
||||
Subject: api-ms-win-appmodel-runtime-l1-1-1: Add new dll.
|
||||
@ -13,7 +13,7 @@ Subject: api-ms-win-appmodel-runtime-l1-1-1: Add new dll.
|
||||
create mode 100644 dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 74378bf..ec20e74 100644
|
||||
index ee1542f..63a6b59 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(advpack,,[implib])
|
||||
@ -22,8 +22,8 @@ index 74378bf..ec20e74 100644
|
||||
WINE_CONFIG_TEST(dlls/amstream/tests)
|
||||
+WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-1)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-appinit-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0)
|
||||
WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0)
|
||||
diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in b/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..289d96f
|
||||
@ -74,10 +74,10 @@ index 0000000..2e5fbf1
|
||||
+@ stub VerifyPackageId
|
||||
+@ stub VerifyPackageRelativeApplicationId
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index ce4eaa1..3caf362 100755
|
||||
index b9e64fe..b35134c 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -125,6 +125,7 @@ my @dll_groups =
|
||||
@@ -136,6 +136,7 @@ my @dll_groups =
|
||||
],
|
||||
[
|
||||
"kernel32",
|
||||
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "61e6e8baa01dd44fa46744a8bc2b226474ce487a"
|
||||
echo "c76c7d85d0be45edf72e63ae7eae51c018383070"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
||||
@ -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;
|
||||
@@ -2355,7 +2413,11 @@ struct wined3d_stream_state
|
||||
@@ -2357,7 +2415,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];
|
||||
@@ -2402,6 +2464,16 @@ struct wined3d_state
|
||||
@@ -2404,6 +2466,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
|
||||
@@ -2454,16 +2526,21 @@ struct wined3d_device
|
||||
@@ -2456,16 +2528,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;
|
||||
|
||||
@@ -2512,9 +2589,23 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
|
||||
@@ -2514,9 +2591,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)
|
||||
{
|
||||
@@ -2559,7 +2650,11 @@ struct wined3d_resource
|
||||
@@ -2561,7 +2652,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;
|
||||
|
||||
@@ -2606,6 +2701,9 @@ void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HI
|
||||
@@ -2608,6 +2703,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 */
|
||||
@@ -2667,6 +2765,9 @@ struct wined3d_texture
|
||||
@@ -2669,6 +2767,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;
|
||||
@@ -2703,7 +2804,12 @@ struct wined3d_texture
|
||||
@@ -2705,7 +2806,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];
|
||||
};
|
||||
|
||||
@@ -2754,11 +2860,23 @@ void wined3d_texture_bind(struct wined3d_texture *texture,
|
||||
@@ -2756,11 +2862,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,
|
||||
@@ -2771,13 +2889,26 @@ void *wined3d_texture_map_bo_address(const struct wined3d_bo_address *data, size
|
||||
@@ -2773,13 +2891,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;
|
||||
@@ -2886,7 +3017,11 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru
|
||||
@@ -2888,7 +3019,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,
|
||||
@@ -2897,6 +3032,11 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
|
||||
@@ -2899,6 +3034,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;
|
||||
@@ -2911,6 +3051,12 @@ struct wined3d_sampler
|
||||
@@ -2913,6 +3053,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;
|
||||
@@ -3006,6 +3152,7 @@ struct wined3d_stateblock
|
||||
@@ -3008,6 +3154,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;
|
||||
@@ -3019,54 +3166,150 @@ enum wined3d_push_constants
|
||||
@@ -3021,54 +3168,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,
|
||||
@@ -3096,6 +3339,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform
|
||||
@@ -3098,6 +3341,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;
|
||||
@@ -3107,6 +3351,24 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d
|
||||
@@ -3109,6 +3353,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 */
|
||||
@@ -3133,6 +3395,9 @@ struct wined3d_buffer
|
||||
@@ -3135,6 +3397,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;
|
||||
@@ -3157,11 +3422,19 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co
|
||||
@@ -3159,11 +3424,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
|
||||
{
|
||||
@@ -3223,7 +3496,12 @@ struct wined3d_unordered_access_view
|
||||
@@ -3225,7 +3498,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);
|
||||
};
|
||||
|
||||
@@ -3260,6 +3538,10 @@ struct wined3d_swapchain
|
||||
@@ -3262,6 +3540,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 564a5198eae9dc64f53c1507aa823cd4f73266da Mon Sep 17 00:00:00 2001
|
||||
From 535b46a3a7a24b603897fdb5d24e0fb704026ec1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 5 Nov 2015 14:33:48 +0100
|
||||
Subject: winex11.drv: Allow to select default display frequency in registry
|
||||
@ -99,19 +99,19 @@ index afa26cf..33bcddc 100644
|
||||
+ return DISP_CHANGE_SUCCESSFUL;
|
||||
}
|
||||
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
|
||||
index 2694d23..e3176f3 100644
|
||||
index d622468..2452986 100644
|
||||
--- a/dlls/winex11.drv/x11drv.h
|
||||
+++ b/dlls/winex11.drv/x11drv.h
|
||||
@@ -378,6 +378,7 @@ extern BOOL private_color_map DECLSPEC_HIDDEN;
|
||||
@@ -383,6 +383,7 @@ extern BOOL private_color_map DECLSPEC_HIDDEN;
|
||||
extern int primary_monitor DECLSPEC_HIDDEN;
|
||||
extern int copy_default_colors DECLSPEC_HIDDEN;
|
||||
extern int alloc_system_colors DECLSPEC_HIDDEN;
|
||||
+extern int default_display_frequency DECLSPEC_HIDDEN;
|
||||
extern int xrender_error_base DECLSPEC_HIDDEN;
|
||||
extern HMODULE x11drv_module DECLSPEC_HIDDEN;
|
||||
|
||||
extern Display *clipboard_display DECLSPEC_HIDDEN;
|
||||
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
|
||||
index d4f5c84..a8f4b4e 100644
|
||||
index 41097f4..c6421a3 100644
|
||||
--- a/dlls/winex11.drv/x11drv_main.c
|
||||
+++ b/dlls/winex11.drv/x11drv_main.c
|
||||
@@ -81,6 +81,7 @@ BOOL client_side_with_render = TRUE;
|
||||
@ -122,7 +122,7 @@ index d4f5c84..a8f4b4e 100644
|
||||
DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES;
|
||||
int xrender_error_base = 0;
|
||||
HMODULE x11drv_module = 0;
|
||||
@@ -411,6 +412,9 @@ static void setup_options(void)
|
||||
@@ -413,6 +414,9 @@ static void setup_options(void)
|
||||
if (!get_config_key( hkey, appkey, "AllocSystemColors", buffer, sizeof(buffer) ))
|
||||
alloc_system_colors = atoi(buffer);
|
||||
|
||||
@ -133,5 +133,5 @@ index d4f5c84..a8f4b4e 100644
|
||||
|
||||
if (appkey) RegCloseKey( appkey );
|
||||
--
|
||||
2.6.2
|
||||
2.9.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 8783f9d46ddd48b80ee9d8dc3e3811b865ee1395 Mon Sep 17 00:00:00 2001
|
||||
From 552ce43d924c0959cd8f093d677e9ce968f251a0 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Wed, 10 Feb 2016 15:09:29 +0800
|
||||
Subject: winex11.drv: Add support for _NET_ACTIVE_WINDOW. (v2)
|
||||
@ -18,10 +18,10 @@ For bug #2155.
|
||||
8 files changed, 67 insertions(+)
|
||||
|
||||
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
|
||||
index 201988c..41ab285 100644
|
||||
index d4d9486..a9ef3ad 100644
|
||||
--- a/dlls/user32/driver.c
|
||||
+++ b/dlls/user32/driver.c
|
||||
@@ -140,6 +140,7 @@ static const USER_DRIVER *load_driver(void)
|
||||
@@ -134,6 +134,7 @@ static const USER_DRIVER *load_driver(void)
|
||||
GET_USER_FUNC(MsgWaitForMultipleObjectsEx);
|
||||
GET_USER_FUNC(ReleaseDC);
|
||||
GET_USER_FUNC(ScrollDC);
|
||||
@ -29,7 +29,7 @@ index 201988c..41ab285 100644
|
||||
GET_USER_FUNC(SetCapture);
|
||||
GET_USER_FUNC(SetFocus);
|
||||
GET_USER_FUNC(SetLayeredWindowAttributes);
|
||||
@@ -441,6 +442,10 @@ static BOOL CDECL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update )
|
||||
@@ -408,6 +409,10 @@ static BOOL CDECL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update )
|
||||
hdc, rect.left - dx, rect.top - dy, SRCCOPY );
|
||||
}
|
||||
|
||||
@ -40,7 +40,7 @@ index 201988c..41ab285 100644
|
||||
static void CDECL nulldrv_SetCapture( HWND hwnd, UINT flags )
|
||||
{
|
||||
}
|
||||
@@ -557,6 +562,7 @@ static USER_DRIVER null_driver =
|
||||
@@ -526,6 +531,7 @@ static USER_DRIVER null_driver =
|
||||
nulldrv_MsgWaitForMultipleObjectsEx,
|
||||
nulldrv_ReleaseDC,
|
||||
nulldrv_ScrollDC,
|
||||
@ -48,7 +48,7 @@ index 201988c..41ab285 100644
|
||||
nulldrv_SetCapture,
|
||||
nulldrv_SetFocus,
|
||||
nulldrv_SetLayeredWindowAttributes,
|
||||
@@ -812,6 +818,7 @@ static USER_DRIVER lazy_load_driver =
|
||||
@@ -754,6 +760,7 @@ static USER_DRIVER lazy_load_driver =
|
||||
nulldrv_MsgWaitForMultipleObjectsEx,
|
||||
nulldrv_ReleaseDC,
|
||||
nulldrv_ScrollDC,
|
||||
@ -57,7 +57,7 @@ index 201988c..41ab285 100644
|
||||
nulldrv_SetFocus,
|
||||
loaderdrv_SetLayeredWindowAttributes,
|
||||
diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c
|
||||
index f1c8831..3746950 100644
|
||||
index 3fe0431..dbde668 100644
|
||||
--- a/dlls/user32/focus.c
|
||||
+++ b/dlls/user32/focus.c
|
||||
@@ -158,6 +158,8 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
|
||||
@ -70,10 +70,10 @@ index f1c8831..3746950 100644
|
||||
if (focus)
|
||||
{
|
||||
diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h
|
||||
index e4a2ed1..0dc736c 100644
|
||||
index e36457d..161085d 100644
|
||||
--- a/dlls/user32/user_private.h
|
||||
+++ b/dlls/user32/user_private.h
|
||||
@@ -101,6 +101,7 @@ typedef struct tagUSER_DRIVER {
|
||||
@@ -95,6 +95,7 @@ typedef struct tagUSER_DRIVER {
|
||||
DWORD (CDECL *pMsgWaitForMultipleObjectsEx)(DWORD,const HANDLE*,DWORD,DWORD,DWORD);
|
||||
void (CDECL *pReleaseDC)(HWND,HDC);
|
||||
BOOL (CDECL *pScrollDC)(HDC,INT,INT,HRGN);
|
||||
@ -82,10 +82,10 @@ index e4a2ed1..0dc736c 100644
|
||||
void (CDECL *pSetFocus)(HWND);
|
||||
void (CDECL *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD);
|
||||
diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
|
||||
index 51ef24b..0d8319b 100644
|
||||
index 5ac4bd7..bf2cbb0 100644
|
||||
--- a/dlls/winex11.drv/event.c
|
||||
+++ b/dlls/winex11.drv/event.c
|
||||
@@ -594,6 +594,9 @@ static void set_focus( Display *display, HWND hwnd, Time time )
|
||||
@@ -597,6 +597,9 @@ static void set_focus( Display *display, HWND hwnd, Time time )
|
||||
Window win;
|
||||
GUITHREADINFO threadinfo;
|
||||
|
||||
@ -95,7 +95,7 @@ index 51ef24b..0d8319b 100644
|
||||
TRACE( "setting foreground window to %p\n", hwnd );
|
||||
SetForegroundWindow( hwnd );
|
||||
|
||||
@@ -814,6 +817,8 @@ static void X11DRV_FocusIn( HWND hwnd, XEvent *xev )
|
||||
@@ -818,6 +821,8 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev )
|
||||
|
||||
if (!focus_win)
|
||||
{
|
||||
@ -105,10 +105,10 @@ index 51ef24b..0d8319b 100644
|
||||
Foreground window, because in most cases the messages sent
|
||||
above must have already changed the foreground window, in which
|
||||
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
|
||||
index 06ce26e..7c0c38d 100644
|
||||
index 3bcc268..a7062a2 100644
|
||||
--- a/dlls/winex11.drv/window.c
|
||||
+++ b/dlls/winex11.drv/window.c
|
||||
@@ -2111,6 +2111,54 @@ BOOL CDECL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update )
|
||||
@@ -2117,6 +2117,54 @@ BOOL CDECL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update )
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
@ -164,22 +164,22 @@ index 06ce26e..7c0c38d 100644
|
||||
*/
|
||||
void CDECL X11DRV_SetCapture( HWND hwnd, UINT flags )
|
||||
diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec
|
||||
index 7cdce52..01ac095 100644
|
||||
index 82d25e5..145ba64 100644
|
||||
--- a/dlls/winex11.drv/winex11.drv.spec
|
||||
+++ b/dlls/winex11.drv/winex11.drv.spec
|
||||
@@ -37,6 +37,7 @@
|
||||
@@ -31,6 +31,7 @@
|
||||
@ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) X11DRV_MsgWaitForMultipleObjectsEx
|
||||
@ cdecl ReleaseDC(long long) X11DRV_ReleaseDC
|
||||
@ cdecl ScrollDC(long long long long) X11DRV_ScrollDC
|
||||
+@ cdecl SetActiveWindow(long) X11DRV_SetActiveWindow
|
||||
@ cdecl SetClipboardData(long long long) X11DRV_SetClipboardData
|
||||
@ cdecl SetCapture(long long) X11DRV_SetCapture
|
||||
@ cdecl SetFocus(long) X11DRV_SetFocus
|
||||
@ cdecl SetLayeredWindowAttributes(long long long long) X11DRV_SetLayeredWindowAttributes
|
||||
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
|
||||
index 23f4ab6..fa94136 100644
|
||||
index f5585b1..19cc852 100644
|
||||
--- a/dlls/winex11.drv/x11drv.h
|
||||
+++ b/dlls/winex11.drv/x11drv.h
|
||||
@@ -309,6 +309,7 @@ struct x11drv_thread_data
|
||||
@@ -315,6 +315,7 @@ struct x11drv_thread_data
|
||||
Display *display;
|
||||
XEvent *current_event; /* event currently being processed */
|
||||
HWND grab_hwnd; /* window that currently grabs the mouse */
|
||||
@ -187,7 +187,7 @@ index 23f4ab6..fa94136 100644
|
||||
HWND last_focus; /* last window that had focus */
|
||||
XIM xim; /* input method */
|
||||
HWND last_xic_hwnd; /* last xic window */
|
||||
@@ -408,6 +409,7 @@ enum x11drv_atoms
|
||||
@@ -416,6 +417,7 @@ enum x11drv_atoms
|
||||
XATOM_DndSelection,
|
||||
XATOM__ICC_PROFILE,
|
||||
XATOM__MOTIF_WM_HINTS,
|
||||
@ -196,10 +196,10 @@ index 23f4ab6..fa94136 100644
|
||||
XATOM__NET_STARTUP_INFO,
|
||||
XATOM__NET_SUPPORTED,
|
||||
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
|
||||
index d4f5c84..bef9055 100644
|
||||
index c6421a3..2ed5ea9 100644
|
||||
--- a/dlls/winex11.drv/x11drv_main.c
|
||||
+++ b/dlls/winex11.drv/x11drv_main.c
|
||||
@@ -125,6 +125,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] =
|
||||
@@ -126,6 +126,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] =
|
||||
"DndSelection",
|
||||
"_ICC_PROFILE",
|
||||
"_MOTIF_WM_HINTS",
|
||||
@ -208,5 +208,5 @@ index d4f5c84..bef9055 100644
|
||||
"_NET_STARTUP_INFO",
|
||||
"_NET_SUPPORTED",
|
||||
--
|
||||
2.8.0
|
||||
2.9.0
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user