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

qingdoa daoo : gdi: Duplicate extent value for the second byte of a DBCS char.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 4d7655a84e0f0bec3a17e6dd38780731f8dc31fb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d7655a84e0f0bec3a17e6d… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Sat May 13 07:52:59 2006 +0800 gdi: Duplicate extent value for the second byte of a DBCS char. --- dlls/gdi/font.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index ada4966..d3fa6df 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -1144,10 +1144,28 @@ BOOL WINAPI GetTextExtentExPointA( HDC h { BOOL ret; INT wlen; - LPWSTR p = FONT_mbtowc(str, count, &wlen); - ret = GetTextExtentExPointW( hdc, p, wlen, maxExt, lpnFit, alpDx, size); + INT *walpDx = NULL; + LPWSTR p = NULL; + + if (alpDx && + NULL == (walpDx = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT)))) + return FALSE; + + p = FONT_mbtowc(str, count, &wlen); + ret = GetTextExtentExPointW( hdc, p, wlen, maxExt, lpnFit, walpDx, size); + if (walpDx) + { + INT n = lpnFit ? *lpnFit : wlen; + INT i, j; + for(i = 0, j = 0; i < n; i++, j++) + { + alpDx[j] = walpDx[i]; + if (IsDBCSLeadByte(str[j])) alpDx[++j] = walpDx[i]; + } + } if (lpnFit) *lpnFit = WideCharToMultiByte(CP_ACP,0,p,*lpnFit,NULL,0,NULL,NULL); HeapFree( GetProcessHeap(), 0, p ); + HeapFree( GetProcessHeap(), 0, walpDx ); return ret; }

1 0

Alexandre Julliard : configure: Make libraries properly relocatable on MacOS.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 7ed7e8fd4d62e20fc709ed8eb55fb54dd0904430 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7ed7e8fd4d62e20fc709ed8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 15 15:14:45 2006 +0200 configure: Make libraries properly relocatable on MacOS. Also set the compatibility version. --- configure | 2 +- configure.ac | 2 +- libs/Makelib.rules.in | 8 ++++++-- libs/wine/Makefile.in | 3 --- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 533fcc5..ebc4f6b 100755 --- a/configure +++ b/configure @@ -14188,7 +14188,7 @@ echo "${ECHO_T}$ac_cv_c_dll_macho" >&6 then LIBEXT="dylib" LDDLLFLAGS="-bundle" - LDSHARED="\$(CC) -dynamiclib" + LDSHARED="\$(CC) -dynamiclib -install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME) \$(SOVERSION:%=-compatibility_version %)" STRIP="$STRIP -u -r" COREFOUNDATIONLIB="-framework CoreFoundation" diff --git a/configure.ac b/configure.ac index cd5a7ae..58c07d9 100644 --- a/configure.ac +++ b/configure.ac @@ -1127,7 +1127,7 @@ case $host_os in then LIBEXT="dylib" LDDLLFLAGS="-bundle" - LDSHARED="\$(CC) -dynamiclib" + LDSHARED="\$(CC) -dynamiclib -install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME) \$(SOVERSION:%=-compatibility_version %)" STRIP="$STRIP -u -r" dnl declare needed frameworks AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") diff --git a/libs/Makelib.rules.in b/libs/Makelib.rules.in index 4a08d1e..c1f8888 100644 --- a/libs/Makelib.rules.in +++ b/libs/Makelib.rules.in @@ -13,6 +13,7 @@ LIBEXT = @LIBEXT@ LIBNAME = lib$(LIBRARY) DEFNAME = $(LIBRARY).def SONAME = $(LIBNAME).so.$(SOVERSION) +DYNAME = $(LIBNAME).$(SOVERSION).dylib MODULE = $(LIBNAME).$(LIBEXT) all: $(MODULE) $(MODULE:.dll=.a) @@ -31,8 +32,8 @@ all: $(MODULE) $(MODULE:.dll=.a) $(LIBNAME).dll: $(OBJS) $(DEFNAME) Makefile.in $(DLLWRAP) --def $(SRCDIR)/$(DEFNAME) -o $@ $(OBJS) $(EXTRALIBS) -$(LIBNAME).$(SOVERSION).dylib: $(OBJS) Makefile.in - $(LDSHARED) -install_name $(libdir)/$(LIBNAME).$(SOVERSION).dylib $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ +$(LIBNAME).$(SOVERSION).dylib: $(OBJS) $(RELPATH) Makefile.in + $(LDSHARED) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ $(LIBNAME).dylib: $(LIBNAME).$(SOVERSION).dylib $(RM) $@ && $(LN_S) $(LIBNAME).$(SOVERSION).dylib $@ @@ -71,3 +72,6 @@ uninstall:: clean:: $(RM) $(LIBNAME).so.$(SOVERSION) $(LIBNAME).dll $(LIBNAME).$(SOVERSION).dylib + +$(RELPATH): + @cd $(TOOLSDIR)/tools && $(MAKE) relpath diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 9d5d6ee..7aa49e3 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -30,7 +30,4 @@ CONFIGDIRS = \ config.o: config.c $(RELPATH) $(CC) -c $(ALLCFLAGS) -o $@ $(SRCDIR)/config.c $(CONFIGDIRS) -$(RELPATH): - @cd $(TOOLSDIR)/tools && $(MAKE) relpath - ### Dependencies:

1 0

