wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Huw Davies : tools: Register dispex.dll.
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: bbfcf30f827f9eb4cd1962c3ecb2cef42e2fc4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfcf30f827f9eb4cd1962c3e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 25 19:01:37 2010 +0000 tools: Register dispex.dll. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 13cc076..e53a2f7 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2372,6 +2372,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,devenum.dll,1 11,,dinput.dll,1 11,,dinput8.dll,1 +11,,dispex.dll,1 11,,dmband.dll,1 11,,dmcompos.dll,1 11,,dmime.dll,1

1 0

Reece Dunn : comctl32/mru: In EnumMRUListA, ensure that the string is NULL terminated and the correct size is returned .
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: 78ce24d632c497aa4162952323c411cfddfc5207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ce24d632c497aa416295232… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Fri Feb 26 07:20:12 2010 +0000 comctl32/mru: In EnumMRUListA, ensure that the string is NULL terminated and the correct size is returned. --- dlls/comctl32/comctl32undoc.c | 4 +++- dlls/comctl32/tests/mru.c | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index ee684c6..ff94051 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -885,9 +885,11 @@ INT WINAPI EnumMRUListA (HANDLE hList, INT nItemPos, LPVOID lpBuffer, } else { lenA = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)&witem->datastart, -1, NULL, 0, NULL, NULL); - datasize = min( witem->size, nBufferSize ); + datasize = min( lenA, nBufferSize ); WideCharToMultiByte(CP_ACP, 0, (LPWSTR)&witem->datastart, -1, lpBuffer, datasize, NULL, NULL); + ((char *)lpBuffer)[ datasize - 1 ] = '\0'; + datasize = lenA - 1; } TRACE("(%p, %d, %p, %d): returning len=%d\n", hList, nItemPos, lpBuffer, nBufferSize, datasize); diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index c4da87b..3eae9a9 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -385,7 +385,7 @@ static void test_MRUListA(void) /* check entry 0 */ buffer[0] = 0; iRet = pEnumMRUList(hMRU, 0, buffer, 255); - todo_wine ok(iRet == lstrlen(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[3]), iRet); + ok(iRet == lstrlen(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[3]), iRet); ok(strcmp(buffer, checks[3]) == 0, "EnumMRUList expected %s, got %s\n", checks[3], buffer); /* check entry 0 with a too small buffer */ @@ -394,21 +394,21 @@ static void test_MRUListA(void) buffer[2] = 'A'; /* unchanged */ buffer[3] = 0; /* unchanged */ iRet = pEnumMRUList(hMRU, 0, buffer, 2); - todo_wine ok(iRet == lstrlen(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[3]), iRet); - todo_wine ok(strcmp(buffer, "T") == 0, "EnumMRUList expected %s, got %s\n", "T", buffer); + ok(iRet == lstrlen(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[3]), iRet); + ok(strcmp(buffer, "T") == 0, "EnumMRUList expected %s, got %s\n", "T", buffer); /* make sure space after buffer has old values */ ok(buffer[2] == 'A', "EnumMRUList expected %02x, got %02x\n", 'A', buffer[2]); /* check entry 1 */ buffer[0] = 0; iRet = pEnumMRUList(hMRU, 1, buffer, 255); - todo_wine ok(iRet == lstrlen(checks[1]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[1]), iRet); + ok(iRet == lstrlen(checks[1]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[1]), iRet); ok(strcmp(buffer, checks[1]) == 0, "EnumMRUList expected %s, got %s\n", checks[1], buffer); /* check entry 2 */ buffer[0] = 0; iRet = pEnumMRUList(hMRU, 2, buffer, 255); - todo_wine ok(iRet == lstrlen(checks[2]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[2]), iRet); + ok(iRet == lstrlen(checks[2]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[2]), iRet); ok(strcmp(buffer, checks[2]) == 0, "EnumMRUList expected %s, got %s\n", checks[2], buffer); /* check out of bounds entry 3 */

1 0

