April 2013 - Wine-commits - list.winehq.org

Michael Stefaniuc : dplayx: Merge the DirectPlayLobby QueryInterface helper .
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: bd0b8291421a13fb66b71c113ff1f21874654e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd0b8291421a13fb66b71c113… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Apr 13 21:43:24 2013 +0200 dplayx: Merge the DirectPlayLobby QueryInterface helper. --- dlls/dplayx/dplobby.c | 71 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index a0c11dd..bab74ea 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include <string.h> +#define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "windef.h" @@ -131,28 +132,6 @@ static BOOL DPL_DestroyLobby1( LPVOID lpDPL ) return TRUE; } -static HRESULT WINAPI DPL_QueryInterface( IDirectPlayLobbyImpl *This, REFIID riid, void **ppvObj ) -{ - TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); - - if ( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlayLobby, riid ) || - IsEqualGUID( &IID_IDirectPlayLobby2, riid ) || IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) - *ppvObj = &This->IDirectPlayLobby3_iface; - else if ( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) || - IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) || IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) - *ppvObj = &This->IDirectPlayLobby3A_iface; - else - { - /* Unsupported interface */ - *ppvObj = NULL; - return E_NOINTERFACE; - } - - IDirectPlayLobby_AddRef( (LPDIRECTPLAYLOBBY)*ppvObj ); - - return S_OK; -} - static void dplobby_destroy(IDirectPlayLobbyImpl *obj) { DPL_DestroyLobby1( obj ); @@ -165,14 +144,58 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_QueryInterface( IDirectPlayLobby3A void **ppv ) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3A( iface ); - return DPL_QueryInterface( This, riid, ppv ); + return IDirectPlayLobby_QueryInterface( &This->IDirectPlayLobby3_iface, riid, ppv ); } static HRESULT WINAPI IDirectPlayLobby3Impl_QueryInterface( IDirectPlayLobby3 *iface, REFIID riid, void **ppv ) { IDirectPlayLobbyImpl *This = impl_from_IDirectPlayLobby3( iface ); - return DPL_QueryInterface( This, riid, ppv ); + + if ( IsEqualGUID( &IID_IUnknown, riid ) ) + { + TRACE( "(%p)->(IID_IUnknown %p)\n", This, ppv ); + *ppv = &This->IDirectPlayLobby3_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlayLobby, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlayLobby %p)\n", This, ppv ); + *ppv = &This->IDirectPlayLobby3_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlayLobbyA %p)\n", This, ppv ); + *ppv = &This->IDirectPlayLobby3A_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlayLobby2, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlayLobby2 %p)\n", This, ppv ); + *ppv = &This->IDirectPlayLobby3_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlayLobby2A %p)\n", This, ppv ); + *ppv = &This->IDirectPlayLobby3A_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlay3 %p)\n", This, ppv ); + *ppv = &This->IDirectPlayLobby3_iface; + } + else if ( IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) + { + TRACE( "(%p)->(IID_IDirectPlayLobby3A %p)\n", This, ppv ); + *ppv = &This->IDirectPlayLobby3A_iface; + } + else + { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI IDirectPlayLobby3AImpl_AddRef(IDirectPlayLobby3A *iface)

1 0

André Hentschel : kernel32: Silence a noisy FIXME in GetConsoleKeyboardLayoutNameW.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: e1c884256e476eac448888a48e159de65a01d806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c884256e476eac448888a48… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 13 23:57:30 2013 +0200 kernel32: Silence a noisy FIXME in GetConsoleKeyboardLayoutNameW. --- dlls/kernel32/console.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index d6d1414..8405f4f 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1274,7 +1274,9 @@ BOOL WINAPI GetConsoleKeyboardLayoutNameA(LPSTR layoutName) */ BOOL WINAPI GetConsoleKeyboardLayoutNameW(LPWSTR layoutName) { - FIXME( "stub %p\n", layoutName); + static int once; + if (!once++) + FIXME( "stub %p\n", layoutName); return TRUE; }

