June 2008 - Wine-Commits - list.winehq.org

Dan Kegel : msi: MsiSourceListEnumMediaDisksW: free original string, not substring.
by Alexandre Julliard June 4, 2008

June 4, 2008

Module: wine Branch: master Commit: ecfa0fbcea9340f3de8a6b3c47af72fa0157f6cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfa0fbcea9340f3de8a6b3c4… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Jun 3 06:29:29 2008 -0700 msi: MsiSourceListEnumMediaDisksW: free original string, not substring. --- dlls/msi/source.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 4c38116..d416f0f 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -304,15 +304,14 @@ UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, if (pcchDiskPrompt) { - data = ptr; - if (!*data) - data++; + if (!*ptr) + ptr++; - size = lstrlenW(data); + size = lstrlenW(ptr); if (size >= *pcchDiskPrompt) r = ERROR_MORE_DATA; else if (szDiskPrompt) - lstrcpyW(szDiskPrompt, data); + lstrcpyW(szDiskPrompt, ptr); *pcchDiskPrompt = size; }

1 0

Dan Kegel : oleaut32/tests: Use VariantInit, not VariantClear, to initialize new variants.
by Alexandre Julliard June 4, 2008

June 4, 2008

Module: wine Branch: master Commit: a8ad5cd5587dd5e98857d7d222a4e8c8e46597e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ad5cd5587dd5e98857d7d22… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Jun 3 06:49:35 2008 -0700 oleaut32/tests: Use VariantInit, not VariantClear, to initialize new variants. --- dlls/oleaut32/tests/vartype.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index e436d8c..c2bc231 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5792,8 +5792,8 @@ static void test_NullByRef(void) VARIANT v1, v2; HRESULT hRes; - VariantClear(&v1); - VariantClear(&v2); + VariantInit(&v1); + VariantInit(&v2); V_VT(&v1) = VT_BYREF|VT_VARIANT; V_BYREF(&v1) = 0; @@ -5826,8 +5826,8 @@ static void test_ChangeType_keep_dst(void) HRESULT hres; bstr = SysAllocString(testW); - VariantClear(&v1); - VariantClear(&v2); + VariantInit(&v1); + VariantInit(&v2); V_VT(&v1) = VT_BSTR; V_BSTR(&v1) = bstr; hres = VariantChangeTypeEx(&v1, &v1, 0, 0, VT_INT);

1 0

Alexandre Julliard : gdi32/tests: Reduce the size of the test output a little.
by Alexandre Julliard June 4, 2008

June 4, 2008

Module: wine Branch: master Commit: 8f7f2036492aac9f829039e96b577ff922ea82e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7f2036492aac9f829039e96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 4 12:52:18 2008 +0200 gdi32/tests: Reduce the size of the test output a little. --- dlls/gdi32/tests/font.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 93f45d5..710148a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1633,8 +1633,6 @@ static void test_text_metrics(const LOGFONTA *lf) LONG size, ret; const char *font_name = lf->lfFaceName; - trace("Testing font metrics for %s, charset %d\n", font_name, lf->lfCharSet); - hdc = GetDC(0); SetLastError(0xdeadbeef); @@ -1660,21 +1658,19 @@ static void test_text_metrics(const LOGFONTA *lf) ok(ret == size, "GetFontData should return %u not %u\n", size, ret); version = GET_BE_WORD(tt_os2.version); - trace("OS/2 chunk version %u, vendor %4.4s\n", version, (LPCSTR)&tt_os2.achVendID); first_unicode_char = GET_BE_WORD(tt_os2.usFirstCharIndex); last_unicode_char = GET_BE_WORD(tt_os2.usLastCharIndex); default_char = GET_BE_WORD(tt_os2.usDefaultChar); break_char = GET_BE_WORD(tt_os2.usBreakChar); - trace("for %s first %x, last %x, default %x, break %x\n", font_name, - first_unicode_char, last_unicode_char, default_char, break_char); + trace("font %s charset %u: %x-%x default %x break %x OS/2 version %u vendor %4.4s\n", + font_name, lf->lfCharSet, first_unicode_char, last_unicode_char, default_char, break_char, + version, (LPCSTR)&tt_os2.achVendID); SetLastError(0xdeadbeef); ret = GetTextMetricsA(hdc, &tmA); ok(ret, "GetTextMetricsA error %u\n", GetLastError()); - trace("A: first %x, last %x, default %x, break %x\n", - tmA.tmFirstChar, tmA.tmLastChar, tmA.tmDefaultChar, tmA.tmBreakChar); #if 0 /* FIXME: This doesn't appear to be what Windows does */ test_char = min(first_unicode_char - 1, 255); @@ -1700,9 +1696,9 @@ static void test_text_metrics(const LOGFONTA *lf) "GetTextMetricsW error %u\n", GetLastError()); if (ret) { - trace("W: first %x, last %x, default %x, break %x\n", - tmW.tmFirstChar, tmW.tmLastChar, tmW.tmDefaultChar, - tmW.tmBreakChar); + trace("%04x-%04x (%02x-%02x) default %x (%x) break %x (%x)\n", + tmW.tmFirstChar, tmW.tmLastChar, tmA.tmFirstChar, tmA.tmLastChar, + tmW.tmDefaultChar, tmA.tmDefaultChar, tmW.tmBreakChar, tmA.tmBreakChar); if (lf->lfCharSet == SYMBOL_CHARSET) {

