November 2008 - Wine-Commits

Jacek Caban : shdocvw: Revert "Added Support for the IViewObjectEx" with tests.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: a43adb40af440cee59e0a091554dcfe11a957482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a43adb40af440cee59e0a0915… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 11 19:57:49 2008 +0100 shdocvw: Revert "Added Support for the IViewObjectEx" with tests. --- dlls/shdocvw/shdocvw.h | 3 +- dlls/shdocvw/tests/webbrowser.c | 6 +++ dlls/shdocvw/view.c | 67 +++++++-------------------------------- dlls/shdocvw/webbrowser.c | 3 -- 4 files changed, 19 insertions(+), 60 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 57d2577..0005143 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -115,7 +115,7 @@ struct WebBrowser { const IPersistMemoryVtbl *lpPersistMemoryVtbl; const IPersistStreamInitVtbl *lpPersistStreamInitVtbl; const IProvideClassInfo2Vtbl *lpProvideClassInfoVtbl; - const IViewObjectExVtbl *lpViewObjectVtbl; + const IViewObject2Vtbl *lpViewObjectVtbl; const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; const IHlinkFrameVtbl *lpHlinkFrameVtbl; @@ -173,7 +173,6 @@ struct InternetExplorer { #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObjectVtbl); #define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectVtbl); -#define VIEWOBJEX(x) ((IViewObjectEx*) &(x)->lpViewObjectVtbl); #define ACTIVEOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) #define OLECMD(x) ((IOleCommandTarget*) &(x)->lpOleCommandTargetVtbl) #define HLINKFRAME(x) ((IHlinkFrame*) &(x)->lpHlinkFrameVtbl) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index a203ae1..3aa4bdd 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1983,6 +1983,7 @@ static void test_QueryInterface(IUnknown *unk) IOleInPlaceSite *inplace = (void*)0xdeadbeef; IOleCache *cache = (void*)0xdeadbeef; IObjectWithSite *site = (void*)0xdeadbeef; + IViewObjectEx *viewex = (void*)0xdeadbeef; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa); @@ -2008,6 +2009,11 @@ static void test_QueryInterface(IUnknown *unk) hres = IUnknown_QueryInterface(unk, &IID_IObjectWithSite, (void**)&site); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(site == NULL, "inplace=%p, ezpected NULL\n", runnable); + + hres = IUnknown_QueryInterface(unk, &IID_IViewObjectEx, (void**)&viewex); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(viewex == NULL, "viewex=%p, ezpected NULL\n", runnable); + } static void test_WebBrowser(void) diff --git a/dlls/shdocvw/view.c b/dlls/shdocvw/view.c index 0bae877..d2e5857 100644 --- a/dlls/shdocvw/view.c +++ b/dlls/shdocvw/view.c @@ -23,25 +23,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); #define VIEWOBJ_THIS(iface) DEFINE_THIS(WebBrowser, ViewObject, iface) -static HRESULT WINAPI ViewObject_QueryInterface(IViewObjectEx *iface, REFIID riid, void **ppv) +static HRESULT WINAPI ViewObject_QueryInterface(IViewObject2 *iface, REFIID riid, void **ppv) { WebBrowser *This = VIEWOBJ_THIS(iface); return IWebBrowser2_QueryInterface(WEBBROWSER(This), riid, ppv); } -static ULONG WINAPI ViewObject_AddRef(IViewObjectEx *iface) +static ULONG WINAPI ViewObject_AddRef(IViewObject2 *iface) { WebBrowser *This = VIEWOBJ_THIS(iface); return IWebBrowser2_AddRef(WEBBROWSER(This)); } -static ULONG WINAPI ViewObject_Release(IViewObjectEx *iface) +static ULONG WINAPI ViewObject_Release(IViewObject2 *iface) { WebBrowser *This = VIEWOBJ_THIS(iface); return IWebBrowser2_Release(WEBBROWSER(This)); } -static HRESULT WINAPI ViewObject_Draw(IViewObjectEx *iface, DWORD dwDrawAspect, +static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hdcTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds, BOOL (STDMETHODCALLTYPE *pfnContinue)(ULONG_PTR), @@ -54,7 +54,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObjectEx *iface, DWORD dwDrawAspect, return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_GetColorSet(IViewObjectEx *iface, DWORD dwAspect, +static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **ppColorSet) { @@ -64,7 +64,7 @@ static HRESULT WINAPI ViewObject_GetColorSet(IViewObjectEx *iface, DWORD dwAspec return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_Freeze(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, +static HRESULT WINAPI ViewObject_Freeze(IViewObject2 *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze) { WebBrowser *This = VIEWOBJ_THIS(iface); @@ -72,14 +72,14 @@ static HRESULT WINAPI ViewObject_Freeze(IViewObjectEx *iface, DWORD dwDrawAspect return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_Unfreeze(IViewObjectEx *iface, DWORD dwFreeze) +static HRESULT WINAPI ViewObject_Unfreeze(IViewObject2 *iface, DWORD dwFreeze) { WebBrowser *This = VIEWOBJ_THIS(iface); FIXME("(%p)->(%d)\n", This, dwFreeze); return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD advf, +static HRESULT WINAPI ViewObject_SetAdvise(IViewObject2 *iface, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink) { WebBrowser *This = VIEWOBJ_THIS(iface); @@ -87,7 +87,7 @@ static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_GetAdvise(IViewObjectEx *iface, DWORD *pAspects, +static HRESULT WINAPI ViewObject_GetAdvise(IViewObject2 *iface, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink) { WebBrowser *This = VIEWOBJ_THIS(iface); @@ -95,7 +95,7 @@ static HRESULT WINAPI ViewObject_GetAdvise(IViewObjectEx *iface, DWORD *pAspects return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_GetExtent(IViewObjectEx *iface, DWORD dwAspect, LONG lindex, +static HRESULT WINAPI ViewObject_GetExtent(IViewObject2 *iface, DWORD dwAspect, LONG lindex, DVTARGETDEVICE *ptd, LPSIZEL lpsizel) { WebBrowser *This = VIEWOBJ_THIS(iface); @@ -103,45 +103,7 @@ static HRESULT WINAPI ViewObject_GetExtent(IViewObjectEx *iface, DWORD dwAspect, return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_GetRect(IViewObjectEx *iface, DWORD dwAspect, LPRECTL pRect) -{ - WebBrowser *This = VIEWOBJ_THIS(iface); - FIXME("(%p)->(%d %p)\n", This, dwAspect, pRect); - return E_NOTIMPL; -} - -static HRESULT WINAPI ViewObject_GetViewStatus(IViewObjectEx *iface, DWORD *pdwStatus) -{ - WebBrowser *This = VIEWOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, pdwStatus); - return E_NOTIMPL; -} - -static HRESULT WINAPI ViewObject_QueryHitPoint(IViewObjectEx *iface, DWORD dwAspect, LPCRECT pRectBounds, - POINT ptlLoc, LONG lCloseHint, DWORD *pHitResult) -{ - WebBrowser *This = VIEWOBJ_THIS(iface); - FIXME("(%p)->(%d %p %p %d %p)\n", This, dwAspect, pRectBounds, pRectBounds, lCloseHint, pHitResult); - return E_NOTIMPL; -} - -static HRESULT WINAPI ViewObject_QueryHitRect(IViewObjectEx * iface, DWORD dwAspect, LPCRECT pRectBounds, - LPCRECT pRectLoc, LONG lCloseHint, DWORD *pHitResult) -{ - WebBrowser *This = VIEWOBJ_THIS(iface); - FIXME("(%p)->(%d %p %p %p %d %p)\n", This, dwAspect, pRectBounds, pRectLoc, pRectBounds, lCloseHint, pHitResult); - return E_NOTIMPL; -} - -static HRESULT WINAPI ViewObject_GetNaturalExtent(IViewObjectEx *iface, DWORD dwAspect, LONG lindex, - DVTARGETDEVICE *ptd, HDC hicTargetDev, DVEXTENTINFO *pExtentInfo, LPSIZEL pSizel) -{ - WebBrowser *This = VIEWOBJ_THIS(iface); - FIXME("(%p)->(%d %d %p %p %p)\n", This, dwAspect, lindex, ptd, pExtentInfo, pSizel); - return E_NOTIMPL; -} - -static const IViewObjectExVtbl ViewObjectVtbl = { +static const IViewObject2Vtbl ViewObjectVtbl = { ViewObject_QueryInterface, ViewObject_AddRef, ViewObject_Release, @@ -151,12 +113,7 @@ static const IViewObjectExVtbl ViewObjectVtbl = { ViewObject_Unfreeze, ViewObject_SetAdvise, ViewObject_GetAdvise, - ViewObject_GetExtent, - ViewObject_GetRect, - ViewObject_GetViewStatus, - ViewObject_QueryHitPoint, - ViewObject_QueryHitRect, - ViewObject_GetNaturalExtent + ViewObject_GetExtent }; #undef VIEWOBJ_THIS diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index f8cc7c7..3699239 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -93,9 +93,6 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IViewObject2, riid)) { TRACE("(%p)->(IID_IViewObject2 %p)\n", This, ppv); *ppv = VIEWOBJ2(This); - }else if(IsEqualGUID(&IID_IViewObjectEx, riid)) { - TRACE("(%p)->(IID_IViewObjectEx %p)\n", This, ppv); - *ppv = VIEWOBJEX(This); }else if(IsEqualGUID(&IID_IOleInPlaceActiveObject, riid)) { TRACE("(%p)->(IID_IOleInPlaceActiveObject %p)\n", This, ppv); *ppv = ACTIVEOBJ(This);

1 0

Paul Vriens : setupapi/tests: Fix some failures on Win9x and WinMe.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: a76d83687add9a9133556967f5a26550b2fb8d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a76d83687add9a9133556967f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 11 19:19:45 2008 +0100 setupapi/tests: Fix some failures on Win9x and WinMe. --- dlls/setupapi/tests/parser.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 3fbe638..2fd4bd1 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -416,12 +416,15 @@ static void test_close_inf_file(void) { SetLastError(0xdeadbeef); SetupCloseInfFile(NULL); - ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef || + GetLastError() == ERROR_INVALID_PARAMETER, /* Win9x, WinMe */ + "Expected 0xdeadbeef, got %u\n", GetLastError()); SetLastError(0xdeadbeef); SetupCloseInfFile(INVALID_HANDLE_VALUE); - ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", GetLastError()); - + ok(GetLastError() == 0xdeadbeef || + GetLastError() == ERROR_INVALID_PARAMETER, /* Win9x, WinMe */ + "Expected 0xdeadbeef, got %u\n", GetLastError()); } static const char *contents = "[Version]\n"

1 0

Alexandre Julliard : user32/tests: Skip the PM_QS_* PeekMessage tests on NT4.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: a16f33c00279a394366e0cac8f6dd11de9d7d73c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16f33c00279a394366e0cac8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 11 23:27:34 2008 +0100 user32/tests: Skip the PM_QS_* PeekMessage tests on NT4. --- dlls/user32/tests/msg.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c30331f..84fda56 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8874,7 +8874,6 @@ static void test_PeekMessage(void) DWORD tid, qstatus; UINT qs_all_input = QS_ALLINPUT; UINT qs_input = QS_INPUT; - UINT qs_sendmessage = 0; BOOL ret; struct peekmsg_info info; @@ -8965,11 +8964,10 @@ static void test_PeekMessage(void) ok(!ret, "PeekMessageA should have returned FALSE instead of msg %04x\n", msg.message); - if (!sequence_cnt) /* nt4 needs explicit PM_QS_SENDMESSAGE to process sent messages */ + if (!sequence_cnt) /* nt4 doesn't fetch anything with PM_QS_* flags */ { - qs_sendmessage = QS_SENDMESSAGE; - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | ((qs_input|qs_sendmessage) << 16)); - ok(!ret, "PeekMessageA should have returned FALSE instead of msg %04x\n", msg.message); + win_skip( "PM_QS_* flags not supported in PeekMessage\n" ); + goto done; } ok_sequence(WmUser, "WmUser", FALSE); @@ -8986,7 +8984,7 @@ static void test_PeekMessage(void) "wrong qstatus %08x\n", qstatus); msg.message = 0; - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_POSTMESSAGE | (qs_sendmessage << 16) ); + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_POSTMESSAGE ); ok(!ret, "PeekMessageA should have returned FALSE instead of msg %04x\n", msg.message);

