wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Alistair Leslie-Hughes : wininet: Clear cached credentials in INTERNET_OPTION_END_BROWSER_SESSION.
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: wine Branch: master Commit: f8f98e6edc0229b0663dfdc84df528885a765e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8f98e6edc0229b0663dfdc8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 19 00:47:44 2019 +0000 wininet: Clear cached credentials in INTERNET_OPTION_END_BROWSER_SESSION. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 31 +++++++++++++++++ dlls/wininet/internet.c | 1 + dlls/wininet/internet.h | 1 + dlls/wininet/tests/http.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5844a7c7d6..60dab62441 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1019,6 +1019,37 @@ static void cache_authorization(LPWSTR host, LPWSTR scheme, LeaveCriticalSection(&authcache_cs); } +void free_authorization_cache(void) +{ + authorizationData *ad, *sa_safe; + basicAuthorizationData *basic, *basic_safe; + + EnterCriticalSection(&authcache_cs); + + LIST_FOR_EACH_ENTRY_SAFE(basic, basic_safe, &basicAuthorizationCache, basicAuthorizationData, entry) + { + heap_free(basic->host); + heap_free(basic->realm); + heap_free(basic->authorization); + + list_remove(&basic->entry); + heap_free(basic); + } + + LIST_FOR_EACH_ENTRY_SAFE(ad, sa_safe, &authorizationCache, authorizationData, entry) + { + heap_free(ad->host); + heap_free(ad->scheme); + heap_free(ad->user); + heap_free(ad->password); + heap_free(ad->domain); + list_remove(&ad->entry); + heap_free(ad); + } + + LeaveCriticalSection(&authcache_cs); +} + static BOOL HTTP_DoAuthorization( http_request_t *request, LPCWSTR pszAuthValue, struct HttpAuthInfo **ppAuthInfo, LPWSTR domain_and_username, LPWSTR password, diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b7aa5fe330..266100861d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2821,6 +2821,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_END_BROWSER_SESSION: FIXME("Option INTERNET_OPTION_END_BROWSER_SESSION: semi-stub\n"); free_cookie(); + free_authorization_cache(); break; case INTERNET_OPTION_CONNECTED_STATE: FIXME("Option INTERNET_OPTION_CONNECTED_STATE: STUB\n"); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 40e51bec32..8954d071f9 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -456,6 +456,7 @@ static inline req_file_t *req_file_addref(req_file_t *req_file) BOOL init_urlcache(void) DECLSPEC_HIDDEN; void free_urlcache(void) DECLSPEC_HIDDEN; void free_cookie(void) DECLSPEC_HIDDEN; +void free_authorization_cache(void) DECLSPEC_HIDDEN; void init_winsock(void) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b61d5c7030..f1a647346e 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4502,6 +4502,92 @@ static void test_basic_auth_credentials_reuse(int port) InternetCloseHandle( ses ); } +static void test_basic_auth_credentials_end_session(int port) +{ + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + char buffer[0x40]; + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + con = InternetConnectA( ses, "localhost", port, "user", "pwd", + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "HEAD", "/upload.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "user"), "got %s\n", buffer); + ok(size == 4, "got %u\n", size); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, "pwd"), "got %s\n", buffer); + ok(size == 3, "got %u\n", size); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == HTTP_STATUS_OK, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); + + ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0 ); + ok( ses != NULL, "InternetOpenA failed\n" ); + + /* Clear the cached credentials */ + ret = InternetSetOptionA(ses, INTERNET_OPTION_END_BROWSER_SESSION, NULL, 0); + ok(ret, "unexpected failure %u\n", GetLastError()); + + con = InternetConnectA( ses, "localhost", port, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0 ); + ok( con != NULL, "InternetConnectA failed %u\n", GetLastError() ); + + req = HttpOpenRequestA( con, "PUT", "/upload2.txt", NULL, NULL, NULL, 0, 0 ); + ok( req != NULL, "HttpOpenRequestA failed %u\n", GetLastError() ); + + ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); + ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_USERNAME, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, ""), "got %s\n", buffer); + ok(size == 0, "got %u\n", size); + + size = sizeof(buffer); + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(req, INTERNET_OPTION_PASSWORD, buffer, &size); + ok(ret, "unexpected failure %u\n", GetLastError()); + ok(!strcmp(buffer, ""), "got %s\n", buffer); + ok(size == 0, "got %u\n", size); + + status = 0xdeadbeef; + size = sizeof(status); + ret = HttpQueryInfoA( req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); + ok( ret, "HttpQueryInfoA failed %u\n", GetLastError() ); + ok( status == HTTP_STATUS_BAD_REQUEST, "got %u\n", status ); + + InternetCloseHandle( req ); + InternetCloseHandle( con ); + InternetCloseHandle( ses ); +} + static void test_async_read(int port) { HINTERNET ses, con, req; @@ -5696,6 +5782,7 @@ static void test_http_connection(void) test_request_content_length(si.port); test_accept_encoding(si.port); test_basic_auth_credentials_reuse(si.port); + test_basic_auth_credentials_end_session(si.port); test_async_read(si.port); test_http_read(si.port); test_connection_break(si.port);

1 0

Zebediah Figura : winex11: Track the client colormap separately.
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: wine Branch: master Commit: 22993aff94ad4b3539ed99648f8180cfc7b9253c URL: https://source.winehq.org/git/wine.git/?a=commit;h=22993aff94ad4b3539ed9964… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 18 21:44:19 2019 -0500 winex11: Track the client colormap separately. If a window with an OpenGL surface attached is reparented as a child window, and then reparented as a top-level window, so that its whole window is destroyed and then recreated, it will be recreated with the colormap of its child window, which more than likely has a different visual. This violates the X11 specification, which states that a window's colormap must have the same visual as the window itself, and causes the X server to return BadMatch to the CreateWindow request. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 21 +++++++++++---------- dlls/winex11.drv/x11drv.h | 3 ++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index e1f1d30170..4e01eb201c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -314,7 +314,7 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data, static int get_window_attributes( struct x11drv_win_data *data, XSetWindowAttributes *attr ) { attr->override_redirect = !data->managed; - attr->colormap = data->colormap ? data->colormap : default_colormap; + attr->colormap = data->whole_colormap ? data->whole_colormap : default_colormap; attr->save_under = ((GetClassLongW( data->hwnd, GCL_STYLE ) & CS_SAVEBITS) != 0); attr->bit_gravity = NorthWestGravity; attr->backing_store = NotUseful; @@ -1445,12 +1445,12 @@ Window create_client_window( HWND hwnd, const XVisualInfo *visual ) TRACE( "%p reparent xwin %lx/%lx\n", data->hwnd, data->whole_window, data->client_window ); } - if (data->colormap) XFreeColormap( gdi_display, data->colormap ); - data->colormap = XCreateColormap( gdi_display, dummy_parent, visual->visual, - (visual->class == PseudoColor || - visual->class == GrayScale || - visual->class == DirectColor) ? AllocAll : AllocNone ); - attr.colormap = data->colormap; + if (data->client_colormap) XFreeColormap( gdi_display, data->client_colormap ); + data->client_colormap = XCreateColormap( gdi_display, dummy_parent, visual->visual, + (visual->class == PseudoColor || + visual->class == GrayScale || + visual->class == DirectColor) ? AllocAll : AllocNone ); + attr.colormap = data->client_colormap; attr.bit_gravity = NorthWestGravity; attr.win_gravity = NorthWestGravity; attr.backing_store = NotUseful; @@ -1509,7 +1509,7 @@ static void create_whole_window( struct x11drv_win_data *data ) data->shaped = (win_rgn != 0); if (data->vis.visualid != default_visual.visualid) - data->colormap = XCreateColormap( data->display, root_window, data->vis.visual, AllocNone ); + data->whole_colormap = XCreateColormap( data->display, root_window, data->vis.visual, AllocNone ); mask = get_window_attributes( data, &attr ); @@ -1586,9 +1586,9 @@ static void destroy_whole_window( struct x11drv_win_data *data, BOOL already_des XDeleteContext( data->display, data->whole_window, winContext ); if (!already_destroyed) XDestroyWindow( data->display, data->whole_window ); } - if (data->colormap) XFreeColormap( data->display, data->colormap ); + if (data->whole_colormap) XFreeColormap( data->display, data->whole_colormap ); data->whole_window = data->client_window = 0; - data->colormap = 0; + data->whole_colormap = 0; data->wm_state = WithdrawnState; data->net_wm_state = 0; data->mapped = FALSE; @@ -1694,6 +1694,7 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) if (thread_data->last_xic_hwnd == hwnd) thread_data->last_xic_hwnd = 0; if (data->icon_pixmap) XFreePixmap( gdi_display, data->icon_pixmap ); if (data->icon_mask) XFreePixmap( gdi_display, data->icon_mask ); + if (data->client_colormap) XFreeColormap( data->display, data->client_colormap ); HeapFree( GetProcessHeap(), 0, data->icon_bits ); XDeleteContext( gdi_display, (XID)hwnd, win_data_context ); release_win_data( data ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9ac83e57b1..e71156cbb0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -553,7 +553,8 @@ struct x11drv_win_data { Display *display; /* display connection for the thread owning the window */ XVisualInfo vis; /* X visual used by this window */ - Colormap colormap; /* colormap if non-default visual */ + Colormap whole_colormap; /* colormap if non-default visual */ + Colormap client_colormap; /* colormap for the client window */ HWND hwnd; /* hwnd that this private data belongs to */ Window whole_window; /* X window for the complete window */ Window client_window; /* X window for the client area */

1 0

Alexandre Julliard : psapi: Avoid using forwards.
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: wine Branch: master Commit: cfb06ad15829c49695077499c20cb7e2f0d719c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfb06ad15829c49695077499… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 19 12:42:06 2019 +0200 psapi: Avoid using forwards. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/psapi.spec | 54 +++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index 6a7bc14815..0e2e3eb87b 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -1,27 +1,27 @@ -@ stdcall EmptyWorkingSet(long) kernel32.K32EmptyWorkingSet -@ stdcall EnumDeviceDrivers(ptr long ptr) kernel32.K32EnumDeviceDrivers -@ stdcall EnumPageFilesA(ptr ptr) kernel32.K32EnumPageFilesA -@ stdcall EnumPageFilesW(ptr ptr) kernel32.K32EnumPageFilesW -@ stdcall EnumProcessModules(long ptr long ptr) kernel32.K32EnumProcessModules -@ stdcall EnumProcessModulesEx(long ptr long ptr long) kernel32.K32EnumProcessModulesEx -@ stdcall EnumProcesses(ptr long ptr) kernel32.K32EnumProcesses -@ stdcall GetDeviceDriverBaseNameA(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameA -@ stdcall GetDeviceDriverBaseNameW(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameW -@ stdcall GetDeviceDriverFileNameA(ptr ptr long) kernel32.K32GetDeviceDriverFileNameA -@ stdcall GetDeviceDriverFileNameW(ptr ptr long) kernel32.K32GetDeviceDriverFileNameW -@ stdcall GetMappedFileNameA(long ptr ptr long) kernel32.K32GetMappedFileNameA -@ stdcall GetMappedFileNameW(long ptr ptr long) kernel32.K32GetMappedFileNameW -@ stdcall GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA -@ stdcall GetModuleBaseNameW(long long ptr long) kernel32.K32GetModuleBaseNameW -@ stdcall GetModuleFileNameExA(long long ptr long) kernel32.K32GetModuleFileNameExA -@ stdcall GetModuleFileNameExW(long long ptr long) kernel32.K32GetModuleFileNameExW -@ stdcall GetModuleInformation(long long ptr long) kernel32.K32GetModuleInformation -@ stdcall GetPerformanceInfo(ptr long) kernel32.K32GetPerformanceInfo -@ stdcall GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA -@ stdcall GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW -@ stdcall GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo -@ stdcall GetWsChanges(long ptr long) kernel32.K32GetWsChanges -@ stdcall GetWsChangesEx(long ptr ptr) kernel32.K32GetWsChangesEx -@ stdcall InitializeProcessForWsWatch(long) kernel32.K32InitializeProcessForWsWatch -@ stdcall QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet -@ stdcall QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx +@ stdcall -import EmptyWorkingSet(long) K32EmptyWorkingSet +@ stdcall -import EnumDeviceDrivers(ptr long ptr) K32EnumDeviceDrivers +@ stdcall -import EnumPageFilesA(ptr ptr) K32EnumPageFilesA +@ stdcall -import EnumPageFilesW(ptr ptr) K32EnumPageFilesW +@ stdcall -import EnumProcessModules(long ptr long ptr) K32EnumProcessModules +@ stdcall -import EnumProcessModulesEx(long ptr long ptr long) K32EnumProcessModulesEx +@ stdcall -import EnumProcesses(ptr long ptr) K32EnumProcesses +@ stdcall -import GetDeviceDriverBaseNameA(ptr ptr long) K32GetDeviceDriverBaseNameA +@ stdcall -import GetDeviceDriverBaseNameW(ptr ptr long) K32GetDeviceDriverBaseNameW +@ stdcall -import GetDeviceDriverFileNameA(ptr ptr long) K32GetDeviceDriverFileNameA +@ stdcall -import GetDeviceDriverFileNameW(ptr ptr long) K32GetDeviceDriverFileNameW +@ stdcall -import GetMappedFileNameA(long ptr ptr long) K32GetMappedFileNameA +@ stdcall -import GetMappedFileNameW(long ptr ptr long) K32GetMappedFileNameW +@ stdcall -import GetModuleBaseNameA(long long ptr long) K32GetModuleBaseNameA +@ stdcall -import GetModuleBaseNameW(long long ptr long) K32GetModuleBaseNameW +@ stdcall -import GetModuleFileNameExA(long long ptr long) K32GetModuleFileNameExA +@ stdcall -import GetModuleFileNameExW(long long ptr long) K32GetModuleFileNameExW +@ stdcall -import GetModuleInformation(long long ptr long) K32GetModuleInformation +@ stdcall -import GetPerformanceInfo(ptr long) K32GetPerformanceInfo +@ stdcall -import GetProcessImageFileNameA(long ptr long) K32GetProcessImageFileNameA +@ stdcall -import GetProcessImageFileNameW(long ptr long) K32GetProcessImageFileNameW +@ stdcall -import GetProcessMemoryInfo(long ptr long) K32GetProcessMemoryInfo +@ stdcall -import GetWsChanges(long ptr long) K32GetWsChanges +@ stdcall -import GetWsChangesEx(long ptr ptr) K32GetWsChangesEx +@ stdcall -import InitializeProcessForWsWatch(long) K32InitializeProcessForWsWatch +@ stdcall -import QueryWorkingSet(long ptr long) K32QueryWorkingSet +@ stdcall -import QueryWorkingSetEx(long ptr long) K32QueryWorkingSetEx

1 0

Zebediah Figura : winegstreamer: Reimplement the WAVE parser ontop of the wavparse plugin.
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: wine Branch: master Commit: 939638b05530b10493e7a7e6699a37696bdd0e27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=939638b05530b10493e7a7e6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 18 21:37:03 2019 -0500 winegstreamer: Reimplement the WAVE parser ontop of the wavparse plugin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 3 +- dlls/quartz/main.c | 1 - dlls/quartz/quartz_private.h | 1 - dlls/quartz/quartz_strmif.idl | 7 - dlls/quartz/regsvr.c | 19 -- dlls/quartz/tests/waveparser.c | 13 +- dlls/quartz/waveparser.c | 440 --------------------------------------- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 109 ++++++++++ dlls/winegstreamer/main.c | 50 +++++ 10 files changed, 173 insertions(+), 471 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=939638b05530b10493e7…

1 0

Zebediah Figura : winegstreamer: Introduce a callback for filter-specific initialization.
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: wine Branch: master Commit: 41fc456498c90a616ad336411e188dd37bd9dda0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41fc456498c90a616ad33641… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 18 21:37:02 2019 -0500 winegstreamer: Introduce a callback for filter-specific initialization. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 119 ++++++++++++++++++++++++------------------ 1 file changed, 67 insertions(+), 52 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a0c8bf6102..87a1deb6f9 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -68,6 +68,8 @@ struct gstdemux HANDLE no_more_pads_event; HANDLE push_thread; + + BOOL (*init_gst)(struct gstdemux *filter); }; struct gstdemux_source @@ -1068,14 +1070,12 @@ static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer u static HRESULT GST_Connect(struct gstdemux *This, IPin *pConnectPin, ALLOCATOR_PROPERTIES *props) { - int ret, i; - LONGLONG avail, duration; + LONGLONG avail; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( "quartz_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); - GstElement *gstfilter; This->props = *props; IAsyncReader_Length(This->reader, &This->filesize, &avail); @@ -1088,68 +1088,21 @@ static HRESULT GST_Connect(struct gstdemux *This, IPin *pConnectPin, ALLOCATOR_P This->container = gst_bin_new(NULL); gst_element_set_bus(This->container, This->bus); - gstfilter = gst_element_factory_make("decodebin", NULL); - if (!gstfilter) { - ERR("Could not make source filter, are gstreamer-plugins-* installed for %u bits?\n", - 8 * (int)sizeof(void*)); - return E_FAIL; - } - - gst_bin_add(GST_BIN(This->container), gstfilter); - - g_signal_connect(gstfilter, "pad-added", G_CALLBACK(existing_new_pad_wrapper), This); - g_signal_connect(gstfilter, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), This); - g_signal_connect(gstfilter, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), This); - g_signal_connect(gstfilter, "unknown-type", G_CALLBACK(unknown_type_wrapper), This); - This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); gst_pad_set_getrange_function(This->my_src, request_buffer_src_wrapper); gst_pad_set_query_function(This->my_src, query_function_wrapper); gst_pad_set_activatemode_function(This->my_src, activate_mode_wrapper); gst_pad_set_event_function(This->my_src, event_src_wrapper); gst_pad_set_element_private (This->my_src, This); - This->their_sink = gst_element_get_static_pad(gstfilter, "sink"); - g_signal_connect(gstfilter, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), This); - ret = gst_pad_link(This->my_src, This->their_sink); - if (ret < 0) { - ERR("Returns: %i\n", ret); - return E_FAIL; - } This->start = This->nextofs = This->nextpullofs = This->stop = 0; - /* Add initial pins */ This->initial = TRUE; - ResetEvent(This->no_more_pads_event); - gst_element_set_state(This->container, GST_STATE_PLAYING); - ret = gst_element_get_state(This->container, NULL, NULL, -1); - - if (ret == GST_STATE_CHANGE_FAILURE) - { - ERR("GStreamer failed to play stream\n"); + if (!This->init_gst(This)) return E_FAIL; - } - - WaitForSingleObject(This->no_more_pads_event, INFINITE); - - gst_pad_query_duration(This->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); - for (i = 0; i < This->cStreams; ++i) - { - This->ppPins[i]->seek.llDuration = This->ppPins[i]->seek.llStop = duration / 100; - This->ppPins[i]->seek.llCurrent = 0; - if (!This->ppPins[i]->seek.llDuration) - This->ppPins[i]->seek.dwCapabilities = 0; - WaitForSingleObject(This->ppPins[i]->caps_event, INFINITE); - } - *props = This->props; - - This->ignore_flush = TRUE; - gst_element_set_state(This->container, GST_STATE_READY); - gst_element_get_state(This->container, NULL, NULL, -1); - This->ignore_flush = FALSE; - This->initial = FALSE; + *props = This->props; This->nextofs = This->nextpullofs = 0; return S_OK; } @@ -1223,6 +1176,67 @@ static const BasePinFuncTable sink_ops = .pfnGetMediaType = BasePinImpl_GetMediaType, }; +static BOOL gstdecoder_init_gst(struct gstdemux *filter) +{ + GstElement *element = gst_element_factory_make("decodebin", NULL); + LONGLONG duration; + unsigned int i; + int ret; + + if (!element) + { + ERR("Failed to create decodebin; are %u-bit GStreamer \"base\" plugins installed?\n", + 8 * (int)sizeof(void*)); + return FALSE; + } + + gst_bin_add(GST_BIN(filter->container), element); + + g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); + g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); + g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), filter); + g_signal_connect(element, "unknown-type", G_CALLBACK(unknown_type_wrapper), filter); + g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), filter); + + filter->their_sink = gst_element_get_static_pad(element, "sink"); + ResetEvent(filter->no_more_pads_event); + + if ((ret = gst_pad_link(filter->my_src, filter->their_sink)) < 0) + { + ERR("Failed to link pads, error %d.\n", ret); + return FALSE; + } + + gst_element_set_state(filter->container, GST_STATE_PLAYING); + ret = gst_element_get_state(filter->container, NULL, NULL, -1); + if (ret == GST_STATE_CHANGE_FAILURE) + { + ERR("Failed to play stream.\n"); + return FALSE; + } + + WaitForSingleObject(filter->no_more_pads_event, INFINITE); + + gst_pad_query_duration(filter->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); + for (i = 0; i < filter->cStreams; ++i) + { + struct gstdemux_source *pin = filter->ppPins[i]; + + pin->seek.llDuration = pin->seek.llStop = duration / 100; + pin->seek.llCurrent = 0; + if (!pin->seek.llDuration) + pin->seek.dwCapabilities = 0; + WaitForSingleObject(pin->caps_event, INFINITE); + } + + filter->ignore_flush = TRUE; + gst_element_set_state(filter->container, GST_STATE_READY); + gst_element_get_state(filter->container, NULL, NULL, -1); + filter->ignore_flush = FALSE; + + return TRUE; +} + IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) { struct gstdemux *object; @@ -1249,6 +1263,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) lstrcpynW(object->sink.name, wcsInputPinName, ARRAY_SIZE(object->sink.name)); object->sink.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; object->sink.pFuncsTable = &sink_ops; + object->init_gst = gstdecoder_init_gst; *phr = S_OK; TRACE("Created GStreamer demuxer %p.\n", object);

