December 2005 - Wine-Commits

wine/dlls/shdocvw dochost.c
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21622 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 07:14:47 Modified files: dlls/shdocvw : dochost.c Log message: Jacek Caban <jacek(a)codeweavers.com> Use sink in navigate_complete instead of ClientSite's IDispatch. Patch: http://cvs.winehq.org/patch.py?id=21622 Old revision New revision Changes Path 1.5 1.6 +8 -15 wine/dlls/shdocvw/dochost.c Index: wine/dlls/shdocvw/dochost.c diff -u -p wine/dlls/shdocvw/dochost.c:1.5 wine/dlls/shdocvw/dochost.c:1.6 --- wine/dlls/shdocvw/dochost.c:1.5 2 Dec 2005 13:14:47 -0000 +++ wine/dlls/shdocvw/dochost.c 2 Dec 2005 13:14:47 -0000 @@ -27,17 +27,13 @@ static ATOM doc_view_atom = 0; static void navigate_complete(WebBrowser *This) { - IDispatch *disp, *docdisp = NULL; + IDispatch *disp = NULL; DISPPARAMS dispparams; VARIANTARG params[2]; VARIANT url; HRESULT hres; - hres = IOleClientSite_QueryInterface(This->client, &IID_IDispatch, (void**)&disp); - if(FAILED(hres)) - return; - - hres = IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)&docdisp); + hres = IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)&disp); if(FAILED(hres)) FIXME("Could not get IDispatch interface\n"); @@ -50,19 +46,16 @@ static void navigate_complete(WebBrowser V_BYREF(params) = &url; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = docdisp; + V_DISPATCH(params+1) = disp; V_VT(&url) = VT_BSTR; V_BSTR(&url) = This->url; - IDispatch_Invoke(disp, DISPID_NAVIGATECOMPLETE2, &IID_NULL, LOCALE_SYSTEM_DEFAULT, - DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); - IDispatch_Invoke(disp, DISPID_DOCUMENTCOMPLETE, &IID_NULL, LOCALE_SYSTEM_DEFAULT, - DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); - - IDispatch_Release(disp); - if(docdisp) - IDispatch_Release(docdisp); + call_sink(This->cp_wbe2, DISPID_NAVIGATECOMPLETE2, &dispparams); + call_sink(This->cp_wbe2, DISPID_DOCUMENTCOMPLETE, &dispparams); + + if(disp) + IDispatch_Release(disp); } static LRESULT navigate2(WebBrowser *This)

1 0

wine/dlls/crypt32 Makefile.in cert.c crypt32.s ...
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21621 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:31:52 Modified files: dlls/crypt32 : Makefile.in cert.c crypt32.spec crypt32_private.h encode.c main.c dlls/crypt32/tests: .cvsignore Makefile.in encode.c Added files: dlls/crypt32 : oid.c dlls/crypt32/tests: oid.c Log message: Juan Lang <juan_lang(a)yahoo.com> Implement more OID support functions. Use the exported OID support functions internally. Move OID support functions and stubs to a separate file. Patch: http://cvs.winehq.org/patch.py?id=21621 Old revision New revision Changes Path 1.14 1.15 +1 -0 wine/dlls/crypt32/Makefile.in 1.24 1.25 +0 -13 wine/dlls/crypt32/cert.c 1.34 1.35 +2 -2 wine/dlls/crypt32/crypt32.spec 1.1 1.2 +3 -0 wine/dlls/crypt32/crypt32_private.h 1.34 1.35 +53 -282 wine/dlls/crypt32/encode.c 1.27 1.28 +4 -40 wine/dlls/crypt32/main.c Added 1.1 +0 -0 wine/dlls/crypt32/oid.c 1.4 1.5 +1 -0 wine/dlls/crypt32/tests/.cvsignore 1.6 1.7 +1 -0 wine/dlls/crypt32/tests/Makefile.in 1.27 1.28 +0 -55 wine/dlls/crypt32/tests/encode.c Added 1.1 +0 -0 wine/dlls/crypt32/tests/oid.c

1 0

