June 2018 - Wine-Devel - list.winehq.org

Out for a few days
by Alexandre Julliard June 6, 2018

June 6, 2018

Folks, I'm going to be out from tomorrow until Sunday, so release 3.10 is going to be delayed until Monday. -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH 1/3] winnt.h: Add some WOW64 definitions.
by Zebediah Figura June 6, 2018

June 6, 2018

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/winnt.h | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 54bf11d..c41eff4 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2112,6 +2112,96 @@ typedef CONTEXT *PCONTEXT; NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); +#define WOW64_CONTEXT_i386 0x00010000 +#define WOW64_CONTEXT_i486 0x00010000 +#define WOW64_CONTEXT_CONTROL (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000001)) +#define WOW64_CONTEXT_INTEGER (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000002)) +#define WOW64_CONTEXT_SEGMENTS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000004)) +#define WOW64_CONTEXT_FLOATING_POINT (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000008)) +#define WOW64_CONTEXT_DEBUG_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000010)) +#define WOW64_CONTEXT_EXTENDED_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000020)) +#define WOW64_CONTEXT_FULL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | WOW64_CONTEXT_SEGMENTS) +#define WOW64_CONTEXT_ALL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | \ + WOW64_CONTEXT_SEGMENTS | WOW64_CONTEXT_FLOATING_POINT | \ + WOW64_CONTEXT_DEBUG_REGISTERS | WOW64_CONTEXT_EXTENDED_REGISTERS) + +#define WOW64_CONTEXT_XSTATE (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000040)) + +#define WOW64_CONTEXT_EXCEPTION_ACTIVE 0x08000000 +#define WOW64_CONTEXT_SERVICE_ACTIVE 0x10000000 +#define WOW64_CONTEXT_EXCEPTION_REQUEST 0x40000000 +#define WOW64_CONTEXT_EXCEPTION_REPORTING 0x80000000 + +#define WOW64_SIZE_OF_80387_REGISTERS 80 +#define WOW64_MAXIMUM_SUPPORTED_EXTENSION 512 + +typedef struct _WOW64_FLOATING_SAVE_AREA { + DWORD ControlWord; + DWORD StatusWord; + DWORD TagWord; + DWORD ErrorOffset; + DWORD ErrorSelector; + DWORD DataOffset; + DWORD DataSelector; + BYTE RegisterArea[WOW64_SIZE_OF_80387_REGISTERS]; + DWORD Cr0NpxState; +} WOW64_FLOATING_SAVE_AREA, *PWOW64_FLOATING_SAVE_AREA; + +#include "pshpack4.h" +typedef struct _WOW64_CONTEXT { + DWORD ContextFlags; + DWORD Dr0; + DWORD Dr1; + DWORD Dr2; + DWORD Dr3; + DWORD Dr6; + DWORD Dr7; + WOW64_FLOATING_SAVE_AREA FloatSave; + DWORD SegGs; + DWORD SegFs; + DWORD SegEs; + DWORD SegDs; + DWORD Edi; + DWORD Esi; + DWORD Ebx; + DWORD Edx; + DWORD Ecx; + DWORD Eax; + DWORD Ebp; + DWORD Eip; + DWORD SegCs; + DWORD EFlags; + DWORD Esp; + DWORD SegSs; + BYTE ExtendedRegisters[WOW64_MAXIMUM_SUPPORTED_EXTENSION]; +} WOW64_CONTEXT, *PWOW64_CONTEXT; +#include "poppack.h" + +typedef struct _WOW64_LDT_ENTRY { + WORD LimitLow; + WORD BaseLow; + union { + struct { + BYTE BaseMid; + BYTE Flags1; + BYTE Flags2; + BYTE BaseHi; + } Bytes; + struct { + DWORD BaseMid : 8; + DWORD Type : 5; + DWORD Dpl : 2; + DWORD Pres : 1; + DWORD LimitHi : 4; + DWORD Sys : 1; + DWORD Reserved_0 : 1; + DWORD Default_Big : 1; + DWORD Granularity : 1; + DWORD BaseHi : 8; + } Bits; + } HighWord; +} WOW64_LDT_ENTRY, *PWOW64_LDT_ENTRY; + /* * Product types */ -- 2.7.4

2 4

[PATCH] d3d8/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 6, 2018

