December 2012 - Wine-Commits

Nikolay Sivov : msxml3: Some tests to show that DISPID_VALUE properties are handled specially.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 9f9ff5528c466ca919fd5df70a48161a55e9eaa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9ff5528c466ca919fd5df70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 19:30:11 2012 +0300 msxml3: Some tests to show that DISPID_VALUE properties are handled specially. --- dlls/msxml3/tests/domdoc.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index eda98f1..6f2b465 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9939,7 +9939,9 @@ static void test_dispex(void) IXMLHTTPRequest *req; IXMLDOMElement *elem; IDispatchEx *dispex; + DISPPARAMS dispparams; IXMLDOMNode *node; + VARIANT arg, ret; VARIANT_BOOL b; IUnknown *unk; HRESULT hr; @@ -9996,6 +9998,58 @@ static void test_dispex(void) ok(did == DISPID_DOM_COLLECTION_BASE+1, "got 0x%08x\n", did); IDispatchEx_Release(dispex); + did = -1; + hr = IDispatchEx_GetDispID(dispex, _bstr_("item"), 0, &did); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(did == DISPID_VALUE, "got %d\n", did); + + V_VT(&arg) = VT_I4; + V_I2(&arg) = 0; + dispparams.cArgs = 1; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + + dispparams.cArgs = 0; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = NULL; + + V_VT(&ret) = VT_EMPTY; + V_I4(&ret) = 1; + hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_I4, "got %d\n", V_VT(&ret)); + ok(V_I4(&ret) == 0, "got %d\n", V_I4(&ret)); + + dispparams.cArgs = 0; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = NULL; + + V_VT(&ret) = VT_EMPTY; + V_I4(&ret) = 1; + hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); +todo_wine { + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_I4(&ret) == 1, "got %d\n", V_I4(&ret)); +} IXMLDOMNodeList_Release(node_list); /* IXMLDOMParseError */

1 0

Alexandre Julliard : gdi32: Add a helper function to order the points of a rectangle.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 456b4c876e6e272ea85ee54e5b41daf6e68157be URL: http://source.winehq.org/git/wine.git/?a=commit;h=456b4c876e6e272ea85ee54e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 16:55:56 2012 +0100 gdi32: Add a helper function to order the points of a rectangle. --- dlls/gdi32/dibdrv/graphics.c | 13 +------------ dlls/gdi32/font.c | 4 +--- dlls/gdi32/gdi_private.h | 16 ++++++++++++++++ dlls/gdi32/region.c | 16 ++-------------- 4 files changed, 20 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index bb4ec81..f9ed4c0 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -108,18 +108,7 @@ static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom, rect.right--; } LPtoDP( hdc, (POINT *)&rect, 2 ); - if (rect.left > rect.right) - { - int tmp = rect.left; - rect.left = rect.right; - rect.right = tmp; - } - if (rect.top > rect.bottom) - { - int tmp = rect.top; - rect.top = rect.bottom; - rect.bottom = tmp; - } + order_rect( &rect ); return rect; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 34520f5..33e603c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2181,9 +2181,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, } LPtoDP(hdc, (POINT*)&rc, 2); - - if(rc.left > rc.right) {INT tmp = rc.left; rc.left = rc.right; rc.right = tmp;} - if(rc.top > rc.bottom) {INT tmp = rc.top; rc.top = rc.bottom; rc.bottom = tmp;} + order_rect( &rc ); } if (lprect && (flags & ETO_OPAQUE)) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 84febeb..edd4bf6 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -439,6 +439,22 @@ static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) rect->bottom += offset_y; } +static inline void order_rect( RECT *rect ) +{ + if (rect->left > rect->right) + { + int tmp = rect->left; + rect->left = rect->right; + rect->right = tmp; + } + if (rect->top > rect->bottom) + { + int tmp = rect->top; + rect->top = rect->bottom; + rect->bottom = tmp; + } +} + static inline void get_bounding_rect( RECT *rect, int x, int y, int width, int height ) { rect->left = x; diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index cafd203..caa4ff6 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1114,20 +1114,8 @@ BOOL WINAPI RectInRegion( HRGN hrgn, const RECT *rect ) /* swap the coordinates to make right >= left and bottom >= top */ /* (region building rectangles are normalized the same way) */ - if( rect->top > rect->bottom) { - rc.top = rect->bottom; - rc.bottom = rect->top; - } else { - rc.top = rect->top; - rc.bottom = rect->bottom; - } - if( rect->right < rect->left) { - rc.right = rect->left; - rc.left = rect->right; - } else { - rc.right = rect->right; - rc.left = rect->left; - } + rc = *rect; + order_rect( &rc ); if ((obj = GDI_GetObjPtr( hrgn, OBJ_REGION ))) {

