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

Misha Koshelev : msi: automation: Implement View::Execute, Fetch, and Close .
by Alexandre Julliard 02 May '07

02 May '07

Module: wine Branch: master Commit: deabb2978eb7cf6d1df32914b112feda2290d0ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=deabb2978eb7cf6d1df32914b… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Apr 30 20:54:02 2007 -0500 msi: automation: Implement View::Execute, Fetch, and Close. --- dlls/msi/automation.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index afbeb25..ee1852d 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -535,3 +535,72 @@ static HRESULT WINAPI RecordImpl_Invoke( return S_OK; } + +static HRESULT WINAPI ViewImpl_Invoke( + AutomationObject* This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + MSIHANDLE msiHandle; + IDispatch *pDispatch = NULL; + UINT ret; + VARIANTARG varg0, varg1; + HRESULT hr; + + VariantInit(&varg0); + VariantInit(&varg1); + + switch (dispIdMember) + { + case DISPID_VIEW_EXECUTE: + if (wFlags & DISPATCH_METHOD) + { + hr = DispGetParam(pDispParams, 0, VT_DISPATCH, &varg0, puArgErr); + if (SUCCEEDED(hr) && V_DISPATCH(&varg0) != NULL) + MsiViewExecute(This->msiHandle, ((AutomationObject *)V_DISPATCH(&varg0))->msiHandle); + else + MsiViewExecute(This->msiHandle, 0); + } + break; + + case DISPID_VIEW_FETCH: + if (wFlags & DISPATCH_METHOD) + { + V_VT(pVarResult) = VT_DISPATCH; + if ((ret = MsiViewFetch(This->msiHandle, &msiHandle)) == ERROR_SUCCESS) + { + if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Record, RecordImpl_Invoke))) + { + IDispatch_AddRef(pDispatch); + V_DISPATCH(pVarResult) = pDispatch; + } + } + else if (ret == ERROR_NO_MORE_ITEMS) + V_DISPATCH(pVarResult) = NULL; + else + { + ERR("MsiViewFetch returned %d\n", ret); + return DISP_E_EXCEPTION; + } + } + break; + + case DISPID_VIEW_CLOSE: + if (wFlags & DISPATCH_METHOD) + { + MsiViewClose(This->msiHandle); + } + break; + + default: + return DISP_E_MEMBERNOTFOUND; + } + + return S_OK; +}

1 0

Misha Koshelev : msi: automation: Implement Database::OpenView.
by Alexandre Julliard 02 May '07

02 May '07

Module: wine Branch: master Commit: df6d7977c8cfeec814a0705b6a76c30d95928a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6d7977c8cfeec814a0705b6… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Apr 30 20:54:09 2007 -0500 msi: automation: Implement Database::OpenView. --- dlls/msi/automation.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index ee1852d..dace6a8 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -604,3 +604,54 @@ static HRESULT WINAPI ViewImpl_Invoke( return S_OK; } + +static HRESULT WINAPI DatabaseImpl_Invoke( + AutomationObject* This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + MSIHANDLE msiHandle; + IDispatch *pDispatch = NULL; + UINT ret; + VARIANTARG varg0, varg1; + HRESULT hr; + + VariantInit(&varg0); + VariantInit(&varg1); + + switch (dispIdMember) + { + case DISPID_DATABASE_OPENVIEW: + if (wFlags & DISPATCH_METHOD) + { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + V_VT(pVarResult) = VT_DISPATCH; + if ((ret = MsiDatabaseOpenViewW(This->msiHandle, V_BSTR(&varg0), &msiHandle)) == ERROR_SUCCESS) + { + if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_View, ViewImpl_Invoke))) + { + IDispatch_AddRef(pDispatch); + V_DISPATCH(pVarResult) = pDispatch; + } + } + else + { + ERR("MsiDatabaseOpenView returned %d\n", ret); + return DISP_E_EXCEPTION; + } + } + break; + + default: + return DISP_E_MEMBERNOTFOUND; + } + + return S_OK; +}

1 0

Misha Koshelev : msi: automation: Implement a few functions from the Session object.
by Alexandre Julliard 02 May '07

02 May '07

