June 2018 - Wine-Commits - list.winehq.org

Francois Gouget : testbot: Track patches to the Wine modules separately.
by Alexandre Julliard June 27, 2018

June 27, 2018

Module: tools Branch: master Commit: 941d9107086a0f8e8e0c55104b14f9d55f0823ab URL: https://source.winehq.org/git/tools.git/?a=commit;h=941d9107086a0f8e8e0c551… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 27 08:09:26 2018 +0200 testbot: Track patches to the Wine modules separately. Patches to the dlls and programs modules don't require a rebuild of the native Wine tools. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 13 +++++++++++++ testbot/lib/WineTestBot/Patches.pm | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index b2bfe6a..811c3b8 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -193,6 +193,19 @@ sub _HandleFile($$$) } $Tests->{$Module}->{Files}->{$File} = $Change; } + elsif ($FilePath =~ m~^(dlls|programs)/([^/]+)/([^/\s]+)$~) + { + my ($Root, $Dir, $File) = ($1, $2, $3); + my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; + $Impacts->{IsWinePatch} = 1; + $Impacts->{ModuleBuild} = 1; + + if ($File eq "Makefile.in" and $Change ne "modify") + { + # This adds / removes a directory + $Impacts->{MakeMakefiles} = 1; + } + } else { my $WineFiles = $Impacts->{WineFiles} || $_WineFiles; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 03a0ebf..cafd54d 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -136,7 +136,8 @@ sub Submit($$$) $PastImpacts = GetPatchImpact($PatchFileName) if ($IsSet); my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts); - if (!$Impacts->{WineBuild} and !$Impacts->{TestBuild}) + if (!$Impacts->{WineBuild} and !$Impacts->{ModuleBuild} and + !$Impacts->{TestBuild}) { if ($Impacts->{IsWinePatch}) {

1 0

Francois Gouget : testbot/web: Let GetHtmlLine() detect and format the timeout errors.
by Alexandre Julliard June 27, 2018

June 27, 2018

Module: tools Branch: master Commit: b03a5e895e9e6dd6f673938a8ccd9fd54b4538bc URL: https://source.winehq.org/git/tools.git/?a=commit;h=b03a5e895e9e6dd6f673938… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 27 08:09:49 2018 +0200 testbot/web: Let GetHtmlLine() detect and format the timeout errors. It already handles filtering and highlighting errors so it makes sense to also have if reformat the timeout errors for the log summary. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index e5f7929..e7e53d2 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -253,6 +253,11 @@ sub GetHtmlLine($$$) return undef if ($Category ne "error" and !$FullLog); my $Html = $self->escapeHTML($Line); + if (!$FullLog and $Html =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) + { + my $Unit = $1; + return $Unit ne "" ? "$Unit: Timeout" : "Timeout"; + } if ($FullLog and $Category ne "none") { # Highlight all line categories in the full log @@ -414,15 +419,7 @@ sub GenerateBody($) print "<pre><code>"; $LogFirst = 0; } - if (!$MoreInfo->{Full} && $Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) - { - my $Unit = $1 ne "" ? "$1: " : ""; - print "${Unit}Timeout\n"; - } - else - { - print "$Html\n"; - } + print "$Html\n"; } close($LogFile);

1 0

