wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Alexander Nicolaysen Sørnes : testData: Allow admins to only show entries for versions they maintain
by Alexander Nicolaysen Sørnes 17 Nov '09

17 Nov '09

Module: appdb Branch: master Commit: 038a0da4cf575be3d7da6addf27451c021705e76 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=038a0da4cf575be3d7da6add… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Nov 15 19:45:17 2009 +0100 testData: Allow admins to only show entries for versions they maintain --- include/testData.php | 57 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 45 insertions(+), 12 deletions(-) diff --git a/include/testData.php b/include/testData.php index 1a6762f..879e363 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1175,27 +1175,46 @@ class testData{ { $oFilter = new FilterInterface(); $oFilter->AddFilterInfo('onlyWithoutMaintainers', 'Only show test data for versions without maintainers', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + + /* Allow admins to only show entries for apps they maintain */ + if($_SESSION['current']->hasPriv('admin')) + $oFilter->AddFilterInfo('onlyMyMaintainedEntries', 'Only show test data for versions you maintain', array(FILTER_OPTION_BOOL), FILTER_VALUES_OPTION_BOOL, array('false','true')); + return $oFilter; } function objectGetEntriesCount($sState, $oFilters = null) { $sExtraTables = ''; - $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; + + $oTest = new testData(); + + if(getInput('onlyMyMaintainedEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oTest->canEdit())) + { + $bOnlyMyMaintainedEntries = true; + } + + /* This combination doesn't make sense */ + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedEntries', $aOptions) == 'true') + { + return false; + } - if($aOptions['onlyWithoutMaintainers'] == 'true') + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') { $sExtraTables = ',appVersion'; $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = testResults.versionId"; } - $oTest = new testData(); - - if($sState != 'accepted' && !$oTest->canEdit()) + if($bOnlyMyMaintainedEntries) { - if($sState == 'rejected') + if(!$oTest->canEdit() && $sState == 'rejected') { $sQuery = "SELECT COUNT(testingId) AS count FROM testResults$sExtraTables WHERE @@ -1255,18 +1274,32 @@ class testData{ function objectGetEntries($sState, $iRows = 0, $iStart = 0, $sOrderBy = "testingId", $bAscending = true, $oFilters = null) { $sExtraTables = ''; - $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false'); + $aOptions = $oFilters ? $oFilters->getOptions() : array('onlyWithoutMaintainers' => 'false', 'onlyMyMaintainedEntries' => 'false'); $sWhereFilter = ''; + $bOnlyMyMaintainedEntries = false; + + $oTest = new testData(); + + if(getInput('onlyMyMaintainedEntries', $aOptions) == 'true' + || ($sState != 'accepted' && !$oTest->canEdit())) + { + $bOnlyMyMaintainedEntries = true; + } - if($aOptions['onlyWithoutMaintainers'] == 'true') + /* This combination doesn't make sense */ + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true' + && getInput('onlyMyMaintainedEntries', $aOptions) == 'true') + { + return false; + } + + if(getInput('onlyWithoutMaintainers', $aOptions) == 'true') { $sExtraTables = ',appVersion'; $sWhereFilter .= " AND appVersion.hasMaintainer = 'false' AND appVersion.versionId = testResults.versionId"; } - $oTest = new testData(); - $sLimit = ""; /* Should we add a limit clause to the query? */ @@ -1280,9 +1313,9 @@ class testData{ $iRows = testData::objectGetEntriesCount($sState); } - if($sState != 'accepted' && !$oTest->canEdit()) + if($bOnlyMyMaintainedEntries) { - if($sState == 'rejected') + if(!$oTest->canEdit() && $sState == 'rejected') { $sQuery = "SELECT testResults.* FROM testResults$sExtraTables WHERE testResults.submitterId = '?'

1 0

Hans Leidekker : wininet: Avoid a crash on NULL lpcszHeader in HttpSendRequestExW.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 4990ca0ea342bd115a9a46047b3b2de599cb916e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4990ca0ea342bd115a9a46047… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 17 15:59:52 2009 +0100 wininet: Avoid a crash on NULL lpcszHeader in HttpSendRequestExW. --- dlls/wininet/http.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1426439..3603761 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3338,17 +3338,21 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, req = &workRequest.u.HttpSendRequestW; if (lpBuffersIn) { - DWORD size; + DWORD size = 0; - if (lpBuffersIn->dwHeadersLength == ~0u) - size = (strlenW( lpBuffersIn->lpcszHeader ) + 1) * sizeof(WCHAR); - else - size = lpBuffersIn->dwHeadersLength * sizeof(WCHAR); + if (lpBuffersIn->lpcszHeader) + { + if (lpBuffersIn->dwHeadersLength == ~0u) + size = (strlenW( lpBuffersIn->lpcszHeader ) + 1) * sizeof(WCHAR); + else + size = lpBuffersIn->dwHeadersLength * sizeof(WCHAR); - req->lpszHeader = HeapAlloc( GetProcessHeap(), 0, size ); - memcpy( req->lpszHeader, lpBuffersIn->lpcszHeader, size ); + req->lpszHeader = HeapAlloc( GetProcessHeap(), 0, size ); + memcpy( req->lpszHeader, lpBuffersIn->lpcszHeader, size ); + } + else req->lpszHeader = NULL; - req->dwHeaderLength = lpBuffersIn->dwHeadersLength; + req->dwHeaderLength = size / sizeof(WCHAR); req->lpOptional = lpBuffersIn->lpvBuffer; req->dwOptionalLength = lpBuffersIn->dwBufferLength; req->dwContentLength = lpBuffersIn->dwBufferTotal;

1 0

Hans Leidekker : msi: Don't set the ALLUSERS property.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: bd4bc161475f600612fad898f09825d74d6368a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd4bc161475f600612fad898f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 17 15:59:11 2009 +0100 msi: Don't set the ALLUSERS property. --- dlls/msi/action.c | 1 - dlls/msi/tests/install.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3a11c61..0755f42 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -716,7 +716,6 @@ static UINT msi_set_context(MSIPACKAGE *package) package->Context = MSIINSTALLCONTEXT_MACHINE; } - MSI_SetPropertyW(package, szAllUsers, szOne); return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index c6fd1ca..a007538 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -920,6 +920,32 @@ static const CHAR ip_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComm "CustomAction\tAction\n" "TestInstalledProp\t19\t\tTest failed\t\n"; +static const CHAR aup_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostFinalize\t\t1000\n" + "ValidateProductID\t\t700\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "RemoveFiles\t\t3500\n" + "InstallFiles\t\t4000\n" + "RegisterUser\t\t6000\n" + "RegisterProduct\t\t6100\n" + "PublishFeatures\t\t6300\n" + "PublishProduct\t\t6400\n" + "InstallFinalize\t\t6600\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "UnpublishFeatures\t\t1800\n" + "InstallValidate\t\t1400\n" + "LaunchConditions\t\t100\n" + "TestAllUsersProp\tALLUSERS AND NOT REMOVE\t50\n"; + +static const CHAR aup_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "TestAllUsersProp\t19\t\tTest failed\t\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1547,6 +1573,19 @@ static const msi_table ip_tables[] = ADD_TABLE(property) }; +static const msi_table aup_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(aup_install_exec_seq), + ADD_TABLE(aup_custom_action), + ADD_TABLE(media), + ADD_TABLE(property) +}; + static const msi_table fiu_tables[] = { ADD_TABLE(rof_component), @@ -6730,6 +6769,37 @@ static void test_installed_prop(void) delete_test_files(); } +static void test_allusers_prop(void) +{ + UINT r; + + create_test_files(); + create_database(msifile, aup_tables, sizeof(aup_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, "FULL=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + delete_test_files(); +} + static char session_manager[] = "System\\CurrentControlSet\\Control\\Session Manager"; static char rename_ops[] = "PendingFileRenameOperations"; @@ -7065,6 +7135,7 @@ START_TEST(install) test_file_in_use(); test_file_in_use_cab(); test_MsiSetExternalUI(); + test_allusers_prop(); DeleteFileA(log_file);

1 0

Hans Leidekker : msi: Set the LogonUser property.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: fd549aa25d490a2db381ad0e3c495ff8dd1e605e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd549aa25d490a2db381ad0e3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 17 15:58:45 2009 +0100 msi: Set the LogonUser property. --- dlls/msi/package.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 87f1092..574289f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -345,7 +345,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) WCHAR *ptr; OSVERSIONINFOEXW OSVersion; MEMORYSTATUSEX msex; - DWORD verval; + DWORD verval, len; WCHAR verstr[10], bufstr[20]; HDC dc; HKEY hkey; @@ -445,11 +445,12 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szUserLangID[] = {'U','s','e','r','L','a','n','g','u','a','g','e','I','D',0}; static const WCHAR szSystemLangID[] = {'S','y','s','t','e','m','L','a','n','g','u','a','g','e','I','D',0}; static const WCHAR szProductState[] = {'P','r','o','d','u','c','t','S','t','a','t','e',0}; + static const WCHAR szLogonUser[] = {'L','o','g','o','n','U','s','e','r',0}; /* * Other things that probably should be set: * - * ComputerName LogonUser VirtualMemory + * ComputerName VirtualMemory * ShellAdvSupport DefaultUIFont PackagecodeChanging * CaptionHeight BorderTop BorderSide TextHeight * RedirectedDllSupport @@ -653,6 +654,18 @@ static VOID set_installer_properties(MSIPACKAGE *package) sprintfW(bufstr, szIntFormat, MsiQueryProductStateW(package->ProductCode)); MSI_SetPropertyW( package, szProductState, bufstr ); + + len = 0; + if (!GetUserNameW( NULL, &len ) && GetLastError() == ERROR_MORE_DATA) + { + WCHAR *username; + if ((username = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + if (GetUserNameW( username, &len )) + MSI_SetPropertyW( package, szLogonUser, username ); + HeapFree( GetProcessHeap(), 0, username ); + } + } } static UINT msi_load_summary_properties( MSIPACKAGE *package )

1 0

Louis Lenders : ntoskrnl.exe: Add stub for MmAllocateContiguousMemory.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 76ae295a090745950483595a56a23db9599bbcc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ae295a090745950483595a5… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Nov 13 19:02:08 2009 +0100 ntoskrnl.exe: Add stub for MmAllocateContiguousMemory. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3404599..06971ad 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1118,6 +1118,15 @@ PVOID WINAPI MmAllocateNonCachedMemory( SIZE_T size ) } /*********************************************************************** + * MmAllocateContiguousMemory (NTOSKRNL.EXE.@) + */ +PVOID WINAPI MmAllocateContiguousMemory( SIZE_T size, PHYSICAL_ADDRESS highest_valid_address ) +{ + FIXME( "%lu, %s stub\n", size, wine_dbgstr_longlong(highest_valid_address.QuadPart) ); + return NULL; +} + +/*********************************************************************** * MmAllocatePagesForMdl (NTOSKRNL.EXE.@) */ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS highaddress, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 642b274..b85fcb9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -655,7 +655,7 @@ @ stub MmAddVerifierThunks @ stub MmAdjustWorkingSetSize @ stub MmAdvanceMdl -@ stub MmAllocateContiguousMemory +@ stdcall MmAllocateContiguousMemory(long double) @ stub MmAllocateContiguousMemorySpecifyCache @ stub MmAllocateMappingAddress @ stdcall MmAllocateNonCachedMemory(long) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 096fca5..df0ad5d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1059,6 +1059,7 @@ void WINAPI KeQuerySystemTime(LARGE_INTEGER*); void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void); +PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T);

1 0

Louis Lenders : ntoskrnl.exe: Add stub for MmAllocatePagesForMdl.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 6c350ad15550024fe39a167b231ece38b31ca113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c350ad15550024fe39a167b2… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Nov 13 17:35:39 2009 +0100 ntoskrnl.exe: Add stub for MmAllocatePagesForMdl. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 93d72a6..3404599 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1117,6 +1117,16 @@ PVOID WINAPI MmAllocateNonCachedMemory( SIZE_T size ) return VirtualAlloc( NULL, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE|PAGE_NOCACHE ); } +/*********************************************************************** + * MmAllocatePagesForMdl (NTOSKRNL.EXE.@) + */ +PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS highaddress, + PHYSICAL_ADDRESS skipbytes, SIZE_T size) +{ + FIXME("%s %s %s %lu: stub\n", wine_dbgstr_longlong(lowaddress.QuadPart), wine_dbgstr_longlong(highaddress.QuadPart), + wine_dbgstr_longlong(skipbytes.QuadPart), size); + return NULL; +} /*********************************************************************** * MmFreeNonCachedMemory (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index fa793eb..642b274 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -659,7 +659,7 @@ @ stub MmAllocateContiguousMemorySpecifyCache @ stub MmAllocateMappingAddress @ stdcall MmAllocateNonCachedMemory(long) -@ stub MmAllocatePagesForMdl +@ stdcall MmAllocatePagesForMdl(double double double long) @ stub MmBuildMdlForNonPagedPool @ stub MmCanFileBeTruncated @ stub MmCommitSessionMappedView diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index ccdeca3..096fca5 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1060,6 +1060,7 @@ void WINAPI KeQueryTickCount(LARGE_INTEGER*); ULONG WINAPI KeQueryTimeIncrement(void); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); +PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void);

1 0

Rob Shearman : oleaut32: Add a test for the memory pointed to by a byref parameter being preserved through a remote IDispatch ::Invoke call.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 4c8eec346d0c874a66e4b405d29ad085101676d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8eec346d0c874a66e4b405d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Nov 17 13:42:37 2009 +0000 oleaut32: Add a test for the memory pointed to by a byref parameter being preserved through a remote IDispatch::Invoke call. --- dlls/oleaut32/tests/tmarshal.c | 30 +++++++++++++++++++++++++++++- dlls/oleaut32/tests/tmarshal.idl | 3 +++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + 3 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index c9ea77d..ba28892 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -587,6 +587,13 @@ static HRESULT WINAPI Widget_get_prop_uint( return S_OK; } +static HRESULT WINAPI Widget_ByRefUInt( + IWidget* iface, UINT *i) +{ + *i = 42; + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -618,7 +625,8 @@ static const struct IWidgetVtbl Widget_VTable = Widget_put_prop_with_lcid, Widget_get_prop_with_lcid, Widget_get_prop_int, - Widget_get_prop_uint + Widget_get_prop_uint, + Widget_ByRefUInt, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -935,6 +943,7 @@ static void test_typelibmarshal(void) ITypeInfo *pTypeInfo; MYSTRUCT mystruct; MYSTRUCT mystructArray[5]; + UINT uval; ok(pKEW != NULL, "Widget creation failed\n"); @@ -1342,6 +1351,25 @@ static void test_typelibmarshal(void) ok(V_UI4(&varresult) == 42, "got %x\n", V_UI4(&varresult)); VariantClear(&varresult); + /* test byref marshalling */ + uval = 666; + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_UI4|VT_BYREF; + V_UI4REF(&vararg[0]) = &uval; + dispparams.cNamedArgs = 0; + dispparams.cArgs = 1; + dispparams.rgvarg = vararg; + dispparams.rgdispidNamedArgs = NULL; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_BYREF_UINT, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, ITypeInfo_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); + ok(V_VT(&vararg[0]) == (VT_UI4|VT_BYREF), "arg VT not unmarshalled correctly: %x\n", V_VT(&vararg[0])); + todo_wine + ok(V_UI4REF(&vararg[0]) == &uval, "Byref pointer not preserved: %p/%p\n", &uval, V_UI4REF(&vararg[0])); + ok(*V_UI4REF(&vararg[0]) == 42, "Expected 42 to be returned instead of %u\n", *V_UI4REF(&vararg[0])); + VariantClear(&varresult); + VariantClear(&vararg[0]); + IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 71d53cf..41079d0 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -137,6 +137,9 @@ library TestTypelib [id(DISPID_TM_PROP_UINT), propget] HRESULT prop_uint([out,retval] UINT *i); + + [id(DISPID_TM_BYREF_UINT)] + HRESULT ByRefUInt([in, out] UINT *i); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 08d7736..1cfd87b 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -37,5 +37,6 @@ #define DISPID_TM_PROP_WITH_LCID 18 #define DISPID_TM_PROP_INT 19 #define DISPID_TM_PROP_UINT 20 +#define DISPID_TM_BYREF_UINT 21 #define DISPID_NOA_BSTRRET 1

1 0

Alexandre Julliard : gdi32: Reset the visible region in ResetDC.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: c73e2d5e02f4239e206c42d96ff9e68d9476713f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c73e2d5e02f4239e206c42d96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 15:14:11 2009 +0100 gdi32: Reset the visible region in ResetDC. --- dlls/gdi32/dc.c | 12 +++++++++++- dlls/wineps.drv/init.c | 4 ---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index fdfc100..c4c5a13 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -859,7 +859,17 @@ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) if ((dc = get_dc_ptr( hdc ))) { - if (dc->funcs->pResetDC) ret = dc->funcs->pResetDC( dc->physDev, devmode ); + if (dc->funcs->pResetDC) + { + ret = dc->funcs->pResetDC( dc->physDev, devmode ); + if (ret) /* reset the visible region */ + { + dc->dirty = 0; + SetRectRgn( dc->hVisRgn, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), + GetDeviceCaps( hdc, DESKTOPVERTRES ) ); + CLIPPING_UpdateGCRegion( dc ); + } + } release_dc_ptr( dc ); } return ret; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index b923529..152ee03 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -401,14 +401,10 @@ BOOL CDECL PSDRV_DeleteDC( PSDRV_PDEVICE *physDev ) HDC CDECL PSDRV_ResetDC( PSDRV_PDEVICE *physDev, const DEVMODEW *lpInitData ) { if(lpInitData) { - HRGN hrgn; DEVMODEA *devmodeA = DEVMODEdupWtoA(PSDRV_Heap, lpInitData); PSDRV_MergeDevmodes(physDev->Devmode, (PSDRV_DEVMODEA *)devmodeA, physDev->pi); HeapFree(PSDRV_Heap, 0, devmodeA); PSDRV_UpdateDevCaps(physDev); - hrgn = CreateRectRgn(0, 0, physDev->horzRes, physDev->vertRes); - SelectVisRgn( physDev->hdc, hrgn ); - DeleteObject(hrgn); } return physDev->hdc; }

