wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Nikolay Sivov : scrrun: Implement Clone() for file collection.
by Alexandre Julliard 08 Jan '14

08 Jan '14

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

Nikolay Sivov : scrrun: Implement Clone() for folder collection.
by Alexandre Julliard 08 Jan '14

08 Jan '14

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 08 Jan '14

08 Jan '14

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

Nikolay Sivov : scrrun: Implement Skip() for file and folder collections.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 64c93f607055c76a5ed4fa8f6a8fa1b68b2b42e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c93f607055c76a5ed4fa8f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:36:29 2014 +0400 scrrun: Implement Skip() for file and folder collections. --- dlls/scrrun/filesystem.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 1c0c6c3..eb9073a 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -545,8 +545,16 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%d): stub\n", This, celt); - return E_NOTIMPL; + HANDLE handle = This->data.u.foldercoll.find; + WIN32_FIND_DATAW data; + + TRACE("(%p)->(%d)\n", This, celt); + + while (FindNextFileW(handle, &data) && celt) + if (is_dir_data(&data)) + --celt; + + return celt ? S_FALSE : S_OK; } static HRESULT WINAPI foldercoll_enumvariant_Reset(IEnumVARIANT *iface) @@ -698,8 +706,16 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%d): stub\n", This, celt); - return E_NOTIMPL; + HANDLE handle = This->data.u.filecoll.find; + WIN32_FIND_DATAW data; + + TRACE("(%p)->(%d)\n", This, celt); + + while (FindNextFileW(handle, &data) && celt) + if (is_file_data(&data)) + --celt; + + return celt ? S_FALSE : S_OK; } static HRESULT WINAPI filecoll_enumvariant_Reset(IEnumVARIANT *iface)

1 0

Michael Stefaniuc : dmime: Fix copy and paste errors.
by Alexandre Julliard 08 Jan '14

08 Jan '14

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

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

08 Jan '14

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

Jacek Caban : htaccess: Set content type for file.winetest.
by Alexandre Julliard 08 Jan '14

08 Jan '14

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 08 Jan '14

08 Jan '14

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

Piotr Caban : msvcr110: Add __crtTerminateProcess implementation.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 460991a8e993336177e43996e773970decd3b1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=460991a8e993336177e43996e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 7 16:14:17 2014 +0100 msvcr110: Add __crtTerminateProcess implementation. --- dlls/msvcr110/msvcr110.c | 8 ++++++++ dlls/msvcr110/msvcr110.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr110/msvcr110.c b/dlls/msvcr110/msvcr110.c index 04a0dc2..51fce29 100644 --- a/dlls/msvcr110/msvcr110.c +++ b/dlls/msvcr110/msvcr110.c @@ -62,3 +62,11 @@ int CDECL MSVCR110__crtGetShowWindowMode(void) TRACE("window=%d\n", si.wShowWindow); return si.wShowWindow; } + +/********************************************************************* + * __crtTerminateProcess (MSVCR110.@) + */ +int CDECL MSVCR110__crtTerminateProcess(UINT exit_code) +{ + return TerminateProcess(GetCurrentProcess(), exit_code); +} diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9b3ebe8..19e1769 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -929,7 +929,7 @@ @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub -arch=i386,win64 __crtSetThreadStackGuarantee @ cdecl __crtSetUnhandledExceptionFilter(ptr) MSVCR110__crtSetUnhandledExceptionFilter -@ stub -arch=i386,win64 __crtTerminateProcess +@ cdecl -arch=i386,win64 __crtTerminateProcess(long) MSVCR110__crtTerminateProcess @ stub -arch=i386,win64 __crtUnhandledException @ cdecl __daylight() msvcrt.__daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit

1 0

Piotr Caban : msvcr110: Add __libm_sse2_sqrt_precise implementation.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 07566faaca053d7b2c9915e9a2bd20fdf51ba81f URL: http://source.winehq.org/git/wine.git/?a=commit;h=07566faaca053d7b2c9915e9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 7 15:47:34 2014 +0100 msvcr110: Add __libm_sse2_sqrt_precise implementation. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcrt/math.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ba588f9..9b3ebe8 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1394,7 +1394,7 @@ @ cdecl -arch=i386 _libm_sse2_log_precise() msvcrt.__libm_sse2_log @ cdecl -arch=i386 _libm_sse2_pow_precise() msvcrt.__libm_sse2_pow @ cdecl -arch=i386 _libm_sse2_sin_precise() msvcrt.__libm_sse2_sin -@ stub -arch=i386 _libm_sse2_sqrt_precise +@ cdecl -arch=i386 _libm_sse2_sqrt_precise() msvcrt.__libm_sse2_sqrt_precise @ cdecl -arch=i386 _libm_sse2_tan_precise() msvcrt.__libm_sse2_tan @ cdecl _loaddll(str) msvcrt._loaddll @ cdecl -arch=x86_64 _local_unwind(ptr ptr) msvcrt._local_unwind diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6bcc2b7..6af8776 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2185,4 +2185,13 @@ void __cdecl __libm_sse2_tanf(void) __asm__ __volatile__( "movd %0,%%xmm0" : : "g" (f) ); } +/* __libm_sse2_sqrt_precise */ +void __cdecl __libm_sse2_sqrt_precise(void) +{ + double d; + __asm__ __volatile__( "movd %%xmm0,%0" : "=m" (d) ); + d = sqrt( d ); + __asm__ __volatile__( "movd %0,%%xmm0" : : "m" (d) ); +} + #endif /* __i386__ */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e482784..fa458a4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1538,3 +1538,4 @@ @ cdecl _fstat32(long ptr) @ cdecl _fstat64i32(long ptr) @ cdecl _is_exception_typeof(ptr ptr) +@ cdecl -arch=i386 __libm_sse2_sqrt_precise()

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
82
Older →

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