1 0

Alexandre Julliard : mlang/tests: Reduce the size of the test output a little.
by Alexandre Julliard June 4, 2008

June 4, 2008

Module: wine Branch: master Commit: a6cdd538f5eda973d718881b111272e171eb1f59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6cdd538f5eda973d718881b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 4 12:52:13 2008 +0200 mlang/tests: Reduce the size of the test output a little. --- dlls/mlang/tests/mlang.c | 28 +++++----------------------- 1 files changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index e826a01..0c21882 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -350,7 +350,6 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) for (i = 0; i < n; i++) { - CPINFOEXA cpinfoex; CHARSETINFO csi; MIMECSETINFO mcsi; BOOL convertible; @@ -388,17 +387,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) else trace("TranslateCharsetInfo failed for cp %u\n", cpinfo[i].uiFamilyCodePage); - if (pGetCPInfoExA) - { - if (pGetCPInfoExA(cpinfo[i].uiCodePage, 0, &cpinfoex)) - trace("CodePage %u name: %s\n", cpinfo[i].uiCodePage, cpinfoex.CodePageName); - else - trace("GetCPInfoExA failed for cp %u\n", cpinfo[i].uiCodePage); - if (pGetCPInfoExA(cpinfo[i].uiFamilyCodePage, 0, &cpinfoex)) - trace("CodePage %u name: %s\n", cpinfo[i].uiFamilyCodePage, cpinfoex.CodePageName); - else - trace("GetCPInfoExA failed for cp %u\n", cpinfo[i].uiFamilyCodePage); - } + trace("%u: codepage %u family %u\n", i, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); /* Win95 does not support UTF-7 */ if (cpinfo[i].uiCodePage == CP_UTF7) continue; @@ -442,7 +431,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) "%s != %s\n", wine_dbgstr_w(cpinfo[i].wszWebCharset), wine_dbgstr_w(mcsi.wszCharset)); #else - "wszWebCharset mismatch"); + "wszWebCharset mismatch\n"); #endif if (0) @@ -468,7 +457,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) "%s != %s\n", wine_dbgstr_w(cpinfo[i].wszHeaderCharset), wine_dbgstr_w(mcsi.wszCharset)); #else - "wszHeaderCharset mismatch"); + "wszHeaderCharset mismatch\n"); #endif if (0) @@ -494,7 +483,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) "%s != %s\n", wine_dbgstr_w(cpinfo[i].wszBodyCharset), wine_dbgstr_w(mcsi.wszCharset)); #else - "wszBodyCharset mismatch"); + "wszBodyCharset mismatch\n"); #endif if (0) @@ -506,8 +495,6 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) "%u != %u || %u\n", mcsi.uiCodePage, cpinfo[i].uiCodePage, cpinfo[i].uiFamilyCodePage); } } - - trace("---\n"); } /* now IEnumCodePage_Next should fail, since pointer is at the end */ @@ -622,12 +609,7 @@ static void test_EnumScripts(IMultiLanguage2 *iML2, DWORD flags) wine_dbgstr_w(sinfo[i].wszFixedWidthFont), wine_dbgstr_w(sinfo[i].wszProportionalFont)); #endif - if (pGetCPInfoExA(sinfo[i].uiCodePage, 0, &cpinfoex)) - trace("CodePage %u name: %s\n", sinfo[i].uiCodePage, cpinfoex.CodePageName); - else - trace("GetCPInfoExA failed for cp %u\n", sinfo[i].uiCodePage); - - trace("---\n"); + trace("%u codepage %u\n", i, sinfo[i].uiCodePage); } /* now IEnumScript_Next should fail, since pointer is at the end */

