wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Igor Paliychuk : ipconfig: Added Ukrainian translation.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: de11a2a7e4fb01284e2b857d9b8bfe50e58e015a URL: http://source.winehq.org/git/wine.git/?a=commit;h=de11a2a7e4fb01284e2b857d9… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Wed Aug 18 20:01:50 2010 +0300 ipconfig: Added Ukrainian translation. --- programs/ipconfig/Makefile.in | 3 +- programs/ipconfig/Uk.rc | 49 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletions(-) diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index 1621cd9..6e57d7b 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -14,6 +14,7 @@ RC_SRCS = \ En.rc \ Fr.rc \ It.rc \ - Lt.rc + Lt.rc \ + Uk.rc @MAKE_PROG_RULES@ diff --git a/programs/ipconfig/Uk.rc b/programs/ipconfig/Uk.rc new file mode 100644 index 0000000..7b400cb --- /dev/null +++ b/programs/ipconfig/Uk.rc @@ -0,0 +1,49 @@ +/* + * IP configuration utility + * Ukrainian language support + * + * Copyright 2010 Andrew Nguyen + * Copyright 2010 Igor Paliychuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "ipconfig.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Використання: ipconfig [ /? | /all ]\n" + STRING_INVALID_CMDLINE, "Помилка: Вказані невідомі чи невірні параметри командного рядка\n" + STRING_ADAPTER_FRIENDLY, "%s адаптер %s\n" + STRING_ETHERNET, "Ethernet" + STRING_UNKNOWN, "Невідомо" + STRING_CONN_DNS_SUFFIX, "DNS-суфікс підключення" + STRING_IP_ADDRESS, "IP-адреса" + STRING_HOSTNAME, "Ім'я хосту" + STRING_NODE_TYPE, "Тип вузла" + STRING_BROADCAST, "Передача" + STRING_PEER_TO_PEER, "Peer-to-peer" + STRING_MIXED, "Змішаний" + STRING_HYBRID, "Гібрид" + STRING_IP_ROUTING, "IP-маршрутизація включена" + STRING_DESCRIPTION, "Опис" + STRING_PHYS_ADDR, "Фізична адреса" + STRING_DHCP_ENABLED, "DHCP ввімкнено" +}

1 0

Igor Paliychuk : jscript: Ukrainian translation update.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 3656f3fcc423039430791a28e443b9ead85ae332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3656f3fcc423039430791a28e… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Wed Aug 18 19:23:38 2010 +0300 jscript: Ukrainian translation update. --- dlls/jscript/jscript_Uk.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Uk.rc b/dlls/jscript/jscript_Uk.rc index 6f0913a..fe756e2 100644 --- a/dlls/jscript/jscript_Uk.rc +++ b/dlls/jscript/jscript_Uk.rc @@ -30,6 +30,7 @@ STRINGTABLE IDS_INVALID_CALL_ARG "Невірний виклик процедури або аргумент" IDS_CREATE_OBJ_ERROR "Сервер автоматизації не може створити об'єкт" IDS_NO_PROPERTY "Об'єкт не підтримує цю властивість чи метод" + IDS_UNSUPPORTED_ACTION "Об'єкт не підтримує цю дію" IDS_ARG_NOT_OPT "Відсутній обов'язковий аргумент" IDS_SYNTAX_ERROR "Синтаксична помилка" IDS_SEMICOLON "Очікується ';'"

1 0

