January 2006 - Wine-commits

Vitaliy Margolen : kernel: Remove calls to Nt[Get|Set]ThreadContext.
by Alexandre Julliard 19 Jan '06

19 Jan '06

Module: wine Branch: refs/heads/master Commit: 8430d43d6c6391066e3a640a56571852d6906ab6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8430d43d6c6391066e3a640… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Thu Jan 19 11:55:24 2006 +0100 kernel: Remove calls to Nt[Get|Set]ThreadContext. It's done in exception handler now. --- dlls/kernel/instr.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/instr.c b/dlls/kernel/instr.c index b34e08e..6a9126f 100644 --- a/dlls/kernel/instr.c +++ b/dlls/kernel/instr.c @@ -568,8 +568,6 @@ DWORD INSTR_EmulateInstruction( EXCEPTIO switch (instr[2]) { case 0xc8: /* mov dr1, eax */ - context->ContextFlags = CONTEXT_DEBUG_REGISTERS; - NtGetContextThread( GetCurrentThread(), context ); TRACE("mov dr1,eax at 0x%08lx\n",context->Eip); context->Eax = context->Dr1; context->Eip += prefixlen+3; @@ -587,12 +585,8 @@ DWORD INSTR_EmulateInstruction( EXCEPTIO switch (instr[2]) { case 0xc8: /* mov eax, dr1 */ - context->ContextFlags = CONTEXT_DEBUG_REGISTERS; - NtGetContextThread( GetCurrentThread(), context ); context->Dr1 = context->Eax; context->Eip += prefixlen+3; - context->ContextFlags = CONTEXT_DEBUG_REGISTERS; - NtSetContextThread( GetCurrentThread(), context ); return ExceptionContinueExecution; } ERR("Unsupported DR register, eip+2 is %02x\n", instr[2]);

1 0

appdb/include user.php
by WineHQ 19 Jan '06

19 Jan '06

ChangeSet ID: 22395 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/18 23:25:52 Modified files: include : user.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Users don't have permission to modify application versions if they aren't logged in. Patch: http://cvs.winehq.org/patch.py?id=22395 Old revision New revision Changes Path 1.62 1.63 +3 -0 appdb/include/user.php Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.62 appdb/include/user.php:1.63 --- appdb/include/user.php:1.62 19 Jan 2006 5:25:52 -0000 +++ appdb/include/user.php 19 Jan 2006 5:25:52 -0000 @@ -863,6 +863,9 @@ class User { */ function hasAppVersionModifyPermission($oVersion) { + if(!$this->isLoggedIn()) + return false; + if($this->hasPriv("admin")) return true;

1 0

Hans Leidekker : winedump: Fix compilation of generated source.
by Alexandre Julliard 18 Jan '06

18 Jan '06

Module: wine Branch: refs/heads/master Commit: 1017bcc4486e8079bda94c0c5930c37607ca82d0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1017bcc4486e8079bda94c0… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Jan 18 17:33:10 2006 +0100 winedump: Fix compilation of generated source. Include config.h in the .c file, not in the .h file. --- tools/winedump/output.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 22185e1..ea11de4 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -145,8 +145,8 @@ void output_header_preamble (void) fprintf (hfile, "/*\n * %s.dll\n *\n * Generated from %s.dll by winedump.\n *\n" " * DO NOT SEND GENERATED DLLS FOR INCLUSION INTO WINE !\n * \n */" - "\n#ifndef __WINE_%s_DLL_H\n#define __WINE_%s_DLL_H\n\n#include " - "\"config.h\"\n#include \"windef.h\"\n#include \"wine/debug.h\"\n" + "\n#ifndef __WINE_%s_DLL_H\n#define __WINE_%s_DLL_H\n\n" + "#include \"windef.h\"\n#include \"wine/debug.h\"\n" "#include \"winbase.h\"\n#include \"winnt.h\"\n\n\n", OUTPUT_DLL_NAME, OUTPUT_DLL_NAME, OUTPUT_UC_DLL_NAME, OUTPUT_UC_DLL_NAME); @@ -211,7 +211,8 @@ void output_c_preamble (void) fprintf (cfile, "/*\n * %s.dll\n *\n * Generated from %s by winedump.\n *\n" " * DO NOT SUBMIT GENERATED DLLS FOR INCLUSION INTO WINE!\n * \n */" - "\n\n#include \"%s_dll.h\"\n\nWINE_DEFAULT_DEBUG_CHANNEL(%s);\n\n", + "\n\n#include \"config.h\"\n#include \"%s_dll.h\"\n\n" + "WINE_DEFAULT_DEBUG_CHANNEL(%s);\n\n", OUTPUT_DLL_NAME, globals.input_name, OUTPUT_DLL_NAME, OUTPUT_DLL_NAME);