1 0

Nikolay Sivov : user32: Use defined constants to identify message box buttons.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 8f985884ea1dc888c44bd29b145a0845fc8776c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f985884ea1dc888c44bd29b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 13 17:07:47 2013 +0400 user32: Use defined constants to identify message box buttons. --- dlls/user32/msgbox.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 91437bc..9328cd0 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -86,11 +86,11 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0); hFont = CreateFontIndirectW (&nclm.lfMessageFont); /* set button font */ - for (i=1; i < 12; i++) - /* No button 8 (Close) */ - if (i != 8) { + for (i = IDOK; i <= IDCONTINUE; i++) + /* no close button */ + if (i != IDCANCEL) SendDlgItemMessageW (hwnd, i, WM_SETFONT, (WPARAM)hFont, 0); - } + /* set text font */ SendDlgItemMessageW (hwnd, MSGBOX_IDTEXT, WM_SETFONT, (WPARAM)hFont, 0); @@ -234,9 +234,9 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* Get the number of visible buttons and their size */ bh = bw = 1; /* Minimum button sizes */ - for (buttons = 0, i = 1; i < 12; i++) + for (buttons = 0, i = IDOK; i <= IDCONTINUE; i++) { - if (i == 8) continue; /* No CLOSE button */ + if (i == IDCLOSE) continue; /* No CLOSE button */ hItem = GetDlgItem(hwnd, i); if (GetWindowLongW(hItem, GWL_STYLE) & WS_VISIBLE) {

1 0

Nikolay Sivov : mshtml: Implement IHTMLTable_get_tBodies.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: f91c0356e77aa0d7a1a010afe2534969110be891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91c0356e77aa0d7a1a010afe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 14 18:43:30 2013 +0400 mshtml: Implement IHTMLTable_get_tBodies. --- dlls/mshtml/htmltable.c | 17 +++++++++++++++-- dlls/mshtml/tests/dom.c | 11 ++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 85daf5b..f3c7ba8 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -379,8 +379,21 @@ static HRESULT WINAPI HTMLTable_get_tFoot(IHTMLTable *iface, IHTMLTableSection * static HRESULT WINAPI HTMLTable_get_tBodies(IHTMLTable *iface, IHTMLElementCollection **p) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLCollection *nscol = NULL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLTableElement_GetTBodies(This->nstable, &nscol); + if(NS_FAILED(nsres)) { + ERR("GetTBodies failed: %08x\n", nsres); + return E_FAIL; + } + + *p = create_collection_from_htmlcol(This->element.node.doc, nscol); + + nsIDOMHTMLCollection_Release(nscol); + return S_OK; } static HRESULT WINAPI HTMLTable_get_caption(IHTMLTable *iface, IHTMLTableCaption **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5cb0a94..44306ee 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5466,6 +5466,7 @@ static void test_table_elem(IHTMLElement *elem) static const elem_type_t row_types[] = {ET_TR,ET_TR}; static const elem_type_t all_types[] = {ET_TBODY,ET_TR,ET_TR,ET_TD,ET_TD}; + static const elem_type_t tbodies_types[] = {ET_TBODY}; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTable, (void**)&table); ok(hres == S_OK, "Could not get IHTMLTable iface: %08x\n", hres); @@ -5475,7 +5476,7 @@ static void test_table_elem(IHTMLElement *elem) col = NULL; hres = IHTMLTable_get_rows(table, &col); ok(hres == S_OK, "get_rows failed: %08x\n", hres); - ok(col != NULL, "get_ros returned NULL\n"); + ok(col != NULL, "get_rows returned NULL\n"); test_elem_collection((IUnknown*)col, row_types, sizeof(row_types)/sizeof(*row_types)); IHTMLElementCollection_Release(col); @@ -5492,6 +5493,14 @@ static void test_table_elem(IHTMLElement *elem) test_elem_all((IUnknown*)node, NULL, 0); IHTMLDOMNode_Release(node); + col = NULL; + hres = IHTMLTable_get_tBodies(table, &col); + ok(hres == S_OK, "get_tBodies failed: %08x\n", hres); + ok(col != NULL, "get_tBodies returned NULL\n"); + + test_elem_collection((IUnknown*)col, tbodies_types, sizeof(tbodies_types)/sizeof(*tbodies_types)); + IHTMLElementCollection_Release(col); + IHTMLTable_Release(table); }

1 0

Henri Verbeet : wined3d: Use GL_STATIC_DRAW_ARB for static buffers.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 12a05be5b6a081c957619e0e751a56dc28d5b423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a05be5b6a081c957619e0e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 15 08:14:51 2013 +0200 wined3d: Use GL_STATIC_DRAW_ARB for static buffers. This mostly affects the initial placement of the VBO. If an application really does use a static buffer as if it was a dynamic one the driver is likely to migrate it out of VRAM anyway, we shouldn't penalize more well-behaved applications for that. --- dlls/wined3d/buffer.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e9a07a5..dc5b4d2 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -113,7 +113,8 @@ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_g /* Context activation is done by the caller. */ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) { - GLenum error, gl_usage; + GLenum gl_usage = GL_STATIC_DRAW_ARB; + GLenum error; TRACE("Creating an OpenGL vertex buffer object for wined3d_buffer %p with usage %s.\n", This, debug_d3dusage(This->resource.usage)); @@ -149,12 +150,9 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc goto fail; } - /* Don't use static, because dx apps tend to update the buffer - * quite often even if they specify 0 usage. - */ - if(This->resource.usage & WINED3DUSAGE_DYNAMIC) + if (This->resource.usage & WINED3DUSAGE_DYNAMIC) { - TRACE("Gl usage = GL_STREAM_DRAW_ARB\n"); + TRACE("Buffer has WINED3DUSAGE_DYNAMIC set.\n"); gl_usage = GL_STREAM_DRAW_ARB; if(gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) @@ -169,11 +167,6 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc } /* No setup is needed here for GL_ARB_map_buffer_range */ } - else - { - TRACE("Gl usage = GL_DYNAMIC_DRAW_ARB\n"); - gl_usage = GL_DYNAMIC_DRAW_ARB; - } /* Reserve memory for the buffer. The amount of data won't change * so we are safe with calling glBufferData once and

1 0

Henri Verbeet : d3drm: Just use RGBA_MAKE.
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 0c228f5faf61d5fa11da74cdc866aa53fe755407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c228f5faf61d5fa11da74cdc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 15 08:14:52 2013 +0200 d3drm: Just use RGBA_MAKE. D3DCOLOR_ARGB is a d3d8+ thing, ddraw has RGBA_MAKE. --- dlls/d3drm/d3drm_private.h | 2 -- dlls/d3drm/frame.c | 7 +++---- dlls/d3drm/light.c | 4 +--- dlls/d3drm/meshbuilder.c | 12 ++++-------- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 941e467..0283cad 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -24,8 +24,6 @@ #include "d3drm.h" #include "dxfile.h" -#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) - HRESULT Direct3DRM_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index b0bbaa6..3492cca 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2133,9 +2133,8 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_SetSceneBackgroundRGB(IDirect3DRMFra TRACE("(%p/%p)->(%f,%f,%f)\n", iface, This, red, green, blue); - This->scenebackground = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), - (BYTE)(green * 255.0f), - (BYTE)(blue * 255.0f)); + This->scenebackground = RGBA_MAKE((BYTE)(red * 255.0f), + (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); return D3DRM_OK; } @@ -2661,7 +2660,7 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa object->IDirect3DRMFrame2_iface.lpVtbl = &Direct3DRMFrame2_Vtbl; object->IDirect3DRMFrame3_iface.lpVtbl = &Direct3DRMFrame3_Vtbl; object->ref = 1; - object->scenebackground = D3DCOLOR_ARGB(0xff, 0, 0, 0); + object->scenebackground = RGBA_MAKE(0, 0, 0, 0xff); memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D)); diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 32500bf..d8eed7e 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -213,9 +213,7 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetColorRGB(IDirect3DRMLight* iface, TRACE("(%p/%p)->(%f,%f,%f)\n", iface, This, red, green, blue); - This->color = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), - (BYTE)(green * 255.0f), - (BYTE)(blue * 255.0f)); + This->color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); return D3DRM_OK; } diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 51f981a..065503a 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1337,8 +1337,8 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, values = (float*)ptr; - This->materials[i].color = D3DCOLOR_ARGB((BYTE)(values[3] * 255.0f), (BYTE)(values[0] * 255.0f), - (BYTE)(values[1] * 255.0f), (BYTE)(values[2] * 255.0f)); + This->materials[i].color = RGBA_MAKE((BYTE)(values[0] * 255.0f), (BYTE)(values[1] * 255.0f), + (BYTE)(values[2] * 255.0f), (BYTE)(values[3] * 255.0f)); IDirect3DRMMaterial2_SetAmbient(This->materials[i].material, values[0], values [1], values[2]); /* Alpha ignored */ IDirect3DRMMaterial2_SetPower(This->materials[i].material, values[4]); @@ -1827,9 +1827,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetColorRGB(IDirect3DRMMeshBui TRACE("(%p)->(%f,%f,%f)\n", This, red, green, blue); - This->color = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), - (BYTE)(green * 255.0f), - (BYTE)(blue * 255.0f)); + This->color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); return D3DRM_OK; } @@ -2845,9 +2843,7 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupColorRGB(IDirect3DRMMesh* ifac if (id >= This->nb_groups) return D3DRMERR_BADVALUE; - This->groups[id].color = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), - (BYTE)(green * 255.0f), - (BYTE)(blue * 255.0f)); + This->groups[id].color = RGBA_MAKE((BYTE)(red * 255.0f), (BYTE)(green * 255.0f), (BYTE)(blue * 255.0f), 0xff); return D3DRM_OK; }

