wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Maarten Lankhorst : quartz: Fix a race condition in videorenderer endflush.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 351165e30dd5afc67a9fa53cdd5aac9b07a1a910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=351165e30dd5afc67a9fa53cd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 10 16:06:56 2010 +0100 quartz: Fix a race condition in videorenderer endflush. --- dlls/quartz/videorenderer.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 6f2a860..86b9f2a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -432,6 +432,7 @@ static HRESULT WINAPI VideoRenderer_Receive(BaseInputPin* pin, IMediaSample * pS LeaveCriticalSection(&This->filter.csFilter); WaitForSingleObject(This->blocked, INFINITE); EnterCriticalSection(&This->filter.csFilter); + SetEvent(This->hEvent); This->sample_held = NULL; if (This->filter.state == State_Paused) { @@ -959,6 +960,15 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndFlush(IPin * iface) TRACE("(%p/%p)->()\n", This, iface); EnterCriticalSection(This->pin.pCritSec); + + if (pVideoRenderer->sample_held) { + SetEvent(pVideoRenderer->blocked); + ResetEvent(pVideoRenderer->hEvent); + LeaveCriticalSection(This->pin.pCritSec); + WaitForSingleObject(pVideoRenderer->hEvent, INFINITE); + EnterCriticalSection(This->pin.pCritSec); + ResetEvent(pVideoRenderer->blocked); + } if (pVideoRenderer->filter.state == State_Paused) { ResetEvent(pVideoRenderer->blocked); ResetEvent(pVideoRenderer->hEvent);

1 0

Maarten Lankhorst : quartz: Handle seeking while running better.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: b353f32453da4bfe6aaccbb9effef48e7ae679ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b353f32453da4bfe6aaccbb9e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 10 16:06:55 2010 +0100 quartz: Handle seeking while running better. --- dlls/quartz/filtergraph.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 50a045e..05b6e47 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2471,17 +2471,18 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, else if ((dwStopFlags & 0x7) != AM_SEEKING_NoPositioning) FIXME("Stop position not handled yet!\n"); + if (state == State_Running && !(dwCurrentFlags & AM_SEEKING_NoFlush)) + IMediaControl_Pause((IMediaControl*)&This->IMediaControl_vtbl); args.current = pCurrent; args.stop = pStop; args.curflags = dwCurrentFlags; args.stopflags = dwStopFlags; hr = all_renderers_seek(This, found_setposition, (DWORD_PTR)&args); - if ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) { - if (This->state == State_Running) - FIXME("Seeking while graph is running is not properly supported!\n"); + if ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) This->pause_time = This->start_time = -1; - } + if (state == State_Running && !(dwCurrentFlags & AM_SEEKING_NoFlush)) + IMediaControl_Run((IMediaControl*)&This->IMediaControl_vtbl); LeaveCriticalSection(&This->cs); return hr;

1 0

Alexandre Julliard : user32: Don' t call GetModuleFileNameW under the user lock.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 2c63cf58eaeec9495c8aa174d62fe1c31aad3e74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c63cf58eaeec9495c8aa174d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 14 13:49:14 2010 +0100 user32: Don't call GetModuleFileNameW under the user lock. --- dlls/user32/cursoricon.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index eeaae7a..356dbd8 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1682,6 +1682,7 @@ BOOL WINAPI GetIconInfoExA( HICON icon, ICONINFOEXA *info ) BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) { struct cursoricon_object *ptr; + HMODULE module; BOOL ret = TRUE; if (info->cbSize != sizeof(*info)) @@ -1707,7 +1708,6 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) info->szResName[0] = 0; if (ptr->module) { - GetModuleFileNameW( ptr->module, info->szModName, MAX_PATH ); if (IS_INTRESOURCE( ptr->resname )) info->wResID = LOWORD( ptr->resname ); else lstrcpynW( info->szResName, ptr->resname, MAX_PATH ); } @@ -1717,7 +1717,9 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) DeleteObject( info->hbmColor ); ret = FALSE; } + module = ptr->module; release_icon_ptr( icon, ptr ); + if (ret && module) GetModuleFileNameW( module, info->szModName, MAX_PATH ); return ret; }

1 0

