April 2021 - Wine-Commits - list.winehq.org

Jacek Caban : winevulkan: Build with msvcrt.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 48bcb133932a7888a039dd43fdccf9b45b4d09b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48bcb133932a7888a039dd43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 19 14:15:20 2021 +0200 winevulkan: Build with msvcrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index bb5248c8f73..7f5b465c9a1 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = winevulkan IMPORTS = user32 gdi32 advapi32 setupapi EXTRALIBS = $(PTHREAD_LIBS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ loader.c \ loader_thunks.c \

1 0

Nikolay Sivov : evr/presenter: Set MF_MT_MINIMUM_DISPLAY_APERTURE when configuring mixer output.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: e10e4795d251a20ceddd4ebb1d5995e37bf6fb2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e10e4795d251a20ceddd4ebb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 19 16:03:06 2021 +0300 evr/presenter: Set MF_MT_MINIMUM_DISPLAY_APERTURE when configuring mixer output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 868a265e3ee..42c4c81d9d3 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -309,12 +309,25 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, return hr; } +static HRESULT video_presenter_configure_output_type(struct video_presenter *presenter, const MFVideoArea *aperture, + IMFMediaType *media_type) +{ + HRESULT hr; + + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)aperture->Area.cx << 32 | aperture->Area.cy); + if (SUCCEEDED(hr)) + hr = IMFMediaType_SetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)aperture, sizeof(*aperture)); + if (SUCCEEDED(hr)) + hr = IMFMediaType_SetBlob(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (UINT8 *)aperture, sizeof(*aperture)); + + return hr; +} + static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) { IMFMediaType *media_type, *candidate_type; + MFVideoArea aperture = {{ 0 }}; unsigned int idx = 0; - UINT64 frame_size; - MFVideoArea aperture; RECT rect; HRESULT hr; @@ -332,11 +345,6 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre aperture.Area.cx = rect.right - rect.left; aperture.Area.cy = rect.bottom - rect.top; - aperture.OffsetX.value = 0; - aperture.OffsetX.fract = 0; - aperture.OffsetY.value = 0; - aperture.OffsetY.fract = 0; - frame_size = (UINT64)aperture.Area.cx << 32 | aperture.Area.cy; while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(presenter->mixer, 0, idx++, &candidate_type))) { @@ -346,10 +354,10 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre WARN("Failed to clone a media type, hr %#x.\n", hr); IMFMediaType_Release(candidate_type); - IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, frame_size); - IMFMediaType_SetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, sizeof(aperture)); + hr = video_presenter_configure_output_type(presenter, &aperture, media_type); - hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + if (SUCCEEDED(hr)) + hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY); if (SUCCEEDED(hr)) hr = video_presenter_set_media_type(presenter, media_type);

1 0

