January 2014 - Wine-Commits

Michael Stefaniuc : dmscript: COM cleanup for IPersistStream from DirectMusicScriptTrack.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: daf7fb1f2d6f94c129851eec0a5c0eb8f752be81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf7fb1f2d6f94c129851eec0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:13:06 2014 +0100 dmscript: COM cleanup for IPersistStream from DirectMusicScriptTrack. --- dlls/dmscript/scripttrack.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 7b5a4ec..63ab577 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmscript); typedef struct DirectMusicScriptTrack { const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + IPersistStream IPersistStream_iface; LONG ref; LPDMUS_OBJECTDESC pDesc; } DirectMusicScriptTrack; @@ -40,6 +40,11 @@ static inline DirectMusicScriptTrack *impl_from_IDirectMusicTrack8(IDirectMusicT return CONTAINING_RECORD(iface, DirectMusicScriptTrack, IDirectMusicTrack8_iface); } +static inline DirectMusicScriptTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, DirectMusicScriptTrack, IPersistStream_iface); +} + /* IDirectMusicScriptTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicScriptTrack, UnknownVtbl, iface); @@ -55,8 +60,8 @@ static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN IDirectMusicTrack_AddRef(&This->IDirectMusicTrack8_iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); + *ppobj = &This->IPersistStream_iface; + IPersistStream_AddRef(&This->IPersistStream_iface); return S_OK; } @@ -271,19 +276,19 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { static HRESULT WINAPI IPersistStreamImpl_QueryInterface(IPersistStream *iface, REFIID riid, void **ppobj) { - ICOM_THIS_MULTI(IDirectMusicScriptTrack, PersistStreamVtbl, iface); + DirectMusicScriptTrack *This = impl_from_IPersistStream(iface); return IDirectMusicScriptTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } static ULONG WINAPI IPersistStreamImpl_AddRef(IPersistStream *iface) { - ICOM_THIS_MULTI(IDirectMusicScriptTrack, PersistStreamVtbl, iface); + DirectMusicScriptTrack *This = impl_from_IPersistStream(iface); return IDirectMusicScriptTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } static ULONG WINAPI IPersistStreamImpl_Release(IPersistStream *iface) { - ICOM_THIS_MULTI(IDirectMusicScriptTrack, PersistStreamVtbl, iface); + DirectMusicScriptTrack *This = impl_from_IPersistStream(iface); return IDirectMusicScriptTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } @@ -314,7 +319,7 @@ static HRESULT WINAPI IPersistStreamImpl_GetSizeMax(IPersistStream *iface, ULARG return E_NOTIMPL; } -static const IPersistStreamVtbl DirectMusicScriptTrack_PersistStream_Vtbl = { +static const IPersistStreamVtbl persist_vtbl = { IPersistStreamImpl_QueryInterface, IPersistStreamImpl_AddRef, IPersistStreamImpl_Release, @@ -342,7 +347,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(LPCGUID lpcGUID, void **ppobj track->UnknownVtbl = &DirectMusicScriptTrack_Unknown_Vtbl; track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; - track->PersistStreamVtbl = &DirectMusicScriptTrack_PersistStream_Vtbl; + track->IPersistStream_iface.lpVtbl = &persist_vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS;

1 0

Akihiro Sagawa : gdi32: Use the vertAdvance value for cellIncX if vertical metrics are available.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: d33602564b36fda5302a2d9bb57889aeacb78258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33602564b36fda5302a2d9bb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:29:51 2014 +0900 gdi32: Use the vertAdvance value for cellIncX if vertical metrics are available. --- dlls/gdi32/freetype.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4be2978..1c3e6fc 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6504,7 +6504,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } TRACE("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); - vec.x = metrics.horiAdvance; + if (vertical_metrics) + vec.x = metrics.vertAdvance; + else + vec.x = metrics.horiAdvance; vec.y = 0; pFT_Vector_Transform(&vec, &transMat); gm.gmCellIncY = -((vec.y+63) >> 6);

1 0

Alexandre Julliard : msvcp90: Avoid using get_current_locale that doesn' t exist in old msvcrt versions.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: c2b0732108ec9eb59fb26142abbfc5868caf7bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2b0732108ec9eb59fb26142a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 12:51:53 2014 +0100 msvcp90: Avoid using get_current_locale that doesn't exist in old msvcrt versions. --- dlls/msvcp90/locale.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f428396..0ae1d8d 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -43,6 +43,8 @@ char* __cdecl _Getdays(void); char* __cdecl _Getmonths(void); void* __cdecl _Gettnames(void); unsigned int __cdecl ___lc_codepage_func(void); +int __cdecl ___lc_collate_cp_func(void); +const unsigned short* __cdecl __pctype_func(void); const locale_facet* __thiscall locale__Getfacet(const locale*, MSVCP_size_t); MSVCP_size_t __cdecl _Strftime(char*, MSVCP_size_t, const char*, const struct tm*, struct __lc_time_data*); @@ -589,13 +591,11 @@ ULONGLONG __cdecl _Getcoll(void) _Collvec collvec; ULONGLONG ull; } ret; - _locale_t locale = _get_current_locale(); TRACE("\n"); - ret.collvec.page = locale->locinfo->lc_collate_cp; - ret.collvec.handle = locale->locinfo->lc_handle[LC_COLLATE]; - _free_locale(locale); + ret.collvec.page = ___lc_collate_cp_func(); + ret.collvec.handle = ___lc_handle_func()[LC_COLLATE]; return ret.ull; } @@ -612,22 +612,17 @@ _Collvec* __thiscall _Locinfo__Getcoll(const _Locinfo *this, _Collvec *ret) /* _Getctype */ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) { - _locale_t locale = _get_current_locale(); short *table; TRACE("\n"); - ret->page = locale->locinfo->lc_codepage; - ret->handle = locale->locinfo->lc_handle[LC_COLLATE]; + ret->page = ___lc_codepage_func(); + ret->handle = ___lc_handle_func()[LC_COLLATE]; ret->delfl = TRUE; table = malloc(sizeof(short[256])); - if(!table) { - _free_locale(locale); - throw_exception(EXCEPTION_BAD_ALLOC, NULL); - } - memcpy(table, locale->locinfo->pctype, sizeof(short[256])); + if(!table) throw_exception(EXCEPTION_BAD_ALLOC, NULL); + memcpy(table, __pctype_func(), sizeof(short[256])); ret->table = table; - _free_locale(locale); return ret; } @@ -642,7 +637,6 @@ _Ctypevec* __thiscall _Locinfo__Getctype(const _Locinfo *this, _Ctypevec *ret) /* _Getcvt */ ULONGLONG __cdecl _Getcvt(void) { - _locale_t locale = _get_current_locale(); union { _Cvtvec cvtvec; ULONGLONG ull; @@ -650,9 +644,8 @@ ULONGLONG __cdecl _Getcvt(void) TRACE("\n"); - ret.cvtvec.page = locale->locinfo->lc_codepage; - ret.cvtvec.handle = locale->locinfo->lc_handle[LC_CTYPE]; - _free_locale(locale); + ret.cvtvec.page = ___lc_codepage_func(); + ret.cvtvec.handle = ___lc_handle_func()[LC_CTYPE]; return ret.ull; }

1 0

Michael Stefaniuc : dmscript/tests: Add COM tests for DirectMusicScript.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 632d9361a2cb79e26e6a9c840d4efc696411a2b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632d9361a2cb79e26e6a9c840… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:07:01 2014 +0100 dmscript/tests: Add COM tests for DirectMusicScript. --- configure | 1 + configure.ac | 1 + dlls/dmscript/tests/Makefile.in | 5 ++ dlls/dmscript/tests/dmscript.c | 148 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 155 insertions(+) diff --git a/configure b/configure index a41afa4..573bb96 100755 --- a/configure +++ b/configure @@ -16734,6 +16734,7 @@ wine_fn_config_test dlls/dmime/tests dmime_test wine_fn_config_dll dmloader enable_dmloader clean wine_fn_config_test dlls/dmloader/tests dmloader_test wine_fn_config_dll dmscript enable_dmscript clean +wine_fn_config_test dlls/dmscript/tests dmscript_test wine_fn_config_dll dmstyle enable_dmstyle clean wine_fn_config_dll dmsynth enable_dmsynth clean wine_fn_config_test dlls/dmsynth/tests dmsynth_test diff --git a/configure.ac b/configure.ac index 3d3e039..a4f0063 100644 --- a/configure.ac +++ b/configure.ac @@ -2787,6 +2787,7 @@ WINE_CONFIG_TEST(dlls/dmime/tests) WINE_CONFIG_DLL(dmloader,,[clean]) WINE_CONFIG_TEST(dlls/dmloader/tests) WINE_CONFIG_DLL(dmscript,,[clean]) +WINE_CONFIG_TEST(dlls/dmscript/tests) WINE_CONFIG_DLL(dmstyle,,[clean]) WINE_CONFIG_DLL(dmsynth,,[clean]) WINE_CONFIG_TEST(dlls/dmsynth/tests) diff --git a/dlls/dmscript/tests/Makefile.in b/dlls/dmscript/tests/Makefile.in new file mode 100644 index 0000000..a4b246d --- /dev/null +++ b/dlls/dmscript/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = dmscript.dll +IMPORTS = ole32 + +C_SRCS = \ + dmscript.c diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c new file mode 100644 index 0000000..f9612fa --- /dev/null +++ b/dlls/dmscript/tests/dmscript.c @@ -0,0 +1,148 @@ +/* + * Copyright 2014 Michael Stefaniuc + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> +#include <windef.h> +#include <initguid.h> +#include <wine/test.h> +#include <dmusici.h> + +static BOOL missing_dmscript(void) +{ + IDirectMusicScript *dms; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicScript, (void**)&dms); + + if (hr == S_OK && dms) + { + IDirectMusicScript_Release(dms); + return FALSE; + } + return TRUE; +} + +/* Outer IUnknown for COM aggregation tests */ +struct unk_impl { + IUnknown IUnknown_iface; + LONG ref; + IUnknown *inner_unk; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return IUnknown_QueryInterface(This->inner_unk, riid, ppv); +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + +static void test_COM(void) +{ + IDirectMusicScript *dms = NULL; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicScript, (IUnknown*)&dms, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dms); + todo_wine ok(hr == E_POINTER, "DirectMusicScript create failed: %08x, expected E_POINTER\n", hr); + /* An invalid non-NULL pUnkOuter crashes newer Windows versions */ + hr = CoCreateInstance(&CLSID_DirectMusicScript, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&unk_obj.inner_unk); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicScript create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!unk_obj.inner_unk, "unk_obj.inner_unk = %p\n", unk_obj.inner_unk); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, + (void**)&dms); + ok(hr == E_NOINTERFACE, "DirectMusicScript create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicScript interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicScript, (void**)&dms); + ok(hr == S_OK, "DirectMusicScript create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicScript_AddRef(dms); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicScript_QueryInterface(dms, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + + hr = IDirectMusicScript_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicScript_QueryInterface(dms, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicScript_Release(dms)); +} + +START_TEST(dmscript) +{ + CoInitialize(NULL); + + if (missing_dmscript()) + { + skip("dmscript not available\n"); + CoUninitialize(); + return; + } + test_COM(); + + CoUninitialize(); +}

1 0

Frédéric Delanoy : dbghelp: Remove an "#if 1" preprocessor directive.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 74b0f6b4adf1155b5459266c6920efbb83740c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b0f6b4adf1155b5459266c6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 11 13:53:24 2014 +0100 dbghelp: Remove an "#if 1" preprocessor directive. --- dlls/dbghelp/storage.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 3f00b07..3c2aea6 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -358,7 +358,7 @@ void hash_table_destroy(struct hash_table* ht) variance = (double)sq / ht->num_buckets - mean * mean; FIXME("STATS: elts[num:%-4u size:%u mean:%f] buckets[min:%-4u variance:%+f max:%-4u]\n", ht->num_elts, ht->num_buckets, mean, min, variance, max); -#if 1 + for (i = 0; i < ht->num_buckets; i++) { for (len = 0, elt = ht->buckets[i]; elt; elt = elt->next) len++; @@ -372,7 +372,6 @@ void hash_table_destroy(struct hash_table* ht) } #endif -#endif } void hash_table_add(struct hash_table* ht, struct hash_table_elt* elt)

1 0

Frédéric Delanoy : dplayx: Avoid TRUE: FALSE conditional expressions.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 7a28ce245d4ca406d1db7507b781684229850ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a28ce245d4ca406d1db7507b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jan 12 10:44:32 2014 +0100 dplayx: Avoid TRUE:FALSE conditional expressions. --- dlls/dplayx/dplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 0d448a6..0314597 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4634,7 +4634,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDp FILETIME filetime; (i == 0) ? (searchSubKey = spSubKey ) : (searchSubKey = lpSubKey ); - *lpbIsDpSp = (i == 0) ? TRUE : FALSE; + *lpbIsDpSp = (i == 0); /* Need to loop over the service providers in the registry */

1 0

Frédéric Delanoy : ntdll: Avoid TRUE: FALSE conditional expressions.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: acf22e83f6f80b317a9ae86d3c5f45ce9fdac85f URL: http://source.winehq.org/git/wine.git/?a=commit;h=acf22e83f6f80b317a9ae86d3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jan 12 10:48:16 2014 +0100 ntdll: Avoid TRUE:FALSE conditional expressions. --- dlls/ntdll/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index c94d9c4..4a57791 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -659,7 +659,7 @@ NTSTATUS WINAPI NtCreateTimer(OUT HANDLE *handle, req->access = access; req->attributes = (attr) ? attr->Attributes : 0; req->rootdir = wine_server_obj_handle( attr ? attr->RootDirectory : 0 ); - req->manual = (timer_type == NotificationTimer) ? TRUE : FALSE; + req->manual = (timer_type == NotificationTimer); if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); status = wine_server_call( req ); *handle = wine_server_ptr_handle( reply->handle );

1 0

Frédéric Delanoy : oleaut32: Avoid TRUE: FALSE conditional expressions.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: f2429cfeed872ab0837c500f50e311f83bfdc948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2429cfeed872ab0837c500f5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jan 12 10:42:46 2014 +0100 oleaut32: Avoid TRUE:FALSE conditional expressions. --- dlls/oleaut32/varformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index e02ad39..e72a170 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2411,7 +2411,7 @@ HRESULT WINAPI VarFormatPercent(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT if (SUCCEEDED(hRet)) { DWORD dwLen = strlenW(*pbstrOut); - BOOL bBracket = (*pbstrOut)[dwLen] == ')' ? TRUE : FALSE; + BOOL bBracket = (*pbstrOut)[dwLen] == ')'; dwLen -= bBracket; memcpy(buff, *pbstrOut, dwLen * sizeof(WCHAR));

1 0

Frédéric Delanoy : dplayx: Remove "#if 1" preprocessor directives.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: eecc2f8b72bbc2d3cee8d290b09bef2f0e43600d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eecc2f8b72bbc2d3cee8d290b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 11 13:53:25 2014 +0100 dplayx: Remove "#if 1" preprocessor directives. --- dlls/dplayx/dplay.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 20899d5..0d448a6 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -324,28 +324,17 @@ HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpcMessageBody, case DPMSGCMD_GETNAMETABLEREPLY: case DPMSGCMD_NEWPLAYERIDREPLY: -#if 0 - if( wCommandId == DPMSGCMD_NEWPLAYERIDREPLY ) - DebugBreak(); -#endif DP_MSG_ReplyReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize ); break; -#if 1 case DPMSGCMD_JUSTENVELOPE: TRACE( "GOT THE SELF MESSAGE: %p -> 0x%08x\n", lpcMessageHeader, ((const DWORD *)lpcMessageHeader)[1] ); NS_SetLocalAddr( This->dp2->lpNameServerData, lpcMessageHeader, 20 ); DP_MSG_ReplyReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize ); -#endif case DPMSGCMD_FORWARDADDPLAYER: -#if 0 - DebugBreak(); -#endif -#if 1 TRACE( "Sending message to self to get my addr\n" ); DP_MSG_ToSelf( This, 1 ); /* This is a hack right now */ -#endif break; case DPMSGCMD_FORWARDADDPLAYERNACK:

1 0

Nikolay Sivov : oleaut32/tests: Make it clear which vartypes are tested, skip calls on undefined vartype values.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 39fcf4ec775ce36fafe871d285beb6a6d9e5aba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fcf4ec775ce36fafe871d28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 12 22:48:31 2014 +0400 oleaut32/tests: Make it clear which vartypes are tested, skip calls on undefined vartype values. --- dlls/oleaut32/tests/vartype.c | 154 ++++++++++++++++++++++++++++------------- 1 file changed, 106 insertions(+), 48 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index e296e77..d100ad1 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5900,89 +5900,147 @@ static void test_ErrorChangeTypeEx(void) /* VT_EMPTY */ static void test_EmptyChangeTypeEx(void) { - HRESULT hres; - VARIANTARG vSrc, vDst; VARTYPE vt; LCID lcid; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); - for (vt = 0; vt <= VT_BSTR_BLOB; vt++) + for (vt = VT_EMPTY; vt <= VT_BSTR_BLOB; vt++) { - HRESULT hExpected = DISP_E_BADVARTYPE; + HRESULT hExpected, hres; + VARIANTARG vSrc, vDst; - VariantInit(&vSrc); - memset(&vDst, 0, sizeof(vDst)); - V_VT(&vDst) = VT_EMPTY; + /* skip for undefined types */ + if ((vt == 15) || (vt > VT_VERSIONED_STREAM && vt < VT_BSTR_BLOB)) + continue; - if (vt == VT_I8 || vt == VT_UI8) + switch (vt) { + case VT_I8: + case VT_UI8: if (has_i8) hExpected = S_OK; - } - else if (vt == VT_RECORD) - { - hExpected = DISP_E_TYPEMISMATCH; - } - else if (vt == VT_VARIANT || vt == VT_DISPATCH || - vt == VT_UNKNOWN || vt == VT_ERROR) - { + else + hExpected = DISP_E_BADVARTYPE; + break; + case VT_RECORD: + case VT_VARIANT: + case VT_DISPATCH: + case VT_UNKNOWN: + case VT_ERROR: hExpected = DISP_E_TYPEMISMATCH; - } - else if (vt <= VT_UINT && vt != (VARTYPE)15) + break; + case VT_EMPTY: + case VT_NULL: + case VT_I2: + case VT_I4: + case VT_R4: + case VT_R8: + case VT_CY: + case VT_DATE: + case VT_BSTR: + case VT_BOOL: + case VT_DECIMAL: + case VT_I1: + case VT_UI1: + case VT_UI2: + case VT_UI4: + case VT_INT: + case VT_UINT: hExpected = S_OK; + break; + default: + hExpected = DISP_E_BADVARTYPE; + } - hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, vt); + VariantInit(&vSrc); + V_VT(&vSrc) = VT_EMPTY; + memset(&vDst, 0, sizeof(vDst)); + V_VT(&vDst) = VT_NULL; - ok(hres == hExpected && (hres != S_OK || V_VT(&vDst) == vt), - "change empty: vt %d expected 0x%08x, got 0x%08x, vt %d\n", - vt, hExpected, hres, V_VT(&vDst)); - if(hres == S_OK) VariantClear(&vDst); + hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, vt); + ok(hres == hExpected, "change empty: vt %d expected 0x%08x, got 0x%08x, vt %d\n", + vt, hExpected, hres, V_VT(&vDst)); + if (hres == S_OK) + { + ok(V_VT(&vDst) == vt, "change empty: vt %d, got %d\n", vt, V_VT(&vDst)); + VariantClear(&vDst); + } } } /* VT_NULL */ static void test_NullChangeTypeEx(void) { - HRESULT hres; - VARIANTARG vSrc, vDst; VARTYPE vt; LCID lcid; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); - for (vt = 0; vt <= VT_BSTR_BLOB; vt++) + for (vt = VT_EMPTY; vt <= VT_BSTR_BLOB; vt++) { - HRESULT hExpected = DISP_E_BADVARTYPE; + VARIANTARG vSrc, vDst; + HRESULT hExpected, hres; - VariantInit(&vSrc); - V_VT(&vSrc) = VT_NULL; - memset(&vDst, 0, sizeof(vDst)); - V_VT(&vDst) = VT_EMPTY; + /* skip for undefined types */ + if ((vt == 15) || (vt > VT_VERSIONED_STREAM && vt < VT_BSTR_BLOB)) + continue; - if (vt == VT_I8 || vt == VT_UI8) + switch (vt) { - if (has_i8) + case VT_I8: + case VT_UI8: + if (has_i8) + hExpected = DISP_E_TYPEMISMATCH; + else + hExpected = DISP_E_BADVARTYPE; + break; + case VT_NULL: + hExpected = S_OK; + break; + case VT_EMPTY: + case VT_I2: + case VT_I4: + case VT_R4: + case VT_R8: + case VT_CY: + case VT_DATE: + case VT_BSTR: + case VT_DISPATCH: + case VT_ERROR: + case VT_BOOL: + case VT_VARIANT: + case VT_UNKNOWN: + case VT_DECIMAL: + case VT_I1: + case VT_UI1: + case VT_UI2: + case VT_UI4: + case VT_INT: + case VT_UINT: + case VT_RECORD: hExpected = DISP_E_TYPEMISMATCH; + break; + default: + hExpected = DISP_E_BADVARTYPE; } - else if (vt == VT_RECORD) - { - hExpected = DISP_E_TYPEMISMATCH; - } - else if (vt == VT_NULL) - { - hExpected = S_OK; - } - else if (vt == VT_VARIANT || vt == VT_DISPATCH || - vt == VT_UNKNOWN || vt == VT_ERROR || - (vt <= VT_UINT && vt != (VARTYPE)15)) - hExpected = DISP_E_TYPEMISMATCH; - hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, vt); + VariantInit(&vSrc); + V_VT(&vSrc) = VT_NULL; + memset(&vDst, 0, sizeof(vDst)); + V_VT(&vDst) = VT_EMPTY; - ok(hres == hExpected && (hres != S_OK || V_VT(&vDst) == vt), - "change null: vt %d expected 0x%08x, got 0x%08x, vt %d\n", + hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, vt); + ok(hres == hExpected, "change null: vt %d expected 0x%08x, got 0x%08x, vt %d\n", vt, hExpected, hres, V_VT(&vDst)); + + /* should work only for VT_NULL -> VT_NULL case */ + if (hres == S_OK) + ok(V_VT(&vDst) == VT_NULL, "change null: VT_NULL expected 0x%08x, got 0x%08x, vt %d\n", + hExpected, hres, V_VT(&vDst)); + else + ok(V_VT(&vDst) == VT_EMPTY, "change null: vt %d expected 0x%08x, got 0x%08x, vt %d\n", + vt, hExpected, hres, V_VT(&vDst)); } }

