October 2018 - Wine-Commits

Michael Stefaniuc : wrc: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: wine Branch: master Commit: 79a6dd21ad617fd63cb30ac7ff1e8440e4bfa081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79a6dd21ad617fd63cb30ac7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 22 22:39:04 2018 +0200 wrc: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/po.c | 10 +++++----- tools/wrc/utils.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index c72a422..74bcf1e 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -602,7 +602,7 @@ static const char *get_language_name( const language_t *lang ) static char name[20]; unsigned int i; - for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) + for (i = 0; i < ARRAY_SIZE(languages); i++) if (languages[i].id == lang->id && languages[i].sub == lang->sub) return languages[i].name; @@ -1314,7 +1314,7 @@ static ver_value_t *translate_stringfileinfo( ver_value_t *val, language_t *lang new_blk = new_ver_block(); *new_blk = *blk; name = convert_msgid_ascii( blk->name, 0 ); - for (i = 0; i < sizeof(block_name)/sizeof(block_name[0]); i++) + for (i = 0; i < ARRAY_SIZE(block_name); i++) { if (!strcasecmp( name, english_block_name[i] )) { @@ -1344,7 +1344,7 @@ static ver_value_t *translate_stringfileinfo( ver_value_t *val, language_t *lang val = val->next; } - for (i = 0; i < sizeof(block_name)/sizeof(block_name[0]); i++) + for (i = 0; i < ARRAY_SIZE(block_name); i++) free( block_name[i] ); return head; } @@ -1494,10 +1494,10 @@ void add_translations( const char *po_dir ) if ((p = strchr( buffer, '#' ))) *p = 0; for (tok = strtok( buffer, " \t\r\n" ); tok; tok = strtok( NULL, " \t\r\n" )) { - for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) + for (i = 0; i < ARRAY_SIZE(languages); i++) if (!strcmp( tok, languages[i].name )) break; - if (i == sizeof(languages)/sizeof(languages[0])) + if (i == ARRAY_SIZE(languages)) error( "unknown language '%s'\n", tok ); name = strmake( "%s/%s.mo", po_dir, tok ); diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 800692a..633ec57 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -565,7 +565,7 @@ int get_language_codepage( unsigned short lang, unsigned short sublang ) unsigned int i; int cp = -1, defcp = -1; - for (i = 0; i < sizeof(lang2cps)/sizeof(lang2cps[0]); i++) + for (i = 0; i < ARRAY_SIZE(lang2cps); i++) { if (lang2cps[i].lang != lang) continue; if (lang2cps[i].sublang == sublang)

1 0

Henri Verbeet : wined3d: Store the "buffer_object" in struct wined3d_bo_address as an UINT_PTR.
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: wine Branch: master Commit: ee7c6c2a93a1c5645eee95e9439a00c0363a1bfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee7c6c2a93a1c5645eee95e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 12:36:39 2018 +0330 wined3d: Store the "buffer_object" in struct wined3d_bo_address as an UINT_PTR. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 127c7b3..6e60c5a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4212,7 +4212,7 @@ const char *debug_const_bo_address(const struct wined3d_const_bo_address *addres { if (!address) return "(null)"; - return wine_dbg_sprintf("{%#x:%p}", address->buffer_object, address->addr); + return wine_dbg_sprintf("{%#lx:%p}", address->buffer_object, address->addr); } const char *debug_bo_address(const struct wined3d_bo_address *address) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e31e41..33d248f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1461,13 +1461,13 @@ do { \ struct wined3d_bo_address { - GLuint buffer_object; + UINT_PTR buffer_object; BYTE *addr; }; struct wined3d_const_bo_address { - GLuint buffer_object; + UINT_PTR buffer_object; const BYTE *addr; };

1 0

Henri Verbeet : wined3d: Get rid of the "format_id" parameter to buffer_init().
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: wine Branch: master Commit: 1ae45f47cd969497563c146df623973e38358419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ae45f47cd969497563c146d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 12:36:40 2018 +0330 wined3d: Get rid of the "format_id" parameter to buffer_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e7b0515..64ceeda 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1341,11 +1341,11 @@ static GLenum buffer_type_hint_from_bind_flags(const struct wined3d_gl_info *gl_ return GL_ARRAY_BUFFER; } -static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, - UINT size, DWORD usage, enum wined3d_format_id format_id, unsigned int access, unsigned int bind_flags, - const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) +static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, UINT size, + DWORD usage, unsigned int access, unsigned int bind_flags, const struct wined3d_sub_resource_data *data, + void *parent, const struct wined3d_parent_ops *parent_ops) { - const struct wined3d_format *format = wined3d_get_format(device->adapter, format_id, usage); + const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, usage); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_resource *resource = &buffer->resource; BOOL dynamic_buffer_ok; @@ -1454,7 +1454,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = buffer_init(object, device, desc->byte_width, desc->usage, WINED3DFMT_UNKNOWN, + if (FAILED(hr = buffer_init(object, device, desc->byte_width, desc->usage, desc->access, desc->bind_flags, data, parent, parent_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr);

1 0

Henri Verbeet : wined3d: Pass the wined3d_buffer_desc structure directly to buffer_init().
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: wine Branch: master Commit: 944e92ba06ecadeb933d95e30035323483dfe7c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=944e92ba06ecadeb933d95e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 12:36:41 2018 +0330 wined3d: Pass the wined3d_buffer_desc structure directly to buffer_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 64ceeda..5b3419d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1341,25 +1341,25 @@ static GLenum buffer_type_hint_from_bind_flags(const struct wined3d_gl_info *gl_ return GL_ARRAY_BUFFER; } -static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, UINT size, - DWORD usage, unsigned int access, unsigned int bind_flags, const struct wined3d_sub_resource_data *data, +static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, + const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) { - const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, usage); + const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, desc->usage); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_resource *resource = &buffer->resource; BOOL dynamic_buffer_ok; HRESULT hr; - if (!size) + if (!desc->byte_width) { WARN("Size 0 requested, returning E_INVALIDARG.\n"); return E_INVALIDARG; } - if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER && size & (WINED3D_CONSTANT_BUFFER_ALIGNMENT - 1)) + if (desc->bind_flags & WINED3D_BIND_CONSTANT_BUFFER && desc->byte_width & (WINED3D_CONSTANT_BUFFER_ALIGNMENT - 1)) { - WARN("Size %#x is not suitably aligned for constant buffers.\n", size); + WARN("Size %#x is not suitably aligned for constant buffers.\n", desc->byte_width); return E_INVALIDARG; } @@ -1369,14 +1369,16 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device return E_INVALIDARG; } - if (FAILED(hr = resource_init(resource, device, WINED3D_RTYPE_BUFFER, format, WINED3D_MULTISAMPLE_NONE, - 0, usage, access, size, 1, 1, size, parent, parent_ops, &buffer_resource_ops))) + if (FAILED(hr = resource_init(resource, device, WINED3D_RTYPE_BUFFER, format, + WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->access, desc->byte_width, 1, 1, + desc->byte_width, parent, parent_ops, &buffer_resource_ops))) { WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } - buffer->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, bind_flags); - buffer->bind_flags = bind_flags; + buffer->desc = *desc; + buffer->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, desc->bind_flags); + buffer->bind_flags = desc->bind_flags; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; TRACE("buffer %p, size %#x, usage %#x, format %s, memory @ %p.\n", @@ -1384,7 +1386,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING - || wined3d_resource_access_is_managed(access)) + || wined3d_resource_access_is_managed(desc->access)) { /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of @@ -1403,7 +1405,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device { TRACE("Not creating a BO because GL_ARB_vertex_buffer is not supported.\n"); } - else if (!(access & WINED3D_RESOURCE_ACCESS_GPU)) + else if (!(desc->access & WINED3D_RESOURCE_ACCESS_GPU)) { TRACE("Not creating a BO because the buffer is not GPU accessible.\n"); } @@ -1454,14 +1456,12 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = buffer_init(object, device, desc->byte_width, desc->usage, - desc->access, desc->bind_flags, data, parent, parent_ops))) + if (FAILED(hr = wined3d_buffer_init(object, device, desc, data, parent, parent_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); heap_free(object); return hr; } - object->desc = *desc; TRACE("Created buffer %p.\n", object);

1 0

Michael Stefaniuc : wmc: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: wine Branch: master Commit: 86ebd6dc0d30eef5ffa1a1e354fb6cdb1ee9c7d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86ebd6dc0d30eef5ffa1a1e3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 22 22:39:03 2018 +0200 wmc: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/lang.c | 7 +++---- tools/wmc/po.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index b045612..07022f7 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -162,14 +162,12 @@ static const language_t languages[] = { {0x500A, 850, 1252, "Spanish", "Puerto Rico"} }; -#define NLAN (sizeof(languages)/sizeof(languages[0])) - void show_languages(void) { unsigned int i; printf(" Code | DOS-cp | WIN-cp | Language | Country\n"); printf("-------+--------+--------+--------------+---------\n"); - for(i = 0; i < NLAN; i++) + for(i = 0; i < ARRAY_SIZE(languages); i++) printf("0x%04x | %5d | %5d | %-12s | %s\n", languages[i].id, languages[i].doscp, @@ -185,7 +183,8 @@ static int langcmp(const void *p1, const void *p2) const language_t *find_language(unsigned id) { - return (const language_t *)bsearch(&id, languages, NLAN, sizeof(languages[0]), langcmp); + return (const language_t *)bsearch(&id, languages, ARRAY_SIZE(languages), + sizeof(languages[0]), langcmp); } void show_codepages(void) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 6db02c8..3529a5b 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -666,10 +666,10 @@ void add_translations( const char *po_dir ) if ((p = strchr( buffer, '#' ))) *p = 0; for (tok = strtok( buffer, " \t\r\n" ); tok; tok = strtok( NULL, " \t\r\n" )) { - for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) + for (i = 0; i < ARRAY_SIZE(languages); i++) if (!strcmp( tok, languages[i].name )) break; - if (i == sizeof(languages)/sizeof(languages[0])) + if (i == ARRAY_SIZE(languages)) error( "unknown language '%s'\n", tok ); name = strmake( "%s/%s.mo", po_dir, tok );

1 0

Dmitry Timoshkov : crypt32/tests: Actually test the return value of CryptGetKeyParam.
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: wine Branch: master Commit: c3d6211aef2aaeeda1712ec4ae62c44909e7d1f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3d6211aef2aaeeda1712ec4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 22 14:17:34 2018 +0300 crypt32/tests: Actually test the return value of CryptGetKeyParam. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/encode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 4a6626a..2da2a87 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8435,7 +8435,7 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) ok(ret, "CryptImportPublicKeyInfoEx failed: %08x\n", GetLastError()); dwSize = sizeof(ai); - CryptGetKeyParam(key, KP_ALGID, (LPVOID)&ai, &dwSize, 0); + ret = CryptGetKeyParam(key, KP_ALGID, (LPVOID)&ai, &dwSize, 0); ok(ret, "CryptGetKeyParam failed: %08x\n", GetLastError()); if(ret) { @@ -8451,7 +8451,7 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) ok(ret, "CryptImportPublicKeyInfoEx failed: %08x\n", GetLastError()); dwSize = sizeof(ai); - CryptGetKeyParam(key, KP_ALGID, (LPVOID)&ai, &dwSize, 0); + ret = CryptGetKeyParam(key, KP_ALGID, (LPVOID)&ai, &dwSize, 0); ok(ret, "CryptGetKeyParam failed: %08x\n", GetLastError()); if(ret) {

1 0

Michael Stefaniuc : server: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: wine Branch: master Commit: 9e365e4eccbe2f5baa9f4ff3dfff7929c8aabadc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e365e4eccbe2f5baa9f4ff3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 22 22:39:01 2018 +0200 server: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 160eb46..162725b 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 7ffaedc..6aa3a55 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 b26b111..4d07797 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 affe8fc..bc59b21 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 c479b38..f274dfb 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 8ad97d4..9e6815d 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 0810a61..d88f16c 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 087e3dd..f840a75 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 );

