June 2016 - Wine-commits - list.winehq.org

Nikolay Sivov : fontsub: Improve CreateFontPackage() stub for TTFCFP_SUBSET case.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: f484af42fe2bd711cbacb2ce203f49b3a2e991d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f484af42fe2bd711cbacb2ce2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 28 20:44:22 2016 +0300 fontsub: Improve CreateFontPackage() stub for TTFCFP_SUBSET case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f99785160009df9d043ec691699216d9c5be517a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/fontsub/main.c | 13 ++++++++++++- include/fontsub.h | 26 ++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/fontsub/main.c b/dlls/fontsub/main.c index b78bd58..a0a6032 100644 --- a/dlls/fontsub/main.c +++ b/dlls/fontsub/main.c @@ -50,5 +50,16 @@ ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, u written, flags, face_index, format, lang, platform, encoding, keep_list, keep_len, allocproc, reallocproc, freeproc, reserved); - return ERR_GENERIC; + if (format != TTFCFP_SUBSET) + return ERR_GENERIC; + + *dest = allocproc(src_len); + if (!*dest) + return ERR_MEM; + + memcpy(*dest, src, src_len); + *dest_len = src_len; + *written = src_len; + + return NO_ERROR; } diff --git a/include/fontsub.h b/include/fontsub.h index 6fc7793..aa83f03 100644 --- a/include/fontsub.h +++ b/include/fontsub.h @@ -27,14 +27,36 @@ typedef void *(__cdecl *CFP_ALLOCPROC)(size_t); typedef void *(__cdecl *CFP_REALLOCPROC)(void *, size_t); typedef void (__cdecl *CFP_FREEPROC)(void *); +#define TTFCFP_SUBSET 0 +#define TTFCFP_SUBSET1 1 +#define TTFCFP_DELTA 2 + +#define TTFCFP_UNICODE_PLATFORMID 0 +#define TTFCFP_APPLE_PLATFORMID 1 +#define TTFCFP_ISO_PLATFORMID 2 +#define TTFCFP_MS_PLATFORMID 3 + +#define TTFCFP_STD_MAC_CHAR_SET 0 +#define TTFCFP_SYMBOL_CHAR_SET 0 +#define TTFCFP_UNICODE_CHAR_SET 1 +#define TTFCFP_DONT_CARE 0xffff + +#define TTFCFP_LANG_KEEP_ALL 0 + +#define TTFCFP_FLAGS_SUBSET 0x0001 +#define TTFCFP_FLAGS_COMPRESS 0x0002 +#define TTFCFP_FLAGS_TTC 0x0004 +#define TTFCFP_FLAGS_GLYPHLIST 0x0008 + +#define ERR_GENERIC 1000 +#define ERR_MEM 1005 + ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, unsigned char **dest, ULONG *dest_len, ULONG *written, const unsigned short flags, const unsigned short face_index, const unsigned short format, const unsigned short lang, const unsigned short platform, const unsigned short encoding, const unsigned short *keep_list, const unsigned short keep_len, CFP_ALLOCPROC allocproc, CFP_REALLOCPROC reallocproc, CFP_FREEPROC freeproc, void *reserved); -#define ERR_GENERIC 1000 - #ifdef __cplusplus } #endif

1 0

