July 2015 - Wine-Commits - list.winehq.org

Aric Stewart : wine.inf: Add Dev Class for HID devices.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: c77c68599fa4d3a76f3f978da001255856bdbdde URL: http://source.winehq.org/git/wine.git/?a=commit;h=c77c68599fa4d3a76f3f978da… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 6 13:07:17 2015 -0500 wine.inf: Add Dev Class for HID devices. --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index fcd2e49..b647c3b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -445,6 +445,8 @@ HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be1031 HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},,,"Imaging devices" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},"Class",,"Image" +HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},,,"Human Interface Devices" +HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},"Class",,"HIDClass" [CurrentVersion] HKLM,%CurrentVersion%,"CommonFilesDir",,"%16427%"

1 0

Matteo Bruni : wined3d: Use a core-compatible GL format for ATI2N.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 04a195a9808e829dbf174e3e2f3f2a917f5be0ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a195a9808e829dbf174e3e2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 6 22:20:12 2015 +0200 wined3d: Use a core-compatible GL format for ATI2N. --- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/utils.c | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e392e50..059332d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3465,11 +3465,21 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) TRACE(" IMPLIED: ARB_vertex_array_bgra support (by EXT_vertex_array_bgra).\n"); gl_info->supported[ARB_VERTEX_ARRAY_BGRA] = TRUE; } + if (!gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC] && gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) + { + TRACE(" IMPLIED: EXT_texture_compression_rgtc support (by ARB_texture_compression_rgtc).\n"); + gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC] = TRUE; + } if (!gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] && gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) { TRACE(" IMPLIED: ARB_texture_compression_rgtc support (by EXT_texture_compression_rgtc).\n"); gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] = TRUE; } + if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] && !gl_info->supported[ARB_TEXTURE_RG]) + { + TRACE("ARB_texture_rg not supported, disabling ARB_texture_compression_rgtc.\n"); + gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] = FALSE; + } if (gl_info->supported[NV_TEXTURE_SHADER2]) { if (gl_info->supported[NV_REGISTER_COMBINERS]) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6c003c7..48f6671 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1269,6 +1269,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, + EXT_TEXTURE_COMPRESSION_RGTC, NULL}, + {WINED3DFMT_ATI2N, GL_COMPRESSED_RG_RGTC2, GL_COMPRESSED_RG_RGTC2, 0, + GL_RG, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_INTZ, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 0, @@ -2381,7 +2386,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W); } - if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) + if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] || gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) { idx = getFmtIdx(WINED3DFMT_ATI1N); gl_info->formats[idx].color_fixup = create_color_fixup_desc(

1 0

Matteo Bruni : wined3d: Use a lookup table to select the sampler function name.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 8839e7fb94b93fe4d669f7ad8db6ae1439a9e7cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8839e7fb94b93fe4d669f7ad8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 6 22:20:11 2015 +0200 wined3d: Use a lookup table to select the sampler function name. --- dlls/wined3d/glsl_shader.c | 67 ++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b465c0f..2770ab9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2516,18 +2516,23 @@ static const char *shader_glsl_get_rel_op(enum wined3d_shader_rel_op op) static void shader_glsl_get_sample_function(const struct wined3d_shader_context *ctx, DWORD resource_idx, DWORD flags, struct glsl_sample_function *sample_function) { - static const unsigned int type_coord_size[] = - { - 0, /* WINED3D_SHADER_RESOURCE_NONE */ - 1, /* WINED3D_SHADER_RESOURCE_BUFFER */ - 1, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ - 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ - 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ - 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ - 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ - 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ - 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ - 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ + static const struct + { + unsigned int coord_size; + const char *type_part; + } + resource_types[] = + { + {0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ + {1, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ + {1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ + {2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ + {2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ + {3, "3D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ + {3, "Cube"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ + {2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ + {3, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ + {3, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ }; struct shader_glsl_ctx_priv *priv = ctx->backend_data; enum wined3d_shader_resource_type resource_type = ctx->reg_maps->resource_info[resource_idx].type; @@ -2543,6 +2548,12 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context sample_function->data_type = ctx->reg_maps->resource_info[resource_idx].data_type; + if (resource_type >= ARRAY_SIZE(resource_types)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; + } + /* Note that there's no such thing as a projected cube texture. */ if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_CUBE) projected = FALSE; @@ -2550,26 +2561,11 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context if (shadow) base = "shadow"; - switch (resource_type) - { - case WINED3D_SHADER_RESOURCE_TEXTURE_1D: - type_part = "1D"; - break; - case WINED3D_SHADER_RESOURCE_TEXTURE_2D: - if (texrect) - type_part = "2DRect"; - else - type_part = "2D"; - break; - case WINED3D_SHADER_RESOURCE_TEXTURE_3D: - type_part = "3D"; - break; - case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE: - type_part = "Cube"; - break; - default: - FIXME("Unhandled resource type %#x.\n", resource_type); - } + type_part = resource_types[resource_type].type_part; + if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2D && texrect) + type_part = "2DRect"; + if (!type_part[0]) + FIXME("Unhandled resource type %#x.\n", resource_type); if (!lod && grad && !gl_info->supported[EXT_GPU_SHADER4]) { @@ -2583,12 +2579,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context string_buffer_sprintf(sample_function->name, "%s%s%s%s%s", base, type_part, projected ? "Proj" : "", lod ? "Lod" : grad ? "Grad" : "", suffix); - if (resource_type >= ARRAY_SIZE(type_coord_size)) - { - ERR("Unexpected resource type %#x.\n", resource_type); - resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; - } - coord_size = type_coord_size[resource_type]; + coord_size = resource_types[resource_type].coord_size; if (shadow) ++coord_size; sample_function->coord_mask = (1 << coord_size) - 1;

1 0

Michael Stefaniuc : dmstyle: Remove a not very useful macro.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 4f2a92328e512b904c76a56cfc977f6ceeb5451f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2a92328e512b904c76a56cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 7 10:12:22 2015 +0200 dmstyle: Remove a not very useful macro. The memory is already zeroed on allocation. --- dlls/dmstyle/dmutils.h | 6 ------ dlls/dmstyle/style.c | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/dmstyle/dmutils.h b/dlls/dmstyle/dmutils.h index 9fc2904..e290287 100644 --- a/dlls/dmstyle/dmutils.h +++ b/dlls/dmstyle/dmutils.h @@ -49,12 +49,6 @@ typedef struct { } guid_info; /* used for initialising structs */ -#define DM_STRUCT_INIT(x) \ - do { \ - memset((x), 0, sizeof(*(x))); \ - (x)->dwSize = sizeof(*x); \ - } while (0) - #define FE(x) { x, #x } #define GE(x) { &x, #x } diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 4e09d0a..255c96a 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -440,7 +440,7 @@ static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm, hr = IStream_Read (pStm, &pNewItem->part_ref, sizeof(DMUS_IO_PARTREF), NULL); /*TRACE_(dmfile)(" - sizeof %lu\n", sizeof(DMUS_IO_PARTREF));*/ list_add_tail (&pNewMotif->Items, &pNewItem->entry); - DM_STRUCT_INIT(&pNewItem->desc); + pNewItem->desc.dwSize = sizeof(pNewItem->desc); break; } case FOURCC_LIST: { @@ -669,7 +669,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU /** TODO trace pattern */ /** reset all data, as a new pattern begin */ - DM_STRUCT_INIT(&pNewMotif->desc); + pNewMotif->desc.dwSize = sizeof(pNewMotif->desc); list_init (&pNewMotif->Items); break; }

1 0

Michael Stefaniuc : dmstyle: Remove an unused variable.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 0ab95a1ec432648b665630154e3f71289a7a2545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab95a1ec432648b665630154… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 7 10:11:48 2015 +0200 dmstyle: Remove an unused variable. --- dlls/dmstyle/style.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 515a8f3..4e09d0a 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -639,12 +639,9 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - DMUS_OBJECTDESC desc; IDirectMusicBand* pBand = NULL; LPDMUS_PRIVATE_STYLE_MOTIF pNewMotif = NULL; - DM_STRUCT_INIT(&desc); - if (pChunk->fccID != DMUS_FOURCC_PATTERN_LIST) { ERR_(dmfile)(": %s chunk should be a PATTERN list\n", debugstr_fourcc (pChunk->fccID)); return E_FAIL;

1 0

Vincent Povirk : ole32: Use grfLocksSupported to decide when LockRegion is implemented.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 9cf835a9478d23b5a59fd8764563474b94ac5538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf835a9478d23b5a59fd8764… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 15:11:16 2015 -0500 ole32: Use grfLocksSupported to decide when LockRegion is implemented. --- dlls/ole32/filelockbytes.c | 2 ++ dlls/ole32/storage32.c | 75 +++++++++++++++++++++++++++++--------------- dlls/ole32/storage32.h | 5 +++ dlls/ole32/tests/storage32.c | 34 ++++++++++++++++++-- 4 files changed, 88 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9cf835a9478d23b5a59fd…

1 0

Nikolay Sivov : dwrite: Implement centered text alignment.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: bb0c6f74a5ad530f8cde5b69281b4e42e21bdcc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb0c6f74a5ad530f8cde5b692… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 23:08:11 2015 +0300 dwrite: Implement centered text alignment. --- dlls/dwrite/layout.c | 33 +++++++++++++++++++++++++++++++-- dlls/dwrite/tests/layout.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index d91da0d..d979307 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1165,7 +1165,7 @@ static void layout_apply_trailing_alignment(struct dwrite_textlayout *layout) } while (inrun && inrun->line == line) { - erun->align_dx = shift; + inrun->align_dx = shift; inrun = layout_get_next_inline_run(layout, inrun); } } @@ -1173,6 +1173,33 @@ static void layout_apply_trailing_alignment(struct dwrite_textlayout *layout) layout->metrics.left = layout->metrics.layoutWidth - layout->metrics.width; } +static void layout_apply_centered_alignment(struct dwrite_textlayout *layout) +{ + struct layout_effective_inline *inrun; + struct layout_effective_run *erun; + UINT32 line; + + erun = layout_get_next_erun(layout, NULL); + inrun = layout_get_next_inline_run(layout, NULL); + + for (line = 0; line < layout->metrics.lineCount; line++) { + FLOAT width = layout_get_line_width(layout, erun, inrun, line); + FLOAT shift = (layout->metrics.layoutWidth - width) / 2.0; + + while (erun && erun->line == line) { + erun->align_dx = shift; + erun = layout_get_next_erun(layout, erun); + } + + while (inrun && inrun->line == line) { + inrun->align_dx = shift; + inrun = layout_get_next_inline_run(layout, inrun); + } + } + + layout->metrics.left = (layout->metrics.layoutWidth - layout->metrics.width) / 2.0; +} + static void layout_apply_text_alignment(struct dwrite_textlayout *layout) { switch (layout->format.textalignment) @@ -1183,8 +1210,10 @@ static void layout_apply_text_alignment(struct dwrite_textlayout *layout) case DWRITE_TEXT_ALIGNMENT_TRAILING: layout_apply_trailing_alignment(layout); break; - case DWRITE_TEXT_ALIGNMENT_JUSTIFIED: case DWRITE_TEXT_ALIGNMENT_CENTER: + layout_apply_centered_alignment(layout); + break; + case DWRITE_TEXT_ALIGNMENT_JUSTIFIED: FIXME("alignment %d not implemented\n", layout->format.textalignment); break; default: diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 232f127..07ebaf3 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2889,6 +2889,7 @@ todo_wine { static void test_SetTextAlignment(void) { + static const WCHAR str2W[] = {'a','a','a','a','a',0}; static const WCHAR strW[] = {'a',0}; DWRITE_CLUSTER_METRICS clusters[1]; DWRITE_TEXT_METRICS metrics; @@ -2992,6 +2993,35 @@ static void test_SetTextAlignment(void) ok(metrics.lineCount == 1, "got %d\n", metrics.lineCount); IDWriteTextLayout_Release(layout); + /* max width less than total run width, trailing alignment */ + hr = IDWriteTextFormat_SetWordWrapping(format, DWRITE_WORD_WRAPPING_NO_WRAP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, str2W, 5, format, 2*clusters[0].width, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(metrics.left == metrics.layoutWidth - metrics.width, "got %.2f\n", metrics.left); +todo_wine + ok(metrics.width == 5*clusters[0].width, "got %.2f\n", metrics.width); + ok(metrics.lineCount == 1, "got %d\n", metrics.lineCount); + IDWriteTextLayout_Release(layout); + + /* maxwidth is 500, centered */ + hr = IDWriteTextFormat_SetTextAlignment(format, DWRITE_TEXT_ALIGNMENT_CENTER); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, str2W, 5, format, 500.0, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(metrics.left == (metrics.layoutWidth - metrics.width) / 2.0, "got %.2f\n", metrics.left); + ok(metrics.width == 5*clusters[0].width, "got %.2f\n", metrics.width); + ok(metrics.lineCount == 1, "got %d\n", metrics.lineCount); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : shell32/tests: Try harder to close Open With window.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 28caa68d41c53e5dcf1d80273f8d23a9daf56dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28caa68d41c53e5dcf1d80273… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 21:44:56 2015 +0300 shell32/tests: Try harder to close Open With window. --- dlls/shell32/tests/shlexec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0972b06..5189d2e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -127,6 +127,8 @@ static INT_PTR shell_execute(LPCSTR verb, LPCSTR file, LPCSTR parameters, LPCSTR if (wait_rc == WAIT_TIMEOUT) { HWND wnd = FindWindowA("#32770", "Windows"); + if (!wnd) + wnd = FindWindowA("Shell_Flyout", ""); if (wnd != NULL) { SendMessageA(wnd, WM_CLOSE, 0, 0);

1 0

Huw Davies : shell32/tests: Win 2k doesn't cope with spaces in the path.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: f5e16e0638e83224067685d0d94c143fb209d344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e16e0638e83224067685d0d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 6 15:02:58 2015 +0100 shell32/tests: Win 2k doesn't cope with spaces in the path. --- dlls/shell32/tests/shlexec.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0d2773d..0972b06 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2523,7 +2523,12 @@ static void init_test(void) "unable to find argv0!\n"); } - GetTempPathA(sizeof(filename), filename); + /* Older versions (win 2k) fail tests if there is a space in + the path. */ + if (dllver.dwMajorVersion <= 5) + strcpy(filename, "c:\\"); + else + GetTempPathA(sizeof(filename), filename); GetTempFileNameA(filename, "wt", 0, tmpdir); GetLongPathNameA(tmpdir, tmpdir, sizeof(tmpdir)); DeleteFileA( tmpdir );

1 0

Jacek Caban : msscript.ocx: Added support for IDispatch functions.
by Alexandre Julliard July 7, 2015

July 7, 2015

Module: wine Branch: master Commit: 7e83d413a27f34daca4b0b0543b6420f458feed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e83d413a27f34daca4b0b054… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 7 12:35:44 2015 +0200 msscript.ocx: Added support for IDispatch functions. --- dlls/msscript.ocx/Makefile.in | 1 + dlls/msscript.ocx/msscript.c | 116 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 107 insertions(+), 10 deletions(-) diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in index 0cbc964..959cd83 100644 --- a/dlls/msscript.ocx/Makefile.in +++ b/dlls/msscript.ocx/Makefile.in @@ -1,6 +1,7 @@ MODULE = msscript.ocx RC_SRCS = msscript.rc IDL_SRCS = msscript.idl +IMPORTS = oleaut32 C_SRCS = \ msscript.c diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 178fdb3..b4e9331 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -45,6 +45,75 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +typedef enum tid_t { + IScriptControl_tid, + LAST_tid +} tid_t; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_IScriptControl +}; + +static HRESULT load_typelib(void) +{ + HRESULT hres; + ITypeLib *tl; + + hres = LoadRegTypeLib(&LIBID_MSScriptControl, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hres; +} + +static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (!typelib) + hres = load_typelib(); + if (!typelib) + return hres; + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(typeinfos[tid]); + return S_OK; +} + +static void release_typelib(void) +{ + unsigned i; + + if(!typelib) + return; + + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -99,24 +168,35 @@ static ULONG WINAPI ScriptControl_Release(IScriptControl *iface) static HRESULT WINAPI ScriptControl_GetTypeInfoCount(IScriptControl *iface, UINT *pctinfo) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI ScriptControl_GetTypeInfo(IScriptControl *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo(IScriptControl_tid, ppTInfo); } static HRESULT WINAPI ScriptControl_GetIDsOfNames(IScriptControl *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hres = get_typeinfo(IScriptControl_tid, &typeinfo); + if(SUCCEEDED(hres)) { + hres = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hres; } static HRESULT WINAPI ScriptControl_Invoke(IScriptControl *iface, DISPID dispIdMember, @@ -124,8 +204,20 @@ static HRESULT WINAPI ScriptControl_Invoke(IScriptControl *iface, DISPID dispIdM EXCEPINFO *pExcepInfo, UINT *puArgErr) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hres = get_typeinfo(IScriptControl_tid, &typeinfo); + if(SUCCEEDED(hres)) { + hres = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hres; } static HRESULT WINAPI ScriptControl_get_Language(IScriptControl *iface, BSTR *p) @@ -344,9 +436,9 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow /****************************************************************** * DllMain (msscript.ocx.@) */ -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - TRACE("(%p %d %p)\n", instance, reason, lpv); + TRACE("(%p %d %p)\n", instance, reason, reserved); switch(reason) { case DLL_WINE_PREATTACH: @@ -355,6 +447,10 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID lpv) msscript_instance = instance; DisableThreadLibraryCalls(instance); break; + case DLL_PROCESS_DETACH: + if(!reserved) + release_typelib(); + break; } return TRUE;

1 0