October 2009 - Wine-commits

Alexandre Julliard : advapi32: Use strict prototypes in the VTableProvStruc definition.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: a54bd70bac52e8901be77b23a62d5ec35a0f8ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54bd70bac52e8901be77b23a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 13:31:12 2009 +0200 advapi32: Use strict prototypes in the VTableProvStruc definition. --- dlls/advapi32/crypt.c | 11 ++++------- include/wincrypt.h | 9 +++++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index d1fc25d..a26770e 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -182,12 +182,9 @@ static BOOL CALLBACK CRYPT_VerifyImage(LPCSTR lpszImage, BYTE* pData) return TRUE; } -static BOOL CALLBACK CRYPT_ReturnhWnd(HWND *phWnd) +static void CALLBACK CRYPT_ReturnhWnd(HWND *phWnd) { - if (!phWnd) - return FALSE; - *phWnd = crypt_hWindow; - return TRUE; + if (phWnd) *phWnd = crypt_hWindow; } #define CRYPT_GetProvFunc(name) \ @@ -242,8 +239,8 @@ static PCRYPTPROV CRYPT_LoadProvider(PCWSTR pImage) * Does it need memory allocation? */ provider->pVTable->Version = 3; - provider->pVTable->pFuncVerifyImage = (FARPROC)CRYPT_VerifyImage; - provider->pVTable->pFuncReturnhWnd = (FARPROC)CRYPT_ReturnhWnd; + provider->pVTable->FuncVerifyImage = CRYPT_VerifyImage; + provider->pVTable->FuncReturnhWnd = CRYPT_ReturnhWnd; provider->pVTable->dwProvType = 0; provider->pVTable->pbContextInfo = NULL; provider->pVTable->cbContextInfo = 0; diff --git a/include/wincrypt.h b/include/wincrypt.h index 067dd7c..0aef72e 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -680,8 +680,13 @@ typedef struct _CRYPT_SMIME_CAPABILITIES { typedef struct _VTableProvStruc { DWORD Version; - FARPROC pFuncVerifyImage; - FARPROC pFuncReturnhWnd; +#ifdef WINE_STRICT_PROTOTYPES + BOOL (WINAPI *FuncVerifyImage)(LPCSTR,BYTE*); + void (WINAPI *FuncReturnhWnd)(HWND*); +#else + FARPROC FuncVerifyImage; + FARPROC FuncReturnhWnd; +#endif DWORD dwProvType; BYTE *pbContextInfo; DWORD cbContextInfo;

1 0