Dylan Smith : wineconsole: Handle mouse wheel scrolling for user backend.
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: 3fbe40e2f9ca01a550c660af381030193ebfa67a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fbe40e2f9ca01a550c660af3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Feb 25 19:15:13 2010 -0500 wineconsole: Handle mouse wheel scrolling for user backend. The mouse wheel will scroll if the buffer height is greater than the console window's height in lines, otherwise console mouse input events are generated. --- programs/wineconsole/user.c | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 15626d4..2c69e25 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1197,9 +1197,6 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM case WM_RBUTTONDBLCLK: WCUSER_GenerateMouseInputRecord(data, WCUSER_GetCell(data, lParam), wParam, DOUBLE_CLICK); break; - case WM_MOUSEWHEEL: - WCUSER_GenerateMouseInputRecord(data, WCUSER_GetCell(data, lParam), wParam, MOUSE_WHEELED); - break; case WM_SETFOCUS: if (data->curcfg.cursor_visible) { @@ -1240,19 +1237,35 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM } } break; + case WM_MOUSEWHEEL: + if (data->curcfg.sb_height <= data->curcfg.win_height) + { + WCUSER_GenerateMouseInputRecord(data, WCUSER_GetCell(data, lParam), wParam, MOUSE_WHEELED); + break; + } + /* else fallthrough */ case WM_VSCROLL: { int pos = data->curcfg.win_pos.Y; - switch (LOWORD(wParam)) - { - case SB_PAGEUP: pos -= 8; break; - case SB_PAGEDOWN: pos += 8; break; - case SB_LINEUP: pos--; break; - case SB_LINEDOWN: pos++; break; - case SB_THUMBTRACK: pos = HIWORD(wParam); break; - default: break; - } + if (uMsg == WM_MOUSEWHEEL) + { + UINT scrollLines = 3; + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES, 0, &scrollLines, 0); + scrollLines *= -GET_WHEEL_DELTA_WPARAM(wParam) / WHEEL_DELTA; + pos += scrollLines; + } else { + switch (LOWORD(wParam)) + { + case SB_PAGEUP: pos -= 8; break; + case SB_PAGEDOWN: pos += 8; break; + case SB_LINEUP: pos--; break; + case SB_LINEDOWN: pos++; break; + case SB_THUMBTRACK: pos = HIWORD(wParam); break; + default: break; + } + } + if (pos < 0) pos = 0; if (pos > data->curcfg.sb_height - data->curcfg.win_height) pos = data->curcfg.sb_height - data->curcfg.win_height; @@ -1268,6 +1281,7 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM } } + break; case WM_SYSCOMMAND: switch (wParam) {

1 0

Detlef Riekenberg : wordpad: Update German print preview translation.
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: b6439286b67e8ec1991fb9cc9972e0198fba6693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6439286b67e8ec1991fb9cc9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Feb 25 23:02:41 2010 +0100 wordpad: Update German print preview translation. --- programs/wordpad/De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 3ca040c..ca11edd 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -247,8 +247,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Ver&größern" STRING_PREVIEW_ZOOMOUT, "Ver&kleinern" STRING_PREVIEW_CLOSE, "&Schließen" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" + STRING_PREVIEW_PAGE, "Seite" + STRING_PREVIEW_PAGES, "Seiten" END STRINGTABLE DISCARDABLE

1 0

Aurimas Fišeras : wordpad: Update Lithuanian translation.
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: 2e91ca1759c29d1734e7a5c3241b9a6d8f55df1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e91ca1759c29d1734e7a5c32… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Feb 25 20:56:27 2010 +0200 wordpad: Update Lithuanian translation. --- programs/wordpad/Lt.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/Lt.rc b/programs/wordpad/Lt.rc index 8e05ca8..c9f2571 100644 --- a/programs/wordpad/Lt.rc +++ b/programs/wordpad/Lt.rc @@ -248,8 +248,8 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Didinti" STRING_PREVIEW_ZOOMOUT, "Mažinti" STRING_PREVIEW_CLOSE, "Užverti" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" + STRING_PREVIEW_PAGE, "Puslapis" + STRING_PREVIEW_PAGES, "Puslapiai" END STRINGTABLE DISCARDABLE

1 0

Vitaly Perov : notepad: Implement printing to file.
by Alexandre Julliard 26 Feb '10

26 Feb '10

