May 2014 - Wine-commits - list.winehq.org

Francois Gouget : testbot/lib: Make Collections try harder to return existing Item objects to avoid inconsistencies.
by Alexandre Julliard 06 May '14

06 May '14

Module: tools Branch: master Commit: c1658af0dac543ad77c327eecb7216b8cadc0fdc URL: http://source.winehq.org/git/tools.git/?a=commit;h=c1658af0dac543ad77c327ee… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 12:40:27 2014 +0200 testbot/lib: Make Collections try harder to return existing Item objects to avoid inconsistencies. Assume we have the following code: 1: my $Jobs = CreateJobs(); 2: my $VM1 = $Jobs->GetItem(100)->Steps->GetItem(1)->Tasks->GetItem(1)->VM; 3: my $VM2 = $Jobs->GetItem(101)->Steps->GetItem(1)->Tasks->GetItem(1)->VM; 4: my $VM2b = $Jobs->GetItem(101)->Steps->GetItem(1)->Tasks->GetItem(1)->VM; 5: print $VM1->Name, " is ", $VM1->Status, "\n"; # Prints 'buildvm is idle' 6: print $VM2->Name, " is ", $VM2->Status, "\n"; # Prints 'buildvm is idle' 7: $VM1->Status('running'); 8: $VM1->Save(); 9: print $VM1->Name, " is ", $VM1->Status, "\n"; # Prints 'buildvm is running' 10: print $VM2->Name, " is ", $VM2->Status, "\n"; # Prints 'buildvm is idle' !!! 11: print $VM2b->Name, " is ", $VM2b->Status, "\n"; # Prints 'buildvm is running' The problem is that although $VM1, $VM2 and $VM2b refer to the same VM (buildvm), they are all separate objects. Then $VM2->Status gets loaded from the database for the print statement on line 6, and is then never refreshed; hence the out-of-date value printed on line 10. In contrast $VM2b->Status is loaded from database for the print statement on line 11 and thus shows the up-to-date value that was saved on line 8. This is very confusing. This patch associates a scope to each Collection and ensures that there is no duplicate Item objects within that scope. Further, any object created from a Collection inherits its scope. So in the example above, because all objects can ultimately be traced back to the $Jobs collection, $VM1, $VM2 and $VM2b all point to the same object which avoids any inconsistency. It's also possible to ensure that two Collections share the same scope by passing the reference collection as a parameter. For instance, in the above sample code, CreateVMs($Jobs)->GetItem('buildvm') will return $VM1. As before, creating a new Collection normally, CreateVMs() for instance, ensures gets a new, empty, scope and thus reload the objects from the database. This ensures the new objects will reflect changes made to the database by other processes. This is also why having a global persistent cache would not work. --- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/ObjectModel/Collection.pm | 199 +++++++++++++++++++++++---- testbot/lib/ObjectModel/DBIBackEnd.pm | 10 +- testbot/lib/ObjectModel/Item.pm | 27 +++- testbot/lib/WineTestBot/Branches.pm | 6 +- testbot/lib/WineTestBot/CGI/Sessions.pm | 5 +- testbot/lib/WineTestBot/Jobs.pm | 6 +- testbot/lib/WineTestBot/Patches.pm | 5 +- testbot/lib/WineTestBot/PendingPatchSets.pm | 5 +- testbot/lib/WineTestBot/PendingPatches.pm | 6 +- testbot/lib/WineTestBot/Roles.pm | 5 +- testbot/lib/WineTestBot/Steps.pm | 7 +- testbot/lib/WineTestBot/StepsTasks.pm | 6 +- testbot/lib/WineTestBot/Tasks.pm | 7 +- testbot/lib/WineTestBot/UserRoles.pm | 7 +- testbot/lib/WineTestBot/Users.pm | 6 +- testbot/lib/WineTestBot/VMs.pm | 6 +- testbot/web/JobDetails.pl | 2 +- 18 files changed, 250 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=c1658af0dac543ad77c3…

1 0

