February 2017 - Wine-commits

Nikolay Sivov : dwrite: Keep content based line height and baseline separately.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 3c494e82e3036e17af87939cec8bb630b5b6ba17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c494e82e3036e17af87939ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 2 02:11:34 2017 +0300 dwrite: Keep content based line height and baseline separately. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 50 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index adc3493..c2094cf 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -222,6 +222,11 @@ struct layout_cluster { UINT32 position; /* relative to run, first cluster has 0 position */ }; +struct layout_line { + FLOAT height; /* height based on content */ + FLOAT baseline; /* baseline based on content */ +}; + enum layout_recompute_mask { RECOMPUTE_CLUSTERS = 1 << 0, RECOMPUTE_MINIMAL_WIDTH = 1 << 1, @@ -265,7 +270,8 @@ struct dwrite_textlayout { UINT32 cluster_count; FLOAT minwidth; - DWRITE_LINE_METRICS1 *lines; + struct layout_line *lines; + DWRITE_LINE_METRICS1 *linemetrics; UINT32 line_alloc; DWRITE_TEXT_METRICS1 metrics; @@ -1312,24 +1318,40 @@ static HRESULT layout_set_line_metrics(struct dwrite_textlayout *layout, DWRITE_ { if (!layout->line_alloc) { layout->line_alloc = 5; - layout->lines = heap_alloc(layout->line_alloc*sizeof(*layout->lines)); - if (!layout->lines) + layout->linemetrics = heap_alloc(layout->line_alloc * sizeof(*layout->linemetrics)); + layout->lines = heap_alloc(layout->line_alloc * sizeof(*layout->lines)); + if (!layout->linemetrics || !layout->lines) { + heap_free(layout->linemetrics); + heap_free(layout->lines); + layout->linemetrics = NULL; + layout->lines = NULL; return E_OUTOFMEMORY; + } } if (layout->metrics.lineCount == layout->line_alloc) { - DWRITE_LINE_METRICS1 *l = heap_realloc(layout->lines, layout->line_alloc*2*sizeof(*layout->lines)); - if (!l) + DWRITE_LINE_METRICS1 *metrics; + struct layout_line *lines; + + if ((metrics = heap_realloc(layout->linemetrics, layout->line_alloc * 2 * sizeof(*layout->linemetrics)))) + layout->linemetrics = metrics; + if ((lines = heap_realloc(layout->lines, layout->line_alloc * 2 * sizeof(*layout->lines)))) + layout->lines = lines; + + if (!metrics || !lines) return E_OUTOFMEMORY; - layout->lines = l; + layout->line_alloc *= 2; } - layout->lines[layout->metrics.lineCount++] = *metrics; + layout->linemetrics[layout->metrics.lineCount] = *metrics; + layout->lines[layout->metrics.lineCount].height = metrics->height; + layout->lines[layout->metrics.lineCount].baseline = metrics->baseline; + + layout->metrics.lineCount++; return S_OK; } - static inline struct layout_effective_run *layout_get_next_erun(struct dwrite_textlayout *layout, const struct layout_effective_run *cur) { @@ -1582,7 +1604,7 @@ static void layout_apply_par_alignment(struct dwrite_textlayout *layout) erun = layout_get_next_erun(layout, NULL); inrun = layout_get_next_inline_run(layout, NULL); for (line = 0; line < layout->metrics.lineCount; line++) { - origin_y += layout->lines[line].baseline; + origin_y += layout->linemetrics[line].baseline; while (erun && erun->line == line) { erun->origin_y = origin_y; @@ -1970,7 +1992,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) origin_y = 0.0f; for (line = 0; line < layout->metrics.lineCount; line++) { - origin_y += layout->lines[line].baseline; + origin_y += layout->linemetrics[line].baseline; /* For all runs on this line */ while (erun && erun->line == line) { @@ -1994,7 +2016,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) /* Use last line origin y + line descent as total content height */ line--; - layout->metrics.height = origin_y + layout->lines[line].height - layout->lines[line].baseline; + layout->metrics.height = origin_y + layout->linemetrics[line].height - layout->linemetrics[line].baseline; /* Initial alignment is always leading */ if (layout->format.textalignment != DWRITE_TEXT_ALIGNMENT_LEADING) @@ -2736,6 +2758,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout3 *iface) heap_free(This->actual_breakpoints); heap_free(This->clustermetrics); heap_free(This->clusters); + heap_free(This->linemetrics); heap_free(This->lines); heap_free(This->str); heap_free(This); @@ -3457,7 +3480,7 @@ static HRESULT WINAPI dwritetextlayout_GetLineMetrics(IDWriteTextLayout3 *iface, if (metrics) { UINT32 i, c = min(max_count, This->metrics.lineCount); for (i = 0; i < c; i++) - memcpy(metrics + i, This->lines + i, sizeof(*metrics)); + memcpy(metrics + i, This->linemetrics + i, sizeof(*metrics)); } *count = This->metrics.lineCount; @@ -3886,7 +3909,7 @@ static HRESULT WINAPI dwritetextlayout3_GetLineMetrics(IDWriteTextLayout3 *iface return hr; if (metrics) - memcpy(metrics, This->lines, sizeof(*metrics)*min(max_count, This->metrics.lineCount)); + memcpy(metrics, This->linemetrics, sizeof(*metrics) * min(max_count, This->metrics.lineCount)); *count = This->metrics.lineCount; return max_count >= This->metrics.lineCount ? S_OK : E_NOT_SUFFICIENT_BUFFER; @@ -4751,6 +4774,7 @@ static HRESULT init_textlayout(const struct textlayout_desc *desc, struct dwrite layout->cluster_count = 0; layout->clustermetrics = NULL; layout->clusters = NULL; + layout->linemetrics = NULL; layout->lines = NULL; layout->line_alloc = 0; layout->minwidth = 0.0f;

1 0

Nikolay Sivov : dwrite: Added support for uniform and proportional spacing methods.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: cb0b0885510c69854e82d35144fa65cbd069a277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb0b0885510c69854e82d3514… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 2 02:11:35 2017 +0300 dwrite: Added support for uniform and proportional spacing methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 142 +++++++++++++++++++++++++++++++++------------ dlls/dwrite/tests/layout.c | 2 - 2 files changed, 104 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb0b0885510c69854e82d…

1 0

Zebediah Figura : secur32/tests: Skip sign/ seal tests if authentication fails.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 38ca35166be379f1846436a392da68603dc8c81d URL: http://source.winehq.org/git/wine.git/?a=commit;h=38ca35166be379f1846436a39… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 25 22:01:51 2017 -0600 secur32/tests: Skip sign/seal tests if authentication fails. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 3b661c1..d90b725 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -971,6 +971,10 @@ static void testSignSeal(void) { client_stat = runClient(&client, first, SECURITY_NETWORK_DREP); + ok(client_stat == SEC_E_OK || client_stat == SEC_I_CONTINUE_NEEDED, + "Running the client returned %s, more tests will fail.\n", + getSecError(client_stat)); + communicate(&client, &server); server_stat = runFakeServer(&server, first, SECURITY_NETWORK_DREP); @@ -980,6 +984,12 @@ static void testSignSeal(void) first = FALSE; } + if(client_stat != SEC_E_OK) + { + skip("Authentication failed, skipping test.\n"); + goto end; + } + /******************************************** * Now start with the actual testing * ********************************************/

1 0

Jefferson Carpenter : wmvcore: Implement WMCreateReaderPriv.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 7b70ebac6deb60d9a7c4d561a2768e3a34008a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b70ebac6deb60d9a7c4d561a… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Wed Feb 1 21:59:19 2017 -0600 wmvcore: Implement WMCreateReaderPriv. Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index a3f23eb..bb17683 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -10,7 +10,7 @@ @ stub WMCreateIndexer @ stdcall WMCreateProfileManager(ptr) @ stdcall WMCreateReader(ptr long ptr) -@ stub WMCreateReaderPriv +@ stdcall WMCreateReaderPriv(ptr) @ stdcall WMCreateSyncReader(ptr long ptr) @ stdcall WMCreateWriter(ptr ptr) @ stub WMCreateWriterFileSink diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 741dd70c..d196079 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -667,6 +667,11 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ return S_OK; } +HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader) +{ + return WMCreateReader(NULL, 0, ret_reader); +} + HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) { FIXME("(%p, %x, %p): stub\n", pcert, rights, syncreader);

1 0

Austin English : winusb: Add stub dll.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: c6adf8af6e3015e7a2cb40aa952c75ad6c2f2388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6adf8af6e3015e7a2cb40aa9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 1 12:52:57 2017 -0600 winusb: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/winusb/Makefile.in | 1 + dlls/winusb/winusb.spec | 22 ++++++++++++++++++++++ 4 files changed, 26 insertions(+) diff --git a/configure b/configure index 68a79c0..56904e9 100755 --- a/configure +++ b/configure @@ -1474,6 +1474,7 @@ enable_winspool_drv enable_winsta enable_wintab32 enable_wintrust +enable_winusb enable_wlanapi enable_wldap32 enable_wmasf @@ -18429,6 +18430,7 @@ wine_fn_config_dll wintab32 enable_wintab32 implib wine_fn_config_test dlls/wintab32/tests wintab32_test wine_fn_config_dll wintrust enable_wintrust implib wine_fn_config_test dlls/wintrust/tests wintrust_test +wine_fn_config_dll winusb enable_winusb wine_fn_config_dll wlanapi enable_wlanapi implib wine_fn_config_test dlls/wlanapi/tests wlanapi_test wine_fn_config_dll wldap32 enable_wldap32 clean,implib diff --git a/configure.ac b/configure.ac index 6e4cd8b..c6d63b2 100644 --- a/configure.ac +++ b/configure.ac @@ -3488,6 +3488,7 @@ WINE_CONFIG_DLL(wintab32,,[implib]) WINE_CONFIG_TEST(dlls/wintab32/tests) WINE_CONFIG_DLL(wintrust,,[implib]) WINE_CONFIG_TEST(dlls/wintrust/tests) +WINE_CONFIG_DLL(winusb) WINE_CONFIG_DLL(wlanapi,,[implib]) WINE_CONFIG_TEST(dlls/wlanapi/tests) WINE_CONFIG_DLL(wldap32,,[clean,implib]) diff --git a/dlls/winusb/Makefile.in b/dlls/winusb/Makefile.in new file mode 100644 index 0000000..c8cab4d --- /dev/null +++ b/dlls/winusb/Makefile.in @@ -0,0 +1 @@ +MODULE = winusb.dll diff --git a/dlls/winusb/winusb.spec b/dlls/winusb/winusb.spec new file mode 100644 index 0000000..09371e9 --- /dev/null +++ b/dlls/winusb/winusb.spec @@ -0,0 +1,22 @@ +@ stub WinUsb_AbortPipe +@ stub WinUsb_ControlTransfer +@ stub WinUsb_FlushPipe +@ stub WinUsb_Free +@ stub WinUsb_GetAssociatedInterface +@ stub WinUsb_GetCurrentAlternateSetting +@ stub WinUsb_GetDescriptor +@ stub WinUsb_GetOverlappedResult +@ stub WinUsb_GetPipePolicy +@ stub WinUsb_GetPowerPolicy +@ stub WinUsb_Initialize +@ stub WinUsb_ParseConfigurationDescriptor +@ stub WinUsb_ParseDescriptors +@ stub WinUsb_QueryDeviceInformation +@ stub WinUsb_QueryInterfaceSettings +@ stub WinUsb_QueryPipe +@ stub WinUsb_ReadPipe +@ stub WinUsb_ResetPipe +@ stub WinUsb_SetCurrentAlternateSetting +@ stub WinUsb_SetPipePolicy +@ stub WinUsb_SetPowerPolicy +@ stub WinUsb_WritePipe

1 0

Matteo Bruni : wined3d: Don't query FFP lights count on core profile.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 0717d00cce6be38c0875c2cef03f7302368f04e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0717d00cce6be38c0875c2cef… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 2 01:04:03 2017 +0100 wined3d: Don't query FFP lights count on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 ++++--- dlls/wined3d/directx.c | 10 +++++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index acf4307..1c69cdd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1730,10 +1730,11 @@ HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UIN } else { + unsigned int light_count = device->adapter->d3d_info.limits.active_light_count; unsigned int i; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - /* Find a free GL light. */ - for (i = 0; i < gl_info->limits.lights; ++i) + + /* Find a free light. */ + for (i = 0; i < light_count; ++i) { if (!device->update_state->lights[i]) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6405776..b175d3a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3361,9 +3361,12 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.user_clip_distances = min(MAX_CLIP_DISTANCES, gl_max); TRACE("Clip plane support - max planes %d.\n", gl_max); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_LIGHTS, &gl_max); - gl_info->limits.lights = gl_max; - TRACE("Light support - max lights %d.\n", gl_max); + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_LIGHTS, &gl_max); + gl_info->limits.lights = gl_max; + TRACE("Light support - max lights %d.\n", gl_max); + } gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_SIZE, &gl_max); gl_info->limits.texture_size = gl_max; @@ -4003,6 +4006,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD adapter->d3d_info.xyzrhw = vertex_caps.xyzrhw; adapter->d3d_info.ffp_generic_attributes = vertex_caps.ffp_generic_attributes; adapter->d3d_info.limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; + adapter->d3d_info.limits.active_light_count = vertex_caps.max_active_lights; adapter->d3d_info.emulated_flatshading = vertex_caps.emulated_flatshading; adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bf8f612..43d80d2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2219,6 +2219,7 @@ struct wined3d_d3d_limits UINT ffp_textures; UINT ffp_blend_stages; UINT ffp_vertex_blend_matrices; + unsigned int active_light_count; }; typedef void (WINE_GLAPI *wined3d_ffp_attrib_func)(const void *data);

1 0

Matteo Bruni : wined3d: Use the correct GLenum for point size limit on core profile.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: fb92b782f64d4623c63d793964dcdcb6f46e289f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb92b782f64d4623c63d79396… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 2 01:04:04 2017 +0100 wined3d: Use the correct GLenum for point size limit on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b175d3a..2b2e314 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3372,7 +3372,8 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.texture_size = gl_max; TRACE("Maximum texture size support - max texture size %d.\n", gl_max); - gl_info->gl_ops.gl.p_glGetFloatv(GL_ALIASED_POINT_SIZE_RANGE, gl_floatv); + gl_info->gl_ops.gl.p_glGetFloatv(gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] + ? GL_ALIASED_POINT_SIZE_RANGE : GL_POINT_SIZE_RANGE, gl_floatv); gl_info->limits.pointsize_min = gl_floatv[0]; gl_info->limits.pointsize_max = gl_floatv[1]; TRACE("Maximum point size support - max point size %f.\n", gl_floatv[1]);

1 0

Matteo Bruni : wined3d: Trace maximum vertex attributes count.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: cd9ab8663d535d7399c94afec337ba25e8de150a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9ab8663d535d7399c94afec… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 2 01:04:06 2017 +0100 wined3d: Trace maximum vertex attributes count. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2b2e314..d8e518ebd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3463,6 +3463,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) } TRACE("Max vertex samplers: %u.\n", gl_info->limits.vertex_samplers); TRACE("Max combined samplers: %u.\n", gl_info->limits.combined_samplers); + TRACE("Max vertex attributes: %u.\n", gl_info->limits.vertex_attribs); } if (gl_info->supported[ARB_VERTEX_BLEND]) {

1 0

Hugh McMaster : regedit: Update some comments in edit.c.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 8ce48b9fcd01e37e8f711517238f933171c8e705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce48b9fcd01e37e8f7115172… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 1 12:57:32 2017 +0000 regedit: Update some comments in edit.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index ea73dc1..c6a6629 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -249,7 +249,7 @@ BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR keyName) if (!LoadStringW(GetModuleHandleW(0), IDS_NEWKEY, newKey, COUNT_OF(newKey))) goto done; - /* try to find out a name for the newly create key (max 100 times) */ + /* try to find a name for the key being created (maximum = 100 attempts) */ for (keyNum = 1; keyNum < 100; keyNum++) { wsprintfW(keyName, newKey, keyNum); lRet = RegOpenKeyW(hKey, keyName, &retKey); @@ -453,7 +453,7 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW if (!LoadStringW(GetModuleHandleW(0), IDS_NEWVALUE, newValue, COUNT_OF(newValue))) goto done; - /* try to find out a name for the newly create key (max 100 times) */ + /* try to find a name for the value being created (maximum = 100 attempts) */ for (valueNum = 1; valueNum < 100; valueNum++) { wsprintfW(valueName, newValue, valueNum); lRet = RegQueryValueExW(hKey, valueName, 0, 0, 0, 0); @@ -492,7 +492,7 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPC error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); return FALSE; } - /* check if value already exists */ + /* check if the value already exists */ if (check_value(hwnd, hKey, newName)) { error_code_messagebox(hwnd, IDS_VALUE_EXISTS, oldName); goto done;

1 0

Huw Davies : gameux/tests: Run the MTA tests before the STA tests to avoid a crash on Windows 10.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: bc84397e30d19b766d1be72f05fbcf86053fbbaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc84397e30d19b766d1be72f0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 1 13:19:10 2017 +0000 gameux/tests: Run the MTA tests before the STA tests to avoid a crash on Windows 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gameexplorer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 1f25f71..1ef7a78 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -673,16 +673,16 @@ START_TEST(gameexplorer) { HRESULT hr; - hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); - trace("Running apartment threaded tests.\n"); + trace("Running multithreaded tests.\n"); run_tests(); if(SUCCEEDED(hr)) CoUninitialize(); - hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); - trace("Running multithreaded tests.\n"); + trace("Running apartment threaded tests.\n"); run_tests(); if(SUCCEEDED(hr)) CoUninitialize();

1 0