June 2019 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_apply_draw_buffers().
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: fdc2812d044779f7590a4a1e6e8dd9b60e9d2d09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdc2812d044779f7590a4a1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 17 15:20:11 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_apply_draw_buffers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6a787a2..66c7d79 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2444,9 +2444,9 @@ static inline GLenum draw_buffer_from_rt_mask(DWORD rt_mask) } /* Context activation is done by the caller. */ -static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt_mask) +static void wined3d_context_gl_apply_draw_buffers(struct wined3d_context_gl *context_gl, uint32_t rt_mask) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLenum draw_buffers[MAX_RENDER_TARGET_VIEWS]; if (!rt_mask) @@ -2775,7 +2775,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, if (rt_mask != *cur_mask) { - context_apply_draw_buffers(context, rt_mask); + wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); *cur_mask = rt_mask; } @@ -3079,7 +3079,7 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, if (rt_mask != *cur_mask) { - context_apply_draw_buffers(&context_gl->c, rt_mask); + wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); *cur_mask = rt_mask; context_invalidate_state(&context_gl->c, STATE_FRAMEBUFFER); } @@ -3195,7 +3195,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; if (rt_mask != *cur_mask) { - context_apply_draw_buffers(context, rt_mask); + wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); *cur_mask = rt_mask; } context->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; @@ -3451,7 +3451,7 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d rt_mask = find_draw_buffers_mask(context_gl, state); if (rt_mask != *cur_mask) { - context_apply_draw_buffers(context, rt_mask); + wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); *cur_mask = rt_mask; } }

1 0

Akihiro Sagawa : usp10: Cache ScriptString_pSize value, again.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 0a4f83197990b3919d2a1fa98b2542dc4c18f0f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a4f83197990b3919d2a1fa9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 13 23:50:21 2019 +0900 usp10: Cache ScriptString_pSize value, again. Fixes a harmless regression caused by c5b41a45f92830fe64306e5b343cf0cc336fcd14. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0a26996..6975a49 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3875,6 +3875,7 @@ const SIZE * WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa) for (j = 0; j < analysis->glyphs[i].numGlyphs; j++) analysis->sz.cx += analysis->glyphs[i].piAdvance[j]; } + analysis->flags |= SCRIPT_STRING_ANALYSIS_FLAGS_SIZE; } return &analysis->sz; }

1 0

