wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Francois Gouget : testbot/WineRunTask: Don't force Windows VMs to have a c: \winetest directory.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: 56ce6a39cc8808b75a8b6cfb52ea8158082fa8de URL: http://source.winehq.org/git/tools.git/?a=commit;h=56ce6a39cc8808b75a8b6cfb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 10:02:18 2012 +0100 testbot/WineRunTask: Don't force Windows VMs to have a c:\winetest directory. --- testbot/bin/WineRunTask.pl | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 8e7aeff..ccb2600 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -248,8 +248,7 @@ if ($FileType ne "exe32" && $FileType ne "exe64") $FullErrFileName, $Job, $Step, $Task; } my $FileName = $Step->FileName; -$ErrMessage = $VM->CopyFileFromHostToGuest("$StepDir/$FileName", - "C:\\winetest\\$FileName"); +$ErrMessage = $VM->CopyFileFromHostToGuest("$StepDir/$FileName", $FileName); if (defined($ErrMessage)) { FatalError "Can't copy exe to VM: $ErrMessage\n", @@ -259,20 +258,20 @@ my $TestLauncher = "TestLauncher" . ($FileType eq "exe64" ? "64" : "32") . ".exe"; $ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/windows/$TestLauncher", - "C:\\winetest\\$TestLauncher"); + $TestLauncher); if (defined($ErrMessage)) { FatalError "Can't copy TestLauncher to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } $ErrMessage = $VM->CopyFileFromHostToGuest("$BinDir/windows/GenFixEnv.exe", - "C:\\winetest\\GenFixEnv.exe"); + "GenFixEnv.exe"); if (defined($ErrMessage)) { FatalError "Can't copy GenFixEnv to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -my $Script = "\@echo off\r\ncd \\winetest\r\nset WINETEST_DEBUG=" . $Step->DebugLevel . +my $Script = "\@echo off\r\nset WINETEST_DEBUG=" . $Step->DebugLevel . "\r\n"; if ($Step->ReportSuccessfulTests) { @@ -313,8 +312,7 @@ $Script .= "cls\r\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout + 15); my $LogErrMessage = RetrieveLogFile $Job, $Step, $Task, - "C:\\winetest\\$RptFileName", - $FullLogFileName; + $RptFileName, $FullLogFileName; TakeScreenshot $VM, $FullScreenshotFileName; if (defined($ErrMessage)) {

1 0

Francois Gouget : testbot/build: Log the Build.pl and Reconfig. pl scripts output.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: 431982a0a3a6b9ace6fbac1ec7a3df12150f211f URL: http://source.winehq.org/git/tools.git/?a=commit;h=431982a0a3a6b9ace6fbac1e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 10:01:41 2012 +0100 testbot/build: Log the Build.pl and Reconfig.pl scripts output. This lets us capture Perl errors in case there are any. --- testbot/bin/WineRunBuild.pl | 14 ++++++-------- testbot/bin/WineRunReconfig.pl | 4 +++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index faf777e..4cc7c89 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -243,14 +243,12 @@ if (defined($ErrMessage)) FatalError "Can't copy patch to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -my $Script = "#!/bin/sh\n"; -$Script .= "../bin/build/Build.pl $FileName " . $Step->FileType . - " $BaseName 32"; -if ($Run64) -{ - $Script .= ",64"; -} -$Script .= "\n"; +my $Script = "#!/bin/sh\n" . + "rm -f Build.log\n" . + "../bin/build/Build.pl $FileName " . $Step->FileType . + " $BaseName 32"; +$Script .= ",64"if ($Run64); +$Script .= " >>Build.log 2>&1\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout); if (defined($ErrMessage)) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 4f86e10..fa38a5f 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -198,7 +198,9 @@ if (defined($ErrMessage)) FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -my $Script = "#!/bin/sh\n../bin/build/Reconfig.pl\n"; +my $Script = "#!/bin/sh\n" . + "rm -f Reconfig.log\n" . + "../bin/build/Reconfig.pl >>Reconfig.log 2>&1\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout); if (defined($ErrMessage)) {

1 0

Francois Gouget : testbot/build: Don' t force WineTestBot to be installed in the same location on the build VM and the WineTestBot server .
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: 320347551427fb2998a7cd493c25393d855bbbb0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=320347551427fb2998a7cd49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 10:01:24 2012 +0100 testbot/build: Don't force WineTestBot to be installed in the same location on the build VM and the WineTestBot server. --- testbot/bin/WineRunBuild.pl | 15 +++++++-------- testbot/bin/WineRunReconfig.pl | 8 +++----- testbot/doc/INSTALL.txt | 3 ++- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 9fd23a7..faf777e 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -237,14 +237,14 @@ if (defined($ErrMessage)) } my $FileName = $Step->FileName; $ErrMessage = $VM->CopyFileFromHostToGuest("$StepDir/$FileName", - "$DataDir/staging/$FileName"); + "staging/$FileName"); if (defined($ErrMessage)) { FatalError "Can't copy patch to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } my $Script = "#!/bin/sh\n"; -$Script .= "$BinDir/build/Build.pl $FileName " . $Step->FileType . +$Script .= "../bin/build/Build.pl $FileName " . $Step->FileType . " $BaseName 32"; if ($Run64) { @@ -254,15 +254,14 @@ $Script .= "\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout); if (defined($ErrMessage)) { - $VM->CopyFileFromGuestToHost("$LogDir/Build.log", - $FullRawlogFileName); + $VM->CopyFileFromGuestToHost("Build.log", $FullRawlogFileName); ProcessRawlog($FullRawlogFileName, $FullLogFileName, $FullErrFileName); FatalError "Failure running script in VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -$ErrMessage = $VM->CopyFileFromGuestToHost("$LogDir/Build.log", - $FullRawlogFileName); +$ErrMessage = $VM->CopyFileFromGuestToHost("Build.log", $FullRawlogFileName); +LogMsg "263 ErrMessage=[", $ErrMessage || "<undef>", "]\n"; if (defined($ErrMessage)) { FatalError "Can't copy log from VM: $ErrMessage\n", $FullErrFileName, @@ -285,11 +284,11 @@ foreach my $OtherStep (@{$Job->Steps->GetItems()}) my $TestExecutable; if ($Step->FileType ne "patchprograms") { - $TestExecutable = "$DataDir/build-mingw$Bits/dlls/$BaseName/tests/${BaseName}_test.exe"; + $TestExecutable = "build-mingw$Bits/dlls/$BaseName/tests/${BaseName}_test.exe"; } else { - $TestExecutable = "$DataDir/build-mingw$Bits/programs/$BaseName/tests/${BaseName}.exe_test.exe"; + $TestExecutable = "build-mingw$Bits/programs/$BaseName/tests/${BaseName}.exe_test.exe"; } $ErrMessage = $VM->CopyFileFromGuestToHost($TestExecutable, "$OtherStepDir/$OtherFileName"); diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 47ac72e..4f86e10 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -198,19 +198,17 @@ if (defined($ErrMessage)) FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -my $Script = "#!/bin/sh\n$BinDir/build/Reconfig.pl\n"; +my $Script = "#!/bin/sh\n../bin/build/Reconfig.pl\n"; $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout); if (defined($ErrMessage)) { - $VM->CopyFileFromGuestToHost("$LogDir/Reconfig.log", - $FullRawlogFileName); + $VM->CopyFileFromGuestToHost("Reconfig.log", $FullRawlogFileName); ProcessRawlog($FullRawlogFileName, $FullLogFileName, $FullErrFileName); FatalError "Failure running script in VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -$ErrMessage = $VM->CopyFileFromGuestToHost("$LogDir/Reconfig.log", - $FullRawlogFileName); +$ErrMessage = $VM->CopyFileFromGuestToHost("Reconfig.log", $FullRawlogFileName); if (defined($ErrMessage)) { FatalError "Can't copy log from VM: $ErrMessage\n", $FullErrFileName, diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index b780de0..f57ed17 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -144,7 +144,8 @@ Dependencies: - In the winehq account, run Reconfig.pl. Check $HOME/tools/testbot/log/Reconfig.log to make sure it succeeded. -- Start the TestAgent server: ./bin/build/testagentd PORT SRCHOST +- Start the TestAgent server from the var directory: + cd $HOME/tools/testbot/var && ../bin/build/testagentd PORT SRCHOST Where PORT is the $AgentPort that was configured in ConfigLocal.pl on the WineTestBot server, and SRCHOST is either omitted or the hostname of the WineTestBot server.

1 0

Francois Gouget : testbot: Document the move of the ConfigLocal.pl file.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: 180ef4eba16f09400fbe1ab9c1e1b8dabc84145f URL: http://source.winehq.org/git/tools.git/?a=commit;h=180ef4eba16f09400fbe1ab9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 09:57:23 2012 +0100 testbot: Document the move of the ConfigLocal.pl file. --- testbot/doc/INSTALL.txt | 4 ++-- testbot/lib/WineTestBot/Config.pm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 95b2a08..b780de0 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -49,8 +49,8 @@ General setup for the web site: - Install scripts/initd in /etc/init.d/winetestbot and adjust the paths and user name if necessary. Then activate it. (typically "chkconfig winetestbot on" or "service winetestbot start") -- Copy lib/WineTestBot/ConfigLocalTemplate.pl to - lib/WineTestBot/ConfigLocal.pl and fill in the options for your site. +- Copy lib/WineTestBot/ConfigLocalTemplate.pl to ConfigLocal.pl in TestBot's + root directory and fill in the options for your site. - Restart Apache, you should now be able to browse to the home page. - Register a new account for yourself. - Using the mysql client, set the ResetCode in your Users entry to a diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 8d96c36..bb1cabb 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -88,12 +88,12 @@ $JobArchiveDays = 0; if (!$::BuildEnv) { $::BuildEnv = 0; - eval 'require "$::RootDir/ConfigLocal.pl";'; + eval 'require "$::RootDir/ConfigLocal.pl"'; if ($@) { - print STDERR "Please create a valid $::RootDir/ConfigLocal.pl, " . + print STDERR "Please create a valid $::RootDir/ConfigLocal.pl file; " . "use $::RootDir/lib/WineTestBot/ConfigLocalTemplate.pl as template\n"; - exit; + exit 1; } require ObjectModel::DBIBackEnd;

1 0

Nikolay Sivov : oleaut32: Added a test for prop getter invocation with different flags.
by Alexandre Julliard 14 Dec '12

14 Dec '12

Module: wine Branch: master Commit: 7f8825085d1057c80d761b28da40058e103be543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8825085d1057c80d761b28d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 23:07:50 2012 +0300 oleaut32: Added a test for prop getter invocation with different flags. --- dlls/oleaut32/tests/test_reg.idl | 8 ++ dlls/oleaut32/tests/typelib.c | 171 ++++++++++++++++++++++++++++++++------ 2 files changed, 153 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/test_reg.idl b/dlls/oleaut32/tests/test_reg.idl index 4598efd..7f73b25 100644 --- a/dlls/oleaut32/tests/test_reg.idl +++ b/dlls/oleaut32/tests/test_reg.idl @@ -127,4 +127,12 @@ library register_test interface Iole_from_disp; } + [ + uuid(f1b68c3b-02a3-4110-bc4c-cf9bc7e7f177) + ] + interface IInvokeTest : IDispatch + { + [propget, id(DISPID_VALUE)] + LONG test([in] LONG i); + } } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 85fd965..1bcc584 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -20,6 +20,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <wine/test.h> #include <stdarg.h> @@ -64,6 +65,74 @@ static WCHAR wszguid[] = {'g','u','i','d',0}; static const int is_win64 = sizeof(void *) > sizeof(int); +static HRESULT WINAPI invoketest_QueryInterface(IInvokeTest *iface, REFIID riid, void **ret) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID_IInvokeTest)) + { + *ret = iface; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI invoketest_AddRef(IInvokeTest *iface) +{ + return 2; +} + +static ULONG WINAPI invoketest_Release(IInvokeTest *iface) +{ + return 1; +} + +static HRESULT WINAPI invoketest_GetTypeInfoCount(IInvokeTest *iface, UINT *cnt) +{ + ok(0, "unexpected call\n"); + *cnt = 0; + return E_NOTIMPL; +} + +static HRESULT WINAPI invoketest_GetTypeInfo(IInvokeTest *iface, UINT index, LCID lcid, ITypeInfo **ti) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI invoketest_GetIDsOfNames(IInvokeTest *iface, REFIID riid, LPOLESTR *names, + UINT cnt, LCID lcid, DISPID *dispid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI invoketest_Invoke(IInvokeTest *iface, DISPID dispid, REFIID riid, + LCID lcid, WORD flags, DISPPARAMS *dispparams, VARIANT *res, EXCEPINFO *ei, UINT *argerr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static LONG WINAPI invoketest_get_test(IInvokeTest *iface, LONG i) +{ + return i+1; +} + +static const IInvokeTestVtbl invoketestvtbl = { + invoketest_QueryInterface, + invoketest_AddRef, + invoketest_Release, + invoketest_GetTypeInfoCount, + invoketest_GetTypeInfo, + invoketest_GetIDsOfNames, + invoketest_Invoke, + invoketest_get_test +}; + +static IInvokeTest invoketest = { &invoketestvtbl }; + static void init_function_pointers(void) { HMODULE hmod = GetModuleHandleA("oleaut32.dll"); @@ -534,6 +603,27 @@ static void test_CreateDispTypeInfo(void) SysFreeString(methdata[3].szName); } +static const char *create_test_typelib(int res_no) +{ + static char filename[MAX_PATH]; + HANDLE file; + HRSRC res; + void *ptr; + DWORD written; + + GetTempFileNameA( ".", "tlb", 0, filename ); + file = CreateFile( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" ); + if (file == INVALID_HANDLE_VALUE) return NULL; + res = FindResource( GetModuleHandle(0), MAKEINTRESOURCE(res_no), "TYPELIB" ); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandle(0), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandle(0), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandle(0), res ), "couldn't write resource\n" ); + CloseHandle( file ); + return filename; +} + static void test_TypeInfo(void) { ITypeLib *pTypeLib; @@ -549,9 +639,11 @@ static void test_TypeInfo(void) DISPID dispidMember; DISPPARAMS dispparams; GUID bogusguid = {0x806afb4f,0x13f7,0x42d2,{0x89,0x2c,0x6c,0x97,0xc3,0x6a,0x36,0xc1}}; - VARIANT var; - UINT count; + VARIANT var, res, args[2]; + UINT count, i; TYPEKIND kind; + const char *filenameA; + WCHAR filename[MAX_PATH]; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -714,6 +806,53 @@ static void test_TypeInfo(void) ITypeInfo_Release(pTypeInfo); ITypeLib_Release(pTypeLib); + + filenameA = create_test_typelib(3); + MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filename, MAX_PATH); + hr = LoadTypeLib(filename, &pTypeLib); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IInvokeTest, &pTypeInfo); + ok(hr == S_OK, "got 0x%08x\n", hr); + + dispparams.cArgs = 1; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = args; + + V_VT(&args[0]) = VT_I4; + V_I4(&args[0]) = 0; + + V_VT(&res) = VT_EMPTY; + + i = 0; + V_VT(&res) = VT_EMPTY; + V_I4(&res) = 0; + /* call propget with DISPATCH_METHOD|DISPATCH_PROPERTYGET flags */ + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, DISPID_VALUE, DISPATCH_METHOD|DISPATCH_PROPERTYGET, + &dispparams, &res, NULL, &i); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res)); + ok(V_I4(&res) == 1, "got %d\n", V_I4(&res)); + + i = 0; + /* call propget with DISPATCH_METHOD flags */ + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, DISPID_VALUE, DISPATCH_METHOD, + &dispparams, &res, NULL, &i); + ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x, %d\n", hr, i); + + i = 0; + V_VT(&res) = VT_EMPTY; + V_I4(&res) = 0; + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, DISPID_VALUE, DISPATCH_PROPERTYGET, + &dispparams, &res, NULL, &i); + ok(hr == S_OK, "got 0x%08x, %d\n", hr, i); + ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res)); + ok(V_I4(&res) == 1, "got %d\n", V_I4(&res)); + + ITypeInfo_Release(pTypeInfo); + ITypeLib_Release(pTypeLib); + DeleteFileA(filenameA); } static int WINAPI int_func( int a0, int a1, int a2, int a3, int a4 ) @@ -2722,27 +2861,6 @@ static void test_dump_typelib(const char *name) #endif -static const char *create_test_typelib(int res_no) -{ - static char filename[MAX_PATH]; - HANDLE file; - HRSRC res; - void *ptr; - DWORD written; - - GetTempFileNameA( ".", "tlb", 0, filename ); - file = CreateFile( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); - ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" ); - if (file == INVALID_HANDLE_VALUE) return NULL; - res = FindResource( GetModuleHandle(0), MAKEINTRESOURCE(res_no), "TYPELIB" ); - ok( res != 0, "couldn't find resource\n" ); - ptr = LockResource( LoadResource( GetModuleHandle(0), res )); - WriteFile( file, ptr, SizeofResource( GetModuleHandle(0), res ), &written, NULL ); - ok( written == SizeofResource( GetModuleHandle(0), res ), "couldn't write resource\n" ); - CloseHandle( file ); - return filename; -} - static void test_create_typelib_lcid(LCID lcid) { char filename[MAX_PATH]; @@ -2813,7 +2931,7 @@ static void test_register_typelib(BOOL system_registration) { TYPEKIND kind; WORD flags; - } attrs[11] = + } attrs[12] = { { TKIND_INTERFACE, 0 }, { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, @@ -2825,7 +2943,8 @@ static void test_register_typelib(BOOL system_registration) { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FDUAL }, { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, - { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE } + { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, + { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE } }; trace("Starting %s typelib registration tests\n", @@ -2857,7 +2976,7 @@ static void test_register_typelib(BOOL system_registration) ok(hr == S_OK, "got %08x\n", hr); count = ITypeLib_GetTypeInfoCount(typelib); - ok(count == 11, "got %d\n", count); + ok(count == 12, "got %d\n", count); for(i = 0; i < count; i++) {

1 0

Caron Jensen : wined3d: Recognize Nvidia GT520 cards.
by Alexandre Julliard 14 Dec '12

14 Dec '12

Module: wine Branch: master Commit: 86cb15b23504d02e6d0db7eb48c0f100a8c6ecd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86cb15b23504d02e6d0db7eb4… Author: Caron Jensen <caron(a)codeweavers.com> Date: Fri Dec 14 10:36:32 2012 -0600 wined3d: Recognize Nvidia GT520 cards. --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 15ac2ea..336c1e7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1085,6 +1085,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX465, "NVIDIA GeForce GTX 465", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT520, "NVIDIA GeForce GT 520", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT540M, "NVIDIA GeForce GT 540M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX550, "NVIDIA GeForce GTX 550 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT555M, "NVIDIA GeForce GT 555M", DRIVER_NVIDIA_GEFORCE6, 1024}, @@ -1505,6 +1506,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 555M", CARD_NVIDIA_GEFORCE_GT555M}, /* Geforce 500 - midend mobile */ {"GTX 550 Ti", CARD_NVIDIA_GEFORCE_GTX550}, /* Geforce 500 - midend */ {"GT 540M", CARD_NVIDIA_GEFORCE_GT540M}, /* Geforce 500 - midend mobile */ + {"GT 520", CARD_NVIDIA_GEFORCE_GT520}, /* Geforce 500 - lowend */ {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ {"GTX 470", CARD_NVIDIA_GEFORCE_GTX470}, /* Geforce 400 - midend high */ {"GTX 465", CARD_NVIDIA_GEFORCE_GTX465}, /* Geforce 400 - midend */ @@ -2019,6 +2021,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i /* Kepler */ {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* Fermi */ + {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0bb3f27..77d3e03 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1415,6 +1415,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX465 = 0x06c4, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0, + CARD_NVIDIA_GEFORCE_GT520 = 0x1040, CARD_NVIDIA_GEFORCE_GT540M = 0x0df4, CARD_NVIDIA_GEFORCE_GTX550 = 0x1244, CARD_NVIDIA_GEFORCE_GT555M = 0x04b8,

