February 2017 - Wine-commits

Józef Kucia : wined3d: Factor out acquire_shader_resources() function.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 900e6e14787a0193c52473cd33b880226fa3c592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=900e6e14787a0193c52473cd3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 1 11:26:20 2017 +0100 wined3d: Factor out acquire_shader_resources() function. 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/cs.c | 57 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c030d35..e9d04f4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -416,6 +416,36 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * cs->ops->submit(cs); } +static void acquire_shader_resources(const struct wined3d_state *state) +{ + struct wined3d_shader_sampler_map_entry *entry; + struct wined3d_shader_resource_view *view; + struct wined3d_shader *shader; + unsigned int i, j; + + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + if (!(shader = state->shader[i])) + continue; + + for (j = 0; j < WINED3D_MAX_CBS; ++j) + { + if (state->cb[i][j]) + wined3d_resource_acquire(&state->cb[i][j]->resource); + } + + for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) + { + entry = &shader->reg_maps.sampler_map.entries[j]; + + if (!(view = state->shader_resource_view[i][entry->resource_idx])) + continue; + + wined3d_resource_acquire(view->resource); + } + } +} + static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { struct wined3d_state *state = &cs->device->state; @@ -481,11 +511,8 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { const struct wined3d_state *state = &cs->device->state; - struct wined3d_shader_sampler_map_entry *entry; - struct wined3d_shader_resource_view *view; - struct wined3d_shader *shader; struct wined3d_cs_draw *op; - unsigned int i, j; + unsigned int i; op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_DRAW; @@ -515,27 +542,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i } if (state->fb->depth_stencil) wined3d_resource_acquire(state->fb->depth_stencil->resource); - for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) - { - if (!(shader = state->shader[i])) - continue; - - for (j = 0; j < WINED3D_MAX_CBS; ++j) - { - if (state->cb[i][j]) - wined3d_resource_acquire(&state->cb[i][j]->resource); - } - - for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) - { - entry = &shader->reg_maps.sampler_map.entries[j]; - - if (!(view = state->shader_resource_view[i][entry->resource_idx])) - continue; - - wined3d_resource_acquire(view->resource); - } - } + acquire_shader_resources(state); cs->ops->submit(cs); }

1 0

Józef Kucia : wined3d: Factor out release_shader_resources() function.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 12058f66cf0010bab3640191afcade4313bf717f URL: http://source.winehq.org/git/wine.git/?a=commit;h=12058f66cf0010bab3640191a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 1 11:26:21 2017 +0100 wined3d: Factor out release_shader_resources() function. 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/cs.c | 55 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e9d04f4..8acfe31 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -446,15 +446,42 @@ static void acquire_shader_resources(const struct wined3d_state *state) } } -static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) +static void release_shader_resources(const struct wined3d_state *state) { - struct wined3d_state *state = &cs->device->state; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; - const struct wined3d_cs_draw *op = data; struct wined3d_shader *shader; unsigned int i, j; + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + if (!(shader = state->shader[i])) + continue; + + for (j = 0; j < WINED3D_MAX_CBS; ++j) + { + if (state->cb[i][j]) + wined3d_resource_release(&state->cb[i][j]->resource); + } + + for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) + { + entry = &shader->reg_maps.sampler_map.entries[j]; + + if (!(view = state->shader_resource_view[i][entry->resource_idx])) + continue; + + wined3d_resource_release(view->resource); + } + } +} + +static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) +{ + struct wined3d_state *state = &cs->device->state; + const struct wined3d_cs_draw *op = data; + unsigned int i; + if (!cs->device->adapter->gl_info.supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && state->load_base_vertex_index != op->base_vertex_idx) { @@ -484,27 +511,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } if (state->fb->depth_stencil) wined3d_resource_release(state->fb->depth_stencil->resource); - for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) - { - if (!(shader = state->shader[i])) - continue; - - for (j = 0; j < WINED3D_MAX_CBS; ++j) - { - if (state->cb[i][j]) - wined3d_resource_release(&state->cb[i][j]->resource); - } - - for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) - { - entry = &shader->reg_maps.sampler_map.entries[j]; - - if (!(view = state->shader_resource_view[i][entry->resource_idx])) - continue; - - wined3d_resource_release(view->resource); - } - } + release_shader_resources(state); } void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx,

