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

Detlef Riekenberg : localui: Implement ConfigurePortUI for LPT.
by Alexandre Julliard May 7, 2007

May 7, 2007

Module: wine Branch: master Commit: 406e5255dcf6a790f73ca08c4c9347c2c850395f URL: http://source.winehq.org/git/wine.git/?a=commit;h=406e5255dcf6a790f73ca08c4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat May 5 00:19:33 2007 +0200 localui: Implement ConfigurePortUI for LPT. --- dlls/localui/localui.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/localui/localui.h | 6 ++- dlls/localui/ui_En.rc | 13 +++++ 3 files changed, 140 insertions(+), 1 deletions(-) diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index 05950e3..55b035a 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -42,15 +42,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(localui); static HINSTANCE LOCALUI_hInstance; static const WCHAR cmd_AddPortW[] = {'A','d','d','P','o','r','t',0}; +static const WCHAR cmd_ConfigureLPTPortCommandOKW[] = {'C','o','n','f','i','g','u','r','e', + 'L','P','T','P','o','r','t', + 'C','o','m','m','a','n','d','O','K',0}; static const WCHAR cmd_DeletePortW[] = {'D','e','l','e','t','e','P','o','r','t',0}; static const WCHAR cmd_GetDefaultCommConfigW[] = {'G','e','t', 'D','e','f','a','u','l','t', 'C','o','m','m','C','o','n','f','i','g',0}; +static const WCHAR cmd_GetTransmissionRetryTimeoutW[] = {'G','e','t', + 'T','r','a','n','s','m','i','s','s','i','o','n', + 'R','e','t','r','y','T','i','m','e','o','u','t',0}; static const WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; static const WCHAR cmd_SetDefaultCommConfigW[] = {'S','e','t', 'D','e','f','a','u','l','t', 'C','o','m','m','C','o','n','f','i','g',0}; +static const WCHAR fmt_uW[] = {'%','u',0}; static const WCHAR portname_LPT[] = {'L','P','T',0}; static const WCHAR portname_COM[] = {'C','O','M',0}; static const WCHAR portname_FILE[] = {'F','I','L','E',':',0}; @@ -67,6 +74,14 @@ typedef struct tag_addportui_t { HANDLE hXcv; } addportui_t; +typedef struct tag_lptconfig_t { + HANDLE hXcv; + DWORD value; +} lptconfig_t; + + +static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); + /***************************************************** * strdupWW [internal] */ @@ -131,6 +146,29 @@ static BOOL dlg_configure_com(HANDLE hXcv, HWND hWnd, PCWSTR pPortName) return FALSE; } + +/***************************************************** + * dlg_configure_lpt [internal] + * + */ + +static BOOL dlg_configure_lpt(HANDLE hXcv, HWND hWnd) +{ + lptconfig_t data; + BOOL res; + + + data.hXcv = hXcv; + + res = DialogBoxParamW(LOCALUI_hInstance, MAKEINTRESOURCEW(LPTCONFIG_DIALOG), hWnd, + dlgproc_lptconfig, (LPARAM) &data); + + TRACE("got %u with %u\n", res, GetLastError()); + + if (!res) SetLastError(ERROR_CANCELLED); + return res; +} + /****************************************************************** * dlg_port_already_exists [internal] */ @@ -291,6 +329,86 @@ static INT_PTR CALLBACK dlgproc_addport(HWND hwnd, UINT msg, WPARAM wparam, LPAR return FALSE; } +/***************************************************************************** + * dlgproc_lptconfig [internal] + * + * Our message-proc is simple, as the range-check is done only during the + * command "OK" and the dialog is set to the start-value at "out of range". + * + * Native localui.dll does the check during keyboard-input and set the dialog + * to the previous value. + * + */ + +static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + lptconfig_t * data; + WCHAR bufferW[16]; + DWORD status; + DWORD dummy; + DWORD len; + DWORD res; + + + switch(msg) + { + case WM_INITDIALOG: + SetWindowLongPtrW(hwnd, DWLP_USER, lparam); + data = (lptconfig_t *) lparam; + + /* Get current setting */ + data->value = 45; + status = ERROR_SUCCESS; + res = XcvDataW( data->hXcv, cmd_GetTransmissionRetryTimeoutW, + (PBYTE) &dummy, 0, + (PBYTE) &data->value, sizeof(data->value), &len, &status); + + TRACE("got %u with status %u\n", res, status); + + /* Set current setting as the initial value in the Dialog */ + SetDlgItemInt(hwnd, LPTCONFIG_EDIT, data->value, FALSE); + return TRUE; + + case WM_COMMAND: + if (wparam == MAKEWPARAM(IDOK, BN_CLICKED)) + { + data = (lptconfig_t *) GetWindowLongPtrW(hwnd, DWLP_USER); + + status = FALSE; + res = GetDlgItemInt(hwnd, LPTCONFIG_EDIT, (BOOL *) &status, FALSE); + /* length is in WCHAR, including the '\0' */ + GetDlgItemTextW(hwnd, LPTCONFIG_EDIT, bufferW, sizeof(bufferW) / sizeof(bufferW[0])); + TRACE("got %s and %u (translated: %u)\n", debugstr_w(bufferW), res, status); + + /* native localui.dll use the same limits */ + if ((res > 0) && (res < 1000000) && status) { + sprintfW(bufferW, fmt_uW, res); + res = XcvDataW( data->hXcv, cmd_ConfigureLPTPortCommandOKW, + (PBYTE) bufferW, + (lstrlenW(bufferW) +1) * sizeof(WCHAR), + (PBYTE) &dummy, 0, &len, &status); + + TRACE("got %u with status %u\n", res, status); + EndDialog(hwnd, TRUE); + return TRUE; + } + + /* Set initial value and rerun the Dialog */ + SetDlgItemInt(hwnd, LPTCONFIG_EDIT, data->value, FALSE); + return TRUE; + } + + if (wparam == MAKEWPARAM(IDCANCEL, BN_CLICKED)) + { + EndDialog(hwnd, FALSE); + return TRUE; + } + return FALSE; + } + return FALSE; +} + + /***************************************************** * get_type_from_name (internal) * @@ -471,6 +589,10 @@ static BOOL WINAPI localui_ConfigurePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPort res = dlg_configure_com(hXcv, hWnd, pPortName); break; + case PORT_IS_LPT: + res = dlg_configure_lpt(hXcv, hWnd); + break; + default: dlg_nothingtoconfig(hWnd); SetLastError(ERROR_CANCELLED); diff --git a/dlls/localui/localui.h b/dlls/localui/localui.h index 599ef58..aa244bd 100644 --- a/dlls/localui/localui.h +++ b/dlls/localui/localui.h @@ -24,7 +24,11 @@ /* ## Resource-ID ## */ #define ADDPORT_DIALOG 100 -#define ADDPORT_EDIT 201 +#define ADDPORT_EDIT 101 + +#define LPTCONFIG_DIALOG 200 +#define LPTCONFIG_GROUP 201 +#define LPTCONFIG_EDIT 202 #define IDS_LOCALPORT 300 #define IDS_INVALIDNAME 301 diff --git a/dlls/localui/ui_En.rc b/dlls/localui/ui_En.rc index 8a1e5b9..c2de626 100644 --- a/dlls/localui/ui_En.rc +++ b/dlls/localui/ui_En.rc @@ -32,6 +32,19 @@ BEGIN END +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Configure LPT Port" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Timeout (seconds)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Transmission Retry:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Cancel", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + STRINGTABLE DISCARDABLE { IDS_LOCALPORT "Local Port"

