July 2022 - Wine-Commits - list.winehq.org

Julian Klemann : http.sys: Add support for relative URLs.
by Alexandre Julliard July 8, 2022

July 8, 2022

Module: wine Branch: master Commit: 296852b2585576dfe523f4217becb4cd6101035d URL: https://source.winehq.org/git/wine.git/?a=commit;h=296852b2585576dfe523f421… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Thu Jul 7 16:25:21 2022 -0500 http.sys: Add support for relative URLs. The queue with the most specific path should be the one to receive the request. --- dlls/http.sys/http.c | 326 ++++++++++++++++++++++++++++++++----------- dlls/httpapi/tests/httpapi.c | 98 +++++++++++++ 2 files changed, 343 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=296852b2585576dfe523…

1 0

Francois Gouget : testbot/web: Add links to the first and last new untracked failures.
by Alexandre Julliard July 8, 2022

July 8, 2022

Module: tools Branch: master Commit: 8f9b52478dc31b7883447a83e7ca9862439bd4cf URL: https://source.winehq.org/git/tools.git/?a=commit;h=8f9b52478dc31b7883447a8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 8 15:34:42 2022 +0200 testbot/web: Add links to the first and last new untracked failures. 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, 12 insertions(+), 3 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 3fbdb427..321d025e 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -437,8 +437,13 @@ sub GenerateFullLog($$$$$) } } } - $LogBugs{-1} ||= [$LineNo, ""]; - $LogBugs{9999999} = [$LineNo, ""]; + $LogBugs{-2} ||= [$LineNo, "First failure"]; + if ($ErrCategory{$LineNo} eq "fullnew" and !$ErrFailures{$LineNo}) + { + $LogBugs{-1} ||= [$LineNo, "First untracked new failure"]; + $LogBugs{10000000} = [$LineNo, "Last untracked new failure"]; + } + $LogBugs{10000001} = [$LineNo, "Last failure"]; } } if (%LogBugs) @@ -447,7 +452,11 @@ sub GenerateFullLog($$$$$) foreach my $Label (sort { $a <=> $b } keys %LogBugs) { my ($LineNo, $Title) = @{$LogBugs{$Label}}; - $Label = $Label < 0 ? "First" : $Label == 9999999 ? "Last" : $Label; + $Label = $Label == -2 ? "First" : + $Label == -1 ? "new" : + $Label == 10000000 ? "new" : + $Label == 10000001 ? "Last" : + $Label; $Title = " title='". $self->escapeHTML($Title) ."'" if ($Title); print " <a href='#k${LogId}L$LineNo'$Title>$Label</a>" }

1 0

Francois Gouget : testbot/web: Clearly identify unused variables in the reset password page.
by Alexandre Julliard July 8, 2022

July 8, 2022

Module: tools Branch: master Commit: 88bb46d5991d2c12925d08a861271da2cd41f96d URL: https://source.winehq.org/git/tools.git/?a=commit;h=88bb46d5991d2c12925d08a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 8 15:34:44 2022 +0200 testbot/web: Clearly identify unused variables in the reset password page. This also avoids shadowing the $User variable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/ResetPassword.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 65dcdd53..b6c0ae9c 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -118,8 +118,8 @@ sub OnChangePassword($) return !1; } - ($ErrMessage, my $User) = $Users->Authenticate($self->GetParam("Name"), - $self->GetParam("Password1")); + ($ErrMessage, my $_User) = $Users->Authenticate($self->GetParam("Name"), + $self->GetParam("Password1")); if (defined $ErrMessage) { $self->AddError($ErrMessage, "Name"); @@ -127,8 +127,7 @@ sub OnChangePassword($) } my $Sessions = CreateSessions(); - ($ErrMessage, my $Session) = $Sessions->NewSession($User, - defined($self->GetParam("AutoLogin"))); + ($ErrMessage, my $_Session) = $Sessions->NewSession($User, defined $self->GetParam("AutoLogin")); if ($ErrMessage) { $self->AddError($ErrMessage, "Name");

1 0

Alexandre Julliard : Use Gitlab for git URLs.
by Alexandre Julliard July 8, 2022

July 8, 2022