1 0

Józef Kucia : wined3d: Do not acquire compute pipeline resources for draws.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 83dadaee0210298525ef0db6349495870116beee URL: http://source.winehq.org/git/wine.git/?a=commit;h=83dadaee0210298525ef0db63… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 1 11:26:22 2017 +0100 wined3d: Do not acquire compute pipeline resources for draws. 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/cs.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 8acfe31..de8ad66 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -416,7 +416,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * cs->ops->submit(cs); } -static void acquire_shader_resources(const struct wined3d_state *state) +static void acquire_shader_resources(const struct wined3d_state *state, unsigned int shader_mask) { struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; @@ -425,6 +425,9 @@ static void acquire_shader_resources(const struct wined3d_state *state) for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { + if (!(shader_mask & (1u << i))) + continue; + if (!(shader = state->shader[i])) continue; @@ -446,7 +449,7 @@ static void acquire_shader_resources(const struct wined3d_state *state) } } -static void release_shader_resources(const struct wined3d_state *state) +static void release_shader_resources(const struct wined3d_state *state, unsigned int shader_mask) { struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; @@ -455,6 +458,9 @@ static void release_shader_resources(const struct wined3d_state *state) for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { + if (!(shader_mask & (1u << i))) + continue; + if (!(shader = state->shader[i])) continue; @@ -511,7 +517,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } if (state->fb->depth_stencil) wined3d_resource_release(state->fb->depth_stencil->resource); - release_shader_resources(state); + release_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); } void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx, @@ -549,7 +555,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i } if (state->fb->depth_stencil) wined3d_resource_acquire(state->fb->depth_stencil->resource); - acquire_shader_resources(state); + acquire_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); cs->ops->submit(cs); }

1 0

Józef Kucia : wined3d: Acquire graphics pipeline UAV resources for draws.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 401fb6e34891b4cb7becfe8cc3708a36944d690f URL: http://source.winehq.org/git/wine.git/?a=commit;h=401fb6e34891b4cb7becfe8cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 1 11:26:23 2017 +0100 wined3d: Acquire graphics pipeline UAV resources for draws. 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/cs.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index de8ad66..d2c334f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -486,6 +486,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { struct wined3d_state *state = &cs->device->state; const struct wined3d_cs_draw *op = data; + struct wined3d_shader *shader; unsigned int i; if (!cs->device->adapter->gl_info.supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] @@ -518,12 +519,27 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) if (state->fb->depth_stencil) wined3d_resource_release(state->fb->depth_stencil->resource); release_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); + if ((shader = state->shader[WINED3D_SHADER_TYPE_PIXEL])) + { + struct wined3d_unordered_access_view *view; + for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) + { + if (!shader->reg_maps.uav_resource_info[i].type) + continue; + + if (!(view = state->unordered_access_view[i])) + continue; + + wined3d_resource_release(view->resource); + } + } } void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { const struct wined3d_state *state = &cs->device->state; + struct wined3d_shader *shader; struct wined3d_cs_draw *op; unsigned int i; @@ -556,6 +572,20 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i if (state->fb->depth_stencil) wined3d_resource_acquire(state->fb->depth_stencil->resource); acquire_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); + if ((shader = state->shader[WINED3D_SHADER_TYPE_PIXEL])) + { + struct wined3d_unordered_access_view *view; + for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) + { + if (!shader->reg_maps.uav_resource_info[i].type) + continue; + + if (!(view = state->unordered_access_view[i])) + continue; + + wined3d_resource_acquire(view->resource); + } + } cs->ops->submit(cs); }

1 0