André Hentschel : ipconfig: Add German translation.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: dc4c7127261c3763c87d1a70cea8b7b82ea86df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4c7127261c3763c87d1a70c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 18 19:54:31 2010 +0200 ipconfig: Add German translation. --- programs/ipconfig/De.rc | 47 +++++++++++++++++++++++++++++++++++++++++ programs/ipconfig/Makefile.in | 1 + 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/De.rc b/programs/ipconfig/De.rc new file mode 100644 index 0000000..08b0441 --- /dev/null +++ b/programs/ipconfig/De.rc @@ -0,0 +1,47 @@ +/* + * IP configuration utility + * German language support + * + * Copyright 2010 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "ipconfig.h" + +#pragma code_page(65001) + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Gebrauch: ipconfig [ /? | /all ]\n" + STRING_INVALID_CMDLINE, "Fehler: Unbekannte oder ungültige Kommandozeilenparameter angegeben\n" + STRING_ADAPTER_FRIENDLY, "%s Adapter %s\n" + STRING_ETHERNET, "Ethernet" + STRING_UNKNOWN, "Unbekannt" + STRING_CONN_DNS_SUFFIX, "Verbindungsspezifisches DNS-Suffix" + STRING_IP_ADDRESS, "IP-Adresse" + STRING_HOSTNAME, "Hostname" + STRING_NODE_TYPE, "Knotentyp" + STRING_BROADCAST, "Broadcast" + STRING_PEER_TO_PEER, "Peer-to-peer" + STRING_MIXED, "Mixed" + STRING_HYBRID, "Hybrid" + STRING_IP_ROUTING, "IP-Routing aktiviert" + STRING_DESCRIPTION, "Beschreibung" + STRING_PHYS_ADDR, "Physikalische Adresse" + STRING_DHCP_ENABLED, "DHCP aktiviert" +} diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index 551076a..1621cd9 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -10,6 +10,7 @@ IMPORTS = iphlpapi ws2_32 user32 C_SRCS = ipconfig.c RC_SRCS = \ + De.rc \ En.rc \ Fr.rc \ It.rc \

1 0

Henri Verbeet : ddraw: Add a separate function for clipper initialization.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 4b84c5e5b7df80bd08915208e798eebc873cd2aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b84c5e5b7df80bd08915208e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:25 2010 +0200 ddraw: Add a separate function for clipper initialization. --- dlls/ddraw/clipper.c | 16 +++++++++++++++- dlls/ddraw/ddraw.c | 12 +++++++----- dlls/ddraw/ddraw_private.h | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index 25e71fa..a7ec624 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -283,7 +283,7 @@ static HRESULT WINAPI IDirectDrawClipperImpl_IsClipListChanged( /***************************************************************************** * The VTable *****************************************************************************/ -const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl = +static const struct IDirectDrawClipperVtbl ddraw_clipper_vtbl = { IDirectDrawClipperImpl_QueryInterface, IDirectDrawClipperImpl_AddRef, @@ -295,3 +295,17 @@ const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl = IDirectDrawClipperImpl_SetClipList, IDirectDrawClipperImpl_SetHwnd }; + +HRESULT ddraw_clipper_init(IDirectDrawClipperImpl *clipper) +{ + clipper->lpVtbl = &ddraw_clipper_vtbl; + clipper->ref = 1; + clipper->wineD3DClipper = pWineDirect3DCreateClipper((IUnknown *)clipper); + if (!clipper->wineD3DClipper) + { + WARN("Failed to create wined3d clipper.\n"); + return E_OUTOFMEMORY; + } + + return DD_OK; +} diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index df79f0e..20f31ee 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3840,6 +3840,8 @@ DirectDrawCreateClipper(DWORD Flags, IUnknown *UnkOuter) { IDirectDrawClipperImpl* object; + HRESULT hr; + TRACE("(%08x,%p,%p)\n", Flags, Clipper, UnkOuter); EnterCriticalSection(&ddraw_cs); @@ -3863,16 +3865,16 @@ DirectDrawCreateClipper(DWORD Flags, return E_OUTOFMEMORY; } - object->lpVtbl = &IDirectDrawClipper_Vtbl; - object->ref = 1; - object->wineD3DClipper = pWineDirect3DCreateClipper((IUnknown *) object); - if(!object->wineD3DClipper) + hr = ddraw_clipper_init(object); + if (FAILED(hr)) { + WARN("Failed to initialize clipper, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); LeaveCriticalSection(&ddraw_cs); - return E_OUTOFMEMORY; + return hr; } + TRACE("Created clipper %p.\n", object); *Clipper = (IDirectDrawClipper *) object; LeaveCriticalSection(&ddraw_cs); return DD_OK; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 40f3bfd..6341f3f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -462,7 +462,7 @@ struct IDirectDrawClipperImpl BOOL initialized; }; -extern const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl DECLSPEC_HIDDEN; +HRESULT ddraw_clipper_init(IDirectDrawClipperImpl *clipper) DECLSPEC_HIDDEN; typeof(WineDirect3DCreateClipper) *pWineDirect3DCreateClipper DECLSPEC_HIDDEN;

1 0

Henri Verbeet : ddraw: Add a separate function for parent initialization.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 759fd517aa98b0ef8f7a73b06ac74eb77e687f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=759fd517aa98b0ef8f7a73b06… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:24 2010 +0200 ddraw: Add a separate function for parent initialization. --- dlls/ddraw/ddraw.c | 7 +++---- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/parent.c | 8 +++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7d97a91..df79f0e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4701,8 +4701,8 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, LeaveCriticalSection(&ddraw_cs); return DDERR_OUTOFMEMORY; } - index_buffer_parent->lpVtbl = &IParent_Vtbl; - index_buffer_parent->ref = 1; + + ddraw_parent_init(index_buffer_parent); /* Create an Index Buffer. WineD3D needs one for Drawing indexed primitives * Create a (hopefully) long enough buffer, and copy the indices into it @@ -5928,8 +5928,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar return DDERR_OUTOFVIDEOMEMORY; } - object->lpVtbl = &IParent_Vtbl; - object->ref = 1; + ddraw_parent_init(object); hr = IWineD3DDevice_CreateSwapChain(This->wineD3DDevice, present_parameters, swapchain, (IUnknown *)object, This->ImplType); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 81d2fd3..40f3bfd 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -315,7 +315,7 @@ struct IParentImpl }; -extern const IParentVtbl IParent_Vtbl DECLSPEC_HIDDEN; +void ddraw_parent_init(IParentImpl *parent) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DDevice implementation diff --git a/dlls/ddraw/parent.c b/dlls/ddraw/parent.c index 2d8f519..705d587 100644 --- a/dlls/ddraw/parent.c +++ b/dlls/ddraw/parent.c @@ -121,9 +121,15 @@ static ULONG WINAPI IParentImpl_Release(IParent *iface) /***************************************************************************** * The VTable *****************************************************************************/ -const IParentVtbl IParent_Vtbl = +static const struct IParentVtbl ddraw_parent_vtbl = { IParentImpl_QueryInterface, IParentImpl_AddRef, IParentImpl_Release, }; + +void ddraw_parent_init(IParentImpl *parent) +{ + parent->lpVtbl = &ddraw_parent_vtbl; + parent->ref = 1; +}

1 0

Henri Verbeet : ddraw: Add a separate function for viewport initialization.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 921bd1bf9a55908cf97b321668e5d73be51696f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=921bd1bf9a55908cf97b32166… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:23 2010 +0200 ddraw: Add a separate function for viewport initialization. --- dlls/ddraw/ddraw.c | 5 +---- dlls/ddraw/ddraw_private.h | 4 +--- dlls/ddraw/viewport.c | 10 +++++++++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7541671..7d97a91 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4505,10 +4505,7 @@ static HRESULT WINAPI d3d3_CreateViewport(IDirect3D3 *iface, IDirect3DViewport3 return DDERR_OUTOFMEMORY; } - object->lpVtbl = &IDirect3DViewport3_Vtbl; - object->ref = 1; - object->ddraw = ddraw_from_d3d3(iface); - object->use_vp2 = 0xff; + d3d_viewport_init(object, ddraw_from_d3d3(iface)); TRACE("Created viewport %p.\n", object); *viewport = (IDirect3DViewport3 *)object; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 6ea61fe..81d2fd3 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -587,11 +587,9 @@ struct IDirect3DViewportImpl IDirect3DMaterialImpl *background; }; -/* Vtable */ -extern const IDirect3DViewport3Vtbl IDirect3DViewport3_Vtbl DECLSPEC_HIDDEN; - /* Helper functions */ void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights) DECLSPEC_HIDDEN; +void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DExecuteBuffer - Wraps to D3D7 diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 56572e3..118e03a 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -1078,7 +1078,7 @@ IDirect3DViewportImpl_Clear2(IDirect3DViewport3 *iface, * The VTable *****************************************************************************/ -const IDirect3DViewport3Vtbl IDirect3DViewport3_Vtbl = +static const struct IDirect3DViewport3Vtbl d3d_viewport_vtbl = { /*** IUnknown Methods ***/ IDirect3DViewportImpl_QueryInterface, @@ -1106,3 +1106,11 @@ const IDirect3DViewport3Vtbl IDirect3DViewport3_Vtbl = IDirect3DViewportImpl_GetBackgroundDepth2, IDirect3DViewportImpl_Clear2, }; + +void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) +{ + viewport->lpVtbl = &d3d_viewport_vtbl; + viewport->ref = 1; + viewport->ddraw = ddraw; + viewport->use_vp2 = 0xff; +}

