December 2020 - Wine-Devel - list.winehq.org

Re: [PATCH] gameux/tests: Use wide-char string literals.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83160 Your paranoid android. === w1064v1809 (32 bit report) === gameux: gamestatistics.c:215: Test failed: setting category title failed: Category0 gamestatistics.c:216: Test failed: setting category title failed: Category1 gamestatistics.c:217: Test failed: setting category title failed: Category2 gamestatistics.c:248: Test failed: setting statistic failed: name=Statistic00, value=Value00 gamestatistics.c:250: Test failed: setting statistic failed: name=Statistic01, value=Value01 gamestatistics.c:252: Test failed: setting statistic failed: name=Statistic10, value=Value10 gamestatistics.c:254: Test failed: setting statistic failed: name=Statistic11, value=Value11 gamestatistics.c:256: Test failed: setting statistic failed: name=Statistic20, value=Value20 gamestatistics.c:258: Test failed: setting statistic failed: name=Statistic21, value=Value21 gamestatistics.c:268: Test failed: setting category title failed: Category0a === w1064 (32 bit report) === gameux: gamestatistics.c:215: Test failed: setting category title failed: Category0 gamestatistics.c:216: Test failed: setting category title failed: Category1 gamestatistics.c:217: Test failed: setting category title failed: Category2 gamestatistics.c:248: Test failed: setting statistic failed: name=Statistic00, value=Value00 gamestatistics.c:250: Test failed: setting statistic failed: name=Statistic01, value=Value01 gamestatistics.c:252: Test failed: setting statistic failed: name=Statistic10, value=Value10 gamestatistics.c:254: Test failed: setting statistic failed: name=Statistic11, value=Value11 gamestatistics.c:256: Test failed: setting statistic failed: name=Statistic20, value=Value20 gamestatistics.c:258: Test failed: setting statistic failed: name=Statistic21, value=Value21 gamestatistics.c:268: Test failed: setting category title failed: Category0a === w10pro64 (32 bit report) === gameux: gamestatistics.c:215: Test failed: setting category title failed: Category0 gamestatistics.c:216: Test failed: setting category title failed: Category1 gamestatistics.c:217: Test failed: setting category title failed: Category2 gamestatistics.c:248: Test failed: setting statistic failed: name=Statistic00, value=Value00 gamestatistics.c:250: Test failed: setting statistic failed: name=Statistic01, value=Value01 gamestatistics.c:252: Test failed: setting statistic failed: name=Statistic10, value=Value10 gamestatistics.c:254: Test failed: setting statistic failed: name=Statistic11, value=Value11 gamestatistics.c:256: Test failed: setting statistic failed: name=Statistic20, value=Value20 gamestatistics.c:258: Test failed: setting statistic failed: name=Statistic21, value=Value21 gamestatistics.c:268: Test failed: setting category title failed: Category0a === w1064v1809 (64 bit report) === gameux: gamestatistics.c:215: Test failed: setting category title failed: Category0 gamestatistics.c:216: Test failed: setting category title failed: Category1 gamestatistics.c:217: Test failed: setting category title failed: Category2 gamestatistics.c:248: Test failed: setting statistic failed: name=Statistic00, value=Value00 gamestatistics.c:250: Test failed: setting statistic failed: name=Statistic01, value=Value01 gamestatistics.c:252: Test failed: setting statistic failed: name=Statistic10, value=Value10 gamestatistics.c:254: Test failed: setting statistic failed: name=Statistic11, value=Value11 gamestatistics.c:256: Test failed: setting statistic failed: name=Statistic20, value=Value20 gamestatistics.c:258: Test failed: setting statistic failed: name=Statistic21, value=Value21 gamestatistics.c:268: Test failed: setting category title failed: Category0a === w1064 (64 bit report) === gameux: gamestatistics.c:215: Test failed: setting category title failed: Category0 gamestatistics.c:216: Test failed: setting category title failed: Category1 gamestatistics.c:217: Test failed: setting category title failed: Category2 gamestatistics.c:248: Test failed: setting statistic failed: name=Statistic00, value=Value00 gamestatistics.c:250: Test failed: setting statistic failed: name=Statistic01, value=Value01 gamestatistics.c:252: Test failed: setting statistic failed: name=Statistic10, value=Value10 gamestatistics.c:254: Test failed: setting statistic failed: name=Statistic11, value=Value11 gamestatistics.c:256: Test failed: setting statistic failed: name=Statistic20, value=Value20 gamestatistics.c:258: Test failed: setting statistic failed: name=Statistic21, value=Value21 gamestatistics.c:268: Test failed: setting category title failed: Category0a === w1064_2qxl (64 bit report) === gameux: gamestatistics.c:215: Test failed: setting category title failed: Category0 gamestatistics.c:216: Test failed: setting category title failed: Category1 gamestatistics.c:217: Test failed: setting category title failed: Category2 gamestatistics.c:248: Test failed: setting statistic failed: name=Statistic00, value=Value00 gamestatistics.c:250: Test failed: setting statistic failed: name=Statistic01, value=Value01 gamestatistics.c:252: Test failed: setting statistic failed: name=Statistic10, value=Value10 gamestatistics.c:254: Test failed: setting statistic failed: name=Statistic11, value=Value11 gamestatistics.c:256: Test failed: setting statistic failed: name=Statistic20, value=Value20 gamestatistics.c:258: Test failed: setting statistic failed: name=Statistic21, value=Value21 gamestatistics.c:268: Test failed: setting category title failed: Category0a === w10pro64 (64 bit report) === gameux: gamestatistics.c:215: Test failed: setting category title failed: Category0 gamestatistics.c:216: Test failed: setting category title failed: Category1 gamestatistics.c:217: Test failed: setting category title failed: Category2 gamestatistics.c:248: Test failed: setting statistic failed: name=Statistic00, value=Value00 gamestatistics.c:250: Test failed: setting statistic failed: name=Statistic01, value=Value01 gamestatistics.c:252: Test failed: setting statistic failed: name=Statistic10, value=Value10 gamestatistics.c:254: Test failed: setting statistic failed: name=Statistic11, value=Value11 gamestatistics.c:256: Test failed: setting statistic failed: name=Statistic20, value=Value20 gamestatistics.c:258: Test failed: setting statistic failed: name=Statistic21, value=Value21 gamestatistics.c:268: Test failed: setting category title failed: Category0a === w10pro64_ar (64 bit report) === gameux: gamestatistics.c:215: Test failed: setting category title failed: Category0 gamestatistics.c:216: Test failed: setting category title failed: Category1 gamestatistics.c:217: Test failed: setting category title failed: Category2 gamestatistics.c:248: Test failed: setting statistic failed: name=Statistic00, value=Value00 gamestatistics.c:250: Test failed: setting statistic failed: name=Statistic01, value=Value01 gamestatistics.c:252: Test failed: setting statistic failed: name=Statistic10, value=Value10 gamestatistics.c:254: Test failed: setting statistic failed: name=Statistic11, value=Value11 gamestatistics.c:256: Test failed: setting statistic failed: name=Statistic20, value=Value20 gamestatistics.c:258: Test failed: setting statistic failed: name=Statistic21, value=Value21 gamestatistics.c:268: Test failed: setting category title failed: Category0a === w10pro64_he (64 bit report) === gameux: gamestatistics.c:215: Test failed: setting category title failed: Category0 gamestatistics.c:216: Test failed: setting category title failed: Category1 gamestatistics.c:217: Test failed: setting category title failed: Category2 gamestatistics.c:248: Test failed: setting statistic failed: name=Statistic00, value=Value00 gamestatistics.c:250: Test failed: setting statistic failed: name=Statistic01, value=Value01 gamestatistics.c:252: Test failed: setting statistic failed: name=Statistic10, value=Value10 gamestatistics.c:254: Test failed: setting statistic failed: name=Statistic11, value=Value11 gamestatistics.c:256: Test failed: setting statistic failed: name=Statistic20, value=Value20 gamestatistics.c:258: Test failed: setting statistic failed: name=Statistic21, value=Value21 gamestatistics.c:268: Test failed: setting category title failed: Category0a === w10pro64_ja (64 bit report) === gameux: gamestatistics.c:215: Test failed: setting category title failed: Category0 gamestatistics.c:216: Test failed: setting category title failed: Category1 gamestatistics.c:217: Test failed: setting category title failed: Category2 gamestatistics.c:248: Test failed: setting statistic failed: name=Statistic00, value=Value00 gamestatistics.c:250: Test failed: setting statistic failed: name=Statistic01, value=Value01 gamestatistics.c:252: Test failed: setting statistic failed: name=Statistic10, value=Value10 gamestatistics.c:254: Test failed: setting statistic failed: name=Statistic11, value=Value11 gamestatistics.c:256: Test failed: setting statistic failed: name=Statistic20, value=Value20 gamestatistics.c:258: Test failed: setting statistic failed: name=Statistic21, value=Value21 gamestatistics.c:268: Test failed: setting category title failed: Category0a === w10pro64_zh_CN (64 bit report) === gameux: gamestatistics.c:215: Test failed: setting category title failed: Category0 gamestatistics.c:216: Test failed: setting category title failed: Category1 gamestatistics.c:217: Test failed: setting category title failed: Category2 gamestatistics.c:248: Test failed: setting statistic failed: name=Statistic00, value=Value00 gamestatistics.c:250: Test failed: setting statistic failed: name=Statistic01, value=Value01 gamestatistics.c:252: Test failed: setting statistic failed: name=Statistic10, value=Value10 gamestatistics.c:254: Test failed: setting statistic failed: name=Statistic11, value=Value11 gamestatistics.c:256: Test failed: setting statistic failed: name=Statistic20, value=Value20 gamestatistics.c:258: Test failed: setting statistic failed: name=Statistic21, value=Value21 gamestatistics.c:268: Test failed: setting category title failed: Category0a