Module: wine Branch: master Commit: e4d211a5e925460d0e25fb591c195f1e22530564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d211a5e925460d0e25fb591… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Apr 30 20:54:15 2007 -0500 msi: automation: Implement a few functions from the Session object. --- dlls/msi/automation.c | 206 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 206 insertions(+), 0 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index dace6a8..84054c5 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -655,3 +655,209 @@ static HRESULT WINAPI DatabaseImpl_Invoke( return S_OK; } + +static HRESULT WINAPI SessionImpl_Invoke( + AutomationObject* This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + WCHAR *szString; + DWORD dwLen; + IDispatch *pDispatch = NULL; + MSIHANDLE msiHandle; + LANGID langId; + UINT ret; + INSTALLSTATE iInstalled, iAction; + VARIANTARG varg0, varg1; + HRESULT hr; + + VariantInit(&varg0); + VariantInit(&varg1); + + switch (dispIdMember) + { + case DISPID_SESSION_PROPERTY: + if (wFlags & DISPATCH_PROPERTYGET) { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + V_VT(pVarResult) = VT_BSTR; + V_BSTR(pVarResult) = NULL; + ret = MsiGetPropertyW(This->msiHandle, V_BSTR(&varg0), NULL, &dwLen); + if (ret == ERROR_SUCCESS) + { + szString = msi_alloc((++dwLen)*sizeof(WCHAR)); + if (szString) + { + if ((ret = MsiGetPropertyW(This->msiHandle, V_BSTR(&varg0), szString, &dwLen)) == ERROR_SUCCESS) + V_BSTR(pVarResult) = SysAllocString(szString); + msi_free(szString); + } + } + if (ret != ERROR_SUCCESS) + ERR("MsiGetProperty returned %d\n", ret); + } else if (wFlags & DISPATCH_PROPERTYPUT) { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BSTR, &varg1, puArgErr); + if (FAILED(hr)) { + VariantClear(&varg0); + return hr; + } + if ((ret = MsiSetPropertyW(This->msiHandle, V_BSTR(&varg0), V_BSTR(&varg1))) != ERROR_SUCCESS) + { + ERR("MsiSetProperty returned %d\n", ret); + return DISP_E_EXCEPTION; + } + } + break; + + case DISPID_SESSION_LANGUAGE: + if (wFlags & DISPATCH_PROPERTYGET) { + langId = MsiGetLanguage(This->msiHandle); + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = langId; + } + break; + + case DISPID_SESSION_MODE: + if (wFlags & DISPATCH_PROPERTYGET) { + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) return hr; + V_VT(pVarResult) = VT_BOOL; + V_BOOL(pVarResult) = MsiGetMode(This->msiHandle, V_I4(&varg0)); + } else if (wFlags & DISPATCH_PROPERTYPUT) { + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) return hr; + hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BOOL, &varg1, puArgErr); + if (FAILED(hr)) return hr; + if ((ret = MsiSetMode(This->msiHandle, V_I4(&varg0), V_BOOL(&varg1))) != ERROR_SUCCESS) + { + ERR("MsiSetMode returned %d\n", ret); + return DISP_E_EXCEPTION; + } + } + break; + + case DISPID_SESSION_DATABASE: + if (wFlags & DISPATCH_PROPERTYGET) { + V_VT(pVarResult) = VT_DISPATCH; + if ((msiHandle = MsiGetActiveDatabase(This->msiHandle))) + { + if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Database, DatabaseImpl_Invoke))) + { + IDispatch_AddRef(pDispatch); + V_DISPATCH(pVarResult) = pDispatch; + } + } + else + { + ERR("MsiGetActiveDatabase failed\n"); + return DISP_E_EXCEPTION; + } + } + break; + + case DISPID_SESSION_DOACTION: + if (wFlags & DISPATCH_METHOD) { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + ret = MsiDoActionW(This->msiHandle, V_BSTR(&varg0)); + V_VT(pVarResult) = VT_I4; + switch (ret) + { + case ERROR_FUNCTION_NOT_CALLED: + V_I4(pVarResult) = msiDoActionStatusNoAction; + break; + case ERROR_SUCCESS: + V_I4(pVarResult) = msiDoActionStatusSuccess; + break; + case ERROR_INSTALL_USEREXIT: + V_I4(pVarResult) = msiDoActionStatusUserExit; + break; + case ERROR_INSTALL_FAILURE: + V_I4(pVarResult) = msiDoActionStatusFailure; + break; + case ERROR_INSTALL_SUSPEND: + V_I4(pVarResult) = msiDoActionStatusSuspend; + break; + case ERROR_MORE_DATA: + V_I4(pVarResult) = msiDoActionStatusFinished; + break; + case ERROR_INVALID_HANDLE_STATE: + V_I4(pVarResult) = msiDoActionStatusWrongState; + break; + case ERROR_INVALID_DATA: + V_I4(pVarResult) = msiDoActionStatusBadActionData; + break; + default: + FIXME("MsiDoAction returned unhandled value %d\n", ret); + return DISP_E_EXCEPTION; + } + } + break; + + case DISPID_SESSION_SETINSTALLLEVEL: + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) return hr; + if ((ret = MsiSetInstallLevel(This->msiHandle, V_I4(&varg0))) != ERROR_SUCCESS) + { + ERR("MsiSetInstallLevel returned %d\n", ret); + return DISP_E_EXCEPTION; + } + break; + + case DISPID_SESSION_FEATURECURRENTSTATE: + if (wFlags & DISPATCH_PROPERTYGET) { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + V_VT(pVarResult) = VT_I4; + if ((ret = MsiGetFeatureStateW(This->msiHandle, V_BSTR(&varg0), &iInstalled, &iAction)) == ERROR_SUCCESS) + V_I4(pVarResult) = iInstalled; + else + { + ERR("MsiGetFeatureState returned %d\n", ret); + V_I4(pVarResult) = msiInstallStateUnknown; + } + } + break; + + case DISPID_SESSION_FEATUREREQUESTSTATE: + if (wFlags & DISPATCH_PROPERTYGET) { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + V_VT(pVarResult) = VT_I4; + if ((ret = MsiGetFeatureStateW(This->msiHandle, V_BSTR(&varg0), &iInstalled, &iAction)) == ERROR_SUCCESS) + V_I4(pVarResult) = iAction; + else + { + ERR("MsiGetFeatureState returned %d\n", ret); + V_I4(pVarResult) = msiInstallStateUnknown; + } + } else if (wFlags & DISPATCH_PROPERTYPUT) { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_I4, &varg1, puArgErr); + if (FAILED(hr)) { + VariantClear(&varg0); + return hr; + } + if ((ret = MsiSetFeatureStateW(This->msiHandle, V_BSTR(&varg0), V_I4(&varg1))) != ERROR_SUCCESS) + { + ERR("MsiSetFeatureState returned %d\n", ret); + return DISP_E_EXCEPTION; + } + } + break; + + default: + return DISP_E_MEMBERNOTFOUND; + } + + return S_OK; +}

