October 2019 - Wine-commits

Gijs Vermeulen : msvcp110: Add more exports.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: e8f406921f0b9254276d212cdb0aec2eeca7dbaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8f406921f0b9254276d212c… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Tue Oct 1 14:23:11 2019 +0200 msvcp110: Add more exports. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 00c3707ea4..eebc430b1e 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1572,8 +1572,8 @@ @ cdecl -arch=win64 ?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch @ cdecl -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Link @ cdecl -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Link -@ stub -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) tr2_sys__Link_wchar +@ cdecl -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) tr2_sys__Link_wchar @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win64 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win32 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor @@ -1773,8 +1773,8 @@ @ cdecl -arch=win64 ?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z(ptr ptr) _Container_base12__Swap_all @ cdecl -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Symlink @ cdecl -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Symlink -@ stub -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) tr2_sys__Symlink_wchar +@ cdecl -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) tr2_sys__Symlink_wchar @ extern ?_Sync(a)ios_base@std@@0_NA ios_base_Sync @ cdecl -arch=win32 ?_Syserror_map(a)std@@YAPBDH(a)Z(long) _Syserror_map @ cdecl -arch=win64 ?_Syserror_map(a)std@@YAPEBDH(a)Z(long) _Syserror_map @@ -1807,8 +1807,8 @@ @ cdecl -arch=win64 ?_Tidy(a)ios_base@std@@AEAAXXZ(ptr) ios_base_Tidy @ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z(str) tr2_sys__Unlink @ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) tr2_sys__Unlink -@ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z -@ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z +@ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z(wstr) tr2_sys__Unlink_wchar +@ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z(wstr) tr2_sys__Unlink_wchar @ cdecl -arch=arm ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ(ptr) basic_streambuf_char__Unlock @ thiscall -arch=i386 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAEXXZ(ptr) basic_streambuf_char__Unlock @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UEAAXXZ(ptr) basic_streambuf_char__Unlock @@ -3732,7 +3732,7 @@ @ cdecl _Cnd_broadcast(ptr) @ cdecl _Cnd_destroy(ptr) @ cdecl _Cnd_do_broadcast_at_thread_exit() -@ cdecl _Cnd_init(ptr) +@ cdecl _Cnd_init(ptr) @ cdecl _Cnd_register_at_thread_exit(ptr ptr ptr) @ cdecl _Cnd_signal(ptr) @ cdecl _Cnd_timedwait(ptr ptr ptr) @@ -3891,9 +3891,9 @@ @ stub _Xp_setw @ stub _Xp_sqrtx @ stub _Xp_subx -@ stub _Xtime_diff_to_millis +@ cdecl _Xtime_diff_to_millis(ptr) @ cdecl _Xtime_diff_to_millis2(ptr ptr) -@ cdecl _Xtime_get_ticks() +@ cdecl -ret64 _Xtime_get_ticks() @ stub __Wcrtomb_lk # extern _Zero @ cdecl towctrans(long long)

1 0

Matteo Bruni : d3d11: Set context to NULL in CreateDeferredContext() stub.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: d6d88ae884269594c3c6489f376651539274d3b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6d88ae884269594c3c6489f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Sep 30 23:11:15 2019 +0200 d3d11: Set context to NULL in CreateDeferredContext() stub. 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/d3d11/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5fac1172ca..212881a9b7 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3358,6 +3358,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device { FIXME("iface %p, flags %#x, context %p stub!\n", iface, flags, context); + *context = NULL; return E_NOTIMPL; }

1 0