Henri Verbeet : wined3d: Avoid '\n' in the middle of a TRACE in wined3d_check_device_format().
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: dfead1bfa8e510ccfcc4078a3d3a9c3d46a0ebdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfead1bfa8e510ccfcc4078a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 1 12:02:54 2017 +0100 wined3d: Avoid '\n' in the middle of a TRACE in wined3d_check_device_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 71a4f60..6405776 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5021,7 +5021,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad DWORD allowed_usage; enum wined3d_gl_resource_type gl_type; - TRACE("wined3d %p, adapter_idx %u, device_type %s, adapter_format %s, usage %s, %s,\n" + TRACE("wined3d %p, adapter_idx %u, device_type %s, adapter_format %s, usage %s, %s, " "resource_type %s, check_format %s.\n", wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(adapter_format_id), debug_d3dusage(usage), debug_d3dusagequery(usage), debug_d3dresourcetype(resource_type),

1 0

Henri Verbeet : ddraw: Mark surfaces as lost when changing the display mode.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 0885e3f5ae398fc8a122c05e8c13acb8ea2184de URL: http://source.winehq.org/git/wine.git/?a=commit;h=0885e3f5ae398fc8a122c05e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 1 12:02:55 2017 +0100 ddraw: Mark surfaces as lost when changing the display mode. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 4 ++++ dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f015b01d..16abbe1 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -695,6 +695,8 @@ static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface) if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, NULL))) ddraw->flags &= ~DDRAW_RESTORE_MODE; + InterlockedCompareExchange(&ddraw->device_state, DDRAW_DEVICE_STATE_NOT_RESTORED, DDRAW_DEVICE_STATE_OK); + wined3d_mutex_unlock(); return hr; @@ -1129,6 +1131,8 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) ddraw->flags |= DDRAW_RESTORE_MODE; + InterlockedCompareExchange(&ddraw->device_state, DDRAW_DEVICE_STATE_NOT_RESTORED, DDRAW_DEVICE_STATE_OK); + wined3d_mutex_unlock(); switch (hr) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ff88b74..2f83314 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2783,7 +2783,7 @@ static void test_coop_level_mode_set(void) hr = IDirectDraw_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL; @@ -2946,7 +2946,7 @@ static void test_coop_level_mode_set(void) hr = IDirectDraw_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 26c2c33..70382bd 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2950,7 +2950,7 @@ static void test_coop_level_mode_set(void) hr = IDirectDraw_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL; @@ -3113,7 +3113,7 @@ static void test_coop_level_mode_set(void) hr = IDirectDraw2_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3aec876..925852e 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3086,7 +3086,7 @@ static void test_coop_level_mode_set(void) hr = IDirectDraw4_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL; @@ -3249,7 +3249,7 @@ static void test_coop_level_mode_set(void) hr = IDirectDraw4_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 44695cb..fef3801 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2812,7 +2812,7 @@ static void test_coop_level_mode_set(void) hr = IDirectDraw7_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL; @@ -2975,7 +2975,7 @@ static void test_coop_level_mode_set(void) hr = IDirectDraw7_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL;

1 0

Henri Verbeet : ddraw: Validate the primary surface dimensions in ddraw_surface7_Restore().
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: ca6b29983b43db43e34cc1befaf064a650f7359f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca6b29983b43db43e34cc1bef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 1 12:02:56 2017 +0100 ddraw: Validate the primary surface dimensions in ddraw_surface7_Restore(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 20 ++++++++++++++++++++ dlls/ddraw/tests/ddraw1.c | 12 ++++++------ dlls/ddraw/tests/ddraw2.c | 12 ++++++------ dlls/ddraw/tests/ddraw4.c | 12 ++++++------ dlls/ddraw/tests/ddraw7.c | 12 ++++++------ 5 files changed, 44 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 94f850b..c46472c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3622,6 +3622,26 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) TRACE("iface %p.\n", iface); + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + struct wined3d_swapchain *swapchain = surface->ddraw->wined3d_swapchain; + struct wined3d_display_mode mode; + HRESULT hr; + + if (FAILED(hr = wined3d_swapchain_get_display_mode(swapchain, &mode, NULL))) + { + WARN("Failed to get display mode, hr %#x.\n", hr); + return hr; + } + + if (mode.width != surface->surface_desc.dwWidth || mode.height != surface->surface_desc.dwHeight) + { + WARN("Display mode %ux%u doesn't match surface dimensions %ux%u.\n", + mode.width, mode.height, surface->surface_desc.dwWidth, surface->surface_desc.dwHeight); + return DDERR_WRONGMODE; + } + } + ddraw_update_lost_surfaces(surface->ddraw); surface->is_lost = FALSE; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2f83314..28b67fd 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2724,7 +2724,7 @@ static void test_coop_level_mode_set(void) screen_size.cy = 0; hr = IDirectDrawSurface_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height); if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */) { @@ -2735,9 +2735,9 @@ static void test_coop_level_mode_set(void) } ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDrawSurface_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL; @@ -2894,13 +2894,13 @@ static void test_coop_level_mode_set(void) screen_size.cy = 0; hr = IDirectDrawSurface_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height); ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDrawSurface_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 70382bd..f27889f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2891,7 +2891,7 @@ static void test_coop_level_mode_set(void) screen_size.cy = 0; hr = IDirectDrawSurface_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height); if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */) { @@ -2902,9 +2902,9 @@ static void test_coop_level_mode_set(void) } ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDrawSurface_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL; @@ -3061,13 +3061,13 @@ static void test_coop_level_mode_set(void) screen_size.cy = 0; hr = IDirectDrawSurface_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height); ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDrawSurface_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 925852e..bcbc2f3 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3034,13 +3034,13 @@ static void test_coop_level_mode_set(void) screen_size.cy = 0; hr = IDirectDrawSurface4_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height); ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDrawSurface4_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL; @@ -3197,13 +3197,13 @@ static void test_coop_level_mode_set(void) screen_size.cy = 0; hr = IDirectDrawSurface4_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height); ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDrawSurface4_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fef3801..3774afb 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2760,13 +2760,13 @@ static void test_coop_level_mode_set(void) screen_size.cy = 0; hr = IDirectDrawSurface7_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height); ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDrawSurface7_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL; @@ -2923,13 +2923,13 @@ static void test_coop_level_mode_set(void) screen_size.cy = 0; hr = IDirectDrawSurface7_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height); ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDrawSurface7_Restore(primary); - todo_wine ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(primary); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); expect_messages = NULL;

