wine-devel February 2021

wine-devel@winehq.org

81 participants
640 discussions

[PATCH] oleaut32: Added ICreateTypeInfo2::DeleteFuncDesc().
by Nikolay Sivov 05 Feb '21

05 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Reported at https://bugs.winehq.org/show_bug.cgi?id=50615, it's not clear if this solves the issue completely. dlls/oleaut32/tests/typelib.c | 75 +++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 52 +++++++++++++++++------- 2 files changed, 113 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ff709ddef62..45196c43923 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -8241,6 +8241,80 @@ static void test_DeleteImplType(void) DeleteFileW(filenameW); } +static void test_DeleteFuncDesc(void) +{ + static OLECHAR interface1W[] = L"interface1"; + ICreateTypeInfo2 *createti2; + ICreateTypeInfo *createti; + ICreateTypeLib2 *createtl; + WCHAR filenameW[MAX_PATH]; + ITypeInfo *ti; + ITypeLib *tl; + TYPEATTR *typeattr; + HRESULT hr; + FUNCDESC funcdesc; + + GetTempFileNameW(L".", L"tlb", 0, filenameW); + + hr = CreateTypeLib2(SYS_WIN32, filenameW, &createtl); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + hr = ICreateTypeInfo_QueryInterface(createti, &IID_ICreateTypeInfo2, (void **)&createti2); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + ICreateTypeInfo_Release(createti); + + hr = ICreateTypeInfo2_QueryInterface(createti2, &IID_ITypeInfo, (void **)&ti); + ok(hr == S_OK, "Failed to get typeinfo, hr %#x.\n", hr); + + memset(&funcdesc, 0, sizeof(FUNCDESC)); + funcdesc.funckind = FUNC_PUREVIRTUAL; + funcdesc.invkind = INVOKE_PROPERTYGET; + funcdesc.callconv = CC_STDCALL; + funcdesc.elemdescFunc.tdesc.vt = VT_BSTR; + U(funcdesc.elemdescFunc).idldesc.wIDLFlags = IDLFLAG_NONE; + + hr = ICreateTypeInfo2_AddFuncDesc(createti2, 0, &funcdesc); + ok(hr == S_OK, "Failed to add a funcdesc, hr %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(typeattr->cFuncs == 1, "Unexpected cFuncs %u.\n", typeattr->cFuncs); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + hr = ICreateTypeInfo2_DeleteFuncDesc(createti2, 1); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = ICreateTypeInfo2_DeleteFuncDesc(createti2, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hr == S_OK, "Failed to get type attr, hr %#x.\n", hr); + ok(!typeattr->cFuncs, "Unexpected cFuncs %u.\n", typeattr->cFuncs); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + hr = ICreateTypeLib2_SaveAllChanges(createtl); + ok(hr == S_OK, "Failed to save changes, hr %#x.\n", hr); + ICreateTypeLib2_Release(createtl); + ITypeInfo_Release(ti); + ICreateTypeInfo2_Release(createti2); + + /* Load and check typeinfo. */ + hr = LoadTypeLibEx(filenameW, REGKIND_NONE, &tl); + ok(hr == S_OK, "Failed to load typelib, hr %#x.\n", hr); + + hr = ITypeLib_GetTypeInfo(tl, 0, &ti); + ok(hr == S_OK, "Failed to get typeinfo, hr %#x.\n", hr); + ok(!typeattr->cFuncs, "Unexpected cFuncs value.\n"); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + ITypeInfo_Release(ti); + + ITypeLib_Release(tl); + + DeleteFileW(filenameW); +} + START_TEST(typelib) { const WCHAR *filename; @@ -8282,4 +8356,5 @@ START_TEST(typelib) test_stub(); test_dep(); test_DeleteImplType(); + test_DeleteFuncDesc(); } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 65d29734800..4669b03d5fc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5587,6 +5587,22 @@ static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface) return ref; } +static void typeinfo_release_funcdesc(TLBFuncDesc *func) +{ + unsigned int i; + + for (i = 0; i < func->funcdesc.cParams; ++i) + { + ELEMDESC *elemdesc = &func->funcdesc.lprgelemdescParam[i]; + if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) + VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); + TLB_FreeCustData(&func->pParamDesc[i].custdata_list); + } + heap_free(func->funcdesc.lprgelemdescParam); + heap_free(func->pParamDesc); + TLB_FreeCustData(&func->custdata_list); +} + static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) { UINT i; @@ -5595,18 +5611,7 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) for (i = 0; i < This->typeattr.cFuncs; ++i) { - int j; - TLBFuncDesc *pFInfo = &This->funcdescs[i]; - for(j = 0; j < pFInfo->funcdesc.cParams; j++) - { - ELEMDESC *elemdesc = &pFInfo->funcdesc.lprgelemdescParam[j]; - if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) - VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); - TLB_FreeCustData(&pFInfo->pParamDesc[j].custdata_list); - } - heap_free(pFInfo->funcdesc.lprgelemdescParam); - heap_free(pFInfo->pParamDesc); - TLB_FreeCustData(&pFInfo->custdata_list); + typeinfo_release_funcdesc(&This->funcdescs[i]); } heap_free(This->funcdescs); @@ -11373,8 +11378,27 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDesc(ICreateTypeInfo2 *iface, UINT index) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u - stub\n", This, index); - return E_NOTIMPL; + unsigned int i; + + TRACE("%p %u\n", This, index); + + if (index >= This->typeattr.cFuncs) + return TYPE_E_ELEMENTNOTFOUND; + + typeinfo_release_funcdesc(&This->funcdescs[index]); + + --This->typeattr.cFuncs; + if (index != This->typeattr.cFuncs) + { + memmove(This->funcdescs + index, This->funcdescs + index + 1, + sizeof(*This->funcdescs) * (This->typeattr.cFuncs - index)); + for (i = index; i < This->typeattr.cFuncs; ++i) + TLB_relink_custdata(&This->funcdescs[i].custdata_list); + } + + This->needs_layout = TRUE; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDescByMemId(ICreateTypeInfo2 *iface, -- 2.30.0