Dec. 6, 2020

[PATCH] jscript/tests: Use wide-char string literals.

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/tests/jscript.c | 5 +---- dlls/jscript/tests/run.c | 29 +++++++++++++---------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index c1b83d47799..e96127fbc5e 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -828,9 +828,6 @@ static void test_jscript_uninitializing(void) ULONG ref; HRESULT hres; - static const WCHAR script_textW[] = - {'f','u','n','c','t','i','o','n',' ','f','(',')',' ','{','}',0}; - script = create_jscript(); hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parse); @@ -850,7 +847,7 @@ static void test_jscript_uninitializing(void) test_state(script, SCRIPTSTATE_INITIALIZED); - hres = IActiveScriptParse_ParseScriptText(parse, script_textW, NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parse, L"function f() {}", NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 7cd0755497c..1deb460f715 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2484,9 +2484,6 @@ static void test_isvisible(BOOL global_members) IActiveScript *engine; HRESULT hres; - static const WCHAR script_textW[] = - {'v','a','r',' ','v',' ','=',' ','t','e','s','t','V','a','l',';',0}; - engine = create_script(); if(!engine) return; @@ -2519,12 +2516,12 @@ static void test_isvisible(BOOL global_members) if(!global_members) SET_EXPECT(GetItemInfo_testVal); - hres = IActiveScriptParse_ParseScriptText(parser, script_textW, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, L"var v = testVal;", NULL, NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); if(!global_members) CHECK_CALLED(GetItemInfo_testVal); - hres = IActiveScriptParse_ParseScriptText(parser, script_textW, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + hres = IActiveScriptParse_ParseScriptText(parser, L"var v = testVal;", NULL, NULL, NULL, 0, 0, 0, NULL, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); IActiveScript_Release(engine); @@ -3035,17 +3032,17 @@ static void run_bom_tests(void) int i; HRESULT hres; struct bom_test bom_tests[] = { - {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, - {{0xFEFF,'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, - {{'v',0xFEFF,'a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, JS_E_OUT_OF_MEMORY}, - {{'v','a','r',0xFEFF,' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, - {{'v','a','r',' ','a',' ','=',' ','1',';',' ',0xFEFF,'r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, - {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t',0xFEFF,'S','u','c','c','e','s','s','(',')',';','\0'}, JS_E_OUT_OF_MEMORY}, - {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s',0xFEFF,'(',')',';','\0'}, S_OK}, - {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, - {{'v','a','r',' ','a',' ','=',0xFEFF,' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, - {{0xFEFF,'v','a','r',' ','a',' ','=',0xFEFF,0xFEFF,' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, - {{0}} + {L"var a = 1; reportSuccess();", S_OK}, + {L"\xfeffvar a = 1; reportSuccess();", S_OK}, + {L"v\xfeff" "ar a = 1; reportSuccess();", JS_E_OUT_OF_MEMORY}, + {L"var\xfeff a = 1; reportSuccess();", S_OK}, + {L"var a = 1; \xfeffreportSuccess();", S_OK}, + {L"var a = 1; report\xfeffSuccess();", JS_E_OUT_OF_MEMORY}, + {L"var a = 1; reportSuccess\xfeff();", S_OK}, + {L"var a = 1; reportSuccess(\xfeff);", S_OK}, + {L"var a =\xfeff 1; reportSuccess(\xfeff);", S_OK}, + {L"\xfeffvar a =\xfeff\xfeff 1; reportSuccess(\xfeff);", S_OK}, + {L""} }; engine_clsid = &CLSID_JScript; -- 2.26.2

Dec. 6, 2020

[PATCH] ieframe/tests: Use wide-char string literals.

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/tests/intshcut.c | 12 ++++-------- dlls/ieframe/tests/webbrowser.c | 16 +++++----------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index 803e7ec60e9..d2135d0ebb3 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -171,9 +171,7 @@ static void test_ReadAndWriteProperties(void) IUniformResourceLocatorA *urlA; IUniformResourceLocatorA *urlAFromFile; WCHAR fileNameW[MAX_PATH]; - - static const WCHAR shortcutW[] = {'t','e','s','t','s','h','o','r','t','c','u','t','.','u','r','l',0}; - WCHAR iconPath[] = {'f','i','l','e',':','/','/','/','C',':','/','a','r','b','i','t','r','a','r','y','/','i','c','o','n','/','p','a','t','h',0}; + static WCHAR iconPath[] = L"file:///C:/arbitrary/icon/path"; char testurl[] = "http://some/bogus/url.html"; ps[0].ulKind = PRSPEC_PROPID; @@ -183,7 +181,7 @@ static void test_ReadAndWriteProperties(void) /* Make sure we have a valid temporary directory */ GetTempPathW(MAX_PATH, fileNameW); - lstrcatW(fileNameW, shortcutW); + lstrcatW(fileNameW, L"testshortcut.url"); hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&urlA); ok(hr == S_OK, "Could not create CLSID_InternetShortcut instance: %08x\n", hr); @@ -208,7 +206,7 @@ static void test_ReadAndWriteProperties(void) IPersistFile_Release(pf); pv[0].vt = VT_LPWSTR; - U(pv[0]).pwszVal = (void *) iconPath; + U(pv[0]).pwszVal = iconPath; pv[1].vt = VT_I4; U(pv[1]).lVal = iconIndex; hr = urlA->lpVtbl->QueryInterface(urlA, &IID_IPropertySetStorage, (void **) &pPropSetStg); @@ -326,10 +324,8 @@ static void test_Load(void) HANDLE file; HRESULT hres; - static const WCHAR test_urlW[] = {'t','e','s','t','.','u','r','l',0}; - GetTempPathW(MAX_PATH, file_path); - lstrcatW(file_path, test_urlW); + lstrcatW(file_path, L"test.url"); for(test = load_tests; test < load_tests + ARRAY_SIZE(load_tests); test++) { IPropertySetStorage *propsetstorage; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 9c2c393aafe..52d1f707357 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -160,8 +160,6 @@ DEFINE_EXPECT(GetExternal); DEFINE_EXPECT(outer_QI_test); DEFINE_EXPECT(Advise_OnClose); -static const WCHAR wszItem[] = {'i','t','e','m',0}; - static VARIANT_BOOL exvb; static IWebBrowser2 *wb; @@ -1268,7 +1266,7 @@ static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, CHECK_EXPECT(UIWindow_SetActiveObject); if(!test_close && !test_hide) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); - ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); + ok(!lstrcmpW(pszObjName, L"item"), "unexpected pszObjName\n"); } else { ok(!pActiveObject, "pActiveObject != NULL\n"); ok(!pszObjName, "pszObjName != NULL\n"); @@ -1282,7 +1280,7 @@ static HRESULT WINAPI InPlaceFrame_SetActiveObject(IOleInPlaceFrame *iface, CHECK_EXPECT(Frame_SetActiveObject); if(!test_close && !test_hide) { ok(pActiveObject != NULL, "pActiveObject = NULL\n"); - ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); + ok(!lstrcmpW(pszObjName, L"item"), "unexpected pszObjName\n"); } else { ok(!pActiveObject, "pActiveObject != NULL\n"); ok(!pszObjName, "pszObjName != NULL\n"); @@ -1817,19 +1815,17 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam static HWND create_container_window(void) { - static const WCHAR wszWebBrowserContainer[] = - {'W','e','b','B','r','o','w','s','e','r','C','o','n','t','a','i','n','e','r',0}; static WNDCLASSEXW wndclass = { sizeof(WNDCLASSEXW), 0, wnd_proc, 0, 0, NULL, NULL, NULL, NULL, NULL, - wszWebBrowserContainer, + L"WebBrowserContainer", NULL }; RegisterClassExW(&wndclass); - return CreateWindowW(wszWebBrowserContainer, wszWebBrowserContainer, + return CreateWindowW(L"WebBrowserContainer", L"WebBrowserContainer", WS_OVERLAPPEDWINDOW, 10, 10, 600, 600, NULL, NULL, NULL, NULL); } @@ -1942,9 +1938,7 @@ static void test_SetHostNames(IOleObject *oleobj) { HRESULT hres; - static const WCHAR test_appW[] = {'t','e','s','t',' ','a','p','p',0}; - - hres = IOleObject_SetHostNames(oleobj, test_appW, (void*)0xdeadbeef); + hres = IOleObject_SetHostNames(oleobj, L"test app", (void*)0xdeadbeef); ok(hres == S_OK, "SetHostNames failed: %08x\n", hres); } -- 2.26.2

Dec. 6, 2020

[PATCH] gameux/tests: Use wide-char string literals.

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gameux/tests/gamestatistics.c | 101 +++++++++++++---------------- 1 file changed, 44 insertions(+), 57 deletions(-) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 192a245e096..c29c6b44470 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -89,12 +89,6 @@ static void test_unregister_game(IGameExplorer *ge) */ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpStatisticsFile) { - static const WCHAR sBackslash[] = {'\\',0}; - static const WCHAR sStatisticsDir[] = {'\\','M','i','c','r','o','s','o','f','t', - '\\','W','i','n','d','o','w','s','\\','G','a','m','e','E','x','p', - 'l','o','r','e','r','\\','G','a','m','e','S','t','a','t','i','s', - 't','i','c','s','\\',0}; - static const WCHAR sDotGamestats[] = {'.','g','a','m','e','s','t','a','t','s',0}; HRESULT hr; WCHAR sGuid[49], sPath[MAX_PATH]; @@ -105,11 +99,11 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta if(SUCCEEDED(hr)) { - lstrcatW(sPath, sStatisticsDir); + lstrcatW(sPath, L"\\Microsoft\\Windows\\GameExplorer\\GameStatistics\\"); lstrcatW(sPath, sGuid); - lstrcatW(sPath, sBackslash); + lstrcatW(sPath, L"\\"); lstrcatW(sPath, sGuid); - lstrcatW(sPath, sDotGamestats); + lstrcatW(sPath, L".gamestats"); *lpStatisticsFile = CoTaskMemAlloc((lstrlenW(sPath)+1)*sizeof(WCHAR)); if(!*lpStatisticsFile) hr = E_OUTOFMEMORY; @@ -145,22 +139,6 @@ static BOOL _isFileExists(LPCWSTR lpFile) static void test_gamestatisticsmgr( void ) { static const GUID guidApplicationId = { 0x17A6558E, 0x60BE, 0x4078, { 0xB6, 0x6F, 0x9C, 0x3A, 0xDA, 0x2A, 0x32, 0xE6 } }; - static const WCHAR sCategory0[] = {'C','a','t','e','g','o','r','y','0',0}; - static const WCHAR sCategory1[] = {'C','a','t','e','g','o','r','y','1',0}; - static const WCHAR sCategory2[] = {'C','a','t','e','g','o','r','y','2',0}; - static const WCHAR sCategory0a[] = {'C','a','t','e','g','o','r','y','0','a',0}; - static const WCHAR sStatistic00[] = {'S','t','a','t','i','s','t','i','c','0','0',0}; - static const WCHAR sStatistic01[] = {'S','t','a','t','i','s','t','i','c','0','1',0}; - static const WCHAR sStatistic10[] = {'S','t','a','t','i','s','t','i','c','1','0',0}; - static const WCHAR sStatistic11[] = {'S','t','a','t','i','s','t','i','c','1','1',0}; - static const WCHAR sStatistic20[] = {'S','t','a','t','i','s','t','i','c','2','0',0}; - static const WCHAR sStatistic21[] = {'S','t','a','t','i','s','t','i','c','2','1',0}; - static const WCHAR sValue00[] = {'V','a','l','u','e','0','0',0}; - static const WCHAR sValue01[] = {'V','a','l','u','e','0','1',0}; - static const WCHAR sValue10[] = {'V','a','l','u','e','1','0',0}; - static const WCHAR sValue11[] = {'V','a','l','u','e','1','1',0}; - static const WCHAR sValue20[] = {'V','a','l','u','e','2','0',0}; - static const WCHAR sValue21[] = {'V','a','l','u','e','2','1',0}; HRESULT hr; DWORD dwOpenResult; @@ -221,7 +199,7 @@ static void test_gamestatisticsmgr( void ) hr = IGameStatistics_SetCategoryTitle(gs, wMaxCategories, NULL); ok(hr==E_INVALIDARG, "setting category title invalid value: 0x%x\n", hr); - hr = IGameStatistics_SetCategoryTitle(gs, wMaxCategories, sCategory0); + hr = IGameStatistics_SetCategoryTitle(gs, wMaxCategories, L"Category0"); ok(hr==E_INVALIDARG, "setting category title invalid value: 0x%x\n", hr); /* check what happen if string is too long */ @@ -234,45 +212,51 @@ static void test_gamestatisticsmgr( void ) ok(hr==S_FALSE, "setting category title invalid result: 0x%x\n", hr); CoTaskMemFree(sTooLongString); - ok(IGameStatistics_SetCategoryTitle(gs, 0, sCategory0)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory0)); - ok(IGameStatistics_SetCategoryTitle(gs, 1, sCategory1)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory1)); - ok(IGameStatistics_SetCategoryTitle(gs, 2, sCategory2)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory1)); + ok(IGameStatistics_SetCategoryTitle(gs, 0, L"Category0")==S_OK, "setting category title failed: Category0\n"); + ok(IGameStatistics_SetCategoryTitle(gs, 1, L"Category1")==S_OK, "setting category title failed: Category1\n"); + ok(IGameStatistics_SetCategoryTitle(gs, 2, L"Category2")==S_OK, "setting category title failed: Category2\n"); /* check what happen if any string is NULL */ - hr = IGameStatistics_SetStatistic(gs, 0, 0, NULL, sValue00); + hr = IGameStatistics_SetStatistic(gs, 0, 0, NULL, L"Value00"); ok(hr == S_FALSE, "setting statistic returned unexpected value: 0x%x)\n", hr); - hr = IGameStatistics_SetStatistic(gs, 0, 0, sStatistic00, NULL); + hr = IGameStatistics_SetStatistic(gs, 0, 0, L"Statistic00", NULL); ok(hr == S_OK, "setting statistic returned unexpected value: 0x%x)\n", hr); /* check what happen if any string is too long */ sTooLongString = CoTaskMemAlloc(sizeof(WCHAR)*(uMaxNameLength+2)); memset(sTooLongString, 'a', sizeof(WCHAR)*(uMaxNameLength+1)); sTooLongString[uMaxNameLength+1]=0; - hr = IGameStatistics_SetStatistic(gs, 0, 0, sTooLongString, sValue00); + hr = IGameStatistics_SetStatistic(gs, 0, 0, sTooLongString, L"Value00"); ok(hr == S_FALSE, "setting statistic returned unexpected value: 0x%x)\n", hr); CoTaskMemFree(sTooLongString); sTooLongString = CoTaskMemAlloc(sizeof(WCHAR)*(uMaxValueLength+2)); memset(sTooLongString, 'a', sizeof(WCHAR)*(uMaxValueLength+1)); sTooLongString[uMaxValueLength+1]=0; - hr = IGameStatistics_SetStatistic(gs, 0, 0, sStatistic00, sTooLongString); + hr = IGameStatistics_SetStatistic(gs, 0, 0, L"Statistic00", sTooLongString); ok(hr == S_FALSE, "setting statistic returned unexpected value: 0x%x)\n", hr); CoTaskMemFree(sTooLongString); /* check what happen on too big index of category or statistic */ - hr = IGameStatistics_SetStatistic(gs, wMaxCategories, 0, sStatistic00, sValue00); + hr = IGameStatistics_SetStatistic(gs, wMaxCategories, 0, L"Statistic00", L"Value00"); ok(hr == E_INVALIDARG, "setting statistic returned unexpected value: 0x%x)\n", hr); - hr = IGameStatistics_SetStatistic(gs, 0, wMaxStatsPerCategory, sStatistic00, sValue00); + hr = IGameStatistics_SetStatistic(gs, 0, wMaxStatsPerCategory, L"Statistic00", L"Value00"); ok(hr == E_INVALIDARG, "setting statistic returned unexpected value: 0x%x)\n", hr); - ok(IGameStatistics_SetStatistic(gs, 0, 0, sStatistic00, sValue00)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic00), wine_dbgstr_w(sValue00)); - ok(IGameStatistics_SetStatistic(gs, 0, 1, sStatistic01, sValue01)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic01), wine_dbgstr_w(sValue01)); - ok(IGameStatistics_SetStatistic(gs, 1, 0, sStatistic10, sValue10)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic10), wine_dbgstr_w(sValue10)); - ok(IGameStatistics_SetStatistic(gs, 1, 1, sStatistic11, sValue11)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic11), wine_dbgstr_w(sValue11)); - ok(IGameStatistics_SetStatistic(gs, 2, 0, sStatistic20, sValue20)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic20), wine_dbgstr_w(sValue20)); - ok(IGameStatistics_SetStatistic(gs, 2, 1, sStatistic21, sValue21)==S_OK, "setting statistic failed: name=%s, value=%s\n", wine_dbgstr_w(sStatistic21), wine_dbgstr_w(sValue21)); + ok(IGameStatistics_SetStatistic(gs, 0, 0, L"Statistic00", L"Value00")==S_OK, + "setting statistic failed: name=Statistic00, value=Value00\n"); + ok(IGameStatistics_SetStatistic(gs, 0, 1, L"Statistic01", L"Value01")==S_OK, + "setting statistic failed: name=Statistic01, value=Value01\n"); + ok(IGameStatistics_SetStatistic(gs, 1, 0, L"Statistic10", L"Value10")==S_OK, + "setting statistic failed: name=Statistic10, value=Value10\n"); + ok(IGameStatistics_SetStatistic(gs, 1, 1, L"Statistic11", L"Value11")==S_OK, + "setting statistic failed: name=Statistic11, value=Value11\n"); + ok(IGameStatistics_SetStatistic(gs, 2, 0, L"Statistic20", L"Value20")==S_OK, + "setting statistic failed: name=Statistic20, value=Value20\n"); + ok(IGameStatistics_SetStatistic(gs, 2, 1, L"Statistic21", L"Value21")==S_OK, + "setting statistic failed: name=Statistic21, value=Value21\n"); ok(_isFileExists(lpStatisticsFile) == FALSE, "statistics file %s already exists\n", wine_dbgstr_w(lpStatisticsFile)); @@ -281,7 +265,7 @@ static void test_gamestatisticsmgr( void ) ok(_isFileExists(lpStatisticsFile) == TRUE, "statistics file %s does not exists\n", wine_dbgstr_w(lpStatisticsFile)); /* this value should not be stored in storage, we need it only to test is it not saved */ - ok(IGameStatistics_SetCategoryTitle(gs, 0, sCategory0a)==S_OK, "setting category title failed: %s\n", wine_dbgstr_w(sCategory0a)); + ok(IGameStatistics_SetCategoryTitle(gs, 0, L"Category0a")==S_OK, "setting category title failed: Category0a\n"); hr = IGameStatistics_Release(gs); ok(SUCCEEDED(hr), "releasing IGameStatistics returned error: 0x%08x\n", hr); @@ -295,17 +279,20 @@ static void test_gamestatisticsmgr( void ) /* verify values with these which we stored before*/ hr = IGameStatistics_GetCategoryTitle(gs, 0, &lpName); ok(hr == S_OK, "getting category title failed\n"); - ok(lstrcmpW(lpName, sCategory0)==0, "getting category title returned invalid string %s\n", wine_dbgstr_w(lpName)); + ok(lstrcmpW(lpName, L"Category0")==0, "getting category title returned invalid string %s\n", + wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); hr = IGameStatistics_GetCategoryTitle(gs, 1, &lpName); ok(hr == S_OK, "getting category title failed\n"); - ok(lstrcmpW(lpName, sCategory1)==0, "getting category title returned invalid string %s\n", wine_dbgstr_w(lpName)); + ok(lstrcmpW(lpName, L"Category1")==0, "getting category title returned invalid string %s\n", + wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); hr = IGameStatistics_GetCategoryTitle(gs, 2, &lpName); ok(hr == S_OK, "getting category title failed\n"); - ok(lstrcmpW(lpName, sCategory2)==0, "getting category title returned invalid string %s\n", wine_dbgstr_w(lpName)); + ok(lstrcmpW(lpName, L"Category2")==0, "getting category title returned invalid string %s\n", + wine_dbgstr_w(lpName)); CoTaskMemFree(lpName); /* check result if category doesn't exists */ @@ -316,43 +303,43 @@ static void test_gamestatisticsmgr( void ) hr = IGameStatistics_GetStatistic(gs, 0, 0, &lpName, &lpValue); ok(hr == S_OK, "getting statistic failed\n"); - ok(lstrcmpW(lpName, sStatistic00)==0, "getting statistic returned invalid name\n"); - ok(lstrcmpW(lpValue, sValue00)==0, "getting statistic returned invalid value\n"); + ok(lstrcmpW(lpName, L"Statistic00")==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, L"Value00")==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 0, 1, &lpName, &lpValue); ok(hr == S_OK, "getting statistic failed\n"); - ok(lstrcmpW(lpName, sStatistic01)==0, "getting statistic returned invalid name\n"); - ok(lstrcmpW(lpValue, sValue01)==0, "getting statistic returned invalid value\n"); + ok(lstrcmpW(lpName, L"Statistic01")==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, L"Value01")==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 1, 0, &lpName, &lpValue); ok(hr == S_OK, "getting statistic failed\n"); - ok(lstrcmpW(lpName, sStatistic10)==0, "getting statistic returned invalid name\n"); - ok(lstrcmpW(lpValue, sValue10)==0, "getting statistic returned invalid value\n"); + ok(lstrcmpW(lpName, L"Statistic10")==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, L"Value10")==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 1, 1, &lpName, &lpValue); ok(hr == S_OK, "getting statistic failed\n"); - ok(lstrcmpW(lpName, sStatistic11)==0, "getting statistic returned invalid name\n"); - ok(lstrcmpW(lpValue, sValue11)==0, "getting statistic returned invalid value\n"); + ok(lstrcmpW(lpName, L"Statistic11")==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, L"Value11")==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 2, 0, &lpName, &lpValue); ok(hr == S_OK, "getting statistic failed\n"); - ok(lstrcmpW(lpName, sStatistic20)==0, "getting statistic returned invalid name\n"); - ok(lstrcmpW(lpValue, sValue20)==0, "getting statistic returned invalid value\n"); + ok(lstrcmpW(lpName, L"Statistic20")==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, L"Value20")==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); hr = IGameStatistics_GetStatistic(gs, 2, 1, &lpName, &lpValue); ok(hr == S_OK, "getting statistic failed\n"); - ok(lstrcmpW(lpName, sStatistic21)==0, "getting statistic returned invalid name\n"); - ok(lstrcmpW(lpValue, sValue21)==0, "getting statistic returned invalid value\n"); + ok(lstrcmpW(lpName, L"Statistic21")==0, "getting statistic returned invalid name\n"); + ok(lstrcmpW(lpValue, L"Value21")==0, "getting statistic returned invalid value\n"); CoTaskMemFree(lpName); CoTaskMemFree(lpValue); -- 2.26.2