1 0

Paul Vriens : winmm/tests: Fix a test failure on Vista and W2K8.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 05c40e08a60e343d9723a5028e6f261bd1ddde16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c40e08a60e343d9723a5028… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 11 17:31:44 2008 +0100 winmm/tests: Fix a test failure on Vista and W2K8. --- dlls/winmm/tests/wave.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a66afa3..09b0f46 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -891,9 +891,10 @@ static void wave_out_test_device(int device) "expected, got %s\n", dev_name(device),wave_out_error(rc)); rc=waveOutGetDevCapsW(device,&capsW,4); - ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED, - "waveOutGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NOTSUPPORTED " - "expected, got %s\n",dev_name(device),wave_out_error(rc)); + ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED || + rc==MMSYSERR_INVALPARAM, /* Vista, W2K8 */ + "waveOutGetDevCapsW(%s): unexpected return value %s\n", + dev_name(device),wave_out_error(rc)); nameA=NULL; rc=waveOutMessage((HWAVEOUT)device, DRV_QUERYDEVICEINTERFACESIZE,

1 0

Alexandre Julliard : user32/tests: Fix window tests on various Windows versions.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: 4a57339236b91506f96050bd1515f3f208f9fda5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a57339236b91506f96050bd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 11 23:00:10 2008 +0100 user32/tests: Fix window tests on various Windows versions. --- dlls/user32/tests/win.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6e41100..84a2780 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -963,12 +963,14 @@ static void test_shell_window(void) DWORD pid; HANDLE hProcess; + SetLastError(0xdeadbeef); ret = DestroyWindow(shellWindow); error = GetLastError(); ok(!ret, "DestroyWindow(shellWindow)\n"); /* passes on Win XP, but not on Win98 */ - ok(error==ERROR_ACCESS_DENIED, "ERROR_ACCESS_DENIED after DestroyWindow(shellWindow)\n"); + ok(error==ERROR_ACCESS_DENIED || error == 0xdeadbeef, + "got %u after DestroyWindow(shellWindow)\n", error); /* close old shell instance */ GetWindowThreadProcessId(shellWindow, &pid); @@ -2558,7 +2560,7 @@ static void test_keyboard_input(HWND hwnd) BOOL ret; flush_events( TRUE ); - ShowWindow(hwnd, SW_SHOW); + SetWindowPos(hwnd, 0, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_SHOWWINDOW); UpdateWindow(hwnd); flush_events( TRUE ); @@ -2680,13 +2682,17 @@ static void test_mouse_input(HWND hwnd) mouse_event(MOUSEEVENTF_MOVE, -1, -1, 0, 0); ShowWindow(popup, SW_HIDE); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + do + ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + while (msg.message >= 0xc000); /* skip registered messages */ ok(msg.hwnd == hwnd && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); flush_events( TRUE ); mouse_event(MOUSEEVENTF_MOVE, 1, 1, 0, 0); ShowWindow(hwnd, SW_HIDE); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + do + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + while (ret && msg.message >= 0xc000); /* skip registered messages */ ok( !ret, "message %04x available\n", msg.message); flush_events( TRUE ); @@ -2752,7 +2758,9 @@ static void test_mouse_input(HWND hwnd) SendMessageA(hwnd, WM_COMMAND, (WPARAM)popup, 0); test_lbuttondown_flag = FALSE; - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + do + ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + while (msg.message >= 0xc000); /* skip registered messages */ ok(msg.hwnd == popup && msg.message == WM_LBUTTONDOWN, "hwnd %p/%p message %04x\n", msg.hwnd, popup, msg.message); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); @@ -4753,11 +4761,12 @@ static void test_GetWindowModuleFileName(void) ok(!ret1, "expected 0, got %u\n", ret1); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %u\n", GetLastError()); + ret1 = GetModuleFileName(0, buf1, sizeof(buf1)); hwnd = GetDesktopWindow(); ok(IsWindow(hwnd), "got invalid desktop window %p\n", hwnd); SetLastError(0xdeadbeef); - ret1 = pGetWindowModuleFileNameA(hwnd, buf1, sizeof(buf1)); - ok(!ret1, "expected 0, got %u\n", ret1); + ret2 = pGetWindowModuleFileNameA(hwnd, buf2, sizeof(buf2)); + ok(!ret2 || ret1 == ret2 /* vista */, "expected 0, got %u\n", ret2); hwnd = FindWindow("Shell_TrayWnd", NULL); ok(IsWindow(hwnd), "got invalid tray window %p\n", hwnd); @@ -5151,7 +5160,6 @@ START_TEST(win) test_SetMenu(hwndMain); test_SetFocus(hwndMain); test_SetActiveWindow(hwndMain); - test_SetForegroundWindow(hwndMain); test_children_zorder(hwndMain); test_popup_zorder(hwndMain2, hwndMain); @@ -5171,11 +5179,12 @@ START_TEST(win) test_csparentdc(); test_SetWindowLong(); test_ShowWindow(); - test_gettext(); + if (0) test_gettext(); /* crashes on NT4 */ test_GetUpdateRect(); test_Expose(); test_layered_window(); + test_SetForegroundWindow(hwndMain); test_shell_window(); /* add the tests above this line */