1 0

Henri Verbeet : ddraw: Add a separate function for material initialization.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: bf26c2c869ef49a69dd192fed58b8f393b69a5d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf26c2c869ef49a69dd192fed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:22 2010 +0200 ddraw: Add a separate function for material initialization. --- dlls/ddraw/ddraw.c | 6 +----- dlls/ddraw/ddraw_private.h | 6 +----- dlls/ddraw/material.c | 15 ++++++++++++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 28af7d0..7541671 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4432,11 +4432,7 @@ static HRESULT WINAPI d3d3_CreateMaterial(IDirect3D3 *iface, IDirect3DMaterial3 return DDERR_OUTOFMEMORY; } - object->lpVtbl = &IDirect3DMaterial3_Vtbl; - object->IDirect3DMaterial2_vtbl = &IDirect3DMaterial2_Vtbl; - object->IDirect3DMaterial_vtbl = &IDirect3DMaterial_Vtbl; - object->ref = 1; - object->ddraw = ddraw_from_d3d3(iface); + d3d_material_init(object, ddraw_from_d3d3(iface)); TRACE("Created material %p.\n", object); *material = (IDirect3DMaterial3 *)object; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f7ea61d..6ea61fe 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -548,13 +548,9 @@ struct IDirect3DMaterialImpl DWORD Handle; }; -/* VTables in various versions */ -extern const IDirect3DMaterialVtbl IDirect3DMaterial_Vtbl DECLSPEC_HIDDEN; -extern const IDirect3DMaterial2Vtbl IDirect3DMaterial2_Vtbl DECLSPEC_HIDDEN; -extern const IDirect3DMaterial3Vtbl IDirect3DMaterial3_Vtbl DECLSPEC_HIDDEN; - /* Helper functions */ void material_activate(IDirect3DMaterialImpl* This) DECLSPEC_HIDDEN; +void d3d_material_init(IDirect3DMaterialImpl *material, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DViewport - Wraps to D3D7 diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 68da7ff..10f4ab5 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -448,7 +448,7 @@ void material_activate(IDirect3DMaterialImpl* This) IDirect3DDevice7_SetMaterial((IDirect3DDevice7 *)This->active_device, &d3d7mat); } -const IDirect3DMaterial3Vtbl IDirect3DMaterial3_Vtbl = +static const struct IDirect3DMaterial3Vtbl d3d_material3_vtbl = { /*** IUnknown Methods ***/ IDirect3DMaterialImpl_QueryInterface, @@ -460,7 +460,7 @@ const IDirect3DMaterial3Vtbl IDirect3DMaterial3_Vtbl = IDirect3DMaterialImpl_GetHandle, }; -const IDirect3DMaterial2Vtbl IDirect3DMaterial2_Vtbl = +static const struct IDirect3DMaterial2Vtbl d3d_material2_vtbl = { /*** IUnknown Methods ***/ Thunk_IDirect3DMaterialImpl_2_QueryInterface, @@ -472,7 +472,7 @@ const IDirect3DMaterial2Vtbl IDirect3DMaterial2_Vtbl = Thunk_IDirect3DMaterialImpl_2_GetHandle, }; -const IDirect3DMaterialVtbl IDirect3DMaterial_Vtbl = +static const struct IDirect3DMaterialVtbl d3d_material1_vtbl = { /*** IUnknown Methods ***/ Thunk_IDirect3DMaterialImpl_1_QueryInterface, @@ -486,3 +486,12 @@ const IDirect3DMaterialVtbl IDirect3DMaterial_Vtbl = IDirect3DMaterialImpl_Reserve, IDirect3DMaterialImpl_Unreserve }; + +void d3d_material_init(IDirect3DMaterialImpl *material, IDirectDrawImpl *ddraw) +{ + material->lpVtbl = &d3d_material3_vtbl; + material->IDirect3DMaterial2_vtbl = &d3d_material2_vtbl; + material->IDirect3DMaterial_vtbl = &d3d_material1_vtbl; + material->ref = 1; + material->ddraw = ddraw; +}

