January 2014 - Wine-Commits

Michael Stefaniuc : dmime: Fix copy and paste errors.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 8472190aaf874afc27ffe9e90965696e43981dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8472190aaf874afc27ffe9e90… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 8 09:24:54 2014 +0100 dmime: Fix copy and paste errors. --- dlls/dmime/segtriggertrack.c | 2 +- dlls/dmime/tempotrack.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 583561c..56847ae 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -235,7 +235,7 @@ static ULONG WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Release (LPPERSIS } static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); + ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); *pClassID = CLSID_DirectMusicSegTriggerTrack; return S_OK; diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index b8dee90..cf1b275 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -307,7 +307,7 @@ static ULONG WINAPI IDirectMusicTempoTrack_IPersistStream_Release (LPPERSISTSTRE } static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); + ICOM_THIS_MULTI(IDirectMusicTempoTrack, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); *pClassID = CLSID_DirectMusicTempoTrack; return S_OK;

1 0

Nikolay Sivov : scrrun: Implement Clone() for file collection.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: c813ae2230d9a4776d1c09b0e17063ff9a52d9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c813ae2230d9a4776d1c09b0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:37:42 2014 +0400 scrrun: Implement Clone() for file collection. --- dlls/scrrun/filesystem.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 2ed6469..e0c9a34 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -145,6 +145,7 @@ static inline HRESULT create_error(DWORD err) static HRESULT create_folder(const WCHAR*, IFolder**); static HRESULT create_file(BSTR, IFile**); static HRESULT create_foldercoll_enum(struct foldercollection*, IUnknown**); +static HRESULT create_filecoll_enum(struct filecollection*, IUnknown**); static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) { @@ -723,8 +724,8 @@ static HRESULT WINAPI filecoll_enumvariant_Reset(IEnumVARIANT *iface) static HRESULT WINAPI filecoll_enumvariant_Clone(IEnumVARIANT *iface, IEnumVARIANT **pclone) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%p): stub\n", This, pclone); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pclone); + return create_filecoll_enum(This->data.u.filecoll.coll, (IUnknown**)pclone); } static const IEnumVARIANTVtbl filecollenumvariantvtbl = { @@ -737,7 +738,7 @@ static const IEnumVARIANTVtbl filecollenumvariantvtbl = { filecoll_enumvariant_Clone }; -static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown **newenum) +HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown **newenum) { struct enumvariant *This;

1 0

Sebastian Lackner : kernel32: Forward condition variable functions to ntdll.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: ddc7f300e2cd5dd2e17783739fabbf74491e9eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc7f300e2cd5dd2e17783739… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 5 03:53:12 2014 +0100 kernel32: Forward condition variable functions to ntdll. --- dlls/kernel32/kernel32.spec | 4 ++++ dlls/kernel32/sync.c | 18 ++++++++++++++++++ dlls/kernel32/tests/sync.c | 6 ++---- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7779a75..02b1bdb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -750,6 +750,7 @@ @ stdcall InitOnceComplete(ptr long ptr) @ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) @ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize +@ stdcall InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) @ stdcall InitializeCriticalSectionEx(ptr long long) @@ -1194,6 +1195,7 @@ @ stdcall SignalObjectAndWait(long long long long) @ stdcall SizeofResource(long long) @ stdcall Sleep(long) +@ stdcall SleepConditionVariableCS(ptr ptr long) @ stdcall SleepEx(long long) @ stdcall SuspendThread(long) @ stdcall SwitchToFiber(ptr) @@ -1263,6 +1265,8 @@ @ stdcall WaitForSingleObjectEx(long long long) @ stdcall WaitNamedPipeA (str long) @ stdcall WaitNamedPipeW (wstr long) +@ stdcall WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable +@ stdcall WakeConditionVariable(ptr) ntdll.RtlWakeConditionVariable @ stdcall WerRegisterFile(wstr long long) @ stdcall WerRegisterMemoryBlock(ptr long) @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 5b7f810..2b7f4b0 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2321,3 +2321,21 @@ __ASM_STDCALL_FUNC(InterlockedDecrement, 4, "ret $4") #endif /* __i386__ */ + +/*********************************************************************** + * SleepConditionVariableCS (KERNEL32.@) + */ +BOOL WINAPI SleepConditionVariableCS( CONDITION_VARIABLE *variable, CRITICAL_SECTION *crit, DWORD timeout ) +{ + NTSTATUS status; + LARGE_INTEGER time; + + status = RtlSleepConditionVariableCS( variable, crit, get_nt_timeout( &time, timeout ) ); + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; +} diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 84c44e0..d76aa16 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1477,8 +1477,7 @@ static void test_condvars_consumer_producer(void) if (!pInitializeConditionVariable) { /* function is not yet in XP, only in newer Windows */ - /* and not yet implemented in Wine for some days/weeks */ - todo_wine win_skip("no condition variable support.\n"); + win_skip("no condition variable support.\n"); return; } @@ -1640,8 +1639,7 @@ static void test_condvars_base(void) { if (!pInitializeConditionVariable) { /* function is not yet in XP, only in newer Windows */ - /* and not yet implemented in Wine for some days/weeks */ - todo_wine win_skip("no condition variable support.\n"); + win_skip("no condition variable support.\n"); return; }

