October 2009 - Wine-Commits

Dmitry Timoshkov : gdi32: Rework the test for too large width/ height font ratio to pass with different font heights, make it pass under Wine.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 21589993826cdb1cb2f87ceb94c8a188bd4a3090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21589993826cdb1cb2f87ceb9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Oct 7 17:50:32 2009 +0900 gdi32: Rework the test for too large width/height font ratio to pass with different font heights, make it pass under Wine. --- dlls/gdi32/freetype.c | 16 ++++++--- dlls/gdi32/tests/font.c | 87 ++++++++++++++++++++-------------------------- 2 files changed, 49 insertions(+), 54 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4723be9..9b5f44f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5430,12 +5430,18 @@ BOOL WineEngGetTextMetrics(GdiFont *font, LPTEXTMETRICW ptm) LeaveCriticalSection( &freetype_cs ); return FALSE; } + + /* Make sure that the font has sane width/height ratio */ + if (font->aveWidth) + { + if ((font->aveWidth + font->potm->otmTextMetrics.tmHeight - 1) / font->potm->otmTextMetrics.tmHeight > 100) + { + WARN("Ignoring too large font->aveWidth %d\n", font->aveWidth); + font->aveWidth = 0; + } + } } - if(!font->potm) - { - LeaveCriticalSection( &freetype_cs ); - return FALSE; - } + *ptm = font->potm->otmTextMetrics; scale_font_metrics(font, ptm); LeaveCriticalSection( &freetype_cs ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 3d0e81d..b67670f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2920,14 +2920,13 @@ static void test_GetGlyphOutline(void) } /* bug #9995: there is a limit to the character width that can be specified */ -static void test_GetTextMetrics2( const char *fontname) +static void test_GetTextMetrics2(const char *fontname, int font_height) { HFONT of, hf; HDC hdc; TEXTMETRICA tm; - LOGFONTA lf; BOOL ret; - int avecharw[3], maxcharw[3]; + int ave_width, height, width, ratio, scale; if (!is_truetype_font_installed( fontname)) { skip("%s is not installed\n", fontname); @@ -2936,60 +2935,46 @@ static void test_GetTextMetrics2( const char *fontname) hdc = CreateCompatibleDC(0); ok( hdc != NULL, "CreateCompatibleDC failed\n"); /* select width = 0 */ - hf = CreateFontA( -11, 0, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, - DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_LH_ANGLES, - DEFAULT_QUALITY, VARIABLE_PITCH, - fontname); - ok( hf != NULL, "CreateFontA failed\n"); - of = SelectObject( hdc, hf); - ret = GetObjectA( hf, sizeof( lf), &lf); - ret = GetTextMetricsA( hdc, &tm); - ok(ret, "GetTextMetricsA error %u\n", GetLastError()); - avecharw[0] =tm.tmAveCharWidth; - maxcharw[0] =tm.tmMaxCharWidth; - SelectObject( hdc, of); - DeleteObject( hf); - /* select LARGE width = 1023 */ - hf = CreateFontA( -11, 1023, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, + hf = CreateFontA(font_height, 0, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_LH_ANGLES, DEFAULT_QUALITY, VARIABLE_PITCH, fontname); ok( hf != NULL, "CreateFontA failed\n"); of = SelectObject( hdc, hf); - ret = GetObjectA( hf, sizeof( lf), &lf); ret = GetTextMetricsA( hdc, &tm); ok(ret, "GetTextMetricsA error %u\n", GetLastError()); - avecharw[1] =tm.tmAveCharWidth; - maxcharw[1] =tm.tmMaxCharWidth; + height = tm.tmHeight; + ave_width = tm.tmAveCharWidth; SelectObject( hdc, of); DeleteObject( hf); - /* select TOOLARGE width = 1536 */ - hf = CreateFontA( -11, 1536, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, - DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_LH_ANGLES, - DEFAULT_QUALITY, VARIABLE_PITCH, - fontname); - ok( hf != NULL, "CreateFontA failed\n"); - of = SelectObject( hdc, hf); - ret = GetObjectA( hf, sizeof( lf), &lf); - ret = GetTextMetricsA( hdc, &tm); - ok(ret, "GetTextMetricsA error %u\n", GetLastError()); - avecharw[2] =tm.tmAveCharWidth; - maxcharw[2] =tm.tmMaxCharWidth; - SelectObject( hdc, of); - DeleteObject( hf); - /* tests */ - ok( avecharw[1] > 10 * avecharw[0], "Av. charwidth not large ( %d cmp.to %d)\n", - avecharw[1], avecharw[0]); - ok( maxcharw[1] > 10 * maxcharw[0], "Max charwidth not large ( %d cmp.to %d)\n", - maxcharw[1], maxcharw[0]); -todo_wine { - ok( avecharw[2] == avecharw[0], "Unexpected Av. charwidth ( %d cmp.to %d)\n", - avecharw[2], avecharw[0]); - ok( maxcharw[2] == maxcharw[0], "Unexpected Max charwidth ( %d cmp.to %d)\n", - maxcharw[2], maxcharw[0]); -} - /* clean up */ + + trace("height %d, ave width %d\n", height, ave_width); + + for (width = ave_width * 2; /* nothing*/; width += ave_width) + { + hf = CreateFont(height, width, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, + DEFAULT_CHARSET, OUT_TT_PRECIS, CLIP_LH_ANGLES, + DEFAULT_QUALITY, VARIABLE_PITCH, fontname); + ok(hf != 0, "CreateFont failed\n"); + of = SelectObject(hdc, hf); + ret = GetTextMetrics(hdc, &tm); + ok(ret, "GetTextMetrics error %u\n", GetLastError()); + SelectObject(hdc, of); + DeleteObject(hf); + + if (tm.tmAveCharWidth == ave_width || width / height > 200) + break; + } + DeleteDC(hdc); + + ratio = width / height; + scale = width / ave_width; + + trace("max width/height ratio (%d / %d) %d, max width scale (%d / %d) %d\n", + width, height, ratio, width, ave_width, scale); + + ok(ratio >= 90 && ratio <= 110, "expected width/height ratio 90-110, got %d\n", ratio); } START_TEST(font) @@ -3029,6 +3014,10 @@ START_TEST(font) test_GdiRealizationInfo(); test_GetTextFace(); test_GetGlyphOutline(); - test_GetTextMetrics2( "Tahoma"); - test_GetTextMetrics2( "Arial"); + test_GetTextMetrics2("Tahoma", -11); + test_GetTextMetrics2("Tahoma", -55); + test_GetTextMetrics2("Tahoma", -110); + test_GetTextMetrics2("Arial", -11); + test_GetTextMetrics2("Arial", -55); + test_GetTextMetrics2("Arial", -110); }

1 0

Alexandre Julliard : Fix empty function prototypes.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: fa6ffb4d5d61581ded02e144cc0c8d7d015b995f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6ffb4d5d61581ded02e144c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 12:24:53 2009 +0200 Fix empty function prototypes. --- dlls/d3dx9_36/tests/texture.c | 2 +- dlls/imm32/tests/imm32.c | 2 +- dlls/mscms/tests/profile.c | 4 ++-- dlls/msctf/tests/inputprocessor.c | 2 +- dlls/msi/tests/msi.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/winedos/relay.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- loader/preloader.c | 2 +- programs/secedit/main.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 7f10e2d..7e4fdae 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -78,7 +78,7 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons return D3DERR_INVALIDCALL; } -static void test_D3DXGetImageInfo() +static void test_D3DXGetImageInfo(void) { HRESULT hr; D3DXIMAGE_INFO info; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7b76226..ccbbc06 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -118,7 +118,7 @@ static void msg_spy_init(HWND hwnd) { msg_spy_flush_msgs(); } -static void msg_spy_cleanup() { +static void msg_spy_cleanup(void) { if (msg_spy.get_msg_hook) UnhookWindowsHookEx(msg_spy.get_msg_hook); if (msg_spy.call_wnd_proc_hook) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 4f71789..470e10e 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -453,7 +453,7 @@ static void test_GetCountColorProfileElements(void) } } -static void test_GetStandardColorSpaceProfileA() +static void test_GetStandardColorSpaceProfileA(void) { BOOL ret; DWORD size; @@ -533,7 +533,7 @@ static void test_GetStandardColorSpaceProfileA() ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); } -static void test_GetStandardColorSpaceProfileW() +static void test_GetStandardColorSpaceProfileW(void) { BOOL ret; DWORD size; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index ffbdbad..edf5cc0 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -770,7 +770,7 @@ static HRESULT RegisterTextService(REFCLSID rclsid) return CoRegisterClassObject(rclsid, (IUnknown*) cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &regid); } -static HRESULT UnregisterTextService() +static HRESULT UnregisterTextService(void) { return CoRevokeClassObject(regid); } diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index fdbb253..f25d580 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -8510,7 +8510,7 @@ static void test_MsiEnumPatchesEx_userunmanaged(LPCSTR usersid, LPCSTR expecteds RegCloseKey(prodkey); } -static void test_MsiEnumPatchesEx_machine() +static void test_MsiEnumPatchesEx_machine(void) { CHAR keypath[MAX_PATH], patch[MAX_PATH]; CHAR patch_squashed[MAX_PATH], patchcode[MAX_PATH]; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index c4568f4..4a991ae 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -118,7 +118,7 @@ extern IUnknown *create_comment( xmlNodePtr comment ); extern IUnknown *create_cdata( xmlNodePtr text ); extern IXMLDOMNodeList *create_children_nodelist( xmlNodePtr ); extern IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ); -extern IUnknown *create_doc_Implementation(); +extern IUnknown *create_doc_Implementation(void); extern IUnknown *create_doc_fragment( xmlNodePtr fragment ); extern IUnknown *create_doc_entity_ref( xmlNodePtr entity ); diff --git a/dlls/winedos/relay.c b/dlls/winedos/relay.c index 39978fa..acadd77 100644 --- a/dlls/winedos/relay.c +++ b/dlls/winedos/relay.c @@ -167,7 +167,7 @@ void DOSVM_RelayHandler( CONTEXT86 *context ) */ void DOSVM_BuildCallFrame( CONTEXT86 *context, DOSRELAY relay, LPVOID data ) { - static void (*__wine_call_from_16_regs_ptr)(); + static void (*__wine_call_from_16_regs_ptr)(void); WORD code_sel = DOSVM_dpmi_segments->relay_code_sel; /* diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 922855d..3faffdf 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -300,7 +300,7 @@ extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap); /* IME support */ extern void IME_UnregisterClasses(void); extern void IME_SetOpenStatus(BOOL fOpen); -extern INT IME_GetCursorPos(); +extern INT IME_GetCursorPos(void); extern void IME_SetCursorPos(DWORD pos); extern void IME_UpdateAssociation(HWND focus); extern BOOL IME_SetCompositionString(DWORD dwIndex, LPCVOID lpComp, diff --git a/loader/preloader.c b/loader/preloader.c index 087d04b..9f9b083 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -192,7 +192,7 @@ struct * It calls wld_start, passing a pointer to the args it receives * then jumps to the address wld_start returns. */ -void _start(); +void _start(void); extern char _end[]; __ASM_GLOBAL_FUNC(_start, "\tmovl $243,%eax\n" /* SYS_set_thread_area */ diff --git a/programs/secedit/main.c b/programs/secedit/main.c index 878adc9..597db5a 100644 --- a/programs/secedit/main.c +++ b/programs/secedit/main.c @@ -16,7 +16,7 @@ #include <stdlib.h> -int main() +int main( int argc, char *argv[] ) { return 0; }

1 0

Henri Verbeet : d3d9: Use separate fields for data to check/ apply in the stateblock tests.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 3cb7e872845ad8627ae4b844485a36c5a81f4c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb7e872845ad8627ae4b8444… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 09:02:57 2009 +0200 d3d9: Use separate fields for data to check/apply in the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 140 +++++++++++++++++++++++------------------- 1 files changed, 77 insertions(+), 63 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 5479bb8..5a22b4a 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -139,13 +139,8 @@ struct state_test void* test_context; }; -/* See below for explanation of the flags */ -#define EVENT_OK 0x00 -#define EVENT_CHECK_DEFAULT 0x01 -#define EVENT_CHECK_INITIAL 0x02 -#define EVENT_CHECK_TEST 0x04 -#define EVENT_ERROR 0x08 -#define EVENT_APPLY_DATA 0x10 +#define EVENT_OK 0 +#define EVENT_ERROR -1 struct event_data { @@ -154,12 +149,43 @@ struct event_data IDirect3DSwapChain9 *new_swap_chain; }; +enum stateblock_data +{ + SB_DATA_NONE = 0, + SB_DATA_DEFAULT, + SB_DATA_INITIAL, + SB_DATA_TEST_IN, + SB_DATA_TEST, +}; + struct event { int (*event_fn)(IDirect3DDevice9 *device, struct event_data *event_data); - int status; + enum stateblock_data check; + enum stateblock_data apply; }; +static const void *get_event_data(const struct state_test *test, enum stateblock_data data) +{ + switch (data) + { + case SB_DATA_DEFAULT: + return test->default_data; + + case SB_DATA_INITIAL: + return test->initial_data; + + case SB_DATA_TEST_IN: + return test->test_data_in; + + case SB_DATA_TEST: + return test->test_data_out; + + default: + return NULL; + } +} + /* This is an event-machine, which tests things. * It tests get and set operations for a batch of states, based on * results from the event function, which directs what's to be done */ @@ -167,51 +193,39 @@ struct event static void execute_test_chain(IDirect3DDevice9 *device, struct state_test *test, unsigned int ntests, struct event *event, unsigned int nevents, struct event_data *event_data) { - int outcome; - unsigned int i = 0, j; + unsigned int i, j; /* For each queued event */ - for (j=0; j < nevents; j++) { + for (j = 0; j < nevents; ++j) + { + const void *data; - /* Execute the next event handler (if available) or just set the supplied status */ - outcome = event[j].status; + /* Execute the next event handler (if available). */ if (event[j].event_fn) - outcome |= event[j].event_fn(device, event_data); - - /* Now verify correct outcome depending on what was signaled by the handler. - * An EVENT_CHECK_TEST signal means check the returned data against the test_data (out). - * An EVENT_CHECK_DEFAULT signal means check the returned data against the default_data. - * An EVENT_CHECK_INITIAL signal means check the returned data against the initial_data. - * An EVENT_ERROR signal means the test isn't going to work, exit the event loop. - * An EVENT_APPLY_DATA signal means load the test data (after checks) */ - - if (outcome & EVENT_ERROR) { - trace("Test %s, Stage %u in error state, aborting\n", test[i].test_name, j); - break; - + { + if (event[j].event_fn(device, event_data) == EVENT_ERROR) + { + trace("Stage %u in error state, aborting.\n", j); + break; + } } - else if (outcome & (EVENT_CHECK_TEST | EVENT_CHECK_DEFAULT | EVENT_CHECK_INITIAL)) + + if (event[j].check != SB_DATA_NONE) { for (i = 0; i < ntests; ++i) { - if (outcome & EVENT_CHECK_TEST) - { - test[i].check_data(device, j, &test[i], test[i].test_data_out); - } - else if (outcome & EVENT_CHECK_DEFAULT) - { - test[i].check_data(device, j, &test[i], test[i].default_data); - } - else if (outcome & EVENT_CHECK_INITIAL) - { - test[i].check_data(device, j, &test[i], test[i].initial_data); - } + data = get_event_data(&test[i], event[j].check); + test[i].check_data(device, j, &test[i], data); } } - if (outcome & EVENT_APPLY_DATA) { - for (i=0; i < ntests; i++) - test[i].set_handler(device, &test[i], test[i].test_data_in); + if (event[j].apply != SB_DATA_NONE) + { + for (i = 0; i < ntests; ++i) + { + data = get_event_data(&test[i], event[j].apply); + test[i].set_handler(device, &test[i], data); + } } } @@ -341,51 +355,51 @@ static void execute_test_chain_all(IDirect3DDevice9 *device, struct state_test * struct event read_events[] = { - { NULL, EVENT_CHECK_INITIAL } + {NULL, SB_DATA_INITIAL, SB_DATA_NONE}, }; struct event write_read_events[] = { - { NULL, EVENT_APPLY_DATA }, - { NULL, EVENT_CHECK_TEST } + {NULL, SB_DATA_NONE, SB_DATA_TEST_IN}, + {NULL, SB_DATA_TEST, SB_DATA_NONE}, }; struct event abort_stateblock_events[] = { - { begin_stateblock, EVENT_APPLY_DATA }, - { end_stateblock, EVENT_OK }, - { abort_stateblock, EVENT_CHECK_DEFAULT } + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {abort_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, }; struct event apply_stateblock_events[] = { - { begin_stateblock, EVENT_APPLY_DATA }, - { end_stateblock, EVENT_OK }, - { apply_stateblock, EVENT_CHECK_TEST } + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {apply_stateblock, SB_DATA_TEST, SB_DATA_NONE}, }; struct event capture_reapply_stateblock_events[] = { - { begin_stateblock, EVENT_APPLY_DATA }, - { end_stateblock, EVENT_OK }, - { capture_stateblock, EVENT_CHECK_DEFAULT | EVENT_APPLY_DATA }, - { apply_stateblock, EVENT_CHECK_DEFAULT } + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {capture_stateblock, SB_DATA_DEFAULT, SB_DATA_TEST_IN}, + {apply_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, }; struct event rendertarget_switch_events[] = { - { NULL, EVENT_APPLY_DATA }, - { switch_render_target, EVENT_CHECK_TEST }, - { revert_render_target, EVENT_OK } + {NULL, SB_DATA_NONE, SB_DATA_TEST_IN}, + {switch_render_target, SB_DATA_TEST, SB_DATA_NONE}, + {revert_render_target, SB_DATA_NONE, SB_DATA_NONE}, }; struct event rendertarget_stateblock_events[] = { - { begin_stateblock, EVENT_APPLY_DATA }, - { switch_render_target, EVENT_CHECK_DEFAULT }, - { end_stateblock, EVENT_OK }, - { revert_render_target, EVENT_OK }, - { apply_stateblock, EVENT_CHECK_TEST } + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {switch_render_target, SB_DATA_DEFAULT, SB_DATA_NONE}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {revert_render_target, SB_DATA_NONE, SB_DATA_NONE}, + {apply_stateblock, SB_DATA_TEST, SB_DATA_NONE}, }; /* Setup each test for execution */

1 0

Aric Stewart : comctl32: Implement LISTVIEW_ApproximateViewRect for icon.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 8e8c5130f7a4eecaa185137f2ed5f842c4d53f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e8c5130f7a4eecaa185137f2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 5 20:41:43 2009 -0500 comctl32: Implement LISTVIEW_ApproximateViewRect for icon. --- dlls/comctl32/listview.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2f30e9a..e1e8f96 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4857,10 +4857,46 @@ static DWORD LISTVIEW_ApproximateViewRect(const LISTVIEW_INFO *infoPtr, INT nIte dwViewRect = MAKELONG(wWidth, wHeight); } + else if (infoPtr->uView == LV_VIEW_ICON) + { + UINT rows,cols; + UINT nItemWidth; + UINT nItemHeight; + + nItemWidth = infoPtr->iconSpacing.cx; + nItemHeight = infoPtr->iconSpacing.cy; + + if (nItemCount == -1) + nItemCount = infoPtr->nItemCount; + + if (wWidth == 0xffff) + wWidth = infoPtr->rcList.right - infoPtr->rcList.left; + + if (wWidth < nItemWidth) + wWidth = nItemWidth; + + cols = wWidth / nItemWidth; + if (cols > nItemCount) + cols = nItemCount; + if (cols < 1) + cols = 1; + + if (nItemCount) + { + rows = nItemCount / cols; + if (nItemCount % cols) + rows++; + } + else + rows = 0; + + wHeight = (nItemHeight * rows)+2; + wWidth = (nItemWidth * cols)+2; + + dwViewRect = MAKELONG(wWidth, wHeight); + } else if (infoPtr->uView == LV_VIEW_SMALLICON) FIXME("uView == LV_VIEW_SMALLICON: not implemented\n"); - else if (infoPtr->uView == LV_VIEW_ICON) - FIXME("uView == LV_VIEW_ICON: not implemented\n"); return dwViewRect; }

1 0

Nikolay Sivov : comctl32/monthcal: Invalidate unconditonally on MCM_SETFIRSTDAYOFWEEK.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 41db6f8500c1a631ca1606220052c820200a6396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41db6f8500c1a631ca1606220… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 04:25:45 2009 +0400 comctl32/monthcal: Invalidate unconditonally on MCM_SETFIRSTDAYOFWEEK. --- dlls/comctl32/monthcal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5a34a37..893a505 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1138,6 +1138,8 @@ MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, INT day) infoPtr->firstDayHighWord = TRUE; } + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + return prev; }