1 0

Mike McCormack : programs: Use WIN32_LEAN_AND_MEAN.
by Alexandre Julliard 18 Jan '06

18 Jan '06

Module: wine Branch: refs/heads/master Commit: 002e143981d97f3bb0f9d7a3a6b44e779b23b7a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=002e143981d97f3bb0f9d7a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 18 14:23:11 2006 +0100 programs: Use WIN32_LEAN_AND_MEAN. --- programs/notepad/license.c | 1 + programs/regsvr32/regsvr32.c | 6 ++++-- programs/winebrowser/main.c | 2 ++ programs/winhelp/callback.c | 2 ++ programs/winhelp/macro.c | 2 ++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/notepad/license.c b/programs/notepad/license.c index 1fcef23..3c90ca3 100644 --- a/programs/notepad/license.c +++ b/programs/notepad/license.c @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN #include <windows.h> #include "license.h" diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 184e00a..866c285 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -45,6 +45,8 @@ * support. */ +#define WIN32_LEAN_AND_MEAN + #include "config.h" #include "wine/port.h" @@ -88,7 +90,7 @@ static VOID *LoadProc(const char* strDll if(!Silent) printf("Failed to load DLL %s\n", strDll); - exit(-1); + ExitProcess(1); } proc = (VOID *) GetProcAddress(*DllHandle, procName); if(!proc) @@ -96,7 +98,7 @@ static VOID *LoadProc(const char* strDll if(!Silent) printf("%s not implemented in DLL %s\n", procName, strDll); FreeLibrary(*DllHandle); - exit(-1); + ExitProcess(1); } return proc; } diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 38648de..6835d47 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -35,6 +35,8 @@ * mailto:[E-MAIL]?subject=[TOPIC]&cc=[E-MAIL]&bcc=[E-MAIL]&body=[TEXT] */ +#define WIN32_LEAN_AND_MEAN + #include "config.h" #include "wine/port.h" diff --git a/programs/winhelp/callback.c b/programs/winhelp/callback.c index 3627547..aaa4eae 100644 --- a/programs/winhelp/callback.c +++ b/programs/winhelp/callback.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include <stdio.h> #include "windows.h" diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index e34a4dc..8727378 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include <stdio.h> #include "windows.h"

1 0

Alexandre Julliard : ntdll: Cleaned up the ioctl functions.
by Alexandre Julliard 18 Jan '06

18 Jan '06

Module: wine Branch: refs/heads/master Commit: 4202824e9eb698c92b1a475cd0b289a0bc8289d0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4202824e9eb698c92b1a475… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 18 17:18:22 2006 +0100 ntdll: Cleaned up the ioctl functions. Renamed function parameters to something usable. Fixed potential event leaks. --- dlls/ntdll/file.c | 247 +++++++++++++++++++++++++++-------------------------- 1 files changed, 128 insertions(+), 119 deletions(-)

1 0

Huw Davies : msxml: Implement get_nodeTypedValue.
by Alexandre Julliard 18 Jan '06

18 Jan '06