wine/tools/winapi c_parser.pm winapi_parser.pm
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21620 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:31:11 Modified files: tools/winapi : c_parser.pm winapi_parser.pm Log message: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Make winapi_check understand the interface keyword. Patch: http://cvs.winehq.org/patch.py?id=21620 Old revision New revision Changes Path 1.19 1.20 +12 -12 wine/tools/winapi/c_parser.pm 1.8 1.9 +8 -8 wine/tools/winapi/winapi_parser.pm Index: wine/tools/winapi/c_parser.pm diff -u -p wine/tools/winapi/c_parser.pm:1.19 wine/tools/winapi/c_parser.pm:1.20 --- wine/tools/winapi/c_parser.pm:1.19 2 Dec 2005 10:31:11 -0000 +++ wine/tools/winapi/c_parser.pm 2 Dec 2005 10:31:11 -0000 @@ -1110,7 +1110,7 @@ sub parse_c_file($$$$) { $declaration .= $&; if($declaration =~ /^typedef/s || - $declaration =~ /^(?:const\s+|extern\s+|static\s+|volatile\s+)*(?:struct|union)(?:\s+\w+)?\s*\{/s) + $declaration =~ /^(?:const\s+|extern\s+|static\s+|volatile\s+)*(?:interface|struct|union)(?:\s+\w+)?\s*\{/s) { # Nothing } elsif($plevel == 1 && $blevel == 1) { @@ -1128,7 +1128,7 @@ sub parse_c_file($$$$) { $declaration .= $&; if(0 && $blevel == 1 && $declaration !~ /^typedef/ && - $declaration !~ /^(?:const\s+|extern\s+|static\s+|volatile\s+)?(?:struct|union)(?:\s+\w+)?\s*\{/s && + $declaration !~ /^(?:const\s+|extern\s+|static\s+|volatile\s+)?(?:interface|struct|union)(?:\s+\w+)?\s*\{/s && $declaration =~ /^(?:\w+(?:\s*\*)*\s+)*(\w+)\s*$\s*(?:(?:\w+\s*,\s*)*(\w+))?\s*$\s*(.*?);$/s && $1 ne "ICOM_VTABLE" && defined($2) && $2 ne "void" && $3) # K&R { @@ -1617,7 +1617,7 @@ sub parse_c_struct_union($$$$$$$$$) { $self->_parse_c_until_one_of("\\S", \$_, \$line, \$column); - if (!s/^(struct\s+|union\s+)((?:MSVCRT|WS)$\s*\w+\s*$|\w+)?\s*\{\s*//s) { + if (!s/^(interface\s+|struct\s+|union\s+)((?:MSVCRT|WS)$\s*\w+\s*$|\w+)?\s*\{\s*//s) { return 0; } $kind = $1; @@ -1787,7 +1787,7 @@ sub parse_c_type($$$$$) { # Nothing } elsif($self->_parse_c('ICOM_VTABLE$.*?$', \$_, \$line, \$column, \$type)) { # Nothing - } elsif($self->_parse_c('(?:enum\s+|struct\s+|union\s+)?(?:(?:MSVCRT|WS)$\s*\w+\s*$|\w+)\s*(\*\s*)*', + } elsif($self->_parse_c('(?:enum\s+|interface\s+|struct\s+|union\s+)?(?:(?:MSVCRT|WS)$\s*\w+\s*$|\w+)\s*(\*\s*)*', \$_, \$line, \$column, \$type)) { # Nothing @@ -1986,7 +1986,7 @@ sub parse_c_variable($$$$$$$) { # Nothing } elsif(/^$/) { return 0; - } elsif (s/^(enum\s+|struct\s+|union\s+)((?:MSVCRT|WS)$\s*\w+\s*$|\w+)?\s*\{\s*//s) { + } elsif (s/^(enum\s+|interface\s+|struct\s+|union\s+)((?:MSVCRT|WS)$\s*\w+\s*$|\w+)?\s*\{\s*//s) { my $kind = $1; my $_name = $2; $self->_update_c_position($&, \$line, \$column); @@ -1998,7 +1998,7 @@ sub parse_c_variable($$$$$$$) { } $finished = 1; - } elsif(s/^((?:enum\s+|struct\s+|union\s+)?\w+\b(?:\s+DECLSPEC_ALIGN$.*?$|\s*(?:const\s*|volatile\s*)?\*)*)\s*(\w+)\s*(\[.*?\]$|:\s*(\d+)$|\{)?//s) { + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s+DECLSPEC_ALIGN$.*?$|\s*(?:const\s*|volatile\s*)?\*)*)\s*(\w+)\s*(\[.*?\]$|:\s*(\d+)$|\{)?//s) { $type = "$sign$1"; $name = $2; @@ -2017,13 +2017,13 @@ sub parse_c_variable($$$$$$$) { $type = $self->_format_c_type($type); $finished = 1; - } elsif(s/^((?:enum\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*)\s*:\s*(\d+)$//s) { + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*)\s*:\s*(\d+)$//s) { $type = "$sign$1:$2"; $name = ""; $type = $self->_format_c_type($type); $finished = 1; - } elsif(s/^((?:enum\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*\s*$\s*(?:$CALL_CONVENTION)?(?:\s*\*)*)\s*(\w+)\s*($\s*$.*?$)$//s) { + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*\s*$\s*(?:$CALL_CONVENTION)?(?:\s*\*)*)\s*(\w+)\s*($\s*$.*?$)$//s) { $type = $self->_format_c_type("$sign$1$3"); $name = $2; @@ -2049,7 +2049,7 @@ sub parse_c_variable($$$$$$$) { } elsif($self->_parse_c('(?:struct\s+)?ICOM_VTABLE\s*$\w+$', \$_, \$line, \$column, \$match)) { $type = $match; $finished = 1; - } elsif(s/^(enum|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*//s) { + } elsif(s/^(enum|interface|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*//s) { my $kind = $1; my $_name = $2; $self->_update_c_position($&, \$line, \$column); @@ -2059,7 +2059,7 @@ sub parse_c_variable($$$$$$$) { } else { $type = "struct { }"; } - } elsif(s/^((?:enum\s+|struct\s+|union\s+)?\w+)\s*(?:\*\s*)*//s) { + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+)\s*(?:\*\s*)*//s) { $type = $&; $type =~ s/\s//g; } else { @@ -2109,7 +2109,7 @@ sub parse_c_variable($$$$$$$) { } elsif($self->_parse_c('(?:struct\s+)?ICOM_VTABLE\s*$.*?$', \$_, \$line, \$column, \$match)) { $type = "<type>"; $name = "<name>"; - } elsif(s/^((?:enum\s+|struct\s+|union\s+)?\w+)\s* + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+)\s* (?:\*\s*)*(\w+|\s*\*?\s*\w+\s*\))\s*(?:\[[^\]]*\]|$[^$]*\))? (?:,\s*(?:\*\s*)*(\w+)\s*(?:\[[^\]]*\])?)* \s*(?:=|$)//sx) @@ -2121,7 +2121,7 @@ sub parse_c_variable($$$$$$$) { $type =~ s/\s//g; $type =~ s/^struct/struct /; - } elsif(/^(enum|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*((?:\*\s*)*)(\w+)\s*(?:=|$)/s) { + } elsif(/^(enum|interface|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*((?:\*\s*)*)(\w+)\s*(?:=|$)/s) { $self->_update_c_position($&, \$line, \$column); my $kind = $1; Index: wine/tools/winapi/winapi_parser.pm diff -u -p wine/tools/winapi/winapi_parser.pm:1.8 wine/tools/winapi/winapi_parser.pm:1.9 --- wine/tools/winapi/winapi_parser.pm:1.8 2 Dec 2005 10:31:11 -0000 +++ wine/tools/winapi/winapi_parser.pm 2 Dec 2005 10:31:11 -0000 @@ -140,7 +140,7 @@ sub parse_c_file($$) { my $names = shift; foreach my $name (@$names) { - if($type =~ /^(?:struct|enum)/) { + if($type =~ /^(?:enum|interface|struct|union)/) { # $output->write("typedef $type {\n"); # $output->write("} $name;\n"); } else { @@ -372,7 +372,7 @@ sub parse_c_file($$) { } } next; - } elsif(/(extern\s+|static\s+)?((struct\s+|union\s+|enum\s+|signed\s+|unsigned\s+)?\w+((\s*\*)+\s*|\s+)) + } elsif(/(extern\s+|static\s+)?((interface\s+|struct\s+|union\s+|enum\s+|signed\s+|unsigned\s+)?\w+((\s*\*)+\s*|\s+)) ((__cdecl|__stdcall|__RPC_STUB|__RPC_USER|CDECL|NET_API_FUNCTION|RPC_ENTRY|VFWAPIV|VFWAPI|WINAPIV|WINAPI|CALLBACK)\s+)? (\w+($\w+$)?)\s*$(.*?)$\s*(\{|\;)/sx) { @@ -432,7 +432,7 @@ sub parse_c_file($$) { $argument_type = "..."; $argument_name = "..."; } elsif($argument =~ /^ - ((?:struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) + ((?:interface\s+|struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) (?:short\s+(?=int)|long\s+(?=int))?)?(?:\w+|ElfW$\w+$|WS$\w+$))\s* ((?:__RPC_FAR|const|CONST|volatile)?\s*(?:\*\s*(?:__RPC_FAR|const|CONST|volatile)?\s*?)*)\s* (\w*)\s*(\[\])?(?:\s+OPTIONAL)?$/x) @@ -446,7 +446,7 @@ sub parse_c_file($$) { } $argument_name = $3; } elsif ($argument =~ /^ - ((?:struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) + ((?:interface\s+|struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) (?:short\s+(?=int)|long\s+(?=int))?)?\w+)\s* ((?:const|volatile)?\s*(?:\*\s*(?:const|volatile)?\s*?)*)\s* (?:__cdecl\s+|__stdcall\s+|__RPC_STUB\s+|__RPC_USER\s+|CALLBACK\s+|CDECL\s+|NET_API_FUNCTION\s+|RPC_ENTRY\s+|STDMETHODCALLTYPE\s+|VFWAPIV\s+|VFWAPI\s+|WINAPIV\s+|WINAPI\s+)? @@ -465,7 +465,7 @@ sub parse_c_file($$) { $argument_type = "$return_type (*)($arguments)"; } elsif ($argument =~ /^ - ((?:struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) + ((?:interface\s+|struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) (?:short\s+(?=int)|long\s+(?=int))?)?\w+)\s* ((?:const|volatile)?\s*(?:\*\s*(?:const|volatile)?\s*?)*)\s* (\w+)\s*\[\s*(.*?)\s*\](?:\[\s*(.*?)\s*\])?$/x) @@ -548,7 +548,7 @@ sub parse_c_file($$) { } elsif(/(DEFAULT|DECLARE)_DEBUG_CHANNEL\s*$(\S+)$/s) { $_ = $'; $again = 1; push @$debug_channels, $1; - } elsif(/typedef\s+(enum|struct|union)(?:\s+(\w+))?\s*\{/s) { + } elsif(/typedef\s+(enum|interface|struct|union)(?:\s+(\w+))?\s*\{/s) { $_ = $'; $again = 1; $level++; my $type = $1; @@ -557,7 +557,7 @@ sub parse_c_file($$) { } &$type_begin($type); } elsif(/typedef\s+ - ((?:const\s+|CONST\s+|enum\s+|long\s+|signed\s+|short\s+|struct\s+|union\s+|unsigned\s+|volatile\s+)*?) + ((?:const\s+|CONST\s+|enum\s+|interface\s+|long\s+|signed\s+|short\s+|struct\s+|union\s+|unsigned\s+|volatile\s+)*?) (\w+) (?:\s+const|\s+volatile)? ((?:\s*(?:(?:FAR|__RPC_FAR|TW_HUGE)?\s*)?\*+\s*|\s+)(?:volatile\s+|DECLSPEC_ALIGN$\d+$\s+)?\w+\s*(?:\[[^\]]*\])* @@ -585,7 +585,7 @@ sub parse_c_file($$) { &$type_begin($type); &$type_end([@names]); } elsif(/typedef\s+ - (?:(?:const\s+|enum\s+|long\s+|signed\s+|short\s+|struct\s+|union\s+|unsigned\s+|volatile\s+)*?) + (?:(?:const\s+|enum\s+|interface\s+|long\s+|signed\s+|short\s+|struct\s+|union\s+|unsigned\s+|volatile\s+)*?) (\w+(?:\s*\*+\s*)?)\s* (?:(\w+)\s*)? $(?:(\w+)\s*)?\s*(?:\*\s*(\w+)|_ATL_CATMAPFUNC)\s*$\s*

