January 2012 - Wine-Commits

Nikolay Sivov : wshom.ocx: Added IWshShortcut stub.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 23fe903d9aded30f4f94165c1a212969ff32af88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23fe903d9aded30f4f94165c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 2 15:09:52 2012 +0300 wshom.ocx: Added IWshShortcut stub. --- dlls/wshom.ocx/shell.c | 285 +++++++++++++++++++++++++++++++++++++++- dlls/wshom.ocx/tests/wshom.c | 17 ++- dlls/wshom.ocx/tests/wshom.idl | 62 +++++++++ dlls/wshom.ocx/wshom.idl | 62 +++++++++ dlls/wshom.ocx/wshom_main.c | 3 +- dlls/wshom.ocx/wshom_private.h | 1 + 6 files changed, 422 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23fe903d9aded30f4f941…

1 0

Nikolay Sivov : wshom.ocx: Implement IWshCollection::Item() for Desktop folder case.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 4a068c64d041cbdc11bd2a7ba44c67f5f6ec460e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a068c64d041cbdc11bd2a7ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 31 00:46:43 2011 +0300 wshom.ocx: Implement IWshCollection::Item() for Desktop folder case. --- dlls/wshom.ocx/Makefile.in | 2 +- dlls/wshom.ocx/shell.c | 44 ++++++++++++++++++++++++++++++++++++- dlls/wshom.ocx/tests/Makefile.in | 2 +- dlls/wshom.ocx/tests/wshom.c | 32 +++++++++++++++++++++++++- 4 files changed, 74 insertions(+), 6 deletions(-) diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index 385fe73..6635e5d 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,5 +1,5 @@ MODULE = wshom.ocx -IMPORTS = uuid oleaut32 +IMPORTS = uuid oleaut32 ole32 shell32 C_SRCS = \ shell.c \ diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 525ee7f..2bd6a08 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -19,7 +19,10 @@ #include "wshom_private.h" #include "wshom.h" +#include "shlobj.h" + #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wshom); @@ -167,8 +170,45 @@ static HRESULT WINAPI WshCollection_Invoke(IWshCollection *iface, DISPID dispIdM static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, VARIANT *value) { WshCollection *This = impl_from_IWshCollection(iface); - FIXME("(%p)->(%s %p): stub\n", This, debugstr_variant(index), value); - return E_NOTIMPL; + static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; + PIDLIST_ABSOLUTE pidl; + WCHAR pathW[MAX_PATH]; + int kind = 0; + BSTR folder; + HRESULT hr; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(index), value); + + if (V_VT(index) != VT_BSTR) + { + FIXME("only BSTR index supported, got %d\n", V_VT(index)); + return E_NOTIMPL; + } + + folder = V_BSTR(index); + if (!strcmpiW(folder, desktopW)) + kind = CSIDL_DESKTOP; + else + { + FIXME("folder kind %s not supported\n", debugstr_w(folder)); + return E_NOTIMPL; + } + + hr = SHGetSpecialFolderLocation(NULL, kind, &pidl); + if (hr != S_OK) return hr; + + if (SHGetPathFromIDListW(pidl, pathW)) + { + V_VT(value) = VT_BSTR; + V_BSTR(value) = SysAllocString(pathW); + hr = V_BSTR(value) ? S_OK : E_OUTOFMEMORY; + } + else + hr = E_FAIL; + + CoTaskMemFree(pidl); + + return hr; } static HRESULT WINAPI WshCollection_Count(IWshCollection *iface, LONG *count) diff --git a/dlls/wshom.ocx/tests/Makefile.in b/dlls/wshom.ocx/tests/Makefile.in index e062b3c..1580050 100644 --- a/dlls/wshom.ocx/tests/Makefile.in +++ b/dlls/wshom.ocx/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wshom.ocx -IMPORTS = ole32 +IMPORTS = oleaut32 ole32 C_SRCS = \ wshom.c diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 414378f..2c2af45 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -26,11 +26,14 @@ #include "wshom.h" #include "wine/test.h" +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) static void test_wshshell(void) { + static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; IWshShell3 *sh3; IDispatchEx *dispex; IWshCollection *coll; @@ -40,6 +43,11 @@ static void test_wshshell(void) ITypeInfo *ti; HRESULT hr; TYPEATTR *tattr; + DISPPARAMS dp; + EXCEPINFO ei; + VARIANT arg, res; + BSTR str; + UINT err; hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDispatch, (void**)&disp); @@ -72,11 +80,31 @@ static void test_wshshell(void) hr = ITypeInfo_GetTypeAttr(ti, &tattr); EXPECT_HR(hr, S_OK); - ok(IsEqualIID(&tattr->guid, &IID_IWshCollection), "got \n"); + ok(IsEqualIID(&tattr->guid, &IID_IWshCollection), "got wrong type guid\n"); ITypeInfo_ReleaseTypeAttr(ti, tattr); - IWshShell3_Release(sh3); + /* try to call Item() with normal IDispatch procedure */ + str = SysAllocString(desktopW); + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = str; + dp.rgvarg = &arg; + dp.rgdispidNamedArgs = NULL; + dp.cArgs = 1; + dp.cNamedArgs = 0; + hr = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 1033, DISPATCH_PROPERTYGET, &dp, &res, &ei, &err); + EXPECT_HR(hr, DISP_E_MEMBERNOTFOUND); + + /* try Item() directly, it returns directory path apparently */ + V_VT(&res) = VT_EMPTY; + hr = IWshCollection_Item(coll, &arg, &res); + EXPECT_HR(hr, S_OK); + SysFreeString(str); + ok(V_VT(&res) == VT_BSTR, "got res type %d\n", V_VT(&res)); + VariantClear(&res); + IWshCollection_Release(coll); + IDispatch_Release(disp); + IWshShell3_Release(sh3); IUnknown_Release(shell); }

