wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Matteo Bruni : wined3d: Declare gl_Position as invariant.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 884b7c50cfd902eff9a41562a103e3bd5747422b URL: https://source.winehq.org/git/wine.git/?a=commit;h=884b7c50cfd902eff9a41562… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 19 20:50:30 2021 +0100 wined3d: Declare gl_Position as invariant. All D3D versions seem to basically guarantee invariance for the vertex position at the very least. In practice, desktop GL implementations also do the same. That's not necessarily the case for tile based renderers, where the cost of providing invariance might be non negligible. We want this behavior though, so let's ask for it explicitly. Based on a patch by Stefan Dösinger. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index adfbf60e726..4e51402f1cf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2184,6 +2184,14 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c if (map & 1) shader_addline(buffer, "void subroutine%u();\n", i); } + if (version->type != WINED3D_SHADER_TYPE_PIXEL && version->type != WINED3D_SHADER_TYPE_COMPUTE) + { + if (version->type == WINED3D_SHADER_TYPE_HULL) + shader_addline(buffer, "out gl_PerVertex { invariant vec4 gl_Position; } gl_out[];\n"); + else + shader_addline(buffer, "invariant gl_Position;\n"); + } + /* Declare the constants (aka uniforms) */ if (shader->limits->constant_float > 0) { @@ -7125,6 +7133,8 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl shader_glsl_add_version_declaration(buffer, gl_info); + shader_addline(buffer, "invariant gl_Position;\n"); + if (per_vertex_point_size) { shader_addline(buffer, "uniform struct\n{\n"); @@ -8994,6 +9004,8 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); + shader_addline(buffer, "invariant gl_Position;\n"); + for (i = 0; i < WINED3D_FFP_ATTRIBS_COUNT; ++i) { const char *type = i < ARRAY_SIZE(attrib_info) ? attrib_info[i].type : "vec4";

1 0

Matteo Bruni : ntdll: Call usleep() instead of NtYieldExecution() in NtDelayExecution().
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: e86b4015ff405d4c054b8a5bc855ee655e1a833c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e86b4015ff405d4c054b8a5b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 19 20:50:29 2021 +0100 ntdll: Call usleep() instead of NtYieldExecution() in NtDelayExecution(). This implements the general fix from b1a79c6b9c3ada0c34b1411b60879962f1815e4d (in particular, making sure that Sleep(0) will not immediately resume execution of the thread if there are no other runnable threads) while preserving the existing behavior of NtYieldExecution() / SwitchToThread(). Thanks Rémi for the idea. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 829add0be2d..d5d92145503 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1480,7 +1480,7 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeou } /* Note that we yield after establishing the desired timeout */ - NtYieldExecution(); + usleep(0); if (!when) return STATUS_SUCCESS; for (;;)

1 0