1 0

Henri Verbeet : ddraw: Validate the primary surface format in ddraw_surface7_Restore().
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 312cb81138a3bd947a3e9ec8cf94774e852ad0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=312cb81138a3bd947a3e9ec8c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 1 12:02:57 2017 +0100 ddraw: Validate the primary surface format in ddraw_surface7_Restore(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 20 +++++++++++++++++--- dlls/ddraw/tests/ddraw1.c | 13 +++++++++++++ dlls/ddraw/tests/ddraw2.c | 13 +++++++++++++ dlls/ddraw/tests/ddraw4.c | 13 +++++++++++++ dlls/ddraw/tests/ddraw7.c | 13 +++++++++++++ 5 files changed, 69 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c46472c..710f6cd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3625,6 +3625,7 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { struct wined3d_swapchain *swapchain = surface->ddraw->wined3d_swapchain; + struct wined3d_sub_resource_desc wined3d_desc; struct wined3d_display_mode mode; HRESULT hr; @@ -3634,10 +3635,23 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) return hr; } - if (mode.width != surface->surface_desc.dwWidth || mode.height != surface->surface_desc.dwHeight) + if (FAILED(hr = wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, 0, &wined3d_desc))) { - WARN("Display mode %ux%u doesn't match surface dimensions %ux%u.\n", - mode.width, mode.height, surface->surface_desc.dwWidth, surface->surface_desc.dwHeight); + WARN("Failed to get resource desc, hr %#x.\n", hr); + return hr; + } + + if (mode.width != wined3d_desc.width || mode.height != wined3d_desc.height) + { + WARN("Display mode dimensions %ux%u don't match surface dimensions %ux%u.\n", + mode.width, mode.height, wined3d_desc.width, wined3d_desc.height); + return DDERR_WRONGMODE; + } + + if (mode.format_id != wined3d_desc.format) + { + WARN("Display mode format %#x doesn't match surface format %#x.\n", + mode.format_id, wined3d_desc.format); return DDERR_WRONGMODE; } } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 28b67fd..c57fa67 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4626,6 +4626,19 @@ static void test_primary_palette(void) hr = IDirectDrawSurface_GetPalette(primary, &tmp); ok(hr == DDERR_NOPALETTEATTACHED, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(primary); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = set_display_mode(ddraw, 640, 480); + ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); + + hr = IDirectDrawSurface_IsLost(primary); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(primary); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(primary); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + done: refcount = IDirectDrawSurface_Release(backbuffer); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f27889f..853a0d4 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -5673,6 +5673,19 @@ static void test_primary_palette(void) hr = IDirectDrawSurface_GetPalette(primary, &tmp); ok(hr == DDERR_NOPALETTEATTACHED, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(primary); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = set_display_mode(ddraw, 640, 480); + ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); + + hr = IDirectDrawSurface_IsLost(primary); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(primary); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(primary); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + done: refcount = IDirectDrawSurface_Release(backbuffer); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index bcbc2f3..93987e9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6944,6 +6944,19 @@ static void test_primary_palette(void) hr = IDirectDrawSurface4_GetPalette(primary, &tmp); ok(hr == DDERR_NOPALETTEATTACHED, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(primary); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = set_display_mode(ddraw, 640, 480); + ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); + + hr = IDirectDrawSurface4_IsLost(primary); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(primary); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(primary); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + done: refcount = IDirectDrawSurface4_Release(backbuffer); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3774afb..c29a50d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6867,6 +6867,19 @@ static void test_primary_palette(void) hr = IDirectDrawSurface7_GetPalette(primary, &tmp); ok(hr == DDERR_NOPALETTEATTACHED, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(primary); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = set_display_mode(ddraw, 640, 480); + ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_IsLost(primary); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Restore(primary); + ok(hr == DDERR_WRONGMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(primary); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + done: refcount = IDirectDrawSurface7_Release(backbuffer); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);

1 0

Henri Verbeet : ddraw: Update the primary surface format when changing the display mode.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: aa8cedb03320e9ececf10302504a005657a126ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa8cedb03320e9ececf103025… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 1 12:02:58 2017 +0100 ddraw: Update the primary surface format when changing the display mode. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw1.c | 29 +++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 29 +++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 29 +++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 29 +++++++++++++++++++++++++++++ 5 files changed, 128 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa8cedb03320e9ececf10…

1 0

Hans Leidekker : credui: Split domain from username in SspiPromptForCredentialsW.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 848f478091ed83b19e082af1ea451bf4ac06d5da URL: http://source.winehq.org/git/wine.git/?a=commit;h=848f478091ed83b19e082af1e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 1 14:18:48 2017 +0100 credui: Split domain from username in SspiPromptForCredentialsW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui_main.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index b85129a..0da4643 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -910,23 +910,45 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, if (!(ret = CredUIPromptForCredentialsW( cred_info, target, NULL, error, username, len_username, password, len_password, save, flags ))) { - DWORD size = sizeof(*id); - WCHAR *ptr; + DWORD size = sizeof(*id), len_domain = 0; + WCHAR *ptr, *user = username, *domain = NULL; - len_username = strlenW( username ); + if ((ptr = strchrW( username, '\\' ))) + { + user = ptr + 1; + len_username = strlenW( user ); + if (!strcmpiW( package, ntlmW ) || !strcmpiW( package, negotiateW )) + { + domain = username; + len_domain = ptr - username; + } + *ptr = 0; + } + else len_username = strlenW( username ); len_password = strlenW( password ); size += (len_username + 1) * sizeof(WCHAR); + size += (len_domain + 1) * sizeof(WCHAR); size += (len_password + 1) * sizeof(WCHAR); if (!(id = HeapAlloc( GetProcessHeap(), 0, size ))) return ERROR_OUTOFMEMORY; ptr = (WCHAR *)(id + 1); - memcpy( ptr, username, (len_username + 1) * sizeof(WCHAR) ); + memcpy( ptr, user, (len_username + 1) * sizeof(WCHAR) ); id->User = ptr; id->UserLength = len_username; ptr += len_username + 1; - id->Domain = NULL; - id->DomainLength = 0; + if (len_domain) + { + memcpy( ptr, domain, (len_domain + 1) * sizeof(WCHAR) ); + id->Domain = ptr; + id->DomainLength = len_domain; + ptr += len_domain + 1; + } + else + { + id->Domain = NULL; + id->DomainLength = 0; + } memcpy( ptr, password, (len_password + 1) * sizeof(WCHAR) ); id->Password = ptr; id->PasswordLength = len_password;

1 0