Michael Stefaniuc : oleaut32/tests: Use an iface instead of an vtbl pointer in IRecordInfoImpl.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 6c94cdc90345dfa000fb59ce61a1b053dd404867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c94cdc90345dfa000fb59ce6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 14 12:02:45 2010 +0100 oleaut32/tests: Use an iface instead of an vtbl pointer in IRecordInfoImpl. --- dlls/oleaut32/tests/safearray.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 29e8761..7c16ef7 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -25,6 +25,7 @@ #include <float.h> #define COBJMACROS +#define CONST_VTABLE #include "wine/test.h" #include "windef.h" #include "winbase.h" @@ -76,7 +77,7 @@ static BOOL HAVE_OLEAUT32_INT_PTR; */ typedef struct IRecordInfoImpl { - const IRecordInfoVtbl *lpvtbl; + IRecordInfo IRecordInfo_iface; LONG ref; DWORD sizeCalled; DWORD clearCalled; @@ -84,12 +85,17 @@ typedef struct IRecordInfoImpl static const IRecordInfoVtbl IRecordInfoImpl_VTable; +static inline IRecordInfoImpl *impl_from_IRecordInfo(IRecordInfo *iface) +{ + return CONTAINING_RECORD(iface, IRecordInfoImpl, IRecordInfo_iface); +} + static IRecordInfoImpl *IRecordInfoImpl_Construct(void) { IRecordInfoImpl *rec; rec = HeapAlloc(GetProcessHeap(), 0, sizeof(IRecordInfoImpl)); - rec->lpvtbl = &IRecordInfoImpl_VTable; + rec->IRecordInfo_iface.lpVtbl = &IRecordInfoImpl_VTable; rec->ref = START_REF_COUNT; rec->clearCalled = 0; rec->sizeCalled = 0; @@ -98,13 +104,13 @@ static IRecordInfoImpl *IRecordInfoImpl_Construct(void) static ULONG CALLBACK IRecordInfoImpl_AddRef(IRecordInfo *iface) { - IRecordInfoImpl* This=(IRecordInfoImpl*)iface; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); return InterlockedIncrement(&This->ref); } static ULONG CALLBACK IRecordInfoImpl_Release(IRecordInfo *iface) { - IRecordInfoImpl* This=(IRecordInfoImpl*)iface; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); return InterlockedDecrement(&This->ref); } @@ -112,14 +118,14 @@ static BOOL fail_GetSize; /* Whether to fail the GetSize call */ static HRESULT CALLBACK IRecordInfoImpl_RecordClear(IRecordInfo *iface, PVOID pvExisting) { - IRecordInfoImpl* This=(IRecordInfoImpl*)iface; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->clearCalled++; return S_OK; } static HRESULT CALLBACK IRecordInfoImpl_GetSize(IRecordInfo *iface, ULONG* size) { - IRecordInfoImpl* This=(IRecordInfoImpl*)iface; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->sizeCalled++; *size = 17; if (fail_GetSize) @@ -1449,7 +1455,7 @@ static void test_SafeArrayCreateEx(void) hres = pSafeArrayGetRecordInfo(sa, &saRec); ok(hres == S_OK,"GRI failed\n"); - ok(saRec == (IRecordInfo*)iRec,"Different saRec\n"); + ok(saRec == &iRec->IRecordInfo_iface, "Different saRec\n"); ok(iRec->ref == START_REF_COUNT + 2, "Didn't AddRef %d\n", iRec->ref); if (iRec->ref == START_REF_COUNT + 2) IRecordInfo_Release(saRec);

1 0

Michael Stefaniuc : shlwapi/tests: Standardize the COM usage in ordinal.c.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 26de0e62027b65562dcf44ac80778d953adb3865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26de0e62027b65562dcf44ac8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 14 12:02:58 2010 +0100 shlwapi/tests: Standardize the COM usage in ordinal.c. --- dlls/shlwapi/tests/ordinal.c | 113 ++++++++++++++++++++++++++--------------- 1 files changed, 72 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26de0e62027b65562dcf4…

1 0