1 0

wine/dlls/commdlg cdlg_Bg.rc cdlg_Ca.rc cdlg_C ...
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21619 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:31:02 Modified files: dlls/commdlg : cdlg_Bg.rc cdlg_Ca.rc cdlg_Cn.rc cdlg_Cs.rc cdlg_Da.rc cdlg_De.rc cdlg_En.rc cdlg_Es.rc cdlg_Fi.rc cdlg_Fr.rc cdlg_Hu.rc cdlg_It.rc cdlg_Ja.rc cdlg_Nl.rc cdlg_No.rc cdlg_Pl.rc cdlg_Pt.rc cdlg_Ru.rc cdlg_Si.rc cdlg_Sk.rc cdlg_Sv.rc cdlg_Uk.rc cdlg_Wa.rc cdlg_Zh.rc Log message: Pavel Roskin <proski(a)gnu.org> Improve script selection combobox in the font selection dialog - set height to 90 (the old value of 10 could only fit a single line) and remove CBS_OWNERDRAWFIXED flag to trim excessive height from the list items. Patch: http://cvs.winehq.org/patch.py?id=21619 Old revision New revision Changes Path 1.2 1.3 +1 -1 wine/dlls/commdlg/cdlg_Bg.rc 1.13 1.14 +1 -1 wine/dlls/commdlg/cdlg_Ca.rc 1.10 1.11 +1 -1 wine/dlls/commdlg/cdlg_Cn.rc 1.10 1.11 +1 -1 wine/dlls/commdlg/cdlg_Cs.rc 1.13 1.14 +1 -1 wine/dlls/commdlg/cdlg_Da.rc 1.26 1.27 +1 -1 wine/dlls/commdlg/cdlg_De.rc 1.42 1.43 +2 -2 wine/dlls/commdlg/cdlg_En.rc 1.19 1.20 +1 -1 wine/dlls/commdlg/cdlg_Es.rc 1.14 1.15 +1 -1 wine/dlls/commdlg/cdlg_Fi.rc 1.22 1.23 +1 -1 wine/dlls/commdlg/cdlg_Fr.rc 1.11 1.12 +1 -1 wine/dlls/commdlg/cdlg_Hu.rc 1.20 1.21 +1 -1 wine/dlls/commdlg/cdlg_It.rc 1.13 1.14 +1 -1 wine/dlls/commdlg/cdlg_Ja.rc 1.15 1.16 +1 -1 wine/dlls/commdlg/cdlg_Nl.rc 1.11 1.12 +1 -1 wine/dlls/commdlg/cdlg_No.rc 1.21 1.22 +1 -1 wine/dlls/commdlg/cdlg_Pl.rc 1.22 1.23 +1 -1 wine/dlls/commdlg/cdlg_Pt.rc 1.23 1.24 +1 -1 wine/dlls/commdlg/cdlg_Ru.rc 1.15 1.16 +1 -1 wine/dlls/commdlg/cdlg_Si.rc 1.16 1.17 +1 -1 wine/dlls/commdlg/cdlg_Sk.rc 1.18 1.19 +1 -1 wine/dlls/commdlg/cdlg_Sv.rc 1.8 1.9 +1 -1 wine/dlls/commdlg/cdlg_Uk.rc 1.13 1.14 +1 -1 wine/dlls/commdlg/cdlg_Wa.rc 1.12 1.13 +1 -1 wine/dlls/commdlg/cdlg_Zh.rc