Nikolay Sivov : t2embed: Implement TTIsEmbeddingEnabledForFacename().
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: cc0b8336f5eb15224ced5d424bb17125a7dc5d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc0b8336f5eb15224ced5d424… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 2 12:19:17 2016 +0300 t2embed: Implement TTIsEmbeddingEnabledForFacename(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 847da79cf80b565a79933d92e0218b230b933a4f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/t2embed/Makefile.in | 2 +- dlls/t2embed/main.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ dlls/t2embed/t2embed.spec | 4 ++-- dlls/t2embed/tests/t2embed.c | 23 ++++++++++++++++++++++ include/t2embapi.h | 3 +++ 5 files changed, 75 insertions(+), 3 deletions(-) diff --git a/dlls/t2embed/Makefile.in b/dlls/t2embed/Makefile.in index e585fe2..baa4757 100644 --- a/dlls/t2embed/Makefile.in +++ b/dlls/t2embed/Makefile.in @@ -1,6 +1,6 @@ MODULE = t2embed.dll IMPORTLIB = t2embed -IMPORTS = gdi32 +IMPORTS = gdi32 advapi32 C_SRCS = \ main.c diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 2794f0f..9c807c7 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winreg.h" #include "t2embapi.h" #include "wine/debug.h" @@ -100,6 +101,51 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) return E_NONE; } +LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) +{ + static const WCHAR exclusionlistW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'S','h','a','r','e','d',' ','T','o','o','l','s','\\','t','2','e','m','b','e','d',0}; + DWORD index; + HKEY hkey; + LONG ret; + + TRACE("(%s %p)\n", debugstr_a(facename), enabled); + + if (!facename) + return E_FACENAMEINVALID; + + if (!enabled) + return E_PBENABLEDINVALID; + + *enabled = TRUE; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, exclusionlistW, 0, GENERIC_READ, &hkey)) + return E_NONE; + + *enabled = TRUE; + ret = ERROR_SUCCESS; + index = 0; + while (ret != ERROR_NO_MORE_ITEMS) + { + DWORD name_len, value_len, value, type; + CHAR name[LF_FACESIZE]; + + name_len = sizeof(name)/sizeof(*name); + value_len = sizeof(value); + ret = RegEnumValueA(hkey, index++, name, &name_len, NULL, &type, (BYTE*)&value, &value_len); + if (ret || type != REG_DWORD) + continue; + + if (!lstrcmpiA(name, facename)) + { + *enabled = !!value; + break; + } + } + RegCloseKey(hkey); + + return E_NONE; +} + LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) { FIXME("(%p %p) stub\n", hDC, enabled); diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec index e3be15c..5375fee 100644 --- a/dlls/t2embed/t2embed.spec +++ b/dlls/t2embed/t2embed.spec @@ -6,7 +6,7 @@ @ stub TTGetEmbeddedFontInfo @ stdcall TTGetEmbeddingType(long ptr) @ stdcall TTIsEmbeddingEnabled(long ptr) -@ stub TTIsEmbeddingEnabledForFacename +@ stdcall TTIsEmbeddingEnabledForFacename(str ptr) @ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) @ stub TTRunValidationTests @ stub _TTCharToUnicode(a)24 @@ -17,7 +17,7 @@ @ stub _TTGetEmbeddedFontInfo(a)28 @ stdcall _TTGetEmbeddingType(a)8(long ptr) TTGetEmbeddingType @ stdcall _TTIsEmbeddingEnabled(a)8(long ptr) TTIsEmbeddingEnabled -@ stub _TTIsEmbeddingEnabledForFacename(a)8 +@ stdcall _TTIsEmbeddingEnabledForFacename(a)8(str ptr) TTIsEmbeddingEnabledForFacename @ stdcall _TTLoadEmbeddedFont(a)40(ptr long ptr long ptr ptr ptr wstr str ptr) TTLoadEmbeddedFont @ stub _TTRunValidationTests(a)8 @ stub TTEmbedFontEx diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index cdc2f49..6efb231 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -76,7 +76,30 @@ static void test_TTGetEmbeddingType(void) DeleteDC(hdc); } +static void test_TTIsEmbeddingEnabledForFacename(void) +{ + BOOL status; + LONG ret; + + ret = TTIsEmbeddingEnabledForFacename(NULL, NULL); + ok(ret == E_FACENAMEINVALID, "got %#x\n", ret); + + status = 123; + ret = TTIsEmbeddingEnabledForFacename(NULL, &status); + ok(ret == E_FACENAMEINVALID, "got %#x\n", ret); + ok(status == 123, "got %d\n", status); + + ret = TTIsEmbeddingEnabledForFacename("Arial", NULL); + ok(ret == E_PBENABLEDINVALID, "got %#x\n", ret); + + status = 123; + ret = TTIsEmbeddingEnabledForFacename("Arial", &status); + ok(ret == E_NONE, "got %#x\n", ret); + ok(status != 123, "got %d\n", status); +} + START_TEST(t2embed) { test_TTGetEmbeddingType(); + test_TTIsEmbeddingEnabledForFacename(); } diff --git a/include/t2embapi.h b/include/t2embapi.h index 60fda64..09067bd 100644 --- a/include/t2embapi.h +++ b/include/t2embapi.h @@ -42,7 +42,9 @@ extern "C" { #define E_HDCINVALID __MSABI_LONG(0x0006) #define E_NOTATRUETYPEFONT __MSABI_LONG(0x000a) #define E_ERRORACCESSINGFONTDATA __MSABI_LONG(0x000c) +#define E_FACENAMEINVALID __MSABI_LONG(0x0113) #define E_PERMISSIONSINVALID __MSABI_LONG(0x0117) +#define E_PBENABLEDINVALID __MSABI_LONG(0x0118) typedef ULONG (WINAPIV * READEMBEDPROC)(void*,void*,ULONG); typedef ULONG (WINAPIV * WRITEEMBEDPROC)(void*,void*,ULONG); @@ -72,6 +74,7 @@ LONG WINAPI TTDeleteEmbeddedFont(HANDLE,ULONG,ULONG*); #define EMBED_NOEMBEDDING 4 LONG WINAPI TTGetEmbeddingType(HDC, ULONG*); +LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled); #ifdef __cplusplus }

1 0

Nikolay Sivov : t2embed: Implement TTIsEmbeddingEnabled().
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: c6703a99d25e7b44f8609abeffc45a96184d9644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6703a99d25e7b44f8609abef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 2 12:19:18 2016 +0300 t2embed: Implement TTIsEmbeddingEnabled(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0ea8c1d62e4993567e451ddcc25f4f0958e17266) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/t2embed/main.c | 24 ++++++++++++++++++++--- dlls/t2embed/tests/t2embed.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ include/t2embapi.h | 3 +++ 3 files changed, 69 insertions(+), 3 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 9c807c7..9fae0a8 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -148,9 +148,27 @@ LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) { - FIXME("(%p %p) stub\n", hDC, enabled); - if (enabled) *enabled = FALSE; - return E_API_NOTIMPL; + OUTLINETEXTMETRICA *otm; + LONG ret; + UINT len; + + TRACE("(%p %p)\n", hDC, enabled); + + if (!hDC) + return E_HDCINVALID; + + len = GetOutlineTextMetricsA(hDC, 0, NULL); + if (!len) + return E_ERRORACCESSINGFACENAME; + + otm = HeapAlloc(GetProcessHeap(), 0, len); + if (!otm) + return E_NOFREEMEMORY; + + GetOutlineTextMetricsA(hDC, len, otm); + ret = TTIsEmbeddingEnabledForFacename(otm->otmpFaceName, enabled); + HeapFree(GetProcessHeap(), 0, otm); + return ret; } LONG WINAPI TTDeleteEmbeddedFont(HANDLE hFontReference, ULONG flags, ULONG *status) diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index 6efb231..79102a6 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -98,8 +98,53 @@ static void test_TTIsEmbeddingEnabledForFacename(void) ok(status != 123, "got %d\n", status); } +static void test_TTIsEmbeddingEnabled(void) +{ + HFONT old_font, hfont; + LONG ret, status; + LOGFONTA logfont; + HDC hdc; + + ret = TTIsEmbeddingEnabled(NULL, NULL); + ok(ret == E_HDCINVALID, "got %#x\n", ret); + + status = 123; + ret = TTIsEmbeddingEnabled(NULL, &status); + ok(ret == E_HDCINVALID, "got %#x\n", ret); + ok(status == 123, "got %d\n", status); + + hdc = CreateCompatibleDC(0); + + ret = TTIsEmbeddingEnabled(hdc, NULL); + ok(ret == E_ERRORACCESSINGFACENAME, "got %#x\n", ret); + + status = 123; + ret = TTIsEmbeddingEnabled(hdc, &status); + ok(ret == E_ERRORACCESSINGFACENAME, "got %#x\n", ret); + ok(status == 123, "got %u\n", status); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWeight = FW_NORMAL; + strcpy(logfont.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&logfont); + ok(hfont != NULL, "got %p\n", hfont); + + old_font = SelectObject(hdc, hfont); + + status = 123; + ret = TTIsEmbeddingEnabled(hdc, &status); + ok(ret == E_NONE, "got %#x\n", ret); + ok(status != 123, "got %u\n", status); + + SelectObject(hdc, old_font); + DeleteObject(hfont); + DeleteDC(hdc); +} + START_TEST(t2embed) { test_TTGetEmbeddingType(); test_TTIsEmbeddingEnabledForFacename(); + test_TTIsEmbeddingEnabled(); } diff --git a/include/t2embapi.h b/include/t2embapi.h index 09067bd..38d6900 100644 --- a/include/t2embapi.h +++ b/include/t2embapi.h @@ -40,8 +40,10 @@ extern "C" { #define E_NONE __MSABI_LONG(0x0000) #define E_API_NOTIMPL __MSABI_LONG(0x0001) #define E_HDCINVALID __MSABI_LONG(0x0006) +#define E_NOFREEMEMORY __MSABI_LONG(0x0007) #define E_NOTATRUETYPEFONT __MSABI_LONG(0x000a) #define E_ERRORACCESSINGFONTDATA __MSABI_LONG(0x000c) +#define E_ERRORACCESSINGFACENAME __MSABI_LONG(0x000d) #define E_FACENAMEINVALID __MSABI_LONG(0x0113) #define E_PERMISSIONSINVALID __MSABI_LONG(0x0117) #define E_PBENABLEDINVALID __MSABI_LONG(0x0118) @@ -75,6 +77,7 @@ LONG WINAPI TTDeleteEmbeddedFont(HANDLE,ULONG,ULONG*); LONG WINAPI TTGetEmbeddingType(HDC, ULONG*); LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled); +LONG WINAPI TTIsEmbeddingEnabled(HDC hdc, BOOL *enabled); #ifdef __cplusplus }

1 0

Francois Gouget : schannel: Add declarations for SECPKG version 7.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 47e70700fbc24d1017ff33cd604c5d760040d140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e70700fbc24d1017ff33cd6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 24 12:32:34 2016 +0200 schannel: Add declarations for SECPKG version 7. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 57271ca1869067f1556ca0c2bc3e45884bb013a0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/schannel/lsamode.c | 4 +++- dlls/schannel/tests/main.c | 6 +++++- include/ntsecpkg.h | 12 +++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/schannel/lsamode.c b/dlls/schannel/lsamode.c index f43150e..96ca240 100644 --- a/dlls/schannel/lsamode.c +++ b/dlls/schannel/lsamode.c @@ -115,6 +115,7 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* GetCredUIContext */ NULL, /* UpdateCredentials */ NULL, /* ValidateTargetInfo */ + NULL, /* PostLogonUser */ }, { NULL, /* InitializePackage */ NULL, /* LsaLogonUser */ @@ -151,6 +152,7 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* GetCredUIContext */ NULL, /* UpdateCredentials */ NULL, /* ValidateTargetInfo */ + NULL, /* PostLogonUser */ } }; @@ -162,7 +164,7 @@ NTSTATUS WINAPI SpLsaModeInitialize(ULONG LsaVersion, PULONG PackageVersion, { TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); - *PackageVersion = SECPKG_INTERFACE_VERSION_6; + *PackageVersion = SECPKG_INTERFACE_VERSION_7; *pcTables = 2; *ppTables = secPkgFunctionTable; diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index d8ade9a..4240dd7 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -43,7 +43,9 @@ QueryMetaData) #define SECPKG_FUNCTION_TABLE_SIZE_5 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ ValidateTargetInfo) -#define SECPKG_FUNCTION_TABLE_SIZE_6 sizeof(SECPKG_FUNCTION_TABLE) +#define SECPKG_FUNCTION_TABLE_SIZE_6 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ + PostLogonUser) +#define SECPKG_FUNCTION_TABLE_SIZE_7 sizeof(SECPKG_FUNCTION_TABLE) #define LSA_BASE_CAPS ( \ SECPKG_FLAG_INTEGRITY | \ @@ -152,6 +154,8 @@ static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, size = SECPKG_FUNCTION_TABLE_SIZE_5; else if (Version == SECPKG_INTERFACE_VERSION_6) size = SECPKG_FUNCTION_TABLE_SIZE_6; + else if (Version == SECPKG_INTERFACE_VERSION_7) + size = SECPKG_FUNCTION_TABLE_SIZE_7; else { ok(FALSE, "Unknown package version 0x%x\n", Version); return NULL; diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index b83d364..0df345d 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -37,6 +37,7 @@ extern "C" { #define SECPKG_INTERFACE_VERSION_4 0x80000 #define SECPKG_INTERFACE_VERSION_5 0x100000 #define SECPKG_INTERFACE_VERSION_6 0x200000 +#define SECPKG_INTERFACE_VERSION_7 0x400000 /* enum definitions for Secure Service Provider/Authentication Packages */ typedef enum _LSA_TOKEN_INFORMATION_TYPE { @@ -147,11 +148,17 @@ typedef struct _SECPKG_EXTENDED_INFORMATION { } Info; } SECPKG_EXTENDED_INFORMATION, *PSECPKG_EXTENDED_INFORMATION; -typedef struct _SECPKG_TARGETINFO { +typedef struct _SECPKG_TARGETINFO { PSID DomainSid; PCWSTR ComputerName; } SECPKG_TARGETINFO, *PSECPKG_TARGETINFO; +typedef struct _SECPKG_POST_LOGON_USER_INFO { + ULONG Flags; + LUID LogonId; + LUID LinkedLogonId; +} SECPKG_POST_LOGON_USER_INFO, *PSECPKG_POST_LOGON_USER_INFO; + /* callbacks implemented by SSP/AP dlls and called by the LSA */ typedef VOID (NTAPI *PLSA_CALLBACK_FUNCTION)(ULONG_PTR, ULONG_PTR, PSecBuffer, PSecBuffer); @@ -365,6 +372,7 @@ typedef NTSTATUS (NTAPI SpUpdateCredentialsFn)(LSA_SEC_HANDLE, GUID *, ULONG, PUCHAR); typedef NTSTATUS (NTAPI SpValidateTargetInfoFn)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PSECPKG_TARGETINFO); +typedef NTSTATUS (NTAPI LSA_AP_POST_LOGON_USER)(PSECPKG_POST_LOGON_USER_INFO); /* User-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI SpInstanceInitFn)(ULONG, PSECPKG_DLL_FUNCTIONS, @@ -435,6 +443,8 @@ typedef struct SECPKG_FUNCTION_TABLE { /* Packages with version SECPKG_INTERFACE_VERSION_5 end here */ SpValidateTargetInfoFn *ValidateTargetInfo; /* Packages with version SECPKG_INTERFACE_VERSION_6 end here */ + LSA_AP_POST_LOGON_USER* PostLogonUser; + /* Packages with version SECPKG_INTERFACE_VERSION_7 end here */ } SECPKG_FUNCTION_TABLE, *PSECPKG_FUNCTION_TABLE;