Tim Schumacher : wininet: Hide GetCookie flag fixme for HTTPONLY cookies.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: fb568344e6f050f60fa649e620cac9bd973491f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb568344e6f050f60fa649e6… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sat Jun 15 13:56:15 2019 +0200 wininet: Hide GetCookie flag fixme for HTTPONLY cookies. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 30a9e25..2af7521 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -733,7 +733,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, TRACE("(%s, %s, %p, %p, %x, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), lpCookieData, lpdwSize, flags, reserved); - if (flags) + if (flags & ~INTERNET_COOKIE_HTTPONLY) FIXME("flags 0x%08x not supported\n", flags); if (!lpszUrl)

1 0

Alexandre Julliard : oleacc: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 0ed304e99002ff69e0018818a3facd4053fd348c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ed304e99002ff69e0018818… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:37:11 2019 +0200 oleacc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/Makefile.in | 2 ++ dlls/oleacc/client.c | 1 - dlls/oleacc/main.c | 11 +++++------ dlls/oleacc/window.c | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 331229f..c8e2a30 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -2,6 +2,8 @@ MODULE = oleacc.dll IMPORTLIB = oleacc IMPORTS = uuid oleaut32 ole32 user32 rpcrt4 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ client.c \ main.c \ diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 0d313a2..1d43ec3 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -20,7 +20,6 @@ #include "oleacc_private.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index b90bc2c..f26abbd 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -31,7 +31,6 @@ #include "oleacc_private.h" #include "resource.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(oleacc); @@ -114,7 +113,7 @@ static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid) TRACE("got window class: %s\n", debugstr_w(class_name)); for(i=0; i<ARRAY_SIZE(builtin_classes); i++) { - if(!strcmpiW(class_name, builtin_classes[i].name)) { + if(!wcsicmp(class_name, builtin_classes[i].name)) { accessible_create ret; ret = (objid==OBJID_CLIENT ? @@ -198,13 +197,13 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo if(memcmp(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix))) return E_FAIL; p = atom_str + ARRAY_SIZE(lresult_atom_prefix); - proc_id = strtoulW(p, &p, 16); + proc_id = wcstoul(p, &p, 16); if(*p != ':') return E_FAIL; - server_mapping = ULongToHandle( strtoulW(p+1, &p, 16) ); + server_mapping = ULongToHandle( wcstoul(p+1, &p, 16) ); if(*p != ':') return E_FAIL; - size = strtoulW(p+1, &p, 16); + size = wcstoul(p+1, &p, 16); if(*p != 0) return E_FAIL; @@ -320,7 +319,7 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) } memcpy(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix)); - sprintfW(atom_str+ARRAY_SIZE(lresult_atom_prefix), atom_fmt, GetCurrentProcessId(), + swprintf(atom_str+ARRAY_SIZE(lresult_atom_prefix), 3*8 + 3, atom_fmt, GetCurrentProcessId(), HandleToUlong(mapping), stat.cbSize.u.LowPart); atom = GlobalAddAtomW(atom_str); if(!atom) { diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index 32c19fd..5957d49 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -20,7 +20,6 @@ #include "oleacc_private.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h"

1 0

Alexandre Julliard : ole2nls: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 7176090a4f53075f9fa6d82462e34fdea0e738c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7176090a4f53075f9fa6d824… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:30:43 2019 +0200 ole2nls: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2nls.dll16/Makefile.in | 2 +- dlls/ole2nls.dll16/ole2nls.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ole2nls.dll16/Makefile.in b/dlls/ole2nls.dll16/Makefile.in index bea1513..1047810 100644 --- a/dlls/ole2nls.dll16/Makefile.in +++ b/dlls/ole2nls.dll16/Makefile.in @@ -1,6 +1,6 @@ MODULE = ole2nls.dll16 -EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ole32.dll C_SRCS = ole2nls.c diff --git a/dlls/ole2nls.dll16/ole2nls.c b/dlls/ole2nls.dll16/ole2nls.c index 68db449..b4b332f 100644 --- a/dlls/ole2nls.dll16/ole2nls.c +++ b/dlls/ole2nls.dll16/ole2nls.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <string.h> #include <stdarg.h> #include <stdio.h>

1 0

Alexandre Julliard : odbccp32: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 45ea03c8a70240e2081ddc87b2865861bb853c2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=45ea03c8a70240e2081ddc87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:29:58 2019 +0200 odbccp32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/Makefile.in | 2 ++ dlls/odbccp32/odbccp32.c | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/odbccp32/Makefile.in b/dlls/odbccp32/Makefile.in index 7730827..e1276a1 100644 --- a/dlls/odbccp32/Makefile.in +++ b/dlls/odbccp32/Makefile.in @@ -2,5 +2,7 @@ MODULE = odbccp32.dll IMPORTLIB = odbccp32 IMPORTS = uuid advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ odbccp32.c diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 694a90c..283ed41 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -30,7 +30,6 @@ #include "winreg.h" #include "winnls.h" #include "sqlext.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" @@ -317,7 +316,7 @@ static BOOL write_config_value(const WCHAR *driver, const WCHAR *args) { WCHAR *divider, *value; - name = heap_alloc( (strlenW(args) + 1) * sizeof(WCHAR)); + name = heap_alloc( (lstrlenW(args) + 1) * sizeof(WCHAR)); if(!name) { push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); @@ -325,7 +324,7 @@ static BOOL write_config_value(const WCHAR *driver, const WCHAR *args) } lstrcpyW(name, args); - divider = strchrW(name,'='); + divider = wcschr(name,'='); if(!divider) { push_error(ODBC_ERROR_INVALID_KEYWORD_VALUE, odbc_error_invalid_keyword); @@ -337,7 +336,7 @@ static BOOL write_config_value(const WCHAR *driver, const WCHAR *args) TRACE("Write pair: %s = %s\n", debugstr_w(name), debugstr_w(value)); if(RegSetValueExW(hkeydriver, name, 0, REG_SZ, (BYTE*)value, - (strlenW(value)+1) * sizeof(WCHAR)) != ERROR_SUCCESS) + (lstrlenW(value)+1) * sizeof(WCHAR)) != ERROR_SUCCESS) ERR("Failed to write registry installed key\n"); heap_free(name); @@ -860,7 +859,7 @@ static void write_registry_values(const WCHAR *regkey, const WCHAR *driver, cons for (; *p; p += lstrlenW(p) + 1) { - WCHAR *divider = strchrW(p,'='); + WCHAR *divider = wcschr(p,'='); if (divider) { @@ -1519,7 +1518,7 @@ BOOL WINAPI SQLValidDSNW(LPCWSTR lpszDSN) clear_errors(); TRACE("%s\n", debugstr_w(lpszDSN)); - if(strlenW(lpszDSN) > SQL_MAX_DSN_LENGTH || strpbrkW(lpszDSN, invalid) != NULL) + if(lstrlenW(lpszDSN) > SQL_MAX_DSN_LENGTH || wcspbrk(lpszDSN, invalid) != NULL) { return FALSE; }

1 0

Hans Leidekker : bcrypt: Add stub implementations of BCryptEnumContextFunctions and BCryptFreeBuffer.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: c1746612b2b4381b2a2c15d5d1b51334854fce9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1746612b2b4381b2a2c15d5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 17 11:52:48 2019 +0200 bcrypt: Add stub implementations of BCryptEnumContextFunctions and BCryptFreeBuffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 4 ++-- dlls/bcrypt/bcrypt_main.c | 12 ++++++++++++ dlls/bcrypt/tests/bcrypt.c | 19 +++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 4 ++-- include/bcrypt.h | 11 +++++++++++ include/ncrypt.h | 5 +++++ 6 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 4946ee5..1ea3760 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -17,14 +17,14 @@ @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) @ stdcall BCryptEnumAlgorithms(long ptr ptr long) @ stub BCryptEnumContextFunctionProviders -@ stub BCryptEnumContextFunctions +@ stdcall BCryptEnumContextFunctions(long wstr long ptr ptr) @ stub BCryptEnumContexts @ stub BCryptEnumProviders @ stub BCryptEnumRegisteredProviders @ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) @ stdcall BCryptFinalizeKeyPair(ptr long) @ stdcall BCryptFinishHash(ptr ptr long long) -@ stub BCryptFreeBuffer +@ stdcall BCryptFreeBuffer(ptr) @ stdcall BCryptGenRandom(ptr ptr long long) @ stdcall BCryptGenerateKeyPair(ptr ptr long long) @ stdcall BCryptGenerateSymmetricKey(ptr ptr ptr long ptr long long) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 399626d..86073bb 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -68,6 +68,18 @@ NTSTATUS WINAPI BCryptRemoveContextFunctionProvider(ULONG table, LPCWSTR context return STATUS_NOT_IMPLEMENTED; } +NTSTATUS WINAPI BCryptEnumContextFunctions( ULONG table, const WCHAR *ctx, ULONG iface, ULONG *buflen, + CRYPT_CONTEXT_FUNCTIONS **buffer ) +{ + FIXME( "%u, %s, %u, %p, %p\n", table, debugstr_w(ctx), iface, buflen, buffer ); + return STATUS_NOT_IMPLEMENTED; +} + +void WINAPI BCryptFreeBuffer( void *buffer ) +{ + FIXME( "%p\n", buffer ); +} + NTSTATUS WINAPI BCryptRegisterProvider(LPCWSTR provider, ULONG flags, PCRYPT_PROVIDER_REG reg) { FIXME("%s, %08x, %p: stub\n", debugstr_w(provider), flags, reg); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index a8bc43c..8e57d53 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -23,6 +23,7 @@ #define WIN32_NO_STATUS #include <windows.h> #include <bcrypt.h> +#include <ncrypt.h> #include "wine/test.h" @@ -39,9 +40,11 @@ static NTSTATUS (WINAPI *pBCryptDuplicateHash)(BCRYPT_HASH_HANDLE, BCRYPT_HASH_H static NTSTATUS (WINAPI *pBCryptDuplicateKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptEncrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); +static NTSTATUS (WINAPI *pBCryptEnumContextFunctions)(ULONG, const WCHAR *, ULONG, ULONG *, CRYPT_CONTEXT_FUNCTIONS **); static NTSTATUS (WINAPI *pBCryptExportKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); static NTSTATUS (WINAPI *pBCryptFinalizeKeyPair)(BCRYPT_KEY_HANDLE, ULONG); static NTSTATUS (WINAPI *pBCryptFinishHash)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +static void (WINAPI *pBCryptFreeBuffer)(void *); static NTSTATUS (WINAPI *pBCryptGenerateKeyPair)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptGenerateSymmetricKey)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); @@ -1896,6 +1899,19 @@ static void test_ECDH(void) pBCryptCloseAlgorithmProvider(alg, 0); } +static void test_BCryptEnumContextFunctions(void) +{ + static const WCHAR sslW[] = {'S','S','L',0}; + CRYPT_CONTEXT_FUNCTIONS *buffer; + NTSTATUS status; + ULONG buflen; + + buffer = NULL; + status = pBCryptEnumContextFunctions( CRYPT_LOCAL, sslW, NCRYPT_SCHANNEL_INTERFACE, &buflen, &buffer ); + todo_wine ok( status == STATUS_SUCCESS, "got %08x\n", status); + if (status == STATUS_SUCCESS) pBCryptFreeBuffer( buffer ); +} + START_TEST(bcrypt) { HMODULE module; @@ -1916,9 +1932,11 @@ START_TEST(bcrypt) pBCryptDuplicateHash = (void *)GetProcAddress(module, "BCryptDuplicateHash"); pBCryptDuplicateKey = (void *)GetProcAddress(module, "BCryptDuplicateKey"); pBCryptEncrypt = (void *)GetProcAddress(module, "BCryptEncrypt"); + pBCryptEnumContextFunctions = (void *)GetProcAddress(module, "BCryptEnumContextFunctions"); pBCryptExportKey = (void *)GetProcAddress(module, "BCryptExportKey"); pBCryptFinalizeKeyPair = (void *)GetProcAddress(module, "BCryptFinalizeKeyPair"); pBCryptFinishHash = (void *)GetProcAddress(module, "BCryptFinishHash"); + pBCryptFreeBuffer = (void *)GetProcAddress(module, "BCryptFreeBuffer"); pBCryptGenerateKeyPair = (void *)GetProcAddress(module, "BCryptGenerateKeyPair"); pBCryptGenerateSymmetricKey = (void *)GetProcAddress(module, "BCryptGenerateSymmetricKey"); pBCryptGenRandom = (void *)GetProcAddress(module, "BCryptGenRandom"); @@ -1946,6 +1964,7 @@ START_TEST(bcrypt) test_ECDSA(); test_RSA(); test_ECDH(); + test_BCryptEnumContextFunctions(); FreeLibrary(module); } diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index d35f8a9..dfe715d 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -18,14 +18,14 @@ @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt @ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms @ stub BCryptEnumContextFunctionProviders -@ stub BCryptEnumContextFunctions +@ stdcall BCryptEnumContextFunctions(long wstr long ptr ptr) bcrypt.BCryptEnumContextFunctions @ stub BCryptEnumContexts @ stub BCryptEnumProviders @ stub BCryptEnumRegisteredProviders @ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) bcrypt.BCryptExportKey @ stdcall BCryptFinalizeKeyPair(ptr long) bcrypt.BCryptFinalizeKeyPair @ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash -@ stub BCryptFreeBuffer +@ stdcall BCryptFreeBuffer(ptr) bcrypt.BCryptFreeBuffer @ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom @ stdcall BCryptGenerateKeyPair(ptr ptr long long) bcrypt.BCryptGenerateKeyPair @ stdcall BCryptGenerateSymmetricKey(ptr ptr ptr long ptr long long) bcrypt.BCryptGenerateSymmetricKey diff --git a/include/bcrypt.h b/include/bcrypt.h index 0151afd..8947d13 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -293,6 +293,15 @@ typedef PVOID BCRYPT_SECRET_HANDLE; /* Flags for BCryptCreateHash */ #define BCRYPT_HASH_REUSABLE_FLAG 0x00000020 +#define CRYPT_LOCAL 0x00000001 +#define CRYPT_DOMAIN 0x00000002 + +typedef struct _CRYPT_CONTEXT_FUNCTIONS +{ + ULONG cFunctions; + WCHAR **rgpszFunctions; +} CRYPT_CONTEXT_FUNCTIONS, *PCRYPT_CONTEXT_FUNCTIONS; + NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); @@ -304,8 +313,10 @@ NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE); NTSTATUS WINAPI BCryptDuplicateHash(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG); NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG); +NTSTATUS WINAPI BCryptEnumContextFunctions(ULONG, const WCHAR *, ULONG, ULONG *, CRYPT_CONTEXT_FUNCTIONS **); NTSTATUS WINAPI BCryptFinalizeKeyPair(BCRYPT_KEY_HANDLE, ULONG); NTSTATUS WINAPI BCryptFinishHash(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +void WINAPI BCryptFreeBuffer(void *); NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, ULONG, ULONG); NTSTATUS WINAPI BCryptGenerateSymmetricKey(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG); diff --git a/include/ncrypt.h b/include/ncrypt.h index 2bfdae0..85ced7a 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -38,6 +38,11 @@ typedef ULONG_PTR NCRYPT_KEY_HANDLE; typedef ULONG_PTR NCRYPT_HASH_HANDLE; typedef ULONG_PTR NCRYPT_SECRET_HANDLE; +#define NCRYPT_KEY_STORAGE_INTERFACE 0x00010001 +#define NCRYPT_SCHANNEL_INTERFACE 0x00010002 +#define NCRYPT_SCHANNEL_SIGNATURE_INTERFACE 0x00010003 +#define NCRYPT_KEY_PROTECTION_INTERFACE 0x00010004 + SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE, BYTE *, DWORD, void *, BYTE *, DWORD, DWORD *, DWORD);

1 0

Gabriel Ivăncescu : ntdll: Add support for EXT4 per directory case folding.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 0639d182e54c373753103114f485edf681f94f82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0639d182e54c373753103114… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jun 14 10:07:43 2019 +0100 ntdll: Add support for EXT4 per directory case folding. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 6605999..dd0062d 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -115,6 +115,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); /* just in case... */ #undef VFAT_IOCTL_READDIR_BOTH +#undef EXT2_IOC_GETFLAGS +#undef EXT4_CASEFOLD_FL #ifdef linux @@ -130,6 +132,12 @@ typedef struct /* Define the VFAT ioctl to get both short and long file names */ #define VFAT_IOCTL_READDIR_BOTH _IOR('r', 1, KERNEL_DIRENT [2] ) +/* Define the ext2 ioctl for handling extra attributes */ +#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) + +/* Case-insensitivity attribute */ +#define EXT4_CASEFOLD_FL 0x40000000 + #ifndef O_DIRECTORY # define O_DIRECTORY 0200000 /* must be directory */ #endif @@ -1113,7 +1121,7 @@ static int get_dir_case_sensitivity_attr( const char *dir ) * get_dir_case_sensitivity_stat * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses (f)statfs(2), statvfs(2), fstatat(2), or ioctl(2). */ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) { @@ -1165,32 +1173,27 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) return FALSE; #elif defined(__linux__) + BOOLEAN sens = TRUE; struct statfs stfs; struct stat st; - char *cifile; + int fd, flags; - /* Only assume CIOPFS is case insensitive. */ - if (statfs( dir, &stfs ) == -1) return FALSE; - if (stfs.f_type != 0x65735546 /* FUSE_SUPER_MAGIC */) + if ((fd = open( dir, O_RDONLY | O_NONBLOCK | O_LARGEFILE )) == -1) return TRUE; - /* Normally, we'd have to parse the mtab to find out exactly what - * kind of FUSE FS this is. But, someone on wine-devel suggested - * a shortcut. We'll stat a special file in the directory. If it's - * there, we'll assume it's a CIOPFS, else not. - * This will break if somebody puts a file named ".ciopfs" in a non- - * CIOPFS directory. - */ - cifile = RtlAllocateHeap( GetProcessHeap(), 0, strlen( dir )+sizeof("/.ciopfs") ); - if (!cifile) return TRUE; - strcpy( cifile, dir ); - strcat( cifile, "/.ciopfs" ); - if (stat( cifile, &st ) == 0) + + if (ioctl( fd, EXT2_IOC_GETFLAGS, &flags ) != -1 && (flags & EXT4_CASEFOLD_FL)) { - RtlFreeHeap( GetProcessHeap(), 0, cifile ); - return FALSE; + sens = FALSE; } - RtlFreeHeap( GetProcessHeap(), 0, cifile ); - return TRUE; + else if (fstatfs( fd, &stfs ) == 0 && /* CIOPFS is case insensitive. Instead of */ + stfs.f_type == 0x65735546 /* FUSE_SUPER_MAGIC */ && /* parsing mtab to discover if the FUSE FS */ + fstatat( fd, ".ciopfs", &st, AT_NO_AUTOMOUNT ) == 0) /* is CIOPFS, look for .ciopfs in the dir. */ + { + sens = FALSE; + } + + close( fd ); + return sens; #else return TRUE; #endif @@ -1201,7 +1204,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * get_dir_case_sensitivity * * Checks if the volume containing the specified directory is case - * sensitive or not. Uses statfs(2) or statvfs(2). + * sensitive or not. Uses multiple methods, depending on platform. */ static BOOLEAN get_dir_case_sensitivity( const char *dir ) {

