wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Orion Poplawski : msvcrt: Bump MSVCRT_MB_LEN_MAX to 5 and use it in MSVCRT__wctomb_l for default buffer lengthSet MB_LEN_MAX to 5 to match MSVCRT_MB_LEN_MAX.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: 8bf17329625320b45d6742feed43771dd3306291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf17329625320b45d6742fee… Author: Orion Poplawski <orion(a)cora.nwra.com> Date: Mon Feb 2 16:14:59 2015 -0700 msvcrt: Bump MSVCRT_MB_LEN_MAX to 5 and use it in MSVCRT__wctomb_l for default buffer lengthSet MB_LEN_MAX to 5 to match MSVCRT_MB_LEN_MAX. --- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/wcs.c | 2 +- include/msvcrt/limits.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 41f31b9..806c4bf 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -47,7 +47,7 @@ #define MSVCRT_I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) #define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) -#define MSVCRT_MB_LEN_MAX 2 +#define MSVCRT_MB_LEN_MAX 5 #ifdef _WIN64 #define MSVCRT_SIZE_MAX MSVCRT_UI64_MAX #else diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5bc544c..98bc686 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1474,7 +1474,7 @@ int CDECL MSVCRT__wctomb_l(char *dst, MSVCRT_wchar_t ch, MSVCRT__locale_t locale { int len; - MSVCRT__wctomb_s_l(&len, dst, dst ? 6 : 0, ch, locale); + MSVCRT__wctomb_s_l(&len, dst, dst ? MSVCRT_MB_LEN_MAX : 0, ch, locale); return len; } diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h index d0f058b..ece8c68 100644 --- a/include/msvcrt/limits.h +++ b/include/msvcrt/limits.h @@ -4,7 +4,7 @@ #include <crtdefs.h> #define CHAR_BIT 8 -#define MB_LEN_MAX 2 +#define MB_LEN_MAX 5 #define SCHAR_MIN (-0x80) #define SCHAR_MAX 0x7f

1 0

Jacek Caban : mshtml: Use our submit implementation for all windows, but only for POST method.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: f0fc2ba27d933c49313e19eabce3ce973597f37b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0fc2ba27d933c49313e19eab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 2 13:43:49 2015 +0100 mshtml: Use our submit implementation for all windows, but only for POST method. --- dlls/mshtml/binding.h | 3 ++- dlls/mshtml/htmlform.c | 23 ++++++++++++++----- dlls/mshtml/navigate.c | 16 +++++++++++++- dlls/mshtml/nsiface.idl | 59 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/nsio.c | 19 ++++++++++++++-- dlls/mshtml/persist.c | 2 +- 6 files changed, 111 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0fc2ba27d933c49313e1…

1 0

