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

Huw Davies : gdi32/tests: Dump the correct metafile if the test fails.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: d79943446f23b22fd6e3c3f9139e7c1567fc80bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d79943446f23b22fd6e3c3f91… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 12:03:04 2009 +0100 gdi32/tests: Dump the correct metafile if the test fails. --- dlls/gdi32/tests/metafile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 4cc7ca4..2b695d8 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1457,8 +1457,8 @@ static void test_CopyMetaFile(void) if (compare_mf_disk_bits(mf_name, MF_BLANK_BITS, sizeof(MF_BLANK_BITS), "mf_blank") != 0) { - dump_mf_bits(hMetafile, "mf_Blank"); - EnumMetaFile(0, hMetafile, mf_enum_proc, 0); + dump_mf_bits(hmf_copy, "mf_Blank"); + EnumMetaFile(0, hmf_copy, mf_enum_proc, 0); } ret = DeleteMetaFile(hmf_copy);

1 0

Hans Leidekker : hhctrl.ocx: Remove some dead code.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 28f91290003675f2962f837b5009c65cf2cca9ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f91290003675f2962f837b5… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Jul 1 11:54:07 2009 +0200 hhctrl.ocx: Remove some dead code. This condition is inside the switch block for HH_DISPLAY_SEARCH, so it can never evaluate to true. --- dlls/hhctrl.ocx/hhctrl.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 5e707b9..10e04bc 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -119,11 +119,6 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat filename = chm_file; index += 2; /* advance beyond "::" for calling NavigateToChm() later */ } - else - { - if (command!=HH_DISPLAY_SEARCH) /* FIXME - use HH_FTS_QUERYW structure in data */ - index = (const WCHAR*)data; - } info = CreateHelpViewer(filename); if(!info)

1 0