1 0

André Hentschel : kernel32/tests: Don' t test last error on success.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 1c61a53ef66f65ea43bfb43e84112b981eec59bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c61a53ef66f65ea43bfb43e8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 8 01:53:52 2014 +0100 kernel32/tests: Don't test last error on success. --- dlls/kernel32/tests/console.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b38bb30..18d3cf9 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1152,22 +1152,13 @@ static void test_OpenConsoleW(void) CloseHandle(ret); } - /* OpenConsoleW should not touch the last error on success. */ - SetLastError(0xdeadbeef); ret = pOpenConsoleW(coninW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_EXISTING); - ok(ret != INVALID_HANDLE_VALUE, - "Expected OpenConsoleW to return a valid handle\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected the last error to be untouched, got %u\n", GetLastError()); + ok(ret != INVALID_HANDLE_VALUE, "Expected OpenConsoleW to return a valid handle\n"); if (ret != INVALID_HANDLE_VALUE) CloseHandle(ret); - SetLastError(0xdeadbeef); ret = pOpenConsoleW(conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_EXISTING); - ok(ret != INVALID_HANDLE_VALUE, - "Expected OpenConsoleW to return a valid handle\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected the last error to be untouched, got %u\n", GetLastError()); + ok(ret != INVALID_HANDLE_VALUE, "Expected OpenConsoleW to return a valid handle\n"); if (ret != INVALID_HANDLE_VALUE) CloseHandle(ret); }

1 0