Francois Gouget : testbot/lib: Make sure we have a consistent view of the VMs Status, no matter which Task we get the corresponding object from.
by Alexandre Julliard 06 May '14

06 May '14

Module: tools Branch: master Commit: ad5dc5add5223edefd45ab693d238be5208b1c74 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ad5dc5add5223edefd45ab69… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 12:40:49 2014 +0200 testbot/lib: Make sure we have a consistent view of the VMs Status, no matter which Task we get the corresponding object from. This ensures we don't schedule two tasks on the same VM when there is more than one VM host. Specifically, in the single VM host scenario the scheduler actions go like this: Schedule Jobs on Host1 Load Job1 from database Load Step1 from database Load Task1 from database Load VM1 (e.g. buildvm) from database VM1 is idle -> start Task1 VM1->Status = running Save VM1 to the database Load Job2 from database Load Step2 from database Load Task2 from database Load VM2 (e.g. the same buildvm) from database -> VM2->Status is up to date VM2->Status is running -> nothing to do All done But in the two (or more) VM hosts scenario the first pass is when all the objects are being loaded from database, while the second one just reuses the already created Collections and Items. So in some cases scheduling goes like this: Schedule Jobs on Host1 Load Job1 from database Load Step1 from database Load Task1 from database Load VM1 (e.g. buildvm) from database VM1 is not on Host1 so continue Load Job2 from database Load Step2 from database Load Task2 from database Load VM2 (e.g. the same buildvm) from database VM2 is not on Host1 so continue Schedule Jobs on Host2 Job1 is already in memory Step1 is already in memory Task1 is already in memory VM1 is already in memory VM1 is idle -> start Task1 VM1->Status = running Save VM1 to the database Job2 is already in memory Step2 is already in memory Task2 is already in memory VM2 is already in memory -> VM2->Status has not been updated so VM2->Status is still idle -> start Task2 -> Bug!!! At this point we have two tasks trying to run on a single VM. When the first one completes the VM gets powered off, leaving the second one hanging. With this patch VM1 and VM2 are the same object, and thus we always have VM1->Status == VM2->Status which fixes this issue. --- testbot/lib/WineTestBot/Jobs.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 1bf9de6..8e36a32 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -429,11 +429,12 @@ $MaxVMsWhenIdle VMs (or $MaxActiveVMs if not set) for future jobs. =back =cut -sub ScheduleOnHost($$) +sub ScheduleOnHost($$$) { - my ($SortedJobs, $Hypervisors) = @_; + my ($ScopeObject, $SortedJobs, $Hypervisors) = @_; - my $HostVMs = CreateVMs(); + + my $HostVMs = CreateVMs($ScopeObject); $HostVMs->FilterEnabledRole(); $HostVMs->FilterHypervisors($Hypervisors); @@ -674,7 +675,7 @@ sub ScheduleJobs() # we should check if there are VMs to revert my %Hosts; - my $VMs = CreateVMs(); + my $VMs = CreateVMs($Jobs); $VMs->FilterEnabledRole(); foreach my $VM (@{$VMs->GetItems()}) { @@ -686,7 +687,7 @@ sub ScheduleJobs() foreach my $Host (keys %Hosts) { my @HostHypervisors = keys %{$Hosts{$Host}}; - my $HostErrMessage = ScheduleOnHost(\@SortedJobs, \@HostHypervisors); + my $HostErrMessage = ScheduleOnHost($Jobs, \@SortedJobs, \@HostHypervisors); push @ErrMessages, $HostErrMessage if (defined $HostErrMessage); } return @ErrMessages ? join("\n", @ErrMessages) : undef;

1 0

Francois Gouget : testbot/lib: Pass the Step object to Task::Run() so it does not have to look it up.
by Alexandre Julliard 06 May '14

06 May '14