Matteo Bruni : include: Get rid of raster caps bits not available in the SDK version of d3d9caps.h.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 4f7f5b6c8d19e78bccdce8ec8cefc36946c1d1ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f7f5b6c8d19e78bccdce8ec… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Sep 30 23:11:16 2019 +0200 include: Get rid of raster caps bits not available in the SDK version of d3d9caps.h. 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/d3d9/tests/d3d9ex.c | 9 +++++---- dlls/d3d9/tests/device.c | 9 +++++---- include/d3d9caps.h | 3 --- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2639d20332..38f49572fe 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4025,13 +4025,14 @@ static void test_device_caps(void) | D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING | D3DPMISCCAPS_FOGVERTEXCLAMPED | D3DPMISCCAPS_POSTBLENDSRGBCONVERT)), "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps); - ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST - | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_ANTIALIASEDGES - | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR + ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST + | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE + | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE | D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS - | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE)), + | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE)) + || broken(!(caps.RasterCaps & ~0x0f736191)), "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps); /* D3DPBLENDCAPS_SRCCOLOR2 and D3DPBLENDCAPS_INVSRCCOLOR2 are only * advertised on the reference rasterizer and WARP. */ diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 1e8133b0c8..170ad57124 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12644,13 +12644,14 @@ static void test_device_caps(void) | D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING | D3DPMISCCAPS_FOGVERTEXCLAMPED | D3DPMISCCAPS_POSTBLENDSRGBCONVERT)), "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps); - ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST - | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_ANTIALIASEDGES - | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR + ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST + | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE + | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE | D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS - | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE)), + | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE)) + || broken(!(caps.RasterCaps & ~0x0f736191)), "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps); /* D3DPBLENDCAPS_SRCCOLOR2 and D3DPBLENDCAPS_INVSRCCOLOR2 are only * advertised on the reference rasterizer and WARP. */ diff --git a/include/d3d9caps.h b/include/d3d9caps.h index 58fd3d91d0..feee0d4ce5 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -125,13 +125,10 @@ #endif #define D3DPRASTERCAPS_DITHER __MSABI_LONG(0x00000001) -#define D3DPRASTERCAPS_PAT __MSABI_LONG(0x00000008) #define D3DPRASTERCAPS_ZTEST __MSABI_LONG(0x00000010) #define D3DPRASTERCAPS_FOGVERTEX __MSABI_LONG(0x00000080) #define D3DPRASTERCAPS_FOGTABLE __MSABI_LONG(0x00000100) -#define D3DPRASTERCAPS_ANTIALIASEDGES __MSABI_LONG(0x00001000) #define D3DPRASTERCAPS_MIPMAPLODBIAS __MSABI_LONG(0x00002000) -#define D3DPRASTERCAPS_ZBIAS __MSABI_LONG(0x00004000) #define D3DPRASTERCAPS_ZBUFFERLESSHSR __MSABI_LONG(0x00008000) #define D3DPRASTERCAPS_FOGRANGE __MSABI_LONG(0x00010000) #define D3DPRASTERCAPS_ANISOTROPY __MSABI_LONG(0x00020000)

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_vertex_shader().
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 3a3742f78508cb563ec83a6a1f7f9eee5478ca81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a3742f78508cb563ec83a6a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 30 20:28:30 2019 -0500 wined3d: Introduce wined3d_stateblock_set_vertex_shader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 12 ++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index dfe6ab47c7..83001253d3 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1274,6 +1274,18 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applied stateblock %p.\n", stateblock); } +void CDECL wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader) +{ + TRACE("stateblock %p, shader %p.\n", stateblock, shader); + + if (shader) + wined3d_shader_incref(shader); + if (stateblock->stateblock_state.vs) + wined3d_shader_decref(stateblock->stateblock_state.vs); + stateblock->stateblock_state.vs = shader; + stateblock->changed.vertexShader = TRUE; +} + HRESULT CDECL wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f88da75306..1f75721792 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -258,6 +258,7 @@ @ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) +@ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_i(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3a06f650aa..5bc33f8232 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2660,6 +2660,7 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_vs_consts_b(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const BOOL *constants); HRESULT __cdecl wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stateblock,

1 0

Matteo Bruni : d3dx9: WARN when the file doesn't exist in D3DXCreateTextureFromFileExW().
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 81ababa864229a7e81abca76ef7e6a12fe5b256f URL: https://source.winehq.org/git/wine.git/?a=commit;h=81ababa864229a7e81abca76… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Sep 30 23:11:12 2019 +0200 d3dx9: WARN when the file doesn't exist in D3DXCreateTextureFromFileExW(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/texture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 022b32bcd8..8708ed702f 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -773,7 +773,10 @@ HRESULT WINAPI D3DXCreateTextureFromFileExW(struct IDirect3DDevice9 *device, con hr = map_view_of_file(srcfile, &buffer, &size); if (FAILED(hr)) + { + WARN("Failed to open file.\n"); return D3DXERR_INVALIDDATA; + } hr = D3DXCreateTextureFromFileInMemoryEx(device, buffer, size, width, height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture);