1 0

Alexandre Julliard : gdi32: Fix handling of rotation matrices in GetGlyphOutline.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: ff5d68ccb2e9386f95ec6f8ff04010f1ebeafac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff5d68ccb2e9386f95ec6f8ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 13:12:19 2012 +0100 gdi32: Fix handling of rotation matrices in GetGlyphOutline. --- dlls/gdi32/freetype.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6f3f070..6c39b97 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5836,8 +5836,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, { FT_Matrix worldMat; worldMat.xx = FT_FixedFromFloat(font->font_desc.matrix.eM11); - worldMat.xy = FT_FixedFromFloat(font->font_desc.matrix.eM12); - worldMat.yx = FT_FixedFromFloat(font->font_desc.matrix.eM21); + worldMat.xy = -FT_FixedFromFloat(font->font_desc.matrix.eM21); + worldMat.yx = -FT_FixedFromFloat(font->font_desc.matrix.eM12); worldMat.yy = FT_FixedFromFloat(font->font_desc.matrix.eM22); pFT_Matrix_Multiply(&worldMat, &transMat); pFT_Matrix_Multiply(&worldMat, &transMatUnrotated); @@ -5849,8 +5849,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, { FT_Matrix extraMat; extraMat.xx = FT_FixedFromFIXED(lpmat->eM11); - extraMat.xy = FT_FixedFromFIXED(lpmat->eM12); - extraMat.yx = FT_FixedFromFIXED(lpmat->eM21); + extraMat.xy = FT_FixedFromFIXED(lpmat->eM21); + extraMat.yx = FT_FixedFromFIXED(lpmat->eM12); extraMat.yy = FT_FixedFromFIXED(lpmat->eM22); pFT_Matrix_Multiply(&extraMat, &transMat); pFT_Matrix_Multiply(&extraMat, &transMatUnrotated);

1 0

Nikolay Sivov : oleaut32: Added a test for prop getter invocation with different flags.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 7f8825085d1057c80d761b28da40058e103be543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8825085d1057c80d761b28d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 23:07:50 2012 +0300 oleaut32: Added a test for prop getter invocation with different flags. --- dlls/oleaut32/tests/test_reg.idl | 8 ++ dlls/oleaut32/tests/typelib.c | 171 ++++++++++++++++++++++++++++++++------ 2 files changed, 153 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/test_reg.idl b/dlls/oleaut32/tests/test_reg.idl index 4598efd..7f73b25 100644 --- a/dlls/oleaut32/tests/test_reg.idl +++ b/dlls/oleaut32/tests/test_reg.idl @@ -127,4 +127,12 @@ library register_test interface Iole_from_disp; } + [ + uuid(f1b68c3b-02a3-4110-bc4c-cf9bc7e7f177) + ] + interface IInvokeTest : IDispatch + { + [propget, id(DISPID_VALUE)] + LONG test([in] LONG i); + } } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 85fd965..1bcc584 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -20,6 +20,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <wine/test.h> #include <stdarg.h> @@ -64,6 +65,74 @@ static WCHAR wszguid[] = {'g','u','i','d',0}; static const int is_win64 = sizeof(void *) > sizeof(int); +static HRESULT WINAPI invoketest_QueryInterface(IInvokeTest *iface, REFIID riid, void **ret) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID_IInvokeTest)) + { + *ret = iface; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI invoketest_AddRef(IInvokeTest *iface) +{ + return 2; +} + +static ULONG WINAPI invoketest_Release(IInvokeTest *iface) +{ + return 1; +} + +static HRESULT WINAPI invoketest_GetTypeInfoCount(IInvokeTest *iface, UINT *cnt) +{ + ok(0, "unexpected call\n"); + *cnt = 0; + return E_NOTIMPL; +} + +static HRESULT WINAPI invoketest_GetTypeInfo(IInvokeTest *iface, UINT index, LCID lcid, ITypeInfo **ti) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI invoketest_GetIDsOfNames(IInvokeTest *iface, REFIID riid, LPOLESTR *names, + UINT cnt, LCID lcid, DISPID *dispid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI invoketest_Invoke(IInvokeTest *iface, DISPID dispid, REFIID riid, + LCID lcid, WORD flags, DISPPARAMS *dispparams, VARIANT *res, EXCEPINFO *ei, UINT *argerr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static LONG WINAPI invoketest_get_test(IInvokeTest *iface, LONG i) +{ + return i+1; +} + +static const IInvokeTestVtbl invoketestvtbl = { + invoketest_QueryInterface, + invoketest_AddRef, + invoketest_Release, + invoketest_GetTypeInfoCount, + invoketest_GetTypeInfo, + invoketest_GetIDsOfNames, + invoketest_Invoke, + invoketest_get_test +}; + +static IInvokeTest invoketest = { &invoketestvtbl }; + static void init_function_pointers(void) { HMODULE hmod = GetModuleHandleA("oleaut32.dll"); @@ -534,6 +603,27 @@ static void test_CreateDispTypeInfo(void) SysFreeString(methdata[3].szName); } +static const char *create_test_typelib(int res_no) +{ + static char filename[MAX_PATH]; + HANDLE file; + HRSRC res; + void *ptr; + DWORD written; + + GetTempFileNameA( ".", "tlb", 0, filename ); + file = CreateFile( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" ); + if (file == INVALID_HANDLE_VALUE) return NULL; + res = FindResource( GetModuleHandle(0), MAKEINTRESOURCE(res_no), "TYPELIB" ); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandle(0), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandle(0), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandle(0), res ), "couldn't write resource\n" ); + CloseHandle( file ); + return filename; +} + static void test_TypeInfo(void) { ITypeLib *pTypeLib; @@ -549,9 +639,11 @@ static void test_TypeInfo(void) DISPID dispidMember; DISPPARAMS dispparams; GUID bogusguid = {0x806afb4f,0x13f7,0x42d2,{0x89,0x2c,0x6c,0x97,0xc3,0x6a,0x36,0xc1}}; - VARIANT var; - UINT count; + VARIANT var, res, args[2]; + UINT count, i; TYPEKIND kind; + const char *filenameA; + WCHAR filename[MAX_PATH]; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -714,6 +806,53 @@ static void test_TypeInfo(void) ITypeInfo_Release(pTypeInfo); ITypeLib_Release(pTypeLib); + + filenameA = create_test_typelib(3); + MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filename, MAX_PATH); + hr = LoadTypeLib(filename, &pTypeLib); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IInvokeTest, &pTypeInfo); + ok(hr == S_OK, "got 0x%08x\n", hr); + + dispparams.cArgs = 1; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = args; + + V_VT(&args[0]) = VT_I4; + V_I4(&args[0]) = 0; + + V_VT(&res) = VT_EMPTY; + + i = 0; + V_VT(&res) = VT_EMPTY; + V_I4(&res) = 0; + /* call propget with DISPATCH_METHOD|DISPATCH_PROPERTYGET flags */ + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, DISPID_VALUE, DISPATCH_METHOD|DISPATCH_PROPERTYGET, + &dispparams, &res, NULL, &i); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res)); + ok(V_I4(&res) == 1, "got %d\n", V_I4(&res)); + + i = 0; + /* call propget with DISPATCH_METHOD flags */ + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, DISPID_VALUE, DISPATCH_METHOD, + &dispparams, &res, NULL, &i); + ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x, %d\n", hr, i); + + i = 0; + V_VT(&res) = VT_EMPTY; + V_I4(&res) = 0; + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, DISPID_VALUE, DISPATCH_PROPERTYGET, + &dispparams, &res, NULL, &i); + ok(hr == S_OK, "got 0x%08x, %d\n", hr, i); + ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res)); + ok(V_I4(&res) == 1, "got %d\n", V_I4(&res)); + + ITypeInfo_Release(pTypeInfo); + ITypeLib_Release(pTypeLib); + DeleteFileA(filenameA); } static int WINAPI int_func( int a0, int a1, int a2, int a3, int a4 ) @@ -2722,27 +2861,6 @@ static void test_dump_typelib(const char *name) #endif -static const char *create_test_typelib(int res_no) -{ - static char filename[MAX_PATH]; - HANDLE file; - HRSRC res; - void *ptr; - DWORD written; - - GetTempFileNameA( ".", "tlb", 0, filename ); - file = CreateFile( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); - ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" ); - if (file == INVALID_HANDLE_VALUE) return NULL; - res = FindResource( GetModuleHandle(0), MAKEINTRESOURCE(res_no), "TYPELIB" ); - ok( res != 0, "couldn't find resource\n" ); - ptr = LockResource( LoadResource( GetModuleHandle(0), res )); - WriteFile( file, ptr, SizeofResource( GetModuleHandle(0), res ), &written, NULL ); - ok( written == SizeofResource( GetModuleHandle(0), res ), "couldn't write resource\n" ); - CloseHandle( file ); - return filename; -} - static void test_create_typelib_lcid(LCID lcid) { char filename[MAX_PATH]; @@ -2813,7 +2931,7 @@ static void test_register_typelib(BOOL system_registration) { TYPEKIND kind; WORD flags; - } attrs[11] = + } attrs[12] = { { TKIND_INTERFACE, 0 }, { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, @@ -2825,7 +2943,8 @@ static void test_register_typelib(BOOL system_registration) { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FDUAL }, { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, - { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE } + { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, + { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE } }; trace("Starting %s typelib registration tests\n", @@ -2857,7 +2976,7 @@ static void test_register_typelib(BOOL system_registration) ok(hr == S_OK, "got %08x\n", hr); count = ITypeLib_GetTypeInfoCount(typelib); - ok(count == 11, "got %d\n", count); + ok(count == 12, "got %d\n", count); for(i = 0; i < count; i++) {

