December 2005 - Wine-Commits

wine/dlls/oleaut32 typelib.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21592 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:00:52 Modified files: dlls/oleaut32 : typelib.c Log message: Robert Shearman <rob(a)codeweavers.com> Don't truncate large integer constants. Patch: http://cvs.winehq.org/patch.py?id=21592 Old revision New revision Changes Path 1.180 1.181 +1 -1 wine/dlls/oleaut32/typelib.c Index: wine/dlls/oleaut32/typelib.c diff -u -p wine/dlls/oleaut32/typelib.c:1.180 wine/dlls/oleaut32/typelib.c:1.181 --- wine/dlls/oleaut32/typelib.c:1.180 1 Dec 2005 12: 0:52 -0000 +++ wine/dlls/oleaut32/typelib.c 1 Dec 2005 12: 0:52 -0000 @@ -1532,7 +1532,7 @@ static void MSFT_ReadValue( VARIANT * pV if(offset <0) { /* data are packed in here */ V_VT(pVar) = (offset & 0x7c000000 )>> 26; - V_I2(pVar) = offset & 0x3ffffff; + V_I4(pVar) = offset & 0x3ffffff; return; } MSFT_ReadLEWords(&(V_VT(pVar)), sizeof(VARTYPE), pcx,

1 0

wine/dlls/shdocvw oleobject.c shdocvw.h webbro ...
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21591 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:00:33 Modified files: dlls/shdocvw : oleobject.c shdocvw.h webbrowser.c Log message: Jacek Caban <jacek(a)codeweavers.com> Added IOleInPlaceActiveObject stub implementation. Patch: http://cvs.winehq.org/patch.py?id=21591 Old revision New revision Changes Path 1.21 1.22 +95 -5 wine/dlls/shdocvw/oleobject.c 1.36 1.37 +2 -0 wine/dlls/shdocvw/shdocvw.h 1.30 1.31 +3 -0 wine/dlls/shdocvw/webbrowser.c Index: wine/dlls/shdocvw/oleobject.c diff -u -p wine/dlls/shdocvw/oleobject.c:1.21 wine/dlls/shdocvw/oleobject.c:1.22 --- wine/dlls/shdocvw/oleobject.c:1.21 1 Dec 2005 12: 0:33 -0000 +++ wine/dlls/shdocvw/oleobject.c 1 Dec 2005 12: 0:33 -0000 @@ -116,7 +116,7 @@ static HRESULT WINAPI OleObject_SetClien This->client = pClientSite; if(!pClientSite) return S_OK; - + IOleClientSite_AddRef(pClientSite); create_shell_embedding_hwnd(This); @@ -237,7 +237,6 @@ static HRESULT WINAPI OleObject_DoVerb(I This->pos_rect.bottom-This->pos_rect.top, SWP_NOZORDER | SWP_SHOWWINDOW); - if(This->client) { IOleClientSite_ShowObject(This->client); IOleClientSite_GetContainer(This->client, &This->container); @@ -556,11 +555,102 @@ static const IOleControlVtbl OleControlV OleControl_FreezeEvents }; +#define ACTIVEOBJ_THIS(iface) DEFINE_THIS(WebBrowser, OleInPlaceActiveObject, iface) + +static HRESULT WINAPI InPlaceActiveObject_QueryInterface(IOleInPlaceActiveObject *iface, + REFIID riid, void **ppv) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IWebBrowser2_QueryInterface(WEBBROWSER2(This), riid, ppv); +} + +static ULONG WINAPI InPlaceActiveObject_AddRef(IOleInPlaceActiveObject *iface) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IWebBrowser2_AddRef(WEBBROWSER2(This)); +} + +static ULONG WINAPI InPlaceActiveObject_Release(IOleInPlaceActiveObject *iface) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IWebBrowser2_Release(WEBBROWSER2(This)); +} + +static HRESULT WINAPI InPlaceActiveObject_GetWindow(IOleInPlaceActiveObject *iface, + HWND *phwnd) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IOleInPlaceObject_GetWindow(INPLACEOBJ(This), phwnd); +} + +static HRESULT WINAPI InPlaceActiveObject_ContextSensitiveHelp(IOleInPlaceActiveObject *iface, + BOOL fEnterMode) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IOleInPlaceObject_ContextSensitiveHelp(INPLACEOBJ(This), fEnterMode); +} + +static HRESULT WINAPI InPlaceActiveObject_TranslateAccelerator(IOleInPlaceActiveObject *iface, + LPMSG lpmsg) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, lpmsg); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceActiveObject *iface, + BOOL fActivate) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%x)\n", This, fActivate); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_OnDocWindowActivate(IOleInPlaceActiveObject *iface, + BOOL fActivate) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%x)\n", This, fActivate); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_ResizeBorder(IOleInPlaceActiveObject *iface, + LPCRECT lprcBorder, IOleInPlaceUIWindow *pUIWindow, BOOL fFrameWindow) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%p %p %x)\n", This, lprcBorder, pUIWindow, fFrameWindow); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_EnableModeless(IOleInPlaceActiveObject *iface, + BOOL fEnable) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%x)\n", This, fEnable); + return E_NOTIMPL; +} + +#undef ACTIVEOBJ_THIS + +static const IOleInPlaceActiveObjectVtbl OleInPlaceActiveObjectVtbl = { + InPlaceActiveObject_QueryInterface, + InPlaceActiveObject_AddRef, + InPlaceActiveObject_Release, + InPlaceActiveObject_GetWindow, + InPlaceActiveObject_ContextSensitiveHelp, + InPlaceActiveObject_TranslateAccelerator, + InPlaceActiveObject_OnFrameWindowActivate, + InPlaceActiveObject_OnDocWindowActivate, + InPlaceActiveObject_ResizeBorder, + InPlaceActiveObject_EnableModeless +}; + void WebBrowser_OleObject_Init(WebBrowser *This) { - This->lpOleObjectVtbl = &OleObjectVtbl; - This->lpOleInPlaceObjectVtbl = &OleInPlaceObjectVtbl; - This->lpOleControlVtbl = &OleControlVtbl; + This->lpOleObjectVtbl = &OleObjectVtbl; + This->lpOleInPlaceObjectVtbl = &OleInPlaceObjectVtbl; + This->lpOleControlVtbl = &OleControlVtbl; + This->lpOleInPlaceActiveObjectVtbl = &OleInPlaceActiveObjectVtbl; This->client = NULL; This->container = NULL; Index: wine/dlls/shdocvw/shdocvw.h diff -u -p wine/dlls/shdocvw/shdocvw.h:1.36 wine/dlls/shdocvw/shdocvw.h:1.37 --- wine/dlls/shdocvw/shdocvw.h:1.36 1 Dec 2005 12: 0:33 -0000 +++ wine/dlls/shdocvw/shdocvw.h 1 Dec 2005 12: 0:33 -0000 @@ -71,6 +71,7 @@ typedef struct { const IQuickActivateVtbl *lpQuickActivateVtbl; const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; const IViewObject2Vtbl *lpViewObjectVtbl; + const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; /* Interfaces available for embeded document */ @@ -125,6 +126,7 @@ typedef struct { #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObjectVtbl); #define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectVtbl); +#define ACTIVEOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) #define CLIENTSITE(x) ((IOleClientSite*) &(x)->lpOleClientSiteVtbl) #define INPLACESITE(x) ((IOleInPlaceSite*) &(x)->lpOleInPlaceSiteVtbl) Index: wine/dlls/shdocvw/webbrowser.c diff -u -p wine/dlls/shdocvw/webbrowser.c:1.30 wine/dlls/shdocvw/webbrowser.c:1.31 --- wine/dlls/shdocvw/webbrowser.c:1.30 1 Dec 2005 12: 0:34 -0000 +++ wine/dlls/shdocvw/webbrowser.c 1 Dec 2005 12: 0:34 -0000 @@ -94,6 +94,9 @@ static HRESULT WINAPI WebBrowser_QueryIn }else if(IsEqualGUID(&IID_IViewObject2, riid)) { TRACE("(%p)->(IID_IViewObject2 %p)\n", This, ppv); *ppv = VIEWOBJ2(This); + }else if(IsEqualGUID(&IID_IOleInPlaceActiveObject, riid)) { + TRACE("(%p)->(IID_IOleInPlaceActiveObject %p)\n", This, ppv); + *ppv = ACTIVEOBJ(This); } if(*ppv) {