Module: tools Branch: master Commit: 25d01cd2b4496290c5fc0b257e72efc04d2734f3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=25d01cd2b4496290c5fc0b25… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 12:41:31 2014 +0200 testbot/lib: Pass the Step object to Task::Run() so it does not have to look it up. --- testbot/lib/WineTestBot/Jobs.pm | 4 ++-- testbot/lib/WineTestBot/Tasks.pm | 16 ++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 8e36a32..b042bea 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -1,5 +1,5 @@ # Copyright 2009 Ge van Geldorp -# Copyright 2012 Francois Gouget +# Copyright 2012-2014 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -511,7 +511,7 @@ sub ScheduleOnHost($$$) my ($ErrProperty, $ErrMessage) = $VM->Save(); return $ErrMessage if (defined $ErrMessage); - $ErrMessage = $Task->Run($Job->Id, $Step->No); + $ErrMessage = $Task->Run($Step); return $ErrMessage if (defined $ErrMessage); $Job->UpdateStatus(); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 28e0727..fd848f2 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -1,5 +1,5 @@ # Copyright 2009 Ge van Geldorp -# Copyright 2012 Francois Gouget +# Copyright 2012-2014 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -72,16 +72,13 @@ Where $Type corresponds to the Task's type. =back =cut -sub Run +sub Run($$) { - my $self = shift; - my ($JobId, $StepNo) = @_; + my ($self, $Step) = @_; $self->Status("running"); $self->Save(); - my $Job = WineTestBot::Jobs::CreateJobs()->GetItem($JobId); - my $Step = $Job->Steps->GetItem($StepNo); my $RunScript; if ($Step->Type eq "build") { @@ -95,8 +92,6 @@ sub Run { $RunScript = "RunTask.pl"; } - $Step = undef; - $Job = undef; $self->GetBackEnd()->PrepareForFork(); my $Pid = fork; @@ -107,7 +102,8 @@ sub Run elsif (!$Pid) { # Capture Perl errors in the task's generic error log - my $TaskDir = "$DataDir/jobs/$JobId/$StepNo/" . $self->No; + my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; + my $TaskDir = "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; mkdir $TaskDir; unlink "$TaskDir/err"; # truncate the log since this is a new run if (open(STDERR, ">>", "$TaskDir/err")) @@ -123,7 +119,7 @@ sub Run } $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; - exec("$BinDir/${ProjectName}$RunScript", $JobId, $StepNo, $self->No) or + exec("$BinDir/${ProjectName}$RunScript", $JobId, $StepNo, $TaskNo) or require WineTestBot::Log; WineTestBot::Log::LogMsg("Unable to exec ${ProjectName}$RunScript: $!\n"); exit(1);

1 0

Francois Gouget : testbot/lib: Set the VM status to running in Task::Run() .
by Alexandre Julliard 06 May '14

06 May '14

Module: tools Branch: master Commit: cfde7ca87f7a2608b2c13939d9d41a52799ac751 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cfde7ca87f7a2608b2c13939… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 12:43:14 2014 +0200 testbot/lib: Set the VM status to running in Task::Run(). It's Task::Run() that starts the WineRun* processes, so it should be its responsibility to update the VM status. --- testbot/lib/WineTestBot/Jobs.pm | 5 +---- testbot/lib/WineTestBot/Tasks.pm | 8 ++++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b042bea..4532d4e 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -507,11 +507,8 @@ sub ScheduleOnHost($$$) { $IdleVMs{$VMKey} = 0; $IdleCount--; - $VM->Status("running"); - my ($ErrProperty, $ErrMessage) = $VM->Save(); - return $ErrMessage if (defined $ErrMessage); - $ErrMessage = $Task->Run($Step); + my $ErrMessage = $Task->Run($Step); return $ErrMessage if (defined $ErrMessage); $Job->UpdateStatus(); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index fd848f2..dd22749 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -79,6 +79,11 @@ sub Run($$) $self->Status("running"); $self->Save(); + my $VM = $self->VM; + $VM->Status("running"); + my ($ErrProperty, $ErrMessage) = $VM->Save(); + return $ErrMessage if (defined $ErrMessage); + my $RunScript; if ($Step->Type eq "build") { @@ -131,8 +136,7 @@ sub Run($$) # ChildPid should be ignored anyway if Status is not 'running'. $self->ChildPid($Pid); $self->Started(time); - my ($ErrProperty, $ErrMessage) = $self->Save(); - + ($ErrProperty, $ErrMessage) = $self->Save(); return $ErrMessage; }