Module: wine Branch: master Commit: d4e665431b40437a5d8fe304be6890a01892ce92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e665431b40437a5d8fe304b… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Thu Feb 25 19:36:04 2010 +0300 notepad: Implement printing to file. --- programs/notepad/dialog.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 5594069..45d0c75 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -5,6 +5,7 @@ * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2002 Andriy Palamarchuk * Copyright 2007 Rolf Kalbermatter + * Copyright 2010 Vitaly Perov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -509,6 +510,26 @@ static ENCODING detect_encoding_of_file(LPCWSTR szFileName) } } +static LPWSTR dialog_print_to_file(HWND hMainWnd) +{ + OPENFILENAMEW ofn; + static WCHAR file[MAX_PATH] = {'o','u','t','p','u','t','.','p','r','n',0}; + static const WCHAR defExt[] = {'p','r','n',0}; + + ZeroMemory(&ofn, sizeof(ofn)); + + ofn.lStructSize = sizeof(ofn); + ofn.Flags = OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; + ofn.hwndOwner = hMainWnd; + ofn.lpstrFile = file; + ofn.nMaxFile = MAX_PATH; + ofn.lpstrDefExt = defExt; + + if(GetSaveFileNameW(&ofn)) + return file; + else + return FALSE; +} static UINT_PTR CALLBACK OfnHookProc(HWND hdlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { static HWND hEncCombo; @@ -835,6 +856,13 @@ VOID DIALOG_FilePrint(VOID) di.lpszDatatype = NULL; di.fwType = 0; + if(printer.Flags & PD_PRINTTOFILE) + { + di.lpszOutput = dialog_print_to_file(printer.hwndOwner); + if(!di.lpszOutput) + return; + } + /* Get the file text */ size = GetWindowTextLengthW(Globals.hEdit) + 1; pTemp = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR));

1 0

Huw Davies : dispex: Add a stub dispex.dll.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: 062628ad8020e09063fcdf6302e86f17321e2ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=062628ad8020e09063fcdf630… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 25 14:35:19 2010 +0000 dispex: Add a stub dispex.dll. --- .gitignore | 2 + configure | 5 ++++ configure.ac | 1 + dlls/dispex/Makefile.in | 19 +++++++++++++++ dlls/dispex/disp_ex.idl | 1 + dlls/dispex/dispex.spec | 4 +++ dlls/dispex/usrmarshal.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 90 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 5be3433..d0cf776 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,8 @@ dlls/actxprxy/actxprxy_urlhist_p.c dlls/advapi32/svcctl.h dlls/advapi32/svcctl_c.c dlls/atl/atliface.h +dlls/dispex/disp_ex.h +dlls/dispex/disp_ex_p.c dlls/dxdiagn/fil_data.h dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c diff --git a/configure b/configure index f58f418..721ed3a 100755 --- a/configure +++ b/configure @@ -14331,6 +14331,10 @@ wine_fn_append_rule ALL_MAKEFILE_DEPENDS "dlls/dispdib.dll16 dlls/dispdib.dll16/ wine_fn_config_makefile dlls/dispdib.dll16 "dlls/Makedll.rules \$(MAKEDEP)" test "x$enable_win16" != xno && wine_fn_append_file ALL_DLL_DIRS "dlls/dispdib.dll16" +wine_fn_append_rule ALL_MAKEFILE_DEPENDS "dlls/dispex dlls/dispex/__install__ dlls/dispex/__install-lib__ dlls/dispex/__install-dev__: __builddeps__" +wine_fn_config_makefile dlls/dispex "dlls/Makedll.rules \$(MAKEDEP)" +test "x$enable_dispex" != xno && wine_fn_append_file ALL_DLL_DIRS "dlls/dispex" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "dlls/display.drv16 dlls/display.drv16/__install__ dlls/display.drv16/__install-lib__ dlls/display.drv16/__install-dev__: __builddeps__" wine_fn_config_makefile dlls/display.drv16 "dlls/Makedll.rules \$(MAKEDEP)" test "x$enable_win16" != xno && wine_fn_append_file ALL_DLL_DIRS "dlls/display.drv16" @@ -17330,6 +17334,7 @@ do "dlls/dinput/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dinput/tests/Makefile" ;; "dlls/dinput8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dinput8/Makefile" ;; "dlls/dispdib.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dispdib.dll16/Makefile" ;; + "dlls/dispex/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dispex/Makefile" ;; "dlls/display.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/display.drv16/Makefile" ;; "dlls/dmband/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmband/Makefile" ;; "dlls/dmcompos/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmcompos/Makefile" ;; diff --git a/configure.ac b/configure.ac index 7f74741..f7cf4b9 100644 --- a/configure.ac +++ b/configure.ac @@ -2235,6 +2235,7 @@ WINE_CONFIG_DLL(dinput,,[dinput],[data_formats.c]) WINE_CONFIG_TEST(dlls/dinput/tests) WINE_CONFIG_DLL(dinput8,,[dinput8]) WINE_CONFIG_DLL(dispdib.dll16,enable_win16) +WINE_CONFIG_DLL(dispex) WINE_CONFIG_DLL(display.drv16,enable_win16) WINE_CONFIG_DLL(dmband) WINE_CONFIG_DLL(dmcompos) diff --git a/dlls/dispex/Makefile.in b/dlls/dispex/Makefile.in new file mode 100644 index 0000000..d408d55 --- /dev/null +++ b/dlls/dispex/Makefile.in @@ -0,0 +1,19 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = dispex.dll +IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 kernel32 ntdll +EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_DELEGATION + +EXTRA_OBJS = dlldata.o + +C_SRCS = \ + usrmarshal.c + +IDL_P_SRCS = \ + disp_ex.idl + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/dispex/disp_ex.idl b/dlls/dispex/disp_ex.idl new file mode 100644 index 0000000..2db98ff --- /dev/null +++ b/dlls/dispex/disp_ex.idl @@ -0,0 +1 @@ +#include "dispex.idl" diff --git a/dlls/dispex/dispex.spec b/dlls/dispex/dispex.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/dispex/dispex.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dispex/usrmarshal.c b/dlls/dispex/usrmarshal.c new file mode 100644 index 0000000..899c35f --- /dev/null +++ b/dlls/dispex/usrmarshal.c @@ -0,0 +1,58 @@ +/* + * Misc marshaling routinues + * + * Copyright 2010 Huw Davies + * + * 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 <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "objbase.h" +#include "oleauto.h" +#include "dispex.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +HRESULT CALLBACK IDispatchEx_InvokeEx_Proxy(IDispatchEx* This, DISPID id, LCID lcid, WORD wFlags, + DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, + IServiceProvider *pspCaller) +{ + FIXME("(%p)->(%08x, %04x, %04x, %p, %p, %p, %p): stub\n", This, id, lcid, wFlags, + pdp, pvarRes, pei, pspCaller); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID lcid, DWORD dwFlags, + DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, + IServiceProvider *pspCaller, UINT cvarRefArg, + UINT *rgiRefArg, VARIANT *rgvarRefArg) +{ + FIXME("(%p)->(%08x, %04x, %08x, %p, %p, %p, %p, %d, %p, %p): stub\n", This, id, lcid, dwFlags, + pdp, pvarRes, pei, pspCaller, cvarRefArg, rgiRefArg, rgvarRefArg); + return E_NOTIMPL; + +}

