September 2015 - Wine-commits

Dmitry Timoshkov : oleaut32/tests: Add parameter checking to the typelib varargs marshalling test.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: f05930f0ce3785369031ba823989d80eb0715151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f05930f0ce3785369031ba823… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 7 12:30:19 2015 +0800 oleaut32/tests: Add parameter checking to the typelib varargs marshalling test. --- dlls/oleaut32/tests/tmarshal.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 1893534..2d6e5f2 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -842,7 +842,35 @@ static HRESULT WINAPI Widget_neg_restrict(IWidget* iface, INT *i) static HRESULT WINAPI Widget_VarArg_Run( IWidget *iface, BSTR name, SAFEARRAY *params, VARIANT *result) { + static const WCHAR catW[] = { 'C','a','t',0 }; + static const WCHAR supermanW[] = { 'S','u','p','e','r','m','a','n',0 }; + LONG bound; + VARIANT *var; + BSTR bstr; + HRESULT hr; + trace("VarArg_Run(%p,%p,%p)\n", name, params, result); + + ok(!lstrcmpW(name, catW), "got %s\n", wine_dbgstr_w(name)); + + hr = SafeArrayGetLBound(params, 1, &bound); + ok(hr == S_OK, "SafeArrayGetLBound error %#x\n", hr); + ok(bound == 0, "expected 0, got %d\n", bound); + + hr = SafeArrayGetUBound(params, 1, &bound); + ok(hr == S_OK, "SafeArrayGetUBound error %#x\n", hr); + ok(bound == 0, "expected 0, got %d\n", bound); + + hr = SafeArrayAccessData(params, (void **)&var); + ok(hr == S_OK, "SafeArrayAccessData failed with %x\n", hr); + + ok(V_VT(&var[0]) == VT_BSTR, "expected VT_BSTR, got %d\n", V_VT(&var[0])); + bstr = V_BSTR(&var[0]); + ok(!lstrcmpW(bstr, supermanW), "got %s\n", wine_dbgstr_w(bstr)); + + hr = SafeArrayUnaccessData(params); + ok(hr == S_OK, "SafeArrayUnaccessData error %#x\n", hr); + return S_OK; } @@ -1516,7 +1544,7 @@ static void test_typelibmarshal(void) V_BSTR(&vararg[1]) = SysAllocString(szCat); VariantInit(&vararg[0]); V_VT(&vararg[0]) = VT_BSTR; - V_BSTR(&vararg[0]) = SysAllocString(NULL); + V_BSTR(&vararg[0]) = SysAllocString(szSuperman); dispparams.cNamedArgs = 0; dispparams.cArgs = 2; dispparams.rgdispidNamedArgs = NULL;

1 0

Dmitry Timoshkov : oleaut32: Don' t assume that SAFEARRAY is the last parameter in an varargs method.
by Alexandre Julliard 07 Sep '15

07 Sep '15

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

Gerald Pfeifer : d3dcompiler_43: Replace 14 instances of 1 << 31 by 1u << 31 to avoid shift shift overflow.
by Alexandre Julliard 07 Sep '15

07 Sep '15

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

Marcus Meissner : netprofm: fix memleak in error exit (Coverity).
by Alexandre Julliard 07 Sep '15

07 Sep '15

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

Thomas Faber : user32: Use float literals for float operation.
by Alexandre Julliard 07 Sep '15

07 Sep '15

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

Hans Leidekker : msi/tests: Avoid test failures when running as an unprivileged user.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: fca92ae67cb1339fed9785a0e915bfdec8becb8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca92ae67cb1339fed9785a0e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 7 11:35:32 2015 +0200 msi/tests: Avoid test failures when running as an unprivileged user. --- dlls/msi/tests/install.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1aefa9f..86ad561 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3159,6 +3159,11 @@ static void test_samesequence(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_FAILURE) + { + win_skip("unprivileged user?\n"); + goto error; + } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); if (r == ERROR_SUCCESS) { @@ -3167,6 +3172,8 @@ static void test_samesequence(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); } + +error: delete_cab_files(); DeleteFileA(msifile); } @@ -3181,6 +3188,12 @@ static void test_uiLevelFlags(void) MsiSetInternalUI(INSTALLUILEVEL_NONE | INSTALLUILEVEL_SOURCERESONLY, NULL); r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_FAILURE) + { + win_skip("unprivileged user?\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); if (r == ERROR_SUCCESS) { @@ -3189,6 +3202,8 @@ static void test_uiLevelFlags(void) ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); } + +error: delete_cab_files(); DeleteFileA(msifile); }

1 0

Hans Leidekker : advapi32/tests: Avoid test failures when running as an unprivileged user.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: b368cd1b713f5ee17186bc4589863c636f71ac37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b368cd1b713f5ee17186bc458… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 7 11:36:04 2015 +0200 advapi32/tests: Avoid test failures when running as an unprivileged user. --- dlls/advapi32/tests/security.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 46db49c..c48ffc9 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5886,6 +5886,12 @@ static void test_system_security_access(void) /* ACCESS_SYSTEM_SECURITY requires special privilege */ res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ|ACCESS_SYSTEM_SECURITY, NULL, &hkey, NULL ); todo_wine ok( res == ERROR_PRIVILEGE_NOT_HELD, "got %d\n", res ); + if (res == ERROR_ACCESS_DENIED) + { + skip( "unprivileged user\n" ); + CloseHandle( token ); + return; + } priv.PrivilegeCount = 1; priv.Privileges[0].Luid = luid; @@ -5897,6 +5903,13 @@ static void test_system_security_access(void) res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ|ACCESS_SYSTEM_SECURITY, NULL, &hkey, NULL ); ok( !res, "got %d\n", res ); + if (res == ERROR_PRIVILEGE_NOT_HELD) + { + win_skip( "privilege not held\n" ); + HeapFree( GetProcessHeap(), 0, priv_prev ); + CloseHandle( token ); + return; + } /* restore privileges */ ret = AdjustTokenPrivileges( token, FALSE, priv_prev, 0, NULL, NULL );

