November 2010 - Wine-commits

Louis Lenders : xapofx1_1: Add stub dll.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 934d6761f02304a0f4cd47080c3c4b88044b1623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=934d6761f02304a0f4cd47080… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Nov 12 11:23:37 2010 +0100 xapofx1_1: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/xapofx1_1/Makefile.in | 6 +++++ dlls/xapofx1_1/main.c | 48 +++++++++++++++++++++++++++++++++++++++++ dlls/xapofx1_1/xapofx1_1.spec | 1 + 5 files changed, 57 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3871a74..482d30d 100755 --- a/configure +++ b/configure @@ -15142,6 +15142,7 @@ wine_fn_config_dll wsock32 enable_wsock32 wsock32 wine_fn_config_dll wtsapi32 enable_wtsapi32 wtsapi32 wine_fn_config_dll wuapi enable_wuapi wine_fn_config_dll wuaueng enable_wuaueng +wine_fn_config_dll xapofx1_1 enable_xapofx1_1 wine_fn_config_dll xinput1_1 enable_xinput1_1 wine_fn_config_dll xinput1_2 enable_xinput1_2 wine_fn_config_dll xinput1_3 enable_xinput1_3 xinput diff --git a/configure.ac b/configure.ac index 93a6221..d4430be 100644 --- a/configure.ac +++ b/configure.ac @@ -2799,6 +2799,7 @@ WINE_CONFIG_DLL(wsock32,,[wsock32]) WINE_CONFIG_DLL(wtsapi32,,[wtsapi32]) WINE_CONFIG_DLL(wuapi) WINE_CONFIG_DLL(wuaueng) +WINE_CONFIG_DLL(xapofx1_1) WINE_CONFIG_DLL(xinput1_1) WINE_CONFIG_DLL(xinput1_2) WINE_CONFIG_DLL(xinput1_3,,[xinput]) diff --git a/dlls/xapofx1_1/Makefile.in b/dlls/xapofx1_1/Makefile.in new file mode 100644 index 0000000..fe5f551 --- /dev/null +++ b/dlls/xapofx1_1/Makefile.in @@ -0,0 +1,6 @@ +MODULE = xapofx1_1.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/xapofx1_1/main.c b/dlls/xapofx1_1/main.c new file mode 100644 index 0000000..1dc0829 --- /dev/null +++ b/dlls/xapofx1_1/main.c @@ -0,0 +1,48 @@ +/* + * Copyright 2010 Louis Lenders + * + * 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 "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xapofx); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break; + + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/xapofx1_1/xapofx1_1.spec b/dlls/xapofx1_1/xapofx1_1.spec new file mode 100644 index 0000000..33269e3 --- /dev/null +++ b/dlls/xapofx1_1/xapofx1_1.spec @@ -0,0 +1 @@ +@ stub CreateFX

1 0

Eric Pouech : kernel32: Fixed regression with echoing input characters.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 7f043168c10cbd7b7a0e5e7e937e08a038e98df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f043168c10cbd7b7a0e5e7e9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Nov 11 22:30:11 2010 +0100 kernel32: Fixed regression with echoing input characters. --- dlls/kernel32/console.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index d49731f..c0af117 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -156,7 +156,8 @@ static int get_console_bare_fd(HANDLE hin) { int fd; - if (wine_server_handle_to_fd(hin, 0, &fd, NULL) == STATUS_SUCCESS) + if (wine_server_handle_to_fd(wine_server_ptr_handle(console_handle_unmap(hin)), + 0, &fd, NULL) == STATUS_SUCCESS) return fd; return -1; } @@ -1587,7 +1588,7 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, if (!GetConsoleMode(hConsoleInput, &mode)) return FALSE; - if ((fd == get_console_bare_fd(hConsoleInput)) == -1) + if ((fd = get_console_bare_fd(hConsoleInput)) != -1) { close(fd); is_bare = TRUE;

1 0

Louis Lenders : d3dx9_36: Quiet a noisy fixme.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: aa75d068a43c688a91b7bee05c5f80122671f960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa75d068a43c688a91b7bee05… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Nov 12 10:44:09 2010 +0100 d3dx9_36: Quiet a noisy fixme. --- dlls/d3dx9_36/surface.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index e4d1802..e9af051 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -59,8 +59,10 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D IWICStream *stream; HRESULT hr; HRESULT initresult; + static int warn_once; - FIXME("(%p, %d, %p): partially implemented\n", data, datasize, info); + if (!warn_once++) + FIXME("(%p, %d, %p): partially implemented\n", data, datasize, info); /* TODO: Add support for (or at least detect) TGA, DDS, PPM and DIB */