1 0

Misha Koshelev : msi: automation: Implement Session::Installer.
by Alexandre Julliard May 7, 2007

May 7, 2007

Module: wine Branch: master Commit: c7e7f36e77efa2892d9e7fa74d08fa47df9c09b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e7f36e77efa2892d9e7fa74… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri May 4 23:18:40 2007 -0500 msi: automation: Implement Session::Installer. --- dlls/msi/automation.c | 8 ++++++++ dlls/msi/msiserver.idl | 2 ++ dlls/msi/msiserver_dispids.h | 1 + dlls/msi/tests/automation.c | 10 ++++------ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 07994e1..169ad81 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -686,6 +686,14 @@ static HRESULT WINAPI SessionImpl_Invoke( switch (dispIdMember) { + case DISPID_SESSION_INSTALLER: + if (wFlags & DISPATCH_PROPERTYGET) { + V_VT(pVarResult) = VT_DISPATCH; + IDispatch_AddRef(This->pInstaller); + V_DISPATCH(pVarResult) = This->pInstaller; + } + break; + case DISPID_SESSION_PROPERTY: if (wFlags & DISPATCH_PROPERTYGET) { hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 4d6c00b..09ea7c7 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -163,6 +163,8 @@ library WindowsInstaller { properties: methods: + [id(DISPID_SESSION_INSTALLER), propget] + Installer *Installer(); [id(DISPID_SESSION_PROPERTY), propget] BSTR Property([in] BSTR PropertyName); [id(DISPID_SESSION_PROPERTY), propput] diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index 1c7a17f..e5efa3e 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -26,6 +26,7 @@ #define DISPID_DATABASE_OPENVIEW 3 +#define DISPID_SESSION_INSTALLER 1 #define DISPID_SESSION_PROPERTY 2 #define DISPID_SESSION_LANGUAGE 3 #define DISPID_SESSION_MODE 4 diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index d4977ab..91e7b9a 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -908,12 +908,10 @@ static void test_Session(IDispatch *pSession) HRESULT hr; /* Session::Installer */ - todo_wine { - hr = Session_Installer(pSession, &pInst); - ok(SUCCEEDED(hr), "Session_Installer failed, hresult 0x%08x\n", hr); - ok(pInst != NULL, "Session_Installer returned NULL IDispatch pointer\n"); - ok(pInst == pInstaller, "Session_Installer does not match Installer instance from CoCreateInstance\n"); - } + hr = Session_Installer(pSession, &pInst); + ok(SUCCEEDED(hr), "Session_Installer failed, hresult 0x%08x\n", hr); + ok(pInst != NULL, "Session_Installer returned NULL IDispatch pointer\n"); + ok(pInst == pInstaller, "Session_Installer does not match Installer instance from CoCreateInstance\n"); /* Session::Property, get */ memset(stringw, 0, sizeof(stringw));

1 0

Marcus Meissner : riched32: Avoid implicit time().
by Alexandre Julliard May 7, 2007

May 7, 2007

Module: wine Branch: master Commit: ec11114c55cbfd110535b846825145750ab35033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec11114c55cbfd110535b8468… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 5 01:18:40 2007 +0200 riched32: Avoid implicit time(). --- dlls/riched20/tests/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 91cad1d..a409b32 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -29,6 +29,7 @@ #include <winnls.h> #include <ole2.h> #include <richedit.h> +#include <time.h> #include <wine/test.h> static HMODULE hmoduleRichEdit;

1 0

Misha Koshelev : msi: automation: Store parent Installer object in Session.
by Alexandre Julliard May 7, 2007

May 7, 2007

Module: wine Branch: master Commit: 8ba0b3c7b9011f99f1d4ad0fa7b698d244fe367b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba0b3c7b9011f99f1d4ad0fa… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri May 4 23:18:19 2007 -0500 msi: automation: Store parent Installer object in Session. --- dlls/msi/automation.c | 13 ++++++++++--- dlls/msi/msipriv.h | 2 +- dlls/msi/script.c | 11 ++++++++++- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 65639a0..07994e1 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -61,6 +61,9 @@ interface AutomationObject { /* The MSI handle of the current object */ MSIHANDLE msiHandle; + /* The parent Installer object (only used in the Session object) */ + IDispatch *pInstaller; + /* A function that is called from AutomationObject::Invoke, specific to this type of object. */ HRESULT (STDMETHODCALLTYPE *funcInvoke)( AutomationObject* This, @@ -134,6 +137,7 @@ HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, LPVOI object->msiHandle = msiHandle; object->clsid = (LPCLSID)clsid; object->funcInvoke = funcInvoke; + object->pInstaller = NULL; /* Load our TypeInfo so we don't have to process GetIDsOfNames */ object->iTypeInfo = NULL; @@ -894,7 +898,7 @@ static HRESULT WINAPI InstallerImpl_Invoke( 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))) + if (SUCCEEDED(create_session(msiHandle, (IDispatch *)This, &pDispatch))) { IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; @@ -922,7 +926,10 @@ HRESULT create_msiserver(IUnknown *pOuter, LPVOID *ppObj) } /* Wrapper around create_automation_object to create a session object. */ -HRESULT create_session(MSIHANDLE msiHandle, IDispatch **pDispatch) +HRESULT create_session(MSIHANDLE msiHandle, IDispatch *pInstaller, IDispatch **pDispatch) { - return create_automation_object(msiHandle, NULL, (LPVOID)pDispatch, &DIID_Session, SessionImpl_Invoke); + HRESULT hr = create_automation_object(msiHandle, NULL, (LPVOID)pDispatch, &DIID_Session, SessionImpl_Invoke); + if (SUCCEEDED(hr) && pDispatch && *pDispatch) + ((AutomationObject *)*pDispatch)->pInstaller = (IDispatch *)pInstaller; + return hr; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index de08aeb..a8d833f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -793,7 +793,7 @@ extern VOID ControlEvent_UnSubscribeToEvent( MSIPACKAGE *package, LPCWSTR event, /* OLE automation */ extern HRESULT create_msiserver(IUnknown *pOuter, LPVOID *ppObj); -extern HRESULT create_session(MSIHANDLE msiHandle, IDispatch **pDispatch); +extern HRESULT create_session(MSIHANDLE msiHandle, IDispatch *pInstaller, IDispatch **pDispatch); extern HRESULT load_type_info(IDispatch *iface, ITypeInfo **pptinfo, REFIID clsid, LCID lcid); /* Scripting */ diff --git a/dlls/msi/script.c b/dlls/msi/script.c index 018b198..54d0ee8 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -46,6 +46,7 @@ static const WCHAR szSession[] = {'S','e','s','s','i','o','n',0}; typedef struct { IActiveScriptSite lpVtbl; + IDispatch *pInstaller; IDispatch *pSession; LONG ref; } MsiActiveScriptSite; @@ -65,6 +66,7 @@ static HRESULT create_ActiveScriptSite(IUnknown *pUnkOuter, LPVOID *ppObj) object->lpVtbl.lpVtbl = &ASS_Vtbl; object->ref = 1; + object->pInstaller = NULL; object->pSession = NULL; *ppObj = object; @@ -97,8 +99,13 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function hr = create_ActiveScriptSite(NULL, (void **)&pActiveScriptSite); if (hr != S_OK) goto done; + /* Create an installer object */ + hr = create_msiserver(NULL, (LPVOID *)&pActiveScriptSite->pInstaller); + if (hr != S_OK) goto done; + IUnknown_AddRef((IUnknown *)pActiveScriptSite->pInstaller); + /* Create a session object */ - hr = create_session(hPackage, &pActiveScriptSite->pSession); + hr = create_session(hPackage, pActiveScriptSite->pInstaller, &pActiveScriptSite->pSession); if (hr != S_OK) goto done; IUnknown_AddRef((IUnknown *)pActiveScriptSite->pSession); @@ -181,6 +188,8 @@ done: if (pActiveScript) IActiveScriptSite_Release(pActiveScript); if (pActiveScriptSite && pActiveScriptSite->pSession) IUnknown_Release((IUnknown *)pActiveScriptSite->pSession); + if (pActiveScriptSite && + pActiveScriptSite->pInstaller) IUnknown_Release((IUnknown *)pActiveScriptSite->pInstaller); if (pActiveScriptSite) IUnknown_Release((IUnknown *)pActiveScriptSite); CoUninitialize(); /* must call even if CoInitialize failed */

1 0

Kevin Koltzau : winbase.h: Define FILE_FLAG_OPEN_REPARSE_POINT.
by Alexandre Julliard May 7, 2007

May 7, 2007

Module: wine Branch: master Commit: 1cb98aa25da4cdbf81813525f6f7d8ea39515a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb98aa25da4cdbf81813525f… Author: Kevin Koltzau <kevin(a)plop.org> Date: Fri May 4 21:44:46 2007 -0400 winbase.h: Define FILE_FLAG_OPEN_REPARSE_POINT. --- include/winbase.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index c45fbf1..7d6a827 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -664,6 +664,7 @@ typedef struct _TIME_ZONE_INFORMATION{ #define FILE_FLAG_DELETE_ON_CLOSE 0x04000000L #define FILE_FLAG_BACKUP_SEMANTICS 0x02000000L #define FILE_FLAG_POSIX_SEMANTICS 0x01000000L +#define FILE_FLAG_OPEN_REPARSE_POINT 0x00200000L #define CREATE_NEW 1 #define CREATE_ALWAYS 2 #define OPEN_EXISTING 3

1 0

Misha Koshelev : msi/tests: automation: Session::Installer conformance test .
by Alexandre Julliard May 7, 2007

May 7, 2007

Module: wine Branch: master Commit: 4a5a90b04a5a70d055b3e108bb683a40a4ac9aff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5a90b04a5a70d055b3e108b… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri May 4 23:17:56 2007 -0500 msi/tests: automation: Session::Installer conformance test. --- dlls/msi/tests/automation.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index c84c54b..d4977ab 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -546,6 +546,17 @@ static HRESULT Installer_VersionGet(LPCWSTR szVersion) return hr; } +static HRESULT Session_Installer(IDispatch *pSession, IDispatch **pInst) +{ + VARIANT varresult; + DISPPARAMS dispparams = {NULL, NULL, 0, 0}; + HRESULT hr; + + hr = invoke(pSession, "Installer", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_DISPATCH); + *pInst = V_DISPATCH(&varresult); + return hr; +} + static HRESULT Session_PropertyGet(IDispatch *pSession, LPCWSTR szName, LPCWSTR szReturn) { VARIANT varresult; @@ -893,9 +904,17 @@ static void test_Session(IDispatch *pSession) UINT len; BOOL bool; int myint; - IDispatch *pDatabase = NULL; + IDispatch *pDatabase = NULL, *pInst = NULL; HRESULT hr; + /* Session::Installer */ + todo_wine { + hr = Session_Installer(pSession, &pInst); + ok(SUCCEEDED(hr), "Session_Installer failed, hresult 0x%08x\n", hr); + ok(pInst != NULL, "Session_Installer returned NULL IDispatch pointer\n"); + ok(pInst == pInstaller, "Session_Installer does not match Installer instance from CoCreateInstance\n"); + } + /* Session::Property, get */ memset(stringw, 0, sizeof(stringw)); hr = Session_PropertyGet(pSession, szProductName, stringw);

1 0

Misha Koshelev : msi: script: Discriminate properly between JScript and VBScript.
by Alexandre Julliard May 7, 2007

May 7, 2007

Module: wine Branch: master Commit: 144ef422e0afdb861eb4f49fcfc7a859cc2e5e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=144ef422e0afdb861eb4f49fc… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri May 4 08:10:21 2007 -0500 msi: script: Discriminate properly between JScript and VBScript. --- dlls/msi/script.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/script.c b/dlls/msi/script.c index f2fc642..018b198 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -103,9 +103,9 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function IUnknown_AddRef((IUnknown *)pActiveScriptSite->pSession); /* Create the scripting engine */ - if (type & msidbCustomActionTypeJScript) + if ((type & 7) == msidbCustomActionTypeJScript) hr = CLSIDFromProgID(szJScript, &clsid); - else if (type & msidbCustomActionTypeVBScript) + else if ((type & 7) == msidbCustomActionTypeVBScript) hr = CLSIDFromProgID(szVBScript, &clsid); else { ERR("Unknown script type %d\n", type);

1 0

Dmitry Timoshkov : advapi32: Add FILE_FLAG_BACKUP_SEMANTICS to the flags passed to CreateFileW to be able to get security information for directories as well as for files .
by Alexandre Julliard May 4, 2007

May 4, 2007

Module: wine Branch: master Commit: e79a94d45be2f05d6e1d2366f46eea0fa59b6a95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79a94d45be2f05d6e1d2366f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 4 16:27:10 2007 +0900 advapi32: Add FILE_FLAG_BACKUP_SEMANTICS to the flags passed to CreateFileW to be able to get security information for directories as well as for files. --- dlls/advapi32/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 729727f..126a4ac 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1749,7 +1749,7 @@ GetFileSecurityW( LPCWSTR lpFileName, NTSTATUS status; hfile = CreateFileW( lpFileName, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, 0 ); + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); if ( hfile == INVALID_HANDLE_VALUE ) return FALSE;

1 0

Dmitry Timoshkov : gdi32: AddFontResource should return a number of added font faces.
by Alexandre Julliard May 4, 2007

May 4, 2007

Module: wine Branch: master Commit: bdfef82348f2243f62755552db360e45792a62d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdfef82348f2243f62755552d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 4 16:26:06 2007 +0900 gdi32: AddFontResource should return a number of added font faces. --- dlls/gdi32/freetype.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 793c1ad..424fb3d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -953,7 +953,7 @@ static WCHAR *get_familyname(FT_Face ft_face) #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 -static BOOL AddFontFileToList(const char *file, char *fake_family, const WCHAR *target_family, DWORD flags) +static INT AddFontFileToList(const char *file, char *fake_family, const WCHAR *target_family, DWORD flags) { FT_Face ft_face; TT_OS2 *pOS2; @@ -987,7 +987,7 @@ static BOOL AddFontFileToList(const char *file, char *fake_family, const WCHAR * } HeapFree(GetProcessHeap(), 0, mac_list); if(had_one) - return TRUE; + return 1; } } #endif /* HAVE_CARBON_CARBON_H */ @@ -998,20 +998,20 @@ static BOOL AddFontFileToList(const char *file, char *fake_family, const WCHAR * TRACE("Loading font file %s index %ld\n", debugstr_a(file), face_index); if((err = pFT_New_Face(library, file, face_index, &ft_face)) != 0) { WARN("Unable to load font file %s err = %x\n", debugstr_a(file), err); - return FALSE; + return 0; } if(!FT_IS_SFNT(ft_face) && (FT_IS_SCALABLE(ft_face) || !(flags & ADDFONT_FORCE_BITMAP))) { /* for now we'll accept TT/OT or bitmap fonts*/ WARN("Ignoring font %s\n", debugstr_a(file)); pFT_Done_Face(ft_face); - return FALSE; + return 0; } /* There are too many bugs in FreeType < 2.1.9 for bitmap font support */ if(!FT_IS_SCALABLE(ft_face) && FT_SimpleVersion < ((2 << 16) | (1 << 8) | (9 << 0))) { WARN("FreeType version < 2.1.9, skipping bitmap font %s\n", debugstr_a(file)); pFT_Done_Face(ft_face); - return FALSE; + return 0; } if(FT_IS_SFNT(ft_face) && (!pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2) || @@ -1020,13 +1020,13 @@ static BOOL AddFontFileToList(const char *file, char *fake_family, const WCHAR * TRACE("Font file %s lacks either an OS2, HHEA or HEAD table.\n" "Skipping this font.\n", debugstr_a(file)); pFT_Done_Face(ft_face); - return FALSE; + return 0; } if(!ft_face->family_name || !ft_face->style_name) { TRACE("Font file %s lacks either a family or style name\n", debugstr_a(file)); pFT_Done_Face(ft_face); - return FALSE; + return 0; } if (target_family) @@ -1140,13 +1140,13 @@ static BOOL AddFontFileToList(const char *file, char *fake_family, const WCHAR * TRACE("This font is a replacement but the original really exists, so we'll skip the replacement\n"); HeapFree(GetProcessHeap(), 0, StyleW); pFT_Done_Face(ft_face); - return FALSE; + return 0; } if(!pHeader || pHeader->Font_Revision <= face->font_version) { TRACE("Original font is newer so skipping this one\n"); HeapFree(GetProcessHeap(), 0, StyleW); pFT_Done_Face(ft_face); - return FALSE; + return 0; } else { TRACE("Replacing original with this one\n"); list_remove(&face->entry); @@ -1218,7 +1218,7 @@ static BOOL AddFontFileToList(const char *file, char *fake_family, const WCHAR * TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), debugstr_w(StyleW)); } while(num_faces > ++face_index); - return TRUE; + return num_faces; } static void DumpFontList(void)

1 0

Dmitry Timoshkov : gdi32: Handle errors in WineEngAddFontResourceEx.
by Alexandre Julliard May 4, 2007

May 4, 2007

Module: wine Branch: master Commit: 71929ffc4d1c7ac8064174758fd0bd9dd618dc22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71929ffc4d1c7ac8064174758… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 4 16:25:38 2007 +0900 gdi32: Handle errors in WineEngAddFontResourceEx. --- dlls/gdi32/freetype.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d3ca23b..793c1ad 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1730,11 +1730,12 @@ INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) if((unixname = wine_get_unix_file_name(file))) { - AddFontFileToList(unixname, NULL, NULL, ADDFONT_FORCE_BITMAP); + INT ret = AddFontFileToList(unixname, NULL, NULL, ADDFONT_FORCE_BITMAP); HeapFree(GetProcessHeap(), 0, unixname); + return ret; } } - return 1; + return 0; } /*************************************************************

1 0