January 2010 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLFrameElement3 stub implementation.
by Alexandre Julliard Jan. 22, 2010

Jan. 22, 2010

Module: wine Branch: master Commit: e4af9ccd2545fcf2d6388bbc0c632c90eebd0247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4af9ccd2545fcf2d6388bbc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 21 14:47:37 2010 +0100 mshtml: Added IHTMLFrameElement3 stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlframe.c | 270 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlframebase.c | 105 ----------------- dlls/mshtml/tests/dom.c | 21 +++- 4 files changed, 290 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4af9ccd2545fcf2d6388…

1 0

Jacek Caban : mshtml: Added IHTMLFrameElement3:: get_contentDocument implementation.
by Alexandre Julliard Jan. 22, 2010

Jan. 22, 2010

Module: wine Branch: master Commit: a06ee80be0e4019c09132bea76e6e0c9eb707403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06ee80be0e4019c09132bea7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 21 14:48:11 2010 +0100 mshtml: Added IHTMLFrameElement3::get_contentDocument implementation. --- dlls/mshtml/htmlframe.c | 18 ++++++++++++++++-- dlls/mshtml/tests/dom.c | 25 ++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index f6f02a8..0bf5c4d 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -94,8 +94,22 @@ static HRESULT WINAPI HTMLFrameElement3_Invoke(IHTMLFrameElement3 *iface, DISPID static HRESULT WINAPI HTMLFrameElement3_get_contentDocument(IHTMLFrameElement3 *iface, IDispatch **p) { HTMLFrameElement *This = HTMLFRAME3_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IHTMLDocument2 *doc; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->framebase.content_window) { + FIXME("NULL window\n"); + return E_FAIL; + } + + hres = IHTMLWindow2_get_document(HTMLWINDOW2(This->framebase.content_window), &doc); + if(FAILED(hres)) + return hres; + + *p = doc ? (IDispatch*)doc : NULL; + return S_OK; } static HRESULT WINAPI HTMLFrameElement3_put_src(IHTMLFrameElement3 *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 951c647..6fa0e29 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5158,10 +5158,12 @@ static void doc_write(IHTMLDocument2 *doc, BOOL ln, const char *text) SafeArrayDestroy(sa); } -static void test_frame_doc(IUnknown *frame_elem) +static void test_frame_doc(IUnknown *frame_elem, BOOL iframe) { IHTMLDocument2 *window_doc, *elem_doc; + IHTMLFrameElement3 *frame_elem3; IHTMLWindow2 *content_window; + HRESULT hres; content_window = get_frame_content_window(frame_elem); window_doc = get_window_doc(content_window); @@ -5170,6 +5172,23 @@ static void test_frame_doc(IUnknown *frame_elem) elem_doc = get_elem_doc(frame_elem); ok(iface_cmp((IUnknown*)window_doc, (IUnknown*)elem_doc), "content_doc != elem_doc\n"); + if(!iframe) { + hres = IUnknown_QueryInterface(frame_elem, &IID_IHTMLFrameElement3, (void**)&frame_elem3); + if(SUCCEEDED(hres)) { + IDispatch *disp = NULL; + + hres = IHTMLFrameElement3_get_contentDocument(frame_elem3, &disp); + ok(hres == S_OK, "get_contentDocument failed: %08x\n", hres); + ok(disp != NULL, "contentDocument == NULL\n"); + ok(iface_cmp((IUnknown*)disp, (IUnknown*)window_doc), "contentDocument != contentWindow.document\n"); + + IDispatch_Release(disp); + IHTMLFrameElement3_Release(frame_elem3); + }else { + win_skip("IHTMLFrameElement3 not supported\n"); + } + } + IHTMLDocument2_Release(elem_doc); IHTMLDocument2_Release(window_doc); } @@ -5192,7 +5211,7 @@ static void test_iframe_elem(IHTMLElement *elem) ET_BR }; - test_frame_doc((IUnknown*)elem); + test_frame_doc((IUnknown*)elem, TRUE); content_window = get_frame_content_window((IUnknown*)elem); test_window_length(content_window, 0); @@ -5981,7 +6000,7 @@ static void test_frame(IDispatch *disp, const char *exp_id) return; test_elem_type((IUnknown*)frame_elem, ET_FRAME); - test_frame_doc((IUnknown*)frame_elem); + test_frame_doc((IUnknown*)frame_elem, FALSE); test_elem_id((IUnknown*)frame_elem, exp_id); IHTMLElement_Release(frame_elem);