1 0

Nikolay Sivov : gdi32: Increase first gdi handle value.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 1d16503ea2d6bc2b026c10ab0ac70101fb774283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d16503ea2d6bc2b026c10ab0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 23:36:03 2016 +0300 gdi32: Increase first gdi handle value. Due to 32->16bit handle truncation low enough handle values could be misinterpreted as stock brushes indices in FillRect(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4161f5120b59d916e1818748f0d0ced7c7a76303) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/gdiobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index e861f24..237544d 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); -#define FIRST_GDI_HANDLE 16 +#define FIRST_GDI_HANDLE 32 #define MAX_GDI_HANDLES 16384 struct hdc_list

1 0

Austin English : wine.inf: Create Microsoft Shared/TextConv directory.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 644bfeca2ea5c0f2c497dfe8c534e772524e4a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=644bfeca2ea5c0f2c497dfe8c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 25 01:18:31 2016 -0500 wine.inf: Create Microsoft Shared/TextConv directory. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 09cc2b93217b00ce4b53d79ff12409c3e4c8c9bf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d47b57c..ce51168 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2582,6 +2582,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Internet Explorer,iexplore.exe 16422,Windows Media Player,wmplayer.exe 16422,Windows NT\Accessories,wordpad.exe +16427,Microsoft Shared\TextConv, 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 11,,*