1 0

Zebediah Figura : winegstreamer: Move more common pin initialization into create_pin().
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: wine Branch: master Commit: e73c58f9e68fadebf566a753ac7e94a9de32f2c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e73c58f9e68fadebf566a753… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 18 21:37:01 2019 -0500 winegstreamer: Move more common pin initialization into create_pin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2ad4b08a13..a0c8bf6102 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -104,7 +104,7 @@ static const IPinVtbl GST_InputPin_Vtbl; static const IBaseFilterVtbl GST_Vtbl; static const IQualityControlVtbl GSTOutPin_QualityControl_Vtbl; -static BOOL create_pin(struct gstdemux *filter, const WCHAR *name); +static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR *name); static HRESULT GST_RemoveOutputPins(struct gstdemux *This); static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface); @@ -775,10 +775,8 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * char *name; GstCaps *caps; GstStructure *arg; - GstPad *mypad; struct gstdemux_source *pin; int ret; - gchar my_name[1024]; WCHAR nameW[128]; TRACE("%p %p %p\n", This, bin, pad); @@ -787,8 +785,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * MultiByteToWideChar(CP_UNIXCP, 0, name, -1, nameW, ARRAY_SIZE(nameW) - 1); nameW[ARRAY_SIZE(nameW) - 1] = 0; TRACE("Name: %s\n", name); - strcpy(my_name, "qz_sink_"); - strcat(my_name, name); g_free(name); caps = gst_pad_query_caps(pad, NULL); @@ -796,29 +792,18 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - mypad = gst_pad_new(my_name, GST_PAD_SINK); - gst_pad_set_chain_function(mypad, got_data_sink_wrapper); - gst_pad_set_event_function(mypad, event_sink_wrapper); - gst_pad_set_query_function(mypad, query_sink_wrapper); - if (strcmp(typename, "audio/x-raw") && strcmp(typename, "video/x-raw")) { FIXME("Unknown type \'%s\'\n", typename); return; } - if (!create_pin(This, nameW)) + if (!(pin = create_pin(This, nameW))) { ERR("Failed to allocate memory.\n"); return; } - pin = This->ppPins[This->cStreams - 1]; - gst_pad_set_element_private(mypad, pin); - pin->my_sink = mypad; - - gst_segment_init(pin->segment, GST_FORMAT_TIME); - if (!strcmp(typename, "video/x-raw")) { GstElement *vconv; @@ -889,9 +874,9 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * goto exit; } } else - ret = gst_pad_link(pad, mypad); + ret = gst_pad_link(pad, pin->my_sink); - gst_pad_set_active(mypad, 1); + gst_pad_set_active(pin->my_sink, 1); exit: TRACE("Linking: %i\n", ret); @@ -1784,28 +1769,37 @@ static const struct strmbase_source_ops source_ops = GSTOutPin_DecideAllocator, }; -static BOOL create_pin(struct gstdemux *filter, const WCHAR *name) +static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR *name) { struct gstdemux_source *pin, **new_array; + char pad_name[19]; if (!(new_array = heap_realloc(filter->ppPins, (filter->cStreams + 1) * sizeof(*new_array)))) - return FALSE; + return NULL; filter->ppPins = new_array; if (!(pin = heap_alloc_zero(sizeof(*pin)))) - return FALSE; + return NULL; strmbase_source_init(&pin->pin, &GST_OutputPin_Vtbl, &filter->filter, name, &source_ops); pin->caps_event = CreateEventW(NULL, FALSE, FALSE, NULL); pin->segment = gst_segment_new(); + gst_segment_init(pin->segment, GST_FORMAT_TIME); pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; SourceSeeking_Init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate, &filter->filter.csFilter); BaseFilterImpl_IncrementPinVersion(&filter->filter); + sprintf(pad_name, "qz_sink_%u", filter->cStreams); + pin->my_sink = gst_pad_new(pad_name, GST_PAD_SINK); + gst_pad_set_element_private(pin->my_sink, pin); + gst_pad_set_chain_function(pin->my_sink, got_data_sink_wrapper); + gst_pad_set_event_function(pin->my_sink, event_sink_wrapper); + gst_pad_set_query_function(pin->my_sink, query_sink_wrapper); + filter->ppPins[filter->cStreams++] = pin; - return TRUE; + return pin; } static HRESULT GST_RemoveOutputPins(struct gstdemux *This)

