July 2017 - Wine-Commits - list.winehq.org

Stefan Dösinger : msvcp140/tests: Port test_dir_operation to msvcp140.
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: 8f0ff15ec7c429ee7ce847ee84a9aa9e58ee9dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0ff15ec7c429ee7ce847ee8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 17 14:23:51 2017 +0200 msvcp140/tests: Port test_dir_operation to msvcp140. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 1 + dlls/msvcp140/tests/msvcp140.c | 123 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 0e3293f..cd7d457 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1461,6 +1461,7 @@ static void test_tr2_sys__dir_operation(void) } file_name = p_tr2_sys__Read_dir(dest, result_handle, &type); } + ok(type == status_unknown, "p_tr2_sys__Read_dir(): expect: status_unknown, got %d\n", type); p_tr2_sys__Close_dir(result_handle); ok(result_handle != NULL, "tr2_sys__Open_dir(): expect: not NULL, got %p\n", result_handle); ok(num_of_f1 == 1, "found f1 %d times\n", num_of_f1); diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index dd2255d..94f87dc 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -165,10 +165,13 @@ static int (__cdecl *p__Schedule_chore)(_Threadpool_chore*); static int (__cdecl *p__Reschedule_chore)(const _Threadpool_chore*); static void (__cdecl *p__Release_chore)(_Threadpool_chore*); +static void (__cdecl *p_Close_dir)(void*); static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); static MSVCP_bool (__cdecl *p_Current_set)(WCHAR const *); static ULONGLONG (__cdecl *p_File_size)(WCHAR const *); static enum file_type (__cdecl *p_Lstat)(WCHAR const *, int *); +static void* (__cdecl *p_Open_dir)(WCHAR*, WCHAR const*, int *, enum file_type*); +static WCHAR* (__cdecl *p_Read_dir)(WCHAR*, void*, enum file_type*); static enum file_type (__cdecl *p_Stat)(WCHAR const *, int *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); @@ -238,10 +241,13 @@ static BOOL init(void) SET(p__Release_chore, "?_Release_chore(a)details@Concurrency@@YAXPAU_Threadpool_chore(a)12@@Z"); } + SET(p_Close_dir, "_Close_dir"); SET(p_Current_get, "_Current_get"); SET(p_Current_set, "_Current_set"); SET(p_File_size, "_File_size"); SET(p_Lstat, "_Lstat"); + SET(p_Open_dir, "_Open_dir"); + SET(p_Read_dir, "_Read_dir"); SET(p_Stat, "_Stat"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); @@ -839,6 +845,122 @@ static void test_Stat(void) ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); } +static void test_dir_operation(void) +{ + WCHAR *file_name, first_file_name[MAX_PATH], dest[MAX_PATH], longer_path[MAX_PATH]; + WCHAR origin_path[MAX_PATH], temp_path[MAX_PATH]; + HANDLE file, result_handle; + enum file_type type; + int err, num_of_f1 = 0, num_of_f2 = 0, num_of_sub_dir = 0, num_of_other_files = 0; + WCHAR test_dirW[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; + WCHAR test_f1W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','1',0}; + WCHAR test_f2W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','2',0}; + WCHAR test_sub_dirW[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','s','u','b','_','d','i','r',0}; + WCHAR test_sub_dir_f1W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r', + '/','s','u','b','_','d','i','r','/','f','1',0}; + WCHAR backslashW[] = {'\\',0}; + WCHAR sW[] = {'s',0}; + WCHAR f1W[] = {'f','1',0}; + WCHAR f2W[] = {'f','2',0}; + WCHAR sub_dirW[] = {'s','u','b','_','d','i','r',0}; + WCHAR not_existW[] = {'n','o','t','_','e','x','i','s','t',0}; + WCHAR emtpy_dirW[] = {'e','m','p','t','y','_','d','i','r',0}; + + memset(origin_path, 0, sizeof(origin_path)); + memset(origin_path, 0, sizeof(temp_path)); + GetCurrentDirectoryW(MAX_PATH, origin_path); + GetTempPathW(MAX_PATH, temp_path); + ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); + + CreateDirectoryW(test_dirW, NULL); + file = CreateFileW(test_f1W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + file = CreateFileW(test_f2W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + CreateDirectoryW(test_sub_dirW, NULL); + file = CreateFileW(test_sub_dir_f1W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + + memcpy(longer_path, temp_path, sizeof(longer_path)); + wcscat(longer_path, backslashW); + wcscat(longer_path, test_dirW); + wcscat(longer_path, backslashW); + while(lstrlenW(longer_path) < MAX_PATH-1) + wcscat(longer_path, sW); + memset(first_file_name, 0, sizeof(first_file_name)); + type = err = 0xdeadbeef; + result_handle = NULL; + result_handle = p_Open_dir(first_file_name, longer_path, &err, &type); + ok(result_handle == NULL, "_Open_dir(): expect NULL, got %p\n", result_handle); + ok(!*first_file_name, "_Open_dir(): expect: 0, got %s\n", wine_dbgstr_w(first_file_name)); + ok(err == ERROR_BAD_PATHNAME, "_Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); + ok((int)type == 0xdeadbeef, "_Open_dir(): expect 0xdeadbeef, got %d\n", type); + + memset(first_file_name, 0, sizeof(first_file_name)); + memset(dest, 0, sizeof(dest)); + err = type = 0xdeadbeef; + result_handle = NULL; + result_handle = p_Open_dir(first_file_name, test_dirW, &err, &type); + ok(result_handle != NULL, "_Open_dir(): expect: not NULL, got %p\n", result_handle); + ok(err == ERROR_SUCCESS, "_Open_dir(): expect: ERROR_SUCCESS, got %d\n", err); + file_name = first_file_name; + while(*file_name) { + if (!wcscmp(file_name, f1W)) { + ++num_of_f1; + ok(type == regular_file, "expect regular_file, got %d\n", type); + }else if(!wcscmp(file_name, f2W)) { + ++num_of_f2; + ok(type == regular_file, "expect regular_file, got %d\n", type); + }else if(!wcscmp(file_name, sub_dirW)) { + ++num_of_sub_dir; + ok(type == directory_file, "expect directory_file, got %d\n", type); + }else { + ++num_of_other_files; + } + file_name = p_Read_dir(dest, result_handle, &type); + } + ok(type == status_unknown, "_Read_dir(): expect: status_unknown, got %d\n", type); + p_Close_dir(result_handle); + ok(result_handle != NULL, "_Open_dir(): expect: not NULL, got %p\n", result_handle); + ok(num_of_f1 == 1, "found f1 %d times\n", num_of_f1); + ok(num_of_f2 == 1, "found f2 %d times\n", num_of_f2); + ok(num_of_sub_dir == 1, "found sub_dir %d times\n", num_of_sub_dir); + ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); + + memset(first_file_name, 0, sizeof(first_file_name)); + err = type = 0xdeadbeef; + result_handle = file; + result_handle = p_Open_dir(first_file_name, not_existW, &err, &type); + ok(result_handle == NULL, "_Open_dir(): expect: NULL, got %p\n", result_handle); + todo_wine ok(err == ERROR_BAD_PATHNAME, "_Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); + ok((int)type == 0xdeadbeef, "_Open_dir(): expect: 0xdeadbeef, got %d\n", type); + ok(!*first_file_name, "_Open_dir(): expect: 0, got %s\n", wine_dbgstr_w(first_file_name)); + + CreateDirectoryW(emtpy_dirW, NULL); + memset(first_file_name, 0, sizeof(first_file_name)); + err = type = 0xdeadbeef; + result_handle = file; + result_handle = p_Open_dir(first_file_name, emtpy_dirW, &err, &type); + ok(result_handle == NULL, "_Open_dir(): expect: NULL, got %p\n", result_handle); + ok(err == ERROR_SUCCESS, "_Open_dir(): expect: ERROR_SUCCESS, got %d\n", err); + ok(type == status_unknown, "_Open_dir(): expect: status_unknown, got %d\n", type); + ok(!*first_file_name, "_Open_dir(): expect: 0, got %s\n", wine_dbgstr_w(first_file_name)); + p_Close_dir(result_handle); + ok(result_handle == NULL, "_Open_dir(): expect: NULL, got %p\n", result_handle); + + ok(RemoveDirectoryW(emtpy_dirW), "expect empty_dir to exist\n"); + ok(DeleteFileW(test_sub_dir_f1W), "expect wine_test_dir/sub_dir/sub_f1 to exist\n"); + ok(RemoveDirectoryW(test_sub_dirW), "expect wine_test_dir/sub_dir to exist\n"); + ok(DeleteFileW(test_f1W), "expect wine_test_dir/f1 to exist\n"); + ok(DeleteFileW(test_f2W), "expect wine_test_dir/f2 to exist\n"); + ok(RemoveDirectoryW(test_dirW), "expect wine_test_dir to exist\n"); + + ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); +} + START_TEST(msvcp140) { if(!init()) return; @@ -854,5 +976,6 @@ START_TEST(msvcp140) test_Current_get(); test_Current_set(); test_Stat(); + test_dir_operation(); FreeLibrary(msvcp); }

1 0

Stefan Dösinger : msvcp140: Implement _Stat and _Lstat.
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: 621e96bfdb55182dbaf89a1500971ebcf547c0b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=621e96bfdb55182dbaf89a150… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 17 14:23:50 2017 +0200 msvcp140: Implement _Stat and _Lstat. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 +- dlls/msvcp140/tests/msvcp140.c | 149 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 59 +++++++++++++++- 3 files changed, 207 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=621e96bfdb55182dbaf89…

1 0

Alexandre Julliard : winex11: Store the process name at startup to avoid grabbing the loader lock again.
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: fc21a83a91c527d85a7b7be1d54700b9b88058d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc21a83a91c527d85a7b7be1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 11:12:48 2017 +0200 winex11: Store the process name at startup to avoid grabbing the loader lock again. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 33 --------------------------------- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 21 ++++++++++++++------- 3 files changed, 15 insertions(+), 40 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index eaf6dcf..d35328c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -803,38 +803,6 @@ static void set_style_hints( struct x11drv_win_data *data, DWORD style, DWORD ex /*********************************************************************** - * get_process_name - * - * get the name of the current process for setting class hints - */ -static char *get_process_name(void) -{ - static char *name; - - if (!name) - { - WCHAR module[MAX_PATH]; - DWORD len = GetModuleFileNameW( 0, module, MAX_PATH ); - if (len && len < MAX_PATH) - { - char *ptr; - WCHAR *p, *appname = module; - - if ((p = strrchrW( appname, '/' ))) appname = p + 1; - if ((p = strrchrW( appname, '\\' ))) appname = p + 1; - len = WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, NULL, 0, NULL, NULL ); - if ((ptr = HeapAlloc( GetProcessHeap(), 0, len ))) - { - WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, ptr, len, NULL, NULL ); - name = ptr; - } - } - } - return name; -} - - -/*********************************************************************** * set_initial_wm_hints * * Set the window manager hints that don't change over the lifetime of a window. @@ -845,7 +813,6 @@ static void set_initial_wm_hints( Display *display, Window window ) Atom protocols[3]; Atom dndVersion = WINE_XDND_VERSION; XClassHint *class_hints; - char *process_name = get_process_name(); /* wm protocols */ i = 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f125289..721c082 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -395,6 +395,7 @@ extern int copy_default_colors DECLSPEC_HIDDEN; extern int alloc_system_colors DECLSPEC_HIDDEN; extern int xrender_error_base DECLSPEC_HIDDEN; extern HMODULE x11drv_module DECLSPEC_HIDDEN; +extern char *process_name DECLSPEC_HIDDEN; extern Display *clipboard_display DECLSPEC_HIDDEN; /* atoms */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 2127df4..65ef59b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -49,6 +49,7 @@ #include "x11drv.h" #include "xcomposite.h" #include "wine/server.h" +#include "wine/unicode.h" #include "wine/debug.h" #include "wine/library.h" @@ -84,6 +85,7 @@ int alloc_system_colors = 256; DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; int xrender_error_base = 0; HMODULE x11drv_module = 0; +char *process_name = NULL; static x11drv_error_callback err_callback; /* current callback for error */ static Display *err_callback_display; /* display callback is set for */ @@ -323,7 +325,9 @@ static inline DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, */ static void setup_options(void) { - char buffer[MAX_PATH+16]; + static const WCHAR x11driverW[] = {'\\','X','1','1',' ','D','r','i','v','e','r',0}; + char buffer[64]; + WCHAR bufferW[MAX_PATH+16]; HKEY hkey, appkey = 0; DWORD len; @@ -332,18 +336,21 @@ static void setup_options(void) /* open the app-specific key */ - len = (GetModuleFileNameA( 0, buffer, MAX_PATH )); + len = (GetModuleFileNameW( 0, bufferW, MAX_PATH )); if (len && len < MAX_PATH) { HKEY tmpkey; - char *p, *appname = buffer; - if ((p = strrchr( appname, '/' ))) appname = p + 1; - if ((p = strrchr( appname, '\\' ))) appname = p + 1; - strcat( appname, "\\X11 Driver" ); + WCHAR *p, *appname = bufferW; + if ((p = strrchrW( appname, '/' ))) appname = p + 1; + if ((p = strrchrW( appname, '\\' ))) appname = p + 1; + len = WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, NULL, 0, NULL, NULL ); + if ((process_name = HeapAlloc( GetProcessHeap(), 0, len ))) + WideCharToMultiByte( CP_UNIXCP, 0, appname, -1, process_name, len, NULL, NULL ); + strcatW( appname, x11driverW ); /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\X11 Driver */ if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey )) { - if (RegOpenKeyA( tmpkey, appname, &appkey )) appkey = 0; + if (RegOpenKeyW( tmpkey, appname, &appkey )) appkey = 0; RegCloseKey( tmpkey ); } }

