January 2013 - Wine-commits

Bruno Jesus : ws2_32/tests: Add SO_ERROR [set|get]sockopt tests.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 02c199beed2ae6a0c2925235ce319844771753b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c199beed2ae6a0c2925235c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 17 22:33:05 2013 -0200 ws2_32/tests: Add SO_ERROR [set|get]sockopt tests. --- dlls/ws2_32/tests/sock.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8860448..56a64bc 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1192,6 +1192,34 @@ static void test_set_getsockopt(void) "got %d with %d (expected SOCKET_ERROR with WSAEINVAL)\n", err, WSAGetLastError()); + /* Test SO_ERROR set/get */ + SetLastError(0xdeadbeef); + i = 1234; + err = setsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, size); +todo_wine + ok( !err && !WSAGetLastError(), + "got %d with %d (expected 0 with 0)\n", + err, WSAGetLastError()); + + SetLastError(0xdeadbeef); + i = 4321; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); +todo_wine + ok( !err && !WSAGetLastError(), + "got %d with %d (expected 0 with 0)\n", + err, WSAGetLastError()); +todo_wine + ok (i == 1234, "got %d (expected 1234)\n", i); + + /* Test invalid optlen */ + SetLastError(0xdeadbeef); + size = 1; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); +todo_wine + ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEFAULT), + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", + err, WSAGetLastError()); + closesocket(s); }

1 0

Austin English : shell32: Add a stub for SHGetSetFolderCustomSettings.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 605f2f941e52e2f641ef38eabc0465add4ac6a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=605f2f941e52e2f641ef38eab… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 17 14:34:46 2013 -0800 shell32: Add a stub for SHGetSetFolderCustomSettings. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shlfolder.c | 11 +++++++++++ include/shlobj.h | 23 +++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index dc09187..790cc9f 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -259,7 +259,7 @@ 701 stdcall CDefFolderMenu_Create2(ptr ptr long ptr ptr ptr long ptr ptr) 704 stdcall -noname GUIDFromStringW(wstr ptr) - + 709 stdcall SHGetSetFolderCustomSettings(ptr str long) 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW 727 stdcall SHGetImageList(long ptr ptr) 730 stdcall -noname RestartDialogEx(long wstr long long) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index c4066b9..4d9f036 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -592,3 +592,14 @@ HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT ci FIXME("%p %u %p 0x%x: stub\n", pidlFolder, cidl, apidl, flags); return E_NOTIMPL; } + +/*********************************************************************** + * SHGetSetFolderCustomSettings + * + * Only in XP (up to SP2) and Server 2003 + */ +HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, LPCSTR path, DWORD flag ) +{ + FIXME("%p %s 0x%x: stub\n", fcs, path, flag); + return E_NOTIMPL; +} diff --git a/include/shlobj.h b/include/shlobj.h index 4502187..450aba0 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1430,6 +1430,29 @@ int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); #define SHCreateDirectoryEx WINELIB_NAME_AW(SHCreateDirectoryEx) /**************************************************************************** +* SHGetSetFolderCustomSettings API +*/ +typedef struct { + DWORD dwSize; + DWORD dwMask; + SHELLVIEWID *pvid; + LPWSTR pszWebViewTemplate; + DWORD cchWebViewTemplate; + LPWSTR pszWebViewTemplateVersion; + LPWSTR pszInfoTip; + DWORD cchInfoTip; + CLSID *pclsid; + DWORD dwFlags; + LPWSTR pszIconFile; + DWORD cchIconFile; + int iIconIndex; + LPWSTR pszLogo; + DWORD cchLogo; +} SHFOLDERCUSTOMSETTINGS, *LPSHFOLDERCUSTOMSETTINGS; + +HRESULT WINAPI SHGetSetFolderCustomSettings(LPSHFOLDERCUSTOMSETTINGS pfcs, LPCSTR pszPath, DWORD dwReadWrite); + +/**************************************************************************** * SHGetSpecialFolderLocation API */ HRESULT WINAPI SHGetSpecialFolderLocation(HWND hwndOwner, int nFolder, LPITEMIDLIST * ppidl);