1 0

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

Dec. 1, 2005

ChangeSet ID: 21590 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:00:26 Modified files: dlls/advpack : advpack.c advpack.spec include : advpub.h Log message: James Hawkins <truiken(a)gmail.com> Add a stub for AdvInstallFile. Patch: http://cvs.winehq.org/patch.py?id=21590 Old revision New revision Changes Path 1.16 1.17 +34 -0 wine/dlls/advpack/advpack.c 1.11 1.12 +1 -1 wine/dlls/advpack/advpack.spec 1.7 1.8 +14 -0 wine/include/advpub.h Index: wine/dlls/advpack/advpack.c diff -u -p wine/dlls/advpack/advpack.c:1.16 wine/dlls/advpack/advpack.c:1.17 --- wine/dlls/advpack/advpack.c:1.16 1 Dec 2005 12: 0:26 -0000 +++ wine/dlls/advpack/advpack.c 1 Dec 2005 12: 0:26 -0000 @@ -36,6 +36,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); typedef HRESULT (WINAPI *DLLREGISTER) (void); +/*********************************************************************** + * AdvInstallFile (ADVPACK.@) + * + * Copies a file from the source to a destination. + * + * PARAMS + * hwnd [I] Handle to the window used for messages. + * lpszSourceDir [I] Source directory. + * lpszSourceFile [I] Source filename. + * lpszDestDir [I] Destination directory. + * lpszDestFile [I] Optional destination filename. + * dwFlags [I] See advpub.h. + * dwReserved [I] Reserved. Must be 0. + * + * RETURNS + * Success: S_OK. + * Failure: E_FAIL. + * + * NOTES + * If lpszDestFile is NULL, the destination filename is the same as + * lpszSourceFIle. + * + * BUGS + * Unimplemented. + */ +HRESULT WINAPI AdvInstallFile(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourceFile, + LPCSTR lpszDestDir, LPCSTR lpszDestFile, + DWORD dwFlags, DWORD dwReserved) +{ + FIXME("(%p,%p,%p,%p,%p,%ld,%ld) stub\n", hwnd, debugstr_a(lpszSourceDir), + debugstr_a(lpszSourceFile), debugstr_a(lpszDestDir), + debugstr_a(lpszDestFile), dwFlags, dwReserved); + return E_FAIL; +} /*********************************************************************** * DllMain (ADVPACK.@) Index: wine/dlls/advpack/advpack.spec diff -u -p wine/dlls/advpack/advpack.spec:1.11 wine/dlls/advpack/advpack.spec:1.12 --- wine/dlls/advpack/advpack.spec:1.11 1 Dec 2005 12: 0:26 -0000 +++ wine/dlls/advpack/advpack.spec 1 Dec 2005 12: 0:26 -0000 @@ -1,5 +1,5 @@ @ stub AddDelBackupEntry -@ stub AdvInstallFile +@ stdcall AdvInstallFile(long str str str str long long) @ stub CloseINFEngine @ stdcall DelNode(str long) @ stdcall DelNodeRunDLL32(ptr ptr str long) Index: wine/include/advpub.h diff -u -p wine/include/advpub.h:1.7 wine/include/advpub.h:1.8 --- wine/include/advpub.h:1.7 1 Dec 2005 12: 0:26 -0000 +++ wine/include/advpub.h 1 Dec 2005 12: 0:26 -0000 @@ -46,6 +46,17 @@ typedef struct _StrTable { typedef const STRTABLE CSTRTABLE; typedef CSTRTABLE *LPCSTRTABLE; +/* Flags for AdvInstallFile */ +#define AIF_WARNIFSKIP 0x00000001 +#define AIF_NOSKIP 0x00000002 +#define AIF_NOVERSIONCHECK 0x00000004 +#define AIF_FORCE_FILE_IN_USE 0x00000008 +#define AIF_NOOVERWRITE 0x00000010 +#define AIF_NO_VERSION_DIALOG 0x00000020 +#define AIF_REPLACEONLY 0x00000400 +#define AIF_NOLANGUAGECHECK 0x10000000 +#define AIF_QUIET 0x20000000 + /* Flags for RunSetupCommand */ #define RSC_FLAG_INF 0x00000001 #define RSC_FLAG_SKIPDISKSPACECHECK 0x00000002 @@ -61,6 +72,9 @@ typedef CSTRTABLE *LPCSTRTABLE; #define ADN_DONT_DEL_DIR 0x00000004 #define ADN_DEL_UNC_PATHS 0x00000008 +HRESULT WINAPI AdvInstallFile(HWND hwnd, LPCSTR lpszSourceDir, + LPCSTR lpszSourceFile, LPCSTR lpszDestDir, LPCSTR lpszDestFile, + DWORD dwFlags, DWORD dwReserved); HRESULT WINAPI DelNode(LPCSTR pszFileOrDirName, DWORD dwFlags); HRESULT WINAPI DelNodeRunDLL32(HWND,HINSTANCE,LPSTR,INT); HRESULT WINAPI ExecuteCab( HWND hwnd, PCABINFO pCab, LPVOID pReserved );