1 0

Jean-Christophe Cardot : winhlp32: Fix some images not shown in certain 16-bit help files.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 87fb704898b007852284a3d3b9559c72af1a3f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fb704898b007852284a3d3b… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Fri Apr 15 12:08:03 2016 +0200 winhlp32: Fix some images not shown in certain 16-bit help files. Subfiles with bitmap images are usually prefixed with '|', but sometimes not. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 91f89b4f96674024b3436423ddb188e838d1ca54) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/hlpfile.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index ab75b2a..3669d11 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -507,6 +507,18 @@ static BOOL HLPFILE_FindSubFile(HLPFILE* hlpfile, LPCSTR name, BYTE **subbuf, BY WINE_TRACE("looking for file '%s'\n", name); ptr = HLPFILE_BPTreeSearch(hlpfile->file_buffer + GET_UINT(hlpfile->file_buffer, 4), name, comp_FindSubFile); + if (!ptr) + { /* Subfiles with bitmap images are usually prefixed with '|', but sometimes not. + Unfortunately, there is no consensus among different pieces of unofficial + documentation. So remove leading '|' and try again. */ + CHAR c = *name++; + if (c == '|') + { + WINE_TRACE("not found. try '%s'\n", name); + ptr = HLPFILE_BPTreeSearch(hlpfile->file_buffer + GET_UINT(hlpfile->file_buffer, 4), + name, comp_FindSubFile); + } + } if (!ptr) return FALSE; *subbuf = hlpfile->file_buffer + GET_UINT(ptr, strlen(name)+1); if (*subbuf >= hlpfile->file_buffer + hlpfile->file_buffer_size)

1 0

Alexander Lakhin : user32: Send the correct WM_CTLCOLOR* message in button WM_SETTEXT handler.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 3cf5d768a060b42c51e4ba2479cd7eb85ec1b99a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf5d768a060b42c51e4ba247… Author: Alexander Lakhin <exclusion(a)gmail.com> Date: Tue Apr 19 22:14:49 2016 +0200 user32: Send the correct WM_CTLCOLOR* message in button WM_SETTEXT handler. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 35ab5f4499185f8df0504b95a99613fa4e30440a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/button.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 9c52147..efd74f9 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -389,13 +389,18 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, HBRUSH hbrush; RECT client, rc; HWND parent = GetParent(hWnd); + UINT message = (btn_type == BS_PUSHBUTTON || + btn_type == BS_DEFPUSHBUTTON || + btn_type == BS_USERBUTTON || + btn_type == BS_OWNERDRAW) ? + WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; if (!parent) parent = hWnd; - hbrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hWnd); + hbrush = (HBRUSH)SendMessageW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); if (!hbrush) /* did the app forget to call DefWindowProc ? */ - hbrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hWnd); + hbrush = (HBRUSH)DefWindowProcW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); GetClientRect(hWnd, &client); rc = client;

