wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Hans Leidekker : msi: Skip disabled components in the InstallService action .
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 0d0074d56be678ea0480eb4bfbe69685bf0eb453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0074d56be678ea0480eb4bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:03:14 2011 +0200 msi: Skip disabled components in the InstallService action. --- dlls/msi/action.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7bed12f..da59d3a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5945,23 +5945,33 @@ static UINT ACTION_UnpublishComponents( MSIPACKAGE *package ) static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) { + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','C','o','m','p','o','n','e','n','t','`',' ','W','H','E','R','E',' ', + '`','C','o','m','p','o','n','e','n','t','`',' ','=','\'','%','s','\'',0}; MSIPACKAGE *package = param; + MSICOMPONENT *component; MSIRECORD *row; MSIFILE *file; - SC_HANDLE hscm, service = NULL; + SC_HANDLE hscm = NULL, service = NULL; LPCWSTR comp, key; LPWSTR name = NULL, disp = NULL, load_order = NULL, serv_name = NULL; LPWSTR depends = NULL, pass = NULL, args = NULL, image_path = NULL; DWORD serv_type, start_type, err_control; SERVICE_DESCRIPTIONW sd = {NULL}; - static const WCHAR query[] = - {'S','E','L','E','C','T',' ','*',' ','F','R', 'O','M',' ', - '`','C','o','m','p','o','n','e','n','t','`',' ', - 'W','H','E','R','E',' ', - '`','C','o','m','p','o','n','e','n','t','`',' ', - '=','\'','%','s','\'',0}; - + comp = MSI_RecordGetString( rec, 12 ); + component = get_loaded_component( package, comp ); + if (!component) + { + WARN("service component not found\n"); + goto done; + } + if (!component->Enabled) + { + TRACE("service component disabled\n"); + goto done; + } hscm = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASEW, GENERIC_WRITE); if (!hscm) { @@ -5969,10 +5979,6 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) goto done; } - comp = MSI_RecordGetString( rec, 12 ); - if (!get_loaded_component( package, comp )) - goto done; - start_type = MSI_RecordGetInteger(rec, 5); if (start_type == SERVICE_BOOT_START || start_type == SERVICE_SYSTEM_START) goto done; @@ -5992,11 +5998,10 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) row = MSI_QueryGetRecord(package->db, query, comp); if (!row) { - ERR("Control query failed!\n"); + ERR("Query failed\n"); goto done; } key = MSI_RecordGetString(row, 6); - file = get_loaded_file(package, key); msiobj_release(&row->hdr); if (!file)

1 0

Hans Leidekker : msi: Avoid casts in IWineMsiRemotePackage methods.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: c96cd6efc8debc3cee4637e4797e01e1a8a543ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c96cd6efc8debc3cee4637e47… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:02:55 2011 +0200 msi: Avoid casts in IWineMsiRemotePackage methods. --- dlls/msi/install.c | 12 ++++-------- dlls/msi/msiserver.idl | 6 +++--- dlls/msi/package.c | 20 ++++++++------------ 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 30a63e6..5879df4 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -246,8 +246,7 @@ static UINT MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, } len = 0; - hr = IWineMsiRemotePackage_GetTargetPath( remote_package, folder, - NULL, &len ); + hr = IWineMsiRemotePackage_GetTargetPath( remote_package, folder, NULL, &len ); if (FAILED(hr)) goto done; @@ -259,8 +258,7 @@ static UINT MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, goto done; } - hr = IWineMsiRemotePackage_GetTargetPath( remote_package, folder, - (BSTR *)value, &len); + hr = IWineMsiRemotePackage_GetTargetPath( remote_package, folder, value, &len ); if (FAILED(hr)) goto done; @@ -371,8 +369,7 @@ static UINT MSI_GetSourcePath( MSIHANDLE hInstall, LPCWSTR szFolder, } len = 0; - hr = IWineMsiRemotePackage_GetSourcePath( remote_package, folder, - NULL, &len ); + hr = IWineMsiRemotePackage_GetSourcePath( remote_package, folder, NULL, &len ); if (FAILED(hr)) goto done; @@ -384,8 +381,7 @@ static UINT MSI_GetSourcePath( MSIHANDLE hInstall, LPCWSTR szFolder, goto done; } - hr = IWineMsiRemotePackage_GetSourcePath( remote_package, folder, - (BSTR *)value, &len); + hr = IWineMsiRemotePackage_GetSourcePath( remote_package, folder, value, &len ); if (FAILED(hr)) goto done; diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index aa81498..669d7f2 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -54,14 +54,14 @@ interface IWineMsiRemotePackage : IUnknown { HRESULT SetMsiHandle( [in] MSIHANDLE handle ); HRESULT GetActiveDatabase( [out] MSIHANDLE *handle ); - HRESULT GetProperty( [in] BSTR property, [out] BSTR *value, [out] DWORD *size ); + HRESULT GetProperty( [in] BSTR property, [out, size_is(*size)] BSTR value, [in, out] DWORD *size ); HRESULT SetProperty( [in] BSTR property, [in] BSTR value ); HRESULT ProcessMessage( [in] INSTALLMESSAGE message, [in] MSIHANDLE record ); HRESULT DoAction( [in] BSTR action ); HRESULT Sequence( [in] BSTR table, [in] int sequence ); - HRESULT GetTargetPath( [in] BSTR folder, [out] BSTR *value, [out] DWORD *size ); + HRESULT GetTargetPath( [in] BSTR folder, [out, size_is(*size)] BSTR value, [in, out] DWORD *size ); HRESULT SetTargetPath( [in] BSTR folder, [in] BSTR value ); - HRESULT GetSourcePath( [in] BSTR folder, [out] BSTR *value, [out] DWORD *size ); + HRESULT GetSourcePath( [in] BSTR folder, [out, size_is(*size)] BSTR value, [in, out] DWORD *size ); HRESULT GetMode( [in] MSIRUNMODE mode, [out] BOOL *ret ); HRESULT SetMode( [in] MSIRUNMODE mode, [in] BOOL state ); HRESULT GetFeatureState( [in] BSTR feature, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2a82ca5..7355b3d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2231,7 +2231,7 @@ static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name, goto done; } - hr = IWineMsiRemotePackage_GetProperty( remote_package, bname, (BSTR *)value, &len ); + hr = IWineMsiRemotePackage_GetProperty( remote_package, bname, value, &len ); if (FAILED(hr)) goto done; @@ -2383,15 +2383,11 @@ static HRESULT WINAPI mrp_GetActiveDatabase( IWineMsiRemotePackage *iface, MSIHA return S_OK; } -static HRESULT WINAPI mrp_GetProperty( IWineMsiRemotePackage *iface, BSTR property, BSTR *value, DWORD *size ) +static HRESULT WINAPI mrp_GetProperty( IWineMsiRemotePackage *iface, BSTR property, BSTR value, DWORD *size ) { msi_remote_package_impl* This = impl_from_IWineMsiRemotePackage( iface ); - UINT r; - - r = MsiGetPropertyW(This->package, (LPWSTR)property, (LPWSTR)value, size); - if (r != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(r); - + UINT r = MsiGetPropertyW(This->package, property, value, size); + if (r != ERROR_SUCCESS) return HRESULT_FROM_WIN32(r); return S_OK; } @@ -2423,10 +2419,10 @@ static HRESULT WINAPI mrp_Sequence( IWineMsiRemotePackage *iface, BSTR table, in return HRESULT_FROM_WIN32(r); } -static HRESULT WINAPI mrp_GetTargetPath( IWineMsiRemotePackage *iface, BSTR folder, BSTR *value, DWORD *size ) +static HRESULT WINAPI mrp_GetTargetPath( IWineMsiRemotePackage *iface, BSTR folder, BSTR value, DWORD *size ) { msi_remote_package_impl* This = impl_from_IWineMsiRemotePackage( iface ); - UINT r = MsiGetTargetPathW(This->package, (LPWSTR)folder, (LPWSTR)value, size); + UINT r = MsiGetTargetPathW(This->package, folder, value, size); return HRESULT_FROM_WIN32(r); } @@ -2437,10 +2433,10 @@ static HRESULT WINAPI mrp_SetTargetPath( IWineMsiRemotePackage *iface, BSTR fold return HRESULT_FROM_WIN32(r); } -static HRESULT WINAPI mrp_GetSourcePath( IWineMsiRemotePackage *iface, BSTR folder, BSTR *value, DWORD *size ) +static HRESULT WINAPI mrp_GetSourcePath( IWineMsiRemotePackage *iface, BSTR folder, BSTR value, DWORD *size ) { msi_remote_package_impl* This = impl_from_IWineMsiRemotePackage( iface ); - UINT r = MsiGetSourcePathW(This->package, (LPWSTR)folder, (LPWSTR)value, size); + UINT r = MsiGetSourcePathW(This->package, folder, value, size); return HRESULT_FROM_WIN32(r); }

1 0

Hans Leidekker : msi: Support remote calls to MsiEnumComponentCosts.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: cc517f2b3803e2cd0f197e5075e829e430d8b94b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc517f2b3803e2cd0f197e507… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:02:40 2011 +0200 msi: Support remote calls to MsiEnumComponentCosts. --- dlls/msi/msi.c | 28 +++++++++++++++++++++++++++- dlls/msi/msiserver.idl | 4 +++- dlls/msi/package.c | 10 ++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index b5e4b13..d48d1d1 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -32,6 +32,7 @@ #include "msidefs.h" #include "msiquery.h" #include "msipriv.h" +#include "msiserver.h" #include "wincrypt.h" #include "winver.h" #include "winuser.h" @@ -1839,7 +1840,32 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i state, drive, buflen, cost, temp); if (!drive || !buflen || !cost || !temp) return ERROR_INVALID_PARAMETER; - if (!(package = msihandle2msiinfo( handle, MSIHANDLETYPE_PACKAGE ))) return ERROR_INVALID_HANDLE; + if (!(package = msihandle2msiinfo( handle, MSIHANDLETYPE_PACKAGE ))) + { + HRESULT hr; + IWineMsiRemotePackage *remote_package; + BSTR bname; + + if (!(remote_package = (IWineMsiRemotePackage *)msi_get_remote( handle ))) + return ERROR_INVALID_HANDLE; + + bname = SysAllocString( component ); + if (!bname) + { + IWineMsiRemotePackage_Release( remote_package ); + return ERROR_OUTOFMEMORY; + } + hr = IWineMsiRemotePackage_EnumComponentCosts( remote_package, bname, index, state, drive, buflen, cost, temp ); + IWineMsiRemotePackage_Release( remote_package ); + SysFreeString( bname ); + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) return HRESULT_CODE(hr); + return ERROR_FUNCTION_FAILED; + } + return ERROR_SUCCESS; + } + if (!msi_get_property_int( package->db, szCostingComplete, 0 )) { msiobj_release( &package->hdr ); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 58c5b3c..aa81498 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -72,7 +72,9 @@ interface IWineMsiRemotePackage : IUnknown HRESULT SetInstallLevel( [in] int level ); HRESULT FormatRecord( [in] MSIHANDLE record, [out] BSTR *value ); HRESULT EvaluateCondition( [in] BSTR condition ); - HRESULT GetFeatureCost( [in] BSTR feature, [in] INT cost_tree, [in] INSTALLSTATE state, [out] INT *cost); + HRESULT GetFeatureCost( [in] BSTR feature, [in] INT cost_tree, [in] INSTALLSTATE state, [out] INT *cost ); + HRESULT EnumComponentCosts( [in] BSTR component, [in] DWORD index, [in] INSTALLSTATE state, + [out, size_is(*buflen)] BSTR drive, [in, out] DWORD *buflen, [out] INT *cost, [out] INT *temp ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bad8ab3..2a82ca5 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2534,6 +2534,15 @@ static HRESULT WINAPI mrp_GetFeatureCost( IWineMsiRemotePackage *iface, BSTR fea return HRESULT_FROM_WIN32(r); } +static HRESULT WINAPI mrp_EnumComponentCosts( IWineMsiRemotePackage *iface, BSTR component, + DWORD index, INSTALLSTATE state, BSTR drive, + DWORD *buflen, INT *cost, INT *temp ) +{ + msi_remote_package_impl* This = impl_from_IWineMsiRemotePackage( iface ); + UINT r = MsiEnumComponentCostsW(This->package, component, index, state, drive, buflen, cost, temp); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -2560,6 +2569,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_FormatRecord, mrp_EvaluateCondition, mrp_GetFeatureCost, + mrp_EnumComponentCosts }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

Hans Leidekker : msi: Fix handling of components without a key path in MsiEnumComponentCostsW.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: b4a7a30b1853d22c2d91b91e847728bea6c5988d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a7a30b1853d22c2d91b91e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:02:25 2011 +0200 msi: Fix handling of components without a key path in MsiEnumComponentCostsW. --- dlls/msi/msi.c | 15 ++++++++++++--- dlls/msi/tests/package.c | 15 +++++++++++---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 4a79daf..b5e4b13 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1864,12 +1864,22 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i drive[0] = 0; *cost = *temp = 0; + GetWindowsDirectoryW( path, MAX_PATH ); if (component && component[0]) { - *cost = max( 8, comp->Cost / 512 ); if (comp->assembly && !comp->assembly->application) *temp = comp->Cost; - if ((file = get_loaded_file( package, comp->KeyPath ))) + if (!comp->Enabled || !comp->KeyPath) { + *cost = 0; + drive[0] = path[0]; + drive[1] = ':'; + drive[2] = 0; + *buflen = 2; + r = ERROR_SUCCESS; + } + else if ((file = get_loaded_file( package, comp->KeyPath ))) + { + *cost = max( 8, comp->Cost / 512 ); drive[0] = file->TargetPath[0]; drive[1] = ':'; drive[2] = 0; @@ -1880,7 +1890,6 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i else if (IStorage_Stat( package->db->storage, &stat, STATFLAG_NONAME ) == S_OK) { *temp = max( 8, stat.cbSize.QuadPart / 512 ); - GetWindowsDirectoryW( path, MAX_PATH ); drive[0] = path[0]; drive[1] = ':'; drive[2] = 0; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index d7161d1..8d70d1c 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -12942,16 +12942,13 @@ static void test_MsiEnumComponentCosts(void) r = add_file_entry( hdb, "'one.txt', 'one', 'one.txt', 4096, '', '', 8192, 1" ); ok( r == ERROR_SUCCESS, "cannot add file %u\n", r ); - r = add_file_entry( hdb, "'two.txt', 'two', 'two.txt', 8192, '', '', 8192, 2" ); - ok( r == ERROR_SUCCESS, "cannot add file %u\n", r ); - r = create_component_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create Component table %u\n", r ); r = add_component_entry( hdb, "'one', '{B2F86B9D-8447-4BC5-8883-750C45AA31CA}', 'TARGETDIR', 0, '', 'one.txt'" ); ok( r == ERROR_SUCCESS, "cannot add component %u\n", r ); - r = add_component_entry( hdb, "'two', '{62A09F6E-0B74-4829-BDB7-CAB66F42CCE8}', 'TARGETDIR', 0, '', 'two.txt'" ); + r = add_component_entry( hdb, "'two', '{62A09F6E-0B74-4829-BDB7-CAB66F42CCE8}', 'TARGETDIR', 0, '', ''" ); ok( r == ERROR_SUCCESS, "cannot add component %u\n", r ); r = create_feature_table( hdb ); @@ -13103,6 +13100,16 @@ static void test_MsiEnumComponentCosts(void) len = sizeof(drive); drive[0] = 0; cost = temp = 0xdead; + r = MsiEnumComponentCostsA( hpkg, "two", 0, INSTALLSTATE_LOCAL, drive, &len, &cost, &temp ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r ); + ok( len == 2, "expected len == 2, got %u\n", len ); + ok( drive[0], "expected a drive\n" ); + ok( !cost, "expected cost == 0, got %d\n", cost ); + ok( !temp, "expected temp == 0, got %d\n", temp ); + + len = sizeof(drive); + drive[0] = 0; + cost = temp = 0xdead; r = MsiEnumComponentCostsA( hpkg, "", 0, INSTALLSTATE_UNKNOWN, drive, &len, &cost, &temp ); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r ); ok( len == 2, "expected len == 2, got %u\n", len );

1 0

Hans Leidekker : ws2_32: Add a test to show that WSAIoctl is synchronous.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: ee683f7162f991e3e85f555dc37217e0b326a810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee683f7162f991e3e85f555dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:02:11 2011 +0200 ws2_32: Add a test to show that WSAIoctl is synchronous. --- dlls/ws2_32/tests/sock.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ca72e68..c032c11 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4630,6 +4630,38 @@ static void test_sioRoutingInterfaceQuery(void) closesocket(sock); } +static void test_synchronous_WSAIoctl(void) +{ + HANDLE previous_port, io_port; + WSAOVERLAPPED overlapped, *olp; + SOCKET socket; + ULONG on; + ULONG_PTR key; + DWORD num_bytes; + BOOL ret; + int res; + + previous_port = CreateIoCompletionPort( INVALID_HANDLE_VALUE, NULL, 0, 0 ); + ok( previous_port != NULL, "failed to create completion port %u\n", GetLastError() ); + + socket = WSASocketW( AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED ); + ok( socket != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError() ); + + io_port = CreateIoCompletionPort( (HANDLE)socket, previous_port, 0, 0 ); + ok( io_port != NULL, "failed to create completion port %u\n", GetLastError() ); + + on = 1; + memset( &overlapped, 0, sizeof(overlapped) ); + res = WSAIoctl( socket, FIONBIO, &on, sizeof(on), NULL, 0, &num_bytes, &overlapped, NULL ); + ok( !res, "WSAIoctl failed %d\n", WSAGetLastError() ); + + ret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 10000 ); + ok( ret, "failed to get completion status %u\n", GetLastError() ); + + CloseHandle( io_port ); + closesocket( socket ); + CloseHandle( previous_port ); +} /**************** Main program ***************/ @@ -4693,6 +4725,7 @@ START_TEST( sock ) /* this is a io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); + test_synchronous_WSAIoctl(); Exit(); }

1 0

Jacek Caban : wininet: Use test.winehq.org for post tests.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: aa4e66395421206616baa9b78552225270fb4c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4e66395421206616baa9b78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 12:23:52 2011 +0000 wininet: Use test.winehq.org for post tests. --- dlls/wininet/tests/http.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c8ac617..39bcab8 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -146,10 +146,10 @@ static const test_data_t test_data[] = { TESTF_COMPRESSED|TESTF_ALLOW_COOKIE }, { - "http://crossover.codeweavers.com/posttest.php", - "http://crossover.codeweavers.com/posttest.php", - "crossover.codeweavers.com", - "/posttest.php", + "http://test.winehq.org/tests/post.php", + "http://test.winehq.org/tests/post.php", + "test.winehq.org", + "/tests/post.php", "Content-Type: application/x-www-form-urlencoded", 0, "mode=Test",

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: ff5dbaede62134e9725bc4b5147569b6ca99dc29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff5dbaede62134e9725bc4b51… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Apr 30 14:43:53 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index f6bfdcc..5c5c9ec 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-26 18:24+0300\n" +"PO-Revision-Date: 2011-04-30 14:43+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -70,14 +70,12 @@ msgid "All files (*.*)" msgstr "Visi failai (*.*)" #: appwiz.rc:42 -#, fuzzy msgid "&Remove" -msgstr "Pa&šalinti..." +msgstr "Pa&šalinti" #: appwiz.rc:43 -#, fuzzy msgid "&Modify/Remove" -msgstr "Pa&keisti/pašalinti..." +msgstr "Pa&keisti/pašalinti" #: appwiz.rc:48 msgid "Downloading..." @@ -361,9 +359,8 @@ msgstr "" "Prašome įvesti paraštes iš naujo." #: comdlg32.rc:74 -#, fuzzy msgid "The 'Number of copies' field cannot be empty." -msgstr "Skaitinė „kopijų skaičius“ reikšmė negali būti tuščia." +msgstr "Laukas „kopijų skaičius“ negali būti tuščias." #: comdlg32.rc:76 msgid "" @@ -693,9 +690,8 @@ msgid "Unstructured Address" msgstr "Nestruktūrinis adresas" #: crypt32.rc:51 -#, fuzzy msgid "S/MIME Capabilities" -msgstr "SMIME gebėjimai" +msgstr "S/MIME gebėjimai" #: crypt32.rc:52 msgid "Prefer Signed Data" @@ -6260,9 +6256,8 @@ msgid "Pr&int..." msgstr "S&pausdinti..." #: shdocvw.rc:37 wordpad.rc:34 -#, fuzzy msgid "Print previe&w" -msgstr "Spaudinio pe&ržiūra..." +msgstr "Spaudinio pe&ržiūra" #: shdocvw.rc:40 oleview.rc:80 taskmgr.rc:139 msgid "&Close" @@ -6300,9 +6295,8 @@ msgid "&Help" msgstr "&Žinynas" #: shdocvw.rc:57 -#, fuzzy msgid "&About Internet Explorer" -msgstr "&Apie interneto naršyklę..." +msgstr "&Apie interneto naršyklę" #: shdocvw.rc:67 msgctxt "home page"

1 0

John Edmonds : wined3d: If Wine fails to acquire the focus window, allow the wndproc function to continue receiving messages.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 2fb6b509cb2a69fa9a5d64c62257c15694146a20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb6b509cb2a69fa9a5d64c62… Author: John Edmonds <pocketcookies2(a)gmail.com> Date: Fri Apr 29 19:23:18 2011 -0400 wined3d: If Wine fails to acquire the focus window, allow the wndproc function to continue receiving messages. --- dlls/wined3d/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f2bc93f..a57ce5e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6559,6 +6559,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface, { ERR("Failed to acquire focus window, hr %#x.\n", hr); wined3d_swapchain_decref(swapchain); + This->filter_messages = filter; return hr; }

1 0

Lucas Fialho Zawacki : dinput8/tests: Tests for creation and initialization of DInput8 interface and simple cases of EnumDevicesBySemantics .
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 1fbf857dc19b3e663ecfae6a8601d6f8303fcab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbf857dc19b3e663ecfae6a8… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Fri Apr 29 19:29:19 2011 -0300 dinput8/tests: Tests for creation and initialization of DInput8 interface and simple cases of EnumDevicesBySemantics. --- configure | 1 + configure.ac | 1 + dlls/dinput8/tests/Makefile.in | 7 +++ dlls/dinput8/tests/device.c | 109 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 80f9d38..7b19dd8 100755 --- a/configure +++ b/configure @@ -15106,6 +15106,7 @@ wine_fn_config_dll devenum enable_devenum po wine_fn_config_dll dinput enable_dinput implib,staticimplib wine_fn_config_test dlls/dinput/tests dinput_test wine_fn_config_dll dinput8 enable_dinput8 implib +wine_fn_config_test dlls/dinput8/tests dinput8_test wine_fn_config_dll dispdib.dll16 enable_win16 wine_fn_config_dll dispex enable_dispex wine_fn_config_test dlls/dispex/tests dispex_test diff --git a/configure.ac b/configure.ac index 2069561..7637c33 100644 --- a/configure.ac +++ b/configure.ac @@ -2509,6 +2509,7 @@ WINE_CONFIG_DLL(devenum,,[po]) WINE_CONFIG_DLL(dinput,,[implib,staticimplib]) WINE_CONFIG_TEST(dlls/dinput/tests) WINE_CONFIG_DLL(dinput8,,[implib]) +WINE_CONFIG_TEST(dlls/dinput8/tests) WINE_CONFIG_DLL(dispdib.dll16,enable_win16) WINE_CONFIG_DLL(dispex) WINE_CONFIG_TEST(dlls/dispex/tests) diff --git a/dlls/dinput8/tests/Makefile.in b/dlls/dinput8/tests/Makefile.in new file mode 100644 index 0000000..604be6a --- /dev/null +++ b/dlls/dinput8/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = dinput8.dll +IMPORTS = dinput ole32 user32 + +C_SRCS = \ + device.c + +@MAKE_TEST_RULES@ diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c new file mode 100644 index 0000000..c18a83a --- /dev/null +++ b/dlls/dinput8/tests/device.c @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2011 Lucas Fialho Zawacki + * Copyright (c) 2006 Vitaliy Margolen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define DIRECTINPUT_VERSION 0x0800 + +#define COBJMACROS +#include <windows.h> + +#include "wine/test.h" +#include "windef.h" +#include "initguid.h" +#include "dinput.h" + +static BOOL CALLBACK enum_by_semantics( + LPCDIDEVICEINSTANCE lpddi, + LPDIRECTINPUTDEVICE8 lpdid, + DWORD dwFlags, + DWORD dwRemaining, + LPVOID pvRef) +{ + return DIENUM_CONTINUE; +} + + +static void test_action_mapping(void) +{ + HRESULT hr; + HINSTANCE hinst = GetModuleHandle(NULL); + LPDIRECTINPUT8 pDI = NULL; + DIACTIONFORMAT af; + /* Dummy GUID */ + const GUID ACTION_MAPPING_GUID = { 0x1, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; + + DIACTION actionMapping[]= + { + /* axis */ + { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */ , 0, { "Steer" } }, + + /* button */ + { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */ , 0, { "Upshift" } } + }; + + hr = CoCreateInstance(&CLSID_DirectInput8, 0, 1, &IID_IDirectInput8A, (LPVOID*)&pDI); + if (hr == DIERR_OLDDIRECTINPUTVERSION || + hr == DIERR_BETADIRECTINPUTVERSION || + hr == REGDB_E_CLASSNOTREG) + { + win_skip("ActionMapping requires dinput8\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInput8 Create failed: hr=%08x\n", hr); + if (FAILED(hr)) return; + + hr = IDirectInput8_Initialize(pDI,hinst, DIRECTINPUT_VERSION); + if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION) + { + win_skip("ActionMapping requires dinput8\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInput8 Initialize failed: hr=%08x\n", hr); + if (FAILED(hr)) return; + + memset (&af, 0, sizeof(af)); + af.dwSize = sizeof(af); + af.dwActionSize = sizeof(DIACTION); + af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]); + af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); + af.rgoAction = actionMapping; + af.guidActionMap = ACTION_MAPPING_GUID; + af.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ + + hr = IDirectInput8_EnumDevicesBySemantics(pDI,0, &af, + enum_by_semantics, 0, 0); + + ok(SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n",hr); + + /* The call fails with a zeroed GUID */ + memset(&af.guidActionMap, 0, sizeof(GUID)); + hr = IDirectInput8_EnumDevicesBySemantics(pDI,0, &af, + enum_by_semantics, 0, 0); + + todo_wine ok(FAILED(hr), "EnumDevicesBySemantics succeeded with invalid GUID hr=%08x\n", hr); + +} + +START_TEST(device) +{ + CoInitialize(NULL); + + test_action_mapping(); + + CoUninitialize(); +}

1 0

Adam Martinson : wined3d: Fix an oops/crash in context_destroy_gl_resources ().
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: f912e55610d055464680d8d05f60f54a4a8174f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f912e55610d055464680d8d05… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Fri Apr 29 16:48:25 2011 -0500 wined3d: Fix an oops/crash in context_destroy_gl_resources(). Introduced by 96b150929b0791c7c30ade49d55cedf2d608537e. --- dlls/wined3d/context.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 00a649b..9fecddd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -989,7 +989,10 @@ static void context_destroy_gl_resources(struct wined3d_context *context) if (gl_info->supported[ARB_SYNC]) { - if (event_query->object.sync) GL_EXTCALL(glDeleteSync(event_query->object.sync)); + for (i = 0; i < context->free_event_query_count; ++i) + { + GL_EXTCALL(glDeleteSync(context->free_event_queries[i].sync)); + } } else if (gl_info->supported[APPLE_FENCE]) {

1 0

← Newer
1
...
88
89
90
91
92
93
94
95
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 May 2011