1 0

wine/ ./configure ./configure.ac dlls/wininet/ ...
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21589 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 06:00:19 Modified files: . : configure configure.ac dlls/wininet : netconnection.c include : config.h.in Log message: Robert Shearman <rob(a)codeweavers.com> Cleanup SSL connections properly, do a few security checks in NETCON_secure_connect and display errors from SSL on failure. Don't use SSL_set_bio as SSL_set_fd is cleaner for us. Patch: http://cvs.winehq.org/patch.py?id=21589 Old revision New revision Changes Path 1.720 1.721 +2 -0 wine/configure 1.416 1.417 +1 -0 wine/configure.ac 1.16 1.17 +114 -28 wine/dlls/wininet/netconnection.c 1.235 1.236 +3 -0 wine/include/config.h.in

1 0

wine/dlls/user listbox.c tests/listbox.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21588 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:59:24 Modified files: dlls/user : listbox.c dlls/user/tests: listbox.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Add a test for LB_SELITEMRANGE, make it pass under Wine. Patch: http://cvs.winehq.org/patch.py?id=21588 Old revision New revision Changes Path 1.25 1.26 +7 -5 wine/dlls/user/listbox.c 1.11 1.12 +87 -0 wine/dlls/user/tests/listbox.c Index: wine/dlls/user/listbox.c diff -u -p wine/dlls/user/listbox.c:1.25 wine/dlls/user/listbox.c:1.26 --- wine/dlls/user/listbox.c:1.25 1 Dec 2005 11:59:24 -0000 +++ wine/dlls/user/listbox.c 1 Dec 2005 11:59:24 -0000 @@ -1380,11 +1380,13 @@ static LRESULT LISTBOX_SelectItemRange( /* A few sanity checks */ if (descr->style & LBS_NOSEL) return LB_ERR; - if ((last == -1) && (descr->nb_items == 0)) return LB_OKAY; if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; - if (last == -1) last = descr->nb_items - 1; - if ((first < 0) || (first >= descr->nb_items)) return LB_ERR; - if ((last < 0) || (last >= descr->nb_items)) return LB_ERR; + + if (!descr->nb_items) return LB_OKAY; + + if (last >= descr->nb_items) last = descr->nb_items - 1; + if (first < 0) first = 0; + if (last < first) return LB_OKAY; if (on) /* Turn selection on */ { @@ -1424,7 +1426,7 @@ static LRESULT LISTBOX_SetSelection( LB_ if (descr->style & LBS_MULTIPLESEL) { if (index == -1) /* Select all items */ - return LISTBOX_SelectItemRange( descr, 0, -1, on ); + return LISTBOX_SelectItemRange( descr, 0, descr->nb_items, on ); else /* Only one item */ return LISTBOX_SelectItemRange( descr, index, index, on ); } Index: wine/dlls/user/tests/listbox.c diff -u -p wine/dlls/user/tests/listbox.c:1.11 wine/dlls/user/tests/listbox.c:1.12 --- wine/dlls/user/tests/listbox.c:1.11 1 Dec 2005 11:59:24 -0000 +++ wine/dlls/user/tests/listbox.c 1 Dec 2005 11:59:24 -0000 @@ -304,6 +304,92 @@ static void test_ownerdraw(void) DestroyWindow(parent); } +#define listbox_test_query(exp, got) \ + ok(exp.selected == got.selected, "expected selected %d, got %d\n", exp.selected, got.selected); \ + ok(exp.anchor == got.anchor, "expected anchor %d, got %d\n", exp.anchor, got.anchor); \ + ok(exp.caret == got.caret, "expected caret %d, got %d\n", exp.caret, got.caret); \ + ok(exp.selcount == got.selcount, "expected selcount %d, got %d\n", exp.selcount, got.selcount); + +static void test_selection(void) +{ + static const struct listbox_stat test_nosel = { 0, LB_ERR, 0, 0 }; + static const struct listbox_stat test_1 = { 0, LB_ERR, 0, 2 }; + static const struct listbox_stat test_2 = { 0, LB_ERR, 0, 3 }; + static const struct listbox_stat test_3 = { 0, LB_ERR, 0, 4 }; + HWND hLB; + struct listbox_stat answer; + INT ret; + + trace("testing LB_SELITEMRANGE\n"); + + hLB = create_listbox(LBS_EXTENDEDSEL, 0); + assert(hLB); + + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, 2)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_1, answer); + + SendMessage(hLB, LB_SETSEL, FALSE, (LPARAM)-1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(0, 4)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_3, answer); + + SendMessage(hLB, LB_SETSEL, FALSE, (LPARAM)-1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(-5, 5)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + SendMessage(hLB, LB_SETSEL, FALSE, (LPARAM)-1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(2, 10)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_1, answer); + + SendMessage(hLB, LB_SETSEL, FALSE, (LPARAM)-1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(4, 10)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + SendMessage(hLB, LB_SETSEL, FALSE, (LPARAM)-1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(10, 1)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_2, answer); + + SendMessage(hLB, LB_SETSEL, FALSE, (LPARAM)-1); + listbox_query(hLB, &answer); + listbox_test_query(test_nosel, answer); + + ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, -1)); + ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); + listbox_query(hLB, &answer); + listbox_test_query(test_2, answer); + + DestroyWindow(hLB); +} + START_TEST(listbox) { const struct listbox_test SS = @@ -376,4 +462,5 @@ START_TEST(listbox) check_item_height(); test_ownerdraw(); + test_selection(); }