Matteo Bruni : Revert "ntdll: Implement NtYieldExecution() as usleep().".
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 3203f056687f62e3d74604da0efb6183989dfab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3203f056687f62e3d74604da… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 19 20:50:28 2021 +0100 Revert "ntdll: Implement NtYieldExecution() as usleep().". Rémi found a regression caused by that patch. His analysis suggests that it's probably correct for NtYieldExecution() to map to sched_yield(). Let's revert the patch and fix the issue in a slightly different way. This reverts commit b1a79c6b9c3ada0c34b1411b60879962f1815e4d. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 10 ++++++++-- configure.ac | 3 ++- dlls/ntdll/unix/sync.c | 6 +++++- include/config.h.in | 3 +++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 7b215627241..ae5c8e2734e 100755 --- a/configure +++ b/configure @@ -1512,7 +1512,6 @@ enable_msv1_0 enable_msvcirt enable_msvcm80 enable_msvcm90 -enable_msvcp_win enable_msvcp100 enable_msvcp110 enable_msvcp120 @@ -1524,6 +1523,7 @@ enable_msvcp70 enable_msvcp71 enable_msvcp80 enable_msvcp90 +enable_msvcp_win enable_msvcr100 enable_msvcr110 enable_msvcr120 @@ -19085,6 +19085,12 @@ if test "x$ac_cv_func_proc_pidinfo" = xyes then : printf "%s\n" "#define HAVE_PROC_PIDINFO 1" >>confdefs.h +fi +ac_fn_c_check_func "$LINENO" "sched_yield" "ac_cv_func_sched_yield" +if test "x$ac_cv_func_sched_yield" = xyes +then : + printf "%s\n" "#define HAVE_SCHED_YIELD 1" >>confdefs.h + fi ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle" if test "x$ac_cv_func_setproctitle" = xyes @@ -21595,7 +21601,6 @@ wine_fn_config_makefile dlls/msvcirt enable_msvcirt wine_fn_config_makefile dlls/msvcirt/tests enable_tests wine_fn_config_makefile dlls/msvcm80 enable_msvcm80 wine_fn_config_makefile dlls/msvcm90 enable_msvcm90 -wine_fn_config_makefile dlls/msvcp_win enable_msvcp_win wine_fn_config_makefile dlls/msvcp100 enable_msvcp100 wine_fn_config_makefile dlls/msvcp100/tests enable_tests wine_fn_config_makefile dlls/msvcp110 enable_msvcp110 @@ -21614,6 +21619,7 @@ wine_fn_config_makefile dlls/msvcp71 enable_msvcp71 wine_fn_config_makefile dlls/msvcp80 enable_msvcp80 wine_fn_config_makefile dlls/msvcp90 enable_msvcp90 wine_fn_config_makefile dlls/msvcp90/tests enable_tests +wine_fn_config_makefile dlls/msvcp_win enable_msvcp_win wine_fn_config_makefile dlls/msvcr100 enable_msvcr100 wine_fn_config_makefile dlls/msvcr100/tests enable_tests wine_fn_config_makefile dlls/msvcr110 enable_msvcr110 diff --git a/configure.ac b/configure.ac index 5074ee14833..9c0c8d25d29 100644 --- a/configure.ac +++ b/configure.ac @@ -1948,6 +1948,7 @@ AC_CHECK_FUNCS(\ posix_fallocate \ prctl \ proc_pidinfo \ + sched_yield \ setproctitle \ setprogname \ sigprocmask \ @@ -3133,7 +3134,6 @@ WINE_CONFIG_MAKEFILE(dlls/msvcirt) WINE_CONFIG_MAKEFILE(dlls/msvcirt/tests) WINE_CONFIG_MAKEFILE(dlls/msvcm80) WINE_CONFIG_MAKEFILE(dlls/msvcm90) -WINE_CONFIG_MAKEFILE(dlls/msvcp_win) WINE_CONFIG_MAKEFILE(dlls/msvcp100) WINE_CONFIG_MAKEFILE(dlls/msvcp100/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp110) @@ -3152,6 +3152,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp71) WINE_CONFIG_MAKEFILE(dlls/msvcp80) WINE_CONFIG_MAKEFILE(dlls/msvcp90) WINE_CONFIG_MAKEFILE(dlls/msvcp90/tests) +WINE_CONFIG_MAKEFILE(dlls/msvcp_win) WINE_CONFIG_MAKEFILE(dlls/msvcr100) WINE_CONFIG_MAKEFILE(dlls/msvcr100/tests) WINE_CONFIG_MAKEFILE(dlls/msvcr110) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 7f71b737045..829add0be2d 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1447,8 +1447,12 @@ NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait, */ NTSTATUS WINAPI NtYieldExecution(void) { - usleep(0); +#ifdef HAVE_SCHED_YIELD + sched_yield(); return STATUS_SUCCESS; +#else + return STATUS_NO_YIELD_PERFORMED; +#endif } diff --git a/include/config.h.in b/include/config.h.in index 0c843a0423c..0fe50e8ce7c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -443,6 +443,9 @@ /* Define to 1 if you have the `sched_setaffinity' function. */ #undef HAVE_SCHED_SETAFFINITY +/* Define to 1 if you have the `sched_yield' function. */ +#undef HAVE_SCHED_YIELD + /* Define to 1 if `cmd' is a member of `scsireq_t'. */ #undef HAVE_SCSIREQ_T_CMD