1 0

Charles Davis : kernel32: Make CopyFile() call CopyFileEx() instead of the other way around.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: e21c805fbeefae5224ea8faf8e9ce4b94cabaeb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21c805fbeefae5224ea8faf8… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jan 17 13:28:43 2013 -0700 kernel32: Make CopyFile() call CopyFileEx() instead of the other way around. --- dlls/kernel32/path.c | 72 +++++++++++++++++++++++--------------------------- 1 files changed, 33 insertions(+), 39 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index a326058..e42b05b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -907,6 +907,36 @@ static BOOL is_same_file(HANDLE h1, HANDLE h2) */ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists ) { + return CopyFileExW( source, dest, NULL, NULL, NULL, + fail_if_exists ? COPY_FILE_FAIL_IF_EXISTS : 0 ); +} + + +/************************************************************************** + * CopyFileA (KERNEL32.@) + */ +BOOL WINAPI CopyFileA( LPCSTR source, LPCSTR dest, BOOL fail_if_exists) +{ + WCHAR *sourceW, *destW; + BOOL ret; + + if (!(sourceW = FILE_name_AtoW( source, FALSE ))) return FALSE; + if (!(destW = FILE_name_AtoW( dest, TRUE ))) return FALSE; + + ret = CopyFileW( sourceW, destW, fail_if_exists ); + + HeapFree( GetProcessHeap(), 0, destW ); + return ret; +} + + +/************************************************************************** + * CopyFileExW (KERNEL32.@) + */ +BOOL WINAPI CopyFileExW(LPCWSTR source, LPCWSTR dest, + LPPROGRESS_ROUTINE progress, LPVOID param, + LPBOOL cancel_ptr, DWORD flags) +{ static const int buffer_size = 65536; HANDLE h1, h2; BY_HANDLE_FILE_INFORMATION info; @@ -925,7 +955,7 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists ) return FALSE; } - TRACE("%s -> %s, %d\n", debugstr_w(source), debugstr_w(dest), fail_if_exists); + TRACE("%s -> %s, %x\n", debugstr_w(source), debugstr_w(dest), flags); if ((h1 = CreateFileW(source, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) @@ -943,7 +973,7 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists ) return FALSE; } - if (!fail_if_exists) + if (!(flags & COPY_FILE_FAIL_IF_EXISTS)) { BOOL same_file = FALSE; h2 = CreateFileW( dest, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, @@ -963,7 +993,7 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists ) } if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, - fail_if_exists ? CREATE_NEW : CREATE_ALWAYS, + (flags & COPY_FILE_FAIL_IF_EXISTS) ? CREATE_NEW : CREATE_ALWAYS, info.dwFileAttributes, h1 )) == INVALID_HANDLE_VALUE) { WARN("Unable to open dest %s\n", debugstr_w(dest)); @@ -995,42 +1025,6 @@ done: /************************************************************************** - * CopyFileA (KERNEL32.@) - */ -BOOL WINAPI CopyFileA( LPCSTR source, LPCSTR dest, BOOL fail_if_exists) -{ - WCHAR *sourceW, *destW; - BOOL ret; - - if (!(sourceW = FILE_name_AtoW( source, FALSE ))) return FALSE; - if (!(destW = FILE_name_AtoW( dest, TRUE ))) return FALSE; - - ret = CopyFileW( sourceW, destW, fail_if_exists ); - - HeapFree( GetProcessHeap(), 0, destW ); - return ret; -} - - -/************************************************************************** - * CopyFileExW (KERNEL32.@) - * - * This implementation ignores most of the extra parameters passed-in into - * the "ex" version of the method and calls the CopyFile method. - * It will have to be fixed eventually. - */ -BOOL WINAPI CopyFileExW(LPCWSTR sourceFilename, LPCWSTR destFilename, - LPPROGRESS_ROUTINE progressRoutine, LPVOID appData, - LPBOOL cancelFlagPointer, DWORD copyFlags) -{ - /* - * Interpret the only flag that CopyFile can interpret. - */ - return CopyFileW(sourceFilename, destFilename, (copyFlags & COPY_FILE_FAIL_IF_EXISTS) != 0); -} - - -/************************************************************************** * CopyFileExA (KERNEL32.@) */ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, LPCSTR destFilename,

1 0

Charles Davis : kernel32: Make CopyFile(Ex)() succeed even if the source file is delete-locked.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 5a3ff7ccc17e3d6a5651761dd89c6989ea5471eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a3ff7ccc17e3d6a5651761dd… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jan 17 13:28:44 2013 -0700 kernel32: Make CopyFile(Ex)() succeed even if the source file is delete-locked. --- dlls/kernel32/path.c | 3 ++- dlls/kernel32/tests/file.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index e42b05b..1cfd850 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -957,7 +957,8 @@ BOOL WINAPI CopyFileExW(LPCWSTR source, LPCWSTR dest, TRACE("%s -> %s, %x\n", debugstr_w(source), debugstr_w(dest), flags); - if ((h1 = CreateFileW(source, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + if ((h1 = CreateFileW(source, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) { WARN("Unable to open source %s\n", debugstr_w(source)); diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ce25cb9..3216fa5 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -652,11 +652,11 @@ static void test_CopyFileA(void) "copying from an r+w opened and r shared file failed (ret=%d, err=%d)\n", retok, GetLastError()); CloseHandle(hfile); - /* copying from a delete-locked source is unreliable */ + /* copying from a delete-locked source mostly succeeds */ hfile = CreateFileA(source, DELETE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError()); retok = CopyFileA(source, dest, FALSE); - ok((!retok && GetLastError() == ERROR_SHARING_VIOLATION) || broken(retok) /* 98, Vista, 2k8, 7 */, + ok(retok || broken(!retok && GetLastError() == ERROR_SHARING_VIOLATION) /* NT, 2000, XP */, "copying from a delete-locked file failed (ret=%d, err=%d)\n", retok, GetLastError()); CloseHandle(hfile);

1 0

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 52814a80b44586def9a1ea4f4299fd2e6172d750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52814a80b44586def9a1ea4f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 18 11:43:22 2013 +0100 msvcp: Sync implementations. --- dlls/msvcp60/msvcp60.spec | 324 ++++++++++---------- dlls/msvcp70/msvcp70.spec | 168 +++++----- dlls/msvcp71/math.c | 744 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/msvcp.h | 13 + dlls/msvcp71/msvcp71.spec | 456 ++++++++++++++-------------- dlls/msvcp80/msvcp80.spec | 456 ++++++++++++++-------------- 6 files changed, 1459 insertions(+), 702 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52814a80b44586def9a1e…

1 0

Henri Verbeet : ddraw: Avoid LPD3DSTATS.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 4f58e3ec48dc23eee76fd7abd5b35a9bb4fa5c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f58e3ec48dc23eee76fd7abd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 18 12:05:21 2013 +0100 ddraw: Avoid LPD3DSTATS. --- include/d3d.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index b3d765d..5db816b 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -941,7 +941,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture *tex1, IDirect3DTexture *tex2) PURE; STDMETHOD(CreateExecuteBuffer)(THIS_ D3DEXECUTEBUFFERDESC *desc, IDirect3DExecuteBuffer **buffer, IUnknown *outer) PURE; - STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; + STDMETHOD(GetStats)(THIS_ D3DSTATS *stats) PURE; STDMETHOD(Execute)(THIS_ IDirect3DExecuteBuffer *buffer, IDirect3DViewport *viewport, DWORD flags) PURE; STDMETHOD(AddViewport)(THIS_ IDirect3DViewport *viewport) PURE; @@ -1028,7 +1028,7 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) /*** IDirect3DDevice2 methods ***/ STDMETHOD(GetCaps)(THIS_ D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc) PURE; STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture2 *tex1, IDirect3DTexture2 *tex2) PURE; - STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; + STDMETHOD(GetStats)(THIS_ D3DSTATS *stats) PURE; STDMETHOD(AddViewport)(THIS_ IDirect3DViewport2 *viewport) PURE; STDMETHOD(DeleteViewport)(THIS_ IDirect3DViewport2 *viewport) PURE; STDMETHOD(NextViewport)(THIS_ IDirect3DViewport2 *ref, @@ -1147,7 +1147,7 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice3 methods ***/ STDMETHOD(GetCaps)(THIS_ D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc) PURE; - STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; + STDMETHOD(GetStats)(THIS_ D3DSTATS *stats) PURE; STDMETHOD(AddViewport)(THIS_ IDirect3DViewport3 *viewport) PURE; STDMETHOD(DeleteViewport)(THIS_ IDirect3DViewport3 *viewport) PURE; STDMETHOD(NextViewport)(THIS_ IDirect3DViewport3 *ref,

1 0

Nikolay Sivov : qmgr: COM cleanup for IBackgroundCopyFile interface.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: d4edda8c4627c76dfa2ef769b864faaec6959caa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4edda8c4627c76dfa2ef769b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 18 08:38:49 2013 +0400 qmgr: COM cleanup for IBackgroundCopyFile interface. --- dlls/qmgr/enum_files.c | 4 +- dlls/qmgr/file.c | 53 ++++++++++++++++++++++++++++------------------- dlls/qmgr/job.c | 6 +--- dlls/qmgr/qmgr.h | 4 +- 4 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index 9f1b505..7b0e505 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -202,8 +202,8 @@ HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl *job, IEnumBack i = 0; LIST_FOR_EACH_ENTRY(file, &job->files, BackgroundCopyFileImpl, entryFromJob) { - file->lpVtbl->AddRef((IBackgroundCopyFile *) file); - This->files[i] = (IBackgroundCopyFile *) file; + IBackgroundCopyFile_AddRef(&file->IBackgroundCopyFile_iface); + This->files[i] = &file->IBackgroundCopyFile_iface; ++i; } LeaveCriticalSection(&job->cs); diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 9d9d9c1..5fa5d09 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -35,6 +35,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); +static inline BackgroundCopyFileImpl *impl_from_IBackgroundCopyFile(IBackgroundCopyFile *iface) +{ + return CONTAINING_RECORD(iface, BackgroundCopyFileImpl, IBackgroundCopyFile_iface); +} + static void BackgroundCopyFileDestructor(BackgroundCopyFileImpl *This) { IBackgroundCopyJob2_Release(&This->owner->IBackgroundCopyJob2_iface); @@ -43,38 +48,43 @@ static void BackgroundCopyFileDestructor(BackgroundCopyFileImpl *This) HeapFree(GetProcessHeap(), 0, This); } -static ULONG WINAPI BITS_IBackgroundCopyFile_AddRef(IBackgroundCopyFile* iface) -{ - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; - return InterlockedIncrement(&This->ref); -} - static HRESULT WINAPI BITS_IBackgroundCopyFile_QueryInterface( IBackgroundCopyFile* iface, REFIID riid, - void **ppvObject) + void **obj) { - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IBackgroundCopyFile)) { - *ppvObject = &This->lpVtbl; - BITS_IBackgroundCopyFile_AddRef(iface); + *obj = iface; + IBackgroundCopyFile_AddRef(iface); return S_OK; } - *ppvObject = NULL; + *obj = NULL; return E_NOINTERFACE; } +static ULONG WINAPI BITS_IBackgroundCopyFile_AddRef(IBackgroundCopyFile* iface) +{ + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} static ULONG WINAPI BITS_IBackgroundCopyFile_Release( IBackgroundCopyFile* iface) { - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + if (ref == 0) BackgroundCopyFileDestructor(This); @@ -86,7 +96,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyFile_GetRemoteName( IBackgroundCopyFile* iface, LPWSTR *pVal) { - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); int n = (lstrlenW(This->info.RemoteName) + 1) * sizeof(WCHAR); *pVal = CoTaskMemAlloc(n); @@ -101,7 +111,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyFile_GetLocalName( IBackgroundCopyFile* iface, LPWSTR *pVal) { - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); int n = (lstrlenW(This->info.LocalName) + 1) * sizeof(WCHAR); *pVal = CoTaskMemAlloc(n); @@ -116,7 +126,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyFile_GetProgress( IBackgroundCopyFile* iface, BG_FILE_PROGRESS *pVal) { - BackgroundCopyFileImpl *This = (BackgroundCopyFileImpl *) iface; + BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); EnterCriticalSection(&This->owner->cs); pVal->BytesTotal = This->fileProgress.BytesTotal; @@ -139,13 +149,12 @@ static const IBackgroundCopyFileVtbl BITS_IBackgroundCopyFile_Vtbl = HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, LPCWSTR remoteName, LPCWSTR localName, - LPVOID *ppObj) + BackgroundCopyFileImpl **file) { BackgroundCopyFileImpl *This; int n; - TRACE("(%s,%s,%p)\n", debugstr_w(remoteName), - debugstr_w(localName), ppObj); + TRACE("(%s, %s, %p)\n", debugstr_w(remoteName), debugstr_w(localName), file); This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); if (!This) @@ -170,7 +179,7 @@ HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, } memcpy(This->info.LocalName, localName, n); - This->lpVtbl = &BITS_IBackgroundCopyFile_Vtbl; + This->IBackgroundCopyFile_iface.lpVtbl = &BITS_IBackgroundCopyFile_Vtbl; This->ref = 1; This->fileProgress.BytesTotal = BG_SIZE_UNKNOWN; @@ -179,7 +188,7 @@ HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, This->owner = owner; IBackgroundCopyJob2_AddRef(&owner->IBackgroundCopyJob2_iface); - *ppObj = &This->lpVtbl; + *file = This; return S_OK; } @@ -236,7 +245,7 @@ static ULONG WINAPI DLBindStatusCallback_Release(IBindStatusCallback *iface) if (ref == 0) { - IBackgroundCopyFile_Release((IBackgroundCopyFile *) This->file); + IBackgroundCopyFile_Release(&This->file->IBackgroundCopyFile_iface); HeapFree(GetProcessHeap(), 0, This); } @@ -365,7 +374,7 @@ static DLBindStatusCallback *DLBindStatusCallbackConstructor( return NULL; This->IBindStatusCallback_iface.lpVtbl = &DLBindStatusCallback_Vtbl; - IBackgroundCopyFile_AddRef((IBackgroundCopyFile *) file); + IBackgroundCopyFile_AddRef(&file->IBackgroundCopyFile_iface); This->file = file; This->ref = 1; return This; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 4d9bf18..26fc43e 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -106,20 +106,18 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_AddFile( LPCWSTR LocalName) { BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); - IBackgroundCopyFile *pFile; BackgroundCopyFileImpl *file; HRESULT res; /* We should return E_INVALIDARG in these cases. */ FIXME("Check for valid filenames and supported protocols\n"); - res = BackgroundCopyFileConstructor(This, RemoteUrl, LocalName, (LPVOID *) &pFile); + res = BackgroundCopyFileConstructor(This, RemoteUrl, LocalName, &file); if (res != S_OK) return res; /* Add a reference to the file to file list */ - IBackgroundCopyFile_AddRef(pFile); - file = (BackgroundCopyFileImpl *) pFile; + IBackgroundCopyFile_AddRef(&file->IBackgroundCopyFile_iface); EnterCriticalSection(&This->cs); list_add_head(&This->files, &file->entryFromJob); This->jobProgress.BytesTotal = BG_SIZE_UNKNOWN; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 0039db7..215c200 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -49,7 +49,7 @@ typedef struct /* Background copy file vtbl and related data */ typedef struct { - const IBackgroundCopyFileVtbl *lpVtbl; + IBackgroundCopyFile IBackgroundCopyFile_iface; LONG ref; BG_FILE_INFO info; BG_FILE_PROGRESS fileProgress; @@ -84,7 +84,7 @@ HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCopyJobs **enumjob) DECLSPEC_HIDDEN; HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, LPCWSTR remoteName, LPCWSTR localName, - LPVOID *ppObj) DECLSPEC_HIDDEN; + BackgroundCopyFileImpl **file) DECLSPEC_HIDDEN; HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl*, IEnumBackgroundCopyFiles**) DECLSPEC_HIDDEN; DWORD WINAPI fileTransfer(void *param) DECLSPEC_HIDDEN; void processJob(BackgroundCopyJobImpl *job) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : qmgr: Remove separate release helpers.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 53e25cb4f60bd2d760a9b2fe8b83de3765ad89d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e25cb4f60bd2d760a9b2fe8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 18 08:39:15 2013 +0400 qmgr: Remove separate release helpers. --- dlls/qmgr/file.c | 15 ++++++--------- dlls/qmgr/job.c | 15 ++++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 5fa5d09..ccba81b 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -40,14 +40,6 @@ static inline BackgroundCopyFileImpl *impl_from_IBackgroundCopyFile(IBackgroundC return CONTAINING_RECORD(iface, BackgroundCopyFileImpl, IBackgroundCopyFile_iface); } -static void BackgroundCopyFileDestructor(BackgroundCopyFileImpl *This) -{ - IBackgroundCopyJob2_Release(&This->owner->IBackgroundCopyJob2_iface); - HeapFree(GetProcessHeap(), 0, This->info.LocalName); - HeapFree(GetProcessHeap(), 0, This->info.RemoteName); - HeapFree(GetProcessHeap(), 0, This); -} - static HRESULT WINAPI BITS_IBackgroundCopyFile_QueryInterface( IBackgroundCopyFile* iface, REFIID riid, @@ -86,7 +78,12 @@ static ULONG WINAPI BITS_IBackgroundCopyFile_Release( TRACE("(%p)->(%d)\n", This, ref); if (ref == 0) - BackgroundCopyFileDestructor(This); + { + IBackgroundCopyJob2_Release(&This->owner->IBackgroundCopyJob2_iface); + HeapFree(GetProcessHeap(), 0, This->info.LocalName); + HeapFree(GetProcessHeap(), 0, This->info.RemoteName); + HeapFree(GetProcessHeap(), 0, This); + } return ref; } diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 26fc43e..4abf220 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -28,14 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); -static void BackgroundCopyJobDestructor(BackgroundCopyJobImpl *This) -{ - This->cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This->displayName); - HeapFree(GetProcessHeap(), 0, This); -} - static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJob2(IBackgroundCopyJob2 *iface) { return CONTAINING_RECORD(iface, BackgroundCopyJobImpl, IBackgroundCopyJob2_iface); @@ -77,7 +69,12 @@ static ULONG WINAPI BITS_IBackgroundCopyJob_Release(IBackgroundCopyJob2 *iface) TRACE("(%p)->(%d)\n", This, ref); if (ref == 0) - BackgroundCopyJobDestructor(This); + { + This->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->cs); + HeapFree(GetProcessHeap(), 0, This->displayName); + HeapFree(GetProcessHeap(), 0, This); + } return ref; }