1 0

Misha Koshelev : msi: automation: Implement Installer::OpenPackage.
by Alexandre Julliard 02 May '07

02 May '07

Module: wine Branch: master Commit: 8026c070bc087dd300a9a8787caa46a2666b4167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8026c070bc087dd300a9a8787… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Apr 30 20:54:24 2007 -0500 msi: automation: Implement Installer::OpenPackage. --- dlls/msi/automation.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 84054c5..d9ca76d 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -861,3 +861,56 @@ static HRESULT WINAPI SessionImpl_Invoke( return S_OK; } + +static HRESULT WINAPI InstallerImpl_Invoke( + AutomationObject* This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + MSIHANDLE msiHandle; + IDispatch *pDispatch = NULL; + UINT ret; + VARIANTARG varg0, varg1; + HRESULT hr; + + VariantInit(&varg0); + VariantInit(&varg1); + + switch (dispIdMember) + { + case DISPID_INSTALLER_OPENPACKAGE: + if (wFlags & DISPATCH_METHOD) + { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); + if (FAILED(hr)) return hr; + V_VT(pVarResult) = VT_DISPATCH; + if ((ret = MsiOpenPackageExW(V_BSTR(&varg0), V_I4(&varg1), &msiHandle)) == ERROR_SUCCESS) + { + if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Session, SessionImpl_Invoke))) + { + IDispatch_AddRef(pDispatch); + V_DISPATCH(pVarResult) = pDispatch; + } + } + else + { + ERR("MsiOpenPackageEx returned %d\n", ret); + return DISP_E_EXCEPTION; + } + } + break; + + default: + return DISP_E_MEMBERNOTFOUND; + } + + return S_OK; +}

1 0

appdb/ ./apidb.css ./appbrowse.php ./appdbStat ...
by WineHQ 02 May '07

02 May '07

