April 2006 - Wine-Commits - list.winehq.org

Mike McCormack : msi: Add some more MsiFormatRecord tests.
by Alexandre Julliard April 11, 2006

April 11, 2006

Module: wine Branch: refs/heads/master Commit: 8232e69492de59a5d7202b7d884510643c54c0c8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8232e69492de59a5d7202b7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Apr 11 14:47:23 2006 +0900 msi: Add some more MsiFormatRecord tests. --- dlls/msi/tests/format.c | 443 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 443 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8232e69492de59a5d72…

1 0

James Hawkins : advpack: Perform a setupapi-level install of the INF file in RunSetupCommand.
by Alexandre Julliard April 11, 2006

April 11, 2006

Module: wine Branch: refs/heads/master Commit: 698ee36c852ba6922f78a8d6a499e4dbe0faaa48 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=698ee36c852ba6922f78a8d… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Apr 11 00:18:49 2006 -0500 advpack: Perform a setupapi-level install of the INF file in RunSetupCommand. --- dlls/advpack/install.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 1cc7d32..1378e9e 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -74,6 +74,40 @@ static BOOL is_full_path(LPWSTR path) return FALSE; } +/* performs a setupapi-level install of the INF file */ +static HRESULT spapi_install(HINF hinf, LPCWSTR install_sec, LPCWSTR source_path) +{ + BOOL ret; + HRESULT res; + PVOID context; + + context = SetupInitDefaultQueueCallbackEx(NULL, INVALID_HANDLE_VALUE, 0, 0, NULL); + if (!context) + return ADV_HRESULT(GetLastError()); + + ret = SetupInstallFromInfSectionW(NULL, hinf, install_sec, SPINST_FILES, + NULL, source_path, SP_COPY_NEWER, + NULL, context, NULL, NULL); + if (!ret) + { + res = ADV_HRESULT(GetLastError()); + SetupTermDefaultQueueCallback(context); + + return res; + } + + SetupTermDefaultQueueCallback(context); + + ret = SetupInstallFromInfSectionW(NULL, hinf, install_sec, + SPINST_INIFILES | SPINST_REGISTRY, + HKEY_LOCAL_MACHINE, NULL, 0, + NULL, NULL, NULL, NULL); + if (!ret) + return ADV_HRESULT(GetLastError()); + + return S_OK; +} + /* this structure very closely resembles parameters of RunSetupCommand() */ typedef struct { @@ -438,6 +472,7 @@ HRESULT WINAPI RunSetupCommandW(HWND hWn DWORD dwFlags, LPVOID pvReserved) { HINF hinf; + HRESULT hr; TRACE("(%p, %s, %s, %s, %s, %p, %ld, %p)\n", hWnd, debugstr_w(szCmdName), debugstr_w(szInfSection), @@ -457,6 +492,8 @@ HRESULT WINAPI RunSetupCommandW(HWND hWn if (hinf == INVALID_HANDLE_VALUE) return ADV_HRESULT(GetLastError()); + hr = spapi_install(hinf, szInfSection, szDir); + SetupCloseInfFile(hinf); - return E_UNEXPECTED; + return hr; }

1 0

James Hawkins : advpack: Implement LaunchINFSectionEx.
by Alexandre Julliard April 11, 2006

April 11, 2006

Module: wine Branch: refs/heads/master Commit: 46fe9448327776c84089ecf63145a3d91b573bec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46fe9448327776c84089ecf… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Apr 11 00:17:36 2006 -0500 advpack: Implement LaunchINFSectionEx. --- dlls/advpack/files.c | 21 +------------ dlls/advpack/install.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 76 insertions(+), 23 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 5c7e636..90ba6cd 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); +LPWSTR get_parameter(LPWSTR *params, WCHAR separator); + /* converts an ansi double null-terminated list to a unicode list */ static LPWSTR ansi_to_unicode_list(LPCSTR ansi_list) { @@ -452,25 +454,6 @@ HRESULT WINAPI DelNodeW(LPCWSTR pszFileO return ret; } -/* sequentially returns pointers to parameters in a parameter list - * returns NULL if the parameter is empty, e.g. one,,three */ -static LPWSTR get_parameter(LPWSTR *params, WCHAR separator) -{ - LPWSTR token = *params; - - if (!*params) - return NULL; - - *params = strchrW(*params, separator); - if (*params) - *(*params)++ = '\0'; - - if (!*token) - return NULL; - - return token; -} - /*********************************************************************** * DelNodeRunDLL32A (ADVPACK.@) * diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 331e956..1cc7d32 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -31,6 +31,7 @@ #include "setupapi.h" #include "advpub.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); @@ -41,6 +42,38 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); #define ADV_HRESULT(x) ((x & SPAPI_ERROR) ? HRESULT_FROM_SPAPI(x) : HRESULT_FROM_WIN32(x)) +/* sequentially returns pointers to parameters in a parameter list + * returns NULL if the parameter is empty, e.g. one,,three */ +LPWSTR get_parameter(LPWSTR *params, WCHAR separator) +{ + LPWSTR token = *params; + + if (!*params) + return NULL; + + *params = strchrW(*params, separator); + if (*params) + *(*params)++ = '\0'; + + if (!*token) + return NULL; + + return token; +} + +static BOOL is_full_path(LPWSTR path) +{ + const int MIN_PATH_LEN = 3; + + if (!path || lstrlenW(path) < MIN_PATH_LEN) + return FALSE; + + if (path[1] == ':' || (path[0] == '\\' && path[1] == '\\')) + return TRUE; + + return FALSE; +} + /* this structure very closely resembles parameters of RunSetupCommand() */ typedef struct { @@ -253,14 +286,51 @@ HRESULT WINAPI LaunchINFSectionExA(HWND * 'A' Always reboot. * 'I' Reboot if needed (default). * 'N' No reboot. - * + * * BUGS - * Unimplemented. + * Doesn't handle the reboot flag. */ HRESULT WINAPI LaunchINFSectionExW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT show) { - FIXME("(%p, %p, %s, %i): stub\n", hWnd, hInst, debugstr_w(cmdline), show); - return E_FAIL; + LPWSTR cmdline_copy, cmdline_ptr; + LPWSTR flags, ptr; + CABINFOW cabinfo; + HRESULT hr = S_OK; + + TRACE("(%p, %p, %s, %d)\n", hWnd, hInst, debugstr_w(cmdline), show); + + if (!cmdline) + return E_INVALIDARG; + + cmdline_copy = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmdline) + 1) * sizeof(WCHAR)); + cmdline_ptr = cmdline_copy; + lstrcpyW(cmdline_copy, cmdline); + + cabinfo.pszInf = get_parameter(&cmdline_ptr, ','); + cabinfo.pszSection = get_parameter(&cmdline_ptr, ','); + cabinfo.pszCab = get_parameter(&cmdline_ptr, ','); + + flags = get_parameter(&cmdline_ptr, ','); + if (flags) + cabinfo.dwFlags = atolW(flags); + + /* get the source path from the cab filename */ + if (cabinfo.pszCab && *cabinfo.pszCab) + { + if (!is_full_path(cabinfo.pszCab)) + goto done; + + lstrcpyW(cabinfo.szSrcPath, cabinfo.pszCab); + ptr = strrchrW(cabinfo.szSrcPath, '\\'); + *(++ptr) = '\0'; + } + + hr = ExecuteCabW(hWnd, &cabinfo, NULL); + +done: + HeapFree(GetProcessHeap(), 0, cmdline_copy); + + return hr; } static HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE)

1 0

James Hawkins : advpack: Standardize the format of advpack traces.
by Alexandre Julliard April 11, 2006

April 11, 2006

Module: wine Branch: refs/heads/master Commit: 65b50022d5ec5d5e73be4f8feccf82390de5f43d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65b50022d5ec5d5e73be4f8… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Apr 11 00:17:13 2006 -0500 advpack: Standardize the format of advpack traces. Display all strings in advpack traces. Use debugstr_a/w for TRACE strings. --- dlls/advpack/advpack.c | 34 +++++++++++++++++----------------- dlls/advpack/files.c | 42 +++++++++++++++++++++++------------------- dlls/advpack/install.c | 28 ++++++++++++++-------------- dlls/advpack/reg.c | 22 +++++++++++++--------- 4 files changed, 67 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=65b50022d5ec5d5e73b…

1 0

James Hawkins : advpack: Standardize the format of advpack parameter lists.
by Alexandre Julliard April 11, 2006

April 11, 2006

Module: wine Branch: refs/heads/master Commit: cc6685f089a7ecbc6b92eed74f8fdffd2da3e061 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc6685f089a7ecbc6b92eed… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Apr 11 00:08:54 2006 -0500 advpack: Standardize the format of advpack parameter lists. --- dlls/advpack/advpack.c | 4 ++-- dlls/advpack/files.c | 12 ++++++------ dlls/advpack/install.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index e9fbc07..07445b6 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -162,7 +162,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, * RETURNS * TRUE if user has admin rights, FALSE otherwise. */ -BOOL WINAPI IsNTAdmin( DWORD reserved, LPDWORD pReserved ) +BOOL WINAPI IsNTAdmin(DWORD reserved, LPDWORD pReserved) { SID_IDENTIFIER_AUTHORITY SidAuthority = {SECURITY_NT_AUTHORITY}; PTOKEN_GROUPS pTokenGroups; @@ -384,7 +384,7 @@ HRESULT WINAPI RebootCheckOnInstallW(HWN /*********************************************************************** * RegisterOCX (ADVPACK.@) */ -void WINAPI RegisterOCX( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show ) +void WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show) { WCHAR wszBuff[MAX_PATH]; WCHAR* pwcComma; diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 1ad531c..7e42607 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -191,8 +191,8 @@ UINT CALLBACK pQueueCallback(PVOID Conte * See AdvInstallFileW. */ HRESULT WINAPI AdvInstallFileA(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourceFile, - LPCSTR lpszDestDir, LPCSTR lpszDestFile, - DWORD dwFlags, DWORD dwReserved) + LPCSTR lpszDestDir, LPCSTR lpszDestFile, + DWORD dwFlags, DWORD dwReserved) { UNICODE_STRING sourcedir, sourcefile; UNICODE_STRING destdir, destfile; @@ -396,7 +396,7 @@ static HRESULT DELNODE_recurse_dirtree(L * * See DelNodeW. */ -HRESULT WINAPI DelNodeA( LPCSTR pszFileOrDirName, DWORD dwFlags ) +HRESULT WINAPI DelNodeA(LPCSTR pszFileOrDirName, DWORD dwFlags) { UNICODE_STRING fileordirname; HRESULT res; @@ -430,7 +430,7 @@ HRESULT WINAPI DelNodeA( LPCSTR pszFileO * - Native version apparently does a lot of checking to make sure * we're not trying to delete a system directory etc. */ -HRESULT WINAPI DelNodeW( LPCWSTR pszFileOrDirName, DWORD dwFlags ) +HRESULT WINAPI DelNodeW(LPCWSTR pszFileOrDirName, DWORD dwFlags) { WCHAR fname[MAX_PATH]; HRESULT ret = E_FAIL; @@ -705,8 +705,8 @@ static DWORD fill_file_list(EXTRACTdest * spaces, tabs, or colons can be before or after the list, but * the list itself must only be separated by colons. */ -HRESULT WINAPI ExtractFilesA( LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags, - LPCSTR FileList, LPVOID LReserved, DWORD Reserved) +HRESULT WINAPI ExtractFilesA(LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags, + LPCSTR FileList, LPVOID LReserved, DWORD Reserved) { EXTRACTdest extractDest; HMODULE hCabinet; diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index a33d429..238cd81 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -304,7 +304,7 @@ static HRESULT launch_exe(LPCWSTR cmd, L HRESULT WINAPI RunSetupCommandA(HWND hWnd, LPCSTR szCmdName, LPCSTR szInfSection, LPCSTR szDir, LPCSTR lpszTitle, HANDLE *phEXE, - DWORD dwFlags, LPVOID pvReserved ) + DWORD dwFlags, LPVOID pvReserved) { UNICODE_STRING cmdname, infsec; UNICODE_STRING dir, title; @@ -365,7 +365,7 @@ HRESULT WINAPI RunSetupCommandA(HWND hWn HRESULT WINAPI RunSetupCommandW(HWND hWnd, LPCWSTR szCmdName, LPCWSTR szInfSection, LPCWSTR szDir, LPCWSTR lpszTitle, HANDLE *phEXE, - DWORD dwFlags, LPVOID pvReserved ) + DWORD dwFlags, LPVOID pvReserved) { HINF hinf;

1 0

Juan Lang : ntdll: Initialize a variable.
by Alexandre Julliard April 11, 2006

April 11, 2006

Module: wine Branch: refs/heads/master Commit: fced68672f9c71b1ceb94837ca7697cea8e2d2c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fced68672f9c71b1ceb9483… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Apr 10 21:32:33 2006 -0700 ntdll: Initialize a variable. Fix an uninitialized pointer in RtlCreateUserThread, caught by coverity. --- dlls/ntdll/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6e3d019..b4226f9 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -370,7 +370,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN struct ntdll_thread_data *thread_data; struct ntdll_thread_regs *thread_regs = NULL; struct startup_info *info = NULL; - void *addr; + void *addr = NULL; HANDLE handle = 0; TEB *teb; DWORD tid = 0;

1 0

Juan Lang : crypt32: Fix a typo caught by coverity.
by Alexandre Julliard April 11, 2006

April 11, 2006

Module: wine Branch: refs/heads/master Commit: 95859a1d6a4a96f4b0d4833be0232f37a8c9db11 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=95859a1d6a4a96f4b0d4833… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Apr 10 21:05:55 2006 -0700 crypt32: Fix a typo caught by coverity. --- dlls/crypt32/cert.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 476aa4a..9269cb7 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -737,8 +737,8 @@ static void CertContext_SetKeyProvInfo(P if (szContainer) { - ret = CryptGetProvParam(hProv, PP_CONTAINER, (BYTE *)szContainer, - &size, 0); + ret = CryptGetProvParam(hProv, PP_CONTAINER, + (BYTE *)szContainer, &size, 0); if (ret) { len = MultiByteToWideChar(CP_ACP, 0, szContainer, -1, @@ -761,7 +761,8 @@ static void CertContext_SetKeyProvInfo(P if (szProvider) { - ret = CryptGetProvParam(hProv, PP_NAME, (BYTE *)szProvider, &size, 0); + ret = CryptGetProvParam(hProv, PP_NAME, (BYTE *)szProvider, + &size, 0); if (ret) { len = MultiByteToWideChar(CP_ACP, 0, szProvider, -1, @@ -889,7 +890,7 @@ static void CRYPT_MakeCertInfo(PCERT_INF else GetSystemTimeAsFileTime(&info->NotBefore); if (pEndTime) - SystemTimeToFileTime(pStartTime, &info->NotBefore); + SystemTimeToFileTime(pStartTime, &info->NotAfter); else { SYSTEMTIME endTime;

1 0

Jacek Caban : exdisp.idl: Added missing attributes and fix some arguments names.
by Alexandre Julliard April 11, 2006

April 11, 2006

Module: wine Branch: refs/heads/master Commit: 5d5a380e9ef862b282df86140fe177451155c604 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d5a380e9ef862b282df861… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 11 00:05:14 2006 +0200 exdisp.idl: Added missing attributes and fix some arguments names. --- include/exdisp.idl | 107 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 69 insertions(+), 38 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 914d41f..898dd1e 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -46,7 +46,9 @@ library SHDocVw [ object, oleautomation, - uuid(eab22ac1-30c1-11cf-a7eb-0000c05bae0b) + uuid(eab22ac1-30c1-11cf-a7eb-0000c05bae0b), + hidden, + dual ] interface IWebBrowser : IDispatch { @@ -88,7 +90,7 @@ interface IWebBrowser : IDispatch [id(200), propget] HRESULT Application([out, retval] IDispatch** ppDisp); [id(201), propget] HRESULT Parent([out, retval] IDispatch** ppDisp); [id(202), propget] HRESULT Container([out, retval] IDispatch** ppDisp); - [id(203), propget] HRESULT Document([out] IDispatch** ppDisp); + [id(203), propget] HRESULT Document([out, retval] IDispatch** ppDisp); [id(204), propget] HRESULT TopLevelContainer([out, retval] VARIANT_BOOL* pBool); [id(205), propget] HRESULT Type([out, retval] BSTR* Type); [id(206), propget] HRESULT Left([out, retval] long *pl); @@ -100,7 +102,7 @@ interface IWebBrowser : IDispatch [id(209), propget] HRESULT Height([out, retval] long *pl); [id(209), propput] HRESULT Height([in] long Height); [id(210), propget] HRESULT LocationName([out, retval] BSTR *LocationName); - [id(211), propget] HRESULT LocationURL([out, retval] BSTR * LocationURL); + [id(211), propget] HRESULT LocationURL([out, retval] BSTR *LocationURL); [id(212), propget] HRESULT Busy([out, retval] VARIANT_BOOL *pBool); } @@ -108,7 +110,8 @@ interface IWebBrowser : IDispatch * DWebBrowserEvents dispinterface */ [ - uuid(eab22ac2-30c1-11CF-a7eb-0000C05bae0b) + uuid(eab22ac2-30c1-11CF-a7eb-0000C05bae0b), + hidden ] dispinterface DWebBrowserEvents { @@ -117,10 +120,10 @@ dispinterface DWebBrowserEvents [id(DISPID_BEFORENAVIGATE)] void BeforeNavigate( [in] BSTR URL, - [in] long Flags, - [in] BSTR TargetFrameName, - [in] VARIANT *PostData, - [in] BSTR Headers, + long Flags, + BSTR TargetFrameName, + VARIANT *PostData, + BSTR Headers, [in, out] VARIANT_BOOL *Cancel); [id(DISPID_NAVIGATECOMPLETE)] @@ -156,10 +159,10 @@ dispinterface DWebBrowserEvents [id(DISPID_FRAMEBEFORENAVIGATE)] void FrameBeforeNavigate( [in] BSTR URL, - [in] long Flags, - [in] BSTR TargetFrameName, - [in] VARIANT *PostData, - [in] BSTR Headers, + long Flags, + BSTR TargetFrameName, + VARIANT *PostData, + BSTR Headers, [in, out]VARIANT_BOOL *Cancel); [id(DISPID_FRAMENAVIGATECOMPLETE)] @@ -206,14 +209,16 @@ enum CommandStateChangeConstants { [ object, oleautomation, - uuid(0002df05-0000-0000-c000-000000000046) + uuid(0002df05-0000-0000-c000-000000000046), + hidden, + dual ] interface IWebBrowserApp : IWebBrowser { [id(300)] HRESULT Quit(); [id(301)] HRESULT ClientToWindow([in,out] int* pcx, [in,out] int* pcy); - [id(302)] HRESULT PutProperty([in] BSTR szProperty, [in] VARIANT vtValue); - [id(303)] HRESULT GetProperty([in] BSTR szProperty, [out, retval] VARIANT *pvtValue); + [id(302)] HRESULT PutProperty([in] BSTR Property, [in] VARIANT vtValue); + [id(303)] HRESULT GetProperty([in] BSTR Property, [out, retval] VARIANT *pvtValue); [id(0), propget] HRESULT Name([out, retval] BSTR* Name); [id(DISPID_HWND), propget] HRESULT HWND([out, retval] long *pHWND); [id(400), propget] HRESULT FullName([out, retval] BSTR* FullName); @@ -226,9 +231,9 @@ interface IWebBrowserApp : IWebBrowser [id(404), propput] HRESULT StatusText([in] BSTR StatusText); [id(405), propget] HRESULT ToolBar([out, retval] int * Value); [id(405), propput] HRESULT ToolBar([in] int Value); - [id(406), propget] HRESULT MenuBar([out, retval] VARIANT_BOOL * Value); + [id(406), propget] HRESULT MenuBar([out, retval] VARIANT_BOOL *Value); [id(406), propput] HRESULT MenuBar([in] VARIANT_BOOL Value); - [id(407), propget] HRESULT FullScreen([out, retval] VARIANT_BOOL * pbFullScreen); + [id(407), propget] HRESULT FullScreen([out, retval] VARIANT_BOOL *pbFullScreen); [id(407), propput] HRESULT FullScreen([in] VARIANT_BOOL bFullScreen); } @@ -238,7 +243,9 @@ interface IWebBrowserApp : IWebBrowser [ object, oleautomation, - uuid(d30c1661-cdaf-11d0-8a3e-00c04fc9e26e) + uuid(d30c1661-cdaf-11d0-8a3e-00c04fc9e26e), + hidden, + dual ] interface IWebBrowser2 : IWebBrowserApp { @@ -264,7 +271,9 @@ interface IWebBrowser2 : IWebBrowserApp [in, optional] VARIANT *pvarShow, [in, optional] VARIANT *pvarSize); - [id(DISPID_READYSTATE), propget] HRESULT ReadyState([out, retval] READYSTATE *plReadyState); + [id(DISPID_READYSTATE), propget, bindable] + HRESULT ReadyState([out, retval] READYSTATE *plReadyState); + [id(550), propget] HRESULT Offline([out, retval] VARIANT_BOOL *pbOffline); [id(550), propput] HRESULT Offline([in] VARIANT_BOOL bOffline); [id(551), propget] HRESULT Silent([out, retval] VARIANT_BOOL *pbSilent); @@ -299,7 +308,8 @@ enum SecureLockIconConstants { * DWebBrowserEvents2 dispinterface */ [ - uuid(34a715a0-6587-11d0-924a-0020afc7ac4d) + uuid(34a715a0-6587-11d0-924a-0020afc7ac4d), + hidden ] dispinterface DWebBrowserEvents2 { @@ -321,7 +331,7 @@ dispinterface DWebBrowserEvents2 void DownloadComplete(); [id(DISPID_TITLECHANGE)] - void TitleChange([in] BSTR szProperty); + void TitleChange([in] BSTR Text); [id(DISPID_PROPERTYCHANGE)] void PropertyChange([in] BSTR szProperty); @@ -434,7 +444,8 @@ coclass WebBrowser_V1 } [ - uuid(8856f961-340a-11d0-a96b-00c04fd705a2) + uuid(8856f961-340a-11d0-a96b-00c04fd705a2), + control ] coclass WebBrowser { @@ -504,25 +515,45 @@ dispinterface DShellWindowsEvents { [ object, oleautomation, - uuid(85cb6900-4d95-11cf-960c-0080c7f4ee85) + uuid(85cb6900-4d95-11cf-960c-0080c7f4ee85), + dual ] interface IShellWindows : IDispatch { - [propget] HRESULT Count( [out] long *Count ); - [id(0)] HRESULT Item( [in] VARIANT index, [out] IDispatch **Folder ); - [id(-4)] HRESULT _NewEnum( [out] IUnknown **ppunk ); - [hidden] HRESULT Register( [in] IDispatch *pid, [in] long hWnd, [in] int swClass, - [out] long *plCookie ); - [hidden] HRESULT RegisterPending( [in] long lThread, [in] VARIANT *pvarloc, - [in] VARIANT *varlocRoot, [in] int swClass, [out] long *plCookie ); - [hidden] HRESULT Revoke( [in] long Cookie ); - [hidden] HRESULT OnNavigate( [in] long Cookie, [out] VARIANT *pvarLoc ); - [hidden] HRESULT OnActivated( [in] long Cookie, [in] VARIANT fActive ); - [hidden] HRESULT FindWindowSW( [in] VARIANT *pvarLoc, [in] VARIANT *pvarLocRoot, - [in] int swClass, [out] long *phwnd, int swfwOptions, - IDispatch **ppdispOut ); - [hidden] HRESULT OnCreated( [in] long lCookie, [in] IUnknown *punk ); - [hidden] HRESULT ProcessAttachDetach( [in] VARIANT_BOOL fAttach ); + [propget] HRESULT Count([out, retval] long *Count); + + [id(0)] HRESULT Item( + [in, optional] VARIANT index, + [out, retval] IDispatch **Folder); + + [id(-4)] HRESULT _NewEnum([out, retval] IUnknown **ppunk); + + [hidden] HRESULT Register( + [in] IDispatch *pid, + [in] long hWnd, + [in] int swClass, + [out] long *plCookie); + + [hidden] HRESULT RegisterPending( + [in] long lThreadId, + [in] VARIANT *pvarloc, + [in] VARIANT *pvarlocRoot, + [in] int swClass, + [out] long *plCookie); + + [hidden] HRESULT Revoke([in] long lCookie); + [hidden] HRESULT OnNavigate([in] long lCookie, [in] VARIANT *pvarLoc); + [hidden] HRESULT OnActivated([in] long lCookie, [in] VARIANT_BOOL fActive); + [hidden] HRESULT FindWindowSW( + [in] VARIANT *pvarLoc, + [in] VARIANT *pvarLocRoot, + [in] int swClass, + [out] long *phwnd, + [in] int swfwOptions, + [out, retval] IDispatch **ppdispOut); + + [hidden] HRESULT OnCreated([in] long lCookie, [in] IUnknown *punk); + [hidden] HRESULT ProcessAttachDetach([in] VARIANT_BOOL fAttach); } [

1 0

Jacek Caban : exdisp.idl: Added missing declarations.
by Alexandre Julliard April 11, 2006

April 11, 2006

Module: wine Branch: refs/heads/master Commit: 5e99bd94f1a7251d68367d880e4e292d9f1b2cea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5e99bd94f1a7251d68367d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 11 00:04:39 2006 +0200 exdisp.idl: Added missing declarations. --- include/exdisp.idl | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 406 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5e99bd94f1a7251d683…

1 0

Alexandre Julliard : server: Moved the tkill function to ptrace.c.
by Alexandre Julliard April 11, 2006

April 11, 2006

Module: wine Branch: refs/heads/master Commit: 7dbd1f01f219787dce827c5cf7f8f5dc4d741987 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7dbd1f01f219787dce827c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 21:07:21 2006 +0200 server: Moved the tkill function to ptrace.c. --- server/context_alpha.c | 8 -------- server/context_i386.c | 28 ---------------------------- server/context_powerpc.c | 8 -------- server/context_sparc.c | 8 -------- server/context_x86_64.c | 16 ---------------- server/ptrace.c | 31 +++++++++++++++++++++++++++++++ server/thread.h | 1 - 7 files changed, 31 insertions(+), 69 deletions(-) diff --git a/server/context_alpha.c b/server/context_alpha.c index 118bff7..979e52d 100644 --- a/server/context_alpha.c +++ b/server/context_alpha.c @@ -334,14 +334,6 @@ void *get_thread_ip( struct thread *thre return (void *)context.Fir; } -/* send a signal to a specific thread */ -int tkill( int tgid, int pid, int sig ) -{ - /* FIXME: should do something here */ - errno = ENOSYS; - return -1; -} - /* retrieve the thread context */ void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int flags ) { diff --git a/server/context_i386.c b/server/context_i386.c index 7285905..b8efb9e 100644 --- a/server/context_i386.c +++ b/server/context_i386.c @@ -550,34 +550,6 @@ void *get_thread_ip( struct thread *thre return (void *)context.Eip; } -/* send a signal to a specific thread */ -int tkill( int tgid, int pid, int sig ) -{ -#ifdef __linux__ - int ret; - - __asm__( "pushl %%ebx\n\t" - "movl %2,%%ebx\n\t" - "int $0x80\n\t" - "popl %%ebx\n\t" - : "=a" (ret) - : "0" (270) /*SYS_tgkill*/, "r" (tgid), "c" (pid), "d" (sig) ); - if (ret == -ENOSYS) - __asm__( "pushl %%ebx\n\t" - "movl %2,%%ebx\n\t" - "int $0x80\n\t" - "popl %%ebx\n\t" - : "=a" (ret) - : "0" (238) /*SYS_tkill*/, "r" (pid), "c" (sig) ); - if (ret >= 0) return ret; - errno = -ret; - return -1; -#else - errno = ENOSYS; - return -1; -#endif -} - /* retrieve the thread context */ void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int flags ) { diff --git a/server/context_powerpc.c b/server/context_powerpc.c index 8cf1424..517bc4e 100644 --- a/server/context_powerpc.c +++ b/server/context_powerpc.c @@ -273,14 +273,6 @@ void *get_thread_ip( struct thread *thre return (void *)context.Iar; } -/* send a signal to a specific thread */ -int tkill( int tgid, int pid, int sig ) -{ - /* FIXME: should do something here */ - errno = ENOSYS; - return -1; -} - /* retrieve the thread context */ void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int flags ) { diff --git a/server/context_sparc.c b/server/context_sparc.c index 805fd7e..843eb11 100644 --- a/server/context_sparc.c +++ b/server/context_sparc.c @@ -172,14 +172,6 @@ void *get_thread_ip( struct thread *thre return (void *)context.pc; } -/* send a signal to a specific thread */ -int tkill( int tgid, int pid, int sig ) -{ - /* FIXME: should do something here */ - errno = ENOSYS; - return -1; -} - /* retrieve the thread context */ void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int flags ) { diff --git a/server/context_x86_64.c b/server/context_x86_64.c index ee9665e..a4ec07c 100644 --- a/server/context_x86_64.c +++ b/server/context_x86_64.c @@ -261,22 +261,6 @@ void *get_thread_ip( struct thread *thre return (void *)context.Rip; } -/* send a signal to a specific thread */ -int tkill( int tgid, int pid, int sig ) -{ -#ifdef __linux__ - int ret; - __asm__( "syscall" : "=a" (ret) - : "0" (200) /*SYS_tkill*/, "D" (pid), "S" (sig) ); - if (ret >= 0) return ret; - errno = -ret; - return -1; -#else - errno = ENOSYS; - return -1; -#endif -} - /* retrieve the thread context */ void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int flags ) { diff --git a/server/ptrace.c b/server/ptrace.c index 817b0ec..9f8441f 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -173,6 +173,37 @@ int get_ptrace_pid( struct thread *threa return thread->unix_pid; } +/* send a signal to a specific thread */ +static inline int tkill( int tgid, int pid, int sig ) +{ + int ret = -ENOSYS; + +#ifdef __linux__ +# ifdef __i386__ + __asm__( "pushl %%ebx\n\t" + "movl %2,%%ebx\n\t" + "int $0x80\n\t" + "popl %%ebx\n\t" + : "=a" (ret) + : "0" (270) /*SYS_tgkill*/, "r" (tgid), "c" (pid), "d" (sig) ); + if (ret == -ENOSYS) + __asm__( "pushl %%ebx\n\t" + "movl %2,%%ebx\n\t" + "int $0x80\n\t" + "popl %%ebx\n\t" + : "=a" (ret) + : "0" (238) /*SYS_tkill*/, "r" (pid), "c" (sig) ); +# elif defined(__x86_64__) + __asm__( "syscall" : "=a" (ret) + : "0" (200) /*SYS_tkill*/, "D" (pid), "S" (sig) ); +# endif +#endif /* __linux__ */ + + if (ret >= 0) return ret; + errno = -ret; + return -1; +} + /* send a Unix signal to a specific thread */ int send_thread_signal( struct thread *thread, int sig ) { diff --git a/server/thread.h b/server/thread.h index 6b4818c..8c5c0f7 100644 --- a/server/thread.h +++ b/server/thread.h @@ -126,7 +126,6 @@ extern void resume_after_ptrace( struct extern void *get_thread_ip( struct thread *thread ); extern void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int flags ); extern void set_thread_context( struct thread *thread, const CONTEXT *context, unsigned int flags ); -extern int tkill( int tgid, int pid, int sig ); extern int send_thread_signal( struct thread *thread, int sig ); extern void get_selector_entry( struct thread *thread, int entry, unsigned int *base, unsigned int *limit, unsigned char *flags );

1 0