2 1

[PATCH v4] odbccp32: Implement SQLWriteDSNToIni/W
by Alistair Leslie-Hughes 05 Feb '21

05 Feb '21

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=50150 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 95 ++++++++++++++++++++++++++++++-- dlls/odbccp32/tests/misc.c | 108 +++++++++++++++++++++++++++++++++++++ 2 files changed, 198 insertions(+), 5 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 420f206b700..54bc4c30278 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1691,16 +1691,101 @@ BOOL WINAPI SQLValidDSN(LPCSTR lpszDSN) BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver) { + DWORD ret; + HKEY hkey, hkeydriver; + WCHAR *filename = NULL; + DWORD size = 0, type; + + TRACE("%s %s\n", debugstr_w(lpszDSN), debugstr_w(lpszDriver)); + clear_errors(); - FIXME("%s %s\n", debugstr_w(lpszDSN), debugstr_w(lpszDriver)); - return TRUE; + + if (!SQLValidDSNW(lpszDSN)) + { + push_error(ODBC_ERROR_INVALID_DSN, odbc_error_invalid_dsn); + return FALSE; + } + + /* It doesn't matter if we cannot find the driver, windows just writes a blank value. */ + if ((ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey)) == ERROR_SUCCESS) + { + HKEY hkeydriver; + + if ((ret = RegOpenKeyW(hkey, lpszDriver, &hkeydriver)) == ERROR_SUCCESS) + { + ret = RegGetValueW(hkeydriver, NULL, L"driver", RRF_RT_REG_SZ, &type, NULL, &size); + /* Windows ignores the fact the driver key is missing */ + if(ret == ERROR_SUCCESS && type == REG_SZ && size) + { + filename = HeapAlloc(GetProcessHeap(), 0, size); + if(!filename) + { + RegCloseKey(hkeydriver); + RegCloseKey(hkey); + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + + return FALSE; + } + ret = RegGetValueW(hkeydriver, NULL, L"driver", RRF_RT_REG_SZ, &type, filename, &size); + } + + RegCloseKey(hkeydriver); + } + + RegCloseKey(hkey); + } + + if ((ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\ODBC\\ODBC.INI", &hkey)) == ERROR_SUCCESS) + { + HKEY sources; + + if ((ret = RegCreateKeyW(hkey, L"ODBC Data Sources", &sources)) == ERROR_SUCCESS) + { + RegSetValueExW(sources, lpszDSN, 0, REG_SZ, (BYTE*)lpszDriver, (lstrlenW(lpszDriver)+1)*sizeof(WCHAR)); + RegCloseKey(sources); + + RegDeleteTreeW(hkey, lpszDSN); + + if ((ret = RegCreateKeyW(hkey, lpszDSN, &hkeydriver)) == ERROR_SUCCESS) + { + if (filename) + RegSetValueExW(sources, L"driver", 0, REG_SZ, (BYTE*)filename, (lstrlenW(filename)+1)*sizeof(WCHAR)); + else + RegSetValueExW(sources, L"driver", 0, REG_SZ, (BYTE*)L"", sizeof(L"")); + + RegCloseKey(hkeydriver); + } + } + + RegCloseKey(hkey); + } + + if (ret != ERROR_SUCCESS) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + heap_free(filename); + + return ret == ERROR_SUCCESS; } BOOL WINAPI SQLWriteDSNToIni(LPCSTR lpszDSN, LPCSTR lpszDriver) { - clear_errors(); - FIXME("%s %s\n", debugstr_a(lpszDSN), debugstr_a(lpszDriver)); - return TRUE; + BOOL ret = FALSE; + WCHAR *dsn, *driver; + + TRACE("%s %s\n", debugstr_a(lpszDSN), debugstr_a(lpszDriver)); + + dsn = SQLInstall_strdup(lpszDSN); + driver = SQLInstall_strdup(lpszDriver); + if (dsn && driver) + ret = SQLWriteDSNToIniW(dsn, driver); + else + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + + heap_free(dsn); + heap_free(driver); + + return ret; } BOOL WINAPI SQLWriteFileDSNW(LPCWSTR lpszFileName, LPCWSTR lpszAppName, diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 0120504227d..f52dcee7acd 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -771,6 +771,113 @@ static void test_SQLConfigDataSource(void) check_error(ODBC_ERROR_COMPONENT_NOT_FOUND); } +static void test_SQLWriteDSNToIni(void) +{ + BOOL ret; + char buffer[MAX_PATH]; + char path[MAX_PATH]; + DWORD type, size; + + SQLSetConfigMode(ODBC_SYSTEM_DSN); + + ret = SQLWriteDSNToIni("wine_dbs", "SQL Server"); + if (!ret) + { + win_skip("Doesn't have permission to write a System DSN\n"); + return; + } + + if(ret) + { + HKEY hkey; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\ODBC Data Sources", 0, + KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + type = 0xdeadbeef; + size = MAX_PATH; + + memset(buffer, 0, sizeof(buffer)); + res = RegQueryValueExA(hkey, "wine_dbs", NULL, &type, (BYTE *)buffer, &size); + ok(res == ERROR_SUCCESS, "RegGetValueA failed\n"); + ok(type == REG_SZ, "got %u\n", type); + ok(!strcmp(buffer, "SQL Server"), "incorrect string '%s'\n", buffer); + + RegCloseKey(hkey); + } + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\wine_dbs", 0, + KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + type = 0xdeadbeef; + size = MAX_PATH; + + memset(path, 0, sizeof(path)); + res = RegQueryValueExA(hkey, "driver", NULL, &type, (BYTE *)path, &size); + ok(res == ERROR_SUCCESS, "RegGetValueA failed\n"); + ok(type == REG_SZ, "got %u\n", type); + /* WINE doesn't have a 'SQL Server' driver available */ + todo_wine ok(strlen(path) != 0, "Invalid value\n"); + + RegCloseKey(hkey); + } + + ret = SQLRemoveDSNFromIni("wine_dbs"); + ok(ret, "got %d\n", ret); + } + + /* Show that values are writen, even though an invalid driver was specified. */ + ret = SQLWriteDSNToIni("wine_mis", "Missing Access Driver (*.mis)"); + ok(ret, "got %d\n", ret); + if(ret) + { + HKEY hkey; + LONG res; + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\ODBC Data Sources", 0, + KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + type = 0xdeadbeef; + size = MAX_PATH; + + memset(buffer, 0, sizeof(buffer)); + res = RegQueryValueExA(hkey, "wine_mis", NULL, &type, (BYTE *)buffer, &size); + ok(res == ERROR_SUCCESS, "RegGetValueA failed\n"); + ok(type == REG_SZ, "got %u\n", type); + ok(!strcmp(buffer, "Missing Access Driver (*.mis)"), "incorrect string '%s'\n", buffer); + + RegCloseKey(hkey); + } + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBC.INI\\wine_mis", 0, + KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) + { + type = 0xdeadbeef; + size = MAX_PATH; + + memset(path, 0, sizeof(path)); + res = RegQueryValueExA(hkey, "driver", NULL, &type, (BYTE *)path, &size); + ok(res == ERROR_SUCCESS, "RegGetValueA failed\n"); + ok(type == REG_SZ, "got %u\n", type); + ok(strlen(path) == 0, "Invalid value\n"); + + RegCloseKey(hkey); + } + + ret = SQLRemoveDSNFromIni("wine_mis"); + ok(ret, "got %d\n", ret); + } +} + START_TEST(misc) { test_SQLConfigMode(); @@ -785,4 +892,5 @@ START_TEST(misc) test_SQLValidDSN(); test_SQLValidDSNW(); test_SQLConfigDataSource(); + test_SQLWriteDSNToIni(); } -- 2.30.0