1 0

Matteo Bruni : d3dx9/tests: Clean up test_update_semantics() a bit.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: cee2d4c4c90887faa862f5d0dfc61e16312e9799 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cee2d4c4c90887faa862f5d0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 19 20:50:27 2021 +0100 d3dx9/tests: Clean up test_update_semantics() a bit. Inspired by a patch from Eric Pouech <eric.pouech(a)gmail.com>. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 829e4ee0ff9..3274b2d38bc 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4739,11 +4739,9 @@ static void test_update_semantics(void) D3DVERTEXELEMENT9 *decl_ptr; DWORD exp_vertex_size = sizeof(*vertices); DWORD vertex_size = 0; + BYTE *decl_mem; int equal; int i = 0; - int *decl_mem; - int filler_a = 0xaaaaaaaa; - int filler_b = 0xbbbbbbbb; test_context = new_test_context(); if (!test_context) @@ -4815,22 +4813,20 @@ static void test_update_semantics(void) /* Check that GetDeclaration only writes up to the D3DDECL_END() marker and * not the full MAX_FVF_DECL_SIZE elements. */ - memset(declaration, filler_a, sizeof(declaration)); + memset(declaration, 0xaa, sizeof(declaration)); memcpy(declaration, declaration0, sizeof(declaration0)); hr = mesh->lpVtbl->UpdateSemantics(mesh, declaration); ok(hr == D3D_OK, "Test UpdateSemantics, " "got %#x expected D3D_OK\n", hr); - memset(declaration, filler_b, sizeof(declaration)); + memset(declaration, 0xbb, sizeof(declaration)); hr = mesh->lpVtbl->GetDeclaration(mesh, declaration); ok(hr == D3D_OK, "Couldn't get vertex declaration. Got %#x, expected D3D_OK\n", hr); - decl_mem = (int*)declaration; - for (i = sizeof(declaration0)/sizeof(*decl_mem); i < sizeof(declaration)/sizeof(*decl_mem); i++) - { - equal = memcmp(&decl_mem[i], &filler_b, sizeof(filler_b)); - ok(equal == 0, - "GetDeclaration wrote past the D3DDECL_END() marker. " - "Got %#x, expected %#x\n", decl_mem[i], filler_b); - if (equal != 0) break; + decl_mem = (BYTE *)declaration; + for (i = sizeof(declaration0); i < sizeof(declaration); ++i) + { + ok(decl_mem[i] == 0xbb, "Unexpected %#x.\n", decl_mem[i]); + if (equal != 0) + break; } /* UpdateSemantics does not check for overlapping fields */

1 0

Matteo Bruni : d3dx9/tests: Clean up GetMatrixTransposePointerArray() tests.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 71c6f5b1ca3f2528aabedf216e525c4526a3c337 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71c6f5b1ca3f2528aabedf21… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 19 20:50:26 2021 +0100 d3dx9/tests: Clean up GetMatrixTransposePointerArray() tests. Inspired by a patch from Eric Pouech <eric.pouech(a)gmail.com>. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index a13dc708726..ea90299f936 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1475,16 +1475,16 @@ static void test_effect_parameter_value_GetMatrixPointerArray(const struct test_ float f[sizeof(D3DXMATRIX) / sizeof(float)]; D3DXMATRIX m; } fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE * sizeof(float) / sizeof(D3DXMATRIX)]; + D3DXMATRIX *matrix_pointer_array[ARRAY_SIZE(fvalue)]; const D3DXPARAMETER_DESC *res_desc = &res->desc; const char *res_full_name = res->full_name; - HRESULT hr; - D3DXMATRIX *matrix_pointer_array[ARRAY_SIZE(fvalue)]; UINT l, k, m, element, err = 0; union { DWORD d; float f; } cmp = {0xabababab}; + HRESULT hr; for (element = 0; element <= res_desc->Elements + 1; ++element) { @@ -1670,20 +1670,28 @@ static void test_effect_parameter_value_GetMatrixTransposeArray(const struct tes static void test_effect_parameter_value_GetMatrixTransposePointerArray(const struct test_effect_parameter_value_result *res, ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) { + union + { + float f[sizeof(D3DXMATRIX) / sizeof(float)]; + D3DXMATRIX m; + } fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE * sizeof(float) / sizeof(D3DXMATRIX)]; + D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)]; const D3DXPARAMETER_DESC *res_desc = &res->desc; const char *res_full_name = res->full_name; - HRESULT hr; - DWORD cmp = 0xabababab; - FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; - D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)]; UINT l, k, m, element, err = 0; + union + { + DWORD d; + float f; + } cmp = {0xabababab}; + HRESULT hr; for (element = 0; element <= res_desc->Elements + 1; ++element) { memset(fvalue, 0xab, sizeof(fvalue)); for (l = 0; l < element; ++l) { - matrix_pointer_array[l] = (D3DXMATRIX *)&fvalue[l * sizeof(**matrix_pointer_array) / sizeof(FLOAT)]; + matrix_pointer_array[l] = &fvalue[l].m; } hr = effect->lpVtbl->GetMatrixTransposePointerArray(effect, parameter, matrix_pointer_array, element); if (!element) @@ -1691,7 +1699,10 @@ static void test_effect_parameter_value_GetMatrixTransposePointerArray(const str ok(hr == D3D_OK, "%u - %s[%u]: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", i, res_full_name, element, hr, D3D_OK); - for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = 0; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } else if (element <= res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) { @@ -1706,23 +1717,30 @@ static void test_effect_parameter_value_GetMatrixTransposePointerArray(const str { if (k < res_desc->Columns && l < res_desc->Rows) { - if (!compare_float(fvalue[m * 16 + l + k * 4], get_float(res_desc->Type, + if (!compare_float(fvalue[m].m.m[k][l], get_float(res_desc->Type, &res_value[m * res_desc->Columns * res_desc->Rows + l * res_desc->Columns + k]), 512)) ++err; } - else if (fvalue[m * 16 + l + k * 4] != 0.0f) ++err; + else if (fvalue[m].m.m[k][l] != 0.0f) + ++err; } } } - for (l = element * 16; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = element; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } else { ok(hr == D3DERR_INVALIDCALL, "%u - %s[%u]: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", i, res_full_name, element, hr, D3DERR_INVALIDCALL); - for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = 0; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } ok(!err, "%u - %s[%u]: GetMatrixTransposePointerArray failed with %u errors\n", i, res_full_name, element, err); }

1 0

Alexandre Julliard : ntdll/tests: Fix a test failure on older Windows versions.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 0907d8cc6d94b5c5707830a9b637ec7a645d53da URL: https://source.winehq.org/git/wine.git/?a=commit;h=0907d8cc6d94b5c5707830a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 22 22:19:57 2021 +0100 ntdll/tests: Fix a test failure on older Windows versions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52069 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 53adee5896d..adc9b1ae6dc 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -245,7 +245,7 @@ static void test_NtAllocateVirtualMemory(void) addr2 = (char *)addr1 + 0xffe; status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_DECOMMIT); ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory failed %x\n", status); - ok( size == 0, "wrong size %lx\n", size ); + ok( size == 0 || broken(size == 0x10000) /* <= win10 1709 */, "wrong size %lx\n", size ); ok( addr2 == addr1, "wrong addr %p\n", addr2 ); size = 0;

1 0

Alexandre Julliard : winmm: Command resources should not depend on pointer size.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: acecec4a2e4b77cc05b0355a799af20fbdc6ec49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acecec4a2e4b77cc05b0355a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 22 16:09:42 2021 +0100 winmm: Command resources should not depend on pointer size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52072 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/mciavi_res.rc | 6 +----- dlls/mciqtz32/mciavi_res.rc | 6 +----- dlls/winmm/mci.c | 8 ++------ dlls/winmm/winmm_res.rc | 6 +----- 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/dlls/mciavi32/mciavi_res.rc b/dlls/mciavi32/mciavi_res.rc index e2e4caa805c..0aae615d13a 100644 --- a/dlls/mciavi32/mciavi_res.rc +++ b/dlls/mciavi32/mciavi_res.rc @@ -22,11 +22,7 @@ #include "mmddk.h" #include "digitalv.h" -#ifdef MCI_INTEGER64 -#define MCI_DWORD_PTR MCI_INTEGER64 -#else -#define MCI_DWORD_PTR MCI_INTEGER -#endif +#define MCI_DWORD_PTR 13 /* MCI_INTEGER64 */ MCIAVI RCDATA BEGIN diff --git a/dlls/mciqtz32/mciavi_res.rc b/dlls/mciqtz32/mciavi_res.rc index e2e4caa805c..0aae615d13a 100644 --- a/dlls/mciqtz32/mciavi_res.rc +++ b/dlls/mciqtz32/mciavi_res.rc @@ -22,11 +22,7 @@ #include "mmddk.h" #include "digitalv.h" -#ifdef MCI_INTEGER64 -#define MCI_DWORD_PTR MCI_INTEGER64 -#else -#define MCI_DWORD_PTR MCI_INTEGER -#endif +#define MCI_DWORD_PTR 13 /* MCI_INTEGER64 */ MCIAVI RCDATA BEGIN diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index c19ab453290..8e43dcc0f62 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1228,8 +1228,7 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret } break; } -#ifdef MCI_INTEGER64 - case MCI_INTEGER64: + case 13: /* MCI_INTEGER64 */ { DWORD_PTR data = *(DWORD_PTR *)(params + 1); switch (dwRet & 0xFFFF0000ul) { @@ -1263,7 +1262,6 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret } break; } -#endif case MCI_STRING: switch (dwRet & 0xFFFF0000ul) { case 0: @@ -1484,11 +1482,9 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, case MCI_RECT: offset += 4 * sizeof(DWORD); break; -#ifdef MCI_INTEGER64 - case MCI_INTEGER64: + case 13: /* MCI_INTEGER64 */ offset += sizeof(DWORD_PTR); break; -#endif default: FIXME("Unknown MCI return type %d\n", retType); dwRet = MCIERR_PARSER_INTERNAL; diff --git a/dlls/winmm/winmm_res.rc b/dlls/winmm/winmm_res.rc index 64c42b42ea0..a365446a46f 100644 --- a/dlls/winmm/winmm_res.rc +++ b/dlls/winmm/winmm_res.rc @@ -25,11 +25,7 @@ #include "windef.h" #include "mmddk.h" -#ifdef MCI_INTEGER64 -#define MCI_DWORD_PTR MCI_INTEGER64 -#else -#define MCI_DWORD_PTR MCI_INTEGER -#endif +#define MCI_DWORD_PTR 13 /* MCI_INTEGER64 */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0

Alexandre Julliard : makefiles: Don't use bundled libraries to build native programs.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 53e207fde0a62850eaf6b2316788a6729f47a55e URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e207fde0a62850eaf6b231… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 22 18:32:35 2021 +0100 makefiles: Don't use bundled libraries to build native programs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index bf8d3a126e3..d0dc9e3d01d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3404,7 +3404,8 @@ static void output_shared_lib( struct makefile *make ) strarray_addall( &dep_libs, get_local_dependencies( make, basename, make->in_files )); strarray_addall( &all_libs, get_expanded_file_local_var( make, basename, "LDFLAGS" )); - strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); + strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); + strarray_addall( &all_libs, libs ); output( "%s:", obj_dir_path( make, make->sharedlib )); output_filenames_obj_dir( make, make->object_files ); @@ -3518,7 +3519,10 @@ static void output_programs( struct makefile *make ) if (!objs.count) objs = make->object_files; if (!strarray_exists( &all_libs, "-nodefaultlibs" )) - strarray_addall( &all_libs, add_unix_libraries( make, &deps )); + { + strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); + strarray_addall( &all_libs, libs ); + } output( "%s:", obj_dir_path( make, program ) ); output_filenames_obj_dir( make, objs );