1 0

Henri Verbeet : d3drm: Get rid of Direct3DRM_create().
by Alexandre Julliard 15 Apr '13

15 Apr '13

Module: wine Branch: master Commit: 06561779110c8d0b55fa9d71716776499144ca65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06561779110c8d0b55fa9d717… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 15 08:14:53 2013 +0200 d3drm: Get rid of Direct3DRM_create(). --- dlls/d3drm/d3drm.c | 11 +++++------ dlls/d3drm/d3drm_main.c | 10 ---------- dlls/d3drm/d3drm_private.h | 1 - 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index a18eb11..65dea6c 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1678,14 +1678,13 @@ static const struct IDirect3DRM3Vtbl Direct3DRM3_Vtbl = IDirect3DRM3Impl_GetOptions }; -HRESULT Direct3DRM_create(IUnknown** ppObj) +HRESULT WINAPI Direct3DRMCreate(IDirect3DRM **d3drm) { - IDirect3DRMImpl* object; + IDirect3DRMImpl *object; - TRACE("(%p)\n", ppObj); + TRACE("d3drm %p.\n", d3drm); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMImpl)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRM_iface.lpVtbl = &Direct3DRM_Vtbl; @@ -1693,7 +1692,7 @@ HRESULT Direct3DRM_create(IUnknown** ppObj) object->IDirect3DRM3_iface.lpVtbl = &Direct3DRM3_Vtbl; object->ref = 1; - *ppObj = (IUnknown*)&object->IDirect3DRM_iface; + *d3drm = &object->IDirect3DRM_iface; return S_OK; } diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index 2adc188..c9bf703 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -42,13 +42,3 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } return TRUE; } - -/*********************************************************************** - * (D3DRM.@) - */ -HRESULT WINAPI Direct3DRMCreate(LPDIRECT3DRM* ppDirect3DRM) -{ - TRACE("(%p)\n", ppDirect3DRM); - - return Direct3DRM_create((IUnknown**)ppDirect3DRM); -} diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 0283cad..ce896a1 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -24,7 +24,6 @@ #include "d3drm.h" #include "dxfile.h" -HRESULT Direct3DRM_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN; HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN;