1 0

Matteo Bruni : d3dx9: Add a trace to D3DXCreateBuffer.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: a172aead8d542b92709545d8bcd992f03ee19d82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a172aead8d542b92709545d8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Sep 30 23:11:13 2019 +0200 d3dx9: Add a trace to D3DXCreateBuffer. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index 75a0e84772..4c8070711c 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -129,6 +129,8 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD size, ID3DXBuffer **buffer) struct ID3DXBufferImpl *object; HRESULT hr; + TRACE("size %u, buffer %p.\n", size, buffer); + if (!buffer) { WARN("Invalid buffer specified.\n");

1 0

Matteo Bruni : user32: Don't go past the end of the animated cursor data.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: aaecc404642877074550ff1c156c32bc9888da74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaecc404642877074550ff1c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Sep 30 23:11:14 2019 +0200 user32: Don't go past the end of the animated cursor data. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 3214746664..9c61d7ff30 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1451,6 +1451,8 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ } ptr += sizeof(DWORD); + if (ptr >= end) + break; ptr += (*(const DWORD *)ptr + 1) & ~1; ptr += sizeof(DWORD); }

1 0

Alexandre Julliard : kernel32: Add set_ntstatus() helper.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 14fbecee65c74a175c64d81ee76611f46c671dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=14fbecee65c74a175c64d81e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 1 09:36:16 2019 +0200 kernel32: Add set_ntstatus() helper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/atom.c | 119 +++++++++------------------------------- dlls/kernel32/cpu.c | 7 +-- dlls/kernel32/format_msg.c | 7 +-- dlls/kernel32/kernel_private.h | 6 ++ dlls/kernel32/locale.c | 4 +- dlls/kernel32/module.c | 32 +++-------- dlls/kernel32/path.c | 23 ++------ dlls/kernel32/process.c | 121 +++++++++++------------------------------ dlls/kernel32/time.c | 52 +++--------------- dlls/kernel32/volume.c | 45 ++++----------- 10 files changed, 102 insertions(+), 314 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=14fbecee65c74a175c64…

1 0