1 0

Henri Verbeet : ddraw: Add a separate function for light initialization.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: c892ed497c7faecfe9060a2e4b146812269701c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c892ed497c7faecfe9060a2e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:21 2010 +0200 ddraw: Add a separate function for light initialization. --- dlls/ddraw/ddraw.c | 4 +--- dlls/ddraw/ddraw_private.h | 4 +--- dlls/ddraw/light.c | 9 ++++++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 55753c4..28af7d0 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4375,9 +4375,7 @@ static HRESULT WINAPI d3d3_CreateLight(IDirect3D3 *iface, IDirect3DLight **light return DDERR_OUTOFMEMORY; } - object->lpVtbl = &IDirect3DLight_Vtbl; - object->ref = 1; - object->ddraw = ddraw_from_d3d3(iface); + d3d_light_init(object, ddraw_from_d3d3(iface)); TRACE("Created light %p.\n", object); *light = (IDirect3DLight *)object; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index fe65b79..f7ea61d 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -525,12 +525,10 @@ struct IDirect3DLightImpl IDirect3DLightImpl *next; }; -/* Vtable */ -extern const IDirect3DLightVtbl IDirect3DLight_Vtbl DECLSPEC_HIDDEN; - /* Helper functions */ void light_activate(IDirect3DLightImpl *light) DECLSPEC_HIDDEN; void light_deactivate(IDirect3DLightImpl *light) DECLSPEC_HIDDEN; +void d3d_light_init(IDirect3DLightImpl *light, IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; /****************************************************************************** * IDirect3DMaterial implementation structure - Wraps to D3D7 diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 9726d86..3cf26b5 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -287,7 +287,7 @@ IDirect3DLightImpl_GetLight(IDirect3DLight *iface, return DD_OK; } -const IDirect3DLightVtbl IDirect3DLight_Vtbl = +static const struct IDirect3DLightVtbl d3d_light_vtbl = { /*** IUnknown Methods ***/ IDirect3DLightImpl_QueryInterface, @@ -298,3 +298,10 @@ const IDirect3DLightVtbl IDirect3DLight_Vtbl = IDirect3DLightImpl_SetLight, IDirect3DLightImpl_GetLight }; + +void d3d_light_init(IDirect3DLightImpl *light, IDirectDrawImpl *ddraw) +{ + light->lpVtbl = &d3d_light_vtbl; + light->ref = 1; + light->ddraw = ddraw; +}