Nikolay Sivov : scrrun: Implement Clone() for folder collection.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 844aa7959e3daf57cfdf5350106b7d3a3c7c761e URL: http://source.winehq.org/git/wine.git/?a=commit;h=844aa7959e3daf57cfdf53501… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:37:17 2014 +0400 scrrun: Implement Clone() for folder collection. --- dlls/scrrun/filesystem.c | 7 ++++--- dlls/scrrun/tests/filesystem.c | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 4802614..2ed6469 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -144,6 +144,7 @@ static inline HRESULT create_error(DWORD err) static HRESULT create_folder(const WCHAR*, IFolder**); static HRESULT create_file(BSTR, IFile**); +static HRESULT create_foldercoll_enum(struct foldercollection*, IUnknown**); static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) { @@ -569,8 +570,8 @@ static HRESULT WINAPI foldercoll_enumvariant_Reset(IEnumVARIANT *iface) static HRESULT WINAPI foldercoll_enumvariant_Clone(IEnumVARIANT *iface, IEnumVARIANT **pclone) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%p): stub\n", This, pclone); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pclone); + return create_foldercoll_enum(This->data.u.foldercoll.coll, (IUnknown**)pclone); } static const IEnumVARIANTVtbl foldercollenumvariantvtbl = { @@ -583,7 +584,7 @@ static const IEnumVARIANTVtbl foldercollenumvariantvtbl = { foldercoll_enumvariant_Clone }; -static HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnknown **newenum) +HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnknown **newenum) { struct enumvariant *This; diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 00d7686..6942a3d 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -863,12 +863,9 @@ static void test_FolderCollection(void) /* clone enumerator */ hr = IEnumVARIANT_Clone(enumvar, &clone); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { ok(clone != enumvar, "got %p, %p\n", enumvar, clone); IEnumVARIANT_Release(clone); -} hr = IEnumVARIANT_Reset(enumvar); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : scrrun: Store collection pointer directly in IEnumVARIANT data.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: c1b7a075cab3109cd684a376dbf19a3a348e55a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b7a075cab3109cd684a376d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:36:54 2014 +0400 scrrun: Store collection pointer directly in IEnumVARIANT data. --- dlls/scrrun/filesystem.c | 66 +++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 42 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index eb9073a..4802614 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -38,20 +38,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrrun); static const WCHAR bsW[] = {'\\',0}; +struct foldercollection { + IFolderCollection IFolderCollection_iface; + LONG ref; + BSTR path; +}; + +struct filecollection { + IFileCollection IFileCollection_iface; + LONG ref; + BSTR path; +}; + struct enumdata { union { struct { - IFolderCollection *coll; + struct foldercollection *coll; HANDLE find; - BSTR path; } foldercoll; struct { - IFileCollection *coll; + struct filecollection *coll; HANDLE find; - BSTR path; } filecoll; } u; }; @@ -63,18 +73,6 @@ struct enumvariant { struct enumdata data; }; -struct foldercollection { - IFolderCollection IFolderCollection_iface; - LONG ref; - BSTR path; -}; - -struct filecollection { - IFileCollection IFileCollection_iface; - LONG ref; - BSTR path; -}; - struct folder { IFolder IFolder_iface; LONG ref; @@ -459,8 +457,7 @@ static ULONG WINAPI foldercoll_enumvariant_Release(IEnumVARIANT *iface) if (!ref) { - IFolderCollection_Release(This->data.u.foldercoll.coll); - SysFreeString(This->data.u.foldercoll.path); + IFolderCollection_Release(&This->data.u.foldercoll.coll->IFolderCollection_iface); FindClose(This->data.u.foldercoll.find); heap_free(This); } @@ -484,7 +481,7 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel { static const WCHAR allW[] = {'*',0}; WCHAR pathW[MAX_PATH]; - BSTR parent = This->data.u.foldercoll.path; + BSTR parent = This->data.u.foldercoll.coll->path; int len; strcpyW(pathW, parent); @@ -522,7 +519,7 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel HRESULT hr; BSTR str; - str = get_full_path(This->data.u.foldercoll.path, &data); + str = get_full_path(This->data.u.foldercoll.coll->path, &data); hr = create_folder(str, &folder); SysFreeString(str); if (FAILED(hr)) return hr; @@ -598,15 +595,8 @@ static HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnkn This->IEnumVARIANT_iface.lpVtbl = &foldercollenumvariantvtbl; This->ref = 1; This->data.u.foldercoll.find = NULL; - This->data.u.foldercoll.path = SysAllocString(collection->path); - if (!This->data.u.foldercoll.path) - { - heap_free(This); - return E_OUTOFMEMORY; - } - - This->data.u.foldercoll.coll = &collection->IFolderCollection_iface; - IFolderCollection_AddRef(This->data.u.foldercoll.coll); + This->data.u.foldercoll.coll = collection; + IFolderCollection_AddRef(&collection->IFolderCollection_iface); *newenum = (IUnknown*)&This->IEnumVARIANT_iface; @@ -622,8 +612,7 @@ static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface) if (!ref) { - IFileCollection_Release(This->data.u.filecoll.coll); - SysFreeString(This->data.u.filecoll.path); + IFileCollection_Release(&This->data.u.filecoll.coll->IFileCollection_iface); heap_free(This); } @@ -646,7 +635,7 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, { static const WCHAR allW[] = {'*',0}; WCHAR pathW[MAX_PATH]; - BSTR parent = This->data.u.filecoll.path; + BSTR parent = This->data.u.filecoll.coll->path; int len; strcpyW(pathW, parent); @@ -683,7 +672,7 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, HRESULT hr; BSTR str; - str = get_full_path(This->data.u.filecoll.path, &data); + str = get_full_path(This->data.u.filecoll.coll->path, &data); hr = create_file(str, &file); SysFreeString(str); if (FAILED(hr)) return hr; @@ -758,15 +747,8 @@ static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown This->IEnumVARIANT_iface.lpVtbl = &filecollenumvariantvtbl; This->ref = 1; - This->data.u.filecoll.path = SysAllocString(collection->path); - if (!This->data.u.filecoll.path) - { - heap_free(This); - return E_OUTOFMEMORY; - } - - This->data.u.filecoll.coll = &collection->IFileCollection_iface; - IFileCollection_AddRef(This->data.u.filecoll.coll); + This->data.u.filecoll.coll = collection; + IFileCollection_AddRef(&collection->IFileCollection_iface); *newenum = (IUnknown*)&This->IEnumVARIANT_iface;