1 0

Michael Stefaniuc : dmscript: Remove the extraneous IUnknown from DirectMusicScript.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: d3ba2a9fe31ac7e19fb80c703626ee32acd32dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3ba2a9fe31ac7e19fb80c703… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:04:51 2014 +0100 dmscript: Remove the extraneous IUnknown from DirectMusicScript. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmscript/dmscript_private.h | 2 - dlls/dmscript/script.c | 134 ++++++++++++++++---------------------- 2 files changed, 55 insertions(+), 81 deletions(-) diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index a7f2ba9..97557bc 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -60,8 +60,6 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVO * IDirectMusicScriptImpl implementation structure */ struct IDirectMusicScriptImpl { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; IDirectMusicScript IDirectMusicScript_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 3f25638..a7f26a6 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -34,91 +34,63 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicScriptImpl implementation */ -/* IDirectMusicScriptImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicScriptImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicScript)) { - *ppobj = &This->IDirectMusicScript_iface; - IDirectMusicScript_AddRef(&This->IDirectMusicScript_iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = &This->ObjectVtbl; - IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicScriptImpl_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMSCRIPT_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicScriptImpl_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This->pHeader); - HeapFree(GetProcessHeap(), 0, This->pVersion); - HeapFree(GetProcessHeap(), 0, This->pwzLanguage); - HeapFree(GetProcessHeap(), 0, This->pwzSource); - HeapFree(GetProcessHeap(), 0, This); - } - - DMSCRIPT_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicScript_Unknown_Vtbl = { - IDirectMusicScriptImpl_IUnknown_QueryInterface, - IDirectMusicScriptImpl_IUnknown_AddRef, - IDirectMusicScriptImpl_IUnknown_Release -}; - static inline IDirectMusicScriptImpl *impl_from_IDirectMusicScript(IDirectMusicScript *iface) { return CONTAINING_RECORD(iface, IDirectMusicScriptImpl, IDirectMusicScript_iface); } static HRESULT WINAPI IDirectMusicScriptImpl_QueryInterface(IDirectMusicScript *iface, REFIID riid, - void **ppobj) + void **ret_iface) { - IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); - return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicScript)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IDirectMusicObject)) + *ret_iface = &This->ObjectVtbl; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicScriptImpl_AddRef(IDirectMusicScript *iface) { - IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); - return IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicScriptImpl_Release(IDirectMusicScript *iface) { - IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); - return IDirectMusicScriptImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This->pHeader); + HeapFree(GetProcessHeap(), 0, This->pVersion); + HeapFree(GetProcessHeap(), 0, This->pwzLanguage); + HeapFree(GetProcessHeap(), 0, This->pwzSource); + HeapFree(GetProcessHeap(), 0, This->pDesc); + HeapFree(GetProcessHeap(), 0, This); + DMSCRIPT_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicScriptImpl_Init(IDirectMusicScript *iface, @@ -223,17 +195,17 @@ static const IDirectMusicScriptVtbl dmscript_vtbl = { /* IDirectMusicScriptImpl IDirectMusicObject part: */ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, ObjectVtbl, iface); - return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicScript_QueryInterface(&This->IDirectMusicScript_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, ObjectVtbl, iface); - return IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicScript_AddRef (&This->IDirectMusicScript_iface); } static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, ObjectVtbl, iface); - return IDirectMusicScriptImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicScript_Release (&This->IDirectMusicScript_iface); } static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { @@ -438,17 +410,17 @@ static const IDirectMusicObjectVtbl DirectMusicScript_Object_Vtbl = { /* IDirectMusicScriptImpl IPersistStream part: */ static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface); - return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicScript_QueryInterface(&This->IDirectMusicScript_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface); - return IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicScript_AddRef(&This->IDirectMusicScript_iface); } static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface); - return IDirectMusicScriptImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicScript_Release(&This->IDirectMusicScript_iface); } static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -715,6 +687,7 @@ static const IPersistStreamVtbl DirectMusicScript_PersistStream_Vtbl = { HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, IUnknown *pUnkOuter) { IDirectMusicScriptImpl *obj; + HRESULT hr; *ppobj = NULL; @@ -725,7 +698,6 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, if (!obj) return E_OUTOFMEMORY; - obj->UnknownVtbl = &DirectMusicScript_Unknown_Vtbl; obj->IDirectMusicScript_iface.lpVtbl = &dmscript_vtbl; obj->ObjectVtbl = &DirectMusicScript_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicScript_PersistStream_Vtbl; @@ -733,7 +705,11 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->guidClass = CLSID_DirectMusicScript; - obj->ref = 0; /* will be inited by QueryInterface */ + obj->ref = 1; + + DMSCRIPT_LockModule(); + hr = IDirectMusicScript_QueryInterface(&obj->IDirectMusicScript_iface, lpcGUID, ppobj); + IDirectMusicScript_Release(&obj->IDirectMusicScript_iface); - return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

Michael Stefaniuc : dmscript: COM cleanup for IDirectMusicScript.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: aaecaf517427191977c0a37c057596c6a9bdfc85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaecaf517427191977c0a37c0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:03:06 2014 +0100 dmscript: COM cleanup for IDirectMusicScript. --- dlls/dmscript/dmscript_private.h | 2 +- dlls/dmscript/script.c | 57 ++++++++++++++++++++++---------------- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index c31164f..a7f2ba9 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -62,7 +62,7 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVO struct IDirectMusicScriptImpl { /* IUnknown fields */ const IUnknownVtbl *UnknownVtbl; - const IDirectMusicScriptVtbl *ScriptVtbl; + IDirectMusicScript IDirectMusicScript_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 149b7b7..3f25638 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -44,8 +44,8 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IUnknown_QueryInterface (LPUNKNOWN IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicScript)) { - *ppobj = &This->ScriptVtbl; - IDirectMusicScript_AddRef ((LPDIRECTMUSICSCRIPT)&This->ScriptVtbl); + *ppobj = &This->IDirectMusicScript_iface; + IDirectMusicScript_AddRef(&This->IDirectMusicScript_iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { *ppobj = &This->ObjectVtbl; @@ -97,30 +97,34 @@ static const IUnknownVtbl DirectMusicScript_Unknown_Vtbl = { IDirectMusicScriptImpl_IUnknown_Release }; -/* IDirectMusicScriptImpl IDirectMusicScript part: */ +static inline IDirectMusicScriptImpl *impl_from_IDirectMusicScript(IDirectMusicScript *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicScriptImpl, IDirectMusicScript_iface); +} + static HRESULT WINAPI IDirectMusicScriptImpl_QueryInterface(IDirectMusicScript *iface, REFIID riid, void **ppobj) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } static ULONG WINAPI IDirectMusicScriptImpl_AddRef(IDirectMusicScript *iface) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); return IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } static ULONG WINAPI IDirectMusicScriptImpl_Release(IDirectMusicScript *iface) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); return IDirectMusicScriptImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } static HRESULT WINAPI IDirectMusicScriptImpl_Init(IDirectMusicScript *iface, IDirectMusicPerformance *pPerformance, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %p, %p): stub\n", This, pPerformance, pErrorInfo); This->pPerformance = pPerformance; return S_OK; @@ -129,7 +133,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_Init(IDirectMusicScript *iface, static HRESULT WINAPI IDirectMusicScriptImpl_CallRoutine(IDirectMusicScript *iface, WCHAR *pwszRoutineName, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %s, %p): stub\n", This, debugstr_w(pwszRoutineName), pErrorInfo); /*return E_NOTIMPL;*/ return S_OK; @@ -139,7 +143,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_CallRoutine(IDirectMusicScript *ifa static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableVariant(IDirectMusicScript *iface, WCHAR *pwszVariableName, VARIANT varValue, BOOL fSetRef, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %s, FIXME, %d, %p): stub\n", This, debugstr_w(pwszVariableName),/* varValue,*/ fSetRef, pErrorInfo); return S_OK; } @@ -147,7 +151,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableVariant(IDirectMusicScri static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableVariant(IDirectMusicScript *iface, WCHAR *pwszVariableName, VARIANT *pvarValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), pvarValue, pErrorInfo); return S_OK; } @@ -155,7 +159,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableVariant(IDirectMusicScri static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableNumber(IDirectMusicScript *iface, WCHAR *pwszVariableName, LONG lValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %s, %i, %p): stub\n", This, debugstr_w(pwszVariableName), lValue, pErrorInfo); return S_OK; } @@ -163,7 +167,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableNumber(IDirectMusicScrip static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableNumber(IDirectMusicScript *iface, WCHAR *pwszVariableName, LONG *plValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), plValue, pErrorInfo); return S_OK; } @@ -171,7 +175,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableNumber(IDirectMusicScrip static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableObject(IDirectMusicScript *iface, WCHAR *pwszVariableName, IUnknown *punkValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), punkValue, pErrorInfo); return S_OK; } @@ -179,7 +183,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableObject(IDirectMusicScrip static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableObject(IDirectMusicScript *iface, WCHAR *pwszVariableName, REFIID riid, void **ppv, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %s, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), debugstr_dmguid(riid), ppv, pErrorInfo); return S_OK; } @@ -187,7 +191,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableObject(IDirectMusicScrip static HRESULT WINAPI IDirectMusicScriptImpl_EnumRoutine(IDirectMusicScript *iface, DWORD dwIndex, WCHAR *pwszName) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } @@ -195,12 +199,12 @@ static HRESULT WINAPI IDirectMusicScriptImpl_EnumRoutine(IDirectMusicScript *ifa static HRESULT WINAPI IDirectMusicScriptImpl_EnumVariable(IDirectMusicScript *iface, DWORD dwIndex, WCHAR *pwszName) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } -static const IDirectMusicScriptVtbl DirectMusicScript_Script_Vtbl = { +static const IDirectMusicScriptVtbl dmscript_vtbl = { IDirectMusicScriptImpl_QueryInterface, IDirectMusicScriptImpl_AddRef, IDirectMusicScriptImpl_Release, @@ -708,16 +712,21 @@ static const IPersistStreamVtbl DirectMusicScript_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { - IDirectMusicScriptImpl* obj; - +HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, IUnknown *pUnkOuter) +{ + IDirectMusicScriptImpl *obj; + + *ppobj = NULL; + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicScriptImpl)); - if (NULL == obj) { - *ppobj = NULL; + if (!obj) return E_OUTOFMEMORY; - } + obj->UnknownVtbl = &DirectMusicScript_Unknown_Vtbl; - obj->ScriptVtbl = &DirectMusicScript_Script_Vtbl; + obj->IDirectMusicScript_iface.lpVtbl = &dmscript_vtbl; obj->ObjectVtbl = &DirectMusicScript_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicScript_PersistStream_Vtbl; obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC));