1 0

wine/dlls/shdocvw events.c shdocvw.h
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21618 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:30:19 Modified files: dlls/shdocvw : events.c shdocvw.h Log message: Jacek Caban <jacek(a)codeweavers.com> Added implementation of IConnectionPoint::Advise and Unadvise. Patch: http://cvs.winehq.org/patch.py?id=21618 Old revision New revision Changes Path 1.18 1.19 +83 -14 wine/dlls/shdocvw/events.c 1.37 1.38 +7 -3 wine/dlls/shdocvw/shdocvw.h Index: wine/dlls/shdocvw/events.c diff -u -p wine/dlls/shdocvw/events.c:1.18 wine/dlls/shdocvw/events.c:1.19 --- wine/dlls/shdocvw/events.c:1.18 2 Dec 2005 10:30:19 -0000 +++ wine/dlls/shdocvw/events.c 2 Dec 2005 10:30:19 -0000 @@ -27,13 +27,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); -typedef struct { +struct ConnectionPoint { const IConnectionPointVtbl *lpConnectionPointVtbl; WebBrowser *webbrowser; + IDispatch **sinks; + DWORD sinks_size; + IID iid; -} ConnectionPoint; +}; #define CONPOINT(x) ((IConnectionPoint*) &(x)->lpConnectionPointVtbl) @@ -84,13 +87,13 @@ static HRESULT WINAPI ConnectionPointCon if(IsEqualGUID(&DIID_DWebBrowserEvents2, riid)) { TRACE("(%p)->(DIID_DWebBrowserEvents2 %p)\n", This, ppCP); - *ppCP = This->cp_wbe2; + *ppCP = CONPOINT(This->cp_wbe2); }else if(IsEqualGUID(&DIID_DWebBrowserEvents, riid)) { TRACE("(%p)->(DIID_DWebBrowserEvents %p)\n", This, ppCP); - *ppCP = This->cp_wbe; + *ppCP = CONPOINT(This->cp_wbe); }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppCP); - *ppCP = This->cp_pns; + *ppCP = CONPOINT(This->cp_pns); } if(*ppCP) { @@ -181,15 +184,53 @@ static HRESULT WINAPI ConnectionPoint_Ad DWORD *pdwCookie) { ConnectionPoint *This = CONPOINT_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, pUnkSink, pdwCookie); - return E_NOTIMPL; + IDispatch *disp; + DWORD i; + HRESULT hres; + + TRACE("(%p)->(%p %p)\n", This, pUnkSink, pdwCookie); + + hres = IUnknown_QueryInterface(pUnkSink, &This->iid, (void**)&disp); + if(FAILED(hres)) { + hres = IUnknown_QueryInterface(pUnkSink, &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) + return CONNECT_E_CANNOTCONNECT; + } + + if(This->sinks) { + for(i=0; i<This->sinks_size; i++) { + if(!This->sinks[i]) + break; + } + + if(i == This->sinks_size) + This->sinks = HeapReAlloc(GetProcessHeap(), 0, This->sinks, + (++This->sinks_size)*sizeof(*This->sinks)); + }else { + This->sinks = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->sinks)); + This->sinks_size = 1; + i = 0; + } + + This->sinks[i] = disp; + *pdwCookie = i+1; + + return S_OK; } static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) { ConnectionPoint *This = CONPOINT_THIS(iface); - FIXME("(%p)->(%ld)\n", This, dwCookie); - return E_NOTIMPL; + + TRACE("(%p)->(%ld)\n", This, dwCookie); + + if(!dwCookie || dwCookie > This->sinks_size || !This->sinks[dwCookie-1]) + return CONNECT_E_NOCONNECTION; + + IDispatch_Release(This->sinks[dwCookie-1]); + This->sinks[dwCookie-1] = NULL; + + return S_OK; } static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, @@ -214,15 +255,43 @@ static const IConnectionPointVtbl Connec ConnectionPoint_EnumConnections }; -static void ConnectionPoint_Create(WebBrowser *wb, REFIID riid, IConnectionPoint **cp) +void call_sink(ConnectionPoint *This, DISPID dispid, DISPPARAMS *dispparams) +{ + DWORD i; + + for(i=0; i<This->sinks_size; i++) { + if(This->sinks[i]) + IDispatch_Invoke(This->sinks[i], dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_METHOD, dispparams, NULL, NULL, NULL); + } +} + +static void ConnectionPoint_Create(WebBrowser *wb, REFIID riid, ConnectionPoint **cp) { ConnectionPoint *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ConnectionPoint)); ret->lpConnectionPointVtbl = &ConnectionPointVtbl; ret->webbrowser = wb; + + ret->sinks = NULL; + ret->sinks_size = 0; + memcpy(&ret->iid, riid, sizeof(IID)); - *cp = CONPOINT(ret); + *cp = ret; +} + +static void ConnectionPoint_Destroy(ConnectionPoint *This) +{ + int i; + + for(i=0; i<This->sinks_size; i++) { + if(This->sinks[i]) + IDispatch_Release(This->sinks[i]); + } + + HeapFree(GetProcessHeap(), 0, This->sinks); + HeapFree(GetProcessHeap(), 0, This); } void WebBrowser_Events_Init(WebBrowser *This) @@ -236,7 +305,7 @@ void WebBrowser_Events_Init(WebBrowser * void WebBrowser_Events_Destroy(WebBrowser *This) { - HeapFree(GetProcessHeap(), 0, This->cp_wbe2); - HeapFree(GetProcessHeap(), 0, This->cp_wbe); - HeapFree(GetProcessHeap(), 0, This->cp_pns); + ConnectionPoint_Destroy(This->cp_wbe2); + ConnectionPoint_Destroy(This->cp_wbe); + ConnectionPoint_Destroy(This->cp_pns); } Index: wine/dlls/shdocvw/shdocvw.h diff -u -p wine/dlls/shdocvw/shdocvw.h:1.37 wine/dlls/shdocvw/shdocvw.h:1.38 --- wine/dlls/shdocvw/shdocvw.h:1.37 2 Dec 2005 10:30:19 -0000 +++ wine/dlls/shdocvw/shdocvw.h 2 Dec 2005 10:30:19 -0000 @@ -58,6 +58,9 @@ extern HRESULT SHDOCVW_GetShellInstanceO /********************************************************************** * WebBrowser declaration for SHDOCVW.DLL */ + +typedef struct ConnectionPoint ConnectionPoint; + typedef struct { /* Interfaces available via WebBrowser object */ @@ -109,9 +112,9 @@ typedef struct { /* Connection points */ - IConnectionPoint *cp_wbe2; - IConnectionPoint *cp_wbe; - IConnectionPoint *cp_pns; + ConnectionPoint *cp_wbe2; + ConnectionPoint *cp_wbe; + ConnectionPoint *cp_pns; } WebBrowser; #define WEBBROWSER(x) ((IWebBrowser*) &(x)->lpWebBrowser2Vtbl) @@ -155,6 +158,7 @@ void WebBrowser_ClientSite_Destroy(WebBr HRESULT WebBrowser_Create(IUnknown*,REFIID,void**); void create_doc_view_hwnd(WebBrowser *This); +void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); #define WB_WM_NAVIGATE2 (WM_USER+100)