1 0

Jacek Caban : htaccess: Set content type for file.winetest.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: tools Branch: master Commit: c36851419c5ae593d994ae2fda3f1e60bc2f38ab URL: http://source.winehq.org/git/tools.git/?a=commit;h=c36851419c5ae593d994ae2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 8 15:20:27 2014 +0100 htaccess: Set content type for file.winetest. --- winetest/tests/.htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/tests/.htaccess b/winetest/tests/.htaccess index 3189dbd..df1bd34 100644 --- a/winetest/tests/.htaccess +++ b/winetest/tests/.htaccess @@ -2,6 +2,7 @@ Order Allow,Deny Allow From All SetEnv no-gzip dont-vary +AddType application/winetest .winetest <Files chunked> Allow from All

1 0

Jeremy Newman : missing p tag, bug 35231
by Jeremy Newman Jan. 8, 2014

Jan. 8, 2014

Module: website Branch: master Commit: b97730a3eda9bb438510d465d3f596c3369cc995 URL: http://source.winehq.org/git/website.git/?a=commit;h=b97730a3eda9bb438510d4… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jan 8 09:06:49 2014 -0600 missing p tag, bug 35231 --- templates/de/download/ubuntu.template | 2 +- templates/en/download/ubuntu.template | 2 +- templates/fr/download/ubuntu.template | 2 +- templates/pl/download/ubuntu.template | 2 +- templates/pt/download/ubuntu.template | 4 ++-- templates/tr/download/ubuntu.template | 2 +- templates/uk/download/ubuntu.template | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/de/download/ubuntu.template b/templates/de/download/ubuntu.template index e77befd..aacaa6c 100644 --- a/templates/de/download/ubuntu.template +++ b/templates/de/download/ubuntu.template @@ -22,7 +22,7 @@ Wähle dann den Software von Drittanbietern-Reiter und klicke auf Hinz Dann, kopiere die untere Zeile dort hinein. -ppa:ubuntu-wine/ppa +ppa:ubuntu-wine/ppa <h2>Warnung: Betapakete</h2> diff --git a/templates/en/download/ubuntu.template b/templates/en/download/ubuntu.template index caee2fd..740c923 100644 --- a/templates/en/download/ubuntu.template +++ b/templates/en/download/ubuntu.template @@ -21,7 +21,7 @@ Software tab and click Add. Then, copy and paste the line below. -ppa:ubuntu-wine/ppa +ppa:ubuntu-wine/ppa <h2>Warning: Beta packages</h2> diff --git a/templates/fr/download/ubuntu.template b/templates/fr/download/ubuntu.template index 09b52de..2a43a3d 100644 --- a/templates/fr/download/ubuntu.template +++ b/templates/fr/download/ubuntu.template @@ -23,7 +23,7 @@ alt="Système->Administration->Sources de logiciels->Autres logiciels" border="0 Ensuite, entrez la ligne suivante : -ppa:ubuntu-wine/ppa +ppa:ubuntu-wine/ppa <h2>Avertissement : paquets bêta</h2> diff --git a/templates/pl/download/ubuntu.template b/templates/pl/download/ubuntu.template index 2ebe476..09912c5 100644 --- a/templates/pl/download/ubuntu.template +++ b/templates/pl/download/ubuntu.template @@ -21,7 +21,7 @@ osób trzecich i kliknij Dodaj.... Następnie, wklej poniższą linijkę. -ppa:ubuntu-wine/ppa +ppa:ubuntu-wine/ppa <h2>Uwaga: paczki beta</h2> diff --git a/templates/pt/download/ubuntu.template b/templates/pt/download/ubuntu.template index 405f9f8..d11506e 100644 --- a/templates/pt/download/ubuntu.template +++ b/templates/pt/download/ubuntu.template @@ -19,9 +19,9 @@ e selecionando Editar->Fontes de Aplicativos. Escolha a aba <img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="Software Center->Edit->Software Sources->Other Software" border="0"> -<ppa>Depois, copie e cole a linha abaixo. +Depois, copie e cole a linha abaixo. -ppa:ubuntu-wine/ppa +ppa:ubuntu-wine/ppa <h2>Aviso: Pacotes Beta</h2> diff --git a/templates/tr/download/ubuntu.template b/templates/tr/download/ubuntu.template index 5c177ab..296c866 100644 --- a/templates/tr/download/ubuntu.template +++ b/templates/tr/download/ubuntu.template @@ -16,7 +16,7 @@ Ubuntu ve Ubuntu türevleri için Wine Ardından, aşağıdaki satırı kopyalayın ve yapıştırın. -ppa:ubuntu-wine/ppa +ppa:ubuntu-wine/ppa <h2>Uyarı: Beta paketleri</h2> diff --git a/templates/uk/download/ubuntu.template b/templates/uk/download/ubuntu.template index f346996..e646226 100644 --- a/templates/uk/download/ubuntu.template +++ b/templates/uk/download/ubuntu.template @@ -20,7 +20,7 @@ Software tab and click Add. Потім, скопіюйте та вставте рядок який вказано нижче. -ppa:ubuntu-wine/ppa +ppa:ubuntu-wine/ppa <h2>Попередження: Розробницькі пакунки</h2>

