October 2019 - Wine-Commits

Matteo Bruni : include: Get rid of raster caps bits not available in the SDK version of d3d9caps.h.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

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

Matteo Bruni : d3d11: Set context to NULL in CreateDeferredContext() stub.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

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

Nikolay Sivov : include: Add Media Session capabilities flags definition.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: wine Branch: master Commit: f359c39b2c19c4918ec7dec0f2efd31a713fcf80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f359c39b2c19c4918ec7dec0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 1 12:56:10 2019 +0300 include: Add Media Session capabilities flags definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfapi.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/mfapi.h b/include/mfapi.h index 346bd38d92..43f5cd6087 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -380,6 +380,14 @@ typedef enum MF_TOPOSTATUS_ENDED = 400, } MF_TOPOSTATUS; +/* Media Session capabilities. */ +#define MFSESSIONCAP_START 0x00000001 +#define MFSESSIONCAP_SEEK 0x00000002 +#define MFSESSIONCAP_PAUSE 0x00000004 +#define MFSESSIONCAP_RATE_FORWARD 0x00000010 +#define MFSESSIONCAP_RATE_REVERSE 0x00000020 +#define MFSESSIONCAP_DOES_NOT_USE_NETWORK 0x00000040 + HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue);

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_vertex_shader().
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

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

Alexandre Julliard : kernel32: Move Get/SetDllDirectory() implementation to ntdll.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: wine Branch: master Commit: a0a2b25a444110d742433c5f10e2e02092749e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0a2b25a444110d742433c5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 1 13:59:51 2019 +0200 kernel32: Move Get/SetDllDirectory() implementation to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 99 ++++++++++++++++++++++++-------------------- dlls/kernel32/tests/module.c | 54 ++++++++++++++++++++---- dlls/ntdll/loader.c | 49 ++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 + include/winternl.h | 6 ++- 5 files changed, 154 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0a2b25a444110d74243…

1 0

Alexandre Julliard : ntdll: Implement RtlSetSearchPathMode().
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

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 : kernel32: Use RtlGetSearchPath() in SearchPathW() implementation.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

Module: wine Branch: master Commit: 6113c468568e20c9e1c66f93791560c7e85193b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6113c468568e20c9e1c66f93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 1 09:35:59 2019 +0200 kernel32: Use RtlGetSearchPath() in SearchPathW() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 93 ++++------------------------------------------------ 1 file changed, 6 insertions(+), 87 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index d5736a2d81..b580e36756 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); #define MAX_PATHNAME_LEN 1024 -static int path_safe_mode = -1; /* path mode set by SetSearchPathMode */ - /* check if a file name is for an executable file (.exe or .com) */ static inline BOOL is_executable( const WCHAR *name ) { @@ -256,51 +254,6 @@ DWORD WINAPI GetShortPathNameA( LPCSTR longpath, LPSTR shortpath, DWORD shortlen return copy_filename_WtoA( shortpathW, shortpath, shortlen ); } -/*********************************************************************** - * get_path_safe_mode - */ -static BOOL get_path_safe_mode(void) -{ - static const WCHAR keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', - 'M','a','c','h','i','n','e','\\', - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - '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 valueW[] = {'S','a','f','e','P','r','o','c','e','s','s','S','e','a','r','c','h','M','o','d','e',0}; - - if (path_safe_mode == -1) - { - char buffer[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; - KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - HANDLE hkey; - DWORD size = sizeof(buffer); - BOOL mode = FALSE; - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - - RtlInitUnicodeString( &nameW, keyW ); - if (!NtOpenKey( &hkey, KEY_READ, &attr )) - { - RtlInitUnicodeString( &nameW, valueW ); - if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, buffer, size, &size ) && - info->Type == REG_DWORD && info->DataLength == sizeof(DWORD)) - mode = !!*(DWORD *)info->Data; - NtClose( hkey ); - } - InterlockedCompareExchange( &path_safe_mode, mode, -1 ); - } - return path_safe_mode != 0; -} - - /*********************************************************************** * contains_pathW * @@ -536,23 +489,14 @@ DWORD WINAPI SearchPathW( LPCWSTR path, LPCWSTR name, LPCWSTR ext, DWORD buflen, ret = req_len + 1; HeapFree( GetProcessHeap(), 0, dll_path ); - HeapFree( GetProcessHeap(), 0, search ); } - else + else if (!RtlGetSearchPath( &dll_path )) { - if ((dll_path = MODULE_get_dll_load_path( NULL, get_path_safe_mode() ))) - { - ret = RtlDosSearchPath_U( dll_path, name, NULL, buflen * sizeof(WCHAR), - buffer, lastpart ) / sizeof(WCHAR); - HeapFree( GetProcessHeap(), 0, dll_path ); - HeapFree( GetProcessHeap(), 0, search ); - } - else - { - SetLastError( ERROR_OUTOFMEMORY ); - return 0; - } + ret = RtlDosSearchPath_U( dll_path, name, NULL, buflen * sizeof(WCHAR), + buffer, lastpart ) / sizeof(WCHAR); + RtlReleasePath( dll_path ); } + HeapFree( GetProcessHeap(), 0, search ); } if (!ret) SetLastError( ERROR_FILE_NOT_FOUND ); @@ -1393,30 +1337,5 @@ BOOL WINAPI CheckNameLegalDOS8Dot3W(const WCHAR *name, char *oemname, DWORD oemn */ BOOL WINAPI SetSearchPathMode( DWORD 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: - InterlockedExchange( &path_safe_mode, 2 ); - return TRUE; - default: - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - - for (;;) - { - int prev = path_safe_mode; - if (prev == 2) break; /* permanently set */ - if (InterlockedCompareExchange( &path_safe_mode, val, prev ) == prev) return TRUE; - } - SetLastError( ERROR_ACCESS_DENIED ); - return FALSE; + return set_ntstatus( RtlSetSearchPathMode( flags )); }

1 0

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

Oct. 1, 2019

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 : user32: Don't go past the end of the animated cursor data.
by Alexandre Julliard Oct. 1, 2019

Oct. 1, 2019

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 Oct. 1, 2019

Oct. 1, 2019

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