1 0

Dmitry Timoshkov : rpcrt4: Perform the INITOUT phase in NdrAsyncServerCall instead of RpcAsyncCompleteCall.
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: wine Branch: master Commit: 306e14b956551570f3a13f2f9c38945c02ac9f1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=306e14b956551570f3a13f2f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 19 09:43:27 2019 +0800 rpcrt4: Perform the INITOUT phase in NdrAsyncServerCall instead of RpcAsyncCompleteCall. This is required to correctly support out reference parameters, otherwise server method receives not initialized pointers during the CALLSERVER phase and crashes. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 17 +++++++++-------- dlls/rpcrt4/ndr_stubless.h | 2 ++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 10de5a4f44..bceecdc827 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1632,6 +1632,8 @@ static void do_ndr_async_client_call( const MIDL_STUB_DESC *pStubDesc, PFORMAT_S pAsync->StubInfo = async_call_data; async_call_data->pHandleFormat = pFormat; + TRACE("pAsync %p, pAsync->StubInfo %p, NotificationType %d\n", pAsync, pAsync->StubInfo, pAsync->NotificationType); + pFormat += get_handle_desc_size(pProcHeader, pFormat); async_call_data->hBinding = client_get_handle(pStubMsg, pProcHeader, async_call_data->pHandleFormat); if (!async_call_data->hBinding) return; @@ -2075,7 +2077,11 @@ void RPC_ENTRY NdrAsyncServerCall(PRPC_MESSAGE pRpcMsg) TRACE("UNMARSHAL\n"); stub_do_args(async_call_data->pStubMsg, pFormat, STUBLESS_UNMARSHAL, async_call_data->number_of_params); - /* 2. CALLSERVER */ + /* 2. INITOUT */ + TRACE("INITOUT\n"); + async_call_data->retval_ptr = stub_do_args(async_call_data->pStubMsg, pFormat, STUBLESS_INITOUT, async_call_data->number_of_params); + + /* 3. CALLSERVER */ TRACE("CALLSERVER\n"); if (pServerInfo->ThunkTable && pServerInfo->ThunkTable[pRpcMsg->ProcNum]) pServerInfo->ThunkTable[pRpcMsg->ProcNum](async_call_data->pStubMsg); @@ -2090,8 +2096,6 @@ RPC_STATUS NdrpCompleteAsyncServerCall(RPC_ASYNC_STATE *pAsync, void *Reply) struct async_call_data *async_call_data; /* the type of pass we are currently doing */ enum stubless_phase phase; - /* location to put retval into */ - LONG_PTR *retval_ptr; RPC_STATUS status = RPC_S_OK; if (!pAsync->StubInfo) @@ -2102,13 +2106,10 @@ RPC_STATUS NdrpCompleteAsyncServerCall(RPC_ASYNC_STATE *pAsync, void *Reply) TRACE("pAsync %p, pAsync->StubInfo %p, pFormat %p\n", pAsync, pAsync->StubInfo, async_call_data->pHandleFormat); - /* 3. INITOUT */ - TRACE("INITOUT\n"); - retval_ptr = stub_do_args(async_call_data->pStubMsg, async_call_data->pHandleFormat, STUBLESS_INITOUT, async_call_data->number_of_params); - if (retval_ptr) + if (async_call_data->retval_ptr) { TRACE("stub implementation returned 0x%lx\n", *(LONG_PTR *)Reply); - *retval_ptr = *(LONG_PTR *)Reply; + *async_call_data->retval_ptr = *(LONG_PTR *)Reply; } else TRACE("void stub implementation\n"); diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index 699a6bcfcf..63bc656990 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -235,6 +235,8 @@ struct async_call_data unsigned short stack_size; /* number of parameters. optional for client to give it to us */ unsigned int number_of_params; + /* location to put retval into */ + LONG_PTR *retval_ptr; /* correlation cache */ ULONG_PTR NdrCorrCache[256]; };

