October 2018 - Wine-devel - list.winehq.org

[PATCH] winedump: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 22 Oct '18

22 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winedump/lib.c | 4 ++-- tools/winedump/pe.c | 2 +- tools/winedump/tlb.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c index f593515d68..5a7c33aa8b 100644 --- a/tools/winedump/lib.c +++ b/tools/winedump/lib.c @@ -68,8 +68,8 @@ static void dump_import_object(const IMPORT_OBJECT_HEADER *ioh) name = (const char *)ioh + sizeof(*ioh); printf(" DLL name : %s\n", name + strlen(name) + 1); printf(" Symbol name : %s\n", name); - printf(" Type : %s\n", (ioh->Type < sizeof(obj_type)/sizeof(obj_type[0])) ? obj_type[ioh->Type] : "unknown"); - printf(" Name type : %s\n", (ioh->NameType < sizeof(name_type)/sizeof(name_type[0])) ? name_type[ioh->NameType] : "unknown"); + printf(" Type : %s\n", (ioh->Type < ARRAY_SIZE(obj_type)) ? obj_type[ioh->Type] : "unknown"); + printf(" Name type : %s\n", (ioh->NameType < ARRAY_SIZE(name_type)) ? name_type[ioh->NameType] : "unknown"); printf(" %-13s: %u\n", (ioh->NameType == IMPORT_OBJECT_ORDINAL) ? "Ordinal" : "Hint", ioh->u.Ordinal); printf("\n"); } diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 7bbb576104..ca41bb7439 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1654,7 +1654,7 @@ static const char *get_resource_type( unsigned int id ) "RT_MANIFEST" }; - if ((size_t)id < sizeof(types)/sizeof(types[0])) return types[id]; + if ((size_t)id < ARRAY_SIZE(types)) return types[id]; return NULL; } diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index bed53933be..c55c6a9f23 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -1000,7 +1000,7 @@ static void dump_msft_segdir(void) print_begin_block("SegDir"); - for(i=0; i < sizeof(segdir)/sizeof(segdir[0]); i++) + for(i=0; i < ARRAY_SIZE(segdir); i++) dump_msft_seg(segdir+i); print_end_block(); @@ -1010,7 +1010,7 @@ static BOOL dump_offset(void) { int i; - for(i=0; i < sizeof(segdir)/sizeof(segdir[0]); i++) + for(i=0; i < ARRAY_SIZE(segdir); i++) if(segdir[i].offset == offset) return segdir[i].func(segdir+i); -- 2.14.5

1 0

[PATCH] server: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 22 Oct '18

22 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/clipboard.c | 2 +- server/directory.c | 2 +- server/fd.c | 10 +++++----- server/mapping.c | 2 +- server/queue.c | 4 ++-- server/registry.c | 18 +++++++++--------- server/token.c | 11 +++++------ server/trace.c | 2 +- 8 files changed, 25 insertions(+), 26 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index 160eb46959..162725b2ea 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -214,7 +214,7 @@ static int synthesize_formats( struct clipboard *clipboard ) else free( data ); } - for (i = 0; i < sizeof(formats) / sizeof(formats[0]); i++) + for (i = 0; i < ARRAY_SIZE( formats ); i++) { if (HAS_FORMAT( map, formats[i][0] )) continue; if (HAS_FORMAT( map, formats[i][1] )) from = formats[i][1]; diff --git a/server/directory.c b/server/directory.c index 7ffaedc462..6aa3a55f35 100644 --- a/server/directory.c +++ b/server/directory.c @@ -421,7 +421,7 @@ void init_directories(void) make_object_static( link_mailslot ); /* events */ - for (i = 0; i < sizeof(kernel_events)/sizeof(kernel_events[0]); i++) + for (i = 0; i < ARRAY_SIZE( kernel_events ); i++) { struct event *event = create_event( &dir_kernel->obj, &kernel_events[i], 0, 1, 0, NULL ); make_object_static( (struct object *)event ); diff --git a/server/fd.c b/server/fd.c index b26b111d76..4d077972eb 100644 --- a/server/fd.c +++ b/server/fd.c @@ -535,7 +535,7 @@ static inline void main_loop_epoll(void) if (!active_users) break; /* last user removed by a timeout */ if (epoll_fd == -1) break; /* an error occurred with epoll */ - ret = epoll_wait( epoll_fd, events, sizeof(events)/sizeof(events[0]), timeout ); + ret = epoll_wait( epoll_fd, events, ARRAY_SIZE( events ), timeout ); set_current_time(); /* put the events into the pollfd array first, like poll does */ @@ -646,9 +646,9 @@ static inline void main_loop_epoll(void) ts.tv_sec = timeout / 1000; ts.tv_nsec = (timeout % 1000) * 1000000; - ret = kevent( kqueue_fd, NULL, 0, events, sizeof(events)/sizeof(events[0]), &ts ); + ret = kevent( kqueue_fd, NULL, 0, events, ARRAY_SIZE( events ), &ts ); } - else ret = kevent( kqueue_fd, NULL, 0, events, sizeof(events)/sizeof(events[0]), NULL ); + else ret = kevent( kqueue_fd, NULL, 0, events, ARRAY_SIZE( events ), NULL ); set_current_time(); @@ -750,9 +750,9 @@ static inline void main_loop_epoll(void) ts.tv_sec = timeout / 1000; ts.tv_nsec = (timeout % 1000) * 1000000; - ret = port_getn( port_fd, events, sizeof(events)/sizeof(events[0]), &nget, &ts ); + ret = port_getn( port_fd, events, ARRAY_SIZE( events ), &nget, &ts ); } - else ret = port_getn( port_fd, events, sizeof(events)/sizeof(events[0]), &nget, NULL ); + else ret = port_getn( port_fd, events, ARRAY_SIZE( events ), &nget, NULL ); if (ret == -1) break; /* an error occurred with event completion */ diff --git a/server/mapping.c b/server/mapping.c index affe8fcffa..bc59b21b96 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -695,7 +695,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s /* load the section headers */ pos += sizeof(nt.Signature) + sizeof(nt.FileHeader) + nt.FileHeader.SizeOfOptionalHeader; - if (nt.FileHeader.NumberOfSections > sizeof(sec)/sizeof(sec[0])) return STATUS_INVALID_IMAGE_FORMAT; + if (nt.FileHeader.NumberOfSections > ARRAY_SIZE( sec )) return STATUS_INVALID_IMAGE_FORMAT; size = sizeof(*sec) * nt.FileHeader.NumberOfSections; if (!mapping->size) mapping->size = mapping->image.map_size; else if (mapping->size > mapping->image.map_size) return STATUS_SECTION_TOO_BIG; diff --git a/server/queue.c b/server/queue.c index c479b388bd..f274dfb7aa 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1666,7 +1666,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons queue_hardware_message( desktop, msg, 0 ); } - for (i = 0; i < sizeof(messages)/sizeof(messages[0]); i++) + for (i = 0; i < ARRAY_SIZE( messages ); i++) { if (!messages[i]) continue; if (!(flags & (1 << i))) continue; @@ -1695,7 +1695,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons if (hook_flags & SEND_HWMSG_INJECTED) msg_data->flags = LLMHF_INJECTED; /* specify a sender only when sending the last message */ - if (!(flags & ((1 << sizeof(messages)/sizeof(messages[0])) - 1))) + if (!(flags & ((1 << ARRAY_SIZE( messages )) - 1))) { if (!(wait = send_hook_ll_message( desktop, msg, input, sender ))) queue_hardware_message( desktop, msg, 0 ); diff --git a/server/registry.c b/server/registry.c index 8ad97d4987..9e6815d8e3 100644 --- a/server/registry.c +++ b/server/registry.c @@ -178,7 +178,7 @@ static const struct object_ops key_ops = static inline int is_wow6432node( const WCHAR *name, unsigned int len ) { return (len == sizeof(wow6432node) && - !memicmpW( name, wow6432node, sizeof(wow6432node)/sizeof(WCHAR) )); + !memicmpW( name, wow6432node, ARRAY_SIZE( wow6432node ))); } /* @@ -439,9 +439,9 @@ static inline void get_req_path( struct unicode_str *str, int skip_root ) str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); if (skip_root && str->len >= sizeof(root_name) && - !memicmpW( str->str, root_name, sizeof(root_name)/sizeof(WCHAR) )) + !memicmpW( str->str, root_name, ARRAY_SIZE( root_name ))) { - str->str += sizeof(root_name)/sizeof(WCHAR); + str->str += ARRAY_SIZE( root_name ); str->len -= sizeof(root_name); } } @@ -691,8 +691,8 @@ static struct key *follow_symlink( struct key *key, int iteration ) path.str = value->data; path.len = (value->len / sizeof(WCHAR)) * sizeof(WCHAR); if (path.len <= sizeof(root_name)) return NULL; - if (memicmpW( path.str, root_name, sizeof(root_name)/sizeof(WCHAR) )) return NULL; - path.str += sizeof(root_name) / sizeof(WCHAR); + if (memicmpW( path.str, root_name, ARRAY_SIZE( root_name ))) return NULL; + path.str += ARRAY_SIZE( root_name ); path.len -= sizeof(root_name); key = root_key; @@ -2052,9 +2052,9 @@ DECL_HANDLER(create_key) class.len = (class.len / sizeof(WCHAR)) * sizeof(WCHAR); if (!objattr->rootdir && name.len >= sizeof(root_name) && - !memicmpW( name.str, root_name, sizeof(root_name)/sizeof(WCHAR) )) + !memicmpW( name.str, root_name, ARRAY_SIZE( root_name ))) { - name.str += sizeof(root_name)/sizeof(WCHAR); + name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); } @@ -2210,9 +2210,9 @@ DECL_HANDLER(load_registry) } if (!objattr->rootdir && name.len >= sizeof(root_name) && - !memicmpW( name.str, root_name, sizeof(root_name)/sizeof(WCHAR) )) + !memicmpW( name.str, root_name, ARRAY_SIZE( root_name ))) { - name.str += sizeof(root_name)/sizeof(WCHAR); + name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); } diff --git a/server/token.c b/server/token.c index 0810a61353..d88f16c4ce 100644 --- a/server/token.c +++ b/server/token.c @@ -791,12 +791,11 @@ struct token *token_create_admin( void ) const SID *user_sid = security_unix_uid_to_sid( getuid() ); ACL *default_dacl = create_default_dacl( user_sid ); - alias_admins_sid = security_sid_alloc( &nt_authority, sizeof(alias_admins_subauth)/sizeof(alias_admins_subauth[0]), + alias_admins_sid = security_sid_alloc( &nt_authority, ARRAY_SIZE( alias_admins_subauth ), alias_admins_subauth ); - alias_users_sid = security_sid_alloc( &nt_authority, sizeof(alias_users_subauth)/sizeof(alias_users_subauth[0]), + alias_users_sid = security_sid_alloc( &nt_authority, ARRAY_SIZE( alias_users_subauth ), alias_users_subauth ); - logon_sid = security_sid_alloc( &nt_authority, sizeof(logon_subauth)/sizeof(logon_subauth[0]), - logon_subauth ); + logon_sid = security_sid_alloc( &nt_authority, ARRAY_SIZE( logon_subauth ), logon_subauth ); if (alias_admins_sid && alias_users_sid && logon_sid && default_dacl) { @@ -836,8 +835,8 @@ struct token *token_create_admin( void ) { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID }, }; static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; - token = create_token( TRUE, user_sid, admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), - admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), default_dacl, + token = create_token( TRUE, user_sid, admin_groups, ARRAY_SIZE( admin_groups ), + admin_privs, ARRAY_SIZE( admin_privs ), default_dacl, admin_source, NULL, -1 ); /* we really need a primary group */ assert( token->primary_group ); diff --git a/server/trace.c b/server/trace.c index 36d30213bd..7ad283a249 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1145,7 +1145,7 @@ static void dump_varargs_filesystem_event( const char *prefix, data_size_t size data_size_t len = (offsetof( struct filesystem_event, name[event->len] ) + sizeof(int)-1) / sizeof(int) * sizeof(int); if (size < len) break; - if (event->action < sizeof(actions)/sizeof(actions[0]) && actions[event->action]) + if (event->action < ARRAY_SIZE( actions ) && actions[event->action]) fprintf( stderr, "{action=%s", actions[event->action] ); else fprintf( stderr, "{action=%u", event->action ); -- 2.14.5

1 0

[PATCH 1/4] dwmapi: add initial tests
by Louis Lenders 22 Oct '18

22 Oct '18

This test and tests in last patch tested on Win7 laptop with DWM service both running and stopped Win7 testbots don`t have DWM service enabled so some tests will be skipped there. On win8 and higher DWM is enabled by default Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- configure | 1 + configure.ac | 1 + dlls/dwmapi/tests/Makefile.in | 5 ++ dlls/dwmapi/tests/dwmapi.c | 92 +++++++++++++++++++++++++++++++++++ include/dwmapi.h | 3 ++ include/winerror.h | 2 + 6 files changed, 104 insertions(+) create mode 100644 dlls/dwmapi/tests/Makefile.in create mode 100644 dlls/dwmapi/tests/dwmapi.c diff --git a/configure b/configure index 9d4a7a8b78..0b780a3576 100755 --- a/configure +++ b/configure @@ -19411,6 +19411,7 @@ wine_fn_config_makefile dlls/dssenh/tests enable_tests wine_fn_config_makefile dlls/dswave enable_dswave wine_fn_config_makefile dlls/dswave/tests enable_tests wine_fn_config_makefile dlls/dwmapi enable_dwmapi +wine_fn_config_makefile dlls/dwmapi/tests enable_tests wine_fn_config_makefile dlls/dwrite enable_dwrite wine_fn_config_makefile dlls/dwrite/tests enable_tests wine_fn_config_makefile dlls/dx8vb enable_dx8vb diff --git a/configure.ac b/configure.ac index b64d99e9d1..ecb5b80e74 100644 --- a/configure.ac +++ b/configure.ac @@ -3264,6 +3264,7 @@ WINE_CONFIG_MAKEFILE(dlls/dssenh/tests) WINE_CONFIG_MAKEFILE(dlls/dswave) WINE_CONFIG_MAKEFILE(dlls/dswave/tests) WINE_CONFIG_MAKEFILE(dlls/dwmapi) +WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests) WINE_CONFIG_MAKEFILE(dlls/dwrite) WINE_CONFIG_MAKEFILE(dlls/dwrite/tests) WINE_CONFIG_MAKEFILE(dlls/dx8vb) diff --git a/dlls/dwmapi/tests/Makefile.in b/dlls/dwmapi/tests/Makefile.in new file mode 100644 index 0000000000..f365f96c72 --- /dev/null +++ b/dlls/dwmapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = dwmapi.dll +IMPORTS = dwmapi + +C_SRCS = \ + dwmapi.c diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c new file mode 100644 index 0000000000..1307206362 --- /dev/null +++ b/dlls/dwmapi/tests/dwmapi.c @@ -0,0 +1,92 @@ +/* + * Unit tests for dwmapi + * + * Copyright 2018 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "dwmapi.h" + +#include "wine/test.h" + +static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL*); +static HRESULT (WINAPI *pDwmEnableComposition)(UINT); + +BOOL dwmenabled; + +static void test_isdwmenabled(void) +{ + HRESULT res; + BOOL ret; + + ret = -1; + res = pDwmIsCompositionEnabled(&ret); + ok((res == S_OK && ret == TRUE) || (res == S_OK && ret == FALSE), "got %x and %d\n", res, ret); + + if (res == S_OK && ret == TRUE) /*to test enable DWM service via services.msc*/ + dwmenabled = TRUE; + else /*to test disable DWM service via services.msc*/ + dwmenabled = FALSE; + + if (dwmenabled) /* disable and reenable dwm*/ + { + ret = -1; + res = pDwmEnableComposition(DWM_EC_DISABLECOMPOSITION); + ok(res == S_OK, "got %x expected S_OK\n", res); + + res = pDwmIsCompositionEnabled(&ret); + ok(res == S_OK && ret == FALSE, "got %x and %d\n", res, ret); + + ret = -1; + res = pDwmEnableComposition(DWM_EC_ENABLECOMPOSITION); + ok(res == S_OK, "got %x\n", res); + + res = pDwmIsCompositionEnabled(&ret); + todo_wine ok(res == S_OK && ret == TRUE, "got %x and %d\n", res, ret); + } + else + { + ret = -1; + res = pDwmEnableComposition(DWM_EC_ENABLECOMPOSITION); /*cannot enable DWM composition this way*/ + todo_wine ok(res == DWM_E_COMPOSITIONDISABLED, "got %x expected S_OK\n", res); + + res = pDwmIsCompositionEnabled(&ret); + ok(res == S_OK && ret == FALSE, "got %x and %d\n", res, ret); + } +} + +START_TEST(dwmapi) +{ + HMODULE hmod = LoadLibraryA("dwmapi.dll"); + + if (!hmod) + { + trace("dwmapi not found, skipping tests\n"); + return; + } + + pDwmIsCompositionEnabled = (void *)GetProcAddress(hmod, "DwmIsCompositionEnabled"); + pDwmEnableComposition = (void *)GetProcAddress(hmod, "DwmEnableComposition"); + + if (!pDwmIsCompositionEnabled || !pDwmEnableComposition) + { + trace("essential function pointers not found, skipping tests\n"); + return; + } + + test_isdwmenabled(); +} diff --git a/include/dwmapi.h b/include/dwmapi.h index b2f39deae5..12527aee62 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -101,6 +101,9 @@ typedef struct _MilMatrix3x2D DOUBLE DY; } MilMatrix3x2D; +#define DWM_EC_DISABLECOMPOSITION 0 +#define DWM_EC_ENABLECOMPOSITION 1 + #define DWM_BB_ENABLE 0x00000001 #define DWM_BB_BLURREGION 0x00000002 #define DWM_BB_TRANSITIONONMAXIMIZED 0x00000004 diff --git a/include/winerror.h b/include/winerror.h index d78c91e84e..a97b405c34 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3090,6 +3090,8 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY _HRESULT_TYPEDEF_(0x80072f8e) #define WININET_E_DECODING_FAILED _HRESULT_TYPEDEF_(0x80072f8f) +#define DWM_E_COMPOSITIONDISABLED _HRESULT_TYPEDEF_(0x80263001) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003) -- 2.17.1

2 5

Integrating FAudio, a reimplementation of XAudio2
by Andrew Eikum 22 Oct '18

22 Oct '18

Hey all, Our current xaudio2 implementation uses OpenAL to do the mixing before sending audio to hardware. We're running up against limitations of the OpenAL API such that it makes sense for us to write our own mixing code. Luckily, someone has already done this. Ethan Lee, who maintains the FNA reimplementation of the XNA game libraries, wrote an implementation of the XAudio2 API called FAudio[1]. FAudio is far more advanced than Wine's current XAudio2 implementation. I'd like to take advantage of his work, rather than re-invent this wheel. Much of this work has already been done, the question is how to upstream the integration into Wine. The licenses are compatible, but the tricky part is Wine isn't the only customer of FAudio, so we have to be mindful of other external requirements on FAudio. I discussed some options with Ethan over private email. You can see the latest reply from Ethan below. I'd like to get more feedback from the community. Does anyone have any other ideas, or strong feelings about the right way to use Ethan's code in Wine? [1] https://github.com/FNA-XNA/FAudio/ Thanks, Andrew ----- Forwarded message from Ethan Lee <flibitijibibo(a)flibitijibibo.com> ----- On 10/18/18 08:40, Andrew Eikum wrote: > On Wed, Oct 17, 2018 at 06:11:37PM -0400, Ethan Lee wrote: > > Since we’re building FAudio directly into the XAudio2 source, how > > should I go about including the source in that folder? I just want to > > be sure I’m doing it in a way that Wine upstream will be okay with; > > codewise I think we’re doing everything okay (no added dependencies, > > FFmpeg is optional, etc.) but since this is effectively a mirror of a > > separate project I wasn’t sure if I needed to do anything more than a > > folder with a README containing FAudio’s Git hash and a date. > > > > Yep, this is going to be the hard part. I can think of a few options, > ranked in order of how I think upstream (Julliard and the rest of the > Wine community) would like it: > > -Make Wine the home of FAudio. We'd import all of the C files, and any > changes to FAudio would have to go through the usual Wine submission > process, including our requirement for tests. You would have to > somehow integrate Wine's source into FNA somehow in order to pull > FAudio into your other builds. The requirement for tests would > actually be a big plus for FAudio in terms of matching Microsoft's > behavior. We aren't sticklers about tests for no reason. I don't know > if this would require a re-license to LGPL; perhaps we can keep just > xaudio2 stuff as zlib. > 1. Probably no to the home change, and definitely no to the license change. One of the big motivations for FAudio's creation was the zlib-licensed implementation, which is mandatory for platforms like iOS/Switch/Sony. Plus, I don't own 100% of the rights, so we'd have to do another relicensing round, which may not go as well as last time. The home change wouldn't be the worst thing but it'd be tough explaining to the average FNA user (and most other devs, now that I think about it) that they have to dig into the Wine tree first. > -Distribute FAudio as a library and build Wine against that. Similar > to how we depend on OpenAL currently. This has some challenges in > terms of getting distro maintainers to bother building it, but I think > it won't be too tough. We can follow VKD3D's lead here in terms of > gathering distro support. If you're not careful when pushing out > FAudio updates, you may break the Wine tests, and our users, which > would be unfortunate (and poorly received by the other Wine devs). > 2. Second best option IMO, though we would need to work around the CoTaskMem exposure in the XAPO/XACT APIs. > -Use a Git submodule. Wine doesn't do this at all currently, but maybe > we could convince them. This would let Wine control precisely which > revision of FAudio is used, preventing regressions due to upstream > changes. It does complicate the Wine build somewhat, and makes > distributing Wine source significantly more complicated. > 3. I'd be okay with this but I could also totally understand why it would be avoided. Git submodules are surprisingly user-unfriendly! We use submodules in FNA but explaining them to new users has definitely taken a few minutes of my time over the years. > -Just copy the source straight over and periodically merge in updates > from FAudio upstream. Git has a subtree-merge feature that can do this > relatively elegantly. This has the disadvantage that we now have two > full copies of the FAudio source that must be maintained, instead of > storing it all at one location. Again, potential licensing > complications. > 4. I think this is the best route, but at the same time I think I can sweeten the deal a whole lot more. One possibility is giving the WASAPI platform entirely to Wine so the team has total control over the platform subsystem (including the license), and while FAudio's core would be primarily developed elsewhere, I can formalize the release process a whole lot more so updates can be reviewed with more consistency, and possibly more participation from Wine maintainers if needed. For example, when Johan sends his xWMA PR the two of us can both do a review of the patchset, and only when both reviews are cleared will we do the merge. At the moment FAudio releases are bundled with FNA releases, which are always on the first of every month, but if the Wine team are more comfortable with FAudio getting dedicated releases (but with the same schedule) I can do that as well.

5 19

[PATCH v2] comctl32: Implement handling of EM_SETCUEBANNER/EM_GETCUEBANNER messages.
by Sergio Gómez Del Real 22 Oct '18

22 Oct '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/comctl32/edit.c | 66 ++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/edit.c | 62 +++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f0180adfbe..f58ceb1a39 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -131,6 +131,7 @@ typedef struct should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ + WCHAR *cue_banner_text; /* * only for multi line controls */ @@ -2181,6 +2182,12 @@ static void EDIT_PaintLine(EDITSTATE *es, HDC dc, INT line, BOOL rev) x += EDIT_PaintText(es, dc, x, y, line, e - li, li + ll - e, FALSE); } else x += EDIT_PaintText(es, dc, x, y, line, 0, ll, FALSE); + + if (!(es->flags & EF_FOCUSED) && es->cue_banner_text && es->text_length == 0) + { + SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT)); + TextOutW(dc, x, y, es->cue_banner_text, strlenW(es->cue_banner_text)); + } } @@ -4152,6 +4159,56 @@ static LRESULT EDIT_EM_GetThumb(EDITSTATE *es) EDIT_WM_HScroll(es, EM_GETTHUMB, 0)); } +/********************************************************************* + * + * EM_SETCUEBANNER + * + */ +static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, const WCHAR *cue_text) +{ + SIZE_T str_size; + + if (es->style & ES_MULTILINE || !cue_text) + return FALSE; + + str_size = strlenW(cue_text); + + if (es->cue_banner_text) + heap_free(es->cue_banner_text); + + es->cue_banner_text = heap_alloc((str_size + 1) * sizeof(WCHAR)); + if (!es->cue_banner_text) + return FALSE; + + memcpy(es->cue_banner_text, cue_text, str_size * sizeof(WCHAR)); + es->cue_banner_text[str_size] = 0; + + return TRUE; +} + +/********************************************************************* + * + * EM_GETCUEBANNER + * + */ +static BOOL EDIT_EM_GetCueBanner(EDITSTATE *es, WCHAR *buf, DWORD size) +{ + if (!es->cue_banner_text) + return FALSE; + else + { + if (size > strlenW(es->cue_banner_text)) + size = strlenW(es->cue_banner_text) + 1; + //lstrcpynW(buf, es->cue_banner_text, strlenW(es->cue_banner_text)+1); + //else if (size > 0) + //{ + memcpy(buf, es->cue_banner_text, (size - 1) * sizeof(WCHAR)); + buf[size-1] = 0; + // } + return TRUE; + } +} + /******************************************************************** * @@ -4489,6 +4546,7 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) SetWindowLongPtrW( es->hwndSelf, 0, 0 ); heap_free(es->undo_text); + heap_free(es->cue_banner_text); heap_free(es); return 0; @@ -4703,6 +4761,14 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR result = EDIT_EM_CharFromPos(es, (short)LOWORD(lParam), (short)HIWORD(lParam)); break; + case EM_SETCUEBANNER: + result = EDIT_EM_SetCueBanner(es, (const WCHAR *)lParam); + break; + + case EM_GETCUEBANNER: + result = EDIT_EM_GetCueBanner(es, (WCHAR *)wParam, (DWORD)lParam); + break; + /* End of the EM_ messages which were in numerical order; what order * are these in? vaguely alphabetical? */ diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index a5097d1cbb..5ab013efb3 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3061,6 +3061,67 @@ static const struct message killfocus_combined_seq[] = { 0 } }; +static void test_cue_banner(void) +{ + HWND hwnd_edit; + BOOL ret; + static WCHAR testW[5] = {'T','e','s','t',0}; + static WCHAR testcmp1W[] = {'T','e','s','t',0}; + static WCHAR testcmp2W[] = {'T','e','s',0}; + static WCHAR getcuetestW[5]; + static WCHAR emptyW[] = {0}; + + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_SETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + if (ret == FALSE) + { + win_skip("skipping for Win XP and 2003 Server.\n"); + DestroyWindow(hwnd_edit); + return; + } + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, testW) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)emptyW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, emptyW) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + /* EM_GETCUEBANNER's buffer size includes null char */ + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + memset(testW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)testW, (LPARAM)lstrlenW(testcmp1W)+1); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(testW, testcmp1W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(testW)); + memset(testW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)testW, (LPARAM)lstrlenW(testcmp1W)); + ok(lstrcmpW(testW, testcmp2W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(testW)); + DestroyWindow(hwnd_edit); + + /* setting cue banner fails for multi-line edit controls */ + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0); + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testW); + ok(ret == FALSE, "EM_SETCUEBANNER.\n"); + + DestroyWindow(hwnd_edit); +} + static void test_change_focus(void) { HWND hwnd, parent_wnd; @@ -3138,6 +3199,7 @@ START_TEST(edit) test_EM_GETLINE(); test_wordbreak_proc(); test_change_focus(); + test_cue_banner(); UnregisterWindowClasses(); -- 2.17.1

1 0

[PATCH] comctl32: Implement handling of EM_SETCUEBANNER/EM_GETCUEBANNER messages.
by Sergio Gómez Del Real 22 Oct '18

22 Oct '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/comctl32/edit.c | 64 ++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/edit.c | 62 ++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f0180adfbe..9800b84749 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -131,6 +131,7 @@ typedef struct should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ + LPWSTR cue_banner_text; /* cue banner string */ /* * only for multi line controls */ @@ -2181,6 +2182,12 @@ static void EDIT_PaintLine(EDITSTATE *es, HDC dc, INT line, BOOL rev) x += EDIT_PaintText(es, dc, x, y, line, e - li, li + ll - e, FALSE); } else x += EDIT_PaintText(es, dc, x, y, line, 0, ll, FALSE); + + if (!(es->flags & EF_FOCUSED) && es->cue_banner_text && es->text_length == 0) + { + SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT)); + TextOutW(dc, x, y, es->cue_banner_text, strlenW(es->cue_banner_text)); + } } @@ -4152,6 +4159,54 @@ static LRESULT EDIT_EM_GetThumb(EDITSTATE *es) EDIT_WM_HScroll(es, EM_GETTHUMB, 0)); } +/********************************************************************* + * + * EM_SETCUEBANNER + * + */ +static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, BOOL focus, const WCHAR *cue_text) +{ + SIZE_T str_size; + + if (es->style & ES_MULTILINE || !cue_text) + return FALSE; + + str_size = strlenW(cue_text); + + if (es->cue_banner_text) + heap_free(es->cue_banner_text); + + es->cue_banner_text = heap_alloc_zero(ROUND_TO_GROW((str_size + 1) * sizeof(WCHAR))); + if (!es->cue_banner_text) + return FALSE; + + memcpy(es->cue_banner_text, cue_text, str_size * sizeof(WCHAR)); + + return TRUE; +} + +/********************************************************************* + * + * EM_GETCUEBANNER + * + */ +static BOOL EDIT_EM_GetCueBanner(EDITSTATE *es, WCHAR *buf, DWORD size) +{ + if (!es->cue_banner_text) + return FALSE; + else + { + if (size > strlenW(es->cue_banner_text)) + lstrcpynW(buf, es->cue_banner_text, strlenW(es->cue_banner_text)+1); + else if (size > 0) + { + memcpy(buf, es->cue_banner_text, (size - 1) * sizeof(WCHAR)); + buf[size-1] = 0; + } + return TRUE; + } +} + /******************************************************************** * @@ -4490,6 +4545,7 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) SetWindowLongPtrW( es->hwndSelf, 0, 0 ); heap_free(es->undo_text); heap_free(es); + heap_free(es->cue_banner_text); return 0; } @@ -4703,6 +4759,14 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR result = EDIT_EM_CharFromPos(es, (short)LOWORD(lParam), (short)HIWORD(lParam)); break; + case EM_SETCUEBANNER: + result = EDIT_EM_SetCueBanner(es, (BOOL)wParam, (const WCHAR *)lParam); + break; + + case EM_GETCUEBANNER: + result = EDIT_EM_GetCueBanner(es, (WCHAR *)wParam, (DWORD)lParam); + break; + /* End of the EM_ messages which were in numerical order; what order * are these in? vaguely alphabetical? */ diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index a5097d1cbb..030c614344 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3061,6 +3061,67 @@ static const struct message killfocus_combined_seq[] = { 0 } }; +static void test_cue_banner(void) +{ + HWND hwnd_edit; + BOOL ret; + static WCHAR testW[80] = {'T','e','s','t',0}; + static WCHAR testcmp1W[] = {'T','e','s','t',0}; + static WCHAR testcmp2W[] = {'T','e','s',0}; + static WCHAR getcuetestW[5]; + static WCHAR emptyW[] = {0}; + + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + ret = (BOOL)SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = (BOOL)SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_SETCUEBANNER should have returned FALSE.\n"); + + ret = (BOOL)SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = (BOOL)SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = (BOOL)SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, testW) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + ret = (BOOL)SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)emptyW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = (BOOL)SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, emptyW) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + /* EM_GETCUEBANNER's buffer size includes null char */ + ret = (BOOL)SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + memset(testW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = (BOOL)SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)testW, (LPARAM)lstrlenW(testcmp1W)+1); + ok(ret == TRUE || + broken(ret == FALSE), /* Win XP */ + "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(testW, testcmp1W) == 0 || + broken(lstrcmpW(testW, testcmp1W) == -1), /* Win XP, Server 2003 */ + "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(testW)); + memset(testW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = (BOOL)SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)testW, (LPARAM)lstrlenW(testcmp1W)); + ok(lstrcmpW(testW, testcmp2W) == 0 || + broken(lstrcmpW(testW, testcmp1W) == -1), /* Win XP, Server 2003 */ + "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(testW)); + DestroyWindow(hwnd_edit); + + /* setting cue banner fails for multi-line edit controls */ + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0); + ret = (BOOL)SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testW); + ok(ret == FALSE, "EM_SETCUEBANNER.\n"); + + DestroyWindow(hwnd_edit); +} + static void test_change_focus(void) { HWND hwnd, parent_wnd; @@ -3138,6 +3199,7 @@ START_TEST(edit) test_EM_GETLINE(); test_wordbreak_proc(); test_change_focus(); + test_cue_banner(); UnregisterWindowClasses(); -- 2.17.1

3 2

[PATCH] winex11.drv: Force changing lock keys state if hooks blocked keyboard input processing.
by Jacek Caban 22 Oct '18

22 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This fixes https://github.com/ValveSoftware/Proton/issues/911 If the game is ran with numlock enabled, Wine will try to sync on the first key event. The game uses dinput in exclusive mode, so our low level keyboard hook prevents simulated numlock press in update_lock_state. Thus, we simulate the same key press again on following key events. It means that all key events will result in two events on Wine side: (simulated) numlock press and the actual key press. The patch avoids that by forcing Wine-side state to be the same as X server state. For this particular case, the game could theoretically be fixed on dinput side (as part of rewrite on top of HID?), but it's still a bug in winex11.drv that any other hooks could expose. dlls/winex11.drv/keyboard.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-)

1 0

[PATCH] gdiplus: Implement GdipMultiplyPenTransform().
by Nikolay Sivov 22 Oct '18

22 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/pen.c | 7 +------ dlls/gdiplus/tests/pen.c | 35 +++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 1f18f3f5a3..ad45bcb5d5 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -496,17 +496,12 @@ GpStatus WINGDIPAPI GdipRotatePenTransform(GpPen *pen, REAL angle, GpMatrixOrder GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *pen, GDIPCONST GpMatrix *matrix, GpMatrixOrder order) { - static int calls; - TRACE("(%p,%p,%u)\n", pen, matrix, order); if(!pen) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + return GdipMultiplyMatrix(&pen->transform, matrix, order); } GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 6f69c3b8b4..530967afb2 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -553,6 +553,41 @@ static void test_transform(void) expectf(1.0, values[4]); expectf(-2.0, values[5]); + /* Multiply */ + status = GdipResetPenTransform(pen); + expect(Ok, status); + + status = GdipSetMatrixElements(matrix, 2.0, 1.0, 1.0, 4.0, 1.0, 2.0); + expect(Ok, status); + + status = GdipMultiplyPenTransform(NULL, matrix, MatrixOrderPrepend); + expect(InvalidParameter, status); + + status = GdipMultiplyPenTransform(pen, matrix, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(2.0, values[0]); + expectf(1.0, values[1]); + expectf(1.0, values[2]); + expectf(4.0, values[3]); + expectf(1.0, values[4]); + expectf(2.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipMultiplyPenTransform(pen, matrix, MatrixOrderAppend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(-2.0, values[0]); + expectf(-36.0, values[1]); + expectf(-36.0, values[2]); + expectf(-158.0, values[3]); + expectf(-15.0, values[4]); + expectf(-76.0, values[5]); + GdipDeletePen(pen); GdipDeleteMatrix(matrix); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 628db82d45..5593ac51b6 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -629,6 +629,7 @@ GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen*,REAL*); GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*); GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *, GpMatrix *); +GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *,GDIPCONST GpMatrix *,GpMatrixOrder); GpStatus WINGDIPAPI GdipResetPenTransform(GpPen*); GpStatus WINGDIPAPI GdipScalePenTransform(GpPen*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); -- 2.19.1

2 1

[PATCH] d2d1: Implement d2d_device_context_ID2D1DeviceContext_DrawGlyphRun().
by Nikolay Sivov 22 Oct '18

22 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 156 +++++++++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 77 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 2593413661..97ed17394a 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1344,85 +1344,10 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGlyphRun(ID2D1DeviceContext D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, DWRITE_MEASURING_MODE measuring_mode) { - struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); - DWRITE_TEXT_ANTIALIAS_MODE antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE; - IDWriteRenderingParams *rendering_params; - DWRITE_RENDERING_MODE rendering_mode; - HRESULT hr; - TRACE("iface %p, baseline_origin %s, glyph_run %p, brush %p, measuring_mode %#x.\n", iface, debug_d2d_point_2f(&baseline_origin), glyph_run, brush, measuring_mode); - if (FAILED(context->error.code)) - return; - - rendering_params = context->text_rendering_params ? context->text_rendering_params - : context->default_text_rendering_params; - - rendering_mode = IDWriteRenderingParams_GetRenderingMode(rendering_params); - - switch (context->drawing_state.textAntialiasMode) - { - case D2D1_TEXT_ANTIALIAS_MODE_ALIASED: - if (rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL - || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC - || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL - || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC) - { - d2d_device_context_set_error(context, E_INVALIDARG); - } - break; - case D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE: - if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED - || rendering_mode == DWRITE_RENDERING_MODE_OUTLINE) - { - d2d_device_context_set_error(context, E_INVALIDARG); - } - break; - case D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE: - if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED) - d2d_device_context_set_error(context, E_INVALIDARG); - break; - default: - ; - } - - if (FAILED(context->error.code)) - return; - - rendering_mode = DWRITE_RENDERING_MODE_DEFAULT; - switch (context->drawing_state.textAntialiasMode) - { - case D2D1_TEXT_ANTIALIAS_MODE_DEFAULT: - if (IDWriteRenderingParams_GetClearTypeLevel(rendering_params) > 0.0f) - antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; - break; - case D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE: - antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; - break; - case D2D1_TEXT_ANTIALIAS_MODE_ALIASED: - rendering_mode = DWRITE_RENDERING_MODE_ALIASED; - break; - default: - ; - } - - if (rendering_mode == DWRITE_RENDERING_MODE_DEFAULT) - { - if (FAILED(hr = IDWriteFontFace_GetRecommendedRenderingMode(glyph_run->fontFace, glyph_run->fontEmSize, - max(context->desc.dpiX, context->desc.dpiY) / 96.0f, - measuring_mode, rendering_params, &rendering_mode))) - { - ERR("Failed to get recommended rendering mode, hr %#x.\n", hr); - rendering_mode = DWRITE_RENDERING_MODE_OUTLINE; - } - } - - if (rendering_mode == DWRITE_RENDERING_MODE_OUTLINE) - d2d_device_context_draw_glyph_run_outline(context, baseline_origin, glyph_run, brush); - else - d2d_device_context_draw_glyph_run_bitmap(context, baseline_origin, glyph_run, brush, - rendering_mode, measuring_mode, antialias_mode); + ID2D1DeviceContext_DrawGlyphRun(iface, baseline_origin, glyph_run, NULL, brush, measuring_mode); } static void STDMETHODCALLTYPE d2d_device_context_SetTransform(ID2D1DeviceContext *iface, @@ -2145,8 +2070,85 @@ static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_DrawGlyphRun D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, const DWRITE_GLYPH_RUN_DESCRIPTION *glyph_run_desc, ID2D1Brush *brush, DWRITE_MEASURING_MODE measuring_mode) { - FIXME("iface %p, baseline_origin %s, glyph_run %p, glyph_run_desc %p, brush %p, measuring_mode %#x stub!\n", + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + DWRITE_TEXT_ANTIALIAS_MODE antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE; + IDWriteRenderingParams *rendering_params; + DWRITE_RENDERING_MODE rendering_mode; + HRESULT hr; + + TRACE("iface %p, baseline_origin %s, glyph_run %p, glyph_run_desc %p, brush %p, measuring_mode %#x.\n", iface, debug_d2d_point_2f(&baseline_origin), glyph_run, glyph_run_desc, brush, measuring_mode); + + if (FAILED(context->error.code)) + return; + + rendering_params = context->text_rendering_params ? context->text_rendering_params + : context->default_text_rendering_params; + + rendering_mode = IDWriteRenderingParams_GetRenderingMode(rendering_params); + + switch (context->drawing_state.textAntialiasMode) + { + case D2D1_TEXT_ANTIALIAS_MODE_ALIASED: + if (rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL + || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC + || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL + || rendering_mode == DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC) + { + d2d_device_context_set_error(context, E_INVALIDARG); + } + break; + case D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE: + if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED + || rendering_mode == DWRITE_RENDERING_MODE_OUTLINE) + { + d2d_device_context_set_error(context, E_INVALIDARG); + } + break; + case D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE: + if (rendering_mode == DWRITE_RENDERING_MODE_ALIASED) + d2d_device_context_set_error(context, E_INVALIDARG); + break; + default: + ; + } + + if (FAILED(context->error.code)) + return; + + rendering_mode = DWRITE_RENDERING_MODE_DEFAULT; + switch (context->drawing_state.textAntialiasMode) + { + case D2D1_TEXT_ANTIALIAS_MODE_DEFAULT: + if (IDWriteRenderingParams_GetClearTypeLevel(rendering_params) > 0.0f) + antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; + break; + case D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE: + antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; + break; + case D2D1_TEXT_ANTIALIAS_MODE_ALIASED: + rendering_mode = DWRITE_RENDERING_MODE_ALIASED; + break; + default: + ; + } + + if (rendering_mode == DWRITE_RENDERING_MODE_DEFAULT) + { + if (FAILED(hr = IDWriteFontFace_GetRecommendedRenderingMode(glyph_run->fontFace, glyph_run->fontEmSize, + max(context->desc.dpiX, context->desc.dpiY) / 96.0f, + measuring_mode, rendering_params, &rendering_mode))) + { + ERR("Failed to get recommended rendering mode, hr %#x.\n", hr); + rendering_mode = DWRITE_RENDERING_MODE_OUTLINE; + } + } + + if (rendering_mode == DWRITE_RENDERING_MODE_OUTLINE) + d2d_device_context_draw_glyph_run_outline(context, baseline_origin, glyph_run, brush); + else + d2d_device_context_draw_glyph_run_bitmap(context, baseline_origin, glyph_run, brush, + rendering_mode, measuring_mode, antialias_mode); } static void STDMETHODCALLTYPE d2d_device_context_DrawImage(ID2D1DeviceContext *iface, ID2D1Image *image, -- 2.19.1

1 0

[PATCH 4/4] crypt32: Add support for importing public key information to a 3rd party CSP.
by Dmitry Timoshkov 22 Oct '18

22 Oct '18

Based on a patch by Alexander Morozov. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/encode.c | 35 +++++++++++++++++++++++++++++++---- include/wincrypt.h | 1 + 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 9a9850d683..9d052b61c1 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4974,21 +4974,48 @@ BOOL WINAPI CryptImportPublicKeyInfo(HCRYPTPROV hCryptProv, 0, 0, NULL, phKey); } -static BOOL WINAPI CRYPT_ImportRsaPublicKeyInfoEx(HCRYPTPROV hCryptProv, +typedef BOOL (WINAPI *ConvertPublicKeyInfoFunc)(DWORD dwCertEncodingType, + PCERT_PUBLIC_KEY_INFO pInfo, ALG_ID aiKeyAlg, DWORD dwFlags, + BYTE **ppbData, DWORD *dwDataLen); + +static BOOL WINAPI CRYPT_ImportPublicKeyInfoEx(HCRYPTPROV hCryptProv, DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pInfo, ALG_ID aiKeyAlg, DWORD dwFlags, void *pvAuxInfo, HCRYPTKEY *phKey) { + static HCRYPTOIDFUNCSET set = NULL; + ConvertPublicKeyInfoFunc convertFunc = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; BOOL ret; - DWORD pubKeySize = 0; + DWORD pubKeySize; + LPBYTE pubKey; TRACE_(crypt)("(%08lx, %08x, %p, %08x, %08x, %p, %p)\n", hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); + if (!set) + set = CryptInitOIDFunctionSet(CRYPT_OID_CONVERT_PUBLIC_KEY_INFO_FUNC, 0); + CryptGetOIDFunctionAddress(set, dwCertEncodingType, pInfo->Algorithm.pszObjId, + 0, (void **)&convertFunc, &hFunc); + if (convertFunc) + { + pubKey = NULL; + pubKeySize = 0; + ret = convertFunc(dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, &pubKey, &pubKeySize); + if (ret) + { + ret = CryptImportKey(hCryptProv, pubKey, pubKeySize, 0, 0, phKey); + CryptMemFree(pubKey); + } + + CryptFreeOIDFunctionAddress(hFunc, 0); + return ret; + } + ret = CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, pInfo->PublicKey.pbData, pInfo->PublicKey.cbData, 0, NULL, &pubKeySize); if (ret) { - LPBYTE pubKey = CryptMemAlloc(pubKeySize); + pubKey = CryptMemAlloc(pubKeySize); if (pubKey) { @@ -5031,7 +5058,7 @@ BOOL WINAPI CryptImportPublicKeyInfoEx(HCRYPTPROV hCryptProv, CryptGetOIDFunctionAddress(set, dwCertEncodingType, pInfo->Algorithm.pszObjId, 0, (void **)&importFunc, &hFunc); if (!importFunc) - importFunc = CRYPT_ImportRsaPublicKeyInfoEx; + importFunc = CRYPT_ImportPublicKeyInfoEx; ret = importFunc(hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); if (hFunc) diff --git a/include/wincrypt.h b/include/wincrypt.h index 0ba3b5ef79..bcb67ff091 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2345,6 +2345,7 @@ static const WCHAR CERT_TRUST_PUB_AUTHENTICODE_FLAGS_VALUE_NAME[] = #define CRYPT_OID_IMPORT_PRIVATE_KEY_INFO_FUNC "CryptDllImportPrivateKeyInfoEx" #define CRYPT_OID_VERIFY_CERTIFICATE_CHAIN_POLICY_FUNC \ "CertDllVerifyCertificateChainPolicy" +#define CRYPT_OID_CONVERT_PUBLIC_KEY_INFO_FUNC "CryptDllConvertPublicKeyInfo" #define URL_OID_GET_OBJECT_URL_FUNC "UrlDllGetObjectUrl" #define TIME_VALID_OID_GET_OBJECT_FUNC "TimeValidDllGetObject" #define CMSG_OID_GEN_CONTENT_ENCRYPT_KEY_FUNC "CryptMsgDllGenContentEncryptKey" -- 2.17.1

1 0