1 0

Henri Verbeet : wined3d: Handle WINED3D_POOL_SYSTEM_MEM resources in ffp_blitter_use_cpu_clear().
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: 95e42a8d19a748af012bd0194035e0463a8d050e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95e42a8d19a748af012bd0194… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 17 14:01:37 2017 +0200 wined3d: Handle WINED3D_POOL_SYSTEM_MEM resources in ffp_blitter_use_cpu_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c914e8d..d000e5c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2551,6 +2551,9 @@ static BOOL ffp_blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) struct wined3d_texture *texture; resource = view->resource; + if (resource->pool == WINED3D_POOL_SYSTEM_MEM) + return TRUE; + if (resource->type == WINED3D_RTYPE_BUFFER) return FALSE; @@ -2578,9 +2581,6 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de continue; resource = view->resource; - if (resource->pool == WINED3D_POOL_SYSTEM_MEM) - goto next; - if (!(flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && ffp_blitter_use_cpu_clear(view)) goto next; @@ -2601,13 +2601,9 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de } } - if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) - { - view = fb->depth_stencil; - if (view && (view->resource->pool == WINED3D_POOL_SYSTEM_MEM - || ffp_blitter_use_cpu_clear(view))) - goto next; - } + if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + && (view = fb->depth_stencil) && ffp_blitter_use_cpu_clear(view)) + goto next; device_clear_render_targets(device, rt_count, fb, rect_count, clear_rects, draw_rect, flags, colour, depth, stencil);

