May 2016 - Wine-Commits - list.winehq.org

Francois Gouget : wined3d: Make wined3d_texture_set_dirty() static.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 08736f50486e60489b86b15acc19010ec5375814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08736f50486e60489b86b15ac… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:39:46 2016 +0200 wined3d: Make wined3d_texture_set_dirty() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3a03bb6..53dbb2f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -116,6 +116,11 @@ void wined3d_texture_validate_location(struct wined3d_texture *texture, TRACE("New locations flags are %s.\n", wined3d_debug_location(sub_resource->locations)); } +static void wined3d_texture_set_dirty(struct wined3d_texture *texture) +{ + texture->flags &= ~(WINED3D_TEXTURE_RGB_VALID | WINED3D_TEXTURE_SRGB_VALID); +} + void wined3d_texture_invalidate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) { @@ -430,11 +435,6 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined wined3d_resource_update_draw_binding(&texture->resource); } -void wined3d_texture_set_dirty(struct wined3d_texture *texture) -{ - texture->flags &= ~(WINED3D_TEXTURE_RGB_VALID | WINED3D_TEXTURE_SRGB_VALID); -} - /* Context activation is done by the caller. */ void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 59c5800..7ac0319 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2586,7 +2586,6 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_ps_consts_i().
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 596f7077971c2ca2abdc5f484b7f41bf4794a23b URL: http://source.winehq.org/git/wine.git/?a=commit;h=596f7077971c2ca2abdc5f484… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:52 2016 +0200 wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_ps_consts_i(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 26 ++++++++++++++------------ dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8f46fcd..bfbee07 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3142,7 +3142,8 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantI(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_i(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_set_ps_consts_i(device->wined3d_device, + reg_idx, count, (const struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 19e819c..1c25f1b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2648,26 +2648,28 @@ HRESULT CDECL wined3d_device_get_ps_consts_b(const struct wined3d_device *device } HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device, - UINT start_register, const int *constants, UINT vector4i_count) + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) { - UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - start_register); - UINT i; + unsigned int i; - TRACE("device %p, start_register %u, constants %p, vector4i_count %u.\n", - device, start_register, constants, vector4i_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_I) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->ps_consts_i[start_register], constants, count * sizeof(int) * 4); - for (i = 0; i < count; ++i) - TRACE("Set INT constant %u to {%d, %d, %d, %d}.\n", start_register + i, - constants[i * 4], constants[i * 4 + 1], - constants[i * 4 + 2], constants[i * 4 + 3]); + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + memcpy(&device->update_state->ps_consts_i[start_idx], constants, count * sizeof(*constants)); + if (TRACE_ON(d3d)) + { + for (i = 0; i < count; ++i) + TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i])); + } if (device->recording) { - for (i = start_register; i < count + start_register; ++i) + for (i = start_idx; i < count + start_idx; ++i) device->recording->changed.pixelShaderConstantsI |= (1u << i); } else diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b648034..b76a5c0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -928,7 +928,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i) { wined3d_device_set_ps_consts_i(device, stateblock->contained_ps_consts_i[i], - &stateblock->state.ps_consts_i[stateblock->contained_ps_consts_i[i]].x, 1); + 1, &stateblock->state.ps_consts_i[stateblock->contained_ps_consts_i[i]]); } for (i = 0; i < stateblock->num_contained_ps_consts_b; ++i) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d81e065..4219b53 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -131,7 +131,7 @@ @ cdecl wined3d_device_set_ps_cb(ptr long ptr) @ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_ps_consts_f(ptr long long ptr) -@ cdecl wined3d_device_set_ps_consts_i(ptr long ptr long) +@ cdecl wined3d_device_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_device_set_ps_resource_view(ptr long ptr) @ cdecl wined3d_device_set_ps_sampler(ptr long ptr) @ cdecl wined3d_device_set_render_state(ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8ddf560..b01e8e4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2219,7 +2219,7 @@ HRESULT __cdecl wined3d_device_set_ps_consts_b(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_set_ps_consts_i(struct wined3d_device *device, - UINT start_register, const int *constants, UINT vector4i_count); + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); void __cdecl wined3d_device_set_ps_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler);

1 0

