February 2022 - Wine-Commits

Eric Pouech : setupapi: Use correct integral type.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: fd8d0babe1ba8efde1d5a251deee43994d2d8eec URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd8d0babe1ba8efde1d5a251… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:02:45 2022 +0100 setupapi: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 7 ++++--- dlls/setupapi/queue.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index df39fd440b3..28ef0820ebf 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -826,7 +826,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) { WCHAR lnkpath[MAX_PATH]; LPWSTR cmdline=NULL, lnkpath_end; - unsigned int name_size; + DWORD name_size; INFCONTEXT name_context, context; int attrs=0; @@ -846,7 +846,7 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) if (!(attrs & FLG_PROFITEM_GROUP) && SetupFindFirstLineW( hinf, field, L"SubDir", &context )) { - unsigned int subdir_size; + DWORD subdir_size; if (!SetupGetStringFieldW( &context, 1, lnkpath_end, (lnkpath+MAX_PATH)-lnkpath_end, &subdir_size )) return TRUE; @@ -878,7 +878,8 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) /* calculate command line */ if (SetupFindFirstLineW( hinf, field, L"CmdLine", &context )) { - unsigned int dir_len=0, subdir_size=0, filename_size=0; + unsigned int dir_len=0; + DWORD subdir_size=0, filename_size=0; int dirid=0; LPCWSTR dir; LPWSTR cmdline_end; diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index dc718cc66fc..e0287f63593 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1275,7 +1275,7 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour { BOOL ret, absolute = (root && *root && !(style & SP_COPY_SOURCE_ABSOLUTE)); WCHAR *buffer, *p, *inf_source = NULL, dest_path[MAX_PATH]; - unsigned int len; + DWORD len; TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root), debugstr_w(dest), style, handler, context, in_use);

1 0