1 0

Andrew Eikum : dsound: Always fill wValidBitsPerSample.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 81d601f56fc5c84c7f517b9424a73e4788c784b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d601f56fc5c84c7f517b942… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 14 08:47:16 2012 -0600 dsound: Always fill wValidBitsPerSample. --- dlls/dsound/primary.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index bc72d78..0964f9b 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -87,10 +87,9 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client WAVEFORMATEXTENSIBLE testwfe = *mixwfe; testwfe.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; - testwfe.Format.wBitsPerSample = 32; + testwfe.Samples.wValidBitsPerSample = testwfe.Format.wBitsPerSample = 32; testwfe.Format.nBlockAlign = testwfe.Format.nChannels * testwfe.Format.wBitsPerSample / 8; testwfe.Format.nAvgBytesPerSec = testwfe.Format.nSamplesPerSec * testwfe.Format.nBlockAlign; - testwfe.Samples.wValidBitsPerSample = 0; if (FAILED(IAudioClient_IsFormatSupported(client, AUDCLNT_SHAREMODE_SHARED, &testwfe.Format, (WAVEFORMATEX**)&retwfe))) w = DSOUND_CopyFormat(&mixwfe->Format); @@ -121,12 +120,12 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client w->nAvgBytesPerSec = w->nSamplesPerSec * w->nBlockAlign; wfe->dwChannelMask = 0; - wfe->Samples.wValidBitsPerSample = 0; if (wi->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { w->wBitsPerSample = 32; wfe->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; } else wfe->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + wfe->Samples.wValidBitsPerSample = w->wBitsPerSample; } else w = DSOUND_CopyFormat(device->primary_pwfx);

