September 2011 - Wine-commits

Frédéric Delanoy : cmd: Fix comments in WCMD_color.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: bab0aa765b73ebebe31e623219629d7711ceafb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab0aa765b73ebebe31e62321… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 27 00:32:38 2011 +0200 cmd: Fix comments in WCMD_color. --- programs/cmd/builtins.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 33437d1..9fe50d9 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2905,13 +2905,11 @@ void WCMD_assoc (const WCHAR *command, BOOL assoc) { /**************************************************************************** * WCMD_color * - * Clear the terminal screen. + * Colors the terminal screen. */ void WCMD_color (void) { - /* Emulate by filling the screen from the top left to bottom right with - spaces, then moving the cursor to the top left afterwards */ CONSOLE_SCREEN_BUFFER_INFO consoleInfo; HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);

1 0

Michael Stefaniuc : comctl32/tests: Don't accept Win95 behavior.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: d8213b468a0dd53f87a0a9bc641668da314044e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8213b468a0dd53f87a0a9bc6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 27 10:25:00 2011 +0200 comctl32/tests: Don't accept Win95 behavior. --- dlls/comctl32/tests/imagelist.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 0ec0505..36c9b65 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -771,18 +771,10 @@ static void check_ilhead_data(const char *ilh_data, INT cx, INT cy, INT cur, INT ok(ilh->cy == cy, "wrong cy %d (expected %d)\n", ilh->cy, cy); ok(ilh->bkcolor == CLR_NONE, "wrong bkcolor %x\n", ilh->bkcolor); ok(ilh->flags == ILC_COLOR24, "wrong flags %04x\n", ilh->flags); - ok(ilh->ovls[0] == -1 || - ilh->ovls[0] == 0, /* win95 */ - "wrong ovls[0] %04x\n", ilh->ovls[0]); - ok(ilh->ovls[1] == -1 || - ilh->ovls[1] == 0, /* win95 */ - "wrong ovls[1] %04x\n", ilh->ovls[1]); - ok(ilh->ovls[2] == -1 || - ilh->ovls[2] == 0, /* win95 */ - "wrong ovls[2] %04x\n", ilh->ovls[2]); - ok(ilh->ovls[3] == -1 || - ilh->ovls[3] == 0, /* win95 */ - "wrong ovls[3] %04x\n", ilh->ovls[3]); + ok(ilh->ovls[0] == -1, "wrong ovls[0] %04x\n", ilh->ovls[0]); + ok(ilh->ovls[1] == -1, "wrong ovls[1] %04x\n", ilh->ovls[1]); + ok(ilh->ovls[2] == -1, "wrong ovls[2] %04x\n", ilh->ovls[2]); + ok(ilh->ovls[3] == -1, "wrong ovls[3] %04x\n", ilh->ovls[3]); } static HBITMAP create_bitmap(INT cx, INT cy, COLORREF color, const char *comment)

1 0

Hans Leidekker : wtsapi32: Return success from WTSRegisterSessionNotification.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: fddbf3b99d6582c50ede10dfddd8d438bea0ca8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fddbf3b99d6582c50ede10dfd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 27 11:39:41 2011 +0200 wtsapi32: Return success from WTSRegisterSessionNotification. --- dlls/wtsapi32/wtsapi32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index c500b53..875cfb5 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -277,7 +277,7 @@ BOOL WINAPI WTSQueryUserConfigW(LPWSTR pServerName, LPWSTR pUserName, WTS_CONFIG BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) { FIXME("Stub %p 0x%08x\n", hWnd, dwFlags); - return FALSE; + return TRUE; } /************************************************************

1 0

Hans Leidekker : explorer: Add a version resource.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: a7ccf9842c793a2e003cc406456ed76162b178a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ccf9842c793a2e003cc4064… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 27 11:40:08 2011 +0200 explorer: Add a version resource. --- programs/explorer/explorer.rc | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/programs/explorer/explorer.rc b/programs/explorer/explorer.rc index 86d7ad0..fbbf5de 100644 --- a/programs/explorer/explorer.rc +++ b/programs/explorer/explorer.rc @@ -28,3 +28,12 @@ STRINGTABLE IDS_EXPLORER_TITLE "Wine Explorer" IDS_PATHBOX_LABEL "Location:" } + +#define WINE_FILEDESCRIPTION_STR "Wine Explorer" +#define WINE_FILENAME_STR "explorer.exe" +#define WINE_FILEVERSION 6,1,7601,17567 +#define WINE_FILEVERSION_STR "6.1.7601.17567" +#define WINE_PRODUCTVERSION 6,1,7601,17567 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17567" + +#include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : wininet: Ignore the accept types array in HttpOpenRequestA if there are invalid pointers .
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 85e9e21929745269685d523421378239b1f3a7ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=85e9e21929745269685d52342… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 27 11:40:33 2011 +0200 wininet: Ignore the accept types array in HttpOpenRequestA if there are invalid pointers. --- dlls/wininet/http.c | 117 ++++++++++++++++++++++----------------------- dlls/wininet/tests/http.c | 13 +++-- 2 files changed, 66 insertions(+), 64 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 772aba6..50630ba 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1347,6 +1347,60 @@ BOOL WINAPI HttpAddRequestHeadersA(HINTERNET hHttpRequest, return r; } +static void free_accept_types( WCHAR **accept_types ) +{ + WCHAR *ptr, **types = accept_types; + + if (!types) return; + while ((ptr = *types)) + { + heap_free( ptr ); + types++; + } + heap_free( accept_types ); +} + +static WCHAR **convert_accept_types( const char **accept_types ) +{ + unsigned int count; + const char **types = accept_types; + WCHAR **typesW; + BOOL invalid_pointer = FALSE; + + if (!types) return NULL; + count = 0; + while (*types) + { + __TRY + { + /* find out how many there are */ + if (*types && **types) + { + TRACE("accept type: %s\n", debugstr_a(*types)); + count++; + } + } + __EXCEPT_PAGE_FAULT + { + WARN("invalid accept type pointer\n"); + invalid_pointer = TRUE; + } + __ENDTRY; + types++; + } + if (invalid_pointer) return NULL; + if (!(typesW = heap_alloc( sizeof(WCHAR *) * (count + 1) ))) return NULL; + count = 0; + types = accept_types; + while (*types) + { + if (*types && **types) typesW[count++] = heap_strdupAtoW( *types ); + types++; + } + typesW[count] = NULL; + return typesW; +} + /*********************************************************************** * HttpOpenRequestA (WININET.@) * @@ -1364,9 +1418,7 @@ HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession, { LPWSTR szVerb = NULL, szObjectName = NULL; LPWSTR szVersion = NULL, szReferrer = NULL, *szAcceptTypes = NULL; - INT acceptTypesCount; HINTERNET rc = FALSE; - LPCSTR *types; TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08lx)\n", hHttpSession, debugstr_a(lpszVerb), debugstr_a(lpszObjectName), @@ -1401,65 +1453,12 @@ HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession, goto end; } - if (lpszAcceptTypes) - { - acceptTypesCount = 0; - types = lpszAcceptTypes; - while (*types) - { - __TRY - { - /* find out how many there are */ - if (*types && **types) - { - TRACE("accept type: %s\n", debugstr_a(*types)); - acceptTypesCount++; - } - } - __EXCEPT_PAGE_FAULT - { - WARN("invalid accept type pointer\n"); - } - __ENDTRY; - types++; - } - szAcceptTypes = heap_alloc(sizeof(WCHAR *) * (acceptTypesCount+1)); - if (!szAcceptTypes) goto end; - - acceptTypesCount = 0; - types = lpszAcceptTypes; - while (*types) - { - __TRY - { - if (*types && **types) - szAcceptTypes[acceptTypesCount++] = heap_strdupAtoW(*types); - } - __EXCEPT_PAGE_FAULT - { - /* ignore invalid pointer */ - } - __ENDTRY; - types++; - } - szAcceptTypes[acceptTypesCount] = NULL; - } - - rc = HttpOpenRequestW(hHttpSession, szVerb, szObjectName, - szVersion, szReferrer, - (LPCWSTR*)szAcceptTypes, dwFlags, dwContext); + szAcceptTypes = convert_accept_types( lpszAcceptTypes ); + rc = HttpOpenRequestW(hHttpSession, szVerb, szObjectName, szVersion, szReferrer, + (const WCHAR **)szAcceptTypes, dwFlags, dwContext); end: - if (szAcceptTypes) - { - acceptTypesCount = 0; - while (szAcceptTypes[acceptTypesCount]) - { - heap_free(szAcceptTypes[acceptTypesCount]); - acceptTypesCount++; - } - heap_free(szAcceptTypes); - } + free_accept_types(szAcceptTypes); heap_free(szReferrer); heap_free(szVersion); heap_free(szObjectName); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f3e85cb..881f1e6 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3085,7 +3085,7 @@ static void test_bogus_accept_types_array(void) { HINTERNET ses, con, req; static const char *types[] = { (const char *)6240, "*/*", "%p", "", (const char *)0xffffffff, "*/*", NULL }; - DWORD size; + DWORD size, error; char buffer[32]; BOOL ret; @@ -3097,11 +3097,14 @@ static void test_bogus_accept_types_array(void) buffer[0] = 0; size = sizeof(buffer); + SetLastError(0xdeadbeef); ret = HttpQueryInfo(req, HTTP_QUERY_ACCEPT | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); - ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); - ok(!strcmp(buffer, ", */*, %p, , , */*") || /* IE6 */ - !strcmp(buffer, "*/*, %p, */*"), - "got '%s' expected '*/*, %%p, */*' or ', */*, %%p, , , */*'\n", buffer); + error = GetLastError(); + ok(!ret || broken(ret), "HttpQueryInfo succeeded\n"); + if (!ret) ok(error == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND, got %u\n", error); + ok(broken(!strcmp(buffer, ", */*, %p, , , */*")) /* IE6 */ || + broken(!strcmp(buffer, "*/*, %p, */*")) /* IE7/8 */ || + !strcmp(buffer, ""), "got '%s' expected ''\n", buffer); InternetCloseHandle(req); InternetCloseHandle(con);

1 0

Hans Leidekker : msi/tests: Properly preserve pending file renames.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 5ea1caa69e8784e33adafa1013bc007b5046f4ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea1caa69e8784e33adafa101… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 27 11:40:57 2011 +0200 msi/tests: Properly preserve pending file renames. --- dlls/msi/tests/install.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index bb8335a..7c74e66 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5598,12 +5598,8 @@ static void process_pending_renames(HKEY hkey) { lstrcpyA(buf2ptr, src); buf2ptr += strlen(src) + 1; - if (*dst) - { - lstrcpyA(buf2ptr, dst); - buf2ptr += strlen(dst) + 1; - } - buf2ptr++; + lstrcpyA(buf2ptr, dst); + buf2ptr += strlen(dst) + 1; continue; }

1 0

Michael Stefaniuc : comctl32/tests: Standardize COM in imagelist.c.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: af27b03967805b6e2fd16016a03fe20b5d643f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af27b03967805b6e2fd16016a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 27 10:21:55 2011 +0200 comctl32/tests: Standardize COM in imagelist.c. --- dlls/comctl32/tests/imagelist.c | 88 ++++++++++++++------------------------- 1 files changed, 31 insertions(+), 57 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index dc08205..0ec0505 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -574,39 +574,37 @@ static void test_merge(void) struct my_IStream { - IStream is; + IStream IStream_iface; char *iml_data; /* written imagelist data */ ULONG iml_data_size; }; -static HRESULT STDMETHODCALLTYPE Test_Stream_QueryInterface( - IStream* This, - REFIID riid, - void** ppvObject) +struct my_IStream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, struct my_IStream, IStream_iface); +} + +static HRESULT STDMETHODCALLTYPE Test_Stream_QueryInterface(IStream *iface, REFIID riid, + void **ppvObject) { assert(0); return E_NOTIMPL; } -static ULONG STDMETHODCALLTYPE Test_Stream_AddRef( - IStream* This) +static ULONG STDMETHODCALLTYPE Test_Stream_AddRef(IStream *iface) { assert(0); return 2; } -static ULONG STDMETHODCALLTYPE Test_Stream_Release( - IStream* This) +static ULONG STDMETHODCALLTYPE Test_Stream_Release(IStream *iface) { assert(0); return 1; } -static HRESULT STDMETHODCALLTYPE Test_Stream_Read( - IStream* This, - void* pv, - ULONG cb, - ULONG* pcbRead) +static HRESULT STDMETHODCALLTYPE Test_Stream_Read(IStream *iface, void *pv, ULONG cb, + ULONG *pcbRead) { assert(0); return E_NOTIMPL; @@ -624,13 +622,10 @@ static BOOL allocate_storage(struct my_IStream *my_is, ULONG add) return my_is->iml_data ? TRUE : FALSE; } -static HRESULT STDMETHODCALLTYPE Test_Stream_Write( - IStream* This, - const void* pv, - ULONG cb, - ULONG* pcbWritten) +static HRESULT STDMETHODCALLTYPE Test_Stream_Write(IStream *iface, const void *pv, ULONG cb, + ULONG *pcbWritten) { - struct my_IStream *my_is = (struct my_IStream *)This; + struct my_IStream *my_is = impl_from_IStream(iface); ULONG current_iml_data_size = my_is->iml_data_size; if (!allocate_storage(my_is, cb)) return E_FAIL; @@ -641,82 +636,61 @@ static HRESULT STDMETHODCALLTYPE Test_Stream_Write( return S_OK; } -static HRESULT STDMETHODCALLTYPE Test_Stream_Seek( - IStream* This, - LARGE_INTEGER dlibMove, - DWORD dwOrigin, - ULARGE_INTEGER* plibNewPosition) +static HRESULT STDMETHODCALLTYPE Test_Stream_Seek(IStream *iface, LARGE_INTEGER dlibMove, + DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { assert(0); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE Test_Stream_SetSize( - IStream* This, - ULARGE_INTEGER libNewSize) +static HRESULT STDMETHODCALLTYPE Test_Stream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) { assert(0); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE Test_Stream_CopyTo( - IStream* This, - IStream* pstm, - ULARGE_INTEGER cb, - ULARGE_INTEGER* pcbRead, - ULARGE_INTEGER* pcbWritten) +static HRESULT STDMETHODCALLTYPE Test_Stream_CopyTo(IStream *iface, IStream *pstm, + ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, + ULARGE_INTEGER *pcbWritten) { assert(0); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE Test_Stream_Commit( - IStream* This, - DWORD grfCommitFlags) +static HRESULT STDMETHODCALLTYPE Test_Stream_Commit(IStream *iface, DWORD grfCommitFlags) { assert(0); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE Test_Stream_Revert( - IStream* This) +static HRESULT STDMETHODCALLTYPE Test_Stream_Revert(IStream *iface) { assert(0); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE Test_Stream_LockRegion( - IStream* This, - ULARGE_INTEGER libOffset, - ULARGE_INTEGER cb, - DWORD dwLockType) +static HRESULT STDMETHODCALLTYPE Test_Stream_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, DWORD dwLockType) { assert(0); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE Test_Stream_UnlockRegion( - IStream* This, - ULARGE_INTEGER libOffset, - ULARGE_INTEGER cb, - DWORD dwLockType) +static HRESULT STDMETHODCALLTYPE Test_Stream_UnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, DWORD dwLockType) { assert(0); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE Test_Stream_Stat( - IStream* This, - STATSTG* pstatstg, - DWORD grfStatFlag) +static HRESULT STDMETHODCALLTYPE Test_Stream_Stat(IStream *iface, STATSTG *pstatstg, + DWORD grfStatFlag) { assert(0); return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE Test_Stream_Clone( - IStream* This, - IStream** ppstm) +static HRESULT STDMETHODCALLTYPE Test_Stream_Clone(IStream *iface, IStream **ppstm) { assert(0); return E_NOTIMPL; @@ -866,7 +840,7 @@ static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, IN ok(cyy == cy, "wrong cy %d (expected %d)\n", cyy, cy); iml_clear_stream_data(); - ret = ImageList_Write(himl, &Test_Stream.is); + ret = ImageList_Write(himl, &Test_Stream.IStream_iface); ok(ret, "ImageList_Write failed\n"); ok(Test_Stream.iml_data != 0, "ImageList_Write didn't write any data\n");

1 0

Francois Gouget : gdi32/tests: Use if(0) instead of #if 0 to make sure code still compiles.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: a87797fbe2104c2d98274bf2c6547f37938abc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a87797fbe2104c2d98274bf2c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 26 23:41:14 2011 +0200 gdi32/tests: Use if(0) instead of #if 0 to make sure code still compiles. --- dlls/gdi32/tests/font.c | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6ce8282..570ae14 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1364,11 +1364,10 @@ todo_wine { for (n = 0; n < ret; n++) { DWORD j; -#if 0 - if (kern_pair[n].wFirst < 127 && kern_pair[n].wSecond < 127) + /* Disabled to limit console spam */ + if (0 && kern_pair[n].wFirst < 127 && kern_pair[n].wSecond < 127) trace("{'%c','%c',%d},\n", kern_pair[n].wFirst, kern_pair[n].wSecond, kern_pair[n].iKernAmount); -#endif for (j = 0; j < kd[i].total_kern_pairs; j++) { if (kern_pair[n].wFirst == kd[i].kern_pair[j].wFirst && @@ -1820,6 +1819,7 @@ static void test_GetFontUnicodeRanges(void) HFONT hfont, hfont_old; DWORD size; GLYPHSET *gs; + DWORD i; if (!pGetFontUnicodeRanges) { @@ -1844,10 +1844,10 @@ static void test_GetFontUnicodeRanges(void) size = pGetFontUnicodeRanges(hdc, gs); ok(size, "GetFontUnicodeRanges failed\n"); -#if 0 - for (i = 0; i < gs->cRanges; i++) - trace("%03d wcLow %04x cGlyphs %u\n", i, gs->ranges[i].wcLow, gs->ranges[i].cGlyphs); -#endif + + if (0) /* Disabled to limit console spam */ + for (i = 0; i < gs->cRanges; i++) + trace("%03d wcLow %04x cGlyphs %u\n", i, gs->ranges[i].wcLow, gs->ranges[i].cGlyphs); trace("found %u ranges\n", gs->cRanges); HeapFree(GetProcessHeap(), 0, gs); @@ -1878,10 +1878,9 @@ static INT CALLBACK arial_enum_proc(const LOGFONT *lf, const TEXTMETRIC *tm, DWO ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); if (type != TRUETYPE_FONTTYPE) return 1; -#if 0 - trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", - lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); -#endif + if (0) /* Disabled to limit console spam */ + trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", + lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); if (efd->total < MAX_ENUM_FONTS) efd->lf[efd->total++] = *lf; else @@ -1897,10 +1896,9 @@ static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); if (type != TRUETYPE_FONTTYPE) return 1; -#if 0 - trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", - lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); -#endif + if (0) /* Disabled to limit console spam */ + trace("enumed font %s, charset %d, height %d, weight %d, italic %d\n", + wine_dbgstr_w(lf->lfFaceName), lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); if (efd->total < MAX_ENUM_FONTS) efd->lf[efd->total++] = *lf; else

1 0

Francois Gouget : msi/tests: Avoid #if 0 to make sure code still compiles.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: d2084d5a41b544c9361d09a4b0a9e93630ae9be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2084d5a41b544c9361d09a4b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 26 23:41:26 2011 +0200 msi/tests: Avoid #if 0 to make sure code still compiles. --- dlls/msi/tests/install.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index b1db7e4..bb8335a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3768,10 +3768,8 @@ static void generate_transform(void) r = MsiDatabaseGenerateTransform(hdb1, hdb2, mstfile, 0, 0); ok(r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r); -#if 0 /* not implemented in wine yet */ r = MsiCreateTransformSummaryInfo(hdb2, hdb2, mstfile, 0, 0); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); -#endif + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); MsiCloseHandle(hdb1); MsiCloseHandle(hdb2);

1 0

Francois Gouget : d3drm/tests: Remove an unneeded assert.h include.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 9fbd18cc346f0dc7e7518a232964d547ccee33f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fbd18cc346f0dc7e7518a232… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 27 00:14:22 2011 +0200 d3drm/tests: Remove an unneeded assert.h include. --- dlls/d3drm/tests/vector.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 1961fe0..f00ee65 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -17,10 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -#include "d3drmdef.h" #include <math.h> +#include "d3drmdef.h" + #include "wine/test.h" #define PI (4.0f*atanf(1.0f))

1 0