January 2012 - Wine-commits

Nikolay Sivov : wshom.ocx: Added IWshShortcut stub.
by Alexandre Julliard 03 Jan '12

03 Jan '12

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 IWshShortcut_put_Description().
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 9e7c1bd163cda52eda9627c6e4955ba4c7065f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e7c1bd163cda52eda9627c6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 2 15:10:43 2012 +0300 wshom.ocx: Implement IWshShortcut_put_Description(). --- dlls/wshom.ocx/shell.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 949707d..0ab5080 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -70,6 +70,9 @@ typedef struct { IWshShortcut IWshShortcut_iface; LONG ref; + + IShellLinkW *link; + BSTR path_link; } WshShortcut; static inline WshCollection *impl_from_IWshCollection( IWshCollection *iface ) @@ -315,7 +318,11 @@ static ULONG WINAPI WshShortcut_Release(IWshShortcut *iface) TRACE("(%p) ref = %d\n", This, ref); if (!ref) + { + SysFreeString(This->path_link); + IShellLinkW_Release(This->link); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -406,8 +413,8 @@ static HRESULT WINAPI WshShortcut_get_Description(IWshShortcut *iface, BSTR *Des static HRESULT WINAPI WshShortcut_put_Description(IWshShortcut *iface, BSTR Description) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(Description)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(Description)); + return IShellLinkW_SetDescription(This->link, Description); } static HRESULT WINAPI WshShortcut_get_Hotkey(IWshShortcut *iface, BSTR *Hotkey) @@ -529,9 +536,12 @@ static const IWshShortcutVtbl WshShortcutVtbl = { WshShortcut_Save }; -static HRESULT WshShortcut_Create(IDispatch **shortcut) +static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) { WshShortcut *This; + HRESULT hr; + + *shortcut = NULL; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -539,6 +549,15 @@ static HRESULT WshShortcut_Create(IDispatch **shortcut) This->IWshShortcut_iface.lpVtbl = &WshShortcutVtbl; This->ref = 1; + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (void**)&This->link); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, This); + return hr; + } + + This->path_link = SysAllocString(path); *shortcut = (IDispatch*)&This->IWshShortcut_iface; return S_OK; @@ -654,7 +673,7 @@ static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR Text, VARIANT* Sec static HRESULT WINAPI WshShell3_CreateShortcut(IWshShell3 *iface, BSTR PathLink, IDispatch** Shortcut) { TRACE("(%s %p)\n", debugstr_w(PathLink), Shortcut); - return WshShortcut_Create(Shortcut); + return WshShortcut_Create(PathLink, Shortcut); } static HRESULT WINAPI WshShell3_ExpandEnvironmentStrings(IWshShell3 *iface, BSTR Src, BSTR* out_Dst)

1 0

Nikolay Sivov : wshom.ocx: Implement IWshShortcut_put_WorkingDirectory().
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 033c18fce9efe649e201a5afc01b6af641cfbd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=033c18fce9efe649e201a5afc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 2 15:11:15 2012 +0300 wshom.ocx: Implement IWshShortcut_put_WorkingDirectory(). --- dlls/wshom.ocx/shell.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 0ab5080..7686284 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -490,8 +490,8 @@ static HRESULT WINAPI WshShortcut_get_WorkingDirectory(IWshShortcut *iface, BSTR static HRESULT WINAPI WshShortcut_put_WorkingDirectory(IWshShortcut *iface, BSTR WorkingDirectory) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(WorkingDirectory)); - return E_NOTIMPL; + TRACE("(%p)->(%s): stub\n", This, debugstr_w(WorkingDirectory)); + return IShellLinkW_SetWorkingDirectory(This->link, WorkingDirectory); } static HRESULT WINAPI WshShortcut_Load(IWshShortcut *iface, BSTR PathLink)

1 0

