April 2006 - Wine-commits - list.winehq.org

Alexandre Julliard : server: Get rid of the no longer used get_thread_single_step function.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: d8659a977303e7e871ff65dd8486800b92b4f854 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d8659a977303e7e871ff65d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 20:27:45 2006 +0200 server: Get rid of the no longer used get_thread_single_step function. --- server/context_alpha.c | 6 ------ server/context_i386.c | 9 --------- server/context_powerpc.c | 12 ------------ server/context_sparc.c | 6 ------ server/context_x86_64.c | 9 --------- server/thread.h | 1 - 6 files changed, 0 insertions(+), 43 deletions(-) diff --git a/server/context_alpha.c b/server/context_alpha.c index 41771bf..118bff7 100644 --- a/server/context_alpha.c +++ b/server/context_alpha.c @@ -334,12 +334,6 @@ void *get_thread_ip( struct thread *thre return (void *)context.Fir; } -/* determine if we should continue the thread in single-step mode */ -int get_thread_single_step( struct thread *thread ) -{ - return 0; /* FIXME */ -} - /* send a signal to a specific thread */ int tkill( int tgid, int pid, int sig ) { diff --git a/server/context_i386.c b/server/context_i386.c index cf334cb..7285905 100644 --- a/server/context_i386.c +++ b/server/context_i386.c @@ -550,15 +550,6 @@ void *get_thread_ip( struct thread *thre return (void *)context.Eip; } -/* determine if we should continue the thread in single-step mode */ -int get_thread_single_step( struct thread *thread ) -{ - CONTEXT context; - if (thread->context) return 0; /* don't single-step inside exception event */ - get_thread_context_ptrace( thread, CONTEXT_CONTROL, &context ); - return (context.EFlags & 0x100) != 0; -} - /* send a signal to a specific thread */ int tkill( int tgid, int pid, int sig ) { diff --git a/server/context_powerpc.c b/server/context_powerpc.c index 9a438b9..8cf1424 100644 --- a/server/context_powerpc.c +++ b/server/context_powerpc.c @@ -273,18 +273,6 @@ void *get_thread_ip( struct thread *thre return (void *)context.Iar; } -/* determine if we should continue the thread in single-step mode */ -int get_thread_single_step( struct thread *thread ) -{ - CONTEXT context; - if (thread->context) return 0; - get_thread_context_ptrace( thread, CONTEXT_CONTROL, &context ); -#ifndef MSR_SE -# define MSR_SE (1<<10) -#endif - return (context.Msr & MSR_SE) != 0; -} - /* send a signal to a specific thread */ int tkill( int tgid, int pid, int sig ) { diff --git a/server/context_sparc.c b/server/context_sparc.c index 39c3dd3..805fd7e 100644 --- a/server/context_sparc.c +++ b/server/context_sparc.c @@ -172,12 +172,6 @@ void *get_thread_ip( struct thread *thre return (void *)context.pc; } -/* determine if we should continue the thread in single-step mode */ -int get_thread_single_step( struct thread *thread ) -{ - return 0; /* FIXME */ -} - /* send a signal to a specific thread */ int tkill( int tgid, int pid, int sig ) { diff --git a/server/context_x86_64.c b/server/context_x86_64.c index ee8bb31..ee9665e 100644 --- a/server/context_x86_64.c +++ b/server/context_x86_64.c @@ -261,15 +261,6 @@ void *get_thread_ip( struct thread *thre return (void *)context.Rip; } -/* determine if we should continue the thread in single-step mode */ -int get_thread_single_step( struct thread *thread ) -{ - CONTEXT context; - if (thread->context) return 0; /* don't single-step inside exception event */ - get_thread_context_ptrace( thread, CONTEXT_CONTROL, &context ); - return (context.EFlags & 0x100) != 0; -} - /* send a signal to a specific thread */ int tkill( int tgid, int pid, int sig ) { diff --git a/server/thread.h b/server/thread.h index ec5a55e..6b4818c 100644 --- a/server/thread.h +++ b/server/thread.h @@ -124,7 +124,6 @@ extern int get_ptrace_pid( struct thread extern int suspend_for_ptrace( struct thread *thread ); extern void resume_after_ptrace( struct thread *thread ); extern void *get_thread_ip( struct thread *thread ); -extern int get_thread_single_step( struct thread *thread ); extern void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int flags ); extern void set_thread_context( struct thread *thread, const CONTEXT *context, unsigned int flags ); extern int tkill( int tgid, int pid, int sig );

1 0

Alexandre Julliard : server: Removed the thread attached flag, since we always detach now.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 820c5927c86678344fe528bb8361ca498b1e519a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=820c5927c86678344fe528b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 20:25:22 2006 +0200 server: Removed the thread attached flag, since we always detach now. --- server/debugger.c | 3 +- server/ptrace.c | 64 +++-------------------------------------------------- server/thread.c | 1 - server/thread.h | 3 -- 4 files changed, 5 insertions(+), 66 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index c32b9b1..c212c0e 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -428,7 +428,7 @@ static int debugger_attach( struct proce goto error; suspend_process( process ); - if (!attach_process( process ) || !set_process_debugger( process, debugger )) + if (!set_process_debugger( process, debugger )) { resume_process( process ); return 0; @@ -485,7 +485,6 @@ int debugger_detach( struct process *pro /* remove relationships between process and its debugger */ process->debugger = NULL; if (!set_process_debug_flag( process, 0 )) clear_error(); /* ignore error */ - detach_process( process ); /* from this function */ resume_process( process ); diff --git a/server/ptrace.c b/server/ptrace.c index 51101d3..817b0ec 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -90,7 +90,6 @@ static int handle_child_status( struct t } if (thread && (WIFSIGNALED(status) || WIFEXITED(status))) { - thread->attached = 0; thread->unix_pid = -1; thread->unix_tid = -1; if (debug_level) @@ -155,7 +154,6 @@ static int wait4_thread( struct thread * { thread->unix_pid = -1; thread->unix_tid = -1; - thread->attached = 0; } else perror( "wait4" ); stop_watchdog(); @@ -193,52 +191,11 @@ int send_thread_signal( struct thread *t { thread->unix_pid = -1; thread->unix_tid = -1; - thread->attached = 0; } } return (ret != -1); } -/* attach to a Unix process with ptrace */ -int attach_process( struct process *process ) -{ - struct thread *thread; - int ret = 1; - - if (list_empty( &process->thread_list )) /* need at least one running thread */ - { - set_error( STATUS_ACCESS_DENIED ); - return 0; - } - - LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) - { - if (thread->attached) continue; - if (suspend_for_ptrace( thread )) resume_after_ptrace( thread ); - else ret = 0; - } - return ret; -} - -/* detach from a ptraced Unix process */ -void detach_process( struct process *process ) -{ - struct thread *thread; - - LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) - { - if (thread->attached) - { - /* make sure it is stopped */ - suspend_for_ptrace( thread ); - if (thread->unix_pid == -1) return; - if (debug_level) fprintf( stderr, "%04x: *detached*\n", thread->id ); - ptrace( PTRACE_DETACH, get_ptrace_pid(thread), (caddr_t)1, 0 ); - thread->attached = 0; - } - } -} - /* suspend a thread to allow using ptrace on it */ /* you must do a resume_after_ptrace when finished with the thread */ int suspend_for_ptrace( struct thread *thread ) @@ -246,21 +203,11 @@ int suspend_for_ptrace( struct thread *t /* can't stop a thread while initialisation is in progress */ if (thread->unix_pid == -1 || !is_process_init_done(thread->process)) goto error; - if (thread->attached) - { - if (!send_thread_signal( thread, SIGSTOP )) goto error; - } - else + /* this may fail if the client is already being debugged */ + if (ptrace( PTRACE_ATTACH, get_ptrace_pid(thread), 0, 0 ) == -1) { - /* this may fail if the client is already being debugged */ - if (!use_ptrace) goto error; - if (ptrace( PTRACE_ATTACH, get_ptrace_pid(thread), 0, 0 ) == -1) - { - if (errno == ESRCH) thread->unix_pid = thread->unix_tid = -1; /* thread got killed */ - goto error; - } - if (debug_level) fprintf( stderr, "%04x: *attached*\n", thread->id ); - thread->attached = 1; + if (errno == ESRCH) thread->unix_pid = thread->unix_tid = -1; /* thread got killed */ + goto error; } if (wait4_thread( thread, SIGSTOP )) return 1; resume_after_ptrace( thread ); @@ -273,13 +220,10 @@ int suspend_for_ptrace( struct thread *t void resume_after_ptrace( struct thread *thread ) { if (thread->unix_pid == -1) return; - assert( thread->attached ); if (ptrace( PTRACE_DETACH, get_ptrace_pid(thread), (caddr_t)1, 0 ) == -1) { if (errno == ESRCH) thread->unix_pid = thread->unix_tid = -1; /* thread got killed */ } - if (debug_level) fprintf( stderr, "%04x: *detached*\n", thread->id ); - thread->attached = 0; } /* read an int from a thread address space */ diff --git a/server/thread.c b/server/thread.c index ccf8678..e5ef779 100644 --- a/server/thread.c +++ b/server/thread.c @@ -139,7 +139,6 @@ inline static void init_thread_structure thread->reply_fd = NULL; thread->wait_fd = NULL; thread->state = RUNNING; - thread->attached = 0; thread->exit_code = 0; thread->priority = THREAD_PRIORITY_NORMAL; thread->affinity = 1; diff --git a/server/thread.h b/server/thread.h index 762def7..ec5a55e 100644 --- a/server/thread.h +++ b/server/thread.h @@ -72,7 +72,6 @@ struct thread struct fd *reply_fd; /* fd to send a reply to a client */ struct fd *wait_fd; /* fd to use to wake a sleeping client */ enum run_state state; /* running state */ - int attached; /* is thread attached with ptrace? */ int exit_code; /* thread exit code */ int unix_pid; /* Unix pid of client */ int unix_tid; /* Unix tid of client */ @@ -122,8 +121,6 @@ extern struct token *thread_get_imperson extern void sigchld_callback(void); extern int get_ptrace_pid( struct thread *thread ); -extern int attach_process( struct process *process ); -extern void detach_process( struct process *process ); extern int suspend_for_ptrace( struct thread *thread ); extern void resume_after_ptrace( struct thread *thread ); extern void *get_thread_ip( struct thread *thread );

1 0

Alexandre Julliard : server: Always detach from the thread when we are done with ptrace.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 5cc97c4e0bd04925deda6553f9e159302a7590ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5cc97c4e0bd04925deda655… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 20:21:46 2006 +0200 server: Always detach from the thread when we are done with ptrace. --- server/ptrace.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 4280b1c..51101d3 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -274,8 +274,12 @@ void resume_after_ptrace( struct thread { if (thread->unix_pid == -1) return; assert( thread->attached ); - ptrace( get_thread_single_step(thread) ? PTRACE_SINGLESTEP : PTRACE_CONT, - get_ptrace_pid(thread), (caddr_t)1, 0 /* cancel the SIGSTOP */ ); + if (ptrace( PTRACE_DETACH, get_ptrace_pid(thread), (caddr_t)1, 0 ) == -1) + { + if (errno == ESRCH) thread->unix_pid = thread->unix_tid = -1; /* thread got killed */ + } + if (debug_level) fprintf( stderr, "%04x: *detached*\n", thread->id ); + thread->attached = 0; } /* read an int from a thread address space */

1 0

Alexandre Julliard : user: Use a smaller window for the menu test.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 64f17bb3efc7d94f09466a5375d6583282e432be URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64f17bb3efc7d94f09466a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 20:21:19 2006 +0200 user: Use a smaller window for the menu test. --- dlls/user/tests/menu.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user/tests/menu.c b/dlls/user/tests/menu.c index 7bb0f94..22e48bf 100644 --- a/dlls/user/tests/menu.c +++ b/dlls/user/tests/menu.c @@ -183,8 +183,8 @@ static void test_menu_locked_by_window(v BOOL ret; HMENU hmenu; HWND hwnd = CreateWindowEx(0, MAKEINTATOM(atomMenuCheckClass), NULL, - WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, NULL, NULL); + WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, + NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindowEx failed with error %ld\n", GetLastError()); hmenu = CreateMenu(); ok(hmenu != NULL, "CreateMenu failed with error %ld\n", GetLastError()); @@ -219,8 +219,8 @@ static void test_menu_ownerdraw(void) HMENU hmenu; LONG leftcol; HWND hwnd = CreateWindowEx(0, MAKEINTATOM(atomMenuCheckClass), NULL, - WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, NULL, NULL); + WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, + NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindowEx failed with error %ld\n", GetLastError()); if( !hwnd) return; SetWindowLongPtr( hwnd, GWLP_WNDPROC, (LONG)menu_ownerdraw_wnd_proc); @@ -455,8 +455,8 @@ static void test_menu_bmp_and_string(voi memset( bmfill, 0x55, sizeof( bmfill)); hwnd = CreateWindowEx(0, MAKEINTATOM(atomMenuCheckClass), NULL, - WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, NULL, NULL); + WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, + NULL, NULL, NULL, NULL); hbm_arrow=LoadBitmap( 0, (CHAR*)OBM_MNARROW); GetObject( hbm_arrow, sizeof(bm), &bm); arrowwidth = bm.bmWidth;

1 0

Jacek Caban : docobj.idl: Fix some enums declarations.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: fc01e11eac8264799a18ae432e7b0d3264820b35 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc01e11eac8264799a18ae4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 18:38:58 2006 +0200 docobj.idl: Fix some enums declarations. --- include/docobj.idl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/docobj.idl b/include/docobj.idl index f313992..8435a8a 100644 --- a/include/docobj.idl +++ b/include/docobj.idl @@ -169,7 +169,7 @@ interface IOleCommandTarget : IUnknown { typedef [unique] IOleCommandTarget *LPOLECOMMANDTARGET; - typedef enum + typedef enum OLECMDF { OLECMDF_SUPPORTED = 0x1, OLECMDF_ENABLED = 0x2, @@ -193,14 +193,14 @@ interface IOleCommandTarget : IUnknown [size_is(cwBuf)] WCHAR rgwz[]; } OLECMDTEXT; - typedef enum + typedef enum OLECMDTEXTF { OLECMDTEXTF_NONE = 0, OLECMDTEXTF_NAME = 1, OLECMDTEXTF_STATUS = 2 } OLECMDTEXTF; - typedef enum + typedef enum OLECMDEXECOPT { OLECMDEXECOPT_DODEFAULT = 0, OLECMDEXECOPT_PROMPTUSER = 1,

1 0

Jacek Caban : exdisp.idl: Added SHDocVw type library declaration.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 91d7bb5211da89d80658159baad060c86b0129c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91d7bb5211da89d80658159… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 18:34:09 2006 +0200 exdisp.idl: Added SHDocVw type library declaration. --- include/exdisp.idl | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 56b7648..9b9c632 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -27,6 +27,20 @@ import "docobj.idl"; #include <exdispid.h> /***************************************************************************** + * SHDocVw library + */ +[ + uuid(EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B), + version(1.1), + helpstring("Microsoft Internet Controls") +] +library SHDocVw +{ + +/* importlib("stdole2.tlb"); */ + + +/***************************************************************************** * IWebBrowser interface */ [ @@ -432,3 +446,6 @@ coclass InternetExplorer [default, source] dispinterface DWebBrowserEvents2; [source] dispinterface DWebBrowserEvents; } + + +} /* library */

1 0

Jacek Caban : exdisp.idl: Move declarations to better match to IE SDK.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 5d3cef6dc9bffea5aedf70f618ee90070f6f7226 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d3cef6dc9bffea5aedf70f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 18:35:37 2006 +0200 exdisp.idl: Move declarations to better match to IE SDK. --- include/exdisp.idl | 188 +++++++++++++++++++++++++++------------------------- 1 files changed, 96 insertions(+), 92 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 9b9c632..6a31648 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -104,89 +104,10 @@ interface IWebBrowser : IDispatch [id(212), propget] HRESULT Busy([out, retval] VARIANT_BOOL *pBool); } - /***************************************************************************** - * IWebBrowserApp interface + * DWebBrowserEvents dispinterface */ [ - object, - oleautomation, - uuid(0002df05-0000-0000-c000-000000000046) -] -interface IWebBrowserApp : IWebBrowser -{ - [id(300)] HRESULT Quit(); - [id(301)] HRESULT ClientToWindow([in,out] int* pcx, [in,out] int* pcy); - [id(302)] HRESULT PutProperty([in] BSTR szProperty, [in] VARIANT vtValue); - [id(303)] HRESULT GetProperty([in] BSTR szProperty, [out, retval] VARIANT *pvtValue); - [id(0), propget] HRESULT Name([out, retval] BSTR* Name); - [id(DISPID_HWND), propget] HRESULT HWND([out, retval] long *pHWND); - [id(400), propget] HRESULT FullName([out, retval] BSTR* FullName); - [id(401), propget] HRESULT Path([out, retval] BSTR* Path); - [id(402), propget] HRESULT Visible([out, retval] VARIANT_BOOL* pBool); - [id(402), propput] HRESULT Visible([in] VARIANT_BOOL Value); - [id(403), propget] HRESULT StatusBar([out, retval] VARIANT_BOOL* pBool); - [id(403), propput] HRESULT StatusBar([in] VARIANT_BOOL Value); - [id(404), propget] HRESULT StatusText([out, retval] BSTR *StatusText); - [id(404), propput] HRESULT StatusText([in] BSTR StatusText); - [id(405), propget] HRESULT ToolBar([out, retval] int * Value); - [id(405), propput] HRESULT ToolBar([in] int Value); - [id(406), propget] HRESULT MenuBar([out, retval] VARIANT_BOOL * Value); - [id(406), propput] HRESULT MenuBar([in] VARIANT_BOOL Value); - [id(407), propget] HRESULT FullScreen([out, retval] VARIANT_BOOL * pbFullScreen); - [id(407), propput] HRESULT FullScreen([in] VARIANT_BOOL bFullScreen); -} - -/***************************************************************************** - * IWebBrowser2 interface - */ -[ - object, - oleautomation, - uuid(d30c1661-cdaf-11d0-8a3e-00c04fc9e26e) -] -interface IWebBrowser2 : IWebBrowserApp -{ - [id(500)] HRESULT Navigate2( - [in] VARIANT *URL, - [in, optional] VARIANT *Flags, - [in, optional] VARIANT *TargetFrameName, - [in, optional] VARIANT *PostData, - [in, optional] VARIANT *Headers); - - [id(501)] HRESULT QueryStatusWB( - [in] OLECMDID cmdID, - [out, retval] OLECMDF *pcmdf); - - [id(502)] HRESULT ExecWB( - [in] OLECMDID cmdID, - [in] OLECMDEXECOPT cmdexecopt, - [in, optional] VARIANT *pvaIn, - [out, in, optional] VARIANT *pvaOut); - - [id(503)] HRESULT ShowBrowserBar( - [in] VARIANT *pvaClsid, - [in, optional] VARIANT *pvarShow, - [in, optional] VARIANT *pvarSize); - - [id(DISPID_READYSTATE), propget] HRESULT ReadyState([out, retval] READYSTATE *plReadyState); - [id(550), propget] HRESULT Offline([out, retval] VARIANT_BOOL *pbOffline); - [id(550), propput] HRESULT Offline([in] VARIANT_BOOL bOffline); - [id(551), propget] HRESULT Silent([out, retval] VARIANT_BOOL *pbSilent); - [id(551), propput] HRESULT Silent([in] VARIANT_BOOL bSilent); - [id(552), propget] HRESULT RegisterAsBrowser([out, retval] VARIANT_BOOL *pbRegister); - [id(552), propput] HRESULT RegisterAsBrowser([in] VARIANT_BOOL bRegister); - [id(553), propget] HRESULT RegisterAsDropTarget([out, retval] VARIANT_BOOL *pbRegister); - [id(553), propput] HRESULT RegisterAsDropTarget([in] VARIANT_BOOL bRegister); - [id(554), propget] HRESULT TheaterMode([out, retval] VARIANT_BOOL *pbRegister); - [id(554), propput] HRESULT TheaterMode([in] VARIANT_BOOL bRegister); - [id(555), propget] HRESULT AddressBar([out, retval] VARIANT_BOOL *Value); - [id(555), propput] HRESULT AddressBar([in] VARIANT_BOOL Value); - [id(556), propget] HRESULT Resizable([out, retval] VARIANT_BOOL *Value); - [id(556), propput] HRESULT Resizable([in] VARIANT_BOOL Value); -} - -[ uuid(eab22ac2-30c1-11CF-a7eb-0000C05bae0b) ] dispinterface DWebBrowserEvents @@ -269,6 +190,90 @@ dispinterface DWebBrowserEvents void PropertyChange([in] BSTR Property); } +/***************************************************************************** + * IWebBrowserApp interface + */ +[ + object, + oleautomation, + uuid(0002df05-0000-0000-c000-000000000046) +] +interface IWebBrowserApp : IWebBrowser +{ + [id(300)] HRESULT Quit(); + [id(301)] HRESULT ClientToWindow([in,out] int* pcx, [in,out] int* pcy); + [id(302)] HRESULT PutProperty([in] BSTR szProperty, [in] VARIANT vtValue); + [id(303)] HRESULT GetProperty([in] BSTR szProperty, [out, retval] VARIANT *pvtValue); + [id(0), propget] HRESULT Name([out, retval] BSTR* Name); + [id(DISPID_HWND), propget] HRESULT HWND([out, retval] long *pHWND); + [id(400), propget] HRESULT FullName([out, retval] BSTR* FullName); + [id(401), propget] HRESULT Path([out, retval] BSTR* Path); + [id(402), propget] HRESULT Visible([out, retval] VARIANT_BOOL* pBool); + [id(402), propput] HRESULT Visible([in] VARIANT_BOOL Value); + [id(403), propget] HRESULT StatusBar([out, retval] VARIANT_BOOL* pBool); + [id(403), propput] HRESULT StatusBar([in] VARIANT_BOOL Value); + [id(404), propget] HRESULT StatusText([out, retval] BSTR *StatusText); + [id(404), propput] HRESULT StatusText([in] BSTR StatusText); + [id(405), propget] HRESULT ToolBar([out, retval] int * Value); + [id(405), propput] HRESULT ToolBar([in] int Value); + [id(406), propget] HRESULT MenuBar([out, retval] VARIANT_BOOL * Value); + [id(406), propput] HRESULT MenuBar([in] VARIANT_BOOL Value); + [id(407), propget] HRESULT FullScreen([out, retval] VARIANT_BOOL * pbFullScreen); + [id(407), propput] HRESULT FullScreen([in] VARIANT_BOOL bFullScreen); +} + +/***************************************************************************** + * IWebBrowser2 interface + */ +[ + object, + oleautomation, + uuid(d30c1661-cdaf-11d0-8a3e-00c04fc9e26e) +] +interface IWebBrowser2 : IWebBrowserApp +{ + [id(500)] HRESULT Navigate2( + [in] VARIANT *URL, + [in, optional] VARIANT *Flags, + [in, optional] VARIANT *TargetFrameName, + [in, optional] VARIANT *PostData, + [in, optional] VARIANT *Headers); + + [id(501)] HRESULT QueryStatusWB( + [in] OLECMDID cmdID, + [out, retval] OLECMDF *pcmdf); + + [id(502)] HRESULT ExecWB( + [in] OLECMDID cmdID, + [in] OLECMDEXECOPT cmdexecopt, + [in, optional] VARIANT *pvaIn, + [out, in, optional] VARIANT *pvaOut); + + [id(503)] HRESULT ShowBrowserBar( + [in] VARIANT *pvaClsid, + [in, optional] VARIANT *pvarShow, + [in, optional] VARIANT *pvarSize); + + [id(DISPID_READYSTATE), propget] HRESULT ReadyState([out, retval] READYSTATE *plReadyState); + [id(550), propget] HRESULT Offline([out, retval] VARIANT_BOOL *pbOffline); + [id(550), propput] HRESULT Offline([in] VARIANT_BOOL bOffline); + [id(551), propget] HRESULT Silent([out, retval] VARIANT_BOOL *pbSilent); + [id(551), propput] HRESULT Silent([in] VARIANT_BOOL bSilent); + [id(552), propget] HRESULT RegisterAsBrowser([out, retval] VARIANT_BOOL *pbRegister); + [id(552), propput] HRESULT RegisterAsBrowser([in] VARIANT_BOOL bRegister); + [id(553), propget] HRESULT RegisterAsDropTarget([out, retval] VARIANT_BOOL *pbRegister); + [id(553), propput] HRESULT RegisterAsDropTarget([in] VARIANT_BOOL bRegister); + [id(554), propget] HRESULT TheaterMode([out, retval] VARIANT_BOOL *pbRegister); + [id(554), propput] HRESULT TheaterMode([in] VARIANT_BOOL bRegister); + [id(555), propget] HRESULT AddressBar([out, retval] VARIANT_BOOL *Value); + [id(555), propput] HRESULT AddressBar([in] VARIANT_BOOL Value); + [id(556), propget] HRESULT Resizable([out, retval] VARIANT_BOOL *Value); + [id(556), propput] HRESULT Resizable([in] VARIANT_BOOL Value); +} + +/***************************************************************************** + * DWebBrowserEvents2 dispinterface + */ [ uuid(34a715a0-6587-11d0-924a-0020afc7ac4d) ] @@ -404,6 +409,17 @@ coclass WebBrowser } [ + uuid(0002df01-0000-0000-c000-000000000046) +] +coclass InternetExplorer +{ + [default] interface IWebBrowser2; + interface IWebBrowserApp; + [default, source] dispinterface DWebBrowserEvents2; + [source] dispinterface DWebBrowserEvents; +} + +[ object, oleautomation, uuid(85cb6900-4d95-11cf-960c-0080c7f4ee85) @@ -436,16 +452,4 @@ coclass ShellWindows [default, source] dispinterface DShellWindowsEvents; } -[ - uuid(0002df01-0000-0000-c000-000000000046) -] -coclass InternetExplorer -{ - [default] interface IWebBrowser2; - interface IWebBrowserApp; - [default, source] dispinterface DWebBrowserEvents2; - [source] dispinterface DWebBrowserEvents; -} - - } /* library */

1 0

Hans Leidekker : dnsapi: Teach winapi_check about dnsapi.dll.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 60e017de999ccbd5105248140d16633a56f2bbc0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=60e017de999ccbd51052481… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Apr 10 16:39:22 2006 +0200 dnsapi: Teach winapi_check about dnsapi.dll. --- tools/winapi/win32.api | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index d0e5db4..33fea81 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1043,6 +1043,52 @@ HRESULT LPVOID +%%dnsapi.dll + +%long + +BOOL +DNS_CHARSET +DNS_CONFIG_TYPE +DNS_FREE_TYPE +DNS_NAME_FORMAT +DNS_STATUS +DWORD +HANDLE +WORD + +%ptr + +HANDLE * +PDNS_MESSAGE_BUFFER +PDNS_RECORD +PDNS_RECORD * +PDNS_RECORDA +PDNS_RECORDA * +PDNS_RECORDW +PDNS_RECORDW * +PDWORD +PIP4_ARRAY +PVOID +PVOID * + +%str + +LPCSTR +LPSTR +PCSTR + +%void + +void + +%wstr + +LPCWSTR +LPWSTR +PCWSTR +PWSTR + %%dplayx.dll %long

1 0

Alexandre Julliard : twain_32: Renamed the dlls/twain directory to dlls/ twain_32.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 1404dc8014a0ebc89723a893c6b045abd5b8cf3e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1404dc8014a0ebc89723a89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 10 17:29:18 2006 +0200 twain_32: Renamed the dlls/twain directory to dlls/twain_32. --- configure | 4 configure.ac | 2 dlls/Makefile.in | 7 dlls/twain/.gitignore | 2 dlls/twain/Makefile.in | 29 - dlls/twain/README | 54 - dlls/twain/TWAIN | 172 ---- dlls/twain/capability.c | 249 ------ dlls/twain/ds_audio.c | 50 - dlls/twain/ds_ctrl.c | 727 ---------------- dlls/twain/ds_image.c | 531 ------------ dlls/twain/dsm_ctrl.c | 453 ---------- dlls/twain/resource.h | 23 - dlls/twain/rsrc.rc | 30 - dlls/twain/twain.h | 1870 ------------------------------------------ dlls/twain/twain.spec | 6 dlls/twain/twain16_main.c | 49 - dlls/twain/twain32_main.c | 640 -------------- dlls/twain/twain_32.spec | 1 dlls/twain/twain_De.rc | 40 - dlls/twain/twain_En.rc | 40 - dlls/twain/twain_Ko.rc | 41 - dlls/twain/twain_i.h | 255 ------ dlls/twain/ui.c | 1074 ------------------------ dlls/twain_32/.gitignore | 2 dlls/twain_32/Makefile.in | 29 + dlls/twain_32/README | 54 + dlls/twain_32/TWAIN | 172 ++++ dlls/twain_32/capability.c | 249 ++++++ dlls/twain_32/ds_audio.c | 50 + dlls/twain_32/ds_ctrl.c | 727 ++++++++++++++++ dlls/twain_32/ds_image.c | 531 ++++++++++++ dlls/twain_32/dsm_ctrl.c | 453 ++++++++++ dlls/twain_32/resource.h | 23 + dlls/twain_32/rsrc.rc | 30 + dlls/twain_32/twain.h | 1870 ++++++++++++++++++++++++++++++++++++++++++ dlls/twain_32/twain.spec | 6 dlls/twain_32/twain16_main.c | 49 + dlls/twain_32/twain32_main.c | 640 ++++++++++++++ dlls/twain_32/twain_32.spec | 1 dlls/twain_32/twain_De.rc | 40 + dlls/twain_32/twain_En.rc | 40 + dlls/twain_32/twain_Ko.rc | 41 + dlls/twain_32/twain_i.h | 255 ++++++ dlls/twain_32/ui.c | 1074 ++++++++++++++++++++++++ 45 files changed, 6340 insertions(+), 6345 deletions(-) delete mode 100644 dlls/twain/.gitignore delete mode 100644 dlls/twain/Makefile.in delete mode 100644 dlls/twain/README delete mode 100644 dlls/twain/TWAIN delete mode 100644 dlls/twain/capability.c delete mode 100644 dlls/twain/ds_audio.c delete mode 100644 dlls/twain/ds_ctrl.c delete mode 100644 dlls/twain/ds_image.c delete mode 100644 dlls/twain/dsm_ctrl.c delete mode 100644 dlls/twain/resource.h delete mode 100644 dlls/twain/rsrc.rc delete mode 100644 dlls/twain/twain.h delete mode 100644 dlls/twain/twain.spec delete mode 100644 dlls/twain/twain16_main.c delete mode 100644 dlls/twain/twain32_main.c delete mode 100644 dlls/twain/twain_32.spec delete mode 100644 dlls/twain/twain_De.rc delete mode 100644 dlls/twain/twain_En.rc delete mode 100644 dlls/twain/twain_Ko.rc delete mode 100644 dlls/twain/twain_i.h delete mode 100644 dlls/twain/ui.c create mode 100644 dlls/twain_32/.gitignore create mode 100644 dlls/twain_32/Makefile.in create mode 100644 dlls/twain_32/README create mode 100644 dlls/twain_32/TWAIN create mode 100644 dlls/twain_32/capability.c create mode 100644 dlls/twain_32/ds_audio.c create mode 100644 dlls/twain_32/ds_ctrl.c create mode 100644 dlls/twain_32/ds_image.c create mode 100644 dlls/twain_32/dsm_ctrl.c create mode 100644 dlls/twain_32/resource.h create mode 100644 dlls/twain_32/rsrc.rc create mode 100644 dlls/twain_32/twain.h create mode 100644 dlls/twain_32/twain.spec create mode 100644 dlls/twain_32/twain16_main.c create mode 100644 dlls/twain_32/twain32_main.c create mode 100644 dlls/twain_32/twain_32.spec create mode 100644 dlls/twain_32/twain_De.rc create mode 100644 dlls/twain_32/twain_En.rc create mode 100644 dlls/twain_32/twain_Ko.rc create mode 100644 dlls/twain_32/twain_i.h create mode 100644 dlls/twain_32/ui.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1404dc8014a0ebc8972…

1 0

Hans Leidekker : dnsapi: Tell Wine developers and packagers about dnsapi. dll.
by Alexandre Julliard 10 Apr '06

10 Apr '06

Module: wine Branch: refs/heads/master Commit: 46759561426c6598b7b4da6613f6be1bbd4940ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46759561426c6598b7b4da6… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Apr 10 16:39:12 2006 +0200 dnsapi: Tell Wine developers and packagers about dnsapi.dll. --- DEVELOPERS-HINTS | 1 + documentation/PACKAGING | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/DEVELOPERS-HINTS b/DEVELOPERS-HINTS index 433216b..d828e9b 100644 --- a/DEVELOPERS-HINTS +++ b/DEVELOPERS-HINTS @@ -53,6 +53,7 @@ DLLs (under dlls/): dmsynth/ - DirectMusic Software Synthesizer dmusic/ - DirectMusic Core Services dmusic32/ - DirectMusic Legacy Port + dnsapi/ - DNS support dplay/ - DirectPlay (networking) dplayx/ - DirectPlay (networking) dpnet/ - DirectPlay (networking) diff --git a/documentation/PACKAGING b/documentation/PACKAGING index dd04422..0a10dbf 100644 --- a/documentation/PACKAGING +++ b/documentation/PACKAGING @@ -59,6 +59,12 @@ Here is a list of the soft dependencies. install each and every last of those before building the package. These libraries are not dependencies in the RPM sense. In DEB packages, they should appear as "Suggests" or "Recommends", as the case may be. + + * libresolv + This is the standard Unix domain name resolver library that is + used to implement DNS support found in dnsapi.dll. resolv.h as + well as libresolv.so should be present at build time. + * FreeType: http://www.freetype.org This library is used for direct rendering of fonts. It provides better support of fonts than using the X11 fonts engine. It is

1 0