Michael Stefaniuc : ole32/tests: Standardize the COM usage in clipboard.c.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 6012a506ccf27a6040176688d351a0905de95db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6012a506ccf27a6040176688d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 14 12:03:36 2010 +0100 ole32/tests: Standardize the COM usage in clipboard.c. --- dlls/ole32/tests/clipboard.c | 43 ++++++++++++++++++++++++++--------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 1afa0e3..d97426c 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #define NONAMELESSUNION #include <stdarg.h> @@ -49,7 +50,7 @@ static inline char *dump_fmtetc(FORMATETC *fmt) } typedef struct DataObjectImpl { - const IDataObjectVtbl *lpVtbl; + IDataObject IDataObject_iface; LONG ref; FORMATETC *fmtetc; @@ -61,7 +62,7 @@ typedef struct DataObjectImpl { } DataObjectImpl; typedef struct EnumFormatImpl { - const IEnumFORMATETCVtbl *lpVtbl; + IEnumFORMATETC IEnumFORMATETC_iface; LONG ref; FORMATETC *fmtetc; @@ -79,9 +80,19 @@ static UINT cf_stream, cf_storage, cf_global, cf_another, cf_onemore; static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT size, LPENUMFORMATETC *lplpformatetc); +static inline DataObjectImpl *impl_from_IDataObject(IDataObject *iface) +{ + return CONTAINING_RECORD(iface, DataObjectImpl, IDataObject_iface); +} + +static inline EnumFormatImpl *impl_from_IEnumFORMATETC(IEnumFORMATETC *iface) +{ + return CONTAINING_RECORD(iface, EnumFormatImpl, IEnumFORMATETC_iface); +} + static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFIID riid, LPVOID *ppvObj) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) { IEnumFORMATETC_AddRef(iface); @@ -94,14 +105,14 @@ static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFII static ULONG WINAPI EnumFormatImpl_AddRef(IEnumFORMATETC *iface) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); LONG ref = InterlockedIncrement(&This->ref); return ref; } static ULONG WINAPI EnumFormatImpl_Release(IEnumFORMATETC *iface) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); ULONG ref = InterlockedDecrement(&This->ref); if(!ref) { @@ -115,7 +126,7 @@ static ULONG WINAPI EnumFormatImpl_Release(IEnumFORMATETC *iface) static HRESULT WINAPI EnumFormatImpl_Next(IEnumFORMATETC *iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); ULONG count, i; trace("next: count %d cur %d\n", celt, This->cur); @@ -147,7 +158,7 @@ static HRESULT WINAPI EnumFormatImpl_Skip(IEnumFORMATETC *iface, ULONG celt) static HRESULT WINAPI EnumFormatImpl_Reset(IEnumFORMATETC *iface) { - EnumFormatImpl *This = (EnumFormatImpl*)iface; + EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); This->cur = 0; return S_OK; @@ -174,7 +185,7 @@ static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT fmtetc_cnt, IEnumFO EnumFormatImpl *ret; ret = HeapAlloc(GetProcessHeap(), 0, sizeof(EnumFormatImpl)); - ret->lpVtbl = &VT_EnumFormatImpl; + ret->IEnumFORMATETC_iface.lpVtbl = &VT_EnumFormatImpl; ret->ref = 1; ret->cur = 0; ret->fmtetc_cnt = fmtetc_cnt; @@ -186,7 +197,7 @@ static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT fmtetc_cnt, IEnumFO static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID riid, LPVOID *ppvObj) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) { IDataObject_AddRef(iface); @@ -199,14 +210,14 @@ static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID r static ULONG WINAPI DataObjectImpl_AddRef(IDataObject* iface) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); ULONG ref = InterlockedIncrement(&This->ref); return ref; } static ULONG WINAPI DataObjectImpl_Release(IDataObject* iface) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); ULONG ref = InterlockedDecrement(&This->ref); if(!ref) @@ -226,7 +237,7 @@ static ULONG WINAPI DataObjectImpl_Release(IDataObject* iface) static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pformatetc, STGMEDIUM *pmedium) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); UINT i; BOOL foundFormat = FALSE; @@ -282,7 +293,7 @@ static HRESULT WINAPI DataObjectImpl_GetDataHere(IDataObject* iface, FORMATETC * static HRESULT WINAPI DataObjectImpl_QueryGetData(IDataObject* iface, FORMATETC *pformatetc) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); UINT i; BOOL foundFormat = FALSE; @@ -320,7 +331,7 @@ static HRESULT WINAPI DataObjectImpl_SetData(IDataObject* iface, FORMATETC *pfor static HRESULT WINAPI DataObjectImpl_EnumFormatEtc(IDataObject* iface, DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc) { - DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl *This = impl_from_IDataObject(iface); DataObjectImpl_EnumFormatEtc_calls++; @@ -371,7 +382,7 @@ static HRESULT DataObjectImpl_CreateText(LPCSTR text, LPDATAOBJECT *lplpdataobj) DataObjectImpl *obj; obj = HeapAlloc(GetProcessHeap(), 0, sizeof(DataObjectImpl)); - obj->lpVtbl = &VT_DataObjectImpl; + obj->IDataObject_iface.lpVtbl = &VT_DataObjectImpl; obj->ref = 1; obj->text = GlobalAlloc(GMEM_MOVEABLE, strlen(text) + 1); strcpy(GlobalLock(obj->text), text); @@ -398,7 +409,7 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) DEVMODEW dm; obj = HeapAlloc(GetProcessHeap(), 0, sizeof(DataObjectImpl)); - obj->lpVtbl = &VT_DataObjectImpl; + obj->IDataObject_iface.lpVtbl = &VT_DataObjectImpl; obj->ref = 1; obj->text = GlobalAlloc(GMEM_MOVEABLE, strlen(cmpl_text_data) + 1); strcpy(GlobalLock(obj->text), cmpl_text_data);