1 0

Jacek Caban : winex11.drv: Force changing lock keys state if hooks blocked keyboard input processing.
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: wine Branch: master Commit: cbc657a244d16d52414ab7c8319afa885c681822 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbc657a244d16d52414ab7c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 22 16:29:42 2018 +0200 winex11.drv: Force changing lock keys state if hooks blocked keyboard input processing. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 353bc5e..b9b8293 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1294,6 +1294,26 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) return TRUE; } +static void adjust_lock_state( BYTE *keystate, HWND hwnd, WORD vkey, WORD scan, DWORD flags, DWORD time ) +{ + BYTE prev_state = keystate[vkey] & 0x01; + + X11DRV_send_keyboard_input( hwnd, vkey, scan, flags, time ); + X11DRV_send_keyboard_input( hwnd, vkey, scan, flags ^ KEYEVENTF_KEYUP, time ); + + /* Keyboard hooks may have blocked processing lock keys causing our state + * to be different than state on X server side. Although Windows allows hooks + * to block changing state, we can't prevent it on X server side. Having + * different states would cause us to try to adjust it again on the next + * key event. We prevent that by overriding hooks and setting key states here. */ + if (get_async_key_state( keystate ) && (keystate[vkey] & 0x01) == prev_state) + { + WARN("keystate %x not changed (%#.2x), probably blocked by hooks\n", vkey, keystate[vkey]); + keystate[vkey] ^= 0x01; + set_async_key_state( keystate ); + } +} + static void update_lock_state( HWND hwnd, WORD vkey, UINT state, DWORD time ) { BYTE keystate[256]; @@ -1309,8 +1329,7 @@ static void update_lock_state( HWND hwnd, WORD vkey, UINT state, DWORD time ) DWORD flags = 0; if (keystate[VK_CAPITAL] & 0x80) flags ^= KEYEVENTF_KEYUP; TRACE("Adjusting CapsLock state (%#.2x)\n", keystate[VK_CAPITAL]); - X11DRV_send_keyboard_input( hwnd, VK_CAPITAL, 0x3a, flags, time ); - X11DRV_send_keyboard_input( hwnd, VK_CAPITAL, 0x3a, flags ^ KEYEVENTF_KEYUP, time ); + adjust_lock_state( keystate, hwnd, VK_CAPITAL, 0x3a, flags, time ); } /* Adjust the NUMLOCK state if it has been changed outside wine */ @@ -1319,8 +1338,7 @@ static void update_lock_state( HWND hwnd, WORD vkey, UINT state, DWORD time ) DWORD flags = KEYEVENTF_EXTENDEDKEY; if (keystate[VK_NUMLOCK] & 0x80) flags ^= KEYEVENTF_KEYUP; TRACE("Adjusting NumLock state (%#.2x)\n", keystate[VK_NUMLOCK]); - X11DRV_send_keyboard_input( hwnd, VK_NUMLOCK, 0x45, flags, time ); - X11DRV_send_keyboard_input( hwnd, VK_NUMLOCK, 0x45, flags ^ KEYEVENTF_KEYUP, time ); + adjust_lock_state( keystate, hwnd, VK_NUMLOCK, 0x45, flags, time ); } /* Adjust the SCROLLLOCK state if it has been changed outside wine */ @@ -1329,8 +1347,7 @@ static void update_lock_state( HWND hwnd, WORD vkey, UINT state, DWORD time ) DWORD flags = 0; if (keystate[VK_SCROLL] & 0x80) flags ^= KEYEVENTF_KEYUP; TRACE("Adjusting ScrLock state (%#.2x)\n", keystate[VK_SCROLL]); - X11DRV_send_keyboard_input( hwnd, VK_SCROLL, 0x46, flags, time ); - X11DRV_send_keyboard_input( hwnd, VK_SCROLL, 0x46, flags ^ KEYEVENTF_KEYUP, time ); + adjust_lock_state( keystate, hwnd, VK_SCROLL, 0x46, flags, time ); } }

