wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Józef Kucia : wined3d: Add few missing enum values to debug_fbostatus().
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 4e38c3988e30b9b6ff08332133e4a079d081a644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e38c3988e30b9b6ff0833213… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:45 2016 +0200 wined3d: Add few missing enum values to debug_fbostatus(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 341e12b..c7bf5bb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4099,6 +4099,8 @@ const char *debug_fbostatus(GLenum status) { FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_UNSUPPORTED); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_UNDEFINED); #undef FBOSTATUS_TO_STR

1 0

Józef Kucia : wined3d: Accept multiple instruction modifiers in SM4+ shaders.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 807c4514d05223266916ae58cc41ed18f998683b URL: http://source.winehq.org/git/wine.git/?a=commit;h=807c4514d05223266916ae58c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:44 2016 +0200 wined3d: Accept multiple instruction modifiers in SM4+ shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 66 +++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5933626..35e6659 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1146,11 +1146,42 @@ static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD return TRUE; } +static void shader_sm4_read_instruction_modifier(DWORD modifier, struct wined3d_shader_instruction *ins) +{ + static const DWORD recognized_bits = WINED3D_SM4_INSTRUCTION_MODIFIER + | WINED3D_SM4_MODIFIER_AOFFIMMI + | WINED3D_SM4_AOFFIMMI_U_MASK + | WINED3D_SM4_AOFFIMMI_V_MASK + | WINED3D_SM4_AOFFIMMI_W_MASK; + + if (modifier & ~recognized_bits) + { + FIXME("Unhandled modifier 0x%08x.\n", modifier); + } + else + { + /* Bit fields are used for sign extension */ + struct + { + int u : 4; + int v : 4; + int w : 4; + } + aoffimmi; + aoffimmi.u = (modifier & WINED3D_SM4_AOFFIMMI_U_MASK) >> WINED3D_SM4_AOFFIMMI_U_SHIFT; + aoffimmi.v = (modifier & WINED3D_SM4_AOFFIMMI_V_MASK) >> WINED3D_SM4_AOFFIMMI_V_SHIFT; + aoffimmi.w = (modifier & WINED3D_SM4_AOFFIMMI_W_MASK) >> WINED3D_SM4_AOFFIMMI_W_SHIFT; + ins->texel_offset.u = aoffimmi.u; + ins->texel_offset.v = aoffimmi.v; + ins->texel_offset.w = aoffimmi.w; + } +} + static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins) { const struct wined3d_sm4_opcode_info *opcode_info; + DWORD opcode_token, opcode, previous_token; struct wined3d_sm4_data *priv = data; - DWORD opcode_token, opcode; unsigned int i, len; const DWORD *p; @@ -1195,36 +1226,9 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi p = *ptr; *ptr += len; - if (opcode_token & WINED3D_SM4_INSTRUCTION_MODIFIER) - { - static const DWORD recognized_bits = WINED3D_SM4_MODIFIER_AOFFIMMI - | WINED3D_SM4_AOFFIMMI_U_MASK - | WINED3D_SM4_AOFFIMMI_V_MASK - | WINED3D_SM4_AOFFIMMI_W_MASK; - DWORD modifier = *p++; - /* Bit fields are used for sign extension */ - struct - { - int u : 4; - int v : 4; - int w : 4; - } - aoffimmi; - - if (modifier & ~recognized_bits) - { - FIXME("Skipping modifier 0x%08x.\n", modifier); - } - else - { - aoffimmi.u = (modifier & WINED3D_SM4_AOFFIMMI_U_MASK) >> WINED3D_SM4_AOFFIMMI_U_SHIFT; - aoffimmi.v = (modifier & WINED3D_SM4_AOFFIMMI_V_MASK) >> WINED3D_SM4_AOFFIMMI_V_SHIFT; - aoffimmi.w = (modifier & WINED3D_SM4_AOFFIMMI_W_MASK) >> WINED3D_SM4_AOFFIMMI_W_SHIFT; - ins->texel_offset.u = aoffimmi.u; - ins->texel_offset.v = aoffimmi.v; - ins->texel_offset.w = aoffimmi.w; - } - } + previous_token = opcode_token; + while (previous_token & WINED3D_SM4_INSTRUCTION_MODIFIER) + shader_sm4_read_instruction_modifier(previous_token = *p++, ins); if (opcode_info->read_opcode_func) {