1 0

Andrew Eikum : dsound: Always fill wValidBitsPerSample.
by Alexandre Julliard 14 Dec '12

14 Dec '12

Module: wine Branch: master Commit: 81d601f56fc5c84c7f517b9424a73e4788c784b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d601f56fc5c84c7f517b942… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 14 08:47:16 2012 -0600 dsound: Always fill wValidBitsPerSample. --- dlls/dsound/primary.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index bc72d78..0964f9b 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -87,10 +87,9 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client WAVEFORMATEXTENSIBLE testwfe = *mixwfe; testwfe.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; - testwfe.Format.wBitsPerSample = 32; + testwfe.Samples.wValidBitsPerSample = testwfe.Format.wBitsPerSample = 32; testwfe.Format.nBlockAlign = testwfe.Format.nChannels * testwfe.Format.wBitsPerSample / 8; testwfe.Format.nAvgBytesPerSec = testwfe.Format.nSamplesPerSec * testwfe.Format.nBlockAlign; - testwfe.Samples.wValidBitsPerSample = 0; if (FAILED(IAudioClient_IsFormatSupported(client, AUDCLNT_SHAREMODE_SHARED, &testwfe.Format, (WAVEFORMATEX**)&retwfe))) w = DSOUND_CopyFormat(&mixwfe->Format); @@ -121,12 +120,12 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client w->nAvgBytesPerSec = w->nSamplesPerSec * w->nBlockAlign; wfe->dwChannelMask = 0; - wfe->Samples.wValidBitsPerSample = 0; if (wi->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { w->wBitsPerSample = 32; wfe->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; } else wfe->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + wfe->Samples.wValidBitsPerSample = w->wBitsPerSample; } else w = DSOUND_CopyFormat(device->primary_pwfx);

