February 2006 - Wine-Commits

Roderick Colenbrander : d3d8: Header cleanup.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: a9665eda799e391fcb2bfd72eba83dbc8098cedb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a9665eda799e391fcb2bfd7… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Feb 27 17:46:12 2006 +0100 d3d8: Header cleanup. Remove unneeded structures and functions from d3d8_private.h, clean some datatypes up and remove d3dcore_gl.h. --- dlls/d3d8/d3d8_private.h | 992 ---------------------------------------------- dlls/d3d8/d3dcore_gl.h | 64 --- 2 files changed, 4 insertions(+), 1052 deletions(-) delete mode 100644 dlls/d3d8/d3dcore_gl.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a9665eda799e391fcb2…

1 0

Jacek Caban : mshtml: Added nsIInterfaceRequestor implementation.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: 91369e20e756313f586de03da1354b4f621985fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91369e20e756313f586de03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 27 19:08:23 2006 +0100 mshtml: Added nsIInterfaceRequestor implementation. --- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/nsembed.c | 49 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/nsiface.idl | 29 ++++++++++++++++++++++++- 3 files changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 59d1464..478c91d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -84,6 +84,7 @@ struct NSContainer { const nsIContextMenuListenerVtbl *lpContextMenuListenerVtbl; const nsIURIContentListenerVtbl *lpURIContentListenerVtbl; const nsIEmbeddingSiteWindowVtbl *lpEmbeddingSiteWindowVtbl; + const nsIInterfaceRequestorVtbl *lpInterfaceRequestorVtbl; nsIWebBrowser *webbrowser; nsIWebNavigation *navigation; @@ -125,6 +126,7 @@ struct NSContainer { #define NSCML(x) ((nsIContextMenuListener*) &(x)->lpContextMenuListenerVtbl) #define NSURICL(x) ((nsIURIContentListener*) &(x)->lpURIContentListenerVtbl) #define NSEMBWNDS(x) ((nsIEmbeddingSiteWindow*) &(x)->lpEmbeddingSiteWindowVtbl) +#define NSIFACEREQ(x) ((nsIInterfaceRequestor*) &(x)->lpInterfaceRequestorVtbl) #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index beffd86..25b44ad 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1,5 +1,5 @@ /* - * Copyright 2005 Jacek Caban + * Copyright 2005-2006 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -457,6 +457,9 @@ static nsresult NSAPI nsWebBrowserChrome }else if(IsEqualGUID(&IID_nsIEmbeddingSiteWindow, riid)) { TRACE("(%p)->(IID_nsIEmbeddingSiteWindow %p)\n", This, result); *result = NSEMBWNDS(This); + }else if(IsEqualGUID(&IID_nsIInterfaceRequestor, riid)) { + TRACE("(%p)->(IID_nsIInterfaceRequestor %p)\n", This, result); + *result = NSIFACEREQ(This); } if(*result) { @@ -916,6 +919,49 @@ static const nsIEmbeddingSiteWindowVtbl nsEmbeddingSiteWindow_GetSiteWindow }; +#define NSIFACEREQ_THIS(iface) DEFINE_THIS(NSContainer, InterfaceRequestor, iface) + +static nsresult NSAPI nsInterfaceRequestor_QueryInterface(nsIInterfaceRequestor *iface, + nsIIDRef riid, nsQIResult result) +{ + NSContainer *This = NSIFACEREQ_THIS(iface); + return nsIWebBrowserChrome_QueryInterface(NSWBCHROME(This), riid, result); +} + +static nsrefcnt NSAPI nsInterfaceRequestor_AddRef(nsIInterfaceRequestor *iface) +{ + NSContainer *This = NSIFACEREQ_THIS(iface); + return nsIWebBrowserChrome_AddRef(NSWBCHROME(This)); +} + +static nsrefcnt NSAPI nsInterfaceRequestor_Release(nsIInterfaceRequestor *iface) +{ + NSContainer *This = NSIFACEREQ_THIS(iface); + return nsIWebBrowserChrome_Release(NSWBCHROME(This)); +} + +static nsresult NSAPI nsInterfaceRequestor_GetInterface(nsIInterfaceRequestor *iface, + nsIIDRef riid, nsQIResult result) +{ + NSContainer *This = NSIFACEREQ_THIS(iface); + + if(IsEqualGUID(&IID_nsIDOMWindow, riid)) { + FIXME("(%p)->(IID_nsIDOMWindow %p)\n", This, result); + return NS_NOINTERFACE; + } + + return nsIWebBrowserChrome_QueryInterface(NSWBCHROME(This), riid, result); +} + +#undef NSIFACEREQ_THIS + +static const nsIInterfaceRequestorVtbl nsInterfaceRequestorVtbl = { + nsInterfaceRequestor_QueryInterface, + nsInterfaceRequestor_AddRef, + nsInterfaceRequestor_Release, + nsInterfaceRequestor_GetInterface +}; + void NSContainer_Create(HTMLDocument *doc) { nsIWebBrowserSetup *wbsetup; @@ -931,6 +977,7 @@ void NSContainer_Create(HTMLDocument *do ret->lpContextMenuListenerVtbl = &nsContextMenuListenerVtbl; ret->lpURIContentListenerVtbl = &nsURIContentListenerVtbl; ret->lpEmbeddingSiteWindowVtbl = &nsEmbeddingSiteWindowVtbl; + ret->lpInterfaceRequestorVtbl = &nsInterfaceRequestorVtbl; ret->doc = doc; ret->ref = 1; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 8afca49..6c483aa 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -68,7 +68,6 @@ interface nsISupports /* Currently we don't need a full declaration of these interfaces */ typedef nsISupports nsIWeakReference; -typedef nsISupports nsIDOMWindow; typedef nsISupports nsIDOMDocument; typedef nsISupports nsISHistory; typedef nsISupports nsISimpleEnumerator; @@ -81,6 +80,9 @@ typedef nsISupports nsIDOMAbstractView; typedef nsISupports nsIStreamListener; typedef nsISupports nsIHttpHeaderVisitor; typedef nsISupports nsIRequestObserver; +typedef nsISupports nsIDOMBarProp; +typedef nsISupports nsIDOMWindowCollection; +typedef nsISupports nsISelection; [ object, @@ -297,6 +299,31 @@ interface nsIUploadChannel : nsISupports [ object, + uuid(a6cf906b-15b3-11d2-932e-00805f8add32) +] +interface nsIDOMWindow : nsISupports +{ + nsresult GetDocument(nsIDOMDocument **aDocument); + nsresult GetParent(nsIDOMWindow **aParent); + nsresult GetTop(nsIDOMWindow **aTop); + nsresult GetScrollbars(nsIDOMBarProp **aScrollbars); + nsresult GetFrames(nsIDOMWindowCollection **aFrames); + nsresult GetName(nsAString *aName); + nsresult SetName(const nsAString *aName); + nsresult GetTextZoom(float *aTextZoom); + nsresult SetTextZoom(float aTextZoom); + nsresult GetScrollX(PRInt32 *aScrollX); + nsresult GetScrollY(PRInt32 *aScrollY); + nsresult ScrollTo(PRInt32 xScroll, PRInt32 yScroll); + nsresult ScrollBy(PRInt32 xScrollDif, PRInt32 yScrollDif); + nsresult GetSelection(nsISelection **_retval); + nsresult ScrollByLines(PRInt32 numLines); + nsresult ScrollByPages(PRInt32 numPages); + nsresult SizeToContent(); +} + +[ + object, uuid(94928ab3-8b63-11d3-989d-001083010e9b) ] interface nsIURIContentListener : nsISupports

1 0

Jacek Caban : mshtml: Improve ConfirmEx hack.
by Alexandre Julliard Feb. 28, 2006

Feb. 28, 2006

Module: wine Branch: refs/heads/master Commit: a611b20c2621d4fccfa2b07d4ee357035b10e8db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a611b20c2621d4fccfa2b07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 24 22:21:03 2006 +0100 mshtml: Improve ConfirmEx hack. --- dlls/mshtml/nsservice.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsservice.c b/dlls/mshtml/nsservice.c index 68b9de0..faa69ce 100644 --- a/dlls/mshtml/nsservice.c +++ b/dlls/mshtml/nsservice.c @@ -122,14 +122,14 @@ static nsresult NSAPI nsPromptService_Co * This is really very very ugly hack!!! */ - if(!memcmp(aButton0Title, wszContinue, sizeof(wszContinue))) + if(aButton0Title && !memcmp(aButton0Title, wszContinue, sizeof(wszContinue))) *_retval = 0; - else if(!memcmp(aButton1Title, wszContinue, sizeof(wszContinue))) + else if(aButton1Title && !memcmp(aButton1Title, wszContinue, sizeof(wszContinue))) *_retval = 1; - else if(!memcmp(aButton2Title, wszContinue, sizeof(wszContinue))) + else if(aButton2Title && !memcmp(aButton2Title, wszContinue, sizeof(wszContinue))) *_retval = 2; - else - *_retval = 0; + /* else + * let's hope that _retval is set to the default value */ return NS_OK; }

1 0

lostwages/wwn wn20060226_306.xml
by Jeremy Newman Feb. 27, 2006

Feb. 27, 2006

ChangeSet ID: 23303 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/02/27 16:09:53 Modified files: wwn : wn20060226_306.xml Log message: Francois Gouget <fgouget(a)free.fr> Spelling fixes. Patch: http://cvs.winehq.org/patch.py?id=23303 Old revision New revision Changes Path 1.2 1.3 +8 -8 lostwages/wwn/wn20060226_306.xml Index: lostwages/wwn/wn20060226_306.xml diff -u -p lostwages/wwn/wn20060226_306.xml:1.2 lostwages/wwn/wn20060226_306.xml:1.3 --- lostwages/wwn/wn20060226_306.xml:1.2 27 Feb 2006 22: 9:53 -0000 +++ lostwages/wwn/wn20060226_306.xml 27 Feb 2006 22: 9:53 -0000 @@ -116,7 +116,7 @@ last week that Google will be working wi under Linux. It was followed by reports in <a href="http://www.pcmag.com/article2/0,1895,1926510,00.asp">PC Magazine</a> and <a href="http://www.techspot.com/news/20454-googles-picasa-under-linux-will-use-wine…">TechSpot</a>, -though they simply the other article. If you haven't used +though they simply copied the other article. If you haven't used <a href="http://picasa.google.com/">Picasa</a>, I'd recommend downloading it and trying it with Wine. It actually works really well out of the box and it's a great little program. Personally, I still prefer something like @@ -174,7 +174,7 @@ where this is headed. Patch #1: WineD3D CopyRects <quote who="Roderick Colenbrander"> -This patch is based on Oliver Stieber his D3D8->WineD3D work and adds the +This patch is based on Oliver Stieber's D3D8->WineD3D work and adds the CopyRects method required by D3D8 to WineD3D. </quote> @@ -207,14 +207,14 @@ base type of which all other texture typ <quote who="Roderick Colenbrander"> Both our d3d8 and wined3d dlls contain a routine which detects the capabilities of the videocard as advertised by the OpenGL driver. Right now -varies parts of D3D8 have been moved over to WineD3D. Varies pieces of the +various parts of D3D8 have been moved over to WineD3D. Various pieces of the code ported to WineD3D use these capabilites. Right now D3D8 contains a list with capabilities but doesn't share it with WineD3D. Because of this some -pieces of code failed for instance wined3d's surface code for each I posted a +pieces of code failed, for instance wined3d's surface code for which I posted a workaround last week. This patch moves the capability detection code over to WineD3D and lets the -few existing parts which need the capabiliteis use the WineD3D capability +few existing parts which need the capabilities use the WineD3D capability structure (gl_info). This info structure contains next to 'flags' inidicating certain features also all GL/GLX functions pointers. Because D3D8 moves over to the wined3d gl_info structure all the gl prototypes in d3dcore_gl.h were @@ -224,8 +224,8 @@ unneeded and removed. Patch #5: Everything Else <quote who="Roderick Colenbrander"> -The past few weeks I have trying to split Oliver Stieber's d3d8 patches in -small pieces. The patches I sent so far me oved big parts of the surface, +The past few weeks I have been trying to split Oliver Stieber's d3d8 patches in +small pieces. The patches I sent so far moved big parts of the surface, texture and capability detection code over to wined3d (roughly 1/3th of the total patch) These parts could safely be moved as they didn't depend on much other d3d8/wined3d functionality. The remaining texture, shader, primitive @@ -233,7 +233,7 @@ drawing code depends on stateblocks and over yet. If I would move over for instance the remaining texture code the stateblock/swapchain code needs to moved too. The current d3d8 shader code would need to be made compatible with the wined3d stateblocks (which isn't -possible becaue various datatypes in the stateblock changed; the wined3d +possible because various datatypes in the stateblock changed; the wined3d stateblock uses incompatible wined3d datatypes which the shader code doesn't understand)

1 0

lostwages/wwn wn20060226_306.xml
by WineHQ Feb. 27, 2006

Feb. 27, 2006

ChangeSet ID: 23302 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/02/27 09:37:32 Modified files: wwn : wn20060226_306.xml Log message: Fix some typos in #306. Patch: http://cvs.winehq.org/patch.py?id=23302 Old revision New revision Changes Path 1.1 1.2 +5 -5 lostwages/wwn/wn20060226_306.xml Index: lostwages/wwn/wn20060226_306.xml diff -u -p lostwages/wwn/wn20060226_306.xml:1.1 lostwages/wwn/wn20060226_306.xml:1.2 --- lostwages/wwn/wn20060226_306.xml:1.1 27 Feb 2006 15:37:32 -0000 +++ lostwages/wwn/wn20060226_306.xml 27 Feb 2006 15:37:32 -0000 @@ -121,8 +121,8 @@ though they simply the other article. I it and trying it with Wine. It actually works really well out of the box and it's a great little program. Personally, I still prefer something like <a href="http://www.gnome.org/gnome-office/eog.shtml">EoG</a> for simple -image viewing but Picasa really has a lot more features. I've used Picasa -a lot with Wine, so it's not a stretch that CodeWeavers would consider +image viewing but Picasa really has a lot more features. Given how well it +runs with Wine, it's not a stretch that CodeWeavers would consider working on it. What's not clear is whether this is going to be a Winelib or Wine application. I suspect it's going to be a straight up Windows application @@ -149,7 +149,7 @@ the following changes: Go forth and <a href="http://www.winehq.com/site/download">download</a>. Finally, I'd like to point out that Zack Brown's -<a href="http://www.kerneltraffic.org">">Kernel Traffic</a> site is on +<a href="http://www.kerneltraffic.org">Kernel Traffic</a> site is on hiatus. While Zack will continue to post these as I write them, there's always a chance his site will go offline. If so, keep in mind that you can continue to find them on <a href="http://www.winehq.org">WineHQ</a>. @@ -275,7 +275,7 @@ Just wanted to report my wine experience I've run Lotus Notes with wine for a long time. What I notice with wine-0.9.8 (though this was present in a few releases before but not in all releases): <ul> -<li> Wine is noticalby faster than the snapshot 200412xx</li> +<li> Wine is noticably faster than the snapshot 200412xx</li> <li> I need to select win98 to get the file select box working</li> <li> I need to set WINEDLLOVERRIDES="usp10=n"</li> <li> Cut and paste between X and wine applications works only when selecting the @@ -311,7 +311,7 @@ Rpaths is not useful when WINE building Will I add <tt>--disable-rpath</tt> of there is a better suggestion? </quote> -Alexandre wanted to know why it wouldn't be useful and Vitaly answer: +Alexandre wanted to know why it wouldn't be useful and Vitaly answered: <quote who="Vitaly Lipatov"> It is only useful when we run wine from the source tree.

1 0

Francois Gouget : advpack: Prepare the unicodification of advpack.dll.
by Alexandre Julliard Feb. 27, 2006

Feb. 27, 2006

Module: wine Branch: refs/heads/master Commit: be6d891f0d641e7e24989b3ec463553378865024 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=be6d891f0d641e7e24989b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 24 16:09:42 2006 +0100 advpack: Prepare the unicodification of advpack.dll. All functions that manipulate strings should have an Ansi and a Unicode variant. Forward the unqualified dll entry points to the Ansi variant for backward compatibility. We're not allowed to use unqualified entry points in Wine, so change RegInstall() calls to RegInstallA(). Update win32.api. --- dlls/advpack/advpack.c | 40 ++++---- dlls/advpack/advpack.spec | 100 +++++++++++++++----- dlls/advpack/files.c | 50 +++++----- dlls/advpack/install.c | 16 ++- dlls/advpack/reg.c | 22 ++-- dlls/mshtml/main.c | 8 +- dlls/urlmon/regsvr.c | 8 +- include/advpub.h | 228 +++++++++++++++++++++++++++++++++------------ tools/winapi/win32.api | 10 +- 9 files changed, 322 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=be6d891f0d641e7e249…

1 0

Eric Pouech : winedbg: Auto mode.
by Alexandre Julliard Feb. 27, 2006

Feb. 27, 2006

Module: wine Branch: refs/heads/master Commit: 893d7524c73aa66552d92bd1bd1362c7f9d10ee2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=893d7524c73aa66552d92bd… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Feb 24 22:15:08 2006 +0100 winedbg: Auto mode. - rewrite auto mode startup - move part of auto handling to tgt_active.c --- programs/winedbg/debugger.h | 3 + programs/winedbg/tgt_active.c | 12 ++++ programs/winedbg/winedbg.c | 116 +++++++++++++++++++++-------------------- 3 files changed, 74 insertions(+), 57 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 91b4b70..38ad642 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -372,8 +372,9 @@ extern void dbg_run_debuggee extern void dbg_wait_next_exception(DWORD cont, int count, int mode); extern enum dbg_start dbg_active_attach(int argc, char* argv[]); extern enum dbg_start dbg_active_launch(int argc, char* argv[]); +extern enum dbg_start dbg_active_auto(int argc, char* argv[]); /* temporary for tgt_active.c */ -extern enum dbg_action_mode {none_mode = 0, winedbg_mode, automatic_mode} dbg_action_mode; +extern enum dbg_action_mode {winedbg_mode, automatic_mode} dbg_action_mode; extern unsigned dbg_main_loop(HANDLE); /* tgt_minidump.c */ diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 335ae5c..226227c 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -872,3 +872,15 @@ enum dbg_start dbg_active_launch(int dbg_last_cmd_line = cmd_line; return start_ok; } + +/****************************************************************** + * dbg_active_auto + * + * Starts (<pid> or <pid> <evt>) in automatic mode + */ +enum dbg_start dbg_active_auto(int argc, char* argv[]) +{ + argc--; argv++; + dbg_action_mode = automatic_mode; + return dbg_active_attach(argc, argv); +} diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 1978d37..e8678c4 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -462,8 +462,9 @@ extern struct backend_cpu be_alpha; int main(int argc, char** argv) { - int retv = 0; - HANDLE hFile = INVALID_HANDLE_VALUE; + int retv = 0; + HANDLE hFile = INVALID_HANDLE_VALUE; + enum dbg_start ds; #ifdef __i386__ be_cpu = &be_i386; @@ -489,71 +490,74 @@ int main(int argc, char** argv) if (retv == -1) dbg_winedbg_usage(); return retv; } + dbg_init_console(); + dbg_action_mode = winedbg_mode; - /* parse options */ - while (argc > 0 && argv[0][0] == '-') + SymSetOptions((SymGetOptions() & ~(SYMOPT_UNDNAME)) | + SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS | SYMOPT_AUTO_PUBLICS); + + if (argc && !strcmp(argv[0], "--auto")) + { + /* force some internal variables */ + DBG_IVAR(BreakOnDllLoad) = 0; + dbg_houtput = GetStdHandle(STD_ERROR_HANDLE); + ds = dbg_active_auto(argc, argv); + } + else { - if (!strcmp(argv[0], "--command")) + /* parse options */ + while (argc > 0 && argv[0][0] == '-') { - char path[MAX_PATH], file[MAX_PATH]; - DWORD w; - - GetTempPath(sizeof(path), path); - GetTempFileName(path, "WD", 0, file); - argc--; argv++; - hFile = CreateFileA(file, GENERIC_READ|GENERIC_WRITE|DELETE, FILE_SHARE_DELETE, - NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, 0); - if (hFile == INVALID_HANDLE_VALUE) + if (!strcmp(argv[0], "--command")) { - dbg_printf("Couldn't open temp file %s (%lu)\n", file, GetLastError()); - return 1; - } - WriteFile(hFile, argv[0], strlen(argv[0]), &w, 0); - WriteFile(hFile, "\nquit\n", 6, &w, 0); - SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + char path[MAX_PATH], file[MAX_PATH]; + DWORD w; - argc--; argv++; - continue; - } - if (!strcmp(argv[0], "--file")) - { - argc--; argv++; - hFile = CreateFileA(argv[0], GENERIC_READ|DELETE, 0, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - if (hFile == INVALID_HANDLE_VALUE) + GetTempPath(sizeof(path), path); + GetTempFileName(path, "WD", 0, file); + argc--; argv++; + hFile = CreateFileA(file, GENERIC_READ|GENERIC_WRITE|DELETE, FILE_SHARE_DELETE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, 0); + if (hFile == INVALID_HANDLE_VALUE) + { + dbg_printf("Couldn't open temp file %s (%lu)\n", file, GetLastError()); + return 1; + } + WriteFile(hFile, argv[0], strlen(argv[0]), &w, 0); + WriteFile(hFile, "\nquit\n", 6, &w, 0); + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + + argc--; argv++; + continue; + } + if (!strcmp(argv[0], "--file")) { - dbg_printf("Couldn't open file %s (%lu)\n", argv[0], GetLastError()); - return 1; + argc--; argv++; + hFile = CreateFileA(argv[0], GENERIC_READ|DELETE, 0, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); + if (hFile == INVALID_HANDLE_VALUE) + { + dbg_printf("Couldn't open file %s (%lu)\n", argv[0], GetLastError()); + return 1; + } + argc--; argv++; + continue; } - argc--; argv++; - continue; - } - if (!strcmp(argv[0], "--auto")) - { - if (dbg_action_mode != none_mode) return dbg_winedbg_usage(); - dbg_action_mode = automatic_mode; - /* force some internal variables */ - DBG_IVAR(BreakOnDllLoad) = 0; - argc--; argv++; - dbg_houtput = GetStdHandle(STD_ERROR_HANDLE); - continue; + return dbg_winedbg_usage(); } - return dbg_winedbg_usage(); + if (!argc) ds = start_ok; + else if ((ds = dbg_active_attach(argc, argv)) == start_error_parse) + ds = dbg_active_launch(argc, argv); } - - if (dbg_action_mode == none_mode) dbg_action_mode = winedbg_mode; - if (!argc || dbg_active_attach(argc, argv) == start_ok || - dbg_active_launch(argc, argv) == start_ok) + switch (ds) { - dbg_init_console(); - - SymSetOptions((SymGetOptions() & ~(SYMOPT_UNDNAME)) | - SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS | SYMOPT_AUTO_PUBLICS); - - retv = dbg_main_loop(hFile); - /* don't save modified variables in auto mode */ - if (dbg_action_mode != automatic_mode) dbg_save_internal_vars(); + case start_ok: break; + case start_error_parse: return dbg_winedbg_usage(); + case start_error_init: return -1; } + retv = dbg_main_loop(hFile); + /* don't save modified variables in auto mode */ + if (dbg_action_mode != automatic_mode) dbg_save_internal_vars(); return retv; }

1 0

Eric Pouech : winedbg: Move gdb command line handling.
by Alexandre Julliard Feb. 27, 2006

Feb. 27, 2006

Module: wine Branch: refs/heads/master Commit: a67f8e862eac26b7e1d07530f0ed461e7f7a05c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a67f8e862eac26b7e1d0753… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Feb 24 22:14:36 2006 +0100 winedbg: Move gdb command line handling. - moves gdb command line handling to gdbproxy.c - using manifest constants to make code more readable --- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/gdbproxy.c | 35 ++++++++++++++++++++++++++++++++--- programs/winedbg/winedbg.c | 35 +++++++++-------------------------- 3 files changed, 43 insertions(+), 31 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index fbe8ea2..91b4b70 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -373,7 +373,7 @@ extern void dbg_wait_next_ex extern enum dbg_start dbg_active_attach(int argc, char* argv[]); extern enum dbg_start dbg_active_launch(int argc, char* argv[]); /* temporary for tgt_active.c */ -extern enum dbg_action_mode {none_mode = 0, winedbg_mode, automatic_mode, gdb_mode} dbg_action_mode; +extern enum dbg_action_mode {none_mode = 0, winedbg_mode, automatic_mode} dbg_action_mode; extern unsigned dbg_main_loop(HANDLE); /* tgt_minidump.c */ @@ -414,7 +414,7 @@ extern void dbg_del_thread(s extern BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE* imh_mod); /* gdbproxy.c */ -extern BOOL gdb_remote(unsigned int); +extern int gdb_main(int argc, char* argv[]); static inline BOOL dbg_read_memory(const void* addr, void* buffer, size_t len) { diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 6a448d3..3d5a9cc 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2042,6 +2042,9 @@ static int fetch_data(struct gdb_context return gdbctx->in_len - in_len; } +#define FLAG_NO_START 1 +#define FLAG_WITH_XTERM 2 + static BOOL gdb_exec(const char* wine_path, unsigned port, unsigned flags) { char buf[MAX_PATH]; @@ -2071,7 +2074,7 @@ static BOOL gdb_exec(const char* wine_pa /* tell gdb to delete this file when done handling it... */ fprintf(f, "shell rm -f \"%s\"\n", buf); fclose(f); - if (flags & 2) + if (flags & FLAG_WITH_XTERM) execlp("xterm", "xterm", "-e", gdb_path, "-x", buf, NULL); else execlp(gdb_path, gdb_path, "-x", buf, NULL); @@ -2106,7 +2109,7 @@ static BOOL gdb_startup(struct gdb_conte if (!dbg_get_debuggee_info(gdbctx->process->handle, &imh_mod)) return FALSE; /* step 4: fire up gdb (if requested) */ - if (flags & 1) + if (flags & FLAG_NO_START) fprintf(stderr, "target remote localhost:%d\n", ntohs(s_addrs.sin_port)); else switch (fork()) @@ -2205,7 +2208,7 @@ static BOOL gdb_init_context(struct gdb_ return TRUE; } -BOOL gdb_remote(unsigned flags) +static int gdb_remote(unsigned flags) { struct pollfd pollfd; struct gdb_context gdbctx; @@ -2248,3 +2251,29 @@ BOOL gdb_remote(unsigned flags) wait(NULL); return 0; } + +int gdb_main(int argc, char* argv[]) +{ + unsigned gdb_flags = 0; + + argc--; argv++; + while (argc > 0 && argv[0][0] == '-') + { + if (strcmp(argv[0], "--no-start") == 0) + { + gdb_flags |= FLAG_NO_START; + argc--; argv++; + continue; + } + if (strcmp(argv[0], "--with-xterm") == 0) + { + gdb_flags |= FLAG_WITH_XTERM; + argc--; argv++; + continue; + } + return -1; + } + if (dbg_active_attach(argc, argv) || dbg_active_launch(argc, argv)) + return gdb_remote(gdb_flags); + return -1; +} diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index e1ffe60..1978d37 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -446,7 +446,7 @@ static void dbg_init_console(void) static int dbg_winedbg_usage(void) { dbg_printf("Usage: winedbg [--command cmd|--file file|--auto] [--gdb [--no-start] [--with-xterm]] cmdline\n"); - return 1; + return -1; } struct backend_cpu* be_cpu; @@ -462,8 +462,7 @@ extern struct backend_cpu be_alpha; int main(int argc, char** argv) { - DWORD retv = 0; - unsigned gdb_flags = 0; + int retv = 0; HANDLE hFile = INVALID_HANDLE_VALUE; #ifdef __i386__ @@ -484,6 +483,13 @@ int main(int argc, char** argv) /* as we don't care about exec name */ argc--; argv++; + if (argc && !strcmp(argv[0], "--gdb")) + { + retv = gdb_main(argc, argv); + if (retv == -1) dbg_winedbg_usage(); + return retv; + } + /* parse options */ while (argc > 0 && argv[0][0] == '-') { @@ -532,25 +538,6 @@ int main(int argc, char** argv) dbg_houtput = GetStdHandle(STD_ERROR_HANDLE); continue; } - if (!strcmp(argv[0], "--gdb")) - { - if (dbg_action_mode != none_mode) return dbg_winedbg_usage(); - dbg_action_mode = gdb_mode; - argc--; argv++; - continue; - } - if (strcmp(argv[0], "--no-start") == 0 && dbg_action_mode == gdb_mode) - { - gdb_flags |= 1; - argc--; argv++; - continue; - } - if (strcmp(argv[0], "--with-xterm") == 0 && dbg_action_mode == gdb_mode) - { - gdb_flags |= 2; - argc--; argv++; - continue; - } return dbg_winedbg_usage(); } @@ -558,10 +545,6 @@ int main(int argc, char** argv) if (!argc || dbg_active_attach(argc, argv) == start_ok || dbg_active_launch(argc, argv) == start_ok) { - /* don't save local vars in gdb mode */ - if (dbg_action_mode == gdb_mode && dbg_curr_pid) - return gdb_remote(gdb_flags); - dbg_init_console(); SymSetOptions((SymGetOptions() & ~(SYMOPT_UNDNAME)) |

1 0

Eric Pouech : winedbg: Active and command line.
by Alexandre Julliard Feb. 27, 2006

Feb. 27, 2006

Module: wine Branch: refs/heads/master Commit: ac7be1e91b2762080971bc157d4d8d43d3ab6092 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac7be1e91b2762080971bc1… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Feb 24 22:14:05 2006 +0100 winedbg: Active and command line. - move process attachment and process creation (related to command line handling) from winedbg.c to tgt_active.c - tidy up argument parsing --- programs/winedbg/debugger.h | 6 +- programs/winedbg/tgt_active.c | 95 ++++++++++++++++++++++++++++++++- programs/winedbg/winedbg.c | 119 ++++++++++------------------------------- 3 files changed, 126 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ac7be1e91b276208097…

1 0

Eric Pouech : winedbg: Cleanup the process_io usage.
by Alexandre Julliard Feb. 27, 2006

Feb. 27, 2006

Module: wine Branch: refs/heads/master Commit: f16f847cc7254f5c229963cdaea1f7ec4782e749 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f16f847cc7254f5c229963c… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Feb 24 22:13:34 2006 +0100 winedbg: Cleanup the process_io usage. - made be_process_io references 'const' - make use of it for dbg_read_memory and dbg_write_memory --- programs/winedbg/be_alpha.c | 8 ++++---- programs/winedbg/be_cpu.h | 4 ++-- programs/winedbg/be_i386.c | 4 ++-- programs/winedbg/be_ppc.c | 4 ++-- programs/winedbg/debugger.h | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/winedbg/be_alpha.c b/programs/winedbg/be_alpha.c index 98bbe9a..221fd46 100644 --- a/programs/winedbg/be_alpha.c +++ b/programs/winedbg/be_alpha.c @@ -82,7 +82,7 @@ static void be_alpha_disasm_one_insn(ADD dbg_printf("Disasm NIY\n"); } -static unsigned be_alpha_insert_Xpoint(HANDLE hProcess, struct be_process_io* pio, +static unsigned be_alpha_insert_Xpoint(HANDLE hProcess, const struct be_process_io* pio, CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long* val, unsigned size) { @@ -104,9 +104,9 @@ static unsigned be_alpha_insert_Xpoint(H return 1; } -static unsigned be_alpha_remove_Xpoint(HANDLE hProcess, CONTEXT* ctx, - enum be_xpoint_type type, void* addr, - unsigned long val, unsigned size) +static unsigned be_alpha_remove_Xpoint(HANDLE hProcess, const struct be_process_io* pio, + CONTEXT* ctx, enum be_xpoint_type type, + void* addr, unsigned long val, unsigned size) { dbg_printf("not done\n"); return FALSE; diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index d776cf1..988a147 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -82,11 +82,11 @@ struct backend_cpu * break points / watchpoints handling * -------------------------------------------------------------------------------*/ /* Inserts an Xpoint in the CPU context and/or debuggee address space */ - unsigned (*insert_Xpoint)(HANDLE hProcess, struct be_process_io* pio, + unsigned (*insert_Xpoint)(HANDLE hProcess, const struct be_process_io* pio, CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long* val, unsigned size); /* Removes an Xpoint in the CPU context and/or debuggee address space */ - unsigned (*remove_Xpoint)(HANDLE hProcess, struct be_process_io* pio, + unsigned (*remove_Xpoint)(HANDLE hProcess, const struct be_process_io* pio, CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long val, unsigned size); /* Checks whether a given watchpoint has been triggered */ diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index f1ee7be..1dc001d 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -392,7 +392,7 @@ static inline int be_i386_get_unused_DR( return -1; } -static unsigned be_i386_insert_Xpoint(HANDLE hProcess, struct be_process_io* pio, +static unsigned be_i386_insert_Xpoint(HANDLE hProcess, const struct be_process_io* pio, CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long* val, unsigned size) { @@ -443,7 +443,7 @@ static unsigned be_i386_insert_Xpoint(HA return 1; } -static unsigned be_i386_remove_Xpoint(HANDLE hProcess, struct be_process_io* pio, +static unsigned be_i386_remove_Xpoint(HANDLE hProcess, const struct be_process_io* pio, CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long val, unsigned size) { diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index e943dfa..2ea7164 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -95,7 +95,7 @@ static void be_ppc_disasm_one_insn(ADDRE dbg_printf("Disasm NIY\n"); } -static unsigned be_ppc_insert_Xpoint(HANDLE hProcess, struct be_process_io* pio, +static unsigned be_ppc_insert_Xpoint(HANDLE hProcess, const struct be_process_io* pio, CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long* val, unsigned size) { @@ -117,7 +117,7 @@ static unsigned be_ppc_insert_Xpoint(HAN return 1; } -static unsigned be_ppc_remove_Xpoint(HANDLE hProcess, struct be_process_io* pio, +static unsigned be_ppc_remove_Xpoint(HANDLE hProcess, const struct be_process_io* pio, CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long val, unsigned size) { diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 3c4acbf..97ad754 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -201,7 +201,7 @@ struct dbg_process { HANDLE handle; DWORD pid; - struct be_process_io* process_io; + const struct be_process_io* process_io; const char* imageName; struct dbg_thread* threads; unsigned continue_on_first_exception; @@ -417,13 +417,13 @@ extern BOOL gdb_remote(unsig static inline BOOL dbg_read_memory(const void* addr, void* buffer, size_t len) { DWORD rlen; - return ReadProcessMemory(dbg_curr_process->handle, addr, buffer, len, &rlen) && len == rlen; + return dbg_curr_process->process_io->read(dbg_curr_process->handle, addr, buffer, len, &rlen) && len == rlen; } static inline BOOL dbg_write_memory(void* addr, const void* buffer, size_t len) { DWORD wlen; - return WriteProcessMemory(dbg_curr_process->handle, addr, buffer, len, &wlen) && len == wlen; + return dbg_curr_process->process_io->write(dbg_curr_process->handle, addr, buffer, len, &wlen) && len == wlen; } static inline void* dbg_heap_realloc(void* buffer, size_t size)

1 0