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

Francois Gouget : mshtml: Nswindow_to_window() is not used anymore, remove it.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 3998a7aa54e028bbab8b0961597370b793f0ad8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3998a7aa54e028bbab8b09615… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:59:50 2016 +0200 mshtml: Nswindow_to_window() is not used anymore, remove it. It has been superseded by mozwindow_to_window(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 12 ------------ dlls/mshtml/mshtml_private.h | 1 - 2 files changed, 13 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index d9f1346..bd15cb3 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3171,18 +3171,6 @@ HRESULT update_window_doc(HTMLInnerWindow *window) return hres; } -HTMLOuterWindow *nswindow_to_window(const nsIDOMWindow *nswindow) -{ - HTMLOuterWindow *iter; - - LIST_FOR_EACH_ENTRY(iter, &window_list, HTMLOuterWindow, entry) { - if(iter->nswindow == nswindow) - return iter; - } - - return NULL; -} - HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy *mozwindow) { HTMLOuterWindow *iter; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a25315c..7401634 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -807,7 +807,6 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLInnerWind HRESULT HTMLOuterWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT update_window_doc(HTMLInnerWindow*) DECLSPEC_HIDDEN; -HTMLOuterWindow *nswindow_to_window(const nsIDOMWindow*) DECLSPEC_HIDDEN; HTMLOuterWindow *mozwindow_to_window(const mozIDOMWindowProxy*) DECLSPEC_HIDDEN; void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactory**) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Allow to create WINED3DFMT_R{16, 32}_TYPELESS depth textures.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: c7fdde8e83640c43746fd363c1ff63d862db43b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7fdde8e83640c43746fd363c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 5 11:46:55 2016 +0200 wined3d: Allow to create WINED3DFMT_R{16, 32}_TYPELESS depth textures. 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/d3d10core/tests/device.c | 3 ++- dlls/d3d11/tests/d3d11.c | 3 ++- dlls/wined3d/utils.c | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5f4981f..7067ee6 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1055,6 +1055,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, FALSE, TRUE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_CONSTANT_BUFFER, 0, FALSE, TRUE}, @@ -1065,7 +1066,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8_UNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, - {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 174031c..b3b67c4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1476,6 +1476,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32_TYPELESS, 9, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_CONSTANT_BUFFER, 0, FALSE, TRUE}, @@ -1486,7 +1487,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8_UNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8_SNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, - {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 01e56eb..394f8ea 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -234,6 +234,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R32_UINT, WINED3DFMT_R32_TYPELESS, "U"}, {WINED3DFMT_R32_SINT, WINED3DFMT_R32_TYPELESS, "I"}, {WINED3DFMT_R32_FLOAT, WINED3DFMT_R32_TYPELESS, "F"}, + {WINED3DFMT_D32_FLOAT, WINED3DFMT_R32_TYPELESS, "D"}, {WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_R24G8_TYPELESS, "DX"}, {WINED3DFMT_X24_TYPELESS_G8_UINT, WINED3DFMT_R24G8_TYPELESS, "XS"}, {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24G8_TYPELESS, "DS"}, @@ -243,6 +244,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R16_UINT, WINED3DFMT_R16_TYPELESS, "U"}, {WINED3DFMT_R16_SINT, WINED3DFMT_R16_TYPELESS, "I"}, {WINED3DFMT_R16_FLOAT, WINED3DFMT_R16_TYPELESS, "F"}, + {WINED3DFMT_D16_UNORM, WINED3DFMT_R16_TYPELESS, "D"}, {WINED3DFMT_R8_UNORM, WINED3DFMT_R8_TYPELESS, "u"}, {WINED3DFMT_BC1_UNORM_SRGB, WINED3DFMT_BC1_TYPELESS, ""}, {WINED3DFMT_BC1_UNORM, WINED3DFMT_BC1_TYPELESS, ""}, @@ -1676,6 +1678,12 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) flags |= WINED3DFMT_FLAG_INTEGER; if (channel_type == WINED3D_CHANNEL_TYPE_FLOAT) flags |= WINED3DFMT_FLAG_FLOAT; + + if (channel_type == WINED3D_CHANNEL_TYPE_DEPTH && !format->depth_size) + { + format->depth_size = format->red_size; + format->red_size = format->red_offset = 0; + } } format_set_flag(format, flags);

1 0

