wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Andrew Talbot : amstream: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 3a53ea339897ed6bb02547f03a84bf4aefc210d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a53ea339897ed6bb02547f03… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 12 20:51:53 2012 +0000 amstream: Avoid signed-unsigned integer comparisons. --- dlls/amstream/mediastreamfilter.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index afd080a..bfec0f0 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -78,7 +78,7 @@ static HRESULT WINAPI BasePinImpl_CheckMediaType(BasePin *This, const AM_MEDIA_T { IMediaStreamFilterImpl *filter = impl_from_IMediaStreamFilter((IMediaStreamFilter*)This->pinInfo.pFilter); MSPID purpose_id; - int i; + ULONG i; TRACE("Checking media type %s - %s\n", debugstr_guid(&pmt->majortype), debugstr_guid(&pmt->subtype)); @@ -130,7 +130,7 @@ static HRESULT WINAPI BasePinImp_GetMediaType(BasePin *This, int index, AM_MEDIA { IMediaStreamFilterImpl *filter = (IMediaStreamFilterImpl*)This->pinInfo.pFilter; MSPID purpose_id; - int i; + ULONG i; /* FIXME: Reset structure as we only fill majortype and minortype for now */ ZeroMemory(amt, sizeof(*amt)); @@ -245,7 +245,7 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) if (!ref) { - int i; + ULONG i; for (i = 0; i < This->nb_streams; i++) { IMediaStream_Release(This->streams[i]);

1 0

Ken Thomases : servicemodelreg: Keep debug channel name to 14 characters or fewer.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 132ea59aff8e58e6f90fb3a354daff7226bf7b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=132ea59aff8e58e6f90fb3a35… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 12 14:32:37 2012 -0600 servicemodelreg: Keep debug channel name to 14 characters or fewer. --- programs/servicemodelreg/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/servicemodelreg/main.c b/programs/servicemodelreg/main.c index 7db760e..8c89464 100644 --- a/programs/servicemodelreg/main.c +++ b/programs/servicemodelreg/main.c @@ -18,7 +18,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(servicemodelreg); +WINE_DEFAULT_DEBUG_CHANNEL(svcmodelreg); int wmain(int argc, WCHAR *argv[]) {

1 0

Austin English : d3d11: Add a stub dll.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 1d1cb5236e6aa5ee215b1f6e653f2e92830c0427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1cb5236e6aa5ee215b1f6e6… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 11 14:11:49 2012 -0800 d3d11: Add a stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3d11/Makefile.in | 3 +++ dlls/d3d11/d3d11.spec | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 6ddb15f..e96750d 100755 --- a/configure +++ b/configure @@ -15401,6 +15401,7 @@ wine_fn_config_dll d3d10 enable_d3d10 implib wine_fn_config_test dlls/d3d10/tests d3d10_test wine_fn_config_dll d3d10core enable_d3d10core implib wine_fn_config_test dlls/d3d10core/tests d3d10core_test +wine_fn_config_dll d3d11 enable_d3d11 wine_fn_config_dll d3d8 enable_d3d8 implib wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 implib diff --git a/configure.ac b/configure.ac index 01d84cd..2a4ea4e 100644 --- a/configure.ac +++ b/configure.ac @@ -2580,6 +2580,7 @@ WINE_CONFIG_DLL(d3d10,,[implib]) WINE_CONFIG_TEST(dlls/d3d10/tests) WINE_CONFIG_DLL(d3d10core,,[implib]) WINE_CONFIG_TEST(dlls/d3d10core/tests) +WINE_CONFIG_DLL(d3d11) WINE_CONFIG_DLL(d3d8,,[implib]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[implib]) diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in new file mode 100644 index 0000000..ef3c5a0 --- /dev/null +++ b/dlls/d3d11/Makefile.in @@ -0,0 +1,3 @@ +MODULE = d3d11.dll + +@MAKE_DLL_RULES@ diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec new file mode 100644 index 0000000..0ff00d2 --- /dev/null +++ b/dlls/d3d11/d3d11.spec @@ -0,0 +1,42 @@ +@ stub D3D11CoreCreateDevice +@ stub D3D11CoreCreateLayeredDevice +@ stub D3D11CoreGetLayeredDeviceSize +@ stub D3D11CoreRegisterLayers +@ stub D3D11CreateDevice +@ stub D3D11CreateDeviceAndSwapChain +@ stub D3DKMTCloseAdapter +@ stub D3DKMTCreateAllocation +@ stub D3DKMTCreateContext +@ stub D3DKMTCreateDevice +@ stub D3DKMTCreateSynchronizationObject +@ stub D3DKMTDestroyAllocation +@ stub D3DKMTDestroyContext +@ stub D3DKMTDestroyDevice +@ stub D3DKMTDestroySynchronizationObject +@ stub D3DKMTEscape +@ stub D3DKMTGetContextSchedulingPriority +@ stub D3DKMTGetDeviceState +@ stub D3DKMTGetDisplayModeList +@ stub D3DKMTGetMultisampleMethodList +@ stub D3DKMTGetRuntimeData +@ stub D3DKMTGetSharedPrimaryHandle +@ stub D3DKMTLock +@ stub D3DKMTOpenAdapterFromHdc +@ stub D3DKMTOpenResource +@ stub D3DKMTPresent +@ stub D3DKMTQueryAdapterInfo +@ stub D3DKMTQueryAllocationResidency +@ stub D3DKMTQueryResourceInfo +@ stub D3DKMTRender +@ stub D3DKMTSetAllocationPriority +@ stub D3DKMTSetContextSchedulingPriority +@ stub D3DKMTSetDisplayMode +@ stub D3DKMTSetDisplayPrivateDriverFormat +@ stub D3DKMTSetGammaRamp +@ stub D3DKMTSetVidPnSourceOwner +@ stub D3DKMTSignalSynchronizationObject +@ stub D3DKMTUnlock +@ stub D3DKMTWaitForSynchronizationObject +@ stub D3DKMTWaitForVerticalBlankEvent +@ stub OpenAdapter10 +@ stub OpenAdapter10_2

1 0

André Hentschel : winemapi: List ignored attachments.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: d2cf09083de20e1521b6877496d2782f83fe2206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2cf09083de20e1521b687749… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 12 20:14:36 2012 +0100 winemapi: List ignored attachments. --- dlls/winemapi/sendmail.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c index e017e2c..03a29ba 100644 --- a/dlls/winemapi/sendmail.c +++ b/dlls/winemapi/sendmail.c @@ -155,7 +155,12 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, } if (message->nFileCount) - FIXME("Ignoring attachments\n"); + { + FIXME("Ignoring %u attachments:\n", message->nFileCount); + for (i = 0; i < message->nFileCount; i++) + FIXME("\t%s (%s)\n", debugstr_a(message->lpFiles[i].lpszPathName), + debugstr_a(message->lpFiles[i].lpszFileName)); + } /* Escape subject and body */ subject = escape_string(message->lpszSubject, empty_string);

1 0

André Hentschel : mmdevapi/test: Fix tests on win8.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 20128a923a7385475208c76ad9e65239d97e19b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20128a923a7385475208c76ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 12 16:51:13 2012 +0100 mmdevapi/test: Fix tests on win8. --- dlls/mmdevapi/tests/capture.c | 2 +- include/audioclient.idl | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index d64b6a3..feedfde 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -559,7 +559,7 @@ static void test_audioclient(void) ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Initialize with invalid sharemode returns %08x\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0xffffffff, 5000000, 0, pwfx, NULL); - ok(hr == E_INVALIDARG, "Initialize with invalid flags returns %08x\n", hr); + ok(hr == E_INVALIDARG || hr == AUDCLNT_E_INVALID_STREAM_FLAG, "Initialize with invalid flags returns %08x\n", hr); /* A period != 0 is ignored and the call succeeds. * Since we can only initialize successfully once, skip those tests. diff --git a/include/audioclient.idl b/include/audioclient.idl index 8050ea6..a755604 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -315,6 +315,12 @@ cpp_quote("#define AUDCLNT_E_BUFFER_ERROR AUDCLNT_ERR(0x18)") cpp_quote("#define AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED AUDCLNT_ERR(0x19)") /* Hex fail */ cpp_quote("#define AUDCLNT_E_INVALID_DEVICE_PERIOD AUDCLNT_ERR(0x20)") +cpp_quote("#define AUDCLNT_E_INVALID_STREAM_FLAG AUDCLNT_ERR(0x021)") +cpp_quote("#define AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE AUDCLNT_ERR(0x022)") +cpp_quote("#define AUDCLNT_E_OUT_OF_OFFLOAD_RESOURCES AUDCLNT_ERR(0x023)") +cpp_quote("#define AUDCLNT_E_OFFLOAD_MODE_ONLY AUDCLNT_ERR(0x024)") +cpp_quote("#define AUDCLNT_E_NONOFFLOAD_MODE_ONLY AUDCLNT_ERR(0x025)") +cpp_quote("#define AUDCLNT_E_RESOURCES_INVALIDATED AUDCLNT_ERR(0x026)") cpp_quote("#define AUDCLNT_S_BUFFER_EMPTY AUDCLNT_SUCCESS(0x1)") cpp_quote("#define AUDCLNT_S_THREAD_ALREADY_REGISTERED AUDCLNT_SUCCESS(0x2)")

1 0

Jacek Caban : atl80: Fixed some spec file entries.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 9abb9ffe91f034eb53f5788d915d5551a1b38eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9abb9ffe91f034eb53f5788d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 14:56:26 2012 +0100 atl80: Fixed some spec file entries. --- dlls/atl80/atl80.spec | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 6756776..67f001e 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -3,15 +3,13 @@ 12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr -15 stdcall AtlModuleGetClassObject(ptr ptr ptr ptr) atl.AtlModuleGetClassObject -16 stdcall AtlModuleInit(ptr long long) atl.AtlModuleInit -17 stdcall AtlModuleRegisterClassObjects(ptr long long) atl.AtlModuleRegisterClassObjects -18 stdcall AtlModuleRegisterServer(ptr long ptr) atl.AtlModuleRegisterServer -19 stdcall AtlModuleRegisterTypeLib(ptr wstr) atl.AtlModuleRegisterTypeLib -20 stdcall AtlModuleRevokeClassObjects(ptr) atl.AtlModuleRevokeClassObjects -21 stdcall AtlModuleTerm(ptr) atl.AtlModuleTerm -22 stdcall AtlModuleUnregisterServer(ptr ptr) atl.AtlModuleUnregisterServer -23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) atl.AtlModuleUpdateRegistryFromResourceD +15 stub AtlComModuleGetClassObject +17 stub AtlComModuleRegisterClassObjects +18 stub AtlComModuleRegisterServer(ptr long ptr) +19 stub AtlRegisterTypeLib(ptr wstr) +20 stub AtlComModuleRevokeClassObjects +22 stub AtlComModuleUnregisterServer +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD 24 stub AtlWaitWithMessageLoop 25 stub AtlSetErrorInfo 26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC @@ -30,10 +28,10 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx 41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl 42 stdcall AtlAxWinInit() atl100.AtlAxWinInit -43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl.AtlModuleAddCreateWndData # don't forward to atl100.dll -44 stdcall AtlModuleExtractCreateWndData(ptr) atl.AtlModuleExtractCreateWndData # don't forward to atl100.dll -45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoW # don't forward to atl100.dll -46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoA # don't forward to atl100.dll +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData +44 stub AtlWinModuleExtractCreateWndData +45 stub AtlWinModuleRegisterWndClassInfoW +46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl 48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost 49 stub AtlRegisterClassCategoriesHelper @@ -42,9 +40,8 @@ 52 stub AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save 54 stub AtlGetObjectSourceInterface -55 stub AtlModuleUnRegisterTypeLib -56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) atl.AtlModuleLoadTypeLib -57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) atl.AtlModuleUnregisterServerEx +55 stub AtlUnRegisterTypeLib +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib 58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx

1 0

Jacek Caban : atl100: Added AtlWinModuleAddCreateWndData implementation ( based on AtlModuleAddCreateWndData).
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 147dbf63cdf9f3731ba1c0d30efc57a300bb559c URL: http://source.winehq.org/git/wine.git/?a=commit;h=147dbf63cdf9f3731ba1c0d30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 14:56:11 2012 +0100 atl100: Added AtlWinModuleAddCreateWndData implementation (based on AtlModuleAddCreateWndData). --- dlls/atl100/atl.c | 16 ++++++++++++++++ dlls/atl100/atl100.spec | 2 +- include/atlbase.h | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 7e273b7..bbea756 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -288,6 +288,22 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, } /*********************************************************************** + * AtlWinModuleAddCreateWndData [atl100.43] + */ +void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE *pM, _AtlCreateWndData *pData, void *pvObject) +{ + TRACE("(%p, %p, %p)\n", pM, pData, pvObject); + + pData->m_pThis = pvObject; + pData->m_dwThreadID = GetCurrentThreadId(); + + EnterCriticalSection(&pM->m_csWindowCreate); + pData->m_pNext = pM->m_pCreateWndList; + pM->m_pCreateWndList = pData; + LeaveCriticalSection(&pM->m_csWindowCreate); +} + +/*********************************************************************** * AtlGetVersion [atl100.@] */ DWORD WINAPI AtlGetVersion(void *pReserved) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index ec8a858..2204187 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -26,7 +26,7 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) 41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() -43 stub AtlWinModuleAddCreateWndData +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) 44 stub AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA diff --git a/include/atlbase.h b/include/atlbase.h index ce62474..140a227 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -160,6 +160,13 @@ typedef struct _ATL_MODULEW_TAG _ATL_TERMFUNC_ELEM* m_pTermFuncs; } _ATL_MODULEW; +typedef struct +{ + void *m_aT; + int m_nSize; + int m_nAllocSize; +} CSimpleArray; + typedef struct _ATL_MODULE70 { UINT cbSize; @@ -168,10 +175,20 @@ typedef struct _ATL_MODULE70 CComCriticalSection m_csStaticDataInitAndTypeInfo; } _ATL_MODULE70; +typedef struct _ATL_WIN_MODULE70 +{ + UINT cbSize; + CComCriticalSection m_csWindowCreate; + _AtlCreateWndData *m_pCreateWndList; + CSimpleArray /* <ATOM> */ m_rgWindowClassAtoms; +} _ATL_WIN_MODULE70; + #if _ATL_VER >= _ATL_VER_70 typedef _ATL_MODULE70 _ATL_MODULE; +typedef _ATL_WIN_MODULE70 _ATL_WIN_MODULE; #else typedef _ATL_MODULEW _ATL_MODULE; +typedef _ATL_MODULEW _ATL_WIN_MODULE; #endif typedef struct _ATL_INTMAP_ENTRY_TAG @@ -195,6 +212,7 @@ HRESULT WINAPI AtlFreeMarshalStream(IStream *pStream); HRESULT WINAPI AtlInternalQueryInterface(void* pThis, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, void** ppvObject); HRESULT WINAPI AtlMarshalPtrInProc(IUnknown *pUnk, const IID *iid, IStream **ppStream); void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData, void* pvObject); +void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE*,_AtlCreateWndData*,void*); HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw); void WINAPI AtlCallTermFunc(_ATL_MODULE*); void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM);

1 0

Jacek Caban : atl: Added locking to AtlModuleAddCreateWndData.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 55b0de217321fd3baab12156a19fe035a1c926a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b0de217321fd3baab12156a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 14:55:58 2012 +0100 atl: Added locking to AtlModuleAddCreateWndData. --- dlls/atl/atl_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 8f8cd76..d7c4dae 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -428,8 +428,11 @@ void WINAPI AtlModuleAddCreateWndData(_ATL_MODULEW *pM, _AtlCreateWndData *pData pData->m_pThis = pvObject; pData->m_dwThreadID = GetCurrentThreadId(); + + EnterCriticalSection(&pM->m_csWindowCreate); pData->m_pNext = pM->m_pCreateWndList; pM->m_pCreateWndList = pData; + LeaveCriticalSection(&pM->m_csWindowCreate); } /***********************************************************************

1 0

Jacek Caban : jscript: Added SCRIPTTEXT_ISEXPRESSION tests.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 2c41c4c1cb1da024e5dbf2786066d221e1dbb81d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c41c4c1cb1da024e5dbf2786… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 13:12:39 2012 +0100 jscript: Added SCRIPTTEXT_ISEXPRESSION tests. --- dlls/jscript/tests/run.c | 83 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 3c5422c..58cf874 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -141,7 +141,7 @@ static const WCHAR test_valW[] = {'t','e','s','t','V','a','l',0}; static const CHAR test_valA[] = "testVal"; static const WCHAR emptyW[] = {0}; -static BOOL strict_dispid_check; +static BOOL strict_dispid_check, testing_expr; static const char *test_name = "(null)"; static IDispatch *script_disp; static int invoke_version; @@ -652,7 +652,8 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); - ok(!pvarRes, "pvarRes != NULL\n"); + if(!testing_expr) + ok(!pvarRes, "pvarRes != NULL\n"); ok(pei != NULL, "pei == NULL\n"); return S_OK; @@ -1695,6 +1696,82 @@ static void test_isvisible(BOOL global_members) IActiveScriptParse_Release(parser); } +static HRESULT parse_script_expr(const char *expr, VARIANT *res) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR str; + HRESULT hres; + + engine = create_script(); + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + SET_EXPECT(GetItemInfo_testVal); + hres = IActiveScript_AddNamedItem(engine, test_valW, + SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + CHECK_CALLED(GetItemInfo_testVal); + + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + str = a2bstr(expr); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, res, NULL); + SysFreeString(str); + + IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); + + return hres; +} + +static void test_script_exprs(void) +{ + VARIANT v; + HRESULT hres; + + testing_expr = TRUE; + + hres = parse_script_expr("true", &v); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); + + hres = parse_script_expr("false, true", &v); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = parse_script_expr("reportSuccess(); true", &v); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + hres = parse_script_expr("if(false) true", &v); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); + + hres = parse_script_expr("return testPropGet", &v); + ok(hres == 0x800a03fa, "parse_script_expr failed: %08x\n", hres); + + hres = parse_script_expr("reportSuccess(); return true", &v); + ok(hres == 0x800a03fa, "parse_script_expr failed: %08x\n", hres); + + testing_expr = FALSE; +} + static BOOL run_tests(void) { HRESULT hres; @@ -1892,6 +1969,8 @@ static BOOL run_tests(void) hres = parse_htmlscript_a("var a=1;\nif(a\n-->0) a=5;\n"); ok(hres != S_OK, "ParseScriptText have not failed\n"); + test_script_exprs(); + parse_script_with_error_a( "?", 0x800a03ea, 0, 0,

1 0

Jacek Caban : jscript: Added support for SCRIPTTEXT_ISEXPRESSION.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 5e4a16819ef3e29757d54a536e436cdb18981fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4a16819ef3e29757d54a536… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 13:12:17 2012 +0100 jscript: Added support for SCRIPTTEXT_ISEXPRESSION. --- dlls/jscript/jscript.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 16deac4..f7032bb 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -766,10 +766,34 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, NULL, pstrDelimiter, FALSE, This->is_encode, &code); + hres = compile_script(This->ctx, pstrCode, NULL, pstrDelimiter, (dwFlags & SCRIPTTEXT_ISEXPRESSION) != 0, + This->is_encode, &code); if(FAILED(hres)) return hres; + if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { + exec_ctx_t *exec_ctx; + + hres = create_exec_ctx(This->ctx, NULL, This->ctx->global, NULL, TRUE, &exec_ctx); + if(SUCCEEDED(hres)) { + jsval_t r; + + IActiveScriptSite_OnEnterScript(This->site); + + clear_ei(This->ctx); + hres = exec_source(exec_ctx, code, &code->global_code, TRUE, &r); + if(SUCCEEDED(hres)) { + hres = jsval_to_variant(r, pvarResult); + jsval_release(r); + } + exec_release(exec_ctx); + + IActiveScriptSite_OnLeaveScript(This->site); + } + + return hres; + } + if(!is_started(This->ctx)) { if(This->queue_tail) This->queue_tail = This->queue_tail->next = code;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2012