Dec. 6, 2020

Re: FOSDEM 21 emulator devroom

by Marcus Meissner

Hi, FOSDEM 2021 will be fully virtual... so no need for travel nor belgian beer hangovers ;) Ciao, Marcus On Sun, Dec 06, 2020 at 01:31:29PM +0300, Stefan Dösinger wrote: > That sounds very interesting indeed! I was thinking of giving a talk about Hangover, Apple 32 bit etc last year but missed the registration deadline. > > I probably won't make it to FOSDEM physically this year, if there's even an in-person FOSDEM. > > > Am 06.12.2020 um 12:45 schrieb Austin English <austinenglish(a)gmail.com>: > > > > > > > > ---------- Forwarded message --------- > > From: Mahmoud Abdelghany <blackbeard334(a)protonmail.com <mailto:blackbeard334(a)protonmail.com>> > > Date: Thu, Dec 3, 2020 at 8:44 AM > > Subject: FOSDEM 21 emulator devroom > > To: press(a)winehq.org <mailto:press(a)winehq.org> <press(a)winehq.org <mailto:press(a)winehq.org>> > > Cc: christophecreeten(a)hotmail.com <mailto:christophecreeten(a)hotmail.com> <christophecreeten(a)hotmail.com <mailto:christophecreeten(a)hotmail.com>> > > > > > > Hey guys, > > > > We're hosting an emulator development room at FOSDEM 21, and were wondering if you guys would be interested in sharing some of your knowledge with the community. > > > > If the answer is yes :D, please let us know. > > > > You can find more info here: > > https://github.com/blackbeard334/fosdem21-emulator-devroom-cfp <https://github.com/blackbeard334/fosdem21-emulator-devroom-cfp> > > > > > > Regards, > > > > Christophe Creeten & Mahmoud Abdelghany > > > > Sent with ProtonMail Secure Email. > > > > > > -- > > -Austin > > GPG: 267B CC1F 053F 0749 (expires 2021/02/18) >