Andrey Gusev : d3d11/tests: Fix a typo in define.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: a41519d2a3405702fc77cdae875a1a9d8c64cf3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41519d2a3405702fc77cdae8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 16 14:30:27 2016 +0300 d3d11/tests: Fix a typo in define. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 86f1d24..591a009 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -239,7 +239,7 @@ static void check_texture_color_(unsigned int line, ID3D11Texture2D *texture, check_texture_sub_resource_color_(line, texture, sub_resource_idx, expected_color, max_diff); } -#define check_texture_sub_resource_float(t, s, c, d) check_texture_sub_resource_flot_(__LINE__, t, s, c, d) +#define check_texture_sub_resource_float(t, s, c, d) check_texture_sub_resource_float_(__LINE__, t, s, c, d) static void check_texture_sub_resource_float_(unsigned int line, ID3D11Texture2D *texture, unsigned int sub_resource_idx, float expected_value, BYTE max_diff) {

1 0

Henri Verbeet : wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_vs_consts_i().
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 3ae7ab95838837a64b6226efc6778d271f2bed6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae7ab95838837a64b6226efc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:51 2016 +0200 wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_vs_consts_i(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0c099e0..8f46fcd 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2868,7 +2868,8 @@ static HRESULT WINAPI d3d9_device_GetVertexShaderConstantI(IDirect3DDevice9Ex *i TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_i(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_vs_consts_i(device->wined3d_device, + reg_idx, count, (struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 59a5c8c..19e819c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2452,17 +2452,17 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_vs_consts_i(const struct wined3d_device *device, - UINT start_register, int *constants, UINT vector4i_count) + unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants) { - UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - start_register); - - TRACE("device %p, start_register %u, constants %p, vector4i_count %u.\n", - device, start_register, constants, vector4i_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_I) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.vs_consts_i[start_register], count * sizeof(int) * 4); + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + memcpy(constants, &device->state.vs_consts_i[start_idx], count * sizeof(*constants)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3831a65..d81e065 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -95,7 +95,7 @@ @ cdecl wined3d_device_get_vs_cb(ptr long) @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_f(ptr long long ptr) -@ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long) +@ cdecl wined3d_device_get_vs_consts_i(ptr long long ptr) @ cdecl wined3d_device_get_vs_resource_view(ptr long) @ cdecl wined3d_device_get_vs_sampler(ptr long) @ cdecl wined3d_device_get_wined3d(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 31aba7a..8ddf560 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2163,7 +2163,7 @@ HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *devi HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *device, unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device, - UINT start_register, int *constants, UINT vector4i_count); + unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_vs_resource_view(const struct wined3d_device *device, UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx);

1 0

Alexandre Julliard : winecfg: Keep metrics in DPI-relative format when saving the theme.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 5b8fdb97310f17396f496eea37bd5c0d27c7b337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8fdb97310f17396f496eea3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 21:19:22 2016 +0900 winecfg: Keep metrics in DPI-relative format when saving the theme. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/theme.c | 59 +++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 2b24dd9..1d915bc 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1011,35 +1011,42 @@ static void read_sysparams(HWND hDlg) static void apply_sysparams(void) { - NONCLIENTMETRICSW nonclient_metrics; + NONCLIENTMETRICSW ncm; int i, cnt = 0; int colors_idx[sizeof(metrics) / sizeof(metrics[0])]; COLORREF colors[sizeof(metrics) / sizeof(metrics[0])]; - - nonclient_metrics.cbSize = sizeof(nonclient_metrics); - SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(nonclient_metrics), &nonclient_metrics, 0); - - nonclient_metrics.iMenuWidth = nonclient_metrics.iMenuHeight = - metrics[IDC_SYSPARAMS_MENU - IDC_SYSPARAMS_BUTTON].size; - nonclient_metrics.iCaptionWidth = nonclient_metrics.iCaptionHeight = - metrics[IDC_SYSPARAMS_ACTIVE_TITLE - IDC_SYSPARAMS_BUTTON].size; - nonclient_metrics.iScrollWidth = nonclient_metrics.iScrollHeight = - metrics[IDC_SYSPARAMS_SCROLLBAR - IDC_SYSPARAMS_BUTTON].size; - - memcpy(&(nonclient_metrics.lfMenuFont), - &(metrics[IDC_SYSPARAMS_MENU_TEXT - IDC_SYSPARAMS_BUTTON].lf), - sizeof(LOGFONTW)); - memcpy(&(nonclient_metrics.lfCaptionFont), - &(metrics[IDC_SYSPARAMS_ACTIVE_TITLE_TEXT - IDC_SYSPARAMS_BUTTON].lf), - sizeof(LOGFONTW)); - memcpy(&(nonclient_metrics.lfStatusFont), - &(metrics[IDC_SYSPARAMS_TOOLTIP_TEXT - IDC_SYSPARAMS_BUTTON].lf), - sizeof(LOGFONTW)); - memcpy(&(nonclient_metrics.lfMessageFont), - &(metrics[IDC_SYSPARAMS_MSGBOX_TEXT - IDC_SYSPARAMS_BUTTON].lf), - sizeof(LOGFONTW)); - - SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(nonclient_metrics), &nonclient_metrics, + HDC hdc; + int dpi; + + hdc = GetDC( 0 ); + dpi = GetDeviceCaps( hdc, LOGPIXELSY ); + ReleaseDC( 0, hdc ); + + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0); + + /* convert metrics back to twips */ + ncm.iMenuWidth = ncm.iMenuHeight = + MulDiv( metrics[IDC_SYSPARAMS_MENU - IDC_SYSPARAMS_BUTTON].size, -1440, dpi ); + ncm.iCaptionWidth = ncm.iCaptionHeight = + MulDiv( metrics[IDC_SYSPARAMS_ACTIVE_TITLE - IDC_SYSPARAMS_BUTTON].size, -1440, dpi ); + ncm.iScrollWidth = ncm.iScrollHeight = + MulDiv( metrics[IDC_SYSPARAMS_SCROLLBAR - IDC_SYSPARAMS_BUTTON].size, -1440, dpi ); + ncm.iSmCaptionWidth = MulDiv( ncm.iSmCaptionWidth, -1440, dpi ); + ncm.iSmCaptionHeight = MulDiv( ncm.iSmCaptionHeight, -1440, dpi ); + + ncm.lfMenuFont = metrics[IDC_SYSPARAMS_MENU_TEXT - IDC_SYSPARAMS_BUTTON].lf; + ncm.lfCaptionFont = metrics[IDC_SYSPARAMS_ACTIVE_TITLE_TEXT - IDC_SYSPARAMS_BUTTON].lf; + ncm.lfStatusFont = metrics[IDC_SYSPARAMS_TOOLTIP_TEXT - IDC_SYSPARAMS_BUTTON].lf; + ncm.lfMessageFont = metrics[IDC_SYSPARAMS_MSGBOX_TEXT - IDC_SYSPARAMS_BUTTON].lf; + + ncm.lfMenuFont.lfHeight = MulDiv( ncm.lfMenuFont.lfHeight, -72, dpi ); + ncm.lfCaptionFont.lfHeight = MulDiv( ncm.lfCaptionFont.lfHeight, -72, dpi ); + ncm.lfStatusFont.lfHeight = MulDiv( ncm.lfStatusFont.lfHeight, -72, dpi ); + ncm.lfMessageFont.lfHeight = MulDiv( ncm.lfMessageFont.lfHeight, -72, dpi ); + ncm.lfSmCaptionFont.lfHeight = MulDiv( ncm.lfSmCaptionFont.lfHeight, -72, dpi ); + + SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(ncm), &ncm, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); for (i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++)

1 0

Hans Leidekker : qmgr: Change job state on failure in transfer_file_http.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: fb704266fa6cf797d900ade4672dfb4c6f6cdd4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb704266fa6cf797d900ade46… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 10:53:07 2016 +0200 qmgr: Change job state on failure in transfer_file_http. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/file.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 2525caf..302f407 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -420,7 +420,8 @@ done: WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); - if (!ret) DeleteFileW(tmpfile); + if (!ret && !transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_ERROR)) + transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_ERROR); SetEvent(job->done); return ret; @@ -525,13 +526,9 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) if (!ret) { TRACE("WinHttpCrackUrl failed, trying local file copy\n"); - if (!transfer_file_local(file, tmpName)) return FALSE; - } - else if (!transfer_file_http(file, &uc, tmpName)) - { - WARN("HTTP transfer failed\n"); - return FALSE; + if (!transfer_file_local(file, tmpName)) WARN("local transfer failed\n"); } + else if (!transfer_file_http(file, &uc, tmpName)) WARN("HTTP transfer failed\n"); if (transitionJobState(job, BG_JOB_STATE_CONNECTING, BG_JOB_STATE_QUEUED) || transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_QUEUED))

