wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 6b9a87c7a801e1776444ac96c555fbad80d34115.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-10-06 19:58:45 +02:00
parent 4fe40942a6
commit 4adc56f74f
13 changed files with 49 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -34,11 +34,6 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
-----------------------------------
**Bug fixes and features included in the next upcoming release [1]:**
* Add support for /passive command line option to msiexec ([Wine Bug #21813](https://bugs.winehq.org/show_bug.cgi?id=21813))
**Bug fixes and features in Wine Staging 1.7.52 [268]:**
*Note: The following list only contains features and bug fixes which are not
@ -111,14 +106,14 @@ for more details.*
* Catch invalid memory accesses in imagehlp.CheckSumMappedFile
* Check architecture before trying to load libraries ([Wine Bug #38021](https://bugs.winehq.org/show_bug.cgi?id=38021))
* Codepage conversion should fail when destination length is < 0
* Correctly parse double quotes in the msi token values
* ~~Correctly parse double quotes in the msi token values~~
* Create Microsoft\Windows\Themes directory during Wineprefix creation ([Wine Bug #34910](https://bugs.winehq.org/show_bug.cgi?id=34910))
* Create stub files for system32/drivers/etc/{services,hosts,networks,protocol} ([Wine Bug #12076](https://bugs.winehq.org/show_bug.cgi?id=12076))
* CreateProcess does not prioritize the working directory over the system search path ([Wine Bug #23934](https://bugs.winehq.org/show_bug.cgi?id=23934))
* D3DCompileShader should filter specific warning messages ([Wine Bug #33770](https://bugs.winehq.org/show_bug.cgi?id=33770))
* Do not allow to deallocate thread stack for current thread
* Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](https://bugs.winehq.org/show_bug.cgi?id=11436))
* Do not trust width/height passed to edit control in WM_SIZE message ([Wine Bug #37542](https://bugs.winehq.org/show_bug.cgi?id=37542))
* ~~Do not trust width/height passed to edit control in WM_SIZE message~~ ([Wine Bug #37542](https://bugs.winehq.org/show_bug.cgi?id=37542))
* Do not use GdipAlloc and GdipFree in internal functions ([Wine Bug #32786](https://bugs.winehq.org/show_bug.cgi?id=32786))
* Do not use unixfs for devices without mountpoint
* Do not wait for hook thread startup in IDirectInput8::Initialize ([Wine Bug #21403](https://bugs.winehq.org/show_bug.cgi?id=21403))
@ -262,7 +257,7 @@ for more details.*
* Share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL forwards ([Wine Bug #21817](https://bugs.winehq.org/show_bug.cgi?id=21817))
* Show unmounted devices in winecfg and allow changing the unix path
* Silence repeated LocaleNameToLCID/LCIDToLocaleName unsupported flags FIXMEs ([Wine Bug #30076](https://bugs.winehq.org/show_bug.cgi?id=30076))
* Silence repeated wbemprox "timeout not supported" fixme ([Wine Bug #37618](https://bugs.winehq.org/show_bug.cgi?id=37618))
* ~~Silence repeated wbemprox "timeout not supported" fixme~~ ([Wine Bug #37618](https://bugs.winehq.org/show_bug.cgi?id=37618))
* Skip unknown item when decoding a CMS certificate ([Wine Bug #34388](https://bugs.winehq.org/show_bug.cgi?id=34388))
* Software support for Environmental Audio Extensions (EAX)
* Super Mario 3: Mario Forever fails to load keyboard mapping from profile files. ([Wine Bug #18099](https://bugs.winehq.org/show_bug.cgi?id=18099))

8
debian/changelog vendored
View File

@ -10,6 +10,14 @@ wine-staging (1.7.53) UNRELEASED; urgency=low
* Removed patch to pass cookie by reference to msvcrt_local_unwind4 in
_seh_longjmp_unwind4 (accepted upstream).
* Removed patch to implement LoadIconMetric (accepted upstream).
* Removed patch to correctly parse double quotes in msi token values (accepted
upstream).
* Removed patch to ignore width/height passed to edit control in WM_SIZE
message (accepted upstream).
* Removed patch to silence repeated wbemprox "timeout not supported" fixme
(fixed upstream).
* Removed patch to add support for /passive command line option to msiexec
(fixed upstream).
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 04 Oct 2015 23:56:05 +0200
wine-staging (1.7.52) unstable; urgency=low

40
patches/msi-Parse_Double_Quotes/0001-msi-Correctly-parse-double-quotes-in-the-token-value.patch
View File

@ -1,40 +0,0 @@
From e519306a786d2133a1e8e487f8d126419154f929 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Wed, 23 Sep 2015 16:07:18 +0800
Subject: msi: Correctly parse double quotes in the token value.
This fixes an installer that passes to InstallProduct a command line like
PROPERTY1="Installing ""Product name"" version 8.0" PROPERTY2=1 PROPERTY3=1
In this case properties PROPERTY2 and PROPERTY3 were not recognized and that
led to an installation failure when a custom action didn't see them as set.
Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
---
dlls/msi/action.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 16c633b..f2e8e71 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -245,7 +245,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes )
{
case '"':
state = state_quote;
- if (in_quotes) count--;
+ if (in_quotes && p[1] != '\"') count--;
else count++;
break;
case ' ':
@@ -329,7 +329,7 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine,
ptr2 = strchrW( ptr, '=' );
if (!ptr2) return ERROR_INVALID_COMMAND_LINE;
-
+
len = ptr2 - ptr;
if (!len) return ERROR_INVALID_COMMAND_LINE;
--
2.5.1

1
patches/msi-Parse_Double_Quotes/definition
View File

@ -1 +0,0 @@
Fixes: Correctly parse double quotes in the msi token values

29
patches/msi-msi_get_property/0001-msi-Add-a-trace-to-msi_get_property.patch
View File

@ -1,29 +0,0 @@
From bd87e9b33291eec35df547cfda6eac3c4b826d8b Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Wed, 23 Sep 2015 16:07:30 +0800
Subject: msi: Add a trace to msi_get_property.
msi_set_property already has a similar trace and this patch makes it easier
to see what is going on.
Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
---
dlls/msi/package.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 7ab2b19..01d2e89 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -2125,6 +2125,8 @@ UINT msi_get_property( MSIDATABASE *db, LPCWSTR szName,
MSIRECORD *row;
UINT rc = ERROR_FUNCTION_FAILED;
+ TRACE("%p %s %p %p\n", db, debugstr_w(szName), szValueBuf, pchValueBuf);
+
row = msi_get_property_row( db, szName );
if (*pchValueBuf > 0)
--
2.5.1

31
patches/msiexec-Passive/0001-msiexec-Add-support-for-passive-command-line-option.patch
View File

@ -1,31 +0,0 @@
From ead7f173a46031c20d7771c34e7c231f98332700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 4 Oct 2015 23:48:16 +0200
Subject: msiexec: Add support for /passive command line option.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Michael Müller <michael@fds-team.de>
---
programs/msiexec/msiexec.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c
index cb0984d..22554de 100644
--- a/programs/msiexec/msiexec.c
+++ b/programs/msiexec/msiexec.c
@@ -931,6 +931,10 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
wine_dbgstr_w(argvW[i]+2));
}
}
+ else if(msi_option_equal(argvW[i], "passive"))
+ {
+ InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL;
+ }
else if(msi_option_equal(argvW[i], "y"))
{
FunctionDllRegisterServer = TRUE;
--
2.6.0

1
patches/msiexec-Passive/definition
View File

@ -1 +0,0 @@
Fixes: [21813] Add support for /passive command line option to msiexec

91
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "d050343c502202e1abdabdb37668684031d5367d"
echo "6b9a87c7a801e1776444ac96c555fbad80d34115"
}
# Show version information
@ -173,10 +173,7 @@ patch_enable_all ()
enable_mountmgr_DosDevices="$1"
enable_mscoree_CorValidateImage="$1"
enable_mshtml_HTMLLocation_put_hash="$1"
enable_msi_Parse_Double_Quotes="$1"
enable_msi_msi_get_property="$1"
enable_msidb_Implementation="$1"
enable_msiexec_Passive="$1"
enable_msvcp90_basic_string_dtor="$1"
enable_msvcrt_Math_Precision="$1"
enable_msvcrt_StdHandle_RefCount="$1"
@ -272,7 +269,6 @@ patch_enable_all ()
enable_user32_DeferWindowPos="$1"
enable_user32_Dialog_Paint_Event="$1"
enable_user32_DrawTextExW="$1"
enable_user32_Edit_Control_Resize="$1"
enable_user32_GetSystemMetrics="$1"
enable_user32_Invalidate_Key_State="$1"
enable_user32_ListBox_Size="$1"
@ -284,7 +280,6 @@ patch_enable_all ()
enable_uxtheme_GTK_Theming="$1"
enable_version_VerQueryValue="$1"
enable_wbemdisp_ISWbemSecurity="$1"
enable_wbemdisp_Timeout="$1"
enable_wbemprox_Bios_Name="$1"
enable_wiaservc_IEnumWIA_DEV_INFO="$1"
enable_wine_inf_Performance="$1"
@ -619,18 +614,9 @@ patch_enable ()
mshtml-HTMLLocation_put_hash)
enable_mshtml_HTMLLocation_put_hash="$2"
;;
msi-Parse_Double_Quotes)
enable_msi_Parse_Double_Quotes="$2"
;;
msi-msi_get_property)
enable_msi_msi_get_property="$2"
;;
msidb-Implementation)
enable_msidb_Implementation="$2"
;;
msiexec-Passive)
enable_msiexec_Passive="$2"
;;
msvcp90-basic_string_dtor)
enable_msvcp90_basic_string_dtor="$2"
;;
@ -916,9 +902,6 @@ patch_enable ()
user32-DrawTextExW)
enable_user32_DrawTextExW="$2"
;;
user32-Edit_Control_Resize)
enable_user32_Edit_Control_Resize="$2"
;;
user32-GetSystemMetrics)
enable_user32_GetSystemMetrics="$2"
;;
@ -952,9 +935,6 @@ patch_enable ()
wbemdisp-ISWbemSecurity)
enable_wbemdisp_ISWbemSecurity="$2"
;;
wbemdisp-Timeout)
enable_wbemdisp_Timeout="$2"
;;
wbemprox-Bios_Name)
enable_wbemprox_Bios_Name="$2"
;;
@ -3763,30 +3743,6 @@ if test "$enable_mshtml_HTMLLocation_put_hash" -eq 1; then
) >> "$patchlist"
fi
# Patchset msi-Parse_Double_Quotes
# |
# | Modified files:
# | * dlls/msi/action.c
# |
if test "$enable_msi_Parse_Double_Quotes" -eq 1; then
patch_apply msi-Parse_Double_Quotes/0001-msi-Correctly-parse-double-quotes-in-the-token-value.patch
(
echo '+ { "Dmitry Timoshkov", "msi: Correctly parse double quotes in the token value.", 1 },';
) >> "$patchlist"
fi
# Patchset msi-msi_get_property
# |
# | Modified files:
# | * dlls/msi/package.c
# |
if test "$enable_msi_msi_get_property" -eq 1; then
patch_apply msi-msi_get_property/0001-msi-Add-a-trace-to-msi_get_property.patch
(
echo '+ { "Dmitry Timoshkov", "msi: Add a trace to msi_get_property.", 1 },';
) >> "$patchlist"
fi
# Patchset msidb-Implementation
# |
# | Modified files:
@ -3824,21 +3780,6 @@ if test "$enable_msidb_Implementation" -eq 1; then
) >> "$patchlist"
fi
# Patchset msiexec-Passive
# |
# | This patchset fixes the following Wine bugs:
# | * [#21813] Add support for /passive command line option to msiexec
# |
# | Modified files:
# | * programs/msiexec/msiexec.c
# |
if test "$enable_msiexec_Passive" -eq 1; then
patch_apply msiexec-Passive/0001-msiexec-Add-support-for-passive-command-line-option.patch
(
echo '+ { "Michael Müller", "msiexec: Add support for /passive command line option.", 1 },';
) >> "$patchlist"
fi
# Patchset msvcp90-basic_string_dtor
# |
# | This patchset fixes the following Wine bugs:
@ -5320,21 +5261,6 @@ if test "$enable_user32_DrawTextExW" -eq 1; then
) >> "$patchlist"
fi
# Patchset user32-Edit_Control_Resize
# |
# | This patchset fixes the following Wine bugs:
# | * [#37542] Do not trust width/height passed to edit control in WM_SIZE message
# |
# | Modified files:
# | * dlls/user32/edit.c
# |
if test "$enable_user32_Edit_Control_Resize" -eq 1; then
patch_apply user32-Edit_Control_Resize/0001-user32-Ignore-sizes-passed-in-WM_SIZE-for-edit-contr.patch
(
echo '+ { "Michael Müller", "user32: Ignore sizes passed in WM_SIZE for edit control.", 1 },';
) >> "$patchlist"
fi
# Patchset user32-GetSystemMetrics
# |
# | This patchset fixes the following Wine bugs:
@ -5505,21 +5431,6 @@ if test "$enable_wbemdisp_ISWbemSecurity" -eq 1; then
) >> "$patchlist"
fi
# Patchset wbemdisp-Timeout
# |
# | This patchset fixes the following Wine bugs:
# | * [#37618] Silence repeated wbemprox "timeout not supported" fixme
# |
# | Modified files:
# | * dlls/wbemprox/class.c
# |
if test "$enable_wbemdisp_Timeout" -eq 1; then
patch_apply wbemdisp-Timeout/0001-wbemprox-Silence-repeated-timeout-not-supported-fixm.patch
(
echo '+ { "Jarkko Korpi", "wbemprox: Silence repeated \"timeout not supported\" fixme.", 1 },';
) >> "$patchlist"
fi
# Patchset wbemprox-Bios_Name
# |
# | Modified files:

35
patches/user32-Edit_Control_Resize/0001-user32-Ignore-sizes-passed-in-WM_SIZE-for-edit-contr.patch
View File

@ -1,35 +0,0 @@
From d6c4b5bde83cd1cf8a71084841342e27c94fd8ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 27 Sep 2015 15:27:42 +0200
Subject: user32: Ignore sizes passed in WM_SIZE for edit control.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Michael Müller <michael@fds-team.de>
---
dlls/user32/edit.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c
index 084bbff..0f5d86d 100644
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -3925,10 +3925,11 @@ static void EDIT_WM_SetText(EDITSTATE *es, LPCWSTR text, BOOL unicode)
*/
static void EDIT_WM_Size(EDITSTATE *es, UINT action, INT width, INT height)
{
- if ((action == SIZE_MAXIMIZED) || (action == SIZE_RESTORED)) {
+ if ((action == SIZE_MAXIMIZED) || (action == SIZE_RESTORED))
+ {
RECT rc;
- TRACE("width = %d, height = %d\n", width, height);
- SetRect(&rc, 0, 0, width, height);
+ /* Approach passes zero as width/height, so don't trust these values */
+ GetClientRect(es->hwndSelf, &rc);
EDIT_SetRectNP(es, &rc);
EDIT_UpdateText(es, NULL, TRUE);
}
--
2.5.1

1
patches/user32-Edit_Control_Resize/definition
View File

@ -1 +0,0 @@
Fixes: [37542] Do not trust width/height passed to edit control in WM_SIZE message

29
patches/wbemdisp-Timeout/0001-wbemprox-Silence-repeated-timeout-not-supported-fixm.patch
View File

@ -1,29 +0,0 @@
From de11056b08110b83c3ce9e2f90c16280d6c74193 Mon Sep 17 00:00:00 2001
From: Jarkko Korpi <jarkko_korpi@hotmail.com>
Date: Mon, 6 Jul 2015 23:47:07 +0300
Subject: wbemprox: Silence repeated "timeout not supported" fixme.
---
dlls/wbemprox/class.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c
index afb9f8c..5ce0381 100644
--- a/dlls/wbemprox/class.c
+++ b/dlls/wbemprox/class.c
@@ -120,7 +120,11 @@ static HRESULT WINAPI enum_class_object_Next(
if (!uCount) return WBEM_S_FALSE;
if (!apObjects || !puReturned) return WBEM_E_INVALID_PARAMETER;
- if (lTimeout != WBEM_INFINITE) FIXME("timeout not supported\n");
+ if (lTimeout != WBEM_INFINITE)
+ {
+ static int once;
+ if (!once++) FIXME("timeout not supported\n");
+ }
*puReturned = 0;
if (ec->index >= view->count) return WBEM_S_FALSE;
--
2.4.5

1
patches/wbemdisp-Timeout/definition
View File

@ -1 +0,0 @@
Fixes: [37618] Silence repeated wbemprox "timeout not supported" fixme

74
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

@ -433,7 +433,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c
--- a/dlls/d3d8/tests/visual.c
+++ b/dlls/d3d8/tests/visual.c
@@ -5408,7 +5408,11 @@
@@ -5440,7 +5440,11 @@
fill_surface(surface_managed, 0x0000ff00, D3DLOCK_NO_DIRTY_UPDATE);
add_dirty_rect_test_draw(device);
color = getPixelColor(device, 320, 240);
@ -1155,7 +1155,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
default:
mat._14 = mat._24 = mat._34 = 0.0f; mat._44 = 1.0f;
}
@@ -4382,7 +4401,11 @@
@@ -4389,7 +4408,11 @@
unsigned int i;
DWORD ttff;
DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2;
@ -1873,7 +1873,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target,
struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN;
void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info,
@@ -2003,7 +2062,11 @@
@@ -2004,7 +2063,11 @@
struct wined3d_state
{
DWORD flags;
@ -1885,7 +1885,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_vertex_declaration *vertex_declaration;
struct wined3d_stream_output stream_output[MAX_STREAM_OUT];
@@ -2048,6 +2111,7 @@
@@ -2049,6 +2112,7 @@
DWORD render_states[WINEHIGHEST_RENDER_STATE + 1];
};
@ -1893,7 +1893,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_gl_bo
{
GLuint name;
@@ -2056,6 +2120,7 @@
@@ -2057,6 +2121,7 @@
UINT size;
};
@ -1901,7 +1901,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
#define WINED3D_UNMAPPED_STAGE ~0U
/* Multithreaded flag. Removed from the public header to signal that
@@ -2111,11 +2176,23 @@
@@ -2112,11 +2177,23 @@
struct wined3d_rendertarget_view *back_buffer_view;
struct wined3d_swapchain **swapchains;
UINT swapchain_count;
@ -1925,7 +1925,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
/* For rendering to a texture using glCopyTexImage */
GLuint depth_blt_texture;
@@ -2126,6 +2203,9 @@
@@ -2127,6 +2204,9 @@
UINT xScreenSpace;
UINT yScreenSpace;
UINT cursorWidth, cursorHeight;
@ -1935,7 +1935,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
HCURSOR hardwareCursor;
/* The Wine logo texture */
@@ -2157,6 +2237,7 @@
@@ -2158,6 +2238,7 @@
UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN;
void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
@ -1943,7 +1943,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN;
void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) DECLSPEC_HIDDEN;
void device_exec_update_texture(struct wined3d_context *context, struct wined3d_texture *src_texture,
@@ -2168,6 +2249,11 @@
@@ -2169,6 +2250,11 @@
void device_create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN;
void device_delete_opengl_contexts_cs(struct wined3d_device *device,
struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
@ -1955,7 +1955,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)
{
@@ -2184,9 +2270,11 @@
@@ -2185,9 +2271,11 @@
ULONG (*resource_incref)(struct wined3d_resource *resource);
ULONG (*resource_decref)(struct wined3d_resource *resource);
void (*resource_unload)(struct wined3d_resource *resource);
@ -1967,7 +1967,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
};
struct wined3d_resource
@@ -2211,6 +2299,7 @@
@@ -2212,6 +2300,7 @@
UINT depth;
UINT size;
DWORD priority;
@ -1975,7 +1975,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void *heap_memory, *map_heap_memory, *user_memory, *bitmap_data;
UINT custom_row_pitch, custom_slice_pitch;
struct wined3d_gl_bo *buffer, *map_buffer;
@@ -2218,6 +2307,10 @@
@@ -2219,6 +2308,10 @@
DWORD locations;
LONG access_fence;
BOOL unmap_dirtify;
@ -1986,7 +1986,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void *parent;
const struct wined3d_parent_ops *parent_ops;
@@ -2242,6 +2335,7 @@
@@ -2243,6 +2336,7 @@
void *parent, const struct wined3d_parent_ops *parent_ops,
const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN;
void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
@ -1994,7 +1994,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
DWORD wined3d_resource_access_from_location(DWORD location) DECLSPEC_HIDDEN;
BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
void wined3d_resource_changed(struct wined3d_resource *resource,
@@ -2290,6 +2384,15 @@
@@ -2291,6 +2385,15 @@
{
while(InterlockedCompareExchange(&resource->access_fence, 0, 0));
}
@ -2010,7 +2010,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
/* Tests show that the start address of resources is 32 byte aligned */
#define RESOURCE_ALIGNMENT 16
@@ -2374,7 +2477,9 @@
@@ -2375,7 +2478,9 @@
void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture,
const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;
@ -2020,7 +2020,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void wined3d_texture_bind(struct wined3d_texture *texture,
struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN;
void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture,
@@ -2408,9 +2513,16 @@
@@ -2409,9 +2514,16 @@
struct wined3d_resource resource;
struct wined3d_texture *container;
@ -2037,7 +2037,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
};
static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource)
@@ -2418,6 +2530,7 @@
@@ -2419,6 +2531,7 @@
return CONTAINING_RECORD(resource, struct wined3d_volume, resource);
}
@ -2045,7 +2045,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc,
unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN;
void wined3d_volume_destroy(struct wined3d_volume *volume) DECLSPEC_HIDDEN;
@@ -2430,6 +2543,24 @@
@@ -2431,6 +2544,24 @@
struct wined3d_surface_dib
{
HBITMAP DIBsection;
@ -2070,7 +2070,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
UINT bitmap_size;
};
@@ -2455,7 +2586,11 @@
@@ -2456,7 +2587,11 @@
struct wined3d_surface_ops
{
HRESULT (*surface_private_setup)(struct wined3d_surface *surface);
@ -2082,7 +2082,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
};
struct wined3d_surface
@@ -2463,12 +2598,26 @@
@@ -2464,12 +2599,26 @@
struct wined3d_resource resource;
const struct wined3d_surface_ops *surface_ops;
struct wined3d_texture *container;
@ -2109,7 +2109,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
GLuint rb_multisample;
GLuint rb_resolved;
GLenum texture_target;
@@ -2512,10 +2661,19 @@
@@ -2513,10 +2662,19 @@
GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN;
void surface_get_drawable_size(const struct wined3d_surface *surface, const struct wined3d_context *context,
unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN;
@ -2129,7 +2129,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN;
void surface_prepare_rb(struct wined3d_surface *surface,
const struct wined3d_gl_info *gl_info, BOOL multisample) DECLSPEC_HIDDEN;
@@ -2527,6 +2685,7 @@
@@ -2528,6 +2686,7 @@
const struct wined3d_gl_info *gl_info, void *mem, unsigned int pitch) DECLSPEC_HIDDEN;
HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point,
struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN;
@ -2137,7 +2137,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc,
GLenum target, unsigned int level, unsigned int layer, DWORD flags,
struct wined3d_surface **surface) DECLSPEC_HIDDEN;
@@ -2541,6 +2700,17 @@
@@ -2542,6 +2701,17 @@
void wined3d_surface_cleanup_cs(struct wined3d_surface *surface) DECLSPEC_HIDDEN;
void wined3d_surface_getdc_cs(struct wined3d_surface *surface) DECLSPEC_HIDDEN;
void wined3d_surface_releasedc_cs(struct wined3d_surface *surface) DECLSPEC_HIDDEN;
@ -2155,7 +2155,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context,
const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN;
@@ -2563,8 +2733,10 @@
@@ -2564,8 +2734,10 @@
GLuint name;
};
@ -2166,7 +2166,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_vertex_declaration_element
{
const struct wined3d_format *format;
@@ -2593,8 +2765,10 @@
@@ -2594,8 +2766,10 @@
BOOL half_float_conv_needed;
};
@ -2177,7 +2177,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_saved_states
{
DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1];
@@ -2662,6 +2836,7 @@
@@ -2663,6 +2837,7 @@
void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN;
void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN;
@ -2185,7 +2185,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
HRESULT state_init(struct wined3d_state *state, const struct wined3d_gl_info *gl_info,
const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN;
void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN;
@@ -2712,6 +2887,32 @@
@@ -2713,6 +2888,32 @@
void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN;
void wined3d_cs_switch_onscreen_ds(struct wined3d_cs *cs, struct wined3d_context *context,
struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN;
@ -2218,7 +2218,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects,
DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN;
@@ -2761,6 +2962,7 @@
@@ -2762,6 +2963,7 @@
void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs,
struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN;
@ -2226,7 +2226,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void wined3d_cs_emit_set_consts_f(struct wined3d_cs *cs, UINT start_register, const float *constants,
UINT vector4f_count, enum wined3d_shader_type type) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_consts_b(struct wined3d_cs *cs, UINT start_register,
@@ -2824,6 +3026,7 @@
@@ -2825,6 +3027,7 @@
void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource,
unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch,
unsigned int depth_pitch) DECLSPEC_HIDDEN;
@ -2234,7 +2234,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
/* Direct3D terminology with little modifications. We do not have an issued state
* because only the driver knows about it, but we have a created state because d3d
@@ -2838,8 +3041,12 @@
@@ -2839,8 +3042,12 @@
struct wined3d_query_ops
{
HRESULT (*query_get_data)(struct wined3d_query *query, void *data, DWORD data_size, DWORD flags);
@ -2247,7 +2247,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
};
struct wined3d_query
@@ -2853,12 +3060,16 @@
@@ -2854,12 +3061,16 @@
enum wined3d_query_type type;
DWORD data_size;
void *extendedData;
@ -2264,7 +2264,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
/* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other
* fixed function semantics as D3DCOLOR or FLOAT16 */
@@ -2885,7 +3096,9 @@
@@ -2886,7 +3097,9 @@
GLenum buffer_object_usage;
GLenum buffer_type_hint;
DWORD flags;
@ -2274,7 +2274,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void *map_ptr;
struct wined3d_map_range *maps;
@@ -2910,11 +3123,15 @@
@@ -2911,11 +3124,15 @@
BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN;
void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context,
const struct wined3d_state *state) DECLSPEC_HIDDEN;
@ -2290,7 +2290,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_rendertarget_view
{
@@ -2953,8 +3170,10 @@
@@ -2954,8 +3171,10 @@
return surface_from_resource(resource);
}
@ -2301,7 +2301,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_shader_resource_view
{
LONG refcount;
@@ -2967,8 +3186,12 @@
@@ -2968,8 +3187,12 @@
struct wined3d_swapchain_ops
{
void (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect,
@ -2314,7 +2314,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
};
struct wined3d_swapchain
@@ -3007,8 +3230,10 @@
@@ -3008,8 +3231,10 @@
void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
@ -2325,7 +2325,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
/*****************************************************************************
* Utility function prototypes
@@ -3212,7 +3437,9 @@
@@ -3213,7 +3438,9 @@
void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_string_buffer *buffer,
const struct wined3d_shader_reg_maps *reg_maps, const DWORD *byte_code, void *backend_ctx) DECLSPEC_HIDDEN;
BOOL shader_match_semantic(const char *semantic_name, enum wined3d_decl_usage usage) DECLSPEC_HIDDEN;