1 0

Zac Brown : winmm: msiSendStringW: Don' t free substring after original string has already been freed.
by Alexandre Julliard June 4, 2008

June 4, 2008

Module: wine Branch: master Commit: d62c3197b3071e00c58d6967ad88d8d234ccc266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62c3197b3071e00c58d6967a… Author: Zac Brown <zac(a)zacbrown.org> Date: Tue Jun 3 14:27:56 2008 -0700 winmm: msiSendStringW: Don't free substring after original string has already been freed. --- dlls/winmm/mci.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index c792d18..411d28e 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1443,7 +1443,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, errCleanUp: HeapFree(GetProcessHeap(), 0, verb); - HeapFree(GetProcessHeap(), 0, devAlias); return dwRet; }

1 0

Austin English : advpack: Fix a test failure on 9x.
by Alexandre Julliard June 4, 2008

June 4, 2008

Module: wine Branch: master Commit: 955adcbce9ad1f685ccab2f12b37fca130b965c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=955adcbce9ad1f685ccab2f12… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 30 15:10:52 2008 -0500 advpack: Fix a test failure on 9x. --- dlls/advpack/tests/advpack.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index e761577..0b668a7 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -331,8 +331,9 @@ static void translateinfstringex_test(void) /* try an empty filename */ hr = pOpenINFEngine("", "Options.NTx86", 0, &hinf, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* NT+ */ || + hr == HRESULT_FROM_WIN32(E_UNEXPECTED) /* 9x */, + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND or E_UNEXPECTED), got %08x\n", hr); /* try a NULL hinf */ hr = pOpenINFEngine(inf_file, "Options.NTx86", 0, NULL, NULL);

1 0

Dan Kegel : userenv/tests: Fix buffer overrun.
by Alexandre Julliard June 4, 2008

June 4, 2008