Alexandre Julliard : winhlp32: Use explicit prototypes for the dll callbacks.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: e2d22db7b9ec325d614806f2ef97cd3587a11506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d22db7b9ec325d614806f2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 13:31:32 2009 +0200 winhlp32: Use explicit prototypes for the dll callbacks. --- programs/winhlp32/callback.c | 38 +++++++++++++++++++------------------- programs/winhlp32/macro.c | 2 +- programs/winhlp32/winhelp.h | 24 ++++++++++++++++++++++-- 3 files changed, 42 insertions(+), 22 deletions(-) diff --git a/programs/winhlp32/callback.c b/programs/winhlp32/callback.c index 0b3e62e..5193861 100644 --- a/programs/winhlp32/callback.c +++ b/programs/winhlp32/callback.c @@ -158,23 +158,23 @@ static LONG CALLBACK WHD_API(LPSTR x, WORD xx, DWORD xxx) return 0; } -FARPROC Callbacks[] = -{ - (FARPROC)WHD_GetFSError, - (FARPROC)WHD_Open, - (FARPROC)WHD_Close, - (FARPROC)WHD_OpenBag, - (FARPROC)WHD_CloseBag, - (FARPROC)WHD_ReadBag, - (FARPROC)WHD_TellBag, - (FARPROC)WHD_SeekBag, - (FARPROC)WHD_IsEofBag, - (FARPROC)WHD_SizeBag, - (FARPROC)WHD_Access, - (FARPROC)WHD_LLInfoFromBag, - (FARPROC)WHD_LLInfoFromFile, - (FARPROC)WHD_Error, - (FARPROC)WHD_ErrorString, - (FARPROC)WHD_GetInfo, - (FARPROC)WHD_API +const struct winhelp_callbacks Callbacks = +{ + WHD_GetFSError, + WHD_Open, + WHD_Close, + WHD_OpenBag, + WHD_CloseBag, + WHD_ReadBag, + WHD_TellBag, + WHD_SeekBag, + WHD_IsEofBag, + WHD_SizeBag, + WHD_Access, + WHD_LLInfoFromBag, + WHD_LLInfoFromFile, + WHD_Error, + WHD_ErrorString, + WHD_GetInfo, + WHD_API }; diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index fdec6b3..9fa99ec 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -735,7 +735,7 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) : DC_NOMSG; WINE_TRACE("Got class %x for DLL %s\n", dll->class, dll_name); if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0); - if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD)Callbacks, 0); + if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (LONG_PTR)&Callbacks, 0); } else WINE_WARN("OOM\n"); } diff --git a/programs/winhlp32/winhelp.h b/programs/winhlp32/winhelp.h index e770cb5..e163d90 100644 --- a/programs/winhlp32/winhelp.h +++ b/programs/winhlp32/winhelp.h @@ -115,7 +115,7 @@ typedef struct tagWinHelp #define DW_ACTIVATE 9 #define DW_CALLBACKS 10 -typedef long (CALLBACK *WINHELP_LDLLHandler)(WORD, LONG, LONG); +typedef LONG (CALLBACK *WINHELP_LDLLHandler)(WORD, LONG_PTR, LONG_PTR); typedef struct tagDll { @@ -140,8 +140,28 @@ typedef struct HFONT hButtonFont; } WINHELP_GLOBALS; +extern const struct winhelp_callbacks +{ + WORD (WINAPI *GetFSError)(void); + HANDLE (WINAPI *HfsOpenSz)(LPSTR,BYTE); + WORD (WINAPI *RcCloseHfs)(HANDLE); + HANDLE (WINAPI *HfOpenHfs)(HANDLE,LPSTR,BYTE); + HANDLE (WINAPI *RcCloseHf)(HANDLE); + LONG (WINAPI *LcbReadHf)(HANDLE,BYTE*,LONG); + LONG (WINAPI *LTellHf)(HANDLE); + LONG (WINAPI *LSeekHf)(HANDLE,LONG,WORD); + BOOL (WINAPI *FEofHf)(HANDLE); + LONG (WINAPI *LcbSizeHf)(HANDLE); + BOOL (WINAPI *FAccessHfs)(HANDLE,LPSTR,BYTE); + WORD (WINAPI *RcLLInfoFromHf)(HANDLE,WORD,LPWORD,LPLONG,LPLONG); + WORD (WINAPI *RcLLInfoFromHfs)(HANDLE,LPSTR,WORD,LPWORD,LPLONG,LPLONG); + void (WINAPI *ErrorW)(int); + void (WINAPI *ErrorSz)(LPSTR); + ULONG_PTR (WINAPI *GetInfo)(WORD,HWND); + LONG (WINAPI *API)(LPSTR,WORD,DWORD); +} Callbacks; + extern WINHELP_GLOBALS Globals; -extern FARPROC Callbacks[]; BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int, BOOL); BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*)(HLPFILE*, LONG, ULONG*),

1 0

Alexandre Julliard : winhlp32: Don' t use FARPROC for functions that take variable number of arguments.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 15751f2031fad77edcf7d389078110c30b3c4c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=15751f2031fad77edcf7d3890… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 13:40:00 2009 +0200 winhlp32: Don't use FARPROC for functions that take variable number of arguments. --- programs/winhlp32/macro.c | 186 ++++++++++++++++++++-------------------- programs/winhlp32/macro.lex.l | 69 +++++++++++++--- 2 files changed, 150 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15751f2031fad77edcf7d…

1 0

Aric Stewart : comctl32: Implement LISTVIEW_ApproximateViewRect for icon.
by Alexandre Julliard 07 Oct '09

07 Oct '09

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

