July 2006 - Wine-Commits - list.winehq.org

Jacek Caban : urlmon: Always verify mime using FindMimeFromData.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 101c18537af2ab72b711c25403e89ad3026841cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=101c18537af2ab72b711c25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 8 16:08:24 2006 +0200 urlmon: Always verify mime using FindMimeFromData. --- dlls/urlmon/binding.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 52e7de3..4277cb2 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -862,12 +862,8 @@ static HRESULT WINAPI InternetProtocolSi fill_stream_buffer(This->stream); - /* FIXME: Always call FindMediaFromData (its implementation is not yet ready for this). */ - if(This->mime) - mime = This->mime; - else - FindMimeFromData(NULL, This->url, This->stream->buf, - min(This->stream->buf_size, 255), This->mime, 0, &mime, 0); + FindMimeFromData(NULL, This->url, This->stream->buf, + min(This->stream->buf_size, 255), This->mime, 0, &mime, 0); on_progress(This, ulProgress, ulProgressMax, BINDSTATUS_MIMETYPEAVAILABLE, mime); }

1 0

Jacek Caban : shdocvw: Added test of DoVerb.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: b1d1507ed8305195fb04992ae7985c53ed72ca02 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b1d1507ed8305195fb04992… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 8 16:10:25 2006 +0200 shdocvw: Added test of DoVerb. --- dlls/shdocvw/tests/webbrowser.c | 245 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 242 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 1e4dffb..5763fe0 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -58,8 +58,15 @@ DEFINE_EXPECT(ShowObject); DEFINE_EXPECT(CanInPlaceActivate); DEFINE_EXPECT(OnInPlaceActivate); DEFINE_EXPECT(OnUIActivate); +DEFINE_EXPECT(GetWindowContext); +DEFINE_EXPECT(Frame_GetWindow); +DEFINE_EXPECT(Frame_SetActiveObject); +DEFINE_EXPECT(UIWindow_SetActiveObject); +DEFINE_EXPECT(SetMenu); -static HWND container_hwnd; +static const WCHAR wszItem[] = {'i','t','e','m',0}; + +static HWND container_hwnd, shell_embedding_hwnd; static HRESULT QueryInterface(REFIID,void**); @@ -67,6 +74,8 @@ static HRESULT WINAPI OleContainer_Query { if(IsEqualGUID(&IID_ITargetContainer, riid)) return E_NOINTERFACE; /* TODO */ + if(IsEqualGUID(&IID_IOleCommandTarget, riid)) + return E_NOINTERFACE; /* TODO */ ok(0, "unexpected call\n"); return E_NOINTERFACE; @@ -182,6 +191,158 @@ static const IOleClientSiteVtbl ClientSi ClientSite_RequestNewObjectLayout }; +static HRESULT WINAPI InPlaceUIWindow_QueryInterface(IOleInPlaceFrame *iface, + REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI InPlaceUIWindow_AddRef(IOleInPlaceFrame *iface) +{ + return 2; +} + +static ULONG WINAPI InPlaceUIWindow_Release(IOleInPlaceFrame *iface) +{ + return 1; +} + +static HRESULT WINAPI InPlaceUIWindow_GetWindow(IOleInPlaceFrame *iface, HWND *phwnd) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceFrame_GetWindow(IOleInPlaceFrame *iface, HWND *phwnd) +{ + CHECK_EXPECT(Frame_GetWindow); + ok(phwnd != NULL, "phwnd == NULL\n"); + if(phwnd) + *phwnd = container_hwnd; + return S_OK; +} + +static HRESULT WINAPI InPlaceUIWindow_ContextSensitiveHelp(IOleInPlaceFrame *iface, BOOL fEnterMode) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceUIWindow_GetBorder(IOleInPlaceFrame *iface, LPRECT lprectBorder) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceUIWindow_RequestBorderSpace(IOleInPlaceFrame *iface, + LPCBORDERWIDTHS pborderwidths) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceUIWindow_SetBorderSpace(IOleInPlaceFrame *iface, + LPCBORDERWIDTHS pborderwidths) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, + IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) +{ + CHECK_EXPECT(UIWindow_SetActiveObject); + ok(pActiveObject != NULL, "pActiveObject = NULL\n"); + ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); + return S_OK; +} + +static HRESULT WINAPI InPlaceFrame_SetActiveObject(IOleInPlaceFrame *iface, + IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) +{ + CHECK_EXPECT(Frame_SetActiveObject); + ok(pActiveObject != NULL, "pActiveObject = NULL\n"); + ok(!lstrcmpW(pszObjName, wszItem), "unexpected pszObjName\n"); + return S_OK; +} + +static HRESULT WINAPI InPlaceFrame_InsertMenus(IOleInPlaceFrame *iface, HMENU hmenuShared, + LPOLEMENUGROUPWIDTHS lpMenuWidths) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceFrame_SetMenu(IOleInPlaceFrame *iface, HMENU hmenuShared, + HOLEMENU holemenu, HWND hwndActiveObject) +{ + CHECK_EXPECT(SetMenu); + ok(hmenuShared == NULL, "hmenuShared=%p\n", hmenuShared); + ok(holemenu == NULL, "holemenu=%p\n", holemenu); + ok(hwndActiveObject == shell_embedding_hwnd, "hwndActiveObject=%p, expected %p\n", + hwndActiveObject, shell_embedding_hwnd); + return S_OK; +} + +static HRESULT WINAPI InPlaceFrame_RemoveMenus(IOleInPlaceFrame *iface, HMENU hmenuShared) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceFrame_SetStatusText(IOleInPlaceFrame *iface, LPCOLESTR pszStatusText) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceFrame_EnableModeless(IOleInPlaceFrame *iface, BOOL fEnable) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceFrame_TranslateAccelerator(IOleInPlaceFrame *iface, LPMSG lpmsg, WORD wID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IOleInPlaceFrameVtbl InPlaceUIWindowVtbl = { + InPlaceUIWindow_QueryInterface, + InPlaceUIWindow_AddRef, + InPlaceUIWindow_Release, + InPlaceUIWindow_GetWindow, + InPlaceUIWindow_ContextSensitiveHelp, + InPlaceUIWindow_GetBorder, + InPlaceUIWindow_RequestBorderSpace, + InPlaceUIWindow_SetBorderSpace, + InPlaceUIWindow_SetActiveObject, +}; + +static IOleInPlaceUIWindow InPlaceUIWindow = { (IOleInPlaceUIWindowVtbl*)&InPlaceUIWindowVtbl }; + +static const IOleInPlaceFrameVtbl InPlaceFrameVtbl = { + InPlaceUIWindow_QueryInterface, + InPlaceUIWindow_AddRef, + InPlaceUIWindow_Release, + InPlaceFrame_GetWindow, + InPlaceUIWindow_ContextSensitiveHelp, + InPlaceUIWindow_GetBorder, + InPlaceUIWindow_RequestBorderSpace, + InPlaceUIWindow_SetBorderSpace, + InPlaceFrame_SetActiveObject, + InPlaceFrame_InsertMenus, + InPlaceFrame_SetMenu, + InPlaceFrame_RemoveMenus, + InPlaceFrame_SetStatusText, + InPlaceFrame_EnableModeless, + InPlaceFrame_TranslateAccelerator +}; + +static IOleInPlaceFrame InPlaceFrame = { &InPlaceFrameVtbl }; + static IOleClientSite ClientSite = { &ClientSiteVtbl }; static HRESULT WINAPI InPlaceSite_QueryInterface(IOleInPlaceSiteEx *iface, REFIID riid, void **ppv) @@ -236,8 +397,37 @@ static HRESULT WINAPI InPlaceSite_GetWin IOleInPlaceFrame **ppFrame, IOleInPlaceUIWindow **ppDoc, LPRECT lprcPosRect, LPRECT lprcClipRect, LPOLEINPLACEFRAMEINFO lpFrameInfo) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + static const RECT pos_rect = {2,1,1002,901}; + static const RECT clip_rect = {10,10,990,890}; + + CHECK_EXPECT(GetWindowContext); + + ok(ppFrame != NULL, "ppFrame = NULL\n"); + if(ppFrame) + *ppFrame = &InPlaceFrame; + + ok(ppDoc != NULL, "ppDoc = NULL\n"); + if(ppDoc) + *ppDoc = &InPlaceUIWindow; + + ok(lprcPosRect != NULL, "lprcPosRect = NULL\n"); + if(lprcPosRect) + memcpy(lprcPosRect, &pos_rect, sizeof(RECT)); + + ok(lprcClipRect != NULL, "lprcClipRect = NULL\n"); + if(lprcClipRect) + memcpy(lprcClipRect, &clip_rect, sizeof(RECT)); + + ok(lpFrameInfo != NULL, "lpFrameInfo = NULL\n"); + if(lpFrameInfo) { + lpFrameInfo->cb = sizeof(*lpFrameInfo); + lpFrameInfo->fMDIApp = FALSE; + lpFrameInfo->hwndFrame = container_hwnd; + lpFrameInfo->haccel = NULL; + lpFrameInfo->cAccelEntries = 0; + } + + return S_OK; } static HRESULT WINAPI InPlaceSite_Scroll(IOleInPlaceSiteEx *iface, SIZE scrollExtant) @@ -361,6 +551,52 @@ static HWND create_container_window(void CW_USEDEFAULT, NULL, NULL, NULL, NULL); } +static void test_DoVerb(IUnknown *unk) +{ + IOleObject *oleobj; + RECT rect = {0,0,1000,1000}; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08lx\n", hres); + if(FAILED(hres)) + return; + + SET_EXPECT(CanInPlaceActivate); + SET_EXPECT(Site_GetWindow); + SET_EXPECT(OnInPlaceActivate); + SET_EXPECT(GetWindowContext); + SET_EXPECT(ShowObject); + SET_EXPECT(GetContainer); + SET_EXPECT(Frame_GetWindow); + SET_EXPECT(OnUIActivate); + SET_EXPECT(Frame_SetActiveObject); + SET_EXPECT(UIWindow_SetActiveObject); + SET_EXPECT(SetMenu); + + hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, + 0, container_hwnd, &rect); + ok(hres == S_OK, "DoVerb failed: %08lx\n", hres); + + CHECK_CALLED(CanInPlaceActivate); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(OnInPlaceActivate); + CHECK_CALLED(GetWindowContext); + CHECK_CALLED(ShowObject); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Frame_GetWindow); + CHECK_CALLED(OnUIActivate); + CHECK_CALLED(Frame_SetActiveObject); + CHECK_CALLED(UIWindow_SetActiveObject); + CHECK_CALLED(SetMenu); + + hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, + 0, container_hwnd, &rect); + ok(hres == S_OK, "DoVerb failed: %08lx\n", hres); + + IOleObject_Release(oleobj); +} + static void test_GetMiscStatus(IOleObject *oleobj) { DWORD st, i; @@ -419,6 +655,8 @@ static void test_ClientSite(IUnknown *un ok(hres == S_OK, "GetWindow failed: %08lx\n", hres); ok((hwnd == NULL) == (client == NULL), "unexpected hwnd %p\n", hwnd); + shell_embedding_hwnd = hwnd; + IOleInPlaceObject_Release(inplace); IOleObject_Release(oleobj); } @@ -469,6 +707,7 @@ static void test_WebBrowser(void) test_ClassInfo(unk); test_ClientSite(unk, &ClientSite); + test_DoVerb(unk); test_ClientSite(unk, NULL); ref = IUnknown_Release(unk);

1 0

Jacek Caban : shdocvw: Added GetMiscStatus test.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: d2520ccf167e136434933e52625deaa46c83b35f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d2520ccf167e136434933e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 8 16:07:30 2006 +0200 shdocvw: Added GetMiscStatus test. --- dlls/shdocvw/tests/webbrowser.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index e5461d7..1e4dffb 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -361,6 +361,22 @@ static HWND create_container_window(void CW_USEDEFAULT, NULL, NULL, NULL, NULL); } +static void test_GetMiscStatus(IOleObject *oleobj) +{ + DWORD st, i; + HRESULT hres; + + for(i=0; i<10; i++) { + st = 0xdeadbeef; + hres = IOleObject_GetMiscStatus(oleobj, i, &st); + ok(hres == S_OK, "GetMiscStatus failed: %08lx\n", hres); + ok(st == (OLEMISC_SETCLIENTSITEFIRST|OLEMISC_ACTIVATEWHENVISIBLE|OLEMISC_INSIDEOUT + |OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE), + "st=%08lx, expected OLEMISC_SETCLIENTSITEFIRST|OLEMISC_ACTIVATEWHENVISIBLE|" + "OLEMISC_INSIDEOUT|OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE)\n", st); + } +} + static void test_ClientSite(IUnknown *unk, IOleClientSite *client) { IOleObject *oleobj; @@ -373,6 +389,8 @@ static void test_ClientSite(IUnknown *un if(FAILED(hres)) return; + test_GetMiscStatus(oleobj); + hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObject, (void**)&inplace); ok(hres == S_OK, "QueryInterface(IID_OleInPlaceObject) failed: %08lx\n", hres); if(FAILED(hres)) {

1 0

Jacek Caban : shdocvw: Call SetMenu in activate_ui.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: d76ed6f6930ecba778c34a99b0350a2acfc851a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d76ed6f6930ecba778c34a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 8 16:09:24 2006 +0200 shdocvw: Call SetMenu in activate_ui. --- dlls/shdocvw/oleobject.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 513b128..dc790b3 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -171,9 +171,8 @@ static HRESULT activate_ui(WebBrowser *T if(This->uiwindow) IOleInPlaceUIWindow_SetActiveObject(This->uiwindow, ACTIVEOBJ(This), wszitem); - /* TODO: - * IOleInPlaceFrmae_SetMenu - */ + if(This->frame) + IOleInPlaceFrame_SetMenu(This->frame, NULL, NULL, This->shell_embedding_hwnd); SetFocus(This->shell_embedding_hwnd);

1 0

Jacek Caban : mshtml: Added OnFrameWindowActivate implementation.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 081d50d297b5729d448ff1b6b7d8ba112ce8c17d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=081d50d297b5729d448ff1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 8 16:11:25 2006 +0200 mshtml: Added OnFrameWindowActivate implementation. --- dlls/mshtml/olewnd.c | 12 +++++++-- dlls/mshtml/tests/htmldoc.c | 56 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/olewnd.c b/dlls/mshtml/olewnd.c index ea6a3c2..ef377ab 100644 --- a/dlls/mshtml/olewnd.c +++ b/dlls/mshtml/olewnd.c @@ -91,11 +91,17 @@ static HRESULT WINAPI OleInPlaceActiveOb return E_NOTIMPL; } -static HRESULT WINAPI OleInPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceActiveObject *iface, BOOL fActivate) +static HRESULT WINAPI OleInPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceActiveObject *iface, + BOOL fActivate) { HTMLDocument *This = ACTOBJ_THIS(iface); - FIXME("(%p)->(%x)\n", This, fActivate); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, fActivate); + + if(This->hostui) + IDocHostUIHandler_OnFrameWindowActivate(This->hostui, fActivate); + + return S_OK; } static HRESULT WINAPI OleInPlaceActiveObject_OnDocWindowActivate(IOleInPlaceActiveObject *iface, BOOL fActivate) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 78ce95b..697ddaf 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -101,6 +101,7 @@ DEFINE_EXPECT(Invoke_AMBIENT_PALETTE); DEFINE_EXPECT(GetDropTarget); DEFINE_EXPECT(UpdateUI); DEFINE_EXPECT(Navigate); +DEFINE_EXPECT(OnFrameWindowActivate); static BOOL expect_LockContainer_fLock; static BOOL expect_SetActiveObject_active; @@ -832,10 +833,12 @@ static HRESULT WINAPI DocHostUIHandler_O return E_NOTIMPL; } +static BOOL expect_OnFrameWindowActivate_fActivate; static HRESULT WINAPI DocHostUIHandler_OnFrameWindowActivate(IDocHostUIHandler2 *iface, BOOL fActivate) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT2(OnFrameWindowActivate); + ok(fActivate == expect_OnFrameWindowActivate_fActivate, "fActivate=%x\n", fActivate); + return S_OK; } static HRESULT WINAPI DocHostUIHandler_ResizeBorder(IDocHostUIHandler2 *iface, LPCRECT prcBorder, @@ -1808,6 +1811,50 @@ static void test_Close(IUnknown *unk, BO IOleObject_Release(oleobj); } +static void test_OnFrameWindowActivate(IUnknown *unk) +{ + IOleInPlaceActiveObject *inplaceact; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&inplaceact); + ok(hres == S_OK, "QueryInterface(IID_IOleInPlaceActiveObject) failed: %08lx\n", hres); + if(FAILED(hres)) + return; + + if(set_clientsite) { + expect_OnFrameWindowActivate_fActivate = TRUE; + SET_EXPECT(OnFrameWindowActivate); + hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, TRUE); + ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres); + CHECK_CALLED(OnFrameWindowActivate); + + SET_EXPECT(OnFrameWindowActivate); + hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, TRUE); + ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres); + CHECK_CALLED(OnFrameWindowActivate); + + expect_OnFrameWindowActivate_fActivate = FALSE; + SET_EXPECT(OnFrameWindowActivate); + hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, FALSE); + ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres); + CHECK_CALLED(OnFrameWindowActivate); + + expect_OnFrameWindowActivate_fActivate = TRUE; + SET_EXPECT(OnFrameWindowActivate); + hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, TRUE); + ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres); + CHECK_CALLED(OnFrameWindowActivate); + }else { + hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, FALSE); + ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres); + + hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, TRUE); + ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres); + } + + IOleInPlaceActiveObject_Release(inplaceact); +} + static void test_InPlaceDeactivate(IUnknown *unk, BOOL expect_call) { IOleInPlaceObjectWindowless *windowlessobj = NULL; @@ -1851,12 +1898,17 @@ static HRESULT test_Activate(IUnknown *u ok(hres == S_OK, "GetUserClassID failed: %08lx\n", hres); ok(IsEqualGUID(&guid, &CLSID_HTMLDocument), "guid != CLSID_HTMLDocument\n"); + test_OnFrameWindowActivate(unk); + test_ClientSite(oleobj, flags); test_InPlaceDeactivate(unk, FALSE); hres = test_DoVerb(oleobj); IOleObject_Release(oleobj); + + test_OnFrameWindowActivate(unk); + return hres; }

1 0

Bang Jun-Young : advapi32: Fix registry API prototypes to match the PSDK.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 0542e835bbf9e1a17d504f089cf326ff55a4e9e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0542e835bbf9e1a17d504f0… Author: Bang Jun-Young <bang.junyoung(a)gmail.com> Date: Sat Jul 8 22:26:16 2006 +0900 advapi32: Fix registry API prototypes to match the PSDK. --- dlls/advapi32/registry.c | 106 +++++++++++++++++++++++----------------------- include/winreg.h | 66 ++++++++++++++--------------- 2 files changed, 86 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0542e835bbf9e1a17d5…

1 0

Alexandre Julliard : include/.gitignore: Moved the wine subdir ignore list to the main file.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 94af8633a48527b6059385b6ce095552cf3c37ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=94af8633a48527b6059385b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 21:43:21 2006 +0200 include/.gitignore: Moved the wine subdir ignore list to the main file. --- include/.gitignore | 1 + include/wine/.gitignore | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 include/wine/.gitignore diff --git a/include/.gitignore b/include/.gitignore index 1f5ac1e..46c85ca 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -42,3 +42,4 @@ /wtypes.h /xmldom.h /xmldso.h +wine/itss.h diff --git a/include/wine/.gitignore b/include/wine/.gitignore deleted file mode 100644 index edeae0d..0000000 --- a/include/wine/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/itss.h

1 0

Alexandre Julliard : libs/.gitignore: Added wildcards for libraries.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: f202bdbf20945434ff365c7427b7fbcf493db88b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f202bdbf20945434ff365c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 21:41:34 2006 +0200 libs/.gitignore: Added wildcards for libraries. --- libs/.gitignore | 4 ++-- libs/unicode/.gitignore | 1 - libs/wine/.gitignore | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 libs/unicode/.gitignore delete mode 100644 libs/wine/.gitignore diff --git a/libs/.gitignore b/libs/.gitignore index 9d6f085..88f12e3 100644 --- a/libs/.gitignore +++ b/libs/.gitignore @@ -1,3 +1,3 @@ +*.dylib +*.so.1 /Makelib.rules -/libwine.so.1 -/libwine_unicode.so.1 diff --git a/libs/unicode/.gitignore b/libs/unicode/.gitignore deleted file mode 100644 index aaea816..0000000 --- a/libs/unicode/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/libwine_unicode.so.1 diff --git a/libs/wine/.gitignore b/libs/wine/.gitignore deleted file mode 100644 index 5ef5c06..0000000 --- a/libs/wine/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/libwine.so.1

1 0

Alexandre Julliard : .gitignore: Added wildcards to ignore generated resource files.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 77dc0d9be59272aedc63be3b30f9d949328cb62e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77dc0d9be59272aedc63be3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 21:39:00 2006 +0200 .gitignore: Added wildcards to ignore generated resource files. --- .gitignore | 7 ++++ dlls/amstream/.gitignore | 1 - dlls/atl/.gitignore | 1 - dlls/avifil32/.gitignore | 1 - dlls/cabinet/.gitignore | 1 - dlls/cards/.gitignore | 59 ------------------------------------- dlls/comcat/.gitignore | 1 - dlls/comctl32/.gitignore | 16 ---------- dlls/comctl32/tests/.gitignore | 1 - dlls/comdlg32/.gitignore | 13 -------- dlls/crypt32/.gitignore | 1 - dlls/d3d8/.gitignore | 1 - dlls/d3d9/.gitignore | 1 - dlls/d3dim/.gitignore | 1 - dlls/d3drm/.gitignore | 1 - dlls/d3dxof/.gitignore | 1 - dlls/ddraw/.gitignore | 1 - dlls/devenum/.gitignore | 1 - dlls/dinput/.gitignore | 1 - dlls/dinput8/.gitignore | 1 - dlls/dmband/.gitignore | 1 - dlls/dmcompos/.gitignore | 1 - dlls/dmime/.gitignore | 1 - dlls/dmloader/.gitignore | 1 - dlls/dmscript/.gitignore | 1 - dlls/dmstyle/.gitignore | 1 - dlls/dmsynth/.gitignore | 1 - dlls/dmusic/.gitignore | 1 - dlls/dmusic32/.gitignore | 1 - dlls/dplay/.gitignore | 1 - dlls/dplayx/.gitignore | 1 - dlls/dpnet/.gitignore | 1 - dlls/dpnhpast/.gitignore | 1 - dlls/dsound/.gitignore | 1 - dlls/dswave/.gitignore | 1 - dlls/dxdiagn/.gitignore | 1 - dlls/gdi/.gitignore | 2 - dlls/gphoto2.ds/.gitignore | 1 - dlls/hhctrl.ocx/.gitignore | 1 - dlls/iccvid/.gitignore | 1 - dlls/kernel/.gitignore | 2 - dlls/kernel/messages/.gitignore | 1 - dlls/mciavi32/.gitignore | 1 - dlls/mpr/.gitignore | 1 - dlls/msacm32/.gitignore | 1 - dlls/mscms/.gitignore | 1 - dlls/msdmo/.gitignore | 1 - dlls/mshtml/.gitignore | 1 - dlls/msi/.gitignore | 4 --- dlls/msrle32/.gitignore | 1 - dlls/msvcrt/.gitignore | 1 - dlls/msvfw32/.gitignore | 1 - dlls/msvidc32/.gitignore | 1 - dlls/mswsock/.gitignore | 1 - dlls/objsel/.gitignore | 1 - dlls/ole32/.gitignore | 5 --- dlls/oleaut32/.gitignore | 1 - dlls/oledlg/.gitignore | 1 - dlls/opengl32/.gitignore | 1 - dlls/qcap/.gitignore | 1 - dlls/quartz/.gitignore | 1 - dlls/riched20/.gitignore | 1 - dlls/sane.ds/.gitignore | 1 - dlls/serialui/.gitignore | 1 - dlls/setupapi/.gitignore | 1 - dlls/shdocvw/.gitignore | 1 - dlls/shell32/.gitignore | 18 ----------- dlls/shlwapi/.gitignore | 1 - dlls/stdole2.tlb/.gitignore | 2 - dlls/stdole32.tlb/.gitignore | 2 - dlls/urlmon/.gitignore | 1 - dlls/user/resources/.gitignore | 62 --------------------------------------- dlls/user/tests/.gitignore | 2 - dlls/uxtheme/.gitignore | 1 - dlls/version/tests/.gitignore | 1 - dlls/wineps.drv/.gitignore | 1 - dlls/wininet/.gitignore | 2 - dlls/winmm/.gitignore | 1 - dlls/winspool.drv/.gitignore | 1 - dlls/wintrust/.gitignore | 1 - dlls/wldap32/.gitignore | 1 - dlls/ws2_32/.gitignore | 1 - dlls/wsock32/.gitignore | 1 - programs/clock/.gitignore | 1 - programs/cmdlgtst/.gitignore | 2 - programs/msiexec/.gitignore | 2 - programs/notepad/.gitignore | 1 - programs/oleview/.gitignore | 2 - programs/progman/.gitignore | 1 - programs/regedit/.gitignore | 7 ---- programs/regsvr32/.gitignore | 1 - programs/start/.gitignore | 1 - programs/taskmgr/.gitignore | 7 ---- programs/uninstaller/.gitignore | 2 - programs/view/.gitignore | 1 - programs/wcmd/.gitignore | 2 - programs/winecfg/.gitignore | 3 -- programs/wineconsole/.gitignore | 1 - programs/winefile/.gitignore | 5 --- programs/winemine/.gitignore | 5 --- programs/winetest/.gitignore | 3 -- programs/winhelp/.gitignore | 1 - programs/wordpad/.gitignore | 2 - 103 files changed, 7 insertions(+), 308 deletions(-) delete mode 100644 dlls/amstream/.gitignore delete mode 100644 dlls/avifil32/.gitignore delete mode 100644 dlls/cabinet/.gitignore delete mode 100644 dlls/cards/.gitignore delete mode 100644 dlls/comcat/.gitignore delete mode 100644 dlls/comctl32/.gitignore delete mode 100644 dlls/comctl32/tests/.gitignore delete mode 100644 dlls/comdlg32/.gitignore delete mode 100644 dlls/crypt32/.gitignore delete mode 100644 dlls/d3d8/.gitignore delete mode 100644 dlls/d3d9/.gitignore delete mode 100644 dlls/d3dim/.gitignore delete mode 100644 dlls/d3drm/.gitignore delete mode 100644 dlls/d3dxof/.gitignore delete mode 100644 dlls/ddraw/.gitignore delete mode 100644 dlls/devenum/.gitignore delete mode 100644 dlls/dinput/.gitignore delete mode 100644 dlls/dinput8/.gitignore delete mode 100644 dlls/dmband/.gitignore delete mode 100644 dlls/dmcompos/.gitignore delete mode 100644 dlls/dmime/.gitignore delete mode 100644 dlls/dmloader/.gitignore delete mode 100644 dlls/dmscript/.gitignore delete mode 100644 dlls/dmstyle/.gitignore delete mode 100644 dlls/dmsynth/.gitignore delete mode 100644 dlls/dmusic/.gitignore delete mode 100644 dlls/dmusic32/.gitignore delete mode 100644 dlls/dplay/.gitignore delete mode 100644 dlls/dplayx/.gitignore delete mode 100644 dlls/dpnet/.gitignore delete mode 100644 dlls/dpnhpast/.gitignore delete mode 100644 dlls/dsound/.gitignore delete mode 100644 dlls/dswave/.gitignore delete mode 100644 dlls/dxdiagn/.gitignore delete mode 100644 dlls/gdi/.gitignore delete mode 100644 dlls/gphoto2.ds/.gitignore delete mode 100644 dlls/hhctrl.ocx/.gitignore delete mode 100644 dlls/iccvid/.gitignore delete mode 100644 dlls/kernel/.gitignore delete mode 100644 dlls/kernel/messages/.gitignore delete mode 100644 dlls/mciavi32/.gitignore delete mode 100644 dlls/mpr/.gitignore delete mode 100644 dlls/msacm32/.gitignore delete mode 100644 dlls/mscms/.gitignore delete mode 100644 dlls/msdmo/.gitignore delete mode 100644 dlls/msrle32/.gitignore delete mode 100644 dlls/msvcrt/.gitignore delete mode 100644 dlls/msvfw32/.gitignore delete mode 100644 dlls/msvidc32/.gitignore delete mode 100644 dlls/mswsock/.gitignore delete mode 100644 dlls/objsel/.gitignore delete mode 100644 dlls/oleaut32/.gitignore delete mode 100644 dlls/oledlg/.gitignore delete mode 100644 dlls/opengl32/.gitignore delete mode 100644 dlls/qcap/.gitignore delete mode 100644 dlls/quartz/.gitignore delete mode 100644 dlls/riched20/.gitignore delete mode 100644 dlls/sane.ds/.gitignore delete mode 100644 dlls/serialui/.gitignore delete mode 100644 dlls/setupapi/.gitignore delete mode 100644 dlls/shdocvw/.gitignore delete mode 100644 dlls/shlwapi/.gitignore delete mode 100644 dlls/stdole2.tlb/.gitignore delete mode 100644 dlls/stdole32.tlb/.gitignore delete mode 100644 dlls/urlmon/.gitignore delete mode 100644 dlls/user/resources/.gitignore delete mode 100644 dlls/user/tests/.gitignore delete mode 100644 dlls/uxtheme/.gitignore delete mode 100644 dlls/version/tests/.gitignore delete mode 100644 dlls/wineps.drv/.gitignore delete mode 100644 dlls/wininet/.gitignore delete mode 100644 dlls/winmm/.gitignore delete mode 100644 dlls/winspool.drv/.gitignore delete mode 100644 dlls/wintrust/.gitignore delete mode 100644 dlls/wldap32/.gitignore delete mode 100644 dlls/ws2_32/.gitignore delete mode 100644 dlls/wsock32/.gitignore delete mode 100644 programs/clock/.gitignore delete mode 100644 programs/cmdlgtst/.gitignore delete mode 100644 programs/msiexec/.gitignore delete mode 100644 programs/notepad/.gitignore delete mode 100644 programs/oleview/.gitignore delete mode 100644 programs/progman/.gitignore delete mode 100644 programs/regedit/.gitignore delete mode 100644 programs/regsvr32/.gitignore delete mode 100644 programs/start/.gitignore delete mode 100644 programs/taskmgr/.gitignore delete mode 100644 programs/uninstaller/.gitignore delete mode 100644 programs/view/.gitignore delete mode 100644 programs/wcmd/.gitignore delete mode 100644 programs/winecfg/.gitignore delete mode 100644 programs/wineconsole/.gitignore delete mode 100644 programs/winefile/.gitignore delete mode 100644 programs/winemine/.gitignore delete mode 100644 programs/wordpad/.gitignore Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=77dc0d9be59272aedc6…

1 0

Alexandre Julliard : .gitignore: Added wildcards to ignore lex and bison output files.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 88c97d72842ebc0d260732d153c83a542b7abd34 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88c97d72842ebc0d260732d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 21:40:49 2006 +0200 .gitignore: Added wildcards to ignore lex and bison output files. --- .gitignore | 2 ++ dlls/msi/.gitignore | 4 ---- libs/wpp/.gitignore | 3 --- programs/winedbg/.gitignore | 3 --- programs/winhelp/.gitignore | 1 - tools/widl/.gitignore | 3 --- tools/wmc/.gitignore | 2 -- tools/wrc/.gitignore | 3 --- 8 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 dlls/msi/.gitignore delete mode 100644 libs/wpp/.gitignore delete mode 100644 programs/winhelp/.gitignore diff --git a/.gitignore b/.gitignore index 2eb2418..cbdb7b7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ *.rej *.res *.so +*.tab.[ch] *.tlb *~ /Make.rules @@ -19,3 +20,4 @@ /tags /wine Makefile +lex.yy.c diff --git a/dlls/msi/.gitignore b/dlls/msi/.gitignore deleted file mode 100644 index 917d794..0000000 --- a/dlls/msi/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/cond.tab.c -/cond.tab.h -/sql.tab.c -/sql.tab.h diff --git a/libs/wpp/.gitignore b/libs/wpp/.gitignore deleted file mode 100644 index 5b5db6c..0000000 --- a/libs/wpp/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/lex.yy.c -/ppy.tab.c -/ppy.tab.h diff --git a/programs/winedbg/.gitignore b/programs/winedbg/.gitignore index f920a23..e1bf13e 100644 --- a/programs/winedbg/.gitignore +++ b/programs/winedbg/.gitignore @@ -1,4 +1 @@ -/dbg.tab.c -/dbg.tab.h -/lex.yy.c /winedbg.man diff --git a/programs/winhelp/.gitignore b/programs/winhelp/.gitignore deleted file mode 100644 index 8b7896a..0000000 --- a/programs/winhelp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lex.yy.c diff --git a/tools/widl/.gitignore b/tools/widl/.gitignore index a3359d0..444551b 100644 --- a/tools/widl/.gitignore +++ b/tools/widl/.gitignore @@ -1,5 +1,2 @@ -/lex.yy.c -/parser.tab.c -/parser.tab.h /widl /widl.man diff --git a/tools/wmc/.gitignore b/tools/wmc/.gitignore index 3d9e96c..4e7d73f 100644 --- a/tools/wmc/.gitignore +++ b/tools/wmc/.gitignore @@ -1,4 +1,2 @@ -/mcy.tab.c -/mcy.tab.h /wmc /wmc.man diff --git a/tools/wrc/.gitignore b/tools/wrc/.gitignore index 22392a3..f0989d7 100644 --- a/tools/wrc/.gitignore +++ b/tools/wrc/.gitignore @@ -1,5 +1,2 @@ -/lex.yy.c -/parser.tab.c -/parser.tab.h /wrc /wrc.man

1 0