September 2009 - Wine-Commits

Detlef Riekenberg : localspl: Implement fpConfigurePort.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 5ec8387d8f3a01ae5f0a0ab512c52c26b24ac517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec8387d8f3a01ae5f0a0ab51… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Sep 28 12:44:28 2009 +0200 localspl: Implement fpConfigurePort. --- dlls/localspl/provider.c | 114 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 112 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 79541db..f3ddb86 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -103,6 +103,7 @@ static const WCHAR default_devmodeW[] = {'D','e','f','a','u','l','t',' ','D','e' static const WCHAR dependent_filesW[] = {'D','e','p','e','n','d','e','n','t',' ','F','i','l','e','s',0}; static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR driverW[] = {'D','r','i','v','e','r',0}; +static const WCHAR emptyW[] = {0}; static const WCHAR fmt_driversW[] = { 'S','y','s','t','e','m','\\', 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'c','o','n','t','r','o','l','\\', @@ -557,6 +558,47 @@ static DWORD monitor_loadall(void) } /****************************************************************** + * monitor_loadui [internal] + * + * load the userinterface-dll for a given portmonitor + * + * On failure, NULL is returned + */ +static monitor_t * monitor_loadui(monitor_t * pm) +{ + monitor_t * pui = NULL; + LPWSTR buffer[MAX_PATH]; + HANDLE hXcv; + DWORD len; + DWORD res; + + if (pm == NULL) return NULL; + TRACE("(%p) => dllname: %s\n", pm, debugstr_w(pm->dllname)); + + /* Try the Portmonitor first; works for many monitors */ + if (pm->monitorUI) { + EnterCriticalSection(&monitor_handles_cs); + pm->refcount++; + LeaveCriticalSection(&monitor_handles_cs); + return pm; + } + + /* query the userinterface-dllname from the Portmonitor */ + if ((pm->monitor) && (pm->monitor->pfnXcvDataPort)) { + /* building (",XcvMonitor %s",pm->name) not needed yet */ + res = pm->monitor->pfnXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + TRACE("got %u with %p\n", res, hXcv); + if (res) { + res = pm->monitor->pfnXcvDataPort(hXcv, monitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); + TRACE("got %u with %s\n", res, debugstr_w((LPWSTR) buffer)); + if (res == ERROR_SUCCESS) pui = monitor_load(NULL, (LPWSTR) buffer); + pm->monitor->pfnXcvClosePort(hXcv); + } + } + return pui; +} + +/****************************************************************** * monitor_load_by_port [internal] * * load a printmonitor for a given port @@ -1152,7 +1194,6 @@ end: */ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCopyFlags, BOOL lazy) { - static const WCHAR emptyW[1]; const printenv_t *env; apd_data_t apd; DRIVER_INFO_8W di; @@ -1476,6 +1517,75 @@ static BOOL WINAPI fpClosePrinter(HANDLE hPrinter) return FALSE; } +/****************************************************************************** + * fpConfigurePort [exported through PRINTPROVIDOR] + * + * Display the Configuration-Dialog for a specific Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box + * pPortName [I] Name of the Port, that should be configured + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) +{ + monitor_t * pm; + monitor_t * pui; + LONG lres; + DWORD res; + + TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); + + lres = copy_servername_from_name(pName, NULL); + if (lres) { + FIXME("server %s not supported\n", debugstr_w(pName)); + SetLastError(ERROR_INVALID_NAME); + return FALSE; + } + + /* an empty Portname is Invalid, but can popup a Dialog */ + if (!pPortName[0]) { + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; + } + + pm = monitor_load_by_port(pPortName); + if (pm && pm->monitor && pm->monitor->pfnConfigurePort) { + TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), + debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); + res = pm->monitor->pfnConfigurePort(pName, hWnd, pPortName); + TRACE("got %d with %u\n", res, GetLastError()); + } + else + { + pui = monitor_loadui(pm); + if (pui && pui->monitorUI && pui->monitorUI->pfnConfigurePortUI) { + TRACE("use %s for %s (monitorui %p: %s)\n", debugstr_w(pui->name), + debugstr_w(pPortName), pui, debugstr_w(pui->dllname)); + res = pui->monitorUI->pfnConfigurePortUI(pName, hWnd, pPortName); + TRACE("got %d with %u\n", res, GetLastError()); + } + else + { + FIXME("not implemented for %s (monitor %p: %s / monitorui %p: %s)\n", + debugstr_w(pPortName), pm, debugstr_w(pm ? pm->dllname : NULL), + pui, debugstr_w(pui ? pui->dllname : NULL)); + + SetLastError(ERROR_NOT_SUPPORTED); + res = FALSE; + } + monitor_unload(pui); + } + monitor_unload(pm); + + TRACE("returning %d with %u\n", res, GetLastError()); + return res; +} /****************************************************************** * fpDeleteMonitor [exported through PRINTPROVIDOR] @@ -1837,7 +1947,7 @@ void setup_provider(void) fpEnumMonitors, fpEnumPorts, NULL, /* fpAddPort */ - NULL, /* fpConfigurePort */ + fpConfigurePort, NULL, /* fpDeletePort */ NULL, /* fpCreatePrinterIC */ NULL, /* fpPlayGdiScriptOnPrinterIC */