1 0

Nikolay Sivov : comctl32/monthcal: Recalculate control layout on MCS_WEEKNUMBERS style change.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 526e1d81a34c1baeb93558dc06d7ff44c176eac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=526e1d81a34c1baeb93558dc0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 03:50:02 2009 +0400 comctl32/monthcal: Recalculate control layout on MCS_WEEKNUMBERS style change. --- dlls/comctl32/monthcal.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5793ca5..5a34a37 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2191,6 +2191,10 @@ static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, infoPtr->dwStyle = lpss->styleNew; + /* make room for week numbers */ + if ((lpss->styleNew ^ lpss->styleOld) & MCS_WEEKNUMBERS) + MONTHCAL_UpdateSize(infoPtr); + return 0; }

1 0

Nikolay Sivov : comctl32/monthcal: Update day of week properly while iterating with prev/ next buttons and hit testing.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 689a9eb5df3191eaf819c6e5a334ab508da6f758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=689a9eb5df3191eaf819c6e5a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 03:19:52 2009 +0400 comctl32/monthcal: Update day of week properly while iterating with prev/next buttons and hit testing. --- dlls/comctl32/monthcal.c | 70 +++++++++++++++++++++++++-------------------- 1 files changed, 39 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 21c72d1..5793ca5 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -382,6 +382,30 @@ int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year) DayOfWeekTable[month-1] + day ) % 7); } +/* properly updates date to point on next month */ +void inline MONTHCAL_GetNextMonth(SYSTEMTIME *date) +{ + if(++date->wMonth > 12) + { + date->wMonth = 1; + date->wYear++; + } + date->wDayOfWeek = MONTHCAL_CalculateDayOfWeek(date->wDay, date->wMonth, + date->wYear); +} + +/* properly updates date to point on prev month */ +void inline MONTHCAL_GetPrevMonth(SYSTEMTIME *date) +{ + if(--date->wMonth < 1) + { + date->wMonth = 12; + date->wYear--; + } + date->wDayOfWeek = MONTHCAL_CalculateDayOfWeek(date->wDay, date->wMonth, + date->wYear); +} + /* From a given point, calculate the row (weekpos), column(daypos) and day in the calendar. day== 0 mean the last day of tha last month */ @@ -1245,7 +1269,7 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) if(!curSel) return FALSE; if(infoPtr->dwStyle & MCS_MULTISELECT) return FALSE; - *curSel = infoPtr->minSel; + *curSel = infoPtr->curSel; TRACE("%d/%d/%d\n", curSel->wYear, curSel->wMonth, curSel->wDay); return TRUE; } @@ -1499,36 +1523,28 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) if(PtInRect(&infoPtr->days, lpht->pt)) { lpht->st.wYear = infoPtr->curSel.wYear; - if ( day < 1) + lpht->st.wMonth = infoPtr->curSel.wMonth; + if (day < 1) { retval = MCHT_CALENDARDATEPREV; - lpht->st.wMonth = infoPtr->curSel.wMonth - 1; - if (lpht->st.wMonth < 1) - { - lpht->st.wMonth = 12; - lpht->st.wYear--; - } - lpht->st.wDay = MONTHCAL_MonthLength(lpht->st.wMonth,lpht->st.wYear) + day; + MONTHCAL_GetPrevMonth(&lpht->st); + lpht->st.wDay = MONTHCAL_MonthLength(lpht->st.wMonth, lpht->st.wYear) + day; } - else if (day > MONTHCAL_MonthLength(infoPtr->curSel.wMonth,infoPtr->curSel.wYear)) + else if (day > MONTHCAL_MonthLength(infoPtr->curSel.wMonth, infoPtr->curSel.wYear)) { retval = MCHT_CALENDARDATENEXT; - lpht->st.wMonth = infoPtr->curSel.wMonth + 1; - if (lpht->st.wMonth > 12) - { - lpht->st.wMonth = 1; - lpht->st.wYear++; - } - lpht->st.wDay = day - MONTHCAL_MonthLength(infoPtr->curSel.wMonth,infoPtr->curSel.wYear); + MONTHCAL_GetNextMonth(&lpht->st); + lpht->st.wDay = day - MONTHCAL_MonthLength(infoPtr->curSel.wMonth, infoPtr->curSel.wYear); } else { retval = MCHT_CALENDARDATE; - lpht->st.wMonth = infoPtr->curSel.wMonth; - lpht->st.wDay = day; - lpht->st.wDayOfWeek = MONTHCAL_CalculateDayOfWeek(day,lpht->st.wMonth,lpht->st.wYear); + lpht->st.wDay = day; } + /* always update day of week */ + lpht->st.wDayOfWeek = MONTHCAL_CalculateDayOfWeek(day, lpht->st.wMonth, + lpht->st.wYear); goto done; - } + } if(PtInRect(&infoPtr->todayrect, lpht->pt)) { retval = MCHT_TODAYLINK; goto done; @@ -1575,11 +1591,7 @@ static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) TRACE("\n"); - next.wMonth++; - if(next.wMonth > 12) { - next.wYear++; - next.wMonth = 1; - } + MONTHCAL_GetNextMonth(&next); if(!MONTHCAL_IsDateInValidRange(infoPtr, &next)) return; @@ -1595,11 +1607,7 @@ static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) TRACE("\n"); - prev.wMonth--; - if(prev.wMonth < 1) { - prev.wYear--; - prev.wMonth = 12; - } + MONTHCAL_GetPrevMonth(&prev); if(!MONTHCAL_IsDateInValidRange(infoPtr, &prev)) return;