1 0

Vincent Povirk : ole32: Initial implementation of transaction locking.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: 4f0d36d9a0339f5f853064bbf4fdc0d320ab82f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0d36d9a0339f5f853064bbf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 14:55:56 2014 -0500 ole32: Initial implementation of transaction locking. --- dlls/ole32/storage32.c | 310 ++++++++++++++++++++++++++++++++---------- dlls/ole32/storage32.h | 28 ++++ dlls/ole32/tests/storage32.c | 4 +- 3 files changed, 268 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f0d36d9a0339f5f85306…

1 0

Zhenbo Li : mshtml: Removed invalid nsAString_InitDepend from HTMLTableRow_put_bgColor and fixed error handling.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: 8192f54998b8ed3f892243ea5f6e84c6ca5d662a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8192f54998b8ed3f892243ea5… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat May 3 17:40:17 2014 +0800 mshtml: Removed invalid nsAString_InitDepend from HTMLTableRow_put_bgColor and fixed error handling. --- dlls/mshtml/htmltablerow.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 74750bd..331d6c9 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -175,8 +175,9 @@ static HRESULT WINAPI HTMLTableRow_put_bgColor(IHTMLTableRow *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - nsAString_InitDepend(&val, V_BSTR(&v)); - variant_to_nscolor(&v, &val); + if (!variant_to_nscolor(&v, &val)) + return S_OK; + nsres = nsIDOMHTMLTableRowElement_SetBgColor(This->nsrow, &val); nsAString_Finish(&val);

1 0

Piotr Caban : oleacc: Add GetProcessHandleFromHwnd implementation.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: d8467aee7472d07158258138aa5144557833cf29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8467aee7472d07158258138a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 3 14:27:35 2014 +0200 oleacc: Add GetProcessHandleFromHwnd implementation. --- dlls/oleacc/main.c | 12 ++++++++++++ dlls/oleacc/oleacc.spec | 1 + dlls/oleacc/tests/main.c | 27 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 2777a38..a80d6b4 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -332,6 +332,18 @@ void WINAPI GetOleaccVersionInfo(DWORD* pVersion, DWORD* pBuild) *pBuild = MAKELONG(0,0); } +HANDLE WINAPI GetProcessHandleFromHwnd(HWND hwnd) +{ + DWORD proc_id; + + TRACE("%p\n", hwnd); + + if(!GetWindowThreadProcessId(hwnd, &proc_id)) + return NULL; + return OpenProcess(PROCESS_DUP_HANDLE | PROCESS_VM_OPERATION | + PROCESS_VM_READ | PROCESS_VM_WRITE | SYNCHRONIZE, TRUE, proc_id); +} + UINT WINAPI GetRoleTextW(DWORD role, LPWSTR lpRole, UINT rolemax) { INT ret; diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 6851454..dc92172 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -9,6 +9,7 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stdcall GetOleaccVersionInfo(ptr ptr) +@ stdcall GetProcessHandleFromHwnd(ptr) @ stdcall GetRoleTextA(long ptr long) @ stdcall GetRoleTextW(long ptr long) @ stub GetStateTextA diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 0162d72..186a71b 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -279,6 +279,32 @@ static void test_AccessibleObjectFromWindow(void) DestroyWindow(hwnd); } +static void test_GetProcessHandleFromHwnd(void) +{ + HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); + HANDLE proc; + HWND hwnd; + + pGetProcessHandleFromHwnd = (void*)GetProcAddress( + GetModuleHandleA("oleacc.dll"), "GetProcessHandleFromHwnd"); + if(!pGetProcessHandleFromHwnd) { + win_skip("GetProcessHandleFromHwnd not available\n"); + return; + } + + proc = pGetProcessHandleFromHwnd(NULL); + ok(!proc, "proc = %p\n", proc); + + hwnd = CreateWindowA("static", "", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + + proc = pGetProcessHandleFromHwnd(hwnd); + ok(proc != NULL, "proc == NULL\n"); + CloseHandle(proc); + + DestroyWindow(hwnd); +} + static void test_default_client_accessible_object(void) { static const WCHAR testW[] = {'t','e','s','t',' ','t',' ','&','j','u','n','k',0}; @@ -417,6 +443,7 @@ START_TEST(main) test_getroletext(); test_LresultFromObject(argv[0]); test_AccessibleObjectFromWindow(); + test_GetProcessHandleFromHwnd(); test_default_client_accessible_object(); unregister_window_class();

1 0

Victor Martinez Calvo : ieframe: Compare against the correct IID in ShellUIHelper.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: 9e828995c9e6f85a0411918eaf45b0f41362784c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e828995c9e6f85a0411918ea… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Fri May 2 19:20:05 2014 +0200 ieframe: Compare against the correct IID in ShellUIHelper. --- dlls/ieframe/shelluihelper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/shelluihelper.c b/dlls/ieframe/shelluihelper.c index 867505b..9dca681 100644 --- a/dlls/ieframe/shelluihelper.c +++ b/dlls/ieframe/shelluihelper.c @@ -45,7 +45,7 @@ static HRESULT WINAPI ShellUIHelper2_QueryInterface(IShellUIHelper2 *iface, REFI }else if(IsEqualGUID(&IID_IShellUIHelper, riid)) { TRACE("(%p)->(IID_IShellUIHelper %p)\n", This, ppv); *ppv = &This->IShellUIHelper2_iface; - }else if(IsEqualGUID(&IID_IShellUIHelper, riid)) { + }else if(IsEqualGUID(&IID_IShellUIHelper2, riid)) { TRACE("(%p)->(IID_IShellUIHelper2 %p)\n", This, ppv); *ppv = &This->IShellUIHelper2_iface; }else {

1 0

Victor Martinez Calvo : quartz: Check correct dwReserved item before tracing.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: 2dbfb2af840e3239435564f070c65876eb14b012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbfb2af840e3239435564f07… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Fri May 2 19:21:44 2014 +0200 quartz: Check correct dwReserved item before tracing. --- dlls/quartz/avisplit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 6cd28da..d74c8ab 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -820,7 +820,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE TRACE("dwChunkId: %.4s\n", (const char *)&pIndex->dwChunkId); if (pIndex->dwReserved[0]) TRACE("dwReserved[0]: %u\n", pIndex->dwReserved[0]); - if (pIndex->dwReserved[2]) + if (pIndex->dwReserved[1]) TRACE("dwReserved[1]: %u\n", pIndex->dwReserved[1]); if (pIndex->dwReserved[2]) TRACE("dwReserved[2]: %u\n", pIndex->dwReserved[2]);

1 0

Victor Martinez Calvo : msdmo: Actually copy output string in IEnumDMO_fnNext.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: 0aea3728cca741913410534f411422905e3b8f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aea3728cca741913410534f4… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Fri May 2 19:27:00 2014 +0200 msdmo: Actually copy output string in IEnumDMO_fnNext. --- dlls/msdmo/dmoreg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index fb1caa1..e0c0719 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -615,9 +615,9 @@ static HRESULT WINAPI IEnumDMO_fnNext( hres = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szValue, &len); if (ERROR_SUCCESS == hres) { - Names[count] = HeapAlloc(GetProcessHeap(), 0, strlenW(szValue) + 1); + Names[count] = HeapAlloc(GetProcessHeap(), 0, (strlenW(szValue) + 1) * sizeof(WCHAR)); if (Names[count]) - strcmpW(Names[count], szValue); + strcpyW(Names[count], szValue); } wsprintfW(szGuidKey,szToGuidFmt,szNextKey); CLSIDFromString(szGuidKey, &pCLSID[count]);

1 0