March 2015 - Wine-Commits - list.winehq.org

Francois Gouget : taskschd: Remove an unneeded NONAMELESSUNION directive.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: aa1ad58ba72a93d19ebf166915649ea0ac06aee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa1ad58ba72a93d19ebf16691… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 24 11:40:35 2015 +0100 taskschd: Remove an unneeded NONAMELESSUNION directive. --- dlls/taskschd/taskschd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/taskschd/taskschd.c b/dlls/taskschd/taskschd.c index 2f4e603..b68c352 100644 --- a/dlls/taskschd/taskschd.c +++ b/dlls/taskschd/taskschd.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Nikolay Sivov : dwrite: Forward IDWriteTextLayout::GetMetrics() to IDWriteTextLayout2::GetMetrics().
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 437fb07438c7d9eebd13520aa561dcffa3237a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=437fb07438c7d9eebd13520aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 21 19:27:21 2015 +0300 dwrite: Forward IDWriteTextLayout::GetMetrics() to IDWriteTextLayout2::GetMetrics(). --- dlls/dwrite/layout.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 56026fb..7a43566 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1705,8 +1705,16 @@ static HRESULT WINAPI dwritetextlayout_GetLineMetrics(IDWriteTextLayout2 *iface, static HRESULT WINAPI dwritetextlayout_GetMetrics(IDWriteTextLayout2 *iface, DWRITE_TEXT_METRICS *metrics) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%p): stub\n", This, metrics); - return E_NOTIMPL; + DWRITE_TEXT_METRICS1 metrics1; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, metrics); + + hr = IDWriteTextLayout2_GetMetrics(iface, &metrics1); + if (hr == S_OK) + memcpy(metrics, &metrics1, sizeof(*metrics)); + + return hr; } static HRESULT WINAPI dwritetextlayout_GetOverhangMetrics(IDWriteTextLayout2 *iface, DWRITE_OVERHANG_METRICS *overhangs)

1 0

Nikolay Sivov : msi: Return interface pointer instead of impl pointer.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 2478421d871f2f4dad3e280ffaffb3da51927ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2478421d871f2f4dad3e280ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 21 00:24:47 2015 +0300 msi: Return interface pointer instead of impl pointer. --- dlls/msi/custom.c | 2 +- dlls/msi/database.c | 2 +- dlls/msi/package.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 002d861..d492e19 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1455,7 +1455,7 @@ HRESULT create_msi_custom_remote( IUnknown *pOuter, LPVOID *ppObj ) This->IWineMsiRemoteCustomAction_iface.lpVtbl = &msi_custom_remote_vtbl; This->refs = 1; - *ppObj = This; + *ppObj = &This->IWineMsiRemoteCustomAction_iface; return S_OK; } diff --git a/dlls/msi/database.c b/dlls/msi/database.c index e970ef6..18e1445 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -2020,7 +2020,7 @@ HRESULT create_msi_remote_database( IUnknown *pOuter, LPVOID *ppObj ) This->database = 0; This->refs = 1; - *ppObj = This; + *ppObj = &This->IWineMsiRemoteDatabase_iface; return S_OK; } diff --git a/dlls/msi/package.c b/dlls/msi/package.c index c5a07fb..de50703 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2660,7 +2660,7 @@ HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj ) This->package = 0; This->refs = 1; - *ppObj = This; + *ppObj = &This->IWineMsiRemotePackage_iface; return S_OK; }

1 0

Nikolay Sivov : ole32/tests: Return interface pointer instead of impl pointer from QI.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 597515c074939f01da8db5716ecd86b6bd8dcaed URL: http://source.winehq.org/git/wine.git/?a=commit;h=597515c074939f01da8db5716… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 10:17:30 2015 +0300 ole32/tests: Return interface pointer instead of impl pointer from QI. --- dlls/ole32/tests/clipboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index db090bd..ce469a6 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -96,7 +96,7 @@ static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFII if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) { IEnumFORMATETC_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IEnumFORMATETC_iface; return S_OK; } *ppvObj = NULL; @@ -201,7 +201,7 @@ static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID r if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) { IDataObject_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IDataObject_iface; return S_OK; } *ppvObj = NULL;