Hans Leidekker : hhctrl.ocx: Don't leak the CHM filename.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: abad7f4f76b6e4f094f10123b2b2ab6a4a4c3f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=abad7f4f76b6e4f094f10123b… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Jul 1 11:53:19 2009 +0200 hhctrl.ocx: Don't leak the CHM filename. --- dlls/hhctrl.ocx/chm.c | 1 + dlls/hhctrl.ocx/hhctrl.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index e8d036b..dbf174d 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -423,6 +423,7 @@ CHMInfo *CloseCHM(CHMInfo *chm) heap_free(chm->defTitle); heap_free(chm->defTopic); heap_free(chm->defToc); + heap_free(chm->szFile); heap_free(chm); return NULL; diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 795bea4..83d39f5 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -69,7 +69,7 @@ typedef struct CHMInfo { IITStorage *pITStorage; IStorage *pStorage; - LPCWSTR szFile; + WCHAR *szFile; IStream *strings_stream; char **strings;

1 0

Huw Davies : gdi32/tests: Add a test for the MFCOMMENT record's size.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 470e8fe2f438b2d91035ffa92d692efb91a8d701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=470e8fe2f438b2d91035ffa92… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 12:14:40 2009 +0100 gdi32/tests: Add a test for the MFCOMMENT record's size. --- dlls/gdi32/tests/metafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 237f2f4..4cc7ca4 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2348,7 +2348,9 @@ static void test_GetWinMetaFileBits(void) if(rec_num == mfcomment_chunks - 1) this_chunk_size = emf_size - rec_num * chunk_size; - ok(rec->rdFunction == META_ESCAPE, "got %04x\n", rec->rdFunction); + ok(rec->rdSize == (this_chunk_size + 44) / 2, "%04x: got %04x expected %04x\n", rec_num, rec->rdSize, (this_chunk_size + 44) / 2); + ok(rec->rdFunction == META_ESCAPE, "%04x: got %04x\n", rec_num, rec->rdFunction); + if(rec->rdSize < (this_chunk_size + 44) / 2) break; ok(rec->rdParm[0] == MFCOMMENT, "got %04x\n", rec->rdParm[0]); ok(rec->rdParm[1] == this_chunk_size + 34, "got %04x %x\n", rec->rdParm[1], emf_size + 34); ok(rec->rdParm[2] == 0x4d57, "got %04x\n", rec->rdParm[2]); /* WMFC */

1 0

Stefan Dösinger : wined3d: Don' t dirtify too many shader constants.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: c82da7d97506b638ded678abb93160e4bd6de2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82da7d97506b638ded678abb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jun 28 18:33:22 2009 +0200 wined3d: Don't dirtify too many shader constants. If we have start = 4, count = 3, the highest dirty constant is the one with index 6. start + count gives 7, so it already includes the zero-based array correction. Don't add an additional 1. Additionally to the inefficiency of looking at one extra constant, this causes problems if the driver rejects loading 257 constants on the initial load. In this case no constant is loaded if GL_EXT_gpu_program_parameters is used. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 28118c7..66a7634 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -515,7 +515,7 @@ static void shader_arb_update_float_vertex_constants(IWineD3DDevice *iface, UINT * context. On a context switch the old context will be fully dirtified */ memset(This->activeContext->vshader_const_dirty + start, 1, sizeof(*This->activeContext->vshader_const_dirty) * count); - This->highest_dirty_vs_const = max(This->highest_dirty_vs_const, start + count + 1); + This->highest_dirty_vs_const = max(This->highest_dirty_vs_const, start + count); } static void shader_arb_update_float_pixel_constants(IWineD3DDevice *iface, UINT start, UINT count) @@ -526,7 +526,7 @@ static void shader_arb_update_float_pixel_constants(IWineD3DDevice *iface, UINT * context. On a context switch the old context will be fully dirtified */ memset(This->activeContext->pshader_const_dirty + start, 1, sizeof(*This->activeContext->pshader_const_dirty) * count); - This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start + count + 1); + This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start + count); } static DWORD *local_const_mapping(IWineD3DBaseShaderImpl *This)

1 0

Hans Leidekker : hhctrl.ocx: Try the Windows help directory if the specified file does not exist.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: bbfe59bc93738e95208d215800d716e4b3594794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfe59bc93738e95208d21580… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Jul 1 11:54:44 2009 +0200 hhctrl.ocx: Try the Windows help directory if the specified file does not exist. --- dlls/hhctrl.ocx/chm.c | 9 +++++---- dlls/hhctrl.ocx/hhctrl.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index dbf174d..c3a7499 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -362,15 +362,16 @@ IStream *GetChmStream(CHMInfo *info, LPCWSTR parent_chm, ChmPath *chm_file) /* Opens the CHM file for reading */ CHMInfo *OpenCHM(LPCWSTR szFile) { - WCHAR file[MAX_PATH] = {0}; HRESULT hres; + CHMInfo *ret; static const WCHAR wszSTRINGS[] = {'#','S','T','R','I','N','G','S',0}; - CHMInfo *ret = heap_alloc_zero(sizeof(CHMInfo)); + if (!(ret = heap_alloc_zero(sizeof(CHMInfo)))) + return NULL; - GetFullPathNameW(szFile, sizeof(file)/sizeof(file[0]), file, NULL); - ret->szFile = strdupW(file); + if (!(ret->szFile = strdupW(szFile))) + return NULL; hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, &IID_IITStorage, (void **) &ret->pITStorage) ; diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 10e04bc..8268a21 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -86,11 +86,27 @@ static const char *command_to_string(UINT command) #undef X } +static BOOL resolve_filename(const WCHAR *filename, WCHAR *fullname, DWORD buflen) +{ + static const WCHAR helpW[] = {'\\','h','e','l','p','\\',0}; + + GetFullPathNameW(filename, buflen, fullname, NULL); + if (GetFileAttributesW(fullname) == INVALID_FILE_ATTRIBUTES) + { + GetWindowsDirectoryW(fullname, buflen); + strcatW(fullname, helpW); + strcatW(fullname, filename); + } + return (GetFileAttributesW(fullname) != INVALID_FILE_ATTRIBUTES); +} + /****************************************************************** * HtmlHelpW (HHCTRL.OCX.15) */ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR data) { + WCHAR fullname[MAX_PATH]; + TRACE("(%p, %s, command=%s, data=%lx)\n", caller, debugstr_w( filename ), command_to_string( command ), data); @@ -120,7 +136,13 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat index += 2; /* advance beyond "::" for calling NavigateToChm() later */ } - info = CreateHelpViewer(filename); + if (!resolve_filename(filename, fullname, MAX_PATH)) + { + WARN("can't find %s\n", debugstr_w(filename)); + return 0; + } + + info = CreateHelpViewer(fullname); if(!info) return NULL; @@ -142,7 +164,13 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat if (!filename) return NULL; - info = CreateHelpViewer(filename); + if (!resolve_filename(filename, fullname, MAX_PATH)) + { + WARN("can't find %s\n", debugstr_w(filename)); + return 0; + } + + info = CreateHelpViewer(fullname); if(!info) return NULL;

1 0

Detlef Riekenberg : shlwapi: Last parameter in SHUnicodeToAnsiCP is an int.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 2e19130976e1b1e169be8cc9c8bc44ed9f43cead URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e19130976e1b1e169be8cc9c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 30 22:32:52 2009 +0200 shlwapi: Last parameter in SHUnicodeToAnsiCP is an int. --- dlls/shlwapi/shlwapi.spec | 2 +- dlls/shlwapi/string.c | 76 +++++++++++++++++++++++---------------------- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index b7ea3aa..fad7d56 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -215,7 +215,7 @@ 215 stdcall -noname SHAnsiToUnicode(str ptr long) 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) 217 stdcall -noname SHUnicodeToAnsi(wstr ptr ptr) -218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr ptr) +218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr long) 219 stdcall -noname QISearch(long long long long) 220 stdcall -noname SHSetDefaultDialogFont(ptr long) 221 stdcall -noname SHRemoveDefaultDialogFont(ptr) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index da0dee3..755360d 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2477,20 +2477,24 @@ DWORD WINAPI SHAnsiToUnicode(LPCSTR lpSrcStr, LPWSTR lpDstStr, int iLen) * CodePage [I] Code page to use for the conversion * lpSrcStr [I] Source Unicode string to convert * lpDstStr [O] Destination for converted Ascii string - * lpiLen [I/O] Input length of lpDstStr/destination for length of lpDstStr + * dstlen [I] Length of buffer at lpDstStr * * RETURNS - * Success: The number of characters that result from the conversion. - * Failure: 0. + * Success: The length in bytes of the result at lpDstStr (including the terminator) + * Failure: When using CP_UTF8, CP_UTF7 or 0xc350 as codePage, 0 is returned and + * the result is not nul-terminated. + * When using a different codepage, the length in bytes of the truncated + * result at lpDstStr (including the terminator) is returned and + * lpDstStr is always nul-terminated. + * */ -INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, - LPINT lpiLen) +DWORD WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, int dstlen) { static const WCHAR emptyW[] = { '\0' }; int len , reqLen; LPSTR mem; - if (!lpDstStr || !lpiLen) + if (!lpDstStr || !dstlen) return 0; if (!lpSrcStr) @@ -2509,41 +2513,41 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, case CP_UTF8: { DWORD dwMode = 0; - INT nWideCharCount = len - 1; - - if (ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, - &nWideCharCount, lpDstStr, - lpiLen) == S_OK) - return 0; + INT lenW = len - 1; + INT needed = dstlen - 1; + HRESULT hr; - if (nWideCharCount < len - 1) + /* try the user supplied buffer first */ + hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &lenW, lpDstStr, &needed); + if (hr == S_OK) { - mem = HeapAlloc(GetProcessHeap(), 0, *lpiLen); - if (!mem) - return 0; + lpDstStr[needed] = '\0'; + return needed + 1; + } - *lpiLen = 0; + /* user buffer too small. exclude termination and copy as much as possible */ + lenW = len; + hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &lenW, NULL, &needed); + needed++; + mem = HeapAlloc(GetProcessHeap(), 0, needed); + if (!mem) + return 0; - if (ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &len, - mem, lpiLen) != S_OK) - { - SHTruncateString(mem, *lpiLen); - lstrcpynA(lpDstStr, mem, *lpiLen + 1); - HeapFree(GetProcessHeap(), 0, mem); - return *lpiLen + 1; - } - HeapFree(GetProcessHeap(), 0, mem); - return *lpiLen; + hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &len, mem, &needed); + if (hr == S_OK) + { + reqLen = SHTruncateString(mem, dstlen); + if (reqLen > 0) memcpy(lpDstStr, mem, reqLen-1); } - lpDstStr[*lpiLen] = '\0'; - return *lpiLen; + HeapFree(GetProcessHeap(), 0, mem); + return 0; } default: break; } - reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, lpDstStr, - *lpiLen, NULL, NULL); + /* try the user supplied buffer first */ + reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, lpDstStr, dstlen, NULL, NULL); if (!reqLen && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { @@ -2556,12 +2560,12 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, mem, reqLen, NULL, NULL); - reqLen = SHTruncateString(mem, *lpiLen); + reqLen = SHTruncateString(mem, dstlen -1); reqLen++; - lstrcpynA(lpDstStr, mem, *lpiLen); - + lstrcpynA(lpDstStr, mem, reqLen); HeapFree(GetProcessHeap(), 0, mem); + lpDstStr[reqLen-1] = '\0'; } } } @@ -2586,9 +2590,7 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, */ INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen) { - INT myint = iLen; - - return SHUnicodeToAnsiCP(CP_ACP, lpSrcStr, lpDstStr, &myint); + return SHUnicodeToAnsiCP(CP_ACP, lpSrcStr, lpDstStr, iLen); } /*************************************************************************

1 0

Paul Chitescu : services.exe: When asked to search by display name skip NULL names.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 8fd619618f37a5e0b08e1063f6f0f5c3945b2664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd619618f37a5e0b08e1063f… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Jul 1 15:21:47 2009 +0300 services.exe: When asked to search by display name skip NULL names. --- programs/services/services.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 9bed784..091c693 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -349,7 +349,7 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase LIST_FOR_EACH_ENTRY(service, &db->services, struct service_entry, entry) { - if (strcmpiW(name, service->config.lpDisplayName) == 0) + if (service->config.lpDisplayName && strcmpiW(name, service->config.lpDisplayName) == 0) return service; }

1 0

Alexandre Julliard : gdiplus: Don' t return garbage from the GdipCreateHBITMAPFromBitmap stub.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 4d31a25f504828954b2f5d96fd69bb534e17231b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d31a25f504828954b2f5d96f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 12:14:40 2009 +0200 gdiplus: Don't return garbage from the GdipCreateHBITMAPFromBitmap stub. --- dlls/gdiplus/image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 6df104e..a603adb 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -449,7 +449,7 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, { FIXME("stub\n"); - hbmReturn = NULL; + if (hbmReturn) *hbmReturn = NULL; return NotImplemented; }

1 0

Alexandre Julliard : kernel32: Avoid the close-on-exec race with pipe() on kernels that support pipe2().
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 887af612190f3c14d6f8513bf405759b98073e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887af612190f3c14d6f8513bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 12:13:46 2009 +0200 kernel32: Avoid the close-on-exec race with pipe() on kernels that support pipe2(). --- dlls/kernel32/process.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 83d1aa5..6fde35b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1304,12 +1304,18 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA if (!env) env = GetEnvironmentStringsW(); - if (pipe(fd) == -1) +#ifdef HAVE_PIPE2 + if (pipe2( fd, O_CLOEXEC ) == -1) +#endif { - SetLastError( ERROR_TOO_MANY_OPEN_FILES ); - return -1; + if (pipe(fd) == -1) + { + SetLastError( ERROR_TOO_MANY_OPEN_FILES ); + return -1; + } + fcntl( fd[0], F_SETFD, FD_CLOEXEC ); + fcntl( fd[1], F_SETFD, FD_CLOEXEC ); } - fcntl( fd[1], F_SETFD, 1 ); /* set close on exec */ if (!(flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS))) {

1 0