1 0

wine/dlls/wldap32 add.c bind.c compare.c contr ...
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21617 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:30:14 Modified files: dlls/wldap32 : add.c bind.c compare.c control.c delete.c dn.c error.c Log message: Hans Leidekker <hans(a)it.vu.nl> Document DN and error handling functions. Try to stick to Wine's documentation format. Patch: http://cvs.winehq.org/patch.py?id=21617 Old revision New revision Changes Path 1.6 1.7 +4 -4 wine/dlls/wldap32/add.c 1.8 1.9 +9 -9 wine/dlls/wldap32/bind.c 1.5 1.6 +4 -4 wine/dlls/wldap32/compare.c 1.5 1.6 +7 -7 wine/dlls/wldap32/control.c 1.3 1.4 +4 -4 wine/dlls/wldap32/delete.c 1.2 1.3 +84 -0 wine/dlls/wldap32/dn.c 1.4 1.5 +74 -2 wine/dlls/wldap32/error.c

1 0

wine/programs/wcmd batch.c builtins.c wcmdmain.c
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21616 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:30:04 Modified files: programs/wcmd : batch.c builtins.c wcmdmain.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Avoid formatted output in a few more places where formatting is not really needed and output could be large enough to be truncated. Patch: http://cvs.winehq.org/patch.py?id=21616 Old revision New revision Changes Path 1.14 1.15 +5 -2 wine/programs/wcmd/batch.c 1.31 1.32 +7 -2 wine/programs/wcmd/builtins.c 1.49 1.50 +3 -3 wine/programs/wcmd/wcmdmain.c Index: wine/programs/wcmd/batch.c diff -u -p wine/programs/wcmd/batch.c:1.14 wine/programs/wcmd/batch.c:1.15 --- wine/programs/wcmd/batch.c:1.14 2 Dec 2005 10:30: 4 -0000 +++ wine/programs/wcmd/batch.c 2 Dec 2005 10:30: 4 -0000 @@ -94,7 +94,9 @@ BATCH_CONTEXT *prev_context; while (WCMD_fgets (string, sizeof(string), h)) { if (strlen(string) == MAXSTRING -1) - WCMD_output("Line in Batch processing possible truncated. Using:\n%s\n",string); + WCMD_output_asis( "Line in Batch processing possible truncated. Using:\n"); + WCMD_output_asis( string); + WCMD_output_asis( "\n"); if (string[0] != ':') { /* Skip over labels */ WCMD_batch_command (string); } @@ -179,7 +181,8 @@ int i; /* Show prompt before batch line IF echo is on */ if (echo_mode && (line[0] != '@')) { WCMD_show_prompt(); - WCMD_output ("%s\n", cmd2); + WCMD_output_asis ( cmd2); + WCMD_output_asis ( "\n"); } WCMD_process_command (cmd2); Index: wine/programs/wcmd/builtins.c diff -u -p wine/programs/wcmd/builtins.c:1.31 wine/programs/wcmd/builtins.c:1.32 --- wine/programs/wcmd/builtins.c:1.31 2 Dec 2005 10:30: 4 -0000 +++ wine/programs/wcmd/builtins.c 2 Dec 2005 10:30: 4 -0000 @@ -827,7 +827,10 @@ char buffer[1048]; */ status = GetEnvironmentVariable(s, buffer, sizeof(buffer)); if (status) { - WCMD_output("%s=%s\n", s, buffer); + WCMD_output_asis( s); + WCMD_output_asis( "="); + WCMD_output_asis( buffer); + WCMD_output_asis( "\n"); } else { WCMD_output ("Environment variable %s not defined\n", s); } @@ -856,7 +859,9 @@ DWORD status; if (strlen(param1) == 0) { status = GetEnvironmentVariable ("PATH", string, sizeof(string)); if (status != 0) { - WCMD_output ("PATH=%s\n", string); + WCMD_output_asis ( "PATH="); + WCMD_output_asis ( string); + WCMD_output_asis ( "\n"); } else { WCMD_output ("PATH not found\n"); Index: wine/programs/wcmd/wcmdmain.c diff -u -p wine/programs/wcmd/wcmdmain.c:1.49 wine/programs/wcmd/wcmdmain.c:1.50 --- wine/programs/wcmd/wcmdmain.c:1.49 2 Dec 2005 10:30: 4 -0000 +++ wine/programs/wcmd/wcmdmain.c 2 Dec 2005 10:30: 4 -0000 @@ -698,7 +698,7 @@ char *p, *q; *q = '\0'; } } - WCMD_output (out_string); + WCMD_output_asis (out_string); } /**************************************************************************** @@ -720,9 +720,9 @@ int status; error_code, GetLastError()); return; } - WCMD_output (lpMsgBuf); + WCMD_output_asis (lpMsgBuf); LocalFree ((HLOCAL)lpMsgBuf); - WCMD_output (newline); + WCMD_output_asis (newline); return; }

