July 2011 - Wine-Commits - list.winehq.org

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 35979eb2314a2454fcc4f245f2fe72f7cde1d564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35979eb2314a2454fcc4f245f… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jul 28 19:22:14 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/po/lt.po b/po/lt.po index ba5a4f8..41479f1 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,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: 2011-07-13 22:17+0300\n" +"PO-Revision-Date: 2011-07-28 19:21+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -171,7 +171,6 @@ msgid "System Path" msgstr "Sistemos kelias" #: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103 -#, fuzzy msgctxt "display name" msgid "Desktop" msgstr "Darbalaukis" @@ -6374,7 +6373,6 @@ msgid "Properties" msgstr "Savybės" #: shell32.rc:82 -#, fuzzy msgctxt "recycle bin" msgid "&Restore" msgstr "&Atkurti" @@ -6509,7 +6507,6 @@ msgid "My Videos" msgstr "Vaizdai" #: shell32.rc:207 -#, fuzzy msgctxt "directory" msgid "Desktop" msgstr "Darbalaukis" @@ -6861,7 +6858,6 @@ msgid " sec" msgstr " sek" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 -#, fuzzy msgctxt "window" msgid "&Restore" msgstr "&Atkurti" @@ -8209,6 +8205,8 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file\n" "which were introduced by a preceding SETLOCAL.\n" msgstr "" +"ENDLOCAL komandų faile baigia aplinkos pakeitimų lokalizavimą,\n" +"kuris buvo padarytas ankstesnio SETLOCAL.\n" #: cmd.rc:218 msgid "" @@ -8219,6 +8217,11 @@ msgid "" "file, whichever comes first), at which point the previous environment\n" "settings are restored.\n" msgstr "" +"SETLOCAL pradeda aplinkos pakeitimų lokalizavimą komandų faile.\n" +"\n" +"Aplinkos pakeitimai padaryti po SETLOCAL yra lokalūs komandų faile ir yra\n" +"išlaikomi iki kol sutinkamas kitas ENDLOCAL (arba failo pabaiga, kas\n" +"pasitaiko pirmiau), tada atkuriami ankstesnės aplinkos nustatymai.\n" #: cmd.rc:221 msgid "" @@ -8257,7 +8260,6 @@ msgstr "" "ar apvalkalą iš kur CMD buvo iškviestas.\n" #: cmd.rc:267 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ATTRIB\t\tShow or change DOS file attributes\n" @@ -8305,6 +8307,7 @@ msgstr "" "DEL (ERASE)\tŠalinti failą ar failų aibę\n" "DIR\t\tPateikti katalogo turinį\n" "ECHO\t\tKopijuoti tekstą tiesiai į pulto išvedimą\n" +"ENDLOCAL\tBaigia aplinkos pakeitimų lokalizavimą komandų faile\n" "HELP\t\tParodyti trumpą pagalbą apie temą\n" "MD (MKDIR)\tSukurti pakatalogį\n" "MORE\t\tRodyti išvedimą puslapiais\n" @@ -8316,6 +8319,7 @@ msgstr "" "REN (RENAME)\tPervadinti failą\n" "RD (RMDIR)\tŠalinti pakatalogį\n" "SET\t\tNustatyti ar parodyti aplinkos kintamuosius\n" +"SETLOCAL\tPradeda aplinkos pakeitimų lokalizavimą komandų faile\n" "TIME\t\tNustatyti ar parodyti dabartinį sistemos laiką\n" "TITLE\t\tNustatyti CMD seanso lango antraštę\n" "TYPE\t\tIšvesti tekstinio failo turinį\n"

1 0

Michael Stefaniuc : dmscript: Merge the IClassFactory implementations.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 6c1e349b6ea4d4171bec182842fb0f07e1336ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1e349b6ea4d4171bec18284… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 11:59:11 2011 +0200 dmscript: Merge the IClassFactory implementations. --- dlls/dmscript/dmscript_main.c | 557 +++++------------------------------------ 1 files changed, 69 insertions(+), 488 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c1e349b6ea4d4171bec1…

1 0