1 0

Jacek Caban : mshtml.idl: Added DispHTMLFrameElement dispinterface declaration.
by Alexandre Julliard Jan. 22, 2010

Jan. 22, 2010

Module: wine Branch: master Commit: af926beaaf1af4984ba15ee77d29a2601370f1eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=af926beaaf1af4984ba15ee77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 21 14:46:28 2010 +0100 mshtml.idl: Added DispHTMLFrameElement dispinterface declaration. --- include/mshtmdid.h | 18 +++++ include/mshtml.idl | 217 +++++++++++++++++++++++++++++++++------------------ 2 files changed, 158 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af926beaaf1af4984ba15…

1 0

Jacek Caban : mshtml.idl: Added IHTMLFrameElement3 declaration.
by Alexandre Julliard Jan. 22, 2010

Jan. 22, 2010

Module: wine Branch: master Commit: 1f98d8e8bb2cef83d51cd39cb8c46604994fdd44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f98d8e8bb2cef83d51cd39cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 21 14:46:55 2010 +0100 mshtml.idl: Added IHTMLFrameElement3 declaration. --- include/mshtml.idl | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 323c2fc..a851b8f 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -14814,6 +14814,39 @@ interface IHTMLFrameBase2 : IDispatch WINE_IHTMLFRAMEBASE3_DISPINTERFACE_DECL /***************************************************************************** + * IHTMLFrameElement3 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051042d-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLFrameElement3 : IDispatch +{ + [propget, id(DISPID_IHTMLFRAMEELEMENT3_CONTENTDOCUMENT)] + HRESULT contentDocument([out, retval] IDispatch **p); + + [propput, id(DISPID_IHTMLFRAMEELEMENT3_IE8_SRC)] + HRESULT src([in] BSTR v); + + [propget, id(DISPID_IHTMLFRAMEELEMENT3_IE8_SRC)] + HRESULT src([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLFRAMEELEMENT3_IE8_LONGDESC)] + HRESULT longDesc([in] BSTR v); + + [propget, id(DISPID_IHTMLFRAMEELEMENT3_IE8_LONGDESC)] + HRESULT longDesc([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLFRAMEELEMENT3_IE8_FRAMEBORDER)] + HRESULT frameBorder([in] BSTR v); + + [propget, id(DISPID_IHTMLFRAMEELEMENT3_IE8_FRAMEBORDER)] + HRESULT frameBorder([out, retval] BSTR * p); +} + +/***************************************************************************** * DispHTMLFrameElement dispinterface */ [

1 0

Rob Shearman : wrc: Fix symbol was not declared and using plain integer as NULL pointer sparse warnings .
by Alexandre Julliard Jan. 22, 2010

Jan. 22, 2010

Module: wine Branch: master Commit: 903f686899585937c98bc9e987392539227f9437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903f686899585937c98bc9e98… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jan 21 11:57:09 2010 +0000 wrc: Fix symbol was not declared and using plain integer as NULL pointer sparse warnings. --- tools/wrc/translation.c | 2 +- tools/wrc/utils.c | 2 +- tools/wrc/wrc.c | 48 +++++++++++++++++++++++----------------------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index e322901..20e8346 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -887,7 +887,7 @@ typedef struct resource_id_node struct resource_id_node *next; } resource_id_node_t; -struct +static struct { int enabled; struct resource_id_node *ids; diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index d3b8cf7..c9445b3 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -367,7 +367,7 @@ struct lang2cp unsigned short lang; unsigned short sublang; unsigned int cp; -} lang2cp_t; +}; /* language to codepage conversion table */ /* specific sublanguages need only be specified if their codepage */ diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 3c7b176..931af46 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -161,7 +161,7 @@ static int verify_translations_mode; char *output_name = NULL; /* The name given by the -o option */ char *input_name = NULL; /* The name given on the command-line */ -char *temp_name = NULL; /* Temporary file for preprocess pipe */ +static char *temp_name = NULL; /* Temporary file for preprocess pipe */ int line_number = 1; /* The current line */ int char_number = 1; /* The current char pos within the line */ @@ -193,27 +193,27 @@ enum long_options_values static const char short_options[] = "D:Ef:F:hi:I:J:l:o:O:rU:v"; static const struct option long_options[] = { - { "debug", 1, 0, LONG_OPT_DEBUG }, - { "define", 1, 0, 'D' }, - { "endianess", 1, 0, LONG_OPT_ENDIANESS }, - { "help", 0, 0, 'h' }, - { "include-dir", 1, 0, 'I' }, - { "input", 1, 0, 'i' }, - { "input-format", 1, 0, 'J' }, - { "language", 1, 0, 'l' }, - { "no-use-temp-file", 0, 0, LONG_OPT_NOTMPFILE }, - { "nostdinc", 0, 0, LONG_OPT_NOSTDINC }, - { "output", 1, 0, 'o' }, - { "output-format", 1, 0, 'O' }, - { "pedantic", 0, 0, LONG_OPT_PEDANTIC }, - { "preprocessor", 1, 0, LONG_OPT_PREPROCESSOR }, - { "target", 1, 0, 'F' }, - { "undefine", 1, 0, 'U' }, - { "use-temp-file", 0, 0, LONG_OPT_TMPFILE }, - { "verbose", 0, 0, 'v' }, - { "verify-translations", 0, 0, LONG_OPT_VERIFY_TRANSL }, - { "version", 0, 0, LONG_OPT_VERSION }, - { 0, 0, 0, 0 } + { "debug", 1, NULL, LONG_OPT_DEBUG }, + { "define", 1, NULL, 'D' }, + { "endianess", 1, NULL, LONG_OPT_ENDIANESS }, + { "help", 0, NULL, 'h' }, + { "include-dir", 1, NULL, 'I' }, + { "input", 1, NULL, 'i' }, + { "input-format", 1, NULL, 'J' }, + { "language", 1, NULL, 'l' }, + { "no-use-temp-file", 0, NULL, LONG_OPT_NOTMPFILE }, + { "nostdinc", 0, NULL, LONG_OPT_NOSTDINC }, + { "output", 1, NULL, 'o' }, + { "output-format", 1, NULL, 'O' }, + { "pedantic", 0, NULL, LONG_OPT_PEDANTIC }, + { "preprocessor", 1, NULL, LONG_OPT_PREPROCESSOR }, + { "target", 1, NULL, 'F' }, + { "undefine", 1, NULL, 'U' }, + { "use-temp-file", 0, NULL, LONG_OPT_TMPFILE }, + { "verbose", 0, NULL, 'v' }, + { "verify-translations", 0, NULL, LONG_OPT_VERIFY_TRANSL }, + { "version", 0, NULL, LONG_OPT_VERSION }, + { NULL, 0, NULL, 0 } }; static void set_version_defines(void) @@ -489,8 +489,8 @@ int main(int argc,char *argv[]) /* Kill io buffering when some kind of debuglevel is enabled */ if(debuglevel) { - setbuf(stdout,0); - setbuf(stderr,0); + setbuf(stdout, NULL); + setbuf(stderr, NULL); } parser_debug = debuglevel & DEBUGLEVEL_TRACE ? 1 : 0;

