January 2013 - Wine-Commits

Alexandre Julliard : make_makefiles: Add support for Objective-C sources.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: ad16c4c0dfc45837934b319399377b98387f88d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad16c4c0dfc45837934b31939… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 9 13:07:19 2013 +0100 make_makefiles: Add support for Objective-C sources. --- tools/make_makefiles | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index be106c9..f408545 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -318,7 +318,7 @@ sub parse_makefile($) push @{$make{"=flags"}}, "manpage" if $var eq "MANPAGE"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|MC_SRCS|RC_SRCS|PO_SRCS|SVG_SRCS|PROGRAMS)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|PO_SRCS|SVG_SRCS|PROGRAMS)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); @@ -389,6 +389,7 @@ sub assign_sources_to_makefiles(@) else { if ($name =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $name; } + elsif ($name =~ /\.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; } elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $name; } @@ -501,6 +502,7 @@ sub update_makefiles(@) replace_makefile_variable( $file, "MC_SRCS" ); replace_makefile_variable( $file, "SVG_SRCS" ); replace_makefile_variable( $file, "C_SRCS" ); + replace_makefile_variable( $file, "OBJC_SRCS" ); replace_makefile_variable( $file, "RC_SRCS" ); replace_makefile_variable( $file, "PRIVATE_IDL_H_SRCS" ); replace_makefile_variable( $file, "PUBLIC_IDL_H_SRCS" );

1 0

