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

Michael Müller : bcrypt: Preparation for asymmetric keys.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: 3f17921d86b8359e241b32bf503340fb11914484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f17921d86b8359e241b32bf… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Mar 26 15:04:32 2018 +0200 bcrypt: Preparation for asymmetric keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 395 ++++++++++++++++++++++++++-------------------- 1 file changed, 223 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f17921d86b8359e241b…

1 0

Ken Thomases : winemac: Reenable window autodisplay when the frame is set and redisplayed.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: 041f59350cd4f483fbfb1b899d61697e67080d26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=041f59350cd4f483fbfb1b89… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 25 20:45:22 2018 -0500 winemac: Reenable window autodisplay when the frame is set and redisplayed. Cocoa will draw the window frame immediately but if autodisplay of its content view is disabled, that may leave the content area black briefly. This change avoids that flicker. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 991db57..b94b774 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2456,6 +2456,20 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self setAutodisplay:NO]; } + - (void) setFrame:(NSRect)frameRect display:(BOOL)flag + { + if (flag) + [self setAutodisplay:YES]; + [super setFrame:frameRect display:flag]; + } + + - (void) setFrame:(NSRect)frameRect display:(BOOL)displayFlag animate:(BOOL)animateFlag + { + if (displayFlag) + [self setAutodisplay:YES]; + [super setFrame:frameRect display:displayFlag animate:animateFlag]; + } + - (void) windowDidDrawContent { if (!drawnSinceShown)

1 0

Alistair Leslie-Hughes : winedevice: Wait until driver has started before returning.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: 57268241f745686e86bae41f44214bd05f98c723 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57268241f745686e86bae41f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 24 23:37:48 2018 +0000 winedevice: Wait until driver has started before returning. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 397676d..9da34ec 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -55,6 +55,7 @@ struct wine_driver struct wine_rb_entry entry; SERVICE_STATUS_HANDLE handle; + HANDLE started; DRIVER_OBJECT *driver_obj; WCHAR name[1]; }; @@ -390,6 +391,8 @@ static void WINAPI async_create_driver( PTP_CALLBACK_INSTANCE instance, void *co goto error; } + SetEvent(driver->started); + EnterCriticalSection( &drivers_cs ); driver->driver_obj = driver_obj; set_service_status( driver->handle, SERVICE_RUNNING, @@ -441,10 +444,16 @@ static NTSTATUS create_driver( const WCHAR *driver_name ) environment.Version = 1; environment.CleanupGroup = cleanup_group; + driver->started = CreateEventW(NULL, TRUE, FALSE, NULL); + /* don't block the service control handler */ if (!TrySubmitThreadpoolCallback( async_create_driver, driver, &environment )) async_create_driver( NULL, driver ); + /* Windows wait 30 Seconds */ + if(WaitForSingleObject(driver->started, 30000) == WAIT_TIMEOUT) + return ERROR_SERVICE_REQUEST_TIMEOUT; + return STATUS_SUCCESS; } @@ -453,6 +462,7 @@ static void wine_drivers_rb_destroy( struct wine_rb_entry *entry, void *context if (unload_driver( entry, TRUE ) != STATUS_SUCCESS) { struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, struct wine_driver, entry ); + CloseHandle(driver->started); ObDereferenceObject( driver->driver_obj ); CloseServiceHandle( (void *)driver->handle ); HeapFree( GetProcessHeap(), 0, driver );

1 0

Henri Verbeet : wined3d: Get rid of the special case for WINED3D_RTYPE_TEXTURE_3D in wined3d_device_update_texture ().
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: 9240316552160abc754261c608afe33a9900291b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9240316552160abc754261c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 14:18:37 2018 +0430 wined3d: Get rid of the special case for WINED3D_RTYPE_TEXTURE_3D in wined3d_device_update_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7f211f2..29083ea 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3820,12 +3820,9 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, level_count = min(src_level_count, dst_level_count); src_size = max(src_texture->resource.width, src_texture->resource.height); + src_size = max(src_size, src_texture->resource.depth); dst_size = max(dst_texture->resource.width, dst_texture->resource.height); - if (type == WINED3D_RTYPE_TEXTURE_3D) - { - src_size = max(src_size, src_texture->resource.depth); - dst_size = max(dst_size, dst_texture->resource.depth); - } + dst_size = max(dst_size, dst_texture->resource.depth); while (src_size > dst_size) { src_size >>= 1;

1 0

Henri Verbeet : wined3d: Handle 3D textures in wined3d_device_copy_sub_resource_region().
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: 6ea4445cc2741b567a3951e7145a1ccfe9cf9ae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ea4445cc2741b567a3951e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 14:18:38 2018 +0430 wined3d: Handle 3D textures in wined3d_device_copy_sub_resource_region(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 29083ea..64437a3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4158,7 +4158,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev wined3d_box_set(&dst_box, dst_x, 0, dst_x + (src_box->right - src_box->left), 1, 0, 1); } - else if (dst_resource->type == WINED3D_RTYPE_TEXTURE_2D) + else { struct wined3d_texture *dst_texture = texture_from_resource(dst_resource); struct wined3d_texture *src_texture = texture_from_resource(src_resource); @@ -4190,16 +4190,18 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev if (!src_box) { - unsigned int src_w, src_h, dst_w, dst_h, dst_level; + unsigned int src_w, src_h, src_d, dst_w, dst_h, dst_d, dst_level; src_w = wined3d_texture_get_level_width(src_texture, src_level); src_h = wined3d_texture_get_level_height(src_texture, src_level); + src_d = wined3d_texture_get_level_depth(src_texture, src_level); dst_level = dst_sub_resource_idx % dst_texture->level_count; dst_w = wined3d_texture_get_level_width(dst_texture, dst_level) - dst_x; dst_h = wined3d_texture_get_level_height(dst_texture, dst_level) - dst_y; + dst_d = wined3d_texture_get_level_depth(dst_texture, dst_level) - dst_z; - wined3d_box_set(&b, 0, 0, min(src_w, dst_w), min(src_h, dst_h), 0, 1); + wined3d_box_set(&b, 0, 0, min(src_w, dst_w), min(src_h, dst_h), 0, min(src_d, dst_d)); src_box = &b; } else if (FAILED(wined3d_texture_check_box_dimensions(src_texture, src_level, src_box))) @@ -4209,7 +4211,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev } wined3d_box_set(&dst_box, dst_x, dst_y, dst_x + (src_box->right - src_box->left), - dst_y + (src_box->bottom - src_box->top), 0, 1); + dst_y + (src_box->bottom - src_box->top), dst_z, dst_z + (src_box->back - src_box->front)); if (FAILED(wined3d_texture_check_box_dimensions(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_box))) { @@ -4217,11 +4219,6 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } } - else - { - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type)); - return WINED3DERR_INVALIDCALL; - } wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, dst_sub_resource_idx, &dst_box, src_resource, src_sub_resource_idx, src_box, WINED3D_BLT_RAW, NULL, WINED3D_TEXF_POINT);

