March 2006 - Wine-commits - list.winehq.org

Vitaly Lipatov : gdi32: Look for ttf fonts in the Wine font dir.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: a1a54e7bf737e5275ac5ba63bafc51272f12f368 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1a54e7bf737e5275ac5ba6… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Fri Mar 17 18:36:11 2006 +0300 gdi32: Look for ttf fonts in the Wine font dir. --- dlls/gdi/freetype.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index f38ef1b..1914f1f 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -1499,6 +1499,7 @@ BOOL WineEngInit(void) WCHAR windowsdir[MAX_PATH]; char *unixname; HANDLE font_mutex; + const char *data_dir; TRACE("\n"); @@ -1578,7 +1579,7 @@ BOOL WineEngInit(void) } WaitForSingleObject(font_mutex, INFINITE); - /* load the system fonts */ + /* load the system bitmap fonts */ load_system_fonts(); /* load in the fonts from %WINDOWSDIR%\\Fonts first of all */ @@ -1590,6 +1591,15 @@ BOOL WineEngInit(void) HeapFree(GetProcessHeap(), 0, unixname); } + /* load the system truetype fonts */ + data_dir = wine_get_data_dir(); + if (data_dir && (unixname = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + sizeof("/fonts/")))) { + strcpy(unixname, data_dir); + strcat(unixname, "/fonts/"); + ReadFontDir(unixname, FALSE); + HeapFree(GetProcessHeap(), 0, unixname); + } + /* now look under HKLM\Software\Microsoft\Windows[ NT]\CurrentVersion\Fonts for any fonts not installed in %WINDOWSDIR%\Fonts. They will have their full path as the entry. Also look for any .fon fonts, since ReadFontDir

1 0

Eric Pouech : dbghelp: Compiland and source files are not the same thing.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: c0e0de6c4e7aea28bf3d707f50f6ca5b47a38b84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0e0de6c4e7aea28bf3d707… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 13:32:31 2006 +0100 dbghelp: Compiland and source files are not the same thing. - in MSC debug info parsing, clearly separate a source file information from a compiland (including in linetab structure) - in ELF debug info parsing, now storing compiland directly in symtab_elt while browsing the symtab section (we still create twice the compilands, once in stabs/dwarf parsing, a second time in symtab parsing) --- dlls/dbghelp/elf_module.c | 58 +++++++++++------------------------ dlls/dbghelp/msc.c | 74 ++++++++++++++++++--------------------------- dlls/dbghelp/mscvpdb.h | 22 +++++++++---- 3 files changed, 62 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c0e0de6c4e7aea28bf3…

1 0

Dmitry Timoshkov : gdi: Add a test for bitmap font metrics to ensure that they match the Windows ones .
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 89edaa7bbe42079e7775e7dbada4414393be3fab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=89edaa7bbe42079e7775e7d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 17 14:01:41 2006 +0800 gdi: Add a test for bitmap font metrics to ensure that they match the Windows ones. --- dlls/gdi/tests/gdiobj.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/tests/gdiobj.c b/dlls/gdi/tests/gdiobj.c index 463bbf4..2dee9ab 100644 --- a/dlls/gdi/tests/gdiobj.c +++ b/dlls/gdi/tests/gdiobj.c @@ -198,6 +198,95 @@ todo_wine ReleaseDC(0, hdc); } +static INT CALLBACK find_font_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + LOGFONT *lf = (LOGFONT *)lParam; + + trace("found font %s, height %ld\n", elf->lfFaceName, elf->lfHeight); + + if (elf->lfHeight == lf->lfHeight && !strcmp(elf->lfFaceName, lf->lfFaceName)) + { + *lf = *elf; + return 0; /* stop enumeration */ + } + return 1; /* continue enumeration */ +} + +static void test_bitmap_font_metrics(void) +{ + static const struct font_data + { + const char face_name[LF_FACESIZE]; + int weight, height, ascent, descent, int_leading, ext_leading; + int ave_char_width, max_char_width; + } fd[] = + { + { "MS Sans Serif", FW_NORMAL, 13, 11, 2, 2, 0, 5, 11 }, + { "MS Sans Serif", FW_NORMAL, 16, 13, 3, 3, 0, 7, 14 }, + { "MS Sans Serif", FW_NORMAL, 20, 16, 4, 4, 0, 8, 16 }, + { "MS Sans Serif", FW_NORMAL, 24, 19, 5, 6, 0, 9, 20 }, + { "MS Sans Serif", FW_NORMAL, 29, 23, 6, 5, 0, 12, 25 }, + { "MS Sans Serif", FW_NORMAL, 37, 29, 8, 5, 0, 16, 32 }, + { "MS Serif", FW_NORMAL, 10, 8, 2, 2, 0, 5, 8 }, + { "MS Serif", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9 }, + { "MS Serif", FW_NORMAL, 13, 11, 2, 2, 0, 5, 12 }, + { "MS Serif", FW_NORMAL, 16, 13, 3, 3, 0, 6, 16 }, + { "MS Serif", FW_NORMAL, 19, 15, 4, 3, 0, 8, 19 }, + { "MS Serif", FW_NORMAL, 21, 16, 5, 3, 0, 9, 23 }, + { "MS Serif", FW_NORMAL, 27, 21, 6, 3, 0, 12, 27 }, + { "MS Serif", FW_NORMAL, 35, 27, 8, 3, 0, 16, 34 }, +#if 0 /* FIXME: enable once the bug in sfnt2fnt is fixed */ + { "Courier", FW_NORMAL, 13, 11, 2, 0, 0, 8, 8 }, +#endif + { "Courier", FW_NORMAL, 16, 13, 3, 0, 0, 9, 9 }, + { "Courier", FW_NORMAL, 20, 16, 4, 0, 0, 12, 12 }, + { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 15 } + /* FIXME: add "Fixedsys", "Terminal", "Small Fonts" */ + }; + HDC hdc; + LOGFONT lf; + HFONT hfont, old_hfont; + TEXTMETRIC tm; + INT ret, i; + + hdc = CreateCompatibleDC(0); + assert(hdc); + + for (i = 0; i < sizeof(fd)/sizeof(fd[0]); i++) + { + memset(&lf, 0, sizeof(lf)); + + lf.lfHeight = fd[i].height; + strcpy(lf.lfFaceName, fd[i].face_name); + ret = EnumFontFamilies(hdc, fd[i].face_name, find_font_proc, (LPARAM)&lf); + if (ret) + { + trace("font %s height %d not found\n", fd[i].face_name, fd[i].height); + continue; + } + + trace("found font %s, height %ld\n", lf.lfFaceName, lf.lfHeight); + + hfont = create_font(lf.lfFaceName, &lf); + old_hfont = SelectObject(hdc, hfont); + ok(GetTextMetrics(hdc, &tm), "GetTextMetrics error %ld\n", GetLastError()); + + ok(tm.tmWeight == fd[i].weight, "%s(%d): tm.tmWeight %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmWeight, fd[i].weight); + ok(tm.tmHeight == fd[i].height, "%s(%d): tm.tmHeight %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmHeight, fd[i].height); + ok(tm.tmAscent == fd[i].ascent, "%s(%d): tm.tmAscent %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmAscent, fd[i].ascent); + ok(tm.tmDescent == fd[i].descent, "%s(%d): tm.tmDescent %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmDescent, fd[i].descent); + ok(tm.tmInternalLeading == fd[i].int_leading, "%s(%d): tm.tmInternalLeading %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmInternalLeading, fd[i].int_leading); + ok(tm.tmExternalLeading == fd[i].ext_leading, "%s(%d): tm.tmExternalLeading %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmExternalLeading, fd[i].ext_leading); + ok(tm.tmAveCharWidth == fd[i].ave_char_width, "%s(%d): tm.tmAveCharWidth %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmAveCharWidth, fd[i].ave_char_width); + ok(tm.tmMaxCharWidth == fd[i].max_char_width, "%s(%d): tm.tmMaxCharWidth %ld != %d\n", fd[i].face_name, fd[i].height, tm.tmMaxCharWidth, fd[i].max_char_width); + + SelectObject(hdc, old_hfont); + DeleteObject(hfont); + } + + DeleteDC(hdc); +} + static void test_gdi_objects(void) { BYTE buff[256]; @@ -898,6 +987,7 @@ START_TEST(gdiobj) test_logfont(); test_logpen(); test_bitmap_font(); + test_bitmap_font_metrics(); test_gdi_objects(); test_GdiGetCharDimensions(); test_text_extents();

1 0

Eric Kohl : widl: 'unsigned char' and 'byte' are must be distinct types.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 919d14c577bfb9262b6bd9f74e64fa60f0cc85c0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=919d14c577bfb9262b6bd9f… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Sat Mar 18 14:33:08 2006 +0100 widl: 'unsigned char' and 'byte' are must be distinct types. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 77219d8..eb00304 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -576,7 +576,7 @@ base_type: tBYTE { $$ = make_type(RPC | tSIGNED int_std { $$ = $2; $$->sign = 1; } | tUNSIGNED int_std { $$ = $2; $$->sign = -1; switch ($$->type) { - case RPC_FC_CHAR: $$->type = RPC_FC_BYTE; $$->sign = 0; break; + case RPC_FC_CHAR: break; case RPC_FC_SMALL: $$->type = RPC_FC_USMALL; break; case RPC_FC_SHORT: $$->type = RPC_FC_USHORT; break; case RPC_FC_LONG: $$->type = RPC_FC_ULONG; break;

1 0

Eric Kohl : widl: Fix proc offset calculation.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: c7174f9fff45837f21b75c2b5d05d38f398a8e25 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c7174f9fff45837f21b75c2… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Sat Mar 18 14:33:39 2006 +0100 widl: Fix proc offset calculation. A void return type is represented by a FC_END/FC_PAD sequence in the proc format string. Increment the proc offset by two when a function returns void. --- tools/widl/client.c | 2 ++ tools/widl/server.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 1dbbbc6..3197b73 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -252,6 +252,8 @@ static void write_function_stubs(type_t } if (!is_void(def->type, NULL)) proc_offset += get_size_procformatstring_var(def); + else + proc_offset += 2; /* FC_END and FC_PAD */ indent--; print_client("}\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index d1ea5f0..8cc33da 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -343,6 +343,8 @@ static void write_function_stubs(type_t } if (!is_void(def->type, NULL)) proc_offset += get_size_procformatstring_var(def); + else + proc_offset += 2; /* FC_END and FC_PAD */ func = PREV_LINK(func); }

1 0

Eric Kohl : widl: Do not generate code that initializes a binding handle.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 623f14294534f4cfe3ab3655db3bd27bf2c69497 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=623f14294534f4cfe3ab365… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Sat Mar 18 14:33:48 2006 +0100 widl: Do not generate code that initializes a binding handle. --- tools/widl/server.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 8cc33da..3f7b976 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -79,7 +79,8 @@ static void write_parameters_init(const while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - print_server("%s = 0;\n", var->name); + if (var->type->type != RPC_FC_BIND_PRIMITIVE) + print_server("%s = 0;\n", var->name); var = PREV_LINK(var); }

1 0

Jacek Caban : mshtml.idl: Added more interfaces.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: 144bb464c3089456fc19a1580dfa1898ccafb20c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=144bb464c3089456fc19a15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 18 14:34:46 2006 +0100 mshtml.idl: Added more interfaces. --- include/mshtmdid.h | 179 ++++++++++++++ include/mshtml.idl | 688 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 867 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=144bb464c3089456fc1…

1 0

Mike McCormack : Remove some unnecessary uses of windowsx.h
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: d5816d22020da65b07b0d768f84112d48eadc2c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d5816d22020da65b07b0d76… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 17 23:26:20 2006 +0900 Remove some unnecessary uses of windowsx.h --- dlls/user/tests/edit.c | 5 +++-- programs/progman/group.c | 1 - programs/progman/main.c | 1 - programs/progman/program.c | 1 - programs/winecfg/audio.c | 9 ++++----- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/user/tests/edit.c b/dlls/user/tests/edit.c index d92b244..1a830c2 100644 --- a/dlls/user/tests/edit.c +++ b/dlls/user/tests/edit.c @@ -20,7 +20,6 @@ #include <assert.h> #include <windows.h> -#include <windowsx.h> #include <commctrl.h> #include "wine/test.h" @@ -278,7 +277,9 @@ static void ET2_OnCommand(HWND hwnd, int static LRESULT CALLBACK ET2_WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { switch (iMsg) { - HANDLE_MSG(hwnd, WM_COMMAND, ET2_OnCommand); + case WM_COMMAND: + ET2_OnCommand(hwnd, LOWORD(wParam), (HWND)lParam, HIWORD(wParam)); + break; } return DefWindowProc(hwnd, iMsg, wParam, lParam); } diff --git a/programs/progman/group.c b/programs/progman/group.c index 2f8c5fc..81d078f 100644 --- a/programs/progman/group.c +++ b/programs/progman/group.c @@ -23,7 +23,6 @@ #include <stdio.h> #include <string.h> #include "windows.h" -#include "windowsx.h" #include "progman.h" /*********************************************************************** diff --git a/programs/progman/main.c b/programs/progman/main.c index d1e2a1e..fd79690 100644 --- a/programs/progman/main.c +++ b/programs/progman/main.c @@ -22,7 +22,6 @@ #include <stdio.h> #include <string.h> #include "windows.h" -#include "windowsx.h" #include "progman.h" GLOBALS Globals; diff --git a/programs/progman/program.c b/programs/progman/program.c index 783d415..d646545 100644 --- a/programs/progman/program.c +++ b/programs/progman/program.c @@ -22,7 +22,6 @@ #include <string.h> #include "windows.h" -#include "windowsx.h" #include "progman.h" /*********************************************************************** diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index b677c2a..ba82e54 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -38,7 +38,6 @@ #include <shlguid.h> #include <shlwapi.h> #include <shlobj.h> -#include <windowsx.h> #include <mmsystem.h> #include <mmreg.h> #include <mmddk.h> @@ -699,8 +698,8 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPAR DWORD dwPos = GetMessagePos(); HWND tree = ((LPNMHDR)lParam)->hwndFrom; ZeroMemory(&ht, sizeof(ht)); - ht.pt.x = GET_X_LPARAM(dwPos); - ht.pt.y = GET_Y_LPARAM(dwPos); + ht.pt.x = (short)LOWORD(dwPos); + ht.pt.y = (short)HIWORD(dwPos); MapWindowPoints(HWND_DESKTOP, tree, &ht.pt, 1); SendMessageW( tree, TVM_HITTEST, 0, (LPARAM)&ht ); if (TVHT_ONITEMSTATEICON & ht.flags) @@ -735,8 +734,8 @@ AudioDlgProc (HWND hDlg, UINT uMsg, WPAR HWND tree = ((LPNMHDR)lParam)->hwndFrom; POINT pt; ZeroMemory(&ht, sizeof(ht)); - pt.x = GET_X_LPARAM(dwPos); - pt.y = GET_Y_LPARAM(dwPos); + pt.x = (short)LOWORD(dwPos); + pt.y = (short)HIWORD(dwPos); ht.pt = pt; MapWindowPoints(HWND_DESKTOP, tree, &ht.pt, 1); SendMessageW( tree, TVM_HITTEST, 0, (LPARAM)&ht );

1 0

Eric Pouech : dbghelp: Live target detection.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: db90e17d923b809d07f71540ab715dcfb239df22 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db90e17d923b809d07f7154… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Mar 18 10:32:33 2006 +0100 dbghelp: Live target detection. - DBGHELP_NOLIVE env variable is tested earlier to avoid some strange effects in live target detection - in WineDbg, delete DBGHELP_NOLIVE before attaching to a process, because we know it must be a live target --- dlls/dbghelp/dbghelp.c | 4 ++-- programs/winedbg/tgt_active.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index f776190..bd75a60 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -170,8 +170,8 @@ static BOOL WINAPI process_invade_cb(cha static BOOL check_live_target(struct process* pcs) { if (!GetProcessId(pcs->handle)) return FALSE; - if (!elf_read_wine_loader_dbg_info(pcs)) return FALSE; - return getenv("DBGHELP_NOLIVE") == NULL; + if (GetEnvironmentVariableA("DBGHELP_NOLIVE", NULL, 0)) return FALSE; + return elf_read_wine_loader_dbg_info(pcs); } /****************************************************************** diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index d4eaade..a76f193 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -83,6 +83,8 @@ BOOL dbg_attach_debuggee(DWORD pid, BOOL } dbg_curr_process->continue_on_first_exception = cofe; + SetEnvironmentVariableA("DBGHELP_NOLIVE", NULL); + if (wfe) /* shall we proceed all debug events until we get an exception ? */ { dbg_interactiveP = FALSE;

1 0

Jacek Caban : mshtml/tests: Code cleanup.
by Alexandre Julliard 18 Mar '06

18 Mar '06

Module: wine Branch: refs/heads/master Commit: cb92214210446ac640fea150284365460844ffc3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb92214210446ac640fea15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 18 12:01:33 2006 +0100 mshtml/tests: Code cleanup. --- dlls/mshtml/tests/protocol.c | 92 ++++++++++++++++++++++++++---------------- 1 files changed, 57 insertions(+), 35 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 9624b37..309c860 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -28,13 +28,38 @@ #include "initguid.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + expect_ ## func = FALSE; \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + DEFINE_GUID(CLSID_ResProtocol, 0x3050F3BC, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); -static BOOL expect_GetBindInfo = FALSE, called_GetBindInfo = FALSE; -static BOOL expect_ReportProgress = FALSE, called_ReportProgress = FALSE; -static BOOL expect_ReportData = FALSE, called_ReportData = FALSE; -static BOOL expect_ReportResult = FALSE, called_ReportResult = FALSE; +DEFINE_EXPECT(GetBindInfo); +DEFINE_EXPECT(ReportProgress); +DEFINE_EXPECT(ReportData); +DEFINE_EXPECT(ReportResult); static HRESULT expect_hrResult; static BOOL expect_hr_win32err = FALSE; @@ -69,31 +94,33 @@ static HRESULT WINAPI ProtocolSink_Repor { static const WCHAR text_html[] = {'t','e','x','t','/','h','t','m','l',0}; - ok(expect_ReportProgress, "unexpected call\n"); + CHECK_EXPECT(ReportProgress); + ok(ulStatusCode == BINDSTATUS_MIMETYPEAVAILABLE - || ulStatusCode == BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, "ulStatusCode=%ld\n", ulStatusCode); + || ulStatusCode == BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, + "ulStatusCode=%ld\n", ulStatusCode); ok(!lstrcmpW(szStatusText, text_html), "szStatusText != text/html\n"); - expect_ReportProgress = FALSE; - called_ReportProgress = TRUE; + return S_OK; } static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) { - ok(expect_ReportData, "unexpected call\n"); + CHECK_EXPECT(ReportData); + ok(ulProgress == ulProgressMax, "ulProgress != ulProgressMax\n"); ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION | BSCF_DATAFULLYAVAILABLE), "grcf = %08lx\n", grfBSCF); - expect_ReportData = FALSE; - called_ReportData = TRUE; + return S_OK; } static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, LPCWSTR szResult) { - ok(expect_ReportResult, "unexpected call\n"); + CHECK_EXPECT(ReportResult); + if(expect_hr_win32err) ok((hrResult&0xffff0000) == ((FACILITY_WIN32 << 16)|0x80000000) || expect_hrResult, "expected win32 err or %08lx got: %08lx\n", expect_hrResult, hrResult); @@ -101,8 +128,7 @@ static HRESULT WINAPI ProtocolSink_Repor ok(hrResult == expect_hrResult, "expected: %08lx got: %08lx\n", expect_hrResult, hrResult); ok(dwError == 0, "dwError = %ld\n", dwError); ok(!szResult, "szResult != NULL\n"); - called_ReportResult = TRUE; - expect_ReportResult = FALSE; + return S_OK; } @@ -141,14 +167,14 @@ static ULONG WINAPI BindInfo_Release(IIn static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { - ok(expect_GetBindInfo, "unexpected call\n"); + CHECK_EXPECT(GetBindInfo); + ok(grfBINDF != NULL, "grfBINDF == NULL\n"); if(grfBINDF) ok(!*grfBINDF, "*grfBINDF != 0\n"); ok(pbindinfo != NULL, "pbindinfo == NULL\n"); ok(pbindinfo->cbSize == sizeof(BINDINFO), "wrong size of pbindinfo: %ld\n", pbindinfo->cbSize); - called_GetBindInfo = TRUE; - expect_GetBindInfo = FALSE; + return S_OK; } @@ -176,8 +202,9 @@ static void test_protocol_fail(IInternet { HRESULT hres; - expect_ReportResult = TRUE; - expect_GetBindInfo = TRUE; + SET_EXPECT(GetBindInfo); + SET_EXPECT(ReportResult); + expect_hrResult = expected_hres; expect_hr_win32err = expect_win32err; hres = IInternetProtocol_Start(protocol, url, &protocol_sink, &bind_info, 0, 0); @@ -186,34 +213,29 @@ static void test_protocol_fail(IInternet "expected win32 err or %08lx got: %08lx\n", expected_hres, hres); else ok(hres == expected_hres, "expected: %08lx got: %08lx\n", expected_hres, hres); - ok(called_ReportResult, "expected ReportResult\n"); - ok(called_GetBindInfo, "expected GetBindInfo\n"); - expect_ReportResult = called_ReportResult = FALSE; - expect_GetBindInfo = called_GetBindInfo = FALSE; + + CHECK_CALLED(GetBindInfo); + CHECK_CALLED(ReportResult); } static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) { HRESULT hres; - expect_GetBindInfo = TRUE; - expect_ReportResult = TRUE; - expect_ReportProgress = TRUE; - expect_ReportData = TRUE; + SET_EXPECT(GetBindInfo); + SET_EXPECT(ReportResult); + SET_EXPECT(ReportProgress); + SET_EXPECT(ReportData); expect_hrResult = S_OK; expect_hr_win32err = FALSE; hres = IInternetProtocol_Start(protocol, url, &protocol_sink, &bind_info, 0, 0); ok(hres == S_OK, "Start failed: %08lx\n", hres); - ok(called_GetBindInfo, "expected GetBindInfo\n"); - ok(called_ReportProgress, "expected ReportProgress\n"); - ok(called_ReportData, "expected ReportData\n"); - ok(called_ReportResult, "expected ReportResult\n"); - called_GetBindInfo = expect_GetBindInfo = FALSE; - called_ReportProgress = expect_ReportProgress = FALSE; - called_ReportData = expect_ReportData = FALSE; - called_ReportResult = expect_ReportResult = FALSE; + CHECK_CALLED(GetBindInfo); + CHECK_CALLED(ReportProgress); + CHECK_CALLED(ReportData); + CHECK_CALLED(ReportResult); } static void test_res_protocol(void)

1 0