wine-commits March 2014

2 participants
530 discussions

Aurimas Fišeras : po: Update Lithuanian translation.

by Alexandre Julliard

Module: wine Branch: master Commit: c8269c2cd73a7b95563bec2e195143bff5441c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8269c2cd73a7b95563bec2e1… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Mar 26 22:34:52 2014 +0200 po: Update Lithuanian translation. --- po/lt.po | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index 4b77e45..f573e7e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-02-10 22:51+0300\n" +"PO-Revision-Date: 2014-03-26 22:34+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -11680,6 +11680,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Wine DLL bibliotekų registravimo serveris\n" +"\n" +"Teikia DLL bibliotekų registravimo paslaugą.\n" +"\n" #: regsvr32.rc:40 msgid "" @@ -11694,54 +11698,64 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"Naudojimas:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdeilutė]] DllVardas\n" +"\n" +"Parametrai:\n" +" [/u] Išregistruoti modulį serveryje.\n" +" [/s] Tyli veiksena (nebus rodomi pranešimai).\n" +" [/i] Kviesti „DllInstall“, perduodant nebūtiną [cmdeilutę].\n" +"\tKai naudojama su [/u], regsvr32 taip pat kviečia „DLL Uninstall“.\n" +" [/n] Nekviesti „DllRegisterServer“. Privalo būti naudojamas su [/i].\n" +"\n" #: regsvr32.rc:41 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regsvr32: Netinkamas arba neatpažintas parametras [%1]\n" +"\n" #: regsvr32.rc:42 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "Nepavyko atverti „%1“\n" +msgstr "regsvr32: Nepavyko įkelti DLL bibliotekos „%1“\n" #: regsvr32.rc:43 msgid "regsvr32: %1 not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: %1 neįgyvendinta DLL bibliotekoje „%2“\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Nepavyko užregistruoti DLL bibliotekos „%1“\n" #: regsvr32.rc:45 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Sėkmingai užregistruota DLL biblioteka „%1“\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Nepavyko išregistruoti DLL bibliotekos „%1“\n" #: regsvr32.rc:47 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Sėkmingai išregistruota DLL biblioteka „%1“\n" #: regsvr32.rc:48 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Nepavyko įdiegti DLL bibliotekos „%1“\n" #: regsvr32.rc:49 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Sėkmingai įdiegta DLL biblioteka „%1“\n" #: regsvr32.rc:50 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Nepavyko pašalinti DLL bibliotekos „%1“\n" #: regsvr32.rc:51 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Sėkmingai pašalinta DLL biblioteka „%1“\n" #: start.rc:55 msgid ""

10 years, 1 month