1 0

Henri Verbeet : wined3d: Simplify wined3d_device_update_sub_resource() a little.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: 1b26c278612ca7b2f06f12b8312887d76a8ad634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b26c278612ca7b2f06f12b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 14:18:39 2018 +0430 wined3d: Simplify wined3d_device_update_sub_resource() a little. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 64437a3..b66b394 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4248,7 +4248,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str height = 1; depth = 1; } - else if (resource->type == WINED3D_RTYPE_TEXTURE_2D || resource->type == WINED3D_RTYPE_TEXTURE_3D) + else { struct wined3d_texture *texture = texture_from_resource(resource); unsigned int level; @@ -4264,11 +4264,6 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str height = wined3d_texture_get_level_height(texture, level); depth = wined3d_texture_get_level_depth(texture, level); } - else - { - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); - return; - } if (!box) {

1 0

Henri Verbeet : ddraw: Handle DDLOCK_WRITEONLY in wined3dmapflags_from_ddrawmapflags().
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: b943c7910b3261c9603343369cd632f7a3b56bba URL: https://source.winehq.org/git/wine.git/?a=commit;h=b943c7910b3261c960334336… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 14:18:40 2018 +0430 ddraw: Handle DDLOCK_WRITEONLY in wined3dmapflags_from_ddrawmapflags(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 65f24dc..b0a028d 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -570,7 +570,7 @@ unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) unsigned int wined3d_flags; wined3d_flags = flags & handled; - if (!(flags & (DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS))) + if (!(flags & (DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS | DDLOCK_WRITEONLY))) wined3d_flags |= WINED3D_MAP_READ; if (!(flags & DDLOCK_READONLY)) wined3d_flags |= WINED3D_MAP_WRITE; @@ -578,7 +578,7 @@ unsigned int wined3dmapflags_from_ddrawmapflags(unsigned int flags) wined3d_flags |= WINED3D_MAP_READ | WINED3D_MAP_WRITE; if (flags & DDLOCK_NODIRTYUPDATE) wined3d_flags |= WINED3D_MAP_NO_DIRTY_UPDATE; - flags &= ~(handled | DDLOCK_WAIT | DDLOCK_READONLY | DDLOCK_NODIRTYUPDATE); + flags &= ~(handled | DDLOCK_WAIT | DDLOCK_READONLY | DDLOCK_WRITEONLY | DDLOCK_NODIRTYUPDATE); if (flags) FIXME("Unhandled flags %#x.\n", flags);

1 0

André Hentschel : iphlpapi: Add support for MibIfTableNormalWithoutStatistics in GetIfTable2Ex.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: fb48a8f47eb3940448b64e09b42a2d41f7e98807 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb48a8f47eb3940448b64e09… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 23 16:01:02 2018 +0100 iphlpapi: Add support for MibIfTableNormalWithoutStatistics in GetIfTable2Ex. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 2 +- dlls/iphlpapi/tests/iphlpapi.c | 8 +++++++- include/netioapi.h | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 604470a..d81fb6a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1862,7 +1862,7 @@ DWORD WINAPI GetIfTable2Ex( MIB_IF_TABLE_LEVEL level, MIB_IF_TABLE2 **table ) TRACE( "level %u, table %p\n", level, table ); - if (!table || level > MibIfTableRaw) + if (!table || level > MibIfTableNormalWithoutStatistics) return ERROR_INVALID_PARAMETER; if (level != MibIfTableNormal) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 3509005..ba7d7f1 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2009,7 +2009,13 @@ static void test_GetIfTable2Ex(void) pFreeMibTable( table ); table = NULL; - ret = pGetIfTable2Ex( 2, &table ); + ret = pGetIfTable2Ex( MibIfTableNormalWithoutStatistics, &table ); + ok( ret == NO_ERROR || broken(ret == ERROR_INVALID_PARAMETER), "got %u\n", ret ); + ok( table != NULL || broken(!table), "table not set\n" ); + pFreeMibTable( table ); + + table = NULL; + ret = pGetIfTable2Ex( 3, &table ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); ok( !table, "table should not be set\n" ); pFreeMibTable( table ); diff --git a/include/netioapi.h b/include/netioapi.h index 4bd64e8..11cadf6 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -24,7 +24,8 @@ typedef enum _MIB_IF_TABLE_LEVEL { MibIfTableNormal, - MibIfTableRaw + MibIfTableRaw, + MibIfTableNormalWithoutStatistics, } MIB_IF_TABLE_LEVEL, *PMIB_IF_TABLE_LEVEL; typedef enum _MIB_NOTIFICATION_TYPE

1 0

Mark White : kernel32: Fix forward slash path handling to GetVolumePathNameW.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: d37d9860a1b598c5a32e4f42e7c5b40224a60de2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d37d9860a1b598c5a32e4f42… Author: Mark White <chopinbig2(a)gmail.com> Date: Sat Mar 24 01:08:02 2018 -0400 kernel32: Fix forward slash path handling to GetVolumePathNameW. Signed-off-by: Mark White <chopinbig2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 4 ++++ dlls/kernel32/volume.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 365e38c..c47043d 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -772,6 +772,10 @@ static void test_GetVolumePathNameA(void) "s:omefile", "S:\\" /* win2k, winxp */, sizeof(volume_path), ERROR_FILE_NOT_FOUND, NO_ERROR }, + { /* test 42: a reasonable forward slash path that is guaranteed to exist */ + "C:/windows/system32", "C:\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, }; BOOL ret, success; DWORD error; diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index b4163f0..3a4edf8 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1693,6 +1693,10 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu return FALSE; } strcpyW( volumenameW, filename ); + + /* Normalize path */ + for (c = volumenameW; *c; c++) if (*c == '/') *c = '\\'; + stop_pos = 0; /* stop searching slashes early for NT-type and nearly NT-type paths */ if (strncmpW(ntprefixW, filename, strlenW(ntprefixW)) == 0) @@ -1776,14 +1780,10 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu if (last_pos + 1 <= buflen) { - WCHAR *p; memcpy(volumepathname, filename, last_pos * sizeof(WCHAR)); if (last_pos + 2 <= buflen) volumepathname[last_pos++] = '\\'; volumepathname[last_pos] = '\0'; - /* Normalize path */ - for (p = volumepathname; *p; p++) if (*p == '/') *p = '\\'; - /* DOS-style paths always return upper-case drive letters */ if (volumepathname[1] == ':') volumepathname[0] = toupperW(volumepathname[0]);

1 0

Gijs Vermeulen : api-ms-win-core-sidebyside-l1-1-0: Add missing forward.
by Alexandre Julliard 26 Mar '18

26 Mar '18

Module: wine Branch: master Commit: be9722969b60b71ecbb3d5261e7fbba2de40881d URL: https://source.winehq.org/git/wine.git/?a=commit;h=be9722969b60b71ecbb3d526… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 26 11:39:59 2018 +0200 api-ms-win-core-sidebyside-l1-1-0: Add missing forward. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-sidebyside-l1-1-0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec b/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec index 0bf78e2..6a58321 100644 --- a/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec +++ b/dlls/api-ms-win-core-sidebyside-l1-1-0/api-ms-win-core-sidebyside-l1-1-0.spec @@ -5,7 +5,7 @@ @ stdcall FindActCtxSectionGuid(long ptr long ptr ptr) kernel32.FindActCtxSectionGuid @ stdcall FindActCtxSectionStringW(long ptr long wstr ptr) kernel32.FindActCtxSectionStringW @ stdcall GetCurrentActCtx(ptr) kernel32.GetCurrentActCtx -@ stub QueryActCtxSettingsW +@ stdcall QueryActCtxSettingsW(long ptr wstr wstr ptr long ptr) kernel32.QueryActCtxSettingsW @ stdcall QueryActCtxW(long ptr ptr long ptr long ptr) kernel32.QueryActCtxW @ stdcall ReleaseActCtx(ptr) kernel32.ReleaseActCtx @ stdcall ZombifyActCtx(ptr) kernel32.ZombifyActCtx

1 0