1 0

Jörg Höhle : winmm: Use MCI_HWND and MCI_HDC in resource files.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: bad21ebe7609bd3f02d7191d45947f0bb10bd9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bad21ebe7609bd3f02d7191d4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 24 19:58:38 2010 +0100 winmm: Use MCI_HWND and MCI_HDC in resource files. --- dlls/mciavi32/mciavi_res.rc | 6 +++--- dlls/mciqtz32/mciavi_res.rc | 6 +++--- dlls/winmm/mci.c | 9 +++++++++ dlls/winmm/winmm_res.rc | 10 +++++----- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/mciavi32/mciavi_res.rc b/dlls/mciavi32/mciavi_res.rc index beffdd5..e2e4caa 100644 --- a/dlls/mciavi32/mciavi_res.rc +++ b/dlls/mciavi32/mciavi_res.rc @@ -205,7 +205,7 @@ L"overlapped\0", 0x00cf0000L, MCI_INTEGER, L"popup\0", 0x80880000L, MCI_INTEGER, L"child\0", 0x40000000L, MCI_INTEGER, L"\0", 0x00000000L, MCI_END_CONSTANT, -L"parent\0", 0x00020000L, MCI_INTEGER, +L"parent\0", 0x00020000L, MCI_HWND, L"nostatic\0", 0x00040000L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"paste\0", MCI_PASTE, 0, MCI_COMMAND_HEAD, @@ -529,7 +529,7 @@ L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"test\0", 0x00000020L, MCI_FLAG, L"at\0", 0x00010000L, MCI_RECT, -L"hdc\0", 0x00020000L, MCI_INTEGER, +L"hdc\0", 0x00020000L, MCI_HDC, L"paint\0", 0x00040000L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"where\0", MCI_WHERE, 0, MCI_COMMAND_HEAD, @@ -550,7 +550,7 @@ L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"test\0", 0x00000020L, MCI_FLAG, L"handle\0", 0x00010000L, MCI_CONSTANT, -L"default\0", 0x00000000L, MCI_INTEGER, +L"default\0", 0x00000000L, MCI_HWND, L"\0", 0x00000000L, MCI_END_CONSTANT, L"state\0", 0x00040000L, MCI_CONSTANT, L"hide\0", 0x00000000L, MCI_INTEGER, diff --git a/dlls/mciqtz32/mciavi_res.rc b/dlls/mciqtz32/mciavi_res.rc index beffdd5..e2e4caa 100644 --- a/dlls/mciqtz32/mciavi_res.rc +++ b/dlls/mciqtz32/mciavi_res.rc @@ -205,7 +205,7 @@ L"overlapped\0", 0x00cf0000L, MCI_INTEGER, L"popup\0", 0x80880000L, MCI_INTEGER, L"child\0", 0x40000000L, MCI_INTEGER, L"\0", 0x00000000L, MCI_END_CONSTANT, -L"parent\0", 0x00020000L, MCI_INTEGER, +L"parent\0", 0x00020000L, MCI_HWND, L"nostatic\0", 0x00040000L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"paste\0", MCI_PASTE, 0, MCI_COMMAND_HEAD, @@ -529,7 +529,7 @@ L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"test\0", 0x00000020L, MCI_FLAG, L"at\0", 0x00010000L, MCI_RECT, -L"hdc\0", 0x00020000L, MCI_INTEGER, +L"hdc\0", 0x00020000L, MCI_HDC, L"paint\0", 0x00040000L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"where\0", MCI_WHERE, 0, MCI_COMMAND_HEAD, @@ -550,7 +550,7 @@ L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"test\0", 0x00000020L, MCI_FLAG, L"handle\0", 0x00010000L, MCI_CONSTANT, -L"default\0", 0x00000000L, MCI_INTEGER, +L"default\0", 0x00000000L, MCI_HWND, L"\0", 0x00000000L, MCI_END_CONSTANT, L"state\0", 0x00040000L, MCI_CONSTANT, L"hide\0", 0x00000000L, MCI_INTEGER, diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 3558d2b..30db363 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -601,6 +601,9 @@ static BOOL MCI_IsCommandTableValid(UINT uTbl) switch (eid) { case MCI_COMMAND_HEAD: if (!*str || !flg) return FALSE; idx = 0; break; /* check unicity of str in table */ case MCI_STRING: if (inCst) return FALSE; break; + case MCI_HWND: /* Occurs inside MCI_CONSTANT as in "window handle default" */ + case MCI_HPAL: + case MCI_HDC: case MCI_INTEGER: if (!*str) return FALSE; break; case MCI_END_COMMAND: if (*str || flg || idx == 0) return FALSE; idx = 0; break; case MCI_RETURN: if (*str || idx != 1) return FALSE; break; @@ -1087,6 +1090,9 @@ static DWORD MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd, *dwFlags |= flg; TRACE("flag=%08x\n", flg); break; + case MCI_HWND: + case MCI_HPAL: + case MCI_HDC: case MCI_INTEGER: if (inCst) { data[offset] |= flg; @@ -1132,6 +1138,9 @@ static DWORD MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd, case MCI_END_COMMAND_LIST: case MCI_CONSTANT: case MCI_FLAG: break; + case MCI_HWND: + case MCI_HPAL: + case MCI_HDC: if (!inCst) offset += sizeof(HANDLE)/sizeof(DWORD); break; case MCI_INTEGER: if (!inCst) offset++; break; case MCI_END_CONSTANT: offset++; break; case MCI_STRING: offset += sizeof(LPWSTR)/sizeof(DWORD); break; diff --git a/dlls/winmm/winmm_res.rc b/dlls/winmm/winmm_res.rc index 949d55c..64c42b4 100644 --- a/dlls/winmm/winmm_res.rc +++ b/dlls/winmm/winmm_res.rc @@ -537,7 +537,7 @@ L"overlapped\0", 0x00cf0000L, MCI_INTEGER, L"popup\0", 0x80880000L, MCI_INTEGER, L"child\0", 0x40000000L, MCI_INTEGER, L"\0", 0x00000000L, MCI_END_CONSTANT, -L"parent\0", 0x00020000L, MCI_INTEGER, +L"parent\0", 0x00020000L, MCI_HWND, L"nostatic\0", 0x00040000L, MCI_FLAG, L"\0", 0x00000000L, MCI_END_COMMAND, L"play\0", MCI_PLAY, 0, MCI_COMMAND_HEAD, @@ -639,7 +639,7 @@ L"window\0", MCI_WINDOW, 0, MCI_COMMAND_HEAD, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"handle\0", 0x00010000L, MCI_CONSTANT, -L"default\0", 0x00000000L, MCI_INTEGER, +L"default\0", 0x00000000L, MCI_HWND, L"\0", 0x00000000L, MCI_END_CONSTANT, L"state\0", 0x00040000L, MCI_CONSTANT, L"hide\0", 0x00000000L, MCI_INTEGER, @@ -674,7 +674,7 @@ L"update\0", MCI_UPDATE, 0, MCI_COMMAND_HEAD, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"at\0", 0x00010000L, MCI_RECT, -L"hdc\0", 0x00020000L, MCI_INTEGER, +L"hdc\0", 0x00020000L, MCI_HDC, L"\0", 0x00000000L, MCI_END_COMMAND, L"\0", 0x00000000L, MCI_END_COMMAND_LIST END @@ -694,7 +694,7 @@ L"overlapped\0", 0x00cf0000L, MCI_INTEGER, L"popup\0", 0x80880000L, MCI_INTEGER, L"child\0", 0x40000000L, MCI_INTEGER, L"\0", 0x00000000L, MCI_END_CONSTANT, -L"parent\0", 0x00020000L, MCI_INTEGER, +L"parent\0", 0x00020000L, MCI_HWND, L"\0", 0x00000000L, MCI_END_COMMAND, L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, @@ -744,7 +744,7 @@ L"window\0", MCI_WINDOW, 0, MCI_COMMAND_HEAD, L"notify\0", 0x00000001L, MCI_FLAG, L"wait\0", 0x00000002L, MCI_FLAG, L"handle\0", 0x00010000L, MCI_CONSTANT, -L"default\0", 0x00000000L, MCI_INTEGER, +L"default\0", 0x00000000L, MCI_HWND, L"\0", 0x00000000L, MCI_END_CONSTANT, L"state\0", 0x00040000L, MCI_CONSTANT, L"hide\0", 0x00000000L, MCI_INTEGER,

1 0

Jacek Caban : shdocvw: Added DocHost::Exec(OLECMDID_UPDATECOMMANDS) implementation.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: f89ac6fa0d053bef5b7aa6f31fb8b87405ecc04b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89ac6fa0d053bef5b7aa6f31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 14:30:03 2010 +0100 shdocvw: Added DocHost::Exec(OLECMDID_UPDATECOMMANDS) implementation. --- dlls/shdocvw/dochost.c | 10 ++++++++-- dlls/shdocvw/iexplore.c | 8 +++++++- dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/webbrowser.c | 37 ++++++++++++++++++++++++++++++++++++- 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index edf569e..f74d064 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -447,8 +447,14 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, nCmdexecopt, debugstr_variant(pvaIn), debugstr_variant(pvaOut)); if(!pguidCmdGroup) { - FIXME("Unimplemented cmdid %d\n", nCmdID); - return E_NOTIMPL; + switch(nCmdID) { + case OLECMDID_UPDATECOMMANDS: + return This->container_vtbl->exec(This, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + default: + FIXME("Unimplemented cmdid %d\n", nCmdID); + return E_NOTIMPL; + } + return S_OK; } if(IsEqualGUID(pguidCmdGroup, &CGID_DocHostCmdPriv)) { diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 3991f57..a0d2684 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -739,10 +739,16 @@ static void WINAPI DocHostContainer_SetURL(DocHost* This, LPCWSTR url) SendMessageW(This->frame_hwnd, WM_UPDATEADDRBAR, 0, (LPARAM)url); } +static HRESULT DocHostContainer_exec(DocHost* This, const GUID *cmd_group, DWORD cmdid, DWORD execopt, VARIANT *in, + VARIANT *out) +{ + return S_OK; +} static const IDocHostContainerVtbl DocHostContainerVtbl = { DocHostContainer_GetDocObjRect, DocHostContainer_SetStatusText, - DocHostContainer_SetURL + DocHostContainer_SetURL, + DocHostContainer_exec }; HRESULT InternetExplorer_Create(IUnknown *pOuter, REFIID riid, void **ppv) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 4f3425d..61dc63f 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -89,6 +89,7 @@ typedef struct _IDocHostContainerVtbl void (WINAPI* GetDocObjRect)(DocHost*,RECT*); HRESULT (WINAPI* SetStatusText)(DocHost*,LPCWSTR); void (WINAPI* SetURL)(DocHost*,LPCWSTR); + HRESULT (*exec)(DocHost*,const GUID*,DWORD,DWORD,VARIANT*,VARIANT*); } IDocHostContainerVtbl; struct DocHost { diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index ef46236..ac45d85 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -1135,6 +1135,8 @@ static const IServiceProviderVtbl ServiceProviderVtbl = WebBrowser_IServiceProvider_QueryService }; +#define DOCHOST_THIS(iface) DEFINE_THIS2(WebBrowser,doc_host,iface) + static void WINAPI DocHostContainer_GetDocObjRect(DocHost* This, RECT* rc) { GetClientRect(This->frame_hwnd, rc); @@ -1150,10 +1152,43 @@ static void WINAPI DocHostContainer_SetURL(DocHost* This, LPCWSTR url) } +static HRESULT DocHostContainer_exec(DocHost *doc_host, const GUID *cmd_group, DWORD cmdid, DWORD execopt, VARIANT *in, + VARIANT *out) +{ + WebBrowser *This = DOCHOST_THIS(doc_host); + IOleCommandTarget *cmdtrg = NULL; + HRESULT hres; + + if(This->client) { + hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(FAILED(hres)) + cmdtrg = NULL; + } + + if(!cmdtrg && This->container) { + hres = IOleContainer_QueryInterface(This->container, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(FAILED(hres)) + cmdtrg = NULL; + } + + if(!cmdtrg) + return S_OK; + + hres = IOleCommandTarget_Exec(cmdtrg, cmd_group, cmdid, execopt, in, out); + IOleCommandTarget_Release(cmdtrg); + if(FAILED(hres)) + FIXME("Exec failed\n"); + + return hres; +} + +#undef DOCHOST_THIS + static const IDocHostContainerVtbl DocHostContainerVtbl = { DocHostContainer_GetDocObjRect, DocHostContainer_SetStatusText, - DocHostContainer_SetURL + DocHostContainer_SetURL, + DocHostContainer_exec }; static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, void **ppv)

1 0

Jacek Caban : shdocvw: Fixed race in tests.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 0048ec36d28442a46ad99185e832e0dd70f9a201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0048ec36d28442a46ad99185e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 12 14:30:15 2010 +0100 shdocvw: Fixed race in tests. --- dlls/shdocvw/tests/webbrowser.c | 34 ++++++++++++++++++++++++++++------ 1 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index babfe11..1b1afc1 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -118,6 +118,8 @@ DEFINE_EXPECT(Exec_SETDOWNLOADSTATE_0); DEFINE_EXPECT(Exec_SETDOWNLOADSTATE_1); DEFINE_EXPECT(Exec_SETPROGRESSMAX); DEFINE_EXPECT(Exec_SETPROGRESSPOS); +DEFINE_EXPECT(Exec_UPDATECOMMANDS); +DEFINE_EXPECT(Exec_SETTITLE); DEFINE_EXPECT(QueryStatus_SETPROGRESSTEXT); DEFINE_EXPECT(QueryStatus_STOP); DEFINE_EXPECT(DocHost_EnableModeless_TRUE); @@ -285,6 +287,16 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(0, "unexpevted V_I4(pvaIn)=%d\n", V_I4(pvaIn)); } return S_OK; + case OLECMDID_UPDATECOMMANDS: + CHECK_EXPECT(Exec_UPDATECOMMANDS); + ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08x\n", nCmdexecopt); + ok(!pvaIn, "pvaIn != NULL\n"); + ok(!pvaOut, "pvaOut=%p, expected NULL\n", pvaOut); + return S_OK; + case OLECMDID_SETTITLE: + CHECK_EXPECT(Exec_SETTITLE); + /* TODO: test args */ + return S_OK; default: ok(0, "unexpected nsCmdID %d\n", nCmdID); } @@ -2250,9 +2262,7 @@ static void test_download(DWORD flags) SET_EXPECT(Invoke_STATUSTEXTCHANGE); SET_EXPECT(SetStatusText); SET_EXPECT(EnableModeless_TRUE); - if(is_first_load) - SET_EXPECT(QueryStatus_STOP); - else + if(!is_first_load) SET_EXPECT(GetHostInfo); SET_EXPECT(Exec_SETDOWNLOADSTATE_0); SET_EXPECT(Invoke_TITLECHANGE); @@ -2261,6 +2271,11 @@ static void test_download(DWORD flags) SET_EXPECT(GetDropTarget); SET_EXPECT(Invoke_PROGRESSCHANGE); SET_EXPECT(Invoke_DOCUMENTCOMPLETE); + + SET_EXPECT(UpdateUI); + SET_EXPECT(Exec_UPDATECOMMANDS); + SET_EXPECT(QueryStatus_STOP); + while(!called_Invoke_DOCUMENTCOMPLETE && GetMessage(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); @@ -2289,9 +2304,7 @@ static void test_download(DWORD flags) todo_wine CHECK_CALLED(EnableModeless_TRUE); else CLEAR_CALLED(EnableModeless_FALSE); /* IE 8 */ - if(is_first_load) - todo_wine CHECK_CALLED(QueryStatus_STOP); - else + if(!is_first_load) todo_wine CHECK_CALLED(GetHostInfo); todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); todo_wine CHECK_CALLED(Invoke_TITLECHANGE); @@ -2304,6 +2317,15 @@ static void test_download(DWORD flags) is_downloading = FALSE; test_ready_state(READYSTATE_COMPLETE); + + while(!called_Exec_UPDATECOMMANDS && GetMessage(&msg, NULL, 0, 0)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + CHECK_CALLED(UpdateUI); + CHECK_CALLED(Exec_UPDATECOMMANDS); + CLEAR_CALLED(QueryStatus_STOP); } static void test_olecmd(IUnknown *unk, BOOL loaded)