1 0

Andrew Eikum : winealsa.drv: Be less strict about wValidBitsPerSample.
by Alexandre Julliard 14 Dec '12

14 Dec '12

Module: wine Branch: master Commit: 4f32f8e185949f2cb7bcee4f218f4724d5b823d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f32f8e185949f2cb7bcee4f2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 14 08:47:11 2012 -0600 winealsa.drv: Be less strict about wValidBitsPerSample. --- dlls/winealsa.drv/mmdevdrv.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6d86f55..416f1ba 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -976,10 +976,8 @@ static snd_pcm_format_t alsa_format(const WAVEFORMATEX *fmt) fmt->wBitsPerSample != fmtex->Samples.wValidBitsPerSample){ if(fmtex->Samples.wValidBitsPerSample == 20 && fmt->wBitsPerSample == 24) format = SND_PCM_FORMAT_S20_3LE; - else{ + else WARN("Unsupported ValidBits: %u\n", fmtex->Samples.wValidBitsPerSample); - format = SND_PCM_FORMAT_UNKNOWN; - } } }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE &&

1 0

Nikolay Sivov : msxml3: Some tests to show that DISPID_VALUE properties are handled specially.
by Alexandre Julliard 14 Dec '12

14 Dec '12

Module: wine Branch: master Commit: 9f9ff5528c466ca919fd5df70a48161a55e9eaa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9ff5528c466ca919fd5df70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 19:30:11 2012 +0300 msxml3: Some tests to show that DISPID_VALUE properties are handled specially. --- dlls/msxml3/tests/domdoc.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index eda98f1..6f2b465 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9939,7 +9939,9 @@ static void test_dispex(void) IXMLHTTPRequest *req; IXMLDOMElement *elem; IDispatchEx *dispex; + DISPPARAMS dispparams; IXMLDOMNode *node; + VARIANT arg, ret; VARIANT_BOOL b; IUnknown *unk; HRESULT hr; @@ -9996,6 +9998,58 @@ static void test_dispex(void) ok(did == DISPID_DOM_COLLECTION_BASE+1, "got 0x%08x\n", did); IDispatchEx_Release(dispex); + did = -1; + hr = IDispatchEx_GetDispID(dispex, _bstr_("item"), 0, &did); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(did == DISPID_VALUE, "got %d\n", did); + + V_VT(&arg) = VT_I4; + V_I2(&arg) = 0; + dispparams.cArgs = 1; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + + dispparams.cArgs = 0; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = NULL; + + V_VT(&ret) = VT_EMPTY; + V_I4(&ret) = 1; + hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_I4, "got %d\n", V_VT(&ret)); + ok(V_I4(&ret) == 0, "got %d\n", V_I4(&ret)); + + dispparams.cArgs = 0; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = NULL; + + V_VT(&ret) = VT_EMPTY; + V_I4(&ret) = 1; + hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); +todo_wine { + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_I4(&ret) == 1, "got %d\n", V_I4(&ret)); +} IXMLDOMNodeList_Release(node_list); /* IXMLDOMParseError */