Francois Gouget : mshtml: Fix a typo in a TRACE() message.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: c242e00b8cd31758ce1e550de0baaf346f9e8e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c242e00b8cd31758ce1e550de… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 12:00:09 2016 +0200 mshtml: Fix a typo in a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 352b757..c341820 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -827,7 +827,7 @@ static HRESULT WINAPI HTMLDocument_get_domain(IHTMLDocument2 *iface, BSTR *p) nsAString_GetData(&nsstr, &str); if(!*str) { - TRACE("Gecko returned emptry string, fallback to loaded URL.\n"); + TRACE("Gecko returned empty string, fallback to loaded URL.\n"); nsAString_Finish(&nsstr); hres = IUri_GetHost(This->window->uri, p); return FAILED(hres) ? hres : S_OK;

1 0

Józef Kucia : wined3d: Recognize SM5 cut_stream opcode.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: bd405f6bd69cc15c8a36c7666dc4822674e38434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd405f6bd69cc15c8a36c7666… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 5 11:46:51 2016 +0200 wined3d: Recognize SM5 cut_stream opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0b4c6a0..cd016e3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5226,6 +5226,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CND */ pshader_hw_cnd, /* WINED3DSIH_CRS */ shader_hw_map2gl, /* WINED3DSIH_CUT */ NULL, + /* WINED3DSIH_CUT_STREAM */ NULL, /* WINED3DSIH_DCL */ shader_hw_nop, /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_hw_nop, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5c33106..e0aeed8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8578,6 +8578,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CND */ shader_glsl_cnd, /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ shader_glsl_cut, + /* WINED3DSIH_CUT_STREAM */ NULL, /* WINED3DSIH_DCL */ shader_glsl_nop, /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_glsl_nop, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2a3b9a9..a520744 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -56,6 +56,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_CND */ "cnd", /* WINED3DSIH_CRS */ "crs", /* WINED3DSIH_CUT */ "cut", + /* WINED3DSIH_CUT_STREAM */ "cut_stream", /* WINED3DSIH_DCL */ "dcl", /* WINED3DSIH_DCL_CONSTANT_BUFFER */ "dcl_constantBuffer", /* WINED3DSIH_DCL_GLOBAL_FLAGS */ "dcl_globalFlags", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4c09843..22012c7 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -207,6 +207,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_HS_FORK_PHASE = 0x73, WINED3D_SM5_OP_HS_JOIN_PHASE = 0x74, WINED3D_SM5_OP_EMIT_STREAM = 0x75, + WINED3D_SM5_OP_CUT_STREAM = 0x76, WINED3D_SM5_OP_BUFINFO = 0x79, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, @@ -799,6 +800,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""}, {WINED3D_SM5_OP_HS_JOIN_PHASE, WINED3DSIH_HS_JOIN_PHASE, "", ""}, {WINED3D_SM5_OP_EMIT_STREAM, WINED3DSIH_EMIT_STREAM, "", "f"}, + {WINED3D_SM5_OP_CUT_STREAM, WINED3DSIH_CUT_STREAM, "", "f"}, {WINED3D_SM5_OP_BUFINFO, WINED3DSIH_BUFINFO, "i", "U"}, {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f592664..6a3df61 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -572,6 +572,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CND, WINED3DSIH_CRS, WINED3DSIH_CUT, + WINED3DSIH_CUT_STREAM, WINED3DSIH_DCL, WINED3DSIH_DCL_CONSTANT_BUFFER, WINED3DSIH_DCL_GLOBAL_FLAGS,

1 0

Hugh McMaster : regedit: Process the next file, if any, on error.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 6ad44d7a3190d8e9a3daa9bd723980e5c4320b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad44d7a3190d8e9a3daa9bd7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 5 09:13:35 2016 +0000 regedit: Process the next file, if any, on error. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 04dd317..c37f695 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -88,7 +88,7 @@ typedef enum { ACTION_ADD, ACTION_EXPORT, ACTION_DELETE } REGEDIT_ACTION; -static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) +static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) { switch (action) { case ACTION_ADD: { @@ -113,7 +113,8 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) if (size == 0) { output_message(STRING_FILE_NOT_FOUND, filename); - exit(1); + HeapFree(GetProcessHeap(), 0, realname); + return; } reg_file = _wfopen(realname, rb_mode); if (reg_file == NULL) @@ -121,7 +122,8 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) WCHAR regedit[] = {'r','e','g','e','d','i','t',0}; _wperror(regedit); output_message(STRING_CANNOT_OPEN_FILE, filename); - exit(1); + HeapFree(GetProcessHeap(), 0, realname); + return; } import_registry_file(reg_file); if (realname) @@ -150,7 +152,6 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) exit(1); break; } - return TRUE; } BOOL ProcessCmdLine(WCHAR *cmdline)