1 0

Nikolay Sivov : ole32: Return interface pointers instead of impl pointers from QI.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 7d44fa714a94bb9010f270926b3e8596e7c8dd15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d44fa714a94bb9010f270926… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 20 10:15:42 2015 +0300 ole32: Return interface pointers instead of impl pointers from QI. --- dlls/ole32/bindctx.c | 2 +- dlls/ole32/hglobalstream.c | 2 +- dlls/ole32/moniker.c | 2 +- dlls/ole32/storage32.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 5e7fe8f..8be88a6 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -92,7 +92,7 @@ BindCtxImpl_QueryInterface(IBindCtx* iface,REFIID riid,void** ppvObject) if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IBindCtx, riid)) { - *ppvObject = This; + *ppvObject = &This->IBindCtx_iface; IBindCtx_AddRef(iface); return S_OK; } diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index ff1dfa2..655e380 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -89,7 +89,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_QueryInterface( IsEqualIID(&IID_ISequentialStream, riid) || IsEqualIID(&IID_IStream, riid)) { - *ppvObject = This; + *ppvObject = &This->IStream_iface; } if ((*ppvObject)==0) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 2997156..6f7afa0 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -316,7 +316,7 @@ RunningObjectTableImpl_QueryInterface(IRunningObjectTable* iface, if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IRunningObjectTable, riid)) - *ppvObject = This; + *ppvObject = &This->IRunningObjectTable_iface; if ((*ppvObject)==0) return E_NOINTERFACE; diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f09beec..07fae9c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -6300,7 +6300,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_QueryInterface( if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IEnumSTATSTG, riid)) { - *ppvObject = This; + *ppvObject = &This->IEnumSTATSTG_iface; IEnumSTATSTG_AddRef(&This->IEnumSTATSTG_iface); return S_OK; }

1 0