1 0

Akihiro Sagawa : usp10/tests: Add advance width tests with CJK bitmap font.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: 9dabf7b013ea7c12a93d665d514ce15560c2f991 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dabf7b013ea7c12a93d665d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 13 23:50:23 2019 +0900 usp10/tests: Add advance width tests with CJK bitmap font. We should use associated glyph's advance width instead of the default one. Because, when using CJK bitmap system font, full-width character (e.g. Hiragana) is rendered with associated font. The glyph is different from the default glyph. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 4c16df5..270a0f4 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2091,6 +2091,7 @@ static void test_ScriptShape(HDC hdc) static void test_ScriptPlace(HDC hdc) { static const WCHAR test1[] = {'t', 'e', 's', 't',0}; + static const WCHAR test2[] = {0x3044, 0x308d, 0x306f,0}; /* Hiragana, Iroha */ BOOL ret; HRESULT hr; SCRIPT_CACHE sc = NULL; @@ -2101,6 +2102,9 @@ static void test_ScriptPlace(HDC hdc) int nb, widths[4]; GOFFSET offset[4]; ABC abc[4]; + HFONT hfont, prev_hfont; + LOGFONTA lf; + TEXTMETRICW tm; hr = ScriptItemize(test1, 4, 2, NULL, NULL, items, NULL); ok(hr == S_OK, "ScriptItemize should return S_OK not %08x\n", hr); @@ -2154,6 +2158,62 @@ static void test_ScriptPlace(HDC hdc) ok(ret, "ExtTextOutW should return TRUE\n"); ScriptFreeCache(&sc); + + /* test CJK bitmap font which has associated font */ + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Fixedsys"); + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + prev_hfont = SelectObject(hdc, hfont); + ret = GetTextMetricsW(hdc, &tm); + ok(ret, "GetTextMetrics failed\n"); + + switch(tm.tmCharSet) { + case SHIFTJIS_CHARSET: + case HANGUL_CHARSET: + case GB2312_CHARSET: + case CHINESEBIG5_CHARSET: + { + SIZE sz; + DWORD len = lstrlenW(test2), i, total; + ret = GetTextExtentExPointW(hdc, test2, len, 0, NULL, NULL, &sz); + ok(ret, "GetTextExtentExPoint failed\n"); + + if (sz.cx > len * tm.tmAveCharWidth) + { + hr = ScriptItemize(test2, len, 2, NULL, NULL, items, NULL); + ok(hr == S_OK, "ScriptItemize should return S_OK not %08x\n", hr); + ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + + items[0].a.fNoGlyphIndex = TRUE; + memset(glyphs, 'a', sizeof(glyphs)); + hr = ScriptShape(hdc, &sc, test2, len, ARRAY_SIZE(glyphs), &items[0].a, glyphs, logclust, attrs, &nb); + ok(hr == S_OK, "ScriptShape should return S_OK not %08x\n", hr); + + memset(offset, 'a', sizeof(offset)); + memset(widths, 'a', sizeof(widths)); + hr = ScriptPlace(hdc, &sc, glyphs, ARRAY_SIZE(widths), attrs, &items[0].a, widths, offset, NULL); + ok(hr == S_OK, "ScriptPlace should return S_OK not %08x\n", hr); + + for (total = 0, i = 0; i < nb; i++) + { + ok(offset[i].du == 0, "[%d] expected 0, got %d\n", i, offset[i].du); + ok(offset[i].dv == 0, "[%d] expected 0, got %d\n", i, offset[i].dv); + todo_wine ok(widths[i] > tm.tmAveCharWidth, "[%d] expected greater than %d, got %d\n", + i, tm.tmAveCharWidth, widths[i]); + total += widths[i]; + } + todo_wine ok(total == sz.cx, "expected %d, got %d\n", sz.cx, total); + } + else + skip("Associated font is unavailable\n"); + + break; + } + default: + skip("Non-CJK locale\n"); + } + SelectObject(hdc, prev_hfont); } static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256])

1 0

Alexandre Julliard : oleaut32: Build with msvcrt.
by Alexandre Julliard June 17, 2019

June 17, 2019

Module: wine Branch: master Commit: aa4ac3ad6cd6d0324170b0b32d4bd50e239f7762 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa4ac3ad6cd6d0324170b0b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:39:34 2019 +0200 oleaut32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/Makefile.in | 2 ++ dlls/oleaut32/dispatch.c | 2 -- dlls/oleaut32/oleaut.c | 3 -- dlls/oleaut32/olefont.c | 13 ++++---- dlls/oleaut32/olepicture.c | 10 +----- dlls/oleaut32/recinfo.c | 9 +++-- dlls/oleaut32/safearray.c | 2 -- dlls/oleaut32/typelib.c | 82 ++++++++++++++++++++++------------------------ dlls/oleaut32/varformat.c | 39 ++++++++++------------ dlls/oleaut32/variant.c | 17 ++++------ dlls/oleaut32/vartype.c | 33 +++++++++---------- 11 files changed, 93 insertions(+), 119 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa4ac3ad6cd6d0324170…

1 0