1 0

Huw Davies : msdaps: Add stub class factories for the row and rowset servers and proxies.
by Alexandre Julliard Jan. 22, 2010

Jan. 22, 2010

Module: wine Branch: master Commit: de6f38108aed5e0625efa256852d8d4c26f5d66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=de6f38108aed5e0625efa2568… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 21 11:53:25 2010 +0000 msdaps: Add stub class factories for the row and rowset servers and proxies. --- .gitignore | 2 + dlls/msdaps/Makefile.in | 6 ++- dlls/msdaps/main.c | 101 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msdaps/row_server.c | 68 +++++++++++++++++++++++++++++ dlls/msdaps/row_server.idl | 56 ++++++++++++++++++++++++ 5 files changed, 231 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f2a0bd8..6c26883 100644 --- a/.gitignore +++ b/.gitignore @@ -65,6 +65,8 @@ dlls/libxinput.def dlls/msdaps/msdaps.h dlls/msdaps/msdaps_i.c dlls/msdaps/msdaps_p.c +dlls/msdaps/row_server.h +dlls/msdaps/row_server_i.c dlls/mshtml.tlb/mshtml_tlb.tlb dlls/mshtml/nsiface.h dlls/msi/cond.tab.c diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index c81c6ef..d602f13 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msdaps.dll -IMPORTS = oleaut32 ole32 rpcrt4 kernel32 ntdll +IMPORTS = uuid oleaut32 ole32 rpcrt4 kernel32 ntdll EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_CLSID_IS="{ 0x06210e88, 0x01f5, 0x11d1, { 0xb5, 0x12, 0x00, 0x80, 0xc7, 0x81, 0xc3, 0x84 } }" -DENTRY_PREFIX=msdaps_ EXTRAIDLFLAGS = --win32-align=2 @@ -12,10 +12,12 @@ EXTRA_OBJS = dlldata.o C_SRCS = \ main.c \ regsvr.c \ + row_server.c \ usrmarshal.c IDL_I_SRCS = \ - msdaps.idl + msdaps.idl \ + row_server.idl IDL_P_SRCS = \ msdaps.idl diff --git a/dlls/msdaps/main.c b/dlls/msdaps/main.c index f803507..92ed78b 100644 --- a/dlls/msdaps/main.c +++ b/dlls/msdaps/main.c @@ -33,6 +33,8 @@ #include "oleauto.h" #include "oledb.h" +#include "row_server.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); @@ -49,11 +51,110 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return msdaps_DllMain(instance, reason, reserved); } + +/****************************************************************************** + * ClassFactory + */ +typedef struct +{ + const IClassFactoryVtbl *lpVtbl; + HRESULT (*create_object)( IUnknown*, LPVOID* ); +} cf; + +static HRESULT WINAPI CF_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) +{ + cf *This = (cf *)iface; + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), obj); + + if( IsEqualCLSID( riid, &IID_IUnknown ) || + IsEqualCLSID( riid, &IID_IClassFactory ) ) + { + IClassFactory_AddRef( iface ); + *obj = iface; + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI CF_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI CF_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **obj) +{ + cf *This = (cf *)iface; + IUnknown *unk = NULL; + HRESULT r; + + TRACE("(%p, %p, %s, %p)\n", This, pOuter, debugstr_guid(riid), obj); + + r = This->create_object( pOuter, (void **) &unk ); + if (SUCCEEDED(r)) + { + r = IUnknown_QueryInterface( unk, riid, obj ); + IUnknown_Release( unk ); + } + return r; +} + +static HRESULT WINAPI CF_LockServer(IClassFactory *iface, BOOL dolock) +{ + FIXME("(%p, %d): stub\n", iface, dolock); + return S_OK; +} + +static const IClassFactoryVtbl CF_Vtbl = +{ + CF_QueryInterface, + CF_AddRef, + CF_Release, + CF_CreateInstance, + CF_LockServer +}; + +static cf row_server_cf = { &CF_Vtbl, create_row_server }; +static cf row_proxy_cf = { &CF_Vtbl, create_row_marshal }; +static cf rowset_server_cf = { &CF_Vtbl, create_rowset_server }; +static cf rowset_proxy_cf = { &CF_Vtbl, create_rowset_marshal }; + /*********************************************************************** * DllGetClassObject */ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) { + TRACE("(%s, %s, %p)\n", debugstr_guid(clsid), debugstr_guid(iid), obj); + + if (IsEqualCLSID(clsid, &CLSID_wine_row_server)) + { + *obj = &row_server_cf; + return S_OK; + } + + if (IsEqualCLSID(clsid, &CLSID_wine_row_proxy)) + { + *obj = &row_proxy_cf; + return S_OK; + } + + if (IsEqualCLSID(clsid, &CLSID_wine_rowset_server)) + { + *obj = &rowset_server_cf; + return S_OK; + } + + if (IsEqualCLSID(clsid, &CLSID_wine_rowset_proxy)) + { + *obj = &rowset_proxy_cf; + return S_OK; + } + return msdaps_DllGetClassObject(clsid, iid, obj); } diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c new file mode 100644 index 0000000..982a631 --- /dev/null +++ b/dlls/msdaps/row_server.c @@ -0,0 +1,68 @@ +/* + * Row and rowset servers / proxies. + * + * Copyright 2010 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "objbase.h" +#include "oleauto.h" +#include "oledb.h" + +#include "row_server.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oledb); + +HRESULT create_row_server(IUnknown *outer, void **obj) +{ + FIXME("(%p, %p): stub\n", outer, obj); + *obj = NULL; + return E_NOTIMPL; +} + +HRESULT create_rowset_server(IUnknown *outer, void **obj) +{ + FIXME("(%p, %p): stub\n", outer, obj); + *obj = NULL; + return E_NOTIMPL; +} + +HRESULT create_row_marshal(IUnknown *outer, void **obj) +{ + FIXME("(%p, %p): stub\n", outer, obj); + *obj = NULL; + return E_NOTIMPL; +} + +HRESULT create_rowset_marshal(IUnknown *outer, void **obj) +{ + FIXME("(%p, %p): stub\n", outer, obj); + *obj = NULL; + return E_NOTIMPL; +} diff --git a/dlls/msdaps/row_server.idl b/dlls/msdaps/row_server.idl new file mode 100644 index 0000000..4da585f --- /dev/null +++ b/dlls/msdaps/row_server.idl @@ -0,0 +1,56 @@ +/* + * Wine row server interface. + * + * Copyright (C) 2010 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + uuid(38248178-cf6d-11de-abe5-000c2916d865) +] +coclass wine_row_server +{ + +} + +[ + uuid(38248179-cf6d-11de-abe5-000c2916d865) +] +coclass wine_row_proxy +{ + +} + +[ + uuid(3824817a-cf6d-11de-abe5-000c2916d865) +] +coclass wine_rowset_server +{ + +} + +[ + uuid(3824817b-cf6d-11de-abe5-000c2916d865) +] +coclass wine_rowset_proxy +{ + +} + +cpp_quote("extern HRESULT create_row_server( IUnknown*, LPVOID* );") +cpp_quote("extern HRESULT create_row_marshal( IUnknown*, LPVOID* );") +cpp_quote("extern HRESULT create_rowset_server( IUnknown*, LPVOID* );") +cpp_quote("extern HRESULT create_rowset_marshal( IUnknown*, LPVOID* );")