1 0

Nikolay Sivov : comctl32/monthcal: Use a timer to auto update today date memory.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 6b5c6645b91922c846ab4df8b3835e95a824822a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b5c6645b91922c846ab4df8b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 00:58:22 2009 +0400 comctl32/monthcal: Use a timer to auto update today date memory. --- dlls/comctl32/monthcal.c | 67 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 56 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 34528f6..a2c7aaa 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -63,10 +63,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(monthcal); #define MC_SEL_LBUTDOWN 2 /* Left button pressed in calendar */ #define MC_PREVPRESSED 4 /* Prev month button pressed */ #define MC_NEXTPRESSED 8 /* Next month button pressed */ -#define MC_NEXTMONTHDELAY 350 /* when continuously pressing `next */ - /* month', wait 500 ms before going */ - /* to the next month */ +#define MC_PREVNEXTMONTHDELAY 350 /* when continuously pressing `next/prev + month', wait 500 ms before going + to the next/prev month */ +#define MC_TODAYUPDATEDELAY 120000 /* time between today check for update (2 min) */ + #define MC_PREVNEXTMONTHTIMER 1 /* Timer ID's */ +#define MC_TODAYUPDATETIMER 2 #define countof(arr) (sizeof(arr)/sizeof(arr[0])) @@ -98,6 +101,7 @@ typedef struct int monthRange; MONTHDAYSTATE *monthdayState; SYSTEMTIME todaysDate; + BOOL todaySet; /* Today was forced with MCM_SETTODAY */ int status; /* See MC_SEL flags */ SYSTEMTIME firstSel; /* first selected day */ INT maxSelCount; @@ -1380,22 +1384,46 @@ MONTHCAL_GetToday(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *today) return TRUE; } +/* Internal helper for MCM_SETTODAY handler and auto update timer handler + * + * RETURN VALUE + * + * TRUE - today date changed + * FALSE - today date isn't changed + */ +static BOOL +MONTHCAL_UpdateToday(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *today) +{ + RECT new_r, old_r; + + if(MONTHCAL_IsDateEqual(today, &infoPtr->todaysDate)) return FALSE; + MONTHCAL_CalcPosFromDay(infoPtr, infoPtr->todaysDate.wDay, + infoPtr->todaysDate.wMonth, &old_r); + MONTHCAL_CalcPosFromDay(infoPtr, today->wDay, today->wMonth, &new_r); + + infoPtr->todaysDate = *today; + + /* only two days need redrawing */ + InvalidateRect(infoPtr->hwndSelf, &old_r, FALSE); + InvalidateRect(infoPtr->hwndSelf, &new_r, FALSE); + return TRUE; +} + +/* MCM_SETTODAT handler */ static LRESULT -MONTHCAL_SetToday(MONTHCAL_INFO *infoPtr, SYSTEMTIME *today) +MONTHCAL_SetToday(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *today) { TRACE("%p\n", today); if(!today) return FALSE; - if(MONTHCAL_IsDateEqual(today, &infoPtr->todaysDate)) return TRUE; + /* remember if date was set successfully */ + if(MONTHCAL_UpdateToday(infoPtr, today)) infoPtr->todaySet = TRUE; - infoPtr->todaysDate = *today; - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return TRUE; } - static LRESULT MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) { @@ -1678,14 +1706,14 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) case MCHT_TITLEBTNNEXT: MONTHCAL_GoToNextMonth(infoPtr); infoPtr->status = MC_NEXTPRESSED; - SetTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER, MC_NEXTMONTHDELAY, 0); + SetTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER, MC_PREVNEXTMONTHDELAY, 0); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return 0; case MCHT_TITLEBTNPREV: MONTHCAL_GoToPrevMonth(infoPtr); infoPtr->status = MC_PREVPRESSED; - SetTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER, MC_NEXTMONTHDELAY, 0); + SetTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER, MC_PREVNEXTMONTHDELAY, 0); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return 0; @@ -1834,6 +1862,20 @@ MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM id) if(infoPtr->status & MC_PREVPRESSED) MONTHCAL_GoToPrevMonth(infoPtr); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); break; + case MC_TODAYUPDATETIMER: + { + SYSTEMTIME st; + + if(infoPtr->todaySet) return 0; + + GetLocalTime(&st); + MONTHCAL_UpdateToday(infoPtr, &st); + + /* notification sent anyway */ + MONTHCAL_NotifySelectionChange(infoPtr); + + return 0; + } default: ERR("got unknown timer %ld\n", id); break; @@ -2211,7 +2253,10 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) /* call MONTHCAL_UpdateSize to set all of the dimensions */ /* of the control */ MONTHCAL_UpdateSize(infoPtr); - + + /* today auto update timer, to be freed only on control destruction */ + SetTimer(infoPtr->hwndSelf, MC_TODAYUPDATETIMER, MC_TODAYUPDATEDELAY, 0); + OpenThemeData (infoPtr->hwndSelf, themeClass); return 0;