1 0

André Hentschel : Wine 1.5.28 freigegeben
by Jeremy Newman 15 Apr '13

15 Apr '13

Module: website Branch: master Commit: bfe997e7496a8255279c22fe3dbbea75be467a2e URL: http://source.winehq.org/git/website.git/?a=commit;h=bfe997e7496a8255279c22… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 12 22:15:41 2013 +0200 Wine 1.5.28 freigegeben --- news/de/2013041201.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2013041201.xml b/news/de/2013041201.xml new file mode 100644 index 0000000..32cdaa4 --- /dev/null +++ b/news/de/2013041201.xml @@ -0,0 +1,17 @@ +<news> +<date>12. April 2013</date> +<title>Wine 1.5.28 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.28 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.28">Neuerungen (en)</a> in dieser Version: +<ul> + <li>GnuTLS wird nun für alle sicheren Verbindungen genutzt, OpenSSL ist nicht länger nötig.</li> + <li>Mac Treiber standardmäßig aktiviert.</li> + <li>Eigene FixedSys Schriftarten.</li> + <li>Neues Icon für die Joystick Systemsteuerung.</li> + <li>Verbesserungen am Postscript Treiber.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.28.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Scott Ritchie : Update download page with new Ubuntu information
by Jeremy Newman 15 Apr '13

