wine-commits January 2020

wine-commits@winehq.org

1 participants
535 discussions

Zebediah Figura : ddraw: Update the primary stateblock in d3d_device3_SetRenderState().
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: 5d28b4224e3c1ed6b528c414e9e109378b34b91f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d28b4224e3c1ed6b528c414… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:24:47 2020 -0600 ddraw: Update the primary stateblock in d3d_device3_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 60 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 69a2767f90..725a935022 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2688,6 +2688,13 @@ static HRESULT WINAPI d3d_device7_SetRenderState_FPUPreserve(IDirect3DDevice7 *i return hr; } +static void d3d_device_set_texture_stage_state(struct d3d_device *device, + UINT stage, enum wined3d_texture_stage_state state, DWORD value) +{ + wined3d_stateblock_set_texture_stage_state(device->state, stage, state, value); + wined3d_device_set_texture_stage_state(device->wined3d_device, stage, state, value); +} + static void fixup_texture_alpha_op(struct d3d_device *device) { /* This fixup is required by the way D3DTBLEND_MODULATE maps to texture stage states. @@ -2711,7 +2718,7 @@ static void fixup_texture_alpha_op(struct d3d_device *device) } /* Args 1 and 2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */ - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_OP, tex_alpha ? WINED3D_TOP_SELECT_ARG1 : WINED3D_TOP_SELECT_ARG2); } @@ -2757,6 +2764,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, if (value == 0) { + wined3d_stateblock_set_texture(device->state, 0, NULL); wined3d_device_set_texture(device->wined3d_device, 0, NULL); hr = D3D_OK; break; @@ -2793,69 +2801,69 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, { fixup_texture_alpha_op(device); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_MODULATE); break; } case D3DTBLEND_ADD: - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_ADD); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT); break; case D3DTBLEND_MODULATEALPHA: - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_MODULATE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_MODULATE); break; case D3DTBLEND_COPY: case D3DTBLEND_DECAL: - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_SELECT_ARG1); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG1); break; case D3DTBLEND_DECALALPHA: - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_BLEND_TEXTURE_ALPHA); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2); - wined3d_device_set_texture_stage_state(device->wined3d_device, + d3d_device_set_texture_stage_state(device, 0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT); break;

1 0

Zebediah Figura : ddraw: Update the primary stateblock in update_clip_space().
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: 1907d01fab8a37db70cb03fe9076d5f1380fbb8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1907d01fab8a37db70cb03fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:24:46 2020 -0600 ddraw: Update the primary stateblock in update_clip_space(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/viewport.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 0a06329a69..1b7f778699 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -38,6 +38,8 @@ static void update_clip_space(struct d3d_device *device, D3DMATRIX projection; multiply_matrix(&projection, &clip_space, &device->legacy_projection); + wined3d_stateblock_set_transform(device->state, + WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); wined3d_device_set_transform(device->wined3d_device, WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); device->legacy_clipspace = clip_space;

1 0

Zebediah Figura : ddraw: Update the primary stateblock in d3d_device3_SetTransform() and d3d_device3_MultiplyTransform().
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: b41af695c3302962d6e53e8b87f62dcab055ffca URL: https://source.winehq.org/git/wine.git/?a=commit;h=b41af695c3302962d6e53e8b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:24:45 2020 -0600 ddraw: Update the primary stateblock in d3d_device3_SetTransform() and d3d_device3_MultiplyTransform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f19d81ccea..69a2767f90 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3193,6 +3193,8 @@ static HRESULT WINAPI d3d_device3_SetTransform(IDirect3DDevice3 *iface, wined3d_mutex_lock(); multiply_matrix(&projection, &device->legacy_clipspace, matrix); + wined3d_stateblock_set_transform(device->state, + WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); wined3d_device_set_transform(device->wined3d_device, WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); device->legacy_projection = *matrix; @@ -3404,6 +3406,8 @@ static HRESULT WINAPI d3d_device3_MultiplyTransform(IDirect3DDevice3 *iface, wined3d_mutex_lock(); multiply_matrix(&tmp, &device->legacy_projection, matrix); multiply_matrix(&projection, &device->legacy_clipspace, &tmp); + wined3d_stateblock_set_transform(device->state, + WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); wined3d_device_set_transform(device->wined3d_device, WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); device->legacy_projection = tmp;

1 0

Zebediah Figura : ddraw: Update the primary stateblock in d3d_device1_SetMatrix().
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: 703a290fcfd5505b67643554820c77aa46d16f90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=703a290fcfd5505b67643554… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:24:44 2020 -0600 ddraw: Update the primary stateblock in d3d_device1_SetMatrix(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 0999c01cb2..f19d81ccea 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1332,18 +1332,19 @@ static HRESULT WINAPI d3d_device1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIX * *****************************************************************************/ static HRESULT WINAPI d3d_device1_SetMatrix(IDirect3DDevice *iface, - D3DMATRIXHANDLE D3DMatHandle, D3DMATRIX *D3DMatrix) + D3DMATRIXHANDLE matrix_handle, D3DMATRIX *matrix) { - struct d3d_device *This = impl_from_IDirect3DDevice(iface); + struct d3d_device *device = impl_from_IDirect3DDevice(iface); D3DMATRIX *m; - TRACE("iface %p, matrix_handle %#x, matrix %p.\n", iface, D3DMatHandle, D3DMatrix); + TRACE("iface %p, matrix_handle %#x, matrix %p.\n", iface, matrix_handle, matrix); - if (!D3DMatrix) return DDERR_INVALIDPARAMS; + if (!matrix) + return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - m = ddraw_get_object(&This->handle_table, D3DMatHandle - 1, DDRAW_HANDLE_MATRIX); + m = ddraw_get_object(&device->handle_table, matrix_handle - 1, DDRAW_HANDLE_MATRIX); if (!m) { WARN("Invalid matrix handle.\n"); @@ -1352,21 +1353,33 @@ static HRESULT WINAPI d3d_device1_SetMatrix(IDirect3DDevice *iface, } if (TRACE_ON(ddraw)) - dump_D3DMATRIX(D3DMatrix); + dump_D3DMATRIX(matrix); - *m = *D3DMatrix; + *m = *matrix; - if (D3DMatHandle == This->world) - wined3d_device_set_transform(This->wined3d_device, - WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)D3DMatrix); + if (matrix_handle == device->world) + { + wined3d_stateblock_set_transform(device->state, + WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)matrix); + wined3d_device_set_transform(device->wined3d_device, + WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)matrix); + } - if (D3DMatHandle == This->view) - wined3d_device_set_transform(This->wined3d_device, - WINED3D_TS_VIEW, (struct wined3d_matrix *)D3DMatrix); + if (matrix_handle == device->view) + { + wined3d_stateblock_set_transform(device->state, + WINED3D_TS_VIEW, (struct wined3d_matrix *)matrix); + wined3d_device_set_transform(device->wined3d_device, + WINED3D_TS_VIEW, (struct wined3d_matrix *)matrix); + } - if (D3DMatHandle == This->proj) - wined3d_device_set_transform(This->wined3d_device, - WINED3D_TS_PROJECTION, (struct wined3d_matrix *)D3DMatrix); + if (matrix_handle == device->proj) + { + wined3d_stateblock_set_transform(device->state, + WINED3D_TS_PROJECTION, (struct wined3d_matrix *)matrix); + wined3d_device_set_transform(device->wined3d_device, + WINED3D_TS_PROJECTION, (struct wined3d_matrix *)matrix); + } wined3d_mutex_unlock();

1 0

Alexandre Julliard : winegcc: Also search the include and lib dirs relative to the binary path.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: 69a9c2be7295b2e79e428f604a35c4ccc7f809b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69a9c2be7295b2e79e428f60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 11:49:49 2020 +0100 winegcc: Also search the include and lib dirs relative to the binary path. Suggested by Kevin Puetz. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/Makefile.in | 3 ++- tools/winegcc/winegcc.c | 54 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index daeb91be1e..0d94eed5ff 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -10,8 +10,9 @@ C_SRCS = \ winegcc_EXTRADEFS = \ -DINCLUDEDIR="\"${includedir}\"" \ - -DDLLDIR="\"${dlldir}\"" \ -DLIBDIR="\"${libdir}\"" \ + -DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" \ + -DBIN_TO_LIBDIR=\"`$(MAKEDEP) -R ${bindir} ${libdir}`\" \ -DCC="\"$(CC)\"" \ -DCPP="\"$(CPPBIN)\"" \ -DCXX="\"$(CXX)\"" \ diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a335332225..c6bd444fa3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -145,6 +145,10 @@ static strarray* tmp_files; static sigset_t signal_mask; #endif +static const char *bindir; +static const char *libdir; +static const char *includedir; + enum processor { proc_cc, proc_cxx, proc_cpp, proc_as }; static const struct @@ -532,7 +536,7 @@ static const char *get_multiarch_dir( enum target_cpu cpu ) static char *get_lib_dir( struct options *opts ) { - static const char *stdlibpath[] = { LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; + const char *stdlibpath[] = { libdir, LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; static const char libwine[] = "/libwine.so"; const char *bit_suffix, *other_bit_suffix, *build_multiarch, *target_multiarch; const char *root = opts->sysroot ? opts->sysroot : ""; @@ -548,8 +552,12 @@ static char *get_lib_dir( struct options *opts ) for (i = 0; i < ARRAY_SIZE(stdlibpath); i++) { - char *p, *buffer = xmalloc( strlen(root) + strlen(stdlibpath[i]) + - strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); + const char *root = (i && opts->sysroot) ? opts->sysroot : ""; + char *p, *buffer; + + if (!stdlibpath[i]) continue; + buffer = xmalloc( strlen(root) + strlen(stdlibpath[i]) + + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); strcpy( buffer, root ); strcat( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); @@ -621,6 +629,28 @@ static char *get_lib_dir( struct options *opts ) return strmake( "%s%s", root, LIBDIR ); } +static void init_argv0_dir( const char *argv0 ) +{ +#ifndef _WIN32 + char *p, *dir; + +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + dir = realpath( "/proc/self/exe", NULL ); +#elif defined (__FreeBSD__) || defined(__DragonFly__) + dir = realpath( "/proc/curproc/file", NULL ); +#else + dir = realpath( argv0, NULL ); +#endif + if (!dir) return; + if (!(p = strrchr( dir, '/' ))) return; + if (p == dir) p++; + *p = 0; + bindir = dir; + includedir = strmake( "%s/%s", dir, BIN_TO_INCLUDEDIR ); + libdir = strmake( "%s/%s", dir, BIN_TO_LIBDIR ); +#endif +} + static void compile(struct options* opts, const char* lang) { strarray* comp_args = strarray_alloc(); @@ -772,23 +802,28 @@ no_compat_defines: { const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; const char *root = opts->isysroot ? opts->isysroot : opts->sysroot ? opts->sysroot : ""; + const char *isystem = gcc_defs ? "-isystem" : "-I"; if (opts->use_msvcrt) { + if (includedir) strarray_add( comp_args, strmake( "%s%s/wine/msvcrt", isystem, includedir )); for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) { if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; - strarray_add(comp_args, strmake( "%s%s%s/wine/msvcrt", - gcc_defs ? "-isystem" : "-I", root, incl_dirs[j] )); + strarray_add(comp_args, strmake( "%s%s%s/wine/msvcrt", isystem, root, incl_dirs[j] )); } strarray_add(comp_args, "-D__MSVCRT__"); } + if (includedir) + { + strarray_add( comp_args, strmake( "-I%s", includedir )); + strarray_add( comp_args, strmake( "%s%s/wine/windows", isystem, includedir )); + } for (j = 0; j < ARRAY_SIZE(incl_dirs); j++) { if (j && !strcmp( incl_dirs[0], incl_dirs[j] )) continue; strarray_add(comp_args, strmake( "-I%s%s", root, incl_dirs[j] )); - strarray_add(comp_args, strmake( "%s%s%s/wine/windows", - gcc_defs ? "-isystem" : "-I", root, incl_dirs[j] )); + strarray_add(comp_args, strmake( "%s%s%s/wine/windows", isystem, root, incl_dirs[j] )); } } else if (opts->wine_objdir) @@ -830,6 +865,8 @@ static strarray *get_winebuild_args(struct options *opts) binary = opts->winebuild; else if (opts->wine_objdir) binary = strmake( "%s/tools/winebuild/winebuild%s", opts->wine_objdir, EXEEXT ); + else if (bindir) + binary = strmake( "%s/winebuild%s", bindir, EXEEXT ); else binary = find_binary( opts->prefix, winebuild ? winebuild : "winebuild" ); strarray_add( spec_args, binary ); @@ -1427,11 +1464,12 @@ int main(int argc, char **argv) sigaddset( &signal_mask, SIGTERM ); sigaddset( &signal_mask, SIGINT ); #endif + init_argv0_dir( argv[0] ); /* setup tmp file removal at exit */ tmp_files = strarray_alloc(); atexit(clean_temp_files); - + /* initialize options */ memset(&opts, 0, sizeof(opts)); opts.target_cpu = build_cpu;

1 0

Alexandre Julliard : widl: Also search the include dir relative to the binary path.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: 90a543d3d75032405db6e363beae9418fdcef441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90a543d3d75032405db6e363… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 11:33:13 2020 +0100 widl: Also search the include dir relative to the binary path. Suggested by Kevin Puetz. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/Makefile.in | 4 +++- tools/widl/widl.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 80a12601de..6c74e88d25 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -19,7 +19,9 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -widl_EXTRADEFS = -DINCLUDEDIR=\"${includedir}\" +widl_EXTRADEFS = \ + -DINCLUDEDIR="\"${includedir}\"" \ + -DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" EXTRALIBS = -lwpp diff --git a/tools/widl/widl.c b/tools/widl/widl.c index aa6697135b..a99eed4e9d 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -150,6 +150,7 @@ static char *idfile_name; char *temp_name; const char *prefix_client = ""; const char *prefix_server = ""; +static const char *includedir; int line_number = 1; @@ -572,6 +573,27 @@ void write_id_data(const statement_list_t *stmts) fclose(idfile); } +static void init_argv0_dir( const char *argv0 ) +{ +#ifndef _WIN32 + char *p, *dir; + +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + dir = realpath( "/proc/self/exe", NULL ); +#elif defined (__FreeBSD__) || defined(__DragonFly__) + dir = realpath( "/proc/curproc/file", NULL ); +#else + dir = realpath( argv0, NULL ); +#endif + if (!dir) return; + if (!(p = strrchr( dir, '/' ))) return; + if (p == dir) p++; + *p = 0; + includedir = strmake( "%s/%s", dir, BIN_TO_INCLUDEDIR ); + free( dir ); +#endif +} + int main(int argc,char *argv[]) { int i, optc; @@ -585,6 +607,7 @@ int main(int argc,char *argv[]) #ifdef SIGHUP signal( SIGHUP, exit_on_signal ); #endif + init_argv0_dir( argv[0] ); now = time(NULL); @@ -751,6 +774,11 @@ int main(int argc,char *argv[]) { static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; + if (includedir) + { + wpp_add_include_path( strmake( "%s/wine/msvcrt", includedir )); + wpp_add_include_path( strmake( "%s/wine/windows", includedir )); + } for (i = 0; i < ARRAY_SIZE(incl_dirs); i++) { if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue;

1 0

Alexandre Julliard : wrc: Also search the include dir relative to the binary path.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: 5417826caa984f8eec3e85282f43235502bce3b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5417826caa984f8eec3e8528… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 30 11:30:13 2020 +0100 wrc: Also search the include dir relative to the binary path. Suggested by Kevin Puetz. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 4 +++- tools/wrc/wrc.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index d502e4b7da..c81276ebc6 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -15,7 +15,9 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}\"" +wrc_EXTRADEFS = \ + -DINCLUDEDIR="\"${includedir}\"" \ + -DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 014b177291..d171bfa2ef 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -154,6 +154,8 @@ static char *output_name; /* The name given by the -o option */ char *input_name = NULL; /* The name given on the command-line */ static char *temp_name = NULL; /* Temporary file for preprocess pipe */ +static const char *includedir; + int line_number = 1; /* The current line */ int char_number = 1; /* The current char pos within the line */ @@ -327,6 +329,27 @@ static void set_target( const char *target ) free( cpu ); } +static void init_argv0_dir( const char *argv0 ) +{ +#ifndef _WIN32 + char *p, *dir; + +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + dir = realpath( "/proc/self/exe", NULL ); +#elif defined (__FreeBSD__) || defined(__DragonFly__) + dir = realpath( "/proc/curproc/file", NULL ); +#else + dir = realpath( argv0, NULL ); +#endif + if (!dir) return; + if (!(p = strrchr( dir, '/' ))) return; + if (p == dir) p++; + *p = 0; + includedir = strmake( "%s/%s", dir, BIN_TO_INCLUDEDIR ); + free( dir ); +#endif +} + int main(int argc,char *argv[]) { int optc; @@ -347,6 +370,7 @@ int main(int argc,char *argv[]) #ifdef SIGHUP signal( SIGHUP, exit_on_signal ); #endif + init_argv0_dir( argv[0] ); /* Set the default defined stuff */ set_version_defines(); @@ -508,6 +532,11 @@ int main(int argc,char *argv[]) { static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; + if (includedir) + { + wpp_add_include_path( strmake( "%s/wine/msvcrt", includedir )); + wpp_add_include_path( strmake( "%s/wine/windows", includedir )); + } for (i = 0; i < ARRAY_SIZE(incl_dirs); i++) { if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue;

1 0

Zebediah Figura : quartz: Trace the requested properties in IMemAllocator::SetProperties().
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: f78975ba28c326c60e9d2a8834c35b446d0b1de0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f78975ba28c326c60e9d2a88… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:57:03 2020 -0600 quartz: Trace the requested properties in IMemAllocator::SetProperties(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/memallocator.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 5ac8a72a81..2f5855e95b 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -166,6 +166,9 @@ static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLO TRACE("(%p)->(%p, %p)\n", This, pRequest, pActual); + TRACE("Requested %d buffers, size %d, alignment %d, prefix %d.\n", + pRequest->cBuffers, pRequest->cbBuffer, pRequest->cbAlign, pRequest->cbPrefix); + EnterCriticalSection(This->pCritSect); { if (!list_empty(&This->used_list))

1 0

Zebediah Figura : qcap/tests: Expand tests for smart tee aggregation.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: d01e30052e2e1525532699aecd579952f4354a34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d01e30052e2e1525532699ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:57:02 2020 -0600 qcap/tests: Expand tests for smart tee aggregation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 111 +++++++++++++++++++++++++++++++++------ 1 file changed, 95 insertions(+), 16 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 014c6ee2d1..7a49150cc2 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -135,6 +135,100 @@ static void test_interfaces(void) ok(!ref, "Got unexpected refcount %d.\n", ref); } +static const GUID test_iid = {0x33333333}; +static LONG outer_ref = 1; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IBaseFilter) + || IsEqualGUID(iid, &test_iid)) + { + *out = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&outer_ref); +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return InterlockedDecrement(&outer_ref); +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_aggregation(void) +{ + IBaseFilter *filter, *filter2; + IUnknown *unk, *unk2; + HRESULT hr; + ULONG ref; + + filter = (IBaseFilter *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_AviDest, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!filter, "Got interface %p.\n", filter); + + hr = CoCreateInstance(&CLSID_AviDest, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + ref = IUnknown_AddRef(unk); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + ref = IUnknown_Release(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_QueryInterface(filter, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &IID_IBaseFilter, (void **)&filter2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter2 == (IBaseFilter *)0xdeadbeef, "Got unexpected IBaseFilter %p.\n", filter2); + + hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + IBaseFilter_Release(filter); + ref = IUnknown_Release(unk); + ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); +} + static void test_enum_pins(void) { IBaseFilter *filter = create_smart_tee(); @@ -2211,21 +2305,6 @@ static void test_unconnected_filter_state(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_smart_tee_filter_aggregation(void) -{ - SourceFilter *sourceFilter = create_video_SourceFilter(); - if (sourceFilter) { - IUnknown *unknown = NULL; - HRESULT hr = CoCreateInstance(&CLSID_SmartTee, (IUnknown*)&sourceFilter->IBaseFilter_iface, - CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unknown); - ok(SUCCEEDED(hr), "SmartTee filter doesn't support aggregation, hr=0x%08x\n", hr); - if (unknown) - IUnknown_Release(unknown); - IBaseFilter_Release(&sourceFilter->IBaseFilter_iface); - } else - ok(0, "out of memory allocating SourceFilter for test\n"); -} - static HRESULT get_connected_filter_classid(IPin *pin, GUID *guid) { IPin *connectedPin = NULL; @@ -2434,13 +2513,13 @@ START_TEST(smartteefilter) event = CreateEventW(NULL, FALSE, FALSE, NULL); test_interfaces(); + test_aggregation(); test_enum_pins(); test_find_pin(); test_pin_info(); test_enum_media_types(); test_unconnected_filter_state(); - test_smart_tee_filter_aggregation(); test_smart_tee_filter(); test_audio_smart_tee_filter_auto_insertion(test_audio_preview);

1 0

Zebediah Figura : quartz/filesource: Store the media type directly in the AsyncReader structure.
by Alexandre Julliard 30 Jan '20

30 Jan '20

Module: wine Branch: master Commit: 506b8a59ee0b1f3820f581c64e6bb49267ee46c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=506b8a59ee0b1f3820f581c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 29 19:57:01 2020 -0600 quartz/filesource: Store the media type directly in the AsyncReader structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 54 +++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index ea0ae8361e..2b7e9d58b1 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -62,7 +62,7 @@ typedef struct AsyncReader IAsyncReader IAsyncReader_iface; LPOLESTR pszFileName; - AM_MEDIA_TYPE *pmt; + AM_MEDIA_TYPE mt; ALLOCATOR_PROPERTIES allocProps; HANDLE file, port, io_thread; CRITICAL_SECTION sample_cs; @@ -359,6 +359,9 @@ static void async_reader_destroy(struct strmbase_filter *iface) filter->sample_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->sample_cs); strmbase_source_cleanup(&filter->source); + + CoTaskMemFree(filter->pszFileName); + FreeMediaType(&filter->mt); } PostQueuedCompletionStatus(filter->port, 0, 1, NULL); @@ -366,9 +369,6 @@ static void async_reader_destroy(struct strmbase_filter *iface) CloseHandle(filter->io_thread); CloseHandle(filter->port); - CoTaskMemFree(filter->pszFileName); - if (filter->pmt) - DeleteMediaType(filter->pmt); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); } @@ -446,7 +446,6 @@ HRESULT AsyncReader_create(IUnknown *outer, void **out) pAsyncRead->IAsyncReader_iface.lpVtbl = &FileAsyncReader_Vtbl; pAsyncRead->pszFileName = NULL; - pAsyncRead->pmt = NULL; InitializeCriticalSection(&pAsyncRead->sample_cs); pAsyncRead->sample_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FileAsyncReader.sample_cs"); @@ -502,7 +501,12 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi return HRESULT_FROM_WIN32(GetLastError()); } - free(This->pszFileName); + if (This->pszFileName) + { + free(This->pszFileName); + FreeMediaType(&This->mt); + } + if (!(This->pszFileName = wcsdup(pszFileName))) { CloseHandle(hFile); @@ -516,30 +520,26 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi This->flushing = FALSE; This->requests = NULL; - if (This->pmt) - DeleteMediaType(This->pmt); - - This->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); if (!pmt) { - CopyMediaType(This->pmt, &default_mt); - if (get_media_type(pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL)) + CopyMediaType(&This->mt, &default_mt); + if (get_media_type(pszFileName, &This->mt.majortype, &This->mt.subtype, NULL)) { TRACE("Found major type %s, subtype %s.\n", - debugstr_guid(&This->pmt->majortype), debugstr_guid(&This->pmt->subtype)); + debugstr_guid(&This->mt.majortype), debugstr_guid(&This->mt.subtype)); } } else - CopyMediaType(This->pmt, pmt); + CopyMediaType(&This->mt, pmt); return S_OK; } -static HRESULT WINAPI FileSource_GetCurFile(IFileSourceFilter * iface, LPOLESTR * ppszFileName, AM_MEDIA_TYPE * pmt) +static HRESULT WINAPI FileSource_GetCurFile(IFileSourceFilter *iface, LPOLESTR *ppszFileName, AM_MEDIA_TYPE *mt) { AsyncReader *This = impl_from_IFileSourceFilter(iface); - - TRACE("%p->(%p, %p)\n", This, ppszFileName, pmt); + + TRACE("filter %p, filename %p, mt %p.\n", This, ppszFileName, mt); if (!ppszFileName) return E_POINTER; @@ -549,16 +549,14 @@ static HRESULT WINAPI FileSource_GetCurFile(IFileSourceFilter * iface, LPOLESTR { *ppszFileName = CoTaskMemAlloc((wcslen(This->pszFileName) + 1) * sizeof(WCHAR)); wcscpy(*ppszFileName, This->pszFileName); + if (mt) + CopyMediaType(mt, &This->mt); } else - *ppszFileName = NULL; - - if (pmt) { - if (This->pmt) - CopyMediaType(pmt, This->pmt); - else - ZeroMemory(pmt, sizeof(*pmt)); + *ppszFileName = NULL; + if (mt) + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); } return S_OK; @@ -588,12 +586,12 @@ static inline AsyncReader *impl_from_IAsyncReader(IAsyncReader *iface) return CONTAINING_RECORD(iface, AsyncReader, IAsyncReader_iface); } -static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *pmt) +static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { AsyncReader *filter = impl_from_strmbase_pin(iface); - if (IsEqualGUID(&pmt->majortype, &filter->pmt->majortype) && - IsEqualGUID(&pmt->subtype, &filter->pmt->subtype)) + if (IsEqualGUID(&mt->majortype, &filter->mt.majortype) + && IsEqualGUID(&mt->subtype, &filter->mt.subtype)) return S_OK; return S_FALSE; @@ -607,7 +605,7 @@ static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int in return VFW_S_NO_MORE_ITEMS; if (index == 0) - CopyMediaType(mt, filter->pmt); + CopyMediaType(mt, &filter->mt); else if (index == 1) CopyMediaType(mt, &default_mt); return S_OK;

1 0

← Newer
1
2
3
4
5
6
7
...
54
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 January 2020