Jacek Caban : iexplore: Moved iexplore registration extension to iexplore. exe.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 3faa938712cbce470701b49b935687cffeb058c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3faa938712cbce470701b49b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 12:14:19 2011 +0200 iexplore: Moved iexplore registration extension to iexplore.exe. --- dlls/shdocvw/factory.c | 125 +------------------- dlls/shdocvw/shdocvw.rc | 3 - programs/iexplore/Makefile.in | 1 + .../shdocvw.inf => programs/iexplore/iexplore.inf | 17 +-- programs/iexplore/iexplore.rc | 3 + programs/iexplore/main.c | 56 +++++++++- 6 files changed, 70 insertions(+), 135 deletions(-) diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index 5c0f106..ce6ddb9 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -23,7 +23,6 @@ #include "shdocvw.h" #include "winreg.h" -#include "advpub.h" #include "rpcproxy.h" #include "isguids.h" @@ -74,77 +73,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); } -static HRESULT reg_install(LPCSTR section, STRTABLEA *strtable) -{ - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - HMODULE hadvpack; - HRESULT hres; - - static const WCHAR advpackW[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - hadvpack = LoadLibraryW(advpackW); - pRegInstall = (void *)GetProcAddress(hadvpack, "RegInstall"); - - hres = pRegInstall(shdocvw_hinstance, section, strtable); - - FreeLibrary(hadvpack); - return hres; -} - -#define INF_SET_CLSID(clsid) \ - do \ - { \ - static CHAR name[] = "CLSID_" #clsid; \ - \ - pse[i].pszName = name; \ - clsids[i++] = &CLSID_ ## clsid; \ - } while (0) - -static HRESULT register_server(BOOL doregister) -{ - STRTABLEA strtable; - STRENTRYA pse[3]; - static CLSID const *clsids[3]; - unsigned int i = 0; - HRESULT hres; - - INF_SET_CLSID(Internet); - INF_SET_CLSID(InternetExplorer); - INF_SET_CLSID(InternetShortcut); - - for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39); - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], - clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4], - clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); - } - - strtable.cEntries = sizeof(pse)/sizeof(pse[0]); - strtable.pse = pse; - - hres = reg_install(doregister ? "RegisterDll" : "UnregisterDll", &strtable); - - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) - HeapFree(GetProcessHeap(), 0, pse[i].pszValue); - - return hres; -} - -#undef INF_SET_CLSID - /*********************************************************************** * DllRegisterServer (shdocvw.@) */ HRESULT WINAPI DllRegisterServer(void) { - HRESULT hres; - - hres = __wine_register_resources( shdocvw_hinstance, NULL ); - if(FAILED(hres)) - return hres; - - return register_server(TRUE); + TRACE("\n"); + return __wine_register_resources( shdocvw_hinstance, NULL ); } /*********************************************************************** @@ -152,57 +87,12 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - HRESULT hres; - - hres = register_server(FALSE); - if(FAILED(hres)) - return hres; - + TRACE("\n"); return __wine_unregister_resources( shdocvw_hinstance, NULL ); } -static BOOL check_native_ie(void) -{ - static const WCHAR cszPath[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; - DWORD handle,size; - BOOL ret = TRUE; - - size = GetFileVersionInfoSizeW(cszPath,&handle); - if (size) - { - LPVOID buf; - LPWSTR lpFileDescription; - UINT dwBytes; - static const WCHAR cszFD[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\','0','4','0','9','0','4','e','4','\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR cszWine[] = {'W','i','n','e',0}; - - buf = HeapAlloc(GetProcessHeap(),0,size); - GetFileVersionInfoW(cszPath,0,size,buf); - - if (VerQueryValueW(buf, cszFD, (LPVOID*)&lpFileDescription, &dwBytes) && - strstrW(lpFileDescription,cszWine)) - ret = FALSE; - - HeapFree(GetProcessHeap(), 0, buf); - } - - return ret; -} - -static DWORD register_iexplore(BOOL doregister) -{ - HRESULT hres; - if (check_native_ie()) - { - TRACE("Native IE detected, not doing registration\n"); - return S_OK; - } - hres = reg_install(doregister ? "RegisterIE" : "UnregisterIE", NULL); - return FAILED(hres); -} - /****************************************************************** - * IEWinMain (SHDOCVW.101) + * IEWinMain (SHDOCVW.101) * * Only returns on error. */ @@ -212,13 +102,6 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) TRACE("%s %d\n", debugstr_a(szCommandLine), nShowWindow); - if(*szCommandLine == '-' || *szCommandLine == '/') { - if(!strcasecmp(szCommandLine+1, "regserver")) - return register_iexplore(TRUE); - if(!strcasecmp(szCommandLine+1, "unregserver")) - return register_iexplore(FALSE); - } - pIEWinMain = (void*)GetProcAddress(get_ieframe_instance(), MAKEINTRESOURCEA(101)); if(!pIEWinMain) ExitProcess(1); diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index bd47bbd..555eabd 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -33,8 +33,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: shdocvw_v1.tlb */ 1 TYPELIB shdocvw_v1.tlb -/* @makedep: shdocvw.inf */ -REGINST REGINST shdocvw.inf - /* @makedep: shdocvw.rgs */ 2 WINE_REGISTRY shdocvw.rgs diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 547f8f0..6762af6 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = iexplore.exe APPMODE = -mwindows IMPORTS = shdocvw user32 gdi32 +DELAYIMPORTS = advpack version C_SRCS = \ main.c diff --git a/dlls/shdocvw/shdocvw.inf b/programs/iexplore/iexplore.inf similarity index 88% rename from dlls/shdocvw/shdocvw.inf rename to programs/iexplore/iexplore.inf index 2cf9d6e..a45df9f 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/programs/iexplore/iexplore.inf @@ -2,20 +2,12 @@ Signature="$CHICAGO$" -[RegisterDll] -AddReg=Classes.Reg - - -[UnregisterDll] -DelReg=Classes.Reg - - [RegisterIE] -AddReg=IE.Reg, Settings.Reg +AddReg=Classes.Reg, IE.Reg, Settings.Reg [UnregisterIE] -DelReg=IE.Reg, Settings.Reg +DelReg=Classes.Reg, IE.Reg, Settings.Reg [Classes.Reg] @@ -44,3 +36,8 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",, HKLM,"Software\Microsoft\Internet Explorer","Build",,"86001" HKLM,"Software\Microsoft\Internet Explorer","Version",,"8.0.6001.18702" HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"8.0.6001.18702" + + +[Strings] +CLSID_InternetExplorer="{0002df01-0000-0000-c000-000000000046}" +CLSID_Internet="{871c5380-42a0-1069-a2ea-08002b30309d}" diff --git a/programs/iexplore/iexplore.rc b/programs/iexplore/iexplore.rc index 64a976c..cd75781 100644 --- a/programs/iexplore/iexplore.rc +++ b/programs/iexplore/iexplore.rc @@ -28,3 +28,6 @@ /* @makedep: iexplore.ico */ 1 ICON iexplore.ico + +/* @makedep: iexplore.inf */ +REGINST REGINST iexplore.inf diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index 0ecf0d9..6065ba9 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -19,10 +19,64 @@ */ #include <windows.h> +#include <advpub.h> +#include <rpcproxy.h> + +#include "wine/unicode.h" +#include "wine/debug.h" extern DWORD WINAPI IEWinMain(LPSTR, int); -int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +static BOOL check_native_ie(void) +{ + DWORD handle, size; + LPWSTR file_desc; + UINT bytes; + void* buf; + BOOL ret; + + static const WCHAR browseui_dllW[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; + static const WCHAR wineW[] = {'W','i','n','e',0}; + static const WCHAR file_desc_strW[] = + {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', + '\\','0','4','0','9','0','4','e','4', + '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; + + size = GetFileVersionInfoSizeW(browseui_dllW, &handle); + if(!size) + return TRUE; + + buf = HeapAlloc(GetProcessHeap(), 0, size); + GetFileVersionInfoW(browseui_dllW, 0, size,buf); + + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW); + + HeapFree(GetProcessHeap(), 0, buf); + return ret; +} + +static DWORD register_iexplore(BOOL doregister) +{ + HRESULT hres; + + if (check_native_ie()) { + WINE_MESSAGE("Native IE detected, not doing registration\n"); + return 0; + } + + hres = RegInstallA(NULL, doregister ? "RegisterIE" : "UnregisterIE", NULL); + return FAILED(hres); +} + +int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) { + + if(*cmdline == '-' || *cmdline == '/') { + if(!strcasecmp(cmdline+1, "regserver")) + return register_iexplore(TRUE); + if(!strcasecmp(cmdline+1, "unregserver")) + return register_iexplore(FALSE); + } + return IEWinMain(cmdline, show); }