1 0

Jacek Caban : atl100: Added AtlComModuleGetClassObject implementation ( based on AtlModuleGetClassObject).
by Alexandre Julliard 14 Dec '12

14 Dec '12

Module: wine Branch: master Commit: 7d3046cd02120c19ddf4fe4eb6f3d46028d53abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3046cd02120c19ddf4fe4eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 14 11:58:10 2012 +0100 atl100: Added AtlComModuleGetClassObject implementation (based on AtlModuleGetClassObject). --- dlls/atl100/atl.c | 28 ++++++++++++++++++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl80/atl80.spec | 2 +- include/atlbase.h | 12 +++++++++++- 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index d2e49c6..c0bc2ae 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -304,6 +304,34 @@ void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE *pM, _AtlCreateWndData } /*********************************************************************** + * AtlComModuleGetClassObject [atl100.15] + */ +HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, REFIID riid, void **ppv) +{ + _ATL_OBJMAP_ENTRY **iter; + HRESULT hres; + + TRACE("(%p %s %s %p)\n", pm, debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if(!pm) + return E_INVALIDARG; + + for(iter = pm->m_ppAutoObjMapFirst; iter < pm->m_ppAutoObjMapLast; iter++) { + if(IsEqualCLSID((*iter)->pclsid, rclsid) && (*iter)->pfnGetClassObject) { + if(!(*iter)->pCF) + hres = (*iter)->pfnGetClassObject((*iter)->pfnCreateInstance, &IID_IUnknown, (void**)&(*iter)->pCF); + if((*iter)->pCF) + hres = IUnknown_QueryInterface((*iter)->pCF, riid, ppv); + TRACE("returning %p (%08x)\n", *ppv, hres); + return hres; + } + } + + WARN("Class %s not found\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** * AtlRegisterClassCategoriesHelper [atl100.49] */ HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID clsid, const struct _ATL_CATMAP_ENTRY *catmap, BOOL reg) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 1c36112..6c959d6 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -3,7 +3,7 @@ 12 stdcall AtlFreeMarshalStream(ptr) 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) -15 stub AtlComModuleGetClassObject +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) 17 stub AtlComModuleRegisterClassObjects 20 stub AtlComModuleRevokeClassObjects 22 stub AtlComModuleUnregisterServer diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 1586e10..1c940dd 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -3,7 +3,7 @@ 12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr -15 stub AtlComModuleGetClassObject +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject 17 stub AtlComModuleRegisterClassObjects 18 stub AtlComModuleRegisterServer(ptr long ptr) 19 stub AtlRegisterTypeLib(ptr wstr) diff --git a/include/atlbase.h b/include/atlbase.h index 37d60c8..6c29ad9 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -89,7 +89,7 @@ typedef struct _ATL_OBJMAP_ENTRYW_TAG _ATL_DESCRIPTIONFUNCW* pfnGetObjectDescription; _ATL_CATMAPFUNC* pfnGetCategoryMap; void (WINAPI *pfnObjectMain)(BOOL bStarting); -} _ATL_OBJMAP_ENTRYW; +} _ATL_OBJMAP_ENTRYW, _ATL_OBJMAP_ENTRY30, _ATL_OBJMAP_ENTRY; typedef struct _ATL_TERMFUNC_ELEM_TAG @@ -183,6 +183,15 @@ typedef struct _ATL_WIN_MODULE70 CSimpleArray /* <ATOM> */ m_rgWindowClassAtoms; } _ATL_WIN_MODULE70; +typedef struct _ATL_COM_MODULE70 +{ + UINT cbSize; + HINSTANCE m_hInstTypeLib; + _ATL_OBJMAP_ENTRY **m_ppAutoObjMapFirst; + _ATL_OBJMAP_ENTRY **m_ppAutoObjMapLast; + CComCriticalSection m_csObjMap; +} _ATL_COM_MODULE70, _ATL_COM_MODULE; + #if _ATL_VER >= _ATL_VER_70 typedef _ATL_MODULE70 _ATL_MODULE; typedef _ATL_WIN_MODULE70 _ATL_WIN_MODULE; @@ -231,5 +240,6 @@ HRESULT WINAPI AtlCreateRegistrar(IRegistrar**); HRESULT WINAPI AtlUpdateRegistryFromResourceD(HINSTANCE,LPCOLESTR,BOOL,struct _ATL_REGMAP_ENTRY*,IRegistrar*); HRESULT WINAPI AtlLoadTypeLib(HINSTANCE,LPCOLESTR,BSTR*,ITypeLib**); HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID,const struct _ATL_CATMAP_ENTRY*,BOOL); +HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE*,REFCLSID,REFIID,void**); #endif /* __WINE_ATLBASE_H__ */

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2012