Aric Stewart : comctl32/tests: LISTVIEW_ApproximateViewRect tests for LV_VIEW_ICON.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: c885bd16c7be1d40007f68cae259dba6dc293872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c885bd16c7be1d40007f68cae… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 5 20:42:08 2009 -0500 comctl32/tests: LISTVIEW_ApproximateViewRect tests for LV_VIEW_ICON. --- dlls/comctl32/tests/listview.c | 75 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 31b09a3..c9551a1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4021,6 +4021,80 @@ static void test_LVS_EX_TRANSPARENTBKGND(void) DestroyWindow(hwnd); } +void test_ApproximateViewRect(void) +{ + HWND hwnd; + DWORD ret; + INT cx, cy; + HIMAGELIST himl; + HBITMAP hbmp; + LVITEMA itema; + static CHAR test[] = "abracadabra, a very long item label"; + + cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); + cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); + + hwnd = create_custom_listview_control(LVS_ICON); + himl = ImageList_Create(40, 40, 0, 4, 4); + ok(himl != NULL, "failed to create imagelist\n"); + hbmp = CreateBitmap(40, 40, 1, 1, NULL); + ok(hbmp != NULL, "failed to create bitmap\n"); + ret = ImageList_Add(himl, hbmp, 0); + expect(0, ret); + ret = SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl); + expect(0, ret); + + itema.mask = LVIF_IMAGE; + itema.iImage = 0; + itema.iItem = 0; + itema.iSubItem = 0; + ret = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM)&itema); + expect(0, ret); + + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(75, 75)); + if (ret == 0) + { + /* version 4.0 */ + win_skip("LVM_SETICONSPACING unimplemented. Skipping.\n"); + return; + } + + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 11, MAKELPARAM(100,100)); + ok(MAKELONG(77,827)==ret,"Incorrect Approximate rect\n"); + + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(50, 50)); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 11, MAKELPARAM(100,100)); + ok(MAKELONG(102,302)==ret,"Incorrect Approximate rect\n"); + + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, -1, MAKELPARAM(100,100)); + ok(MAKELONG(52,52)==ret,"Incorrect Approximate rect\n"); + + itema.pszText = test; + ret = SendMessage(hwnd, LVM_SETITEMTEXT, 0, (LPARAM)&itema); + expect(TRUE, ret); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, -1, MAKELPARAM(100,100)); + ok(MAKELONG(52,52)==ret,"Incorrect Approximate rect\n"); + + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 0, MAKELPARAM(100,100)); + ok(MAKELONG(52,2)==ret,"Incorrect Approximate rect\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 1, MAKELPARAM(100,100)); + ok(MAKELONG(52,52)==ret,"Incorrect Approximate rect\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 2, MAKELPARAM(100,100)); + ok(MAKELONG(102,52)==ret,"Incorrect Approximate rect\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 3, MAKELPARAM(100,100)); + ok(MAKELONG(102,102)==ret,"Incorrect Approximate rect\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 4, MAKELPARAM(100,100)); + ok(MAKELONG(102,102)==ret,"Incorrect Approximate rect\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 5, MAKELPARAM(100,100)); + ok(MAKELONG(102,152)==ret,"Incorrect Approximate rect\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 6, MAKELPARAM(100,100)); + ok(MAKELONG(102,152)==ret,"Incorrect Approximate rect\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 7, MAKELPARAM(160,100)); + ok(MAKELONG(152,152)==ret,"Incorrect Approximate rect\n"); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4077,6 +4151,7 @@ START_TEST(listview) test_indentation(); test_getitemspacing(); test_getcolumnwidth(); + test_ApproximateViewRect(); if (!load_v6_module(&ctx_cookie)) {

1 0

Aurimas Fišeras : jscript: Update Lithuanian translation.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 50b8c47d197661fdff85e6c2a9cd9895d3c9de8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=50b8c47d197661fdff85e6c2a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Oct 6 18:53:15 2009 +0300 jscript: Update Lithuanian translation. --- dlls/jscript/jscript_Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Lt.rc b/dlls/jscript/jscript_Lt.rc index 83c0680..4d39895 100644 --- a/dlls/jscript/jscript_Lt.rc +++ b/dlls/jscript/jscript_Lt.rc @@ -27,6 +27,7 @@ STRINGTABLE DISCARDABLE { IDS_TO_PRIMITIVE "Klaida keičiant objektą į primityvų tipą" IDS_INVALID_CALL_ARG "Netinkamas kreipinys į procedūrą ar argumentas" + IDS_CREATE_OBJ_ERROR "Automatizacijos serveriui nepavyko sukurti objekto" IDS_NO_PROPERTY "Objektas nepalaiko šios savybės ar metodo" IDS_ARG_NOT_OPT "Argumentas nėra neprivalomas" IDS_SYNTAX_ERROR "Sintaksės klaida"

1 0

Damjan Jovanovic : sti: Allow CoCreateInstance aggregation and fix a broken test.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 0dea7326c333078e02b99d618002f1d21e0244b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dea7326c333078e02b99d618… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Oct 6 19:15:40 2009 +0200 sti: Allow CoCreateInstance aggregation and fix a broken test. --- dlls/sti/sti_main.c | 3 --- dlls/sti/tests/sti.c | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/sti/sti_main.c b/dlls/sti/sti_main.c index 15c946d..4e91698 100644 --- a/dlls/sti/sti_main.c +++ b/dlls/sti/sti_main.c @@ -97,9 +97,6 @@ static HRESULT WINAPI sti_cf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOu *ppobj = NULL; - if (pOuter) - return CLASS_E_NOAGGREGATION; - r = This->pfnCreateInstance( riid, pOuter, (LPVOID *)&punk ); if (FAILED(r)) return r; diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index 9a1aeee..0575d29 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -218,7 +218,9 @@ static void test_stillimage_aggregation(void) if (SUCCEEDED(hr)) IStillImage_Release(pStiW); hr = CoCreateInstance(&CLSID_Sti, &aggregator, CLSCTX_ALL, &IID_IUnknown, (void**)&pUnknown); - ok(FAILED(hr), "CoCreateInstance unexpectedly succeeded when querying for IUnknown during aggregation\n"); + ok(SUCCEEDED(hr) || + broken(hr == CLASS_E_NOAGGREGATION), /* Win 2000 */ + "CoCreateInstance unexpectedly failed when querying for IUnknown during aggregation, hr = 0x%x\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(pUnknown); }

1 0

Jacek Caban : jscript: Call SetSite on created ActiveX object.
by Alexandre Julliard 07 Oct '09

07 Oct '09

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

Nikolay Sivov : comctl32/monthcal: Use a single timer for auto month scroll with prev/next buttons.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 70eb6c0385cf8e2c9cd2d9303a32bd20bdb5a57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=70eb6c0385cf8e2c9cd2d9303… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 6 23:23:55 2009 +0400 comctl32/monthcal: Use a single timer for auto month scroll with prev/next buttons. --- dlls/comctl32/monthcal.c | 43 ++++++++++++++----------------------------- 1 files changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 42710c0..34528f6 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -66,8 +66,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(monthcal); #define MC_NEXTMONTHDELAY 350 /* when continuously pressing `next */ /* month', wait 500 ms before going */ /* to the next month */ -#define MC_NEXTMONTHTIMER 1 /* Timer ID's */ -#define MC_PREVMONTHTIMER 2 +#define MC_PREVNEXTMONTHTIMER 1 /* Timer ID's */ #define countof(arr) (sizeof(arr)/sizeof(arr[0])) @@ -1679,14 +1678,14 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) case MCHT_TITLEBTNNEXT: MONTHCAL_GoToNextMonth(infoPtr); infoPtr->status = MC_NEXTPRESSED; - SetTimer(infoPtr->hwndSelf, MC_NEXTMONTHTIMER, MC_NEXTMONTHDELAY, 0); + SetTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER, MC_NEXTMONTHDELAY, 0); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return 0; case MCHT_TITLEBTNPREV: MONTHCAL_GoToPrevMonth(infoPtr); infoPtr->status = MC_PREVPRESSED; - SetTimer(infoPtr->hwndSelf, MC_PREVMONTHTIMER, MC_NEXTMONTHDELAY, 0); + SetTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER, MC_NEXTMONTHDELAY, 0); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return 0; @@ -1767,14 +1766,9 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) TRACE("\n"); - if(infoPtr->status & MC_NEXTPRESSED) { - KillTimer(infoPtr->hwndSelf, MC_NEXTMONTHTIMER); - infoPtr->status &= ~MC_NEXTPRESSED; - redraw = TRUE; - } - if(infoPtr->status & MC_PREVPRESSED) { - KillTimer(infoPtr->hwndSelf, MC_PREVMONTHTIMER); - infoPtr->status &= ~MC_PREVPRESSED; + if(infoPtr->status & (MC_PREVPRESSED | MC_NEXTPRESSED)) { + KillTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER); + infoPtr->status &= ~(MC_PREVPRESSED | MC_NEXTPRESSED); redraw = TRUE; } @@ -1830,30 +1824,21 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) static LRESULT -MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM wParam) +MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM id) { - BOOL redraw = FALSE; - - TRACE("%ld\n", wParam); + TRACE("%ld\n", id); - switch(wParam) { - case MC_NEXTMONTHTIMER: - redraw = TRUE; - MONTHCAL_GoToNextMonth(infoPtr); - break; - case MC_PREVMONTHTIMER: - redraw = TRUE; - MONTHCAL_GoToPrevMonth(infoPtr); + switch(id) { + case MC_PREVNEXTMONTHTIMER: + if(infoPtr->status & MC_NEXTPRESSED) MONTHCAL_GoToNextMonth(infoPtr); + if(infoPtr->status & MC_PREVPRESSED) MONTHCAL_GoToPrevMonth(infoPtr); + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); break; default: - ERR("got unknown timer\n"); + ERR("got unknown timer %ld\n", id); break; } - /* redraw only if necessary */ - if(redraw) - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - return 0; }

1 0

Nikolay Sivov : comctl32/monthcal: Use a timer to auto update today date memory.
by Alexandre Julliard 07 Oct '09

07 Oct '09

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