1 0

Hans Leidekker : msi: Honor msidbComponentAttributesNeverOverwrite.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: b112d7712608a7d326117233b7fb814ccfd0bb26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b112d7712608a7d326117233b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 12 15:05:35 2010 +0100 msi: Honor msidbComponentAttributesNeverOverwrite. --- dlls/msi/files.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 47aa74f..b3a6176 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -227,6 +227,14 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite) continue; + if (file->state == msifs_overwrite && + (file->Component->Attributes & msidbComponentAttributesNeverOverwrite)) + { + TRACE("not overwriting %s\n", debugstr_w(file->TargetPath)); + file->state = msifs_skipped; + continue; + } + if (file->Sequence > mi->last_sequence || mi->is_continuous || (file->IsCompressed && !mi->is_extracted)) {

1 0

Hans Leidekker : msi: Don' t rebuild the target path for files from global assembly components.
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 19a2d144b563f23dacfb127b94948b0f0f89b003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a2d144b563f23dacfb127b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 12 15:05:55 2010 +0100 msi: Don't rebuild the target path for files from global assembly components. --- dlls/msi/install.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 9463a52..1579a5e 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -549,16 +549,16 @@ UINT MSI_SetTargetPathW(MSIPACKAGE *package, LPCWSTR szFolder, LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { MSICOMPONENT *comp = file->Component; - LPWSTR p; + LPWSTR dir; - if (!comp) + if (!comp->Enabled || (comp->assembly && !comp->assembly->application)) continue; - p = resolve_folder(package, comp->Directory, FALSE, FALSE, FALSE, NULL); + dir = resolve_folder(package, comp->Directory, FALSE, FALSE, FALSE, NULL); msi_free(file->TargetPath); - file->TargetPath = build_directory_name(2, p, file->FileName); - msi_free(p); + file->TargetPath = build_directory_name(2, dir, file->FileName); + msi_free(dir); } } msi_free(path);

1 0

Henri Verbeet : wined3d: Simplify a condition in IWineD3DSurfaceImpl_LoadTexture().
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: a59ee29dec293b9dcc3306bf40b3587c4228d8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59ee29dec293b9dcc3306bf4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 12 13:12:03 2010 +0100 wined3d: Simplify a condition in IWineD3DSurfaceImpl_LoadTexture(). --- dlls/wined3d/surface.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d848d2..618e3f0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2443,14 +2443,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO if (!(This->Flags & flag)) { TRACE("Reloading because surface is dirty\n"); - } else if(/* Reload: gl texture has ck, now no ckey is set OR */ - ((This->Flags & SFLAG_GLCKEY) && (!(This->CKeyFlags & WINEDDSD_CKSRCBLT))) || - /* Reload: vice versa OR */ - ((!(This->Flags & SFLAG_GLCKEY)) && (This->CKeyFlags & WINEDDSD_CKSRCBLT)) || - /* Also reload: Color key is active AND the color key has changed */ - ((This->CKeyFlags & WINEDDSD_CKSRCBLT) && ( - (This->glCKey.dwColorSpaceLowValue != This->SrcBltCKey.dwColorSpaceLowValue) || - (This->glCKey.dwColorSpaceHighValue != This->SrcBltCKey.dwColorSpaceHighValue)))) { + } + /* Reload if either the texture and sysmem have different ideas about the + * color key, or the actual key values changed. */ + else if (!(This->Flags & SFLAG_GLCKEY) != !(This->CKeyFlags & WINEDDSD_CKSRCBLT) + || ((This->CKeyFlags & WINEDDSD_CKSRCBLT) + && (This->glCKey.dwColorSpaceLowValue != This->SrcBltCKey.dwColorSpaceLowValue + || This->glCKey.dwColorSpaceHighValue != This->SrcBltCKey.dwColorSpaceHighValue))) + { TRACE("Reloading because of color keying\n"); /* To perform the color key conversion we need a sysmem copy of * the surface. Make sure we have it

1 0

Henri Verbeet : wined3d: Rename the IWineD3DSurfaceImpl "Flags" field to " flags".
by Alexandre Julliard 12 Nov '10

12 Nov '10

Module: wine Branch: master Commit: 027fdb31c2ac31a95b64fb008f076cb786487b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=027fdb31c2ac31a95b64fb008… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 12 13:12:04 2010 +0100 wined3d: Rename the IWineD3DSurfaceImpl "Flags" field to "flags". --- dlls/wined3d/device.c | 24 ++-- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 345 +++++++++++++++++++++------------------- dlls/wined3d/surface_base.c | 14 +- dlls/wined3d/surface_gdi.c | 48 +++--- dlls/wined3d/swapchain.c | 17 +- dlls/wined3d/wined3d_private.h | 3 +- 7 files changed, 242 insertions(+), 211 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=027fdb31c2ac31a95b64f…

1 0