1 0

Dmitry Timoshkov : rpcrt4: Remove FIXME about RPC_CONTEXT_HANDLE_FLAGS from NDRSContextMarshall2 and NDRSContextUnmarshall2.
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: wine Branch: master Commit: 07ee2a7d82fcb52dc40fe59cff317b23c3c70eac URL: https://source.winehq.org/git/wine.git/?a=commit;h=07ee2a7d82fcb52dc40fe59c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 19 14:39:16 2019 +0800 rpcrt4: Remove FIXME about RPC_CONTEXT_HANDLE_FLAGS from NDRSContextMarshall2 and NDRSContextUnmarshall2. RPC_CONTEXT_HANDLE_FLAGS contain the values RPC_CONTEXT_HANDLE_SERIALIZE or RPC_CONTEXT_HANDLE_DONT_SERIALIZE, however all the calls to underlying binding->Assoc are guarded by a critical section, so it's redundant to take any action about passed in Flags parameter. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_contexthandle.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_contexthandle.c b/dlls/rpcrt4/ndr_contexthandle.c index a5e1ffc253..848d924e97 100644 --- a/dlls/rpcrt4/ndr_contexthandle.c +++ b/dlls/rpcrt4/ndr_contexthandle.c @@ -263,9 +263,6 @@ void WINAPI NDRSContextMarshall2(RPC_BINDING_HANDLE hBinding, if (!binding->server || !binding->Assoc) RpcRaiseException(RPC_S_INVALID_BINDING); - if (Flags & RPC_CONTEXT_HANDLE_FLAGS) - FIXME("unimplemented flags: 0x%x\n", Flags & RPC_CONTEXT_HANDLE_FLAGS); - if (SContext->userContext) { status = RpcServerAssoc_UpdateContextHandle(binding->Assoc, SContext, CtxGuard, userRunDownIn); @@ -337,9 +334,6 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshall2(RPC_BINDING_HANDLE hBinding, if (!binding->server || !binding->Assoc) RpcRaiseException(RPC_S_INVALID_BINDING); - if (Flags & RPC_CONTEXT_HANDLE_FLAGS) - FIXME("unimplemented flags: 0x%x\n", Flags & RPC_CONTEXT_HANDLE_FLAGS); - if (!pBuff || (!context_ndr->attributes && UuidIsNil((UUID *)&context_ndr->uuid, &status))) status = RpcServerAssoc_AllocateContextHandle(binding->Assoc, CtxGuard,