1 0

Hugh McMaster : regedit: Use WINAPI functions for better internationalization.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 221bb0f7694403644294d3dbd8d4fba9e2f0b03a URL: http://source.winehq.org/git/wine.git/?a=commit;h=221bb0f7694403644294d3dbd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 5 05:15:35 2016 +0000 regedit: Use WINAPI functions for better internationalization. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 65 +++++++++++++++++++++++++++ po/bg.po | 59 ++++++++++++++++++++++++ po/ca.po | 73 ++++++++++++++++++++++++++++++ po/cs.po | 63 ++++++++++++++++++++++++++ po/da.po | 65 +++++++++++++++++++++++++++ po/de.po | 75 +++++++++++++++++++++++++++++++ po/el.po | 59 ++++++++++++++++++++++++ po/en.po | 86 +++++++++++++++++++++++++++++++++++ po/en_US.po | 86 +++++++++++++++++++++++++++++++++++ po/eo.po | 59 ++++++++++++++++++++++++ po/es.po | 65 +++++++++++++++++++++++++++ po/fa.po | 59 ++++++++++++++++++++++++ po/fi.po | 75 +++++++++++++++++++++++++++++++ po/fr.po | 73 ++++++++++++++++++++++++++++++ po/he.po | 62 ++++++++++++++++++++++++++ po/hi.po | 59 ++++++++++++++++++++++++ po/hr.po | 63 ++++++++++++++++++++++++++ po/hu.po | 65 +++++++++++++++++++++++++++ po/it.po | 65 +++++++++++++++++++++++++++ po/ja.po | 73 ++++++++++++++++++++++++++++++ po/ko.po | 65 +++++++++++++++++++++++++++ po/lt.po | 75 +++++++++++++++++++++++++++++++ po/ml.po | 59 ++++++++++++++++++++++++ po/nb_NO.po | 73 ++++++++++++++++++++++++++++++ po/nl.po | 65 +++++++++++++++++++++++++++ po/or.po | 59 ++++++++++++++++++++++++ po/pa.po | 59 ++++++++++++++++++++++++ po/pl.po | 73 ++++++++++++++++++++++++++++++ po/pt_BR.po | 71 +++++++++++++++++++++++++++++ po/pt_PT.po | 65 +++++++++++++++++++++++++++ po/rm.po | 59 ++++++++++++++++++++++++ po/ro.po | 64 ++++++++++++++++++++++++++ po/ru.po | 75 +++++++++++++++++++++++++++++++ po/sk.po | 63 ++++++++++++++++++++++++++ po/sl.po | 65 +++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 60 +++++++++++++++++++++++++ po/sr_RS(a)latin.po | 60 +++++++++++++++++++++++++ po/sv.po | 65 +++++++++++++++++++++++++++ po/te.po | 59 ++++++++++++++++++++++++ po/th.po | 59 ++++++++++++++++++++++++ po/tr.po | 73 ++++++++++++++++++++++++++++++ po/uk.po | 71 +++++++++++++++++++++++++++++ po/wa.po | 59 ++++++++++++++++++++++++ po/wine.pot | 59 ++++++++++++++++++++++++ po/zh_CN.po | 67 ++++++++++++++++++++++++++++ po/zh_TW.po | 65 +++++++++++++++++++++++++++ programs/regedit/regedit.c | 106 ++++++++++++++++++++++++++++---------------- programs/regedit/regedit.rc | 37 ++++++++++++++++ programs/regedit/resource.h | 10 +++++ 49 files changed, 3150 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=221bb0f7694403644294d…

1 0