1 0

Alexandre Julliard : Wine release 1.7.51
by Alexandre Julliard 04 Sep '15

04 Sep '15

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

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: 4e82a2ea1c9c3d07bba7301af4392647803d81dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e82a2ea1c9c3d07bba7301af… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Sep 3 22:55:49 2015 +0300 po: Update Finnish translation. --- po/fi.po | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/po/fi.po b/po/fi.po index 213ba69..0c7fb6a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9904,14 +9904,12 @@ msgstr "" "/i Käynnistä ohjelma tuoreilla ympäristömuuttujilla.\n" "/min Käynnistä ohjelma pienennettynä.\n" "/max Käynnistä ohjelma suurennettuna.\n" -"/low Käynnistä ohjelma matalassa prioriteettiluokassa.\n" -"/normal Käynnistä ohjelma normaalissa prioriteettiluokassa.\n" -"/high Käynnistä ohjelma korkeassa prioriteettiluokassa.\n" -"/realtime Käynnistä ohjelma reaaliaikaisessa prioriteettiluokassa.\n" -"/abovenormal Käynnistä ohjelma normaalia korkeammassa\n" -" prioriteettiluokassa.\n" -"/belownormal Käynnistä ohjelma normaalia matalammassa\n" -" prioriteettiluokassa.\n" +"/low Käynnistä ohjelma prioriteetilla 'matala'.\n" +"/normal Käynnistä ohjelma prioriteetilla 'normaali'.\n" +"/high Käynnistä ohjelma prioriteetilla 'korkea'.\n" +"/realtime Käynnistä ohjelma prioriteetilla 'reaaliaikainen'.\n" +"/abovenormal Käynnistä ohjelma prioriteetilla 'normaalia korkeampi'.\n" +"/belownormal Käynnistä ohjelma prioriteetilla 'normaalia matalampi'.\n" "/node n Käynnistä ohjelma määrätyllä NUMA-solmulla.\n" "/affinity peite Käynnistä ohjelma määrätyllä affiniteettipeitteellä.\n" "/wait Odota, että ohjelma sulkeutuu, ja palauta sen paluuarvo.\n" @@ -12829,18 +12827,16 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "uninstaller: Ei löydy ohjelmaa, jonka GUID olisi '%1'\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" -msgstr "" +msgstr "uninstaller: Valitsinta '--remove' täytyy seurata ohjelman GUID\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Virhe: Viallinen vaihtoehto '%c'.\n" +msgstr "uninstaller: Virheellinen valitsin [%1]\n" #: uninstaller.rc:35 msgid "" @@ -12849,6 +12845,10 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" +"Winen ohjelmanpoistaja\n" +"\n" +"Poista ohjelmia nykyisestä Wine-prefiksistä.\n" +"\n" #: uninstaller.rc:43 msgid "" @@ -12863,6 +12863,16 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" +"Käyttö:\n" +" uninstaller [valitsimet]\n" +"\n" +"Valitsimet:\n" +" --help\t Näytä tämä viesti.\n" +" --list\t Listaa tähän Wine-prefiksiin asennetut ohjelmat.\n" +" --remove {GUID} Poista valittu ohjelma.\n" +"\t\t Käytä valitsinta '--list' GUIDin löytämiseen.\n" +" [ei valitsinta] Käynnistä tämän ohjelman graafinen versio.\n" +"\n" #: view.rc:36 msgid "&Pan"

1 0

Vincent Povirk : mscoree: Don't modify the PATH environment variable.
by Alexandre Julliard 04 Sep '15

04 Sep '15

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