1 0

Jacek Caban : iexplore: Removed unneeded imports.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: a9700cbc84187822851f4e62052e7628a07729ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9700cbc84187822851f4e620… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 12:14:40 2011 +0200 iexplore: Removed unneeded imports. --- programs/iexplore/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 6762af6..1c1e191 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = iexplore.exe APPMODE = -mwindows -IMPORTS = shdocvw user32 gdi32 +IMPORTS = shdocvw DELAYIMPORTS = advpack version C_SRCS = \

1 0

Michael Stefaniuc : dmsynth: Merge the IClassFactory implementations.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 4afd3e46fcbbccb8ee575f41fe4772b38d0270ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afd3e46fcbbccb8ee575f41f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 11:57:55 2011 +0200 dmsynth: Merge the IClassFactory implementations. --- dlls/dmsynth/dmsynth_main.c | 133 ++++++++++++++++++------------------------- 1 files changed, 56 insertions(+), 77 deletions(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 0915d50..87cc3c7 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -31,107 +31,86 @@ static HINSTANCE instance; LONG DMSYNTH_refCount = 0; typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; + HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); } IClassFactoryImpl; /****************************************************************** - * DirectMusicSynth ClassFactory + * IClassFactory implementation */ -static HRESULT WINAPI SynthCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface IID: %s\n", debugstr_guid(riid)); - - if (ppobj == NULL) return E_POINTER; - - return E_NOINTERFACE; -} - -static ULONG WINAPI SynthCF_AddRef(LPCLASSFACTORY iface) { - DMSYNTH_LockModule(); - - return 2; /* non-heap based object */ -} - -static ULONG WINAPI SynthCF_Release(LPCLASSFACTORY iface) { - DMSYNTH_UnlockModule(); - - return 1; /* non-heap based object */ +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); } -static HRESULT WINAPI SynthCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); - return DMUSIC_CreateDirectMusicSynthImpl (riid, ppobj, pOuter); +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid)) + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + else if (IsEqualGUID(&IID_IClassFactory, riid)) + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + else { + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + *ppv = iface; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static HRESULT WINAPI SynthCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - TRACE("(%d)\n", dolock); - - if (dolock) - DMSYNTH_LockModule(); - else - DMSYNTH_UnlockModule(); +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + DMSYNTH_LockModule(); - return S_OK; + return 2; /* non-heap based object */ } -static const IClassFactoryVtbl SynthCF_Vtbl = { - SynthCF_QueryInterface, - SynthCF_AddRef, - SynthCF_Release, - SynthCF_CreateInstance, - SynthCF_LockServer -}; - -static IClassFactoryImpl Synth_CF = {&SynthCF_Vtbl}; - -/****************************************************************** - * DirectMusicSynthSink ClassFactory - */ -static HRESULT WINAPI SynthSinkCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface IID: %s\n", debugstr_guid(riid)); +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + DMSYNTH_UnlockModule(); - if (ppobj == NULL) return E_POINTER; - - return E_NOINTERFACE; + return 1; /* non-heap based object */ } -static ULONG WINAPI SynthSinkCF_AddRef(LPCLASSFACTORY iface) { - DMSYNTH_LockModule(); - - return 2; /* non-heap based object */ -} +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, + REFIID riid, void **ppv) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); -static ULONG WINAPI SynthSinkCF_Release(LPCLASSFACTORY iface) { - DMSYNTH_UnlockModule(); + TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return 1; /* non-heap based object */ + return This->fnCreateInstance(riid, ppv, pUnkOuter); } -static HRESULT WINAPI SynthSinkCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); - return DMUSIC_CreateDirectMusicSynthSinkImpl (riid, ppobj, pOuter); -} +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) +{ + TRACE("(%d)\n", dolock); -static HRESULT WINAPI SynthSinkCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - TRACE("(%d)\n", dolock); + if (dolock) + DMSYNTH_LockModule(); + else + DMSYNTH_UnlockModule(); - if (dolock) - DMSYNTH_LockModule(); - else - DMSYNTH_UnlockModule(); - - return S_OK; + return S_OK; } -static const IClassFactoryVtbl SynthSinkCF_Vtbl = { - SynthSinkCF_QueryInterface, - SynthSinkCF_AddRef, - SynthSinkCF_Release, - SynthSinkCF_CreateInstance, - SynthSinkCF_LockServer +static const IClassFactoryVtbl classfactory_vtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer }; -static IClassFactoryImpl SynthSink_CF = {&SynthSinkCF_Vtbl}; - +static IClassFactoryImpl Synth_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicSynthImpl}; +static IClassFactoryImpl SynthSink_CF = {{&classfactory_vtbl}, + DMUSIC_CreateDirectMusicSynthSinkImpl}; + /****************************************************************** * DllMain *

1 0

Henri Verbeet : wined3d: wined3d_device_evict_managed_resources() doesn' t need a return value.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 2256a7e804b1767ea827f6c908c404c95e1810e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2256a7e804b1767ea827f6c90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:54 2011 +0200 wined3d: wined3d_device_evict_managed_resources() doesn't need a return value. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/ddraw.c | 8 ++++---- dlls/wined3d/device.c | 4 +--- include/wine/wined3d.h | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5c4568d..e93976e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -361,16 +361,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ResourceManagerDiscardBytes(IDirect3D DWORD Bytes) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, byte_count %u.\n", iface, Bytes); if (Bytes) FIXME("Byte count ignored.\n"); wined3d_mutex_lock(); - hr = wined3d_device_evict_managed_resources(This->wined3d_device); + wined3d_device_evict_managed_resources(This->wined3d_device); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice8Impl_GetDirect3D(IDirect3DDevice8 *iface, IDirect3D8 **ppD3D8) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 74d8383..2456e16 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -304,15 +304,14 @@ static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(IDirect3DDevice9E static HRESULT WINAPI IDirect3DDevice9Impl_EvictManagedResources(IDirect3DDevice9Ex *iface) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_device_evict_managed_resources(This->wined3d_device); + wined3d_device_evict_managed_resources(This->wined3d_device); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(IDirect3DDevice9Ex *iface, diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 40d27ed..70e8895 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5158,15 +5158,15 @@ static HRESULT WINAPI d3d3_EnumZBufferFormats(IDirect3D3 *iface, REFCLSID device static HRESULT WINAPI d3d7_EvictManagedTextures(IDirect3D7 *iface) { IDirectDrawImpl *This = impl_from_IDirect3D7(iface); - HRESULT hr; + TRACE("iface %p!\n", iface); EnterCriticalSection(&ddraw_cs); - if (!This->d3d_initialized) hr = D3D_OK; - else hr = wined3d_device_evict_managed_resources(This->wined3d_device); + if (This->d3d_initialized) + wined3d_device_evict_managed_resources(This->wined3d_device); LeaveCriticalSection(&ddraw_cs); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d3_EvictManagedTextures(IDirect3D3 *iface) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 16327e4..84c7789 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5386,7 +5386,7 @@ BOOL CDECL wined3d_device_show_cursor(struct wined3d_device *device, BOOL show) return oldVisible; } -HRESULT CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) +void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { struct wined3d_resource *resource, *cursor; @@ -5405,8 +5405,6 @@ HRESULT CDECL wined3d_device_evict_managed_resources(struct wined3d_device *devi /* Invalidate stream sources, the buffer(s) may have been evicted. */ device_invalidate_state(device, STATE_STREAMSRC); - - return WINED3D_OK; } static HRESULT updateSurfaceDesc(struct wined3d_surface *surface, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0a09ec6..bfc1b39 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2204,7 +2204,7 @@ HRESULT __cdecl wined3d_device_draw_tri_patch(struct wined3d_device *device, UIN const float *num_segs, const WINED3DTRIPATCH_INFO *tri_patch_info); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); -HRESULT __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); +void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_back_buffer(struct wined3d_device *device, UINT swapchain_idx, UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer);