Francois Gouget : Fix some winapi_check documentation warnings.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 17689c07bb873c40caa65d5931ce48ca50adfe7a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17689c07bb873c40caa65d5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 12 00:34:55 2006 +0200 Fix some winapi_check documentation warnings. --- dlls/advapi32/security.c | 6 ++++++ dlls/cfgmgr32/main.c | 9 +++++++++ dlls/gdi/freetype.c | 2 ++ dlls/mprapi/mprapi.c | 3 +++ dlls/ntdll/sync.c | 3 +++ dlls/ole32/usrmarshal.c | 6 ++++++ dlls/usp10/usp10.c | 4 ++++ 7 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index f61b38a..ccd3ded 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2174,6 +2174,9 @@ VOID WINAPI BuildTrusteeWithObjectsAndNa pTrustee->ptstrName = (LPWSTR)pObjName; } +/****************************************************************************** + * BuildTrusteeWithObjectsAndSidA [ADVAPI32.@] + */ VOID WINAPI BuildTrusteeWithObjectsAndSidA( PTRUSTEEA pTrustee, POBJECTS_AND_SID pObjSid, GUID* pObjectGuid, GUID* pInheritedObjectGuid, PSID pSid ) { @@ -2215,6 +2218,9 @@ VOID WINAPI BuildTrusteeWithObjectsAndSi pTrustee->ptstrName = (LPSTR) pObjSid; } +/****************************************************************************** + * BuildTrusteeWithObjectsAndSidW [ADVAPI32.@] + */ VOID WINAPI BuildTrusteeWithObjectsAndSidW( PTRUSTEEW pTrustee, POBJECTS_AND_SID pObjSid, GUID* pObjectGuid, GUID* pInheritedObjectGuid, PSID pSid ) { diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c index 0312900..db09189 100644 --- a/dlls/cfgmgr32/main.c +++ b/dlls/cfgmgr32/main.c @@ -45,6 +45,9 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWO return TRUE; } +/*********************************************************************** + * CM_Get_Device_ID_ListA (CFGMGR32.@) + */ CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) { @@ -53,6 +56,9 @@ CONFIGRET WINAPI CM_Get_Device_ID_ListA( return CR_SUCCESS; } +/*********************************************************************** + * CM_Get_Device_ID_Size (CFGMGR32.@) + */ CONFIGRET WINAPI CM_Get_Device_ID_Size( ULONG* pulLen, LPVOID dnDevInst, ULONG ulFlags) { @@ -61,6 +67,9 @@ CONFIGRET WINAPI CM_Get_Device_ID_Size( return CR_SUCCESS; } +/*********************************************************************** + * CM_Get_Device_IDA (CFGMGR32.@) + */ CONFIGRET WINAPI CM_Get_Device_IDA( LPVOID dnDevInst, LPSTR Buffer, ULONG BufferLen, ULONG ulFlags) { diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 4edac76..09c53a5 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -4074,6 +4074,8 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERI #else /* HAVE_FREETYPE */ +/*************************************************************************/ + BOOL WineEngInit(void) { return FALSE; diff --git a/dlls/mprapi/mprapi.c b/dlls/mprapi/mprapi.c index a638a87..b6b572e 100644 --- a/dlls/mprapi/mprapi.c +++ b/dlls/mprapi/mprapi.c @@ -44,6 +44,9 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWO return TRUE; } +/*********************************************************************** + * MprAdminIsServiceRunning (MPRAPI.@) + */ BOOL APIENTRY MprAdminIsServiceRunning(LPWSTR server) { FIXME("(%s): stub!\n", debugstr_w(server)); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index eb4341b..2857911 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -843,6 +843,9 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEA return STATUS_SUCCESS; } +/****************************************************************** + * NtCreateIoCompletion (NTDLL.@) + */ NTSTATUS WINAPI NtCreateIoCompletion( PHANDLE CompletionPort, ACCESS_MASK DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes, ULONG NumberOfConcurrentThreads ) { diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 8c76bc4..870db1f 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -308,6 +308,9 @@ IMPL_WIREM_HANDLE(HACCEL) IMPL_WIREM_HANDLE(HMENU) IMPL_WIREM_HANDLE(HWND) +/****************************************************************************** + * HGLOBAL_UserSize [OLE32.@] + */ unsigned long __RPC_USER HGLOBAL_UserSize(unsigned long *pFlags, unsigned long StartingSize, HGLOBAL *phGlobal) { unsigned long size = StartingSize; @@ -443,6 +446,9 @@ unsigned char * __RPC_USER HGLOBAL_UserU return pBuffer; } +/****************************************************************************** + * HGLOBAL_UserFree [OLE32.@] + */ void __RPC_USER HGLOBAL_UserFree(unsigned long *pFlags, HGLOBAL *phGlobal) { TRACE("("); dump_user_flags(pFlags); TRACE(", &%p\n", *phGlobal); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index be8c388..8fbad37 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -72,6 +72,10 @@ typedef struct scriptcache { HDC hdc; } Scriptcache; +/*********************************************************************** + * DllMain + * + */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) {

1 0

Francois Gouget : Various trace fixes.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: f7c24f37ad62c2cf970debf3d2b1ed337114d35f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f7c24f37ad62c2cf970debf… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 12 00:32:31 2006 +0200 Various trace fixes. Add trailing '\n's to trace calls. Remove spaces before '\n'. --- dlls/d3d9/pixelshader.c | 2 +- dlls/ddraw/tests/d3d.c | 8 ++++---- dlls/gdi/tests/bitmap.c | 2 +- dlls/kernel/tests/toolhelp.c | 2 +- dlls/msi/tests/msi.c | 4 ++-- dlls/ole32/tests/moniker.c | 8 ++++---- dlls/wined3d/baseshader.c | 2 +- dlls/winspool/info.c | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c index 6c9b75c..7fed701 100644 --- a/dlls/d3d9/pixelshader.c +++ b/dlls/d3d9/pixelshader.c @@ -100,7 +100,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Crea IDirect3DPixelShader9Impl *object; HRESULT hrc = D3D_OK; - TRACE("(%p) Relay \n", This); + TRACE("(%p) Relay\n", This); if (ppShader == NULL) { TRACE("(%p) Invalid call\n", This); diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index a176c2b..7ad03d7 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -469,13 +469,13 @@ static void ProcessVerticesTest() /* Play with some matrices. */ rc = IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_VIEW, &view); - ok(rc==D3D_OK, "IDirect3DDevice7_SetTransform failed"); + ok(rc==D3D_OK, "IDirect3DDevice7_SetTransform failed\n"); rc = IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_PROJECTION, &proj); - ok(rc==D3D_OK, "IDirect3DDevice7_SetTransform failed"); + ok(rc==D3D_OK, "IDirect3DDevice7_SetTransform failed\n"); rc = IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_WORLD, &world); - ok(rc==D3D_OK, "IDirect3DDevice7_SetTransform failed"); + ok(rc==D3D_OK, "IDirect3DDevice7_SetTransform failed\n"); rc = IDirect3DVertexBuffer7_ProcessVertices(lpVBufDest1, D3DVOP_TRANSFORM, 0, 4, lpVBufSrc, 0, lpD3DDevice, 0); ok(rc==D3D_OK , "IDirect3DVertexBuffer::ProcessVertices returned: %lx\n", rc); @@ -492,7 +492,7 @@ static void ProcessVerticesTest() vp.dvMinZ = 1.0; vp.dvMaxZ = 0.0; rc = IDirect3DDevice7_SetViewport(lpD3DDevice, &vp); - ok(rc==D3D_OK, "IDirect3DDevice7_SetViewport failed"); + ok(rc==D3D_OK, "IDirect3DDevice7_SetViewport failed\n"); /* Check the results */ if( !comparefloat(out[0].x, 256.0 ) || /* X coordinate is cut at the surface edges */ diff --git a/dlls/gdi/tests/bitmap.c b/dlls/gdi/tests/bitmap.c index 3c410a0..ff16f8d 100644 --- a/dlls/gdi/tests/bitmap.c +++ b/dlls/gdi/tests/bitmap.c @@ -299,7 +299,7 @@ static void test_dib_info(HBITMAP hbm, c ok(ret == sizeof(ds), "%d != %d\n", ret, sizeof(ds)); ok(ds.dsBm.bmBits == bits, "wrong bm.bmBits %p != %p\n", ds.dsBm.bmBits, bits); - ok(ds.dsBmih.biSizeImage == ds.dsBm.bmWidthBytes * ds.dsBm.bmHeight, "%lu != %u", + ok(ds.dsBmih.biSizeImage == ds.dsBm.bmWidthBytes * ds.dsBm.bmHeight, "%lu != %u\n", ds.dsBmih.biSizeImage, ds.dsBm.bmWidthBytes * ds.dsBm.bmHeight); ok(bmih->biSizeImage == 0, "%lu != 0\n", bmih->biSizeImage); ds.dsBmih.biSizeImage = 0; diff --git a/dlls/kernel/tests/toolhelp.c b/dlls/kernel/tests/toolhelp.c index 2b4a150..47695de 100644 --- a/dlls/kernel/tests/toolhelp.c +++ b/dlls/kernel/tests/toolhelp.c @@ -242,7 +242,7 @@ static void test_module(DWORD pid, const { trace("PID=%lx base=%p size=%lx %s %s\n", me.th32ProcessID, me.modBaseAddr, me.modBaseSize, me.szExePath, me.szModule); - ok(me.th32ProcessID == pid, "wrong returned process id"); + ok(me.th32ProcessID == pid, "wrong returned process id\n"); for (i = 0; i < num_expected; i++) if (!lstrcmpi(expected[i], me.szModule)) found[i]++; num++; diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index e6fd855..7b18053 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -72,13 +72,13 @@ static void test_null(void) UINT r; r = MsiOpenPackageExW(NULL, 0, &hpkg); - ok( r == ERROR_INVALID_PARAMETER,"wrong error"); + ok( r == ERROR_INVALID_PARAMETER,"wrong error\n"); r = MsiQueryProductStateW(NULL); ok( r == INSTALLSTATE_INVALIDARG, "wrong return\n"); r = MsiEnumFeaturesW(NULL,0,NULL,NULL); - ok( r == ERROR_INVALID_PARAMETER,"wrong error"); + ok( r == ERROR_INVALID_PARAMETER,"wrong error\n"); } START_TEST(msi) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 9ca5ab8..ba21173 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -515,7 +515,7 @@ static void test_class_moniker(void) ok_ole_success(hr, IMoniker_IsSystemMoniker); ok(moniker_type == MKSYS_CLASSMONIKER, - "dwMkSys != MKSYS_CLASSMONIKER, instead was 0x%08lx", + "dwMkSys != MKSYS_CLASSMONIKER, instead was 0x%08lx\n", moniker_type); hr = CreateBindCtx(0, &bindctx); @@ -644,7 +644,7 @@ static void test_item_moniker(void) ok_ole_success(hr, IMoniker_IsSystemMoniker); ok(moniker_type == MKSYS_ITEMMONIKER, - "dwMkSys != MKSYS_ITEMMONIKER, instead was 0x%08lx", + "dwMkSys != MKSYS_ITEMMONIKER, instead was 0x%08lx\n", moniker_type); hr = CreateBindCtx(0, &bindctx); @@ -702,7 +702,7 @@ static void test_anti_moniker(void) hr = IMoniker_IsSystemMoniker(moniker, &moniker_type); ok_ole_success(hr, IMoniker_IsSystemMoniker); ok(moniker_type == MKSYS_ANTIMONIKER, - "dwMkSys != MKSYS_ANTIMONIKER, instead was 0x%08lx", + "dwMkSys != MKSYS_ANTIMONIKER, instead was 0x%08lx\n", moniker_type); hr = IMoniker_Inverse(moniker, &inverse); @@ -776,7 +776,7 @@ static void test_generic_composite_monik ok_ole_success(hr, IMoniker_IsSystemMoniker); ok(moniker_type == MKSYS_GENERICCOMPOSITE, - "dwMkSys != MKSYS_GENERICCOMPOSITE, instead was 0x%08lx", + "dwMkSys != MKSYS_GENERICCOMPOSITE, instead was 0x%08lx\n", moniker_type); hr = CreateBindCtx(0, &bindctx); diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index acc402b..c9c65d9 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -379,7 +379,7 @@ void generate_base_shader( } else { - TRACE("Found opcode D3D:%s GL:%s, PARAMS:%d, \n", + TRACE("Found opcode D3D:%s GL:%s, PARAMS:%d,\n", curOpcode->name, curOpcode->glname, curOpcode->num_params); /* Unless we encounter a no-op command, this opcode is unrecognized */ diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 0288269..df22eae 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -1425,7 +1425,7 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DW if (!mi2w->pName || (! mi2w->pName[0])) { - WARN("pName not valid : %s \n", debugstr_w(mi2w->pName)); + WARN("pName not valid : %s\n", debugstr_w(mi2w->pName)); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -1437,7 +1437,7 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DW } if (!mi2w->pDLLName || (! mi2w->pDLLName[0])) { - WARN("pDLLName not valid : %s \n", debugstr_w(mi2w->pDLLName)); + WARN("pDLLName not valid : %s\n", debugstr_w(mi2w->pDLLName)); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: e739ba9551260a5e596817eb0936c2a7813d0e0e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e739ba9551260a5e596817e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 12 00:06:31 2006 +0200 Assorted spelling fixes. --- configure | 2 +- configure.ac | 2 +- dlls/advpack/tests/install.c | 2 +- dlls/msi/action.c | 2 +- dlls/user/tests/wsprintf.c | 6 +++--- dlls/wined3d/surface.c | 2 +- dlls/x11drv/dib.c | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 4caf278..533fcc5 100755 --- a/configure +++ b/configure @@ -21815,7 +21815,7 @@ fi if test "$wine_cv_msg_fonts" = "yes" then echo - echo "*** Warning: Freetype or Fontforge is missing." + echo "*** Warning: FreeType or FontForge is missing." echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." exitcode=1 fi diff --git a/configure.ac b/configure.ac index 4861751..cd5a7ae 100644 --- a/configure.ac +++ b/configure.ac @@ -1833,7 +1833,7 @@ fi if test "$wine_cv_msg_fonts" = "yes" then echo - echo "*** Warning: Freetype or Fontforge is missing." + echo "*** Warning: FreeType or FontForge is missing." echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." exitcode=1 fi diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index d8eee76..6e7b59c 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -61,7 +61,7 @@ static void test_RunSetupCommand() hr = pRunSetupCommand(NULL, "winver.exe", "Install", NULL, "Title", NULL, 0, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %ld\n", hr); - /* try to run a non-existent exe */ + /* try to run a nonexistent exe */ hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "idontexist.exe", "Install", "c:\\windows\\system32", "Title", &hexe, 0, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 270e9ae..22133cf 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1459,7 +1459,7 @@ static MSIFOLDER *load_folder( MSIPACKAG tgt_short = p; src_short = folder_split_path( p, ':' ); - /* split the long and short pathes */ + /* split the long and short paths */ tgt_long = folder_split_path( tgt_short, '|' ); src_long = folder_split_path( src_short, '|' ); diff --git a/dlls/user/tests/wsprintf.c b/dlls/user/tests/wsprintf.c index d4bcd4c..5fbbc94 100644 --- a/dlls/user/tests/wsprintf.c +++ b/dlls/user/tests/wsprintf.c @@ -51,7 +51,7 @@ static void wsprintfWTest(void) } /* Test if the CharUpper / CharLower functions return true 16 bit results, - if the input is a 16 bit input value. Upto Wine 11-2003 the input value + if the input is a 16 bit input value. Up to Wine 11-2003 the input value 0xff returns 0xffffffff. */ static void CharUpperTest(void) @@ -69,7 +69,7 @@ static void CharUpperTest(void) break; } } - ok(!failed,"CharUpper failed - 16bit input (0x%0x) returned 32bit result (0x%0x)",i,out); + ok(!failed,"CharUpper failed - 16bit input (0x%0x) returned 32bit result (0x%0x)\n",i,out); } static void CharLowerTest(void) @@ -87,7 +87,7 @@ static void CharLowerTest(void) break; } } - ok(!failed,"CharLower failed - 16bit input (0x%0x) returned 32bit result (0x%0x)",i,out); + ok(!failed,"CharLower failed - 16bit input (0x%0x) returned 32bit result (0x%0x)\n",i,out); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 04c3ec3..d56777f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1905,7 +1905,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetCo } if(dirtify) { - TRACE("Color key changed, dirtifing surface\n"); + TRACE("Color key changed, dirtifying surface\n"); This->Flags |= SFLAG_DIRTY; } diff --git a/dlls/x11drv/dib.c b/dlls/x11drv/dib.c index 5904f0a..3379852 100644 --- a/dlls/x11drv/dib.c +++ b/dlls/x11drv/dib.c @@ -1609,8 +1609,8 @@ static void X11DRV_DIB_GetImageBits_8( i * Hack for now * This condition is true when GetImageBits has been called by * UpdateDIBSection. For now, GetNearestIndex is too slow to support - * 256 colormaps, so we'll just use for for GetDIBits calls. - * (In somes cases, in a updateDIBSection, the returned colors are bad too) + * 256 colormaps, so we'll just use it for GetDIBits calls. + * (In some cases, in an updateDIBSection, the returned colors are bad too) */ if (!srccolors) goto updatesection;

1 0

Mikołaj Zalewski : comctl32: header: Check for HDN_GETDISPINFO not being sent during INSERT/SETITEM.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 8266fdd8cbce2eb2486b0ac210357b7ab24ce3e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8266fdd8cbce2eb2486b0ac… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun May 14 11:36:39 2006 +0200 comctl32: header: Check for HDN_GETDISPINFO not being sent during INSERT/SETITEM. --- dlls/comctl32/tests/header.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 87dec21..f85b92c 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -34,6 +34,8 @@ typedef struct tagEXPECTEDNOTIFY EXPECTEDNOTIFY expectedNotify[10]; INT nExpectedNotify = 0; INT nReceivedNotify = 0; +INT unexpectedNotify[10]; +INT nUnexpectedNotify = 0; static HWND hHeaderParentWnd; static HWND hWndHeader; @@ -48,10 +50,17 @@ static void expect_notify(INT iCode, BOO nExpectedNotify++; } +static void dont_expect_notify(INT iCode) +{ + assert(nUnexpectedNotify < 10); + unexpectedNotify[nUnexpectedNotify++] = iCode; +} + static BOOL notifies_received() { BOOL fRet = (nExpectedNotify == nReceivedNotify); nExpectedNotify = nReceivedNotify = 0; + nUnexpectedNotify = 0; return fRet; } @@ -156,6 +165,11 @@ static void compare_items(INT iCode, HDI } if (hdi1->mask & HDI_TEXT) { + if (hdi1->pszText == LPSTR_TEXTCALLBACKA) + { + ok(hdi1->pszText == LPSTR_TEXTCALLBACKA, "Notify %d - only one item is LPSTR_TEXTCALLBACK\n", iCode); + } + else if (fUnicode) { char buf1[260]; @@ -252,6 +266,17 @@ static void test_header_control (void) setItemUnicodeNotify(hWndHeader, 3, pszUniTestA, pszUniTestW); SendMessageA(hWndHeader, WM_NOTIFYFORMAT, (WPARAM)hHeaderParentWnd, (LPARAM)NF_REQUERY); setItem(hWndHeader, 3, str_items[4], TRUE); + + dont_expect_notify(HDN_GETDISPINFOA); + dont_expect_notify(HDN_GETDISPINFOW); + addItem(hWndHeader, 0, LPSTR_TEXTCALLBACKA); + setItem(hWndHeader, 0, str_items[4], TRUE); + /* unexpected notifies cleared by notifies_received in setItem */ + dont_expect_notify(HDN_GETDISPINFOA); + dont_expect_notify(HDN_GETDISPINFOW); + setItem(hWndHeader, 0, LPSTR_TEXTCALLBACKA, TRUE); + /* unexpected notifies cleared by notifies_received in setItem */ + delItem(hWndHeader, 0); res = delItem(hWndHeader, 5); ok(res == 1, "Deleting Out of Range item should fail with 1 (%ld)\n", res); @@ -284,6 +309,10 @@ LRESULT CALLBACK HeaderTestWndProc(HWND { NMHEADERA *hdr = (NMHEADER *)lParam; EXPECTEDNOTIFY *expected; + int i; + + for (i=0; i<nUnexpectedNotify; i++) + ok(hdr->hdr.code != unexpectedNotify[i], "Received invalid notify %d\n", hdr->hdr.code); if (nReceivedNotify >= nExpectedNotify || hdr->hdr.hwndFrom != hWndHeader ) break;

1 0

Mikołaj Zalewski : comctl32: listview: Store the iSubItem in header's lParam in LVM_INSERTCOLUMN.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 700dd456e9f342769877451f93992148f8387f6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=700dd456e9f342769877451… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat May 13 21:34:57 2006 +0200 comctl32: listview: Store the iSubItem in header's lParam in LVM_INSERTCOLUMN. --- dlls/comctl32/listview.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4878778..e57e584 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6545,6 +6545,16 @@ static INT LISTVIEW_InsertColumnT(LISTVI ZeroMemory(&hdi, sizeof(HDITEMW)); column_fill_hditem(infoPtr, &hdi, nColumn, lpColumn, isW); + + /* + * when the iSubItem is available Windows copies it to the header lParam. It seems + * to happen only in LVM_INSERTCOLUMN - not in LVM_SETCOLUMN + */ + if (lpColumn->mask & LVCF_SUBITEM) + { + hdi.mask |= HDI_LPARAM; + hdi.lParam = lpColumn->iSubItem; + } /* insert item in header control */ nNewColumn = SendMessageW(infoPtr->hwndHeader,

1 0

Mikołaj Zalewski : comctl32: header: Correct HDN_GETDISPINFO. Use it during drawing.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 74c3b366d39420421f7ee944d8e779f74d837b77 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=74c3b366d39420421f7ee94… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat May 13 21:31:12 2006 +0200 comctl32: header: Correct HDN_GETDISPINFO. Use it during drawing. Improve HEADER_SendHeaderDispInfoNotify and rename it to HEADER_PrepareCallbackItems. The new HEADER_FreeCallbackItems frees the buffers allocated by it. GetItemT and DrawItem calls these functions. --- dlls/comctl32/header.c | 146 +++++++++++++++++++++++++++--------------------- 1 files changed, 82 insertions(+), 64 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 05ec599..fea902b 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -94,11 +94,15 @@ typedef struct #define VERT_BORDER 3 #define DIVIDER_WIDTH 10 +#define MAX_HEADER_TEXT_LEN 260 #define HDN_UNICODE_OFFSET 20 #define HDN_FIRST_UNICODE (HDN_FIRST-HDN_UNICODE_OFFSET) #define HEADER_GetInfoPtr(hwnd) ((HEADER_INFO *)GetWindowLongPtrW(hwnd,0)) +static BOOL HEADER_PrepareCallbackItems(HWND hwnd, INT iItem, INT reqMask); +static void HEADER_FreeCallbackItems(HEADER_ITEM *lpItem); + static const WCHAR themeClass[] = {'H','e','a','d','e','r',0}; static WCHAR emptyString[] = {0}; @@ -235,6 +239,7 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT if (r.right - r.left == 0) return phdi->rect.right; + HEADER_PrepareCallbackItems(hwnd, iItem, HDI_TEXT|HDI_IMAGE); if (theme != NULL) { int state = (phdi->bDown) ? HIS_PRESSED : (bHotTrack ? HIS_HOT : HIS_NORMAL); @@ -422,6 +427,7 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT } }/*Ownerdrawn*/ + HEADER_FreeCallbackItems(phdi); return phdi->rect.right; } @@ -725,97 +731,118 @@ HEADER_SendHeaderNotifyT (HWND hwnd, UIN } /** - * Send Disp Info notification. + * Prepare callback items * depends on NMHDDISPINFOW having same structure as NMHDDISPINFOA * (so we handle the two cases only doing a specific cast for pszText). + * Checks if any of the required field are callback. If there are sends a + * NMHDISPINFO notify to retrieve these items. The items are stored in the + * HEADER_ITEM pszText and iImage fields. They should be freed with + * HEADER_FreeCallbackItems. * * @param hwnd : hwnd header container handler - * @param mask : notification mask (usually HDI_TEXT or HDI_IMAGE) - * @param pDispInfo : NMHDDISPINFO structure (can be unicode or ansi) - * @param isW : TRUE if dispinfo is Unicode + * @param iItem : the header item id + * @param reqMask : required fields. If any of them is callback this function will fetch it + * + * @return TRUE on success, else FALSE */ static BOOL -HEADER_SendHeaderDispInfoNotify(HWND hwnd, INT iItem, INT mask, LPHDITEMW phdi, HEADER_ITEM* lpItem, BOOL isW) +HEADER_PrepareCallbackItems(HWND hwnd, INT iItem, INT reqMask) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - BOOL ret; - BOOL convertToAnsi = FALSE; - BOOL convertToUnicode = FALSE; - BOOL isUnicodeNotify = FALSE; + HEADER_ITEM *lpItem = &infoPtr->items[iItem]; + DWORD mask = reqMask & lpItem->callbackMask; NMHDDISPINFOW dispInfo; + void *pvBuffer = NULL; - if (mask & HDI_TEXT) + if (mask == 0) + return TRUE; + if (mask&HDI_TEXT && lpItem->pszText != NULL) { - convertToAnsi = (isW && infoPtr->nNotifyFormat == NFR_ANSI); - convertToUnicode = (!isW && infoPtr->nNotifyFormat == NFR_UNICODE); + ERR("(): function called without a call to FreeCallbackItems\n"); + Free(lpItem->pszText); + lpItem->pszText = NULL; } - isUnicodeNotify = (isW && !convertToAnsi); memset(&dispInfo, 0, sizeof(NMHDDISPINFOW)); dispInfo.hdr.hwndFrom = hwnd; dispInfo.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID); - if (isUnicodeNotify || convertToUnicode) + if (infoPtr->nNotifyFormat == NFR_UNICODE) { dispInfo.hdr.code = HDN_GETDISPINFOW; + if (mask & HDI_TEXT) + pvBuffer = Alloc(MAX_HEADER_TEXT_LEN * sizeof(WCHAR)); } else { dispInfo.hdr.code = HDN_GETDISPINFOA; + if (mask & HDI_TEXT) + pvBuffer = Alloc(MAX_HEADER_TEXT_LEN * sizeof(CHAR)); } + dispInfo.pszText = (LPWSTR)pvBuffer; + dispInfo.cchTextMax = (pvBuffer!=NULL?MAX_HEADER_TEXT_LEN:0); dispInfo.iItem = iItem; dispInfo.mask = mask; - /* - dispInfo.pszText = Alloc(sizeof(WCHAR) * 260); - dispInfo.cchTextMax = 260; - */ - ret = (BOOL) SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM) dispInfo.hdr.idFrom, - (LPARAM) &dispInfo); + dispInfo.lParam = lpItem->lParam; + + TRACE("Sending HDN_GETDISPINFO%c\n", infoPtr->nNotifyFormat == NFR_UNICODE?'W':'A'); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, + (WPARAM) dispInfo.hdr.idFrom, + (LPARAM) &dispInfo); TRACE("SendMessage returns(mask:0x%x,str:%s,lParam:%p)\n", dispInfo.mask, - (isUnicodeNotify ? debugstr_w(dispInfo.pszText) : (LPSTR) dispInfo.pszText), + (infoPtr->nNotifyFormat == NFR_UNICODE ? debugstr_w(dispInfo.pszText) : (LPSTR) dispInfo.pszText), (void*) dispInfo.lParam); - - if (dispInfo.mask & HDI_DI_SETITEM) + + if (mask & HDI_IMAGE) + lpItem->iImage = dispInfo.iImage; + if (mask & HDI_TEXT) { - if (dispInfo.mask & HDI_IMAGE) + if (infoPtr->nNotifyFormat == NFR_UNICODE) { - lpItem->iImage = dispInfo.iImage; - lpItem->callbackMask &= ~HDI_IMAGE; + lpItem->pszText = (LPWSTR)pvBuffer; + + /* the user might have used his own buffer */ + if (dispInfo.pszText != lpItem->pszText) + Str_GetPtrW(dispInfo.pszText, lpItem->pszText, MAX_HEADER_TEXT_LEN); } - if (dispInfo.mask & HDI_TEXT) + else { - if (isUnicodeNotify || convertToUnicode) - Str_SetPtrW(&lpItem->pszText, (LPCWSTR)dispInfo.pszText); - else /*if (convertToAnsi || !isW)*/ - Str_SetPtrAtoW(&lpItem->pszText, (LPCSTR)dispInfo.pszText); - lpItem->callbackMask &= ~HDI_TEXT; + Str_SetPtrAtoW(&lpItem->pszText, (LPSTR)dispInfo.pszText); + Free(pvBuffer); } + } - FIXME("NMHDDISPINFO returns with flags HDI_DI_SETITEM\n"); + if (dispInfo.mask & HDI_DI_SETITEM) + { + /* make the items permanent */ + lpItem->callbackMask &= ~dispInfo.mask; } - if (NULL != phdi) + return TRUE; +} + +/*** + * DESCRIPTION: + * Free the items that might be allocated with HEADER_PrepareCallbackItems + * + * PARAMETER(S): + * [I] lpItem : the item to free the data + * + */ +static void +HEADER_FreeCallbackItems(HEADER_ITEM *lpItem) +{ + if (lpItem->callbackMask&HDI_TEXT && lpItem->pszText != NULL) { - if ((phdi->mask & mask) & HDI_IMAGE) - { - phdi->iImage = dispInfo.iImage; - } - if ((phdi->mask & mask) & HDI_TEXT) - { - if (isUnicodeNotify) - Str_GetPtrW ((LPCWSTR)dispInfo.pszText, phdi->pszText, phdi->cchTextMax); - else if (convertToUnicode) - Str_GetPtrWtoA ((LPCWSTR)dispInfo.pszText, (LPSTR)phdi->pszText, phdi->cchTextMax); - else /*if (!isW) */ - Str_GetPtrA ((LPCSTR)dispInfo.pszText, (LPSTR)phdi->pszText, phdi->cchTextMax); - } + Free(lpItem->pszText); + lpItem->pszText = NULL; } - return ret; + + if (lpItem->callbackMask&HDI_IMAGE) + lpItem->iImage = I_IMAGECALLBACK; } - static BOOL HEADER_SendClickNotify (HWND hwnd, UINT code, INT iItem) { @@ -940,6 +967,7 @@ HEADER_GetItemT (HWND hwnd, INT nItem, L return FALSE; lpItem = &infoPtr->items[nItem]; + HEADER_PrepareCallbackItems(hwnd, nItem, phdi->mask); if (phdi->mask & HDI_BITMAP) phdi->hbm = lpItem->hbm; @@ -956,10 +984,6 @@ HEADER_GetItemT (HWND hwnd, INT nItem, L if (phdi->mask & HDI_IMAGE) { phdi->iImage = lpItem->iImage; - if (lpItem->callbackMask & HDI_IMAGE) - { - HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_IMAGE, phdi, lpItem, bUnicode); - } } if (phdi->mask & HDI_ORDER) @@ -967,19 +991,13 @@ HEADER_GetItemT (HWND hwnd, INT nItem, L if (phdi->mask & HDI_TEXT) { - if (lpItem->callbackMask & HDI_TEXT) - { - HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_TEXT, phdi, lpItem, bUnicode); - } + if (bUnicode) + Str_GetPtrW (lpItem->pszText, phdi->pszText, phdi->cchTextMax); else - { - if (bUnicode) - Str_GetPtrW (lpItem->pszText, phdi->pszText, phdi->cchTextMax); - else - Str_GetPtrWtoA (lpItem->pszText, (LPSTR)phdi->pszText, phdi->cchTextMax); - } + Str_GetPtrWtoA (lpItem->pszText, (LPSTR)phdi->pszText, phdi->cchTextMax); } + HEADER_FreeCallbackItems(lpItem); return TRUE; }

1 0

Mikołaj Zalewski : comctl32: header: Mark the callback items in a mask.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 96190f77b9dbc63fb2cafd3a3fa2eabe266d5dce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=96190f77b9dbc63fb2cafd3… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat May 13 21:22:44 2006 +0200 comctl32: header: Mark the callback items in a mask. Mark the callback items in the callbackMask HEADER_ITEM field. The pszText for callback texts is now NULL what simplifies some checks. Checks for lpItem->pszText==emptyString are also not needed as emptyString is not stored in lpItem but used as a parameter to Str_SetPtr (I haven't noticed it). --- dlls/comctl32/header.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index bed77ca..05ec599 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -61,6 +61,7 @@ typedef struct BOOL bDown; /* is item pressed? (used for drawing) */ RECT rect; /* bounding rectangle of the item */ + DWORD callbackMask; /* HDI_* flags for items that are callback */ } HEADER_ITEM; @@ -103,8 +104,7 @@ static WCHAR emptyString[] = {0}; static void HEADER_DisposeItem(HEADER_ITEM *lpItem) { - if (lpItem->pszText && lpItem->pszText != emptyString && - lpItem->pszText != LPSTR_TEXTCALLBACKW) /* covers LPSTR_TEXTCALLBACKA too */ + if (lpItem->pszText) { Free(lpItem->pszText); } @@ -127,14 +127,17 @@ static void HEADER_StoreHDItemInHeader(H if (phdi->mask & HDI_IMAGE) { lpItem->iImage = phdi->iImage; + if (phdi->iImage == I_IMAGECALLBACK) + lpItem->callbackMask |= HDI_IMAGE; + else + lpItem->callbackMask &= ~HDI_IMAGE; } if (phdi->mask & HDI_TEXT) { if (lpItem->pszText) { - if (lpItem->pszText != emptyString && lpItem->pszText != LPSTR_TEXTCALLBACKW) - Free(lpItem->pszText); + Free(lpItem->pszText); lpItem->pszText = NULL; } @@ -145,10 +148,12 @@ static void HEADER_StoreHDItemInHeader(H Str_SetPtrW(&lpItem->pszText, pszText); else Str_SetPtrAtoW(&lpItem->pszText, (LPSTR)pszText); + lpItem->callbackMask &= ~HDI_TEXT; } else { - lpItem->pszText = phdi->pszText; + lpItem->pszText = NULL; + lpItem->callbackMask |= HDI_TEXT; } } } @@ -777,6 +782,7 @@ HEADER_SendHeaderDispInfoNotify(HWND hwn if (dispInfo.mask & HDI_IMAGE) { lpItem->iImage = dispInfo.iImage; + lpItem->callbackMask &= ~HDI_IMAGE; } if (dispInfo.mask & HDI_TEXT) { @@ -784,6 +790,7 @@ HEADER_SendHeaderDispInfoNotify(HWND hwn Str_SetPtrW(&lpItem->pszText, (LPCWSTR)dispInfo.pszText); else /*if (convertToAnsi || !isW)*/ Str_SetPtrAtoW(&lpItem->pszText, (LPCSTR)dispInfo.pszText); + lpItem->callbackMask &= ~HDI_TEXT; } FIXME("NMHDDISPINFO returns with flags HDI_DI_SETITEM\n"); @@ -949,7 +956,7 @@ HEADER_GetItemT (HWND hwnd, INT nItem, L if (phdi->mask & HDI_IMAGE) { phdi->iImage = lpItem->iImage; - if (lpItem->iImage == I_IMAGECALLBACK) + if (lpItem->callbackMask & HDI_IMAGE) { HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_IMAGE, phdi, lpItem, bUnicode); } @@ -960,7 +967,7 @@ HEADER_GetItemT (HWND hwnd, INT nItem, L if (phdi->mask & HDI_TEXT) { - if (lpItem->pszText == LPSTR_TEXTCALLBACKW) /* covers == TEXTCALLBACKA too */ + if (lpItem->callbackMask & HDI_TEXT) { HEADER_SendHeaderDispInfoNotify(hwnd, nItem, HDI_TEXT, phdi, lpItem, bUnicode); }

1 0

Mikołaj Zalewski : comctl32 header: Free the old string also when the new one is LPSTR_TEXTCALLBACK.
by Alexandre Julliard May 15, 2006

May 15, 2006

Module: wine Branch: refs/heads/master Commit: 25d66de3588f96a0442dd6dada2cf972949fa596 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=25d66de3588f96a0442dd6d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat May 13 21:16:41 2006 +0200 comctl32 header: Free the old string also when the new one is LPSTR_TEXTCALLBACK. --- dlls/comctl32/header.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 7d0aeb5..bed77ca 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -131,17 +131,16 @@ static void HEADER_StoreHDItemInHeader(H if (phdi->mask & HDI_TEXT) { - if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ + if (lpItem->pszText) { - LPWSTR pszText; - if (lpItem->pszText) - { - if (lpItem->pszText != emptyString && lpItem->pszText != LPSTR_TEXTCALLBACKW) - Free(lpItem->pszText); - lpItem->pszText = NULL; - } + if (lpItem->pszText != emptyString && lpItem->pszText != LPSTR_TEXTCALLBACKW) + Free(lpItem->pszText); + lpItem->pszText = NULL; + } - pszText = (phdi->pszText != NULL ? phdi->pszText : emptyString); + if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ + { + LPWSTR pszText = (phdi->pszText != NULL ? phdi->pszText : emptyString); if (fUnicode) Str_SetPtrW(&lpItem->pszText, pszText); else

1 0