Dec. 6, 2020

Re: FOSDEM 21 emulator devroom

by Stefan Dösinger

That sounds very interesting indeed! I was thinking of giving a talk about Hangover, Apple 32 bit etc last year but missed the registration deadline. I probably won't make it to FOSDEM physically this year, if there's even an in-person FOSDEM. > Am 06.12.2020 um 12:45 schrieb Austin English <austinenglish(a)gmail.com>: > > > > ---------- Forwarded message --------- > From: Mahmoud Abdelghany <blackbeard334(a)protonmail.com <mailto:blackbeard334(a)protonmail.com>> > Date: Thu, Dec 3, 2020 at 8:44 AM > Subject: FOSDEM 21 emulator devroom > To: press(a)winehq.org <mailto:press(a)winehq.org> <press(a)winehq.org <mailto:press(a)winehq.org>> > Cc: christophecreeten(a)hotmail.com <mailto:christophecreeten(a)hotmail.com> <christophecreeten(a)hotmail.com <mailto:christophecreeten(a)hotmail.com>> > > > Hey guys, > > We're hosting an emulator development room at FOSDEM 21, and were wondering if you guys would be interested in sharing some of your knowledge with the community. > > If the answer is yes :D, please let us know. > > You can find more info here: > https://github.com/blackbeard334/fosdem21-emulator-devroom-cfp <https://github.com/blackbeard334/fosdem21-emulator-devroom-cfp> > > > Regards, > > Christophe Creeten & Mahmoud Abdelghany > > Sent with ProtonMail Secure Email. > > > -- > -Austin > GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

