mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 07afb240a87d097c83ca5263c61145a170894a22
This commit is contained in:
Alistair Leslie-Hughes
parent
3bba693408
commit
79ed5e86aa
@ -1,4 +1,4 @@
|
||||
From 8ed9e258d5232b7c207a5d05bce72985a6f0677c Mon Sep 17 00:00:00 2001
|
||||
From 221f88c7bb5155b55428319fff84cfbc275667ed Mon Sep 17 00:00:00 2001
|
||||
From: Paul Gofman <gofmanp@gmail.com>
|
||||
Date: Thu, 4 Apr 2019 02:25:00 +0300
|
||||
Subject: [PATCH] ddraw: Allow setting texture without DDSCAPS_TEXTURE for
|
||||
@ -11,10 +11,10 @@ Signed-off-by: Paul Gofman <gofmanp@gmail.com>
|
||||
2 files changed, 141 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
|
||||
index 1d2cb4dce11..fb14719a853 100644
|
||||
index ab222e30eb2..4613c2cd357 100644
|
||||
--- a/dlls/ddraw/device.c
|
||||
+++ b/dlls/ddraw/device.c
|
||||
@@ -2950,10 +2950,8 @@ static HRESULT WINAPI d3d_device3_SetLightState(IDirect3DDevice3 *iface,
|
||||
@@ -2902,10 +2902,8 @@ static HRESULT WINAPI d3d_device3_SetLightState(IDirect3DDevice3 *iface,
|
||||
wined3d_mutex_unlock();
|
||||
return DDERR_INVALIDPARAMS;
|
||||
}
|
||||
@ -25,7 +25,7 @@ index 1d2cb4dce11..fb14719a853 100644
|
||||
device->material = value;
|
||||
}
|
||||
else if (state == D3DLIGHTSTATE_COLORMODEL)
|
||||
@@ -4834,7 +4832,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
|
||||
@@ -4786,7 +4784,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
|
||||
struct ddraw_surface *surf = unsafe_impl_from_IDirectDrawSurface7(texture);
|
||||
struct wined3d_texture *wined3d_texture = NULL;
|
||||
|
||||
@ -35,19 +35,16 @@ index 1d2cb4dce11..fb14719a853 100644
|
||||
|
||||
if (surf && (surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE))
|
||||
wined3d_texture = surf->wined3d_texture;
|
||||
@@ -4870,8 +4869,8 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
|
||||
@@ -4822,13 +4821,24 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
|
||||
{
|
||||
struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
|
||||
struct ddraw_surface *tex = unsafe_impl_from_IDirect3DTexture2(texture);
|
||||
+ struct wined3d_texture *wined3d_texture;
|
||||
DWORD texmapblend;
|
||||
- HRESULT hr;
|
||||
+ struct wined3d_texture *wined3d_texture;
|
||||
|
||||
TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture);
|
||||
|
||||
@@ -4880,7 +4879,18 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
|
||||
if (device->legacyTextureBlending)
|
||||
IDirect3DDevice3_GetRenderState(iface, D3DRENDERSTATE_TEXTUREMAPBLEND, &texmapblend);
|
||||
wined3d_mutex_lock();
|
||||
|
||||
- hr = IDirect3DDevice7_SetTexture(&device->IDirect3DDevice7_iface, stage, &tex->IDirectDrawSurface7_iface);
|
||||
+ if (tex && ((tex->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE) || !device->hw))
|
||||
@ -63,9 +60,9 @@ index 1d2cb4dce11..fb14719a853 100644
|
||||
+
|
||||
+ wined3d_device_set_texture(device->wined3d_device, stage, wined3d_texture);
|
||||
|
||||
if (device->legacyTextureBlending && texmapblend == D3DTBLEND_MODULATE)
|
||||
if (device->legacyTextureBlending && device->texture_map_blend == D3DTBLEND_MODULATE)
|
||||
{
|
||||
@@ -4912,7 +4922,7 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
|
||||
@@ -4860,7 +4870,7 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
|
||||
|
||||
wined3d_mutex_unlock();
|
||||
|
||||
@ -75,7 +72,7 @@ index 1d2cb4dce11..fb14719a853 100644
|
||||
|
||||
static const struct tss_lookup
|
||||
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
|
||||
index 77ae359a9ca..93f3c589373 100644
|
||||
index 6a8ecde93ad..2188e4eb03f 100644
|
||||
--- a/dlls/ddraw/tests/ddraw4.c
|
||||
+++ b/dlls/ddraw/tests/ddraw4.c
|
||||
@@ -330,7 +330,7 @@ static IDirectDraw4 *create_ddraw(void)
|
||||
@ -137,7 +134,7 @@ index 77ae359a9ca..93f3c589373 100644
|
||||
static IDirect3DViewport3 *create_viewport(IDirect3DDevice3 *device, UINT x, UINT y, UINT w, UINT h)
|
||||
{
|
||||
IDirect3DViewport3 *viewport;
|
||||
@@ -16215,6 +16226,116 @@ static void test_caps(void)
|
||||
@@ -16308,6 +16319,116 @@ static void test_caps(void)
|
||||
IDirectDraw4_Release(ddraw);
|
||||
}
|
||||
|
||||
@ -254,7 +251,7 @@ index 77ae359a9ca..93f3c589373 100644
|
||||
START_TEST(ddraw4)
|
||||
{
|
||||
DDDEVICEIDENTIFIER identifier;
|
||||
@@ -16348,4 +16469,5 @@ START_TEST(ddraw4)
|
||||
@@ -16441,4 +16562,5 @@ START_TEST(ddraw4)
|
||||
test_alphatest();
|
||||
test_clipper_refcount();
|
||||
test_caps();
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
From e6eb1b2542caec9481f9ec0ad87d17dd568a3106 Mon Sep 17 00:00:00 2001
|
||||
From e5b50178db3b0e1fdd7f4c3c88c2c6d4dd5ebd86 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 4 Feb 2017 16:20:37 +0100
|
||||
Subject: [PATCH] kernel32: Implement some processor group functions.
|
||||
|
||||
---
|
||||
.../api-ms-win-core-kernel32-legacy-l1-1-0.spec | 2 +-
|
||||
.../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 2 +-
|
||||
dlls/kernel32/cpu.c | 28 ++++++++++++++++------
|
||||
dlls/kernel32/kernel32.spec | 2 +-
|
||||
dlls/kernel32/tests/process.c | 23 ++++++++++++++++++
|
||||
include/winnt.h | 2 ++
|
||||
...pi-ms-win-core-kernel32-legacy-l1-1-0.spec | 2 +-
|
||||
...pi-ms-win-core-kernel32-legacy-l1-1-1.spec | 2 +-
|
||||
dlls/kernel32/cpu.c | 28 ++++++++++++++-----
|
||||
dlls/kernel32/kernel32.spec | 2 +-
|
||||
dlls/kernel32/tests/process.c | 23 +++++++++++++++
|
||||
include/winnt.h | 2 ++
|
||||
6 files changed, 49 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
|
||||
index e653ac6..b6af37a 100644
|
||||
index e653ac6d212..b6af37ab0aa 100644
|
||||
--- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
|
||||
+++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
|
||||
@@ -21,7 +21,7 @@
|
||||
@ -26,7 +26,7 @@ index e653ac6..b6af37a 100644
|
||||
@ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId
|
||||
@ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA
|
||||
diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
|
||||
index 946e3de..fca40f1 100644
|
||||
index fd1a0bcf0ab..b281fd963da 100644
|
||||
--- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
|
||||
+++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec
|
||||
@@ -26,7 +26,7 @@
|
||||
@ -37,12 +37,12 @@ index 946e3de..fca40f1 100644
|
||||
+@ stdcall GetMaximumProcessorGroupCount() kernel32.GetMaximumProcessorGroupCount
|
||||
@ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId
|
||||
@ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId
|
||||
@ stdcall GetNumaAvailableMemoryNodeEx(long ptr)
|
||||
@ stdcall GetNumaAvailableMemoryNodeEx(long ptr) kernel32.GetNumaAvailableMemoryNodeEx
|
||||
diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c
|
||||
index 6e198ba..8d0afde 100644
|
||||
index 96180bed4ec..a71d961eefa 100644
|
||||
--- a/dlls/kernel32/cpu.c
|
||||
+++ b/dlls/kernel32/cpu.c
|
||||
@@ -284,7 +284,9 @@ SIZE_T WINAPI GetLargePageMinimum(void)
|
||||
@@ -276,7 +276,9 @@ SIZE_T WINAPI GetLargePageMinimum(void)
|
||||
*/
|
||||
WORD WINAPI GetActiveProcessorGroupCount(void)
|
||||
{
|
||||
@ -53,7 +53,7 @@ index 6e198ba..8d0afde 100644
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -293,14 +295,26 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
|
||||
@@ -285,14 +287,26 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
|
||||
*/
|
||||
DWORD WINAPI GetActiveProcessorCount(WORD group)
|
||||
{
|
||||
@ -87,7 +87,7 @@ index 6e198ba..8d0afde 100644
|
||||
|
||||
/***********************************************************************
|
||||
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
|
||||
index 8346575..1928382 100644
|
||||
index c01f132371e..cedd84efbc7 100644
|
||||
--- a/dlls/kernel32/kernel32.spec
|
||||
+++ b/dlls/kernel32/kernel32.spec
|
||||
@@ -717,7 +717,7 @@
|
||||
@ -100,7 +100,7 @@ index 8346575..1928382 100644
|
||||
@ stdcall GetModuleFileNameW(long ptr long)
|
||||
@ stdcall GetModuleHandleA(str)
|
||||
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
|
||||
index 0892d84..71d141d 100644
|
||||
index 0892d842ff7..71d141df8ea 100644
|
||||
--- a/dlls/kernel32/tests/process.c
|
||||
+++ b/dlls/kernel32/tests/process.c
|
||||
@@ -91,6 +91,7 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void);
|
||||
@ -155,10 +155,10 @@ index 0892d84..71d141d 100644
|
||||
test_ProcThreadAttributeList();
|
||||
test_SuspendProcessState();
|
||||
diff --git a/include/winnt.h b/include/winnt.h
|
||||
index 6f651c8..e0ac7d5 100644
|
||||
index fad4c7c47fa..a77633bcf7e 100644
|
||||
--- a/include/winnt.h
|
||||
+++ b/include/winnt.h
|
||||
@@ -6355,6 +6355,8 @@ typedef struct _GROUP_AFFINITY
|
||||
@@ -6326,6 +6326,8 @@ typedef struct _GROUP_AFFINITY
|
||||
WORD Reserved[3];
|
||||
} GROUP_AFFINITY, *PGROUP_AFFINITY;
|
||||
|
||||
@ -168,5 +168,5 @@ index 6f651c8..e0ac7d5 100644
|
||||
{
|
||||
WORD Group;
|
||||
--
|
||||
1.9.1
|
||||
2.20.1
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "cce8074aa9fb2191faba25ce7fd24e2678d3bd17"
|
||||
echo "07afb240a87d097c83ca5263c61145a170894a22"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 8e59420b744b29a736d3082aae7fc7a94ba9246b Mon Sep 17 00:00:00 2001
|
||||
From 0dbb12f12b3637dbf512cd0c0d719c901d57e63d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 11 May 2017 05:32:55 +0200
|
||||
Subject: [PATCH] winebuild: Generate syscall thunks for ntdll exports.
|
||||
@ -8,16 +8,16 @@ Based on a patch by Erich E. Hoover.
|
||||
dlls/ntdll/signal_i386.c | 6 +-
|
||||
dlls/ntdll/tests/exception.c | 2 +
|
||||
include/winternl.h | 2 +-
|
||||
tools/winebuild/build.h | 8 ++-
|
||||
tools/winebuild/build.h | 7 +++
|
||||
tools/winebuild/import.c | 10 ++--
|
||||
tools/winebuild/parser.c | 59 ++++++++++++++++++++
|
||||
tools/winebuild/spec16.c | 22 +-------
|
||||
tools/winebuild/spec32.c | 104 +++++++++++++++++++++++++++++++++++
|
||||
tools/winebuild/utils.c | 21 +++++++
|
||||
9 files changed, 206 insertions(+), 28 deletions(-)
|
||||
9 files changed, 206 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
|
||||
index 7c6e1b50c..a62fbd4bf 100644
|
||||
index 93eb142ab3f..5542d4b5e8e 100644
|
||||
--- a/dlls/ntdll/signal_i386.c
|
||||
+++ b/dlls/ntdll/signal_i386.c
|
||||
@@ -427,6 +427,9 @@ static size_t signal_stack_size;
|
||||
@ -48,7 +48,7 @@ index 7c6e1b50c..a62fbd4bf 100644
|
||||
if (!(thread_data->fs = wine_ldt_alloc_fs()))
|
||||
{
|
||||
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
|
||||
index ada28c91e..3ed8fa082 100644
|
||||
index ada28c91ebd..3ed8fa08213 100644
|
||||
--- a/dlls/ntdll/tests/exception.c
|
||||
+++ b/dlls/ntdll/tests/exception.c
|
||||
@@ -1651,6 +1651,8 @@ static void test_thread_context(void)
|
||||
@ -61,7 +61,7 @@ index ada28c91e..3ed8fa082 100644
|
||||
ok( context.SegCs == LOWORD(expect.SegCs), "wrong SegCs %08x/%08x\n", context.SegCs, expect.SegCs );
|
||||
ok( context.SegDs == LOWORD(expect.SegDs), "wrong SegDs %08x/%08x\n", context.SegDs, expect.SegDs );
|
||||
diff --git a/include/winternl.h b/include/winternl.h
|
||||
index 0e8cf30d7..4ec65ca63 100644
|
||||
index 2351df010b0..68bceddef68 100644
|
||||
--- a/include/winternl.h
|
||||
+++ b/include/winternl.h
|
||||
@@ -357,7 +357,7 @@ typedef struct _TEB
|
||||
@ -74,10 +74,10 @@ index 0e8cf30d7..4ec65ca63 100644
|
||||
ULONG FpSoftwareStatusRegister; /* 0c8/010c */
|
||||
PVOID SystemReserved1[54]; /* 0cc/0110 used for krnl386.exe16 private data in Wine */
|
||||
diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h
|
||||
index 49473c768..0b7cb370b 100644
|
||||
index 43a0dd20e82..eb63b661c7f 100644
|
||||
--- a/tools/winebuild/build.h
|
||||
+++ b/tools/winebuild/build.h
|
||||
@@ -103,6 +103,7 @@ typedef struct
|
||||
@@ -105,6 +105,7 @@ typedef struct
|
||||
int flags;
|
||||
char *name; /* public name of this function */
|
||||
char *link_name; /* name of the C symbol to link to */
|
||||
@ -85,7 +85,7 @@ index 49473c768..0b7cb370b 100644
|
||||
char *export_name; /* name exported under for noname exports */
|
||||
union
|
||||
{
|
||||
@@ -129,6 +130,7 @@ typedef struct
|
||||
@@ -131,6 +132,7 @@ typedef struct
|
||||
int alloc_entry_points; /* number of allocated entry points */
|
||||
int nb_names; /* number of entry points with names */
|
||||
unsigned int nb_resources; /* number of resources */
|
||||
@ -93,7 +93,7 @@ index 49473c768..0b7cb370b 100644
|
||||
int characteristics; /* characteristics for the PE header */
|
||||
int dll_characteristics;/* DLL characteristics for the PE header */
|
||||
int subsystem; /* subsystem id */
|
||||
@@ -138,6 +140,7 @@ typedef struct
|
||||
@@ -140,6 +142,7 @@ typedef struct
|
||||
ORDDEF **names; /* array of entry point names (points into entry_points) */
|
||||
ORDDEF **ordinals; /* array of dll ordinals (points into entry_points) */
|
||||
struct resource *resources; /* array of dll resources (format differs between Win16/Win32) */
|
||||
@ -101,18 +101,18 @@ index 49473c768..0b7cb370b 100644
|
||||
} DLLSPEC;
|
||||
|
||||
enum target_cpu
|
||||
@@ -179,8 +182,9 @@ struct strarray
|
||||
#define FLAG_FORWARD 0x200 /* function is a forwarded name */
|
||||
#define FLAG_EXT_LINK 0x400 /* function links to an external symbol */
|
||||
#define FLAG_EXPORT32 0x800 /* 32-bit export in 16-bit spec file */
|
||||
+#define FLAG_SYSCALL 0x1000 /* function should be called through a syscall thunk */
|
||||
@@ -182,8 +185,10 @@ struct strarray
|
||||
#define FLAG_FORWARD 0x1000 /* function is a forwarded name */
|
||||
#define FLAG_EXT_LINK 0x2000 /* function links to an external symbol */
|
||||
#define FLAG_EXPORT32 0x4000 /* 32-bit export in 16-bit spec file */
|
||||
+#define FLAG_SYSCALL 0x8000 /* function should be called through a syscall thunk */
|
||||
|
||||
-#define FLAG_CPU(cpu) (0x01000 << (cpu))
|
||||
+#define FLAG_CPU(cpu) (0x02000 << (cpu))
|
||||
#define FLAG_CPU(cpu) (0x10000 << (cpu))
|
||||
+
|
||||
#define FLAG_CPU_MASK (FLAG_CPU(CPU_LAST + 1) - FLAG_CPU(0))
|
||||
#define FLAG_CPU_WIN64 (FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM64))
|
||||
#define FLAG_CPU_WIN32 (FLAG_CPU_MASK & ~FLAG_CPU_WIN64)
|
||||
@@ -323,6 +327,8 @@ extern void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 );
|
||||
@@ -325,6 +330,8 @@ extern void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 );
|
||||
extern int parse_spec_file( FILE *file, DLLSPEC *spec );
|
||||
extern int parse_def_file( FILE *file, DLLSPEC *spec );
|
||||
|
||||
@ -122,10 +122,10 @@ index 49473c768..0b7cb370b 100644
|
||||
|
||||
extern int byte_swapped;
|
||||
diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c
|
||||
index d8abc9d03..9c7c605b6 100644
|
||||
index 8c32b738a23..599281674f2 100644
|
||||
--- a/tools/winebuild/import.c
|
||||
+++ b/tools/winebuild/import.c
|
||||
@@ -454,6 +454,7 @@ static void check_undefined_forwards( DLLSPEC *spec )
|
||||
@@ -541,6 +541,7 @@ static void check_undefined_forwards( DLLSPEC *spec )
|
||||
/* flag the dll exports that link to an undefined symbol */
|
||||
static void check_undefined_exports( DLLSPEC *spec )
|
||||
{
|
||||
@ -133,7 +133,7 @@ index d8abc9d03..9c7c605b6 100644
|
||||
int i;
|
||||
|
||||
for (i = 0; i < spec->nb_entry_points; i++)
|
||||
@@ -461,7 +462,8 @@ static void check_undefined_exports( DLLSPEC *spec )
|
||||
@@ -548,7 +549,8 @@ static void check_undefined_exports( DLLSPEC *spec )
|
||||
ORDDEF *odp = &spec->entry_points[i];
|
||||
if (odp->type == TYPE_STUB || odp->type == TYPE_ABS || odp->type == TYPE_VARIABLE) continue;
|
||||
if (odp->flags & FLAG_FORWARD) continue;
|
||||
@ -143,7 +143,7 @@ index d8abc9d03..9c7c605b6 100644
|
||||
{
|
||||
switch(odp->type)
|
||||
{
|
||||
@@ -472,14 +474,14 @@ static void check_undefined_exports( DLLSPEC *spec )
|
||||
@@ -559,14 +561,14 @@ static void check_undefined_exports( DLLSPEC *spec )
|
||||
if (link_ext_symbols)
|
||||
{
|
||||
odp->flags |= FLAG_EXT_LINK;
|
||||
@ -162,10 +162,10 @@ index d8abc9d03..9c7c605b6 100644
|
||||
}
|
||||
}
|
||||
diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
|
||||
index bec9f523e..da832de0e 100644
|
||||
index 3191efaf9ea..f440881a0ec 100644
|
||||
--- a/tools/winebuild/parser.c
|
||||
+++ b/tools/winebuild/parser.c
|
||||
@@ -540,6 +540,24 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp )
|
||||
@@ -541,6 +541,24 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp )
|
||||
}
|
||||
|
||||
|
||||
@ -190,7 +190,7 @@ index bec9f523e..da832de0e 100644
|
||||
/*******************************************************************
|
||||
* parse_spec_ordinal
|
||||
*
|
||||
@@ -615,6 +633,14 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec )
|
||||
@@ -616,6 +634,14 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec )
|
||||
assert( 0 );
|
||||
}
|
||||
|
||||
@ -205,7 +205,7 @@ index bec9f523e..da832de0e 100644
|
||||
if ((odp->flags & FLAG_CPU_MASK) && !(odp->flags & FLAG_CPU(target_cpu)))
|
||||
{
|
||||
/* ignore this entry point */
|
||||
@@ -812,6 +838,37 @@ static void assign_ordinals( DLLSPEC *spec )
|
||||
@@ -813,6 +839,37 @@ static void assign_ordinals( DLLSPEC *spec )
|
||||
}
|
||||
|
||||
|
||||
@ -243,7 +243,7 @@ index bec9f523e..da832de0e 100644
|
||||
/*******************************************************************
|
||||
* add_16bit_exports
|
||||
*
|
||||
@@ -913,6 +970,8 @@ int parse_spec_file( FILE *file, DLLSPEC *spec )
|
||||
@@ -914,6 +971,8 @@ int parse_spec_file( FILE *file, DLLSPEC *spec )
|
||||
current_line = 0; /* no longer parsing the input file */
|
||||
assign_names( spec );
|
||||
assign_ordinals( spec );
|
||||
@ -253,7 +253,7 @@ index bec9f523e..da832de0e 100644
|
||||
}
|
||||
|
||||
diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c
|
||||
index b21f47277..24a8f1054 100644
|
||||
index 3a7e457282a..a179175b8c1 100644
|
||||
--- a/tools/winebuild/spec16.c
|
||||
+++ b/tools/winebuild/spec16.c
|
||||
@@ -495,27 +495,6 @@ static int relay_type_compare( const void *e1, const void *e2 )
|
||||
@ -293,7 +293,7 @@ index b21f47277..24a8f1054 100644
|
||||
entry_point->u.func.nb_args = 0;
|
||||
assert( !spec->ordinals[0] );
|
||||
diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
|
||||
index a0aa01754..6ae34a676 100644
|
||||
index 855e6d8739f..119e1079940 100644
|
||||
--- a/tools/winebuild/spec32.c
|
||||
+++ b/tools/winebuild/spec32.c
|
||||
@@ -371,6 +371,109 @@ static void output_relay_debug( DLLSPEC *spec )
|
||||
@ -406,7 +406,7 @@ index a0aa01754..6ae34a676 100644
|
||||
/*******************************************************************
|
||||
* output_exports
|
||||
*
|
||||
@@ -714,6 +817,7 @@ void output_spec32_file( DLLSPEC *spec )
|
||||
@@ -767,6 +870,7 @@ void output_spec32_file( DLLSPEC *spec )
|
||||
open_output_file();
|
||||
output_standard_file_header();
|
||||
output_module( spec );
|
||||
@ -415,7 +415,7 @@ index a0aa01754..6ae34a676 100644
|
||||
output_exports( spec );
|
||||
output_imports( spec );
|
||||
diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
|
||||
index dbfe7a4ba..5796af2f6 100644
|
||||
index 31a6b283713..74fc8a16bcf 100644
|
||||
--- a/tools/winebuild/utils.c
|
||||
+++ b/tools/winebuild/utils.c
|
||||
@@ -838,6 +838,7 @@ void free_dll_spec( DLLSPEC *spec )
|
||||
@ -458,5 +458,5 @@ index dbfe7a4ba..5796af2f6 100644
|
||||
+ return j + 1;
|
||||
+}
|
||||
--
|
||||
2.21.0
|
||||
2.20.1
|
||||
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
From 0e816291072f8a941ef5af3e91c4ce9184741967 Mon Sep 17 00:00:00 2001
|
||||
From 8448c96713a20589d0c76cdd351d59d692b470dc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Fri, 18 Aug 2017 23:22:16 +0200
|
||||
Subject: [PATCH] d3d11/tests: Add basic dual source blend test.
|
||||
|
||||
---
|
||||
dlls/d3d11/tests/d3d11.c | 169 +++++++++++++++++++++++++++++++++++++++++++++++
|
||||
dlls/d3d11/tests/d3d11.c | 169 +++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 169 insertions(+)
|
||||
|
||||
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
|
||||
index e63ed82..44f046b 100644
|
||||
index f04e5d65a78..d21037cd3c6 100644
|
||||
--- a/dlls/d3d11/tests/d3d11.c
|
||||
+++ b/dlls/d3d11/tests/d3d11.c
|
||||
@@ -27825,6 +27825,174 @@ static void test_depth_clip(void)
|
||||
release_test_context(&test_context);
|
||||
@@ -29381,6 +29381,174 @@ static void test_desktop_window(void)
|
||||
ok(!refcount, "Device has %u references left.\n", refcount);
|
||||
}
|
||||
|
||||
+static void test_dual_blending(void)
|
||||
@ -186,7 +186,7 @@ index e63ed82..44f046b 100644
|
||||
START_TEST(d3d11)
|
||||
{
|
||||
unsigned int argc, i;
|
||||
@@ -27959,6 +28127,7 @@ START_TEST(d3d11)
|
||||
@@ -29525,6 +29693,7 @@ START_TEST(d3d11)
|
||||
queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, test_negative_viewports);
|
||||
queue_test(test_early_depth_stencil);
|
||||
queue_test(test_conservative_depth_output);
|
||||
@ -195,5 +195,5 @@ index e63ed82..44f046b 100644
|
||||
queue_test(test_clip_distance);
|
||||
queue_test(test_combined_clip_and_cull_distances);
|
||||
--
|
||||
1.9.1
|
||||
2.20.1
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user