Alexandre Julliard : ntdll: Implement RtlSetSearchPathMode().
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 444933ae0499bbaf5d57f2b4f76846cc53db4d77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=444933ae0499bbaf5d57f2b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 1 09:32:46 2019 +0200 ntdll: Implement RtlSetSearchPathMode(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 55 +++++++++++++++++++++++++++++++++++++++++---------- dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 3 files changed, 47 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0ab25dcc51..4e6c51a702 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -71,6 +71,7 @@ const WCHAR system_dir[] = {'C',':','\\','w','i','n','d','o','w','s','\\', static BOOL imports_fixup_done = FALSE; /* set once the imports have been fixed up, before attaching them */ static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ +static ULONG path_safe_mode; /* path mode set by RtlSetSearchPathMode */ struct ldr_notification { @@ -3619,6 +3620,7 @@ static void load_global_options(void) 'C','o','n','t','r','o','l','\\', 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; + static const WCHAR safesearchW[] = {'S','a','f','e','P','r','o','c','e','s','s','S','e','a','r','c','h','M','o','d','e',0}; static const WCHAR critsectW[] = {'C','r','i','t','i','c','a','l','S','e','c','t','i','o','n','T','i','m','e','o','u','t',0}; static const WCHAR heapresW[] = {'H','e','a','p','S','e','g','m','e','n','t','R','e','s','e','r','v','e',0}; static const WCHAR heapcommitW[] = {'H','e','a','p','S','e','g','m','e','n','t','C','o','m','m','i','t',0}; @@ -3641,21 +3643,22 @@ static void load_global_options(void) if (NtOpenKey( &hkey, KEY_QUERY_VALUE, &attr )) return; query_dword_option( hkey, globalflagW, &NtCurrentTeb()->Peb->NtGlobalFlag ); + query_dword_option( hkey, safesearchW, &path_safe_mode ); - query_dword_option( hkey, critsectW, &value ); - NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart = (ULONGLONG)value * -10000000; + if (!query_dword_option( hkey, critsectW, &value )) + NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart = (ULONGLONG)value * -10000000; - query_dword_option( hkey, heapresW, &value ); - NtCurrentTeb()->Peb->HeapSegmentReserve = value; + if (!query_dword_option( hkey, heapresW, &value )) + NtCurrentTeb()->Peb->HeapSegmentReserve = value; - query_dword_option( hkey, heapcommitW, &value ); - NtCurrentTeb()->Peb->HeapSegmentCommit = value; + if (!query_dword_option( hkey, heapcommitW, &value )) + NtCurrentTeb()->Peb->HeapSegmentCommit = value; - query_dword_option( hkey, decommittotalW, &value ); - NtCurrentTeb()->Peb->HeapDeCommitTotalFreeThreshold = value; + if (!query_dword_option( hkey, decommittotalW, &value )) + NtCurrentTeb()->Peb->HeapDeCommitTotalFreeThreshold = value; - query_dword_option( hkey, decommitfreeW, &value ); - NtCurrentTeb()->Peb->HeapDeCommitFreeBlockThreshold = value; + if (!query_dword_option( hkey, decommitfreeW, &value )) + NtCurrentTeb()->Peb->HeapDeCommitFreeBlockThreshold = value; NtClose( hkey ); } @@ -3754,6 +3757,38 @@ PVOID WINAPI RtlPcToFileHeader( PVOID pc, PVOID *address ) } +/************************************************************************* + * RtlSetSearchPathMode (NTDLL.@) + */ +NTSTATUS WINAPI RtlSetSearchPathMode( ULONG flags ) +{ + int val; + + switch (flags) + { + case BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE: + val = 1; + break; + case BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE: + val = 0; + break; + case BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT: + interlocked_xchg( (int *)&path_safe_mode, 2 ); + return STATUS_SUCCESS; + default: + return STATUS_INVALID_PARAMETER; + } + + for (;;) + { + int prev = path_safe_mode; + if (prev == 2) break; /* permanently set */ + if (interlocked_cmpxchg( (int *)&path_safe_mode, val, prev ) == prev) return STATUS_SUCCESS; + } + return STATUS_ACCESS_DENIED; +} + + /*********************************************************************** * NtLoadDriver (NTDLL.@) * ZwLoadDriver (NTDLL.@) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5a6f4e4ed4..de2a632b17 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -926,6 +926,7 @@ @ stub RtlSetPropertyNames @ stub RtlSetPropertySetClassId @ stdcall RtlSetSaclSecurityDescriptor(ptr long ptr long) +@ stdcall RtlSetSearchPathMode(long) # @ stub RtlSetSecurityDescriptorRMControl @ stub RtlSetSecurityObject # @ stub RtlSetSecurityObjectEx diff --git a/include/winternl.h b/include/winternl.h index 4d58aebe21..fde8a64630 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2836,6 +2836,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE,PRTL_OVERLAPPED_COMP NTSYSAPI void WINAPI RtlSetLastWin32Error(DWORD); NTSYSAPI void WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus(NTSTATUS); NTSYSAPI NTSTATUS WINAPI RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN,PACL,BOOLEAN); +NTSYSAPI NTSTATUS WINAPI RtlSetSearchPathMode(ULONG); NTSYSAPI NTSTATUS WINAPI RtlSetThreadErrorMode(DWORD,LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*); NTSYSAPI void WINAPI RtlSetUnhandledExceptionFilter(PRTL_EXCEPTION_FILTER);

1 0

Alexandre Julliard : ntdll: Implement RtlGetSearchPath().
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 5f938bb51b63674a6a7333f89bd90fe7b2e4c539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f938bb51b63674a6a7333f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 1 09:33:52 2019 +0200 ntdll: Implement RtlGetSearchPath(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 98 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/loader.c | 89 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 + include/winternl.h | 4 +- 4 files changed, 189 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f938bb51b63674a6a73…

1 0