Christian Costa : d3dx9_36: Finish implementation of ID3DXFileImpl_CreateEnumObject and add stubbed interface for ID3DXFileData .
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: ba6932459a37de8f4c10beda265ecd2907708c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6932459a37de8f4c10beda2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Jan 9 10:22:33 2013 +0100 d3dx9_36: Finish implementation of ID3DXFileImpl_CreateEnumObject and add stubbed interface for ID3DXFileData. --- dlls/d3dx9_36/xfile.c | 260 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 255 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index aaf1391..5db7800 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -53,8 +53,17 @@ typedef struct { typedef struct { ID3DXFileEnumObject ID3DXFileEnumObject_iface; LONG ref; + ULONG nb_children; + ID3DXFileData **children; } ID3DXFileEnumObjectImpl; +typedef struct { + ID3DXFileData ID3DXFileData_iface; + LONG ref; + IDirectXFileData *dxfile_data; +} ID3DXFileDataImpl; + + static inline ID3DXFileImpl* impl_from_ID3DXFile(ID3DXFile *iface) { return CONTAINING_RECORD(iface, ID3DXFileImpl, ID3DXFile_iface); @@ -65,6 +74,169 @@ static inline ID3DXFileEnumObjectImpl* impl_from_ID3DXFileEnumObject(ID3DXFileEn return CONTAINING_RECORD(iface, ID3DXFileEnumObjectImpl, ID3DXFileEnumObject_iface); } +static inline ID3DXFileDataImpl* impl_from_ID3DXFileData(ID3DXFileData *iface) +{ + return CONTAINING_RECORD(iface, ID3DXFileDataImpl, ID3DXFileData_iface); +} + +/*** IUnknown methods ***/ + +static HRESULT WINAPI ID3DXFileDataImpl_QueryInterface(ID3DXFileData *iface, REFIID riid, void **ret_iface) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ID3DXFileData)) + { + iface->lpVtbl->AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + WARN("(%p)->(%s, %p), not found\n", iface, debugstr_guid(riid), ret_iface); + *ret_iface = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ID3DXFileDataImpl_AddRef(ID3DXFileData *iface) +{ + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ID3DXFileDataImpl_Release(ID3DXFileData *iface) +{ + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); + + if (!ref) + { + IDirectXFileData_Release(This->dxfile_data); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + + +/*** ID3DXFileData methods ***/ + +static HRESULT WINAPI ID3DXFileDataImpl_GetEnum(ID3DXFileData *iface, ID3DXFileEnumObject **enum_object) +{ + FIXME("(%p)->(%p): stub\n", iface, enum_object); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileDataImpl_GetName(ID3DXFileData *iface, char *name, SIZE_T *size) +{ + FIXME("(%p)->(%p, %p): stub\n", iface, name, size); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileDataImpl_GetId(ID3DXFileData *iface, GUID *guid) +{ + FIXME("(%p)->(%p): stub\n", iface, guid); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileDataImpl_Lock(ID3DXFileData *iface, SIZE_T *size, const void **data) +{ + FIXME("(%p)->(%p, %p): stub\n", iface, size, data); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileDataImpl_Unlock(ID3DXFileData *iface) +{ + FIXME("(%p)->(): stub\n", iface); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID *guid) +{ + FIXME("(%p)->(%p): stub\n", iface, guid); + + return E_NOTIMPL; +} + + +static BOOL WINAPI ID3DXFileDataImpl_IsReference(ID3DXFileData *iface) +{ + TRACE("(%p)->(): stub\n", iface); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileDataImpl_GetChildren(ID3DXFileData *iface, SIZE_T *children) +{ + TRACE("(%p)->(%p): stub\n", iface, children); + + return E_NOTIMPL; +} + + +static HRESULT WINAPI ID3DXFileDataImpl_GetChild(ID3DXFileData *iface, SIZE_T id, ID3DXFileData **object) +{ + TRACE("(%p)->(%lu, %p): stub\n", iface, id, object); + + return E_NOTIMPL; +} + + +static const ID3DXFileDataVtbl ID3DXFileData_Vtbl = +{ + ID3DXFileDataImpl_QueryInterface, + ID3DXFileDataImpl_AddRef, + ID3DXFileDataImpl_Release, + ID3DXFileDataImpl_GetEnum, + ID3DXFileDataImpl_GetName, + ID3DXFileDataImpl_GetId, + ID3DXFileDataImpl_Lock, + ID3DXFileDataImpl_Unlock, + ID3DXFileDataImpl_GetType, + ID3DXFileDataImpl_IsReference, + ID3DXFileDataImpl_GetChildren, + ID3DXFileDataImpl_GetChild +}; + + +static HRESULT ID3DXFileDataImpl_Create(IDirectXFileData *dxfile_data, ID3DXFileData **ret_iface) +{ + ID3DXFileDataImpl *object; + + TRACE("(%p, %p)\n", dxfile_data, ret_iface); + + *ret_iface = NULL; + + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->ID3DXFileData_iface.lpVtbl = &ID3DXFileData_Vtbl; + object->ref = 1; + object->dxfile_data = dxfile_data; + + *ret_iface = &object->ID3DXFileData_iface; + + return S_OK; +} + /*** IUnknown methods ***/ @@ -90,7 +262,7 @@ static ULONG WINAPI ID3DXFileEnumObjectImpl_AddRef(ID3DXFileEnumObject *iface) ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): new ref %u\n", iface, ref); + TRACE("(%p)->(): new ref = %u\n", iface, ref); return ref; } @@ -100,10 +272,17 @@ static ULONG WINAPI ID3DXFileEnumObjectImpl_Release(ID3DXFileEnumObject *iface) ID3DXFileEnumObjectImpl *This = impl_from_ID3DXFileEnumObject(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): new ref %u\n", iface, ref); + TRACE("(%p)->(): new ref = %u\n", iface, ref); if (!ref) + { + ULONG i; + + for (i = 0; i < This->nb_children; i++) + (This->children[i])->lpVtbl->Release(This->children[i]); + HeapFree(GetProcessHeap(), 0, This->children); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -189,7 +368,7 @@ static ULONG WINAPI ID3DXFileImpl_AddRef(ID3DXFile *iface) ID3DXFileImpl *This = impl_from_ID3DXFile(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): new ref %d\n", iface, ref); + TRACE("(%p)->(): new ref = %u\n", iface, ref); return ref; } @@ -200,7 +379,7 @@ static ULONG WINAPI ID3DXFileImpl_Release(ID3DXFile *iface) ID3DXFileImpl *This = impl_from_ID3DXFile(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): new ref %d\n", iface, ref); + TRACE("(%p)->(): new ref = %u\n", iface, ref); if (!ref) { @@ -216,15 +395,53 @@ static ULONG WINAPI ID3DXFileImpl_Release(ID3DXFile *iface) static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const void *source, D3DXF_FILELOADOPTIONS options, ID3DXFileEnumObject **enum_object) { + ID3DXFileImpl *This = impl_from_ID3DXFile(iface); ID3DXFileEnumObjectImpl *object; + IDirectXFileEnumObject *dxfile_enum_object; + void *dxfile_source; + DXFILELOADOPTIONS dxfile_options; + DXFILELOADRESOURCE dxfile_resource; + DXFILELOADMEMORY dxfile_memory; + IDirectXFileData *data_object; + HRESULT ret; - FIXME("(%p)->(%p, %x, %p): partial stub\n", iface, source, options, enum_object); + TRACE("(%p)->(%p, %x, %p)\n", iface, source, options, enum_object); if (!enum_object) return E_POINTER; *enum_object = NULL; + if (options == D3DXF_FILELOAD_FROMFILE) + { + dxfile_source = (void*)source; + dxfile_options = DXFILELOAD_FROMFILE; + } + else if (options == D3DXF_FILELOAD_FROMRESOURCE) + { + D3DXF_FILELOADRESOURCE *resource = (D3DXF_FILELOADRESOURCE*)source; + + dxfile_resource.hModule = resource->hModule; + dxfile_resource.lpName = resource->lpName; + dxfile_resource.lpType = resource->lpType; + dxfile_source = &dxfile_resource; + dxfile_options = DXFILELOAD_FROMRESOURCE; + } + else if (options == D3DXF_FILELOAD_FROMMEMORY) + { + D3DXF_FILELOADMEMORY *memory = (D3DXF_FILELOADMEMORY*)source; + + dxfile_memory.lpMemory = memory->lpMemory; + dxfile_memory.dSize = memory->dSize; + dxfile_source = &dxfile_memory; + dxfile_options = DXFILELOAD_FROMMEMORY; + } + else + { + FIXME("Source type %u is not handled yet\n", options); + return E_NOTIMPL; + } + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -232,6 +449,39 @@ static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const voi object->ID3DXFileEnumObject_iface.lpVtbl = &ID3DXFileEnumObject_Vtbl; object->ref = 1; + ret = IDirectXFile_CreateEnumObject(This->dxfile, dxfile_source, dxfile_options, &dxfile_enum_object); + + if (ret != S_OK) + { + HeapFree(GetProcessHeap(), 0, object); + return ret; + } + + /* Fill enum object with top level data objects */ + while (SUCCEEDED(ret = IDirectXFileEnumObject_GetNextDataObject(dxfile_enum_object, &data_object))) + { + if (object->children) + object->children = HeapReAlloc(GetProcessHeap(), 0, object->children, sizeof(*object->children) * (object->nb_children + 1)); + else + object->children = HeapAlloc(GetProcessHeap(), 0, sizeof(*object->children)); + if (!object->children) + { + ret = E_OUTOFMEMORY; + break; + } + ret = ID3DXFileDataImpl_Create(data_object, &object->children[object->nb_children]); + if (ret != S_OK) + break; + object->nb_children++; + } + + IDirectXFileEnumObject_Release(dxfile_enum_object); + + if (ret != DXFILEERR_NOMOREOBJECTS) + WARN("Cannot get all top level data objects\n"); + + TRACE("Found %u children\n", object->nb_children); + *enum_object = &object->ID3DXFileEnumObject_iface; return S_OK;

1 0

Ken Thomases : winemac: Convert main thread to Cocoa main loop on process attach.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 35319684d3eb0a06a94d474558d91228912d3012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35319684d3eb0a06a94d47455… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 7 14:44:36 2013 -0600 winemac: Convert main thread to Cocoa main loop on process attach. --- dlls/winemac.drv/Makefile.in | 3 +- dlls/winemac.drv/cocoa_main.m | 122 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 6 ++- dlls/winemac.drv/macdrv_main.c | 14 +++-- 4 files changed, 138 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 38d8f7e..a388b9b 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ OBJC_SRCS = \ cocoa_app.m \ - cocoa_display.m + cocoa_display.m \ + cocoa_main.m @MAKE_DLL_RULES@ diff --git a/dlls/winemac.drv/cocoa_main.m b/dlls/winemac.drv/cocoa_main.m new file mode 100644 index 0000000..d920036 --- /dev/null +++ b/dlls/winemac.drv/cocoa_main.m @@ -0,0 +1,122 @@ +/* + * MACDRV Cocoa initialization code + * + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. + * + * 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 + */ + +#import <AppKit/AppKit.h> + +#include "macdrv_cocoa.h" +#import "cocoa_app.h" + + +/* Condition values for an NSConditionLock. Used to signal between run_cocoa_app + and macdrv_start_cocoa_app so the latter knows when the former is running + the application event loop. */ +enum { + COCOA_APP_NOT_RUNNING, + COCOA_APP_RUNNING, +}; + + +/*********************************************************************** + * run_cocoa_app + * + * Transforms the main thread from merely idling in its run loop to + * being a Cocoa application running its event loop. + * + * This will be the perform callback of a custom run loop source that + * will be scheduled in the main thread's run loop from a secondary + * thread by macdrv_start_cocoa_app. This function communicates that + * it has successfully started the application by changing the condition + * of a shared NSConditionLock, passed in via the info parameter. + * + * This function never returns. It's the new permanent home of the + * main thread. + */ +static void run_cocoa_app(void* info) +{ + NSConditionLock* lock = info; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + [WineApplication sharedApplication]; + [NSApp setDelegate:(WineApplication*)NSApp]; + + /* Retain the lock while we're using it, so macdrv_start_cocoa_app() + doesn't deallocate it in the middle of us unlocking it. */ + [lock retain]; + [lock lock]; + [lock unlockWithCondition:COCOA_APP_RUNNING]; + [lock release]; + + [pool release]; + + /* Never returns */ + [NSApp run]; +} + + +/*********************************************************************** + * macdrv_start_cocoa_app + * + * Tells the main thread to transform itself into a Cocoa application. + * + * Returns 0 on success, non-zero on failure. + */ +int macdrv_start_cocoa_app(void) +{ + int ret = -1; + CFRunLoopSourceRef source; + NSConditionLock* lock; + NSDate* timeLimit; + CFRunLoopSourceContext source_context = { 0 }; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + /* Make sure Cocoa is in multi-threading mode by detaching a + do-nothing thread. */ + [NSThread detachNewThreadSelector:@selector(self) + toTarget:[NSThread class] + withObject:nil]; + + lock = [[NSConditionLock alloc] initWithCondition:COCOA_APP_NOT_RUNNING]; + timeLimit = [NSDate dateWithTimeIntervalSinceNow:5]; + + source_context.info = lock; + source_context.perform = run_cocoa_app; + source = CFRunLoopSourceCreate(NULL, 0, &source_context); + + if (source && lock && timeLimit) + { + CFRunLoopAddSource(CFRunLoopGetMain(), source, kCFRunLoopCommonModes); + CFRunLoopSourceSignal(source); + CFRunLoopWakeUp(CFRunLoopGetMain()); + + if ([lock lockWhenCondition:COCOA_APP_RUNNING beforeDate:timeLimit]) + { + [lock unlock]; + ret = 0; + } + } + + if (source) + CFRelease(source); + [lock release]; + [pool release]; + return ret; +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 720073e..932aa90 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -1,7 +1,7 @@ /* * MACDRV Cocoa interface declarations * - * Copyright 2011, 2012 Ken Thomases for CodeWeavers Inc. + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -104,6 +104,10 @@ struct macdrv_display { }; +/* main */ +extern int macdrv_start_cocoa_app(void) DECLSPEC_HIDDEN; + + /* display */ extern int macdrv_get_displays(struct macdrv_display** displays, int* count) DECLSPEC_HIDDEN; extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 17aebf6..9ee249d 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -3,6 +3,7 @@ * * Copyright 1998 Patrik Stridvall * Copyright 2000 Alexandre Julliard + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,11 +21,10 @@ */ #include "config.h" -#include <stdarg.h> +#include "macdrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(macdrv); -#include "windef.h" -#include "winbase.h" -#include "winreg.h" /*********************************************************************** * MACDRV initialisation routine @@ -36,7 +36,11 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: - /* Do attach */ + if (macdrv_start_cocoa_app()) + { + ERR("Failed to start Cocoa app main loop\n"); + ret = FALSE; + } break; case DLL_THREAD_DETACH: /* do thread detach */

1 0

Jacek Caban : mshtml: Wine Gecko 1.9 release.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 136b738b502f6093dbe91fff6f862c406fa43b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=136b738b502f6093dbe91fff6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 9 14:21:18 2013 +0100 mshtml: Wine Gecko 1.9 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/mutation.c | 6 ++ dlls/mshtml/navigate.c | 5 +- dlls/mshtml/nsiface.idl | 137 +++++++++++++++++++++++++++-------------- dlls/mshtml/nsio.c | 22 ++++++- 7 files changed, 123 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=136b738b502f6093dbe91…

1 0

Christian Costa : dmusic: COM cleanup of IDirectMusicDownload.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 1c77528a893d1e66014be04e9d4d02d36366872d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c77528a893d1e66014be04e9… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Jan 9 10:22:55 2013 +0100 dmusic: COM cleanup of IDirectMusicDownload. --- dlls/dmusic/dmusic_private.h | 8 ++-- dlls/dmusic/download.c | 112 +++++++++++++++++++++++------------------ 2 files changed, 67 insertions(+), 53 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 286b48b..ff16833 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -148,11 +148,11 @@ struct IDirectMusicDownloadedInstrumentImpl { * IDirectMusicDownloadImpl implementation structure */ struct IDirectMusicDownloadImpl { - /* IUnknown fields */ - const IDirectMusicDownloadVtbl *lpVtbl; - LONG ref; + /* IUnknown fields */ + IDirectMusicDownload IDirectMusicDownload_iface; + LONG ref; - /* IDirectMusicDownloadImpl fields */ + /* IDirectMusicDownloadImpl fields */ }; /***************************************************************************** diff --git a/dlls/dmusic/download.c b/dlls/dmusic/download.c index 11ab117..b306513 100644 --- a/dlls/dmusic/download.c +++ b/dlls/dmusic/download.c @@ -1,4 +1,5 @@ -/* IDirectMusicDownload Implementation +/* + * IDirectMusicDownload Implementation * * Copyright (C) 2003-2004 Rok Mandeljc * @@ -21,72 +22,85 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); +static inline IDirectMusicDownloadImpl* impl_from_IDirectMusicDownload(IDirectMusicDownload *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicDownloadImpl, IDirectMusicDownload_iface); +} + /* IDirectMusicDownloadImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicDownloadImpl_QueryInterface (LPDIRECTMUSICDOWNLOAD iface, REFIID riid, LPVOID *ppobj) { - IDirectMusicDownloadImpl *This = (IDirectMusicDownloadImpl *)iface; - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown) - || IsEqualIID (riid, &IID_IDirectMusicDownload)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; +static HRESULT WINAPI IDirectMusicDownloadImpl_QueryInterface(IDirectMusicDownload *iface, REFIID riid, void **ret_iface) +{ + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDirectMusicDownload)) + { + IDirectMusicDownload_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + *ret_iface = NULL; + WARN("(%p, %s, %p): not found\n", iface, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; } -static ULONG WINAPI IDirectMusicDownloadImpl_AddRef (LPDIRECTMUSICDOWNLOAD iface) { - IDirectMusicDownloadImpl *This = (IDirectMusicDownloadImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); +static ULONG WINAPI IDirectMusicDownloadImpl_AddRef(IDirectMusicDownload *iface) +{ + IDirectMusicDownloadImpl *This = impl_from_IDirectMusicDownload(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); + DMUSIC_LockModule(); - return refCount; + return ref; } -static ULONG WINAPI IDirectMusicDownloadImpl_Release (LPDIRECTMUSICDOWNLOAD iface) { - IDirectMusicDownloadImpl *This = (IDirectMusicDownloadImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); +static ULONG WINAPI IDirectMusicDownloadImpl_Release(IDirectMusicDownload *iface) +{ + IDirectMusicDownloadImpl *This = impl_from_IDirectMusicDownload(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + if (!ref) + HeapFree(GetProcessHeap(), 0, This); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); - } + DMUSIC_UnlockModule(); - DMUSIC_UnlockModule(); - - return refCount; + return ref; } /* IDirectMusicDownloadImpl IDirectMusicDownload part: */ -static HRESULT WINAPI IDirectMusicDownloadImpl_GetBuffer (LPDIRECTMUSICDOWNLOAD iface, void** ppvBuffer, DWORD* pdwSize) { - IDirectMusicDownloadImpl *This = (IDirectMusicDownloadImpl *)iface; - FIXME("(%p, %p, %p): stub\n", This, ppvBuffer, pdwSize); - return S_OK; +static HRESULT WINAPI IDirectMusicDownloadImpl_GetBuffer(IDirectMusicDownload *iface, void **buffer, DWORD *size) +{ + FIXME("(%p, %p, %p): stub\n", iface, buffer, size); + + return S_OK; } static const IDirectMusicDownloadVtbl DirectMusicDownload_Vtbl = { - IDirectMusicDownloadImpl_QueryInterface, - IDirectMusicDownloadImpl_AddRef, - IDirectMusicDownloadImpl_Release, - IDirectMusicDownloadImpl_GetBuffer + IDirectMusicDownloadImpl_QueryInterface, + IDirectMusicDownloadImpl_AddRef, + IDirectMusicDownloadImpl_Release, + IDirectMusicDownloadImpl_GetBuffer }; /* for ClassFactory */ -HRESULT DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { - IDirectMusicDownloadImpl* dmdl; - - dmdl = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadImpl)); - if (NULL == dmdl) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - dmdl->lpVtbl = &DirectMusicDownload_Vtbl; - dmdl->ref = 0; /* will be inited by QueryInterface */ - - return IDirectMusicDownloadImpl_QueryInterface ((LPDIRECTMUSICDOWNLOAD)dmdl, lpcGUID, ppobj); +HRESULT DMUSIC_CreateDirectMusicDownloadImpl(const GUID *guid, void **ret_iface, IUnknown *unk_outer) +{ + IDirectMusicDownloadImpl *download; + + download = HeapAlloc(GetProcessHeap(), 0, sizeof(*download)); + if (!download) + { + *ret_iface = NULL; + return E_OUTOFMEMORY; + } + + download->IDirectMusicDownload_iface.lpVtbl = &DirectMusicDownload_Vtbl; + download->ref = 1; + + return S_OK; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: c607607dc0281648281d5dd2e312b01755da4a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c607607dc0281648281d5dd2e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jan 8 22:49:12 2013 +0200 po: Update Lithuanian translation. --- po/lt.po | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/po/lt.po b/po/lt.po index a86dc8f..0b15c3f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-01-07 21:59+0300\n" +"PO-Revision-Date: 2013-01-08 22:47+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10398,50 +10398,40 @@ msgid "State" msgstr "Būsena" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "Sąsajos" +msgstr "Sąsajos statistika" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "Išsiųsta" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "Gauta" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" -msgstr "baitai" +msgstr "Baitų" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "„Unicast“ paketų" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "Ne „unicast“ paketų" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "Garantijų nedavimas" +msgstr "Atmetimai" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" -msgstr "Klaida" +msgstr "Klaidos" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "Nežinomas prievadas.\n" +msgstr "Nežinomi protokolai" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Austin English : include: Add D3D_DRIVER_TYPE to d3dcommon.idl.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: f8582e10278b3549e627c6d01e85edef912b50c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8582e10278b3549e627c6d01… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 8 18:58:23 2013 -0800 include: Add D3D_DRIVER_TYPE to d3dcommon.idl. --- include/d3dcommon.idl | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 598abd5..76f66f5 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -68,6 +68,16 @@ interface ID3DInclude typedef ID3DInclude* LPD3DINCLUDE; +typedef enum D3D_DRIVER_TYPE +{ + D3D_DRIVER_TYPE_UNKNOWN, + D3D_DRIVER_TYPE_HARDWARE, + D3D_DRIVER_TYPE_REFERENCE, + D3D_DRIVER_TYPE_NULL, + D3D_DRIVER_TYPE_SOFTWARE, + D3D_DRIVER_TYPE_WARP, +} D3D_DRIVER_TYPE; + typedef enum D3D_FEATURE_LEVEL { D3D_FEATURE_LEVEL_9_1 = 0x9100,

1 0

Ken Thomases : winemac: Add a custom NSApplication subclass, WineApplication.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: daf0fd75e638729240f874a39ed7a28830ff02ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf0fd75e638729240f874a39… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 7 14:44:31 2013 -0600 winemac: Add a custom NSApplication subclass, WineApplication. --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/cocoa_app.h | 30 +++++++++++++++++++++ dlls/winemac.drv/cocoa_app.m | 58 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 2082b37..38d8f7e 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ window.c OBJC_SRCS = \ + cocoa_app.m \ cocoa_display.m @MAKE_DLL_RULES@ diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h new file mode 100644 index 0000000..cc3ede3 --- /dev/null +++ b/dlls/winemac.drv/cocoa_app.h @@ -0,0 +1,30 @@ +/* + * MACDRV Cocoa application class declaration + * + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. + * + * 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 + */ + +#import <AppKit/AppKit.h> + +#include "macdrv_cocoa.h" + + +(a)interface WineApplication : NSApplication <NSApplicationDelegate> + + - (void) transformProcessToForeground; + +(a)end diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m new file mode 100644 index 0000000..ee7e2f8 --- /dev/null +++ b/dlls/winemac.drv/cocoa_app.m @@ -0,0 +1,58 @@ +/* + * MACDRV Cocoa application class + * + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. + * + * 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 + */ + +#import "cocoa_app.h" + + +(a)implementation WineApplication + + - (void) transformProcessToForeground + { + if ([self activationPolicy] != NSApplicationActivationPolicyRegular) + { + NSMenu* mainMenu; + NSMenu* submenu; + NSString* bundleName; + NSString* title; + NSMenuItem* item; + + [self setActivationPolicy:NSApplicationActivationPolicyRegular]; + [self activateIgnoringOtherApps:YES]; + + mainMenu = [[[NSMenu alloc] init] autorelease]; + + submenu = [[[NSMenu alloc] initWithTitle:@"Wine"] autorelease]; + bundleName = [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleNameKey]; + if ([bundleName length]) + title = [NSString stringWithFormat:@"Quit %@", bundleName]; + else + title = @"Quit"; + item = [submenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"]; + [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask]; + item = [[[NSMenuItem alloc] init] autorelease]; + [item setTitle:@"Wine"]; + [item setSubmenu:submenu]; + [mainMenu addItem:item]; + + [self setMainMenu:mainMenu]; + } + } + +(a)end

1 0

Jacek Caban : vbscript: Added support for a few more constants.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: 724ef956b3b891bfe24bdc6b23ea0b6ce347314a URL: http://source.winehq.org/git/wine.git/?a=commit;h=724ef956b3b891bfe24bdc6b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 9 11:57:07 2013 +0100 vbscript: Added support for a few more constants. --- dlls/vbscript/global.c | 80 +++++------------------------------------- dlls/vbscript/tests/api.vbs | 10 +++++ 2 files changed, 20 insertions(+), 70 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index cba4edc..5b28e8a 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1578,66 +1578,6 @@ static HRESULT Global_vbFirstFullWeek(vbdisp_t *This, VARIANT *arg, unsigned arg return E_NOTIMPL; } -static HRESULT Global_vbCritical(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbQuestion(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbExclamation(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbInformation(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbDefaultButton1(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbDefaultButton2(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbDefaultButton3(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbDefaultButton4(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbApplicationModal(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbSystemModal(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Global_vbTrue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -1855,16 +1795,16 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBYESNOCANCEL, NULL, BP_GET, MB_YESNOCANCEL}, {DISPID_GLOBAL_VBYESNO, NULL, BP_GET, MB_YESNO}, {DISPID_GLOBAL_VBRETRYCANCEL, NULL, BP_GET, MB_RETRYCANCEL}, - {DISPID_GLOBAL_VBCRITICAL, Global_vbCritical, BP_GET}, - {DISPID_GLOBAL_VBQUESTION, Global_vbQuestion, BP_GET}, - {DISPID_GLOBAL_VBEXCLAMATION, Global_vbExclamation, BP_GET}, - {DISPID_GLOBAL_VBINFORMATION, Global_vbInformation, BP_GET}, - {DISPID_GLOBAL_VBDEFAULTBUTTON1, Global_vbDefaultButton1, BP_GET}, - {DISPID_GLOBAL_VBDEFAULTBUTTON2, Global_vbDefaultButton2, BP_GET}, - {DISPID_GLOBAL_VBDEFAULTBUTTON3, Global_vbDefaultButton3, BP_GET}, - {DISPID_GLOBAL_VBDEFAULTBUTTON4, Global_vbDefaultButton4, BP_GET}, - {DISPID_GLOBAL_VBAPPLICATIONMODAL, Global_vbApplicationModal, BP_GET}, - {DISPID_GLOBAL_VBSYSTEMMODAL, Global_vbSystemModal, BP_GET}, + {DISPID_GLOBAL_VBCRITICAL, NULL, BP_GET, MB_ICONHAND}, + {DISPID_GLOBAL_VBQUESTION, NULL, BP_GET, MB_ICONQUESTION}, + {DISPID_GLOBAL_VBEXCLAMATION, NULL, BP_GET, MB_ICONEXCLAMATION}, + {DISPID_GLOBAL_VBINFORMATION, NULL, BP_GET, MB_ICONASTERISK}, + {DISPID_GLOBAL_VBDEFAULTBUTTON1, NULL, BP_GET, MB_DEFBUTTON1}, + {DISPID_GLOBAL_VBDEFAULTBUTTON2, NULL, BP_GET, MB_DEFBUTTON2}, + {DISPID_GLOBAL_VBDEFAULTBUTTON3, NULL, BP_GET, MB_DEFBUTTON3}, + {DISPID_GLOBAL_VBDEFAULTBUTTON4, NULL, BP_GET, MB_DEFBUTTON4}, + {DISPID_GLOBAL_VBAPPLICATIONMODAL, NULL, BP_GET, MB_APPLMODAL}, + {DISPID_GLOBAL_VBSYSTEMMODAL, NULL, BP_GET, MB_SYSTEMMODAL}, {DISPID_GLOBAL_VBOK, NULL, BP_GET, IDOK}, {DISPID_GLOBAL_VBCANCEL, NULL, BP_GET, IDCANCEL}, {DISPID_GLOBAL_VBABORT, NULL, BP_GET, IDABORT}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2cb7fe0..4f8c544 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -59,6 +59,16 @@ TestConstant "vbDataObject", vbDataObject, 13 TestConstant "vbDecimal", vbDecimal, 14 TestConstant "vbByte", vbByte, 17 TestConstant "vbArray", vbArray, 8192 +TestConstant "vbCritical", vbCritical, 16 +TestConstant "vbQuestion", vbQuestion, 32 +TestConstant "vbExclamation", vbExclamation, 48 +TestConstant "vbInformation", vbInformation, 64 +TestConstant "vbDefaultButton1", vbDefaultButton1, 0 +TestConstant "vbDefaultButton2", vbDefaultButton2, 256 +TestConstant "vbDefaultButton3", vbDefaultButton3, 512 +TestConstant "vbDefaultButton4", vbDefaultButton4, 768 +TestConstant "vbApplicationModal", vbApplicationModal, 0 +TestConstant "vbSystemModal", vbSystemModal, 4096 Sub TestCStr(arg, exval) dim x

1 0

Henri Verbeet : ddraw: Avoid LPD3DMATERIAL.
by Alexandre Julliard Jan. 9, 2013

Jan. 9, 2013

Module: wine Branch: master Commit: caa7e42ed4ff8a6c93fcfc6b2aef0168369b6224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa7e42ed4ff8a6c93fcfc6b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 9 11:27:13 2013 +0100 ddraw: Avoid LPD3DMATERIAL. --- include/d3d.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 8678560..9e4ccf2 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -448,8 +448,8 @@ DECLARE_INTERFACE_(IDirect3DMaterial,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DMaterial methods ***/ STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; - STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; - STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; + STDMETHOD(SetMaterial)(THIS_ D3DMATERIAL *data) PURE; + STDMETHOD(GetMaterial)(THIS_ D3DMATERIAL *data) PURE; STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice *device, D3DMATERIALHANDLE *handle) PURE; STDMETHOD(Reserve)(THIS) PURE; STDMETHOD(Unreserve)(THIS) PURE; @@ -494,8 +494,8 @@ DECLARE_INTERFACE_(IDirect3DMaterial2,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DMaterial2 methods ***/ - STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; - STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; + STDMETHOD(SetMaterial)(THIS_ D3DMATERIAL *data) PURE; + STDMETHOD(GetMaterial)(THIS_ D3DMATERIAL *data) PURE; STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice2 *device, D3DMATERIALHANDLE *handle) PURE; }; #undef INTERFACE @@ -532,8 +532,8 @@ DECLARE_INTERFACE_(IDirect3DMaterial3,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DMaterial3 methods ***/ - STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; - STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; + STDMETHOD(SetMaterial)(THIS_ D3DMATERIAL *data) PURE; + STDMETHOD(GetMaterial)(THIS_ D3DMATERIAL *data) PURE; STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice3 *device, D3DMATERIALHANDLE *handle) PURE; }; #undef INTERFACE

1 0