Marcus Meissner : icinfo: vsnprintfw takes characters as buffer size not bytes.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: master Commit: 85f1a79be8bbb9b62ad88e0d0fbf1e005fd3ba16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f1a79be8bbb9b62ad88e0d… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Jun 26 16:14:33 2018 +0200 icinfo: vsnprintfw takes characters as buffer size not bytes. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/icinfo/icinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index bfbef6b..601ec8c 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -26,14 +26,14 @@ static int mywprintf(const WCHAR *format, ...) { static char output_bufA[65536]; - static WCHAR output_bufW[sizeof(output_bufA) / sizeof(WCHAR)]; + static WCHAR output_bufW[sizeof(output_bufA)]; va_list parms; DWORD nOut; BOOL res = FALSE; HANDLE hout = GetStdHandle(STD_OUTPUT_HANDLE); va_start(parms, format); - vsnprintfW(output_bufW, sizeof(output_bufW), format, parms); + vsnprintfW(output_bufW, sizeof(output_bufW)/sizeof(output_bufW[0]), format, parms); va_end(parms); /* Try to write as unicode whenever we think it's a console */

1 0

Andrey Gusev : msi: Remove checks for negative value.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: master Commit: 5bd1b6f41032d1e133a8d9a96fba711ee491d634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bd1b6f41032d1e133a8d9a9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jun 26 09:06:48 2018 +0200 msi: Remove checks for negative value. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/format.c | 2 +- dlls/msi/string.c | 5 ++--- dlls/msi/table.c | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 9356c9e..d32afb2 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -242,7 +242,7 @@ static WCHAR *deformat_file( FORMAT *format, FORMSTR *str, BOOL shortname, int * if ((ret = strdupW( file->TargetPath ))) len = strlenW( ret ); goto done; } - if ((len = GetShortPathNameW(file->TargetPath, NULL, 0)) <= 0) + if (!(len = GetShortPathNameW(file->TargetPath, NULL, 0))) { if ((ret = strdupW( file->TargetPath ))) len = strlenW( ret ); goto done; diff --git a/dlls/msi/string.c b/dlls/msi/string.c index f094a53..7383fdd 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -233,7 +233,7 @@ static void set_st_entry( string_table *st, UINT n, WCHAR *str, int len, USHORT static UINT string2id( const string_table *st, const char *buffer, UINT *id ) { - DWORD sz; + int sz; UINT r = ERROR_INVALID_PARAMETER; LPWSTR str; @@ -245,8 +245,7 @@ static UINT string2id( const string_table *st, const char *buffer, UINT *id ) return ERROR_SUCCESS; } - sz = MultiByteToWideChar( st->codepage, 0, buffer, -1, NULL, 0 ); - if( sz <= 0 ) + if (!(sz = MultiByteToWideChar( st->codepage, 0, buffer, -1, NULL, 0 ))) return r; str = msi_alloc( sz*sizeof(WCHAR) ); if( !str ) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 45a1814..e046c5c 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1279,9 +1279,7 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT UINT r; int ival; - if ( (iField <= 0) || - (iField > tv->num_cols) || - MSI_RecordIsNull( rec, iField ) ) + if (!iField || iField > tv->num_cols || MSI_RecordIsNull( rec, iField )) return ERROR_FUNCTION_FAILED; columninfo = tv->columns[ iField - 1 ];

1 0

Alexandre Julliard : schedsvc: Only restart the directory watch once we' ve received data.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: master Commit: 6a1ce3c114b1e1fa94bedd270299d127680f6d33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a1ce3c114b1e1fa94bedd27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 26 13:09:13 2018 +0200 schedsvc: Only restart the directory watch once we've received data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/svc_main.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 8e23a04..8830d59 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -47,9 +47,17 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; WCHAR path[MAX_PATH]; HANDLE htasks, hport, htimer; - JOBOBJECT_ASSOCIATE_COMPLETION_PORT info; + JOBOBJECT_ASSOCIATE_COMPLETION_PORT job_info; OVERLAPPED ov; LARGE_INTEGER period; + struct + { + FILE_NOTIFY_INFORMATION data; + WCHAR name_buffer[MAX_PATH]; + } info; + + /* the buffer must be DWORD aligned */ + C_ASSERT(!(sizeof(info) & 3)); TRACE("Starting...\n"); @@ -91,9 +99,9 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) return -1; } - info.CompletionKey = hjob_queue; - info.CompletionPort = hport; - if (!SetInformationJobObject(hjob_queue, JobObjectAssociateCompletionPortInformation, &info, sizeof(info))) + job_info.CompletionKey = hjob_queue; + job_info.CompletionPort = hport; + if (!SetInformationJobObject(hjob_queue, JobObjectAssociateCompletionPortInformation, &job_info, sizeof(job_info))) { ERR("SetInformationJobObject failed\n"); return -1; @@ -102,29 +110,16 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) memset(&ov, 0, sizeof(ov)); ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + memset(&info, 0, sizeof(info)); + ReadDirectoryChangesW(htasks, &info, sizeof(info), FALSE, + FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE, + NULL, &ov, NULL); + for (;;) { - struct - { - FILE_NOTIFY_INFORMATION data; - WCHAR name_buffer[MAX_PATH]; - } info; HANDLE events[4]; DWORD ret; - /* the buffer must be DWORD aligned */ - C_ASSERT(!(sizeof(info) & 3)); - - memset(&info, 0, sizeof(info)); - - ret = ReadDirectoryChangesW(htasks, &info, sizeof(info), FALSE, - FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE, - NULL, &ov, NULL); - if (!ret) break; - - if (info.data.NextEntryOffset) - FIXME("got multiple entries\n"); - events[0] = done_event; events[1] = htimer; events[2] = hport; @@ -160,6 +155,9 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) continue; } + if (info.data.NextEntryOffset) + FIXME("got multiple entries\n"); + /* Directory change notification */ info.data.FileName[info.data.FileNameLength/sizeof(WCHAR)] = 0; @@ -204,6 +202,11 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) if (!SetWaitableTimer(htimer, &period, 0, NULL, NULL, FALSE)) ERR("SetWaitableTimer failed\n"); } + + memset(&info, 0, sizeof(info)); + if (!ReadDirectoryChangesW(htasks, &info, sizeof(info), FALSE, + FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE, + NULL, &ov, NULL)) break; } CancelWaitableTimer(htimer);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: master Commit: b9c67d304a07facbdb30ccd87115b265e0faacd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9c67d304a07facbdb30ccd8… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Jun 26 08:26:49 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/lt.po b/po/lt.po index b21c2ba..b3b939b 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-05-29 20:50+0300\n" +"PO-Revision-Date: 2018-06-26 08:26+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14786,6 +14786,8 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"Užstrigo programa, bet WineDbg nepavyko prisijungti prie proceso ir gauti " +"dėklo pėdsako." #: winedbg.rc:41 msgid "(unidentified)"