1 0

Alexandre Julliard : makefiles: Add a separate variable to keep track of source test files.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 859338a4d4810965cbfb521c0a7cbf7fbfb07a21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=859338a4d4810965cbfb521c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 20 13:26:51 2021 +0100 makefiles: Add a separate variable to keep track of source test files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index acc8f49bfba..bf8d3a126e3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -206,6 +206,7 @@ struct makefile struct strarray in_files; struct strarray ok_files; struct strarray pot_files; + struct strarray test_files; struct strarray clean_files; struct strarray distclean_files; struct strarray uninstall_files; @@ -3016,6 +3017,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour strarray_add( &make->c2man_files, source->filename ); if (make->testdll && !is_dll_src) { + strarray_add( &make->test_files, obj ); strarray_add( &make->ok_files, strmake( "%s.ok", obj )); output( "%s.ok:\n", obj_dir_path( make, obj )); output( "\t%s%s $(RUNTESTFLAGS) -T . -M %s -p %s%s %s && touch $@\n", @@ -3886,12 +3888,8 @@ static void output_linguas( const struct makefile *make ) static void output_testlist( const struct makefile *make ) { const char *dest = obj_dir_path( make, "testlist.c" ); - struct strarray files = empty_strarray; unsigned int i; - for (i = 0; i < make->ok_files.count; i++) - strarray_add( &files, replace_extension( make->ok_files.str[i], ".ok", "" )); - output_file = create_temp_file( dest ); output( "/* Automatically generated by make depend; DO NOT EDIT!! */\n\n" ); @@ -3900,11 +3898,13 @@ static void output_testlist( const struct makefile *make ) output( "#define STANDALONE\n" ); output( "#include \"wine/test.h\"\n\n" ); - for (i = 0; i < files.count; i++) output( "extern void func_%s(void);\n", files.str[i] ); + for (i = 0; i < make->test_files.count; i++) + output( "extern void func_%s(void);\n", make->test_files.str[i] ); output( "\n" ); output( "const struct test winetest_testlist[] =\n" ); output( "{\n" ); - for (i = 0; i < files.count; i++) output( " { \"%s\", func_%s },\n", files.str[i], files.str[i] ); + for (i = 0; i < make->test_files.count; i++) + output( " { \"%s\", func_%s },\n", make->test_files.str[i], make->test_files.str[i] ); output( " { 0, 0 }\n" ); output( "};\n" ); @@ -3960,7 +3960,7 @@ static void output_stub_makefile( struct makefile *make ) if (make->install_rules[INSTALL_LIB].count) strarray_add( &targets, "install-lib" ); if (make->install_rules[INSTALL_DEV].count) strarray_add( &targets, "install-dev" ); if (make->clean_files.count) strarray_add( &targets, "clean" ); - if (make->ok_files.count) + if (make->test_files.count) { strarray_add( &targets, "check" ); strarray_add( &targets, "test" );

1 0

Alexandre Julliard : makefiles: Don't append .fake extension to fake dlls.
by Alexandre Julliard 22 Nov '21

22 Nov '21

Module: wine Branch: master Commit: 62d335053f7ce675a6ae92b6a9f128ad3e9d4c0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d335053f7ce675a6ae92b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 20 13:07:47 2021 +0100 makefiles: Don't append .fake extension to fake dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 ------ dlls/ntdll/unix/loader.c | 11 +---------- dlls/setupapi/fakedll.c | 27 ++++++++------------------- tools/makedep.c | 11 ++++------- tools/widl/widl.c | 2 -- 5 files changed, 13 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a754579bf54..5cf538f3319 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2788,9 +2788,6 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne RtlAppendUnicodeToString( new_name, name ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status != STATUS_DLL_NOT_FOUND) goto done; - RtlAppendUnicodeToString( new_name, L".fake" ); - status = open_dll_file( new_name, pwm, mapping, image_info, id ); - if (status != STATUS_DLL_NOT_FOUND) goto done; new_name->Length = len; RtlAppendUnicodeToString( new_name, L"\\programs\\" ); @@ -2799,9 +2796,6 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne RtlAppendUnicodeToString( new_name, name ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status != STATUS_DLL_NOT_FOUND) goto done; - RtlAppendUnicodeToString( new_name, L".fake" ); - status = open_dll_file( new_name, pwm, mapping, image_info, id ); - if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( new_name ); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 3d26da194e4..00b07edb1f3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1720,16 +1720,6 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, SECTION_IMAGE_INFORMATION info; enum loadorder loadorder; - /* remove .fake extension if present */ - if (image_info->image_flags & IMAGE_FLAGS_WineFakeDll) - { - static const WCHAR fakeW[] = {'.','f','a','k','e',0}; - WCHAR *ext = wcsrchr( filename, '.' ); - - TRACE( "%s is a fake Wine dll\n", debugstr_w(filename) ); - if (ext && !wcsicmp( ext, fakeW )) *ext = 0; - } - init_unicode_string( &nt_name, filename ); loadorder = get_load_order( &nt_name ); @@ -1742,6 +1732,7 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, } else if (image_info->image_flags & IMAGE_FLAGS_WineFakeDll) { + TRACE( "%s is a fake Wine dll\n", debugstr_w(filename) ); if (loadorder == LO_NATIVE) return STATUS_DLL_NOT_FOUND; loadorder = LO_BUILTIN; /* builtin with no fallback since mapping a fake dll is not useful */ } diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 8ff29fb4f92..a4b8df4dfb4 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -253,8 +253,7 @@ static int read_file( const WCHAR *name, void **data, SIZE_T *size ) st.st_size - header_size ) == st.st_size - header_size) { *data = file_buffer; - if ((lstrlenW(name) > 2 && !wcscmp( name + lstrlenW(name) - 2, L"16" )) || - (lstrlenW(name) > 7 && !wcscmp( name + lstrlenW(name) - 7, L"16.fake" ))) + if (lstrlenW(name) > 2 && !wcscmp( name + lstrlenW(name) - 2, L"16" )) extract_16bit_image( nt, data, size ); ret = 1; } @@ -432,11 +431,11 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) len = lstrlenW( name ); if (build_dir) maxlen = lstrlenW(build_dir) + ARRAY_SIZE(L"\\programs") + len + 1; while ((path = enum_load_path( i++ ))) maxlen = max( maxlen, lstrlenW(path) ); - maxlen += ARRAY_SIZE(pe_dir) + len + ARRAY_SIZE(L".fake"); + maxlen += ARRAY_SIZE(pe_dir) + len + 1; if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen * sizeof(WCHAR) ))) return NULL; - pos = maxlen - len - ARRAY_SIZE(L".fake"); + pos = maxlen - len - 1; lstrcpyW( file + pos, name ); file[--pos] = '\\'; @@ -451,8 +450,6 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) ptr = prepend( ptr, L"\\dlls", 5 ); ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); if ((res = read_file( ptr, &data, size ))) goto done; - lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size ))) goto done; /* now as a program */ ptr = file + pos; @@ -463,8 +460,6 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) ptr = prepend( ptr, L"\\programs", 9 ); ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); if ((res = read_file( ptr, &data, size ))) goto done; - lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size ))) goto done; } file[pos + len + 1] = 0; @@ -888,7 +883,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size, } /* copy a fake dll file to the dest directory */ -static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL delete, struct list *delay_copy ) +static int install_fake_dll( WCHAR *dest, WCHAR *file, BOOL delete, struct list *delay_copy ) { int ret; SIZE_T size; @@ -899,7 +894,6 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL de WCHAR *end = name + lstrlenW(name); SIZE_T len = end - name; - if (ext) lstrcpyW( end, ext ); if (!(ret = read_file( file, &data, &size ))) { *end = 0; @@ -987,16 +981,11 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *wildcard, { lstrcatW( name, L"\\" ); lstrcatW( name, data.name ); - if (wcschr( data.name, '.' )) /* module possibly already has an extension */ - { - if (install_fake_dll( dest, file, NULL, delete, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", delete, &delay_copy )) continue; - } + if (wcschr( data.name, '.' ) && install_fake_dll( dest, file, delete, &delay_copy )) + continue; lstrcatW( name, default_ext ); - if (install_fake_dll( dest, file, NULL, delete, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", delete, &delay_copy )) continue; } - else install_fake_dll( dest, file, NULL, delete, &delay_copy ); + install_fake_dll( dest, file, delete, &delay_copy ); } while (!_wfindnext( handle, &data )); _findclose( handle ); @@ -1014,7 +1003,7 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, B if (build_dir) maxlen = lstrlenW(build_dir) + ARRAY_SIZE(L"\\programs") + 1; for (i = 0; (path = enum_load_path(i)); i++) maxlen = max( maxlen, lstrlenW(path) ); - maxlen += 2 * max_dll_name_len + 2 + ARRAY_SIZE(pe_dir) + 10; /* ".dll.fake" */ + maxlen += 2 * max_dll_name_len + 2 + ARRAY_SIZE(pe_dir) + 10; /* ".dll" */ if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen * sizeof(WCHAR) ))) return FALSE; if (!(dest = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(dirname) + max_dll_name_len) * sizeof(WCHAR) ))) diff --git a/tools/makedep.c b/tools/makedep.c index 99f824d5f8b..acc8f49bfba 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2731,9 +2731,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, for (i = 0; i < source->importlibdeps.count; i++) { struct makefile *submake = find_importlib_module( source->importlibdeps.str[i] ); - const char *module = submake->module; - if (*dll_ext && !submake->is_cross) module = strmake( "%s.fake", module ); - output_filename( obj_dir_path( submake, module )); + output_filename( obj_dir_path( submake, submake->module )); } output( "\n" ); } @@ -3221,11 +3219,10 @@ static void output_fake_module( struct makefile *make ) if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); - strarray_add( &make->all_targets, strmake( "%s.fake", make->module )); - add_install_rule( make, make->module, strmake( "%s.fake", make->module ), - strmake( "d%s/%s", pe_dir, make->module )); + strarray_add( &make->all_targets, make->module ); + add_install_rule( make, make->module, make->module, strmake( "d%s/%s", pe_dir, make->module )); - output( "%s.fake:", obj_dir_path( make, make->module )); + output( "%s:", obj_dir_path( make, make->module )); if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, make->res_files ); output_filename( tools_path( make, "winebuild" )); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index aa73601233f..0b5f07236f0 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -688,8 +688,6 @@ int open_typelib( const char *name ) if (strendswith( name, ".dll" )) namelen -= 4; TRYOPEN( strmake( "%.*s/%.*s/%s", (int)strlen(dlldirs.str[i]) - 2, dlldirs.str[i], namelen, name, name )); - TRYOPEN( strmake( "%.*s/%.*s/%s.fake", (int)strlen(dlldirs.str[i]) - 2, dlldirs.str[i], - namelen, name, name )); } else {

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021