1 0

Dmitry Timoshkov : wbemprox: Remove unused IUnknown *outer parameter from object constructors.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 182ff187a968833c226e10892bce46ccadc3f836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=182ff187a968833c226e10892… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 30 18:21:36 2013 +0900 wbemprox: Remove unused IUnknown *outer parameter from object constructors. --- dlls/wbemprox/class.c | 9 ++++----- dlls/wbemprox/main.c | 7 ++----- dlls/wbemprox/qualifier.c | 5 ++--- dlls/wbemprox/query.c | 2 +- dlls/wbemprox/services.c | 8 ++++---- dlls/wbemprox/wbemlocator.c | 6 +++--- dlls/wbemprox/wbemprox_private.h | 8 ++++---- 7 files changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 4a8eb1e..58fbbf8 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -152,7 +152,7 @@ static HRESULT WINAPI enum_class_object_Clone( TRACE("%p, %p\n", iface, ppEnum); - return EnumWbemClassObject_create( NULL, ec->query, (void **)ppEnum ); + return EnumWbemClassObject_create( ec->query, (void **)ppEnum ); } static HRESULT WINAPI enum_class_object_Skip( @@ -190,12 +190,11 @@ static const IEnumWbemClassObjectVtbl enum_class_object_vtbl = enum_class_object_Skip }; -HRESULT EnumWbemClassObject_create( - IUnknown *pUnkOuter, struct query *query, LPVOID *ppObj ) +HRESULT EnumWbemClassObject_create( struct query *query, LPVOID *ppObj ) { struct enum_class_object *ec; - TRACE("%p, %p\n", pUnkOuter, ppObj); + TRACE("%p\n", ppObj); ec = heap_alloc( sizeof(*ec) ); if (!ec) return E_OUTOFMEMORY; @@ -551,7 +550,7 @@ static HRESULT WINAPI class_object_GetPropertyQualifierSet( TRACE("%p, %s, %p\n", iface, debugstr_w(wszProperty), ppQualSet); - return WbemQualifierSet_create( NULL, co->name, wszProperty, (void **)ppQualSet ); + return WbemQualifierSet_create( co->name, wszProperty, (void **)ppQualSet ); } static HRESULT WINAPI class_object_Clone( diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index 346ee87..d1b08f1 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); static HINSTANCE instance; -typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); +typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); typedef struct { @@ -87,14 +87,11 @@ static HRESULT WINAPI wbemprox_cf_CreateInstance( IClassFactory *iface, LPUNKNOW if (pOuter) return CLASS_E_NOAGGREGATION; - r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk ); + r = This->pfnCreateInstance( (LPVOID *)&punk ); if (FAILED(r)) return r; r = IUnknown_QueryInterface( punk, riid, ppobj ); - if (FAILED(r)) - return r; - IUnknown_Release( punk ); return r; } diff --git a/dlls/wbemprox/qualifier.c b/dlls/wbemprox/qualifier.c index b410534..4da3445 100644 --- a/dlls/wbemprox/qualifier.c +++ b/dlls/wbemprox/qualifier.c @@ -247,12 +247,11 @@ static const IWbemQualifierSetVtbl qualifier_set_vtbl = qualifier_set_EndEnumeration }; -HRESULT WbemQualifierSet_create( - IUnknown *pUnkOuter, const WCHAR *class, const WCHAR *member, LPVOID *ppObj ) +HRESULT WbemQualifierSet_create( const WCHAR *class, const WCHAR *member, LPVOID *ppObj ) { struct qualifier_set *set; - TRACE("%p, %p\n", pUnkOuter, ppObj); + TRACE("%p\n", ppObj); if (!(set = heap_alloc( sizeof(*set) ))) return E_OUTOFMEMORY; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index e1a10a4..5134d5b 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -314,7 +314,7 @@ HRESULT exec_query( const WCHAR *str, IEnumWbemClassObject **result ) if (hr != S_OK) goto done; hr = execute_view( query->view ); if (hr != S_OK) goto done; - hr = EnumWbemClassObject_create( NULL, query, (void **)result ); + hr = EnumWbemClassObject_create( query, (void **)result ); done: release_query( query ); diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index ac5eb74..fd87feb 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -282,7 +282,7 @@ static HRESULT WINAPI wbem_services_OpenNamespace( if ((strcmpiW( strNamespace, cimv2W ) && strcmpiW( strNamespace, defaultW )) || ws->namespace) return WBEM_E_INVALID_NAMESPACE; - return WbemServices_create( NULL, cimv2W, (void **)ppWorkingNamespace ); + return WbemServices_create( cimv2W, (void **)ppWorkingNamespace ); } static HRESULT WINAPI wbem_services_CancelAsyncCall( @@ -816,7 +816,7 @@ static HRESULT WINAPI wbem_services_ExecMethod( hr = execute_view( query->view ); if (hr != S_OK) goto done; - hr = EnumWbemClassObject_create( NULL, query, (void **)&result ); + hr = EnumWbemClassObject_create( query, (void **)&result ); if (hr != S_OK) goto done; hr = create_class_object( query->view->table->name, result, 0, NULL, &obj ); @@ -879,11 +879,11 @@ static const IWbemServicesVtbl wbem_services_vtbl = wbem_services_ExecMethodAsync }; -HRESULT WbemServices_create( IUnknown *pUnkOuter, const WCHAR *namespace, LPVOID *ppObj ) +HRESULT WbemServices_create( const WCHAR *namespace, LPVOID *ppObj ) { struct wbem_services *ws; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); ws = heap_alloc( sizeof(*ws) ); if (!ws) return E_OUTOFMEMORY; diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 07bd89f..463e6d4 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -194,7 +194,7 @@ static HRESULT WINAPI wbem_locator_ConnectServer( if (SecurityFlags) FIXME("unsupported flags\n"); - hr = WbemServices_create( NULL, namespace, (void **)ppNamespace ); + hr = WbemServices_create( namespace, (void **)ppNamespace ); heap_free( namespace ); heap_free( server ); if (SUCCEEDED( hr )) @@ -211,11 +211,11 @@ static const IWbemLocatorVtbl wbem_locator_vtbl = wbem_locator_ConnectServer }; -HRESULT WbemLocator_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT WbemLocator_create( LPVOID *ppObj ) { wbem_locator *wl; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); wl = heap_alloc( sizeof(*wl) ); if (!wl) return E_OUTOFMEMORY; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 2aed821..81c0fcc 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -207,12 +207,12 @@ void set_variant( VARTYPE, LONGLONG, void *, VARIANT * ) DECLSPEC_HIDDEN; HRESULT create_signature( const WCHAR *, const WCHAR *, enum param_direction, IWbemClassObject ** ) DECLSPEC_HIDDEN; -HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemServices_create(const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, struct record *, IWbemClassObject **) DECLSPEC_HIDDEN; -HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemQualifierSet_create(IUnknown *, const WCHAR *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT EnumWbemClassObject_create(struct query *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemQualifierSet_create(const WCHAR *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; HRESULT process_get_owner(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : winhttp: Remove unused IUnknown *outer parameter from object constructor.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: f8d79c83b446120295210b5752559560054cf7a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d79c83b446120295210b575… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 30 18:21:27 2013 +0900 winhttp: Remove unused IUnknown *outer parameter from object constructor. --- dlls/winhttp/main.c | 7 ++----- dlls/winhttp/request.c | 4 ++-- dlls/winhttp/winhttp_private.h | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 5827c10..9cdcc98 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -53,7 +53,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return TRUE; } -typedef HRESULT (*fnCreateInstance)( IUnknown *outer, void **obj ); +typedef HRESULT (*fnCreateInstance)( void **obj ); struct winhttp_cf { @@ -110,14 +110,11 @@ static HRESULT WINAPI requestcf_CreateInstance( if (outer) return CLASS_E_NOAGGREGATION; - hr = cf->pfnCreateInstance( outer, (void **)&unknown ); + hr = cf->pfnCreateInstance( (void **)&unknown ); if (FAILED(hr)) return hr; hr = IUnknown_QueryInterface( unknown, riid, obj ); - if (FAILED(hr)) - return hr; - IUnknown_Release( unknown ); return hr; } diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 84a0ed1..ed3430a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3814,11 +3814,11 @@ static const struct IWinHttpRequestVtbl winhttp_request_vtbl = winhttp_request_SetAutoLogonPolicy }; -HRESULT WinHttpRequest_create( IUnknown *unknown, void **obj ) +HRESULT WinHttpRequest_create( void **obj ) { struct winhttp_request *request; - TRACE("%p, %p\n", unknown, obj); + TRACE("%p\n", obj); if (!(request = heap_alloc( sizeof(*request) ))) return E_OUTOFMEMORY; request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index a149160..8f26704 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -282,7 +282,7 @@ void delete_domain( domain_t * ) DECLSPEC_HIDDEN; BOOL set_server_for_hostname( connect_t *, LPCWSTR, INTERNET_PORT ) DECLSPEC_HIDDEN; void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; -extern HRESULT WinHttpRequest_create( IUnknown *, void ** ) DECLSPEC_HIDDEN; +extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; static inline const char *debugstr_variant( const VARIANT *v ) {

1 0