September 2015 - Wine-Commits

Marcus Meissner : netprofm: fix memleak in error exit (Coverity).
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: faa14ba1b1c4d389725af4beefaec88da81c1418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa14ba1b1c4d389725af4bee… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Sep 7 09:07:56 2015 +0200 netprofm: fix memleak in error exit (Coverity). --- dlls/netprofm/list.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 197ef68..33b2fa6 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1681,7 +1681,11 @@ static void init_networks( struct list_manager *mgr ) if (ret != ERROR_BUFFER_OVERFLOW) return; if (!(buf = heap_alloc( size ))) return; - if (GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, buf, &size )) return; + if (GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, buf, &size )) + { + heap_free( buf ); + return; + } memset( &id, 0, sizeof(id) ); for (aa = buf; aa; aa = aa->Next)

1 0

Dmitry Timoshkov : oleaut32: Don' t assume that SAFEARRAY is the last parameter in an varargs method.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: 755feaca394d647191028bda8b1584b9eb145a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755feaca394d647191028bda8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 7 12:30:24 2015 +0800 oleaut32: Don't assume that SAFEARRAY is the last parameter in an varargs method. --- dlls/oleaut32/tests/tmarshal.c | 1 - dlls/oleaut32/typelib.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 2d6e5f2..f18aecc 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1550,7 +1550,6 @@ static void test_typelibmarshal(void) dispparams.rgdispidNamedArgs = NULL; dispparams.rgvarg = vararg; hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_RUN, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); -todo_wine ok_ole_success(hr, IDispatch_Invoke); SysFreeString(V_BSTR(&vararg[1])); SysFreeString(V_BSTR(&vararg[0])); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 29bab33..f4bba71 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7078,7 +7078,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } V_VT(&rgvarg[i]) = rgvt[i]; } - else if (rgvt[i] == (VT_VARIANT | VT_ARRAY) && func_desc->cParamsOpt < 0 && i == func_desc->cParams-1) + else if (rgvt[i] == (VT_VARIANT | VT_ARRAY) && func_desc->cParamsOpt < 0) { SAFEARRAY *a; SAFEARRAYBOUND bound;

1 0

Bruno Jesus : shlwapi: Reject NULL key on SHRegCloseUSKey with tests.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: ffb4d151174be47b728099e0d203474e5e6d1b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb4d151174be47b728099e0d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Sep 6 08:34:12 2015 +0800 shlwapi: Reject NULL key on SHRegCloseUSKey with tests. --- dlls/shlwapi/reg.c | 3 +++ dlls/shlwapi/tests/shreg.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 1653b80..a72f4c2 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -193,6 +193,9 @@ LONG WINAPI SHRegCloseUSKey( LPSHUSKEY hKey = hUSKey; LONG ret = ERROR_SUCCESS; + if (!hKey) + return ERROR_INVALID_PARAMETER; + if (hKey->HKCUkey) ret = RegCloseKey(hKey->HKCUkey); if (hKey->HKCUstart && hKey->HKCUstart != HKEY_CURRENT_USER) diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c index dfc8c3e..ca7fbad 100644 --- a/dlls/shlwapi/tests/shreg.c +++ b/dlls/shlwapi/tests/shreg.c @@ -38,6 +38,8 @@ static DWORD (WINAPI *pSHCopyKeyA)(HKEY,LPCSTR,HKEY,DWORD); static DWORD (WINAPI *pSHRegGetPathA)(HKEY,LPCSTR,LPCSTR,LPSTR,DWORD); static LSTATUS (WINAPI *pSHRegGetValueA)(HKEY,LPCSTR,LPCSTR,SRRF,LPDWORD,LPVOID,LPDWORD); static LSTATUS (WINAPI *pSHRegCreateUSKeyW)(LPCWSTR,REGSAM,HUSKEY,PHUSKEY,DWORD); +static LSTATUS (WINAPI *pSHRegOpenUSKeyW)(LPCWSTR,REGSAM,HUSKEY,PHUSKEY,BOOL); +static LSTATUS (WINAPI *pSHRegCloseUSKey)(HUSKEY); static const char sTestpath1[] = "%LONGSYSTEMVAR%\\subdir1"; static const char sTestpath2[] = "%FOO%\\subdir1"; @@ -458,6 +460,35 @@ static void test_SHRegCreateUSKeyW(void) ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); } +static void test_SHRegCloseUSKey(void) +{ + static const WCHAR localW[] = {'S','o','f','t','w','a','r','e',0}; + LONG ret; + HUSKEY key; + + if (!pSHRegOpenUSKeyW || !pSHRegCloseUSKey) + { + win_skip("SHRegOpenUSKeyW or SHRegCloseUSKey not available\n"); + return; + } + + ret = pSHRegCloseUSKey(NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + ret = pSHRegOpenUSKeyW(localW, KEY_ALL_ACCESS, NULL, &key, FALSE); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = pSHRegCloseUSKey(key); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + /* Test with limited rights, specially without KEY_SET_VALUE */ + ret = pSHRegOpenUSKeyW(localW, KEY_QUERY_VALUE, NULL, &key, FALSE); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = pSHRegCloseUSKey(key); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); +} + START_TEST(shreg) { HKEY hkey = create_test_entries(); @@ -476,6 +507,8 @@ START_TEST(shreg) pSHRegGetPathA = (void*)GetProcAddress(hshlwapi,"SHRegGetPathA"); pSHRegGetValueA = (void*)GetProcAddress(hshlwapi,"SHRegGetValueA"); pSHRegCreateUSKeyW = (void*)GetProcAddress(hshlwapi, "SHRegCreateUSKeyW"); + pSHRegOpenUSKeyW = (void*)GetProcAddress(hshlwapi, "SHRegOpenUSKeyW"); + pSHRegCloseUSKey = (void*)GetProcAddress(hshlwapi, "SHRegCloseUSKey"); test_SHGetValue(); test_SHRegGetValue(); @@ -484,6 +517,7 @@ START_TEST(shreg) test_SHCopyKey(); test_SHDeleteKey(); test_SHRegCreateUSKeyW(); + test_SHRegCloseUSKey(); delete_key( hkey, "Software\\Wine", "Test" ); }