Ken Thomases : opengl32: Fix get_current_context_type() to not shift the type bits down.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: 4a6743e91353ffa8cfdf5183c6518bd95327a835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6743e91353ffa8cfdf5183c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 2 15:51:42 2015 -0600 opengl32: Fix get_current_context_type() to not shift the type bits down. The result is compared directly with handle type values like HANDLE_CONTEXT whose meaningful values are in the high nibble. --- dlls/opengl32/wgl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index cb91699..6ff54f0 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -165,7 +165,7 @@ static void free_handle_ptr( struct wgl_handle *ptr ) static inline enum wgl_handle_type get_current_context_type(void) { if (!NtCurrentTeb()->glCurrentRC) return HANDLE_CONTEXT; - return (LOWORD(NtCurrentTeb()->glCurrentRC) & HANDLE_TYPE_MASK) >> 12; + return LOWORD(NtCurrentTeb()->glCurrentRC) & HANDLE_TYPE_MASK; } /***********************************************************************

1 0

Matteo Bruni : wined3d: Use the core version of the asynchronous queries functions.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: 9defaa53a1052fcd9e0c75a50ecbfaafe6b08c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9defaa53a1052fcd9e0c75a50… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 29 18:45:04 2015 +0100 wined3d: Use the core version of the asynchronous queries functions. --- dlls/wined3d/context.c | 16 ++++++++-------- dlls/wined3d/directx.c | 16 ++++++++++++++-- dlls/wined3d/query.c | 22 +++++++++++----------- 3 files changed, 33 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9defaa53a1052fcd9e0c7…

1 0

Matteo Bruni : opengl32: Don' t use deprecated functions for extension checking purposes on core profile contexts.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: 1e48bbb7acf3bfc43c5d041a2680d73aed9e40c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e48bbb7acf3bfc43c5d041a2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 29 18:45:00 2015 +0100 opengl32: Don't use deprecated functions for extension checking purposes on core profile contexts. --- dlls/opengl32/wgl.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 32d241c..cb91699 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -162,6 +162,12 @@ static void free_handle_ptr( struct wgl_handle *ptr ) LeaveCriticalSection( &wgl_section ); } +static inline enum wgl_handle_type get_current_context_type(void) +{ + if (!NtCurrentTeb()->glCurrentRC) return HANDLE_CONTEXT; + return (LOWORD(NtCurrentTeb()->glCurrentRC) & HANDLE_TYPE_MASK) >> 12; +} + /*********************************************************************** * wglCopyContext (OPENGL32.@) */ @@ -684,6 +690,30 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, /* check if the extension is present in the list */ static BOOL has_extension( const char *list, const char *ext, size_t len ) { + if (!list) + { + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + const char *gl_ext; + unsigned int i; + GLint extensions_count; + + if (!funcs->ext.p_glGetStringi) + { + void **func_ptr = (void **)&funcs->ext.p_glGetStringi; + + *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); + } + + glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count); + for (i = 0; i < extensions_count; ++i) + { + gl_ext = (const char *)funcs->ext.p_glGetStringi(GL_EXTENSIONS, i); + if (!strncmp(gl_ext, ext, len) && !gl_ext[len]) + return TRUE; + } + return FALSE; + } + while (list) { while (*list == ' ') list++; @@ -701,15 +731,21 @@ static int compar(const void *elt_a, const void *elt_b) { /* Check if a GL extension is supported */ static BOOL is_extension_supported(const char* extension) { + enum wgl_handle_type type = get_current_context_type(); const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - const char *gl_ext_string = (const char*)glGetString(GL_EXTENSIONS); + const char *gl_ext_string = NULL; size_t len; TRACE("Checking for extension '%s'\n", extension); - if(!gl_ext_string) { - ERR("No OpenGL extensions found, check if your OpenGL setup is correct!\n"); - return FALSE; + if (type == HANDLE_CONTEXT) + { + gl_ext_string = (const char*)glGetString(GL_EXTENSIONS); + if (!gl_ext_string) + { + ERR("No OpenGL extensions found, check if your OpenGL setup is correct!\n"); + return FALSE; + } } /* We use the GetProcAddress function from the display driver to retrieve function pointers

1 0

Piotr Caban : msvcp71: Added basic_string<char>::insert(iterator, char*, char*) implementation.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: ae372f53f79a0cc22e88e63920fa83e9df5cd1e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae372f53f79a0cc22e88e6392… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jan 31 16:22:26 2015 +0100 msvcp71: Added basic_string<char>::insert(iterator, char*, char*) implementation. --- dlls/msvcp71/msvcp71.spec | 4 ++-- dlls/msvcp90/string.c | 27 +++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 0bac67c..6b62d5c 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -3832,8 +3832,8 @@ @ thiscall -arch=win32 ?insert@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@IPBDI@Z(ptr long ptr long) basic_string_char_insert_cstr_len @ cdecl -arch=win64 ?insert@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAAEAV12@_KPEBD@Z(ptr long str) basic_string_char_insert_cstr @ thiscall -arch=win32 ?insert@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXViterator@12@ID@Z(ptr ptr long long) basic_string_char_insert_iter_chn -@ thiscall -arch=win32 ?insert@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXViterator@12@PBD1@Z(ptr ptr ptr ptr) basic_string_wchar_insert_iter_ptr_ptr -@ thiscall -arch=win32 ?insert@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXViterator@12@Vconst_iterator@12@1@Z(ptr ptr ptr ptr) basic_string_wchar_insert_iter_beg_end +@ thiscall -arch=win32 ?insert@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXViterator@12@PBD1@Z(ptr ptr ptr ptr) basic_string_char_insert_iter_ptr_ptr +@ thiscall -arch=win32 ?insert@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXViterator@12@Vconst_iterator@12@1@Z(ptr ptr ptr ptr) basic_string_char_insert_iter_beg_end @ thiscall -arch=win32 ?insert@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE?AViterator@12@V312@@Z(ptr ptr ptr) basic_string_wchar_insert_iter_null @ thiscall -arch=win32 ?insert@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE?AViterator@12@V312@G@Z(ptr ptr ptr long) basic_string_wchar_insert_iter_ch @ thiscall -arch=win32 ?insert@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEAAV12@IABV12@@Z(ptr long ptr) basic_string_wchar_insert diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 810fb5a..3afb375 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -4138,6 +4138,15 @@ basic_string_char* __thiscall basic_string_char_replace_iter_ch(basic_string_cha return this; } +static basic_string_char* basic_string_char_replace_iter_ptr_ptr(basic_string_char *this, + basic_string_char_iterator beg, basic_string_char_iterator end, + const char *res_beg, const char *res_end) +{ + basic_string_char_iterator begin = { basic_string_char_ptr(this) }; + return basic_string_char_replace_cstr_len(this, basic_string_char__Pdif(beg, begin), + basic_string_char__Pdif(end, beg), res_beg, res_end-res_beg); +} + /* ?replace@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@Viterator@12@0PBD1@Z */ /* ?replace@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEAAV12@V?$_Ptrit@DHPADAADPADAAD@2@0PBD1@Z */ DEFINE_THISCALL_WRAPPER(basic_string_char_replace_iter_beg_end, 20) @@ -4205,6 +4214,22 @@ basic_string_char_iterator* __thiscall basic_string_char_insert_iter_null(basic_ return basic_string_char_insert_iter_ch(this, ret, where, 0); } +/* ?insert@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXViterator@12@PBD1@Z */ +DEFINE_THISCALL_WRAPPER(basic_string_char_insert_iter_ptr_ptr, 16) +void __thiscall basic_string_char_insert_iter_ptr_ptr(basic_string_char *this, + basic_string_char_iterator where, const char *beg, const char *end) +{ + basic_string_char_replace_iter_ptr_ptr(this, where, where, beg, end); +} + +/* ?insert@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXViterator@12@PBD1@Z */ +DEFINE_THISCALL_WRAPPER(basic_string_char_insert_iter_beg_end, 16) +void __thiscall basic_string_char_insert_iter_beg_end(basic_string_char *this, + basic_string_char_iterator where, basic_string_char_iterator beg, basic_string_char_iterator end) +{ + basic_string_char_replace_iter_ptr_ptr(this, where, where, beg.pos, end.pos); +} + /* ?begin@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AViterator@12@XZ */ /* ?begin@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE?AVconst_iterator@12@XZ */ /* ?rend@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$reverse_iterator@Viterator@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@XZ */ @@ -4360,8 +4385,6 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_iter_ch(basic_string_w return this; } -/* ?replace@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEAAV12@V?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@0PB_W1@Z */ -/* ?replace@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAAEAV12@V?$_String_const_iterator@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@0PEB_W1@Z */ static basic_string_wchar* basic_string_wchar_replace_iter_ptr_ptr(basic_string_wchar *this, basic_string_wchar_iterator beg, basic_string_wchar_iterator end, const wchar_t *res_beg, const wchar_t *res_end)

1 0

Piotr Caban : shell32: Add partial support for Mac trash enumeration.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: 6dac2f7a776e8dc994aae4e1714fc5f03565e132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dac2f7a776e8dc994aae4e17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 30 17:03:44 2015 +0100 shell32: Add partial support for Mac trash enumeration. --- dlls/shell32/tests/recyclebin.c | 18 ++-- dlls/shell32/trash.c | 219 ++++++++++++++++++++++++++++++---------- 2 files changed, 170 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6dac2f7a776e8dc994aae…

1 0

Piotr Caban : shell32: Pass trash path to TRASH_EnumItems.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: 8aba9366edbafeada63105e000a101738338c91e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aba9366edbafeada63105e00… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 30 17:03:36 2015 +0100 shell32: Pass trash path to TRASH_EnumItems. --- dlls/shell32/recyclebin.c | 8 +++----- dlls/shell32/trash.c | 7 +++++-- dlls/shell32/xdg.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 7053998..28098af 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -423,7 +423,7 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH if (grfFlags & SHCONTF_NONFOLDERS) { - if (FAILED(ret = TRASH_EnumItems(&pidls, &pidls_count))) + if (FAILED(ret = TRASH_EnumItems(NULL, &pidls, &pidls_count))) goto failed; for (i=0; i<pidls_count; i++) if (!AddToEnumList(list, pidls[i])) @@ -863,9 +863,8 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryR HRESULT hr; TRACE("(%s, %p)\n", debugstr_w(pszRootPath), pSHQueryRBInfo); - FIXME("Ignoring pszRootPath=%s\n",debugstr_w(pszRootPath)); - hr = TRASH_EnumItems(&apidl,&cidl); + hr = TRASH_EnumItems(pszRootPath, &apidl, &cidl); if (FAILED(hr)) return hr; pSHQueryRBInfo->i64NumItems = cidl; @@ -900,9 +899,8 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags) HRESULT ret; TRACE("(%p, %s, 0x%08x)\n", hwnd, debugstr_w(pszRootPath) , dwFlags); - FIXME("Ignoring pszRootPath=%s\n",debugstr_w(pszRootPath)); - ret = TRASH_EnumItems(&apidl,&cidl); + ret = TRASH_EnumItems(pszRootPath, &apidl, &cidl); if (FAILED(ret)) return ret; diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 3ca6e4e..f178570 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -100,7 +100,7 @@ BOOL TRASH_TrashFile(LPCWSTR wszPath) return (status == noErr); } -HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) +HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) { FIXME("stub!\n"); return E_NOTIMPL; @@ -577,12 +577,15 @@ failed: return NULL; } -HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) +HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) { int ti_count; int pos=0, i; HRESULT err = E_OUTOFMEMORY; HDPA tinfs; + + if(path) + FIXME("Ignoring path = %s\n", debugstr_w(path)); if (!TRASH_EnsureInitialized()) return E_FAIL; tinfs = enum_bucket_trashinfos(home_trash, &ti_count); diff --git a/dlls/shell32/xdg.h b/dlls/shell32/xdg.h index 6236887..dc3acb0 100644 --- a/dlls/shell32/xdg.h +++ b/dlls/shell32/xdg.h @@ -40,7 +40,7 @@ void XDG_FreeParsedFile(XDG_PARSED_FILE *file) DECLSPEC_HIDDEN; BOOL TRASH_CanTrashFile(LPCWSTR wszPath) DECLSPEC_HIDDEN; BOOL TRASH_TrashFile(LPCWSTR wszPath) DECLSPEC_HIDDEN; HRESULT TRASH_UnpackItemID(LPCSHITEMID id, WIN32_FIND_DATAW *data) DECLSPEC_HIDDEN; -HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) DECLSPEC_HIDDEN; +HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) DECLSPEC_HIDDEN; HRESULT TRASH_RestoreItem(LPCITEMIDLIST pidl) DECLSPEC_HIDDEN; HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) DECLSPEC_HIDDEN;