1 0

Rob Shearman : server: Fix symbol was not declared and using plain integer as NULL pointer sparse warnings .
by Alexandre Julliard Jan. 22, 2010

Jan. 22, 2010

Module: wine Branch: master Commit: f12f8503a3349512ccd7b6537352ae6665f9eb3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12f8503a3349512ccd7b6537… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jan 21 11:57:45 2010 +0000 server: Fix symbol was not declared and using plain integer as NULL pointer sparse warnings. --- server/change.c | 4 ++-- server/main.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/server/change.c b/server/change.c index 9a1a02d..0dd7d29 100644 --- a/server/change.c +++ b/server/change.c @@ -451,8 +451,8 @@ struct inode { char *name; /* basename name of the inode */ }; -struct list inode_hash[ HASH_SIZE ]; -struct list wd_hash[ HASH_SIZE ]; +static struct list inode_hash[ HASH_SIZE ]; +static struct list wd_hash[ HASH_SIZE ]; static int inotify_add_dir( char *path, unsigned int filter ); diff --git a/server/main.c b/server/main.c index dd5ed53..a59350b 100644 --- a/server/main.c +++ b/server/main.c @@ -65,14 +65,14 @@ static void parse_args( int argc, char *argv[] ) static struct option long_options[] = { - {"debug", 2, 0, 'd'}, - {"foreground", 0, 0, 'f'}, - {"help", 0, 0, 'h'}, - {"kill", 2, 0, 'k'}, - {"persistent", 2, 0, 'p'}, - {"version", 0, 0, 'v'}, - {"wait", 0, 0, 'w'}, - { NULL, 0, 0, 0} + {"debug", 2, NULL, 'd'}, + {"foreground", 0, NULL, 'f'}, + {"help", 0, NULL, 'h'}, + {"kill", 2, NULL, 'k'}, + {"persistent", 2, NULL, 'p'}, + {"version", 0, NULL, 'v'}, + {"wait", 0, NULL, 'w'}, + { NULL, 0, NULL, 0} }; server_argv0 = argv[0];