Eric Pouech : shell32: Use correct integral type.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: d183986adf3bad5d15accd58d467c2bd467924b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d183986adf3bad5d15accd58… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:02:51 2022 +0100 shell32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 10 +++++++--- dlls/shell32/shellpath.c | 8 ++++---- dlls/shell32/shlview.c | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 1ca4840dc58..1c61374a732 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -337,9 +337,13 @@ static INT SIC_IconAppend (const WCHAR *sourcefile, INT src_index, HICON *hicons static BOOL get_imagelist_icon_size(int list, SIZE *size) { + int cx, cy; if (list < 0 || list >= ARRAY_SIZE(shell_imagelists)) return FALSE; - return ImageList_GetIconSize( shell_imagelists[list], &size->cx, &size->cy ); + if (!ImageList_GetIconSize( shell_imagelists[list], &cx, &cy )) return FALSE; + size->cx = cx; + size->cy = cy; + return TRUE; } /**************************************************************************** @@ -358,8 +362,8 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) for (i = 0; i < ARRAY_SIZE(hicons); i++) { - get_imagelist_icon_size( i, &size ); - if (!PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 )) + if (!get_imagelist_icon_size( i, &size ) || + !PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 )) WARN("Failed to load icon %d from %s.\n", index, debugstr_w(sourcefile)); if (!hicons[i]) goto fail; } diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 2f1573f8221..2c62f9d4b6a 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3677,7 +3677,7 @@ static HRESULT get_known_folder_redirection_place( { HRESULT hr; LPWSTR lpRegistryPath = NULL; - KF_CATEGORY category; + DWORD category; /* first, get known folder's category */ hr = get_known_folder_registry_path(rfid, NULL, &lpRegistryPath); @@ -3918,7 +3918,7 @@ static HRESULT WINAPI knownfolder_GetCategory( hr = E_FAIL; if(SUCCEEDED(hr)) - hr = get_known_folder_dword(knownfolder->registryPath, L"Category", pCategory); + hr = get_known_folder_dword(knownfolder->registryPath, L"Category", (DWORD *)pCategory); return hr; } @@ -3943,7 +3943,7 @@ static HRESULT get_known_folder_path( DWORD dwSize, dwType; WCHAR path[MAX_PATH] = {0}; WCHAR parentGuid[39]; - KF_CATEGORY category; + DWORD category; LPWSTR parentRegistryPath, parentPath; HKEY hRedirectionRootKey = NULL; @@ -4138,7 +4138,7 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition( ZeroMemory(pKFD, sizeof(*pKFD)); /* required fields */ - hr = get_known_folder_dword(knownfolder->registryPath, L"Category", &pKFD->category); + hr = get_known_folder_dword(knownfolder->registryPath, L"Category", (DWORD *)&pKFD->category); if(FAILED(hr)) return hr; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 0ffe2e4e9cf..463af7ab92c 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3282,7 +3282,7 @@ static HRESULT WINAPI IShellFolderView_fnGetSelectedCount( if (FAILED(hr)) return hr; - hr = IShellItemArray_GetCount(selection, count); + hr = IShellItemArray_GetCount(selection, (DWORD *)count); IShellItemArray_Release(selection); return hr; }

1 0

Eric Pouech : taskschd: Use correct integral type.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: 7a0fb40c78488bb0d3373b84d6061f788bc50335 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a0fb40c78488bb0d3373b84… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:02:57 2022 +0100 taskschd: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/regtask.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 094f34d8f79..9a18fed8714 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -158,7 +158,7 @@ static HRESULT WINAPI regtask_get_State(IRegisteredTask *iface, TASK_STATE *stat if (!state) return E_POINTER; - return SchRpcGetTaskInfo(regtask->path, SCH_FLAG_STATE, &enabled, state); + return SchRpcGetTaskInfo(regtask->path, SCH_FLAG_STATE, &enabled, (DWORD *)state); } static HRESULT WINAPI regtask_get_Enabled(IRegisteredTask *iface, VARIANT_BOOL *v_enabled)

1 0

Eric Pouech : user32: Use correct integral type.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: 10e0867f8600d4936a3b0ff0a8678ccbbe41d41a URL: https://source.winehq.org/git/wine.git/?a=commit;h=10e0867f8600d4936a3b0ff0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 12:03:03 2022 +0100 user32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 2 +- dlls/user32/spy.c | 2 +- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index fde4b9965ed..eca8c3f115a 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); WINE_DECLARE_DEBUG_CHANNEL(keyboard); -INT global_key_state_counter = 0; +LONG global_key_state_counter = 0; /*********************************************************************** * get_key_state diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 727094be05d..e4651661ae0 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2045,7 +2045,7 @@ typedef struct WCHAR wnd_name[16]; /* window name for message */ } SPY_INSTANCE; -static int indent_tls_index = TLS_OUT_OF_INDEXES; +static LONG indent_tls_index = TLS_OUT_OF_INDEXES; /*********************************************************************** * get_indent_level diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index d1016780658..9e65e9f1f66 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -120,7 +120,7 @@ struct rawinput_thread_data RAWINPUT buffer[1]; /* rawinput message data buffer */ }; -extern INT global_key_state_counter DECLSPEC_HIDDEN; +extern LONG global_key_state_counter DECLSPEC_HIDDEN; extern BOOL (WINAPI *imm_register_window)(HWND) DECLSPEC_HIDDEN; extern void (WINAPI *imm_unregister_window)(HWND) DECLSPEC_HIDDEN; #define WM_IME_INTERNAL 0x287 diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4f1f70d9802..02891cd34ce 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4192,7 +4192,8 @@ BOOL WINAPI GetProcessDefaultLayout( DWORD *layout ) if (process_layout == ~0u) { WCHAR *str, buffer[MAX_PATH]; - DWORD i, len, version_layout = 0; + DWORD i, version_layout = 0; + UINT len; DWORD user_lang = GetUserDefaultLangID(); DWORD *languages; void *data = NULL;

1 0

Eric Pouech : mfreadwrite: Use correct integral types.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: 715a6bfc633da493848ae2315501d465b2d593b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=715a6bfc633da493848ae231… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 2 15:53:31 2022 +0300 mfreadwrite: Use correct integral types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index be77e1c5b1d..8ba00e86ff6 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -87,7 +87,7 @@ struct media_stream struct stream_transform decoder; IMFVideoSampleAllocatorEx *allocator; IMFVideoSampleAllocatorNotify notify_cb; - unsigned int id; + DWORD id; unsigned int index; enum media_stream_state state; unsigned int flags; @@ -162,9 +162,9 @@ struct source_reader unsigned int first_audio_stream_index; unsigned int first_video_stream_index; unsigned int last_read_index; - unsigned int stream_count; + DWORD stream_count; unsigned int flags; - unsigned int queue; + DWORD queue; enum media_source_state source_state; struct media_stream *streams; struct list responses; @@ -368,8 +368,8 @@ static void source_reader_response_ready(struct source_reader *reader, struct st static void source_reader_copy_sample_buffer(IMFSample *src, IMFSample *dst) { IMFMediaBuffer *buffer; - unsigned int flags; LONGLONG time; + DWORD flags; HRESULT hr; IMFSample_CopyAllItems(src, (IMFAttributes *)dst); @@ -1057,7 +1057,7 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m return !request_sample; } -static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, unsigned int *stream_index) +static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, DWORD *stream_index) { unsigned int i, first_selected = ~0u, requests = ~0u; BOOL selected, stream_drained; @@ -1095,7 +1095,7 @@ static HRESULT source_reader_get_next_selected_stream(struct source_reader *read return first_selected == ~0u ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK; } -static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, unsigned int index, unsigned int *stream_index) +static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, unsigned int index, DWORD *stream_index) { BOOL selected; HRESULT hr; @@ -1814,7 +1814,8 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG { struct source_reader *reader = impl_from_IMFSourceReader(iface); struct source_reader_async_command *command; - unsigned int i, flags; + unsigned int i; + DWORD flags; HRESULT hr; TRACE("%p, %s, %p.\n", iface, debugstr_guid(format), position); @@ -1871,8 +1872,8 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD index, DWORD flags, DWORD *actual_index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) { - unsigned int actual_index_tmp; struct media_stream *stream; + DWORD actual_index_tmp; LONGLONG timestamp_tmp; DWORD stream_index; HRESULT hr = S_OK; @@ -1931,7 +1932,7 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind } static HRESULT source_reader_read_sample_async(struct source_reader *reader, unsigned int index, unsigned int flags, - unsigned int *actual_index, unsigned int *stream_flags, LONGLONG *timestamp, IMFSample **sample) + DWORD *actual_index, DWORD *stream_flags, LONGLONG *timestamp, IMFSample **sample) { struct source_reader_async_command *command; HRESULT hr; @@ -2166,7 +2167,7 @@ static const IMFSourceReaderVtbl srcreader_vtbl = static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor, const GUID *major) { - unsigned int count, i; + DWORD count, i; BOOL selected; HRESULT hr; GUID guid; @@ -2415,8 +2416,9 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) { mp4vmagic, L".m4v", mp4mask }, }; unsigned char buffer[4 * sizeof(unsigned int)], pattern[4 * sizeof(unsigned int)]; - unsigned int i, j, length = 0, caps = 0; IMFAttributes *attributes; + DWORD length = 0, caps = 0; + unsigned int i, j; QWORD position; HRESULT hr; @@ -2424,12 +2426,13 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) if (SUCCEEDED(IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes))) { - IMFAttributes_GetStringLength(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &length); + UINT32 string_length = 0; + IMFAttributes_GetStringLength(attributes, &MF_BYTESTREAM_CONTENT_TYPE, &string_length); IMFAttributes_Release(attributes); - } - if (length) - return S_OK; + if (string_length) + return S_OK; + } if (FAILED(hr = IMFByteStream_GetCapabilities(stream, &caps))) return hr;