1 0

Józef Kucia : wined3d: Print correct resource type in FIXME() message.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: cb66c6390dcea73be6118b9693cc94a09e310ed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb66c6390dcea73be6118b969… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:43 2016 +0200 wined3d: Print correct resource type in FIXME() message. Signed-off-by: Józef Kucia <jkucia(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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cea5e5a..474cace 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1860,7 +1860,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont default: sampler_type = "unsupported_sampler"; - FIXME("Unhandled resource type %#x.\n", reg_maps->resource_info[i].type); + FIXME("Unhandled resource type %#x.\n", reg_maps->resource_info[entry->resource_idx].type); break; } shader_addline(buffer, "uniform %s%s %s_sampler%u;\n",

1 0

Józef Kucia : dxgi: Trace requested feature levels.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 7402e8116c20496375a15506f56159a4b3b9edde URL: http://source.winehq.org/git/wine.git/?a=commit;h=7402e8116c20496375a15506f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 22 11:18:42 2016 +0200 dxgi: Trace requested feature levels. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_main.c | 16 ++++++++++------ dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/utils.c | 15 +++++++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index a4c1362..8a39d93 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -128,8 +128,8 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I unsigned int flags, const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, void **device) { struct layer_get_size_args get_size_args; - struct dxgi_device *dxgi_device; struct dxgi_device_layer d3d10_layer; + struct dxgi_device *dxgi_device; UINT device_size; DWORD count; HRESULT hr; @@ -137,18 +137,22 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I TRACE("d3d10core %p, factory %p, adapter %p, flags %#x, feature_levels %p, level_count %u, device %p.\n", d3d10core, factory, adapter, flags, feature_levels, level_count, device); - FIXME("Ignoring flags.\n"); + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + if (TRACE_ON(dxgi)) + dump_feature_levels(feature_levels, level_count); hr = register_d3d10core_layers(d3d10core); if (FAILED(hr)) { - ERR("Failed to register d3d10core layers, returning %#x\n", hr); + ERR("Failed to register d3d10core layers, returning %#x.\n", hr); return hr; } if (!get_layer(DXGI_DEVICE_LAYER_D3D10_DEVICE, &d3d10_layer)) { - ERR("Failed to get D3D10 device layer\n"); + ERR("Failed to get D3D10 device layer.\n"); return E_FAIL; } @@ -156,7 +160,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I hr = d3d10_layer.init(d3d10_layer.id, &count, NULL); if (FAILED(hr)) { - WARN("Failed to initialize D3D10 device layer\n"); + WARN("Failed to initialize D3D10 device layer.\n"); return E_FAIL; } @@ -176,7 +180,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I dxgi_device = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, device_size); if (!dxgi_device) { - ERR("Failed to allocate device memory\n"); + ERR("Failed to allocate device memory.\n"); return E_OUTOFMEMORY; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 129f6b4..804ae99 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -79,6 +79,7 @@ struct dxgi_device_layer /* TRACE helper functions */ const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index c0c1fcd..c01dd9b 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -364,6 +364,21 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) } } +void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) +{ + unsigned int i; + + if (!feature_levels || !level_count) + { + TRACE("Feature levels: (null).\n"); + return; + } + + TRACE("Feature levels (count = %u):\n", level_count); + for (i = 0; i < level_count; ++i) + TRACE(" [%u] = %s.\n", i, debug_feature_level(feature_levels[i])); +} + void dxgi_sample_desc_from_wined3d(DXGI_SAMPLE_DESC *desc, enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality) {

1 0

Alistair Leslie-Hughes : wined3d: Add detection for NVIDIA GTX TITAN Series.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 1bb1824e7e82df1d12a93444dc19573e84050e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bb1824e7e82df1d12a93444d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 22 09:16:19 2016 +0000 wined3d: Add detection for NVIDIA GTX TITAN Series. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 10 ++++++++-- dlls/wined3d/wined3d_private.h | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 761ee07..4aa5fe1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1286,7 +1286,10 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITANB, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITANX, "NVIDIA GeForce GTX TITAN X", DRIVER_NVIDIA_GEFORCE8, 12288}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITANZ, "NVIDIA GeForce GTX TITAN Z", DRIVER_NVIDIA_GEFORCE8, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1753,6 +1756,7 @@ cards_nvidia_binary[] = {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ + {"GTX TITAN X", CARD_NVIDIA_GEFORCE_GTXTITANX}, /* Geforce 900 - highend */ {"GTX 960M", CARD_NVIDIA_GEFORCE_GTX960M}, /* GeForce 900 - midend high mobile */ {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ @@ -1766,7 +1770,9 @@ cards_nvidia_binary[] = {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ - {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ + {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITANB}, /* Geforce 700 - highend */ + {"GTX TITAN Z", CARD_NVIDIA_GEFORCE_GTXTITANZ}, /* Geforce 700 - highend */ + {"GTX TITAN", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bfc8f26..3cc7ece 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1794,7 +1794,10 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, - CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, + CARD_NVIDIA_GEFORCE_GTXTITAN = 0x1005, + CARD_NVIDIA_GEFORCE_GTXTITANB = 0x100c, + CARD_NVIDIA_GEFORCE_GTXTITANX = 0x17c2, + CARD_NVIDIA_GEFORCE_GTXTITANZ = 0x1001, CARD_NVIDIA_GEFORCE_820M = 0x0fed, CARD_NVIDIA_GEFORCE_830M = 0x1340, CARD_NVIDIA_GEFORCE_840M = 0x1341,

1 0

Alex Henrie : qedit: List parameters in order in create function traces.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: bac92dd6894555b55d8ea7a6c7d5e818abbfad2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac92dd6894555b55d8ea7a6c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Apr 22 00:18:00 2016 -0600 qedit: List parameters in order in create function traces. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 2 +- dlls/qedit/samplegrabber.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 9098223..53ab75a 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -640,7 +640,7 @@ static const IMediaDetVtbl IMediaDet_VTable = HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { MediaDetImpl* obj = NULL; - TRACE("(%p,%p)\n", ppv, pUnkOuter); + TRACE("(%p,%p)\n", pUnkOuter, ppv); obj = CoTaskMemAlloc(sizeof(MediaDetImpl)); if (NULL == obj) { diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index e9e4906..946dba9 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -1262,7 +1262,7 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) ISeekingPassThru *passthru; HRESULT hr; - TRACE("(%p,%p)\n", ppv, pUnkOuter); + TRACE("(%p,%p)\n", pUnkOuter, ppv); obj = CoTaskMemAlloc(sizeof(SG_Impl)); if (NULL == obj) {

1 0

Alistair Leslie-Hughes : inetcomm/tests: Add IMimeMessage SetOption tests.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 00558c29544167365936f55931bbe217189b4914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00558c29544167365936f5593… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 19 09:26:33 2016 +0000 inetcomm/tests: Add IMimeMessage SetOption tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 63 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 3b70685..bd90a80 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -332,6 +332,68 @@ static void test_CreateMessage(void) IStream_Release(stream); } +static void test_MessageOptions(void) +{ + static const char string[] = "XXXXX"; + static const char zero[] = "0"; + HRESULT hr; + IMimeMessage *msg; + PROPVARIANT prop; + + hr = MimeOleCreateMessage(NULL, &msg); + ok(hr == S_OK, "ret %08x\n", hr); + + PropVariantInit(&prop); + + prop.vt = VT_BOOL; + prop.u.boolVal = TRUE; + hr = IMimeMessage_SetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); + ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + hr = IMimeMessage_GetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); + todo_wine ok(hr == S_OK, "ret %08x\n", hr); + todo_wine ok(prop.vt == VT_BOOL, "vt %08x\n", prop.vt); + todo_wine ok(prop.u.boolVal == TRUE, "Hide Attachments got %d\n", prop.u.boolVal); + PropVariantClear(&prop); + + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(string)+1); + strcpy(prop.u.pszVal, string); + hr = IMimeMessage_SetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); + todo_wine ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + hr = IMimeMessage_GetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); + todo_wine ok(hr == S_OK, "ret %08x\n", hr); + todo_wine ok(prop.vt == VT_BOOL, "vt %08x\n", prop.vt); + todo_wine ok(prop.u.boolVal == TRUE, "Hide Attachments got %d\n", prop.u.boolVal); + PropVariantClear(&prop); + + /* Invalid property type doesn't change the value */ + prop.vt = VT_LPSTR; + prop.u.pszVal = CoTaskMemAlloc(strlen(zero)+1); + strcpy(prop.u.pszVal, zero); + hr = IMimeMessage_SetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); + todo_wine ok(hr == S_OK, "ret %08x\n", hr); + PropVariantClear(&prop); + + hr = IMimeMessage_GetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); + todo_wine ok(hr == S_OK, "ret %08x\n", hr); + todo_wine ok(prop.vt == VT_BOOL, "vt %08x\n", prop.vt); + todo_wine ok(prop.u.boolVal == TRUE, "Hide Attachments got %d\n", prop.u.boolVal); + PropVariantClear(&prop); + + /* Invalid OID */ + prop.vt = VT_BOOL; + prop.u.boolVal = TRUE; + hr = IMimeMessage_SetOption(msg, 0xff00000a, &prop); + todo_wine ok(hr == MIME_E_INVALID_OPTION_ID, "ret %08x\n", hr); + PropVariantClear(&prop); + + IMimeMessage_Release(msg); +} + void test_BindToObject(void) { HRESULT hr; @@ -372,6 +434,7 @@ START_TEST(mimeole) test_CreateBody(); test_Allocator(); test_CreateMessage(); + test_MessageOptions(); test_BindToObject(); test_MimeOleGetPropertySchema(); OleUninitialize();

1 0

Alistair Leslie-Hughes : mimeole.idl: Add more MIME_E defines.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 84cf8ca09625a4e7c829083f9dddfde001d654ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=84cf8ca09625a4e7c829083f9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 19 09:26:22 2016 +0000 mimeole.idl: Add more MIME_E defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mimeole.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/mimeole.idl b/include/mimeole.idl index 8f8a524..bc1f3ac 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -48,6 +48,23 @@ cpp_quote("#define MIME_E_INVALID_HANDLE 0x800cce09") cpp_quote("#define MIME_E_CHARSET_TRANSLATE 0x800cce0a") cpp_quote("#define MIME_E_NOT_INITIALIZED 0x800cce0b") +cpp_quote("#define MIME_E_INVALID_OPTION_VALUE 0x800cce1f") +cpp_quote("#define MIME_E_INVALID_OPTION_ID 0x800cce20") +cpp_quote("#define MIME_E_INVALID_HEADER_NAME 0x800cce21") +cpp_quote("#define MIME_E_NOT_BOUND 0x800cce22") +cpp_quote("#define MIME_E_MAX_SIZE_TOO_SMALL 0x800cce23") +cpp_quote("#define MIME_E_MULTIPART_HAS_CHILDREN 0x800cce25") +cpp_quote("#define MIME_E_INVALID_PROP_FLAGS 0x800cce26") +cpp_quote("#define MIME_E_INVALID_ADDRESS_TYPE 0x800cce27") +cpp_quote("#define MIME_E_INVALID_OBJECT_IID 0x800cce28") +cpp_quote("#define MIME_E_MLANG_DLL_NOT_FOUND 0x800cce29") +cpp_quote("#define MIME_E_ROOT_NOT_EMPTY 0x800cce2a") +cpp_quote("#define MIME_E_MLANG_BAD_DLL 0x800cce2b") +cpp_quote("#define MIME_E_REG_OPEN_KEY 0x800cce2c") +cpp_quote("#define MIME_E_INVALID_INET_DATE 0x800cce2d") +cpp_quote("#define MIME_E_INVALID_BODYTYPE 0x800cce2e") +cpp_quote("#define MIME_E_INVALID_DELETE_TYPE 0x800cce2f") +cpp_quote("#define MIME_E_OPTION_HAS_NO_VALUE 0x800cce30") cpp_quote("#define MIME_E_INVALID_CHARSET_TYPE 0x800cce31") cpp_quote("#define MIME_E_INVALID_TEXT_TYPE 0x800cce38")

1 0

Alistair Leslie-Hughes : mimeole.idl: Add more OID values.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 896a62a28ac9848a9ed03c8a1e41fd12e0c2eac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896a62a28ac9848a9ed03c8a1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 19 09:26:12 2016 +0000 mimeole.idl: Add more OID values. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mimeole.idl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index dddfc26..8f8a524 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -139,12 +139,26 @@ cpp_quote("} MIMEPROPID;") cpp_quote("#define TYPEDID_MASK ((ULONG)0xffff)") cpp_quote("#define TYPEDID_TYPE(t) ((VARTYPE)((t) & TYPEDID_MASK))") +cpp_quote("#define OID_ALLOW_8BIT_HEADER (0x00010000 | VT_BOOL)") +cpp_quote("#define OID_CBMAX_HEADER_LINE (0x00020000 | VT_UI4)") +cpp_quote("#define OID_SAVE_FORMAT (0x00030000 | VT_UI4)") +cpp_quote("#define OID_WRAP_BODY_TEXT (0x00040000 | VT_BOOL)") +cpp_quote("#define OID_CBMAX_BODY_LINE (0x00050000 | VT_UI4)") +cpp_quote("#define OID_TRANSMIT_BODY_ENCODING (0x00060000 | VT_UI4)") +cpp_quote("#define OID_TRANSMIT_TEXT_ENCODING (0x00070000 | VT_UI4)") +cpp_quote("#define OID_GENERATE_MESSAGE_ID (0x00080000 | VT_BOOL)") cpp_quote("#define OID_HIDE_TNEF_ATTACHMENTS (0x000e0000 | VT_BOOL)") +cpp_quote("#define OID_CLEANUP_TREE_ON_SAVE (0x000f0000 | VT_BOOL)") +cpp_quote("#define OID_BODY_REMOVE_NBSP (0x00140000 | VT_BOOL)") +cpp_quote("#define OID_DEFAULT_BODY_CHARSET (0x00150000 | VT_UI4)") +cpp_quote("#define OID_DEFAULT_HEADER_CHARSET (0x00160000 | VT_UI4)") +cpp_quote("#define OID_DBCS_ESCAPE_IS_8BIT (0x00170000 | VT_BOOL)") cpp_quote("#define OID_SECURITY_TYPE (0x00180000 | VT_UI4)") cpp_quote("#define OID_SECURITY_HWND_OWNER (0x00320000 | VT_UI4)") cpp_quote("#define OID_HEADER_RELOAD_TYPE (0x00370000 | VT_UI4)") +cpp_quote("#define OID_CAN_INLINE_TEXT_BODIES (0x00380000 | VT_BOOL)") cpp_quote("#define OID_SHOW_MACBINARY (0x00390000 | VT_BOOL)") - +cpp_quote("#define OID_SAVEBODY_KEEPBOUNDARY (0x00400000 | VT_BOOL)") [ uuid(e4b28371-83b0-11d0-8259-00c04fd85ab4),

1 0

Alistair Leslie-Hughes : inetcomm: Implement MimeOleGetPropertySchema.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 8599014c2dd2ad58b8d51e023ccfd71f4001e3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8599014c2dd2ad58b8d51e023… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 19 09:26:02 2016 +0000 inetcomm: Implement MimeOleGetPropertySchema. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 125 +++++++++++++++++++++++++++++++++++++++++- dlls/inetcomm/tests/mimeole.c | 12 ++++ 2 files changed, 135 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 8aebb38..7a0b5bf 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -115,6 +115,17 @@ static inline MimeBody *impl_from_IMimeBody(IMimeBody *iface) return CONTAINING_RECORD(iface, MimeBody, IMimeBody_iface); } +typedef struct propschema +{ + IMimePropertySchema IMimePropertySchema_iface; + LONG ref; +} propschema; + +static inline propschema *impl_from_IMimePropertySchema(IMimePropertySchema *iface) +{ + return CONTAINING_RECORD(iface, propschema, IMimePropertySchema_iface); +} + static LPSTR strdupA(LPCSTR str) { char *ret; @@ -3032,8 +3043,118 @@ HRESULT VirtualStream_create(IUnknown *outer, void **obj) return MimeOleCreateVirtualStream((IStream **)obj); } -HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema **schema) +/* IMimePropertySchema Interface */ +static HRESULT WINAPI propschema_QueryInterface(IMimePropertySchema *iface, REFIID riid, void **out) +{ + propschema *This = impl_from_IMimePropertySchema(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), out); + + *out = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IMimePropertySchema)) + { + *out = iface; + } + else + { + FIXME("no interface for %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IMimePropertySchema_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI propschema_AddRef(IMimePropertySchema *iface) +{ + propschema *This = impl_from_IMimePropertySchema(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI propschema_Release(IMimePropertySchema *iface) +{ + propschema *This = impl_from_IMimePropertySchema(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI propschema_RegisterProperty(IMimePropertySchema *iface, const char *name, DWORD flags, + DWORD rownumber, VARTYPE vtdefault, DWORD *propid) +{ + propschema *This = impl_from_IMimePropertySchema(iface); + FIXME("(%p)->(%s, %x, %d, %d, %p) stub\n", This, debugstr_a(name), flags, rownumber, vtdefault, propid); + return E_NOTIMPL; +} + +static HRESULT WINAPI propschema_ModifyProperty(IMimePropertySchema *iface, const char *name, DWORD flags, + DWORD rownumber, VARTYPE vtdefault) +{ + propschema *This = impl_from_IMimePropertySchema(iface); + FIXME("(%p)->(%s, %x, %d, %d) stub\n", This, debugstr_a(name), flags, rownumber, vtdefault); + return E_NOTIMPL; +} + +static HRESULT WINAPI propschema_GetPropertyId(IMimePropertySchema *iface, const char *name, DWORD *propid) +{ + propschema *This = impl_from_IMimePropertySchema(iface); + FIXME("(%p)->(%s, %p) stub\n", This, debugstr_a(name), propid); + return E_NOTIMPL; +} + +static HRESULT WINAPI propschema_GetPropertyName(IMimePropertySchema *iface, DWORD propid, char **name) +{ + propschema *This = impl_from_IMimePropertySchema(iface); + FIXME("(%p)->(%d, %p) stub\n", This, propid, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI propschema_RegisterAddressType(IMimePropertySchema *iface, const char *name, DWORD *adrtype) { - FIXME("(%p) stub\n", schema); + propschema *This = impl_from_IMimePropertySchema(iface); + FIXME("(%p)->(%s, %p) stub\n", This, debugstr_a(name), adrtype); return E_NOTIMPL; } + +static IMimePropertySchemaVtbl prop_schema_vtbl = +{ + propschema_QueryInterface, + propschema_AddRef, + propschema_Release, + propschema_RegisterProperty, + propschema_ModifyProperty, + propschema_GetPropertyId, + propschema_GetPropertyName, + propschema_RegisterAddressType +}; + + +HRESULT WINAPI MimeOleGetPropertySchema(IMimePropertySchema **schema) +{ + propschema *This; + + TRACE("(%p) stub\n", schema); + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->IMimePropertySchema_iface.lpVtbl = &prop_schema_vtbl; + This->ref = 1; + + *schema = &This->IMimePropertySchema_iface; + + return S_OK; +} diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 2b6dee2..3b70685 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -353,6 +353,17 @@ void test_BindToObject(void) IMimeMessage_Release(msg); } +static void test_MimeOleGetPropertySchema(void) +{ + HRESULT hr; + IMimePropertySchema *schema = NULL; + + hr = MimeOleGetPropertySchema(&schema); + ok(hr == S_OK, "ret %08x\n", hr); + + IMimePropertySchema_Release(schema); +} + START_TEST(mimeole) { OleInitialize(NULL); @@ -362,5 +373,6 @@ START_TEST(mimeole) test_Allocator(); test_CreateMessage(); test_BindToObject(); + test_MimeOleGetPropertySchema(); OleUninitialize(); }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
75
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 April 2016