June 6, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/stateblock.c | 14 +++---- dlls/d3d8/tests/visual.c | 88 ++++++++++++++++++++------------------------ 2 files changed, 47 insertions(+), 55 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 3ad9c1c140..83f153a289 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -1108,7 +1108,7 @@ const D3DRENDERSTATETYPE render_state_indices[] = struct render_state_data { - DWORD states[sizeof(render_state_indices) / sizeof(*render_state_indices)]; + DWORD states[ARRAY_SIZE(render_state_indices)]; }; struct render_state_arg @@ -1132,7 +1132,7 @@ static void render_state_apply_data(IDirect3DDevice8 *device, const struct state unsigned int i; HRESULT hr; - for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + for (i = 0; i < ARRAY_SIZE(render_state_indices); ++i) { hr = IDirect3DDevice8_SetRenderState(device, render_state_indices[i], rsdata->states[i]); ok(SUCCEEDED(hr), "SetRenderState returned %#x.\n", hr); @@ -1147,7 +1147,7 @@ static void render_state_check_data(IDirect3DDevice8 *device, const struct state unsigned int i; HRESULT hr; - for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + for (i = 0; i < ARRAY_SIZE(render_state_indices); ++i) { DWORD value = ctx->poison_data_buffer.states[i]; hr = IDirect3DDevice8_GetRenderState(device, render_state_indices[i], &value); @@ -1244,7 +1244,7 @@ static void render_state_poison_data_init(struct render_state_data *data) { unsigned int i; - for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + for (i = 0; i < ARRAY_SIZE(render_state_indices); ++i) { data->states[i] = 0x1337c0de; } @@ -1423,10 +1423,10 @@ static HRESULT render_state_test_init(IDirect3DDevice8 *device, struct state_tes render_state_test_data_init(&ctx->test_data_all_buffer); render_state_poison_data_init(&ctx->poison_data_buffer); - for (i = 0; i < sizeof(render_state_indices) / sizeof(*render_state_indices); ++i) + for (i = 0; i < ARRAY_SIZE(render_state_indices); ++i) { ctx->test_data_vertex_buffer.states[i] = ctx->default_data_buffer.states[i]; - for (j = 0; j < sizeof(states_vertex) / sizeof(*states_vertex); ++j) + for (j = 0; j < ARRAY_SIZE(states_vertex); ++j) { if (render_state_indices[i] == states_vertex[j]) { @@ -1436,7 +1436,7 @@ static HRESULT render_state_test_init(IDirect3DDevice8 *device, struct state_tes } ctx->test_data_pixel_buffer.states[i] = ctx->default_data_buffer.states[i]; - for (j = 0; j < sizeof(states_pixel) / sizeof(*states_pixel); ++j) + for (j = 0; j < ARRAY_SIZE(states_pixel); ++j) { if (render_state_indices[i] == states_pixel[j]) { diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c2a4abfc04..bed70d8a17 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -494,7 +494,7 @@ static void lighting_test(void) hr = IDirect3DDevice8_LightEnable(device, 0, TRUE); ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, tests[i].world_matrix); ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); @@ -706,22 +706,14 @@ static void test_specular_lighting(void) } tests[] = { - {&directional, FALSE, 30.0f, expected_directional, - sizeof(expected_directional) / sizeof(expected_directional[0])}, - {&directional, TRUE, 30.0f, expected_directional_local, - sizeof(expected_directional_local) / sizeof(expected_directional_local[0])}, - {&point, FALSE, 30.0f, expected_point, - sizeof(expected_point) / sizeof(expected_point[0])}, - {&point, TRUE, 30.0f, expected_point_local, - sizeof(expected_point_local) / sizeof(expected_point_local[0])}, - {&spot, FALSE, 30.0f, expected_spot, - sizeof(expected_spot) / sizeof(expected_spot[0])}, - {&spot, TRUE, 30.0f, expected_spot_local, - sizeof(expected_spot_local) / sizeof(expected_spot_local[0])}, - {&point_range, FALSE, 30.0f, expected_point_range, - sizeof(expected_point_range) / sizeof(expected_point_range[0])}, - {&point_side, TRUE, 0.0f, expected_point_side, - sizeof(expected_point_side) / sizeof(expected_point_side[0])}, + {&directional, FALSE, 30.0f, expected_directional, ARRAY_SIZE(expected_directional)}, + {&directional, TRUE, 30.0f, expected_directional_local, ARRAY_SIZE(expected_directional_local)}, + {&point, FALSE, 30.0f, expected_point, ARRAY_SIZE(expected_point)}, + {&point, TRUE, 30.0f, expected_point_local, ARRAY_SIZE(expected_point_local)}, + {&spot, FALSE, 30.0f, expected_spot, ARRAY_SIZE(expected_spot)}, + {&spot, TRUE, 30.0f, expected_spot_local, ARRAY_SIZE(expected_spot_local)}, + {&point_range, FALSE, 30.0f, expected_point_range, ARRAY_SIZE(expected_point_range)}, + {&point_side, TRUE, 0.0f, expected_point_side, ARRAY_SIZE(expected_point_side)}, }; IDirect3DDevice8 *device; D3DMATERIAL8 material; @@ -795,7 +787,7 @@ static void test_specular_lighting(void) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SPECULARENABLE, TRUE); ok(SUCCEEDED(hr), "Failed to enable specular lighting, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice8_SetLight(device, 0, tests[i].light); ok(SUCCEEDED(hr), "Failed to set light parameters, hr %#x.\n", hr); @@ -1480,7 +1472,7 @@ static void fog_with_shader_test(void) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, end.i); ok(hr == D3D_OK, "Setting fog end failed (%08x)\n", hr); - for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { hr = IDirect3DDevice8_SetVertexShader(device, vertex_shader[test_data[i].vshader]); ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); @@ -2458,7 +2450,7 @@ static void test_scalar_instructions(void) goto done; } - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff336699, 0.0f, 0); ok(SUCCEEDED(hr), "%s: Failed to clear, hr %#x.\n", test_data[i].name, hr); @@ -3100,7 +3092,7 @@ static void texop_test(void) hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00000000, 1.0f, 0); ok(SUCCEEDED(hr), "IDirect3DDevice9_Clear failed with 0x%08x\n", hr); - for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { if (!(caps.TextureOpCaps & test_data[i].caps_flag)) { @@ -3789,7 +3781,7 @@ static void intz_test(void) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); get_rt_readback(original_rt, &rb); - for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + for (i = 0; i < ARRAY_SIZE(expected_colors); ++i) { D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), @@ -3847,7 +3839,7 @@ static void intz_test(void) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); get_rt_readback(original_rt, &rb); - for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + for (i = 0; i < ARRAY_SIZE(expected_colors); ++i) { D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), @@ -3915,7 +3907,7 @@ static void intz_test(void) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); get_rt_readback(original_rt, &rb); - for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + for (i = 0; i < ARRAY_SIZE(expected_colors); ++i) { D3DCOLOR color = get_readback_color(&rb, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), @@ -4070,7 +4062,7 @@ static void shadow_test(void) D3DTTFF_COUNT4 | D3DTTFF_PROJECTED); ok(SUCCEEDED(hr), "SetTextureStageState failed, hr %#x.\n", hr); - for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { D3DFORMAT format = formats[i].format; IDirect3DTexture8 *texture; @@ -4132,7 +4124,7 @@ static void shadow_test(void) IDirect3DTexture8_Release(texture); get_rt_readback(original_rt, &rb); - for (j = 0; j < sizeof(expected_colors) / sizeof(*expected_colors); ++j) + for (j = 0; j < ARRAY_SIZE(expected_colors); ++j) { D3DCOLOR color = get_readback_color(&rb, expected_colors[j].x, expected_colors[j].y); /* Geforce 7 on Windows returns 1.0 in alpha when the depth format is D24S8 or D24X8, @@ -4459,7 +4451,7 @@ static void resz_test(void) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); - for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + for (i = 0; i < ARRAY_SIZE(expected_colors); ++i) { D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), @@ -4544,7 +4536,7 @@ static void resz_test(void) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); - for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + for (i = 0; i < ARRAY_SIZE(expected_colors); ++i) { D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); ok(color_match(color, expected_colors[i].color, 1), @@ -4891,7 +4883,7 @@ static void fog_special_test(void) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, conv.d); ok(SUCCEEDED(hr), "Failed to set fog end, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); @@ -5926,7 +5918,7 @@ static void test_fog_interpolation(void) hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &ident_mat); ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { if(!(caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE) && tests[i].tfog) continue; @@ -6081,7 +6073,7 @@ static void test_negative_fixedfunction_fog(void) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { if (!(caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE) && tests[i].tfog) continue; @@ -6206,7 +6198,7 @@ static void test_table_fog_zw(void) hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x000000ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); @@ -6414,7 +6406,7 @@ static void test_signed_formats(void) hr = IDirect3DDevice8_CreatePixelShader(device, shader_code_alpha, &shader_alpha); ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); - for (i = 0; i < sizeof(formats) / sizeof(*formats); i++) + for (i = 0; i < ARRAY_SIZE(formats); i++) { hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, formats[i].format); @@ -6424,7 +6416,7 @@ static void test_signed_formats(void) continue; } - for (j = 0; j < sizeof(tests) / sizeof(*tests); j++) + for (j = 0; j < ARRAY_SIZE(tests); j++) { texture_sysmem = NULL; hr = IDirect3DDevice8_CreateTexture(device, tests[j].width, 4, 1, 0, @@ -6661,7 +6653,7 @@ static void test_updatetexture(void) hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); ok(hr == D3D_OK, "Failed to set texture stage state, hr %#x.\n", hr); - for (t = 0; t < sizeof(texture_types) / sizeof(*texture_types); ++t) + for (t = 0; t < ARRAY_SIZE(texture_types); ++t) { if (!(caps.TextureCaps & texture_types[t].cap)) { @@ -6683,7 +6675,7 @@ static void test_updatetexture(void) hr = IDirect3DDevice8_SetVertexShader(device, texture_types[t].fvf); ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { if (tests[i].src_format == MAKEFOURCC('A','T','I','2') && !ati2n_supported) continue; @@ -7253,7 +7245,7 @@ static void test_pointsize(void) hr = IDirect3DDevice8_SetRenderTarget(device, rt, depthstencil); ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); - for (i = 0; i < sizeof(test_setups) / sizeof(test_setups[0]); ++i) + for (i = 0; i < ARRAY_SIZE(test_setups); ++i) { if (caps.VertexShaderVersion < test_setups[i].vs->version || caps.PixelShaderVersion < test_setups[i].ps->version) @@ -7285,7 +7277,7 @@ static void test_pointsize(void) hr = IDirect3DDevice8_SetPixelShader(device, ps); ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); - for (j = 0; j < sizeof(tests) / sizeof(tests[0]); ++j) + for (j = 0; j < ARRAY_SIZE(tests); ++j) { unsigned int size = tests[j].override_min ? 63 : tests[j].zero_size ? 0 : tests[j].scale ? test_setups[i].scaled_size : test_setups[i].nonscaled_size; @@ -8116,7 +8108,7 @@ static void test_flip(void) return; } - for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + for (i = 0; i < ARRAY_SIZE(back_buffers); ++i) { hr = IDirect3DDevice8_GetBackBuffer(device, i, D3DBACKBUFFER_TYPE_MONO, &back_buffers[i]); ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); @@ -8152,7 +8144,7 @@ static void test_flip(void) IDirect3DSurface8_Release(test_surface); /* Backbuffer surface pointers are unmodified */ - for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + for (i = 0; i < ARRAY_SIZE(back_buffers); ++i) { hr = IDirect3DDevice8_GetBackBuffer(device, i, D3DBACKBUFFER_TYPE_MONO, &test_surface); ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); @@ -8184,7 +8176,7 @@ static void test_flip(void) color = get_surface_color(back_buffers[0], 1, 1); ok(color == 0xff808080, "Got unexpected color 0x%08x.\n", color); - for (i = 0; i < sizeof(back_buffers) / sizeof(*back_buffers); ++i) + for (i = 0; i < ARRAY_SIZE(back_buffers); ++i) IDirect3DSurface8_Release(back_buffers[i]); refcount = IDirect3DDevice8_Release(device); @@ -8377,7 +8369,7 @@ static void test_uninitialized_varyings(void) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { if (caps.VertexShaderVersion < tests[i].vs_version || caps.PixelShaderVersion < tests[i].ps_version) @@ -8574,7 +8566,7 @@ static void test_shademode(void) /* Try it first with a TRIANGLESTRIP. Do it with different geometry because * the color fixups we have to do for FLAT shading will be dependent on that. */ - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { if (tests[i].vs->version) { @@ -9222,7 +9214,7 @@ static void test_texture_blending(void) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "Failed to disable lighting, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { const struct test *current_test = &tests[i]; @@ -9413,7 +9405,7 @@ static void test_color_clamping(void) hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_COLORARG2, D3DTA_CURRENT); ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { if (caps.VertexShaderVersion < tests[i].vs_version || caps.PixelShaderVersion < tests[i].ps_version) @@ -10118,7 +10110,7 @@ static void test_map_synchronisation(void) } size = (tri_count + 2) * sizeof(*quad1.strip); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice8_CreateVertexBuffer(device, size, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &buffer); @@ -10228,7 +10220,7 @@ static void test_viewport(void) /* This crashes on Windows. */ /* hr = IDirect3DDevice8_SetViewport(device, NULL); */ - for (i = 0; i < sizeof(rt_sizes) / sizeof(rt_sizes[0]); ++i) + for (i = 0; i < ARRAY_SIZE(rt_sizes); ++i) { if (i) { @@ -10244,7 +10236,7 @@ static void test_viewport(void) ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); } - for (j = 0; j < sizeof(tests) / sizeof(tests[0]); ++j) + for (j = 0; j < ARRAY_SIZE(tests); ++j) { hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x (i %u, j %u).\n", hr, i, j); -- 2.14.4

2 1

[PATCH 0/4] winevulkan: Update to 1.0.76
by Roderick Colenbrander June 6, 2018

June 6, 2018

Hi, Until now our Vulkan implementation was stuck at 1.0.51 due to licensing of vk.xml. Now that the license issues are resolved, we can migrate to a newer version. The patch series updates to latest vk.xml (1.1.76) and adds parsing for the new vk.xml version. They added 'alias' types to not have to duplicate information about data types and functions for functionality promoted to Vulkan 1.1 Core. This required a lot of changes. Along the way I found some bugs / parsing issues in the original script to simplify code review, I moved these earlier in the series as they are indepent. Vulkan 1.1 moved a lot of extensions into its Core including interop extensions for memory, fences and semaphores. These rely on platform specific functionality and would need some more implementation work to support. (It is also the question how we would deal with these. Probably needs to be implemented in winex11.drv to allow vkd3d to use them). For now to avoid having to deal with full 1.1 support, I'm leaving out 1.1 features and leave the patch version at 76. Essentially bringing us to 1.0.76. In practice support for updated extensions is what benefits most users as there are probably not many applications needing Core 1.1. Thanks, Roderick Roderick Colenbrander (4): winevulkan: Fix parsing of const function pointer members. winevulkan: Parse forward declared struct members. winevulkan: Parse extension require sections one by one. winevulkan: Update Vulkan support to 1.0.76. dlls/vulkan-1/vulkan-1.spec | 28 + dlls/winevulkan/make_vulkan | 319 +- dlls/winevulkan/vk.xml | 6448 ++++++++++++++++++++++++++------------- dlls/winevulkan/vulkan_thunks.c | 377 ++- dlls/winevulkan/vulkan_thunks.h | 156 +- dlls/winevulkan/winevulkan.spec | 28 + include/wine/vulkan.h | 1739 ++++++----- 7 files changed, 6219 insertions(+), 2876 deletions(-) -- 2.14.3

4 12

[PATCH 1/4] msi/tests: Test that some actions cause resolution of SourceDir.
by Zebediah Figura June 6, 2018

June 6, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/install.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a4726d6..af37d93 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1316,6 +1316,28 @@ static const CHAR x64_directory_dat[] = "ProgramFiles64Folder\tTARGETDIR\t.\n" "TARGETDIR\t\tSourceDir"; +static const CHAR sr_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostInitialize\t\t200\n" + "FileCost\t\t300\n" + "CostFinalize\t\t400\n" + "InstallValidate\t\t500\n" + "InstallInitialize\t\t600\n" + "sourcedir_unset\tSourceDir\t700\n" + "ResolveSource\tRESOLVE_SOURCE\t800\n" + "ProcessComponents\tPROCESS_COMPONENTS\t800\n" + "sourcedir_set\tNOT SourceDir\t900\n" + "InstallFinalize\t\t1000\n"; + +static const CHAR sr_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "sourcedir_unset\t19\t\tSourceDir should not be set\n" + "sourcedir_set\t19\t\tSourceDir should be set\n"; + static const msi_table tables[] = { ADD_TABLE(component), @@ -1984,6 +2006,19 @@ static const msi_table x64_tables[] = ADD_TABLE(install_exec_seq), }; +static const msi_table sr_tables[] = +{ + ADD_TABLE(media), + ADD_TABLE(directory), + ADD_TABLE(file), + ADD_TABLE(component), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(property), + ADD_TABLE(sr_install_exec_seq), + ADD_TABLE(sr_custom_action), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -6109,6 +6144,32 @@ error: DeleteFileA(msifile); } +/* Test what actions cause resolution of SourceDir when executed. */ +static void test_source_resolution(void) +{ + UINT r; + + if (is_process_limited()) + { + skip( "process is limited\n" ); + return; + } + + create_test_files(); + create_database(msifile, sr_tables, sizeof(sr_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, "RESOLVE_SOURCE=1"); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + r = MsiInstallProductA(msifile, "PROCESS_COMPONENTS=1"); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + delete_test_files(); + DeleteFileA(msifile); +} + START_TEST(install) { DWORD len; @@ -6200,6 +6261,7 @@ START_TEST(install) test_feature_tree(); test_deferred_action(); test_wow64(); + test_source_resolution(); DeleteFileA(customdll); -- 2.7.4

3 9

[PATCH] imm32/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 6, 2018

June 6, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imm32/tests/imm32.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index be3ddfce03..ee1aeb3965 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -26,8 +26,6 @@ #include "imm.h" #include "ddk/imm.h" -#define NUMELEMS(array) (sizeof((array))/sizeof((array)[0])) - static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); @@ -73,7 +71,7 @@ static LRESULT CALLBACK get_msg_filter(int nCode, WPARAM wParam, LPARAM lParam) MSG *msg = (MSG*)lParam; if ((msg->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL) && - (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) + (msg_spy.i_msg < ARRAY_SIZE(msg_spy.msgs))) { msg_spy.msgs[msg_spy.i_msg].msg.hwnd = msg->hwnd; msg_spy.msgs[msg_spy.i_msg].msg.message = msg->message; @@ -94,7 +92,7 @@ static LRESULT CALLBACK call_wnd_proc_filter(int nCode, WPARAM wParam, CWPSTRUCT *cwp = (CWPSTRUCT*)lParam; if (((cwp->hwnd == msg_spy.hwnd || msg_spy.hwnd == NULL)) && - (msg_spy.i_msg < NUMELEMS(msg_spy.msgs))) + (msg_spy.i_msg < ARRAY_SIZE(msg_spy.msgs))) { memcpy(&msg_spy.msgs[msg_spy.i_msg].msg, cwp, sizeof(msg_spy.msgs[0].msg)); msg_spy.msgs[msg_spy.i_msg].post = FALSE; @@ -126,7 +124,7 @@ static imm_msgs* msg_spy_find_next_msg(UINT message, UINT *start) { msg_spy_pump_msg_queue(); - if (msg_spy.i_msg >= NUMELEMS(msg_spy.msgs)) + if (msg_spy.i_msg >= ARRAY_SIZE(msg_spy.msgs)) fprintf(stdout, "%s:%d: msg_spy: message buffer overflow!\n", __FILE__, __LINE__); @@ -1067,8 +1065,8 @@ static BOOL CALLBACK is_ime_window_proc(HWND hWnd, LPARAM param) static const WCHAR imeW[] = {'I','M','E',0}; WCHAR class_nameW[16]; HWND *ime_window = (HWND *)param; - if (GetClassNameW(hWnd, class_nameW, sizeof(class_nameW)/sizeof(class_nameW[0])) && - !lstrcmpW(class_nameW, imeW)) { + if (GetClassNameW(hWnd, class_nameW, ARRAY_SIZE(class_nameW)) && !lstrcmpW(class_nameW, imeW)) + { *ime_window = hWnd; return FALSE; } @@ -1229,7 +1227,7 @@ static void test_default_ime_window_creation(void) { FALSE, FALSE } }; - for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++) + for (i = 0; i < ARRAY_SIZE(testcases); i++) { thread = CreateThread(NULL, 0, test_default_ime_window_cb, &testcases[i], 0, NULL); ok(thread != NULL, "CreateThread failed with error %u\n", GetLastError()); -- 2.14.4

2 1

[PATCH] jscript/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 6, 2018

June 6, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/tests/run.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 887b264d8f..77cd74ebb3 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1316,7 +1316,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, case DISPID_GLOBAL_TESTARGTYPES: { VARIANT args[8], v; - DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; + DISPPARAMS dp = {args, NULL, ARRAY_SIZE(args), 0}; HRESULT hres; CHECK_EXPECT(global_testargtypes_i); -- 2.14.4

2 1

[PATCH 4/4] webservices: Fix handling of empty text field mappings.
by Hans Leidekker June 6, 2018

June 6, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 355 +++++++++++++++++++--------------------- dlls/webservices/tests/reader.c | 150 +++++++++++++++++ 2 files changed, 314 insertions(+), 191 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 6925200a59..087ad0a9cc 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4442,24 +4442,24 @@ static HRESULT text_to_bool( const WS_XML_TEXT *text, BOOL *val ) static HRESULT read_type_bool( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_BOOL_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; - BOOL found, val = FALSE; + BOOL val = FALSE; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_bool( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_bool( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4468,7 +4468,7 @@ static HRESULT read_type_bool( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4476,7 +4476,7 @@ static HRESULT read_type_bool( struct reader *reader, WS_TYPE_MAPPING mapping, { BOOL *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4524,25 +4524,24 @@ static HRESULT text_to_int8( const WS_XML_TEXT *text, INT64 *val ) static HRESULT read_type_int8( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_INT8_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; INT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_int8( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_int8( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4551,7 +4550,7 @@ static HRESULT read_type_int8( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4559,7 +4558,7 @@ static HRESULT read_type_int8( struct reader *reader, WS_TYPE_MAPPING mapping, { INT8 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4607,25 +4606,24 @@ static HRESULT text_to_int16( const WS_XML_TEXT *text, INT64 *val ) static HRESULT read_type_int16( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_INT16_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; INT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_int16( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_int16( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4634,7 +4632,7 @@ static HRESULT read_type_int16( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4642,7 +4640,7 @@ static HRESULT read_type_int16( struct reader *reader, WS_TYPE_MAPPING mapping, { INT16 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4688,25 +4686,24 @@ static HRESULT text_to_int32( const WS_XML_TEXT *text, INT64 *val ) static HRESULT read_type_int32( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_INT32_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; INT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_int32( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_int32( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4715,7 +4712,7 @@ static HRESULT read_type_int32( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4723,7 +4720,7 @@ static HRESULT read_type_int32( struct reader *reader, WS_TYPE_MAPPING mapping, { INT32 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4769,25 +4766,24 @@ static HRESULT text_to_int64( const WS_XML_TEXT *text, INT64 *val ) static HRESULT read_type_int64( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_INT64_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; INT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_int64( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_int64( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4796,7 +4792,7 @@ static HRESULT read_type_int64( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4804,7 +4800,7 @@ static HRESULT read_type_int64( struct reader *reader, WS_TYPE_MAPPING mapping, { INT64 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4851,25 +4847,24 @@ static HRESULT text_to_uint8( const WS_XML_TEXT *text, UINT64 *val ) static HRESULT read_type_uint8( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UINT8_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; UINT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_uint8( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_uint8( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4878,7 +4873,7 @@ static HRESULT read_type_uint8( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4886,7 +4881,7 @@ static HRESULT read_type_uint8( struct reader *reader, WS_TYPE_MAPPING mapping, { UINT8 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -4942,25 +4937,24 @@ static HRESULT text_to_uint16( const WS_XML_TEXT *text, UINT64 *val ) static HRESULT read_type_uint16( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UINT16_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; UINT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_uint16( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_uint16( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -4969,7 +4963,7 @@ static HRESULT read_type_uint16( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -4977,7 +4971,7 @@ static HRESULT read_type_uint16( struct reader *reader, WS_TYPE_MAPPING mapping, { UINT16 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5032,25 +5026,24 @@ static HRESULT text_to_uint32( const WS_XML_TEXT *text, UINT64 *val ) static HRESULT read_type_uint32( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UINT32_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; UINT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_uint32( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_uint32( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5059,7 +5052,7 @@ static HRESULT read_type_uint32( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5067,7 +5060,7 @@ static HRESULT read_type_uint32( struct reader *reader, WS_TYPE_MAPPING mapping, { UINT32 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5120,25 +5113,24 @@ static HRESULT text_to_uint64( const WS_XML_TEXT *text, UINT64 *val ) static HRESULT read_type_uint64( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UINT64_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; UINT64 val = 0; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_uint64( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_uint64( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5147,7 +5139,7 @@ static HRESULT read_type_uint64( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5155,7 +5147,7 @@ static HRESULT read_type_uint64( struct reader *reader, WS_TYPE_MAPPING mapping, { UINT64 *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5201,22 +5193,21 @@ static HRESULT text_to_float( const WS_XML_TEXT *text, float *val ) static HRESULT read_type_float( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_FLOAT_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; float val = 0.0; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_float( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_float( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5225,7 +5216,7 @@ static HRESULT read_type_float( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5233,7 +5224,7 @@ static HRESULT read_type_float( struct reader *reader, WS_TYPE_MAPPING mapping, { float *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5279,22 +5270,21 @@ static HRESULT text_to_double( const WS_XML_TEXT *text, double *val ) static HRESULT read_type_double( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_DOUBLE_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; double val = 0.0; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_double( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_double( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5303,7 +5293,7 @@ static HRESULT read_type_double( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5311,7 +5301,7 @@ static HRESULT read_type_double( struct reader *reader, WS_TYPE_MAPPING mapping, { double *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5343,20 +5333,19 @@ static HRESULT text_to_wsz( const WS_XML_TEXT *text, WS_HEAP *heap, WCHAR **ret static HRESULT read_type_wsz( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_WSZ_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, WCHAR **ret, ULONG size ) + WS_HEAP *heap, WCHAR **ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; WCHAR *str = NULL; - BOOL found; if (desc) { FIXME( "description not supported\n" ); return E_NOTIMPL; } - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_wsz( text, heap, &str )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_wsz( text, heap, &str )) != S_OK) return hr; switch (option) { @@ -5398,22 +5387,21 @@ static HRESULT get_enum_value( const WS_XML_TEXT *text, const WS_ENUM_DESCRIPTIO static HRESULT read_type_enum( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_ENUM_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; int val = 0; - BOOL found; if (!desc) return E_INVALIDARG; - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = get_enum_value( text, desc, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = get_enum_value( text, desc, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5422,7 +5410,7 @@ static HRESULT read_type_enum( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5430,7 +5418,7 @@ static HRESULT read_type_enum( struct reader *reader, WS_TYPE_MAPPING mapping, { int *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5476,22 +5464,21 @@ static HRESULT text_to_datetime( const WS_XML_TEXT *text, WS_DATETIME *val ) static HRESULT read_type_datetime( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_DATETIME_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; HRESULT hr; WS_DATETIME val = {0, WS_DATETIME_FORMAT_UTC}; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_datetime( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_datetime( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5500,7 +5487,7 @@ static HRESULT read_type_datetime( struct reader *reader, WS_TYPE_MAPPING mappin break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5508,7 +5495,7 @@ static HRESULT read_type_datetime( struct reader *reader, WS_TYPE_MAPPING mappin { WS_DATETIME *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5554,22 +5541,21 @@ static HRESULT text_to_guid( const WS_XML_TEXT *text, GUID *val ) static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_GUID_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; GUID val = {0}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_guid( text, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_guid( text, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5578,7 +5564,7 @@ static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5586,7 +5572,7 @@ static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, { GUID *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5634,22 +5620,21 @@ static HRESULT text_to_unique_id( const WS_XML_TEXT *text, WS_HEAP *heap, WS_UNI static HRESULT read_type_unique_id( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_UNIQUE_ID_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_UNIQUE_ID val = {{0}}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_unique_id( text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_unique_id( text, heap, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5658,7 +5643,7 @@ static HRESULT read_type_unique_id( struct reader *reader, WS_TYPE_MAPPING mappi break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5666,7 +5651,7 @@ static HRESULT read_type_unique_id( struct reader *reader, WS_TYPE_MAPPING mappi { WS_UNIQUE_ID *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5714,17 +5699,16 @@ static HRESULT text_to_string( const WS_XML_TEXT *text, WS_HEAP *heap, WS_STRING static HRESULT read_type_string( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_STRING_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_STRING val = {0}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_string( text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_string( text, heap, &val )) != S_OK) return hr; switch (option) { @@ -5748,7 +5732,7 @@ static HRESULT read_type_string( struct reader *reader, WS_TYPE_MAPPING mapping, { WS_STRING *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5796,17 +5780,16 @@ static HRESULT text_to_bytes( const WS_XML_TEXT *text, WS_HEAP *heap, WS_BYTES * static HRESULT read_type_bytes( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_BYTES_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_BYTES val = {0}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_bytes( text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_bytes( text, heap, &val )) != S_OK) return hr; switch (option) { @@ -5830,7 +5813,7 @@ static HRESULT read_type_bytes( struct reader *reader, WS_TYPE_MAPPING mapping, { WS_BYTES *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5856,17 +5839,16 @@ static HRESULT text_to_xml_string( const WS_XML_TEXT *text, WS_HEAP *heap, WS_XM static HRESULT read_type_xml_string( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_XML_STRING_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_XML_STRING val = {0}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_xml_string( text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_xml_string( text, heap, &val )) != S_OK) return hr; switch (option) { @@ -5890,7 +5872,7 @@ static HRESULT read_type_xml_string( struct reader *reader, WS_TYPE_MAPPING mapp { WS_XML_STRING *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -5941,12 +5923,11 @@ static HRESULT text_to_qname( struct reader *reader, const WS_XML_TEXT *text, WS static HRESULT read_type_qname( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_XML_QNAME_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { const WS_XML_TEXT *text; WS_XML_QNAME val = {{0}}; HRESULT hr; - BOOL found; if (desc) FIXME( "ignoring description\n" ); @@ -5954,13 +5935,13 @@ static HRESULT read_type_qname( struct reader *reader, WS_TYPE_MAPPING mapping, if ((hr = read_startelement( reader )) != S_OK) return hr; if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; - if ((hr = get_text( reader, mapping, localname, ns, &text, &found )) != S_OK) return hr; - if (found && (hr = text_to_qname( reader, text, heap, &val )) != S_OK) return hr; + if ((hr = get_text( reader, mapping, localname, ns, &text, found )) != S_OK) return hr; + if (*found && (hr = text_to_qname( reader, text, heap, &val )) != S_OK) return hr; switch (option) { case WS_READ_REQUIRED_VALUE: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_NILLABLE_VALUE: @@ -5969,7 +5950,7 @@ static HRESULT read_type_qname( struct reader *reader, WS_TYPE_MAPPING mapping, break; case WS_READ_REQUIRED_POINTER: - if (!found) return WS_E_INVALID_FORMAT; + if (!*found) return WS_E_INVALID_FORMAT; /* fall through */ case WS_READ_OPTIONAL_POINTER: @@ -5977,7 +5958,7 @@ static HRESULT read_type_qname( struct reader *reader, WS_TYPE_MAPPING mapping, { WS_XML_QNAME *heap_val = NULL; if (size != sizeof(heap_val)) return E_INVALIDARG; - if (found) + if (*found) { if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; *heap_val = val; @@ -6224,7 +6205,7 @@ static HRESULT read_type_union( struct reader *reader, const WS_UNION_DESCRIPTIO static HRESULT read_type( struct reader *, WS_TYPE_MAPPING, WS_TYPE, const WS_XML_STRING *, const WS_XML_STRING *, const void *, WS_READ_OPTION, WS_HEAP *, - void *, ULONG ); + void *, ULONG, BOOL * ); static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, void **ret, ULONG *count ) @@ -6232,6 +6213,7 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO HRESULT hr; ULONG item_size, nb_items = 0, nb_allocated = 1, offset = 0; WS_READ_OPTION option; + BOOL found; char *buf; if (!(option = get_field_read_option( desc->type, desc->options ))) return E_INVALIDARG; @@ -6257,7 +6239,6 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO if (desc->type == WS_UNION_TYPE) { - BOOL found; hr = read_type_union( reader, desc->typeDescription, heap, buf + offset, item_size, &found ); if (hr != S_OK) { @@ -6269,7 +6250,7 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO else { hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->itemLocalName, desc->itemNs, - desc->typeDescription, option, heap, buf + offset, item_size ); + desc->typeDescription, option, heap, buf + offset, item_size, &found ); if (hr == WS_E_INVALID_FORMAT) break; if (hr != S_OK) { @@ -6301,18 +6282,22 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_READ_OPTION option, WS_HEAP *heap, void *ret, ULONG size ) { + struct reader_pos pos; + BOOL found; HRESULT hr; + if (reader->current == reader->last) { - BOOL found; if ((hr = read_to_startelement( reader, &found )) != S_OK) return hr; if (!found) return WS_E_INVALID_FORMAT; } - if ((hr = read_next_node( reader )) != S_OK) return hr; - if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; - return read_type( reader, WS_ANY_ELEMENT_TYPE_MAPPING, desc->type, NULL, NULL, - desc->typeDescription, option, heap, ret, size ); + save_reader_position( reader, &pos ); + if ((hr = read_next_node( reader )) != S_OK) return hr; + hr = read_type( reader, WS_ANY_ELEMENT_TYPE_MAPPING, desc->type, NULL, NULL, + desc->typeDescription, option, heap, ret, size, &found ); + if (hr == S_OK && !found) restore_reader_position( reader, &pos ); + return hr; } static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, char *buf, @@ -6322,6 +6307,7 @@ static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTIO WS_READ_OPTION option; ULONG size; HRESULT hr; + BOOL found; if (!desc) return E_INVALIDARG; if (desc->options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) @@ -6345,17 +6331,16 @@ static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTIO case WS_ATTRIBUTE_FIELD_MAPPING: hr = read_type( reader, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->localName, desc->ns, - desc->typeDescription, option, heap, ptr, size ); + desc->typeDescription, option, heap, ptr, size, &found ); break; case WS_ELEMENT_FIELD_MAPPING: hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->localName, desc->ns, - desc->typeDescription, option, heap, ptr, size ); + desc->typeDescription, option, heap, ptr, size, &found ); break; case WS_ELEMENT_CHOICE_FIELD_MAPPING: { - BOOL found; if (desc->type != WS_UNION_TYPE || !desc->typeDescription || (desc->options & (WS_FIELD_POINTER|WS_FIELD_NILLABLE))) return E_INVALIDARG; hr = read_type_union( reader, desc->typeDescription, heap, ptr, size, &found ); @@ -6406,7 +6391,7 @@ static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTIO static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_STRUCT_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) + WS_HEAP *heap, void *ret, ULONG size, BOOL *found ) { ULONG i, offset; HRESULT hr; @@ -6481,6 +6466,8 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, struct node *parent = find_parent( reader ); parent->flags |= NODE_FLAG_IGNORE_TRAILING_ELEMENT_CONTENT; } + + *found = TRUE; return S_OK; } @@ -6576,7 +6563,7 @@ static HRESULT is_nil_element( const WS_XML_ELEMENT_NODE *elem ) static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYPE type, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const void *desc, - WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size ) + WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size, BOOL *found ) { HRESULT hr; @@ -6585,114 +6572,94 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP if (mapping == WS_ELEMENT_TYPE_MAPPING && is_nil_element( &reader->current->hdr )) { if (option != WS_READ_NILLABLE_POINTER && option != WS_READ_NILLABLE_VALUE) return WS_E_INVALID_FORMAT; + *found = TRUE; return end_mapping( reader, mapping ); } switch (type) { case WS_BOOL_TYPE: - if ((hr = read_type_bool( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_bool( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_INT8_TYPE: - if ((hr = read_type_int8( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_int8( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_INT16_TYPE: - if ((hr = read_type_int16( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_int16( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_INT32_TYPE: - if ((hr = read_type_int32( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_int32( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_INT64_TYPE: - if ((hr = read_type_int64( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_int64( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UINT8_TYPE: - if ((hr = read_type_uint8( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_uint8( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UINT16_TYPE: - if ((hr = read_type_uint16( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_uint16( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UINT32_TYPE: - if ((hr = read_type_uint32( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_uint32( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UINT64_TYPE: - if ((hr = read_type_uint64( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_uint64( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_FLOAT_TYPE: - if ((hr = read_type_float( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_float( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_DOUBLE_TYPE: - if ((hr = read_type_double( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_double( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_DATETIME_TYPE: - if ((hr = read_type_datetime( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_datetime( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_GUID_TYPE: - if ((hr = read_type_guid( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_guid( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_UNIQUE_ID_TYPE: - if ((hr = read_type_unique_id( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_unique_id( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_STRING_TYPE: - if ((hr = read_type_string( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_string( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_WSZ_TYPE: - if ((hr = read_type_wsz( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_wsz( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_BYTES_TYPE: - if ((hr = read_type_bytes( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_bytes( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_XML_STRING_TYPE: - if ((hr = read_type_xml_string( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_xml_string( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_XML_QNAME_TYPE: - if ((hr = read_type_qname( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_qname( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_STRUCT_TYPE: - if ((hr = read_type_struct( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_struct( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; case WS_ENUM_TYPE: - if ((hr = read_type_enum( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) - return hr; + hr = read_type_enum( reader, mapping, localname, ns, desc, option, heap, value, size, found ); break; default: @@ -6700,6 +6667,7 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP return E_NOTIMPL; } + if (hr != S_OK) return hr; return end_mapping( reader, mapping ); } @@ -6711,6 +6679,7 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY ULONG size, WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + BOOL found; HRESULT hr; TRACE( "%p %u %u %p %u %p %p %u %p\n", handle, mapping, type, desc, option, heap, value, @@ -6727,7 +6696,7 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY return E_INVALIDARG; } - if ((hr = read_type( reader, mapping, type, NULL, NULL, desc, option, heap, value, size )) != S_OK) + if ((hr = read_type( reader, mapping, type, NULL, NULL, desc, option, heap, value, size, &found )) != S_OK) { LeaveCriticalSection( &reader->cs ); return hr; @@ -6754,6 +6723,7 @@ HRESULT read_header( WS_XML_READER *handle, const WS_XML_STRING *localname, cons ULONG size ) { struct reader *reader = (struct reader *)handle; + BOOL found; HRESULT hr; EnterCriticalSection( &reader->cs ); @@ -6765,7 +6735,7 @@ HRESULT read_header( WS_XML_READER *handle, const WS_XML_STRING *localname, cons } hr = read_type( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, type, localname, ns, desc, option, heap, - value, size ); + value, size, &found ); LeaveCriticalSection( &reader->cs ); return hr; @@ -6779,6 +6749,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + BOOL found; HRESULT hr; TRACE( "%p %p %u %p %p %u %p\n", handle, desc, option, heap, value, size, error ); @@ -6795,7 +6766,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO } hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->elementLocalName, - desc->elementNs, desc->typeDescription, option, heap, value, size ); + desc->elementNs, desc->typeDescription, option, heap, value, size, &found ); LeaveCriticalSection( &reader->cs ); return hr; @@ -6809,6 +6780,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi { struct reader *reader = (struct reader *)handle; WS_TYPE type = map_value_type( value_type ); + BOOL found; HRESULT hr; TRACE( "%p %u %p %u %p\n", handle, type, value, size, error ); @@ -6825,7 +6797,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi } hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, type, NULL, NULL, NULL, WS_READ_REQUIRED_VALUE, - NULL, value, size ); + NULL, value, size, &found ); LeaveCriticalSection( &reader->cs ); return hr; @@ -6839,6 +6811,7 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI WS_ERROR *error ) { struct reader *reader = (struct reader *)handle; + BOOL found; HRESULT hr; TRACE( "%p %p %u %p %p %u %p\n", handle, desc, option, heap, value, size, error ); @@ -6861,7 +6834,7 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI } hr = read_type( reader, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->attributeLocalName, - desc->attributeNs, desc->typeDescription, option, heap, value, size ); + desc->attributeNs, desc->typeDescription, option, heap, value, size, &found ); LeaveCriticalSection( &reader->cs ); return hr; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 7dd7979522..bd8a37cc52 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -6539,6 +6539,155 @@ static void test_repeating_element_choice(void) WsFreeHeap( heap ); } +static void test_empty_text_field(void) +{ + static WS_XML_STRING str_ns = {0, NULL}, str_t = {1, (BYTE *)"t"}; + HRESULT hr; + WS_XML_READER *reader; + WS_HEAP *heap; + WS_FIELD_DESCRIPTION f, *fields[1]; + WS_STRUCT_DESCRIPTION s; + struct test + { + WS_STRING str; + } *test; + struct test2 + { + WCHAR *str; + } *test2; + struct test3 + { + BOOL bool; + } *test3; + struct test4 + { + WS_XML_STRING str; + } *test4; + struct test5 + { + WS_BYTES bytes; + } *test5; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_STRING_TYPE; + f.offset = FIELD_OFFSET(struct test, str); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + test = NULL; + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test != NULL, "test not set\n" ); + ok( !test->str.length, "got %u\n", test->str.length ); + todo_wine ok( test->str.chars != NULL, "chars not set\n" ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_WSZ_TYPE; + f.offset = FIELD_OFFSET(struct test2, str); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test2); + s.alignment = TYPE_ALIGNMENT(struct test2); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + test2 = NULL; + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test2, sizeof(test2), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test2 != NULL, "test2 not set\n" ); + ok( test2->str != NULL, "str not set\n" ); + ok( !test2->str[0], "not empty\n" ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_BOOL_TYPE; + f.offset = FIELD_OFFSET(struct test3, bool); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test3); + s.alignment = TYPE_ALIGNMENT(struct test3); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test3, sizeof(test3), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_XML_STRING_TYPE; + f.offset = FIELD_OFFSET(struct test4, str); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test4); + s.alignment = TYPE_ALIGNMENT(struct test4); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + test4 = NULL; + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test4, sizeof(test4), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test4 != NULL, "test4 not set\n" ); + ok( !test4->str.length, "got %u\n", test4->str.length ); + todo_wine ok( test4->str.bytes != NULL, "bytes not set\n" ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_BYTES_TYPE; + f.offset = FIELD_OFFSET(struct test5, bytes); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test5); + s.alignment = TYPE_ALIGNMENT(struct test5); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_t; + s.typeNs = &str_ns; + + test5 = NULL; + prepare_struct_type_test( reader, "<t></t>" ); + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test5, sizeof(test5), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test5 != NULL, "test5 not set\n" ); + ok( !test5->bytes.length, "got %u\n", test5->bytes.length ); + todo_wine ok( test5->bytes.bytes != NULL, "bytes not set\n" ); + + WsFreeReader( reader ); + WsFreeHeap( heap ); +} START_TEST(reader) { @@ -6588,4 +6737,5 @@ START_TEST(reader) test_union_type(); test_float(); test_repeating_element_choice(); + test_empty_text_field(); } -- 2.11.0

1 0

[PATCH 3/4] webservices: Handle WS_XML_TEXT_TYPE_INT64 in text_to_uint64.
by Hans Leidekker June 6, 2018

June 6, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 79a1af63bf..6925200a59 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -5095,6 +5095,13 @@ static HRESULT text_to_uint64( const WS_XML_TEXT *text, UINT64 *val ) hr = str_to_uint64( text_utf8->value.bytes, text_utf8->value.length, MAX_UINT64, val ); break; } + case WS_XML_TEXT_TYPE_INT64: + { + const WS_XML_INT64_TEXT *text_int64 = (const WS_XML_INT64_TEXT *)text; + *val = text_int64->value; + hr = S_OK; + break; + } case WS_XML_TEXT_TYPE_UINT64: { const WS_XML_UINT64_TEXT *text_uint64 = (const WS_XML_UINT64_TEXT *)text; -- 2.11.0

1 0

[PATCH 2/4] webservices/tests: Make test data local if it's only used in one place.
by Hans Leidekker June 6, 2018

June 6, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/reader.c | 116 +++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 62 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 7064cf0f82..7dd7979522 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -67,57 +67,6 @@ static const char data9[] = static const char data10[] = "<a></b>"; -static const char data11[] = - "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" - "<o:services o:GenerationTime=\"2015-09-03T18:47:54\">" - "" - "</o:services>" - "</o:OfficeConfig>"; - -static const char data11b[] = - "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" - "<o:services o:GenerationTime=\"2015-09-03T18:47:54\"></o:services>" - "<trailing>content</trailing>" - "</o:OfficeConfig>"; - -static const char data12[] = - "<services>" - "<service><id>1</id></service>" - "<service><id>2</id></service>" - "</services>"; - -static const char data13[] = - "<services></services>"; - -static const char data14[] = - "<services>" - "<wrapper>" - "<service><id>1</id></service>" - "<service><id>2</id></service>" - "</wrapper>" - "</services>"; - -static const char data15[] = - "<services>" - "<wrapper>" - "<service>1</service>" - "<service>2</service>" - "</wrapper>" - "</services>"; - -static const char data16[] = - "<services>" - "<wrapper>" - "<service name='1'>1</service>" - "<service name='2'>2</service>" - "</wrapper>" - "</services>"; - -static const char data17[] = - "<services>" - "<service><name></name></service>" - "</services>"; - static void test_WsCreateError(void) { HRESULT hr; @@ -2997,6 +2946,17 @@ static void test_text_field_mapping(void) static void test_complex_struct_type(void) { + static const char data[] = + "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" + "<o:services o:GenerationTime=\"2015-09-03T18:47:54\">" + "" + "</o:services>" + "</o:OfficeConfig>"; + static const char data2[] = + "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" + "<o:services o:GenerationTime=\"2015-09-03T18:47:54\"></o:services>" + "<trailing>content</trailing>" + "</o:OfficeConfig>"; static const WCHAR timestampW[] = {'2','0','1','5','-','0','9','-','0','3','T','1','8',':','4','7',':','5','4',0}; HRESULT hr; @@ -3035,7 +2995,7 @@ static void test_complex_struct_type(void) ok( hr == S_OK, "got %08x\n", hr ); /* element content type mapping */ - prepare_struct_type_test( reader, data11 ); + prepare_struct_type_test( reader, data ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3112,7 +3072,7 @@ static void test_complex_struct_type(void) ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); /* element type mapping */ - prepare_struct_type_test( reader, data11 ); + prepare_struct_type_test( reader, data ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3136,7 +3096,7 @@ static void test_complex_struct_type(void) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); /* trailing content */ - prepare_struct_type_test( reader, data11b ); + prepare_struct_type_test( reader, data2 ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3149,7 +3109,7 @@ static void test_complex_struct_type(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); - prepare_struct_type_test( reader, data11b ); + prepare_struct_type_test( reader, data2 ); hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3165,6 +3125,38 @@ static void test_complex_struct_type(void) static void test_repeating_element(void) { + static const char data[] = + "<services>" + "<service><id>1</id></service>" + "<service><id>2</id></service>" + "</services>"; + static const char data2[] = + "<services></services>"; + static const char data3[] = + "<services>" + "<wrapper>" + "<service><id>1</id></service>" + "<service><id>2</id></service>" + "</wrapper>" + "</services>"; + static const char data4[] = + "<services>" + "<wrapper>" + "<service>1</service>" + "<service>2</service>" + "</wrapper>" + "</services>"; + static const char data5[] = + "<services>" + "<wrapper>" + "<service name='1'>1</service>" + "<service name='2'>2</service>" + "</wrapper>" + "</services>"; + static const char data6[] = + "<services>" + "<service><name></name></service>" + "</services>"; static const WCHAR oneW[] = {'1',0}, twoW[] = {'2',0}; WS_XML_STRING str_name = {4, (BYTE *)"name"}; WS_XML_STRING str_services = {8, (BYTE *)"services"}; @@ -3214,7 +3206,7 @@ static void test_repeating_element(void) hr = WsCreateReader( NULL, 0, &reader, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - prepare_struct_type_test( reader, data12 ); + prepare_struct_type_test( reader, data ); memset( &f2, 0, sizeof(f2) ); f2.mapping = WS_ELEMENT_FIELD_MAPPING; @@ -3257,7 +3249,7 @@ static void test_repeating_element(void) ok( test->service[1].id == 2, "got %u\n", test->service[1].id ); /* array of pointers */ - prepare_struct_type_test( reader, data12 ); + prepare_struct_type_test( reader, data ); f.options = WS_FIELD_POINTER; test4 = NULL; hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, @@ -3272,7 +3264,7 @@ static void test_repeating_element(void) } /* item range */ - prepare_struct_type_test( reader, data13 ); + prepare_struct_type_test( reader, data2 ); f.options = 0; range.minItemCount = 0; range.maxItemCount = 1; @@ -3286,7 +3278,7 @@ static void test_repeating_element(void) ok( !test->service_count, "got %u\n", test->service_count ); /* wrapper element */ - prepare_struct_type_test( reader, data14 ); + prepare_struct_type_test( reader, data3 ); f.itemRange = NULL; f.localName = &str_wrapper; f.ns = &str_ns; @@ -3301,7 +3293,7 @@ static void test_repeating_element(void) ok( test->service[1].id == 2, "got %u\n", test->service[1].id ); /* repeating text field mapping */ - prepare_struct_type_test( reader, data15 ); + prepare_struct_type_test( reader, data4 ); f2.mapping = WS_TEXT_FIELD_MAPPING; f2.localName = NULL; f2.ns = NULL; @@ -3319,7 +3311,7 @@ static void test_repeating_element(void) ok( !lstrcmpW( test2->service[1].id, twoW ), "wrong data\n" ); /* repeating attribute field + text field mapping */ - prepare_struct_type_test( reader, data16 ); + prepare_struct_type_test( reader, data5 ); f2.offset = FIELD_OFFSET(struct service3, id); memset( &f3, 0, sizeof(f3) ); f3.mapping = WS_ATTRIBUTE_FIELD_MAPPING; @@ -3344,7 +3336,7 @@ static void test_repeating_element(void) ok( !lstrcmpW( test3->service[1].id, twoW ), "wrong data\n" ); /* empty text, item range */ - prepare_struct_type_test( reader, data17 ); + prepare_struct_type_test( reader, data6 ); memset( &f2, 0, sizeof(f2) ); f2.mapping = WS_ELEMENT_FIELD_MAPPING; -- 2.11.0

1 0