1 0

Piotr Caban : shell32: Handle TRASH_EnumItems failures correctly.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: d46862b4874519d70a4138285a6b754e3e0c4c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46862b4874519d70a4138285… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 30 17:03:30 2015 +0100 shell32: Handle TRASH_EnumItems failures correctly. --- dlls/shell32/recyclebin.c | 15 ++++++++++++--- dlls/shell32/tests/recyclebin.c | 21 +++++++++++---------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index d839329..7053998 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -411,7 +411,7 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH IEnumIDListImpl *list; LPITEMIDLIST *pidls; HRESULT ret = E_OUTOFMEMORY; - int pidls_count; + int pidls_count = 0; int i=0; TRACE("(%p, %p, %x, %p)\n", This, hwnd, grfFlags, ppenumIDList); @@ -860,10 +860,14 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryR LPITEMIDLIST *apidl; INT cidl; INT i=0; + HRESULT hr; + TRACE("(%s, %p)\n", debugstr_w(pszRootPath), pSHQueryRBInfo); FIXME("Ignoring pszRootPath=%s\n",debugstr_w(pszRootPath)); - TRASH_EnumItems(&apidl,&cidl); + hr = TRASH_EnumItems(&apidl,&cidl); + if (FAILED(hr)) + return hr; pSHQueryRBInfo->i64NumItems = cidl; pSHQueryRBInfo->i64Size = 0; for (; i<cidl; i++) @@ -894,9 +898,14 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags) INT cidl; INT i=0; HRESULT ret; + TRACE("(%p, %s, 0x%08x)\n", hwnd, debugstr_w(pszRootPath) , dwFlags); FIXME("Ignoring pszRootPath=%s\n",debugstr_w(pszRootPath)); - TRASH_EnumItems(&apidl,&cidl); + + ret = TRASH_EnumItems(&apidl,&cidl); + if (FAILED(ret)) + return ret; + ret = erase_items(hwnd,(const LPCITEMIDLIST*)apidl,cidl,!(dwFlags & SHERB_NOCONFIRMATION)); for (;i<cidl;i++) ILFree(apidl[i]); diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c index c798492..ba99adf 100644 --- a/dlls/shell32/tests/recyclebin.c +++ b/dlls/shell32/tests/recyclebin.c @@ -70,9 +70,12 @@ static void test_query_recyclebin(void) ok(GetTempFileNameA(temp_path, "trash", 0, buf), "GetTempFileName failed\n"); buf[strlen(buf) + 1] = '\0'; hr = pSHQueryRecycleBinA(buf,&info1); - ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); - ok(info1.i64Size!=0xdeadbeef,"i64Size not set\n"); - ok(info1.i64NumItems!=0xdeadbeef,"i64NumItems not set\n"); + if(hr != S_OK) todo_wine ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); + else { + ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); + ok(info1.i64Size!=0xdeadbeef,"i64Size not set\n"); + ok(info1.i64NumItems!=0xdeadbeef,"i64NumItems not set\n"); + } /*create and send a file to the recycle bin*/ file = CreateFileA(buf,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,0,NULL); ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n",buf); @@ -87,13 +90,11 @@ static void test_query_recyclebin(void) shfo.lpszProgressTitle = NULL; ok(!pSHFileOperationA(&shfo), "Deletion was not successful\n"); hr = pSHQueryRecycleBinA(buf,&info2); - ok(hr == S_OK, "SHQueryRecycleBinW failed with error 0x%x\n", hr); - if(info2.i64Size!=info1.i64Size || info2.i64NumItems!=info1.i64NumItems) { - ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); - ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); - } else todo_wine { - ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); - ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); + if(hr != S_OK) todo_wine ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); + else { + ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); + ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); + ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); } }