1 0

Marcus Meissner : wpp: Fixed resource leakages (Coverity).
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 15968fadef203d45620709d341fc397841210b7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=15968fadef203d45620709d34… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 7 08:59:22 2009 +0200 wpp: Fixed resource leakages (Coverity). --- libs/wpp/wpp.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index e6a1a83..afca1bb 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -216,12 +216,16 @@ int wpp_parse_temp( const char *input, const char *output_base, char **output_na if((fd = mkstemps( temp_name, 0 )) == -1) { ppy_error("Could not generate a temp name from %s\n", temp_name); + free( temp_name ); return 2; } if (!(output = fdopen(fd, "wt"))) { ppy_error("Could not open fd %s for writing\n", temp_name); + close( fd ); + unlink( temp_name ); + free( temp_name ); return 2; }

1 0

Jacek Caban : jscript: Call SetSite on created ActiveX object.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 06f26f53f73636feebd97e6c94c6ca86b17d6336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f26f53f73636feebd97e6c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 6 21:23:14 2009 +0200 jscript: Call SetSite on created ActiveX object. --- dlls/jscript/activex.c | 13 +++++- dlls/jscript/jscript.c | 99 ++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.h | 2 + dlls/jscript/tests/activex.c | 91 +++++++++++++++++++++++++++++++++++++- 4 files changed, 202 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index 027a2e2..8af4eb7 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -117,8 +117,19 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) hres = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void**)&obj_site); if(SUCCEEDED(hres)) { - FIXME("Set object site\n"); + IUnknown *ax_site; + + ax_site = create_ax_site(ctx); + if(ax_site) { + hres = IObjectWithSite_SetSite(obj_site, ax_site); + IUnknown_Release(ax_site); + } IObjectWithSite_Release(obj_site); + if(!ax_site || FAILED(hres)) { + IObjectWithSite_Release(obj_site); + IUnknown_Release(obj); + return NULL; + } } return obj; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 90a5b47..eb41835 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -159,6 +159,105 @@ static HRESULT set_ctx_site(JScript *This) return S_OK; } +typedef struct { + const IServiceProviderVtbl *lpIServiceProviderVtbl; + + LONG ref; + + IServiceProvider *sp; +} AXSite; + +#define SERVPROV(x) ((IServiceProvider*) &(x)->lpIServiceProviderVtbl) + +#define SERVPROV_THIS(iface) DEFINE_THIS(AXSite, IServiceProvider, iface) + +static HRESULT WINAPI AXSite_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + AXSite *This = SERVPROV_THIS(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = SERVPROV(This); + }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + *ppv = SERVPROV(This); + }else { + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI AXSite_AddRef(IServiceProvider *iface) +{ + AXSite *This = SERVPROV_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI AXSite_Release(IServiceProvider *iface) +{ + AXSite *This = SERVPROV_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI AXSite_QueryService(IServiceProvider *iface, + REFGUID guidService, REFIID riid, void **ppv) +{ + AXSite *This = SERVPROV_THIS(iface); + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + return IServiceProvider_QueryService(This->sp, guidService, riid, ppv); +} + +#undef SERVPROV_THIS + +static IServiceProviderVtbl AXSiteVtbl = { + AXSite_QueryInterface, + AXSite_AddRef, + AXSite_Release, + AXSite_QueryService +}; + +IUnknown *create_ax_site(script_ctx_t *ctx) +{ + IServiceProvider *sp; + AXSite *ret; + HRESULT hres; + + hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IServiceProvider, (void**)&sp); + if(FAILED(hres)) { + ERR("Could not get IServiceProvider iface: %08x\n", hres); + return NULL; + } + + ret = heap_alloc(sizeof(AXSite)); + if(!ret) { + IServiceProvider_Release(sp); + return NULL; + } + + ret->lpIServiceProviderVtbl = &AXSiteVtbl; + ret->ref = 1; + ret->sp = sp; + + return (IUnknown*)SERVPROV(ret); +} + #define ACTSCRIPT_THIS(iface) DEFINE_THIS(JScript, IActiveScript, iface) static HRESULT WINAPI JScript_QueryInterface(IActiveScript *iface, REFIID riid, void **ppv) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 4451669..cde1e1b 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -309,6 +309,8 @@ HRESULT create_object_constr(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_regexp_constr(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_string_constr(script_ctx_t*,DispatchEx*,DispatchEx**); +IUnknown *create_ax_site(script_ctx_t*); + typedef struct { const WCHAR *str; DWORD len; diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index cd7b5a0..4826910 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -67,6 +67,7 @@ DEFINE_EXPECT(reportSuccess); DEFINE_EXPECT(Host_QS_SecMgr); DEFINE_EXPECT(Caller_QS_SecMgr); DEFINE_EXPECT(QI_IObjectWithSite); +DEFINE_EXPECT(SetSite); static const WCHAR testW[] = {'t','e','s','t',0}; @@ -78,6 +79,7 @@ static HRESULT QueryCustomPolicy_hres; static DWORD QueryCustomPolicy_psize; static DWORD QueryCustomPolicy_policy; static HRESULT QI_IDispatch_hres; +static HRESULT SetSite_hres; #define TESTOBJ_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}" @@ -123,6 +125,56 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(buf, stra); } +static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ULONG WINAPI ObjectWithSite_AddRef(IObjectWithSite *iface) +{ + return 2; +} + +static ULONG WINAPI ObjectWithSite_Release(IObjectWithSite *iface) +{ + return 1; +} + +static HRESULT WINAPI ObjectWithSite_SetSite(IObjectWithSite *iface, IUnknown *pUnkSite) +{ + IServiceProvider *sp; + HRESULT hres; + + + CHECK_EXPECT(SetSite); + ok(pUnkSite != NULL, "pUnkSite == NULL\n"); + + hres = IUnknown_QueryInterface(pUnkSite, &IID_IServiceProvider, (void**)&sp); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + IServiceProvider_Release(sp); + + return SetSite_hres; +} + +static HRESULT WINAPI ObjectWithSite_GetSite(IObjectWithSite *iface, REFIID riid, void **ppvSite) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IObjectWithSiteVtbl ObjectWithSiteVtbl = { + ObjectWithSite_QueryInterface, + ObjectWithSite_AddRef, + ObjectWithSite_Release, + ObjectWithSite_SetSite, + ObjectWithSite_GetSite +}; + +static IObjectWithSite ObjectWithSite = { &ObjectWithSiteVtbl }; + +static IObjectWithSite *object_with_site; + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -135,12 +187,12 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, *ppv = iface; }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { CHECK_EXPECT(QI_IObjectWithSite); - return E_NOINTERFACE; + *ppv = object_with_site; }else { return E_NOINTERFACE; } - return S_OK; + return *ppv ? S_OK : E_NOINTERFACE; } static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface) @@ -663,6 +715,7 @@ static IActiveScriptParse *create_script(void) QueryCustomPolicy_psize = sizeof(DWORD); QueryCustomPolicy_policy = URLPOLICY_ALLOW; QI_IDispatch_hres = S_OK; + SetSite_hres = S_OK; hres = CoCreateInstance(&CLSID_JScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IActiveScript, (void**)&script); @@ -925,6 +978,40 @@ static void test_ActiveXObject(void) CHECK_CALLED(QueryCustomPolicy); IUnknown_Release(parser); + + parser = create_script(); + object_with_site = &ObjectWithSite; + + SET_EXPECT(Host_QS_SecMgr); + SET_EXPECT(ProcessUrlAction); + SET_EXPECT(CreateInstance); + SET_EXPECT(QueryCustomPolicy); + SET_EXPECT(QI_IObjectWithSite); + SET_EXPECT(SetSite); + SET_EXPECT(reportSuccess); + parse_script_a(parser, "(new ActiveXObject('Wine.Test')).reportSuccess();"); + CHECK_CALLED(Host_QS_SecMgr); + CHECK_CALLED(ProcessUrlAction); + CHECK_CALLED(CreateInstance); + CHECK_CALLED(QueryCustomPolicy); + CHECK_CALLED(QI_IObjectWithSite); + CHECK_CALLED(SetSite); + CHECK_CALLED(reportSuccess); + + SetSite_hres = E_FAIL; + SET_EXPECT(ProcessUrlAction); + SET_EXPECT(CreateInstance); + SET_EXPECT(QueryCustomPolicy); + SET_EXPECT(QI_IObjectWithSite); + SET_EXPECT(SetSite); + parse_script_a(parser, "testException(function() { new ActiveXObject('Wine.Test'); }, 'Error', -2146827859);"); + CHECK_CALLED(ProcessUrlAction); + CHECK_CALLED(CreateInstance); + CHECK_CALLED(QueryCustomPolicy); + CHECK_CALLED(QI_IObjectWithSite); + CHECK_CALLED(SetSite); + + IUnknown_Release(parser); } static BOOL init_key(const char *key_name, const char *def_value, BOOL init)

1 0