1 0

Michael Stefaniuc : msctf/tests: Standardize the COM usage in inputprocessor.c.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: d5c285ddb0892ffe4a4d825991052c4ebeff9b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c285ddb0892ffe4a4d82599… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 14 12:03:20 2010 +0100 msctf/tests: Standardize the COM usage in inputprocessor.c. --- dlls/msctf/tests/inputprocessor.c | 112 ++++++++++++++++++++++++------------- 1 files changed, 74 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5c285ddb0892ffe4a4d8…

1 0

Michael Stefaniuc : mmdevapi: Standardize the COM usage in devenum.c.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 1df7dab11515d66bbfb726f86299ddde0a8be20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1df7dab11515d66bbfb726f86… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 14 12:02:32 2010 +0100 mmdevapi: Standardize the COM usage in devenum.c. --- dlls/mmdevapi/devenum.c | 85 +++++++++++++++++++++++++++++----------------- 1 files changed, 53 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1df7dab11515d66bbfb72…

1 0

André Hentschel : wrc: Allow comma after popup name.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: a49eac930a3e6582b3df67f739206fc821f4e89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49eac930a3e6582b3df67f73… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 13 17:28:34 2010 +0100 wrc: Allow comma after popup name. --- tools/wrc/parser.y | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 8c49114..e1a3c68 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -369,7 +369,7 @@ resource_file else $1 = rsc; - /* Final statements before were done */ + /* Final statements before we're done */ if ((head = get_resource_head($1)) != NULL) { if (resource_top) /* append to existing resources */ @@ -1278,13 +1278,14 @@ item_definitions * (who would want to specify a MF_x flag twice?). */ item_options - : /* Empty */ { $$ = 0; } - | opt_comma tCHECKED item_options { $$ = $3 | MF_CHECKED; } - | opt_comma tGRAYED item_options { $$ = $3 | MF_GRAYED; } - | opt_comma tHELP item_options { $$ = $3 | MF_HELP; } - | opt_comma tINACTIVE item_options { $$ = $3 | MF_DISABLED; } - | opt_comma tMENUBARBREAK item_options { $$ = $3 | MF_MENUBARBREAK; } - | opt_comma tMENUBREAK item_options { $$ = $3 | MF_MENUBREAK; } + : /* Empty */ { $$ = 0; } + | ',' item_options { $$ = $2; } + | tCHECKED item_options { $$ = $2 | MF_CHECKED; } + | tGRAYED item_options { $$ = $2 | MF_GRAYED; } + | tHELP item_options { $$ = $2 | MF_HELP; } + | tINACTIVE item_options { $$ = $2 | MF_DISABLED; } + | tMENUBARBREAK item_options { $$ = $2 | MF_MENUBARBREAK; } + | tMENUBREAK item_options { $$ = $2 | MF_MENUBREAK; } ; /* ------------------------------ MenuEx ------------------------------ */

1 0

Jerome Leclanche : winemenubuilder: Add a trailing semicolon to MimeType in desktop files.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 33c7105ecf8b1f7243c001de2fce1e85d4c150d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c7105ecf8b1f7243c001de2… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon Dec 13 17:17:17 2010 +0000 winemenubuilder: Add a trailing semicolon to MimeType in desktop files. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index bb045a4..8414d7b 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2135,7 +2135,7 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c fprintf(desktop, "[Desktop Entry]\n"); fprintf(desktop, "Type=Application\n"); fprintf(desktop, "Name=%s\n", friendlyAppName); - fprintf(desktop, "MimeType=%s\n", mimeType); + fprintf(desktop, "MimeType=%s;\n", mimeType); fprintf(desktop, "Exec=wine start /ProgIDOpen %s %%f\n", progId); fprintf(desktop, "NoDisplay=true\n"); fprintf(desktop, "StartupNotify=true\n");

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010