1 0

Jacek Caban : atl100: Added AtlComModuleGetClassObject implementation ( based on AtlModuleGetClassObject).
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 7d3046cd02120c19ddf4fe4eb6f3d46028d53abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3046cd02120c19ddf4fe4eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 14 11:58:10 2012 +0100 atl100: Added AtlComModuleGetClassObject implementation (based on AtlModuleGetClassObject). --- dlls/atl100/atl.c | 28 ++++++++++++++++++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl80/atl80.spec | 2 +- include/atlbase.h | 12 +++++++++++- 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index d2e49c6..c0bc2ae 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -304,6 +304,34 @@ void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE *pM, _AtlCreateWndData } /*********************************************************************** + * AtlComModuleGetClassObject [atl100.15] + */ +HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, REFIID riid, void **ppv) +{ + _ATL_OBJMAP_ENTRY **iter; + HRESULT hres; + + TRACE("(%p %s %s %p)\n", pm, debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if(!pm) + return E_INVALIDARG; + + for(iter = pm->m_ppAutoObjMapFirst; iter < pm->m_ppAutoObjMapLast; iter++) { + if(IsEqualCLSID((*iter)->pclsid, rclsid) && (*iter)->pfnGetClassObject) { + if(!(*iter)->pCF) + hres = (*iter)->pfnGetClassObject((*iter)->pfnCreateInstance, &IID_IUnknown, (void**)&(*iter)->pCF); + if((*iter)->pCF) + hres = IUnknown_QueryInterface((*iter)->pCF, riid, ppv); + TRACE("returning %p (%08x)\n", *ppv, hres); + return hres; + } + } + + WARN("Class %s not found\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** * AtlRegisterClassCategoriesHelper [atl100.49] */ HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID clsid, const struct _ATL_CATMAP_ENTRY *catmap, BOOL reg) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 1c36112..6c959d6 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -3,7 +3,7 @@ 12 stdcall AtlFreeMarshalStream(ptr) 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) -15 stub AtlComModuleGetClassObject +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) 17 stub AtlComModuleRegisterClassObjects 20 stub AtlComModuleRevokeClassObjects 22 stub AtlComModuleUnregisterServer diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 1586e10..1c940dd 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -3,7 +3,7 @@ 12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr -15 stub AtlComModuleGetClassObject +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject 17 stub AtlComModuleRegisterClassObjects 18 stub AtlComModuleRegisterServer(ptr long ptr) 19 stub AtlRegisterTypeLib(ptr wstr) diff --git a/include/atlbase.h b/include/atlbase.h index 37d60c8..6c29ad9 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -89,7 +89,7 @@ typedef struct _ATL_OBJMAP_ENTRYW_TAG _ATL_DESCRIPTIONFUNCW* pfnGetObjectDescription; _ATL_CATMAPFUNC* pfnGetCategoryMap; void (WINAPI *pfnObjectMain)(BOOL bStarting); -} _ATL_OBJMAP_ENTRYW; +} _ATL_OBJMAP_ENTRYW, _ATL_OBJMAP_ENTRY30, _ATL_OBJMAP_ENTRY; typedef struct _ATL_TERMFUNC_ELEM_TAG @@ -183,6 +183,15 @@ typedef struct _ATL_WIN_MODULE70 CSimpleArray /* <ATOM> */ m_rgWindowClassAtoms; } _ATL_WIN_MODULE70; +typedef struct _ATL_COM_MODULE70 +{ + UINT cbSize; + HINSTANCE m_hInstTypeLib; + _ATL_OBJMAP_ENTRY **m_ppAutoObjMapFirst; + _ATL_OBJMAP_ENTRY **m_ppAutoObjMapLast; + CComCriticalSection m_csObjMap; +} _ATL_COM_MODULE70, _ATL_COM_MODULE; + #if _ATL_VER >= _ATL_VER_70 typedef _ATL_MODULE70 _ATL_MODULE; typedef _ATL_WIN_MODULE70 _ATL_WIN_MODULE; @@ -231,5 +240,6 @@ HRESULT WINAPI AtlCreateRegistrar(IRegistrar**); HRESULT WINAPI AtlUpdateRegistryFromResourceD(HINSTANCE,LPCOLESTR,BOOL,struct _ATL_REGMAP_ENTRY*,IRegistrar*); HRESULT WINAPI AtlLoadTypeLib(HINSTANCE,LPCOLESTR,BSTR*,ITypeLib**); HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID,const struct _ATL_CATMAP_ENTRY*,BOOL); +HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE*,REFCLSID,REFIID,void**); #endif /* __WINE_ATLBASE_H__ */

1 0

Austin English : msvcrt: Implement memcpy in msvcrt instead of forwarding to ntdll.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: c8e71e9a3e301a58a9b1e91213949ec01b5eb6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e71e9a3e301a58a9b1e9121… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 13 20:01:48 2012 -0800 msvcrt: Implement memcpy in msvcrt instead of forwarding to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c4d0332..274554b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1338,7 +1338,7 @@ @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc @ cdecl memchr(ptr long long) ntdll.memchr @ cdecl memcmp(ptr ptr long) ntdll.memcmp -@ cdecl memcpy(ptr ptr long) ntdll.memcpy +@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy @ cdecl memcpy_s(ptr long ptr long) @ cdecl memmove(ptr ptr long) ntdll.memmove @ cdecl memmove_s(ptr long ptr long) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 1e46488..2748c8d 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1605,3 +1605,11 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1 return 1; } #undef I10_OUTPUT_MAX_PREC + +/********************************************************************* + * memcpy (NTDLL.@) + */ +void * __cdecl MSVCRT_memcpy( void *dst, const void *src, size_t n ) +{ + return memmove( dst, src, n ); +}

1 0

Austin English : msvcrt: Implement _ftol in msvcrt instead of forwarding to ntdll.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: a79de8aa292c699f23daf7dcc436f297832c6dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79de8aa292c699f23daf7dcc… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 13 20:01:26 2012 -0800 msvcrt: Implement _ftol in msvcrt instead of forwarding to ntdll. --- dlls/msvcrt/math.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 230d405..4570da0 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -629,6 +629,15 @@ double CDECL _CItanh(void) return MSVCRT_tanh(x); } +/********************************************************************* + * _ftol (MSVCRT.@) + */ +LONGLONG CDECL MSVCRT__ftol(void) +{ + FPU_DOUBLE(x); + return (LONGLONG)x; +} + #endif /* defined(__GNUC__) && defined(__i386__) */ /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 06d26b4..c4d0332 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -453,9 +453,9 @@ @ cdecl _ftime32_s(ptr) MSVCRT__ftime32_s @ cdecl _ftime64(ptr) MSVCRT__ftime64 @ cdecl _ftime64_s(ptr) MSVCRT__ftime64_s -@ cdecl -ret64 _ftol() ntdll._ftol -@ cdecl -ret64 _ftol2() ntdll._ftol -@ cdecl -ret64 _ftol2_sse() ntdll._ftol #FIXME: SSE variant should be implemented +@ cdecl -arch=i386 -ret64 _ftol() MSVCRT__ftol +@ cdecl -arch=i386 -ret64 _ftol2() MSVCRT__ftol +@ cdecl -arch=i386 -ret64 _ftol2_sse() MSVCRT__ftol #FIXME: SSE variant should be implemented # stub _ftol2_sse_excpt @ cdecl _fullpath(ptr str long) # stub _fullpath_dbg(ptr str long long str long)

1 0

Jacek Caban : jscript: Allow poping multiple stack values at the time.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 0f0f76ce6badf9ab0d952b78fa846c05e2b81a44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0f76ce6badf9ab0d952b78f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 14 11:06:43 2012 +0100 jscript: Allow poping multiple stack values at the time. --- dlls/jscript/compile.c | 24 ++++++++++++------------ dlls/jscript/engine.c | 6 ++++-- dlls/jscript/engine.h | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index a3dab82..c37ec31 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -530,8 +530,9 @@ static HRESULT compile_conditional_expression(compiler_ctx_t *ctx, conditional_e return E_OUTOFMEMORY; set_arg_uint(ctx, jmp_false, ctx->code_off); - if(!push_instr(ctx, OP_pop)) - return E_OUTOFMEMORY; + hres = push_instr_uint(ctx, OP_pop, 1); + if(FAILED(hres)) + return hres; hres = compile_expression(ctx, expr->false_expression, TRUE); if(FAILED(hres)) @@ -1053,7 +1054,7 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr, BOOL if(FAILED(hres)) return hres; - return emit_ret || push_instr(ctx, OP_pop) ? S_OK : E_OUTOFMEMORY; + return emit_ret ? S_OK : push_instr_uint(ctx, OP_pop, 1); } static inline BOOL is_loop_statement(statement_type_t type) @@ -1353,12 +1354,12 @@ static HRESULT pop_to_stat(compiler_ctx_t *ctx, BOOL var_stack, BOOL scope_stack stack_pop += iter->stack_use; } - if(var_stack) { - /* FIXME: optimize */ - while(stack_pop--) { - if(!push_instr(ctx, OP_pop)) - return E_OUTOFMEMORY; - } + if(var_stack && stack_pop) { + HRESULT hres; + + hres = push_instr_uint(ctx, OP_pop, stack_pop); + if(FAILED(hres)) + return hres; } return S_OK; @@ -1579,12 +1580,11 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t } if(SUCCEEDED(hres)) { - if(push_instr(ctx, OP_pop)) { + hres = push_instr_uint(ctx, OP_pop, 1); + if(SUCCEEDED(hres)) { default_jmp = push_instr(ctx, OP_jmp); if(!default_jmp) hres = E_OUTOFMEMORY; - }else { - hres = E_OUTOFMEMORY; } } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a7934fc..fbfa460 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2339,9 +2339,11 @@ static HRESULT interp_jmp_z(exec_ctx_t *ctx) static HRESULT interp_pop(exec_ctx_t *ctx) { - TRACE("\n"); + const unsigned arg = get_op_uint(ctx, 0); - stack_popn(ctx, 1); + TRACE("%u\n", arg); + + stack_popn(ctx, arg); return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 3407c06..0e9ed3b 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -84,7 +84,7 @@ typedef struct { X(null, 1, 0,0) \ X(obj_prop, 1, ARG_BSTR, 0) \ X(or, 1, 0,0) \ - X(pop, 1, 0,0) \ + X(pop, 1, ARG_UINT, 0) \ X(pop_except, 1, 0,0) \ X(pop_scope, 1, 0,0) \ X(postinc, 1, ARG_INT, 0) \

1 0

Jacek Caban : jscript: Properly handle return value evaluation in comma expression.
by Alexandre Julliard Dec. 14, 2012

Dec. 14, 2012

Module: wine Branch: master Commit: 10c2a2bba456d5c8f70f4c98384196dfebf1d2e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c2a2bba456d5c8f70f4c983… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 14 11:06:28 2012 +0100 jscript: Properly handle return value evaluation in comma expression. --- dlls/jscript/compile.c | 12 ++++-------- dlls/jscript/tests/lang.js | 9 +++++++-- dlls/jscript/tests/run.c | 6 ++++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 4effda4..a3dab82 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -474,18 +474,15 @@ static HRESULT compile_increment_expression(compiler_ctx_t *ctx, unary_expressio } /* ECMA-262 3rd Edition 11.14 */ -static HRESULT compile_comma_expression(compiler_ctx_t *ctx, binary_expression_t *expr) +static HRESULT compile_comma_expression(compiler_ctx_t *ctx, binary_expression_t *expr, BOOL emit_ret) { HRESULT hres; - hres = compile_expression(ctx, expr->expression1, TRUE); + hres = compile_expression(ctx, expr->expression1, FALSE); if(FAILED(hres)) return hres; - if(!push_instr(ctx, OP_pop)) - return E_OUTOFMEMORY; - - return compile_expression(ctx, expr->expression2, TRUE); + return compile_expression(ctx, expr->expression2, emit_ret); } /* ECMA-262 3rd Edition 11.11 */ @@ -938,8 +935,7 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr, BOOL case EXPR_CALL: return compile_call_expression(ctx, (call_expression_t*)expr, emit_ret); case EXPR_COMMA: - hres = compile_comma_expression(ctx, (binary_expression_t*)expr); - break; + return compile_comma_expression(ctx, (binary_expression_t*)expr, emit_ret); case EXPR_COND: hres = compile_conditional_expression(ctx, (conditional_expression_t*)expr); break; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 640d171..23e12cc 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -189,14 +189,19 @@ tmp = eval("1;"); ok(tmp === 1, "tmp = " + tmp); tmp = eval("1,2;"); ok(tmp === 2, "tmp = " + tmp); +tmp = eval("testNoRes(),2;"); +ok(tmp === 2, "tmp = " + tmp); tmp = eval("if(true) {3}"); ok(tmp === 3, "tmp = " + tmp); -testNoRes(); eval("testRes(); testRes()"); tmp = eval("3; if(false) {4;} else {};;;") ok(tmp === 3, "tmp = " + tmp); -tmp = (function(){ return testRes();})(); +testNoRes(); +testRes() && testRes(); +testNoRes(), testNoRes(); + +tmp = (function(){ return testNoRes(), testRes();})(); var obj1 = new Object(); ok(typeof(obj1) === "object", "typeof(obj1) is not object"); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 32b7c4c..55b1398 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -749,8 +749,10 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, case DISPID_GLOBAL_TESTRES: ok(pvarRes != NULL, "pvarRes = NULL\n"); - if(pvarRes) - V_VT(pvarRes) = VT_NULL; + if(pvarRes) { + V_VT(pvarRes) = VT_BOOL; + V_BOOL(pvarRes) = VARIANT_TRUE; + } return S_OK; case DISPID_GLOBAL_TESTNORES:

1 0