1 0

Nikolay Sivov : xmllite: Initial support for start tag parsing.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 61b46738274a7d4ad9b7bc5c5b51615feb8951bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b46738274a7d4ad9b7bc5c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 18 10:04:27 2013 +0400 xmllite: Initial support for start tag parsing. --- dlls/xmllite/reader.c | 140 +++++++++++++++++++++++++++++++++++++++--- dlls/xmllite/tests/reader.c | 67 ++++++++++++++++++++ 2 files changed, 197 insertions(+), 10 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c3f53b4..058875a 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -51,7 +51,8 @@ typedef enum XmlReadInState_Misc_DTD, XmlReadInState_DTD, XmlReadInState_DTD_Misc, - XmlReadInState_Element + XmlReadInState_Element, + XmlReadInState_Content } XmlReaderInternalState; typedef enum @@ -448,11 +449,28 @@ static void readerinput_grow(xmlreaderinput *readerinput, int length) } } -static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) +static inline int readerinput_is_utf8(xmlreaderinput *readerinput) { - encoded_buffer *buffer = &readerinput->buffer->encoded; static char startA[] = {'<','?'}; static char commentA[] = {'<','!'}; + encoded_buffer *buffer = &readerinput->buffer->encoded; + unsigned char *ptr = (unsigned char*)buffer->data; + + return !memcmp(buffer->data, startA, sizeof(startA)) || + !memcmp(buffer->data, commentA, sizeof(commentA)) || + /* test start byte */ + (ptr[0] == '<' && + ( + (ptr[1] && (ptr[1] <= 0x7f)) || + (buffer->data[1] >> 5) == 0x6 || /* 2 bytes */ + (buffer->data[1] >> 4) == 0xe || /* 3 bytes */ + (buffer->data[1] >> 3) == 0x1e) /* 4 bytes */ + ); +} + +static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; static WCHAR startW[] = {'<','?'}; static WCHAR commentW[] = {'<','!'}; static char utf8bom[] = {0xef,0xbb,0xbf}; @@ -464,8 +482,7 @@ static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encod /* try start symbols if we have enough data to do that, input buffer should contain first chunk already */ - if (!memcmp(buffer->data, startA, sizeof(startA)) || - !memcmp(buffer->data, commentA, sizeof(commentA))) + if (readerinput_is_utf8(readerinput)) *enc = XmlEncoding_UTF8; else if (!memcmp(buffer->data, startW, sizeof(startW)) || !memcmp(buffer->data, commentW, sizeof(commentW))) @@ -987,9 +1004,10 @@ static inline int is_namestartchar(WCHAR ch) (ch >= 0xfdf0 && ch <= 0xfffd); } -static inline int is_namechar(WCHAR ch) +/* [4 NS] NCName ::= Name - (Char* ':' Char*) */ +static inline int is_ncnamechar(WCHAR ch) { - return (ch == ':') || (ch >= 'A' && ch <= 'Z') || + return (ch >= 'A' && ch <= 'Z') || (ch == '_') || (ch >= 'a' && ch <= 'z') || (ch == '-') || (ch == '.') || (ch >= '0' && ch <= '9') || @@ -1011,6 +1029,11 @@ static inline int is_namechar(WCHAR ch) (ch >= 0xfdf0 && ch <= 0xfffd); } +static inline int is_namechar(WCHAR ch) +{ + return (ch == ':') || is_ncnamechar(ch); +} + /* [4] NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF] @@ -1316,11 +1339,106 @@ static HRESULT reader_parse_dtd(xmlreader *reader) return S_OK; } +/* [7 NS] QName ::= PrefixedName | UnprefixedName + [8 NS] PrefixedName ::= Prefix ':' LocalPart + [9 NS] UnprefixedName ::= LocalPart + [10 NS] Prefix ::= NCName + [11 NS] LocalPart ::= NCName */ +static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *local, strval *qname) +{ + WCHAR *ptr, *start = reader_get_cur(reader); + + ptr = start; + if (!is_ncnamechar(*ptr)) return NC_E_QNAMECHARACTER; + + while (is_ncnamechar(*ptr)) + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + + /* got a qualified name */ + if (*ptr == ':') + { + prefix->str = start; + prefix->len = ptr-start; + + reader_skipn(reader, 1); + start = ptr = reader_get_cur(reader); + + while (is_ncnamechar(*ptr)) + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + } + else + { + prefix->str = NULL; + prefix->len = 0; + } + + local->str = start; + local->len = ptr-start; + + if (prefix->len) + TRACE("qname %s:%s\n", debugstr_wn(prefix->str, prefix->len), debugstr_wn(local->str, local->len)); + else + TRACE("ncname %s\n", debugstr_wn(local->str, local->len)); + + qname->str = prefix->str ? prefix->str : local->str; + /* count ':' too */ + qname->len = (prefix->len ? prefix->len + 1 : 0) + local->len; + + return S_OK; +} + +/* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' + [14 NS] EmptyElemTag ::= '<' QName (S Attribute)* S? '/>' */ +static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname) +{ + static const WCHAR endW[] = {'/','>',0}; + HRESULT hr; + + /* skip '<' */ + reader_skipn(reader, 1); + + hr = reader_parse_qname(reader, prefix, local, qname); + if (FAILED(hr)) return hr; + + reader_skipspaces(reader); + + if (!reader_cmp(reader, endW)) return S_OK; + + FIXME("only empty elements without attributes supported\n"); + return E_NOTIMPL; +} + /* [39] element ::= EmptyElemTag | STag content ETag */ static HRESULT reader_parse_element(xmlreader *reader) { - FIXME("element parsing not implemented\n"); - return E_NOTIMPL; + static const WCHAR ltW[] = {'<',0}; + strval qname, prefix, local; + HRESULT hr; + + /* check if we are really on element */ + if (reader_cmp(reader, ltW)) return S_FALSE; + reader_shrink(reader); + + /* this handles empty elements too */ + hr = reader_parse_stag(reader, &prefix, &local, &qname); + if (FAILED(hr)) return hr; + + /* FIXME: need to check for defined namespace to reject invalid prefix, + currently reject all prefixes */ + if (prefix.len) return NC_E_UNDECLAREDPREFIX; + + reader->nodetype = XmlNodeType_Element; + reader_set_strvalue(reader, StringValue_LocalName, &local); + reader_set_strvalue(reader, StringValue_QualifiedName, &qname); + + FIXME("element content parsing not implemented\n"); + return hr; } static HRESULT reader_parse_nextnode(xmlreader *reader) @@ -1389,7 +1507,9 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) case XmlReadInState_Element: hr = reader_parse_element(reader); if (FAILED(hr)) return hr; - break; + + reader->instate = XmlReadInState_Content; + return hr; default: FIXME("internal state %d not handled\n", reader->instate); return E_NOTIMPL; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index d084e7b..7394564 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1022,6 +1022,72 @@ todo_wine { IXmlReader_Release(reader); } +static struct test_entry element_tests[] = { + { "<a/>", "a", "", S_OK }, + { "<a />", "a", "", S_OK }, + { "<a:b/>", "a:b", "", NC_E_UNDECLAREDPREFIX }, + { "<:a/>", NULL, NULL, NC_E_QNAMECHARACTER }, + { "< a/>", NULL, NULL, NC_E_QNAMECHARACTER }, + { NULL } +}; + +static void test_read_element(void) +{ + struct test_entry *test = element_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + if (test->hr_broken) + ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + else + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_Element, "got %d for %s\n", type, test->xml); + + len = 0; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + /* value */ + len = 1; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + } + + IStream_Release(stream); + test++; + } + + IXmlReader_Release(reader); +} + START_TEST(reader) { HRESULT r; @@ -1041,6 +1107,7 @@ START_TEST(reader) test_read_comment(); test_read_pi(); test_read_dtd(); + test_read_element(); test_read_full(); test_read_xmldeclaration();

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: d7ac251e8dc69687c8c64f4ecd63168783e2ff60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ac251e8dc69687c8c64f4ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 18 08:38:28 2013 +0400 po: Update Russian translation. --- po/ru.po | 164 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 79 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7ac251e8dc69687c8c64…

1 0