1 0

Alexandre Julliard : rpcrt4: Add a phase in proxies for zeroing output parameters on startup.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 2bdff697338cc559580a863e3c2e85d5a292f761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bdff697338cc559580a863e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 22:43:12 2011 +0200 rpcrt4: Add a phase in proxies for zeroing output parameters on startup. --- dlls/rpcrt4/ndr_stubless.c | 162 ++++++++++++++++++++++++-------------------- 1 files changed, 89 insertions(+), 73 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 017be5d..243a0af 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -144,6 +144,62 @@ static inline void call_freer(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemor if (m) m(pStubMsg, pMemory, pFormat); } +static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) +{ + DWORD size; + switch(*pFormat) + { + case RPC_FC_STRUCT: + size = *(const WORD*)(pFormat + 2); + break; + case RPC_FC_BOGUS_STRUCT: + size = *(const WORD*)(pFormat + 2); + if(*(const WORD*)(pFormat + 4)) + FIXME("Unhandled conformant description\n"); + break; + case RPC_FC_CARRAY: + case RPC_FC_CVARRAY: + size = *(const WORD*)(pFormat + 2); + ComputeConformance(pStubMsg, NULL, pFormat + 4, 0); + size *= pStubMsg->MaxCount; + break; + case RPC_FC_SMFARRAY: + case RPC_FC_SMVARRAY: + size = *(const WORD*)(pFormat + 2); + break; + case RPC_FC_LGFARRAY: + case RPC_FC_LGVARRAY: + size = *(const DWORD*)(pFormat + 2); + break; + case RPC_FC_BOGUS_ARRAY: + pFormat = ComputeConformance(pStubMsg, NULL, pFormat + 4, *(const WORD*)&pFormat[2]); + TRACE("conformance = %ld\n", pStubMsg->MaxCount); + pFormat = ComputeVariance(pStubMsg, NULL, pFormat, pStubMsg->MaxCount); + size = ComplexStructSize(pStubMsg, pFormat); + size *= pStubMsg->MaxCount; + break; + case RPC_FC_C_CSTRING: + case RPC_FC_C_WSTRING: + if (*pFormat == RPC_FC_C_CSTRING) + size = sizeof(CHAR); + else + size = sizeof(WCHAR); + if (pFormat[1] == RPC_FC_STRING_SIZED) + ComputeConformance(pStubMsg, NULL, pFormat + 2, 0); + else + pStubMsg->MaxCount = 0; + size *= pStubMsg->MaxCount; + break; + default: + FIXME("Unhandled type %02x\n", *pFormat); + /* fallthrough */ + case RPC_FC_RP: + size = sizeof(void *); + break; + } + return size; +} + void WINAPI NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE pMessage) { #if 0 /* these functions are not defined yet */ @@ -367,6 +423,13 @@ void client_do_args( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, enum s switch (phase) { + case STUBLESS_INITOUT: + if (!params[i].attr.IsBasetype && params[i].attr.IsOut && + !params[i].attr.IsIn && !params[i].attr.IsByValue) + { + memset( *(unsigned char **)pArg, 0, calc_arg_size( pStubMsg, pTypeFormat )); + } + break; case STUBLESS_CALCSIZE: if (params[i].attr.IsSimpleRef && !*(unsigned char **)pArg) RpcRaiseException(RPC_X_NULL_REF_POINTER); @@ -648,24 +711,33 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma } /* order of phases: - * 1. CALCSIZE - calculate the buffer size - * 2. GETBUFFER - allocate the buffer - * 3. MARSHAL - marshal [in] params into the buffer - * 4. SENDRECEIVE - send/receive buffer - * 5. UNMARSHAL - unmarshal [out] params from buffer - * 6. FREE - clear [out] parameters (for proxies, and only on error) + * 1. INITOUT - zero [out] parameters (proxies only) + * 2. CALCSIZE - calculate the buffer size + * 3. GETBUFFER - allocate the buffer + * 4. MARSHAL - marshal [in] params into the buffer + * 5. SENDRECEIVE - send/receive buffer + * 6. UNMARSHAL - unmarshal [out] params from buffer + * 7. FREE - clear [out] parameters (for proxies, and only on error) */ if ((pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) || (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_HAS_COMM_OR_FAULT)) { + /* 1. INITOUT */ + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) + { + TRACE( "INITOUT\n" ); + client_do_args(&stubMsg, pFormat, STUBLESS_INITOUT, fpu_stack, + number_of_params, (unsigned char *)&RetVal); + } + __TRY { - /* 1. CALCSIZE */ + /* 2. CALCSIZE */ TRACE( "CALCSIZE\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_CALCSIZE, fpu_stack, number_of_params, (unsigned char *)&RetVal); - /* 2. GETBUFFER */ + /* 3. GETBUFFER */ TRACE( "GETBUFFER\n" ); if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { @@ -691,12 +763,12 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma } } - /* 3. MARSHAL */ + /* 4. MARSHAL */ TRACE( "MARSHAL\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_MARSHAL, fpu_stack, number_of_params, (unsigned char *)&RetVal); - /* 4. SENDRECEIVE */ + /* 5. SENDRECEIVE */ TRACE( "SENDRECEIVE\n" ); if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { @@ -729,7 +801,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) NdrConvert(&stubMsg, pFormat); - /* 5. UNMARSHAL */ + /* 6. UNMARSHAL */ TRACE( "UNMARSHAL\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_UNMARSHAL, fpu_stack, number_of_params, (unsigned char *)&RetVal); @@ -738,7 +810,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma { if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) { - /* 6. FREE */ + /* 7. FREE */ TRACE( "FREE\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_FREE, fpu_stack, number_of_params, (unsigned char *)&RetVal); @@ -774,12 +846,12 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma } else { - /* 1. CALCSIZE */ + /* 2. CALCSIZE */ TRACE( "CALCSIZE\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_CALCSIZE, fpu_stack, number_of_params, (unsigned char *)&RetVal); - /* 2. GETBUFFER */ + /* 3. GETBUFFER */ TRACE( "GETBUFFER\n" ); if (Oif_flags.HasPipes) /* NdrGetPipeBuffer(...) */ @@ -796,12 +868,12 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma NdrGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); } - /* 3. MARSHAL */ + /* 4. MARSHAL */ TRACE( "MARSHAL\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_MARSHAL, fpu_stack, number_of_params, (unsigned char *)&RetVal); - /* 4. SENDRECEIVE */ + /* 5. SENDRECEIVE */ TRACE( "SENDRECEIVE\n" ); if (Oif_flags.HasPipes) /* NdrPipesSendReceive(...) */ @@ -823,7 +895,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) NdrConvert(&stubMsg, pFormat); - /* 5. UNMARSHAL */ + /* 6. UNMARSHAL */ TRACE( "UNMARSHAL\n" ); client_do_args(&stubMsg, pFormat, STUBLESS_UNMARSHAL, fpu_stack, number_of_params, (unsigned char *)&RetVal); @@ -1000,62 +1072,6 @@ LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, uns } #endif -static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) -{ - DWORD size; - switch(*pFormat) - { - case RPC_FC_STRUCT: - size = *(const WORD*)(pFormat + 2); - break; - case RPC_FC_BOGUS_STRUCT: - size = *(const WORD*)(pFormat + 2); - if(*(const WORD*)(pFormat + 4)) - FIXME("Unhandled conformant description\n"); - break; - case RPC_FC_CARRAY: - case RPC_FC_CVARRAY: - size = *(const WORD*)(pFormat + 2); - ComputeConformance(pStubMsg, NULL, pFormat + 4, 0); - size *= pStubMsg->MaxCount; - break; - case RPC_FC_SMFARRAY: - case RPC_FC_SMVARRAY: - size = *(const WORD*)(pFormat + 2); - break; - case RPC_FC_LGFARRAY: - case RPC_FC_LGVARRAY: - size = *(const DWORD*)(pFormat + 2); - break; - case RPC_FC_BOGUS_ARRAY: - pFormat = ComputeConformance(pStubMsg, NULL, pFormat + 4, *(const WORD*)&pFormat[2]); - TRACE("conformance = %ld\n", pStubMsg->MaxCount); - pFormat = ComputeVariance(pStubMsg, NULL, pFormat, pStubMsg->MaxCount); - size = ComplexStructSize(pStubMsg, pFormat); - size *= pStubMsg->MaxCount; - break; - case RPC_FC_C_CSTRING: - case RPC_FC_C_WSTRING: - if (*pFormat == RPC_FC_C_CSTRING) - size = sizeof(CHAR); - else - size = sizeof(WCHAR); - if (pFormat[1] == RPC_FC_STRING_SIZED) - ComputeConformance(pStubMsg, NULL, pFormat + 2, 0); - else - pStubMsg->MaxCount = 0; - size *= pStubMsg->MaxCount; - break; - default: - FIXME("Unhandled type %02x\n", *pFormat); - /* fallthrough */ - case RPC_FC_RP: - size = sizeof(void *); - break; - } - return size; -} - static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat, enum stubless_phase phase, unsigned short number_of_params)

1 0

Alexandre Julliard : rpcrt4: Support sizing of a few more argument types.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 976cd5c9fee029ab0eb8190f738a80ab6703fe4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=976cd5c9fee029ab0eb8190f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 29 12:08:47 2011 +0200 rpcrt4: Support sizing of a few more argument types. --- dlls/rpcrt4/ndr_stubless.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 243a0af..4e00269 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -150,6 +150,7 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) switch(*pFormat) { case RPC_FC_STRUCT: + case RPC_FC_PSTRUCT: size = *(const WORD*)(pFormat + 2); break; case RPC_FC_BOGUS_STRUCT: @@ -178,6 +179,15 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) size = ComplexStructSize(pStubMsg, pFormat); size *= pStubMsg->MaxCount; break; + case RPC_FC_USER_MARSHAL: + size = *(const WORD*)(pFormat + 4); + break; + case RPC_FC_CSTRING: + size = *(const WORD*)(pFormat + 2); + break; + case RPC_FC_WSTRING: + size = *(const WORD*)(pFormat + 2) * sizeof(WCHAR); + break; case RPC_FC_C_CSTRING: case RPC_FC_C_WSTRING: if (*pFormat == RPC_FC_C_CSTRING)