Nikolay Sivov : evr/presenter: Add missing allocation error path.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 2764d3e3bad2741e4febc0fb8b51e2a0d978e923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2764d3e3bad2741e4febc0fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 19 16:03:09 2021 +0300 evr/presenter: Add missing allocation error path. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index cbf799b61a1..414ba5bcaa0 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -391,17 +391,21 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre return hr; } -static void video_presenter_sample_queue_init(struct video_presenter *presenter) +static HRESULT video_presenter_sample_queue_init(struct video_presenter *presenter) { struct sample_queue *queue = &presenter->thread.queue; if (queue->size) - return; + return S_OK; memset(queue, 0, sizeof(*queue)); - queue->samples = calloc(presenter->allocator_capacity, sizeof(*queue->samples)); + if (!(queue->samples = calloc(presenter->allocator_capacity, sizeof(*queue->samples)))) + return E_OUTOFMEMORY; + queue->size = presenter->allocator_capacity; queue->back = queue->size - 1; + + return S_OK; } static void video_presenter_sample_queue_push(struct video_presenter *presenter, IMFSample *sample) @@ -714,10 +718,13 @@ static DWORD CALLBACK video_presenter_streaming_thread(void *arg) static HRESULT video_presenter_start_streaming(struct video_presenter *presenter) { + HRESULT hr; + if (presenter->thread.hthread) return S_OK; - video_presenter_sample_queue_init(presenter); + if (FAILED(hr = video_presenter_sample_queue_init(presenter))) + return hr; if (!(presenter->thread.ready_event = CreateEventW(NULL, FALSE, FALSE, NULL))) return HRESULT_FROM_WIN32(GetLastError());

1 0

Sven Baars : gdi32: Remove some unreachable code (Coverity).
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 265a32aa1220949465989d9e77c177429faa0e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=265a32aa1220949465989d9e… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Apr 18 14:30:23 2021 +0200 gdi32: Remove some unreachable code (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b29d9fcc88e..456eb245700 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1701,8 +1701,6 @@ static void fontconfig_add_fonts_from_dir_list( FcConfig *config, FcStrList *dir } done: - if (font_set) pFcFontSetDestroy( font_set ); - if (subdir_list) pFcStrListDone( subdir_list ); if (subdir_set) pFcStrSetDestroy( subdir_set ); if (cache) pFcDirCacheUnload( cache ); }

1 0

Michele Dionisio : msvcrt: Add __stdio_common_vfprintf_p and __stdio_common_vfwprintf_p.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 8ea43f388f760c247642b327c37e46d67c58c585 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea43f388f760c247642b327… Author: Michele Dionisio <michele.dionisio(a)gmail.com> Date: Sat Apr 17 08:42:52 2021 +0200 msvcrt: Add __stdio_common_vfprintf_p and __stdio_common_vfwprintf_p. Signed-off-by: Michele Dionisio <michele.dionisio(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 4 ++-- .../api-ms-win-crt-stdio-l1-1-0.spec | 4 ++-- dlls/msvcrt/file.c | 28 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 8 +++---- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 136358a174c..246dde7dbdf 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -147,11 +147,11 @@ @ cdecl _o___std_type_info_destroy_list(ptr) ucrtbase._o___std_type_info_destroy_list @ cdecl _o___std_type_info_name(ptr ptr) ucrtbase._o___std_type_info_name @ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase._o___stdio_common_vfprintf -@ stub _o___stdio_common_vfprintf_p +@ cdecl _o___stdio_common_vfprintf_p(int64 ptr str ptr ptr) ucrtbase._o___stdio_common_vfprintf_p @ cdecl _o___stdio_common_vfprintf_s(int64 ptr str ptr ptr) ucrtbase._o___stdio_common_vfprintf_s @ cdecl _o___stdio_common_vfscanf(int64 ptr str ptr ptr) ucrtbase._o___stdio_common_vfscanf @ cdecl _o___stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase._o___stdio_common_vfwprintf -@ stub _o___stdio_common_vfwprintf_p +@ cdecl _o___stdio_common_vfwprintf_p(int64 ptr wstr ptr ptr) ucrtbase._o___stdio_common_vfwprintf_p @ cdecl _o___stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) ucrtbase._o___stdio_common_vfwprintf_s @ cdecl _o___stdio_common_vfwscanf(int64 ptr wstr ptr ptr) ucrtbase._o___stdio_common_vfwscanf @ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase._o___stdio_common_vsnprintf_s diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 19c06eaa67d..fce22df0357 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -2,11 +2,11 @@ @ cdecl __p__commode() ucrtbase.__p__commode @ cdecl __p__fmode() ucrtbase.__p__fmode @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf -@ stub __stdio_common_vfprintf_p +@ cdecl __stdio_common_vfprintf_p(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf_p @ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf_s @ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfscanf @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf -@ stub __stdio_common_vfwprintf_p +@ cdecl __stdio_common_vfwprintf_p(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf_p @ cdecl __stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf_s @ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index bf7496cc233..6e955099090 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5257,6 +5257,20 @@ int CDECL _stdio_common_vfprintf(unsigned __int64 options, FILE *file, const cha return vfprintf_helper(options & UCRTBASE_PRINTF_MASK, file, format, locale, valist); } +/********************************************************************* + * __stdio_common_vfprintf_p (UCRTBASE.@) + */ +int CDECL __stdio_common_vfprintf_p(unsigned __int64 options, FILE *file, const char *format, + _locale_t locale, __ms_va_list valist) +{ + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + + return vfprintf_helper((options & UCRTBASE_PRINTF_MASK) | MSVCRT_PRINTF_POSITIONAL_PARAMS + | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, file, format, locale, valist); +} + + /********************************************************************* * __stdio_common_vfprintf_s (UCRTBASE.@) */ @@ -5282,6 +5296,20 @@ int CDECL __stdio_common_vfwprintf(unsigned __int64 options, FILE *file, const w return vfwprintf_helper(options & UCRTBASE_PRINTF_MASK, file, format, locale, valist); } +/********************************************************************* + * __stdio_common_vfwprintf_p (UCRTBASE.@) + */ +int CDECL __stdio_common_vfwprintf_p(unsigned __int64 options, FILE *file, const wchar_t *format, + _locale_t locale, __ms_va_list valist) +{ + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + + return vfwprintf_helper((options & UCRTBASE_PRINTF_MASK) | MSVCRT_PRINTF_POSITIONAL_PARAMS + | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, file, format, locale, valist); +} + + /********************************************************************* * __stdio_common_vfwprintf_s (UCRTBASE.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 8f331825fc4..cc6f2e70f6b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -147,11 +147,11 @@ @ cdecl __std_type_info_hash(ptr) @ cdecl __std_type_info_name(ptr ptr) @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) _stdio_common_vfprintf -@ stub __stdio_common_vfprintf_p +@ cdecl __stdio_common_vfprintf_p(int64 ptr str ptr ptr) @ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) @ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) -@ stub __stdio_common_vfwprintf_p +@ cdecl __stdio_common_vfwprintf_p(int64 ptr wstr ptr ptr) @ cdecl __stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) @ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) @@ -811,11 +811,11 @@ @ cdecl _o___std_type_info_destroy_list(ptr) __std_type_info_destroy_list @ cdecl _o___std_type_info_name(ptr ptr) __std_type_info_name @ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) _stdio_common_vfprintf -@ stub _o___stdio_common_vfprintf_p +@ cdecl _o___stdio_common_vfprintf_p(int64 ptr str ptr ptr) __stdio_common_vfprintf_p @ cdecl _o___stdio_common_vfprintf_s(int64 ptr str ptr ptr) __stdio_common_vfprintf_s @ cdecl _o___stdio_common_vfscanf(int64 ptr str ptr ptr) __stdio_common_vfscanf @ cdecl _o___stdio_common_vfwprintf(int64 ptr wstr ptr ptr) __stdio_common_vfwprintf -@ stub _o___stdio_common_vfwprintf_p +@ cdecl _o___stdio_common_vfwprintf_p(int64 ptr wstr ptr ptr) __stdio_common_vfwprintf_p @ cdecl _o___stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) __stdio_common_vfwprintf_s @ cdecl _o___stdio_common_vfwscanf(int64 ptr wstr ptr ptr) __stdio_common_vfwscanf @ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) __stdio_common_vsnprintf_s

1 0

Jacek Caban : winevulkan: Use wide string literals.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: da5248bcfad07bb2ff092b0086ff690558ac649d URL: https://source.winehq.org/git/wine.git/?a=commit;h=da5248bcfad07bb2ff092b00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 19 14:15:31 2021 +0200 winevulkan: Use wide string literals. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 5f5664db3fa..73f09d9e303 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -276,8 +276,7 @@ VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) static HANDLE get_display_device_init_mutex(void) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; - HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + HANDLE mutex = CreateMutexW(NULL, FALSE, L"display_device_init"); WaitForSingleObject(mutex, INFINITE); return mutex; @@ -303,7 +302,6 @@ static void wait_graphics_driver_ready(void) static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) { - static const WCHAR pci[] = {'P','C','I',0}; VkPhysicalDeviceIDProperties *id; SP_DEVINFO_DATA device_data; DWORD type, device_idx = 0; @@ -317,7 +315,7 @@ static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) wait_graphics_driver_ready(); mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pci, NULL, 0); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, L"PCI", NULL, 0); device_data.cbSize = sizeof(device_data); while (SetupDiEnumDeviceInfo(devinfo, device_idx++, &device_data)) { @@ -377,10 +375,8 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) return TRUE; } -static const WCHAR winevulkan_json_resW[] = {'w','i','n','e','v','u','l','k','a','n','_','j','s','o','n',0}; -static const WCHAR winevulkan_json_pathW[] = {'\\','w','i','n','e','v','u','l','k','a','n','.','j','s','o','n',0}; -static const WCHAR vulkan_driversW[] = {'S','o','f','t','w','a','r','e','\\','K','h','r','o','n','o','s','\\', - 'V','u','l','k','a','n','\\','D','r','i','v','e','r','s',0}; +static const WCHAR winevulkan_json_pathW[] = L"\\winevulkan.json"; +static const WCHAR vulkan_driversW[] = L"Software\\Khronos\\Vulkan\\Drivers"; HRESULT WINAPI DllRegisterServer(void) { @@ -393,7 +389,7 @@ HRESULT WINAPI DllRegisterServer(void) /* Create the JSON manifest and registry key to register this ICD with the official Vulkan loader. */ TRACE("\n"); - rsrc = FindResourceW(hinstance, winevulkan_json_resW, (const WCHAR *)RT_RCDATA); + rsrc = FindResourceW(hinstance, L"winevulkan_json", (const WCHAR *)RT_RCDATA); data = LockResource(LoadResource(hinstance, rsrc)); datalen = SizeofResource(hinstance, rsrc);

1 0

Hans Leidekker : wldap32: Get rid of the WLDAP32_ prefix.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 8db46756ca91695c7242e05d24a3e5ec4340c10c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8db46756ca91695c7242e05d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 10:04:54 2021 +0200 wldap32: Get rid of the WLDAP32_ prefix. We can now include the public header without conflicts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/add.c | 45 ++-- dlls/wldap32/ber.c | 104 ++++---- dlls/wldap32/bind.c | 132 +++++------ dlls/wldap32/compare.c | 57 ++--- dlls/wldap32/control.c | 65 +++-- dlls/wldap32/delete.c | 51 ++-- dlls/wldap32/dn.c | 31 +-- dlls/wldap32/error.c | 59 ++--- dlls/wldap32/extended.c | 58 ++--- dlls/wldap32/init.c | 67 +++--- dlls/wldap32/libldap.c | 5 +- dlls/wldap32/libldap.h | 147 ++++++------ dlls/wldap32/misc.c | 106 ++++----- dlls/wldap32/modify.c | 49 ++-- dlls/wldap32/modrdn.c | 41 ++-- dlls/wldap32/option.c | 525 ++++++++++++++++++++-------------------- dlls/wldap32/page.c | 112 ++++----- dlls/wldap32/parse.c | 118 ++++----- dlls/wldap32/rename.c | 33 +-- dlls/wldap32/search.c | 76 +++--- dlls/wldap32/value.c | 31 +-- dlls/wldap32/winldap_private.h | 527 +++-------------------------------------- dlls/wldap32/wldap32.spec | 56 ++--- include/winber.h | 2 +- include/winldap.h | 10 +- 25 files changed, 1039 insertions(+), 1468 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8db46756ca91695c7242…

1 0

Hans Leidekker : wldap32: Use wide character string literals.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 81e418efaf5ded55311385d3868c36a01dc9e432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81e418efaf5ded55311385d3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 10:04:53 2021 +0200 wldap32: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/init.c | 11 ++++------- dlls/wldap32/winldap_private.h | 6 ------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index 28e62ba6de2..8043164ad30 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -30,9 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); -/* Should eventually be determined by the algorithm documented on MSDN. */ -static const WCHAR defaulthost[] = { 'l','o','c','a','l','h','o','s','t',0 }; - /* Split a space separated string of hostnames into a string array */ static char **split_hostnames( const char *hostnames ) { @@ -256,7 +253,7 @@ WLDAP32_LDAP * CDECL cldap_openW( WCHAR *hostname, ULONG portnumber ) TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); - if (!(hostnameU = strWtoU( hostname ? hostname : defaulthost ))) return NULL; + if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; if (!(url = urlify_hostnames( "cldap://", hostnameU, portnumber ))) goto exit; ld = create_context( url ); @@ -342,7 +339,7 @@ WLDAP32_LDAP * CDECL ldap_initW( const PWCHAR hostname, ULONG portnumber ) TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); - if (!(hostnameU = strWtoU( hostname ? hostname : defaulthost ))) return NULL; + if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; if (!(url = urlify_hostnames( "ldap://", hostnameU, portnumber ))) goto exit; ld = create_context( url ); @@ -401,7 +398,7 @@ WLDAP32_LDAP * CDECL ldap_openW( WCHAR *hostname, ULONG portnumber ) TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); - if (!(hostnameU = strWtoU( hostname ? hostname : defaulthost ))) return NULL; + if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; if (!(url = urlify_hostnames( "ldap://", hostnameU, portnumber ))) goto exit; ld = create_context( url ); @@ -462,7 +459,7 @@ WLDAP32_LDAP * CDECL ldap_sslinitW( WCHAR *hostname, ULONG portnumber, int secur TRACE( "(%s, %d, 0x%08x)\n", debugstr_w(hostname), portnumber, secure ); - if (!(hostnameU = strWtoU( hostname ? hostname : defaulthost ))) return NULL; + if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; if (secure) url = urlify_hostnames( "ldaps://", hostnameU, portnumber ); diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 6777c114d81..0d528471b0c 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -220,15 +220,9 @@ typedef struct ldap_version_info #define LDAP_SERVER_RESP_SORT_OID "1.2.840.113556.1.4.474" #define LDAP_CONTROL_VLVRESPONSE "2.16.840.1.113730.3.4.10" -#if defined(_MSC_VER) || defined(__MINGW32__) #define LDAP_PAGED_RESULT_OID_STRING_W L"1.2.840.113556.1.4.319" #define LDAP_SERVER_RESP_SORT_OID_W L"1.2.840.113556.1.4.474" #define LDAP_CONTROL_VLVRESPONSE_W L"2.16.840.1.113730.3.4.10" -#else -static const WCHAR LDAP_PAGED_RESULT_OID_STRING_W[] = {'1','.','2','.','8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','3','1','9',0}; -static const WCHAR LDAP_SERVER_RESP_SORT_OID_W[] = {'1','.','2','.','8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','4','7','4',0}; -static const WCHAR LDAP_CONTROL_VLVRESPONSE_W[] = {'2','.','1','6','.','8','4','0','.','1','.','1','1','3','7','3','0','.','3','.','4','.','1','0',0}; -#endif typedef struct ldapcontrolA {

1 0

Hans Leidekker : wldap32: Use CRT memory allocators.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 8a52b16e0d3f407d101f073c5d1b2c0ebaa8c7e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a52b16e0d3f407d101f073c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 10:04:52 2021 +0200 wldap32: Use CRT memory allocators. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/add.c | 12 +-- dlls/wldap32/ber.c | 20 ++--- dlls/wldap32/bind.c | 66 +++++++------- dlls/wldap32/compare.c | 36 ++++---- dlls/wldap32/delete.c | 12 +-- dlls/wldap32/dn.c | 12 +-- dlls/wldap32/extended.c | 8 +- dlls/wldap32/init.c | 46 +++++----- dlls/wldap32/misc.c | 18 ++-- dlls/wldap32/modify.c | 12 +-- dlls/wldap32/modrdn.c | 24 ++--- dlls/wldap32/option.c | 4 +- dlls/wldap32/page.c | 26 +++--- dlls/wldap32/rename.c | 24 ++--- dlls/wldap32/search.c | 32 +++---- dlls/wldap32/value.c | 18 ++-- dlls/wldap32/winldap_private.h | 200 +++++++++++++++++++---------------------- 17 files changed, 275 insertions(+), 295 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a52b16e0d3f407d101f…

1 0

Rémi Bernon : user32: Remove unused heap_strdupW helper.
by Alexandre Julliard April 19, 2021

April 19, 2021

Module: wine Branch: master Commit: 63291b1593f70e1049c6de97758179804ecdb37f URL: https://source.winehq.org/git/wine.git/?a=commit;h=63291b1593f70e1049c6de97… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 19 10:22:40 2021 +0200 user32: Remove unused heap_strdupW helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_private.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index dfd52421e66..5f8059a12a0 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -381,14 +381,4 @@ struct png_funcs #define assert(expr) ((void)0) #endif -static inline WCHAR *heap_strdupW(const WCHAR *src) -{ - WCHAR *dst; - unsigned len; - if (!src) return NULL; - len = (lstrlenW(src) + 1) * sizeof(WCHAR); - if ((dst = heap_alloc(len))) memcpy(dst, src, len); - return dst; -} - #endif /* __WINE_USER_PRIVATE_H */

1 0