1 0

Gerald Pfeifer : server: Replace 1 << 31 by 1u << 31 to avoid shift overflow in in get_active_hooks.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: 509d0f06cece4668a04f35f0ca6e924947673c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509d0f06cece4668a04f35f0c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Sep 4 16:07:31 2015 +0200 server: Replace 1 << 31 by 1u << 31 to avoid shift overflow in in get_active_hooks. --- server/hook.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/hook.c b/server/hook.c index 3abd8d9..a8e6ab9 100644 --- a/server/hook.c +++ b/server/hook.c @@ -356,7 +356,7 @@ unsigned int get_active_hooks(void) { struct hook_table *table = get_queue_hooks( current ); struct hook_table *global_hooks = get_global_hooks( current ); - unsigned int ret = 1 << 31; /* set high bit to indicate that the bitmap is valid */ + unsigned int ret = 1u << 31; /* set high bit to indicate that the bitmap is valid */ int id; for (id = WH_MINHOOK; id <= WH_WINEVENT; id++)

1 0

Bruno Jesus : quartz: Ensure pSample is NULL before calling IAsyncReader_WaitForNext.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: 29a9ea18bc3fa8148f1203e08ec276cb56720817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a9ea18bc3fa8148f1203e08… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 5 00:25:43 2015 +0800 quartz: Ensure pSample is NULL before calling IAsyncReader_WaitForNext. --- dlls/quartz/pin.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 8377be5..52a3970 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -415,6 +415,7 @@ static void PullPin_Flush(PullPin *This) { DWORD_PTR dwUser; + pSample = NULL; IAsyncReader_WaitForNext(This->pReader, 0, &pSample, &dwUser); if (!pSample)

1 0

Thomas Faber : user32: Use float literals for float operation.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: 8a718259d37c0db1fe0b4710e0b21c1886174617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a718259d37c0db1fe0b4710e… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Sep 7 10:14:02 2015 +0200 user32: Use float literals for float operation. --- dlls/user32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 67adefb..084bbff 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -631,7 +631,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta prev = current_line->net_length - 1; w = current_line->net_length; d = (float)current_line->width/(float)fw; - if (d > 1.2) d -= 0.2; + if (d > 1.2f) d -= 0.2f; next = prev/d; if (next >= prev) next = prev-1; do {

1 0

Gerald Pfeifer : d3dcompiler_43: Replace 14 instances of 1 << 31 by 1u << 31 to avoid shift shift overflow.
by Alexandre Julliard Sept. 7, 2015

Sept. 7, 2015

Module: wine Branch: master Commit: d04324f0fa449947743e8f00bee0267ba988f93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04324f0fa449947743e8f00b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 6 21:05:23 2015 +0200 d3dcompiler_43: Replace 14 instances of 1 << 31 by 1u << 31 to avoid shift shift overflow. --- dlls/d3dcompiler_43/bytecodewriter.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index aa3b80d..a3e6f63 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -602,7 +602,7 @@ static void write_declarations(struct bc_writer *This, put_dword(buffer, instr_dcl); /* Write the usage and index */ - token = (1 << 31); /* Bit 31 of non-instruction opcodes is 1 */ + token = (1u << 31); /* Bit 31 of non-instruction opcodes is 1 */ token |= (decls[i].usage << D3DSP_DCL_USAGE_SHIFT) & D3DSP_DCL_USAGE_MASK; token |= (decls[i].usage_idx << D3DSP_DCL_USAGEINDEX_SHIFT) & D3DSP_DCL_USAGEINDEX_MASK; put_dword(buffer, token); @@ -618,7 +618,7 @@ static void write_declarations(struct bc_writer *This, static void write_const(struct constant **consts, int num, DWORD opcode, DWORD reg_type, struct bytecode_buffer *buffer, BOOL len) { int i; DWORD instr_def = opcode; - const DWORD reg = (1<<31) | d3dsp_register( reg_type, 0 ) | D3DSP_WRITEMASK_ALL; + const DWORD reg = (1u << 31) | d3dsp_register( reg_type, 0 ) | D3DSP_WRITEMASK_ALL; if(len) { if(opcode == D3DSIO_DEFB) @@ -889,7 +889,7 @@ static DWORD map_vs_output(struct bc_writer *This, DWORD regnum, DWORD mask, DWO static void vs_12_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD has_wmask; if(reg->rel_reg) { @@ -963,7 +963,7 @@ static void vs_12_dstreg(struct bc_writer *This, const struct shader_reg *reg, static void vs_1_x_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD has_swizzle; DWORD component; @@ -1074,7 +1074,7 @@ static DWORD map_ps_input(struct bc_writer *This, static void ps_1_0123_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ if(reg->rel_reg) { WARN("Relative addressing not supported in <= ps_3_0\n"); This->state = E_INVALIDARG; @@ -1120,7 +1120,7 @@ static void ps_1_0123_srcreg(struct bc_writer *This, const struct shader_reg *re static void ps_1_0123_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ if(reg->rel_reg) { WARN("Relative addressing not supported for destination registers\n"); @@ -1382,7 +1382,7 @@ static const struct bytecode_backend ps_1_0123_backend = { static void ps_1_4_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ if(reg->rel_reg) { WARN("Relative addressing not supported in <= ps_3_0\n"); This->state = E_INVALIDARG; @@ -1421,7 +1421,7 @@ static void ps_1_4_srcreg(struct bc_writer *This, const struct shader_reg *reg, static void ps_1_4_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ if(reg->rel_reg) { WARN("Relative addressing not supported for destination registers\n"); @@ -1568,7 +1568,7 @@ static void vs_2_header(struct bc_writer *This, static void vs_2_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD has_swizzle; DWORD component; DWORD d3d9reg; @@ -1803,12 +1803,12 @@ static void write_samplers(const struct bwriter_shader *shader, struct bytecode_ DWORD i; DWORD instr_dcl = D3DSIO_DCL | (2 << D3DSI_INSTLENGTH_SHIFT); DWORD token; - const DWORD reg = (1<<31) | d3dsp_register( D3DSPR_SAMPLER, 0 ) | D3DSP_WRITEMASK_ALL; + const DWORD reg = (1u << 31) | d3dsp_register( D3DSPR_SAMPLER, 0 ) | D3DSP_WRITEMASK_ALL; for(i = 0; i < shader->num_samplers; i++) { /* Write the DCL instruction */ put_dword(buffer, instr_dcl); - token = (1<<31); + token = (1u << 31); /* Already shifted */ token |= (d3d9_sampler(shader->samplers[i].type)) & D3DSP_TEXTURETYPE_MASK; put_dword(buffer, token); @@ -1835,7 +1835,7 @@ static void ps_2_header(struct bc_writer *This, const struct bwriter_shader *sha static void ps_2_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; if(reg->rel_reg) { WARN("Relative addressing not supported in <= ps_3_0\n"); @@ -1890,7 +1890,7 @@ static void ps_2_0_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; if(reg->rel_reg) { @@ -2063,7 +2063,7 @@ static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *sha static void sm_3_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; d3d9reg = d3d9_register(reg->type); @@ -2102,7 +2102,7 @@ static void sm_3_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { - DWORD token = (1 << 31); /* Bit 31 of registers is 1 */ + DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; if(reg->rel_reg) {

1 0

Alexandre Julliard : Wine release 1.7.51
by Alexandre Julliard Sept. 4, 2015

Sept. 4, 2015

Module: website Branch: master Commit: adc93baca06c1a47d6a32ef1896fa39442d0ba85 URL: http://source.winehq.org/git/website.git/?a=commit;h=adc93baca06c1a47d6a32e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 4 21:03:52 2015 +0900 Wine release 1.7.51 --- news/en/2015090401.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2015090401.xml b/news/en/2015090401.xml new file mode 100644 index 0000000..10420c4 --- /dev/null +++ b/news/en/2015090401.xml @@ -0,0 +1,16 @@ +<news> +<date>September 4, 2015</date> +<title>Wine 1.7.51 Released</title> +<body> + The Wine development release 1.7.51 is now available. + <a href="{$root}/announce/1.7.51">What's new</a> in this release: +<ul> + <li>XAudio2 implementation using OpenAL Soft.</li> + <li>Support for the new Universal C Runtime DLL.</li> + <li>Dropdown menu support in the standard Open Dialog.</li> + <li>Grayscale rendering mode in DirectWrite.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.51.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Dmitry Timoshkov : oleaut32/tests: Avoid using a reserved keyword ' _restrict' in an idl.
by Alexandre Julliard Sept. 4, 2015

Sept. 4, 2015

Module: wine Branch: master Commit: 2952822effc71fd423e402c87aade7bcc1379f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2952822effc71fd423e402c87… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 4 15:24:28 2015 +0800 oleaut32/tests: Avoid using a reserved keyword '_restrict' in an idl. --- dlls/oleaut32/tests/tmarshal.c | 4 ++-- dlls/oleaut32/tests/tmarshal.idl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index a2fa6e8..e8d5e64 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -825,7 +825,7 @@ static HRESULT WINAPI Widget_put_prop_req_arg( return S_OK; } -static HRESULT WINAPI Widget__restrict(IWidget* iface, INT *i) +static HRESULT WINAPI Widget_pos_restrict(IWidget* iface, INT *i) { trace("restrict\n"); *i = DISPID_TM_RESTRICTED; @@ -875,7 +875,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_ByRefUInt, Widget_put_prop_opt_arg, Widget_put_prop_req_arg, - Widget__restrict, + Widget_pos_restrict, Widget_neg_restrict }; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index bf90384..33a4df9 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -175,7 +175,7 @@ library TestTypelib HRESULT prop_req_arg([in] INT req, [in] INT i); [id(DISPID_TM_RESTRICTED), restricted] - HRESULT _restrict([out, retval] INT *i); + HRESULT pos_restrict([out, retval] INT *i); [id(DISPID_TM_NEG_RESTRICTED), restricted] HRESULT neg_restrict([out, retval] INT *i);

1 0

Vincent Povirk : mscoree: Don't modify the PATH environment variable.
by Alexandre Julliard Sept. 4, 2015

Sept. 4, 2015

Module: wine Branch: master Commit: 6df7366e4e4a0342ba347be054bc66565b13ca64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df7366e4e4a0342ba347be05… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 3 15:44:24 2015 -0500 mscoree: Don't modify the PATH environment variable. Wine Mono 4.5.4 eliminated the need for this. --- dlls/mscoree/metahost.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index fb0068d..5e32ecb 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -111,21 +111,6 @@ static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char static void mono_shutdown_callback_fn(MonoProfiler *prof); -static void set_environment(LPCWSTR bin_path) -{ - WCHAR path_env[MAX_PATH]; - int len; - - static const WCHAR pathW[] = {'P','A','T','H',0}; - - /* We have to modify PATH as Mono loads other DLLs from this directory. */ - GetEnvironmentVariableW(pathW, path_env, sizeof(path_env)/sizeof(WCHAR)); - len = strlenW(path_env); - path_env[len++] = ';'; - strcpyW(path_env+len, bin_path); - SetEnvironmentVariableW(pathW, path_env); -} - static MonoImage* CDECL image_open_module_handle_dummy(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) { @@ -139,10 +124,9 @@ static void missing_runtime_message(void) static HRESULT load_mono(LPCWSTR mono_path) { - static const WCHAR bin[] = {'\\','b','i','n',0}; static const WCHAR lib[] = {'\\','l','i','b',0}; static const WCHAR etc[] = {'\\','e','t','c',0}; - WCHAR mono_dll_path[MAX_PATH+16], mono_bin_path[MAX_PATH+4]; + WCHAR mono_dll_path[MAX_PATH+16]; WCHAR mono_lib_path[MAX_PATH+4], mono_etc_path[MAX_PATH+4]; char mono_lib_path_a[MAX_PATH], mono_etc_path_a[MAX_PATH]; int trace_size; @@ -158,10 +142,6 @@ static HRESULT load_mono(LPCWSTR mono_path) if (!mono_handle) { - strcpyW(mono_bin_path, mono_path); - strcatW(mono_bin_path, bin); - set_environment(mono_bin_path); - strcpyW(mono_lib_path, mono_path); strcatW(mono_lib_path, lib); WideCharToMultiByte(CP_UTF8, 0, mono_lib_path, -1, mono_lib_path_a, MAX_PATH, NULL, NULL);

1 0