1 0

André Hentschel : gdi32: Don't strip font suffix.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: e4beddb664a27208b69cc734b33c0b15cd42e6e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4beddb664a27208b69cc734b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 16 21:33:43 2009 +0100 gdi32: Don't strip font suffix. --- dlls/gdi32/font.c | 22 ---------------------- dlls/gdi32/tests/font.c | 6 ------ 2 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index ed64166..7f8f6f6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -306,10 +306,6 @@ HFONT WINAPI CreateFontIndirectA( const LOGFONTA *plfA ) */ HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf ) { - static const WCHAR ItalicW[] = {' ','I','t','a','l','i','c','\0'}; - static const WCHAR BoldW[] = {' ','B','o','l','d','\0'}; - WCHAR *pFaceNameItalicSuffix, *pFaceNameBoldSuffix; - WCHAR *pFaceNameSuffix = NULL; HFONT hFont; FONTOBJ *fontPtr; @@ -328,24 +324,6 @@ HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf ) plf->lfOrientation/10., plf->lfEscapement/10., fontPtr); } - pFaceNameItalicSuffix = strstrW(fontPtr->logfont.lfFaceName, ItalicW); - if (pFaceNameItalicSuffix) - { - fontPtr->logfont.lfItalic = TRUE; - pFaceNameSuffix = pFaceNameItalicSuffix; - } - - pFaceNameBoldSuffix = strstrW(fontPtr->logfont.lfFaceName, BoldW); - if (pFaceNameBoldSuffix) - { - if (fontPtr->logfont.lfWeight < FW_BOLD) - fontPtr->logfont.lfWeight = FW_BOLD; - if (!pFaceNameSuffix || (pFaceNameBoldSuffix < pFaceNameSuffix)) - pFaceNameSuffix = pFaceNameBoldSuffix; - } - - if (pFaceNameSuffix) *pFaceNameSuffix = 0; - if (!(hFont = alloc_gdi_handle( &fontPtr->header, OBJ_FONT, &font_funcs ))) { HeapFree( GetProcessHeap(), 0, fontPtr ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6d76abe..4ad418f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3013,15 +3013,12 @@ void test_CreateFontIndirect(void) ok(hfont != 0, "CreateFontIndirectA failed\n"); ret = GetObject(hfont, sizeof(getobj_lf), &getobj_lf); ok(lf.lfItalic == getobj_lf.lfItalic, "lfItalic: expect %02x got %02x\n", lf.lfItalic, getobj_lf.lfItalic); - todo_wine - { ok(lf.lfWeight == getobj_lf.lfWeight || broken((SHORT)lf.lfWeight == getobj_lf.lfWeight), /* win9x */ "lfWeight: expect %08x got %08x\n", lf.lfWeight, getobj_lf.lfWeight); ok(!lstrcmpA(lf.lfFaceName, getobj_lf.lfFaceName) || broken(!memcmp(lf.lfFaceName, getobj_lf.lfFaceName, LF_FACESIZE-1)), /* win9x doesn't ensure '\0' termination */ "font names don't match: %s != %s\n", lf.lfFaceName, getobj_lf.lfFaceName); - } DeleteObject(hfont); lf.lfItalic = FALSE; @@ -3033,13 +3030,10 @@ void test_CreateFontIndirect(void) ok(lf.lfWeight == getobj_lf.lfWeight || broken((SHORT)lf.lfWeight == getobj_lf.lfWeight), /* win9x */ "lfWeight: expect %08x got %08x\n", lf.lfWeight, getobj_lf.lfWeight); - todo_wine - { ok(lf.lfItalic == getobj_lf.lfItalic, "lfItalic: expect %02x got %02x\n", lf.lfItalic, getobj_lf.lfItalic); ok(!lstrcmpA(lf.lfFaceName, getobj_lf.lfFaceName) || broken(!memcmp(lf.lfFaceName, getobj_lf.lfFaceName, LF_FACESIZE-1)), /* win9x doesn't ensure '\0' termination */ "font names don't match: %s != %s\n", lf.lfFaceName, getobj_lf.lfFaceName); - } DeleteObject(hfont); }

1 0

Andrew Eikum : mshtml: Implement IHTMLWindow2::get_top.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 3f63a2968da6bdb56459ae5c46dcae92ba4e52f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f63a2968da6bdb56459ae5c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 16 17:28:54 2009 -0600 mshtml: Implement IHTMLWindow2::get_top. --- dlls/mshtml/htmlwindow.c | 13 ++++++++++--- dlls/mshtml/tests/dom.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 073a5ae..17d2bfe 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -730,9 +730,16 @@ static HRESULT WINAPI HTMLWindow2_get_self(IHTMLWindow2 *iface, IHTMLWindow2 **p static HRESULT WINAPI HTMLWindow2_get_top(IHTMLWindow2 *iface, IHTMLWindow2 **p) { - HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLWindow *This = HTMLWINDOW2_THIS(iface), *curr; + TRACE("(%p)->(%p)\n", This, p); + + curr = This; + while(curr->parent) + curr = curr->parent; + *p = HTMLWINDOW2(curr); + IHTMLWindow2_AddRef(*p); + + return S_OK; } static HRESULT WINAPI HTMLWindow2_get_window(IHTMLWindow2 *iface, IHTMLWindow2 **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c965c79..00c67a8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5601,8 +5601,8 @@ static void test_cond_comment(IHTMLDocument2 *doc) static void test_frame(IDispatch *disp, const char *exp_id) { - IHTMLWindow2 *frame2, *parent; - IHTMLDocument2 *parent_doc; + IHTMLWindow2 *frame2, *parent, *top; + IHTMLDocument2 *parent_doc, *top_doc; IHTMLWindow4 *frame; IHTMLFrameBase *frame_elem; IHTMLElement *html_elem; @@ -5639,21 +5639,43 @@ static void test_frame(IDispatch *disp, const char *exp_id) hres = IHTMLWindow2_get_parent(frame2, &parent); ok(hres == S_OK, "IHTMLWindow2_get_parent failed: 0x%08x\n", hres); - IHTMLWindow2_Release(frame2); - if(FAILED(hres)) + if(FAILED(hres)){ + IHTMLWindow2_Release(frame2); return; + } hres = IHTMLWindow2_get_document(parent, &parent_doc); ok(hres == S_OK, "IHTMLWindow2_get_document failed: 0x%08x\n", hres); IHTMLWindow2_Release(parent); - if(FAILED(hres)) + if(FAILED(hres)){ + IHTMLWindow2_Release(frame2); return; + } hres = IHTMLDocument2_get_title(parent_doc, &bstr); ok(hres == S_OK, "IHTMLDocument2_get_title failed: 0x%08x\n", hres); ok(!strcmp_wa(bstr, "frameset test"), "Did not get the right parent. Expected \"frameset test\", found %s\n", wine_dbgstr_w(bstr)); IHTMLDocument2_Release(parent_doc); SysFreeString(bstr); + + /* test get_top */ + hres = IHTMLWindow2_get_top(frame2, &top); + ok(hres == S_OK, "IHTMLWindow2_get_top failed: 0x%08x\n", hres); + IHTMLWindow2_Release(frame2); + if(FAILED(hres)) + return; + + hres = IHTMLWindow2_get_document(top, &top_doc); + ok(hres == S_OK, "IHTMLWindow2_get_document failed: 0x%08x\n", hres); + IHTMLWindow2_Release(top); + if(FAILED(hres)) + return; + + hres = IHTMLDocument2_get_title(top_doc, &bstr); + ok(hres == S_OK, "IHTMLDocument2_get_title failed: 0x%08x\n", hres); + ok(!strcmp_wa(bstr, "frameset test"), "Did not get the right parent. Expected \"frameset test\", found %s\n", wine_dbgstr_w(bstr)); + IHTMLDocument2_Release(top_doc); + SysFreeString(bstr); } static void test_frameset(IHTMLDocument2 *doc)

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
91
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 November 2009