1 0

wine/dlls/stdole2.tlb std_ole_v2.idl
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21587 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:59:11 Modified files: dlls/stdole2.tlb: std_ole_v2.idl Log message: Robert Shearman <rob(a)codeweavers.com> Fix the entry attributes of the two module functions and uncomment LoadPicture, but comment out the defaultvalue attribute that causes widl to issue a warning. Patch: http://cvs.winehq.org/patch.py?id=21587 Old revision New revision Changes Path 1.1 1.2 +4 -6 wine/dlls/stdole2.tlb/std_ole_v2.idl Index: wine/dlls/stdole2.tlb/std_ole_v2.idl diff -u -p wine/dlls/stdole2.tlb/std_ole_v2.idl:1.1 wine/dlls/stdole2.tlb/std_ole_v2.idl:1.2 --- wine/dlls/stdole2.tlb/std_ole_v2.idl:1.1 1 Dec 2005 11:59:11 -0000 +++ wine/dlls/stdole2.tlb/std_ole_v2.idl 1 Dec 2005 11:59:11 -0000 @@ -397,21 +397,19 @@ library stdole helpcontext(0x2775) ] module StdFunctions{ - /* FIXME: widl can't cope with a defaultvalue of an enum parameter yet. */ - /* [ - entry(0x60000000), + entry("OleLoadPictureFileEx"), helpstring("Loads a picture from a file"), helpcontext(0x2775) ] HRESULT LoadPicture([in, optional] VARIANT filename, [in, optional, defaultvalue(0)] int widthDesired, [in, optional, defaultvalue(0)] int heightDesired, - [in, optional, defaultvalue(0)] enum LoadPictureConstants flags, + /* FIXME: widl can't cope with a defaultvalue of an enum parameter yet. */ + [in, optional/*, defaultvalue(0)*/] enum LoadPictureConstants flags, [out, retval] IPictureDisp **retval); - */ [ - entry(0x60000001), + entry("OleSavePictureFile"), helpstring("Saves a picture to a file"), helpcontext(0x2775) ]

