https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c003509323faee50695d76...
commit c003509323faee50695d761420a36a6d0d198d7d Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Mon Oct 1 00:19:01 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Mon Oct 1 00:19:01 2018 +0100
[D3DCOMPILER_43] Sync with Wine Staging 3.17. CORE-15127 --- dll/directx/wine/d3dcompiler_43/compiler.c | 2 +- dll/directx/wine/d3dcompiler_43/utils.c | 8 ++++---- media/doc/README.WINE | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dll/directx/wine/d3dcompiler_43/compiler.c b/dll/directx/wine/d3dcompiler_43/compiler.c index cf75cd516c..53d2a430a5 100644 --- a/dll/directx/wine/d3dcompiler_43/compiler.c +++ b/dll/directx/wine/d3dcompiler_43/compiler.c @@ -570,7 +570,7 @@ static const struct target_info targets_info[] = { static const struct target_info * get_target_info(const char *target) { LONG min = 0; - LONG max = sizeof(targets_info) / sizeof(targets_info[0]) - 1; + LONG max = ARRAY_SIZE(targets_info) - 1; LONG cur; int res;
diff --git a/dll/directx/wine/d3dcompiler_43/utils.c b/dll/directx/wine/d3dcompiler_43/utils.c index 9d32677a81..748501f207 100644 --- a/dll/directx/wine/d3dcompiler_43/utils.c +++ b/dll/directx/wine/d3dcompiler_43/utils.c @@ -557,7 +557,7 @@ HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD d return S_OK; }
-HRESULT dxbc_init(struct dxbc *dxbc, DWORD size) +HRESULT dxbc_init(struct dxbc *dxbc, UINT size) { TRACE("dxbc %p, size %u.\n", dxbc, size);
@@ -1154,7 +1154,7 @@ static BOOL expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t
static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hlsl_base_type t2) { - enum hlsl_base_type types[] = + static const enum hlsl_base_type types[] = { HLSL_TYPE_BOOL, HLSL_TYPE_INT, @@ -1165,7 +1165,7 @@ static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hl }; int t1_idx = -1, t2_idx = -1, i;
- for (i = 0; i < sizeof(types) / sizeof(types[0]); ++i) + for (i = 0; i < ARRAY_SIZE(types); ++i) { /* Always convert away from HLSL_TYPE_HALF */ if (t1 == types[i]) @@ -1943,7 +1943,7 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_SWIZZLE", };
- if (type >= sizeof(names) / sizeof(names[0])) + if (type >= ARRAY_SIZE(names)) return "Unexpected node type"; return names[type]; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index f277dc5e53..d1e9eaa12b 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -24,7 +24,7 @@ The following libraries are shared with Wine. reactos/dll/directx/wine/amstream # Synced to WineStaging-3.9 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-3.9 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-3.9 -reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-3.3 +reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-3.17 reactos/dll/directx/wine/d3drm # Synced to WineStaging-3.9 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-3.9 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-3.3