1 0

wine/dlls/shdocvw oleobject.c
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21615 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:29:57 Modified files: dlls/shdocvw : oleobject.c Log message: Jacek Caban <jacek(a)codeweavers.com> Sync window sizes. Patch: http://cvs.winehq.org/patch.py?id=21615 Old revision New revision Changes Path 1.23 1.24 +26 -1 wine/dlls/shdocvw/oleobject.c Index: wine/dlls/shdocvw/oleobject.c diff -u -p wine/dlls/shdocvw/oleobject.c:1.23 wine/dlls/shdocvw/oleobject.c:1.24 --- wine/dlls/shdocvw/oleobject.c:1.23 2 Dec 2005 10:29:57 -0000 +++ wine/dlls/shdocvw/oleobject.c 2 Dec 2005 10:29:57 -0000 @@ -31,8 +31,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); static ATOM shell_embedding_atom = 0; +static LRESULT resize_window(WebBrowser *This, LONG width, LONG height) +{ + if(This->doc_view_hwnd) + SetWindowPos(This->doc_view_hwnd, NULL, 0, 0, width, height, + SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; +} + static LRESULT WINAPI shell_embedding_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { + WebBrowser *This; + + static const WCHAR wszTHIS[] = {'T','H','I','S',0}; + + if(msg == WM_CREATE) { + This = *(WebBrowser**)lParam; + SetPropW(hwnd, wszTHIS, This); + }else { + This = GetPropW(hwnd, wszTHIS); + } + + switch(msg) { + case WM_SIZE: + return resize_window(This, LOWORD(lParam), HIWORD(lParam)); + } + return DefWindowProcA(hwnd, msg, wParam, lParam); } @@ -477,8 +502,8 @@ static HRESULT WINAPI OleInPlaceObject_S if(This->shell_embedding_hwnd) { SetWindowPos(This->shell_embedding_hwnd, NULL, lprcPosRect->left, lprcPosRect->top, - lprcPosRect->bottom-lprcPosRect->top, lprcPosRect->right-lprcPosRect->left, + lprcPosRect->bottom-lprcPosRect->top, SWP_NOZORDER | SWP_NOACTIVATE); }

