November 2015 - Wine-Commits

Dmitry Timoshkov : user32/tests: Add more tests for mixed menu with strings and bitmaps.
by Alexandre Julliard Nov. 18, 2015

Nov. 18, 2015

Module: wine Branch: master Commit: 5ef96fd5bccd5adcbb5f934fe58de8c429e8a5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef96fd5bccd5adcbb5f934fe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 18 08:46:04 2015 +0800 user32/tests: Add more tests for mixed menu with strings and bitmaps. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 357 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 357 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ef96fd5bccd5adcbb5f9…

1 0

Francois Gouget : cmd/tests: Use net session to verify we have sufficient privileges.
by Alexandre Julliard Nov. 18, 2015

Nov. 18, 2015

Module: wine Branch: master Commit: 9dee791516284ded1808ba133a63385f38cfafb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dee791516284ded1808ba133… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 18 14:58:53 2015 +0100 cmd/tests: Use net session to verify we have sufficient privileges. Modifying the associations requires holding administrator+elevated privileges. 'net session' is the standard way of checking that in batch files. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index db286db..1bcd655 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1950,6 +1950,10 @@ if exist baz\lala (echo file created in read-only dir) else echo file not create cd .. & rd /s/q foobar echo ------------ Testing assoc ------------ +rem Modifying associations requires some privileges... +net session >nul 2>&1 +if errorlevel 1 goto :SkipAssoc + rem FIXME Can't test error messages in the current test system, so we have to use some kludges rem FIXME Revise once || conditional execution is fixed mkdir foobar & cd foobar @@ -1978,8 +1982,25 @@ cmd /c tmp.cmd > baz type baz echo --- cd .. & rd /s/q foobar +goto ContinueFType +:SkipAssoc +echo --- setting association +echo --- +echo .foo=bar +echo .foo=bar +echo +++ +echo .foo=bar +echo --- resetting association +echo --- +echo +++ +echo --- + +:ContinueFType echo ------------ Testing ftype ------------ +rem Modifying associations requires some privileges... +net session >nul 2>&1 +if errorlevel 1 goto :SkipFType rem FIXME Can't test error messages in the current test system, so we have to use some kludges rem FIXME Revise once || conditional execution is fixed mkdir foobar & cd foobar @@ -2020,7 +2041,19 @@ regedit /s regCleanup.reg set WINE_FOO= endlocal cd .. & rd /s/q foobar +goto ContinueCall +:SkipFType +echo --- setting association +echo --- +echo footype=foo_opencmd +echo .foo=footype +echo footype=foo_opencmd +echo +++ +echo footype=foo_opencmd +echo --- resetting association +echo original value +:ContinueCall echo ------------ Testing CALL ------------ mkdir foobar & cd foobar echo --- external script

1 0

Qian Hong : ntoskrnl.exe: Add PsRemoveCreateThreadNotifyRoutine stub.
by Alexandre Julliard Nov. 18, 2015

Nov. 18, 2015