1 0

Alistair Leslie-Hughes : wmvcore: Support IWMReaderPlaylistBurn interface in IWMReader.
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: 73f80669c6c6012e185b844c1a462473c1307403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f80669c6c6012e185b844c1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 16 09:49:09 2017 +0000 wmvcore: Support IWMReaderPlaylistBurn interface in IWMReader. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 6 ++++ dlls/wmvcore/wmvcore_main.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 83c19da9..7099549 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -81,6 +81,7 @@ static void test_wmreader_interfaces(void) IWMDRMReader *drmreader; IWMDRMReader2 *drmreader2; IWMDRMReader3 *drmreader3; + IWMReaderPlaylistBurn *playlist; hr = WMCreateReader( NULL, 0, &reader ); ok(hr == S_OK, "WMCreateReader failed 0x%08x\n", hr); @@ -147,6 +148,9 @@ static void test_wmreader_interfaces(void) hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader3, (void **)&drmreader3); ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); + hr = IWMReader_QueryInterface(reader, &IID_IWMReaderPlaylistBurn, (void **)&playlist); + ok(hr == S_OK, "Failed 0x%08x\n", hr); + if(packet) IWMPacketSize_Release(packet); if(packet2) @@ -179,6 +183,8 @@ static void test_wmreader_interfaces(void) IWMReaderStreamClock_Release(clock); if(negotiation) IWMReaderTypeNegotiation_Release(negotiation); + if(playlist) + IWMReaderPlaylistBurn_Release(playlist); IWMReader_Release(reader); } diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index f048b9b..980d51e 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -71,6 +71,7 @@ typedef struct { IWMReaderStreamClock IWMReaderStreamClock_iface; IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; IWMReaderTimecode IWMReaderTimecode_iface; + IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; LONG ref; } WMReader; @@ -125,6 +126,9 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi }else if(IsEqualGUID(riid, &IID_IWMReaderTimecode)) { TRACE("(%p)->(IWMReaderTimecode %p)\n", This, ppv); *ppv = &This->IWMReaderTimecode_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderPlaylistBurn)) { + TRACE("(%p)->(IWMReaderPlaylistBurn %p)\n", This, ppv); + *ppv = &This->IWMReaderPlaylistBurn_iface; }else { *ppv = NULL; FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -1283,6 +1287,70 @@ static const IWMReaderTimecodeVtbl WMReaderTimecodeVtbl = timecode_GetTimecodeRangeBounds }; + +static inline WMReader *impl_from_IWMReaderPlaylistBurn(IWMReaderPlaylistBurn *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderPlaylistBurn_iface); +} + +static HRESULT WINAPI playlist_QueryInterface(IWMReaderPlaylistBurn *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI playlist_AddRef(IWMReaderPlaylistBurn *iface) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI playlist_Release(IWMReaderPlaylistBurn *iface) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI playlist_InitPlaylistBurn(IWMReaderPlaylistBurn *iface, DWORD count, + LPCWSTR_WMSDK_TYPE_SAFE *filenames, IWMStatusCallback *callback, void *context) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + FIXME("%p, %d, %p, %p, %p\n", This, count, filenames, callback, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI playlist_GetInitResults(IWMReaderPlaylistBurn *iface, DWORD count, HRESULT *stat) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + FIXME("%p, %d, %p\n", This, count, stat); + return E_NOTIMPL; +} + +static HRESULT WINAPI playlist_Cancel(IWMReaderPlaylistBurn *iface) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI playlist_EndPlaylistBurn(IWMReaderPlaylistBurn *iface, HRESULT result) +{ + WMReader *This = impl_from_IWMReaderPlaylistBurn(iface); + FIXME("%p, 0x%08x\n", This, result); + return E_NOTIMPL; +} + +static const IWMReaderPlaylistBurnVtbl WMReaderPlaylistBurnVtbl = +{ + playlist_QueryInterface, + playlist_AddRef, + playlist_Release, + playlist_InitPlaylistBurn, + playlist_GetInitResults, + playlist_Cancel, + playlist_EndPlaylistBurn +}; + HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) { WMReader *reader; @@ -1300,6 +1368,7 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; reader->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; reader->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; + reader->IWMReaderPlaylistBurn_iface.lpVtbl = &WMReaderPlaylistBurnVtbl; reader->ref = 1; *ret_reader = &reader->IWMReader_iface;

1 0

Alistair Leslie-Hughes : wmvcore: Support IWMReaderTimecode interface in IWMReader.
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: b15c39855b42b022eff82a0639f523af86723226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15c39855b42b022eff82a063… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 16 09:49:00 2017 +0000 wmvcore: Support IWMReaderTimecode interface in IWMReader. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 2 +- dlls/wmvcore/wmvcore_main.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 4369748..83c19da9 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -124,7 +124,7 @@ static void test_wmreader_interfaces(void) ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMReaderNetworkConfig, (void **)&netconfig); ok(hr == S_OK, "Failed 0x%08x\n", hr); diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 2969668..f048b9b 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -70,6 +70,7 @@ typedef struct { IWMReaderNetworkConfig2 IWMReaderNetworkConfig2_iface; IWMReaderStreamClock IWMReaderStreamClock_iface; IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; + IWMReaderTimecode IWMReaderTimecode_iface; LONG ref; } WMReader; @@ -121,6 +122,9 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi }else if(IsEqualGUID(riid, &IID_IWMReaderTypeNegotiation)) { TRACE("(%p)->(IWMReaderTypeNegotiation %p)\n", This, ppv); *ppv = &This->IWMReaderTypeNegotiation_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderTimecode)) { + TRACE("(%p)->(IWMReaderTimecode %p)\n", This, ppv); + *ppv = &This->IWMReaderTimecode_iface; }else { *ppv = NULL; FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -1232,6 +1236,53 @@ static const IWMReaderTypeNegotiationVtbl WMReaderTypeNegotiationVtbl = negotiation_TryOutputProps }; +static inline WMReader *impl_from_IWMReaderTimecode(IWMReaderTimecode *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderTimecode_iface); +} + +static HRESULT WINAPI timecode_QueryInterface(IWMReaderTimecode *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReaderTimecode(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI timecode_AddRef(IWMReaderTimecode *iface) +{ + WMReader *This = impl_from_IWMReaderTimecode(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI timecode_Release(IWMReaderTimecode *iface) +{ + WMReader *This = impl_from_IWMReaderTimecode(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI timecode_GetTimecodeRangeCount(IWMReaderTimecode *iface, WORD num, WORD *count) +{ + WMReader *This = impl_from_IWMReaderTimecode(iface); + FIXME("%p, %d, %p\n", This, num, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI timecode_GetTimecodeRangeBounds(IWMReaderTimecode *iface, WORD stream, WORD range, + DWORD *start_timecode, DWORD *end_timecode) +{ + WMReader *This = impl_from_IWMReaderTimecode(iface); + FIXME("%p, %d, %d, %p, %p\n", This, stream, range, start_timecode, end_timecode); + return E_NOTIMPL; +} + +static const IWMReaderTimecodeVtbl WMReaderTimecodeVtbl = +{ + timecode_QueryInterface, + timecode_AddRef, + timecode_Release, + timecode_GetTimecodeRangeCount, + timecode_GetTimecodeRangeBounds +}; + HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) { WMReader *reader; @@ -1248,6 +1299,7 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ reader->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl; reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; reader->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; + reader->IWMReaderTimecode_iface.lpVtbl = &WMReaderTimecodeVtbl; reader->ref = 1; *ret_reader = &reader->IWMReader_iface;

1 0

Henri Verbeet : wined3d: Drop the special case for "converted" surfaces in wined3d_surface_blt().
by Alexandre Julliard July 17, 2017

July 17, 2017

Module: wine Branch: master Commit: 56128d18d4dfcd306beda6aacb69836938c1a2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=56128d18d4dfcd306beda6aac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 17 14:01:42 2017 +0200 wined3d: Drop the special case for "converted" surfaces in wined3d_surface_blt(). We still want to avoid invalidating the system memory copy for these surfaces, but we've become a lot better at preserving the current location for resources, to the point that the special case actually hurts. In particular, if the resource wasn't already current on the CPU, using the CPU blitter would cause us to read it back, which is what we're trying to avoid. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c143256..584c511 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3621,16 +3621,6 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst goto cpu; } - /* We want to avoid invalidating the sysmem location for converted - * surfaces, since otherwise we'd have to convert the data back when - * locking them. */ - if (dst_texture->flags & WINED3D_TEXTURE_CONVERTED || dst_texture->resource.format->convert - || wined3d_format_get_color_key_conversion(dst_texture, TRUE)) - { - WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); - goto cpu; - } - if (flags & ~simple_blit) { WARN_(d3d_perf)("Using fallback for complex blit (%#x).\n", flags);

1 0

Jacek Caban : winhttp: Get rid of no longer needed netconn_init.
by Alexandre Julliard July 14, 2017

July 14, 2017

Module: wine Branch: master Commit: c2f464decb8c44fbbc08e7f694c89d6aa758a754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f464decb8c44fbbc08e7f69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 14 15:58:00 2017 +0200 winhttp: Get rid of no longer needed netconn_init. Spotted by Hans. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 7 ------- dlls/winhttp/winhttp_private.h | 1 - 2 files changed, 8 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index c6cc698..d9f81de 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -289,13 +289,6 @@ static BOOL ensure_cred_handle(void) return ret; } -BOOL netconn_init( netconn_t *conn ) -{ - memset(conn, 0, sizeof(*conn)); - conn->socket = -1; - return TRUE; -} - void netconn_unload( void ) { if(cred_handle_initialized) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index eba20c9..636bae9 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -284,7 +284,6 @@ void close_connection( request_t * ) DECLSPEC_HIDDEN; BOOL netconn_close( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int ) DECLSPEC_HIDDEN; netconn_t *netconn_create( int, int, int ) DECLSPEC_HIDDEN; -BOOL netconn_init( netconn_t * ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN;

1 0

Alex Henrie : msvcr120: Add erfc.
by Alexandre Julliard July 14, 2017

July 14, 2017

Module: wine Branch: master Commit: 26163f5cdfbb51795f0803ea525a7aead142232a URL: http://source.winehq.org/git/wine.git/?a=commit;h=26163f5cdfbb51795f0803ea5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 13 23:14:19 2017 -0600 msvcr120: Add erfc. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 32 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 54 insertions(+), 12 deletions(-) diff --git a/configure b/configure index f334749..c6e24d0 100755 --- a/configure +++ b/configure @@ -17416,6 +17416,8 @@ for ac_func in \ cbrt \ cbrtf \ erf \ + erfc \ + erfcf \ erff \ exp2 \ exp2f \ diff --git a/configure.ac b/configure.ac index bae5ba0..5bee74a 100644 --- a/configure.ac +++ b/configure.ac @@ -2603,6 +2603,8 @@ AC_CHECK_FUNCS(\ cbrt \ cbrtf \ erf \ + erfc \ + erfcf \ erff \ exp2 \ exp2f \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index fb5c350..a1668bb 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -221,9 +221,9 @@ @ stub ctanhl @ stub ctanl @ cdecl erf(double) ucrtbase.erf -@ stub erfc -@ stub erfcf -@ stub erfcl +@ cdecl erfc(double) ucrtbase.erfc +@ cdecl erfcf(float) ucrtbase.erfcf +@ cdecl erfcl(double) ucrtbase.erfcl @ cdecl erff(float) ucrtbase.erff @ cdecl erfl(double) ucrtbase.erfl @ cdecl exp(double) ucrtbase.exp diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 323d5f4..d44812a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2123,9 +2123,9 @@ @ stub ctanl @ cdecl -ret64 div(long long) MSVCRT_div @ cdecl erf(double) MSVCR120_erf -@ stub erfc -@ stub erfcf -@ stub erfcl +@ cdecl erfc(double) MSVCR120_erfc +@ cdecl erfcf(float) MSVCR120_erfcf +@ cdecl erfcl(double) MSVCR120_erfcl @ cdecl erff(float) MSVCR120_erff @ cdecl erfl(double) MSVCR120_erfl @ cdecl exit(long) MSVCRT_exit diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 73101c7..8c3ecfd 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1789,9 +1789,9 @@ @ stub ctanl @ cdecl -ret64 div(long long) msvcr120.div @ cdecl erf(double) msvcr120.erf -@ stub erfc -@ stub erfcf -@ stub erfcl +@ cdecl erfc(double) msvcr120.erfc +@ cdecl erfcf(float) msvcr120.erfcf +@ cdecl erfcl(double) msvcr120.erfcl @ cdecl erff(float) msvcr120.erff @ cdecl erfl(double) msvcr120.erfl @ cdecl exit(long) msvcr120.exit diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9eed9b8..89c45c7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2773,6 +2773,38 @@ LDOUBLE CDECL MSVCR120_erfl(LDOUBLE x) } /********************************************************************* + * erfc (MSVCR120.@) + */ +double CDECL MSVCR120_erfc(double x) +{ +#ifdef HAVE_ERFC + return erfc(x); +#else + return 1 - MSVCR120_erf(x); +#endif +} + +/********************************************************************* + * erfcf (MSVCR120.@) + */ +float CDECL MSVCR120_erfcf(float x) +{ +#ifdef HAVE_ERFCF + return erfcf(x); +#else + return MSVCR120_erfc(x); +#endif +} + +/********************************************************************* + * erfcl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_erfcl(LDOUBLE x) +{ + return MSVCR120_erfc(x); +} + +/********************************************************************* * fmaxf (MSVCR120.@) */ float CDECL MSVCR120_fmaxf(float x, float y) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index aacf361..017f086 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2266,9 +2266,9 @@ @ stub ctanl @ cdecl -ret64 div(long long) MSVCRT_div @ cdecl erf(double) MSVCR120_erf -@ stub erfc -@ stub erfcf -@ stub erfcl +@ cdecl erfc(double) MSVCR120_erfc +@ cdecl erfcf(float) MSVCR120_erfcf +@ cdecl erfcl(double) MSVCR120_erfcl @ cdecl erff(float) MSVCR120_erff @ cdecl erfl(double) MSVCR120_erfl @ cdecl exit(long) MSVCRT_exit diff --git a/include/config.h.in b/include/config.h.in index 2e909fd..e5b6465 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -141,6 +141,12 @@ /* Define to 1 if you have the `erf' function. */ #undef HAVE_ERF +/* Define to 1 if you have the `erfc' function. */ +#undef HAVE_ERFC + +/* Define to 1 if you have the `erfcf' function. */ +#undef HAVE_ERFCF + /* Define to 1 if you have the `erff' function. */ #undef HAVE_ERFF

1 0

Alexandre Julliard : ole32: New high resolution cursors generated from SVG.
by Alexandre Julliard July 14, 2017

July 14, 2017

Module: wine Branch: master Commit: 3b4492765ab0615f52b7b4f5104f76ad1187b3e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b4492765ab0615f52b7b4f51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 13:11:39 2017 +0200 ole32: New high resolution cursors generated from SVG. Based on a cursor set published by Ludvig Hummel under the X11 license. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/Makefile.in | 6 + dlls/ole32/drag_copy.cur | Bin 326 -> 33134 bytes dlls/ole32/drag_copy.svg | 284 ++++++++++++++++++++++++++++++++++++++++ dlls/ole32/drag_link.cur | Bin 326 -> 33134 bytes dlls/ole32/drag_link.svg | 278 +++++++++++++++++++++++++++++++++++++++ dlls/ole32/drag_move.cur | Bin 326 -> 33134 bytes dlls/ole32/drag_move.svg | 254 ++++++++++++++++++++++++++++++++++++ dlls/ole32/nodrop.cur | Bin 326 -> 33134 bytes dlls/ole32/nodrop.svg | 328 +++++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 1150 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b4492765ab0615f52b7b…

1 0