1 0

wine/dlls/shell32/tests shlfolder.c
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21614 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:29:49 Modified files: dlls/shell32/tests: shlfolder.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Added a test for native PIDL format. Patch: http://cvs.winehq.org/patch.py?id=21614 Old revision New revision Changes Path 1.44 1.45 +11 -0 wine/dlls/shell32/tests/shlfolder.c Index: wine/dlls/shell32/tests/shlfolder.c diff -u -p wine/dlls/shell32/tests/shlfolder.c:1.44 wine/dlls/shell32/tests/shlfolder.c:1.45 --- wine/dlls/shell32/tests/shlfolder.c:1.44 2 Dec 2005 10:29:49 -0000 +++ wine/dlls/shell32/tests/shlfolder.c 2 Dec 2005 10:29:49 -0000 @@ -368,6 +368,17 @@ static void test_GetDisplayName(void) return; } + /* WinXP stores the filenames as both ANSI and UNICODE in the pidls */ + pidlLast = ILFindLastID(pidlTestFile); + todo_wine { + ok( pidlLast->mkid.cb >= 76, "Expected pidl length of at least 76, got %d.\n", + pidlLast->mkid.cb); + } + if (pidlLast->mkid.cb >= 76) { + ok(!lstrcmpW((WCHAR*)&pidlLast->mkid.abID[46], wszFileName), + "WinXP stores the filename as a wchar-string at this position!\n"); + } + /* It seems as if we cannot bind to regular files on windows, but only directories. */ hr = IShellFolder_BindToObject(psfDesktop, pidlTestFile, NULL, &IID_IUnknown, (VOID**)&psfFile);