1 0

Nikolay Sivov : wshom.ocx: Dump VARIANT parameters, fix instance leak.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 3149386b86e0b910ed01f97e89c6259a0eb1d2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3149386b86e0b910ed01f97e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 30 22:00:00 2011 +0300 wshom.ocx: Dump VARIANT parameters, fix instance leak. --- dlls/wshom.ocx/shell.c | 49 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 4e76a4c..525ee7f 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -23,6 +23,38 @@ WINE_DEFAULT_DEBUG_CHANNEL(wshom); +const char *debugstr_variant(const VARIANT *v) +{ + if(!v) + return "(null)"; + + switch(V_VT(v)) { + case VT_EMPTY: + return "{VT_EMPTY}"; + case VT_NULL: + return "{VT_NULL}"; + case VT_I4: + return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); + case VT_R8: + return wine_dbg_sprintf("{VT_R8: %lf}", V_R8(v)); + case VT_BSTR: + return wine_dbg_sprintf("{VT_BSTR: %s}", debugstr_w(V_BSTR(v))); + case VT_DISPATCH: + return wine_dbg_sprintf("{VT_DISPATCH: %p}", V_DISPATCH(v)); + case VT_BOOL: + return wine_dbg_sprintf("{VT_BOOL: %x}", V_BOOL(v)); + case VT_UNKNOWN: + return wine_dbg_sprintf("{VT_UNKNOWN: %p}", V_UNKNOWN(v)); + case VT_UINT: + return wine_dbg_sprintf("{VT_UINT: %u}", V_UINT(v)); + case VT_BSTR|VT_BYREF: + return wine_dbg_sprintf("{VT_BSTR|VT_BYREF: ptr %p, data %s}", + V_BSTRREF(v), debugstr_w(V_BSTRREF(v) ? *V_BSTRREF(v) : NULL)); + default: + return wine_dbg_sprintf("{vt %d}", V_VT(v)); + } +} + static IWshShell3 WshShell3; typedef struct @@ -70,6 +102,10 @@ static ULONG WINAPI WshCollection_Release(IWshCollection *iface) WshCollection *This = impl_from_IWshCollection(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref = %d\n", This, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + return ref; } @@ -131,7 +167,7 @@ static HRESULT WINAPI WshCollection_Invoke(IWshCollection *iface, DISPID dispIdM static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, VARIANT *value) { WshCollection *This = impl_from_IWshCollection(iface); - FIXME("(%p)->(%p %p): stub\n", This, index, value); + FIXME("(%p)->(%s %p): stub\n", This, debugstr_variant(index), value); return E_NOTIMPL; } @@ -281,13 +317,14 @@ static HRESULT WINAPI WshShell3_get_Environment(IWshShell3 *iface, VARIANT *Type static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR Command, VARIANT *WindowStyle, VARIANT *WaitOnReturn, int *out_ExitCode) { - FIXME("(%p %p %p): stub\n", WindowStyle, WaitOnReturn, out_ExitCode); + FIXME("(%s %s %p): stub\n", debugstr_variant(WindowStyle), debugstr_variant(WaitOnReturn), out_ExitCode); return E_NOTIMPL; } static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR Text, VARIANT* SecondsToWait, VARIANT *Title, VARIANT *Type, int *button) { - FIXME("(%s %p %p %p %p): stub\n", debugstr_w(Text), SecondsToWait, Title, Type, button); + FIXME("(%s %s %s %s %p): stub\n", debugstr_w(Text), debugstr_variant(SecondsToWait), + debugstr_variant(Title), debugstr_variant(Type), button); return E_NOTIMPL; } @@ -311,7 +348,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR Name, VARIANT* o static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR Name, VARIANT *Value, VARIANT *Type) { - FIXME("(%s %p %p): stub\n", debugstr_w(Name), Value, Type); + FIXME("(%s %s %s): stub\n", debugstr_w(Name), debugstr_variant(Value), debugstr_variant(Type)); return E_NOTIMPL; } @@ -323,13 +360,13 @@ static HRESULT WINAPI WshShell3_RegDelete(IWshShell3 *iface, BSTR Name) static HRESULT WINAPI WshShell3_LogEvent(IWshShell3 *iface, VARIANT *Type, BSTR Message, BSTR Target, VARIANT_BOOL *out_Success) { - FIXME("(%p %s %s %p): stub\n", Type, debugstr_w(Message), debugstr_w(Target), out_Success); + FIXME("(%s %s %s %p): stub\n", debugstr_variant(Type), debugstr_w(Message), debugstr_w(Target), out_Success); return E_NOTIMPL; } static HRESULT WINAPI WshShell3_AppActivate(IWshShell3 *iface, VARIANT *App, VARIANT *Wait, VARIANT_BOOL *out_Success) { - FIXME("(%p %p %p): stub\n", App, Wait, out_Success); + FIXME("(%s %s %p): stub\n", debugstr_variant(App), debugstr_variant(Wait), out_Success); return E_NOTIMPL; }

1 0

Jacek Caban : jscript: Always alloc the first chunk of code buffer.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 11453b2414a3cde94887afa56fe6e26ca4f13027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11453b2414a3cde94887afa56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 2 11:45:54 2012 +0100 jscript: Always alloc the first chunk of code buffer. --- dlls/jscript/compile.c | 43 ++++++++++++++++++++++++++----------------- 1 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 60b0c2e..268c3b0 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -150,12 +150,7 @@ static unsigned push_instr(compiler_ctx_t *ctx, jsop_t op) { assert(ctx->code_size >= ctx->code_off); - if(!ctx->code_size) { - ctx->code->instrs = heap_alloc(64 * sizeof(instr_t)); - if(!ctx->code->instrs) - return -1; - ctx->code_size = 64; - }else if(ctx->code_size == ctx->code_off) { + if(ctx->code_size == ctx->code_off) { instr_t *new_instrs; new_instrs = heap_realloc(ctx->code->instrs, ctx->code_size*2*sizeof(instr_t)); @@ -1647,22 +1642,36 @@ void release_compiler(compiler_ctx_t *ctx) static HRESULT init_compiler(parser_ctx_t *parser) { - if(!parser->code) { - parser->code = heap_alloc_zero(sizeof(bytecode_t)); - if(!parser->code) - return E_OUTOFMEMORY; - jsheap_init(&parser->code->heap); + compiler_ctx_t *compiler; + + if(parser->compiler) + return S_OK; + + compiler = heap_alloc_zero(sizeof(*compiler)); + if(!compiler) + return E_OUTOFMEMORY; + + compiler->code = heap_alloc_zero(sizeof(bytecode_t)); + if(!compiler->code) { + release_compiler(compiler); + return E_OUTOFMEMORY; } - if(!parser->compiler) { - parser->compiler = heap_alloc_zero(sizeof(compiler_ctx_t)); - if(!parser->compiler) - return E_OUTOFMEMORY; + jsheap_init(&compiler->code->heap); - parser->compiler->parser = parser; - parser->compiler->code = parser->code; + compiler->code->instrs = heap_alloc(64 * sizeof(instr_t)); + if(!compiler->code->instrs) { + release_bytecode(compiler->code); + release_compiler(compiler); + return E_OUTOFMEMORY; } + compiler->code_size = 64; + + compiler->parser = parser; + + parser->code = compiler->code; + parser->compiler = compiler; return S_OK; }

1 0

Jacek Caban : jscript: Make 0 an invalid code offset.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 708c83e2087dd985506b418ceaffc08a7da60c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708c83e2087dd985506b418ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 2 11:46:11 2012 +0100 jscript: Make 0 an invalid code offset. --- dlls/jscript/compile.c | 143 ++++++++++++++++++++++++------------------------ dlls/jscript/engine.c | 2 +- dlls/jscript/parser.y | 4 +- 3 files changed, 75 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=708c83e2087dd985506b4…

1 0

Jacek Caban : vbscript: Added InStr implementation.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: d23ecdfc64bd3f36f422466417e6d2474765904c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d23ecdfc64bd3f36f42246641… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 17:00:12 2011 +0100 vbscript: Added InStr implementation. --- dlls/vbscript/global.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 92 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e3c7161..d0f1130 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -85,6 +85,26 @@ static HRESULT return_short(VARIANT *res, short val) return S_OK; } +static HRESULT return_int(VARIANT *res, int val) +{ + if((short)val == val) + return return_short(res, val); + + if(res) { + V_VT(res) = VT_I4; + V_I4(res) = val; + } + + return S_OK; +} + +static inline HRESULT return_null(VARIANT *res) +{ + if(res) + V_VT(res) = VT_NULL; + return S_OK; +} + static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) { IInternetHostSecurityManager *secmgr = NULL; @@ -511,10 +531,78 @@ static HRESULT Global_String(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_InStr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT *startv, *str1v, *str2v; + BSTR str1, str2; + int start, ret; + + TRACE("\n"); + + switch(args_cnt) { + case 2: + startv = NULL; + str1v = args+1; + str2v = args; + break; + case 3: + startv = args+2; + str1v = args+1; + str2v = args; + break; + case 4: + FIXME("unsupported compare argument %s\n", debugstr_variant(args)); + return E_NOTIMPL; + default: + assert(0); + } + + if(startv) { + /* FIXME: Move to helper */ + switch(V_VT(startv)) { + case VT_I2: + start = V_I2(startv); + break; + case VT_I4: + start = V_I4(startv); + break; + default: + FIXME("unsupported start %s\n", debugstr_variant(startv)); + return E_NOTIMPL; + } + if(--start < 0) { + FIXME("start %d\n", start); + return E_FAIL; + } + }else { + start = 0; + } + + if(V_VT(str1v) == VT_NULL || V_VT(str2v) == VT_NULL) + return return_null(res); + + if(V_VT(str1v) != VT_BSTR) { + FIXME("Unsupported str1 type %s\n", debugstr_variant(str1v)); + return E_NOTIMPL; + } + str1 = V_BSTR(str1v); + + if(V_VT(str2v) != VT_BSTR) { + FIXME("Unsupported str2 type %s\n", debugstr_variant(str2v)); + return E_NOTIMPL; + } + str2 = V_BSTR(str2v); + + if(start < SysStringLen(str1)) { + WCHAR *ptr; + + ptr = strstrW(str1+start, str2); + ret = ptr ? ptr-str1+1 : 0; + }else { + ret = 0; + } + + return return_int(res, ret); } static HRESULT Global_InStrB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -1532,7 +1620,7 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_TRIM, Global_Trim, 0, 1}, {DISPID_GLOBAL_SPACE, Global_Space, 0, 1}, {DISPID_GLOBAL_STRING, Global_String, 0, 0, 2}, - {DISPID_GLOBAL_INSTR, Global_InStr, 0, 3, 4}, + {DISPID_GLOBAL_INSTR, Global_InStr, 0, 2, 4}, {DISPID_GLOBAL_INSTRB, Global_InStrB, 0, 3, 4}, {DISPID_GLOBAL_ASCB, Global_AscB, 0, 1}, {DISPID_GLOBAL_CHRB, Global_ChrB, 0, 1},

1 0

Alexandre Julliard : d3d8/tests: Convert a file to utf-8.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 158d1891c30094a4831a09b844276afb3ab09ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=158d1891c30094a4831a09b84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 10:16:49 2012 +0100 d3d8/tests: Convert a file to utf-8. --- dlls/d3d8/tests/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index 837e2d4..1062972 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -1,6 +1,6 @@ /* * Copyright 2006-2007 Henri Verbeet - * Copyright 2011 Stefan D�singer for CodeWeavers + * Copyright 2011 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Alexandre Julliard : gdi32: Calculate the image size in GradientFill only once we have the correct bit count .
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: ccfbcfaf538ef6bf52e09a0d97e8ae6784718478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccfbcfaf538ef6bf52e09a0d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 2 21:46:46 2012 +0100 gdi32: Calculate the image size in GradientFill only once we have the correct bit count. --- dlls/gdi32/bitblt.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 0d7ed3c..80a42ea 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -395,7 +395,7 @@ BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, struct gdi_image_bits bits; unsigned int i; POINT *pts; - BOOL ret = TRUE; + BOOL ret = FALSE; DWORD err; HRGN rgn; @@ -436,15 +436,14 @@ BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, info->bmiHeader.biClrImportant = 0; info->bmiHeader.biWidth = dst.visrect.right - dst.visrect.left; info->bmiHeader.biHeight = dst.visrect.bottom - dst.visrect.top; - info->bmiHeader.biSizeImage = get_dib_image_size( info ); + info->bmiHeader.biSizeImage = 0; dev = GET_DC_PHYSDEV( dc, pPutImage ); err = dev->funcs->pPutImage( dev, 0, 0, info, NULL, NULL, NULL, 0 ); - if ((err && err != ERROR_BAD_FORMAT) || - !(bits.ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ))) - { - ret = FALSE; + if (err && err != ERROR_BAD_FORMAT) goto done; + + info->bmiHeader.biSizeImage = get_dib_image_size( info ); + if (!(bits.ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ))) goto done; - } bits.is_copy = TRUE; bits.free = free_heap_bits; @@ -462,7 +461,7 @@ BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, rgn = CreateRectRgn( 0, 0, 0, 0 ); gradient_bitmapinfo( info, bits.ptr, vert_array, nvert, grad_array, ngrad, mode, pts, rgn ); OffsetRgn( rgn, dst.visrect.left, dst.visrect.top ); - if (dev->funcs->pPutImage( dev, 0, rgn, info, &bits, &src, &dst, SRCCOPY )) ret = FALSE; + ret = !dev->funcs->pPutImage( dev, 0, rgn, info, &bits, &src, &dst, SRCCOPY ); if (bits.free) bits.free( &bits ); DeleteObject( rgn );

1 0

Alexandre Julliard : gdi32: Add stubs for the OpenGL entry points in the DIB driver.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 5721cbf0e8a6c02c42a1ceea0f58877b0b43a1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5721cbf0e8a6c02c42a1ceea0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 12:36:39 2012 +0100 gdi32: Add stubs for the OpenGL entry points in the DIB driver. --- dlls/gdi32/dibdrv/dc.c | 186 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 169 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 8ead659..5b9c844 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -400,6 +400,158 @@ static UINT dibdrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const RG return next->funcs->pSetDIBColorTable( next, pos, count, colors ); } +/*********************************************************************** + * dibdrv_ChoosePixelFormat + */ +static INT dibdrv_ChoosePixelFormat( PHYSDEV dev, const PIXELFORMATDESCRIPTOR *pfd ) +{ + FIXME( "Not supported on DIB section\n" ); + return 0; +} + +/*********************************************************************** + * dibdrv_DescribePixelFormat + */ +static INT dibdrv_DescribePixelFormat( PHYSDEV dev, INT fmt, UINT size, PIXELFORMATDESCRIPTOR *pfd ) +{ + FIXME( "Not supported on DIB section\n" ); + return 0; +} + +/*********************************************************************** + * dibdrv_GetPixelFormat + */ +static INT dibdrv_GetPixelFormat( PHYSDEV dev ) +{ + FIXME( "Not supported on DIB section\n" ); + return 0; +} + +/*********************************************************************** + * dibdrv_SetPixelFormat + */ +static BOOL dibdrv_SetPixelFormat( PHYSDEV dev, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_SwapBuffers + */ +static BOOL dibdrv_SwapBuffers( PHYSDEV dev ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglCopyContext + */ +static BOOL dibdrv_wglCopyContext( HGLRC src, HGLRC dst, UINT mask ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglCreateContext + */ +static HGLRC dibdrv_wglCreateContext( PHYSDEV dev ) +{ + FIXME( "Not supported on DIB section\n" ); + return 0; +} + +/*********************************************************************** + * dibdrv_wglCreateContextAttribsARB + */ +static HGLRC dibdrv_wglCreateContextAttribsARB( PHYSDEV dev, HGLRC ctx, const int *attribs ) +{ + FIXME( "Not supported on DIB section\n" ); + return 0; +} + +/*********************************************************************** + * dibdrv_wglDeleteContext + */ +static BOOL dibdrv_wglDeleteContext( HGLRC ctx ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglGetPbufferDCARB + */ +static HDC dibdrv_wglGetPbufferDCARB( PHYSDEV dev, void *buffer ) +{ + FIXME( "Not supported on DIB section\n" ); + return 0; +} + +/*********************************************************************** + * dibdrv_wglGetProcAddress + */ +static PROC dibdrv_wglGetProcAddress( LPCSTR name ) +{ + FIXME( "Not supported on DIB section\n" ); + return NULL; +} + +/*********************************************************************** + * dibdrv_wglMakeContextCurrentARB + */ +static BOOL dibdrv_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC ctx ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglMakeCurrent + */ +static BOOL dibdrv_wglMakeCurrent( PHYSDEV dev, HGLRC ctx ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglSetPixelFormatWINE + */ +static BOOL dibdrv_wglSetPixelFormatWINE( PHYSDEV dev, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglShareLists + */ +static BOOL dibdrv_wglShareLists( HGLRC ctx1, HGLRC ctx2 ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglUseFontBitmapsA + */ +static BOOL dibdrv_wglUseFontBitmapsA( PHYSDEV dev, DWORD first, DWORD count, DWORD base ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} + +/*********************************************************************** + * dibdrv_wglUseFontBitmapsW + */ +static BOOL dibdrv_wglUseFontBitmapsW( PHYSDEV dev, DWORD first, DWORD count, DWORD base ) +{ + FIXME( "Not supported on DIB section\n" ); + return FALSE; +} const struct gdi_dc_funcs dib_driver = { @@ -411,7 +563,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pArcTo */ NULL, /* pBeginPath */ dibdrv_BlendImage, /* pBlendImage */ - NULL, /* pChoosePixelFormat */ + dibdrv_ChoosePixelFormat, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ dibdrv_CopyBitmap, /* pCopyBitmap */ @@ -422,7 +574,7 @@ const struct gdi_dc_funcs dib_driver = dibdrv_DeleteBitmap, /* pDeleteBitmap */ dibdrv_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ - NULL, /* pDescribePixelFormat */ + dibdrv_DescribePixelFormat, /* pDescribePixelFormat */ NULL, /* pDeviceCapabilities */ NULL, /* pEllipse */ NULL, /* pEndDoc */ @@ -458,7 +610,7 @@ const struct gdi_dc_funcs dib_driver = dibdrv_GetNearestColor, /* pGetNearestColor */ NULL, /* pGetOutlineTextMetrics */ dibdrv_GetPixel, /* pGetPixel */ - NULL, /* pGetPixelFormat */ + dibdrv_GetPixelFormat, /* pGetPixelFormat */ NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetTextCharsetInfo */ NULL, /* pGetTextExtentExPoint */ @@ -514,7 +666,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */ dibdrv_SetPixel, /* pSetPixel */ - NULL, /* pSetPixelFormat */ + dibdrv_SetPixelFormat, /* pSetPixelFormat */ NULL, /* pSetPolyFillMode */ NULL, /* pSetROP2 */ NULL, /* pSetRelAbs */ @@ -534,19 +686,19 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pStretchDIBits */ NULL, /* pStrokeAndFillPath */ NULL, /* pStrokePath */ - NULL, /* pSwapBuffers */ + dibdrv_SwapBuffers, /* pSwapBuffers */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ - NULL, /* pwglCopyContext */ - NULL, /* pwglCreateContext */ - NULL, /* pwglCreateContextAttribsARB */ - NULL, /* pwglDeleteContext */ - NULL, /* pwglGetPbufferDCARB */ - NULL, /* pwglGetProcAddress */ - NULL, /* pwglMakeContextCurrentARB */ - NULL, /* pwglMakeCurrent */ - NULL, /* pwglSetPixelFormatWINE */ - NULL, /* pwglShareLists */ - NULL, /* pwglUseFontBitmapsA */ - NULL /* pwglUseFontBitmapsW */ + dibdrv_wglCopyContext, /* pwglCopyContext */ + dibdrv_wglCreateContext, /* pwglCreateContext */ + dibdrv_wglCreateContextAttribsARB, /* pwglCreateContextAttribsARB */ + dibdrv_wglDeleteContext, /* pwglDeleteContext */ + dibdrv_wglGetPbufferDCARB, /* pwglGetPbufferDCARB */ + dibdrv_wglGetProcAddress, /* pwglGetProcAddress */ + dibdrv_wglMakeContextCurrentARB, /* pwglMakeContextCurrentARB */ + dibdrv_wglMakeCurrent, /* pwglMakeCurrent */ + dibdrv_wglSetPixelFormatWINE, /* pwglSetPixelFormatWINE */ + dibdrv_wglShareLists, /* pwglShareLists */ + dibdrv_wglUseFontBitmapsA, /* pwglUseFontBitmapsA */ + dibdrv_wglUseFontBitmapsW, /* pwglUseFontBitmapsW */ };

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.36
by Jeremy Newman Jan. 3, 2012

Jan. 3, 2012

Module: website Branch: master Commit: 6a3c12ffabc691b3ab4f66e34a90883dc763b19b URL: http://source.winehq.org/git/website.git/?a=commit;h=6a3c12ffabc691b3ab4f66… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Dec 30 20:02:26 2011 +0100 Polish translation for release 1.3.36 --- news/pl/2011123001.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pl/2011123001.xml b/news/pl/2011123001.xml new file mode 100644 index 0000000..c9adaa4 --- /dev/null +++ b/news/pl/2011123001.xml @@ -0,0 +1,18 @@ +<news> +<date>Grudzień 30, 2011</date> +<title>Wydano Wine 1.3.36</title> +<body> + Wydanie rozwojowe Wine 1.3.36 jest już dostępne. + <a href="{$root}/announce/1.3.36">Co nowego</a> w tym wydaniu: +<ul> + <li>Silnik UDisks dla dynamiczneo obsługi urządzeń.</li> + <li>Zaimplementowanie poligonów i piór geometryczny w silniku DIB.</li> + <li>JScript teraz kompiluje całe funkcje.</li> + <li>Ulepszona obsługa pionowych czcionek.</li> + <li>Kilka skryptów więcej w UniScribe.</li> + <li>Zaimplementowano garść funkcji ctype w MSVCP.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.36.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0