1 0

Jacek Caban : urlmon.idl: Added IInternetHostSecurityManager and CONFIRMSAFETY declarations.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 2ed82514d4c64b1880f1668b113c4810a582853e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed82514d4c64b1880f1668b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 28 14:36:37 2009 +0200 urlmon.idl: Added IInternetHostSecurityManager and CONFIRMSAFETY declarations. --- include/urlmon.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 3c6576b..78afd16 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1065,6 +1065,42 @@ cpp_quote("#define MAX_SIZE_SECURITY_ID 512") [in] DWORD dwFlags); } +/***************************************************************************** + * IInternetHostSecurityManager interface + */ +cpp_quote("#define SID_SInternetHostSecurityManager IID_IInternetHostSecurityManager") + +[ + local, + object, + uuid(3af280b6-cb3f-11d0-891e-00c04fb6bfc4), + pointer_default(unique) +] +interface IInternetHostSecurityManager : IUnknown +{ + HRESULT GetSecurityId( + [out, size_is(*pcbSecurityId)] BYTE *pbSecurityId, + [in, out] DWORD *pcbSecurityId, + [in] DWORD_PTR dwReserved); + + HRESULT ProcessUrlAction( + [in] DWORD dwAction, + [out, size_is(cbPolicy)] BYTE *pPolicy, + [in] DWORD cbPolicy, + [in] BYTE *pContext, + [in] DWORD cbContext, + [in] DWORD dwFlags, + [in] DWORD dwReserved); + + HRESULT QueryCustomPolicy( + [in] REFGUID guidKey, + [out, size_is(,*pcbPolicy)] BYTE **ppPolicy, + [out] DWORD *pcbPolicy, + [in] BYTE *pContext, + [in] DWORD cbContext, + [in] DWORD dwReserved); +} + cpp_quote("#define URLACTION_MIN 0x00001000") cpp_quote("#define URLACTION_DOWNLOAD_MIN 0x00001000") cpp_quote("#define URLACTION_DOWNLOAD_SIGNED_ACTIVEX 0x00001001") @@ -1643,6 +1679,17 @@ interface IInternetProtocolEx : IInternetProtocol [in] HANDLE *dwReserved); } +cpp_quote("#define CONFIRMSAFETYACTION_LOADOBJECT 0x00000001") + +struct CONFIRMSAFETY +{ + CLSID clsid; + IUnknown *pUnk; + DWORD dwFlags; +}; + +cpp_quote("EXTERN_C const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY;") + cpp_quote("DEFINE_GUID(CLSID_InternetSecurityManager, 0x7b8a2d94, 0x0ac9, 0x11d1, 0x89, 0x6c, 0x00, 0xc0, 0x4f, 0xB6, 0xbf, 0xc4);") cpp_quote("DEFINE_GUID(CLSID_InternetZoneManager, 0x7B8A2D95, 0x0AC9, 0x11D1, 0x89, 0x6C, 0x00, 0xC0, 0x4F, 0xB6, 0xBF, 0xC4);") cpp_quote("DEFINE_GUID(IID_IAsyncMoniker, 0x79EAC9D3, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);")