1 0

wine/dlls/oleaut32 typelib.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21586 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:59:07 Modified files: dlls/oleaut32 : typelib.c Log message: Robert Shearman <rob(a)codeweavers.com> The pparamdescex of an ELEMDESC should only be copied if wParamFlags & PARAMFLAG_DHASDEFAULT. Make ITypeInfo_ReleaseVarDesc use TLB_FreeElemDesc. Patch: http://cvs.winehq.org/patch.py?id=21586 Old revision New revision Changes Path 1.179 1.180 +9 -9 wine/dlls/oleaut32/typelib.c Index: wine/dlls/oleaut32/typelib.c diff -u -p wine/dlls/oleaut32/typelib.c:1.179 wine/dlls/oleaut32/typelib.c:1.180 --- wine/dlls/oleaut32/typelib.c:1.179 1 Dec 2005 11:59: 7 -0000 +++ wine/dlls/oleaut32/typelib.c 1 Dec 2005 11:59: 7 -0000 @@ -4333,7 +4333,7 @@ static ULONG WINAPI ITypeInfo_fnRelease( static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( ITypeInfo2 *iface, LPTYPEATTR *ppTypeAttr) { - ITypeInfoImpl *This = (ITypeInfoImpl *)iface; + const ITypeInfoImpl *This = (ITypeInfoImpl *)iface; SIZE_T size; TRACE("(%p)\n",This); @@ -4382,7 +4382,7 @@ static HRESULT WINAPI ITypeInfo_fnGetTyp static SIZE_T TLB_SizeElemDesc( const ELEMDESC *elemdesc ) { SIZE_T size = TLB_SizeTypeDesc(&elemdesc->tdesc, FALSE); - if (elemdesc->u.paramdesc.pparamdescex) + if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) size += sizeof(*elemdesc->u.paramdesc.pparamdescex); return size; } @@ -4391,23 +4391,24 @@ static HRESULT TLB_CopyElemDesc( const E { memcpy(dest, src, sizeof(ELEMDESC)); *buffer = TLB_CopyTypeDesc(&dest->tdesc, &src->tdesc, *buffer); - if (src->u.paramdesc.pparamdescex) + if (src->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) { const PARAMDESCEX *pparamdescex_src = src->u.paramdesc.pparamdescex; PARAMDESCEX *pparamdescex_dest = dest->u.paramdesc.pparamdescex = (PARAMDESCEX *)*buffer; *buffer += sizeof(PARAMDESCEX); memcpy(pparamdescex_dest, pparamdescex_src, sizeof(PARAMDESCEX)); VariantInit(&pparamdescex_dest->varDefaultValue); - if (src->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) - return VariantCopy(&pparamdescex_dest->varDefaultValue, - (VARIANTARG *)&pparamdescex_src->varDefaultValue); + return VariantCopy(&pparamdescex_dest->varDefaultValue, + (VARIANTARG *)&pparamdescex_src->varDefaultValue); } + else + dest->u.paramdesc.pparamdescex = NULL; return S_OK; } static void TLB_FreeElemDesc( ELEMDESC *elemdesc ) { - if (elemdesc->u.paramdesc.pparamdescex) + if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); } @@ -5717,8 +5718,7 @@ static void WINAPI ITypeInfo_fnReleaseVa ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TRACE("(%p)->(%p)\n", This, pVarDesc); - if (pVarDesc->elemdescVar.u.paramdesc.pparamdescex) - VariantClear(&pVarDesc->elemdescVar.u.paramdesc.pparamdescex->varDefaultValue); + TLB_FreeElemDesc(&pVarDesc->elemdescVar); if (pVarDesc->varkind == VAR_CONST) VariantClear(pVarDesc->u.lpvarValue); SysFreeString((BSTR)pVarDesc);