1 0

Michael Stefaniuc : gdi32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: master Commit: 314a276f19e78c3498942b9cdec3be0dfacf84fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=314a276f19e78c3498942b9c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 25 21:46:41 2018 +0200 gdi32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 10 ++++----- dlls/gdi32/tests/brush.c | 2 +- dlls/gdi32/tests/dc.c | 6 +++--- dlls/gdi32/tests/dib.c | 38 ++++++++++++++++----------------- dlls/gdi32/tests/font.c | 52 ++++++++++++++++++++++----------------------- dlls/gdi32/tests/gdiobj.c | 2 +- dlls/gdi32/tests/icm.c | 2 +- dlls/gdi32/tests/metafile.c | 7 +++--- dlls/gdi32/tests/path.c | 14 ++++++------ dlls/gdi32/tests/pen.c | 2 +- 10 files changed, 67 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=314a276f19e78c349894…

1 0

Nikolay Sivov : crypt32: Fix string arguments tracing.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: master Commit: 3dcdbba6ef0f7602a342bd4e80238fdab0e14e7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dcdbba6ef0f7602a342bd4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 26 10:59:38 2018 +0300 crypt32: Fix string arguments tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 4a904d4..2ba8055 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -622,7 +622,7 @@ static LONG Base64WithHeaderAndTrailerToBinaryA(LPCSTR pszString, if (!(headerBegins = strstr(pszString, header))) { - TRACE("Can't find %s in %s.\n", header, pszString); + TRACE("Can't find %s in %s.\n", header, debugstr_an(pszString, cchString)); return ERROR_INVALID_DATA; } @@ -746,7 +746,7 @@ BOOL WINAPI CryptStringToBinaryA(LPCSTR pszString, StringToBinaryAFunc decoder; LONG ret; - TRACE("(%s, %d, %08x, %p, %p, %p, %p)\n", debugstr_a(pszString), + TRACE("(%s, %d, %08x, %p, %p, %p, %p)\n", debugstr_an(pszString, cchString ? cchString : -1), cchString, dwFlags, pbBinary, pcbBinary, pdwSkip, pdwFlags); if (!pszString) @@ -833,7 +833,7 @@ static LONG Base64WithHeaderAndTrailerToBinaryW(LPCWSTR pszString, if (!(headerBegins = strstrW(pszString, header))) { - TRACE("Can't find %s in %s.\n", debugstr_w(header), debugstr_w(pszString)); + TRACE("Can't find %s in %s.\n", debugstr_w(header), debugstr_wn(pszString, cchString)); return ERROR_INVALID_DATA; } @@ -957,7 +957,7 @@ BOOL WINAPI CryptStringToBinaryW(LPCWSTR pszString, StringToBinaryWFunc decoder; LONG ret; - TRACE("(%s, %d, %08x, %p, %p, %p, %p)\n", debugstr_w(pszString), + TRACE("(%s, %d, %08x, %p, %p, %p, %p)\n", debugstr_wn(pszString, cchString ? cchString : -1), cchString, dwFlags, pbBinary, pcbBinary, pdwSkip, pdwFlags); if (!pszString)

1 0

Hua Meng : msvcp120: Add test for Concurrent_vector_grow_to_at_least_with_result.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: master Commit: 1367904871954af99ee0f00a24541ed86a39c9f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1367904871954af99ee0f00a… Author: Hua Meng <161220092(a)smail.nju.edu.cn> Date: Tue Jun 26 18:35:57 2018 +0800 msvcp120: Add test for Concurrent_vector_grow_to_at_least_with_result. Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index b5e470c..2974482 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -420,6 +420,8 @@ static void* (__thiscall *p_vector_base_v4__Internal_compact)( void (__cdecl*)(void*, const void*, size_t)); static size_t (__thiscall *p_vector_base_v4__Internal_grow_by)( vector_base_v4*, size_t, size_t, void (__cdecl*)(void*, const void*, size_t), const void *); +static size_t (__thiscall *p_vector_base_v4__Internal_grow_to_at_least_with_result)( + vector_base_v4*, size_t, size_t, void (__cdecl*)(void*, const void*, size_t), const void *); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -572,6 +574,8 @@ static BOOL init(void) "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAPEAX_KPEAXP6AX10(a)ZP6AX1PEBX0@Z(a)Z"); SET(p_vector_base_v4__Internal_grow_by, "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAA_K_K0P6AXPEAXPEBX0(a)Z2@Z"); + SET(p_vector_base_v4__Internal_grow_to_at_least_with_result, + "?_Internal_grow_to_at_least_with_result(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAA_K_K0P6AXPEAXPEBX0(a)Z2@Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -693,6 +697,8 @@ static BOOL init(void) "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEPAXIPAXP6AX0I(a)ZP6AX0PBXI@Z(a)Z"); SET(p_vector_base_v4__Internal_grow_by, "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIIIP6AXPAXPBXI(a)Z1@Z"); + SET(p_vector_base_v4__Internal_grow_to_at_least_with_result, + "?_Internal_grow_to_at_least_with_result(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIIIP6AXPAXPBXI(a)Z1@Z"); #else SET(p__Thrd_current, "_Thrd_current"); @@ -742,6 +748,8 @@ static BOOL init(void) "?_Internal_compact(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAPAXIPAXP6AX0I(a)ZP6AX0PBXI@Z(a)Z"); SET(p_vector_base_v4__Internal_grow_by, "?_Internal_grow_by(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAIIIP6AXPAXPBXI(a)Z1@Z"); + SET(p_vector_base_v4__Internal_grow_to_at_least_with_result, + "?_Internal_grow_to_at_least_with_result(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAIIIP6AXPAXPBXI(a)Z1@Z"); #endif } SET(p__Thrd_equal, @@ -3036,6 +3044,44 @@ static void test_vector_base_v4(void) CHECK_CALLED(concurrent_vector_int_destroy); concurrent_vector_int_dtor(&v2); + /* test for Internal_grow_to_at_least_with_result */ + concurrent_vector_int_ctor(&v2); + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + vector_elem_count += 2; + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 2, "v2.early_size got %ld expected 2\n", (long)v2.early_size); + i = 0; + SET_EXPECT(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_copy); + idx = (size_t)call_func5(p_vector_base_v4__Internal_grow_to_at_least_with_result, + &v2, 3, sizeof(int), concurrent_vector_int_copy, &i); + CHECK_CALLED(concurrent_vector_int_alloc); + CHECK_CALLED(concurrent_vector_int_copy); + ok(idx == 2, "_Internal_grow_to_at_least_with_result returned %ld expected 2\n", (long)idx); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 3, "v2.early_size got %ld expected 3\n", (long)v2.early_size); + i = 0; + SET_EXPECT(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_copy); + idx = (size_t)call_func5(p_vector_base_v4__Internal_grow_to_at_least_with_result, + &v2, 5, sizeof(int), concurrent_vector_int_copy, &i); + CHECK_CALLED(concurrent_vector_int_alloc); + CHECK_CALLED(concurrent_vector_int_copy); + ok(idx == 3, "_Internal_grow_to_at_least_with_result returned %ld expected 3\n", (long)idx); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 5, "v2.early_size got %ld expected 5\n", (long)v2.early_size); + SET_EXPECT(concurrent_vector_int_destroy); + size = (size_t)call_func2(p_vector_base_v4__Internal_clear, + &v2, concurrent_vector_int_destroy); + ok(size == 3, "_Internal_clear returned %ld expected 3\n", (long)size); + CHECK_CALLED(concurrent_vector_int_destroy); + concurrent_vector_int_dtor(&v2); + SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &vector, concurrent_vector_int_destroy);

1 0

Zebediah Figura : devenum: Use separate factories for CLSID_SystemDeviceEnum and CLSID_CDeviceMoniker.
by Alexandre Julliard June 26, 2018

June 26, 2018

Module: wine Branch: master Commit: 47921c19e06254a0b66b41c73979aca2978afd5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=47921c19e06254a0b66b41c7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 26 09:05:30 2018 -0500 devenum: Use separate factories for CLSID_SystemDeviceEnum and CLSID_CDeviceMoniker. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_main.c | 46 +++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index 7bfc593..3499f99 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -56,6 +56,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) return TRUE; } +struct class_factory +{ + IClassFactory IClassFactory_iface; + IUnknown *obj; +}; + +static inline struct class_factory *impl_from_IClassFactory( IClassFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct class_factory, IClassFactory_iface ); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID iid, void **obj) { TRACE("(%p, %s, %p)\n", iface, debugstr_guid(iid), obj); @@ -87,24 +98,15 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID iid, void **obj) { + struct class_factory *This = impl_from_IClassFactory( iface ); + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(iid), obj); if (!obj) return E_POINTER; if (outer) return CLASS_E_NOAGGREGATION; - if (IsEqualGUID(&IID_ICreateDevEnum, iid)) - { - *obj = &DEVENUM_CreateDevEnum; - return S_OK; - } - if (IsEqualGUID(&IID_IParseDisplayName, iid)) - { - *obj = &DEVENUM_ParseDisplayName; - return S_OK; - } - - return CLASS_E_CLASSNOTAVAILABLE; + return IUnknown_QueryInterface(This->obj, iid, obj); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL lock) @@ -124,24 +126,24 @@ static const IClassFactoryVtbl ClassFactory_vtbl = { ClassFactory_LockServer }; -static IClassFactory devenum_cf = { &ClassFactory_vtbl }; +static struct class_factory create_devenum_cf = { { &ClassFactory_vtbl }, (IUnknown *)&DEVENUM_CreateDevEnum }; +static struct class_factory device_moniker_cf = { { &ClassFactory_vtbl }, (IUnknown *)&DEVENUM_ParseDisplayName }; /*********************************************************************** * DllGetClassObject (DEVENUM.@) */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **obj) { - TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + TRACE("(%s, %s, %p)\n", debugstr_guid(clsid), debugstr_guid(iid), obj); - *ppv = NULL; + *obj = NULL; - /* FIXME: we should really have two class factories. - * Oh well - works just fine as it is */ - if (IsEqualGUID(rclsid, &CLSID_SystemDeviceEnum) || - IsEqualGUID(rclsid, &CLSID_CDeviceMoniker)) - return IClassFactory_QueryInterface(&devenum_cf, iid, ppv); + if (IsEqualGUID(clsid, &CLSID_SystemDeviceEnum)) + return IClassFactory_QueryInterface(&create_devenum_cf.IClassFactory_iface, iid, obj); + else if (IsEqualGUID(clsid, &CLSID_CDeviceMoniker)) + return IClassFactory_QueryInterface(&device_moniker_cf.IClassFactory_iface, iid, obj); - FIXME("CLSID: %s, IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid)); + FIXME("class %s not available\n", debugstr_guid(clsid)); return CLASS_E_CLASSNOTAVAILABLE; }

1 0