Michael Stefaniuc : scrrun: Print the debug string instead of the pointer value.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 6ab6564b9fd760a71591d16f40507ce674dc107f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab6564b9fd760a71591d16f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 24 10:02:45 2015 +0100 scrrun: Print the debug string instead of the pointer value. --- dlls/scrrun/dictionary.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index cce8a37..631d0b0 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -671,7 +671,7 @@ static HRESULT WINAPI dictionary_Remove(IDictionary *iface, VARIANT *key) dictionary *This = impl_from_IDictionary(iface); struct keyitem_pair *pair; - TRACE("(%p)->(%p)\n", This, debugstr_variant(key)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(key)); if (!(pair = get_keyitem_pair(This, key))) return CTL_E_ELEMENT_NOT_FOUND;

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_DrawInstanced().
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 010ff106dd8b8eeb317d088ec86550f79c3c7857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=010ff106dd8b8eeb317d088ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 09:38:26 2015 +0100 d3d10core: Implement d3d10_device_DrawInstanced(). --- dlls/d3d10core/device.c | 9 +++++++-- dlls/wined3d/device.c | 9 +++++++++ dlls/wined3d/directx.c | 1 + dlls/wined3d/drawprim.c | 14 ++++++++++++-- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ed59ee6..d8b3d7e 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -304,9 +304,14 @@ static void STDMETHODCALLTYPE d3d10_device_DrawInstanced(ID3D10Device1 *iface, UINT instance_vertex_count, UINT instance_count, UINT start_vertex_location, UINT start_instance_location) { - FIXME("iface %p, instance_vertex_count %u, instance_count %u, start_vertex_location %u,\n" - "\tstart_instance_location %u stub!\n", iface, instance_vertex_count, instance_count, + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, instance_vertex_count %u, instance_count %u, start_vertex_location %u, " + "start_instance_location %u.\n", iface, instance_vertex_count, instance_count, start_vertex_location, start_instance_location); + + wined3d_device_draw_primitive_instanced(device->wined3d_device, start_vertex_location, + instance_vertex_count, start_instance_location, instance_count); } static void STDMETHODCALLTYPE d3d10_device_GSSetConstantBuffers(ID3D10Device1 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 631045a..870e384 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3427,6 +3427,15 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT return WINED3D_OK; } +void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device, + UINT start_vertex, UINT vertex_count, UINT start_instance, UINT instance_count) +{ + TRACE("device %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", + device, start_vertex, vertex_count, start_instance, instance_count); + + wined3d_cs_emit_draw(device->cs, start_vertex, vertex_count, start_instance, instance_count, FALSE); +} + HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3667840..13061f4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2890,6 +2890,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glDeleteShader) /* OpenGL 2.0 */ USE_GL_FUNC(glDetachShader) /* OpenGL 2.0 */ USE_GL_FUNC(glDisableVertexAttribArray) /* OpenGL 2.0 */ + USE_GL_FUNC(glDrawArraysInstanced) /* OpenGL 3.1 */ USE_GL_FUNC(glDrawBuffers) /* OpenGL 2.0 */ USE_GL_FUNC(glDrawElementsInstanced) /* OpenGL 3.1 */ USE_GL_FUNC(glEnableVertexAttribArray) /* OpenGL 2.0 */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 4916c05..c0654a6 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -74,8 +74,18 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit } else { - gl_info->gl_ops.gl.p_glDrawArrays(primitive_type, start_idx, count); - checkGLcall("glDrawArrays"); + if (instance_count) + { + if (start_instance) + FIXME("Start instance (%u) not supported.\n", start_instance); + GL_EXTCALL(glDrawArraysInstanced(primitive_type, start_idx, count, instance_count)); + checkGLcall("glDrawArraysInstanced"); + } + else + { + gl_info->gl_ops.gl.p_glDrawArrays(primitive_type, start_idx, count); + checkGLcall("glDrawArrays"); + } } } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9de0baf..a79d6a6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -43,6 +43,7 @@ @ cdecl wined3d_device_draw_indexed_primitive(ptr long long) @ cdecl wined3d_device_draw_indexed_primitive_instanced(ptr long long long long) @ cdecl wined3d_device_draw_primitive(ptr long long) +@ cdecl wined3d_device_draw_primitive_instanced(ptr long long long long) @ cdecl wined3d_device_end_scene(ptr) @ cdecl wined3d_device_end_stateblock(ptr ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 116918d..0f70848 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2143,6 +2143,8 @@ HRESULT __cdecl wined3d_device_draw_indexed_primitive(struct wined3d_device *dev void __cdecl wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, UINT start_idx, UINT index_count, UINT start_instance, UINT instance_count); HRESULT __cdecl wined3d_device_draw_primitive(struct wined3d_device *device, UINT start_vertex, UINT vertex_count); +void __cdecl wined3d_device_draw_primitive_instanced(struct wined3d_device *device, + UINT start_vertex, UINT vertex_count, UINT start_instance, UINT instance_count); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device);

1 0

Henri Verbeet : wined3d: Implement d3d10 style instance data step rates.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 1b08196c5a1046a3bdecd383e3811de6aa85fbdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b08196c5a1046a3bdecd383e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 09:38:23 2015 +0100 wined3d: Implement d3d10 style instance data step rates. --- dlls/d3d10core/inputlayout.c | 7 ++----- dlls/d3d8/vertexdeclaration.c | 2 ++ dlls/d3d9/vertexdeclaration.c | 2 ++ dlls/wined3d/context.c | 19 +++++++++++++++++-- dlls/wined3d/state.c | 27 +++++++++++---------------- dlls/wined3d/utils.c | 14 ++++++++++++++ dlls/wined3d/vertexdeclaration.c | 20 +++++++++++++------- dlls/wined3d/wined3d_private.h | 8 ++++++-- include/wine/wined3d.h | 10 +++++++++- 9 files changed, 76 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b08196c5a1046a3bdecd…

1 0

David Naylor : configure: Explicitly set host_cpu for 'amd64'.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 9a3fdffe9d8ebfce4791767dcfa14b59c020694b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a3fdffe9d8ebfce4791767dc… Author: David Naylor <dbn(a)freebsd.org> Date: Sun Mar 22 20:21:04 2015 +0200 configure: Explicitly set host_cpu for 'amd64'. --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index af78958..4596844 100755 --- a/configure +++ b/configure @@ -4924,6 +4924,7 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi + host_cpu="x86_64" TARGETFLAGS="-m64" fi diff --git a/configure.ac b/configure.ac index d04780c..1fc7873 100644 --- a/configure.ac +++ b/configure.ac @@ -165,6 +165,7 @@ case $host in [AC_MSG_RESULT([no]) AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])]) fi + host_cpu="x86_64" AC_SUBST(TARGETFLAGS,"-m64") fi ;;