Dec. 6, 2020

Fwd: FOSDEM 21 emulator devroom

by Austin English

---------- Forwarded message --------- From: Mahmoud Abdelghany <blackbeard334(a)protonmail.com> Date: Thu, Dec 3, 2020 at 8:44 AM Subject: FOSDEM 21 emulator devroom To: press(a)winehq.org <press(a)winehq.org> Cc: christophecreeten(a)hotmail.com <christophecreeten(a)hotmail.com> Hey guys, We're hosting an emulator development room at FOSDEM 21, and were wondering if you guys would be interested in sharing some of your knowledge with the community. If the answer is yes :D, please let us know. You can find more info here: https://github.com/blackbeard334/fosdem21-emulator-devroom-cfp Regards, Christophe Creeten & Mahmoud Abdelghany Sent with ProtonMail Secure Email. -- -Austin GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

Dec. 6, 2020

[PATCH v3] odbccp32: Implement SQLWriteDSNToIni/W

by Alistair Leslie-Hughes

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 | 96 +++++++++++++++++++++++++++++++-- dlls/odbccp32/tests/misc.c | 108 +++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+), 5 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 420f206b700..53ca70c0b9f 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1691,16 +1691,102 @@ BOOL WINAPI SQLValidDSN(LPCSTR lpszDSN) BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver) { + BOOL ret = FALSE; + 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 (RegCreateKeyW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\ODBC\\ODBC.INI", &hkey) == ERROR_SUCCESS) + { + HKEY sources; + + if (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 (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); + ret = TRUE; + } + + RegCloseKey(hkey); + } + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + heap_free(filename); + + return ret; } 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.29.2

Dec. 6, 2020

Re: Wine staging 5.19 release

by Zebediah Figura (she/her)

On 12/4/20 8:44 AM, Gerald Pfeifer wrote: > On Sat, 24 Oct 2020, Gerald Pfeifer wrote: >> Here is a patch on top (of the Wine Staging patchset) that is required. >> >> Can you please include that? Thank you! > > Thanks to (I believe Zebediah) for addressing those issues! > > I have to confess there is one snippet I missed. With the additional > patch below Wine 5.22 + Staging patchset builds on FreeBSD 11 out of > the box. > > Thank you for considering that; for now I'm carrying it as part of > the FreeBSD emulators/wine-devel port. Thanks for the report; this should hopefully be fixed by 2dc013940d2aae1b2e9de887d9ddb490e8a7a6fc. > > Gerald > > > --- dlls/ntdll/unix/file.c.orig 2020-11-07 09:33:27.083812000 +0000 > +++ dlls/ntdll/unix/file.c 2020-11-07 09:53:55.641522000 +0000 > @@ -394,6 +394,18 @@ > #define XATTR_USER_PREFIX_LEN (sizeof(XATTR_USER_PREFIX) - 1) > #endif > > +#ifdef HAVE_SYS_EXTATTR_H > +static inline int xattr_valid_namespace( const char *name ) > +{ > + if (strncmp( XATTR_USER_PREFIX, name, XATTR_USER_PREFIX_LEN ) != 0) > + { > + errno = EPERM; > + return 0; > + } > + return 1; > +} > +#endif > + > static int xattr_fremove( int filedes, const char *name ) > { > #if defined(XATTR_ADDITIONAL_OPTIONS) >

Dec. 6, 2020

[PATCH] kernelbase: Add rudimentary mui resource support to loader.c

by Craig Schulstad

Signed-off-by: Craig Schulstad <craigaschulstad(a)gmail.com> --- dlls/kernelbase/loader.c | 169 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 164 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index fc9b0ce0083..0fbe9bcd9e8 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -48,6 +48,9 @@ struct exclusive_datafile }; static struct list exclusive_datafile_list = LIST_INIT( exclusive_datafile_list ); +static WCHAR mui_locale[LOCALE_NAME_MAX_LENGTH]; +static BOOL locale_found = 0; +static BOOL recursion_flag = 0; /*********************************************************************** * Modules @@ -1011,11 +1014,122 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExW( HMODULE module, ENUMRESTYPEP return ret; } +/***********************************************************************/ +/* get_mui - Acquire an MUI module for the associated resource */ +/***********************************************************************/ + +HMODULE get_mui(HMODULE module) + +{ + + HMODULE mui_module = NULL; + + WCHAR module_name[MAX_PATH], mui_name[MAX_PATH]; + + INT i, j, k, l; + + /* Initialize the work strings */ + + for (i = 0; i < MAX_PATH; i++) { + module_name[i] = 0; + mui_name[i] = 0; + } + + /* Note - the reference to the Windows file name for an "MUI" file has a structure such as */ + /* "C:\Program Files\Application Directory\xx-XX\Application.exe.mui"; however, in testing */ + /* out the usage of the "GetModuleFileNameW" function, it was determined that it works with */ + /* a relative Linux file structure such as "xx-XX/Application.exe.mui". */ + + /* Acquire the base resource file name */ + + if (!(GetModuleFileNameW(module, module_name, MAX_PATH))) return module; + + /* Stay with the original module reference if this file is not an executable file. */ + + if (!(wcsstr(module_name, L".exe"))) return module; + + /* Acquire the locale name using LCIDToLocaleName. Since this function utilizes the FindResourceExW function, this */ + /* sets up a recursive call to this function. In order to avoid a stack overflow condition that would be caused by */ + /* repeated calls, a flag will be set on to return back to the FindResourceExW function without again calling the */ + /* locale acquisition function. */ + + if (!(locale_found)) { + + if (recursion_flag) return module; + + recursion_flag = 1; + + LCIDToLocaleName( GetUserDefaultLCID(), mui_locale, LOCALE_NAME_MAX_LENGTH, 0 ); + + recursion_flag = 0; + + locale_found = 1; + + } + + /* Locate the position of the final backslash in the retrieved executable file. */ + + j = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + if (module_name[i] == '\\') j = i; + } + + /* Set up the work index that will be used to extract just the executable file from the fully qualified file name. */ + + k = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + /* If work index "j" has been set to -1, then the file portion of the qualified name has been reached and will */ + /* be copied to the "MUI" file reference. */ + + if (j < 0) { + mui_name[k] = module_name[i]; + k++; + } + + /* When the position of the final backslash has been reached, add the locale name as the folder/directory */ + /* containing the "MUI" file and reset work index "j" to -1. */ + + if (i >= j && j > 0) { + for (l = 0; l < 5; l++) { + mui_name[k] = mui_locale[l]; + k++; + } + mui_name[k] = '/'; + k++; + j = -1; + } + } + + /* Finally, append the literal ".mui" onto the file reference. */ + + wcscat(mui_name, L".mui"); + + /* Now, see if there is an associated "MUI" file and if so use its handle for the module handle. */ + + mui_module = LoadLibraryExW(mui_name, 0, 0); + + if (mui_module) { + return mui_module; + } else { + return module; + } + +} + +/***********************************************************************/ +/* get_res_handle - Isolated call of the LdrFindResource function */ +/***********************************************************************/ + +HRSRC get_res_handle(HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang) -/********************************************************************** - * FindResourceExW (kernelbase.@) - */ -HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) { NTSTATUS status; UNICODE_STRING nameW, typeW; @@ -1024,7 +1138,6 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); - if (!module) module = GetModuleHandleW( 0 ); nameW.Buffer = typeW.Buffer = NULL; __TRY @@ -1046,7 +1159,41 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP if (!IS_INTRESOURCE(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + return (HRSRC)entry; + +} + +/********************************************************************** + * FindResourceExW (kernelbase.@) + */ +HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) +{ + + HRSRC rsrc; + + TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); + + if (!module) module = GetModuleHandleW( 0 ); + + rsrc = get_res_handle(module, type, name, lang); + + if (rsrc) { + + return rsrc; + + } else { + + /* If a resource retrieval failed using the initial module value, attempt to */ + /* locate an associated MUI file and retry the resource retrieval. */ + + module = get_mui(module); + + rsrc = get_res_handle(module, type, name, lang); + + return rsrc; + + } } @@ -1074,11 +1221,23 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeResource( HGLOBAL handle ) HGLOBAL WINAPI DECLSPEC_HOTPATCH LoadResource( HINSTANCE module, HRSRC rsrc ) { void *ret; + HMODULE mui_module = NULL; TRACE( "%p %p\n", module, rsrc ); if (!rsrc) return 0; if (!module) module = GetModuleHandleW( 0 ); + + + /* Only check for an MUI reference if the resource handle value is less than the module value, */ + /* or if an MUI reference was found and the MUI reference and handle value are larger than the */ + /* module value for the executable file. That is a signal that the resource handle is to be */ + /* associated with the MUI file instead of the executable file. */ + + mui_module = get_mui(module); + + if (((HMODULE)rsrc < module) || ((mui_module > module) && ((HMODULE)rsrc > mui_module))) module = mui_module; + if (!set_ntstatus( LdrAccessResource( module, (IMAGE_RESOURCE_DATA_ENTRY *)rsrc, &ret, NULL ))) return 0; return ret; -- 2.17.1

Dec. 5, 2020

[PATCH] winegstreamer: Clean up a newly allocated buffer on error in bytestream_wrapper_pull().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/media_source.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index d411bbd1de2..ffbf8041ed8 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -443,6 +443,7 @@ GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 of { struct media_source *source = gst_pad_get_element_private(pad); IMFByteStream *byte_stream = source->byte_stream; + GstBuffer *new_buffer = NULL; ULONG bytes_read; GstMapInfo info; BOOL is_eof; @@ -463,7 +464,7 @@ GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 of return GST_FLOW_EOS; if (!(*buf)) - *buf = gst_buffer_new_and_alloc(len); + *buf = new_buffer = gst_buffer_new_and_alloc(len); gst_buffer_map(*buf, &info, GST_MAP_WRITE); hr = IMFByteStream_Read(byte_stream, info.data, len, &bytes_read); gst_buffer_unmap(*buf, &info); @@ -471,7 +472,11 @@ GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 of gst_buffer_set_size(*buf, bytes_read); if (FAILED(hr)) + { + if (new_buffer) + gst_buffer_unref(new_buffer); return GST_FLOW_ERROR; + } return GST_FLOW_OK; } -- 2.29.2

Dec. 5, 2020

[PATCH v2] msctf/tests: Use wide-char string literals.

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Missed to commit a line break. dlls/msctf/tests/inputprocessor.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 1c97d2c5d1c..55a6ab6c34c 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1112,9 +1112,6 @@ static void test_Register(void) { HRESULT hr; - static const WCHAR szDesc[] = {'F','a','k','e',' ','W','i','n','e',' ','S','e','r','v','i','c','e',0}; - static const WCHAR szFile[] = {'F','a','k','e',' ','W','i','n','e',' ','S','e','r','v','i','c','e',' ','F','i','l','e',0}; - hr = ITfInputProcessorProfiles_GetCurrentLanguage(g_ipp,&gLangid); ok(SUCCEEDED(hr),"Unable to get current language id\n"); trace("Current Language %x\n",gLangid); @@ -1124,7 +1121,8 @@ static void test_Register(void) hr = ITfInputProcessorProfiles_Register(g_ipp, &CLSID_FakeService); ok(SUCCEEDED(hr),"Unable to register text service(%x)\n",hr); hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, - &CLSID_FakeService, szDesc, ARRAY_SIZE(szDesc), szFile, ARRAY_SIZE(szFile), 1); + &CLSID_FakeService, L"Fake Wine Service", ARRAY_SIZE(L"Fake Wine Service"), + L"Fake Wine Service File", ARRAY_SIZE(L"Fake Wine Service File"), 1); ok(SUCCEEDED(hr),"Unable to add Language Profile (%x)\n",hr); } @@ -2071,12 +2069,11 @@ static void test_InsertAtSelection(TfEditCookie ec, ITfContext *cxt) HRESULT hr; ITfInsertAtSelection *iis; ITfRange *range=NULL; - static const WCHAR txt[] = {'H','e','l','l','o',' ','W','o','r','l','d',0}; hr = ITfContext_QueryInterface(cxt, &IID_ITfInsertAtSelection , (LPVOID*)&iis); ok(SUCCEEDED(hr),"Failed to get ITfInsertAtSelection interface\n"); test_ACP_InsertTextAtSelection = SINK_EXPECTED; - hr = ITfInsertAtSelection_InsertTextAtSelection(iis, ec, 0, txt, 11, &range); + hr = ITfInsertAtSelection_InsertTextAtSelection(iis, ec, 0, L"Hello World", 11, &range); ok(SUCCEEDED(hr),"ITfInsertAtSelection_InsertTextAtSelection failed %x\n",hr); sink_check_ok(&test_ACP_InsertTextAtSelection,"InsertTextAtSelection"); ok(range != NULL,"No range returned\n"); -- 2.26.2