1 0

Michael Stefaniuc : dmscript: Remove duplicate "IDirectMusicScript" from method names.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 75b2ce7716a81181040a3066c1e9331602276e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75b2ce7716a81181040a3066c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:01:03 2014 +0100 dmscript: Remove duplicate "IDirectMusicScript" from method names. --- dlls/dmscript/script.c | 76 +++++++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 26 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 80959cf..149b7b7 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -98,29 +98,37 @@ static const IUnknownVtbl DirectMusicScript_Unknown_Vtbl = { }; /* IDirectMusicScriptImpl IDirectMusicScript part: */ -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_QueryInterface (LPDIRECTMUSICSCRIPT iface, REFIID riid, LPVOID *ppobj) { +static HRESULT WINAPI IDirectMusicScriptImpl_QueryInterface(IDirectMusicScript *iface, REFIID riid, + void **ppobj) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } -static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicScript_AddRef (LPDIRECTMUSICSCRIPT iface) { +static ULONG WINAPI IDirectMusicScriptImpl_AddRef(IDirectMusicScript *iface) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); return IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } -static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicScript_Release (LPDIRECTMUSICSCRIPT iface) { +static ULONG WINAPI IDirectMusicScriptImpl_Release(IDirectMusicScript *iface) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); return IDirectMusicScriptImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_Init (LPDIRECTMUSICSCRIPT iface, IDirectMusicPerformance* pPerformance, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_Init(IDirectMusicScript *iface, + IDirectMusicPerformance *pPerformance, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %p, %p): stub\n", This, pPerformance, pErrorInfo); This->pPerformance = pPerformance; return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_CallRoutine (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszRoutineName, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_CallRoutine(IDirectMusicScript *iface, + WCHAR *pwszRoutineName, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %s, %p): stub\n", This, debugstr_w(pwszRoutineName), pErrorInfo); /*return E_NOTIMPL;*/ @@ -128,68 +136,84 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_CallRoutine (LPD /*return E_FAIL;*/ } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_SetVariableVariant (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, VARIANT varValue, BOOL fSetRef, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableVariant(IDirectMusicScript *iface, + WCHAR *pwszVariableName, VARIANT varValue, BOOL fSetRef, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %s, FIXME, %d, %p): stub\n", This, debugstr_w(pwszVariableName),/* varValue,*/ fSetRef, pErrorInfo); return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_GetVariableVariant (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, VARIANT* pvarValue, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableVariant(IDirectMusicScript *iface, + WCHAR *pwszVariableName, VARIANT *pvarValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), pvarValue, pErrorInfo); return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_SetVariableNumber (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, LONG lValue, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableNumber(IDirectMusicScript *iface, + WCHAR *pwszVariableName, LONG lValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %s, %i, %p): stub\n", This, debugstr_w(pwszVariableName), lValue, pErrorInfo); return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_GetVariableNumber (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, LONG* plValue, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableNumber(IDirectMusicScript *iface, + WCHAR *pwszVariableName, LONG *plValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), plValue, pErrorInfo); return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_SetVariableObject (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, IUnknown* punkValue, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableObject(IDirectMusicScript *iface, + WCHAR *pwszVariableName, IUnknown *punkValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), punkValue, pErrorInfo); return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_GetVariableObject (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, REFIID riid, LPVOID* ppv, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableObject(IDirectMusicScript *iface, + WCHAR *pwszVariableName, REFIID riid, void **ppv, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %s, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), debugstr_dmguid(riid), ppv, pErrorInfo); return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_EnumRoutine (LPDIRECTMUSICSCRIPT iface, DWORD dwIndex, WCHAR* pwszName) { +static HRESULT WINAPI IDirectMusicScriptImpl_EnumRoutine(IDirectMusicScript *iface, DWORD dwIndex, + WCHAR *pwszName) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_EnumVariable (LPDIRECTMUSICSCRIPT iface, DWORD dwIndex, WCHAR* pwszName) { +static HRESULT WINAPI IDirectMusicScriptImpl_EnumVariable(IDirectMusicScript *iface, DWORD dwIndex, + WCHAR *pwszName) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } static const IDirectMusicScriptVtbl DirectMusicScript_Script_Vtbl = { - IDirectMusicScriptImpl_IDirectMusicScript_QueryInterface, - IDirectMusicScriptImpl_IDirectMusicScript_AddRef, - IDirectMusicScriptImpl_IDirectMusicScript_Release, - IDirectMusicScriptImpl_IDirectMusicScript_Init, - IDirectMusicScriptImpl_IDirectMusicScript_CallRoutine, - IDirectMusicScriptImpl_IDirectMusicScript_SetVariableVariant, - IDirectMusicScriptImpl_IDirectMusicScript_GetVariableVariant, - IDirectMusicScriptImpl_IDirectMusicScript_SetVariableNumber, - IDirectMusicScriptImpl_IDirectMusicScript_GetVariableNumber, - IDirectMusicScriptImpl_IDirectMusicScript_SetVariableObject, - IDirectMusicScriptImpl_IDirectMusicScript_GetVariableObject, - IDirectMusicScriptImpl_IDirectMusicScript_EnumRoutine, - IDirectMusicScriptImpl_IDirectMusicScript_EnumVariable + IDirectMusicScriptImpl_QueryInterface, + IDirectMusicScriptImpl_AddRef, + IDirectMusicScriptImpl_Release, + IDirectMusicScriptImpl_Init, + IDirectMusicScriptImpl_CallRoutine, + IDirectMusicScriptImpl_SetVariableVariant, + IDirectMusicScriptImpl_GetVariableVariant, + IDirectMusicScriptImpl_SetVariableNumber, + IDirectMusicScriptImpl_GetVariableNumber, + IDirectMusicScriptImpl_SetVariableObject, + IDirectMusicScriptImpl_GetVariableObject, + IDirectMusicScriptImpl_EnumRoutine, + IDirectMusicScriptImpl_EnumVariable }; /* IDirectMusicScriptImpl IDirectMusicObject part: */

1 0

Michael Stefaniuc : dmscript: Don' t use the method implementations directly.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: f7dc10d2ce36ad84d8ce7f0fc3bb9d77d7d88a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7dc10d2ce36ad84d8ce7f0fc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 21:59:30 2014 +0100 dmscript: Don't use the method implementations directly. --- dlls/dmscript/script.c | 13 ++++--------- dlls/dmscript/scripttrack.c | 9 +++------ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 090e0ce..80959cf 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -31,11 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmscript); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -static ULONG WINAPI IDirectMusicScriptImpl_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicScript_AddRef (LPDIRECTMUSICSCRIPT iface); -static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface); -static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicScriptImpl implementation */ @@ -46,19 +41,19 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IUnknown_QueryInterface (LPUNKNOWN if (IsEqualIID (riid, &IID_IUnknown)) { *ppobj = &This->UnknownVtbl; - IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicScript)) { *ppobj = &This->ScriptVtbl; - IDirectMusicScriptImpl_IDirectMusicScript_AddRef ((LPDIRECTMUSICSCRIPT)&This->ScriptVtbl); + IDirectMusicScript_AddRef ((LPDIRECTMUSICSCRIPT)&This->ScriptVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { *ppobj = &This->ObjectVtbl; - IDirectMusicScriptImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); + IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { *ppobj = &This->PersistStreamVtbl; - IDirectMusicScriptImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); + IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; } diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 7ff8ef8..d17b7e1 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -24,9 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmscript); /***************************************************************************** * IDirectMusicScriptTrack implementation */ -static ULONG WINAPI IDirectMusicScriptTrack_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface); -static ULONG WINAPI IDirectMusicScriptTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface); /* IDirectMusicScriptTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { @@ -35,16 +32,16 @@ static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { *ppobj = &This->UnknownVtbl; - IDirectMusicScriptTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { *ppobj = (LPDIRECTMUSICTRACK8)&This->TrackVtbl; - IDirectMusicScriptTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl); + IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { *ppobj = &This->PersistStreamVtbl; - IDirectMusicScriptTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); + IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; }

1 0

Frédéric Delanoy : winedump: Remove an "#if 1" preprocessor directive.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 5d0adcfa1e2456589e1daf613e232860f28da177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0adcfa1e2456589e1daf613… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 11 13:53:26 2014 +0100 winedump: Remove an "#if 1" preprocessor directive. --- tools/winedump/pdb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 3513452..2899e77 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -132,7 +132,6 @@ static DWORD pdb_get_file_size(const struct pdb_reader* reader, unsigned idx) static void pdb_exit(struct pdb_reader* reader) { -#if 1 unsigned i; unsigned char* file; DWORD size; @@ -150,7 +149,7 @@ static void pdb_exit(struct pdb_reader* reader) dump_data(file, size, " "); free(file); } -#endif + if (reader->read_file == pdb_jg_read_file) { free((char*)reader->u.jg.root);

1 0

Dmitry Timoshkov : wuapi: Fix object constructors to match the changed prototype.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 1f99a11f5709ba769d425307a5bf6328a591b830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f99a11f5709ba769d425307a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Jan 11 13:07:19 2014 +0900 wuapi: Fix object constructors to match the changed prototype. --- dlls/wuapi/downloader.c | 5 +++-- dlls/wuapi/installer.c | 5 +++-- dlls/wuapi/searcher.c | 5 +++-- dlls/wuapi/systeminfo.c | 5 +++-- dlls/wuapi/updates.c | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/wuapi/downloader.c b/dlls/wuapi/downloader.c index 6bed32e..e17e155 100644 --- a/dlls/wuapi/downloader.c +++ b/dlls/wuapi/downloader.c @@ -29,6 +29,7 @@ #include "ole2.h" #include "initguid.h" #include "wuapi.h" +#include "wuapi_private.h" #include "wine/debug.h" @@ -248,11 +249,11 @@ static const struct IUpdateDownloaderVtbl update_downloader_vtbl = update_downloader_EndDownload }; -HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT UpdateDownloader_create( LPVOID *ppObj ) { update_downloader *downloader; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); downloader = HeapAlloc( GetProcessHeap(), 0, sizeof(*downloader) ); if (!downloader) return E_OUTOFMEMORY; diff --git a/dlls/wuapi/installer.c b/dlls/wuapi/installer.c index f60d618..46c8699 100644 --- a/dlls/wuapi/installer.c +++ b/dlls/wuapi/installer.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "ole2.h" #include "wuapi.h" +#include "wuapi_private.h" #include "wine/debug.h" @@ -342,11 +343,11 @@ static const struct IUpdateInstallerVtbl update_installer_vtbl = update_installer_get_RebootRequiredBeforeInstallation }; -HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT UpdateInstaller_create( LPVOID *ppObj ) { update_installer *installer; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); installer = HeapAlloc( GetProcessHeap(), 0, sizeof(*installer) ); if (!installer) return E_OUTOFMEMORY; diff --git a/dlls/wuapi/searcher.c b/dlls/wuapi/searcher.c index 522f99a..1ca8020 100644 --- a/dlls/wuapi/searcher.c +++ b/dlls/wuapi/searcher.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "ole2.h" #include "wuapi.h" +#include "wuapi_private.h" #include "wine/debug.h" @@ -314,11 +315,11 @@ static const struct IUpdateSearcherVtbl update_searcher_vtbl = update_searcher_put_ServiceID }; -HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT UpdateSearcher_create( LPVOID *ppObj ) { update_searcher *searcher; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); searcher = HeapAlloc( GetProcessHeap(), 0, sizeof(*searcher) ); if (!searcher) return E_OUTOFMEMORY; diff --git a/dlls/wuapi/systeminfo.c b/dlls/wuapi/systeminfo.c index f3f635f..7c62bed 100644 --- a/dlls/wuapi/systeminfo.c +++ b/dlls/wuapi/systeminfo.c @@ -29,6 +29,7 @@ #include "winuser.h" #include "ole2.h" #include "wuapi.h" +#include "wuapi_private.h" #include "wine/debug.h" @@ -143,11 +144,11 @@ static const struct ISystemInformationVtbl systeminfo_vtbl = systeminfo_get_RebootRequired }; -HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT SystemInformation_create(LPVOID *ppObj) { systeminfo *info; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); info = HeapAlloc(GetProcessHeap(), 0, sizeof(*info)); if (!info) diff --git a/dlls/wuapi/updates.c b/dlls/wuapi/updates.c index d099fb4..4f6648c 100644 --- a/dlls/wuapi/updates.c +++ b/dlls/wuapi/updates.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "ole2.h" #include "wuapi.h" +#include "wuapi_private.h" #include "wine/debug.h" @@ -202,11 +203,11 @@ static const struct IAutomaticUpdatesVtbl automatic_updates_vtbl = automatic_updates_EnableService }; -HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT AutomaticUpdates_create( LPVOID *ppObj ) { automatic_updates *updates; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); updates = HeapAlloc( GetProcessHeap(), 0, sizeof(*updates) ); if (!updates) return E_OUTOFMEMORY;

1 0

Andrey Gusev : Ukrainian translation for release 1.6.2
by Jeremy Newman Jan. 13, 2014

Jan. 13, 2014

Module: website Branch: master Commit: 33ba68dd46374458733f23bc0ff9fda6c4c7e4a1 URL: http://source.winehq.org/git/website.git/?a=commit;h=33ba68dd46374458733f23… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 10 23:21:25 2014 +0200 Ukrainian translation for release 1.6.2 --- news/uk/2014011001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/uk/2014011001.xml b/news/uk/2014011001.xml new file mode 100644 index 0000000..a424f7a --- /dev/null +++ b/news/uk/2014011001.xml @@ -0,0 +1,13 @@ +<news> +<date>10 січня 2014</date> +<title>Випущено Wine 1.6.2</title> +<body> + Технічний реліз Wine 1.6.2 наразі доступний. + <a href="{$root}/announce/1.6.2">Що нового</a> в цьому релізі: +<ul> + <li>Підтримку управління кольором liblcms оновлено до 2-ої версії.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.2.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

刘涛 : website: Simplified Chinese translation for 1.7.10 release
by Jeremy Newman Jan. 13, 2014

Jan. 13, 2014

Module: website Branch: master Commit: e3a770878fe18645ea83295586b813a311936ac4 URL: http://source.winehq.org/git/website.git/?a=commit;h=e3a770878fe18645ea8329… Author: 刘涛 <wendaotao(a)163.com> Date: Mon Jan 13 09:33:21 2014 +0800 website: Simplified Chinese translation for 1.7.10 release --- news/zh-cn/2014010301.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/zh-cn/2014010301.xml b/news/zh-cn/2014010301.xml new file mode 100644 index 0000000..85b35fd --- /dev/null +++ b/news/zh-cn/2014010301.xml @@ -0,0 +1,17 @@ +<news> +<date>一月 3, 2014</date> +<title>Wine 1.7.10 发布</title> +<body> + Wine 开发版 1.7.10 现在可以使用了。 + 本次<a href="{$root}/announce/1.7.10">更新</a> : +<ul> + <li>在 Mac 后端驱动中，使窗口最大化。</li> + <li>实现了 AVI 压缩器。</li> + <li>在动态装载的库中支持线程本地存储（TLS）。</li> + <li>开始实现一个任务调度器。</li> + <li>支持扩展的 IPX 协议。</li> + <li>各种 bug 的修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.7.10.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.6.2
by Jeremy Newman Jan. 13, 2014

Jan. 13, 2014

Module: website Branch: master Commit: 4b60b154892ae8e5b61e458a65f9c096b9d9aedd URL: http://source.winehq.org/git/website.git/?a=commit;h=4b60b154892ae8e5b61e45… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 11 13:35:55 2014 +0100 French translation for release 1.6.2 --- news/fr/2014011001.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/fr/2014011001.xml b/news/fr/2014011001.xml new file mode 100644 index 0000000..53551ee --- /dev/null +++ b/news/fr/2014011001.xml @@ -0,0 +1,12 @@ +<news> +<date>10 janvier 2014</date> +<title>Sortie de Wine 1.6.2</title> +<body> + La version de maintenance 1.6.2 de Wine est disponible. + <a href="{$root}/announce/1.6.2">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de la gestion de couleurs mise à jour vers liblcms version 2.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.2.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.6.2 freigegeben
by Jeremy Newman Jan. 13, 2014

Jan. 13, 2014

Module: website Branch: master Commit: c3378ebc0f7a4ddf8e38c93254ced7d9ee387085 URL: http://source.winehq.org/git/website.git/?a=commit;h=c3378ebc0f7a4ddf8e38c9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 12 15:07:08 2014 +0100 Wine 1.6.2 freigegeben --- news/de/2014011001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2014011001.xml b/news/de/2014011001.xml new file mode 100644 index 0000000..e8689fb --- /dev/null +++ b/news/de/2014011001.xml @@ -0,0 +1,13 @@ +<news> +<date>10. Januar 2014</date> +<title>Wine 1.6.2 freigegeben</title> +<body> + Die Wartungsversion 1.6.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.6.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung des Farbmanagements auf liblcms Version 2 aktualisiert.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.2.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexander Nicolaysen Sørnes : url: Prevent use of uninitialized variable
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: e5f5749c737cb2802c0f0c6bedcb6d3bf4f99d99 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e5f5749c737cb2802c0f0c6b… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 18:48:28 2014 +0100 url: Prevent use of uninitialized variable --- include/url.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/url.php b/include/url.php index 9f0e3fc..539586a 100644 --- a/include/url.php +++ b/include/url.php @@ -281,7 +281,7 @@ class Url { else $hResult = appData::getData($oApp->iAppId, "url", FALSE); - $sReturn .= html_frame_start("URLs", "90%", "", 0); + $sReturn = html_frame_start("URLs", "90%", "", 0); $sReturn .= "<form method=\"post\" action=\"$sFormAction\">\n"; $sReturn .= html_table_begin("border=0 cellpadding=5 cellspacing=0 width=100%"); $sReturn .= html_tr(array(

1 0

Alexander Nicolaysen Sørnes : editAppFamily: Don't call url functions statically
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 4c87dbe7c4367342b6baff1834bfa52ca95b5c0e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4c87dbe7c4367342b6baff18… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 18:48:16 2014 +0100 editAppFamily: Don't call url functions statically --- admin/editAppFamily.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/admin/editAppFamily.php b/admin/editAppFamily.php index 1908692..6531fb4 100644 --- a/admin/editAppFamily.php +++ b/admin/editAppFamily.php @@ -15,10 +15,12 @@ if(!is_numeric($aClean['iAppId'])) if(!($_SESSION['current']->hasPriv("admin") || $_SESSION['current']->isSuperMaintainer($aClean['iAppId']))) util_show_error_page_and_exit("Insufficient Privileges!"); +$oUrl = new Url(); + if(!empty($aClean['sSubmit'])) { process_app_version_changes(false); - url::processForm($aClean); + $oUrl->ProcessForm($aClean); $oApp = new application($aClean['iAppId']); util_redirect_and_exit($oApp->objectMakeUrl()); } @@ -51,7 +53,7 @@ else echo ""; // URL editor - echo url::outputEditor("editAppFamily.php", NULL, $oApp); + echo $oUrl->outputEditor("editAppFamily.php", NULL, $oApp); echo html_back_link(1,$oApp->objectMakeUrl()); }

1 0

Alexander Nicolaysen Sørnes : version: make makeLincenceList non-static
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 93bd9dc9c8dc389a541bffa9e2590a5c51ce6c02 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=93bd9dc9c8dc389a541bffa9… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 18:47:38 2014 +0100 version: make makeLincenceList non-static --- include/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/version.php b/include/version.php index 7f5d7db..6e4d890 100644 --- a/include/version.php +++ b/include/version.php @@ -1408,7 +1408,7 @@ class version { } // returns a string containing the html for a selection list - public static function makeLicenseList($sLicense = NULL) + public function makeLicenseList($sLicense = NULL) { if(!$sLicense) $sLicense = $this->sLicense;

1 0

Alexander Nicolaysen Sørnes : xinha: Remove unused files
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: b8b3834b4a671582546d661060ebe5f002f6c9dd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b8b3834b4a671582546d6610… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 18:30:00 2014 +0100 xinha: Remove unused files --- README.xinha_customizations | 29 + xinha/contrib/.htaccess | 11 - xinha/contrib/compress.bat | 7 - xinha/contrib/compress.php | 99 --- xinha/contrib/compress_yui.php | 107 --- xinha/contrib/dojo_js_compressor.jar | Bin 817536 -> 0 bytes xinha/contrib/lc_merge_strings.php | 178 ----- xinha/contrib/lc_parse_strings.php | 325 -------- xinha/contrib/php-xinha.php | 219 ------ xinha/contrib/test_server.py | 61 -- xinha/contrib/yuicompressor-2.4.2.jar | Bin 851219 -> 0 bytes xinha/plugins/CSS/CSS.js | 2 - xinha/plugins/CSSPicker/CSSPicker.js | 2 - xinha/plugins/DefinitionList/DefinitionList.js | 91 --- xinha/plugins/DefinitionList/definition-list.css | 15 - xinha/plugins/DefinitionList/img/ed_dd.gif | Bin 138 -> 0 bytes xinha/plugins/DefinitionList/img/ed_dl.gif | Bin 136 -> 0 bytes xinha/plugins/DefinitionList/img/ed_dt.gif | Bin 149 -> 0 bytes xinha/plugins/DefinitionList/lang/ja.js | 7 - xinha/plugins/DefinitionList/lang/nl.js | 8 - xinha/plugins/DefinitionList/lang/pt_br.js | 20 - xinha/plugins/DoubleClick/DoubleClick.js | 66 -- xinha/plugins/Forms/Forms.js | 2 - xinha/plugins/Forms/forms.css | 3 - xinha/plugins/Forms/img/ed_button.gif | Bin 89 -> 0 bytes xinha/plugins/Forms/img/ed_checkbox.gif | Bin 102 -> 0 bytes xinha/plugins/Forms/img/ed_fieldset.gif | Bin 76 -> 0 bytes xinha/plugins/Forms/img/ed_file.gif | Bin 130 -> 0 bytes xinha/plugins/Forms/img/ed_form.gif | Bin 114 -> 0 bytes xinha/plugins/Forms/img/ed_hidden.gif | Bin 83 -> 0 bytes xinha/plugins/Forms/img/ed_image.gif | Bin 562 -> 0 bytes xinha/plugins/Forms/img/ed_label.gif | Bin 58 -> 0 bytes xinha/plugins/Forms/img/ed_password.gif | Bin 111 -> 0 bytes xinha/plugins/Forms/img/ed_radio.gif | Bin 104 -> 0 bytes xinha/plugins/Forms/img/ed_reset.gif | Bin 97 -> 0 bytes xinha/plugins/Forms/img/ed_select.gif | Bin 111 -> 0 bytes xinha/plugins/Forms/img/ed_submit.gif | Bin 94 -> 0 bytes xinha/plugins/Forms/img/ed_text.gif | Bin 112 -> 0 bytes xinha/plugins/Forms/img/ed_textarea.gif | Bin 115 -> 0 bytes xinha/plugins/Forms/lang/ja.js | 86 -- xinha/plugins/Forms/lang/nl.js | 87 -- xinha/plugins/Forms/lang/pt_br.js | 83 -- xinha/plugins/Forms/popups/fieldset.html | 45 -- xinha/plugins/Forms/popups/form.html | 89 --- xinha/plugins/Forms/popups/input.html | 179 ----- xinha/plugins/Forms/popups/label.html | 58 -- xinha/plugins/Forms/popups/select.html | 208 ----- xinha/plugins/Forms/popups/textarea.html | 112 --- xinha/plugins/GetHtml/GetHtml.js | 17 - xinha/plugins/HorizontalRule/HorizontalRule.js | 2 - xinha/plugins/HorizontalRule/lang/de.js | 21 - xinha/plugins/HorizontalRule/lang/fr.js | 20 - xinha/plugins/HorizontalRule/lang/ja.js | 21 - xinha/plugins/HorizontalRule/lang/nb.js | 21 - xinha/plugins/HorizontalRule/lang/nl.js | 21 - xinha/plugins/HorizontalRule/lang/pt_br.js | 34 - .../popups/edit_horizontal_rule.html | 141 ---- xinha/plugins/HtmlEntities/Entities.js | 204 ----- xinha/plugins/HtmlEntities/HtmlEntities.js | 51 -- xinha/plugins/HtmlEntities/iso-8859-1.js | 109 --- xinha/plugins/InsertAnchor/InsertAnchor.js | 2 - xinha/plugins/InsertAnchor/dialog.html | 14 - xinha/plugins/InsertAnchor/img/insert-anchor.gif | Bin 370 -> 0 bytes xinha/plugins/InsertAnchor/img/placeholder.gif | Bin 834 -> 0 bytes xinha/plugins/InsertAnchor/insert-anchor.css | 8 - xinha/plugins/InsertAnchor/lang/de.js | 8 - xinha/plugins/InsertAnchor/lang/fr.js | 7 - xinha/plugins/InsertAnchor/lang/ja.js | 7 - xinha/plugins/InsertAnchor/lang/nb.js | 7 - xinha/plugins/InsertAnchor/lang/nl.js | 8 - xinha/plugins/InsertAnchor/lang/pl.js | 8 - xinha/plugins/InsertAnchor/lang/pt_br.js | 22 - .../plugins/InsertAnchor/popups/insert_anchor.html | 59 -- xinha/plugins/InsertNote/InsertNote.js | 2 - xinha/plugins/InsertNote/dialog.html | 12 - xinha/plugins/InsertNote/img/insert-note.gif | Bin 627 -> 0 bytes xinha/plugins/InsertPagebreak/InsertPagebreak.js | 43 - xinha/plugins/InsertPagebreak/img/pagebreak.gif | Bin 105 -> 0 bytes xinha/plugins/InsertPagebreak/lang/de.js | 6 - xinha/plugins/InsertPagebreak/lang/fr.js | 5 - xinha/plugins/InsertPagebreak/lang/ja.js | 5 - xinha/plugins/InsertPagebreak/lang/nb.js | 6 - xinha/plugins/InsertPagebreak/lang/nl.js | 6 - xinha/plugins/InsertPagebreak/lang/pt_br.js | 18 - xinha/plugins/InsertSnippet/InsertSnippet.css | 93 --- xinha/plugins/InsertSnippet/InsertSnippet.js | 92 --- xinha/plugins/InsertSnippet/demosnippets.js | 15 - xinha/plugins/InsertSnippet/img/ed_snippet.gif | Bin 606 -> 0 bytes xinha/plugins/InsertSnippet/lang/de.js | 10 - xinha/plugins/InsertSnippet/lang/ja.js | 10 - xinha/plugins/InsertSnippet/lang/nb.js | 11 - xinha/plugins/InsertSnippet/lang/nl.js | 11 - xinha/plugins/InsertSnippet/lang/pt_br.js | 25 - .../InsertSnippet/popups/insertsnippet.html | 133 ---- xinha/plugins/InsertSnippet/readme.html | 57 -- xinha/plugins/InsertSnippet/snippets.html | 29 - xinha/plugins/InsertSnippet/snippets.php | 22 - xinha/plugins/InsertSnippet2/InsertSnippet.css | 92 --- xinha/plugins/InsertSnippet2/InsertSnippet2.js | 2 - xinha/plugins/InsertSnippet2/dialog.html | 20 - xinha/plugins/InsertSnippet2/img/1.PNG | Bin 267 -> 0 bytes xinha/plugins/InsertSnippet2/img/10.PNG | Bin 258 -> 0 bytes xinha/plugins/InsertSnippet2/img/11.PNG | Bin 294 -> 0 bytes xinha/plugins/InsertSnippet2/img/12.PNG | Bin 260 -> 0 bytes xinha/plugins/InsertSnippet2/img/13.PNG | Bin 263 -> 0 bytes xinha/plugins/InsertSnippet2/img/14.PNG | Bin 272 -> 0 bytes xinha/plugins/InsertSnippet2/img/15.PNG | Bin 261 -> 0 bytes xinha/plugins/InsertSnippet2/img/16.PNG | Bin 257 -> 0 bytes xinha/plugins/InsertSnippet2/img/2.PNG | Bin 255 -> 0 bytes xinha/plugins/InsertSnippet2/img/3.PNG | Bin 272 -> 0 bytes xinha/plugins/InsertSnippet2/img/4.PNG | Bin 265 -> 0 bytes xinha/plugins/InsertSnippet2/img/5.PNG | Bin 261 -> 0 bytes xinha/plugins/InsertSnippet2/img/6.PNG | Bin 275 -> 0 bytes xinha/plugins/InsertSnippet2/img/7.PNG | Bin 262 -> 0 bytes xinha/plugins/InsertSnippet2/img/8.PNG | Bin 282 -> 0 bytes xinha/plugins/InsertSnippet2/img/9.PNG | Bin 268 -> 0 bytes xinha/plugins/InsertSnippet2/img/ed_snippet.gif | Bin 606 -> 0 bytes xinha/plugins/InsertSnippet2/lang/de.js | 12 - xinha/plugins/InsertSnippet2/readme.html | 51 -- xinha/plugins/InsertSnippet2/snippets.php | 37 - xinha/plugins/InsertSnippet2/snippets.xml | 42 - xinha/plugins/Linker/Linker.js | 2 - xinha/plugins/Linker/dTree/api.html | 252 ------ xinha/plugins/Linker/dTree/dtree.css | 41 - xinha/plugins/Linker/dTree/dtree.js | 2 - xinha/plugins/Linker/dTree/example01.html | 53 -- xinha/plugins/Linker/dTree/img/base.gif | Bin 1018 -> 0 bytes xinha/plugins/Linker/dTree/img/cd.gif | Bin 228 -> 0 bytes xinha/plugins/Linker/dTree/img/copy.gif | Bin 641 -> 0 bytes xinha/plugins/Linker/dTree/img/empty.gif | Bin 62 -> 0 bytes xinha/plugins/Linker/dTree/img/folder.gif | Bin 355 -> 0 bytes xinha/plugins/Linker/dTree/img/folderopen.gif | Bin 365 -> 0 bytes xinha/plugins/Linker/dTree/img/globe.gif | Bin 1080 -> 0 bytes xinha/plugins/Linker/dTree/img/imgfolder.gif | Bin 609 -> 0 bytes xinha/plugins/Linker/dTree/img/join.gif | Bin 62 -> 0 bytes xinha/plugins/Linker/dTree/img/joinbottom.gif | Bin 55 -> 0 bytes xinha/plugins/Linker/dTree/img/line.gif | Bin 46 -> 0 bytes xinha/plugins/Linker/dTree/img/minus.gif | Bin 82 -> 0 bytes xinha/plugins/Linker/dTree/img/minusbottom.gif | Bin 76 -> 0 bytes xinha/plugins/Linker/dTree/img/move.gif | Bin 653 -> 0 bytes xinha/plugins/Linker/dTree/img/musicfolder.gif | Bin 626 -> 0 bytes xinha/plugins/Linker/dTree/img/nolines_minus.gif | Bin 64 -> 0 bytes xinha/plugins/Linker/dTree/img/nolines_plus.gif | Bin 67 -> 0 bytes xinha/plugins/Linker/dTree/img/offline.gif | Bin 1001 -> 0 bytes xinha/plugins/Linker/dTree/img/offline.png | Bin 922 -> 0 bytes xinha/plugins/Linker/dTree/img/page.gif | Bin 556 -> 0 bytes xinha/plugins/Linker/dTree/img/plus.gif | Bin 86 -> 0 bytes xinha/plugins/Linker/dTree/img/plusbottom.gif | Bin 82 -> 0 bytes xinha/plugins/Linker/dTree/img/question.gif | Bin 1034 -> 0 bytes xinha/plugins/Linker/dTree/img/trash.gif | Bin 1036 -> 0 bytes xinha/plugins/Linker/dialog.html | 103 --- xinha/plugins/Linker/lang/de.js | 19 - xinha/plugins/Linker/lang/fr.js | 18 - xinha/plugins/Linker/lang/ja.js | 24 - xinha/plugins/Linker/lang/nb.js | 7 - xinha/plugins/Linker/lang/nl.js | 7 - xinha/plugins/Linker/lang/pl.js | 19 - xinha/plugins/Linker/lang/pt_br.js | 43 - xinha/plugins/Linker/link-picker.js | 2 - xinha/plugins/Linker/pluginMethods.js | 2 - xinha/plugins/Linker/scan.php | 114 --- xinha/plugins/PSFixed/PSFixed.js | 2 - xinha/plugins/PSLocal/PSLocal.js | 2 - xinha/plugins/PSLocal/dialog.html | 6 - xinha/plugins/PSLocal/gears_init.js | 2 - xinha/plugins/PSServer/PSServer.js | 2 - xinha/plugins/PSServer/backend.php | 830 -------------------- xinha/plugins/PSServer/config.inc.php | 194 ----- xinha/plugins/PSServer/demo_images/.htaccess | 2 - xinha/plugins/PSServer/demo_images/bikerpeep.jpg | Bin 27684 -> 0 bytes xinha/plugins/PSServer/demo_images/linux/linux.gif | Bin 11803 -> 0 bytes xinha/plugins/PSServer/demo_images/wesnoth078.jpg | Bin 8460 -> 0 bytes xinha/plugins/PasteText/PasteText.js | 2 - xinha/plugins/PasteText/img/ed_paste_text.gif | Bin 381 -> 0 bytes xinha/plugins/PasteText/lang/de.js | 6 - xinha/plugins/PasteText/lang/fr.js | 5 - xinha/plugins/PasteText/lang/ja.js | 5 - xinha/plugins/PasteText/lang/nb.js | 6 - xinha/plugins/PasteText/lang/nl.js | 6 - xinha/plugins/PasteText/lang/pl.js | 6 - xinha/plugins/PasteText/lang/pt_br.js | 21 - xinha/plugins/PasteText/lang/ru.js | 5 - xinha/plugins/PasteText/popups/paste_text.html | 9 - .../plugins/PersistentStorage/PersistentStorage.js | 2 - xinha/plugins/PersistentStorage/dialog.html | 126 --- xinha/plugins/PreserveScripts/PreserveScripts.js | 68 -- xinha/plugins/PreserveScripts/js.png | Bin 730 -> 0 bytes xinha/plugins/PreserveScripts/php.png | Bin 698 -> 0 bytes xinha/plugins/PreserveScripts/php.svg | 152 ---- xinha/plugins/QuickTag/QuickTag.js | 53 -- xinha/plugins/QuickTag/img/ed_quicktag.gif | Bin 82 -> 0 bytes xinha/plugins/QuickTag/lang/de.js | 16 - xinha/plugins/QuickTag/lang/fr.js | 16 - xinha/plugins/QuickTag/lang/ja.js | 16 - xinha/plugins/QuickTag/lang/nb.js | 17 - xinha/plugins/QuickTag/lang/nl.js | 17 - xinha/plugins/QuickTag/lang/pl.js | 17 - xinha/plugins/QuickTag/lang/pt_br.js | 30 - xinha/plugins/QuickTag/popups/quicktag.html | 354 --------- xinha/plugins/QuickTag/tag-lib.js | 2 - xinha/plugins/SaveOnBlur/SaveOnBlur.js | 47 -- xinha/plugins/SaveSubmit/README.txt | 15 - xinha/plugins/SaveSubmit/SaveSubmit.js | 2 - xinha/plugins/SaveSubmit/img/ed_save_green.gif | Bin 208 -> 0 bytes xinha/plugins/SaveSubmit/img/ed_save_red.gif | Bin 207 -> 0 bytes xinha/plugins/SaveSubmit/lang/de.js | 8 - xinha/plugins/SaveSubmit/lang/fr.js | 8 - xinha/plugins/SaveSubmit/lang/ja.js | 8 - xinha/plugins/SaveSubmit/lang/nl.js | 9 - xinha/plugins/SaveSubmit/lang/pt_br.js | 21 - xinha/plugins/SaveSubmit/lang/ru.js | 9 - xinha/plugins/SetId/SetId.js | 88 --- xinha/plugins/SetId/img/placeholder.gif | Bin 834 -> 0 bytes xinha/plugins/SetId/img/set-id.gif | Bin 370 -> 0 bytes xinha/plugins/SetId/lang/de.js | 8 - xinha/plugins/SetId/lang/ja.js | 9 - xinha/plugins/SetId/lang/nb.js | 8 - xinha/plugins/SetId/lang/nl.js | 10 - xinha/plugins/SetId/lang/pt_br.js | 25 - xinha/plugins/SetId/popups/set_id.html | 58 -- xinha/plugins/SetId/set-id.css | 7 - xinha/plugins/SmartReplace/SmartReplace.js | 2 - xinha/plugins/SmartReplace/dialog.html | 16 - xinha/plugins/SmartReplace/img/SmartReplace.svg | 231 ------ xinha/plugins/SmartReplace/img/smartquotes.png | Bin 999 -> 0 bytes xinha/plugins/SmartReplace/lang/de.js | 19 - xinha/plugins/SmartReplace/lang/fr.js | 13 - xinha/plugins/SmartReplace/lang/ja.js | 19 - xinha/plugins/SmartReplace/lang/nl.js | 20 - xinha/plugins/SmartReplace/lang/pt_br.js | 24 - xinha/plugins/SmartReplace/readme.txt | 15 - xinha/plugins/UnFormat/UnFormat.js | 107 --- xinha/plugins/UnFormat/dialog.html | 28 - xinha/plugins/UnFormat/img/unformat.gif | Bin 136 -> 0 bytes xinha/plugins/UnFormat/lang/de.js | 12 - xinha/plugins/UnFormat/lang/fr.js | 12 - xinha/plugins/UnFormat/lang/ja.js | 12 - xinha/plugins/UnFormat/lang/nb.js | 13 - xinha/plugins/UnFormat/lang/nl.js | 12 - xinha/plugins/UnFormat/lang/pt_br.js | 27 - xinha/plugins/UnsavedChanges/UnsavedChanges.js | 55 -- xinha/plugins/UnsavedChanges/lang/es.js | 5 - xinha/plugins/UnsavedChanges/lang/fr.js | 5 - xinha/plugins/UnsavedChanges/lang/fr_ca.js | 5 - xinha/plugins/WysiwygWrap/WysiwygWrap.js | 101 --- 245 files changed, 29 insertions(+), 7647 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=b8b3834b4a671582546d…

1 0

Alexander Nicolaysen Sørnes : help: Replace ereg with preg_match
by Alexander Nicolaysen Sørnes Jan. 12, 2014

Jan. 12, 2014

Module: appdb Branch: master Commit: 8b0a6b6198ba673d1e468cb9aecfe51ec92f9fe7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8b0a6b6198ba673d1e468cb9… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Jan 12 17:52:28 2014 +0100 help: Replace ereg with preg_match --- help/index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/help/index.php b/help/index.php index f366671..ded67c0 100644 --- a/help/index.php +++ b/help/index.php @@ -42,10 +42,10 @@ function display_index () // display dir while (list($key,$file) = each($files)) { - if(!ereg("(.+)\\.help$", $file, $arr)) + if(!preg_match("(([^.]+).help)", $file, $aMatches)) continue; - $id = $arr[1]; + $id = $aMatches[1]; $title = get_help_title("$help_path/$file"); echo " <li> <a href=\"".BASE."help?sTopic=$id\" style=\"cursor: help\"> $title </a></li>\n"; @@ -95,9 +95,9 @@ function get_help_title ($file) $line = trim($line); - if(eregi("^$", $line, $arr)) + if(preg_match("/^$/i", $line, $aMatches)) { - return $arr[1]; + return $aMatches[1]; } return "Internal Error: missing title"; }

1 0