Module: website Branch: master Commit: ebb1a0246f8098bc88f80e9ccf9609b005daf944 URL: https://source.winehq.org/git/website.git/?a=commit;h=ebb1a0246f8098bc88f80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 14:15:55 2022 +0200 Use Gitlab for git URLs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/plugins/announce.php | 4 ++-- include/winehq.conf.sample | 4 ++-- templates/de/home.template | 4 ++-- templates/en/home.template | 4 ++-- templates/es/home.template | 4 ++-- templates/fr/home.template | 4 ++-- templates/ko/home.template | 4 ++-- templates/nl/home.template | 4 ++-- templates/pl/home.template | 4 ++-- templates/pt/home.template | 4 ++-- templates/tr/home.template | 4 ++-- templates/uk/home.template | 4 ++-- templates/zh-cn/home.template | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=ebb1a0246f8098bc8…

1 0

Alexandre Julliard : Use Gitlab for commit URLs.
by Alexandre Julliard July 8, 2022

July 8, 2022

Module: bugzilla Branch: master Commit: ea4302dd1afc72b1edb0039222c4bb7c2b7af7e9 URL: https://source.winehq.org/git/bugzilla.git/?a=commit;h=ea4302dd1afc72b1edb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 8 12:14:26 2022 +0200 Use Gitlab for commit URLs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- template/en/default/bug/edit.html.tmpl | 4 ++-- template/en/default/list/table.html.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 5685dc3..7cf3932 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -904,12 +904,12 @@ <tr> [% IF field.name == 'cf_regression_sha1sum' && bug.${field.name} %] [% PROCESS bug/field.html.tmpl value = bug.${field.name} - desc_url = "//source.winehq.org/git/wine.git/commit/${bug.cf_regression_sha1sum}" + desc_url = "https://gitlab.winehq.org/wine/wine/-/commit/${bug.cf_regression_sha1sum}" editable = bug.check_can_change_field(field.name, 0, 1) value_span = 2 %] [% ELSIF field.name == 'cf_fixedby_sha1sum' && bug.${field.name} %] [% PROCESS bug/field.html.tmpl value = bug.${field.name} - desc_url = "//source.winehq.org/git/wine.git/commit/${bug.cf_fixedby_sha1sum}" + desc_url = "https://gitlab.winehq.org/wine/wine/-/commit/${bug.cf_fixedby_sha1sum}" editable = bug.check_can_change_field(field.name, 0, 1) value_span = 2 %] [% ELSIF field.name == 'cf_staged_patchset' && bug.${field.name} && is_safe_url("${bug.cf_staged_patchset}") %] diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index 21f7713..a68b14c 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -199,10 +199,10 @@ [%- bug.$column.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%] </a> [% ELSIF column == 'cf_regression_sha1sum' && bug.cf_regression_sha1sum %] - <a href="//source.winehq.org/git/wine.git/commit/[% bug.cf_regression_sha1sum FILTER html %]"> + <a href="https://gitlab.winehq.org/wine/wine/-/commit/[% bug.cf_regression_sha1sum FILTER html %]"> [% bug.cf_regression_sha1sum.truncate(16) FILTER html %]</a> [% ELSIF column == 'cf_fixedby_sha1sum' && bug.cf_fixedby_sha1sum %] - <a href="//source.winehq.org/git/wine.git/commit/[% bug.cf_fixedby_sha1sum FILTER html %]"> + <a href="https://gitlab.winehq.org/wine/wine/-/commit/[% bug.cf_fixedby_sha1sum FILTER html %]"> [% bug.cf_fixedby_sha1sum.truncate(16) FILTER html %]</a> [% ELSE %] [%- display_value(column, bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%]

1 0