1 0

Huw Davies : include: Add IProvideRuntimeContext and a few annotations.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: f7830e9fc409a48871a52f8690ae69e808875985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7830e9fc409a48871a52f869… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 25 14:34:08 2010 +0000 include: Add IProvideRuntimeContext and a few annotations. --- include/dispex.idl | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/include/dispex.idl b/include/dispex.idl index b1759dd..6f1c545 100644 --- a/include/dispex.idl +++ b/include/dispex.idl @@ -81,13 +81,13 @@ interface IDispatchEx : IDispatch [local] HRESULT InvokeEx( - [in] DISPID id, - [in] LCID lcid, - [in] WORD wFlags, - [in] DISPPARAMS *pdp, - [out] VARIANT *pvarRes, - [out] EXCEPINFO *pei, - [in, unique] IServiceProvider *pspCaller); + [in, annotation("__in")] DISPID id, + [in, annotation("__in")] LCID lcid, + [in, annotation("__in")] WORD wFlags, + [in, annotation("__in")] DISPPARAMS *pdp, + [out, annotation("__out_opt")] VARIANT *pvarRes, + [out, annotation("__out_opt")] EXCEPINFO *pei, + [in, unique, annotation("__in_opt")] IServiceProvider *pspCaller); [call_as(InvokeEx)] HRESULT RemoteInvokeEx( @@ -191,3 +191,15 @@ interface ICanHandleException : IUnknown [in] EXCEPINFO *pExcepInfo, [in] VARIANT *pvar); } + +[ + object, + uuid(10e2414a-ec59-49d2-bc51-5add2c36febc), + pointer_default(unique) +] +interface IProvideRuntimeContext : IUnknown +{ + HRESULT GetCurrentSourceContext( + [out] DWORD_PTR *pdwContext, + [out] VARIANT_BOOL *pfExecutingGlobalCode); +}

1 0