1 0

Alexandre Julliard : ntdll/tests: Fixed more object manager tests on Vista.
by Alexandre Julliard Nov. 12, 2008

Nov. 12, 2008

Module: wine Branch: master Commit: af601ff2b592e5f8ce9a4f925b705e5d27d7764a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af601ff2b592e5f8ce9a4f925… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 11 21:22:35 2008 +0100 ntdll/tests: Fixed more object manager tests on Vista. --- dlls/ntdll/tests/om.c | 89 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 72 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index fa2642a..bde6032 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -130,9 +130,9 @@ static void test_namespace_pipe(void) ok(status == STATUS_INSTANCE_NOT_AVAILABLE, "NtCreateNamedPipeFile should have failed with STATUS_INSTANCE_NOT_AVAILABLE got(%08x)\n", status); - attr.Attributes = OBJ_CASE_INSENSITIVE; - status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); - ok(status == STATUS_SUCCESS, "Failed to open NamedPipe(%08x)\n", status); + h = CreateFileA("\\\\.\\pipe\\test\\pipe", GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + ok(h != INVALID_HANDLE_VALUE, "Failed to open NamedPipe (%u)\n", GetLastError()); pNtClose(h); pRtlInitUnicodeString(&str, buffer3); @@ -178,6 +178,64 @@ static void test_namespace_pipe(void) DIR_TEST_CREATE_SUCCESS(&h) pNtClose(h); DIR_TEST_OPEN_SUCCESS(&h) pNtClose(h); \ pRtlFreeUnicodeString(&str); +static BOOL is_correct_dir( HANDLE dir, const char *name ) +{ + NTSTATUS status; + UNICODE_STRING str; + OBJECT_ATTRIBUTES attr; + HANDLE h = 0; + + pRtlCreateUnicodeStringFromAsciiz(&str, name); + InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, dir, NULL); + status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); + pRtlFreeUnicodeString(&str); + if (h) pNtClose( h ); + return (status == STATUS_OBJECT_NAME_EXISTS); +} + +/* return a handle to the BaseNamedObjects dir where kernel32 objects get created */ +static HANDLE get_base_dir(void) +{ + static const char objname[] = "om.c_get_base_dir_obj"; + NTSTATUS status; + UNICODE_STRING str; + OBJECT_ATTRIBUTES attr; + HANDLE dir, h; + unsigned int i; + + h = CreateMutexA(NULL, FALSE, objname); + ok(h != 0, "CreateMutexA failed got ret=%p (%d)\n", h, GetLastError()); + InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, 0, NULL); + + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local"); + status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); + pRtlFreeUnicodeString(&str); + if (!status && is_correct_dir( dir, objname )) goto done; + if (!status) pNtClose( dir ); + + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects"); + status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); + pRtlFreeUnicodeString(&str); + if (!status && is_correct_dir( dir, objname )) goto done; + if (!status) pNtClose( dir ); + + for (i = 0; i < 20; i++) + { + char name[40]; + sprintf( name, "\\BaseNamedObjects\\Session\\%u", i ); + pRtlCreateUnicodeStringFromAsciiz(&str, name ); + status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); + pRtlFreeUnicodeString(&str); + if (!status && is_correct_dir( dir, objname )) goto done; + if (!status) pNtClose( dir ); + } + dir = 0; + +done: + pNtClose( h ); + return dir; +} + static void test_name_collisions(void) { NTSTATUS status; @@ -205,12 +263,13 @@ static void test_name_collisions(void) "NtCreateMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08x)\n", status); pRtlFreeUnicodeString(&str); - - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects"); - DIR_TEST_OPEN_SUCCESS(&dir) + if (!(dir = get_base_dir())) + { + win_skip( "couldn't find the BaseNamedObjects dir\n" ); + return; + } pRtlCreateUnicodeStringFromAsciiz(&str, "om.c-test"); InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, dir, NULL); - h = CreateMutexA(NULL, FALSE, "om.c-test"); ok(h != 0, "CreateMutexA failed got ret=%p (%d)\n", h, GetLastError()); status = pNtCreateMutant(&h1, GENERIC_ALL, &attr, FALSE); @@ -532,16 +591,12 @@ static void test_symboliclink(void) STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND) - /* Compaund test */ - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local"); - status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); - if (status == STATUS_OBJECT_NAME_NOT_FOUND) /* nt4 doesn't have Local\\ */ + /* Compound test */ + if (!(dir = get_base_dir())) { - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects"); - status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); + win_skip( "couldn't find the BaseNamedObjects dir\n" ); + return; } - ok(status == STATUS_SUCCESS, "Failed to open Directory(%08x)\n", status); - pRtlFreeUnicodeString(&str); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); pRtlCreateUnicodeStringFromAsciiz(&str, "test-link"); @@ -551,9 +606,9 @@ static void test_symboliclink(void) pRtlFreeUnicodeString(&str); pRtlFreeUnicodeString(&target); - pRtlCreateUnicodeStringFromAsciiz(&str, "test-link\\PIPE"); + pRtlCreateUnicodeStringFromAsciiz(&str, "test-link\\NUL"); status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); - ok(status == STATUS_SUCCESS, "Failed to open NamedPipe(%08x)\n", status); + todo_wine ok(status == STATUS_SUCCESS, "Failed to open NUL device(%08x)\n", status); pRtlFreeUnicodeString(&str); pNtClose(h);

1 0

Christian Costa : d3dxof: Prepare support for objects binary format.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 86d7f9f58c839e89995e230ee660605ca2be7572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d7f9f58c839e89995e230ee… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Nov 11 12:41:11 2008 +0100 d3dxof: Prepare support for objects binary format. --- dlls/d3dxof/d3dxof.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 6479e21..25d4834 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -306,7 +306,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV object->hFile = hFile; object->pDirectXFile = This; object->buf.pdxf = This; - object->buf.txt = TRUE; + object->buf.txt = (header[2] == XOFFILE_FORMAT_TEXT); object->buf.token_present = FALSE; object->buf.cur_subobject = 0; @@ -1803,7 +1803,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) for (k = 0; k < nb_elems; k++) { - if (k) + if (buf->txt && k) { token = check_TOKEN(buf); if (token == TOKEN_COMMA) @@ -1937,13 +1937,16 @@ static BOOL parse_object_members_list(parse_buffer * buf) } } - token = get_TOKEN(buf); - if (token != TOKEN_SEMICOLON) + if (buf->txt) { - /* Allow comma instead of semicolon in some specific cases */ - if (!((token == TOKEN_COMMA) && ((i+1) < pt->nb_members) && (pt->members[i].type == pt->members[i+1].type) - && (!pt->members[i].nb_dims) && (!pt->members[i+1].nb_dims))) - return FALSE; + token = get_TOKEN(buf); + if (token != TOKEN_SEMICOLON) + { + /* Allow comma instead of semicolon in some specific cases */ + if (!((token == TOKEN_COMMA) && ((i+1) < pt->nb_members) && (pt->members[i].type == pt->members[i+1].type) + && (!pt->members[i].nb_dims) && (!pt->members[i+1].nb_dims))) + return FALSE; + } } }