Hugh McMaster : regedit: Parse command-line input using Unicode.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 256290f74f9d51fce5bdf2b48e93e65f42fc2588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=256290f74f9d51fce5bdf2b48… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 5 05:15:22 2016 +0000 regedit: Parse command-line input using Unicode. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/Makefile.in | 2 +- programs/regedit/main.c | 9 +-- programs/regedit/regedit.c | 165 +++++++++++++------------------------------ 3 files changed, 53 insertions(+), 123 deletions(-) diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index acbfbd4..54f00f7 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -1,5 +1,5 @@ MODULE = regedit.exe -APPMODE = -mwindows -mno-cygwin +APPMODE = -mwindows -municode -mno-cygwin IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 593ffef..8f82580 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -30,7 +30,7 @@ WCHAR g_pszDefaultValueName[64]; -BOOL ProcessCmdLine(LPSTR lpCmdLine); +BOOL ProcessCmdLine(WCHAR *cmdline); static const WCHAR hkey_local_machine[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}; static const WCHAR hkey_users[] = {'H','K','E','Y','_','U','S','E','R','S',0}; @@ -134,15 +134,12 @@ static BOOL TranslateChildTabMessage(MSG *msg) return TRUE; } -int APIENTRY WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) +int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) { MSG msg; HACCEL hAccel; - if (ProcessCmdLine(lpCmdLine)) { + if (ProcessCmdLine(GetCommandLineW())) { return 0; } diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index cbe3616..ae268b6 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -18,10 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <ctype.h> #include <stdio.h> #include <stdlib.h> #include <windows.h> +#include <shellapi.h> +#include "wine/unicode.h" #include "regproc.h" static const char *usage = @@ -59,43 +60,41 @@ typedef enum { ACTION_ADD, ACTION_EXPORT, ACTION_DELETE } REGEDIT_ACTION; -static BOOL PerformRegAction(REGEDIT_ACTION action, char **argv, int *i) +static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) { switch (action) { case ACTION_ADD: { - char *filename = argv[*i]; + WCHAR *filename = argv[*i]; + WCHAR hyphen[] = {'-',0}; FILE *reg_file; - if (filename[0]) { - char* realname = NULL; + if (!strcmpW(filename, hyphen)) + reg_file = stdin; + else + { + int size; + WCHAR *realname = NULL; + WCHAR rb_mode[] = {'r','b',0}; - if (strcmp(filename, "-") == 0) + size = SearchPathW(NULL, filename, NULL, 0, NULL, NULL); + if (size > 0) { - reg_file = stdin; + realname = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + size = SearchPathW(NULL, filename, NULL, size, realname, NULL); } - else + if (size == 0) { - int size; - - size = SearchPathA(NULL, filename, NULL, 0, NULL, NULL); - if (size > 0) - { - realname = HeapAlloc(GetProcessHeap(), 0, size); - size = SearchPathA(NULL, filename, NULL, size, realname, NULL); - } - if (size == 0) - { - fprintf(stderr, "regedit: File not found \"%s\" (%d)\n", - filename, GetLastError()); - exit(1); - } - reg_file = fopen(realname, "rb"); - if (reg_file == NULL) - { - perror(""); - fprintf(stderr, "regedit: Can't open file \"%s\"\n", filename); - exit(1); - } + fprintf(stderr, "regedit: File not found \"%ls\" (%d)\n", + filename, GetLastError()); + exit(1); + } + reg_file = _wfopen(realname, rb_mode); + if (reg_file == NULL) + { + WCHAR regedit[] = {'r','e','g','e','d','i','t',0}; + _wperror(regedit); + fprintf(stderr, "regedit: Can't open file \"%ls\"\n", filename); + exit(1); } import_registry_file(reg_file); if (realname) @@ -106,29 +105,17 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, char **argv, int *i) } break; } - case ACTION_DELETE: { - WCHAR *reg_key_nameW = GetWideString(argv[*i]); - - delete_registry_key(reg_key_nameW); - HeapFree(GetProcessHeap(), 0, reg_key_nameW); + case ACTION_DELETE: + delete_registry_key(argv[*i]); break; - } case ACTION_EXPORT: { - char *filename = argv[*i]; - WCHAR* filenameW; - - filenameW = GetWideString(filename); - if (filenameW[0]) { - char *reg_key_name = argv[++(*i)]; - WCHAR* reg_key_nameW; + WCHAR *filename = argv[*i]; + WCHAR *key_name = argv[++(*i)]; - reg_key_nameW = GetWideString(reg_key_name); - export_registry_key(filenameW, reg_key_nameW, REG_FORMAT_4); - HeapFree(GetProcessHeap(), 0, reg_key_nameW); - } else { - export_registry_key(filenameW, NULL, REG_FORMAT_4); - } - HeapFree(GetProcessHeap(), 0, filenameW); + if (key_name && *key_name) + export_registry_key(filename, key_name, REG_FORMAT_4); + else + export_registry_key(filename, NULL, REG_FORMAT_4); break; } default: @@ -139,76 +126,24 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, char **argv, int *i) return TRUE; } -static char *get_token(char *input, char **next) -{ - char *ch = input; - char *str; - - while (*ch && isspace(*ch)) - ch++; - - str = ch; - - if (*ch == '"') { - ch++; - str = ch; - for (;;) { - while (*ch && (*ch != '"')) - ch++; - - if (!*ch) - break; - - if (*(ch - 1) == '\\') { - ch++; - continue; - } - break; - } - } - else { - while (*ch && !isspace(*ch)) - ch++; - } - - if (*ch) { - *ch = 0; - ch++; - } - - *next = ch; - return str; -} - -BOOL ProcessCmdLine(LPSTR lpCmdLine) +BOOL ProcessCmdLine(WCHAR *cmdline) { - char *s = lpCmdLine; - char **argv; - char *tok; - int argc = 0, i = 1; + WCHAR **argv; + int argc, i; REGEDIT_ACTION action = ACTION_ADD; - if (!*lpCmdLine) - return FALSE; + argv = CommandLineToArgvW(cmdline, &argc); - while (*s) { - if (isspace(*s)) - i++; - s++; - } - - s = lpCmdLine; - argv = HeapAlloc(GetProcessHeap(), 0, i * sizeof(char *)); + if (!argv) + return FALSE; - for (i = 0; *s; i++) + if (argc == 1) { - tok = get_token(s, &s); - argv[i] = HeapAlloc(GetProcessHeap(), 0, strlen(tok) + 1); - strcpy(argv[i], tok); - argc++; + LocalFree(argv); + return FALSE; } - for (i = 0; i < argc; i++) + for (i = 1; i < argc; i++) { if (argv[i][0] != '/' && argv[i][0] != '-') break; /* No flags specified. */ @@ -219,7 +154,7 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) if (argv[i][1] && argv[i][2] && argv[i][2] != ':') break; /* This is a file path beginning with '/'. */ - switch (toupper(argv[i][1])) + switch (toupperW(argv[i][1])) { case '?': fprintf(stderr, usage); @@ -241,7 +176,7 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) /* ignored */; break; default: - fprintf(stderr, "regedit: Invalid switch [%s]\n", argv[i]); + fprintf(stderr, "regedit: Invalid switch [%ls]\n", argv[i]); exit(1); } } @@ -265,9 +200,7 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) for (; i < argc; i++) PerformRegAction(action, argv, &i); - for (i = 0; i < argc; i++) - HeapFree(GetProcessHeap(), 0, argv[i]); - HeapFree(GetProcessHeap(), 0, argv); + LocalFree(argv); return TRUE; }

1 0

Alex Henrie : kernel32: Fix memory leak in WCEL_FindPrevInHist.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: d44ec680dad72338ed832dafdcebfbeb0606d099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d44ec680dad72338ed832dafd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 23 01:25:24 2016 -0600 kernel32: Fix memory leak in WCEL_FindPrevInHist. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index bcfdece..e685e1e 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -469,6 +469,7 @@ static void WCEL_FindPrevInHist(WCEL_Context* ctx) return; } } + HeapFree(GetProcessHeap(), 0, data); } while (ctx->histPos != startPos); return;

1 0

Alex Henrie : kernel32: Fix memory leak in WCEL_MoveToHist.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 16c51fbe176cb3fa20318a2801306ddfe06f990c URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c51fbe176cb3fa20318a280… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 23 01:25:23 2016 -0600 kernel32: Fix memory leak in WCEL_MoveToHist. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/editline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index b436a50..bcfdece 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -428,9 +428,9 @@ static void WCEL_MoveToHist(WCEL_Context* ctx, int idx) if (WCEL_Grow(ctx, len)) { WCEL_InsertString(ctx, data); - HeapFree(GetProcessHeap(), 0, data); ctx->histPos = idx; } + HeapFree(GetProcessHeap(), 0, data); } static void WCEL_FindPrevInHist(WCEL_Context* ctx)

1 0

Nikolay Sivov : dwrite: Implement HasVerticalGlyphVariants().
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: e30607fdb085d62125c716bd7678085f38b45aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30607fdb085d62125c716bd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 5 12:55:54 2016 +0300 dwrite: Implement HasVerticalGlyphVariants(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 38 +++++--- dlls/dwrite/opentype.c | 116 +++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 203 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 346 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e30607fdb085d62125c71…

1 0