Module: wine
Branch: master
Commit: a77d50b6f32d3f9e3e64f88dff104ac87e6325e9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77d50b6f32d3f9e3e64f88df…
Author: Jay Yang <jkelleyy(a)gmail.com>
Date: Fri Jul 8 10:46:40 2011 -0400
shell32/tests: Add tests for SHQueryRecycleBin.
---
dlls/shell32/tests/Makefile.in | 1 +
dlls/shell32/tests/recyclebin.c | 102 +++++++++++++++++++++++++++++++++++++++
2 files changed, 103 insertions(+), 0 deletions(-)
diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in
index 3399532..61ffc51 100644
--- a/dlls/shell32/tests/Makefile.in
+++ b/dlls/shell32/tests/Makefile.in
@@ -8,6 +8,7 @@ C_SRCS = \
ebrowser.c \
generated.c \
progman_dde.c \
+ recyclebin.c \
shelldispatch.c \
shelllink.c \
shellole.c \
diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c
new file mode 100644
index 0000000..ed30464
--- /dev/null
+++ b/dlls/shell32/tests/recyclebin.c
@@ -0,0 +1,102 @@
+/*
+ * Tests for recycle bin functions
+ *
+ * Copyright 2011 Jay Yang
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include "shellapi.h"
+
+#include <stdio.h>
+#include "wine/test.h"
+
+static int (WINAPI *pSHQueryRecycleBinA)(LPCSTR,LPSHQUERYRBINFO);
+static int (WINAPI *pSHFileOperationA)(LPSHFILEOPSTRUCTA);
+
+static char int64_buffer[65];
+/* Note: This function uses a single buffer for the return value.*/
+static const char* str_from_int64(__int64 ll)
+{
+
+ if (sizeof(ll) > sizeof(unsigned long) && ll >> 32)
+ sprintf(int64_buffer,"%lx%08lx",(unsigned long)(ll >> 32),(unsigned long)ll);
+ else
+ sprintf(int64_buffer,"%lx",(unsigned long)ll);
+ return int64_buffer;
+}
+
+static void setup_pointers(void)
+{
+ HMODULE hshell32 = GetModuleHandleA("shell32.dll");
+ pSHQueryRecycleBinA = (void*)GetProcAddress(hshell32, "SHQueryRecycleBinA");
+ pSHFileOperationA = (void*)GetProcAddress(hshell32, "SHFileOperationA");
+}
+
+static void test_query_recyclebin(void)
+{
+ SHQUERYRBINFO info1={sizeof(info1),0xdeadbeef,0xdeadbeef};
+ SHQUERYRBINFO info2={sizeof(info2),0xdeadbeef,0xdeadbeef};
+ UINT written;
+ HRESULT hr;
+ HANDLE file;
+ SHFILEOPSTRUCTA shfo;
+ const CHAR *name="test.txt";
+ CHAR buf[MAX_PATH+strlen(name)+2];
+ if(!pSHQueryRecycleBinA)
+ {
+ skip("SHQueryRecycleBinA does not exist");
+ return;
+ }
+ if(!pSHFileOperationA)
+ {
+ skip("SHFileOperationA does not exist");
+ return;
+ }
+ GetCurrentDirectoryA(MAX_PATH, buf);
+ strcat(buf,"\\");
+ strcat(buf,name);
+ 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);
+ CloseHandle(file);
+ shfo.hwnd = NULL;
+ shfo.wFunc = FO_DELETE;
+ shfo.pFrom = buf;
+ shfo.pTo = NULL;
+ shfo.fFlags = FOF_FILESONLY | FOF_NOCONFIRMATION | FOF_SILENT | FOF_ALLOWUNDO;
+ shfo.hNameMappings = NULL;
+ 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);
+ todo_wine ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written));
+ todo_wine ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1));
+}
+
+
+START_TEST(recyclebin)
+{
+ setup_pointers();
+ test_query_recyclebin();
+}
Module: website
Branch: master
Commit: b5a769548cc5051af9172c76bdb0401b728e6f9a
URL: http://source.winehq.org/git/website.git/?a=commit;h=b5a769548cc5051af9172c…
Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com>
Date: Fri Jul 8 21:38:13 2011 +0200
French translation for release 1.3.24
---
news/fr/2011070801.xml | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/news/fr/2011070801.xml b/news/fr/2011070801.xml
new file mode 100644
index 0000000..055c600
--- /dev/null
+++ b/news/fr/2011070801.xml
@@ -0,0 +1,20 @@
+<news>
+<date>8 juillet 2011</date>
+<title>Sortie de Wine 1.3.24</title>
+<body>
+<p> La version de développement 1.3.24 de Wine est disponible.</p>
+<p> <a href="{$root}/announce/1.3.24">Nouveautés</a> de cette version :
+<ul>
+ <li>Diverses améliorations dans DirectInput.</li>
+ <li>Prise en charge du retour à la ligne automatique dans Uniscribe.</li>
+ <li>Éléments d'interface graphique additionnels dans le shell Explorer intégré.</li>
+ <li>Davantage de fonctions D3DX9.</li>
+ <li>Prise en charge améliorée des dossiers shell bien connus.</li>
+ <li>Diverses corrections de bogues.</li>
+</ul></p>
+<p><p>Le <a
+href="http://prdownloads.sourceforge.net/wine/wine-1.3.24.tar.bz2">code
+source</a> est disponible dès à présent.
+Les paquets binaires sont en cours de construction, et apparaîtront sous peu
+sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs.
+</p></body></news>
Module: website
Branch: master
Commit: 8f82d65920c91e2c74ca3b22d54b4221dc164fe8
URL: http://source.winehq.org/git/website.git/?a=commit;h=8f82d65920c91e2c74ca3b…
Author: Alexandre Julliard <julliard(a)winehq.org>
Date: Fri Jul 8 20:46:33 2011 +0200
Wine release 1.3.24
---
news/en/2011070801.xml | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/news/en/2011070801.xml b/news/en/2011070801.xml
new file mode 100644
index 0000000..e1bb456
--- /dev/null
+++ b/news/en/2011070801.xml
@@ -0,0 +1,17 @@
+<news>
+<date>July 8, 2011</date>
+<title>Wine 1.3.24 Released</title>
+<body>
+<p> The Wine development release 1.3.24 is now available.</p>
+<p> <a href="{$root}/announce/1.3.24">What's new</a> in this release:
+<ul>
+ <li>Various DirectInput improvements.</li>
+ <li>Support for line breaking in Uniscribe.</li>
+ <li>More UI elements in builtin Shell Explorer.</li>
+ <li>Some more D3DX9 functions.</li>
+ <li>Improved support for shell known folders.</li>
+ <li>Various bug fixes.</li>
+</ul></p>
+<p><p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.24.tar.bz2">available now</a>.
+Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>.
+</p></body></news>