15 Apr '13

Module: website Branch: master Commit: 60b016dc54115c7e137aae388f00ed9e44dfff65 URL: http://source.winehq.org/git/website.git/?a=commit;h=60b016dc54115c7e137aae… Author: Scott Ritchie <scottritchie(a)ubuntu.com> Date: Fri Apr 12 16:20:11 2013 -0700 Update download page with new Ubuntu information Update download page with new Ubuntu information >From 251bb488f74a3cb5445f4495d387d050191c4e44 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scottritchie(a)ubuntu.com> Date: Fri, 12 Apr 2013 16:12:22 -0700 Subject: [PATCH] Update download page with new Ubuntu information --- templates/en/download.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index eb5d3a2..616dce8 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -61,8 +61,8 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Download Ubuntu packages</a> - - binary and source .debs for Ubuntu Oneiric (11.10), and Precise (12.04) - <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> + - binary and source .debs for Ubuntu Precise (12.04), Quantal (12.10), and Raring (13.04) + <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> <tr bgcolor="#ffffff">

1 0

Frédéric Delanoy : French translation for release 1.5.28
by Jeremy Newman 15 Apr '13

15 Apr '13

Module: website Branch: master Commit: 09e96dc94957c2b08387b66e041bbb5699113686 URL: http://source.winehq.org/git/website.git/?a=commit;h=09e96dc94957c2b08387b6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Apr 13 09:29:23 2013 +0200 French translation for release 1.5.28 --- news/fr/2013041201.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2013041201.xml b/news/fr/2013041201.xml new file mode 100644 index 0000000..1f7c607 --- /dev/null +++ b/news/fr/2013041201.xml @@ -0,0 +1,16 @@ +<news> +<date>12 avril 2013</date> +<title>Sortie de Wine 1.5.28</title> +<body> + La version de développement 1.5.28 de Wine est disponible. + <a href="{$root}/announce/1.5.28">Nouveautés</a> de cette version : +<ul> + <li>GnuTLS utilisé pour toutes les connexions sécurisées ; OpenSSL n'est plus nécessaire.</li> + <li>Pilote Mac activé par défaut.</li> + <li>Fontes FixedSys intégrées.</li> + <li>Nouvelle icône pour les joysticks dans le panneau de configuration.</li> + <li>Améliorations aux pilote Postscript.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.28.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0