January 2009 - Wine-Commits

Aric Stewart : shell32: Initial stub for SHGetImageList.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: c31a0cc4e18f465584ace353ddd75aac117dac79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31a0cc4e18f465584ace353d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 20 09:33:02 2009 -0600 shell32: Initial stub for SHGetImageList. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellord.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 6a51bcd..b64d8ef 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -256,6 +256,7 @@ 704 stdcall -noname GUIDFromStringW(wstr ptr) 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW + 727 stdcall SHGetImageList(long ptr ptr) 730 stdcall -noname RestartDialogEx(long wstr long long) 1217 stub FOOBAR1217 # no joke! This is the real name!! diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 51d6fc9..82a0e69 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -2017,3 +2017,9 @@ BOOL WINAPI LinkWindow_UnregisterClass(void) void WINAPI SHFlushSFCache(void) { } + +HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) +{ + FIXME("STUB: %i %s\n",iImageList,debugstr_guid(riid)); + return E_NOINTERFACE; +}

1 0

Dylan Smith : richedit: Implemented ITextServices TxGetText and TxSetText.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: 20d6bc8ac7e3b166fbb50337e59a7d2c2c23ef7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d6bc8ac7e3b166fbb50337e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 20 01:41:44 2009 -0500 richedit: Implemented ITextServices TxGetText and TxSetText. --- dlls/riched20/Makefile.in | 2 +- dlls/riched20/tests/txtsrv.c | 12 ++++++------ dlls/riched20/txtsrv.c | 32 ++++++++++++++++++++++++++++---- 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index 7f85120..d56137e 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = riched20.dll IMPORTLIB = riched20 -IMPORTS = uuid ole32 imm32 user32 gdi32 kernel32 +IMPORTS = uuid ole32 oleaut32 imm32 user32 gdi32 kernel32 C_SRCS = \ caret.c \ diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 05976ef..87cbebf 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -641,7 +641,7 @@ static void test_TxGetText(void) return; hres = ITextServices_TxGetText(txtserv, &rettext); - todo_wine ok(hres == S_OK, "ITextServices_TxGetText failed\n"); + ok(hres == S_OK, "ITextServices_TxGetText failed\n"); IUnknown_Release(txtserv); CoTaskMemFree(dummyTextHost); @@ -657,14 +657,14 @@ static void test_TxSetText(void) return; hres = ITextServices_TxSetText(txtserv, settext); - todo_wine ok(hres == S_OK, "ITextServices_TxSetText failed\n"); + ok(hres == S_OK, "ITextServices_TxSetText failed\n"); hres = ITextServices_TxGetText(txtserv, &rettext); - todo_wine ok(hres == S_OK, "ITextServices_TxGetText failed\n"); + ok(hres == S_OK, "ITextServices_TxGetText failed\n"); - todo_wine ok(SysStringLen(rettext) == 4, + ok(SysStringLen(rettext) == 4, "String returned of wrong length\n"); - todo_wine ok(memcmp(rettext,settext,SysStringByteLen(rettext)) == 0, + ok(memcmp(rettext,settext,SysStringByteLen(rettext)) == 0, "String returned differs\n"); IUnknown_Release(txtserv); @@ -717,7 +717,7 @@ void test_TxGetNaturalSize() { xdim = 0; ydim = 0; result = ITextServices_TxSetText(txtserv, oneA); - todo_wine ok(result == S_OK, "ITextServices_TxSetText failed\n"); + ok(result == S_OK, "ITextServices_TxSetText failed\n"); result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index f05e721..2d5ff81 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -27,6 +27,7 @@ #include "editor.h" #include "ole2.h" +#include "oleauto.h" #include "richole.h" #include "imm.h" #include "textserv.h" @@ -276,9 +277,23 @@ HRESULT WINAPI fnTextSrv_TxGetText(ITextServices *iface, BSTR* pbstrText) { ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + int length; - FIXME("%p: STUB\n", This); - return E_NOTIMPL; + length = ME_GetTextLength(This->editor); + if (length) + { + BSTR bstr; + bstr = SysAllocStringByteLen(NULL, length * sizeof(WCHAR)); + if (bstr == NULL) + return E_OUTOFMEMORY; + + ME_GetTextW(This->editor, bstr , 0, length, FALSE); + *pbstrText = bstr; + } else { + *pbstrText = NULL; + } + + return S_OK; } HRESULT WINAPI fnTextSrv_TxSetText(ITextServices *iface, @@ -286,8 +301,17 @@ HRESULT WINAPI fnTextSrv_TxSetText(ITextServices *iface, { ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); - FIXME("%p: STUB\n", This); - return E_NOTIMPL; + ME_InternalDeleteText(This->editor, 0, ME_GetTextLength(This->editor), + FALSE); + ME_InsertTextFromCursor(This->editor, 0, pszText, -1, + This->editor->pBuffer->pDefaultStyle); + ME_SetSelection(This->editor, 0, 0); + This->editor->nModifyStep = 0; + OleFlushClipboard(); + ME_EmptyUndoStack(This->editor); + ME_UpdateRepaint(This->editor); + + return S_OK; } HRESULT WINAPI fnTextSrv_TxGetCurrentTargetX(ITextServices *iface,

1 0

Dylan Smith : richedit: Implemented ITextServices_TxSendMessage.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: e7b68a20fd78d3f5a082d5b00cf8ee7c031ccbda URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b68a20fd78d3f5a082d5b00… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 20 01:41:40 2009 -0500 richedit: Implemented ITextServices_TxSendMessage. --- dlls/riched20/context.c | 8 ++++++-- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 2 ++ dlls/riched20/style.c | 2 -- dlls/riched20/txtsrv.c | 9 +++++++-- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/context.c b/dlls/riched20/context.c index 80e808e..6d4a2a9 100644 --- a/dlls/riched20/context.c +++ b/dlls/riched20/context.c @@ -29,8 +29,12 @@ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) c->pt.y = 0; c->hbrMargin = CreateSolidBrush(RGB(224,224,224)); c->rcView = editor->rcFormat; - c->dpi.cx = GetDeviceCaps(hDC, LOGPIXELSX); - c->dpi.cy = GetDeviceCaps(hDC, LOGPIXELSY); + if (hDC) { + c->dpi.cx = GetDeviceCaps(hDC, LOGPIXELSX); + c->dpi.cy = GetDeviceCaps(hDC, LOGPIXELSY); + } else { + c->dpi.cx = c->dpi.cy = 96; + } } void ME_DestroyContext(ME_Context *c) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index cd2312b..09f3fb3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3024,7 +3024,7 @@ void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam * The LRESULT that is returned is a return value for window procs, * and the phresult parameter is the COM return code needed by the * text services interface. */ -static LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, +LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode, HRESULT* phresult) { *phresult = S_OK; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6c93385..53d6295 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -262,6 +262,8 @@ void ME_DeleteReObject(REOBJECT* reo); /* editor.c */ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10); +LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, + LPARAM lParam, BOOL unicode, HRESULT* phresult); void ME_SendOldNotify(ME_TextEditor *editor, int nCode); int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int nStart, int nChars, BOOL bCRLF); ME_DisplayItem *ME_FindItemAtOffset(ME_TextEditor *editor, ME_DIType nItemType, int nOffset, int *nItemOffset); diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index b7b909b..3980400 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -373,7 +373,6 @@ HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) LOGFONTW lf; int i, nEmpty, nAge = 0x7FFFFFFF; ME_FontCacheItem *item; - assert(c->hDC); assert(s); ME_LogFontFromStyle(c, &lf, s); @@ -426,7 +425,6 @@ void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) { int i; - assert(c->hDC); assert(s); SelectObject(c->hDC, hOldFont); for (i=0; i<HFONT_CACHE_SIZE; i++) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index d4679f7..f05e721 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -57,6 +57,7 @@ typedef struct ITextServicesImpl { ITextHost *pMyHost; LONG ref; CRITICAL_SECTION csTxtSrv; + ME_TextEditor *editor; char spare[256]; } ITextServicesImpl; @@ -70,6 +71,7 @@ HRESULT WINAPI CreateTextServices(IUnknown * pUnkOuter, IUnknown **ppUnk) { ITextServicesImpl *ITextImpl; + HRESULT hres; TRACE("%p %p --> %p\n", pUnkOuter, pITextHost, ppUnk); if (pITextHost == NULL) return E_POINTER; @@ -83,6 +85,8 @@ HRESULT WINAPI CreateTextServices(IUnknown * pUnkOuter, ITextHost_AddRef(pITextHost); ITextImpl->pMyHost = pITextHost; ITextImpl->lpVtbl = &textservices_Vtbl; + ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); + ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); if (pUnkOuter) { @@ -150,9 +154,10 @@ HRESULT WINAPI fnTextSrv_TxSendMessage(ITextServices *iface, LRESULT* plresult) { ICOM_THIS_MULTI(ITextServicesImpl, lpVtbl, iface); + HRESULT hresult; - FIXME("%p: STUB\n", This); - return E_NOTIMPL; + *plresult = ME_HandleMessage(This->editor, msg, wparam, lparam, TRUE, &hresult); + return hresult; } HRESULT WINAPI fnTextSrv_TxDraw(ITextServices *iface,

1 0

Dylan Smith : richedit: Prevented using NULL hwnd for certain operations.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: 902afbc65b4c7f4a71433df9c3738f103102a27f URL: http://source.winehq.org/git/wine.git/?a=commit;h=902afbc65b4c7f4a71433df9c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 20 01:41:36 2009 -0500 richedit: Prevented using NULL hwnd for certain operations. Certain operations will simply not be done for windowless richedit controls, such as WM_PAINT which isn't done for windowless richedit controls since ITextServices provides a TxDraw method. --- dlls/riched20/editor.c | 207 ++++++++++++++++++++++++++--------------------- dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 52 ++++++++----- dlls/riched20/txthost.c | 1 + 4 files changed, 150 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=902afbc65b4c7f4a71433…

1 0

Dylan Smith : richedit: Used ITextHost methods to avoid using window handle directly.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: 05c788ac6f464b75c2a55c847a91d3a79261ca8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c788ac6f464b75c2a55c847… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 20 01:41:32 2009 -0500 richedit: Used ITextHost methods to avoid using window handle directly. The methods in ITextHost are mostly thin wrappers around functions that take a handle to a window as their first parameter. This patch just uses the wrapper functions provided by ITextHost instead of using the functions that require a handle to a window that the editor might now have (for windowless richedit controls). --- dlls/riched20/caret.c | 22 ++++++------ dlls/riched20/context.c | 4 +- dlls/riched20/editor.c | 79 +++++++++++++++++++++++++---------------------- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 47 ++++++++++++++++------------ dlls/riched20/para.c | 4 +- dlls/riched20/run.c | 12 +++--- dlls/riched20/table.c | 2 +- dlls/riched20/wrap.c | 19 +++++------ 9 files changed, 100 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05c788ac6f464b75c2a55…

1 0

Dylan Smith : richedit: Implemented ITextHost for windowed richedit controls.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: 6c4dda009e8fe1d18cd110bd7ac71805122ef1d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4dda009e8fe1d18cd110bd7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 20 01:41:25 2009 -0500 richedit: Implemented ITextHost for windowed richedit controls. --- dlls/riched20/Makefile.in | 1 + dlls/riched20/editor.c | 71 +++-- dlls/riched20/editor.h | 49 +++ dlls/riched20/editstr.h | 7 + dlls/riched20/txthost.c | 726 +++++++++++++++++++++++++++++++++++++++++++++ include/textserv.h | 40 --- 6 files changed, 830 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c4dda009e8fe1d18cd11…

1 0

Juan Lang : crypt32: Add a localized name for the TrustedPublisher store.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: 7e3881909d8ff7cc2a4dbce1ae41567645297ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3881909d8ff7cc2a4dbce1a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 20 12:00:07 2009 -0800 crypt32: Add a localized name for the TrustedPublisher store. --- dlls/crypt32/crypt32_En.rc | 1 + dlls/crypt32/cryptres.h | 1 + dlls/crypt32/oid.c | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index ace77d2..e24ce86 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -171,6 +171,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_MY "Personal" IDS_LOCALIZEDNAME_CA "Intermediate Certification Authorities" IDS_LOCALIZEDNAME_ADDRESSBOOK "Other People" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Trusted Publishers" } STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/cryptres.h b/dlls/crypt32/cryptres.h index 6d0ac46..fe2fd91 100644 --- a/dlls/crypt32/cryptres.h +++ b/dlls/crypt32/cryptres.h @@ -164,6 +164,7 @@ #define IDS_LOCALIZEDNAME_MY 1142 #define IDS_LOCALIZEDNAME_CA 1143 #define IDS_LOCALIZEDNAME_ADDRESSBOOK 1144 +#define IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER 1145 #define IDS_KEY_ID 1200 #define IDS_CERT_ISSUER 1201 diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index b4aae66..893e7f9 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -81,8 +81,9 @@ static const WCHAR ROOT[] = {'R','O','O','T',0}; static const WCHAR MY[] = {'M','Y',0}; static const WCHAR CA[] = {'C','A',0}; static const WCHAR ADDRESSBOOK[] = {'A','D','D','R','E','S','S','B','O','O','K',0}; -static const LPCWSTR LocalizedKeys[] = {ROOT,MY,CA,ADDRESSBOOK}; -static WCHAR LocalizedNames[4][256]; +static const WCHAR TRUSTEDPUBLISHER[] = {'T','r','u','s','t','e','d','P','u','b','l','i','s','h','e','r',0}; +static const LPCWSTR LocalizedKeys[] = {ROOT,MY,CA,ADDRESSBOOK,TRUSTEDPUBLISHER}; +static WCHAR LocalizedNames[sizeof(LocalizedKeys)/sizeof(LocalizedKeys[0])][256]; static void free_function_sets(void) {

1 0

Juan Lang : netapi32: Remove unused define.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: f356c8e46d9c39421cd8c07aba2664eb5e5a4c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f356c8e46d9c39421cd8c07ab… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 20 12:00:31 2009 -0800 netapi32: Remove unused define. --- dlls/netapi32/nbt.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 5042baa..b840a41 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -106,8 +106,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(netbios); #define MAX_NBT_NAME_SZ 255 #define SIMPLE_NAME_QUERY_PKT_SIZE 16 + MAX_NBT_NAME_SZ -#define DEFAULT_NBT_SESSIONS 16 - #define NBNS_TYPE_NB 0x0020 #define NBNS_TYPE_NBSTAT 0x0021 #define NBNS_CLASS_INTERNET 0x00001

1 0

Henri Verbeet : ddraw: Get rid of ICOM_VFIELD_MULTI_NAME and ICOM_VFIELD_OFFSET.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: 772e56a2d84eee4340765247348c2d164a5c7d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=772e56a2d84eee43407652473… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 21 09:56:14 2009 +0100 ddraw: Get rid of ICOM_VFIELD_MULTI_NAME and ICOM_VFIELD_OFFSET. --- dlls/ddraw/ddcomimpl.h | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddcomimpl.h b/dlls/ddraw/ddcomimpl.h index 4db261b..394823d 100644 --- a/dlls/ddraw/ddcomimpl.h +++ b/dlls/ddraw/ddcomimpl.h @@ -22,23 +22,15 @@ #include <stddef.h> -/* Generates the name for a vtable pointer for a given interface. */ -/* The canonical name for a single interface is "lpVtbl". */ -#define ICOM_VFIELD_MULTI_NAME(iface) iface##_vtbl - -/* Returns the offset of a vtable pointer within an implementation object. */ -#define ICOM_VFIELD_OFFSET(impltype, iface) \ - offsetof(impltype, ICOM_VFIELD_MULTI_NAME(iface)) - /* Given an interface pointer, returns the implementation pointer. */ #define ICOM_OBJECT(impltype, ifacename, ifaceptr) \ (impltype*)((ifaceptr) == NULL ? NULL \ - : (char*)(ifaceptr) - ICOM_VFIELD_OFFSET(impltype,ifacename)) + : (char*)(ifaceptr) - offsetof(impltype, ifacename##_vtbl)) #define ICOM_THIS_FROM(impltype, ifacename, ifaceptr) \ impltype* This = ICOM_OBJECT(impltype, ifacename, ifaceptr) #define COM_INTERFACE_CAST(impltype, ifnamefrom, ifnameto, ifaceptr) \ ((ifaceptr) ? (ifnameto *)&(((impltype *)((char *)(ifaceptr) \ - - ICOM_VFIELD_OFFSET(impltype, ifnamefrom)))->ICOM_VFIELD_MULTI_NAME(ifnameto)) : NULL) + - offsetof(impltype, ifnamefrom##_vtbl)))->ifnameto##_vtbl) : NULL) #endif /* _DDCOMIMPL_H_ */

1 0

Henri Verbeet : ddraw: Get rid of ICOM_INTERFACE.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: 9a0c885e632ce96424a2a536efd1282335907fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0c885e632ce96424a2a536e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 21 09:56:13 2009 +0100 ddraw: Get rid of ICOM_INTERFACE. --- dlls/ddraw/clipper.c | 8 +- dlls/ddraw/ddcomimpl.h | 10 +- dlls/ddraw/ddraw.c | 72 +++----- dlls/ddraw/ddraw_thunks.c | 8 +- dlls/ddraw/device.c | 416 +++++++++++++++----------------------------- dlls/ddraw/direct3d.c | 110 ++++-------- dlls/ddraw/executebuffer.c | 26 ++-- dlls/ddraw/gamma.c | 8 +- dlls/ddraw/light.c | 6 +- dlls/ddraw/main.c | 36 ++-- dlls/ddraw/material.c | 17 +- dlls/ddraw/parent.c | 7 +- dlls/ddraw/surface.c | 60 +++---- dlls/ddraw/texture.c | 22 +-- dlls/ddraw/vertexbuffer.c | 42 ++--- dlls/ddraw/viewport.c | 43 ++--- 16 files changed, 333 insertions(+), 558 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a0c885e632ce96424a2a…

1 0