Module: wine Branch: master Commit: f9c80b087f3c78105778fc6815ce4132747deda9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c80b087f3c78105778fc681… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Nov 18 16:14:19 2015 +0800 ntoskrnl.exe: Add PsRemoveCreateThreadNotifyRoutine stub. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 90a6321..04f0198 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2067,6 +2067,16 @@ NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE No /*********************************************************************** + * PsRemoveCreateThreadNotifyRoutine (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsRemoveCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine ) +{ + FIXME( "stub: %p\n", NotifyRoutine ); + return STATUS_SUCCESS; +} + + +/*********************************************************************** * PsTerminateSystemThread (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS ExitStatus) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index fab6eff..f59cade 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -898,7 +898,7 @@ @ stub PsProcessType @ stub PsReferenceImpersonationToken @ stub PsReferencePrimaryToken -@ stub PsRemoveCreateThreadNotifyRoutine +@ stdcall PsRemoveCreateThreadNotifyRoutine(ptr) @ stub PsRemoveLoadImageNotifyRoutine @ stub PsRestoreImpersonation @ stub PsReturnPoolQuota

1 0

Alexandre Julliard : winex11: Make OpenGL traces more compact and readable.
by Alexandre Julliard Nov. 18, 2015

Nov. 18, 2015

Module: wine Branch: master Commit: aaa7f2ca5a2afb67e96cbb29c0b281c10706a42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa7f2ca5a2afb67e96cbb29c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 23:05:20 2015 +0900 winex11: Make OpenGL traces more compact and readable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 51 +++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 35 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 03a958e..3d0bd24 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -740,16 +740,15 @@ failed: return FALSE; } -static int describeContext( struct wgl_context *ctx ) { - int tmp; - int ctx_vis_id; - TRACE(" Context %p have (vis:%p):\n", ctx, ctx->vis); - pglXGetFBConfigAttrib(gdi_display, ctx->fmt->fbconfig, GLX_FBCONFIG_ID, &tmp); - TRACE(" - FBCONFIG_ID 0x%x\n", tmp); - pglXGetFBConfigAttrib(gdi_display, ctx->fmt->fbconfig, GLX_VISUAL_ID, &tmp); - TRACE(" - VISUAL_ID 0x%x\n", tmp); - ctx_vis_id = tmp; - return ctx_vis_id; +static const char *debugstr_fbconfig( GLXFBConfig fbconfig ) +{ + int id, visual, drawable; + + if (pglXGetFBConfigAttrib( gdi_display, fbconfig, GLX_FBCONFIG_ID, &id )) + return "*** invalid fbconfig"; + pglXGetFBConfigAttrib( gdi_display, fbconfig, GLX_VISUAL_ID, &visual ); + pglXGetFBConfigAttrib( gdi_display, fbconfig, GLX_DRAWABLE_TYPE, &drawable ); + return wine_dbg_sprintf( "fbconfig %#x visual id %#x drawable type %#x", id, visual, drawable ); } static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_pbuffer* pbuf) { @@ -1408,7 +1407,8 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) return FALSE; } - TRACE("created GL drawable %lx for win %p format %x\n", gl->drawable, hwnd, format->fmt_id ); + TRACE( "created GL drawable %lx for win %p %s\n", + gl->drawable, hwnd, debugstr_fbconfig( format->fbconfig )); XFlush( gdi_display ); @@ -1465,22 +1465,6 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change) } } - if (TRACE_ON(wgl)) { - int gl_test = 0; - - gl_test = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_FBCONFIG_ID, &value); - if (gl_test) { - ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); - } else { - TRACE(" FBConfig have :\n"); - TRACE(" - FBCONFIG_ID 0x%x\n", value); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &value); - TRACE(" - VISUAL_ID 0x%x\n", value); - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); - TRACE(" - DRAWABLE_TYPE 0x%x\n", value); - } - } - return set_win_format( hwnd, fmt ); } @@ -1858,10 +1842,8 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) goto done; } - if (TRACE_ON(wgl)) { - describeContext(ctx); - TRACE("hdc %p drawable %lx fmt %p ctx %p\n", hdc, gl->drawable, gl->format, ctx->ctx ); - } + TRACE("hdc %p drawable %lx fmt %p ctx %p %s\n", hdc, gl->drawable, gl->format, ctx->ctx, + debugstr_fbconfig( gl->format->fbconfig )); ret = pglXMakeCurrent(gdi_display, gl->drawable, ctx->ctx); if (ret) @@ -1957,13 +1939,12 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de } else { - describeContext(org); - describeContext(dest); - /* Re-create the GLX context and share display lists */ pglXDestroyContext(gdi_display, dest->ctx); dest->ctx = create_glxcontext(gdi_display, dest, org->ctx); - TRACE(" re-created an OpenGL context (%p) for Wine context %p sharing lists with OpenGL ctx %p\n", dest->ctx, dest, org->ctx); + TRACE(" re-created context (%p) for Wine context %p (%s) sharing lists with ctx %p (%s)\n", + dest->ctx, dest, debugstr_fbconfig(dest->fmt->fbconfig), + org->ctx, debugstr_fbconfig( org->fmt->fbconfig)); org->sharing = TRUE; dest->sharing = TRUE;

1 0

Alexandre Julliard : winex11: Always create direct rendering OpenGL contexts.
by Alexandre Julliard Nov. 18, 2015

Nov. 18, 2015