1 0

Nikolay Sivov : comctl32/tooltips: Allow NULL hinst value when fetching text from resources.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 9d0ebc13ac7e0dad17ff104c38f8ebd7b9326aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0ebc13ac7e0dad17ff104c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 24 00:10:06 2015 +0300 comctl32/tooltips: Allow NULL hinst value when fetching text from resources. --- dlls/comctl32/tests/tooltips.c | 26 ++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 6 +++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 271009d..a07a054 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -20,6 +20,8 @@ #include <windows.h> #include <commctrl.h> +#include "resources.h" + #include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) @@ -326,6 +328,30 @@ static void test_gettext(void) SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); ok(toolinfoA.lpszText == NULL, "expected NULL, got %p\n", toolinfoA.lpszText); + + /* NULL hinst, valid resource id for text */ + toolinfoA.cbSize = sizeof(TTTOOLINFOA); + toolinfoA.hwnd = NULL; + toolinfoA.hinst = NULL; + toolinfoA.uFlags = 0; + toolinfoA.uId = 0x1233ABCD; + toolinfoA.lpszText = MAKEINTRESOURCEA(IDS_TBADD1); + toolinfoA.lParam = 0xdeadbeef; + GetClientRect(hwnd, &toolinfoA.rect); + r = SendMessageA(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&toolinfoA); + ok(r, "failed to add a tool\n"); + + toolinfoA.hwnd = NULL; + toolinfoA.uId = 0x1233ABCD; + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); + ok(strcmp(toolinfoA.lpszText, "abc") == 0, "lpszText should be an empty string\n"); + + toolinfoA.hinst = (HINSTANCE)0xdeadbee; + SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); + ok(toolinfoA.hinst == NULL, "expected NULL, got %p\n", toolinfoA.hinst); + + SendMessageA(hwnd, TTM_DELTOOLA, 0, (LPARAM)&toolinfoA); } else { diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 7564c3f..5423ca5 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -484,12 +484,12 @@ TOOLTIPS_GetTipText (const TOOLTIPS_INFO *infoPtr, INT nTool, WCHAR *buffer) { TTTOOL_INFO *toolPtr = &infoPtr->tools[nTool]; - if (IS_INTRESOURCE(toolPtr->lpszText) && toolPtr->hinst) { + if (IS_INTRESOURCE(toolPtr->lpszText)) { /* load a resource */ TRACE("load res string %p %x\n", toolPtr->hinst, LOWORD(toolPtr->lpszText)); - LoadStringW (toolPtr->hinst, LOWORD(toolPtr->lpszText), - buffer, INFOTIPSIZE); + if (!LoadStringW (toolPtr->hinst, LOWORD(toolPtr->lpszText), buffer, INFOTIPSIZE)) + buffer[0] = '\0'; } else if (toolPtr->lpszText) { if (toolPtr->lpszText == LPSTR_TEXTCALLBACKW) {

1 0