1 0

Henri Verbeet : ddraw: Remove unused / redundant includes.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: c5a14085d45a7402f3013e0397957d1250261f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a14085d45a7402f3013e039… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:20 2010 +0200 ddraw: Remove unused / redundant includes. --- dlls/ddraw/clipper.c | 15 +-------------- dlls/ddraw/ddraw.c | 18 ------------------ dlls/ddraw/ddraw_private.h | 18 ++++++++---------- dlls/ddraw/device.c | 18 ------------------ dlls/ddraw/executebuffer.c | 18 ------------------ dlls/ddraw/light.c | 17 ----------------- dlls/ddraw/main.c | 19 ++----------------- dlls/ddraw/material.c | 18 ------------------ dlls/ddraw/palette.c | 8 +------- dlls/ddraw/parent.c | 17 ----------------- dlls/ddraw/regsvr.c | 16 ++++------------ dlls/ddraw/surface.c | 18 ------------------ dlls/ddraw/utils.c | 4 +--- dlls/ddraw/vertexbuffer.c | 17 ----------------- dlls/ddraw/viewport.c | 18 ------------------ 15 files changed, 17 insertions(+), 222 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index a8a3242..25e71fa 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -20,23 +20,10 @@ */ #include "config.h" - -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "ddraw.h" -#include "winerror.h" +#include "wine/port.h" #include "ddraw_private.h" -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(ddraw); /***************************************************************************** diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 6f060e7..55753c4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -23,25 +23,7 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 990d4f7..fe65b79 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -19,24 +19,22 @@ #ifndef __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H #define __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H -/* MAY NOT CONTAIN X11 or DGA specific includes/defines/structs! */ +#include <assert.h> +#define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "wine/debug.h" -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" #include "winbase.h" -#include "wtypes.h" #include "wingdi.h" #include "winuser.h" -#include "ddraw.h" -#include "ddrawi.h" -#include "d3d.h" -#include "wine/list.h" +#include "d3d.h" +#include "ddraw.h" #ifdef DDRAW_INIT_GUID #include "initguid.h" #endif +#include "wine/list.h" #include "wine/wined3d.h" extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 25ff428..bb046b4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -30,25 +30,7 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d7); WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 04f856a..9f08976 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -23,25 +23,7 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d7); diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index dd41ffe..9726d86 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -21,23 +21,6 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" - -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" #include "ddraw_private.h" diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 7292ed8..0fccec7 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -26,28 +26,13 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS +#define DDRAW_INIT_GUID +#include "ddraw_private.h" -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" #include "wine/exception.h" #include "winreg.h" -#include "ddraw.h" -#include "d3d.h" - -#define DDRAW_INIT_GUID -#include "ddraw_private.h" - static typeof(WineDirect3DCreate) *pWineDirect3DCreate; WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 3c5dc1d..68da7ff 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -22,25 +22,7 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d7); WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk); diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 9ef0a7c..2937ec6 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -18,13 +18,7 @@ */ #include "config.h" -#include "winerror.h" -#include "wine/debug.h" - -#define COBJMACROS - -#include <assert.h> -#include <string.h> +#include "wine/port.h" #include "ddraw_private.h" diff --git a/dlls/ddraw/parent.c b/dlls/ddraw/parent.c index 473152e..2d8f519 100644 --- a/dlls/ddraw/parent.c +++ b/dlls/ddraw/parent.c @@ -23,23 +23,6 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" - -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" #include "ddraw_private.h" diff --git a/dlls/ddraw/regsvr.c b/dlls/ddraw/regsvr.c index 6ab75d1..52a6fb7 100644 --- a/dlls/ddraw/regsvr.c +++ b/dlls/ddraw/regsvr.c @@ -18,20 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <string.h> +#include "config.h" +#include "wine/port.h" -#include "windef.h" -#include "winbase.h" -#include "winreg.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" - -#include "ddraw.h" - -#include "wine/debug.h" +#include "ddraw_private.h" #include "wine/unicode.h" +#include "winreg.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8f23ab1..46c166a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -26,25 +26,7 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index ed8b480..89234c1 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -22,11 +22,9 @@ */ #include "config.h" - -#define NONAMELESSUNION +#include "wine/port.h" #include "ddraw_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index f16cf12..fc02660 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -21,23 +21,6 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" - -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" #include "ddraw_private.h" diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 403463b..56572e3 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -22,25 +22,7 @@ #include "config.h" #include "wine/port.h" -#include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/exception.h" - -#include "ddraw.h" -#include "d3d.h" - #include "ddraw_private.h" -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d7);

1 0

Henri Verbeet : ddraw: Merge texture.c into surface.c.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 407f78e9e1cd97d499b075c4182bfd906a0c9d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=407f78e9e1cd97d499b075c41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 18 19:26:19 2010 +0200 ddraw: Merge texture.c into surface.c. --- dlls/ddraw/Makefile.in | 1 - dlls/ddraw/surface.c | 398 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/texture.c | 501 ------------------------------------------------ 3 files changed, 398 insertions(+), 502 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=407f78e9e1cd97d499b07…

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010