Nikolay Sivov : msi: Fix a record leak on failure removing a column ( Coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: 195168351fe0aadc1e1a550a80e68c88f3832b12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=195168351fe0aadc1e1a550a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 27 06:57:30 2014 +0400 msi: Fix a record leak on failure removing a column (Coverity). --- dlls/msi/table.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index bd15a8e..8012369 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1970,7 +1970,10 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num r = TABLE_CreateView(tv->db, szColumns, &columns); if (r != ERROR_SUCCESS) + { + msiobj_release(&rec->hdr); return r; + } r = msi_table_find_row((MSITABLEVIEW *)columns, rec, &row, NULL); if (r != ERROR_SUCCESS)

10 years, 1 month

Nikolay Sivov : msi: Fix a record leak on error path (Coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: 203d282a78c4e022a3a4feb0d98aac7c154f83e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203d282a78c4e022a3a4feb0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 27 06:56:14 2014 +0400 msi: Fix a record leak on error path (Coverity). --- dlls/msi/table.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index f67981c..bd15a8e 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2092,7 +2092,10 @@ static UINT TABLE_drop(struct tagMSIVIEW *view) r = TABLE_CreateView(tv->db, szTables, &tables); if (r != ERROR_SUCCESS) + { + msiobj_release(&rec->hdr); return r; + } r = msi_table_find_row((MSITABLEVIEW *)tables, rec, &row, NULL); if (r != ERROR_SUCCESS)

10 years, 1 month

Nikolay Sivov : msi: Fix a leak of allocated string buffer on error path ( Coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: c01c0b52ed95a695698c29fae63e42e825cd4172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c01c0b52ed95a695698c29fae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 27 06:55:45 2014 +0400 msi: Fix a leak of allocated string buffer on error path (Coverity). --- dlls/msi/format.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 756c4d1..3c815d9 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -370,7 +370,11 @@ static LPWSTR build_default_format(const MSIRECORD* record) { max_len = len; buf = msi_realloc(buf, (max_len + 1) * sizeof(WCHAR)); - if (!buf) return NULL; + if (!buf) + { + msi_free(rc); + return NULL; + } } if (str)

10 years, 1 month

Nikolay Sivov : msi: Fix a record leak on error paths (Coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: dc33b1358115a7fef739e77ede1be48e3d94078f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc33b1358115a7fef739e77ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 27 06:55:24 2014 +0400 msi: Fix a record leak on error paths (Coverity). --- dlls/msi/custom.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 63bec19..002d861 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1003,7 +1003,7 @@ static UINT HANDLE_CustomType5_6( MSIPACKAGE *package, const WCHAR *source, cons 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','B','i' ,'n','a','r','y','`',' ','W','H','E','R','E',' ', '`','N','a','m','e','`',' ','=',' ','\'','%','s','\'',0}; - MSIRECORD *row = 0; + MSIRECORD *row = NULL; msi_custom_action_info *info; CHAR *buffer = NULL; WCHAR *bufferw = NULL; @@ -1017,10 +1017,14 @@ static UINT HANDLE_CustomType5_6( MSIPACKAGE *package, const WCHAR *source, cons return ERROR_FUNCTION_FAILED; r = MSI_RecordReadStream(row, 2, NULL, &sz); - if (r != ERROR_SUCCESS) return r; + if (r != ERROR_SUCCESS) goto done; buffer = msi_alloc( sz + 1 ); - if (!buffer) return ERROR_FUNCTION_FAILED; + if (!buffer) + { + r = ERROR_FUNCTION_FAILED; + goto done; + } r = MSI_RecordReadStream(row, 2, buffer, &sz); if (r != ERROR_SUCCESS) @@ -1040,6 +1044,7 @@ static UINT HANDLE_CustomType5_6( MSIPACKAGE *package, const WCHAR *source, cons done: msi_free(bufferw); msi_free(buffer); + msiobj_release(&row->hdr); return r; }

10 years, 1 month

Nikolay Sivov : gdiplus: Fix image attributes leak (Coverity).

by Alexandre Julliard

Module: wine Branch: master Commit: d78a0612ed7b6a18455bb7c4cee63b10561b3b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d78a0612ed7b6a18455bb7c4c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 27 06:54:01 2014 +0400 gdiplus: Fix image attributes leak (Coverity). --- dlls/gdiplus/brush.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 2b49b64..38e8dc2 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -745,8 +745,6 @@ GpStatus WINGDIPAPI GdipCreateTexture2(GpImage *image, GpWrapMode wrapmode, /****************************************************************************** * GdipCreateTextureIA [GDIPLUS.@] - * - * FIXME: imageattr ignored */ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, GDIPCONST GpImageAttributes *imageattr, REAL x, REAL y, REAL width, @@ -844,6 +842,7 @@ GpStatus WINGDIPAPI GdipCreateTexture2I(GpImage *image, GpWrapMode wrapmode, imageattr->wrap = wrapmode; stat = GdipCreateTextureIA(image, imageattr, x, y, width, height, texture); + GdipDisposeImageAttributes(imageattr); } return stat;

10 years, 1 month

Javier Cantero : user32/tests: New test cases for SubtractRect().

by Alexandre Julliard

Module: wine Branch: master Commit: ee5c64f583668988e04cae38169641f647833d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5c64f583668988e04cae381… Author: Javier Cantero <jcantero(a)escomposlinux.org> Date: Wed Mar 26 23:05:16 2014 +0100 user32/tests: New test cases for SubtractRect(). --- dlls/user32/tests/uitools.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c index 0401448..5f10b00 100644 --- a/dlls/user32/tests/uitools.c +++ b/dlls/user32/tests/uitools.c @@ -70,7 +70,7 @@ static void test_SubtractRect(void) RECT rectr; BOOL result; - /* case 1: source rectangles don't intersect */ + /* source rectangles don't intersect */ SetRect(&rect1, 50, 50, 150, 100); SetRect(&rect2, 250, 200, 1500, 1000); result = SubtractRect(&rectr, &rect1, &rect2); @@ -79,7 +79,7 @@ static void test_SubtractRect(void) && rectr.bottom == 100, "wrong rect subtraction of SubtractRect " "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom); - /* case 2: source rect 2 partially overlaps rect 1 */ + /* source rect 2 partially overlaps rect 1 */ SetRect(&rect1, 2431, 626, 3427, 1608); SetRect(&rect2, 2499, 626, 3427, 1608); result = SubtractRect(&rectr, &rect1, &rect2); @@ -88,12 +88,28 @@ static void test_SubtractRect(void) && rectr.bottom == 1608, "wrong rect subtraction of SubtractRect " "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom); - /* case 3: source rect 2 completely overlaps rect 1 */ + /* source rect 2 partially overlaps rect 1 - dest is src rect 2 */ + SetRect(&rect1, 2431, 626, 3427, 1608); + SetRect(&rect2, 2499, 626, 3427, 1608); + result = SubtractRect(&rect2, &rect1, &rect2); + ok(result, "SubtractRect returned FALSE but subtraction should not be empty\n"); + ok(result && rectr.left == 2431 && rectr.top == 626 && rectr.right == 2499 + && rectr.bottom == 1608, "wrong rect subtraction of SubtractRect " + "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom); + + /* source rect 2 completely overlaps rect 1 */ SetRect(&rect1, 250, 250, 400, 500); SetRect(&rect2, 50, 50, 1500, 1000); result = SubtractRect(&rectr, &rect1, &rect2); ok(!result, "SubtractRect returned TRUE but subtraction should be empty " "(dest rect={%d, %d, %d, %d})\n", rectr.left, rectr.top, rectr.right, rectr.bottom); + + /* source rect 2 completely overlaps rect 1 - dest is src rect 2 */ + SetRect(&rect1, 250, 250, 400, 500); + SetRect(&rect2, 50, 50, 1500, 1000); + result = SubtractRect(&rect2, &rect1, &rect2); + ok(!result, "SubtractRect returned TRUE but subtraction should be empty " + "(dest rect={%d, %d, %d, %d})\n", rect2.left, rect2.top, rect2.right, rect2.bottom); } START_TEST(uitools)

10 years, 1 month

Austin English : wine.inf: Add %AppData%\Microsoft and %LocalAppData%\Microsoft folders:.

by Alexandre Julliard

Module: wine Branch: master Commit: 5b5556308bdde37617e5dfa95572e2cfd973ff2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5556308bdde37617e5dfa95… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 18 12:53:48 2014 -0700 wine.inf: Add %AppData%\Microsoft and %LocalAppData%\Microsoft folders:. --- loader/wine.inf.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d6e6994..1f08d2e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2546,6 +2546,9 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,wbem,wbemprox.dll 11,wbem,wmic.exe 11,wbem,wmiutils.dll +; empty folders to make sure the parent dirs are not removed +16410,Microsoft, +16412,Microsoft, 16422,Internet Explorer,iexplore.exe 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll

10 years, 1 month

Michael Stefaniuc : shell32: COM cleanup for IEnumIDList.

by Alexandre Julliard

Module: wine Branch: master Commit: c13e106e73e1c8dd00fe20823bb72bdb73e422cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13e106e73e1c8dd00fe20823… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 25 23:40:52 2014 +0100 shell32: COM cleanup for IEnumIDList. --- dlls/shell32/shfldr_unixfs.c | 49 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 3e8ad1e..8f93e7f 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -170,9 +170,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); #if !defined(__MINGW32__) && !defined(_MSC_VER) -#define ADJUST_THIS(c,m,p) ((c*)(((long)p)-(long)&(((c*)0)->lp##m##Vtbl))) -#define STATIC_CAST(i,p) ((i*)&p->lp##i##Vtbl) - #define LEN_SHITEMID_FIXED_PART ((USHORT) \ ( sizeof(USHORT) /* SHITEMID's cb field. */ \ + sizeof(PIDLTYPE) /* PIDLDATA's type field. */ \ @@ -2368,13 +2365,18 @@ HRESULT WINAPI MyDocuments_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID /* UnixSubFolderIterator object layout and typedef. */ typedef struct _UnixSubFolderIterator { - const IEnumIDListVtbl *lpIEnumIDListVtbl; - LONG m_cRef; + IEnumIDList IEnumIDList_iface; + LONG ref; SHCONTF m_fFilter; DIR *m_dirFolder; char m_szFolder[FILENAME_MAX]; } UnixSubFolderIterator; +static inline UnixSubFolderIterator *impl_from_IEnumIDList(IEnumIDList *iface) +{ + return CONTAINING_RECORD(iface, UnixSubFolderIterator, IEnumIDList_iface); +} + static void UnixSubFolderIterator_Destroy(UnixSubFolderIterator *iterator) { TRACE("(iterator=%p)\n", iterator); @@ -2400,35 +2402,34 @@ static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_QueryInterface(IEnumIDLi IEnumIDList_AddRef(iface); return S_OK; } - + static ULONG WINAPI UnixSubFolderIterator_IEnumIDList_AddRef(IEnumIDList* iface) { - UnixSubFolderIterator *This = ADJUST_THIS(UnixSubFolderIterator, IEnumIDList, iface); + UnixSubFolderIterator *This = impl_from_IEnumIDList(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(iface=%p)\n", iface); - - return InterlockedIncrement(&This->m_cRef); + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI UnixSubFolderIterator_IEnumIDList_Release(IEnumIDList* iface) { - UnixSubFolderIterator *This = ADJUST_THIS(UnixSubFolderIterator, IEnumIDList, iface); - ULONG cRef; - - TRACE("(iface=%p)\n", iface); + UnixSubFolderIterator *This = impl_from_IEnumIDList(iface); + ULONG ref = InterlockedDecrement(&This->ref); - cRef = InterlockedDecrement(&This->m_cRef); - - if (!cRef) + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) UnixSubFolderIterator_Destroy(This); - return cRef; + return ref; } static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Next(IEnumIDList* iface, ULONG celt, LPITEMIDLIST* rgelt, ULONG* pceltFetched) { - UnixSubFolderIterator *This = ADJUST_THIS(UnixSubFolderIterator, IEnumIDList, iface); + UnixSubFolderIterator *This = impl_from_IEnumIDList(iface); ULONG i = 0; /* This->m_dirFolder will be NULL if the user doesn't have access rights for the dir. */ @@ -2487,8 +2488,8 @@ static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Skip(IEnumIDList* iface, static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Reset(IEnumIDList* iface) { - UnixSubFolderIterator *This = ADJUST_THIS(UnixSubFolderIterator, IEnumIDList, iface); - + UnixSubFolderIterator *This = impl_from_IEnumIDList(iface); + TRACE("(iface=%p)\n", iface); if (This->m_dirFolder) @@ -2523,13 +2524,13 @@ static IEnumIDList *UnixSubFolderIterator_Constructor(UnixFolder *pUnixFolder, S TRACE("(pUnixFolder=%p)\n", pUnixFolder); iterator = SHAlloc(sizeof(*iterator)); - iterator->lpIEnumIDListVtbl = &UnixSubFolderIterator_IEnumIDList_Vtbl; - iterator->m_cRef = 1; + iterator->IEnumIDList_iface.lpVtbl = &UnixSubFolderIterator_IEnumIDList_Vtbl; + iterator->ref = 1; iterator->m_fFilter = fFilter; iterator->m_dirFolder = opendir(pUnixFolder->m_pszPath); lstrcpyA(iterator->m_szFolder, pUnixFolder->m_pszPath); - return (IEnumIDList*)iterator; + return &iterator->IEnumIDList_iface; } #else /* __MINGW32__ || _MSC_VER */

10 years, 1 month

Michael Stefaniuc : shell32: Simplify the creation of an IEnumIDList.

by Alexandre Julliard

Module: wine Branch: master Commit: 0aff99771d03de4432f26dfff31fdb854c611dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aff99771d03de4432f26dfff… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 25 23:33:45 2014 +0100 shell32: Simplify the creation of an IEnumIDList. --- dlls/shell32/shfldr_unixfs.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 10b2879..3e8ad1e 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -971,14 +971,12 @@ static HRESULT WINAPI ShellFolder2_ParseDisplayName(IShellFolder2* iface, HWND h return result; } -static IUnknown *UnixSubFolderIterator_Constructor(UnixFolder *pUnixFolder, SHCONTF fFilter); +static IEnumIDList *UnixSubFolderIterator_Constructor(UnixFolder *pUnixFolder, SHCONTF fFilter); static HRESULT WINAPI ShellFolder2_EnumObjects(IShellFolder2* iface, HWND hwndOwner, SHCONTF grfFlags, IEnumIDList** ppEnumIDList) { UnixFolder *This = impl_from_IShellFolder2(iface); - IUnknown *newIterator; - HRESULT hr; TRACE("(%p)->(%p 0x%08x %p)\n", This, hwndOwner, grfFlags, ppEnumIDList); @@ -987,11 +985,8 @@ static HRESULT WINAPI ShellFolder2_EnumObjects(IShellFolder2* iface, HWND hwndOw return E_UNEXPECTED; } - newIterator = UnixSubFolderIterator_Constructor(This, grfFlags); - hr = IUnknown_QueryInterface(newIterator, &IID_IEnumIDList, (void**)ppEnumIDList); - IUnknown_Release(newIterator); - - return hr; + *ppEnumIDList = UnixSubFolderIterator_Constructor(This, grfFlags); + return S_OK; } static HRESULT CreateUnixFolder(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv, const CLSID *pCLSID); @@ -2521,21 +2516,20 @@ static const IEnumIDListVtbl UnixSubFolderIterator_IEnumIDList_Vtbl = { UnixSubFolderIterator_IEnumIDList_Clone }; -static IUnknown *UnixSubFolderIterator_Constructor(UnixFolder *pUnixFolder, SHCONTF fFilter) { +static IEnumIDList *UnixSubFolderIterator_Constructor(UnixFolder *pUnixFolder, SHCONTF fFilter) +{ UnixSubFolderIterator *iterator; TRACE("(pUnixFolder=%p)\n", pUnixFolder); - - iterator = SHAlloc((ULONG)sizeof(UnixSubFolderIterator)); + + iterator = SHAlloc(sizeof(*iterator)); iterator->lpIEnumIDListVtbl = &UnixSubFolderIterator_IEnumIDList_Vtbl; - iterator->m_cRef = 0; + iterator->m_cRef = 1; iterator->m_fFilter = fFilter; iterator->m_dirFolder = opendir(pUnixFolder->m_pszPath); lstrcpyA(iterator->m_szFolder, pUnixFolder->m_pszPath); - UnixSubFolderIterator_IEnumIDList_AddRef((IEnumIDList*)iterator); - - return (IUnknown*)iterator; + return (IEnumIDList*)iterator; } #else /* __MINGW32__ || _MSC_VER */

10 years, 1 month

← Newer
1
2
3
4
5
6
7
8
...
53
Older →

Jump to page:

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 March 2014