1 0

Rob Shearman : wmc: Fix symbol was not declared and using plain integer as NULL pointer sparse warnings .
by Alexandre Julliard Jan. 22, 2010

Jan. 22, 2010

Module: wine Branch: master Commit: e4ff90cc4dc6be5cdceb150d4c43a26bc17f8428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4ff90cc4dc6be5cdceb150d4… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jan 21 11:57:27 2010 +0000 wmc: Fix symbol was not declared and using plain integer as NULL pointer sparse warnings. --- tools/wmc/wmc.c | 8 +++++--- tools/wmc/wmc.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 910a654..4c4ba28 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -101,7 +101,7 @@ int rcinline = 0; /* * Debugging flag (-D option) */ -int dodebug = 0; +static int dodebug = 0; char *output_name = NULL; /* The name given by the -o option */ char *input_name = NULL; /* The name given on the command-line */ @@ -115,6 +115,8 @@ time_t now; /* The time of start of wmc */ int mcy_debug; +FILE *yyin; + int getopt (int argc, char *const *argv, const char *optstring); static void segvhandler(int sig); @@ -242,8 +244,8 @@ int main(int argc,char *argv[]) mcy_debug = dodebug; if(dodebug) { - setbuf(stdout, 0); - setbuf(stderr, 0); + setbuf(stdout, NULL); + setbuf(stderr, NULL); } /* Check for input file on command-line */ diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index 86ccd6f..cf6d430 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -65,7 +65,7 @@ extern node_t *nodehead; extern lan_blk_t *lanblockhead; int mcy_lex(void); -FILE *yyin; +extern FILE *yyin; void set_codepage(int cp); void add_token(tok_e type, const WCHAR *name, int tok, int cp, const WCHAR *alias, int fix);