1 0

[PATCH v2 resend] xactengine3_7: Implement IXACT3Engine PrepareWave
by Alistair Leslie-Hughes 05 Feb '21

05 Feb '21

v2: Deal with FACTAudioEngine_PrepareWave isn't implemented. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=49689 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 281aecc154b..1af5bfe98c5 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -995,8 +995,36 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + UINT ret; + + TRACE("(%p)->(0x%08x, %s, %d, %d, %d, %d, %p)\n", This, dwFlags, debugstr_a(szWavePath), + wStreamingPacketSize, dwAlignment, dwPlayOffset, nLoopCount, ppWave); + + ret = FACTAudioEngine_PrepareWave(This->fact_engine, dwFlags, szWavePath, wStreamingPacketSize, + dwAlignment, dwPlayOffset, nLoopCount, &fwave); + if(ret != 0 || !fwave) + { + ERR("Failed to CreateWave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + ERR("Failed to allocate XACT3WaveImpl!"); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } enum { -- 2.30.0

1 0

[PATCH v3 1/2] advapi32/tests: Add some tests for querying the security of pseudo-handles.
by Zebediah Figura 05 Feb '21

05 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: Test all root keys. dlls/advapi32/tests/security.c | 50 ++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6d2d5f56f1b..da752f8c413 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7871,6 +7871,55 @@ static void test_create_process_token_child(void) } } +static void test_pseudo_handle_security(void) +{ + char buffer[200]; + PSECURITY_DESCRIPTOR sd = buffer, sd_ptr; + unsigned int i; + DWORD size; + BOOL ret; + + static const HKEY keys[] = + { + HKEY_CLASSES_ROOT, + HKEY_CURRENT_USER, + HKEY_LOCAL_MACHINE, + HKEY_USERS, + HKEY_PERFORMANCE_DATA, + HKEY_CURRENT_CONFIG, + HKEY_DYN_DATA, + }; + + ret = GetKernelObjectSecurity(GetCurrentProcess(), OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(GetCurrentThread(), OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(ret, "got error %u\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(keys); ++i) + { + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(keys[i], OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(!ret, "key %p: expected failure\n", keys[i]); + ok(GetLastError() == ERROR_INVALID_HANDLE, "key %p: got error %u\n", keys[i], GetLastError()); + + ret = GetSecurityInfo(keys[i], SE_REGISTRY_KEY, + DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr); + if (keys[i] == HKEY_PERFORMANCE_DATA) + ok(ret == ERROR_INVALID_HANDLE, "key %p: got error %u\n", keys[i], ret); + else if (keys[i] == HKEY_DYN_DATA) + todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED || broken(ret == ERROR_INVALID_HANDLE) /* <7 */, + "key %p: got error %u\n", keys[i], ret); + else + todo_wine ok(!ret, "key %p: got error %u\n", keys[i], ret); + LocalFree(sd_ptr); + + ret = GetSecurityInfo(keys[i], SE_KERNEL_OBJECT, + DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr); + ok(ret == ERROR_INVALID_HANDLE, "key %p: got error %u\n", keys[i], ret); + } +} + START_TEST(security) { init(); @@ -7935,6 +7984,7 @@ START_TEST(security) test_BuildSecurityDescriptorW(); test_duplicate_handle_access(); test_create_process_token(); + test_pseudo_handle_security(); /* Must be the last test, modifies process token */ test_token_security_descriptor(); -- 2.20.1

1 1

[PATCH v2 1/5] winegstreamer: Store the wg_parser pointer as our source pad's private data.
by Zebediah Figura 05 Feb '21

05 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 45bd2f9a4a9..31f0a07d93f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -636,9 +636,8 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) } } -static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) +static gboolean gst_base_src_perform_seek(struct wg_parser *parser, GstEvent *event) { - struct wg_parser *parser = This->wg_parser; gboolean res = TRUE; gdouble rate; GstFormat seek_format; @@ -687,15 +686,15 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) { - struct parser *This = gst_pad_get_element_private(pad); + struct wg_parser *parser = gst_pad_get_element_private(pad); gboolean ret = TRUE; - GST_LOG("filter %p, type \"%s\".", This, GST_EVENT_TYPE_NAME(event)); + GST_LOG("parser %p, type \"%s\".", parser, GST_EVENT_TYPE_NAME(event)); switch (event->type) { case GST_EVENT_SEEK: - ret = gst_base_src_perform_seek(This, event); + ret = gst_base_src_perform_seek(parser, event); break; case GST_EVENT_FLUSH_START: @@ -848,10 +847,9 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer); -static void *push_data(void *iface) +static void *push_data(void *arg) { - struct parser *This = iface; - struct wg_parser *parser = This->wg_parser; + struct wg_parser *parser = arg; GstBuffer *buffer; LONGLONG maxlen; @@ -1125,8 +1123,7 @@ static DWORD CALLBACK stream_thread(void *arg) static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer) { - struct parser *filter = gst_pad_get_element_private(pad); - struct wg_parser *parser = filter->wg_parser; + struct wg_parser *parser = gst_pad_get_element_private(pad); GstBuffer *new_buffer = NULL; GstFlowReturn ret; @@ -1414,11 +1411,10 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) { - struct parser *This = gst_pad_get_element_private(pad); - struct wg_parser *parser = This->wg_parser; + struct wg_parser *parser = gst_pad_get_element_private(pad); GstFormat format; - GST_LOG("filter %p, type %s.", This, GST_QUERY_TYPE_NAME(query)); + GST_LOG("parser %p, type %s.", parser, GST_QUERY_TYPE_NAME(query)); switch (GST_QUERY_TYPE(query)) { case GST_QUERY_DURATION: @@ -1456,8 +1452,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) static gboolean activate_push(GstPad *pad, gboolean activate) { - struct parser *This = gst_pad_get_element_private(pad); - struct wg_parser *parser = This->wg_parser; + struct wg_parser *parser = gst_pad_get_element_private(pad); if (!activate) { if (parser->push_thread) { @@ -1467,7 +1462,7 @@ static gboolean activate_push(GstPad *pad, gboolean activate) } else if (!parser->push_thread) { int ret; - if ((ret = pthread_create(&parser->push_thread, NULL, push_data, This))) + if ((ret = pthread_create(&parser->push_thread, NULL, push_data, parser))) { GST_ERROR("Failed to create push thread: %s", strerror(errno)); parser->push_thread = 0; @@ -1479,10 +1474,10 @@ static gboolean activate_push(GstPad *pad, gboolean activate) static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) { - struct parser *filter = gst_pad_get_element_private(pad); + struct wg_parser *parser = gst_pad_get_element_private(pad); - GST_DEBUG("%s source pad for filter %p in %s mode.", - activate ? "Activating" : "Deactivating", filter, gst_pad_mode_get_name(mode)); + GST_DEBUG("%s source pad for parser %p in %s mode.", + activate ? "Activating" : "Deactivating", parser, gst_pad_mode_get_name(mode)); switch (mode) { case GST_PAD_MODE_PULL: @@ -1625,7 +1620,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) gst_pad_set_query_function(parser->my_src, query_function); gst_pad_set_activatemode_function(parser->my_src, activate_mode); gst_pad_set_event_function(parser->my_src, event_src); - gst_pad_set_element_private (parser->my_src, This); + gst_pad_set_element_private(parser->my_src, parser); parser->start_offset = parser->next_offset = parser->stop_offset = 0; This->next_pull_offset = 0; -- 2.30.0

1 4

[PATCH 1/5] winegstreamer: Store the wg_parser pointer as our source pad's private data.
by Zebediah Figura 05 Feb '21

05 Feb '21

2 6

[PATCH] ntdll: Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory.
by Zebediah Figura 05 Feb '21

05 Feb '21

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/file.c | 1 - dlls/ntdll/unix/file.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 2507437c8c3..839046a7488 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -171,7 +171,6 @@ static void create_file_test(void) U(io).Status = 0xdeadbeef; offset.QuadPart = 0; status = pNtReadFile( dir, NULL, NULL, NULL, &io, buf, sizeof(buf), &offset, NULL ); - todo_wine ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtReadFile error %08x\n", status ); if (status == STATUS_PENDING) { diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c41d6bbfa6c..68ce40eb700 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -344,7 +344,7 @@ NTSTATUS errno_to_status( int err ) case EACCES: return STATUS_ACCESS_DENIED; case ENOTDIR: return STATUS_OBJECT_PATH_NOT_FOUND; case ENOENT: return STATUS_OBJECT_NAME_NOT_FOUND; - case EISDIR: return STATUS_FILE_IS_A_DIRECTORY; + case EISDIR: return STATUS_INVALID_DEVICE_REQUEST; case EMFILE: case ENFILE: return STATUS_TOO_MANY_OPENED_FILES; case EINVAL: return STATUS_INVALID_PARAMETER; -- 2.20.1

1 0

[PATCH v2] msdrm: Add stub DRMRegisterContent function.
by Vijay Kiran Kamuju 04 Feb '21

04 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50595 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH resend v5 4/5] mountmgr: Add support for volume information queries.
by Erich E. Hoover 04 Feb '21

04 Feb '21

This patch allows the mountmgr to handle the volume information request IRP, allowing volume information to be queried from the mountmgr by ntdll. v5: No change v4: Reordered (no content change) v3: Use SystemBuffer instead of UserBuffer (see 8e98dcd42e13bfeb5a2397ff9bf1c7f63c224e23) v2: Per Zeb's request, now storing the volume with the disk_device so that the lookup doesn't require a search. Best, Erich

3 8

[PATCH] msdrm: Add stub DRMRegisterContent function.
by Vijay Kiran Kamuju 04 Feb '21

04 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50595 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

← Newer
1
...
50
51
52
53
54
55
56
...
64
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-devel February 2021