Module: wine Branch: master Commit: 9d54392ca9915d1a7ca43017774f4679e0d2dfad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d54392ca9915d1a7ca430177… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Jun 3 15:04:00 2008 -0700 userenv/tests: Fix buffer overrun. --- dlls/userenv/tests/userenv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index a8d5221..d277f36 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -137,7 +137,7 @@ static BOOL get_env(const WCHAR * env, const char * var, char ** result) { envlen = lstrlenW(p); sprintf(buf, "%s", userenv_dbgstr_w(p)); - if (CompareStringA(GetThreadLocale(), NORM_IGNORECASE|LOCALE_USE_CP_ACP, buf, varlen, var, varlen) == CSTR_EQUAL) + if (CompareStringA(GetThreadLocale(), NORM_IGNORECASE|LOCALE_USE_CP_ACP, buf, min(envlen, varlen), var, varlen) == CSTR_EQUAL) { if (buf[varlen] == '=') {

1 0

Vijay Kiran Kamuju : rsaenh: Fix AES provider keys for Windows XP.
by Alexandre Julliard June 4, 2008

June 4, 2008

Module: wine Branch: master Commit: e666bb2a5cd3bdd916b6384162b1059d404cbaec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e666bb2a5cd3bdd916b638416… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Jun 3 15:06:30 2008 -0400 rsaenh: Fix AES provider keys for Windows XP. --- dlls/rsaenh/rsaenh.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 14e67d7..f957a1f 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3822,7 +3822,7 @@ cleanup: return res; } -static const WCHAR szProviderKeys[5][104] = { +static const WCHAR szProviderKeys[6][116] = { { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', @@ -3851,7 +3851,13 @@ static const WCHAR szProviderKeys[5][104] = { 'C','r','y','p','t','o','g','r','a','p','h','y','\\','D','e','f','a','u','l','t','s','\\', 'P','r','o','v','i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ', 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 } + 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }, + { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'C','r','y','p','t','o','g','r','a','p','h','y','\\','D','e','f','a','u','l','t','s','\\', + 'P','r','o','v','i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ', + 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ', + 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r', + ' ','(','P','r','o','t','o','t','y','p','e',')',0 } }; static const WCHAR szDefaultKeys[3][65] = { { 'S','o','f','t','w','a','r','e','\\', @@ -3897,7 +3903,7 @@ HRESULT WINAPI DllRegisterServer(void) long apiRet; int i; - for (i=0; i<5; i++) { + for (i=0; i<6; i++) { apiRet = RegCreateKeyExW(HKEY_LOCAL_MACHINE, szProviderKeys[i], 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &key, &dp); @@ -3917,6 +3923,7 @@ HRESULT WINAPI DllRegisterServer(void) type=PROV_RSA_SCHANNEL; break; case 4: + case 5: type=PROV_RSA_AES; break; default: @@ -3993,6 +4000,7 @@ HRESULT WINAPI DllUnregisterServer(void) RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[2]); RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[3]); RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[4]); + RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[5]); RegDeleteKeyW(HKEY_LOCAL_MACHINE, szDefaultKeys[0]); RegDeleteKeyW(HKEY_LOCAL_MACHINE, szDefaultKeys[1]); RegDeleteKeyW(HKEY_LOCAL_MACHINE, szDefaultKeys[2]);

1 0

Alexandre Julliard : user32/tests: Abstract the printing of minmax info and do it all on one line.
by Alexandre Julliard June 4, 2008

June 4, 2008

Module: wine Branch: master Commit: 69414975e169a93f9738827d9d926003a6a28a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=69414975e169a93f9738827d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 4 12:34:53 2008 +0200 user32/tests: Abstract the printing of minmax info and do it all on one line. --- dlls/user32/tests/win.c | 66 +++++++++++----------------------------------- 1 files changed, 16 insertions(+), 50 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 60b7d88..45dda82 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -59,6 +59,16 @@ static DWORD our_pid; #define COUNTOF(arr) (sizeof(arr)/sizeof(arr[0])) +static void dump_minmax_info( const MINMAXINFO *minmax ) +{ + trace("Reserved=%d,%d MaxSize=%d,%d MaxPos=%d,%d MinTrack=%d,%d MaxTrack=%d,%d\n", + minmax->ptReserved.x, minmax->ptReserved.y, + minmax->ptMaxSize.x, minmax->ptMaxSize.y, + minmax->ptMaxPosition.x, minmax->ptMaxPosition.y, + minmax->ptMinTrackSize.x, minmax->ptMinTrackSize.y, + minmax->ptMaxTrackSize.x, minmax->ptMaxTrackSize.y); +} + /* try to make sure pending X events have been processed before continuing */ static void flush_events( BOOL remove_messages ) { @@ -552,13 +562,7 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR MINMAXINFO* minmax = (MINMAXINFO *)lparam; trace("hwnd %p, WM_GETMINMAXINFO, %08lx, %08lx\n", hwnd, wparam, lparam); - trace("ptReserved (%d,%d), ptMaxSize (%d,%d), ptMaxPosition (%d,%d)\n" - " ptMinTrackSize (%d,%d), ptMaxTrackSize (%d,%d)\n", - minmax->ptReserved.x, minmax->ptReserved.y, - minmax->ptMaxSize.x, minmax->ptMaxSize.y, - minmax->ptMaxPosition.x, minmax->ptMaxPosition.y, - minmax->ptMinTrackSize.x, minmax->ptMinTrackSize.y, - minmax->ptMaxTrackSize.x, minmax->ptMaxTrackSize.y); + dump_minmax_info( minmax ); SetWindowLongPtrA(hwnd, GWLP_USERDATA, 0x20031021); break; } @@ -652,13 +656,7 @@ static LRESULT WINAPI tool_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR MINMAXINFO* minmax = (MINMAXINFO *)lparam; trace("hwnd %p, WM_GETMINMAXINFO, %08lx, %08lx\n", hwnd, wparam, lparam); - trace("ptReserved (%d,%d), ptMaxSize (%d,%d), ptMaxPosition (%d,%d)\n" - " ptMinTrackSize (%d,%d), ptMaxTrackSize (%d,%d)\n", - minmax->ptReserved.x, minmax->ptReserved.y, - minmax->ptMaxSize.x, minmax->ptMaxSize.y, - minmax->ptMaxPosition.x, minmax->ptMaxPosition.y, - minmax->ptMinTrackSize.x, minmax->ptMinTrackSize.y, - minmax->ptMaxTrackSize.x, minmax->ptMaxTrackSize.y); + dump_minmax_info( minmax ); SetWindowLongPtrA(hwnd, GWLP_USERDATA, 0x20031021); break; } @@ -741,9 +739,6 @@ static void verify_window_info(HWND hwnd, const WINDOWINFO *info) ok(info->dwWindowStatus == status, "wrong dwWindowStatus: %04x != %04x\n", info->dwWindowStatus, status); - trace("rcWindow: %d,%d - %d,%d\n", rcWindow.left, rcWindow.top, rcWindow.right, rcWindow.bottom); - trace("rcClient: %d,%d - %d,%d\n", rcClient.left, rcClient.top, rcClient.right, rcClient.bottom); - /* win2k and XP return broken border info in GetWindowInfo most of * the time, so there is no point in testing it. */ @@ -1422,17 +1417,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_1(HWND hwnd, UINT msg, WPARAM wparam, L style &= ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */ AdjustWindowRectEx(&rc, style, 0, exstyle); trace("MDI child: calculated max window size = (%d x %d)\n", rc.right-rc.left, rc.bottom-rc.top); - - trace("ptReserved = (%d,%d)\n" - "ptMaxSize = (%d,%d)\n" - "ptMaxPosition = (%d,%d)\n" - "ptMinTrackSize = (%d,%d)\n" - "ptMaxTrackSize = (%d,%d)\n", - minmax->ptReserved.x, minmax->ptReserved.y, - minmax->ptMaxSize.x, minmax->ptMaxSize.y, - minmax->ptMaxPosition.x, minmax->ptMaxPosition.y, - minmax->ptMinTrackSize.x, minmax->ptMinTrackSize.y, - minmax->ptMaxTrackSize.x, minmax->ptMaxTrackSize.y); + dump_minmax_info( minmax ); ok(minmax->ptMaxSize.x == rc.right - rc.left, "default width of maximized child %d != %d\n", minmax->ptMaxSize.x, rc.right - rc.left); @@ -1441,17 +1426,8 @@ static LRESULT WINAPI mdi_child_wnd_proc_1(HWND hwnd, UINT msg, WPARAM wparam, L DefMDIChildProcA(hwnd, msg, wparam, lparam); - trace("DefMDIChildProc returned:\n" - "ptReserved = (%d,%d)\n" - "ptMaxSize = (%d,%d)\n" - "ptMaxPosition = (%d,%d)\n" - "ptMinTrackSize = (%d,%d)\n" - "ptMaxTrackSize = (%d,%d)\n", - minmax->ptReserved.x, minmax->ptReserved.y, - minmax->ptMaxSize.x, minmax->ptMaxSize.y, - minmax->ptMaxPosition.x, minmax->ptMaxPosition.y, - minmax->ptMinTrackSize.x, minmax->ptMinTrackSize.y, - minmax->ptMaxTrackSize.x, minmax->ptMaxTrackSize.y); + trace("DefMDIChildProc returned:\n"); + dump_minmax_info( minmax ); MDI_ChildGetMinMaxInfo(client, hwnd, &my_minmax); ok(minmax->ptMaxSize.x == my_minmax.ptMaxSize.x, "default width of maximized child %d != %d\n", @@ -1529,17 +1505,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L style &= ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */ AdjustWindowRectEx(&rc, style, 0, exstyle); trace("calculated max child window size = (%d x %d)\n", rc.right-rc.left, rc.bottom-rc.top); - - trace("ptReserved = (%d,%d)\n" - "ptMaxSize = (%d,%d)\n" - "ptMaxPosition = (%d,%d)\n" - "ptMinTrackSize = (%d,%d)\n" - "ptMaxTrackSize = (%d,%d)\n", - minmax->ptReserved.x, minmax->ptReserved.y, - minmax->ptMaxSize.x, minmax->ptMaxSize.y, - minmax->ptMaxPosition.x, minmax->ptMaxPosition.y, - minmax->ptMinTrackSize.x, minmax->ptMinTrackSize.y, - minmax->ptMaxTrackSize.x, minmax->ptMaxTrackSize.y); + dump_minmax_info( minmax ); ok(minmax->ptMaxSize.x == rc.right - rc.left, "default width of maximized child %d != %d\n", minmax->ptMaxSize.x, rc.right - rc.left);

1 0

Alexandre Julliard : user32/tests: Don' t add a newline before dumping the flag values.
by Alexandre Julliard June 4, 2008

June 4, 2008

Module: wine Branch: master Commit: 3cc1270f99d08437ec6df600df9336cbbdb7a8ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc1270f99d08437ec6df600d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 4 12:34:27 2008 +0200 user32/tests: Don't add a newline before dumping the flag values. --- dlls/user32/tests/msg.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f87d101..62797e1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2789,7 +2789,7 @@ static LRESULT WINAPI mdi_client_hook_proc(HWND hwnd, UINT message, WPARAM wPara WINDOWPOS *winpos = (WINDOWPOS *)lParam; trace("%s\n", (message == WM_WINDOWPOSCHANGING) ? "WM_WINDOWPOSCHANGING" : "WM_WINDOWPOSCHANGED"); - trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", + trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x ", winpos->hwnd, winpos->hwndInsertAfter, winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); dump_winpos_flags(winpos->flags); @@ -2840,7 +2840,7 @@ static LRESULT WINAPI mdi_child_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, WINDOWPOS *winpos = (WINDOWPOS *)lParam; trace("%s\n", (message == WM_WINDOWPOSCHANGING) ? "WM_WINDOWPOSCHANGING" : "WM_WINDOWPOSCHANGED"); - trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", + trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x ", winpos->hwnd, winpos->hwndInsertAfter, winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); dump_winpos_flags(winpos->flags); @@ -2909,7 +2909,7 @@ static LRESULT WINAPI mdi_frame_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, WINDOWPOS *winpos = (WINDOWPOS *)lParam; trace("%s\n", (message == WM_WINDOWPOSCHANGING) ? "WM_WINDOWPOSCHANGING" : "WM_WINDOWPOSCHANGED"); - trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", + trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x ", winpos->hwnd, winpos->hwndInsertAfter, winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); dump_winpos_flags(winpos->flags); @@ -3554,7 +3554,7 @@ static INT_PTR CALLBACK TestModalDlgProcA(HWND hwnd, UINT message, WPARAM wParam WINDOWPOS *winpos = (WINDOWPOS *)lParam; trace("%s\n", (message == WM_WINDOWPOSCHANGING) ? "WM_WINDOWPOSCHANGING" : "WM_WINDOWPOSCHANGED"); - trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", + trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x ", winpos->hwnd, winpos->hwndInsertAfter, winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); dump_winpos_flags(winpos->flags); @@ -6516,7 +6516,7 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, WINDOWPOS *winpos = (WINDOWPOS *)lParam; trace("%s\n", (message == WM_WINDOWPOSCHANGING) ? "WM_WINDOWPOSCHANGING" : "WM_WINDOWPOSCHANGED"); - trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", + trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x ", winpos->hwnd, winpos->hwndInsertAfter, winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); dump_winpos_flags(winpos->flags); @@ -6670,7 +6670,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam WINDOWPOS *winpos = (WINDOWPOS *)lParam; trace("%s\n", (message == WM_WINDOWPOSCHANGING) ? "WM_WINDOWPOSCHANGING" : "WM_WINDOWPOSCHANGED"); - trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", + trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x ", winpos->hwnd, winpos->hwndInsertAfter, winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); dump_winpos_flags(winpos->flags); @@ -6759,7 +6759,7 @@ static LRESULT WINAPI TestDlgProcA(HWND hwnd, UINT message, WPARAM wParam, LPARA WINDOWPOS *winpos = (WINDOWPOS *)lParam; trace("%s\n", (message == WM_WINDOWPOSCHANGING) ? "WM_WINDOWPOSCHANGING" : "WM_WINDOWPOSCHANGED"); - trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", + trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x ", winpos->hwnd, winpos->hwndInsertAfter, winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); dump_winpos_flags(winpos->flags); @@ -9738,7 +9738,7 @@ static INT_PTR WINAPI test_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPAR WINDOWPOS *winpos = (WINDOWPOS *)lParam; trace("%s\n", (message == WM_WINDOWPOSCHANGING) ? "WM_WINDOWPOSCHANGING" : "WM_WINDOWPOSCHANGED"); - trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", + trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x ", winpos->hwnd, winpos->hwndInsertAfter, winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); dump_winpos_flags(winpos->flags);

1 0