January 2019 - Wine-Devel - list.winehq.org

[PATCH] po: Fuzzy a Japanese translation with a format mismatch.
by Francois Gouget Jan. 14, 2019

Jan. 14, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Feel free to provide a fixed translation instead. po/ja.po | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] po: Fuzzy a Portuguese (Portugal) translation with a format mismatch.
by Francois Gouget Jan. 14, 2019

Jan. 14, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Feel free to provide a fixed translation instead. po/pt_PT.po | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH] oleaut32/tests: Fix some memory leaks (Valgrind).
by Sven Baars Jan. 13, 2019

Jan. 13, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/oleaut32/tests/tmarshal.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 0b6776b40a..4b03d5a890 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -38,6 +38,7 @@ static inline void release_iface_(unsigned int line, void *iface) { ULONG ref = IUnknown_Release((IUnknown *)iface); ok_(__FILE__, line)(!ref, "Got outstanding refcount %d.\n", ref); + if (ref == 1) IUnknown_Release((IUnknown *)iface); } #define release_iface(a) release_iface_(__LINE__, a) @@ -2141,8 +2142,8 @@ static void test_marshal_iface(IWidget *widget, IDispatch *disp) sfd1 = create_disp_obj(); sfd2 = create_disp_obj(); sfd3 = create_disp_obj(); - hr = IWidget_iface_in(widget, (IUnknown *)create_disp_obj(), - (IDispatch *)create_disp_obj(), create_disp_obj()); + hr = IWidget_iface_in(widget, (IUnknown *)sfd1, + (IDispatch *)sfd2, sfd3); ok(hr == S_OK, "Got hr %#x.\n", hr); release_iface(sfd1); release_iface(sfd2); @@ -2329,9 +2330,10 @@ if (hr == S_OK) { release_iface(unk_out); release_iface(unk_in_out); +} release_iface(sfd1); +todo_wine release_iface(sfd3); -} testmode = 2; unk_in = unk_out = unk_in_out = NULL; @@ -2471,22 +2473,24 @@ static void test_marshal_variant(IWidget *widget, IDispatch *disp) static void test_marshal_safearray(IWidget *widget, IDispatch *disp) { - SAFEARRAY *in, *out, *in_ptr, *in_out; + SAFEARRAY *in, *out, *out2, *in_ptr, *in_out; HRESULT hr; in = make_safearray(3); - out = make_safearray(5); + out = out2 = make_safearray(5); in_ptr = make_safearray(7); in_out = make_safearray(9); hr = IWidget_safearray(widget, in, &out, &in_ptr, &in_out); ok(hr == S_OK, "Got hr %#x.\n", hr); check_safearray(in, 3); check_safearray(out, 4); + check_safearray(out2, 5); check_safearray(in_ptr, 7); check_safearray(in_out, 6); SafeArrayDestroy(in); SafeArrayDestroy(out); + SafeArrayDestroy(out2); SafeArrayDestroy(in_ptr); SafeArrayDestroy(in_out); } @@ -2629,6 +2633,7 @@ static void test_marshal_coclass(IWidget *widget, IDispatch *disp) release_iface(out); release_iface(in_out); release_iface(&class1->ICoclass1_iface); + release_iface(&class3->ICoclass1_iface); testmode = 2; in = out = in_out = NULL; -- 2.17.1

1 0

[v2 PATCH] oledb32: Support Milliseconds when converting BSTR -> DBTIMESTAMP
by Alistair Leslie-Hughes Jan. 13, 2019