1 0

wine/dlls/advpack advpack.c
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21613 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/02 04:29:40 Modified files: dlls/advpack : advpack.c Log message: James Hawkins <truiken(a)gmail.com> Document many of the advpack functions. Patch: http://cvs.winehq.org/patch.py?id=21613 Old revision New revision Changes Path 1.17 1.18 +74 -0 wine/dlls/advpack/advpack.c Index: wine/dlls/advpack/advpack.c diff -u -p wine/dlls/advpack/advpack.c:1.17 wine/dlls/advpack/advpack.c:1.18 --- wine/dlls/advpack/advpack.c:1.17 2 Dec 2005 10:29:40 -0000 +++ wine/dlls/advpack/advpack.c 2 Dec 2005 10:29:40 -0000 @@ -126,6 +126,8 @@ HRESULT WINAPI RunSetupCommand( HWND hWn /*********************************************************************** * LaunchINFSection (ADVPACK.@) + * + * See LaunchINFSectionEx. */ INT WINAPI LaunchINFSection( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show ) { @@ -135,6 +137,21 @@ INT WINAPI LaunchINFSection( HWND hWnd, /*********************************************************************** * LaunchINFSectionEx (ADVPACK.@) + * + * Installs an INF section. + * + * PARAMS + * hWnd [I] Handle to the window used for the display. + * hInst [I] Instance of the process. + * cmdline [I] Contains parameters in the order INF,section,CAB,flags. + * show [I] How the window should be shown. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * + * BUGS + * Unimplemented. */ HRESULT WINAPI LaunchINFSectionEx( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show ) { @@ -181,6 +198,18 @@ BOOL WINAPI DoInfInstall(const SETUPCOMM /*********************************************************************** * IsNTAdmin (ADVPACK.@) + * + * Checks if the user has admin privileges. + * + * PARAMS + * reserved [I] Reserved. Must be 0. + * pReserved [I] Reserved. Must be NULL. + * + * RETURNS + * TRUE if user has admin rights, FALSE otherwise. + * + * BUGS + * Unimplemented. */ BOOL WINAPI IsNTAdmin( DWORD reserved, LPDWORD pReserved ) { @@ -190,6 +219,11 @@ BOOL WINAPI IsNTAdmin( DWORD reserved, L /*********************************************************************** * NeedRebootInit (ADVPACK.@) + * + * Sets up conditions for reboot checking. + * + * RETURNS + * Value required by NeedReboot. */ DWORD WINAPI NeedRebootInit(VOID) { @@ -199,6 +233,17 @@ DWORD WINAPI NeedRebootInit(VOID) /*********************************************************************** * NeedReboot (ADVPACK.@) + * + * Determines whether a reboot is required. + * + * PARAMS + * dwRebootCheck [I] Value from NeedRebootInit. + * + * RETURNS + * TRUE if a reboot is needed, FALSE otherwise. + * + * BUGS + * Unimplemented. */ BOOL WINAPI NeedReboot(DWORD dwRebootCheck) { @@ -208,6 +253,8 @@ BOOL WINAPI NeedReboot(DWORD dwRebootChe /*********************************************************************** * GetVersionFromFile (ADVPACK.@) + * + * See GetVersionFromFileEx. */ HRESULT WINAPI GetVersionFromFile( LPSTR Filename, LPDWORD MajorVer, LPDWORD MinorVer, BOOL Version ) @@ -225,6 +272,21 @@ typedef struct tagLANGANDCODEPAGE /*********************************************************************** * GetVersionFromFileEx (ADVPACK.@) + * + * Gets the files version or language information. + * + * PARAMS + * lpszFilename [I] The file to get the info from. + * pdwMSVer [O] Major version. + * pdwLSVer [O] Minor version. + * bVersion [I] Whether to retrieve version or language info. + * + * RETURNS + * Always returns S_OK. + * + * NOTES + * If bVersion is TRUE, version information is retrieved, else + * pdwMSVer gets the language ID and pdwLSVer gets the codepage ID. */ HRESULT WINAPI GetVersionFromFileEx( LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion ) @@ -452,6 +514,18 @@ HRESULT WINAPI DelNode( LPCSTR pszFileOr /*********************************************************************** * DelNodeRunDLL32 (ADVPACK.@) * + * Deletes a file or directory, WinMain style. + * + * PARAMS + * hWnd [I] Handle to the window used for the display. + * hInst [I] Instance of the process. + * cmdline [I] Contains parameters in the order FileOrDirName,Flags. + * show [I] How the window should be shown. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * * BUGS * Unimplemented */

1 0