1 0

Piotr Caban : shell32: Create trash test file in temp directory.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: 814ab9ee4635c73e88e27960d30ad023a4d9121c URL: http://source.winehq.org/git/wine.git/?a=commit;h=814ab9ee4635c73e88e27960d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 30 17:03:25 2015 +0100 shell32: Create trash test file in temp directory. --- dlls/shell32/tests/recyclebin.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c index d449b7e..c798492 100644 --- a/dlls/shell32/tests/recyclebin.c +++ b/dlls/shell32/tests/recyclebin.c @@ -55,8 +55,7 @@ static void test_query_recyclebin(void) HRESULT hr; HANDLE file; SHFILEOPSTRUCTA shfo; - const CHAR name[] = "test.txt"; - CHAR buf[MAX_PATH + sizeof(name) + 1]; + CHAR temp_path[MAX_PATH-14], buf[MAX_PATH+1]; if(!pSHQueryRecycleBinA) { skip("SHQueryRecycleBinA does not exist\n"); @@ -67,18 +66,17 @@ static void test_query_recyclebin(void) skip("SHFileOperationA does not exist\n"); return; } - GetCurrentDirectoryA(MAX_PATH, buf); - strcat(buf,"\\"); - strcat(buf,name); + ok(GetTempPathA(sizeof(temp_path), temp_path), "GetTempPath failed\n"); + ok(GetTempFileNameA(temp_path, "trash", 0, buf), "GetTempFileName failed\n"); buf[strlen(buf) + 1] = '\0'; hr = pSHQueryRecycleBinA(buf,&info1); ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); ok(info1.i64Size!=0xdeadbeef,"i64Size not set\n"); ok(info1.i64NumItems!=0xdeadbeef,"i64NumItems not set\n"); /*create and send a file to the recycle bin*/ - file = CreateFileA(name,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,0,NULL); - ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n",name); - WriteFile(file,name,strlen(name),&written,NULL); + file = CreateFileA(buf,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,0,NULL); + ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n",buf); + WriteFile(file,buf,strlen(buf),&written,NULL); CloseHandle(file); shfo.hwnd = NULL; shfo.wFunc = FO_DELETE;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2015