You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
Compare commits
15 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
aa0c8391eb | ||
|
36020b4a0e | ||
|
4fa7fcd631 | ||
|
ebf36e4717 | ||
|
835c92a298 | ||
|
708eb528c0 | ||
|
77a24c72b8 | ||
|
8924ee42d8 | ||
|
e1b2c45272 | ||
|
9b43d37fd1 | ||
|
5b64f435e9 | ||
|
441fd5f422 | ||
|
c103bbb0b6 | ||
|
d88d44f1d9 | ||
|
5e84688c5f |
@@ -1,118 +0,0 @@
|
||||
From 71d1c176af87bdc48326d5883fbea608314ee0a4 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Costa <titan.costa@gmail.com>
|
||||
Date: Sun, 11 Jan 2015 16:29:30 +0100
|
||||
Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple
|
||||
texture to dds file.
|
||||
|
||||
---
|
||||
dlls/d3dx9_36/d3dx9_private.h | 2 ++
|
||||
dlls/d3dx9_36/surface.c | 63 +++++++++++++++++++++++++++++++++++
|
||||
dlls/d3dx9_36/texture.c | 5 +--
|
||||
3 files changed, 66 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
|
||||
index 6a9b3e12b7b..0c6374f35ca 100644
|
||||
--- a/dlls/d3dx9_36/d3dx9_private.h
|
||||
+++ b/dlls/d3dx9_36/d3dx9_private.h
|
||||
@@ -316,6 +316,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO
|
||||
IDirect3DSurface9 **temp_surface, BOOL write);
|
||||
HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect,
|
||||
IDirect3DSurface9 *temp_surface, BOOL update);
|
||||
+HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture,
|
||||
+ const PALETTEENTRY *src_palette);
|
||||
HRESULT d3dx_pixels_init(const void *data, uint32_t row_pitch, uint32_t slice_pitch,
|
||||
const PALETTEENTRY *palette, enum d3dx_pixel_format_id format, uint32_t left, uint32_t top, uint32_t right,
|
||||
uint32_t bottom, uint32_t front, uint32_t back, struct d3dx_pixels *pixels);
|
||||
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
|
||||
index 9d2dc96a979..912a3e3c849 100644
|
||||
--- a/dlls/d3dx9_36/surface.c
|
||||
+++ b/dlls/d3dx9_36/surface.c
|
||||
@@ -628,6 +628,69 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
|
||||
return D3D_OK;
|
||||
}
|
||||
|
||||
+static HRESULT get_surface(D3DRESOURCETYPE type, struct IDirect3DBaseTexture9 *tex,
|
||||
+ int face, UINT level, struct IDirect3DSurface9 **surf)
|
||||
+{
|
||||
+ switch (type)
|
||||
+ {
|
||||
+ case D3DRTYPE_TEXTURE:
|
||||
+ return IDirect3DTexture9_GetSurfaceLevel((IDirect3DTexture9*) tex, level, surf);
|
||||
+ case D3DRTYPE_CUBETEXTURE:
|
||||
+ return IDirect3DCubeTexture9_GetCubeMapSurface((IDirect3DCubeTexture9*) tex, face, level, surf);
|
||||
+ default:
|
||||
+ ERR("Unexpected texture type\n");
|
||||
+ return E_NOTIMPL;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture, const PALETTEENTRY *src_palette)
|
||||
+{
|
||||
+ HRESULT hr;
|
||||
+ D3DRESOURCETYPE type;
|
||||
+ UINT mip_levels;
|
||||
+ IDirect3DSurface9 *surface;
|
||||
+
|
||||
+ type = IDirect3DBaseTexture9_GetType(src_texture);
|
||||
+
|
||||
+ if ((type != D3DRTYPE_TEXTURE) && (type != D3DRTYPE_CUBETEXTURE) && (type != D3DRTYPE_VOLUMETEXTURE))
|
||||
+ return D3DERR_INVALIDCALL;
|
||||
+
|
||||
+ if (type == D3DRTYPE_CUBETEXTURE)
|
||||
+ {
|
||||
+ FIXME("Cube texture not supported yet\n");
|
||||
+ return E_NOTIMPL;
|
||||
+ }
|
||||
+ else if (type == D3DRTYPE_VOLUMETEXTURE)
|
||||
+ {
|
||||
+ FIXME("Volume texture not supported yet\n");
|
||||
+ return E_NOTIMPL;
|
||||
+ }
|
||||
+
|
||||
+ mip_levels = IDirect3DTexture9_GetLevelCount(src_texture);
|
||||
+
|
||||
+ if (mip_levels > 1)
|
||||
+ {
|
||||
+ FIXME("Mipmap not supported yet\n");
|
||||
+ return E_NOTIMPL;
|
||||
+ }
|
||||
+
|
||||
+ if (src_palette)
|
||||
+ {
|
||||
+ FIXME("Saving surfaces with palettized pixel formats not implemented yet\n");
|
||||
+ return E_NOTIMPL;
|
||||
+ }
|
||||
+
|
||||
+ hr = get_surface(type, src_texture, D3DCUBEMAP_FACE_POSITIVE_X, 0, &surface);
|
||||
+
|
||||
+ if (SUCCEEDED(hr))
|
||||
+ {
|
||||
+ hr = save_dds_surface_to_memory(dst_buffer, surface, NULL, NULL);
|
||||
+ IDirect3DSurface9_Release(surface);
|
||||
+ }
|
||||
+
|
||||
+ return hr;
|
||||
+}
|
||||
+
|
||||
static const uint8_t bmp_file_signature[] = { 'B', 'M' };
|
||||
static const uint8_t jpg_file_signature[] = { 0xff, 0xd8 };
|
||||
static const uint8_t png_file_signature[] = { 0x89, 'P', 'N', 'G', 0x0d, 0x0a, 0x1a, 0x0a };
|
||||
diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
|
||||
index 719a2787445..3f76ec209f9 100644
|
||||
--- a/dlls/d3dx9_36/texture.c
|
||||
+++ b/dlls/d3dx9_36/texture.c
|
||||
@@ -1866,10 +1866,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
|
||||
if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL;
|
||||
|
||||
if (file_format == D3DXIFF_DDS)
|
||||
- {
|
||||
- FIXME("DDS file format isn't supported yet\n");
|
||||
- return E_NOTIMPL;
|
||||
- }
|
||||
+ return save_dds_texture_to_memory(dst_buffer, src_texture, src_palette);
|
||||
|
||||
type = IDirect3DBaseTexture9_GetType(src_texture);
|
||||
switch (type)
|
||||
--
|
||||
2.47.2
|
||||
|
@@ -1,2 +0,0 @@
|
||||
Fixes: [26898] Support for DDS file format in D3DXSaveTextureToFileInMemory
|
||||
Disabled: True
|
@@ -1,4 +1,4 @@
|
||||
From 914fe97f7dc20348ec3e1a2e18bcefa9b7cab463 Mon Sep 17 00:00:00 2001
|
||||
From 16f5ebca082d65ca9abeddb857f30ef58f590ea3 Mon Sep 17 00:00:00 2001
|
||||
From: Zebediah Figura <z.figura12@gmail.com>
|
||||
Date: Fri, 8 Jun 2018 18:51:40 -0500
|
||||
Subject: [PATCH] server: Add an object operation to grab the esync file
|
||||
@@ -44,7 +44,7 @@ Split off to decrease patch size.
|
||||
35 files changed, 71 insertions(+)
|
||||
|
||||
diff --git a/server/async.c b/server/async.c
|
||||
index 749c547af4f..2377c737e98 100644
|
||||
index d2d929c9709..9768a4932a6 100644
|
||||
--- a/server/async.c
|
||||
+++ b/server/async.c
|
||||
@@ -78,6 +78,7 @@ static const struct object_ops async_ops =
|
||||
@@ -100,7 +100,7 @@ index 91f159bc7c9..0df7fd2f18e 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/completion.c b/server/completion.c
|
||||
index f9e68c523f1..9093132efac 100644
|
||||
index 99680ae0680..3d750154d1b 100644
|
||||
--- a/server/completion.c
|
||||
+++ b/server/completion.c
|
||||
@@ -92,6 +92,7 @@ static const struct object_ops completion_wait_ops =
|
||||
@@ -120,10 +120,10 @@ index f9e68c523f1..9093132efac 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/console.c b/server/console.c
|
||||
index b64283baf4a..1cc9eea6a50 100644
|
||||
index de6f4e73e31..9bdba479e8c 100644
|
||||
--- a/server/console.c
|
||||
+++ b/server/console.c
|
||||
@@ -81,6 +81,7 @@ static const struct object_ops console_ops =
|
||||
@@ -84,6 +84,7 @@ static const struct object_ops console_ops =
|
||||
console_add_queue, /* add_queue */
|
||||
remove_queue, /* remove_queue */
|
||||
console_signaled, /* signaled */
|
||||
@@ -131,7 +131,7 @@ index b64283baf4a..1cc9eea6a50 100644
|
||||
no_satisfied, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
console_get_fd, /* get_fd */
|
||||
@@ -158,6 +159,7 @@ static const struct object_ops console_server_ops =
|
||||
@@ -161,6 +162,7 @@ static const struct object_ops console_server_ops =
|
||||
add_queue, /* add_queue */
|
||||
remove_queue, /* remove_queue */
|
||||
console_server_signaled, /* signaled */
|
||||
@@ -139,15 +139,15 @@ index b64283baf4a..1cc9eea6a50 100644
|
||||
no_satisfied, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
console_server_get_fd, /* get_fd */
|
||||
@@ -227,6 +229,7 @@ static const struct object_ops screen_buffer_ops =
|
||||
screen_buffer_add_queue, /* add_queue */
|
||||
NULL, /* remove_queue */
|
||||
NULL, /* signaled */
|
||||
@@ -230,6 +232,7 @@ static const struct object_ops screen_buffer_ops =
|
||||
add_queue, /* add_queue */
|
||||
remove_queue, /* remove_queue */
|
||||
screen_buffer_signaled, /* signaled */
|
||||
+ NULL, /* get_esync_fd */
|
||||
NULL, /* satisfied */
|
||||
no_satisfied, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
screen_buffer_get_fd, /* get_fd */
|
||||
@@ -276,6 +279,7 @@ static const struct object_ops console_device_ops =
|
||||
@@ -279,6 +282,7 @@ static const struct object_ops console_device_ops =
|
||||
no_add_queue, /* add_queue */
|
||||
NULL, /* remove_queue */
|
||||
NULL, /* signaled */
|
||||
@@ -155,23 +155,23 @@ index b64283baf4a..1cc9eea6a50 100644
|
||||
no_satisfied, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
@@ -313,6 +317,7 @@ static const struct object_ops console_input_ops =
|
||||
console_input_add_queue, /* add_queue */
|
||||
NULL, /* remove_queue */
|
||||
NULL, /* signaled */
|
||||
@@ -318,6 +322,7 @@ static const struct object_ops console_input_ops =
|
||||
add_queue, /* add_queue */
|
||||
remove_queue, /* remove_queue */
|
||||
console_input_signaled, /* signaled */
|
||||
+ NULL, /* get_esync_fd */
|
||||
no_satisfied, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
console_input_get_fd, /* get_fd */
|
||||
@@ -370,6 +375,7 @@ static const struct object_ops console_output_ops =
|
||||
console_output_add_queue, /* add_queue */
|
||||
NULL, /* remove_queue */
|
||||
NULL, /* signaled */
|
||||
@@ -377,6 +382,7 @@ static const struct object_ops console_output_ops =
|
||||
add_queue, /* add_queue */
|
||||
remove_queue, /* remove_queue */
|
||||
console_output_signaled, /* signaled */
|
||||
+ NULL, /* get_esync_fd */
|
||||
no_satisfied, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
console_output_get_fd, /* get_fd */
|
||||
@@ -428,6 +434,7 @@ static const struct object_ops console_connection_ops =
|
||||
@@ -435,6 +441,7 @@ static const struct object_ops console_connection_ops =
|
||||
no_add_queue, /* add_queue */
|
||||
NULL, /* remove_queue */
|
||||
NULL, /* signaled */
|
||||
@@ -180,7 +180,7 @@ index b64283baf4a..1cc9eea6a50 100644
|
||||
no_signal, /* signal */
|
||||
console_connection_get_fd, /* get_fd */
|
||||
diff --git a/server/debugger.c b/server/debugger.c
|
||||
index c59a0abea77..ca04d4c71ce 100644
|
||||
index 39a740e07e5..0c01ec1c0d3 100644
|
||||
--- a/server/debugger.c
|
||||
+++ b/server/debugger.c
|
||||
@@ -86,6 +86,7 @@ static const struct object_ops debug_event_ops =
|
||||
@@ -200,7 +200,7 @@ index c59a0abea77..ca04d4c71ce 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/device.c b/server/device.c
|
||||
index 436dac6bfe9..f730fa81afa 100644
|
||||
index 1f93cca437d..a0608aa6164 100644
|
||||
--- a/server/device.c
|
||||
+++ b/server/device.c
|
||||
@@ -66,6 +66,7 @@ static const struct object_ops irp_call_ops =
|
||||
@@ -236,7 +236,7 @@ index 436dac6bfe9..f730fa81afa 100644
|
||||
no_signal, /* signal */
|
||||
device_file_get_fd, /* get_fd */
|
||||
diff --git a/server/directory.c b/server/directory.c
|
||||
index b37ec969a9e..a6c0e292071 100644
|
||||
index fd689c561bc..2894f7669db 100644
|
||||
--- a/server/directory.c
|
||||
+++ b/server/directory.c
|
||||
@@ -69,6 +69,7 @@ static const struct object_ops object_type_ops =
|
||||
@@ -268,7 +268,7 @@ index 6a63c0dd5e9..f95dc5a391f 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/event.c b/server/event.c
|
||||
index f1b79b1b35e..c727bfdd1ba 100644
|
||||
index ad7c09acc99..16cea16e9c2 100644
|
||||
--- a/server/event.c
|
||||
+++ b/server/event.c
|
||||
@@ -72,6 +72,7 @@ static const struct object_ops event_ops =
|
||||
@@ -288,7 +288,7 @@ index f1b79b1b35e..c727bfdd1ba 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/fd.c b/server/fd.c
|
||||
index 16328063df6..4ce78db5b33 100644
|
||||
index dde92beb664..b0c28e54360 100644
|
||||
--- a/server/fd.c
|
||||
+++ b/server/fd.c
|
||||
@@ -172,6 +172,7 @@ static const struct object_ops fd_ops =
|
||||
@@ -336,7 +336,7 @@ index 2a839968c25..cbef0c63383 100644
|
||||
no_signal, /* signal */
|
||||
file_get_fd, /* get_fd */
|
||||
diff --git a/server/handle.c b/server/handle.c
|
||||
index e65831b3b22..e6c5707556f 100644
|
||||
index 8968df73647..3d36af360c2 100644
|
||||
--- a/server/handle.c
|
||||
+++ b/server/handle.c
|
||||
@@ -126,6 +126,7 @@ static const struct object_ops handle_table_ops =
|
||||
@@ -348,7 +348,7 @@ index e65831b3b22..e6c5707556f 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/hook.c b/server/hook.c
|
||||
index c2d2823cd61..ab4d0e9dd31 100644
|
||||
index ffe7206369e..921aa8aba2e 100644
|
||||
--- a/server/hook.c
|
||||
+++ b/server/hook.c
|
||||
@@ -81,6 +81,7 @@ static const struct object_ops hook_table_ops =
|
||||
@@ -360,7 +360,7 @@ index c2d2823cd61..ab4d0e9dd31 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/mailslot.c b/server/mailslot.c
|
||||
index 61eceec94e2..92fe938d3b9 100644
|
||||
index c54281c2101..e4c24459f22 100644
|
||||
--- a/server/mailslot.c
|
||||
+++ b/server/mailslot.c
|
||||
@@ -81,6 +81,7 @@ static const struct object_ops mailslot_ops =
|
||||
@@ -396,7 +396,7 @@ index 61eceec94e2..92fe938d3b9 100644
|
||||
no_signal, /* signal */
|
||||
mailslot_device_file_get_fd, /* get_fd */
|
||||
diff --git a/server/mapping.c b/server/mapping.c
|
||||
index 2bf45780375..b84bb08a77b 100644
|
||||
index 247b28cf6f5..d8498b65054 100644
|
||||
--- a/server/mapping.c
|
||||
+++ b/server/mapping.c
|
||||
@@ -67,6 +67,7 @@ static const struct object_ops ranges_ops =
|
||||
@@ -436,7 +436,7 @@ index af0efe72132..4785a830e92 100644
|
||||
mutex_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/named_pipe.c b/server/named_pipe.c
|
||||
index dd8c14b30a9..5880b601d3a 100644
|
||||
index 6e4ae371a1b..0eebd68abe6 100644
|
||||
--- a/server/named_pipe.c
|
||||
+++ b/server/named_pipe.c
|
||||
@@ -119,6 +119,7 @@ static const struct object_ops named_pipe_ops =
|
||||
@@ -480,7 +480,7 @@ index dd8c14b30a9..5880b601d3a 100644
|
||||
no_signal, /* signal */
|
||||
named_pipe_device_file_get_fd, /* get_fd */
|
||||
diff --git a/server/object.c b/server/object.c
|
||||
index b1665fb5372..0a4d1bede06 100644
|
||||
index cd368ef724a..4d8fcc5a774 100644
|
||||
--- a/server/object.c
|
||||
+++ b/server/object.c
|
||||
@@ -108,6 +108,7 @@ static const struct object_ops apc_reserve_ops =
|
||||
@@ -500,7 +500,7 @@ index b1665fb5372..0a4d1bede06 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/object.h b/server/object.h
|
||||
index 6222e3352ed..0a65d0e3892 100644
|
||||
index 1058f9bfb0a..4acf6f03572 100644
|
||||
--- a/server/object.h
|
||||
+++ b/server/object.h
|
||||
@@ -78,6 +78,8 @@ struct object_ops
|
||||
@@ -513,7 +513,7 @@ index 6222e3352ed..0a65d0e3892 100644
|
||||
void (*satisfied)(struct object *,struct wait_queue_entry *);
|
||||
/* signal an object */
|
||||
diff --git a/server/process.c b/server/process.c
|
||||
index 49f5c75005f..dc83a089655 100644
|
||||
index b161e3394ba..b3676936317 100644
|
||||
--- a/server/process.c
|
||||
+++ b/server/process.c
|
||||
@@ -105,6 +105,7 @@ static const struct object_ops process_ops =
|
||||
@@ -541,7 +541,7 @@ index 49f5c75005f..dc83a089655 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/queue.c b/server/queue.c
|
||||
index 984d466b66e..8a95055db40 100644
|
||||
index 2d23fb0def8..19486a745be 100644
|
||||
--- a/server/queue.c
|
||||
+++ b/server/queue.c
|
||||
@@ -165,6 +165,7 @@ static const struct object_ops msg_queue_ops =
|
||||
@@ -561,7 +561,7 @@ index 984d466b66e..8a95055db40 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/registry.c b/server/registry.c
|
||||
index cc9a33fff1d..c19e92c9750 100644
|
||||
index c60c737feff..34c422dcc6f 100644
|
||||
--- a/server/registry.c
|
||||
+++ b/server/registry.c
|
||||
@@ -180,6 +180,7 @@ static const struct object_ops key_ops =
|
||||
@@ -573,10 +573,10 @@ index cc9a33fff1d..c19e92c9750 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/request.c b/server/request.c
|
||||
index dabcea68309..832a33917b4 100644
|
||||
index 2254315b79e..f4f5e713935 100644
|
||||
--- a/server/request.c
|
||||
+++ b/server/request.c
|
||||
@@ -90,6 +90,7 @@ static const struct object_ops master_socket_ops =
|
||||
@@ -89,6 +89,7 @@ static const struct object_ops master_socket_ops =
|
||||
no_add_queue, /* add_queue */
|
||||
NULL, /* remove_queue */
|
||||
NULL, /* signaled */
|
||||
@@ -621,10 +621,10 @@ index 19b76d44c16..55cd6aa037e 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/sock.c b/server/sock.c
|
||||
index d2ec882554f..44a4e3b7b15 100644
|
||||
index e064f867ff4..e9e81d9ecd0 100644
|
||||
--- a/server/sock.c
|
||||
+++ b/server/sock.c
|
||||
@@ -471,6 +471,7 @@ static const struct object_ops sock_ops =
|
||||
@@ -486,6 +486,7 @@ static const struct object_ops sock_ops =
|
||||
add_queue, /* add_queue */
|
||||
remove_queue, /* remove_queue */
|
||||
default_fd_signaled, /* signaled */
|
||||
@@ -632,7 +632,7 @@ index d2ec882554f..44a4e3b7b15 100644
|
||||
no_satisfied, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
sock_get_fd, /* get_fd */
|
||||
@@ -3599,6 +3600,7 @@ static const struct object_ops ifchange_ops =
|
||||
@@ -3695,6 +3696,7 @@ static const struct object_ops ifchange_ops =
|
||||
no_add_queue, /* add_queue */
|
||||
NULL, /* remove_queue */
|
||||
NULL, /* signaled */
|
||||
@@ -640,7 +640,7 @@ index d2ec882554f..44a4e3b7b15 100644
|
||||
no_satisfied, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
ifchange_get_fd, /* get_fd */
|
||||
@@ -3820,6 +3822,7 @@ static const struct object_ops socket_device_ops =
|
||||
@@ -3916,6 +3918,7 @@ static const struct object_ops socket_device_ops =
|
||||
no_add_queue, /* add_queue */
|
||||
NULL, /* remove_queue */
|
||||
NULL, /* signaled */
|
||||
@@ -649,7 +649,7 @@ index d2ec882554f..44a4e3b7b15 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/symlink.c b/server/symlink.c
|
||||
index dd28efd3a75..c7f34412317 100644
|
||||
index 74b60162c01..2dd9c6a798d 100644
|
||||
--- a/server/symlink.c
|
||||
+++ b/server/symlink.c
|
||||
@@ -71,6 +71,7 @@ static const struct object_ops symlink_ops =
|
||||
@@ -661,10 +661,10 @@ index dd28efd3a75..c7f34412317 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/thread.c b/server/thread.c
|
||||
index 506adfc0a6f..339cdfec1fa 100644
|
||||
index c7d1c6c55c8..ac000826599 100644
|
||||
--- a/server/thread.c
|
||||
+++ b/server/thread.c
|
||||
@@ -96,6 +96,7 @@ static const struct object_ops thread_apc_ops =
|
||||
@@ -106,6 +106,7 @@ static const struct object_ops thread_apc_ops =
|
||||
add_queue, /* add_queue */
|
||||
remove_queue, /* remove_queue */
|
||||
thread_apc_signaled, /* signaled */
|
||||
@@ -672,7 +672,7 @@ index 506adfc0a6f..339cdfec1fa 100644
|
||||
no_satisfied, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
@@ -138,6 +139,7 @@ static const struct object_ops context_ops =
|
||||
@@ -148,6 +149,7 @@ static const struct object_ops context_ops =
|
||||
add_queue, /* add_queue */
|
||||
remove_queue, /* remove_queue */
|
||||
context_signaled, /* signaled */
|
||||
@@ -680,7 +680,7 @@ index 506adfc0a6f..339cdfec1fa 100644
|
||||
no_satisfied, /* satisfied */
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
@@ -187,6 +189,7 @@ static const struct object_ops thread_ops =
|
||||
@@ -197,6 +199,7 @@ static const struct object_ops thread_ops =
|
||||
add_queue, /* add_queue */
|
||||
remove_queue, /* remove_queue */
|
||||
thread_signaled, /* signaled */
|
||||
@@ -689,7 +689,7 @@ index 506adfc0a6f..339cdfec1fa 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/timer.c b/server/timer.c
|
||||
index 96dc9d00ca1..f59902d5607 100644
|
||||
index b0b6ec81535..883f30fa97e 100644
|
||||
--- a/server/timer.c
|
||||
+++ b/server/timer.c
|
||||
@@ -76,6 +76,7 @@ static const struct object_ops timer_ops =
|
||||
@@ -701,7 +701,7 @@ index 96dc9d00ca1..f59902d5607 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/token.c b/server/token.c
|
||||
index 48ee1eca8fe..479596bdbfa 100644
|
||||
index 7e20c670a16..b638ed192cb 100644
|
||||
--- a/server/token.c
|
||||
+++ b/server/token.c
|
||||
@@ -145,6 +145,7 @@ static const struct object_ops token_ops =
|
||||
@@ -713,7 +713,7 @@ index 48ee1eca8fe..479596bdbfa 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/window.c b/server/window.c
|
||||
index 412592fbc71..94a70ce890f 100644
|
||||
index f7f9d5e517f..8c416d8c88f 100644
|
||||
--- a/server/window.c
|
||||
+++ b/server/window.c
|
||||
@@ -107,6 +107,7 @@ static const struct object_ops window_ops =
|
||||
@@ -725,7 +725,7 @@ index 412592fbc71..94a70ce890f 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
diff --git a/server/winstation.c b/server/winstation.c
|
||||
index e5f4bfec357..50fe34aa9ce 100644
|
||||
index b3746090ccf..126b70d625a 100644
|
||||
--- a/server/winstation.c
|
||||
+++ b/server/winstation.c
|
||||
@@ -76,6 +76,7 @@ static const struct object_ops winstation_ops =
|
||||
@@ -745,5 +745,5 @@ index e5f4bfec357..50fe34aa9ce 100644
|
||||
no_signal, /* signal */
|
||||
no_get_fd, /* get_fd */
|
||||
--
|
||||
2.45.2
|
||||
2.47.2
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From 33961353f1d7e0590c83927e632a6d43b2a81fa2 Mon Sep 17 00:00:00 2001
|
||||
From a955d4d49edc6bbd44ee168f42cd1773f4868533 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Gofman <pgofman@codeweavers.com>
|
||||
Date: Tue, 14 Jan 2020 21:39:23 +0300
|
||||
Subject: [PATCH] ntdll: Increase step after failed map attempt in
|
||||
@@ -9,10 +9,10 @@ Subject: [PATCH] ntdll: Increase step after failed map attempt in
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
|
||||
index 75e6319c007..9ddd9a3a218 100644
|
||||
index 4b952b765d7..6a24eb0fa8e 100644
|
||||
--- a/dlls/ntdll/unix/virtual.c
|
||||
+++ b/dlls/ntdll/unix/virtual.c
|
||||
@@ -1306,6 +1306,7 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
|
||||
@@ -1382,6 +1382,7 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
|
||||
step == 0)
|
||||
break;
|
||||
start = (char *)start + step;
|
||||
@@ -21,5 +21,5 @@ index 75e6319c007..9ddd9a3a218 100644
|
||||
|
||||
return NULL;
|
||||
--
|
||||
2.43.0
|
||||
2.49.0
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From d853eba76fd849e21b5cb4ce0a3f113ba9beea87 Mon Sep 17 00:00:00 2001
|
||||
From c86b01cc0809af60b05bcc8ce66a6001cd4b993b Mon Sep 17 00:00:00 2001
|
||||
From: Paul Gofman <pgofman@codeweavers.com>
|
||||
Date: Thu, 23 Jul 2020 18:40:39 +0300
|
||||
Subject: [PATCH] ntdll: Increase free ranges view block size on 64 bit.
|
||||
@@ -8,10 +8,10 @@ Subject: [PATCH] ntdll: Increase free ranges view block size on 64 bit.
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
|
||||
index 9ddd9a3a218..30d0df85fba 100644
|
||||
index 6a24eb0fa8e..a36c919d47f 100644
|
||||
--- a/dlls/ntdll/unix/virtual.c
|
||||
+++ b/dlls/ntdll/unix/virtual.c
|
||||
@@ -210,7 +210,11 @@ static BYTE *pages_vprot;
|
||||
@@ -221,7 +221,11 @@ static BYTE *pages_vprot;
|
||||
#endif
|
||||
|
||||
static struct file_view *view_block_start, *view_block_end, *next_free_view;
|
||||
@@ -24,5 +24,5 @@ index 9ddd9a3a218..30d0df85fba 100644
|
||||
static void *preload_reserve_end;
|
||||
static BOOL force_exec_prot; /* whether to force PROT_EXEC on all PROT_READ mmaps */
|
||||
--
|
||||
2.43.0
|
||||
2.49.0
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From 4c246e61f0de05a8b80e7a5d5ff2edcd21036fec Mon Sep 17 00:00:00 2001
|
||||
From e5c4a6bd332d7d125e9db79fa29b14e55e3a1ee5 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Gofman <pgofman@codeweavers.com>
|
||||
Date: Mon, 25 Nov 2019 12:19:20 +0300
|
||||
Subject: [PATCH] ntdll: Force virtual memory allocation order.
|
||||
@@ -12,14 +12,14 @@ are from higher memory than they expect.
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48175
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46568
|
||||
---
|
||||
dlls/ntdll/unix/virtual.c | 410 +++++++++++++++-----------------------
|
||||
1 file changed, 164 insertions(+), 246 deletions(-)
|
||||
dlls/ntdll/unix/virtual.c | 402 +++++++++++++++-----------------------
|
||||
1 file changed, 162 insertions(+), 240 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
|
||||
index 1a3d527f186..ec72d692c3a 100644
|
||||
index a36c919d47f..2f682e70ec2 100644
|
||||
--- a/dlls/ntdll/unix/virtual.c
|
||||
+++ b/dlls/ntdll/unix/virtual.c
|
||||
@@ -1269,43 +1269,15 @@ static struct file_view *find_view_range( const void *addr, size_t size )
|
||||
@@ -1324,43 +1324,15 @@ static struct file_view *find_view_range( const void *addr, size_t size )
|
||||
}
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ index 1a3d527f186..ec72d692c3a 100644
|
||||
|
||||
/***********************************************************************
|
||||
* try_map_free_area
|
||||
@@ -1338,112 +1310,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
|
||||
@@ -1393,112 +1365,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
|
||||
}
|
||||
|
||||
|
||||
@@ -184,7 +184,7 @@ index 1a3d527f186..ec72d692c3a 100644
|
||||
/***********************************************************************
|
||||
* remove_reserved_area
|
||||
*
|
||||
@@ -1553,8 +1419,7 @@ static void free_view( struct file_view *view )
|
||||
@@ -1613,8 +1479,7 @@ static void free_view( struct file_view *view )
|
||||
*/
|
||||
static void unregister_view( struct file_view *view )
|
||||
{
|
||||
@@ -194,7 +194,7 @@ index 1a3d527f186..ec72d692c3a 100644
|
||||
wine_rb_remove( &views_tree, &view->entry );
|
||||
}
|
||||
|
||||
@@ -1582,8 +1447,7 @@ static void delete_view( struct file_view *view ) /* [in] View */
|
||||
@@ -1642,8 +1507,7 @@ static void delete_view( struct file_view *view ) /* [in] View */
|
||||
static void register_view( struct file_view *view )
|
||||
{
|
||||
wine_rb_put( &views_tree, view->base, &view->entry );
|
||||
@@ -204,7 +204,7 @@ index 1a3d527f186..ec72d692c3a 100644
|
||||
}
|
||||
|
||||
|
||||
@@ -1855,89 +1719,176 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want
|
||||
@@ -1919,89 +1783,176 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want
|
||||
return ptr;
|
||||
}
|
||||
|
||||
@@ -362,8 +362,8 @@ index 1a3d527f186..ec72d692c3a 100644
|
||||
-
|
||||
- if (start >= limit_high) continue;
|
||||
- if (end <= limit_low) return NULL;
|
||||
- if (start < limit_low) start = limit_low;
|
||||
- if (end > limit_high) end = limit_high;
|
||||
- if (start < limit_low) start = (void *)ROUND_SIZE( 0, limit_low, host_page_mask );
|
||||
- if (end > limit_high) end = ROUND_ADDR( limit_high, host_page_mask );
|
||||
- ptr = find_reserved_free_area_outside_preloader( start, end, size, top_down, align_mask );
|
||||
- if (ptr) break;
|
||||
- }
|
||||
@@ -396,8 +396,8 @@ index 1a3d527f186..ec72d692c3a 100644
|
||||
+
|
||||
+ TRACE("range %p-%p.\n", base, end);
|
||||
+
|
||||
+ if (base < limit_low) base = limit_low;
|
||||
+ if (end > limit_high) end = limit_high;
|
||||
+ if (base < limit_low) base = (void *)ROUND_SIZE( 0, limit_low, host_page_mask );
|
||||
+ if (end > limit_high) end = ROUND_ADDR( limit_high, host_page_mask );
|
||||
+ if (base > end || end - base < size) continue;
|
||||
+
|
||||
+ if (reserve_end >= base)
|
||||
@@ -407,8 +407,8 @@ index 1a3d527f186..ec72d692c3a 100644
|
||||
-
|
||||
- if (start >= limit_high) return NULL;
|
||||
- if (end <= limit_low) continue;
|
||||
- if (start < limit_low) start = limit_low;
|
||||
- if (end > limit_high) end = limit_high;
|
||||
- if (start < limit_low) start = (void *)ROUND_SIZE( 0, limit_low, host_page_mask );
|
||||
- if (end > limit_high) end = ROUND_ADDR( limit_high, host_page_mask );
|
||||
- ptr = find_reserved_free_area_outside_preloader( start, end, size, top_down, align_mask );
|
||||
- if (ptr) break;
|
||||
+ if (reserve_end >= end)
|
||||
@@ -442,31 +442,24 @@ index 1a3d527f186..ec72d692c3a 100644
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
@@ -2041,48 +1992,13 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
|
||||
}
|
||||
else
|
||||
{
|
||||
- void *start = address_space_start;
|
||||
- void *end = min( user_space_limit, host_addr_space_limit );
|
||||
- size_t view_size, unmap_size;
|
||||
@@ -2112,43 +2063,12 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
|
||||
void *start = address_space_start;
|
||||
void *end = min( user_space_limit, host_addr_space_limit );
|
||||
size_t host_size = ROUND_SIZE( 0, size, host_page_mask );
|
||||
- size_t unmap_size, view_size = host_size + align_mask + 1;
|
||||
-
|
||||
+ limit_high = limit_high ? min( limit_high + 1, (UINT_PTR)user_space_limit) : (UINT_PTR)user_space_limit;
|
||||
+ if (limit_low < (ULONG_PTR)address_space_start) limit_low = (ULONG_PTR)address_space_start;
|
||||
if (!align_mask) align_mask = granularity_mask;
|
||||
- view_size = size + align_mask + 1;
|
||||
-
|
||||
- if (limit_low && (void *)limit_low > start) start = (void *)limit_low;
|
||||
- if (limit_high && (void *)limit_high < end) end = (char *)limit_high + 1;
|
||||
-
|
||||
- if ((ptr = map_reserved_area( start, end, size, top_down, get_unix_prot(vprot), align_mask )))
|
||||
if (limit_low && (void *)limit_low > start) start = (void *)limit_low;
|
||||
if (limit_high && (void *)limit_high < end) end = (char *)limit_high + 1;
|
||||
|
||||
- if ((ptr = map_reserved_area( start, end, host_size, top_down, get_unix_prot(vprot), align_mask )))
|
||||
- {
|
||||
- TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size );
|
||||
- goto done;
|
||||
- }
|
||||
|
||||
-
|
||||
- if (start > address_space_start || end < host_addr_space_limit || top_down)
|
||||
- {
|
||||
- if (!(ptr = map_free_area( start, end, size, top_down, get_unix_prot(vprot), align_mask )))
|
||||
- if (!(ptr = map_free_area( start, end, host_size, top_down, get_unix_prot(vprot), align_mask )))
|
||||
- return STATUS_NO_MEMORY;
|
||||
- TRACE( "got mem with map_free_area %p-%p\n", ptr, (char *)ptr + size );
|
||||
- goto done;
|
||||
@@ -487,15 +480,15 @@ index 1a3d527f186..ec72d692c3a 100644
|
||||
- unmap_size = unmap_area_above_user_limit( ptr, view_size );
|
||||
- if (unmap_size) munmap( ptr, unmap_size );
|
||||
- }
|
||||
- ptr = unmap_extra_space( ptr, view_size, size, align_mask );
|
||||
+ if (!(ptr = alloc_free_area( (void *)limit_low, (void *)limit_high, size, top_down, get_unix_prot( vprot ), align_mask )))
|
||||
- ptr = unmap_extra_space( ptr, view_size, host_size, align_mask );
|
||||
+ if (!(ptr = alloc_free_area( start, end, host_size, top_down, get_unix_prot( vprot ), align_mask )))
|
||||
+ return STATUS_NO_MEMORY;
|
||||
}
|
||||
-done:
|
||||
status = create_view( view_ret, ptr, size, vprot );
|
||||
if (status != STATUS_SUCCESS) unmap_area( ptr, size );
|
||||
return status;
|
||||
@@ -3275,6 +3191,7 @@ static unsigned int virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_P
|
||||
@@ -3413,6 +3333,7 @@ static unsigned int virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_P
|
||||
done:
|
||||
server_leave_uninterrupted_section( &virtual_mutex, &sigset );
|
||||
if (needs_close) close( unix_handle );
|
||||
@@ -503,7 +496,7 @@ index 1a3d527f186..ec72d692c3a 100644
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -6394,6 +6311,7 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL
|
||||
@@ -6624,6 +6545,7 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL
|
||||
*ret = (ULONG_PTR)base;
|
||||
*size_ptr = size;
|
||||
}
|
||||
@@ -512,5 +505,5 @@ index 1a3d527f186..ec72d692c3a 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
@@ -1,17 +1,17 @@
|
||||
From 844ba5e56a7231f65b65cabf06fe44ee49876aa0 Mon Sep 17 00:00:00 2001
|
||||
From 09d76a4049ee4cc8bce4ffafc349da326fc058e0 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Gofman <pgofman@codeweavers.com>
|
||||
Date: Fri, 1 Dec 2023 14:55:20 -0600
|
||||
Subject: [PATCH] ntdll: Exclude natively mapped areas from free areas list.
|
||||
|
||||
---
|
||||
dlls/ntdll/unix/virtual.c | 106 ++++++++++++++++++++++++++++++++++----
|
||||
1 file changed, 97 insertions(+), 9 deletions(-)
|
||||
dlls/ntdll/unix/virtual.c | 105 ++++++++++++++++++++++++++++++++++----
|
||||
1 file changed, 96 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
|
||||
index ec72d692c3a..30d43afc076 100644
|
||||
index 2f682e70ec2..6170363f0a0 100644
|
||||
--- a/dlls/ntdll/unix/virtual.c
|
||||
+++ b/dlls/ntdll/unix/virtual.c
|
||||
@@ -127,6 +127,7 @@ struct file_view
|
||||
@@ -135,6 +135,7 @@ struct file_view
|
||||
#define VPROT_SYSTEM 0x0200 /* system view (underlying mmap not under our control) */
|
||||
#define VPROT_PLACEHOLDER 0x0400
|
||||
#define VPROT_FREE_PLACEHOLDER 0x0800
|
||||
@@ -19,7 +19,7 @@ index ec72d692c3a..30d43afc076 100644
|
||||
|
||||
/* Conversion from VPROT_* to Win32 flags */
|
||||
static const BYTE VIRTUAL_Win32Flags[16] =
|
||||
@@ -175,6 +176,8 @@ static void *working_set_limit = (void *)0x7fff0000;
|
||||
@@ -191,6 +192,8 @@ static void *working_set_limit = (void *)0x7fff0000;
|
||||
static void *host_addr_space_limit; /* top of the host virtual address space */
|
||||
|
||||
static struct file_view *arm64ec_view;
|
||||
@@ -28,7 +28,7 @@ index ec72d692c3a..30d43afc076 100644
|
||||
|
||||
ULONG_PTR user_space_wow_limit = 0;
|
||||
struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000;
|
||||
@@ -1157,7 +1160,9 @@ static void dump_view( struct file_view *view )
|
||||
@@ -1212,7 +1215,9 @@ static void dump_view( struct file_view *view )
|
||||
BYTE prot = get_page_vprot( addr );
|
||||
|
||||
TRACE( "View: %p - %p", addr, addr + view->size - 1 );
|
||||
@@ -39,7 +39,7 @@ index ec72d692c3a..30d43afc076 100644
|
||||
TRACE( " (builtin image)\n" );
|
||||
else if (view->protect & VPROT_FREE_PLACEHOLDER)
|
||||
TRACE( " (placeholder)\n" );
|
||||
@@ -1277,6 +1282,8 @@ struct alloc_area
|
||||
@@ -1332,6 +1337,8 @@ struct alloc_area
|
||||
int unix_prot;
|
||||
BOOL top_down;
|
||||
UINT_PTR align_mask;
|
||||
@@ -48,7 +48,7 @@ index ec72d692c3a..30d43afc076 100644
|
||||
};
|
||||
|
||||
/***********************************************************************
|
||||
@@ -1285,9 +1292,14 @@ struct alloc_area
|
||||
@@ -1340,9 +1347,13 @@ struct alloc_area
|
||||
* Try mmaping some expected free memory region, eventually stepping and
|
||||
* retrying inside it, and return where it actually succeeded, or NULL.
|
||||
*/
|
||||
@@ -60,12 +60,11 @@ index ec72d692c3a..30d43afc076 100644
|
||||
+ size_t abs_step = step > 0 ? step : -step;
|
||||
+ size_t size = area->size;
|
||||
+ int unix_prot = area->unix_prot;
|
||||
+ void *ptr;
|
||||
+
|
||||
while (start && base <= start && (char*)start + size <= (char*)end)
|
||||
{
|
||||
if (anon_mmap_tryfixed( start, size, unix_prot, 0 ) != MAP_FAILED) return start;
|
||||
@@ -1298,12 +1310,19 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
|
||||
@@ -1353,12 +1364,19 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
|
||||
strerror(errno), start, (char *)start + size, unix_prot );
|
||||
return NULL;
|
||||
}
|
||||
@@ -86,7 +85,7 @@ index ec72d692c3a..30d43afc076 100644
|
||||
}
|
||||
|
||||
return NULL;
|
||||
@@ -1727,11 +1746,11 @@ static void *try_map_free_area_range( struct alloc_area *area, char *start, char
|
||||
@@ -1791,11 +1809,11 @@ static void *try_map_free_area_range( struct alloc_area *area, char *start, char
|
||||
{
|
||||
if (end - start < area->size) return NULL;
|
||||
alloc_start = ROUND_ADDR( end - area->size, area->align_mask );
|
||||
@@ -100,7 +99,7 @@ index ec72d692c3a..30d43afc076 100644
|
||||
}
|
||||
|
||||
static void *alloc_free_area_in_range( struct alloc_area *area, char *base, char *end )
|
||||
@@ -1821,9 +1840,10 @@ static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BO
|
||||
@@ -1885,9 +1903,10 @@ static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BO
|
||||
struct range_entry *range, *ranges_start, *ranges_end;
|
||||
char *reserve_start, *reserve_end;
|
||||
struct alloc_area area;
|
||||
@@ -112,7 +111,7 @@ index ec72d692c3a..30d43afc076 100644
|
||||
|
||||
TRACE("limit %p-%p, size %p, top_down %#x.\n", limit_low, limit_high, (void *)size, top_down);
|
||||
|
||||
@@ -1888,6 +1908,50 @@ static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BO
|
||||
@@ -1952,6 +1971,50 @@ static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BO
|
||||
if ((result = alloc_free_area_in_range( &area, base, end )))
|
||||
break;
|
||||
}
|
||||
@@ -163,7 +162,7 @@ index ec72d692c3a..30d43afc076 100644
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1947,6 +2011,17 @@ failed:
|
||||
@@ -2012,6 +2075,17 @@ failed:
|
||||
return status;
|
||||
}
|
||||
|
||||
@@ -181,10 +180,10 @@ index ec72d692c3a..30d43afc076 100644
|
||||
/***********************************************************************
|
||||
* map_view
|
||||
*
|
||||
@@ -1997,7 +2072,15 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
|
||||
if (!align_mask) align_mask = granularity_mask;
|
||||
@@ -2067,7 +2141,15 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
|
||||
if (limit_high && (void *)limit_high < end) end = (char *)limit_high + 1;
|
||||
|
||||
if (!(ptr = alloc_free_area( (void *)limit_low, (void *)limit_high, size, top_down, get_unix_prot( vprot ), align_mask )))
|
||||
if (!(ptr = alloc_free_area( start, end, host_size, top_down, get_unix_prot( vprot ), align_mask )))
|
||||
- return STATUS_NO_MEMORY;
|
||||
+ {
|
||||
+ WARN("Allocation failed, clearing native views.\n");
|
||||
@@ -198,7 +197,7 @@ index ec72d692c3a..30d43afc076 100644
|
||||
}
|
||||
status = create_view( view_ret, ptr, size, vprot );
|
||||
if (status != STATUS_SUCCESS) unmap_area( ptr, size );
|
||||
@@ -4346,7 +4429,12 @@ void virtual_set_force_exec( BOOL enable )
|
||||
@@ -4503,7 +4585,12 @@ void virtual_set_force_exec( BOOL enable )
|
||||
WINE_RB_FOR_EACH_ENTRY( view, &views_tree, struct file_view, entry )
|
||||
{
|
||||
/* file mappings are always accessible */
|
||||
@@ -213,5 +212,5 @@ index ec72d692c3a..30d43afc076 100644
|
||||
mprotect_range( view->base, view->size, commit, 0 );
|
||||
}
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
@@ -1,7 +1,8 @@
|
||||
From 03c96b5a2e215a7aa7d8c74ca3fbb5794fdcc95f Mon Sep 17 00:00:00 2001
|
||||
From afd4ad0f6725f49daaa0fe2351c98faa6a57519a Mon Sep 17 00:00:00 2001
|
||||
From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
|
||||
Date: Sat, 6 Feb 2021 12:52:51 -0700
|
||||
Subject: kernelbase: Add support for deleting reparse points with DeleteFile.
|
||||
Subject: [PATCH] kernelbase: Add support for deleting reparse points with
|
||||
DeleteFile.
|
||||
|
||||
Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
|
||||
---
|
||||
@@ -10,11 +11,11 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
|
||||
2 files changed, 11 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
|
||||
index 6214f549406..17c25eb5858 100644
|
||||
index 36b43d345d6..b7d16410d75 100644
|
||||
--- a/dlls/kernelbase/file.c
|
||||
+++ b/dlls/kernelbase/file.c
|
||||
@@ -993,7 +993,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeleteFileW( LPCWSTR path )
|
||||
|
||||
@@ -1002,7 +1002,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeleteFileW( LPCWSTR path )
|
||||
InitializeObjectAttributes( &attr, &nameW, OBJ_CASE_INSENSITIVE, 0, NULL );
|
||||
status = NtCreateFile(&hFile, SYNCHRONIZE | DELETE, &attr, &io, NULL, 0,
|
||||
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
|
||||
- FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0);
|
||||
@@ -24,10 +25,10 @@ index 6214f549406..17c25eb5858 100644
|
||||
|
||||
RtlFreeUnicodeString( &nameW );
|
||||
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
|
||||
index f3aad01ee93..4e3f0f04a3e 100644
|
||||
index d4833d84906..598fdc77830 100644
|
||||
--- a/dlls/ntdll/tests/file.c
|
||||
+++ b/dlls/ntdll/tests/file.c
|
||||
@@ -5367,7 +5367,7 @@ static void test_reparse_points(void)
|
||||
@@ -6007,7 +6007,7 @@ static void test_reparse_points(void)
|
||||
REPARSE_GUID_DATA_BUFFER guid_buffer;
|
||||
static const WCHAR dotW[] = {'.',0};
|
||||
REPARSE_DATA_BUFFER *buffer = NULL;
|
||||
@@ -36,7 +37,7 @@ index f3aad01ee93..4e3f0f04a3e 100644
|
||||
IO_STATUS_BLOCK iosb;
|
||||
UNICODE_STRING nameW;
|
||||
HANDLE handle;
|
||||
@@ -5532,7 +5532,14 @@ static void test_reparse_points(void)
|
||||
@@ -6172,7 +6172,14 @@ static void test_reparse_points(void)
|
||||
bret = DeviceIoControl(handle, FSCTL_SET_REPARSE_POINT, (LPVOID)buffer, buffer_len, NULL, 0, &dwret, 0);
|
||||
ok(bret, "Failed to create junction point! (0x%lx)\n", GetLastError());
|
||||
CloseHandle(handle);
|
||||
@@ -53,5 +54,5 @@ index f3aad01ee93..4e3f0f04a3e 100644
|
||||
cleanup:
|
||||
/* Cleanup */
|
||||
--
|
||||
2.17.1
|
||||
2.47.2
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From 762d7992e4a328d9fd94e3960c98951ead0e1a0a Mon Sep 17 00:00:00 2001
|
||||
From a34c3f550b16e84f907c637514f0645456420d65 Mon Sep 17 00:00:00 2001
|
||||
From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
|
||||
Date: Sat, 6 Feb 2021 12:46:30 -0700
|
||||
Subject: [PATCH] kernelbase: Add support for moving reparse points with
|
||||
@@ -13,11 +13,11 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
|
||||
4 files changed, 36 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
|
||||
index abec5367512..d7c3797d4a9 100644
|
||||
index b7d16410d75..dccae6cb565 100644
|
||||
--- a/dlls/kernelbase/file.c
|
||||
+++ b/dlls/kernelbase/file.c
|
||||
@@ -2580,7 +2580,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH MoveFileWithProgressW( const WCHAR *source, const
|
||||
|
||||
@@ -2514,7 +2514,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH MoveFileWithProgressW( const WCHAR *source, const
|
||||
InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL );
|
||||
status = NtOpenFile( &source_handle, DELETE | SYNCHRONIZE, &attr, &io,
|
||||
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
|
||||
- FILE_SYNCHRONOUS_IO_NONALERT );
|
||||
@@ -26,10 +26,10 @@ index abec5367512..d7c3797d4a9 100644
|
||||
if (!set_ntstatus( status )) goto error;
|
||||
|
||||
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
|
||||
index a25b6820291..70b10c56ea0 100644
|
||||
index 8b561e162e8..7b6e2776947 100644
|
||||
--- a/dlls/ntdll/tests/file.c
|
||||
+++ b/dlls/ntdll/tests/file.c
|
||||
@@ -5666,7 +5666,8 @@ static INT build_reparse_buffer(const WCHAR *filename, ULONG tag, ULONG flags,
|
||||
@@ -6021,7 +6021,8 @@ static INT build_reparse_buffer(const WCHAR *filename, ULONG tag, ULONG flags,
|
||||
|
||||
static void test_reparse_points(void)
|
||||
{
|
||||
@@ -39,7 +39,7 @@ index a25b6820291..70b10c56ea0 100644
|
||||
static const WCHAR reparseW[] = {'\\','r','e','p','a','r','s','e',0};
|
||||
static const WCHAR targetW[] = {'\\','t','a','r','g','e','t',0};
|
||||
static const WCHAR parentW[] = {'\\','.','.','\\',0};
|
||||
@@ -6037,6 +6038,15 @@ static void test_reparse_points(void)
|
||||
@@ -6392,6 +6393,15 @@ static void test_reparse_points(void)
|
||||
wine_dbgstr_w(dest), wine_dbgstr_w(rel_target));
|
||||
CloseHandle(handle);
|
||||
|
||||
@@ -56,10 +56,10 @@ index a25b6820291..70b10c56ea0 100644
|
||||
/* Cleanup */
|
||||
pRtlFreeUnicodeString(&nameW);
|
||||
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
|
||||
index 1b35463e069..d2e57f5a127 100644
|
||||
index d3045c6c936..49afb57b2b6 100644
|
||||
--- a/dlls/ntdll/unix/file.c
|
||||
+++ b/dlls/ntdll/unix/file.c
|
||||
@@ -5395,8 +5395,10 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
|
||||
@@ -5556,8 +5556,10 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
|
||||
{
|
||||
FILE_RENAME_INFORMATION *info = ptr;
|
||||
unsigned int flags;
|
||||
@@ -70,7 +70,7 @@ index 1b35463e069..d2e57f5a127 100644
|
||||
char *unix_name;
|
||||
|
||||
if (class == FileRenameInformation)
|
||||
@@ -5413,6 +5415,19 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
|
||||
@@ -5574,6 +5576,19 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
|
||||
InitializeObjectAttributes( &attr, &name_str, OBJ_CASE_INSENSITIVE, info->RootDirectory, NULL );
|
||||
get_redirect( &attr, &redir );
|
||||
|
||||
@@ -90,7 +90,7 @@ index 1b35463e069..d2e57f5a127 100644
|
||||
status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF );
|
||||
if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE)
|
||||
{
|
||||
@@ -5429,9 +5444,14 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
|
||||
@@ -5590,9 +5605,14 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io,
|
||||
}
|
||||
SERVER_END_REQ;
|
||||
|
||||
@@ -106,10 +106,10 @@ index 1b35463e069..d2e57f5a127 100644
|
||||
else status = STATUS_INVALID_PARAMETER_3;
|
||||
break;
|
||||
diff --git a/server/fd.c b/server/fd.c
|
||||
index b0cbf28d543..5f1b4ac3114 100644
|
||||
index dd6a61c557d..dde92beb664 100644
|
||||
--- a/server/fd.c
|
||||
+++ b/server/fd.c
|
||||
@@ -2695,7 +2695,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da
|
||||
@@ -2724,7 +2724,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@ index b0cbf28d543..5f1b4ac3114 100644
|
||||
{
|
||||
if (!fstat( fd->unix_fd, &st2 ) && st.st_ino == st2.st_ino && st.st_dev == st2.st_dev)
|
||||
{
|
||||
@@ -2711,7 +2711,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da
|
||||
@@ -2740,7 +2740,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da
|
||||
}
|
||||
|
||||
/* can't replace directories or special files */
|
||||
@@ -127,7 +127,7 @@ index b0cbf28d543..5f1b4ac3114 100644
|
||||
{
|
||||
set_error( STATUS_ACCESS_DENIED );
|
||||
goto failed;
|
||||
@@ -2769,6 +2769,8 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da
|
||||
@@ -2806,6 +2806,8 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da
|
||||
fd->nt_name = dup_nt_name( root, nt_name, &fd->nt_namelen );
|
||||
free( fd->unix_name );
|
||||
fd->closed->unix_name = fd->unix_name = realpath( name, NULL );
|
||||
@@ -137,5 +137,5 @@ index b0cbf28d543..5f1b4ac3114 100644
|
||||
if (!fd->unix_name)
|
||||
set_error( STATUS_NO_MEMORY );
|
||||
--
|
||||
2.42.0
|
||||
2.47.2
|
||||
|
||||
|
@@ -1,18 +1,18 @@
|
||||
From 2cf5a014dcd6f85a1afa76ad8ca6c65f2c17db39 Mon Sep 17 00:00:00 2001
|
||||
From e941585d942942f7b97b73ae24b9a0a486a855e4 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Gofman <pgofman@codeweavers.com>
|
||||
Date: Tue, 14 Jul 2020 15:00:34 +0300
|
||||
Subject: [PATCH] ntdll: Support x86_64 syscall emulation.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/ntdll/unix/signal_x86_64.c | 195 ++++++++++++++++++++++++++++++++
|
||||
2 files changed, 196 insertions(+)
|
||||
dlls/ntdll/unix/signal_x86_64.c | 203 ++++++++++++++++++++++++++++++++
|
||||
2 files changed, 204 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ef21a4313d4..db709285f79 100644
|
||||
index 8192c067e4c..d4abbdb3f37 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -384,6 +384,7 @@ AC_CHECK_HEADERS(\
|
||||
@@ -391,6 +391,7 @@ AC_CHECK_HEADERS(\
|
||||
linux/ioctl.h \
|
||||
linux/major.h \
|
||||
linux/param.h \
|
||||
@@ -21,7 +21,7 @@ index ef21a4313d4..db709285f79 100644
|
||||
linux/types.h \
|
||||
linux/ucdrom.h \
|
||||
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
|
||||
index 537e4e1f60e..58397374ea4 100644
|
||||
index fb5259d8714..93020158d0b 100644
|
||||
--- a/dlls/ntdll/unix/signal_x86_64.c
|
||||
+++ b/dlls/ntdll/unix/signal_x86_64.c
|
||||
@@ -27,6 +27,7 @@
|
||||
@@ -41,8 +41,8 @@ index 537e4e1f60e..58397374ea4 100644
|
||||
#include <unistd.h>
|
||||
#ifdef HAVE_MACHINE_SYSARCH_H
|
||||
# include <machine/sysarch.h>
|
||||
@@ -65,6 +68,14 @@
|
||||
# include <mach/mach.h>
|
||||
@@ -73,6 +76,14 @@
|
||||
extern void _thread_set_tsd_base(uint64_t);
|
||||
#endif
|
||||
|
||||
+#if defined(HAVE_LINUX_FILTER_H) && defined(HAVE_LINUX_SECCOMP_H) && defined(HAVE_SYS_PRCTL_H)
|
||||
@@ -56,7 +56,7 @@ index 537e4e1f60e..58397374ea4 100644
|
||||
#include "ntstatus.h"
|
||||
#define WIN32_NO_STATUS
|
||||
#include "windef.h"
|
||||
@@ -1824,6 +1835,186 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
|
||||
@@ -1857,6 +1868,194 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -146,14 +146,22 @@ index 537e4e1f60e..58397374ea4 100644
|
||||
+
|
||||
+ static struct sock_filter filter[] =
|
||||
+ {
|
||||
+ BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, instruction_pointer) + 4),
|
||||
+ /* Native libs are loaded at high addresses. */
|
||||
+ BPF_JUMP(BPF_JMP | BPF_JGT | BPF_K, NATIVE_SYSCALL_ADDRESS_START >> 32, 0, 1),
|
||||
+ BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW),
|
||||
+ /* Allow i386. */
|
||||
+ BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, arch)),
|
||||
+ BPF_JUMP (BPF_JMP | BPF_JEQ | BPF_K, AUDIT_ARCH_X86_64, 1, 0),
|
||||
+ BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW),
|
||||
+ /* Native libs are loaded at high addresses. */
|
||||
+ BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, instruction_pointer) + 4),
|
||||
+ BPF_JUMP(BPF_JMP | BPF_JGT | BPF_K, NATIVE_SYSCALL_ADDRESS_START >> 32, 0, 8),
|
||||
+ /* High addresses may be top-down allocations, trap those */
|
||||
+ BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, 0x7fff, 1, 0),
|
||||
+ BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW),
|
||||
+ BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, instruction_pointer)),
|
||||
+ BPF_JUMP(BPF_JMP | BPF_JGE | BPF_K, 0xfe000000, 1, 0),
|
||||
+ BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW),
|
||||
+ BPF_JUMP(BPF_JMP | BPF_JGE | BPF_K, 0xffff0000, 0, 1),
|
||||
+ BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_ALLOW),
|
||||
+ BPF_STMT(BPF_RET | BPF_K, SECCOMP_RET_TRAP),
|
||||
+ /* Allow wine64-preloader */
|
||||
+ BPF_STMT(BPF_LD | BPF_W | BPF_ABS, offsetof(struct seccomp_data, instruction_pointer)),
|
||||
+ BPF_JUMP(BPF_JMP | BPF_JGE | BPF_K, 0x7d400000, 1, 0),
|
||||
@@ -243,7 +251,7 @@ index 537e4e1f60e..58397374ea4 100644
|
||||
|
||||
/***********************************************************************
|
||||
* handle_interrupt
|
||||
@@ -2560,10 +2751,14 @@ void signal_init_process(void)
|
||||
@@ -2567,10 +2766,14 @@ void signal_init_process(void)
|
||||
if (sigaction( SIGSEGV, &sig_act, NULL ) == -1) goto error;
|
||||
if (sigaction( SIGILL, &sig_act, NULL ) == -1) goto error;
|
||||
if (sigaction( SIGBUS, &sig_act, NULL ) == -1) goto error;
|
||||
@@ -259,5 +267,5 @@ index 537e4e1f60e..58397374ea4 100644
|
||||
|
||||
error:
|
||||
--
|
||||
2.45.2
|
||||
2.47.2
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From 2d897946980e67f742b9f39f5f548cf0e2340510 Mon Sep 17 00:00:00 2001
|
||||
From f16a96be2b219f8e7733a36dc147f5247b618870 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Wed, 17 Jul 2024 21:55:20 +1000
|
||||
Subject: [PATCH] odbc32: SQLGetData support ODBC v2.0
|
||||
@@ -8,10 +8,10 @@ Subject: [PATCH] odbc32: SQLGetData support ODBC v2.0
|
||||
1 file changed, 24 insertions(+)
|
||||
|
||||
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
|
||||
index 3b3b198eaa8..c2748cd33d7 100644
|
||||
index c16c9a6da69..18d3df1007f 100644
|
||||
--- a/dlls/odbc32/proxyodbc.c
|
||||
+++ b/dlls/odbc32/proxyodbc.c
|
||||
@@ -2450,11 +2450,35 @@ static SQLRETURN get_data_unix( struct statement *stmt, SQLUSMALLINT column, SQL
|
||||
@@ -2468,11 +2468,35 @@ static SQLRETURN get_data_unix( struct statement *stmt, SQLUSMALLINT column, SQL
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ index 3b3b198eaa8..c2748cd33d7 100644
|
||||
if (stmt->hdr.win32_funcs->SQLGetData)
|
||||
+ {
|
||||
+ struct environment *env = (struct environment *)find_object_type(SQL_HANDLE_ENV, stmt->hdr.parent);
|
||||
+ if (env && env->attr_version == SQL_OV_ODBC2)
|
||||
+ if (env && env->driver_ver == SQL_OV_ODBC2)
|
||||
+ {
|
||||
+ if (type == SQL_C_TYPE_TIME)
|
||||
+ type = SQL_C_TIME;
|
||||
@@ -48,5 +48,5 @@ index 3b3b198eaa8..c2748cd33d7 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.45.2
|
||||
2.47.2
|
||||
|
||||
|
@@ -1,26 +1,27 @@
|
||||
From 6b7448e5ebdc0b16f3af606a62e2ca465f3ae026 Mon Sep 17 00:00:00 2001
|
||||
From 5874cf0a309a0ecfa97206b8b15734485920c325 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Wed, 17 Jul 2024 22:03:03 +1000
|
||||
Subject: [PATCH] odbc32: SQLColAttributesW support ODBC v2.0
|
||||
|
||||
---
|
||||
dlls/odbc32/proxyodbc.c | 18 ++++++++++++++++--
|
||||
1 file changed, 16 insertions(+), 2 deletions(-)
|
||||
dlls/odbc32/proxyodbc.c | 19 +++++++++++++++++--
|
||||
1 file changed, 17 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
|
||||
index 71c853013fd..b5c0edb119e 100644
|
||||
index 18d3df1007f..8d51ad37176 100644
|
||||
--- a/dlls/odbc32/proxyodbc.c
|
||||
+++ b/dlls/odbc32/proxyodbc.c
|
||||
@@ -6195,6 +6195,8 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
|
||||
@@ -6256,6 +6256,9 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
|
||||
SQLPOINTER char_attr, SQLSMALLINT buflen, SQLSMALLINT *retlen,
|
||||
SQLLEN *num_attr )
|
||||
{
|
||||
+ struct environment *env;
|
||||
+ SQLRETURN ret = SQL_ERROR;
|
||||
+
|
||||
if (stmt->hdr.win32_funcs->SQLColAttributeW)
|
||||
return stmt->hdr.win32_funcs->SQLColAttributeW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen,
|
||||
retlen, num_attr );
|
||||
@@ -6237,11 +6239,23 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
|
||||
@@ -6315,11 +6318,23 @@ static SQLRETURN col_attribute_win32_w( struct statement *stmt, SQLUSMALLINT col
|
||||
return SQL_ERROR;
|
||||
}
|
||||
|
||||
@@ -28,9 +29,9 @@ index 71c853013fd..b5c0edb119e 100644
|
||||
+ ret = stmt->hdr.win32_funcs->SQLColAttributesW( stmt->hdr.win32_handle, col, field_id, char_attr, buflen,
|
||||
retlen, num_attr );
|
||||
+ /* Convert back for ODBC2 drivers */
|
||||
+ env = (struct environment *)find_object_type(SQL_HANDLE_ENV, stmt->hdr.parent);
|
||||
+ if (SQL_SUCCEEDED(ret) && num_attr && field_id == SQL_COLUMN_TYPE &&
|
||||
+ ((struct environment*)(stmt->hdr.parent))->attr_version == SQL_OV_ODBC2 &&
|
||||
+ ((struct environment*)(stmt->hdr.parent))->driver_ver == SQL_OV_ODBC2)
|
||||
+ env && env->attr_version == SQL_OV_ODBC3 && env->driver_ver == SQL_OV_ODBC2)
|
||||
+ {
|
||||
+ if (*num_attr == SQL_TIME)
|
||||
+ *num_attr = SQL_TYPE_TIME;
|
||||
@@ -47,5 +48,5 @@ index 71c853013fd..b5c0edb119e 100644
|
||||
|
||||
/*************************************************************************
|
||||
--
|
||||
2.43.0
|
||||
2.47.2
|
||||
|
||||
|
@@ -1,288 +0,0 @@
|
||||
From 0a60f26b0ee4664ea253d1155ff943a85f5ba434 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Martinez <kevinrmartinezj@gmail.com>
|
||||
Date: Wed, 17 Jul 2024 15:10:49 -0400
|
||||
Subject: [PATCH] shell32: Added stub for IEnumObjects interface.
|
||||
|
||||
---
|
||||
dlls/actxprxy/usrmarshal.c | 17 ++++
|
||||
dlls/shell32/Makefile.in | 1 +
|
||||
dlls/shell32/enumobjects.c | 166 +++++++++++++++++++++++++++++++
|
||||
dlls/shell32/shell32_classes.idl | 5 +
|
||||
dlls/shell32/shell32_main.h | 1 +
|
||||
dlls/shell32/shellole.c | 1 +
|
||||
include/shobjidl.idl | 14 +++
|
||||
7 files changed, 205 insertions(+)
|
||||
create mode 100644 dlls/shell32/enumobjects.c
|
||||
|
||||
diff --git a/dlls/actxprxy/usrmarshal.c b/dlls/actxprxy/usrmarshal.c
|
||||
index e4eada6848f..43b72e0b002 100644
|
||||
--- a/dlls/actxprxy/usrmarshal.c
|
||||
+++ b/dlls/actxprxy/usrmarshal.c
|
||||
@@ -247,3 +247,20 @@ HRESULT __RPC_STUB IParentAndItem_GetParentAndItem_Proxy(
|
||||
TRACE("(%p)->(%p %p %p)\n", This, parent, folder, child);
|
||||
return IParentAndItem_RemoteGetParentAndItem_Proxy(This, parent, folder, child);
|
||||
}
|
||||
+
|
||||
+HRESULT CALLBACK IEnumObjects_Next_Proxy(IEnumObjects *This, ULONG celt, REFIID riid, void **rgelt, ULONG *pceltFetched)
|
||||
+{
|
||||
+ ULONG fetched;
|
||||
+ TRACE("(%p)->(%ld, %p, %p, %p)\n", This, celt, debugstr_guid(riid), rgelt, pceltFetched);
|
||||
+ if (!pceltFetched) pceltFetched = &fetched;
|
||||
+ return IEnumObjects_RemoteNext_Proxy(This, celt, riid, rgelt, pceltFetched);
|
||||
+}
|
||||
+
|
||||
+HRESULT __RPC_STUB IEnumObjects_Next_Stub(IEnumObjects *This, ULONG celt, REFIID riid, void **rgelt, ULONG *pceltFetched)
|
||||
+{
|
||||
+ HRESULT hr;
|
||||
+ TRACE("(%p)->(%ld, %p, %p, %p)\n", This, celt, debugstr_guid(riid), rgelt, pceltFetched);
|
||||
+ *pceltFetched = 0;
|
||||
+ hr = IEnumObjects_Next(This, celt, riid, rgelt, pceltFetched);
|
||||
+ return hr;
|
||||
+}
|
||||
\ No newline at end of file
|
||||
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
|
||||
index 828d8e82e2d..e071ed6a45d 100644
|
||||
--- a/dlls/shell32/Makefile.in
|
||||
+++ b/dlls/shell32/Makefile.in
|
||||
@@ -21,6 +21,7 @@ SOURCES = \
|
||||
dragdrophelper.c \
|
||||
ebrowser.c \
|
||||
enumidlist.c \
|
||||
+ enumobjects.c \
|
||||
folders.c \
|
||||
iconcache.c \
|
||||
new_menu.c \
|
||||
diff --git a/dlls/shell32/enumobjects.c b/dlls/shell32/enumobjects.c
|
||||
new file mode 100644
|
||||
index 00000000000..16ad52168d8
|
||||
--- /dev/null
|
||||
+++ b/dlls/shell32/enumobjects.c
|
||||
@@ -0,0 +1,166 @@
|
||||
+/*
|
||||
+ * EnumerableObjectCollection
|
||||
+ *
|
||||
+ * Copyright 2024 Kevin Martinez
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
+ */
|
||||
+
|
||||
+#include <stdarg.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
+
|
||||
+#define COBJMACROS
|
||||
+
|
||||
+#include "wine/debug.h"
|
||||
+#include "windef.h"
|
||||
+#include "winbase.h"
|
||||
+#include "winreg.h"
|
||||
+#include "shlwapi.h"
|
||||
+
|
||||
+#include "shell32_main.h"
|
||||
+
|
||||
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
||||
+
|
||||
+struct enum_objects
|
||||
+{
|
||||
+ IEnumObjects IEnumObjects_iface;
|
||||
+ LONG ref;
|
||||
+};
|
||||
+
|
||||
+static inline struct enum_objects *impl_from_IEnumObjects(IEnumObjects *iface)
|
||||
+{
|
||||
+ return CONTAINING_RECORD(iface, struct enum_objects, IEnumObjects_iface);
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI enum_objects_QueryInterface(IEnumObjects *iface, REFIID riid, void **obj)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IEnumObjects(iface);
|
||||
+
|
||||
+ TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj);
|
||||
+
|
||||
+ *obj = NULL;
|
||||
+
|
||||
+ if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IEnumObjects))
|
||||
+ {
|
||||
+ *obj = &This->IEnumObjects_iface;
|
||||
+ }
|
||||
+
|
||||
+ if (*obj)
|
||||
+ {
|
||||
+ IUnknown_AddRef((IUnknown*)*obj);
|
||||
+ return S_OK;
|
||||
+ }
|
||||
+
|
||||
+ WARN("no interface for %s.\n", debugstr_guid(riid));
|
||||
+
|
||||
+ return E_NOINTERFACE;
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI enum_objects_AddRef(IEnumObjects *iface)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IEnumObjects(iface);
|
||||
+ ULONG refcount = InterlockedIncrement(&This->ref);
|
||||
+
|
||||
+ TRACE("(%p): increasing refcount to %lu.\n", This, refcount);
|
||||
+
|
||||
+ return refcount;
|
||||
+}
|
||||
+
|
||||
+ static ULONG WINAPI enum_objects_Release(IEnumObjects *iface)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IEnumObjects(iface);
|
||||
+ ULONG refcount = InterlockedDecrement(&This->ref);
|
||||
+
|
||||
+ TRACE("(%p): decreasing refcount to %lu.\n", This, refcount);
|
||||
+
|
||||
+ if (!refcount)
|
||||
+ {
|
||||
+ free(This);
|
||||
+ }
|
||||
+
|
||||
+ return refcount;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI enum_objects_Next(IEnumObjects *iface, ULONG celt, REFIID riid, void **rgelt, ULONG *celtFetched)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IEnumObjects(iface);
|
||||
+
|
||||
+ FIXME("(%p %ld, %p)->(%p, %p): stub!\n", This, celt, debugstr_guid(riid), rgelt, celtFetched);
|
||||
+
|
||||
+ if (celtFetched)
|
||||
+ *celtFetched = 0;
|
||||
+
|
||||
+ return S_FALSE;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI enum_objects_Skip(IEnumObjects *iface, ULONG celt)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IEnumObjects(iface);
|
||||
+
|
||||
+ FIXME("(%p %ld): stub!\n", This, celt);
|
||||
+
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI enum_objects_Reset(IEnumObjects *iface)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IEnumObjects(iface);
|
||||
+
|
||||
+ FIXME("(%p): stub!\n", This);
|
||||
+
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI enum_objects_Clone(IEnumObjects *iface, IEnumObjects **ppenum)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IEnumObjects(iface);
|
||||
+
|
||||
+ FIXME("(%p)->(%p): stub!\n", This, ppenum);
|
||||
+
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static const IEnumObjectsVtbl enum_objects_vtbl =
|
||||
+{
|
||||
+ enum_objects_QueryInterface,
|
||||
+ enum_objects_AddRef,
|
||||
+ enum_objects_Release,
|
||||
+ enum_objects_Next,
|
||||
+ enum_objects_Skip,
|
||||
+ enum_objects_Reset,
|
||||
+ enum_objects_Clone,
|
||||
+};
|
||||
+
|
||||
+HRESULT WINAPI EnumerableObjectCollection_Constructor(IUnknown *outer, REFIID riid, void **obj)
|
||||
+{
|
||||
+ struct enum_objects *This;
|
||||
+ HRESULT hr;
|
||||
+
|
||||
+ TRACE("(%p, %s, %p)\n", outer, debugstr_guid(riid), obj);
|
||||
+
|
||||
+ if (outer)
|
||||
+ return CLASS_E_NOAGGREGATION;
|
||||
+
|
||||
+ if (!(This = heap_alloc(sizeof(*This))))
|
||||
+ return E_OUTOFMEMORY;
|
||||
+
|
||||
+ This->ref = 1;
|
||||
+ This->IEnumObjects_iface.lpVtbl = &enum_objects_vtbl;
|
||||
+
|
||||
+ hr = IEnumObjects_QueryInterface(&This->IEnumObjects_iface, riid, obj);
|
||||
+ IEnumObjects_Release(&This->IEnumObjects_iface);
|
||||
+ return hr;
|
||||
+}
|
||||
diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl
|
||||
index 932b6f395b2..9e2df630940 100644
|
||||
--- a/dlls/shell32/shell32_classes.idl
|
||||
+++ b/dlls/shell32/shell32_classes.idl
|
||||
@@ -194,3 +194,8 @@ coclass NewMenu {}
|
||||
threading(apartment),
|
||||
uuid(9ac9fbe1-e0a2-4ad6-b4ee-e212013ea917)
|
||||
] coclass ShellItem { interface IShellItem2; }
|
||||
+
|
||||
+[
|
||||
+ threading(apartment),
|
||||
+ uuid(2d3468c1-36a7-43b6-ac24-d3f02fd9607a)
|
||||
+] coclass EnumerableObjectCollection {}
|
||||
diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h
|
||||
index 766c7c23adc..ab3187fd24a 100644
|
||||
--- a/dlls/shell32/shell32_main.h
|
||||
+++ b/dlls/shell32/shell32_main.h
|
||||
@@ -104,6 +104,7 @@ HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, LPV
|
||||
HRESULT WINAPI KnownFolderManager_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv);
|
||||
HRESULT WINAPI IFileOperation_Constructor(IUnknown *outer, REFIID riid, void **out);
|
||||
HRESULT WINAPI ActiveDesktop_Constructor(IUnknown *outer, REFIID riid, void **out);
|
||||
+HRESULT WINAPI EnumerableObjectCollection_Constructor(IUnknown *outer, REFIID riid, void **obj);
|
||||
|
||||
extern HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST, LPWSTR, UINT, int*);
|
||||
HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize);
|
||||
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
|
||||
index aa9bd3e0f3e..fc3f6b032cd 100644
|
||||
--- a/dlls/shell32/shellole.c
|
||||
+++ b/dlls/shell32/shellole.c
|
||||
@@ -87,6 +87,7 @@ static const struct {
|
||||
{&CLSID_ShellImageDataFactory, ShellImageDataFactory_Constructor},
|
||||
{&CLSID_FileOperation, IFileOperation_Constructor},
|
||||
{&CLSID_ActiveDesktop, ActiveDesktop_Constructor},
|
||||
+ {&CLSID_EnumerableObjectCollection, EnumerableObjectCollection_Constructor},
|
||||
{NULL, NULL}
|
||||
};
|
||||
|
||||
diff --git a/include/shobjidl.idl b/include/shobjidl.idl
|
||||
index 4118e3d9ba2..aa393225db1 100644
|
||||
--- a/include/shobjidl.idl
|
||||
+++ b/include/shobjidl.idl
|
||||
@@ -4134,3 +4134,17 @@ interface IFileOperation : IUnknown
|
||||
HRESULT PerformOperations();
|
||||
HRESULT GetAnyOperationsAborted([out] BOOL *aborted);
|
||||
}
|
||||
+
|
||||
+[
|
||||
+ object,
|
||||
+ uuid(2c1c7e2e-2d0e-4059-831e-1e6f82335c2e),
|
||||
+ pointer_default(unique)
|
||||
+]
|
||||
+interface IEnumObjects : IUnknown
|
||||
+{
|
||||
+ [local] HRESULT Next([in] ULONG celt, [in] REFIID riid, [out, iid_is(riid)] void **rgelt, [out, optional] ULONG *pceltFetched);
|
||||
+ [call_as(Next)] HRESULT RemoteNext([in] ULONG celt, [in] REFIID riid, [out, size_is(celt), length_is(*pceltFetched), iid_is(riid)] void **rgelt, [out] ULONG *pceltFetched);
|
||||
+ HRESULT Skip([in] ULONG celt);
|
||||
+ HRESULT Reset();
|
||||
+ HRESULT Clone([out] IEnumObjects **ppenum);
|
||||
+}
|
||||
--
|
||||
2.45.2
|
||||
|
@@ -1,147 +0,0 @@
|
||||
From d3b76c01d434b774c7de82ae8c1e05b566f108b8 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Martinez <kevinrmartinezj@gmail.com>
|
||||
Date: Wed, 24 Jul 2024 17:22:57 -0400
|
||||
Subject: [PATCH] shell32: Added stub for IObjectCollection interface.
|
||||
|
||||
---
|
||||
dlls/shell32/enumobjects.c | 96 ++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 96 insertions(+)
|
||||
|
||||
diff --git a/dlls/shell32/enumobjects.c b/dlls/shell32/enumobjects.c
|
||||
index 16ad52168d8..233919738bf 100644
|
||||
--- a/dlls/shell32/enumobjects.c
|
||||
+++ b/dlls/shell32/enumobjects.c
|
||||
@@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
||||
struct enum_objects
|
||||
{
|
||||
IEnumObjects IEnumObjects_iface;
|
||||
+ IObjectCollection IObjectCollection_iface;
|
||||
LONG ref;
|
||||
};
|
||||
|
||||
@@ -45,6 +46,11 @@ static inline struct enum_objects *impl_from_IEnumObjects(IEnumObjects *iface)
|
||||
return CONTAINING_RECORD(iface, struct enum_objects, IEnumObjects_iface);
|
||||
}
|
||||
|
||||
+static inline struct enum_objects *impl_from_IObjectCollection(IObjectCollection *iface)
|
||||
+{
|
||||
+ return CONTAINING_RECORD(iface, struct enum_objects, IObjectCollection_iface);
|
||||
+}
|
||||
+
|
||||
static HRESULT WINAPI enum_objects_QueryInterface(IEnumObjects *iface, REFIID riid, void **obj)
|
||||
{
|
||||
struct enum_objects *This = impl_from_IEnumObjects(iface);
|
||||
@@ -57,6 +63,10 @@ static HRESULT WINAPI enum_objects_QueryInterface(IEnumObjects *iface, REFIID ri
|
||||
{
|
||||
*obj = &This->IEnumObjects_iface;
|
||||
}
|
||||
+ else if (IsEqualIID(riid, &IID_IObjectCollection) || IsEqualIID(riid, &IID_IObjectArray))
|
||||
+ {
|
||||
+ *obj = &This->IObjectCollection_iface;
|
||||
+ }
|
||||
|
||||
if (*obj)
|
||||
{
|
||||
@@ -144,6 +154,91 @@ static const IEnumObjectsVtbl enum_objects_vtbl =
|
||||
enum_objects_Clone,
|
||||
};
|
||||
|
||||
+static HRESULT WINAPI object_collection_QueryInterface(IObjectCollection *iface, REFIID riid, void **obj)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IObjectCollection(iface);
|
||||
+ return IEnumObjects_QueryInterface(&This->IEnumObjects_iface, riid, obj);
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI object_collection_AddRef(IObjectCollection *iface)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IObjectCollection(iface);
|
||||
+ return IEnumObjects_AddRef(&This->IEnumObjects_iface);
|
||||
+}
|
||||
+
|
||||
+static ULONG WINAPI object_collection_Release(IObjectCollection *iface)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IObjectCollection(iface);
|
||||
+ return IEnumObjects_Release(&This->IEnumObjects_iface);
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI object_collection_GetCount(IObjectCollection *iface, UINT *count)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IObjectCollection(iface);
|
||||
+
|
||||
+ FIXME("(%p)->(%p): stub!\n", This, count);
|
||||
+
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI object_collection_GetAt(IObjectCollection *iface, UINT index, REFIID riid, void **obj)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IObjectCollection(iface);
|
||||
+
|
||||
+ FIXME("(%p %u, %s)->(%p): stub!\n", This, index, debugstr_guid(riid), obj);
|
||||
+
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI object_collection_AddObject(IObjectCollection *iface, IUnknown *obj)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IObjectCollection(iface);
|
||||
+
|
||||
+ FIXME("(%p %p): stub!\n", This, obj);
|
||||
+
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI object_collection_AddFromArray(IObjectCollection *iface, IObjectArray *source_array)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IObjectCollection(iface);
|
||||
+
|
||||
+ FIXME("(%p %p): stub!\n", This, source_array);
|
||||
+
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI object_collection_RemoveObjectAt(IObjectCollection *iface, UINT index)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IObjectCollection(iface);
|
||||
+
|
||||
+ FIXME("(%p %u): stub!\n", This, index);
|
||||
+
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static HRESULT WINAPI object_collection_Clear(IObjectCollection *iface)
|
||||
+{
|
||||
+ struct enum_objects *This = impl_from_IObjectCollection(iface);
|
||||
+
|
||||
+ FIXME("(%p): stub!\n", This);
|
||||
+
|
||||
+ return E_NOTIMPL;
|
||||
+}
|
||||
+
|
||||
+static const IObjectCollectionVtbl object_collection_vtbl =
|
||||
+{
|
||||
+ object_collection_QueryInterface,
|
||||
+ object_collection_AddRef,
|
||||
+ object_collection_Release,
|
||||
+ object_collection_GetCount,
|
||||
+ object_collection_GetAt,
|
||||
+ object_collection_AddObject,
|
||||
+ object_collection_AddFromArray,
|
||||
+ object_collection_RemoveObjectAt,
|
||||
+ object_collection_Clear
|
||||
+};
|
||||
+
|
||||
HRESULT WINAPI EnumerableObjectCollection_Constructor(IUnknown *outer, REFIID riid, void **obj)
|
||||
{
|
||||
struct enum_objects *This;
|
||||
@@ -159,6 +254,7 @@ HRESULT WINAPI EnumerableObjectCollection_Constructor(IUnknown *outer, REFIID ri
|
||||
|
||||
This->ref = 1;
|
||||
This->IEnumObjects_iface.lpVtbl = &enum_objects_vtbl;
|
||||
+ This->IObjectCollection_iface.lpVtbl = &object_collection_vtbl;
|
||||
|
||||
hr = IEnumObjects_QueryInterface(&This->IEnumObjects_iface, riid, obj);
|
||||
IEnumObjects_Release(&This->IEnumObjects_iface);
|
||||
--
|
||||
2.45.2
|
||||
|
@@ -1,4 +0,0 @@
|
||||
Fixes: [53620] err:ole:com_get_class_object class IEnumObjects not registered.
|
||||
Fixes: [56891] Visual novel Mebae (Tanuki Soft) crashes on startup
|
||||
|
||||
# MR https://gitlab.winehq.org/wine/wine/-/merge_requests/6130
|
@@ -1,24 +0,0 @@
|
||||
From 3407a396a86366b81b243fde01e191aa1a2f7f5a Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Fri, 26 Sep 2014 20:24:50 +0200
|
||||
Subject: [PATCH] user32: Call UpdateWindow() during DIALOG_CreateIndirect.
|
||||
|
||||
---
|
||||
dlls/user32/dialog.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c
|
||||
index a226c764c49..91ce53f8297 100644
|
||||
--- a/dlls/user32/dialog.c
|
||||
+++ b/dlls/user32/dialog.c
|
||||
@@ -703,6 +703,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
|
||||
if (template.style & WS_VISIBLE && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE))
|
||||
{
|
||||
NtUserShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */
|
||||
+ UpdateWindow( hwnd );
|
||||
}
|
||||
return hwnd;
|
||||
}
|
||||
--
|
||||
2.35.1
|
||||
|
@@ -1 +0,0 @@
|
||||
Fixes: [35652] Send WM_PAINT event during dialog creation
|
@@ -1,4 +1,4 @@
|
||||
From d5389dd8bb868076b75675719d529d0507a90815 Mon Sep 17 00:00:00 2001
|
||||
From af732e026343d613cccbab91f7cae3787191ebef Mon Sep 17 00:00:00 2001
|
||||
From: katahiromz <katayama.hirofumi.mz@gmail.com>
|
||||
Date: Thu, 11 Oct 2018 13:47:02 +0900
|
||||
Subject: [PATCH] user32: Implement CascadeWindows.
|
||||
@@ -11,11 +11,11 @@ Use stanard heap_ functions.
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45968
|
||||
Signed-off-by: Hirofumi Katayama <katayama.hirofumi.mz@gmail.com>
|
||||
---
|
||||
dlls/user32/mdi.c | 216 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
|
||||
dlls/user32/mdi.c | 216 +++++++++++++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 214 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
|
||||
index 10a3882..2e93056 100644
|
||||
index 05725a29914..e9ec37b0063 100644
|
||||
--- a/dlls/user32/mdi.c
|
||||
+++ b/dlls/user32/mdi.c
|
||||
@@ -2,6 +2,7 @@
|
||||
@@ -26,7 +26,7 @@ index 10a3882..2e93056 100644
|
||||
*
|
||||
* This file contains routines to support MDI (Multiple Document
|
||||
* Interface) features .
|
||||
@@ -1846,12 +1847,223 @@ done:
|
||||
@@ -1795,12 +1796,223 @@ done:
|
||||
* Success: Number of cascaded windows.
|
||||
* Failure: 0
|
||||
*/
|
||||
@@ -174,7 +174,7 @@ index 10a3882..2e93056 100644
|
||||
+ work_rect = mi.rcWork;
|
||||
+ }
|
||||
+
|
||||
+ hDWP = BeginDeferWindowPos(info.wnd_count);
|
||||
+ hDWP = NtUserBeginDeferWindowPos( info.wnd_count );
|
||||
+ if (hDWP == NULL)
|
||||
+ goto cleanup;
|
||||
+
|
||||
@@ -243,7 +243,7 @@ index 10a3882..2e93056 100644
|
||||
+ EndDeferWindowPos(hDWP);
|
||||
+
|
||||
+ if (prev)
|
||||
+ SetForegroundWindow(prev);
|
||||
+ NtUserSetForegroundWindow( prev );
|
||||
+
|
||||
+cleanup:
|
||||
+ heap_free(info.wnd_array);
|
||||
@@ -253,5 +253,5 @@ index 10a3882..2e93056 100644
|
||||
|
||||
|
||||
--
|
||||
1.9.1
|
||||
2.47.2
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
From 3f238e248fc4fc4415b3ce5e420c798d516d24ee Mon Sep 17 00:00:00 2001
|
||||
From 4469bff76a8408ca91dbdd1ebeba5f37f146f854 Mon Sep 17 00:00:00 2001
|
||||
From: Hirofumi Katayama <katayama.hirofumi.mz@gmail.com>
|
||||
Date: Mon, 26 Nov 2018 09:09:52 +0900
|
||||
Subject: [PATCH] user32: Implement TileWindows
|
||||
@@ -13,10 +13,10 @@ Signed-off-by: Hirofumi Katayama <katayama.hirofumi.mz@gmail.com>
|
||||
1 file changed, 175 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
|
||||
index 9679be895ed..c752f967b4d 100644
|
||||
index e9ec37b0063..3bf0f28a04f 100644
|
||||
--- a/dlls/user32/mdi.c
|
||||
+++ b/dlls/user32/mdi.c
|
||||
@@ -144,6 +144,10 @@ typedef struct
|
||||
@@ -132,6 +132,10 @@ typedef struct
|
||||
|
||||
static HBITMAP hBmpClose = 0;
|
||||
|
||||
@@ -27,7 +27,7 @@ index 9679be895ed..c752f967b4d 100644
|
||||
/* ----------------- declarations ----------------- */
|
||||
static void MDI_UpdateFrameText( HWND, HWND, BOOL, LPCWSTR);
|
||||
static BOOL MDI_AugmentFrameMenu( HWND, HWND );
|
||||
@@ -1929,8 +1933,6 @@ WORD WINAPI
|
||||
@@ -1881,8 +1885,6 @@ WORD WINAPI
|
||||
CascadeWindows (HWND hwndParent, UINT wFlags, const RECT *lpRect,
|
||||
UINT cKids, const HWND *lpKids)
|
||||
{
|
||||
@@ -36,7 +36,7 @@ index 9679be895ed..c752f967b4d 100644
|
||||
CASCADE_INFO info;
|
||||
HWND hwnd, top, prev;
|
||||
HMONITOR monitor;
|
||||
@@ -2084,8 +2086,177 @@ WORD WINAPI
|
||||
@@ -2036,8 +2038,177 @@ WORD WINAPI
|
||||
TileWindows (HWND hwndParent, UINT wFlags, const RECT *lpRect,
|
||||
UINT cKids, const HWND *lpKids)
|
||||
{
|
||||
@@ -135,7 +135,7 @@ index 9679be895ed..c752f967b4d 100644
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ hDWP = BeginDeferWindowPos(info.wnd_count);
|
||||
+ hDWP = NtUserBeginDeferWindowPos( info.wnd_count );
|
||||
+ if (hDWP == NULL)
|
||||
+ goto cleanup;
|
||||
+
|
||||
@@ -206,7 +206,7 @@ index 9679be895ed..c752f967b4d 100644
|
||||
+ EndDeferWindowPos(hDWP);
|
||||
+
|
||||
+ if (hwndPrev)
|
||||
+ SetForegroundWindow(hwndPrev);
|
||||
+ NtUserSetForegroundWindow( hwndPrev );
|
||||
+
|
||||
+cleanup:
|
||||
+ if (cKids == 0 || lpKids == NULL)
|
||||
@@ -217,5 +217,5 @@ index 9679be895ed..c752f967b4d 100644
|
||||
|
||||
|
||||
--
|
||||
2.24.1
|
||||
2.47.2
|
||||
|
||||
|
@@ -1,26 +0,0 @@
|
||||
From 068536823c008835d9d96af2ae2cb030e753dd7f Mon Sep 17 00:00:00 2001
|
||||
From: David Torok <dt@zeroitlab.com>
|
||||
Date: Sun, 17 Nov 2019 19:08:12 +0100
|
||||
Subject: [PATCH] Send WM_NCPOINTERUP on focus regain
|
||||
|
||||
---
|
||||
dlls/win32u/input.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
|
||||
index dda2a750275..05efec915b2 100644
|
||||
--- a/dlls/win32u/input.c
|
||||
+++ b/dlls/win32u/input.c
|
||||
@@ -1375,6 +1375,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
|
||||
send_message( hwnd, WM_ACTIVATE,
|
||||
MAKEWPARAM( mouse ? WA_CLICKACTIVE : WA_ACTIVE, is_iconic(hwnd) ),
|
||||
(LPARAM)previous );
|
||||
+
|
||||
+ send_message( hwnd, WM_NCPOINTERUP, 0, 0);
|
||||
+
|
||||
if (NtUserGetAncestor( hwnd, GA_PARENT ) == get_desktop_window())
|
||||
NtUserPostMessage( get_desktop_window(), WM_PARENTNOTIFY, WM_NCACTIVATE, (LPARAM)hwnd );
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user