1 0

Dmitry Timoshkov : shell32: Return S_OK from IDropTargetHelper::Show().
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: wine Branch: master Commit: f6ecc6be42b887f20ca698d73af362a18e392537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ecc6be42b887f20ca698d7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 19 14:39:02 2019 +0800 shell32: Return S_OK from IDropTargetHelper::Show(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dragdrophelper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c index 425ee71b9f..55a906afd5 100644 --- a/dlls/shell32/dragdrophelper.c +++ b/dlls/shell32/dragdrophelper.c @@ -155,7 +155,7 @@ static HRESULT WINAPI IDropTargetHelper_fnShow (IDropTargetHelper * iface, BOOL { dragdrophelper *This = impl_from_IDropTargetHelper(iface); FIXME ("(%p)->(%u)\n", This, fShow); - return E_NOTIMPL; + return S_OK; } static const IDropTargetHelperVtbl DropTargetHelperVtbl =

1 0

Zhiyi Zhang : kernelbase/tests: Add more PathAllocCanonicalize tests.
by Alexandre Julliard 19 Sep '19

19 Sep '19

Module: wine Branch: master Commit: 80fd28c7f22a1eb30dd0b8b681698716f43bba2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=80fd28c7f22a1eb30dd0b8b6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 19 12:04:57 2019 +0800 kernelbase/tests: Add more PathAllocCanonicalize tests. Contains tests added by Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/path.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index b5da303629..abe586b0a2 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -72,6 +72,7 @@ static const struct alloccanonicalize_test alloccanonicalize_tests[] = {"\\\\?C:a", "\\\\?C:a", 0, S_OK}, /* No . */ + {"*", "*", 0, S_OK}, {"", "\\", 0, S_OK}, {"C:", "C:", 0, S_OK}, {"C:\\", "C:\\", 0, S_OK}, @@ -83,19 +84,41 @@ static const struct alloccanonicalize_test alloccanonicalize_tests[] = {"..", "\\", 0, S_OK}, {"...", "\\", 0, S_OK}, {"*.", "*.", 0, S_OK}, + {"*.\\", "*.\\", 0, S_OK}, + {"*.\\", "*.\\", 0, S_OK}, {"*..", "*.", 0, S_OK}, + {"*..\\", "*..\\", 0, S_OK}, {"*...", "*.", 0, S_OK}, + {"*...\\", "*...\\", 0, S_OK}, + {"*....", "*.", 0, S_OK}, + {"*....\\", "*....\\", 0, S_OK}, + {".a", ".a", 0, S_OK}, + {".a\\", ".a\\", 0, S_OK}, {"a.", "a", 0, S_OK}, + {"a.\\", "a.\\", 0, S_OK}, + {".a.", ".a", 0, S_OK}, {"a.b", "a.b", 0, S_OK}, + {".a.b.", ".a.b", 0, S_OK}, {"a\\.", "a", 0, S_OK}, {"a\\.\\b", "a\\b", 0, S_OK}, + {"a\\.b", "a\\.b", 0, S_OK}, + {"a\\.b\\", "a\\.b\\", 0, S_OK}, + {":.", ":", 0, S_OK}, + {"::.", "::\\", 0, S_OK}, + {":::.", ":::", 0, S_OK}, {"C:.", "C:\\", 0, S_OK}, + {"C:.\\", "C:.\\", 0, S_OK}, + {"C:.\\.", "C:\\", 0, S_OK}, {"C:\\.", "C:\\", 0, S_OK}, {"C:\\.\\", "C:\\", 0, S_OK}, {"C:\\a.", "C:\\a", 0, S_OK}, + {"C:\\a.\\", "C:\\a.\\", 0, S_OK}, + {"C:\\.a", "C:\\.a", 0, S_OK}, + {"C:\\.a\\", "C:\\.a\\", 0, S_OK}, {"C:\\a\\.", "C:\\a", 0, S_OK}, {"C:\\a\\\\.", "C:\\a\\", 0, S_OK}, {"C:\\a\\\\\\.", "C:\\a\\\\", 0, S_OK}, + {".\\", "\\", 0, S_OK}, {"\\.", "\\", 0, S_OK}, {"\\\\.", "\\\\", 0, S_OK}, {"\\\\.\\", "\\\\", 0, S_OK}, @@ -115,21 +138,53 @@ static const struct alloccanonicalize_test alloccanonicalize_tests[] = "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", 0, S_OK}, /* .. */ + {"..a", "..a", 0, S_OK}, + {"..a\\", "..a\\", 0, S_OK}, + {"...a", "...a", 0, S_OK}, + {"...a\\", "...a\\", 0, S_OK}, + {"....a", "....a", 0, S_OK}, {"a..", "a", 0, S_OK}, + {"a..\\", "a..\\", 0, S_OK}, + {"a...", "a", 0, S_OK}, + {"a...\\", "a...\\", 0, S_OK}, + {"a....", "a", 0, S_OK}, + {"a....\\", "a....\\", 0, S_OK}, + {"..a..", "..a", 0, S_OK}, {"a..b", "a..b", 0, S_OK}, + {"..a..b..", "..a..b", 0, S_OK}, {"a\\..", "\\", 0, S_OK}, {"a\\..\\", "\\", 0, S_OK}, {"a\\..\\b", "\\b", 0, S_OK}, + {":..", ":", 0, S_OK}, + {"::..", "::\\", 0, S_OK}, + {":::..", ":::", 0, S_OK}, {"C:..", "C:\\", 0, S_OK}, + {"C:...", "C:\\", 0, S_OK}, + {"C:..\\", "C:..\\", 0, S_OK}, + {"C:..\\\\", "C:..\\\\", 0, S_OK}, + {"C:...\\", "C:...\\", 0, S_OK}, {"C:\\..", "C:\\", 0, S_OK}, + {"C:\\..a", "C:\\..a", 0, S_OK}, + {"C:\\..a\\", "C:\\..a\\", 0, S_OK}, + {"C:\\...a", "C:\\...a", 0, S_OK}, + {"C:\\...a\\", "C:\\...a\\", 0, S_OK}, + {"C:\\....a", "C:\\....a", 0, S_OK}, + {"C:\\....a\\", "C:\\....a\\", 0, S_OK}, + {"C:\\a..", "C:\\a", 0, S_OK}, + {"C:\\a..\\", "C:\\a..\\", 0, S_OK}, {"C:\\\\..", "C:\\", 0, S_OK}, {"C:\\..\\", "C:\\", 0, S_OK}, + {"C:\\...\\", "C:\\...\\", 0, S_OK}, {"C:\\a\\..", "C:\\", 0, S_OK}, + {"C:\\a\\b..", "C:\\a\\b", 0, S_OK}, {"C:\\a\\\\..", "C:\\a", 0, S_OK}, {"C:\\a\\\\\\..", "C:\\a\\", 0, S_OK}, {"C:\\a\\..\\b", "C:\\b", 0, S_OK}, {"C:\\a\\..\\\\b", "C:\\\\b", 0, S_OK}, + {"..\\", "\\", 0, S_OK}, + {"...\\", "...\\", 0, S_OK}, {"\\..", "\\", 0, S_OK}, + {"\\...", "\\", 0, S_OK}, {"\\\\..", "\\\\", 0, S_OK}, {"\\\\\\..", "\\", 0, S_OK}, {"\\\\..\\", "\\\\", 0, S_OK}, @@ -249,6 +304,8 @@ static const struct alloccanonicalize_test alloccanonicalize_tests[] = /* PATHCCH_DO_NOT_NORMALIZE_SEGMENTS */ /* No effect for spaces */ + {"a ", "a ", 0, S_OK}, + {"C:\\a ", "C:\\a ", 0, S_OK}, {"C:\\a \\", "C:\\a \\", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"C:\\a\\ ", "C:\\a\\ ", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"C:\\a ", "C:\\a ", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, @@ -263,8 +320,15 @@ static const struct alloccanonicalize_test alloccanonicalize_tests[] = {"*..", "*..", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {".", "\\", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"..", "\\", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {":.", ":.", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"::.", "::.", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {":::.", ":::.", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {":..", ":..", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"::..", "::..", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {":::..", ":::..", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"C:.", "C:.", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"C:..", "C:..", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, + {"C:...", "C:...", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"C:\\a\\.", "C:\\a", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"C:\\a\\..", "C:\\", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK}, {"C:\\a.", "C:\\a.", PATHCCH_DO_NOT_NORMALIZE_SEGMENTS, S_OK},

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2019