1 0

Hans Leidekker : qmgr: Clear job error on resume.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 98f7468f9a7c4ff5afe9dec2558e8bc43f0bf8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98f7468f9a7c4ff5afe9dec25… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 10:53:06 2016 +0200 qmgr: Clear job error on resume. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/job.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index f6891e3..33e3bd2 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -371,6 +371,12 @@ static HRESULT WINAPI BackgroundCopyJob_Resume( && This->state != BG_JOB_STATE_TRANSFERRING) { This->state = BG_JOB_STATE_QUEUED; + This->error.context = This->error.code = 0; + if (This->error.file) + { + IBackgroundCopyFile2_Release(This->error.file); + This->error.file = NULL; + } SetEvent(globalMgr.jobEvent); } LeaveCriticalSection(&globalMgr.cs);

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: ce91365b105966885195fe36d5e14c4d7c4134c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce91365b105966885195fe36d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 10:52:00 2016 +0200 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 88 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 81b762e..e66100c 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1051,7 +1051,7 @@ static void test_WsReadEndElement(void) hr = WsReadEndElement( reader, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); - hr = set_input( reader, "<a></a>", sizeof("<a></a>") - 1 ); + hr = set_input( reader, "<a></A>", sizeof("<a></A>") - 1 ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsFillReader( reader, sizeof("<a></a>") - 1, NULL, NULL ); @@ -1722,6 +1722,7 @@ static void test_WsMoveReader(void) WS_XML_STRING localname = {1, (BYTE *)"a"}, localname2 = {1, (BYTE *)"b"}, ns = {0, NULL}; const WS_XML_NODE *node; WS_XML_ELEMENT_NODE *elem; + WS_XML_UTF8_TEXT utf8; hr = WsCreateReader( NULL, 0, &reader, NULL ) ; ok( hr == S_OK, "got %08x\n", hr ); @@ -1803,7 +1804,7 @@ static void test_WsMoveReader(void) hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* EOF node is last child of BOF node */ hr = WsMoveReader( reader, WS_MOVE_TO_BOF, NULL, NULL ); @@ -1814,14 +1815,14 @@ static void test_WsMoveReader(void) hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); hr = WsMoveReader( reader, WS_MOVE_TO_NEXT_NODE, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", elem->node.nodeType ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = WsMoveReader( reader, WS_MOVE_TO_ROOT_ELEMENT, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1848,7 +1849,7 @@ static void test_WsMoveReader(void) hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); hr = WsMoveReader( reader, WS_MOVE_TO_PARENT_ELEMENT, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1875,11 +1876,86 @@ static void test_WsMoveReader(void) hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", elem->node.nodeType ); + ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); hr = WsMoveReader( reader, WS_MOVE_TO_PARENT_ELEMENT, NULL, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + WsFreeWriter( writer ); + WsFreeHeap( heap ); + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* <a><b>test</b></a> */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = (BYTE *)"test"; + utf8.value.length = sizeof("test") - 1; + hr = WsWriteText( writer, &utf8.text, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetInputToBuffer( reader, buffer, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsMoveReader( reader, WS_MOVE_TO_ROOT_ELEMENT, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsMoveReader( reader, WS_MOVE_TO_NEXT_NODE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + hr = WsMoveReader( reader, WS_MOVE_TO_ROOT_ELEMENT, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsMoveReader( reader, WS_MOVE_TO_CHILD_NODE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + elem = (WS_XML_ELEMENT_NODE *)node; + ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "b", 1 ), "wrong data\n" ); + + hr = WsMoveReader( reader, WS_MOVE_TO_NEXT_NODE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + WsFreeReader( reader ); WsFreeWriter( writer ); WsFreeHeap( heap );

1 0

Hans Leidekker : webservices: Flush the writer in WsWriteText.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: f4b336379063399b08d5b56d8aa18dacc914e589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b336379063399b08d5b56d8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 10:51:56 2016 +0200 webservices: Flush the writer in WsWriteText. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 35be982..a6ecf24 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -861,6 +861,13 @@ HRESULT WINAPI WsWriteEndCData( WS_XML_WRITER *handle, WS_ERROR *error ) return S_OK; } +/* flush current start element if necessary */ +static HRESULT write_flush( struct writer *writer ) +{ + if (writer->state == WRITER_STATE_STARTELEMENT) return write_endstartelement( writer ); + return S_OK; +} + static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRING *prefix, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { @@ -868,9 +875,7 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN WS_XML_ELEMENT_NODE *elem; HRESULT hr; - /* flush current start element if necessary */ - if (writer->state == WRITER_STATE_STARTELEMENT && ((hr = write_endstartelement( writer )) != S_OK)) - return hr; + if ((hr = write_flush( writer )) != S_OK) return hr; if (!prefix && node_type( writer->current ) == WS_XML_NODE_TYPE_ELEMENT) prefix = writer->current->hdr.prefix; @@ -950,6 +955,7 @@ HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_E } else { + if ((hr = write_flush( writer )) != S_OK) return hr; if ((hr = write_grow_buffer( writer, src->value.length )) != S_OK) return hr; write_bytes( writer, src->value.bytes, src->value.length ); }

1 0

Akihiro Sagawa : libport: Fix null character handling when mapping DBCS characters.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 6938fec4aeb3b94ed184e3c272e7e278f354117e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6938fec4aeb3b94ed184e3c27… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 15 21:08:47 2016 +0900 libport: Fix null character handling when mapping DBCS characters. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 8 ++++---- libs/port/mbtowc.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 3161b8b..8eccf99 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1211,9 +1211,9 @@ static void test_dbcs_to_widechar(void) { WCHAR wbuf_ok[] = { 0x770b, 0x003f, '\0', 0xffff }; WCHAR wbuf_broken[] = { 0x770b, '\0', 0xffff, 0xffff }; - todo_wine ok(count == 3 || broken(count == 2 /*windows xp*/), + ok(count == 3 || broken(count == 2 /*windows xp*/), "%04x: returned %d (expected 3)\n", flags[i], count); - todo_wine ok(!memcmp(wbuf, wbuf_ok, sizeof(wbuf_ok)) + ok(!memcmp(wbuf, wbuf_ok, sizeof(wbuf_ok)) || broken(!memcmp(wbuf, wbuf_broken, sizeof(wbuf_broken))), "%04x: returned %04x %04x %04x %04x (expected %04x %04x %04x %04x)\n", flags[i], wbuf[0], wbuf[1], wbuf[2], wbuf[3], @@ -1240,9 +1240,9 @@ static void test_dbcs_to_widechar(void) { WCHAR wbuf_ok[] = { 0x770b, 0x003f, '\0', 'x', 0xffff }; WCHAR wbuf_broken[] = { 0x770b, '\0', 'x', 0xffff, 0xffff }; - todo_wine ok(count == 4 || broken(count == 3), + ok(count == 4 || broken(count == 3), "%04x: returned %d (expected 4)\n", flags[i], count); - todo_wine ok(!memcmp(wbuf, wbuf_ok, sizeof(wbuf_ok)) + ok(!memcmp(wbuf, wbuf_ok, sizeof(wbuf_ok)) || broken(!memcmp(wbuf, wbuf_broken, sizeof(wbuf_broken))), "%04x: returned %04x %04x %04x %04x %04x (expected %04x %04x %04x %04x %04x)\n", flags[i], wbuf[0], wbuf[1], wbuf[2], wbuf[3], wbuf[4], diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index fd7764e..4977c82 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -131,7 +131,7 @@ static inline int get_length_dbcs( const struct dbcs_table *table, for (len = 0; srclen; srclen--, src++, len++) { - if (cp2uni_lb[*src] && srclen > 1) + if (cp2uni_lb[*src] && srclen > 1 && src[1]) { src++; srclen--; @@ -183,7 +183,7 @@ static inline int mbstowcs_dbcs( const struct dbcs_table *table, for (len = dstlen; srclen && len; len--, srclen--, src++, dst++) { unsigned char off = cp2uni_lb[*src]; - if (off && srclen > 1) + if (off && srclen > 1 && src[1]) { src++; srclen--; @@ -212,7 +212,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, for (len = 0; srclen; srclen--, src++) { unsigned char off = cp2uni_lb[*src]; - if (off && srclen > 1) + if (off && srclen > 1 && src[1]) { src++; srclen--; @@ -227,7 +227,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, for (len = dstlen; srclen && len; srclen--, src++) { unsigned char off = cp2uni_lb[*src]; - if (off && srclen > 1) + if (off && srclen > 1 && src[1]) { src++; srclen--;

1 0