Stefan Rentsch : wbemprox: Provide more accurate system information.
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: wine Branch: master Commit: fefe108e2043d8a9d993b4e2cb129c851ca5e795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fefe108e2043d8a9d993b4e2… Author: Stefan Rentsch <et14rest(a)gmail.com> Date: Tue Jul 5 14:28:30 2022 +0200 wbemprox: Provide more accurate system information. This re-uses existing functions from Win32_ComputerSystemProduct to provide more accurate values, which are helpful to system overview applications. > wmic.exe computersystem GET Manufacturer --- dlls/wbemprox/builtin.c | 67 +++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4ac52918f6f..820fb61930f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1625,20 +1625,52 @@ static WCHAR *get_username(void) return ret; } +static WCHAR *get_compsysproduct_string( BYTE id, const char *buf, UINT len ) +{ + const struct smbios_header *hdr; + const struct smbios_system *system; + UINT offset; + + if (!(hdr = find_smbios_entry( SMBIOS_TYPE_SYSTEM, buf, len ))) return NULL; + + system = (const struct smbios_system *)hdr; + offset = (const char *)system - buf + system->hdr.length; + return get_smbios_string( id, buf, offset, len ); +} + +static WCHAR *get_compsysproduct_name( const char *buf, UINT len ) +{ + WCHAR *ret = get_compsysproduct_string( 2, buf, len ); + if (!ret) return wcsdup( L"Wine" ); + return ret; +} + +static WCHAR *get_compsysproduct_vendor( const char *buf, UINT len ) +{ + WCHAR *ret = get_compsysproduct_string( 1, buf, len ); + if (!ret) return wcsdup( L"The Wine Project" ); + return ret; +} + static enum fill_status fill_compsys( struct table *table, const struct expr *cond ) { struct record_computersystem *rec; enum fill_status status = FILL_STATUS_UNFILTERED; - UINT row = 0; + UINT row = 0, len; + char *buf; if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + len = GetSystemFirmwareTable( RSMB, 0, NULL, 0 ); + if (!(buf = malloc( len ))) return FILL_STATUS_FAILED; + GetSystemFirmwareTable( RSMB, 0, buf, len ); + rec = (struct record_computersystem *)table->data; rec->description = L"AT/AT COMPATIBLE"; rec->domain = L"WORKGROUP"; rec->domainrole = 0; /* standalone workstation */ - rec->manufacturer = L"The Wine Project"; - rec->model = L"Wine"; + rec->manufacturer = get_compsysproduct_vendor( buf, len ); + rec->model = get_compsysproduct_name( buf, len ); rec->name = get_computername(); rec->num_logical_processors = get_logical_processor_count( NULL, &rec->num_processors ); rec->systemtype = get_systemtype(); @@ -1647,24 +1679,13 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; + free( buf ); + TRACE("created %u rows\n", row); table->num_rows = row; return status; } -static WCHAR *get_compsysproduct_string( BYTE id, const char *buf, UINT len ) -{ - const struct smbios_header *hdr; - const struct smbios_system *system; - UINT offset; - - if (!(hdr = find_smbios_entry( SMBIOS_TYPE_SYSTEM, buf, len ))) return NULL; - - system = (const struct smbios_system *)hdr; - offset = (const char *)system - buf + system->hdr.length; - return get_smbios_string( id, buf, offset, len ); -} - static WCHAR *get_compsysproduct_identifyingnumber( const char *buf, UINT len ) { WCHAR *ret = get_compsysproduct_string( 4, buf, len ); @@ -1672,13 +1693,6 @@ static WCHAR *get_compsysproduct_identifyingnumber( const char *buf, UINT len ) return ret; } -static WCHAR *get_compsysproduct_name( const char *buf, UINT len ) -{ - WCHAR *ret = get_compsysproduct_string( 2, buf, len ); - if (!ret) return wcsdup( L"Wine" ); - return ret; -} - static WCHAR *get_compsysproduct_uuid( const char *buf, UINT len ) { static const BYTE none[] = {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; @@ -1700,13 +1714,6 @@ done: return ret; } -static WCHAR *get_compsysproduct_vendor( const char *buf, UINT len ) -{ - WCHAR *ret = get_compsysproduct_string( 1, buf, len ); - if (!ret) return wcsdup( L"The Wine Project" ); - return ret; -} - static WCHAR *get_compsysproduct_version( const char *buf, UINT len ) { WCHAR *ret = get_compsysproduct_string( 3, buf, len );

1 0

Akihiro Sagawa : mciqtz32: Fix thread handle leak if a second play.
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: wine Branch: master Commit: de0794a1ddbfaa5bab9728e5d8f956541079c341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de0794a1ddbfaa5bab9728e5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jul 5 21:02:49 2022 +0900 mciqtz32: Fix thread handle leak if a second play. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/mciqtz32/mciqtz.c | 11 +++++++---- dlls/winmm/tests/mci.c | 13 +++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index a7ec0b78f33..5bde3f5dd14 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -449,10 +449,13 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms IVideoWindow_put_Visible(wma->vidwin, OATRUE); - wma->thread = CreateThread(NULL, 0, MCIQTZ_notifyThread, wma, 0, NULL); - if (!wma->thread) { - TRACE("Can't create thread\n"); - return MCIERR_INTERNAL; + if (!wma->thread) + { + wma->thread = CreateThread(NULL, 0, MCIQTZ_notifyThread, wma, 0, NULL); + if (!wma->thread) { + TRACE("Can't create thread\n"); + return MCIERR_INTERNAL; + } } return 0; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index cfad9a77da8..2e31cf51708 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1336,6 +1336,19 @@ static void test_playWaveTypeMpegvideo(void) err = mciSendStringA("close mysound", NULL, 0, NULL); ok(!err,"mci close returned %s\n", dbg_mcierr(err)); + + /* test a second play */ + err = mciSendStringA("open tempfile.wav type MPEGVideo alias mysound", NULL, 0, NULL); + ok(err==ok_saved,"mci open tempfile.wav type MPEGVideo returned %s\n", dbg_mcierr(err)); + + err = mciSendStringA("play mysound", NULL, 0, NULL); + ok(!err,"mci play retuend %s\n", dbg_mcierr(err)); + + err = mciSendStringA("play mysound", NULL, 0, NULL); + ok(!err,"mci play retuend %s\n", dbg_mcierr(err)); + + err = mciSendStringA("close mysound", NULL, 0, NULL); + ok(!err,"mci close returned %s\n", dbg_mcierr(err)); } static void test_asyncWaveTypeMpegvideo(HWND hwnd)

1 0

Hugh McMaster : regedit: Replace heap_x*() functions with malloc(), realloc() and free().
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: wine Branch: master Commit: a6063f836737fd1bb3719a607885b6a0533c7f63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6063f836737fd1bb3719a60… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 7 21:55:37 2022 +1000 regedit: Replace heap_x*() functions with malloc(), realloc() and free(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/childwnd.c | 29 +++++----- programs/regedit/edit.c | 36 ++++++------- programs/regedit/framewnd.c | 46 ++++++++-------- programs/regedit/hexedit.c | 25 +++++---- programs/regedit/listview.c | 30 +++++------ programs/regedit/main.c | 1 - programs/regedit/main.h | 3 +- programs/regedit/regedit.c | 14 ++--- programs/regedit/regproc.c | 128 +++++++++++++++++--------------------------- programs/regedit/treeview.c | 54 +++++++++---------- 10 files changed, 163 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6063f836737fd1bb371…

1 0

Zhiyi Zhang : atl: Avoid NULL pointer reference in AtlComModuleRevokeClassObjects().
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: wine Branch: master Commit: 2f3b916d05f6f2cd092f228645a0eb8bca5a1b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f3b916d05f6f2cd092f2286… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 1 12:31:34 2022 +0800 atl: Avoid NULL pointer reference in AtlComModuleRevokeClassObjects(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/atl/atl.c | 6 ++++++ dlls/atl100/tests/atl.c | 26 ++++++++++++++++++++++++++ dlls/atl110/tests/atl.c | 26 ++++++++++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 5a302621d60..32e0c722f8b 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -598,6 +598,9 @@ HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) return E_INVALIDARG; for(iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { + if(!(*iter)) + continue; + hres = CoRevokeClassObject((*iter)->dwRegister); if(FAILED(hres)) return hres; @@ -617,6 +620,9 @@ HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) return E_INVALIDARG; for(iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { + if(!(*iter)) + continue; + hres = CoRevokeClassObject((*iter)->pCache->dwRegister); if(FAILED(hres)) return hres; diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 7da6e5a9cd6..a40c38df25a 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -1115,6 +1115,31 @@ static void test_AtlComModuleRegisterClassObjects(void) ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); } +static void test_AtlComModuleRevokeClassObjects(void) +{ + _ATL_OBJMAP_ENTRY *null_entry = NULL; + _ATL_COM_MODULE module; + HRESULT hr; + + /* Test NULL module */ + hr = AtlComModuleRevokeClassObjects(NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + /* Test NULL m_ppAutoObjMapFirst and m_ppAutoObjMapLast */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = NULL; + module.m_ppAutoObjMapLast = NULL; + hr = AtlComModuleRevokeClassObjects(&module); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* Test m_ppAutoObjMapFirst and m_ppAutoObjMapLast both pointing to a NULL entry */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = &null_entry; + module.m_ppAutoObjMapLast = &null_entry; + hr = AtlComModuleRevokeClassObjects(&module); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); +} + START_TEST(atl) { if (!register_class()) @@ -1132,6 +1157,7 @@ START_TEST(atl) test_AtlAxCreateControl(); test_AtlComModuleGetClassObject(); test_AtlComModuleRegisterClassObjects(); + test_AtlComModuleRevokeClassObjects(); CoUninitialize(); } diff --git a/dlls/atl110/tests/atl.c b/dlls/atl110/tests/atl.c index 9e4bad87e97..ba5639178c3 100644 --- a/dlls/atl110/tests/atl.c +++ b/dlls/atl110/tests/atl.c @@ -82,12 +82,38 @@ static void test_AtlComModuleRegisterClassObjects(void) ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); } +static void test_AtlComModuleRevokeClassObjects(void) +{ + _ATL_OBJMAP_ENTRY_EX *null_entry = NULL; + _ATL_COM_MODULE module; + HRESULT hr; + + /* Test NULL module */ + hr = AtlComModuleRevokeClassObjects(NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + /* Test NULL m_ppAutoObjMapFirst and m_ppAutoObjMapLast */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = NULL; + module.m_ppAutoObjMapLast = NULL; + hr = AtlComModuleRevokeClassObjects(&module); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* Test m_ppAutoObjMapFirst and m_ppAutoObjMapLast both pointing to a NULL entry */ + module.cbSize = sizeof(module); + module.m_ppAutoObjMapFirst = &null_entry; + module.m_ppAutoObjMapLast = &null_entry; + hr = AtlComModuleRevokeClassObjects(&module); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); +} + START_TEST(atl) { CoInitialize(NULL); test_AtlComModuleGetClassObject(); test_AtlComModuleRegisterClassObjects(); + test_AtlComModuleRevokeClassObjects(); CoUninitialize(); }

1 0

Rémi Bernon : widl: Support namespaces for union declarations.
by Alexandre Julliard July 7, 2022

July 7, 2022

Module: wine Branch: master Commit: 837297c21f69098dea3d6b4d61838c46d98d0f53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=837297c21f69098dea3d6b4d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 25 12:44:18 2022 +0200 widl: Support namespaces for union declarations. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/parser.y | 6 +++--- tools/widl/typetree.c | 9 +++++---- tools/widl/typetree.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 02db99a55b7..4000f37032c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -477,7 +477,7 @@ typedecl: | structdef | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } | uniondef - | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, FALSE, NULL); } + | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, current_namespace, FALSE, NULL); } | attributes enumdef { $$ = $2; $$->attrs = check_enum_attrs($1); } | attributes structdef { $$ = $2; $$->attrs = check_struct_attrs($1); } | attributes uniondef { $$ = $2; $$->attrs = check_union_attrs($1); } @@ -1277,7 +1277,7 @@ unqualified_type: | structdef { $$ = $1; } | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } | uniondef { $$ = $1; } - | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, FALSE, NULL); } + | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, current_namespace, FALSE, NULL); } | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } | aKNOWNTYPE { $$ = find_type_or_error(current_namespace, $1); } ; @@ -1296,7 +1296,7 @@ typedef: m_attributes tTYPEDEF m_attributes decl_spec declarator_list ; uniondef: tUNION m_typename '{' ne_union_fields '}' - { $$ = type_new_nonencapsulated_union($2, TRUE, $4); } + { $$ = type_new_nonencapsulated_union($2, current_namespace, TRUE, $4); } | tUNION m_typename tSWITCH '(' s_field ')' m_ident '{' cases '}' { $$ = type_new_encapsulated_union($2, $5, $7, $9); } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 3ad140d520c..fef9d2e5c03 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -580,19 +580,20 @@ type_t *type_new_struct(char *name, struct namespace *namespace, int defined, va return t; } -type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields) +type_t *type_new_nonencapsulated_union(const char *name, struct namespace *namespace, int defined, var_list_t *fields) { type_t *t = NULL; if (name) - t = find_type(name, NULL, tsUNION); + t = find_type(name, namespace, tsUNION); if (!t) { t = make_type(TYPE_UNION); t->name = name; + t->namespace = namespace; if (name) - reg_type(t, name, NULL, tsUNION); + reg_type(t, name, namespace, tsUNION); } if (!t->defined && defined) @@ -627,7 +628,7 @@ type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *unio { if (!union_field) union_field = make_var(xstrdup("tagged_union")); - union_field->declspec.type = type_new_nonencapsulated_union(gen_name(), TRUE, cases); + union_field->declspec.type = type_new_nonencapsulated_union(gen_name(), NULL, TRUE, cases); t->details.structure = xmalloc(sizeof(*t->details.structure)); t->details.structure->fields = append_var(NULL, switch_field); diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 8f5e1ebdac5..be2288db021 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -53,7 +53,7 @@ type_t *type_new_void(void); type_t *type_coclass_declare(char *name); type_t *type_new_enum(const char *name, struct namespace *namespace, int defined, var_list_t *enums); type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields); -type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields); +type_t *type_new_nonencapsulated_union(const char *name, struct namespace *namespace, int defined, var_list_t *fields); type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases); type_t *type_new_bitfield(type_t *field_type, const expr_t *bits); type_t *type_runtimeclass_declare(char *name, struct namespace *namespace);

1 0