March 2023 - Wine-commits - list.winehq.org

Michael Stefaniuc : ntdll/tests: Use FAILED() instead of not SUCCEEDED().
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: wine Branch: master Commit: 0a2cfe902e85b43200516248eba4833379729e78 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a2cfe902e85b43200516248eba483… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 30 19:23:41 2023 +0200 ntdll/tests: Use FAILED() instead of not SUCCEEDED(). --- dlls/ntdll/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index ae1c8c7c89d..af74819aaca 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2130,7 +2130,7 @@ static void subtest_query_process_debug_port_custom_dacl(int argc, char **argv, InitializeObjectAttributes(&attr, NULL, 0, NULL, &sd); status = NtCreateDebugObject(&debug_obj, MAXIMUM_ALLOWED, &attr, DEBUG_KILL_ON_CLOSE); ok(SUCCEEDED(status), "Failed to create debug object: %#010lx\n", status); - if (!SUCCEEDED(status)) return; + if (FAILED(status)) return; old_debug_obj = pDbgUiGetThreadDebugObject(); pDbgUiSetThreadDebugObject(debug_obj);

1 0

Michael Stefaniuc : wmvcore/tests: Don't cast NULL to another pointer type.
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: wine Branch: master Commit: 17fbef91929af9c6ab98e53fb2a54942f0f1a0a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/17fbef91929af9c6ab98e53fb2a549… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 30 19:27:19 2023 +0200 wmvcore/tests: Don't cast NULL to another pointer type. --- dlls/wmvcore/tests/wmvcore.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index f07abb8d4bb..a116d8a1d69 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -3185,7 +3185,7 @@ static void test_async_reader_settings(void) WMT_TYPE_DWORD, 0, E_INVALIDARG); SetEvent(callback.expect_started); - hr = IWMReader_Start(reader, 0, 0, 1, (void **)NULL); + hr = IWMReader_Start(reader, 0, 0, 1, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_Close(reader); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -3259,7 +3259,7 @@ static void test_async_reader_streaming(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } - hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)NULL); + hr = IWMReader_Start(reader, 0, 0, 1.0f, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); wait_started_callback(&callback); @@ -3296,7 +3296,7 @@ static void test_async_reader_streaming(void) callback.last_pts[1] = 0; callback.next_pts[1] = 0; - hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)NULL); + hr = IWMReader_Start(reader, 0, 0, 1.0f, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); wait_started_callback(&callback);

1 0

Michael Stefaniuc : mfplat/tests: Remove duplicated ok() call.
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: wine Branch: master Commit: e4512287a004582607f492aa95beb61e5e7ce03c URL: https://gitlab.winehq.org/wine/wine/-/commit/e4512287a004582607f492aa95beb6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 30 19:31:30 2023 +0200 mfplat/tests: Remove duplicated ok() call. --- dlls/mfplat/tests/mfplat.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 540001676bf..1e5dc190944 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -8341,7 +8341,6 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void) hr = IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &value32); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(value32 == MFVideoInterlace_Progressive, "Unexpected value %#x.\n", value32); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, &value32); ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr);

1 0

Zhiyi Zhang : dwrite: Use cache when font transform matrix contains only translation offsets.
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: wine Branch: master Commit: f2df5a6c5dcc7551fc2d273bb6fbb8ea6d132c2e URL: https://gitlab.winehq.org/wine/wine/-/commit/f2df5a6c5dcc7551fc2d273bb6fbb8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 22 17:14:24 2023 +0800 dwrite: Use cache when font transform matrix contains only translation offsets. Word 2016 queries a lot of font glyph bounding boxes and bitmaps with translation matrices. The result of these queries is not cached because the transform matrix is not the identity matrix. However, the translation offsets don't affect FreeType font operations at all, which can be verified in ft_matrix_from_dwrite_matrix() called by get_glyph_transform(). So these results with translation matrices can be cached as well. With this patch, Word 2016 stuttering is reduced significantly. --- dlls/dwrite/dwrite_private.h | 19 +++++++++++++++++++ dlls/dwrite/font.c | 17 +++++++++++++---- dlls/dwrite/freetype.c | 12 ++++++------ dlls/dwrite/unixlib.h | 5 +++-- 4 files changed, 41 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d0ed1db97ef..e87e747d295 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __WINE_DWRITE_PRIVATE_H +#define __WINE_DWRITE_PRIVATE_H + #include "dwrite_3.h" #include "d2d1.h" #include "winternl.h" @@ -27,6 +30,14 @@ #define MS_GSUB_TAG DWRITE_MAKE_OPENTYPE_TAG('G','S','U','B') #define MS_GPOS_TAG DWRITE_MAKE_OPENTYPE_TAG('G','P','O','S') +typedef struct MATRIX_2X2 +{ + float m11; + float m12; + float m21; + float m22; +} MATRIX_2X2; + static const DWRITE_MATRIX identity = { 1.0f, 0.0f, @@ -34,6 +45,12 @@ static const DWRITE_MATRIX identity = 0.0f, 0.0f }; +static const MATRIX_2X2 identity_2x2 = +{ + 1.0f, 0.0f, + 0.0f, 1.0f, +}; + static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) { WCHAR *ret = NULL; @@ -820,3 +837,5 @@ struct font_data_context; extern HMODULE dwrite_module DECLSPEC_HIDDEN; extern void dwrite_fontface_get_glyph_bbox(IDWriteFontFace *fontface, struct dwrite_glyphbitmap *bitmap) DECLSPEC_HIDDEN; + +#endif /* __WINE_DWRITE_PRIVATE_H */ diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9dce26a17c2..a73f8239587 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -69,6 +69,15 @@ struct cache_entry unsigned int has_bitmap : 1; }; +/* Ignore dx and dy because FreeType doesn't actually use it */ +static inline void matrix_2x2_from_dwrite_matrix(MATRIX_2X2 *m1, const DWRITE_MATRIX *m2) +{ + m1->m11 = m2->m11; + m1->m12 = m2->m12; + m1->m21 = m2->m21; + m1->m22 = m2->m22; +} + static void fontface_release_cache_entry(struct cache_entry *entry) { free(entry->bitmap); @@ -157,11 +166,11 @@ void dwrite_fontface_get_glyph_bbox(IDWriteFontFace *iface, struct dwrite_glyphb params.simulations = bitmap->simulations; params.glyph = bitmap->glyph; params.emsize = bitmap->emsize; - params.m = bitmap->m ? *bitmap->m : identity; + matrix_2x2_from_dwrite_matrix(&params.m, bitmap->m ? bitmap->m : &identity); EnterCriticalSection(&fontface->cs); /* For now bypass cache for transformed cases. */ - if (bitmap->m && memcmp(bitmap->m, &identity, sizeof(*bitmap->m))) + if (bitmap->m && memcmp(&params.m, &identity_2x2, sizeof(params.m))) { params.bbox = &bitmap->bbox; UNIX_CALL(get_glyph_bbox, &params); @@ -202,15 +211,15 @@ static HRESULT dwrite_fontface_get_glyph_bitmap(struct dwrite_fontface *fontface params.glyph = bitmap->glyph; params.mode = rendering_mode; params.emsize = bitmap->emsize; - params.m = bitmap->m ? *bitmap->m : identity; params.bbox = bitmap->bbox; params.pitch = bitmap->pitch; params.bitmap = bitmap->buf; params.is_1bpp = is_1bpp; + matrix_2x2_from_dwrite_matrix(&params.m, bitmap->m ? bitmap->m : &identity); EnterCriticalSection(&fontface->cs); /* For now bypass cache for transformed cases. */ - if (memcmp(&params.m, &identity, sizeof(params.m))) + if (bitmap->m && memcmp(&params.m, &identity_2x2, sizeof(params.m))) { UNIX_CALL(get_glyph_bitmap, &params); } diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 0caf2b03696..f50cf36fc18 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -496,7 +496,7 @@ static NTSTATUS get_glyph_count(void *args) return STATUS_SUCCESS; } -static inline void ft_matrix_from_dwrite_matrix(const DWRITE_MATRIX *m, FT_Matrix *ft_matrix) +static inline void ft_matrix_from_matrix_2x2(const MATRIX_2X2 *m, FT_Matrix *ft_matrix) { ft_matrix->xx = m->m11 * 0x10000; ft_matrix->xy = -m->m21 * 0x10000; @@ -504,7 +504,7 @@ static inline void ft_matrix_from_dwrite_matrix(const DWRITE_MATRIX *m, FT_Matri ft_matrix->yy = m->m22 * 0x10000; } -static BOOL get_glyph_transform(unsigned int simulations, const DWRITE_MATRIX *m, FT_Matrix *ret) +static BOOL get_glyph_transform(unsigned int simulations, const MATRIX_2X2 *m, FT_Matrix *ret) { FT_Matrix ftm; @@ -515,7 +515,7 @@ static BOOL get_glyph_transform(unsigned int simulations, const DWRITE_MATRIX *m /* Some fonts provide mostly bitmaps and very few outlines, for example for .notdef. Disable transform if that's the case. */ - if (!memcmp(m, &identity, sizeof(*m)) && !simulations) + if (!memcmp(m, &identity_2x2, sizeof(*m)) && !simulations) return FALSE; if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) @@ -527,7 +527,7 @@ static BOOL get_glyph_transform(unsigned int simulations, const DWRITE_MATRIX *m pFT_Matrix_Multiply(&ftm, ret); } - ft_matrix_from_dwrite_matrix(m, &ftm); + ft_matrix_from_matrix_2x2(m, &ftm); pFT_Matrix_Multiply(&ftm, ret); return TRUE; @@ -955,7 +955,7 @@ static NTSTATUS wow64_get_glyph_bbox(void *args) ULONG simulations; ULONG glyph; float emsize; - DWRITE_MATRIX m; + MATRIX_2X2 m; PTR32 bbox; } const *params32 = args; struct get_glyph_bbox_params params = @@ -980,7 +980,7 @@ static NTSTATUS wow64_get_glyph_bitmap(void *args) ULONG glyph; ULONG mode; float emsize; - DWRITE_MATRIX m; + MATRIX_2X2 m; RECT bbox; int pitch; PTR32 bitmap; diff --git a/dlls/dwrite/unixlib.h b/dlls/dwrite/unixlib.h index c63d5bea722..33a9690b160 100644 --- a/dlls/dwrite/unixlib.h +++ b/dlls/dwrite/unixlib.h @@ -20,6 +20,7 @@ #include "windef.h" #include "winternl.h" #include "dwrite.h" +#include "dwrite_private.h" #include "wine/unixlib.h" struct create_font_object_params @@ -66,7 +67,7 @@ struct get_glyph_bbox_params unsigned int simulations; unsigned int glyph; float emsize; - DWRITE_MATRIX m; + MATRIX_2X2 m; RECT *bbox; }; @@ -77,7 +78,7 @@ struct get_glyph_bitmap_params unsigned int glyph; unsigned int mode; float emsize; - DWRITE_MATRIX m; + MATRIX_2X2 m; RECT bbox; int pitch; BYTE *bitmap;

1 0

Zebediah Figura : include: Include corecrt.h in vadefs.h.
by Alexandre Julliard 31 Mar '23

31 Mar '23

Module: wine Branch: master Commit: cf4b4ff642494251ab3d3c7e3c8fb77c5e4b78fd URL: https://gitlab.winehq.org/wine/wine/-/commit/cf4b4ff642494251ab3d3c7e3c8fb7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 30 16:21:22 2023 -0500 include: Include corecrt.h in vadefs.h. For the __has_attribute() fallback. Fixes: f4c3801495f4fe17a10e2f21339de3b511c78339 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54666 --- include/msvcrt/vadefs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/msvcrt/vadefs.h b/include/msvcrt/vadefs.h index 462c2d6815f..b5205f79c36 100644 --- a/include/msvcrt/vadefs.h +++ b/include/msvcrt/vadefs.h @@ -21,6 +21,8 @@ #ifndef _INC_VADEFS #define _INC_VADEFS +#include <corecrt.h> + #ifdef __cplusplus #define _ADDRESSOF(v) (&reinterpret_cast<const char &>(v)) #else

1 0

Alistair Leslie-Hughes : msado15: Handle DBTYPE_STR type when loading recordset data.
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: 3a1f5224fb92913f1789970a755e9bc4e00ceac0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a1f5224fb92913f1789970a755e9b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 28 14:06:45 2023 +1100 msado15: Handle DBTYPE_STR type when loading recordset data. --- dlls/msado15/recordset.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 13807aa1c5a..0f4acda0156 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -970,6 +970,22 @@ static HRESULT map_index( struct fields *fields, VARIANT *index, ULONG *ret ) return MAKE_ADO_HRESULT(adErrItemNotFound); } +static inline WCHAR *heap_strdupAtoW(const char *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = malloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +} + static HRESULT WINAPI fields_get_Item( Fields *iface, VARIANT index, Field **obj ) { struct fields *fields = impl_from_Fields( iface ); @@ -1948,6 +1964,15 @@ static HRESULT load_all_recordset_data(struct recordset *recordset, IUnknown *ro case DBTYPE_I4: V_I4(&copy) = *(LONG*)(data + bindings[datacol].obValue); break; + case DBTYPE_STR: + { + WCHAR *str = heap_strdupAtoW( (char*)(data + bindings[datacol].obValue) ); + + V_VT(&copy) = VT_BSTR; + V_BSTR(&copy) = SysAllocString(str); + free(str); + break; + } case DBTYPE_WSTR: { V_VT(&copy) = VT_BSTR;

1 0

Rémi Bernon : winemac: Use the default IME implementation for stubs.
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: 50352739cafc76e2ca27b989aaede072d5f6494d URL: https://gitlab.winehq.org/wine/wine/-/commit/50352739cafc76e2ca27b989aaede0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 7 22:57:51 2023 +0100 winemac: Use the default IME implementation for stubs. --- dlls/winemac.drv/ime.c | 70 --------------------------------------- dlls/winemac.drv/winemac.drv.spec | 9 ----- 2 files changed, 79 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 5780c942283..94953a1fd66 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -519,23 +519,6 @@ static void UpdateDataInDefaultIMEWindow(HIMC hIMC, HWND hwnd, BOOL showable) UnlockRealIMC(hIMC); } -BOOL WINAPI ImeConfigure(HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) -{ - FIXME("(%p, %p, %ld, %p): stub\n", hKL, hWnd, dwMode, lpData); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -DWORD WINAPI ImeConversionList(HIMC hIMC, LPCWSTR lpSource, LPCANDIDATELIST lpCandList, - DWORD dwBufLen, UINT uFlag) - -{ - FIXME("(%p, %s, %p, %ld, %d): stub\n", hIMC, debugstr_w(lpSource), lpCandList, - dwBufLen, uFlag); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - BOOL WINAPI ImeDestroy(UINT uForce) { TRACE("\n"); @@ -545,12 +528,6 @@ BOOL WINAPI ImeDestroy(UINT uForce) return TRUE; } -LRESULT WINAPI ImeEscape(HIMC hIMC, UINT uSubFunc, LPVOID lpData) -{ - TRACE("%x %p\n", uSubFunc, lpData); - return 0; -} - BOOL WINAPI ImeProcessKey(HIMC hIMC, UINT vKey, LPARAM lKeyData, const LPBYTE lpbKeyState) { LPINPUTCONTEXT lpIMC; @@ -636,15 +613,6 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) return TRUE; } -BOOL WINAPI ImeSetActiveContext(HIMC hIMC, BOOL fFlag) -{ - static int once; - - if (!once++) - FIXME("(%p, %x): stub\n", hIMC, fFlag); - return TRUE; -} - UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, TRANSMSGLIST *lpdwTransKey, UINT fuState, HIMC hIMC) { @@ -869,36 +837,6 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) return bRet; } -BOOL WINAPI ImeRegisterWord(LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister) -{ - FIXME("(%s, %ld, %s): stub\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -BOOL WINAPI ImeUnregisterWord(LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister) -{ - FIXME("(%s, %ld, %s): stub\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszUnregister)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -UINT WINAPI ImeGetRegisterWordStyle(UINT nItem, LPSTYLEBUFW lpStyleBuf) -{ - FIXME("(%d, %p): stub\n", nItem, lpStyleBuf); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -UINT WINAPI ImeEnumRegisterWord(REGISTERWORDENUMPROCW lpfnEnumProc, LPCWSTR lpszReading, - DWORD dwStyle, LPCWSTR lpszRegister, LPVOID lpData) -{ - FIXME("(%p, %s, %ld, %s, %p): stub\n", lpfnEnumProc, debugstr_w(lpszReading), dwStyle, - debugstr_w(lpszRegister), lpData); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - static BOOL IME_SetCompositionString(void* hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, DWORD cursor_pos, BOOL cursor_valid) { LPINPUTCONTEXT lpIMC; @@ -986,14 +924,6 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DW return IME_SetCompositionString(hIMC, dwIndex, lpComp, dwCompLen, 0, FALSE); } -DWORD WINAPI ImeGetImeMenuItems(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOW lpImeParentMenu, - LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize) -{ - FIXME("(%p, %lx %lx %p %p %lx): stub\n", hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - static void IME_NotifyComplete(void* hIMC) { NotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index b060d1cc2a6..d5e94b53ce4 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -2,19 +2,10 @@ @ cdecl wine_notify_icon(long ptr) # IME -@ stdcall ImeConfigure(long long long ptr) -@ stdcall ImeConversionList(long wstr ptr long long) @ stdcall ImeDestroy(long) -@ stdcall ImeEnumRegisterWord(ptr wstr long wstr ptr) -@ stdcall ImeEscape(long long ptr) -@ stdcall ImeGetImeMenuItems(long long long ptr ptr long) -@ stdcall ImeGetRegisterWordStyle(long ptr) @ stdcall ImeInquire(ptr wstr wstr) @ stdcall ImeProcessKey(long long long ptr) -@ stdcall ImeRegisterWord(wstr long wstr) @ stdcall ImeSelect(long long) -@ stdcall ImeSetActiveContext(long long) @ stdcall ImeSetCompositionString(long long ptr long ptr long) @ stdcall ImeToAsciiEx(long long ptr ptr long long) -@ stdcall ImeUnregisterWord(wstr long wstr) @ stdcall NotifyIME(long long long long)

1 0

Alex Henrie : wldap32: Implement ldap_connect.
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: 0256f1318491ee86dcb3e0cf3d7dda843c49e113 URL: https://gitlab.winehq.org/wine/wine/-/commit/0256f1318491ee86dcb3e0cf3d7dda… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Mar 29 19:26:32 2023 -0600 wldap32: Implement ldap_connect. --- dlls/wldap32/init.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index b8010a2da12..78891d9be61 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -251,7 +251,11 @@ ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout ) TRACE( "(%p, %p)\n", ld, timeout ); if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - return WLDAP32_LDAP_SUCCESS; /* FIXME: do something, e.g. ping the host */ + + if (timeout && (timeout->tv_sec || timeout->tv_usec)) + FIXME( "ignoring timeout\n" ); + + return map_error( ldap_connect( CTX(ld) ) ); } /***********************************************************************

1 0

Alex Henrie : wldap32: Return ~0u from ldap_modrdn* for any error.
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: c8148d677898aea3b40e81eeb4d663de469c4ecc URL: https://gitlab.winehq.org/wine/wine/-/commit/c8148d677898aea3b40e81eeb4d663… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Mar 30 09:34:48 2023 -0600 wldap32: Return ~0u from ldap_modrdn* for any error. --- dlls/wldap32/modrdn.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/wldap32/modrdn.c b/dlls/wldap32/modrdn.c index 4acf16eb5e4..f9d2a356e87 100644 --- a/dlls/wldap32/modrdn.c +++ b/dlls/wldap32/modrdn.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); */ ULONG CDECL ldap_modrdnA( LDAP *ld, char *dn, char *newdn ) { - ULONG ret = WLDAP32_LDAP_NO_MEMORY; + ULONG ret = ~0u; WCHAR *dnW = NULL, *newdnW = NULL; TRACE( "(%p, %s, %s)\n", ld, debugstr_a(dn), debugstr_a(newdn) ); @@ -65,7 +65,7 @@ ULONG CDECL ldap_modrdnW( LDAP *ld, WCHAR *dn, WCHAR *newdn ) */ ULONG CDECL ldap_modrdn2A( LDAP *ld, char *dn, char *newdn, int delete ) { - ULONG ret = WLDAP32_LDAP_NO_MEMORY; + ULONG ret = ~0u; WCHAR *dnW = NULL, *newdnW = NULL; TRACE( "(%p, %s, %p, 0x%02x)\n", ld, debugstr_a(dn), newdn, delete ); @@ -88,7 +88,7 @@ exit: */ ULONG CDECL ldap_modrdn2W( LDAP *ld, WCHAR *dn, WCHAR *newdn, int delete ) { - ULONG ret = WLDAP32_LDAP_NO_MEMORY; + ULONG ret = ~0u; char *dnU = NULL, *newdnU = NULL; int msg; @@ -96,15 +96,12 @@ ULONG CDECL ldap_modrdn2W( LDAP *ld, WCHAR *dn, WCHAR *newdn, int delete ) if (!ld || !newdn) return ~0u; - if (dn && !(dnU = strWtoU( dn ))) return WLDAP32_LDAP_NO_MEMORY; + if (dn && !(dnU = strWtoU( dn ))) return ~0u; if ((newdnU = strWtoU( newdn ))) { - ret = ldap_rename( CTX(ld), dnU, newdnU, NULL, delete, NULL, NULL, &msg ); - if (ret == WLDAP32_LDAP_SUCCESS) + if (ldap_rename( CTX(ld), dnU, newdnU, NULL, delete, NULL, NULL, &msg ) == LDAP_SUCCESS) ret = msg; - else - ret = ~0u; free( newdnU ); } free( dnU );

1 0

Alex Henrie : wldap32: Implement setting LDAP_OPT_SERVER_CERTIFICATE and add tests.
by Alexandre Julliard 30 Mar '23

30 Mar '23

Module: wine Branch: master Commit: 8fb04515cfc733eaee66201941fcce5120865ce5 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fb04515cfc733eaee66201941fcce… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Mar 30 09:34:48 2023 -0600 wldap32: Implement setting LDAP_OPT_SERVER_CERTIFICATE and add tests. ctxt_handle is moved to the top of struct tlsw_session so that it can be easily retrieved via LDAP_OPT_X_TLS_SSL_CTX. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54727 --- dlls/wldap32/Makefile.in | 2 +- dlls/wldap32/add.c | 8 ++++++-- dlls/wldap32/bind.c | 22 ++++++++++++++++------ dlls/wldap32/compare.c | 8 ++++++-- dlls/wldap32/control.c | 2 ++ dlls/wldap32/delete.c | 8 ++++++-- dlls/wldap32/extended.c | 8 ++++++-- dlls/wldap32/init.c | 34 +++++++++++++++++++++++++++++++++- dlls/wldap32/modify.c | 8 ++++++-- dlls/wldap32/modrdn.c | 5 ++++- dlls/wldap32/option.c | 7 +++++-- dlls/wldap32/rename.c | 8 ++++++-- dlls/wldap32/search.c | 16 +++++++++------- dlls/wldap32/tests/Makefile.in | 2 +- dlls/wldap32/tests/parse.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wldap32/winldap_private.h | 16 ++++++++++++++-- include/winldap.h | 2 ++ libs/ldap/libldap/tls_w.c | 2 +- 18 files changed, 163 insertions(+), 34 deletions(-)

1 0