ChangeSet ID: 31122 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/05/01 20:08:22 Modified files: . : apidb.css appbrowse.php appdbStats.php browse_by_rating.php browse_downloadable.php index.php preferences.php viewScreenshots.php votestats.php admin : editAppVersion.php help : index.php include : application.php application_queue.php distribution.php downloadurl.php form_login.php form_new.php html.php objectManager.php testData.php url.php vendor.php version.php version_queue.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Layout improvements. Change default inner padding for html_frame_start() from 5 to 0, this lets us eliminate the white spacing between frames and their contents. Add in a div.default_container class that has a 5px padding to replace the now not present default spacing. Patch: http://cvs.winehq.org/patch.py?id=31122 Old revision New revision Changes Path 1.17 1.18 +3 -0 appdb/apidb.css 1.24 1.25 +4 -0 appdb/appbrowse.php 1.18 1.19 +7 -1 appdb/appdbStats.php 1.3 1.4 +3 -0 appdb/browse_by_rating.php 1.5 1.6 +4 -0 appdb/browse_downloadable.php 1.46 1.47 +3 -1 appdb/index.php 1.35 1.36 +4 -0 appdb/preferences.php 1.12 1.13 +5 -0 appdb/viewScreenshots.php 1.31 1.32 +4 -0 appdb/votestats.php 1.49 1.50 +5 -0 appdb/admin/editAppVersion.php 1.11 1.12 +7 -1 appdb/help/index.php 1.108 1.109 +2 -2 appdb/include/application.php 1.3 1.4 +8 -1 appdb/include/application_queue.php 1.29 1.30 +4 -4 appdb/include/distribution.php 1.14 1.15 +4 -4 appdb/include/downloadurl.php 1.9 1.10 +2 -0 appdb/include/form_login.php 1.11 1.12 +2 -0 appdb/include/form_new.php 1.12 1.13 +1 -1 appdb/include/html.php 1.20 1.21 +9 -0 appdb/include/objectManager.php 1.51 1.52 +1 -1 appdb/include/testData.php 1.16 1.17 +1 -1 appdb/include/url.php 1.25 1.26 +8 -4 appdb/include/vendor.php 1.126 1.127 +1 -1 appdb/include/version.php 1.9 1.10 +14 -6 appdb/include/version_queue.php

1 0

lostwages/templates/en home_about.template
by Jeremy Newman 01 May '07

01 May '07

ChangeSet ID: 31121 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/05/01 15:52:28 Modified files: templates/en : home_about.template Log message: Andrew Riedi <andrewriedi(a)gmail.com> Fix the X11 link and state that we use OpenGL also. Patch: http://cvs.winehq.org/patch.py?id=31121 Old revision New revision Changes Path 1.21 1.22 +2 -1 lostwages/templates/en/home_about.template Index: lostwages/templates/en/home_about.template diff -u -p lostwages/templates/en/home_about.template:1.21 lostwages/templates/en/home_about.template:1.22 --- lostwages/templates/en/home_about.template:1.21 1 May 2007 20:52:28 -0000 +++ lostwages/templates/en/home_about.template 1 May 2007 20:52:28 -0000 @@ -2,7 +2,8 @@ <p>Wine is an Open Source implementation of the <a href="http://www.microsoft.com/windows/">Windows</a> API on top of <a -href="http://www.x.org/X11_protocol.html">X</a> and Unix.</p> +href="http://www.x.org">X</a>, <a href="http://www.opengl.org">OpenGL</a>, and +Unix.</p> <p>Think of Wine as a compatibility layer for running Windows programs. Wine does not require Microsoft Windows, as it is a completely free alternative

1 0

lostwages/templates/en resources.template
by Jeremy Newman 01 May '07

01 May '07

ChangeSet ID: 31120 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/05/01 15:51:02 Modified files: templates/en : resources.template Log message: EA Durbin <ead1234(a)hotmail.com> prune dead link Patch: http://cvs.winehq.org/patch.py?id=31120 Old revision New revision Changes Path 1.14 1.15 +0 -1 lostwages/templates/en/resources.template Index: lostwages/templates/en/resources.template diff -u -p lostwages/templates/en/resources.template:1.14 lostwages/templates/en/resources.template:1.15 --- lostwages/templates/en/resources.template:1.14 1 May 2007 20:51: 2 -0000 +++ lostwages/templates/en/resources.template 1 May 2007 20:51: 2 -0000 @@ -17,7 +17,6 @@ <li><a href="http://www.winprog.org/tutorial/">Win32 API Tutorial</a> If you know nothing about Windows, you can't do worse than start here. <li><a href="ftp://ftp.borland.com/pub/delphi/techpubs/delphi2/win32.zip">Win32 API</a> Help File format, courtesy of Borland. - <li><a href="http://leb.net/wine/WinDoc/">WinDoc</a> Mirror of Microsoft's old site, with indexes. <li><a href="http://msdn.microsoft.com/developercenters/">MSDN Online</a> Microsoft's new site. <li><a href="http://www.microsoft.com/windows/directx/default.aspx">DirectX</a> Multimedia API for games, etc. <li>The Open32 API is the subset of Win32 implemented by IBM's OS/2 Merlin. Open32 provides source code