1 0

Francois Gouget : testbot: Adopt the missions syntax for WineReconfig.pl.
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: tools Branch: master Commit: 79b14119076c211fef634e5dfd752b9f5e7c5da2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=79b14119076c211fef634e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 22 03:05:20 2018 +0200 testbot: Adopt the missions syntax for WineReconfig.pl. This makes it possible to specify the mission options on the command line if necessary. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineReconfig.pl | 72 ++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 32 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 63d72e8..74fe4ea 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -42,6 +42,7 @@ use File::Path; use Build::Utils; use WineTestBot::Config; +use WineTestBot::Missions; # @@ -50,9 +51,9 @@ use WineTestBot::Config; sub BuildWine($$$$) { - my ($Targets, $NoRm, $Build, $Extras) = @_; + my ($TaskMissions, $NoRm, $Build, $Extras) = @_; - return 1 if (!$Targets->{$Build}); + return 1 if (!$TaskMissions->{Builds}->{$Build}); # FIXME Temporary code to ensure compatibility during the transition my $OldDir = "build-$Build"; if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-$Build") @@ -82,11 +83,11 @@ sub BuildWine($$$$) sub UpdateWineBuilds($$) { - my ($Targets, $NoRm) = @_; + my ($TaskMissions, $NoRm) = @_; - return BuildWine($Targets, $NoRm, "win32", "") && - BuildWine($Targets, $NoRm, "wow64", "--enable-win64") && - BuildWine($Targets, $NoRm, "wow32", "--with-wine64='$DataDir/wine-wow64'"); + return BuildWine($TaskMissions, $NoRm, "win32", "") && + BuildWine($TaskMissions, $NoRm, "wow64", "--enable-win64") && + BuildWine($TaskMissions, $NoRm, "wow32", "--with-wine64='$DataDir/wine-wow64'"); } @@ -96,7 +97,7 @@ sub UpdateWineBuilds($$) sub UpdateWinePrefixes($) { - my ($Targets) = @_; + my ($TaskMissions) = @_; # Make sure no obsolete wineprefix is left behind in case WineReconfig # is called with a different set of targets @@ -113,7 +114,7 @@ sub UpdateWinePrefixes($) # time. Note that this requires using a different wineprefix for each build. foreach my $Build ("win32", "wow64", "wow32") { - next if (!$Targets->{$Build}); + next if (!$TaskMissions->{Builds}->{$Build}); # Wait for the wineprefix creation to complete so it is really done # before the snapshot gets updated. @@ -136,10 +137,7 @@ sub UpdateWinePrefixes($) $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; -my %AllTargets; -map { $AllTargets{$_} = 1 } qw(win32 wow32 wow64); - -my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $OptAddOns, $OptWinePrefix, $TargetList); +my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $OptAddOns, $OptWinePrefix, $MissionStatement); while (@ARGV) { my $Arg = shift @ARGV; @@ -174,9 +172,9 @@ while (@ARGV) $Usage = 2; last; } - elsif (!defined $TargetList) + elsif (!defined $MissionStatement) { - $TargetList = $Arg; + $MissionStatement = $Arg; } else { @@ -187,23 +185,33 @@ while (@ARGV) } # Check and untaint parameters -my $Targets; +my $TaskMissions; if (!defined $Usage) { if (!$OptUpdate and !$OptBuild and !$OptAddOns and !$OptWinePrefix) { $OptUpdate = $OptBuild = $OptAddOns = $OptWinePrefix = 1; } - $TargetList = join(",", keys %AllTargets) if (!defined $TargetList); - foreach my $Target (split /,/, $TargetList) + $MissionStatement ||= "win32:wow32:wow64"; + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) { - if (!$AllTargets{$Target}) - { - Error "invalid target name $Target\n"; - $Usage = 2; - last; - } - $Targets->{$Target} = 1; + Error "$ErrMessage\n"; + $Usage = 2; + } + elsif (!@$Missions) + { + Error "Empty mission statement\n"; + $Usage = 2; + } + elsif (@$Missions > 1) + { + Error "Cannot specify missions for multiple tasks\n"; + $Usage = 2; + } + else + { + $TaskMissions = $Missions->[0]; } } if (defined $Usage) @@ -215,7 +223,7 @@ if (defined $Usage) exit $Usage; } print "Usage: $Name0 [--update] [--build [--no-rm]] [--addons] [--wineprefix]\n"; - print " [--help] [TARGETS]\n"; + print " [--help] [MISSIONS]\n"; print "\n"; print "Performs all the tasks needed for the host to be ready to test new patches: update the Wine source and addons, and rebuild the Wine binaries.\n"; print "\n"; @@ -225,11 +233,11 @@ if (defined $Usage) print " --addons Update the Gecko and Mono Wine addons.\n"; print " --wineprefix Update the wineprefixes.\n"; print "If none of the above actions is specified they are all performed.\n"; - print " TARGETS Is a comma-separated list of targets to process. By default all\n"; - print " targets are processed.\n"; - print " - win32: Apply the above to the regular 32 bit Wine.\n"; - print " - wow32: Apply the above to the 32 bit WoW Wine.\n"; - print " - wow64: Apply the above to the 64 bit WoW Wine.\n"; + print " MISSIONS Is a colon-separated list of missions. By default the\n"; + print " following missions are run.\n"; + print " - win32: Build the regular 32 bit Wine.\n"; + print " - wow32: Build the 32 bit WoW Wine.\n"; + print " - wow64: Build the 64 bit WoW Wine.\n"; print " --no-rm Don't rebuild from scratch.\n"; print " --help Shows this usage message.\n"; exit 0; @@ -255,8 +263,8 @@ if ($DataDir =~ /'/) exit(1) if (!BuildNativeTestAgentd()); exit(1) if ($OptUpdate and !GitPull("wine")); exit(1) if ($OptAddOns and !UpdateAddOns()); -exit(1) if ($OptBuild and !UpdateWineBuilds($Targets, $OptNoRm)); -exit(1) if ($OptWinePrefix and !UpdateWinePrefixes($Targets)); +exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm)); +exit(1) if ($OptWinePrefix and !UpdateWinePrefixes($TaskMissions)); LogMsg "ok\n"; exit;