1 0

Sebastian Lackner : user32/tests: Add tests for button WM_CTLCOLOR* messages.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: b1ad817b574269363e9c3bdd16b17137746fa411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ad817b574269363e9c3bdd1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 19 22:15:05 2016 +0200 user32/tests: Add tests for button WM_CTLCOLOR* messages. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2c180741e154a73a502c3aff1a15f9e990c2aac4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/msg.c | 87 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 58e1437..12b0855 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5372,6 +5372,35 @@ static const struct message WmSetFontStaticSeq[] = { WM_CTLCOLORSTATIC, sent|defwinproc }, { 0 } }; +static const struct message WmSetTextButtonSeq[] = +{ + { WM_SETTEXT, sent }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_COMMAND, sent|parent|optional }, + { WM_DRAWITEM, sent|parent|optional }, + { 0 } +}; +static const struct message WmSetTextStaticSeq[] = +{ + { WM_SETTEXT, sent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { 0 } +}; +static const struct message WmSetTextGroupSeq[] = +{ + { WM_SETTEXT, sent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, /* FIXME: Missing in Wine */ + { WM_CTLCOLORSTATIC, sent|parent|optional }, /* FIXME: Missing in Wine */ + { 0 } +}; +static const struct message WmSetTextInvisibleSeq[] = +{ + { WM_SETTEXT, sent }, + { 0 } +}; static const struct message WmSetStyleButtonSeq[] = { { BM_SETSTYLE, sent }, @@ -5541,51 +5570,63 @@ static void test_button_messages(void) const struct message *lbuttondown; const struct message *lbuttonup; const struct message *setfont; + const struct message *settext; } button[] = { { BS_PUSHBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, { BS_DEFPUSHBUTTON, DLGC_BUTTON | DLGC_DEFPUSHBUTTON, WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, { BS_CHECKBOX, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_AUTOCHECKBOX, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_RADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_3STATE, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_AUTO3STATE, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_GROUPBOX, DLGC_STATIC, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckIgnoredSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextGroupSeq }, { BS_USERBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleUserSeq, WmSetStateUserSeq, WmClearStateButtonSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, { BS_AUTORADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - NULL /* avoid infinite loop */, WmLButtonUpBrokenSeq, WmSetFontStaticSeq }, + NULL /* avoid infinite loop */, WmLButtonUpBrokenSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_OWNERDRAW, DLGC_BUTTON, WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq, WmSetStyleOwnerdrawSeq, WmSetStateOwnerdrawSeq, WmClearStateOwnerdrawSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, }; unsigned int i; HWND hwnd, parent; @@ -5719,6 +5760,30 @@ static void test_button_messages(void) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(button[i].setcheck, "BM_SETCHECK on a button", FALSE); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 1"); + sprintf(desc, "button[%i]: WM_SETTEXT on a visible button", i); + ok_sequence(button[i].settext, desc, FALSE); + + ShowWindow(hwnd, SW_HIDE); + flush_events(); + flush_sequence(); + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 2"); + sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); + ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + + ShowWindow(hwnd, SW_SHOW); + ShowWindow(parent, SW_HIDE); + flush_events(); + flush_sequence(); + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 3"); + sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); + ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + + ShowWindow(parent, SW_SHOW); + flush_events(); + state = SendMessageA(hwnd, BM_GETCHECK, 0, 0); if (button[i].style == BS_PUSHBUTTON || button[i].style == BS_DEFPUSHBUTTON ||

1 0

Alexander Lakhin : user32: Send WM_CTLCOLOR* message only for visible buttons.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: stable Commit: 3512282bafcfe46309f1996ec9c14e267f816bd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3512282bafcfe46309f1996ec… Author: Alexander Lakhin <exclusion(a)gmail.com> Date: Tue Apr 19 22:15:24 2016 +0200 user32: Send WM_CTLCOLOR* message only for visible buttons. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bc3f40e21a4beaaabd2d865838bef99a3d12f908) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/button.c | 53 ++++++++++++++++++++++++++----------------------- dlls/user32/tests/msg.c | 4 ++-- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index efd74f9..13fc746 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -385,31 +385,34 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, case WM_SETTEXT: { /* Clear an old text here as Windows does */ - HDC hdc = GetDC(hWnd); - HBRUSH hbrush; - RECT client, rc; - HWND parent = GetParent(hWnd); - UINT message = (btn_type == BS_PUSHBUTTON || - btn_type == BS_DEFPUSHBUTTON || - btn_type == BS_USERBUTTON || - btn_type == BS_OWNERDRAW) ? - WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; - - if (!parent) parent = hWnd; - hbrush = (HBRUSH)SendMessageW(parent, message, - (WPARAM)hdc, (LPARAM)hWnd); - if (!hbrush) /* did the app forget to call DefWindowProc ? */ - hbrush = (HBRUSH)DefWindowProcW(parent, message, - (WPARAM)hdc, (LPARAM)hWnd); - - GetClientRect(hWnd, &client); - rc = client; - BUTTON_CalcLabelRect(hWnd, hdc, &rc); - /* Clip by client rect bounds */ - if (rc.right > client.right) rc.right = client.right; - if (rc.bottom > client.bottom) rc.bottom = client.bottom; - FillRect(hdc, &rc, hbrush); - ReleaseDC(hWnd, hdc); + if (IsWindowVisible(hWnd)) + { + HDC hdc = GetDC(hWnd); + HBRUSH hbrush; + RECT client, rc; + HWND parent = GetParent(hWnd); + UINT message = (btn_type == BS_PUSHBUTTON || + btn_type == BS_DEFPUSHBUTTON || + btn_type == BS_USERBUTTON || + btn_type == BS_OWNERDRAW) ? + WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; + + if (!parent) parent = hWnd; + hbrush = (HBRUSH)SendMessageW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); + if (!hbrush) /* did the app forget to call DefWindowProc ? */ + hbrush = (HBRUSH)DefWindowProcW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); + + GetClientRect(hWnd, &client); + rc = client; + BUTTON_CalcLabelRect(hWnd, hdc, &rc); + /* Clip by client rect bounds */ + if (rc.right > client.right) rc.right = client.right; + if (rc.bottom > client.bottom) rc.bottom = client.bottom; + FillRect(hdc, &rc, hbrush); + ReleaseDC(hWnd, hdc); + } if (unicode) DefWindowProcW( hWnd, WM_SETTEXT, wParam, lParam ); else DefWindowProcA( hWnd, WM_SETTEXT, wParam, lParam ); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 12b0855..c214ecd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5770,7 +5770,7 @@ static void test_button_messages(void) SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 2"); sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); - ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + ok_sequence(WmSetTextInvisibleSeq, desc, FALSE); ShowWindow(hwnd, SW_SHOW); ShowWindow(parent, SW_HIDE); @@ -5779,7 +5779,7 @@ static void test_button_messages(void) SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 3"); sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); - ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + ok_sequence(WmSetTextInvisibleSeq, desc, FALSE); ShowWindow(parent, SW_SHOW); flush_events();

1 0