Module: wine Branch: refs/heads/master Commit: 917a801d80352cb372c8bfec97a253fad6a69f55 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=917a801d80352cb372c8bfe… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 18 14:22:23 2006 +0100 msxml: Implement get_nodeTypedValue. --- dlls/msxml3/node.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 08e991a..0725cae 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -557,8 +557,8 @@ static HRESULT WINAPI xmlnode_get_nodeTy IXMLDOMNode *iface, VARIANT* typedValue) { - FIXME("\n"); - return E_NOTIMPL; + FIXME("ignoring data type\n"); + return xmlnode_get_nodeValue(iface, typedValue); } static HRESULT WINAPI xmlnode_put_nodeTypedValue(

1 0

Sasha Slijepcevic : msvcrt: In _tempnam, if TMP is set, it has a precedence over the
by Alexandre Julliard 18 Jan '06

18 Jan '06

Module: wine Branch: refs/heads/master Commit: 736cd60340aa1c53011edbf24e137ec1f7624374 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=736cd60340aa1c53011edbf… Author: Sasha Slijepcevic <sascha93101(a)yahoo.com> Date: Wed Jan 18 14:22:27 2006 +0100 msvcrt: In _tempnam, if TMP is set, it has a precedence over the parameter dir. --- dlls/msvcrt/file.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0b42816..1f751f8 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1887,6 +1887,9 @@ __int64 _telli64(int fd) char *_tempnam(const char *dir, const char *prefix) { char tmpbuf[MAX_PATH]; + const char *tmp_dir = MSVCRT_getenv("TMP"); + + if (tmp_dir) dir = tmp_dir; TRACE("dir (%s) prefix (%s)\n",dir,prefix); if (GetTempFileNameA(dir,prefix,0,tmpbuf))

1 0

Robert Shearman : ntdll: Loader optimization.
by Alexandre Julliard 18 Jan '06

18 Jan '06

Module: wine Branch: refs/heads/master Commit: 2d08465b81d90e8cf1389b5abf5abefee7ba6462 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d08465b81d90e8cf1389b5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jan 18 14:22:19 2006 +0100 ntdll: Loader optimization. Optimize for the case where a DLL with no path is requested and it is already loaded. --- dlls/ntdll/loader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 47cc1da..5996523 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1487,6 +1487,12 @@ static NTSTATUS find_dll_file( const WCH } nt_name.Buffer = NULL; + + if (!contains_path( libname )) + { + if ((*pwm = find_basename_module( libname )) != NULL) goto found; + } + if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) { /* we need to search for it */ @@ -1496,11 +1502,6 @@ static NTSTATUS find_dll_file( const WCH if (len >= *size) goto overflow; if ((*pwm = find_fullname_module( filename )) != NULL) goto found; - /* check for already loaded module in a different path */ - if (!contains_path( libname )) - { - if ((*pwm = find_basename_module( file_part )) != NULL) goto found; - } if (!RtlDosPathNameToNtPathName_U( filename, &nt_name, NULL, NULL )) { RtlFreeHeap( GetProcessHeap(), 0, dllname ); @@ -1525,7 +1526,6 @@ static NTSTATUS find_dll_file( const WCH len = strlenW(libname) * sizeof(WCHAR); if (len >= *size) goto overflow; strcpyW( filename, libname ); - *pwm = find_basename_module( filename ); goto found; } }

1 0

Jacek Caban : shdocvw: Deactivate document in SetClientSite if ClientSite is NULL.
by Alexandre Julliard 18 Jan '06

18 Jan '06

Module: wine Branch: refs/heads/master Commit: 47f796c6293c8a174006b2ab6de1316c407ab29e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=47f796c6293c8a174006b2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 18 13:22:52 2006 +0100 shdocvw: Deactivate document in SetClientSite if ClientSite is NULL. Fix ref counting. --- dlls/shdocvw/client.c | 1 + dlls/shdocvw/dochost.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/events.c | 1 + dlls/shdocvw/oleobject.c | 16 +++++++++++--- dlls/shdocvw/shdocvw.h | 1 + 5 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 170a9a9..842c184 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -204,6 +204,7 @@ static HRESULT WINAPI InPlaceSite_GetWin TRACE("(%p)->(%p %p %p %p %p)\n", This, ppFrame, ppDoc, lprcPosRect, lprcClipRect, lpFrameInfo); + IOleInPlaceFrame_AddRef(INPLACEFRAME(This)); *ppFrame = INPLACEFRAME(This); *ppDoc = NULL; diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index d5dc95c..57b8660 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -154,6 +154,58 @@ void create_doc_view_hwnd(WebBrowser *Th NULL, shdocvw_hinstance, This); } +void deactivate_document(WebBrowser *This) +{ + IOleInPlaceObjectWindowless *winobj; + IOleObject *oleobj = NULL; + IHlinkTarget *hlink = NULL; + HRESULT hres; + + if(This->view) + IOleDocumentView_UIActivate(This->view, FALSE); + + hres = IUnknown_QueryInterface(This->client, &IID_IOleInPlaceObjectWindowless, + (void**)&winobj); + if(SUCCEEDED(hres)) { + IOleInPlaceObjectWindowless_InPlaceDeactivate(winobj); + IOleInPlaceObjectWindowless_Release(winobj); + } + + if(This->view) { + IOleDocumentView_Show(This->view, FALSE); + IOleDocumentView_CloseView(This->view, 0); + IOleDocumentView_SetInPlaceSite(This->view, NULL); + IOleDocumentView_Release(This->view); + This->view = NULL; + } + + hres = IUnknown_QueryInterface(This->document, &IID_IOleObject, (void**)&oleobj); + if(SUCCEEDED(hres)) + IOleObject_Close(oleobj, OLECLOSE_NOSAVE); + + hres = IUnknown_QueryInterface(This->document, &IID_IHlinkTarget, (void**)&hlink); + if(SUCCEEDED(hres)) { + IHlinkTarget_SetBrowseContext(hlink, NULL); + IHlinkTarget_Release(hlink); + } + + if(oleobj) { + IOleClientSite *client_site = NULL; + + IOleObject_GetClientSite(oleobj, &client_site); + if(client_site) { + if(client_site == CLIENTSITE(This)) + IOleObject_SetClientSite(oleobj, NULL); + IOleClientSite_Release(client_site); + } + + IOleObject_Release(oleobj); + } + + IUnknown_Release(This->document); + This->document = NULL; +} + #define DOCHOSTUI_THIS(iface) DEFINE_THIS(WebBrowser, DocHostUIHandler, iface) static HRESULT WINAPI DocHostUIHandler_QueryInterface(IDocHostUIHandler2 *iface, diff --git a/dlls/shdocvw/events.c b/dlls/shdocvw/events.c index 5733447..b7f93b7 100644 --- a/dlls/shdocvw/events.c +++ b/dlls/shdocvw/events.c @@ -177,6 +177,7 @@ static HRESULT WINAPI ConnectionPoint_Ge TRACE("(%p)->(%p)\n", This, ppCPC); *ppCPC = CONPTCONT(This->webbrowser); + IConnectionPointContainer_AddRef(CONPTCONT(This->webbrowser)); return S_OK; } diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index a20678a..58eb6ef 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -130,18 +130,26 @@ static HRESULT WINAPI OleObject_SetClien if(This->client == pClientSite) return S_OK; - if(This->doc_view_hwnd) + if(This->doc_view_hwnd) { DestroyWindow(This->doc_view_hwnd); - if(This->shell_embedding_hwnd) + This->doc_view_hwnd = NULL; + } + if(This->shell_embedding_hwnd) { DestroyWindow(This->shell_embedding_hwnd); + This->shell_embedding_hwnd = NULL; + } if(This->client) IOleClientSite_Release(This->client); - This->client = pClientSite; - if(!pClientSite) + if(!pClientSite) { + if(This->document) + deactivate_document(This); + This->client = NULL; return S_OK; + } + This->client = pClientSite; IOleClientSite_AddRef(pClientSite); create_shell_embedding_hwnd(This); diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 735c1c4..49508b8 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -158,6 +158,7 @@ void WebBrowser_ClientSite_Destroy(WebBr HRESULT WebBrowser_Create(IUnknown*,REFIID,void**); void create_doc_view_hwnd(WebBrowser *This); +void deactivate_document(WebBrowser*); void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); #define WB_WM_NAVIGATE2 (WM_USER+100)

1 0

Alexandre Julliard : gdi: Ignore a few more metafile escapes.
by Alexandre Julliard 18 Jan '06

18 Jan '06

Module: wine Branch: refs/heads/master Commit: bde6885161ea6a21cfea5cd2678a02cf3f736267 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bde6885161ea6a21cfea5cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 18 13:23:20 2006 +0100 gdi: Ignore a few more metafile escapes. --- dlls/gdi/metafile.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/metafile.c b/dlls/gdi/metafile.c index 55c8296..80de9c7 100644 --- a/dlls/gdi/metafile.c +++ b/dlls/gdi/metafile.c @@ -865,6 +865,8 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, case META_ESCAPE: switch (mr->rdParm[0]) { case GETSCALINGFACTOR: /* get function ... would just NULL dereference */ + case GETPHYSPAGESIZE: + case GETPRINTINGOFFSET: return FALSE; case SETABORTPROC: FIXME("Filtering Escape(SETABORTPROC), possible virus?\n");

1 0