1 0

wine/dlls/wldap32 search.c wldap32.spec
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21585 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:58:49 Modified files: dlls/wldap32 : search.c wldap32.spec Log message: Steven Edwards <steven(a)codeweavers.com> Add stubs for ldap_search_init_page[A/W]. Patch: http://cvs.winehq.org/patch.py?id=21585 Old revision New revision Changes Path 1.6 1.7 +24 -0 wine/dlls/wldap32/search.c 1.30 1.31 +3 -3 wine/dlls/wldap32/wldap32.spec Index: wine/dlls/wldap32/search.c diff -u -p wine/dlls/wldap32/search.c:1.6 wine/dlls/wldap32/search.c:1.7 --- wine/dlls/wldap32/search.c:1.6 1 Dec 2005 11:58:49 -0000 +++ wine/dlls/wldap32/search.c 1 Dec 2005 11:58:49 -0000 @@ -495,3 +495,27 @@ exit: #endif return ret; } + +PLDAPSearch ldap_search_init_pageA( WLDAP32_LDAP *ld, const PCHAR name, + ULONG scope, const PCHAR filter, PCHAR attrs[], + ULONG attrsonly, PLDAPControlA* srvcontrols, + PLDAPControlA* clntcontrols, ULONG timelimit, + ULONG sizelimit, PLDAPSortKeyA* keys) +{ + FIXME( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p, 0x%08lx, 0x%08lx, %p)\n", + ld, debugstr_a(name), scope, debugstr_a(filter), attrs, + attrsonly, srvcontrols, clntcontrols, timelimit, sizelimit, keys); + return NULL; +} + +PLDAPSearch ldap_search_init_pageW( WLDAP32_LDAP *ld, const PWCHAR name, + ULONG scope, const PWCHAR filter, PWCHAR attrs[], + ULONG attrsonly, PLDAPControlW* srvcontrols, + PLDAPControlW* clntcontrols, ULONG timelimit, + ULONG sizelimit, PLDAPSortKeyW* keys) +{ + FIXME( "(%p, %s, 0x%08lx, %s, %p, 0x%08lx, %p, %p, 0x%08lx, 0x%08lx, %p)\n", + ld, debugstr_w(name), scope, debugstr_w(filter), attrs, + attrsonly, srvcontrols, clntcontrols, timelimit, sizelimit, keys); + return NULL; +} Index: wine/dlls/wldap32/wldap32.spec diff -u -p wine/dlls/wldap32/wldap32.spec:1.30 wine/dlls/wldap32/wldap32.spec:1.31 --- wine/dlls/wldap32/wldap32.spec:1.30 1 Dec 2005 11:58:49 -0000 +++ wine/dlls/wldap32/wldap32.spec 1 Dec 2005 11:58:49 -0000 @@ -191,9 +191,9 @@ 201 cdecl ldap_startup(ptr ptr) 202 cdecl ldap_cleanup(long) 203 cdecl ldap_search_ext_sW(ptr wstr long wstr ptr long ptr ptr ptr long ptr) -204 stub ldap_search_init_page -205 stub ldap_search_init_pageA -206 stub ldap_search_init_pageW +204 cdecl ldap_search_init_page(ptr str long str ptr long ptr ptr ptr long ptr) ldap_search_init_pageA +205 cdecl ldap_search_init_pageA(ptr str long str ptr long ptr ptr ptr long ptr) +206 cdecl ldap_search_init_pageW(ptr wstr long wstr ptr long ptr ptr ptr long ptr) 207 cdecl ldap_search_sA(ptr str long str ptr long ptr) 208 cdecl ldap_search_sW(ptr wstr long wstr ptr long ptr) 209 cdecl ldap_search_stA(ptr str long str ptr long ptr ptr)