Jan. 13, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/convert.c | 30 ++++++++++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 29 +++++++++++++++++++++++++---- 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f18c756..22fe5af 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -30,11 +30,25 @@ #include "oledb_private.h" +#include <stdio.h> #include "wine/debug.h" #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); +static inline char *strdupWtoA( LPCWSTR str ) +{ + LPSTR ret = NULL; + DWORD len; + + if (!str) return ret; + len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); + ret = heap_alloc( len ); + if (ret) + WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); + return ret; +} + typedef struct { IDataConvert IDataConvert_iface; @@ -527,6 +541,22 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, d->second = st.wSecond; d->fraction = st.wMilliseconds * 1000000; } + else + { + char *buff = strdupWtoA(s); + static const char *format = "%d-%d-%d %d:%d:%d.%d"; + + if(sscanf( buff, format, &d->year, &d->month, &d->day, &d->hour, &d->minute, &d->second, &d->fraction) != 7) + { + hr = DISP_E_TYPEMISMATCH; + *dst_status = DBSTATUS_E_CANTCONVERTVALUE; + *dst_len = get_length(dst_type); + } + else + hr = S_OK; + + heap_free(buff); + } VariantClear(&var); } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index e79bb45..7cafeda 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3608,8 +3608,12 @@ static void test_converttovar(void) static void test_converttotimestamp(void) { static const WCHAR strW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2',0}; + static const WCHAR str1W[] = {'2','0','1','3','/','0','5','/','1','4',' ','0','2','.','0','4','.','1','2',0}; static const WCHAR strFullW[] = {'2','0','1','3','-','0','5','-','1','4',' ','0','2',':','0','4',':','1','2', '.','0','1','7','0','0','0','0','0','0',0}; + static const WCHAR strFull1W[] = {'2','0','1','3','/','0','5','/','1','4',' ','0','2',':','0','4',':','1','2', + '.','0','1','7',0}; + DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; DBTIMESTAMP ts1 = {2013, 5, 14, 2, 4, 12, 17000000}; DATE date; @@ -3639,13 +3643,30 @@ static void test_converttotimestamp(void) ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); SysFreeString(bstr); + bstr = SysAllocString(str1W); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); + SysFreeString(bstr); + bstr = SysAllocString(strFullW); dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); - todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); - todo_wine ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + SysFreeString(bstr); + + bstr = SysAllocString(strFull1W); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DISP_E_TYPEMISMATCH, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_CANTCONVERTVALUE, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); SysFreeString(bstr); V_VT(&var) = VT_NULL; -- 1.9.1

1 0

Re: [PATCH v2] ntoskrnl.exe: fix handling relocations on page boundary
by Rafał H Jan. 13, 2019

Jan. 13, 2019

Why this is deferred. I hoped to have it included in Wine 4.0. It fixes kernel driver crashes for multiple games (StarForce v3, Age of Wushu, MTA: SA, makes the last one totally working, no idea about others) and is not intrusive at all. If not crash-fixes than what is accepted type of patches right now before Wine 4.0? W dniu 11.01.2019 o 19:05, Marvin pisze: Thank you for your contribution to Wine! This is an automated notification to let you know that your patch has been reviewed and its status set to "Deferred". This means that the patch is deferred because of code freeze for an upcoming release. You need to either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release. If you do not understand the reason for this status, disagree with our assessment, or are simply not sure how to proceed next, please ask for clarification by replying to this email.

2 1

[PATCH] mstask/tests: Fix some memory leaks (Valgrind).
by Sven Baars Jan. 13, 2019

Jan. 13, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/mstask/tests/task.c | 1 + dlls/mstask/tests/task_scheduler.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 4e8386a008..6195194d61 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -760,6 +760,7 @@ static void test_workitem_data(void) ok(count == sizeof(hello), "got %u\n", count); ok(data != NULL, "got NULL\n"); ok(!memcmp(data, hello, sizeof(hello)), "data mismatch\n"); + CoTaskMemFree(data); hr = ITask_SetWorkItemData(task, 0, NULL); ok(hr == S_OK, "got %#x\n", hr); diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index f61022575d..5abee75e23 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -329,11 +329,13 @@ static void test_save_task_curfile(ITask *task) hr = IPersistFile_Save(pfile, NULL, TRUE); ok(hr == S_OK, "Save error %#x\n", hr); + CoTaskMemFree(curfile); curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); ok(hr == S_OK, "GetCurFile error %#x\n", hr); ok(curfile && curfile[0] , "curfile should not be NULL\n"); + CoTaskMemFree(curfile); IPersistFile_Release(pfile); } @@ -454,18 +456,21 @@ static void test_task_storage(void) curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task2_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task3, (IScheduledWorkItem *)task); ok(hr == S_OK, "AddWorkItem error %#x\n", hr); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task3_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); ok(hr == S_OK, "AddWorkItem error %#x\n", hr); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); -- 2.17.1