1 0

Alistair Leslie-Hughes : shdocvw: Added Support for the IViewObjectEx interface.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: b91061e1da06678bee5a9c313ac00f21902f2f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91061e1da06678bee5a9c313… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 11 20:30:05 2008 +1100 shdocvw: Added Support for the IViewObjectEx interface. --- dlls/shdocvw/shdocvw.h | 3 +- dlls/shdocvw/view.c | 67 +++++++++++++++++++++++++++++++++++++-------- dlls/shdocvw/webbrowser.c | 3 ++ 3 files changed, 60 insertions(+), 13 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 0005143..57d2577 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -115,7 +115,7 @@ struct WebBrowser { const IPersistMemoryVtbl *lpPersistMemoryVtbl; const IPersistStreamInitVtbl *lpPersistStreamInitVtbl; const IProvideClassInfo2Vtbl *lpProvideClassInfoVtbl; - const IViewObject2Vtbl *lpViewObjectVtbl; + const IViewObjectExVtbl *lpViewObjectVtbl; const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; const IHlinkFrameVtbl *lpHlinkFrameVtbl; @@ -173,6 +173,7 @@ struct InternetExplorer { #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObjectVtbl); #define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectVtbl); +#define VIEWOBJEX(x) ((IViewObjectEx*) &(x)->lpViewObjectVtbl); #define ACTIVEOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) #define OLECMD(x) ((IOleCommandTarget*) &(x)->lpOleCommandTargetVtbl) #define HLINKFRAME(x) ((IHlinkFrame*) &(x)->lpHlinkFrameVtbl) diff --git a/dlls/shdocvw/view.c b/dlls/shdocvw/view.c index d2e5857..0bae877 100644 --- a/dlls/shdocvw/view.c +++ b/dlls/shdocvw/view.c @@ -23,25 +23,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); #define VIEWOBJ_THIS(iface) DEFINE_THIS(WebBrowser, ViewObject, iface) -static HRESULT WINAPI ViewObject_QueryInterface(IViewObject2 *iface, REFIID riid, void **ppv) +static HRESULT WINAPI ViewObject_QueryInterface(IViewObjectEx *iface, REFIID riid, void **ppv) { WebBrowser *This = VIEWOBJ_THIS(iface); return IWebBrowser2_QueryInterface(WEBBROWSER(This), riid, ppv); } -static ULONG WINAPI ViewObject_AddRef(IViewObject2 *iface) +static ULONG WINAPI ViewObject_AddRef(IViewObjectEx *iface) { WebBrowser *This = VIEWOBJ_THIS(iface); return IWebBrowser2_AddRef(WEBBROWSER(This)); } -static ULONG WINAPI ViewObject_Release(IViewObject2 *iface) +static ULONG WINAPI ViewObject_Release(IViewObjectEx *iface) { WebBrowser *This = VIEWOBJ_THIS(iface); return IWebBrowser2_Release(WEBBROWSER(This)); } -static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect, +static HRESULT WINAPI ViewObject_Draw(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hdcTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds, BOOL (STDMETHODCALLTYPE *pfnContinue)(ULONG_PTR), @@ -54,7 +54,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect, return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwAspect, +static HRESULT WINAPI ViewObject_GetColorSet(IViewObjectEx *iface, DWORD dwAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **ppColorSet) { @@ -64,7 +64,7 @@ static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwAspect return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_Freeze(IViewObject2 *iface, DWORD dwDrawAspect, LONG lindex, +static HRESULT WINAPI ViewObject_Freeze(IViewObjectEx *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze) { WebBrowser *This = VIEWOBJ_THIS(iface); @@ -72,14 +72,14 @@ static HRESULT WINAPI ViewObject_Freeze(IViewObject2 *iface, DWORD dwDrawAspect, return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_Unfreeze(IViewObject2 *iface, DWORD dwFreeze) +static HRESULT WINAPI ViewObject_Unfreeze(IViewObjectEx *iface, DWORD dwFreeze) { WebBrowser *This = VIEWOBJ_THIS(iface); FIXME("(%p)->(%d)\n", This, dwFreeze); return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_SetAdvise(IViewObject2 *iface, DWORD aspects, DWORD advf, +static HRESULT WINAPI ViewObject_SetAdvise(IViewObjectEx *iface, DWORD aspects, DWORD advf, IAdviseSink *pAdvSink) { WebBrowser *This = VIEWOBJ_THIS(iface); @@ -87,7 +87,7 @@ static HRESULT WINAPI ViewObject_SetAdvise(IViewObject2 *iface, DWORD aspects, D return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_GetAdvise(IViewObject2 *iface, DWORD *pAspects, +static HRESULT WINAPI ViewObject_GetAdvise(IViewObjectEx *iface, DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink) { WebBrowser *This = VIEWOBJ_THIS(iface); @@ -95,7 +95,7 @@ static HRESULT WINAPI ViewObject_GetAdvise(IViewObject2 *iface, DWORD *pAspects, return E_NOTIMPL; } -static HRESULT WINAPI ViewObject_GetExtent(IViewObject2 *iface, DWORD dwAspect, LONG lindex, +static HRESULT WINAPI ViewObject_GetExtent(IViewObjectEx *iface, DWORD dwAspect, LONG lindex, DVTARGETDEVICE *ptd, LPSIZEL lpsizel) { WebBrowser *This = VIEWOBJ_THIS(iface); @@ -103,7 +103,45 @@ static HRESULT WINAPI ViewObject_GetExtent(IViewObject2 *iface, DWORD dwAspect, return E_NOTIMPL; } -static const IViewObject2Vtbl ViewObjectVtbl = { +static HRESULT WINAPI ViewObject_GetRect(IViewObjectEx *iface, DWORD dwAspect, LPRECTL pRect) +{ + WebBrowser *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%d %p)\n", This, dwAspect, pRect); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_GetViewStatus(IViewObjectEx *iface, DWORD *pdwStatus) +{ + WebBrowser *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, pdwStatus); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_QueryHitPoint(IViewObjectEx *iface, DWORD dwAspect, LPCRECT pRectBounds, + POINT ptlLoc, LONG lCloseHint, DWORD *pHitResult) +{ + WebBrowser *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%d %p %p %d %p)\n", This, dwAspect, pRectBounds, pRectBounds, lCloseHint, pHitResult); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_QueryHitRect(IViewObjectEx * iface, DWORD dwAspect, LPCRECT pRectBounds, + LPCRECT pRectLoc, LONG lCloseHint, DWORD *pHitResult) +{ + WebBrowser *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%d %p %p %p %d %p)\n", This, dwAspect, pRectBounds, pRectLoc, pRectBounds, lCloseHint, pHitResult); + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_GetNaturalExtent(IViewObjectEx *iface, DWORD dwAspect, LONG lindex, + DVTARGETDEVICE *ptd, HDC hicTargetDev, DVEXTENTINFO *pExtentInfo, LPSIZEL pSizel) +{ + WebBrowser *This = VIEWOBJ_THIS(iface); + FIXME("(%p)->(%d %d %p %p %p)\n", This, dwAspect, lindex, ptd, pExtentInfo, pSizel); + return E_NOTIMPL; +} + +static const IViewObjectExVtbl ViewObjectVtbl = { ViewObject_QueryInterface, ViewObject_AddRef, ViewObject_Release, @@ -113,7 +151,12 @@ static const IViewObject2Vtbl ViewObjectVtbl = { ViewObject_Unfreeze, ViewObject_SetAdvise, ViewObject_GetAdvise, - ViewObject_GetExtent + ViewObject_GetExtent, + ViewObject_GetRect, + ViewObject_GetViewStatus, + ViewObject_QueryHitPoint, + ViewObject_QueryHitRect, + ViewObject_GetNaturalExtent }; #undef VIEWOBJ_THIS diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 3699239..f8cc7c7 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -93,6 +93,9 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IViewObject2, riid)) { TRACE("(%p)->(IID_IViewObject2 %p)\n", This, ppv); *ppv = VIEWOBJ2(This); + }else if(IsEqualGUID(&IID_IViewObjectEx, riid)) { + TRACE("(%p)->(IID_IViewObjectEx %p)\n", This, ppv); + *ppv = VIEWOBJEX(This); }else if(IsEqualGUID(&IID_IOleInPlaceActiveObject, riid)) { TRACE("(%p)->(IID_IOleInPlaceActiveObject %p)\n", This, ppv); *ppv = ACTIVEOBJ(This);

1 0

David Adam : d3dx8: Simplify D3DXQuaternionInverse.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: fea5a776299b076fc3510b53e59d4a8f4a9474ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea5a776299b076fc3510b53e… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Nov 11 14:37:23 2008 +0100 d3dx8: Simplify D3DXQuaternionInverse. --- dlls/d3dx8/math.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c index 9a8c530..f41c9f4 100644 --- a/dlls/d3dx8/math.c +++ b/dlls/d3dx8/math.c @@ -940,14 +940,8 @@ D3DXQUATERNION* WINAPI D3DXQuaternionExp(D3DXQUATERNION *pout, CONST D3DXQUATERN D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) { - D3DXQUATERNION temp; FLOAT norm; - temp.x = 0.0f; - temp.y = 0.0f; - temp.z = 0.0f; - temp.w = 0.0f; - norm = D3DXQuaternionLengthSq(pq); if ( !norm ) { @@ -958,11 +952,10 @@ D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUA } else { - D3DXQuaternionConjugate(&temp, pq); - pout->x = temp.x / norm; - pout->y = temp.y / norm; - pout->z = temp.z / norm; - pout->w = temp.w / norm; + pout->x = -pq->x / norm; + pout->y = -pq->y / norm; + pout->z = -pq->z / norm; + pout->w = pq->w / norm; } return pout; }

1 0

Christian Costa : d3dxof: Add support for DXFILELOAD_FROMMEMORY.
by Alexandre Julliard Nov. 11, 2008

Nov. 11, 2008

Module: wine Branch: master Commit: 641200dc1e3ce55f1e338fc156c4d69af54597c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=641200dc1e3ce55f1e338fc15… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Nov 11 12:40:31 2008 +0100 d3dxof: Add support for DXFILELOAD_FROMMEMORY. --- dlls/d3dxof/d3dxof.c | 56 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 19 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 1c3c99b..6479e21 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -205,6 +205,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV DWORD header[4]; DWORD size; HANDLE hFile = INVALID_HANDLE_VALUE; + LPDXFILELOADMEMORY lpdxflm = NULL; TRACE("(%p/%p)->(%p,%x,%p)\n", This, iface, pvSource, dwLoadOptions, ppEnumObj); @@ -233,14 +234,14 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV hr = DXFILEERR_BADFILETYPE; goto error; } + } + else if (dwLoadOptions == DXFILELOAD_FROMMEMORY) + { + lpdxflm = (LPDXFILELOADMEMORY)pvSource; - if (TRACE_ON(d3dxof)) - { - char string[17]; - memcpy(string, header, 16); - string[16] = 0; - TRACE("header = '%s'\n", string); - } + FIXME("Source in memory at %p with size %d\n", lpdxflm->lpMemory, lpdxflm->dSize); + + memcpy(header, (char*)lpdxflm->lpMemory, 16); } else { @@ -249,6 +250,14 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV goto error; } + if (TRACE_ON(d3dxof)) + { + char string[17]; + memcpy(string, header, 16); + string[16] = 0; + TRACE("header = '%s'\n", string); + } + if (header[0] != XOFFILE_FORMAT_MAGIC) { hr = DXFILEERR_BADFILETYPE; @@ -301,22 +310,31 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV object->buf.token_present = FALSE; object->buf.cur_subobject = 0; - object->buf.buffer = HeapAlloc(GetProcessHeap(), 0, MAX_INPUT_SIZE+1); - if (!object->buf.buffer) + if (dwLoadOptions == DXFILELOAD_FROMFILE) { - WARN("Out of memory\n"); - hr = DXFILEERR_BADALLOC; - goto error; - } + object->buf.buffer = HeapAlloc(GetProcessHeap(), 0, MAX_INPUT_SIZE+1); + if (!object->buf.buffer) + { + WARN("Out of memory\n"); + hr = DXFILEERR_BADALLOC; + goto error; + } - ReadFile(hFile, object->buf.buffer, MAX_INPUT_SIZE+1, &object->buf.rem_bytes, NULL); - if (object->buf.rem_bytes > MAX_INPUT_SIZE) + ReadFile(hFile, object->buf.buffer, MAX_INPUT_SIZE+1, &object->buf.rem_bytes, NULL); + if (object->buf.rem_bytes > MAX_INPUT_SIZE) + { + FIXME("File size > %d not supported yet\n", MAX_INPUT_SIZE); + HeapFree(GetProcessHeap(), 0, object->buf.buffer); + hr = DXFILEERR_PARSEERROR; + goto error; + } + } + else { - FIXME("File size > %d not supported yet\n", MAX_INPUT_SIZE); - HeapFree(GetProcessHeap(), 0, object->buf.buffer); - hr = DXFILEERR_PARSEERROR; - goto error; + object->buf.buffer = ((LPBYTE)lpdxflm->lpMemory) + 16; + object->buf.rem_bytes = lpdxflm->dSize; } + TRACE("Read %d bytes\n", object->buf.rem_bytes); *ppEnumObj = (LPDIRECTXFILEENUMOBJECT)object;

1 0