1 0

Ge van Geldorp : setupapi/tests: Add acceptable error code for Win7.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 5448bf3e369421d2749f4b84eee63561111e64ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5448bf3e369421d2749f4b84e… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 28 12:41:09 2009 +0200 setupapi/tests: Add acceptable error code for Win7. --- dlls/setupapi/tests/misc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 4b8bd03..848f64c 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -198,13 +198,13 @@ static void test_SetupCopyOEMInf(void) SetLastError(0xdeadbeef); res = pSetupCopyOEMInfA(tmpfile, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); - if (GetLastError() == ERROR_WRONG_INF_TYPE) + if (GetLastError() == ERROR_WRONG_INF_TYPE || GetLastError() == ERROR_UNSUPPORTED_TYPE /* Win7 */) { /* FIXME: * Vista needs a [Manufacturer] entry in the inf file. Doing this will give some * popups during the installation though as it also needs a catalog file (signed?). */ - win_skip("Needs a different inf file on Vista/W2K8\n"); + win_skip("Needs a different inf file on Vista+\n"); DeleteFile(tmpfile); return; }

1 0

André Hentschel : widl: Add ARM support.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 1d0365da957e0521292319351f919828c9a0b4f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0365da957e0521292319351… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 25 16:10:50 2009 +0200 widl: Add ARM support. --- tools/widl/widl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 60322d3..c1c3832 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -252,7 +252,8 @@ static void set_target( const char *target ) { "x86_64", SYS_WIN64 }, { "sparc", SYS_WIN32 }, { "alpha", SYS_WIN32 }, - { "powerpc", SYS_WIN32 } + { "powerpc", SYS_WIN32 }, + { "arm", SYS_WIN32 } }; unsigned int i;

1 0