1 0

Huw Davies : msdaps: Switch to using an entry prefix for the auto-generated dlldata routines.
by Alexandre Julliard Jan. 22, 2010

Jan. 22, 2010

Module: wine Branch: master Commit: 0d519bdfd78fa3c70bd2e05f36ac01dc2d253ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d519bdfd78fa3c70bd2e05f3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 21 11:33:53 2010 +0000 msdaps: Switch to using an entry prefix for the auto-generated dlldata routines. --- dlls/msdaps/Makefile.in | 4 ++- dlls/msdaps/main.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msdaps/regsvr.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+), 1 deletions(-) diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index 0f65343..c81c6ef 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -4,12 +4,14 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msdaps.dll IMPORTS = oleaut32 ole32 rpcrt4 kernel32 ntdll -EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_CLSID_IS="{ 0x06210e88, 0x01f5, 0x11d1, { 0xb5, 0x12, 0x00, 0x80, 0xc7, 0x81, 0xc3, 0x84 } }" +EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_CLSID_IS="{ 0x06210e88, 0x01f5, 0x11d1, { 0xb5, 0x12, 0x00, 0x80, 0xc7, 0x81, 0xc3, 0x84 } }" -DENTRY_PREFIX=msdaps_ EXTRAIDLFLAGS = --win32-align=2 EXTRA_OBJS = dlldata.o C_SRCS = \ + main.c \ + regsvr.c \ usrmarshal.c IDL_I_SRCS = \ diff --git a/dlls/msdaps/main.c b/dlls/msdaps/main.c new file mode 100644 index 0000000..f803507 --- /dev/null +++ b/dlls/msdaps/main.c @@ -0,0 +1,66 @@ +/* + * msdaps initialisation. + * + * Copyright 2010 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "objbase.h" +#include "oleauto.h" +#include "oledb.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oledb); + +extern BOOL WINAPI msdaps_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; +extern HRESULT WINAPI msdaps_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; +extern HRESULT WINAPI msdaps_DllCanUnloadNow(void) DECLSPEC_HIDDEN; + +/***************************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + return msdaps_DllMain(instance, reason, reserved); +} + +/*********************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) +{ + return msdaps_DllGetClassObject(clsid, iid, obj); +} + +/*********************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return msdaps_DllCanUnloadNow(); +} diff --git a/dlls/msdaps/regsvr.c b/dlls/msdaps/regsvr.c new file mode 100644 index 0000000..37946de --- /dev/null +++ b/dlls/msdaps/regsvr.c @@ -0,0 +1,61 @@ +/* + * self-registerable dll functions for msdaps.dll + * + * Copyright (C) 2004 Raphael Junqueira + * 2010 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "config.h" + +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "winerror.h" + +#include "ole2.h" +#include "olectl.h" +#include "oleauto.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oledb); + +extern HRESULT WINAPI msdaps_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT WINAPI msdaps_DllUnregisterServer(void) DECLSPEC_HIDDEN; + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return msdaps_DllRegisterServer(); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return msdaps_DllUnregisterServer(); +}

1 0

Rob Shearman : ole32: Rearrange declarations in itemmoniker. c to avoid unnecessary forward declarations.
by Alexandre Julliard Jan. 22, 2010

Jan. 22, 2010

Module: wine Branch: master Commit: c3af2dd752776ee1f42b5f6d54fafbd70cce9dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3af2dd752776ee1f42b5f6d5… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jan 21 11:58:24 2010 +0000 ole32: Rearrange declarations in itemmoniker.c to avoid unnecessary forward declarations. --- dlls/ole32/itemmoniker.c | 359 ++++++++++++++++++++-------------------------- 1 files changed, 156 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3af2dd752776ee1f42b5…

1 0