1 0

Francois Gouget : testbot: Adopt the missions syntax for *Build.pl.
by Alexandre Julliard Oct. 23, 2018

Oct. 23, 2018

Module: tools Branch: master Commit: 6fb501c5838e330e8884089e5890541c0b9ac291 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6fb501c5838e330e8884089… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 22 03:05:14 2018 +0200 testbot: Adopt the missions syntax for *Build.pl. This makes it possible to specify mission options on the command line if necessary. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 6 ++--- testbot/bin/build/Build.pl | 59 +++++++++++++++++++++++++-------------------- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index ec36b62..21d2e8b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -339,13 +339,13 @@ if ($Step->FileType ne "patch") # Figure out what to build # -my (%Builds, %TestExes); +my (%Missions, %TestExes); foreach my $TestStep (@{$Job->Steps->GetItems()}) { if (($TestStep->PreviousNo || 0) == $Step->No and $TestStep->FileType =~ /^exe/) { - $Builds{$TestStep->FileType} = 1; + $Missions{$TestStep->FileType} = 1; $TestExes{$TestStep->FileName} = $TestStep->FileType; } } @@ -364,7 +364,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n". "( set -x\n". - " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Builds) ."\n". + " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Missions) ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 54b1aea..b50a25c 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -46,6 +46,7 @@ sub BEGIN use Build::Utils; use WineTestBot::Config; +use WineTestBot::Missions; use WineTestBot::Utils; @@ -71,9 +72,9 @@ sub BuildNative() sub BuildTestExecutables($$$) { - my ($Targets, $Impacts, $Build) = @_; + my ($TaskMissions, $Impacts, $Build) = @_; - return 1 if (!$Targets->{$Build}); + return 1 if (!$TaskMissions->{Builds}->{$Build}); my (@BuildDirs, @TestExes); foreach my $TestInfo (values %{$Impacts->{Tests}}) @@ -116,10 +117,7 @@ sub BuildTestExecutables($$$) $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; -my %AllTargets; -map { $AllTargets{$_} = 1 } qw(exe32 exe64); - -my ($Usage, $PatchFile, $TargetList); +my ($Usage, $PatchFile, $MissionStatement); while (@ARGV) { my $Arg = shift @ARGV; @@ -152,9 +150,9 @@ while (@ARGV) last; } } - elsif (!defined $TargetList) + elsif (!defined $MissionStatement) { - $TargetList = $Arg; + $MissionStatement = $Arg; } else { @@ -165,7 +163,7 @@ while (@ARGV) } # Check and untaint parameters -my $Targets; +my $TaskMissions; if (!defined $Usage) { if (!defined $PatchFile) @@ -174,17 +172,26 @@ if (!defined $Usage) $Usage = 2; } - $TargetList = join(",", keys %AllTargets) if (!defined $TargetList); - foreach my $Target (split /[,:]/, $TargetList) + $MissionStatement = "exe32:exe64" if (!defined $MissionStatement); + my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); + if (defined $ErrMessage) { - $Target = "exe$1" if ($Target =~ /^(32|64)$/); - if (!$AllTargets{$Target}) - { - Error "invalid target name $Target\n"; - $Usage = 2; - last; - } - $Targets->{$Target} = 1; + Error "$ErrMessage\n"; + $Usage = 2; + } + elsif (!@$Missions) + { + Error "Empty mission statement\n"; + $Usage = 2; + } + elsif (@$Missions > 1) + { + Error "Cannot specify missions for multiple tasks\n"; + $Usage = 2; + } + else + { + $TaskMissions = $Missions->[0]; } } if (defined $Usage) @@ -195,16 +202,16 @@ if (defined $Usage) Error "try '$Name0 --help' for more information\n"; exit $Usage; } - print "Usage: $Name0 [--help] PATCHFILE TARGETS\n"; + print "Usage: $Name0 [--help] PATCHFILE [MISSIONS]\n"; print "\n"; print "Applies the specified patch and rebuilds the Wine test executables.\n"; print "\n"; print "Where:\n"; print " PATCHFILE Is the staging file containing the patch to build.\n"; - print " TARGETS Is a comma-separated list of build targets. By default every\n"; - print " target is run.\n"; - print " - exe32: Rebuild the 32 bit Windows test executables.\n"; - print " - exe64: Rebuild the 64 bit Windows test executables.\n"; + print " MISSIONS Is a colon-separated list of missions. By default all supported\n"; + print " missions are run.\n"; + print " - exe32: Build the 32 bit Windows test executables.\n"; + print " - exe64: Build the 64 bit Windows test executables.\n"; print " --help Shows this usage message.\n"; exit 0; } @@ -224,8 +231,8 @@ my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or ($Impacts->{PatchedRoot} and !BuildNative()) or - !BuildTestExecutables($Targets, $Impacts, "exe32") or - !BuildTestExecutables($Targets, $Impacts, "exe64")) + !BuildTestExecutables($TaskMissions, $Impacts, "exe32") or + !BuildTestExecutables($TaskMissions, $Impacts, "exe64")) { exit(1); }

1 0