1 0

Alexandre Julliard : server: Give system APCs priority over signaled objects.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: 48c53215861b07201a50c96226d455ee53cc2376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c53215861b07201a50c9622… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 1 14:07:24 2007 +0200 server: Give system APCs priority over signaled objects. --- server/thread.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/server/thread.c b/server/thread.c index b8aff71..c3a2535 100644 --- a/server/thread.c +++ b/server/thread.c @@ -497,15 +497,14 @@ static int check_wait( struct thread *thread ) struct thread_wait *wait = thread->wait; struct wait_queue_entry *entry = wait->queues; + assert( wait ); + + if ((wait->flags & SELECT_INTERRUPTIBLE) && !list_empty( &thread->system_apc )) + return STATUS_USER_APC; + /* Suspended threads may not acquire locks, but they can run system APCs */ - if (thread->process->suspend + thread->suspend > 0) - { - if ((wait->flags & SELECT_INTERRUPTIBLE) && !list_empty( &thread->system_apc )) - return STATUS_USER_APC; - return -1; - } + if (thread->process->suspend + thread->suspend > 0) return -1; - assert( wait ); if (wait->flags & SELECT_ALL) { int not_ok = 0; @@ -535,7 +534,6 @@ static int check_wait( struct thread *thread ) } other_checks: - if ((wait->flags & SELECT_INTERRUPTIBLE) && !list_empty(&thread->system_apc)) return STATUS_USER_APC; if ((wait->flags & SELECT_ALERTABLE) && !list_empty(&thread->user_apc)) return STATUS_USER_APC; if (wait->timeout <= current_time) return STATUS_TIMEOUT; return -1;

1 0

Alexandre Julliard : kernel32: Don' t skip directory symlinks when looking for a specific file.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: f807f2d457222778da2244ae53cefaeecda04383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f807f2d457222778da2244ae5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 1 14:32:33 2007 +0200 kernel32: Don't skip directory symlinks when looking for a specific file. --- dlls/kernel32/file.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index d0b84cf..6b2fb49 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -71,6 +71,7 @@ typedef struct static BOOL oem_file_apis; +static const WCHAR wildcardsW[] = { '*','?',0 }; /*********************************************************************** * create_file_OF @@ -1559,7 +1560,6 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, LPVOID data, FINDEX_SEARCH_OPS search_op, LPVOID filter, DWORD flags) { - static const WCHAR wildcardsW[] = { '*','?',0 }; WCHAR *mask, *p; FIND_FIRST_INFO *info = NULL; UNICODE_STRING nt_name; @@ -1787,7 +1787,8 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) /* check for dir symlink */ if ((dir_info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) && - (dir_info->FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) + (dir_info->FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) && + strpbrkW( info->mask.Buffer, wildcardsW )) { if (!check_dir_symlink( info, dir_info )) continue; }

1 0

James Hawkins : msi: Run the costing actions for both the UI and execute sequences.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: 1104dc088df7f0f492c1bc6b48258d8a2ce9a956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1104dc088df7f0f492c1bc6b4… Author: James Hawkins <truiken(a)gmail.com> Date: Tue May 1 03:21:22 2007 -0500 msi: Run the costing actions for both the UI and execute sequences. --- dlls/msi/action.c | 3 --- dlls/msi/tests/install.c | 8 ++------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 804a1e5..8ff889b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1568,9 +1568,6 @@ static UINT ACTION_CostInitialize(MSIPACKAGE *package) {'C','o','s','t','i','n','g','C','o','m','p','l','e','t','e',0 }; static const WCHAR szZero[] = { '0', 0 }; - if ( 1 == msi_get_property_int( package, szCosting, 0 ) ) - return ERROR_SUCCESS; - MSI_SetPropertyW(package, szCosting, szZero); MSI_SetPropertyW(package, cszRootDrive, c_colon); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index b1cb4b8..d349371 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1479,12 +1479,8 @@ static void test_setpropertyfolder(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - delete_pf("msitest\\maximus", TRUE); /* FIXME: remove when the tests pass */ - todo_wine - { - ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\added", FALSE), "File not installed\n"); - } + ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\added", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); DeleteFile(msifile);

1 0