Nikolay Sivov : wshom.ocx: Implement IWshShortcut_put_TargetPath().
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 34f1811d1263dc9ac5cac34376dcc59782821b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f1811d1263dc9ac5cac3437… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 2 15:12:02 2012 +0300 wshom.ocx: Implement IWshShortcut_put_TargetPath(). --- dlls/wshom.ocx/shell.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 7686284..121d3e7 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -462,8 +462,8 @@ static HRESULT WINAPI WshShortcut_get_TargetPath(IWshShortcut *iface, BSTR *Path static HRESULT WINAPI WshShortcut_put_TargetPath(IWshShortcut *iface, BSTR Path) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(Path)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(Path)); + return IShellLinkW_SetPath(This->link, Path); } static HRESULT WINAPI WshShortcut_get_WindowStyle(IWshShortcut *iface, int *ShowCmd)

1 0

Nikolay Sivov : wshom.ocx: Implement IWshShortcut::Save().
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 06c0b139f596cae83d498a55a9a0589e50400589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c0b139f596cae83d498a55a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 2 15:12:26 2012 +0300 wshom.ocx: Implement IWshShortcut::Save(). --- dlls/wshom.ocx/shell.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 121d3e7..4d0c266 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -504,8 +504,16 @@ static HRESULT WINAPI WshShortcut_Load(IWshShortcut *iface, BSTR PathLink) static HRESULT WINAPI WshShortcut_Save(IWshShortcut *iface) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + IPersistFile *file; + HRESULT hr; + + TRACE("(%p)\n", This); + + IShellLinkW_QueryInterface(This->link, &IID_IPersistFile, (void**)&file); + hr = IPersistFile_Save(file, This->path_link, TRUE); + IPersistFile_Release(file); + + return hr; } static const IWshShortcutVtbl WshShortcutVtbl = {

1 0

Jacek Caban : ieframe: Added ITargetFramePriv2 interface to HlinkFrame object.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: f3a2d0535944829e6b01197374e69dee33a7c39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a2d0535944829e6b0119737… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 2 16:42:40 2012 +0100 ieframe: Added ITargetFramePriv2 interface to HlinkFrame object. --- dlls/ieframe/ieframe.h | 3 +- dlls/ieframe/navigate.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 4c32e52..026ab12 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -34,7 +34,7 @@ #include "mshtmhst.h" #include "exdisp.h" #include "hlink.h" -#include "htiframe.h" +#include "htiface.h" #include "shdeprecated.h" #include "docobjectservice.h" @@ -57,6 +57,7 @@ typedef struct { typedef struct { IHlinkFrame IHlinkFrame_iface; ITargetFrame2 ITargetFrame2_iface; + ITargetFramePriv2 ITargetFramePriv2_iface; IUnknown *outer; DocHost *doc_host; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index c58ff7f..a12b195 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1229,6 +1229,97 @@ static const ITargetFrame2Vtbl TargetFrame2Vtbl = { TargetFrame2_GetTargetAlias }; +static inline HlinkFrame *impl_from_ITargetFramePriv2(ITargetFramePriv2 *iface) +{ + return CONTAINING_RECORD(iface, HlinkFrame, ITargetFramePriv2_iface); +} + +static HRESULT WINAPI TargetFramePriv2_QueryInterface(ITargetFramePriv2 *iface, REFIID riid, void **ppv) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI TargetFramePriv2_AddRef(ITargetFramePriv2 *iface) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI TargetFramePriv2_Release(ITargetFramePriv2 *iface) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI TargetFramePriv2_FindFrameDownwards(ITargetFramePriv2 *iface, + LPCWSTR pszTargetName, DWORD dwFlags, IUnknown **ppunkTargetFrame) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(pszTargetName), dwFlags, ppunkTargetFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFramePriv2_FindFrameInContext(ITargetFramePriv2 *iface, + LPCWSTR pszTargetName, IUnknown *punkContextFrame, DWORD dwFlags, IUnknown **ppunkTargetFrame) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + FIXME("(%p)->(%s %p %x %p)\n", This, debugstr_w(pszTargetName), punkContextFrame, dwFlags, ppunkTargetFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFramePriv2_OnChildFrameActivate(ITargetFramePriv2 *iface, IUnknown *pUnkChildFrame) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + FIXME("(%p)->(%p)\n", This, pUnkChildFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFramePriv2_OnChildFrameDeactivate(ITargetFramePriv2 *iface, IUnknown *pUnkChildFrame) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + FIXME("(%p)->(%p)\n", This, pUnkChildFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFramePriv2_NavigateHack(ITargetFramePriv2 *iface, DWORD grfHLNF, LPBC pbc, + IBindStatusCallback *pibsc, LPCWSTR pszTargetName, LPCWSTR pszUrl, LPCWSTR pszLocation) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + FIXME("(%p)->(%x %p %p %s %s %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName), + debugstr_w(pszUrl), debugstr_w(pszLocation)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFramePriv2_FindBrowserByIndex(ITargetFramePriv2 *iface, DWORD dwID, IUnknown **ppunkBrowser) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + FIXME("(%p)->(%d %p)\n", This, dwID, ppunkBrowser); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFramePriv2_AggregatedNavigation2(ITargetFramePriv2 *iface, DWORD grfHLNF, LPBC pbc, + IBindStatusCallback *pibsc, LPCWSTR pszTargetName, IUri *pUri, LPCWSTR pszLocation) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + FIXME("(%p)->(%x %p %p %s %p %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName), + pUri, debugstr_w(pszLocation)); + return E_NOTIMPL; +} + +static const ITargetFramePriv2Vtbl TargetFramePriv2Vtbl = { + TargetFramePriv2_QueryInterface, + TargetFramePriv2_AddRef, + TargetFramePriv2_Release, + TargetFramePriv2_FindFrameDownwards, + TargetFramePriv2_FindFrameInContext, + TargetFramePriv2_OnChildFrameActivate, + TargetFramePriv2_OnChildFrameDeactivate, + TargetFramePriv2_NavigateHack, + TargetFramePriv2_FindBrowserByIndex, + TargetFramePriv2_AggregatedNavigation2 +}; + BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IHlinkFrame, riid)) { @@ -1237,6 +1328,12 @@ BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_ITargetFrame2, riid)) { TRACE("(%p)->(IID_ITargetFrame2 %p)\n", This, ppv); *ppv = &This->ITargetFrame2_iface; + }else if(IsEqualGUID(&IID_ITargetFramePriv, riid)) { + TRACE("(%p)->(IID_ITargetFramePriv %p)\n", This, ppv); + *ppv = &This->ITargetFramePriv2_iface; + }else if(IsEqualGUID(&IID_ITargetFramePriv2, riid)) { + TRACE("(%p)->(IID_ITargetFramePriv2 %p)\n", This, ppv); + *ppv = &This->ITargetFramePriv2_iface; }else { return FALSE; } @@ -1249,6 +1346,7 @@ void HlinkFrame_Init(HlinkFrame *This, IUnknown *outer, DocHost *doc_host) { This->IHlinkFrame_iface.lpVtbl = &HlinkFrameVtbl; This->ITargetFrame2_iface.lpVtbl = &TargetFrame2Vtbl; + This->ITargetFramePriv2_iface.lpVtbl = &TargetFramePriv2Vtbl; This->outer = outer; This->doc_host = doc_host;

1 0

Alexandre Julliard : gdi32: Calculate the image size in GradientFill only once we have the correct bit count .
by Alexandre Julliard 03 Jan '12

03 Jan '12

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 03 Jan '12

03 Jan '12

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

Alexandre Julliard : d3d8/tests: Convert a file to utf-8.
by Alexandre Julliard 03 Jan '12

03 Jan '12

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

Łukasz Wojniłowicz : Polish translation for release 1.3.36
by Jeremy Newman 03 Jan '12

03 Jan '12

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