Hans Leidekker : msi: Add tests for removing registry values.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: b2c8f351070db35133ba33dfd4f1509d97f0e091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2c8f351070db35133ba33dfd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 25 15:17:43 2010 +0100 msi: Add tests for removing registry values. --- dlls/msi/tests/install.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 138 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e97d48a..5f6d83a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1500,6 +1500,58 @@ static const CHAR rd_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const CHAR rrv_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "registry.txt\tregistry\tregistry.txt\t1000\t\t\t8192\t1\n"; + +static const CHAR rrv_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "registry\t\t\tregistry feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR rrv_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "registry\tregistry\n"; + +static const CHAR rrv_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "registry\t{DA97585B-962D-45EB-AD32-DA15E60CA9EE}\tMSITESTDIR\t0\t\tregistry.txt\n"; + +static const CHAR rrv_registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n" + "s72\ti2\tl255\tL255\tL0\ts72\n" + "Registry\tRegistry\n" + "reg1\t2\tSOFTWARE\\Wine\\keyA\t\tA\tregistry\n" + "reg2\t2\tSOFTWARE\\Wine\\keyA\tvalueA\tA\tregistry\n" + "reg3\t2\tSOFTWARE\\Wine\\key1\t-\t\tregistry\n"; + +static const CHAR rrv_remove_registry_dat[] = "RemoveRegistry\tRoot\tKey\tName\tComponent_\n" + "s72\ti2\tl255\tL255\ts72\n" + "RemoveRegistry\tRemoveRegistry\n" + "reg1\t2\tSOFTWARE\\Wine\\keyB\t\tregistry\n" + "reg2\t2\tSOFTWARE\\Wine\\keyB\tValueB\tregistry\n" + "reg3\t2\tSOFTWARE\\Wine\\key2\t-\tregistry\n"; + +static const CHAR rrv_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "RemoveRegistryValues\t\t3000\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2363,6 +2415,20 @@ static const msi_table rd_tables[] = ADD_TABLE(property) }; +static const msi_table rrv_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(rrv_component), + ADD_TABLE(rrv_feature), + ADD_TABLE(rrv_feature_comp), + ADD_TABLE(rrv_file), + ADD_TABLE(rrv_registry), + ADD_TABLE(rrv_remove_registry), + ADD_TABLE(rrv_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -8396,6 +8462,77 @@ static void test_remove_duplicate_files(void) delete_test_files(); } +static void test_remove_registry_values(void) +{ + UINT r; + LONG res; + HKEY key; + + create_test_files(); + create_file("msitest\\registry.txt", 1000); + create_database(msifile, rrv_tables, sizeof(rrv_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", &key); + RegSetValueExA(key, "value1", 0, REG_SZ, (const BYTE *)"1", 2); + RegCloseKey(key); + + RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", &key); + RegSetValueExA(key, "value2", 0, REG_SZ, (const BYTE *)"2", 2); + RegCloseKey(key); + + RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA", &key); + RegSetValueExA(key, "", 0, REG_SZ, (const BYTE *)"default", 8); + RegSetValueExA(key, "valueA", 0, REG_SZ, (const BYTE *)"A", 2); + RegSetValueExA(key, "valueB", 0, REG_SZ, (const BYTE *)"B", 2); + RegCloseKey(key); + + RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB", &key); + RegSetValueExA(key, "", 0, REG_SZ, (const BYTE *)"default", 8); + RegSetValueExA(key, "valueB", 0, REG_SZ, (const BYTE *)"B", 2); + RegCloseKey(key); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", &key); + ok(res == ERROR_SUCCESS, "key removed\n"); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", &key); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + res = RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", &key); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + RegCloseKey(key); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", &key); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", &key); + ok(res == ERROR_SUCCESS, "key removed\n"); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA", &key); + ok(res == ERROR_SUCCESS, "key removed\n"); + RegCloseKey(key); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB", &key); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA"); + RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2"); + RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine"); + + ok(!delete_pf("msitest\\registry.txt", TRUE), "file not removed\n"); + todo_wine ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -8499,6 +8636,7 @@ START_TEST(install) test_create_remove_shortcut(); test_publish_components(); test_remove_duplicate_files(); + test_remove_registry_values(); DeleteFileA(log_file);

1 0

Hans Leidekker : msi: Implement the RemoveRegistryValues standard action.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: 342f866044562a722fe8923fce1b4a8531af9a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=342f866044562a722fe8923fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 25 15:17:11 2010 +0100 msi: Implement the RemoveRegistryValues standard action. --- dlls/msi/action.c | 306 ++++++++++++++++++++++++++++++++++++++++++---------- dlls/msi/msipriv.h | 4 + 2 files changed, 254 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=342f866044562a722fe89…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010