January 2013 - Wine-Commits

Stefan Dösinger : d3d9/tests: Add a software vertexprocessing buffer discard test.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 4d5c8b6fe71519f42c8e1980d5b8f45aaebd0db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d5c8b6fe71519f42c8e1980d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 15 14:03:19 2013 +0100 d3d9/tests: Add a software vertexprocessing buffer discard test. --- dlls/d3d9/tests/device.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 7e7fe40..a0997d6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6030,6 +6030,101 @@ static void test_set_palette(void) DestroyWindow(window); } +static void test_swvp_buffer(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + UINT refcount; + HWND window; + HRESULT hr; + unsigned int i; + IDirect3DVertexBuffer9 *buffer; + static const unsigned int bufsize = 1024; + D3DVERTEXBUFFER_DESC desc; + D3DPRESENT_PARAMETERS present_parameters = {0}; + struct + { + float x, y, z; + } *ptr, *ptr2; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = window; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferWidth = screen_width; + present_parameters.BackBufferHeight = screen_height; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.EnableAutoDepthStencil = FALSE; + if (FAILED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + IDirect3D9_Release(d3d9); + return; + } + + hr = IDirect3DDevice9_CreateVertexBuffer(device, bufsize * sizeof(*ptr), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, + D3DPOOL_DEFAULT, &buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_GetDesc(buffer, &desc); + ok(SUCCEEDED(hr), "Failed to get desc, hr %#x.\n", hr); + ok(desc.Pool == D3DPOOL_DEFAULT, "Got pool %u, expected D3DPOOL_DEFAULT\n", desc.Pool); + ok(desc.Usage == (D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY), + "Got usage %u, expected D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY\n", desc.Usage); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, bufsize * sizeof(*ptr), (void **)&ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + for (i = 0; i < bufsize; i++) + { + ptr[i].x = i * 1.0f; + ptr[i].y = i * 2.0f; + ptr[i].z = i * 3.0f; + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(*ptr)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, bufsize * sizeof(*ptr2), (void **)&ptr2, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + ok(ptr == ptr2, "Lock returned two different pointers: %p, %p\n", ptr, ptr2); + for (i = 0; i < bufsize; i++) + { + if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f) + { + ok(FALSE, "Vertex %u is %f,%f,%f, expected %f,%f,%f\n", i, + ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f); + break; + } + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer9_Release(buffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -6116,6 +6211,7 @@ START_TEST(device) test_surface_double_unlock(); test_surface_lockrect_blocks(); test_set_palette(); + test_swvp_buffer(); } out:

1 0

Jacek Caban : mshtml: Added IHTMLScriptElement::put_text implementation.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 1aa8742da76200e3c771fd416ec213c4f6129345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa8742da76200e3c771fd416… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 15 13:39:54 2013 +0100 mshtml: Added IHTMLScriptElement::put_text implementation. --- dlls/mshtml/htmlscript.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index d08c9cb..0750a5f 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -192,8 +192,38 @@ static HRESULT WINAPI HTMLScriptElement_get_event(IHTMLScriptElement *iface, BST static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR v) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + HTMLInnerWindow *window; + nsIDOMNode *parent; + nsAString text_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->element.node.doc || !This->element.node.doc->window) { + WARN("no windoow\n"); + return E_UNEXPECTED; + } + + window = This->element.node.doc->window; + + nsAString_InitDepend(&text_str, v); + nsres = nsIDOMHTMLScriptElement_SetText(This->nsscript, &text_str); + nsAString_Finish(&text_str); + if(NS_FAILED(nsres)) { + ERR("SetSrc failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); + if(NS_FAILED(nsres) || !parent) { + TRACE("No parent, not executing\n"); + This->parse_on_bind = TRUE; + return S_OK; + } + + nsIDOMNode_Release(parent); + doc_insert_script(window, This); + return S_OK; } static HRESULT WINAPI HTMLScriptElement_get_text(IHTMLScriptElement *iface, BSTR *p)

1 0

Jacek Caban : atl100: Added AtlGetObjectSourceInterface tests.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 4ad22987bcc923a03af0240a689d9ad5e153a851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad22987bcc923a03af0240a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 15 12:45:57 2013 +0100 atl100: Added AtlGetObjectSourceInterface tests. --- dlls/atl100/tests/atl.c | 214 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 214 insertions(+), 0 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 963b39e..8aea90a 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -23,6 +23,7 @@ #define CONST_VTABLE #include <atlbase.h> +#include <mshtml.h> #include <wine/test.h> @@ -38,6 +39,21 @@ static const GUID CATID_CatTest2 = {0x178fc163,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x46}}; #define CATID_CATTEST2_STR "178fc163-0000-0000-0000-000000000246" +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + if(!riid) + return "(null)"; + + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + static void test_winmodule(void) { _AtlCreateWndData create_data[3]; @@ -343,6 +359,203 @@ static void test_cp(void) ok(!advise_cnt, "advise_cnt = %d\n", advise_cnt); } +static CLSID persist_clsid; + +static HRESULT WINAPI Persist_QueryInterface(IPersist *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI Persist_AddRef(IPersist *iface) +{ + return 2; +} + +static ULONG WINAPI Persist_Release(IPersist *iface) +{ + return 1; +} + +static HRESULT WINAPI Persist_GetClassID(IPersist *iface, CLSID *pClassID) +{ + *pClassID = persist_clsid; + return S_OK; +} + +static const IPersistVtbl PersistVtbl = { + Persist_QueryInterface, + Persist_AddRef, + Persist_Release, + Persist_GetClassID +}; + +static IPersist Persist = { &PersistVtbl }; + +static HRESULT WINAPI ProvideClassInfo2_QueryInterface(IProvideClassInfo2 *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ProvideClassInfo2_AddRef(IProvideClassInfo2 *iface) +{ + return 2; +} + +static ULONG WINAPI ProvideClassInfo2_Release(IProvideClassInfo2 *iface) +{ + return 1; +} + +static HRESULT WINAPI ProvideClassInfo2_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) +{ + ok(dwGuidKind == GUIDKIND_DEFAULT_SOURCE_DISP_IID, "unexpected dwGuidKind %x\n", dwGuidKind); + *pGUID = DIID_DispHTMLBody; + return S_OK; +} + +static const IProvideClassInfo2Vtbl ProvideClassInfo2Vtbl = { + ProvideClassInfo2_QueryInterface, + ProvideClassInfo2_AddRef, + ProvideClassInfo2_Release, + ProvideClassInfo2_GetClassInfo, + ProvideClassInfo2_GetGUID +}; + +static IProvideClassInfo2 ProvideClassInfo2 = { &ProvideClassInfo2Vtbl }; +static BOOL support_classinfo2; + +static HRESULT WINAPI Dispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid)) { + *ppv = iface; + return S_OK; + } + + if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { + if(!support_classinfo2) + return E_NOINTERFACE; + *ppv = &ProvideClassInfo2; + return S_OK; + } + + if(IsEqualGUID(&IID_IPersist, riid)) { + *ppv = &Persist; + return S_OK; + } + + ok(0, "unexpected riid: %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI Dispatch_AddRef(IDispatch *iface) +{ + return 2; +} + +static ULONG WINAPI Dispatch_Release(IDispatch *iface) +{ + return 1; +} + +static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + ITypeLib *typelib; + HRESULT hres; + + static const WCHAR mshtml_tlbW[] = {'m','s','h','t','m','l','.','t','l','b',0}; + + ok(!iTInfo, "iTInfo = %d\n", iTInfo); + ok(!lcid, "lcid = %x\n", lcid); + + hres = LoadTypeLib(mshtml_tlbW, &typelib); + ok(hres == S_OK, "LoadTypeLib failed: %08x\n", hres); + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IHTMLElement, ppTInfo); + ok(hres == S_OK, "GetTypeInfoOfGuid failed: %08x\n", hres); + + ITypeLib_Release(typelib); + return S_OK; +} + +static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IDispatchVtbl DispatchVtbl = { + Dispatch_QueryInterface, + Dispatch_AddRef, + Dispatch_Release, + Dispatch_GetTypeInfoCount, + Dispatch_GetTypeInfo, + Dispatch_GetIDsOfNames, + Dispatch_Invoke +}; + +static IDispatch Dispatch = { &DispatchVtbl }; + +static void test_source_iface(void) +{ + unsigned short maj_ver, min_ver; + IID libid, iid; + HRESULT hres; + + support_classinfo2 = TRUE; + + maj_ver = min_ver = 0xdead; + hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); + ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); + ok(IsEqualGUID(&iid, &DIID_DispHTMLBody), "iid = %s\n", debugstr_guid(&iid)); + ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); + + support_classinfo2 = FALSE; + persist_clsid = CLSID_HTMLDocument; + + maj_ver = min_ver = 0xdead; + hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); + ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); + ok(IsEqualGUID(&iid, &DIID_HTMLDocumentEvents), "iid = %s\n", debugstr_guid(&iid)); + ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); + + persist_clsid = CLSID_HTMLStyle; + + maj_ver = min_ver = 0xdead; + hres = AtlGetObjectSourceInterface((IUnknown*)&Dispatch, &libid, &iid, &maj_ver, &min_ver); + ok(hres == S_OK, "AtlGetObjectSourceInterface failed: %08x\n", hres); + ok(IsEqualGUID(&libid, &LIBID_MSHTML), "libid = %s\n", debugstr_guid(&libid)); + ok(IsEqualGUID(&iid, &IID_NULL), "iid = %s\n", debugstr_guid(&iid)); + ok(maj_ver == 4 && min_ver == 0, "ver = %d.%d\n", maj_ver, min_ver); +} + START_TEST(atl) { CoInitialize(NULL); @@ -351,6 +564,7 @@ START_TEST(atl) test_regcat(); test_typelib(); test_cp(); + test_source_iface(); CoUninitialize(); }

1 0

Andrew Talbot : dinput: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 6eecf4886f57c33aee8e7878bc38578d567cec2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eecf4886f57c33aee8e7878b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jan 14 21:44:49 2013 +0000 dinput: Avoid signed-unsigned integer comparisons. --- dlls/dinput/config.c | 2 +- dlls/dinput/joystick.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index abf3fd5..708f406 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -331,7 +331,7 @@ static void assign_action(HWND dialog) static void copy_actions(LPDIACTIONFORMATW to, LPDIACTIONFORMATW from) { - int i; + DWORD i; for (i=0; i < from->dwNumActions; i++) { to->rgoAction[i].guidInstance = from->rgoAction[i].guidInstance; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index d32acec..73ded55 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -482,7 +482,8 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags) { JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); - int i, j, has_actions = 0; + unsigned int i, j; + int has_actions = 0; DWORD object_types[] = { DIDFT_AXIS, DIDFT_BUTTON }; DWORD type_map[] = { DIDFT_RELAXIS, DIDFT_PSHBUTTON };

1 0

Henri Verbeet : ddraw: Avoid LPD3DSTATE.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 61e8f02ce253d656fdab41cc54689aa4f3906e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e8f02ce253d656fdab41cc5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 15 08:46:51 2013 +0100 ddraw: Avoid LPD3DSTATE. --- dlls/ddraw/executebuffer.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 5e8e475..80e44ef 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -205,8 +205,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, DWORD i; TRACE("STATELIGHT (%d)\n", count); - for (i = 0; i < count; i++) { - LPD3DSTATE ci = (LPD3DSTATE) instr; + for (i = 0; i < count; ++i) + { + D3DSTATE *ci = (D3DSTATE *)instr; TRACE("(%08x,%08x)\n", ci->u1.dlstLightStateType, ci->u2.dwArg[0]); @@ -272,8 +273,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, IDirect3DDevice2 *d3d_device2 = &device->IDirect3DDevice2_iface; TRACE("STATERENDER (%d)\n", count); - for (i = 0; i < count; i++) { - LPD3DSTATE ci = (LPD3DSTATE) instr; + for (i = 0; i < count; ++i) + { + D3DSTATE *ci = (D3DSTATE *)instr; IDirect3DDevice2_SetRenderState(d3d_device2, ci->u1.drstRenderStateType, ci->u2.dwArg[0]);

1 0

Dmitry Timoshkov : gdiplus: Avoid not necessary memory allocation for BITMAPINFO.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: bd601f9950c9d89e9c205f86e399dc283652392a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd601f9950c9d89e9c205f86e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 15 12:48:56 2013 +0800 gdiplus: Avoid not necessary memory allocation for BITMAPINFO. --- dlls/gdiplus/image.c | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 377cab1..b182405 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4694,28 +4694,21 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi if (retval == Ok) { HDC hdc; - BITMAPINFO *pbmi; + char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *pbmi = (BITMAPINFO *)bmibuf; INT src_height; hdc = CreateCompatibleDC(NULL); - pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - if (pbmi) - { - pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - pbmi->bmiHeader.biBitCount = 0; - - GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biBitCount = 0; - src_height = abs(pbmi->bmiHeader.biHeight); - pbmi->bmiHeader.biHeight = -src_height; + GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); - GetDIBits(hdc, hbm, 0, src_height, lockeddata.Scan0, pbmi, DIB_RGB_COLORS); + src_height = abs(pbmi->bmiHeader.biHeight); + pbmi->bmiHeader.biHeight = -src_height; - GdipFree(pbmi); - } - else - retval = OutOfMemory; + GetDIBits(hdc, hbm, 0, src_height, lockeddata.Scan0, pbmi, DIB_RGB_COLORS); DeleteDC(hdc);

1 0

Dmitry Timoshkov : windowscodecs: Fix reading the mask bits in CreateBitmapFromHICON.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 0df1742307b7aafec611feddec9c049eae0d938a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df1742307b7aafec611fedde… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 15 12:47:47 2013 +0800 windowscodecs: Fix reading the mask bits in CreateBitmapFromHICON. --- dlls/windowscodecs/imgfactory.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 8762c81..3e574d5 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -642,7 +642,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHICON(IWICComponentFactor memset(&bi, 0, sizeof(bi)); bi.bmiHeader.biSize = sizeof(bi.bmiHeader); bi.bmiHeader.biWidth = width; - bi.bmiHeader.biHeight = -height; + bi.bmiHeader.biHeight = info.hbmColor ? -height: -height * 2; bi.bmiHeader.biPlanes = 1; bi.bmiHeader.biBitCount = 32; bi.bmiHeader.biCompression = BI_RGB; @@ -701,8 +701,6 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHICON(IWICComponentFactor for (x = 0; x < width; x++, rgba++, bits++) { - if (!info.hbmColor) *rgba = ~*rgba; - if (*bits) *rgba = 0; else

1 0

Dmitry Timoshkov : qcap: Fix compilation on older systems.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 98166a59804971b06a851abc68ea5546cdadbcee URL: http://source.winehq.org/git/wine.git/?a=commit;h=98166a59804971b06a851abc6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 15 12:47:00 2013 +0800 qcap: Fix compilation on older systems. --- dlls/qcap/v4l.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index f5baaeb..2562c48 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -47,7 +47,8 @@ #endif #ifdef HAVE_LIBV4L1_H #include <libv4l1.h> -#elif defined(HAVE_LINUX_VIDEODEV_H) +#endif +#ifdef HAVE_LINUX_VIDEODEV_H #include <linux/videodev.h> #endif #ifdef HAVE_UNISTD_H

1 0

Jacek Caban : vbscript: Added support for more constants.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: a71443a8840be9e80b4778815ead3170fa7a5168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71443a8840be9e80b4778815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 14 17:42:48 2013 +0100 vbscript: Added support for more constants. --- dlls/vbscript/global.c | 56 +++++------------------------------------- dlls/vbscript/tests/api.vbs | 7 +++++ 2 files changed, 14 insertions(+), 49 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5b28e8a..6886ff7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1548,48 +1548,6 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_vbUseSystem(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbUseSystemDayOfWeek(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFirstJan1(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFirstFourDays(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFirstFullWeek(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbTrue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFalse(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Global_vbUseDefault(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -1777,8 +1735,8 @@ static HRESULT Global_vbMsgBoxRtlReading(vbdisp_t *This, VARIANT *arg, unsigned } static const builtin_prop_t global_props[] = { - {DISPID_GLOBAL_VBUSESYSTEM, Global_vbUseSystem, BP_GET}, - {DISPID_GLOBAL_USESYSTEMDAYOFWEEK, Global_vbUseSystemDayOfWeek, BP_GET}, + {DISPID_GLOBAL_VBUSESYSTEM, NULL, BP_GET, 0}, + {DISPID_GLOBAL_USESYSTEMDAYOFWEEK, NULL, BP_GET, 0}, {DISPID_GLOBAL_VBSUNDAY, NULL, BP_GET, 1}, {DISPID_GLOBAL_VBMONDAY, NULL, BP_GET, 2}, {DISPID_GLOBAL_VBTUESDAY, NULL, BP_GET, 3}, @@ -1786,9 +1744,9 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBTHURSDAY, NULL, BP_GET, 5}, {DISPID_GLOBAL_VBFRIDAY, NULL, BP_GET, 6}, {DISPID_GLOBAL_VBSATURDAY, NULL, BP_GET, 7}, - {DISPID_GLOBAL_VBFIRSTJAN1, Global_vbFirstJan1, BP_GET}, - {DISPID_GLOBAL_VBFIRSTFOURDAYS, Global_vbFirstFourDays, BP_GET}, - {DISPID_GLOBAL_VBFIRSTFULLWEEK, Global_vbFirstFullWeek, BP_GET}, + {DISPID_GLOBAL_VBFIRSTJAN1, NULL, BP_GET, 1}, + {DISPID_GLOBAL_VBFIRSTFOURDAYS, NULL, BP_GET, 2}, + {DISPID_GLOBAL_VBFIRSTFULLWEEK, NULL, BP_GET, 3}, {DISPID_GLOBAL_VBOKONLY, NULL, BP_GET, MB_OK}, {DISPID_GLOBAL_VBOKCANCEL, NULL, BP_GET, MB_OKCANCEL}, {DISPID_GLOBAL_VBABORTRETRYIGNORE, NULL, BP_GET, MB_ABORTRETRYIGNORE}, @@ -1829,8 +1787,8 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBDECIMAL, NULL, BP_GET, VT_DECIMAL}, {DISPID_GLOBAL_VBBYTE, NULL, BP_GET, VT_UI1}, {DISPID_GLOBAL_VBARRAY, NULL, BP_GET, VT_ARRAY}, - {DISPID_GLOBAL_VBTRUE, Global_vbTrue, BP_GET}, - {DISPID_GLOBAL_VBFALSE, Global_vbFalse, BP_GET}, + {DISPID_GLOBAL_VBTRUE, NULL, BP_GET, VARIANT_TRUE}, + {DISPID_GLOBAL_VBFALSE, NULL, BP_GET, VARIANT_FALSE}, {DISPID_GLOBAL_VBUSEDEFAULT, Global_vbUseDefault, BP_GET}, {DISPID_GLOBAL_VBBINARYCOMPARE, Global_vbBinaryCompare, BP_GET}, {DISPID_GLOBAL_VBTEXTCOMPARE, Global_vbTextCompare, BP_GET}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 4f8c544..966b256 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -69,6 +69,13 @@ TestConstant "vbDefaultButton3", vbDefaultButton3, 512 TestConstant "vbDefaultButton4", vbDefaultButton4, 768 TestConstant "vbApplicationModal", vbApplicationModal, 0 TestConstant "vbSystemModal", vbSystemModal, 4096 +TestConstant "vbUseSystem", vbUseSystem, 0 +TestConstant "vbUseSystemDayOfWeek", vbUseSystemDayOfWeek, 0 +TestConstant "vbFirstJan1", vbFirstJan1, 1 +TestConstant "vbFirstFourDays", vbFirstFourDays, 2 +TestConstant "vbFirstFullWeek", vbFirstFullWeek, 3 +TestConstant "vbTrue", vbTrue, -1 +TestConstant "vbFalse", vbFalse, 0 Sub TestCStr(arg, exval) dim x

1 0

Alexandre Julliard : gdi32: Store the vertical flag together with the other font flags.
by Alexandre Julliard Jan. 15, 2013

Jan. 15, 2013

Module: wine Branch: master Commit: 0f40a031e7e25e35ff6ce3b067a5e6eb18655102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f40a031e7e25e35ff6ce3b06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 15 14:13:09 2013 +0100 gdi32: Store the vertical flag together with the other font flags. --- dlls/gdi32/freetype.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c90f3c2..22080b1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -270,7 +270,6 @@ typedef struct tagFace { DWORD ntmFlags; FT_Fixed font_version; BOOL scalable; - BOOL vertical; Bitmap_Size size; /* set if face is a bitmap */ DWORD flags; /* ADDFONT flags */ struct tagFamily *family; @@ -282,6 +281,7 @@ typedef struct tagFace { #define ADDFONT_ALLOW_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 #define ADDFONT_ADD_RESOURCE 0x08 /* added through AddFontResource */ +#define ADDFONT_VERTICAL_FONT 0x10 #define ADDFONT_AA_FLAGS(flags) ((flags) << 16) typedef struct tagFamily { @@ -493,7 +493,6 @@ static const WCHAR english_name_value[] = {'E','n','g','l','i','s','h',' ','N',' static const WCHAR face_index_value[] = {'I','n','d','e','x',0}; static const WCHAR face_ntmflags_value[] = {'N','t','m','f','l','a','g','s',0}; static const WCHAR face_version_value[] = {'V','e','r','s','i','o','n',0}; -static const WCHAR face_vertical_value[] = {'V','e','r','t','i','c','a','l',0}; static const WCHAR face_height_value[] = {'H','e','i','g','h','t',0}; static const WCHAR face_width_value[] = {'W','i','d','t','h',0}; static const WCHAR face_size_value[] = {'S','i','z','e',0}; @@ -1394,7 +1393,6 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *bu reg_load_dword(hkey_face, face_index_value, (DWORD*)&face->face_index); reg_load_dword(hkey_face, face_ntmflags_value, &face->ntmFlags); reg_load_dword(hkey_face, face_version_value, (DWORD*)&face->font_version); - reg_load_dword(hkey_face, face_vertical_value, (DWORD*)&face->vertical); reg_load_dword(hkey_face, face_flags_value, (DWORD*)&face->flags); needed = sizeof(face->fs); @@ -1551,7 +1549,6 @@ static void add_face_to_cache(Face *face) reg_save_dword(hkey_face, face_index_value, face->face_index); reg_save_dword(hkey_face, face_ntmflags_value, face->ntmFlags); reg_save_dword(hkey_face, face_version_value, face->font_version); - if (face->vertical) reg_save_dword(hkey_face, face_vertical_value, face->vertical); if (face->flags) reg_save_dword(hkey_face, face_flags_value, face->flags); RegSetValueExW(hkey_face, face_font_sig_value, 0, REG_BINARY, (BYTE*)&face->fs, sizeof(face->fs)); @@ -1741,7 +1738,7 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) } static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, void *font_data_ptr, DWORD font_data_size, - DWORD flags, BOOL vertical ) + DWORD flags ) { Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); My_FT_Bitmap_Size *size = (My_FT_Bitmap_Size *)ft_face->available_sizes; @@ -1758,7 +1755,7 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); if (!face->FullName) face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES ); - if (vertical) + if (flags & ADDFONT_VERTICAL_FONT) face->FullName = prepend_at( face->FullName ); if (file) @@ -1799,7 +1796,6 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, } if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); - face->vertical = vertical; face->flags = flags; face->family = NULL; face->cached_enum_data = NULL; @@ -1813,13 +1809,13 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, } static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr, DWORD font_data_size, - FT_Long face_index, DWORD flags, BOOL vertical ) + FT_Long face_index, DWORD flags ) { Face *face; Family *family; - face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags, vertical ); - family = get_family( ft_face, vertical ); + face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags ); + family = get_family( ft_face, flags & ADDFONT_VERTICAL_FONT ); if (insert_face_in_family_list( face, family )) { if (flags & ADDFONT_ADD_TO_CACHE) @@ -1949,12 +1945,13 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ return 0; } - AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags, FALSE); + AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags); ++ret; if (FT_HAS_VERTICAL(ft_face)) { - AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags, TRUE); + AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, + flags | ADDFONT_VERTICAL_FONT); ++ret; } @@ -3007,7 +3004,7 @@ static BOOL get_fontdir( const char *unix_name, struct fontdir *fd ) DWORD type; if (!ft_face) return FALSE; - face = create_face( ft_face, 0, unix_name, NULL, 0, 0, FALSE ); + face = create_face( ft_face, 0, unix_name, NULL, 0, 0 ); get_family_names( ft_face, &name, &english_name, FALSE ); pFT_Done_Face( ft_face ); @@ -4783,7 +4780,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) font_link = find_font_link(family->FamilyName); face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { - if(face->vertical == want_vertical && + if(!(face->flags & ADDFONT_VERTICAL_FONT) == !want_vertical && (csi.fs.fsCsb[0] & face->fs.fsCsb[0] || (font_link != NULL && csi.fs.fsCsb[0] & font_link->fs.fsCsb[0]))) { if(face->scalable) @@ -4803,7 +4800,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { face_list = get_face_list_from_family(family); LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { - if(face->scalable && face->vertical == want_vertical) { + if(face->scalable && !(face->flags & ADDFONT_VERTICAL_FONT) == !want_vertical) { csi.fs.fsCsb[0] = 0; WARN("just using first face for now\n"); goto found; @@ -4948,7 +4945,7 @@ found_face: ret->strikeout = lf.lfStrikeOut ? 0xff : 0; create_child_font_list(ret); - if (face->vertical) /* We need to try to load the GSUB table */ + if (face->flags & ADDFONT_VERTICAL_FONT) /* We need to try to load the GSUB table */ { int length = get_font_data(ret, GSUB_TAG , 0, NULL, 0); if (length != GDI_ERROR)

1 0