Dec. 5, 2020

Re: Re: Wine staging 5.19 release

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83152 Your paranoid android. === debiant (build log) === error: patch failed: dlls/ntdll/unix/file.c:394 Task: Patch failed to apply === debiant (build log) === error: patch failed: dlls/ntdll/unix/file.c:394 Task: Patch failed to apply

Dec. 5, 2020

Wine staging 6.0rc1 release

by Alistair Leslie-Hughes

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.0rc1 (740 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * HACK: Switch between all selection streams on MF_SOURCE_READER_ANY_STREAM. * msctf: Added ITfActiveLanguageProfileNotifySink support in ITfSource. * winebuild: Call __wine_syscall_dispatcher through the fixed address. * mf/topoloader: Add partial topology resolution tests. * mf/topoloader: Move node connection responsibility to connection function. * mf/topoloader: Implement source node to sink node branch resolver. * mf/topoloader: Unstub IMFTopologyLoader::Load. * winegstreamer: Implement ::SetInputType for audio conversion transform. * winegstreamer: Implement ::SetOutputType for audio conversion transform. * winegstreamer: Implement Get(Input/Output)CurrentType functions for audio converter transform. Added: * [40262] Correct order of windows messages. * [46070] Basemark Web 3.0 Desktop Launcher crashes. Updated: * msvcrt-Math_Precision * mfplat-streaming-support * ntdll-Junction_Points * widl-winrt-support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

Dec. 5, 2020

Re: [PATCH] ntdll: Fix memchr implementation.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83142 Your paranoid android. === debiant (build log) === error: patch failed: dlls/msvcrt/string.c:2621 error: patch failed: dlls/ntdll/string.c:72 error: patch failed: dlls/ntdll/tests/string.c:65 Task: Patch failed to apply === debiant (build log) === error: patch failed: dlls/msvcrt/string.c:2621 error: patch failed: dlls/ntdll/string.c:72 error: patch failed: dlls/ntdll/tests/string.c:65 Task: Patch failed to apply

Dec. 4, 2020

Re: [PATCH v2 17/17] winegstreamer: Implement Get(Input/Output)CurrentType functions for color converter transform.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83139 Your paranoid android. === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply

Dec. 4, 2020

Re: [PATCH v2 16/17] winegstreamer: Semi-stub Get*Attributes functions for color converter transform.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83138 Your paranoid android. === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply

Dec. 4, 2020

Re: [PATCH v2 15/17] winegstreamer: Implement ::Get(Input/Output)StreamInfo for color conversion transform.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83137 Your paranoid android. === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply

Dec. 4, 2020

Re: [PATCH v2 14/17] winegstreamer: Implement ::ProcessMessage for color conversion MFT.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83136 Your paranoid android. === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply

Dec. 4, 2020

Re: [PATCH v2 13/17] winegstreamer: Implement ::Process(Input/Output) for color conversion transform.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83135 Your paranoid android. === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply

Dec. 4, 2020

Re: [PATCH v2 12/17] winegstreamer: Implement ::SetOutputType for color conversion transform.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83134 Your paranoid android. === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply

Dec. 4, 2020

Re: [PATCH v2 11/17] winegstreamer: Implement ::GetOutputAvailableType for color conversion transform.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83133 Your paranoid android. === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply

Dec. 4, 2020

Re: [PATCH v2 10/17] winegstreamer: Implement ::SetInputType for color conversion transform.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83132 Your paranoid android. === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply

Dec. 4, 2020

Re: [PATCH v2 09/17] winegstreamer: Implement ::GetInputAvailableType for color conversion transform.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83131 Your paranoid android. === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply

Dec. 4, 2020

Re: [PATCH v2 08/17] winegstreamer: Register the color conversion transform.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83130 Your paranoid android. === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply === debiant (build log) === error: patch failed: dlls/winegstreamer/audioconvert.c:18 error: patch failed: dlls/winegstreamer/audioconvert.c:38 error: patch failed: dlls/winegstreamer/audioconvert.c:295 error: patch failed: dlls/winegstreamer/audioconvert.c:87 error: patch failed: dlls/winegstreamer/audioconvert.c:495 Task: Patch failed to apply

Dec. 4, 2020