Alexandre Julliard : libwine: Don' t export wine_ldt_copy for the Windows build.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: f93c9d9b13530c579f4b89d17859154a625372c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93c9d9b13530c579f4b89d17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 14:55:52 2009 +0200 libwine: Don't export wine_ldt_copy for the Windows build. --- include/wine/library.h | 13 +------------ libs/wine/ldt.c | 1 - libs/wine/wine.def | 1 - 3 files changed, 1 insertions(+), 14 deletions(-) diff --git a/include/wine/library.h b/include/wine/library.h index 474cfb2..9ff1910 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -102,19 +102,8 @@ static inline void wine_ldt_init_fs( unsigned short sel, const LDT_ENTRY *entry static inline void wine_ldt_free_fs( unsigned short sel ) { } #endif /* __i386__ */ - /* the local copy of the LDT */ -#ifdef __CYGWIN__ -# ifdef WINE_EXPORT_LDT_COPY -# define WINE_LDT_EXTERN __declspec(dllexport) -# else -# define WINE_LDT_EXTERN __declspec(dllimport) -# endif -#else -# define WINE_LDT_EXTERN extern -#endif - -WINE_LDT_EXTERN struct __wine_ldt_copy +extern struct __wine_ldt_copy { void *base[8192]; /* base address or 0 if entry is free */ unsigned long limit[8192]; /* limit in bytes or 0 if entry is free */ diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 80ceba8..7475d51 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -31,7 +31,6 @@ #include "windef.h" #include "winbase.h" -#define WINE_EXPORT_LDT_COPY #include "wine/library.h" #ifdef __i386__ diff --git a/libs/wine/wine.def b/libs/wine/wine.def index a99c170..b94397a 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -87,7 +87,6 @@ EXPORTS wine_init_argv0_path wine_is_dbcs_leadbyte wine_ldt_alloc_entries - wine_ldt_copy wine_ldt_free_entries wine_ldt_get_entry wine_ldt_get_ptr

1 0

Dylan Smith : secur32: Free schannel handle table.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: fd3c8335fd91e9a1952eabf4abd1cf8b5631dfd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3c8335fd91e9a1952eabf4a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Sep 28 03:48:38 2009 -0400 secur32: Free schannel handle table. The table is initialized on process attach, and should be freed on process detach (which is where SECUR32_deinitSchannelSP gets called). --- dlls/secur32/schannel.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 3912fbd..f776206 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1413,8 +1413,33 @@ fail: void SECUR32_deinitSchannelSP(void) { + int i = schan_handle_table_size; + if (!libgnutls_handle) return; + /* deinitialized sessions first because a pointer to the credentials + * are stored for the session by calling gnutls_credentials_set. */ + while (--i) + { + if (schan_handle_table[i].type == SCHAN_HANDLE_CTX) + { + struct schan_context *ctx = schan_free_handle(i, SCHAN_HANDLE_CTX); + pgnutls_deinit(ctx->session); + HeapFree(GetProcessHeap(), 0, ctx); + } + } + i = schan_handle_table_size; + while (--i) + { + if (schan_handle_table[i].type != SCHAN_HANDLE_FREE) + { + struct schan_credentials *cred; + cred = schan_free_handle(i, SCHAN_HANDLE_CRED); + pgnutls_certificate_free_credentials(cred->credentials); + HeapFree(GetProcessHeap(), 0, cred); + } + } + HeapFree(GetProcessHeap(), 0, schan_handle_table); pgnutls_global_deinit(); wine_dlclose(libgnutls_handle, NULL, 0); }

1 0

Dylan Smith : richedit: Use ITextHost interface in ME_LinkNotify.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 0342ab0df1a0110ff751ca77cc589b2e924a805e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0342ab0df1a0110ff751ca77c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Sep 28 03:44:19 2009 -0400 richedit: Use ITextHost interface in ME_LinkNotify. Using the ITextHost interface allows this notification to be received for windowless richedit controls. Windowed richedit conrols have an ITextHost implementation that will fill in hwndFrom and idFrom, but these should probably be initialized to 0 for windowless richedit controls. --- dlls/riched20/caret.c | 2 ++ dlls/riched20/editor.c | 6 +++--- dlls/riched20/wrap.c | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index fdcb924..500b6c7 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1537,6 +1537,8 @@ void ME_SendSelChange(ME_TextEditor *editor) if (!(editor->nEventMask & ENM_SELCHANGE)) return; + sc.nmhdr.hwndFrom = NULL; + sc.nmhdr.idFrom = 0; sc.nmhdr.code = EN_SELCHANGE; ME_GetSelectionOfs(editor, &sc.chrg.cpMin, &sc.chrg.cpMax); sc.seltyp = SEL_EMPTY; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 09e3de6..97e55ba 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2941,8 +2941,8 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM if (cursor.pRun->member.run.style->fmt.dwMask & CFM_LINK && cursor.pRun->member.run.style->fmt.dwEffects & CFE_LINK) { /* The clicked run has CFE_LINK set */ - info.nmhdr.hwndFrom = editor->hWnd; - info.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID); + info.nmhdr.hwndFrom = NULL; + info.nmhdr.idFrom = 0; info.nmhdr.code = EN_LINK; info.msg = msg; info.wParam = wParam; @@ -2950,7 +2950,7 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM cursor.nOffset = 0; info.chrg.cpMin = ME_GetCursorOfs(&cursor); info.chrg.cpMax = info.chrg.cpMin + cursor.pRun->member.run.strText->nLen; - SendMessageW(GetParent(editor->hWnd), WM_NOTIFY,info.nmhdr.idFrom, (LPARAM)&info); + ITextHost_TxNotify(editor->texthost, info.nmhdr.code, &info); } } diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 579f33a..00229b2 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -776,6 +776,8 @@ ME_SendRequestResize(ME_TextEditor *editor, BOOL force) { REQRESIZE info; + info.nmhdr.hwndFrom = NULL; + info.nmhdr.idFrom = 0; info.nmhdr.code = EN_REQUESTRESIZE; info.rc = rc; info.rc.right = editor->nTotalWidth;

1 0

Damjan Jovanovic : sti: Test behavior of creation with the A/ W functions versus STI_VERSION_FLAG_UNICODE.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: ee1dd49076c344d43f1fc50aa55e7d9053f36a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1dd49076c344d43f1fc50aa… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Sep 26 17:59:54 2009 +0200 sti: Test behavior of creation with the A/W functions versus STI_VERSION_FLAG_UNICODE. --- configure | 9 +++ configure.ac | 1 + dlls/sti/tests/Makefile.in | 15 ++++ dlls/sti/tests/sti.c | 154 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 179 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5372518..2c8e4e5 100755 --- a/configure +++ b/configure @@ -16610,6 +16610,14 @@ dlls/sti/Makefile: dlls/sti/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/sti/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/sti/tests/Makefile" +test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + sti/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/sti/tests/Makefile: dlls/sti/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/sti/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/storage.dll16/Makefile" test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ storage.dll16" @@ -19031,6 +19039,7 @@ do "dlls/stdole2.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stdole2.tlb/Makefile" ;; "dlls/stdole32.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stdole32.tlb/Makefile" ;; "dlls/sti/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sti/Makefile" ;; + "dlls/sti/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sti/tests/Makefile" ;; "dlls/storage.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/storage.dll16/Makefile" ;; "dlls/stress.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stress.dll16/Makefile" ;; "dlls/strmiids/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/strmiids/Makefile" ;; diff --git a/configure.ac b/configure.ac index faf891d..b773573 100644 --- a/configure.ac +++ b/configure.ac @@ -2437,6 +2437,7 @@ WINE_CONFIG_MAKEFILE([dlls/spoolss/tests/Makefile],[dlls/Maketest.rules],[dlls], WINE_CONFIG_MAKEFILE([dlls/stdole2.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/stdole32.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/sti/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/sti/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/storage.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/stress.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/strmiids/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) diff --git a/dlls/sti/tests/Makefile.in b/dlls/sti/tests/Makefile.in new file mode 100644 index 0000000..b2587d4 --- /dev/null +++ b/dlls/sti/tests/Makefile.in @@ -0,0 +1,15 @@ +EXTRADEFS = -DCOM_NO_WINDOWS_H +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = sti.dll +IMPORTS = ole32 kernel32 +EXTRALIBS = -luuid + +CTESTS = \ + sti.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c new file mode 100644 index 0000000..524ff9c --- /dev/null +++ b/dlls/sti/tests/sti.c @@ -0,0 +1,154 @@ +/* + * General still image implementation + * + * Copyright 2009 Damjan Jovanovic + * + * 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 + */ + +#include <stdarg.h> +#include <assert.h> +#include "windef.h" +#include "winbase.h" +#define COBJMACROS +#include <initguid.h> +#include <sti.h> +#include <guiddef.h> +#include <devguid.h> +#include <stdio.h> + +#include "wine/test.h" + +static HMODULE sti_dll; +static HRESULT (WINAPI *pStiCreateInstance)(HINSTANCE,DWORD,PSTIW*,LPUNKNOWN); +static HRESULT (WINAPI *pStiCreateInstanceA)(HINSTANCE,DWORD,PSTIA*,LPUNKNOWN); +static HRESULT (WINAPI *pStiCreateInstanceW)(HINSTANCE,DWORD,PSTIW*,LPUNKNOWN); + +static BOOL init_function_pointers(void) +{ + sti_dll = LoadLibrary("sti.dll"); + if (sti_dll) + { + pStiCreateInstance = (void*) + GetProcAddress(sti_dll, "StiCreateInstance"); + pStiCreateInstanceA = (void*) + GetProcAddress(sti_dll, "StiCreateInstanceA"); + pStiCreateInstanceW = (void*) + GetProcAddress(sti_dll, "StiCreateInstanceW"); + return TRUE; + } + return FALSE; +} + +void test_version_flag_versus_aw(void) +{ + HRESULT hr; + + /* Who wins, the STI_VERSION_FLAG_UNICODE or the A/W function? And what about the neutral StiCreateInstance function? */ + + if (pStiCreateInstance) + { + PSTIW pStiW; + hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, NULL); + if (SUCCEEDED(hr)) + { + IUnknown *pUnknown; + hr = IUnknown_QueryInterface((IUnknown*)pStiW, &IID_IStillImageW, (void**)&pUnknown); + if (SUCCEEDED(hr)) + { + ok(pUnknown == (IUnknown*)pStiW, "created interface was not IID_IStillImageW\n"); + IUnknown_Release(pUnknown); + } + IUnknown_Release((IUnknown*)pStiW); + } + else + todo_wine ok(0, "could not create StillImageA, hr = 0x%X\n", hr); + hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); + if (SUCCEEDED(hr)) + { + IUnknown *pUnknown; + hr = IUnknown_QueryInterface((IUnknown*)pStiW, &IID_IStillImageW, (void**)&pUnknown); + if (SUCCEEDED(hr)) + { + ok(pUnknown == (IUnknown*)pStiW, "created interface was not IID_IStillImageW\n"); + IUnknown_Release(pUnknown); + } + IUnknown_Release((IUnknown*)pStiW); + } + else + todo_wine ok(0, "could not create StillImageW, hr = 0x%X\n", hr); + } + else + skip("No StiCreateInstance function\n"); + + if (pStiCreateInstanceA) + { + PSTIA pStiA; + hr = pStiCreateInstanceA(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiA, NULL); + if (SUCCEEDED(hr)) + { + IUnknown *pUnknown; + hr = IUnknown_QueryInterface((IUnknown*)pStiA, &IID_IStillImageA, (void**)&pUnknown); + if (SUCCEEDED(hr)) + { + ok(pUnknown == (IUnknown*)pStiA, "created interface was not IID_IStillImageA\n"); + IUnknown_Release(pUnknown); + } + IUnknown_Release((IUnknown*)pStiA); + } + else + todo_wine ok(0, "could not create StillImageA, hr = 0x%X\n", hr); + } + else + skip("No StiCreateInstanceA function\n"); + + if (pStiCreateInstanceW) + { + PSTIW pStiW; + hr = pStiCreateInstanceW(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, NULL); + if (SUCCEEDED(hr)) + { + IUnknown *pUnknown; + hr = IUnknown_QueryInterface((IUnknown*)pStiW, &IID_IStillImageW, (void**)&pUnknown); + if (SUCCEEDED(hr)) + { + ok(pUnknown == (IUnknown*)pStiW, "created interface was not IID_IStillImageW\n"); + IUnknown_Release((IUnknown*)pUnknown); + } + IUnknown_Release((IUnknown*)pStiW); + } + else + todo_wine ok(0, "could not create StillImageW, hr = 0x%X\n", hr); + } + else + skip("No StiCreateInstanceW function\n"); +} + +START_TEST(sti) +{ + if (SUCCEEDED(CoInitialize(NULL))) + { + if (init_function_pointers()) + { + test_version_flag_versus_aw(); + FreeLibrary(sti_dll); + } + else + skip("could not load sti.dll\n"); + CoUninitialize(); + } + else + skip("CoInitialize failed\n"); +}

1 0

Marcus Meissner : jscript: Initialize val_str (Coverity).
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: bc4633a25bc5140455a19d4698cf67819fb9bf24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4633a25bc5140455a19d469… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Sep 28 09:18:49 2009 +0200 jscript: Initialize val_str (Coverity). --- dlls/jscript/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 4bb8091..55b6b85 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -200,7 +200,7 @@ static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, WORD StringInstance *string; const WCHAR *str; DWORD length; - BSTR attr_value, val_str; + BSTR attr_value, val_str = NULL; HRESULT hres; if(!(string = string_this(jsthis))) {

1 0

Nikolay Sivov : comctl32/monthcal: Add parameter validation to MCM_HITTEST handler.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 69080d6d29a6b14bad3ea3be7e12226e43f7cf5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=69080d6d29a6b14bad3ea3be7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 23:26:53 2009 +0400 comctl32/monthcal: Add parameter validation to MCM_HITTEST handler. --- dlls/comctl32/monthcal.c | 4 ++++ dlls/comctl32/tests/monthcal.c | 17 +++++++++++++++-- include/commctrl.h | 7 +++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 1389622..603e3e8 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1141,6 +1141,7 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) DWORD retval; int day,wday,wnum; + if(!lpht || lpht->cbSize < MCHITTESTINFO_V1_SIZE) return -1; x = lpht->pt.x; y = lpht->pt.y; @@ -1417,6 +1418,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); } + ht.cbSize = sizeof(MCHITTESTINFO); ht.pt.x = (short)LOWORD(lParam); ht.pt.y = (short)HIWORD(lParam); TRACE("(%d, %d)\n", ht.pt.x, ht.pt.y); @@ -1550,6 +1552,7 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) redraw = TRUE; } + ht.cbSize = sizeof(MCHITTESTINFO); ht.pt.x = (short)LOWORD(lParam); ht.pt.y = (short)HIWORD(lParam); hit = MONTHCAL_HitTest(infoPtr, &ht); @@ -1628,6 +1631,7 @@ MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, LPARAM lParam) if(!(infoPtr->status & MC_SEL_LBUTDOWN)) return 0; + ht.cbSize = sizeof(MCHITTESTINFO); ht.pt.x = (short)LOWORD(lParam); ht.pt.y = (short)HIWORD(lParam); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 109d8a8..8561b8c 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -867,6 +867,19 @@ static void test_monthcal_hittest(void) hwnd = create_monthcal_control(0); + /* test with invalid structure size */ + mchit.cbSize = MCHITTESTINFO_V1_SIZE - 1; + mchit.pt.x = 0; + mchit.pt.y = 0; + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); + expect(0, mchit.pt.x); + expect(0, mchit.pt.y); + expect(-1, res); + expect(0, mchit.uHit); + /* test with invalid pointer */ + res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)NULL); + expect(-1, res); + flush_sequences(sequences, NUM_MSG_SEQUENCES); st.wYear = 2007; @@ -882,7 +895,7 @@ static void test_monthcal_hittest(void) expect(1,res); /* (0, 0) is the top left of the control and should not be active */ - mchit.cbSize = sizeof(MCHITTESTINFO); + mchit.cbSize = MCHITTESTINFO_V1_SIZE; mchit.pt.x = 0; mchit.pt.y = 0; res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); @@ -1051,7 +1064,7 @@ static void test_monthcal_todaylink(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); /* (70, 370) is in active area - today link */ - mchit.cbSize = sizeof(MCHITTESTINFO); + mchit.cbSize = MCHITTESTINFO_V1_SIZE; mchit.pt.x = 70; mchit.pt.y = 370; res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); diff --git a/include/commctrl.h b/include/commctrl.h index ae417c0..6a42e2e 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4702,8 +4702,15 @@ typedef struct { POINT pt; UINT uHit; SYSTEMTIME st; + /* Vista */ + RECT rc; + INT iOffset; + INT iRow; + INT iCol; } MCHITTESTINFO, *PMCHITTESTINFO; +#define MCHITTESTINFO_V1_SIZE CCSIZEOF_STRUCT(MCHITTESTINFO, st) + typedef struct tagNMSELCHANGE { NMHDR nmhdr;

1 0