Module: wine Branch: master Commit: ef9c0cecc548f8a771b97d3d8b29f144254cfee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef9c0cecc548f8a771b97d3d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 15:36:41 2015 +0900 winex11: Always create direct rendering OpenGL contexts. Indirect rendering is no longer supported nowadays. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 99befde..03a958e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1264,18 +1264,15 @@ static GLXContext create_glxcontext(Display *display, struct wgl_context *contex { GLXContext ctx; - /* We use indirect rendering for rendering to bitmaps. See get_formats for a comment about this. */ - BOOL indirect = !(context->fmt->dwFlags & PFD_DRAW_TO_BITMAP); - if(context->gl3_context) { if(context->numAttribs) - ctx = pglXCreateContextAttribsARB(gdi_display, context->fmt->fbconfig, shareList, indirect, context->attribList); + ctx = pglXCreateContextAttribsARB(gdi_display, context->fmt->fbconfig, shareList, GL_TRUE, context->attribList); else - ctx = pglXCreateContextAttribsARB(gdi_display, context->fmt->fbconfig, shareList, indirect, NULL); + ctx = pglXCreateContextAttribsARB(gdi_display, context->fmt->fbconfig, shareList, GL_TRUE, NULL); } else if(context->vis) - ctx = pglXCreateContext(gdi_display, context->vis, shareList, indirect); + ctx = pglXCreateContext(gdi_display, context->vis, shareList, GL_TRUE); else /* Create a GLX Context for a pbuffer */ ctx = pglXCreateNewContext(gdi_display, context->fmt->fbconfig, context->fmt->render_type, shareList, TRUE);

1 0

Andrew Eikum : kernel32: Always uninitialize the terminal for the console shell process.
by Alexandre Julliard Nov. 18, 2015

Nov. 18, 2015

Module: wine Branch: master Commit: df718b8ab8f0451d026c33d81c1c3cddbed04925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df718b8ab8f0451d026c33d81… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 17 09:41:43 2015 -0600 kernel32: Always uninitialize the terminal for the console shell process. The terminal raw IO check and the console shell process check are used separately to initialize the terminal in different ways. However, if either check fails during uninitialization, then no uninitialization will occur at all and modified terminfo settings will remain instead of being restored. We should check each condition individually and uninitialize each part as required. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 363e763..51d6e60 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -211,15 +211,18 @@ static BOOL put_console_into_raw_mode(int fd) static BOOL restore_console_mode(HANDLE hin) { int fd; - BOOL ret; + BOOL ret = TRUE; + + if (S_termios_raw) + { + if ((fd = get_console_bare_fd(hin)) == -1) return FALSE; + ret = tcsetattr(fd, TCSANOW, &S_termios) >= 0; + close(fd); + } + + if (RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle == KERNEL32_CONSOLE_SHELL) + TERM_Exit(); - if (!S_termios_raw || - RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != KERNEL32_CONSOLE_SHELL) - return TRUE; - if ((fd = get_console_bare_fd(hin)) == -1) return FALSE; - ret = tcsetattr(fd, TCSANOW, &S_termios) >= 0; - close(fd); - TERM_Exit(); return ret; }

1 0

Nikolay Sivov : dwrite: Return face count of 1 for CFF file type.
by Alexandre Julliard Nov. 17, 2015

Nov. 17, 2015

Module: wine Branch: master Commit: 19eaed6a3833a7bff780ccc31800cad2ecfd48d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19eaed6a3833a7bff780ccc31… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 17 17:41:36 2015 +0300 dwrite: Return face count of 1 for CFF file type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 82e0a9c..b48a769 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -748,6 +748,7 @@ HRESULT opentype_analyze_font(IDWriteFontFileStream *stream, UINT32* font_count, } else if (DWRITE_MAKE_OPENTYPE_TAG(tag[0], tag[1], tag[2], tag[3]) == MS_OTTO_TAG) { + *font_count = 1; *file_type = DWRITE_FONT_FILE_TYPE_CFF; face = DWRITE_FONT_FACE_TYPE_CFF; }

1 0

Austin English : ntoskrnl.exe: Add CmRegisterCallback/ CmUnRegisterCallback stub.
by Alexandre Julliard Nov. 17, 2015

Nov. 17, 2015

Module: wine Branch: master Commit: 0a5f0f7420aef3627c1fb63ec6300b84ae1d8d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5f0f7420aef3627c1fb63ec… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 16 22:34:47 2015 -0600 ntoskrnl.exe: Add CmRegisterCallback/CmUnRegisterCallback stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- include/ddk/wdm.h | 3 +++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a845610..90a6321 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -36,6 +36,7 @@ #include "ddk/csq.h" #include "ddk/ntddk.h" #include "ddk/ntifs.h" +#include "ddk/wdm.h" #include "wine/unicode.h" #include "wine/server.h" #include "wine/list.h" @@ -2378,3 +2379,21 @@ void WINAPI ProbeForWrite(void *address, SIZE_T length, ULONG alignment) { FIXME("(%p %lu %u) stub\n", address, length, alignment); } + +/*********************************************************************** + * CmRegisterCallback (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI CmRegisterCallback(EX_CALLBACK_FUNCTION *function, void *context, LARGE_INTEGER *cookie) +{ + FIXME("(%p %p %p): stub\n", function, context, cookie); + return STATUS_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * CmUnRegisterCallback (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI CmUnRegisterCallback(LARGE_INTEGER cookie) +{ + FIXME("(%s): stub\n", wine_dbgstr_longlong(cookie.QuadPart)); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 5f75d4b..fab6eff 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -100,8 +100,8 @@ @ stub CcUnpinRepinnedBcb @ stub CcWaitForCurrentLazyWriterActivity @ stub CcZeroData -@ stub CmRegisterCallback -@ stub CmUnRegisterCallback +@ stdcall CmRegisterCallback(ptr ptr ptr) +@ stdcall CmUnRegisterCallback(int64) @ stdcall DbgBreakPoint() ntdll.DbgBreakPoint @ stub DbgBreakPointWithStatus @ stub DbgLoadImageSymbols diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index e79d18e..0c51527 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1163,6 +1163,9 @@ typedef struct _CALLBACK_OBJECT UCHAR reserved[3]; } CALLBACK_OBJECT, *PCALLBACK_OBJECT; +typedef NTSTATUS (NTAPI EX_CALLBACK_FUNCTION)(void *CallbackContext, void *Argument1, void *Argument2); +typedef EX_CALLBACK_FUNCTION *PEX_CALLBACK_FUNCTION; + NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); #ifdef NONAMELESSUNION

1 0

Jacek Caban : ole32: Use absolute key path in create_classes_root_hkey.
by Alexandre Julliard Nov. 17, 2015

Nov. 17, 2015

Module: wine Branch: master Commit: a1cc980bcba27e2d9b88eff312de1220d83f34b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1cc980bcba27e2d9b88eff31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 17 15:25:52 2015 +0100 ole32: Use absolute key path in create_classes_root_hkey. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 522f66b..2f55076 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -331,7 +331,8 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES } static const WCHAR classes_rootW[] = - {'M','a','c','h','i','n','e','\\','S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s',0}; + {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e', + '\\','S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s',0}; static HKEY classes_root_hkey;

1 0

Qian Hong : atl100: Implemented semi stub AtlAxCreateControlLic and AtlAxCreateControlLicEx.
by Alexandre Julliard Nov. 17, 2015

Nov. 17, 2015

Module: wine Branch: master Commit: f949c8791c38e8d1a9987b9c9c8487be4229d8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f949c8791c38e8d1a9987b9c9… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Nov 17 08:45:33 2015 +0800 atl100: Implemented semi stub AtlAxCreateControlLic and AtlAxCreateControlLicEx. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl_ax.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 15b0550..083dbe0 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1035,15 +1035,15 @@ static enum content get_content_type(LPCOLESTR name, CLSID *control_id) } /*********************************************************************** - * AtlAxCreateControlEx [atl100.@] + * AtlAxCreateControlLicEx [atl100.@] * * REMARKS * See http://www.codeproject.com/com/cwebpage.asp for some background * */ -HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd, +HRESULT WINAPI AtlAxCreateControlLicEx(LPCOLESTR lpszName, HWND hWnd, IStream *pStream, IUnknown **ppUnkContainer, IUnknown **ppUnkControl, - REFIID iidSink, IUnknown *punkSink) + REFIID iidSink, IUnknown *punkSink, BSTR lic) { CLSID controlId; HRESULT hRes; @@ -1053,8 +1053,11 @@ HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd, IUnknown *pContainer = NULL; enum content content; - TRACE("(%s %p %p %p %p %p %p)\n", debugstr_w(lpszName), hWnd, pStream, - ppUnkContainer, ppUnkControl, iidSink, punkSink); + TRACE("(%s %p %p %p %p %p %p %s)\n", debugstr_w(lpszName), hWnd, pStream, + ppUnkContainer, ppUnkControl, iidSink, punkSink, debugstr_w(lic)); + + if (lic) + FIXME("semi stub\n"); if (ppUnkContainer) *ppUnkContainer = NULL; if (ppUnkControl) *ppUnkControl = NULL; @@ -1427,28 +1430,21 @@ INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND return 0; } -#if _ATL_VER >= _ATL_VER_80 - /*********************************************************************** * AtlAxCreateControlLic [atl100.59] * */ HRESULT WINAPI AtlAxCreateControlLic(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, IUnknown **container, BSTR lic) { - FIXME("(%s %p %p %p %s)\n", debugstr_w(lpTricsData), hwnd, stream, container, debugstr_w(lic)); - return E_NOTIMPL; + return AtlAxCreateControlLicEx(lpTricsData, hwnd, stream, container, NULL, NULL, NULL, lic); } /*********************************************************************** - * AtlAxCreateControlLicEx [atl100.60] + * AtlAxCreateControlEx [atl100.@] * */ -HRESULT WINAPI AtlAxCreateControlLicEx(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, - IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink, BSTR lic) +HRESULT WINAPI AtlAxCreateControlEx(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, + IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink) { - FIXME("(%s %p %p %p %p %s %p %s)\n", debugstr_w(lpTricsData), hwnd, stream, container, control, - debugstr_guid(iidSink), punkSink, debugstr_w(lic)); - return E_NOTIMPL; + return AtlAxCreateControlLicEx(lpTricsData, hwnd, stream, container, control, iidSink, punkSink, NULL); } - -#endif

1 0