1 0

Alexandre Julliard : ntdll: Consistently use time_t in timezone matching.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: abfa6bf8609f92d8ecb9bff816f18d43bd787a29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abfa6bf8609f92d8ecb9bff8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 14:18:26 2022 +0100 ntdll: Consistently use time_t in timezone matching. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 9f49b9e6f58..4052d28f644 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2254,12 +2254,12 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* tzi->DaylightDate.wDay, tzi->DaylightDate.wMonth, tzi->DaylightDate.wYear); } -static time_t find_dst_change(unsigned long min, unsigned long max, int *is_dst) +static time_t find_dst_change(time_t start, time_t end, int *is_dst) { - time_t start; struct tm *tm; + ULONGLONG min = (sizeof(time_t) == sizeof(int)) ? (ULONG)start : start; + ULONGLONG max = (sizeof(time_t) == sizeof(int)) ? (ULONG)end : end; - start = min; tm = localtime(&start); *is_dst = !tm->tm_isdst; TRACE("starting date isdst %d, %s", !*is_dst, ctime(&start));

1 0

Alex Henrie : msi: Fix memory leak in get_fusion_filename (Coverity).
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: ad90181e1407bc4ffe81e55f07f83b23c09cccb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad90181e1407bc4ffe81e55f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:14 2022 -0700 msi: Fix memory leak in get_fusion_filename (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 349d7c0ffa3..93cc6210f6e 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -552,6 +552,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) GetWindowsDirectoryW(windir, MAX_PATH); len = lstrlenW(windir) + lstrlenW(L"Microsoft.NET\\Framework\\") + lstrlenW(L"v2.0.50727") + lstrlenW(L"fusion.dll") + 3; + msi_free(filename); if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; lstrcpyW(filename, windir);

1 0

Alex Henrie : adsldp: Fix memory leak on error path in search_ExecuteSearch (Coverity).
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: 36af68289546d942759539acf65b35a9acf43b85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36af68289546d942759539ac… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 2 00:23:11 2022 -0700 adsldp: Fix memory leak on error path in search_ExecuteSearch (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 8039065eff3..f564bc6f6cc 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1302,7 +1302,11 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte props = NULL; else { - if (count && !names) return E_ADS_BAD_PARAMETER; + if (count && !names) + { + heap_free(ldap_ctx); + return E_ADS_BAD_PARAMETER; + } props = heap_alloc((count + 1) * sizeof(props[0])); if (!props)

1 0

Alexandre Julliard : configure: Enable 64-bit time_t on Linux.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: 2211ca9fa57640b4c19c0a6aa57fda94328c53c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2211ca9fa57640b4c19c0a6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 2 13:23:21 2022 +0100 configure: Enable 64-bit time_t on Linux. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 1 + include/config.h.in | 3 +++ 3 files changed, 7 insertions(+) diff --git a/configure b/configure index f5afadafd39..548a07d01bb 100755 --- a/configure +++ b/configure @@ -10579,6 +10579,9 @@ fi printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + +printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h + case $host_cpu in *i[3456789]86*) DLLFLAGS="$DLLFLAGS -fno-PIC" diff --git a/configure.ac b/configure.ac index 039beaf98ac..f4a5ff03de4 100644 --- a/configure.ac +++ b/configure.ac @@ -812,6 +812,7 @@ case $host_os in *) AC_DEFINE(_GNU_SOURCE,1,[Define to 1 to enable GNU extensions on Linux]) + AC_DEFINE(_TIME_BITS,64,[Define to 64 to enable 64-bit time_t on Linux]) case $host_cpu in *i[[3456789]]86*) DLLFLAGS="$DLLFLAGS -fno-PIC" diff --git a/include/config.h.in b/include/config.h.in index 9717dc17236..a8218444be6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -903,6 +903,9 @@ /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES +/* Define to 64 to enable 64-bit time_t on Linux */ +#undef _TIME_BITS + /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus

1 0

Zebediah Figura : shell32: Move PIDL definitions from undocshell.h to pidl.h.
by Alexandre Julliard Feb. 2, 2022

Feb. 2, 2022

Module: wine Branch: master Commit: c7f58d2be35bffdf747b28c1b49fdb121b712a50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7f58d2be35bffdf747b28c1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 19:32:50 2022 -0600 shell32: Move PIDL definitions from undocshell.h to pidl.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/changenotify.c | 1 + dlls/shell32/pidl.h | 8 ++++++++ dlls/shell32/undocshell.h | 29 ----------------------------- 3 files changed, 9 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index f8714627eb6..40ccb891589 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -26,6 +26,7 @@ #include "wine/list.h" #include "wine/debug.h" #include "shell32_main.h" +#include "pidl.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index fc14ab3c1c8..7aaea904a68 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -270,6 +270,14 @@ void _ILFreeaPidl(LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; LPITEMIDLIST * _ILCopyaPidl(const LPCITEMIDLIST * apidlsrc, UINT cidl) DECLSPEC_HIDDEN; LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida) DECLSPEC_HIDDEN; +/* type parameter for ILGetDisplayNameEx() */ +#define ILGDN_FORPARSING 0 +#define ILGDN_NORMAL 1 +#define ILGDN_INFOLDER 2 + BOOL ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type) DECLSPEC_HIDDEN; +HRESULT SHILCreateFromPathW(const WCHAR *path, LPITEMIDLIST *pidl, DWORD *attributes); +LPITEMIDLIST SHSimpleIDListFromPathA(const char *path); +LPITEMIDLIST SHSimpleIDListFromPathW(const WCHAR *path); #endif diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 9af57b4fe7f..b606f1789d6 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -31,35 +31,6 @@ extern "C" { #endif /* defined(__cplusplus) */ -/**************************************************************************** - * IDList Functions - */ -BOOL WINAPI ILGetDisplayName( - LPCITEMIDLIST pidl, - LPVOID path); - -/* type parameter for ILGetDisplayNameEx() */ -#define ILGDN_FORPARSING 0 -#define ILGDN_NORMAL 1 -#define ILGDN_INFOLDER 2 - -BOOL WINAPI ILGetDisplayNameEx( - LPSHELLFOLDER psf, - LPCITEMIDLIST pidl, - LPVOID path, - DWORD type); - -LPITEMIDLIST WINAPI ILGlobalClone(LPCITEMIDLIST pidl); -void WINAPI ILGlobalFree(LPITEMIDLIST pidl); - -LPITEMIDLIST SHSimpleIDListFromPathA (LPCSTR lpszPath); -LPITEMIDLIST SHSimpleIDListFromPathW (LPCWSTR lpszPath); - -HRESULT SHILCreateFromPathW ( - LPCWSTR path, - LPITEMIDLIST * ppidl, - DWORD *attributes); - /* string functions */

1 0