1 0

wine/dlls/x11drv winpos.c
by Alexandre Julliard Dec. 1, 2005

Dec. 1, 2005

ChangeSet ID: 21584 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:58:41 Modified files: dlls/x11drv : winpos.c Log message: Detlef Riekenberg <wine.dev(a)web.de> Remove unused include X11/IntrinsicP.h. Patch: http://cvs.winehq.org/patch.py?id=21584 Old revision New revision Changes Path 1.143 1.144 +0 -1 wine/dlls/x11drv/winpos.c Index: wine/dlls/x11drv/winpos.c diff -u -p wine/dlls/x11drv/winpos.c:1.143 wine/dlls/x11drv/winpos.c:1.144 --- wine/dlls/x11drv/winpos.c:1.143 1 Dec 2005 11:58:41 -0000 +++ wine/dlls/x11drv/winpos.c 1 Dec 2005 11:58:41 -0000 @@ -23,7 +23,6 @@ #include <X11/Xlib.h> #ifdef HAVE_LIBXSHAPE -#include <X11/IntrinsicP.h> #include <X11/extensions/shape.h> #endif /* HAVE_LIBXSHAPE */ #include <stdarg.h>

1 0

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

Dec. 1, 2005

ChangeSet ID: 21583 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/12/01 05:58:33 Modified files: dlls/shdocvw : oleobject.c Log message: Jacek Caban <jacek(a)codeweavers.com> Added SetObjectRects implementation. Patch: http://cvs.winehq.org/patch.py?id=21583 Old revision New revision Changes Path 1.20 1.21 +12 -2 wine/dlls/shdocvw/oleobject.c Index: wine/dlls/shdocvw/oleobject.c diff -u -p wine/dlls/shdocvw/oleobject.c:1.20 wine/dlls/shdocvw/oleobject.c:1.21 --- wine/dlls/shdocvw/oleobject.c:1.20 1 Dec 2005 11:58:33 -0000 +++ wine/dlls/shdocvw/oleobject.c 1 Dec 2005 11:58:33 -0000 @@ -454,8 +454,18 @@ static HRESULT WINAPI OleInPlaceObject_S LPCRECT lprcPosRect, LPCRECT lprcClipRect) { WebBrowser *This = INPLACEOBJ_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); + + if(This->shell_embedding_hwnd) { + SetWindowPos(This->shell_embedding_hwnd, NULL, + lprcPosRect->left, lprcPosRect->top, + lprcPosRect->bottom-lprcPosRect->top, + lprcPosRect->right-lprcPosRect->left, + SWP_NOZORDER | SWP_NOACTIVATE); + } + + return S_OK; } static HRESULT WINAPI OleInPlaceObject_ReactivateAndUndo(IOleInPlaceObject *iface)

1 0