1 0

Alexandre Julliard : rpcrt4: Use the same phase values for clients and stubs.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 78e8fccbd65c5536c449111826527e192eb1cf2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=78e8fccbd65c5536c44911182… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 22:34:57 2011 +0200 rpcrt4: Use the same phase values for clients and stubs. --- dlls/rpcrt4/ndr_es.c | 6 +- dlls/rpcrt4/ndr_stubless.c | 442 ++++++++++++++++++++------------------------ dlls/rpcrt4/ndr_stubless.h | 15 ++- 3 files changed, 217 insertions(+), 246 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78e8fccbd65c5536c4491…

1 0

Henri Verbeet : wined3d: Don' t hide GL function pointer typedefs behind extension defines.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 3d7c596cdc90fd01976844e38aa1de94ce6c9716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7c596cdc90fd01976844e38… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:53 2011 +0200 wined3d: Don't hide GL function pointer typedefs behind extension defines. These are specific to wined3d. --- dlls/wined3d/wined3d_gl.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 24c366e..5088782 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1892,9 +1892,9 @@ typedef void (WINE_GLAPI *PGLFNFINISHOBJECTAPPLEPROC)(GLenum, GLuint); #define GL_APPLE_flush_buffer_range 1 #define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8a12 #define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8a13 +#endif typedef void (WINE_GLAPI *PGLFNBUFFERPARAMETERIAPPLE)(GLenum target, GLenum pname, GLint param); typedef void (WINE_GLAPI *PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); -#endif /* GL_APPLE_flush_render */ typedef void (WINE_GLAPI *PGLFNFLUSHRENDERAPPLEPROC)(void); @@ -1969,15 +1969,15 @@ typedef void (WINE_GLAPI *PGLFNDRAWBUFFERSARBPROC)(GLsizei n, const GLenum *bufs /* GL_ARB_draw_elements_base_vertex */ #ifndef GL_ARB_draw_elements_base_vertex #define GL_ARB_draw_elements_base_vertex 1 +#endif typedef void (WINE_GLAPI *PGLFNDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); typedef void (WINE_GLAPI *PGLFNDRAWRANGEELEMENTSBASEVERTEXPROC)(GLenum mode, GLuint start, GLuint end, - GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); + GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); typedef void (WINE_GLAPI *PGLFNDRAWELEMENTSINSTANCEDBASEVERTEXPROC)(GLenum mode, GLsizei count, - GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); + GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); typedef void (WINE_GLAPI *PGLFNMULTIDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, GLsizei *count, GLenum type, - const GLvoid **indices, GLsizei primcount, GLint *basevertex); -#endif + const GLvoid **indices, GLsizei primcount, GLint *basevertex); /* GL_ARB_fragment_program */ #ifndef GL_ARB_fragment_program @@ -3083,11 +3083,11 @@ typedef void (WINE_GLAPI *PGLFNGLGENERATEMIPMAPEXTPROC)(GLenum target); /* GL_EXT_gpu_program_parameters */ #ifndef GL_EXT_gpu_program_parameters #define GL_EXT_gpu_program_parameters 1 +#endif typedef void (WINE_GLAPI *PGLFNPROGRAMENVPARAMETERS4FVEXTPROC)(GLenum target, GLuint index, GLsizei count, const float *params); typedef void (WINE_GLAPI *PGLFNPROGRAMLOCALPARAMETERS4FVEXTPROC)(GLenum target, GLuint index, GLsizei count, const float *params); -#endif /* GL_EXT_gpu_shader4 */ #ifndef GL_EXT_gpu_shader4

1 0