2 1

[PATCH] winebuild: Fix a segmentation fault
by James Larrowe Jan. 12, 2019

Jan. 12, 2019

When 'winebuild' is called with no arguments, the make_c_identifier function is passed a null pointer, which is dereferenced and causes a segmentation fault. This patch fixes that issue. Signed-off-by: James Larrowe <larrowe.semaj11(a)gmail.com> --- tools/winebuild/utils.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 95da1758c5..a6b1c102fd 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -816,10 +816,17 @@ char *make_c_identifier( const char *str ) { char *p, buffer[256]; - for (p = buffer; *str && p < buffer+sizeof(buffer)-1; p++, str++) + if ( str == NULL ) { - if (isalnum(*str)) *p = *str; - else *p = '_'; + return NULL; + } + else + { + for (p = buffer; *str && p < buffer+sizeof(buffer)-1; p++, str++) + { + if (isalnum(*str)) *p = *str; + else *p = '_'; + } } *p = 0; return xstrdup( buffer ); -- 2.20.1

1 0

[PATCH] shell32/tests: Fix a typo.
by Sven Baars Jan. 12, 2019

Jan. 12, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- Noticed this while fixing the SHGetKnownFolderPath implementation. Will send a patch for that after the code freeze. dlls/shell32/tests/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index bac64e57a7..38b56f01d3 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1882,7 +1882,7 @@ if (0) { /* crashes */ path2 = NULL; hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_SIMPLE_IDLIST, NULL, &path2); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); - ok(path != NULL, "expected path != NULL\n"); + ok(path2 != NULL, "expected path != NULL\n"); ok(!lstrcmpiW(path, path2), "expected equal paths: %s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(path2)); CoTaskMemFree(path2); -- 2.17.1

1 0

[PATCH 2/2] po: Update French translation
by Isira Seneviratne Jan. 11, 2019

Jan. 11, 2019

1 0

Re: [PATCH 2/2] po: Update French translation
by Isira Seneviratne Jan. 11, 2019

Jan. 11, 2019

On Sat, Jan 12, 2019, 4:53 AM Dorian Wouters <dorian(a)elementw.net wrote: > You're welcome :) > Just noticed another thing: "Êtes vous" should be "Êtes-vous" (for some > reason I can hardly grasp even as a native french speaker); make sure to > include that in your patch if you submit it again. > Will do, thanks! > On 12/01/2019 00:20, Isira Seneviratne wrote: > > > > > > On Sat, Jan 12, 2019, 4:22 AM Dorian Wouters <dorian(a)elementw.net > > <mailto:dorian(a)elementw.net> wrote: > > > > Hi Isira, > > > > On 07/01/2019 17:10, Isira Seneviratne wrote: > > > #: winemine.rc:34 > > > msgid "All results will be lost. Are you sure?" > > > -msgstr "" > > > +msgstr "Tout les résultats seront perdu. Êtes vous sûr?" > > > > Shouldn't it be "perdus"? "résultats" is plural. > > > > > > Thank you, French isn't my strongest language. > > > > In addition the rest of the translation file has " "/NBSP/U+00A0 > before > > question marks, as per the punctuation rules of most french-speaking > > places (Québec not being one of them, mandating no or half-space > > instead); I think it should be added here too. > > > > > > Yeah, that was a mistake. Thank you again :) > > > > > > -- > > Regards, > > Dorian > > > > >

1 0