February 2008 - Wine-commits

Alexandre Julliard : user32: Pass the modified SetWindowPos flags to the set_window_pos server request.
by Alexandre Julliard 21 Feb '08

21 Feb '08

Module: wine Branch: master Commit: 55165f87cce88e6b49f2436ef0f9d7dc12e25285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55165f87cce88e6b49f2436ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 20 14:41:09 2008 +0100 user32: Pass the modified SetWindowPos flags to the set_window_pos server request. --- dlls/user32/winpos.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 4da5d28..daebe7c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1675,7 +1675,7 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) SWP_DoNCCalcSize( winpos, &newWindowRect, &newClientRect, valid_rects ); - if (!set_window_pos( winpos->hwnd, winpos->hwndInsertAfter, orig_flags, + if (!set_window_pos( winpos->hwnd, winpos->hwndInsertAfter, winpos->flags, &newWindowRect, &newClientRect, valid_rects )) return FALSE;

1 0

Dan Kegel : website: bring back 'forums' in site menu
by Jeremy Newman 20 Feb '08

20 Feb '08

Module: website Branch: master Commit: e1abb266251ea43509e99d0264c2bb0793408309 URL: http://source.winehq.org/git/website.git/?a=commit;h=e1abb266251ea43509e99d… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Feb 19 16:27:53 2008 -0800 website: bring back 'forums' in site menu Also fix a typo in my last patch. --- include/config.php | 2 +- templates/en/forums.template | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/config.php b/include/config.php index c1c6d2e..ccdc9fb 100644 --- a/include/config.php +++ b/include/config.php @@ -63,7 +63,7 @@ class config 'Development' => array( 'Development' => '{$root}/site/development', 'Developers Guide' => '{$root}/site/docs/winedev-guide/index', - 'Mailing Lists' => '{$root}/site/forums', + 'Mailing Lists/Forums' => '{$root}/site/forums', 'GIT' => '{$root}/site/git', 'Sending Patches' => '{$root}/site/sending_patches', 'To Do Lists' => 'http://wiki.winehq.org/TodoList', diff --git a/templates/en/forums.template b/templates/en/forums.template index a806f60..9ec34a1 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -1,4 +1,4 @@ - + <h1>Key Mailing Lists / Forums</h1> @@ -6,8 +6,7 @@ Here are the most useful ones for users: <ul> - <li>The <a href="http://www.winehq.org/mailman/listinfo/wine-users">Wine-Users Mailing List</a> (and [<a href="http://www.winehq.org/pipermail/wine-users/">web archive</a>) - best place for Wine user support - </li> + <li>The <a href="http://www.winehq.org/mailman/listinfo/wine-users">Wine-Users Mailing List</a> (and <a href="http://www.winehq.org/pipermail/wine-users/">web archive</a>) - best place for Wine user support</li> <li>Ubuntu users may also want to visit the <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Wine area at Ubuntu Forums</a>

1 0

Jeff Zaroyko : bugzilla: (resend) add a stop sign next to warning about pasting logs or backtraces
by Jeremy Newman 20 Feb '08

20 Feb '08

Module: bugzilla Branch: master Commit: a064f3ce75b6674a4dd12d2a5661d3a4bc089a10 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=a064f3ce75b6674a4dd12… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Wed Feb 20 07:25:49 2008 +1100 bugzilla: (resend) add a stop sign next to warning about pasting logs or backtraces Resending this as an attachment. When some people file bug reports they don't comply with the request that logs or backtraces not be pasted in the description field. This patch adds a stop sign to catch peoples attention, which would hopefully remove the need to tell people off for doing the wrong thing. >From b29a80564ea0d13a7d3b0806010a1e1f81b504a9 Mon Sep 17 00:00:00 2001 From: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Tue, 19 Feb 2008 16:52:50 +1100 Subject: Modified warning about pasting logs into the description field when submitting new bugs. Includes stop sign to catch attention. MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1.4.4.2" This is a multi-part message in MIME format. --------------1.4.4.2 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit --- images/stop.png | Bin 0 -> 2369 bytes template/en/default/bug/create/create.html.tmpl | 2 +- 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/images/stop.png b/images/stop.png new file mode 100644 index 0000000..064d9a2 Binary files /dev/null and b/images/stop.png differ diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index ebc5a7f..7bdce6c 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -406,7 +406,7 @@ function handleWantsAttachment(wants_attachment) { <tr> <td> </td> <td colspan="3"> - Please do not PASTE logs and back traces (create an attachment + <img src="/images/stop.png" alt="STOP">Please do not PASTE logs and back traces (create an attachment below, instead). </td> </tr>

1 0

Jeremy Newman : fix sidebar link, should be download, not downloads
by Jeremy Newman 20 Feb '08

20 Feb '08

Module: bugzilla Branch: master Commit: 4d5bf3c481c15c5735409e36475703d145feb225 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4d5bf3c481c15c5735409… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Feb 20 10:20:06 2008 -0600 fix sidebar link, should be download, not downloads --- template/en/default/global/sidebar.html.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index 5822272..a328e7b 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -35,7 +35,7 @@ <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=regression&keywords_type=anywords" class="menuItem">Regressions</a></td></tr> <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=tasklist&keywords_type=anywords" class="menuItem">Tasklist</a></td></tr> <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=tasklet&keywords_type=anywords" class="menuItem">Tasklets</a></td></tr> - <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=downloads&keywords_type=anywords" class="menuItem">with download</a></td></tr> + <tr class="sideMenu"><td width="100%"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=download&keywords_type=anywords" class="menuItem">with download</a></td></tr> [% INCLUDE global/menu_end.html.tmpl %] [% IF user.id %]

1 0

Jeremy Newman : links should be .org, not .com
by Jeremy Newman 20 Feb '08

20 Feb '08

Module: bugzilla Branch: master Commit: 7b2e1952a5f56108a93496f72a745b81f0c57a27 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=7b2e1952a5f56108a9349… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Feb 20 10:21:46 2008 -0600 links should be .org, not .com --- template/en/default/index.html.tmpl | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index ef9213f..9e13783 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -168,24 +168,24 @@ function addSidebar() { The bugs we are currently working on are organized into Task lists. <ol class="wine_index_list"> - <li><a href="http://bugs.winehq.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Wine 1.0</a> + <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Wine 1.0</a> These bugs are scheduled to be fixed before Wine 1.0 is released. </li> - <li><a href="http://bugs.winehq.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Regressions</a> + <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Regressions</a> Bugs introduced as result of a regression. </li> - <li><a href="http://bugs.winehq.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Task List</a> + <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Task List</a> Available large scale tasks. </li> - <li><a href="http://bugs.winehq.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Tasklets</a> + <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Tasklets</a> Small tasks available to be worked on. </li> - <li><a href="http://bugs.winehq.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">With download</a> + <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">With download</a> Bugs in downloadable Applications. </li>

1 0

Alistair Leslie-Hughes : slc: Initial stub DLL.
by Alexandre Julliard 20 Feb '08

20 Feb '08

Module: wine Branch: master Commit: ea563709efa9bc2d20e76c294a23e804c13bb58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea563709efa9bc2d20e76c294… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 20 00:17:08 2008 +1100 slc: Initial stub DLL. --- .gitignore | 1 + Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 5 +++++ dlls/slc/Makefile.in | 14 ++++++++++++++ dlls/slc/slc.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/slc/slc.spec | 41 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 111 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 9702e70..c3b6cca 100644 --- a/.gitignore +++ b/.gitignore @@ -479,6 +479,7 @@ dlls/shlwapi/shlwapi.res dlls/shlwapi/tests/*.ok dlls/shlwapi/tests/shlwapi_crosstest.exe dlls/shlwapi/tests/testlist.c +dlls/slc/libslc.def dlls/snmpapi/libsnmpapi.def dlls/snmpapi/tests/*.ok dlls/snmpapi/tests/snmpapi_crosstest.exe diff --git a/Makefile.in b/Makefile.in index e650d0c..2edfc8d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -423,6 +423,7 @@ ALL_MAKEFILES = \ dlls/shlwapi/Makefile \ dlls/shlwapi/tests/Makefile \ dlls/slbcsp/Makefile \ + dlls/slc/Makefile \ dlls/snmpapi/Makefile \ dlls/snmpapi/tests/Makefile \ dlls/softpub/Makefile \ @@ -837,6 +838,7 @@ dlls/shfolder/Makefile: dlls/shfolder/Makefile.in dlls/Makedll.rules dlls/shlwapi/Makefile: dlls/shlwapi/Makefile.in dlls/Makedll.rules dlls/shlwapi/tests/Makefile: dlls/shlwapi/tests/Makefile.in dlls/Maketest.rules dlls/slbcsp/Makefile: dlls/slbcsp/Makefile.in dlls/Makedll.rules +dlls/slc/Makefile: dlls/slc/Makefile.in dlls/Makedll.rules dlls/snmpapi/Makefile: dlls/snmpapi/Makefile.in dlls/Makedll.rules dlls/snmpapi/tests/Makefile: dlls/snmpapi/tests/Makefile.in dlls/Maketest.rules dlls/softpub/Makefile: dlls/softpub/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 66622a1..87b658c 100755 --- a/configure +++ b/configure @@ -21697,6 +21697,8 @@ ac_config_files="$ac_config_files dlls/shlwapi/tests/Makefile" ac_config_files="$ac_config_files dlls/slbcsp/Makefile" +ac_config_files="$ac_config_files dlls/slc/Makefile" + ac_config_files="$ac_config_files dlls/snmpapi/Makefile" ac_config_files="$ac_config_files dlls/snmpapi/tests/Makefile" @@ -22796,6 +22798,7 @@ do "dlls/shlwapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shlwapi/Makefile" ;; "dlls/shlwapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shlwapi/tests/Makefile" ;; "dlls/slbcsp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/slbcsp/Makefile" ;; + "dlls/slc/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/slc/Makefile" ;; "dlls/snmpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/Makefile" ;; "dlls/snmpapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/tests/Makefile" ;; "dlls/softpub/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/softpub/Makefile" ;; diff --git a/configure.ac b/configure.ac index ba0355a..f1071de 100644 --- a/configure.ac +++ b/configure.ac @@ -1922,6 +1922,7 @@ AC_CONFIG_FILES([dlls/shfolder/Makefile]) AC_CONFIG_FILES([dlls/shlwapi/Makefile]) AC_CONFIG_FILES([dlls/shlwapi/tests/Makefile]) AC_CONFIG_FILES([dlls/slbcsp/Makefile]) +AC_CONFIG_FILES([dlls/slc/Makefile]) AC_CONFIG_FILES([dlls/snmpapi/Makefile]) AC_CONFIG_FILES([dlls/snmpapi/tests/Makefile]) AC_CONFIG_FILES([dlls/softpub/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 6885d2a..e2680c9 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -212,6 +212,7 @@ BASEDIRS = \ shfolder \ shlwapi \ slbcsp \ + slc \ snmpapi \ softpub \ spoolss \ @@ -627,6 +628,7 @@ IMPORT_LIBS = \ shell32/libshell32.$(IMPLIBEXT) \ shfolder/libshfolder.$(IMPLIBEXT) \ shlwapi/libshlwapi.$(IMPLIBEXT) \ + slc/libslc.$(IMPLIBEXT) \ snmpapi/libsnmpapi.$(IMPLIBEXT) \ spoolss/libspoolss.$(IMPLIBEXT) \ sti/libsti.$(IMPLIBEXT) \ @@ -968,6 +970,9 @@ shfolder/libshfolder.$(IMPLIBEXT): shfolder/shfolder.spec $(WINEBUILD) shlwapi/libshlwapi.$(IMPLIBEXT): shlwapi/shlwapi.spec $(WINEBUILD) @cd shlwapi && $(MAKE) libshlwapi.$(IMPLIBEXT) +slc/libslc.$(IMPLIBEXT): slc/slc.spec $(WINEBUILD) + @cd slc && $(MAKE) libslc.$(IMPLIBEXT) + snmpapi/libsnmpapi.$(IMPLIBEXT): snmpapi/snmpapi.spec $(WINEBUILD) @cd snmpapi && $(MAKE) libsnmpapi.$(IMPLIBEXT) diff --git a/dlls/slc/Makefile.in b/dlls/slc/Makefile.in new file mode 100644 index 0000000..2097ca2 --- /dev/null +++ b/dlls/slc/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = slc.dll +IMPORTLIB = libslc.$(IMPLIBEXT) +IMPORTS = kernel32 + +C_SRCS = \ + slc.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c new file mode 100644 index 0000000..40c5287 --- /dev/null +++ b/dlls/slc/slc.c @@ -0,0 +1,44 @@ +/* + * + * Copyright 2008 Alistair Leslie-Hughes + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(slc); + + +/*********************************************************************** + * DllMain (CLUSAPI.@) + * + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec new file mode 100644 index 0000000..e946247 --- /dev/null +++ b/dlls/slc/slc.spec @@ -0,0 +1,41 @@ +@ stub SLpAuthenticateGenuineTicketResponse +@ stub SLpBeginGenuineTicketTransaction +@ stub SLpCheckProductKey +@ stub SLpGetGenuineBlob +@ stub SLpGetGenuineLocal +@ stub SLpGetLicenseAcquisitionInfo +@ stub SLpGetMachineUGUID +@ stub SLpVLActivateProduct +@ stub SLClose +@ stub SLConsumeRight +@ stub SLConsumeWindowsRight +@ stub SLDepositOfflineConfirmationId +@ stub SLFireEvent +@ stub SLGenerateOfflineInstallationId +@ stub SLGetInstalledSAMLicenseApplications +@ stub SLGetLicense +@ stub SLGetLicenseFileId +@ stub SLGetLicenseInformation +@ stub SLGetLicensingStatusInformation +@ stub SLGetPKeyId +@ stub SLGetPKeyInformation +@ stub SLGetPolicyInformation +@ stub SLGetPolicyInformationDWORD +@ stub SLGetProductSkuInformation +@ stub SLGetSAMLicense +@ stub SLGetSLIDList +@ stub SLGetServiceInformation +@ stub SLGetWindowsInformation +@ stub SLGetWindowsInformationDWORD +@ stub SLInstallLicense +@ stub SLInstallProofOfPurchase +@ stub SLInstallSAMLicense +@ stub SLOpen +@ stub SLReArmWindows +@ stub SLRegisterEvent +@ stub SLRegisterWindowsEvent +@ stub SLUninstallLicense +@ stub SLUninstallProofOfPurchase +@ stub SLUninstallSAMLicense +@ stub SLUnregisterEvent +@ stub SLUnregisterWindowsEvent

1 0

Andrew Riedi : user32: Test LoadImage() to load an icon as a cursor.
by Alexandre Julliard 20 Feb '08

20 Feb '08

Module: wine Branch: master Commit: 5b3f53baf9b464baeff6c61091fe159b99253985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3f53baf9b464baeff6c6109… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Tue Feb 19 01:23:16 2008 -0800 user32: Test LoadImage() to load an icon as a cursor. --- dlls/user32/tests/cursoricon.c | 113 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 112 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index ca4b118..023a3a5 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -3,7 +3,7 @@ * * Copyright 2006 Michael Kaufmann * Copyright 2007 Dmitry Timoshkov - * Copyright 2007 Andrew Riedi + * Copyright 2007-2008 Andrew Riedi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +32,30 @@ #include "wingdi.h" #include "winuser.h" +#include "pshpack1.h" + +typedef struct +{ + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; + WORD xHotspot; + WORD yHotspot; + DWORD dwDIBSize; + DWORD dwDIBOffset; +} CURSORICONFILEDIRENTRY; + +typedef struct +{ + WORD idReserved; + WORD idType; + WORD idCount; + CURSORICONFILEDIRENTRY idEntries[1]; +} CURSORICONFILEDIR; + +#include "poppack.h" + static char **test_argv; static int test_argc; static HWND child = 0; @@ -559,6 +583,92 @@ static void test_CreateIcon(void) DeleteObject(hbmColor); } +static void test_LoadImage(void) +{ + HANDLE handle; + BOOL ret; + DWORD error, bytes_written; + CURSORICONFILEDIR *icon_data; + CURSORICONFILEDIRENTRY *icon_entry; + BITMAPINFOHEADER *icon_header; + ICONINFO icon_info; + +#define ICON_WIDTH 32 +#define ICON_HEIGHT 32 +#define ICON_AND_SIZE (ICON_WIDTH*ICON_HEIGHT/8) +#define ICON_BPP 32 +#define ICON_SIZE \ + (sizeof(CURSORICONFILEDIR) + sizeof(BITMAPINFOHEADER) \ + + ICON_AND_SIZE + ICON_AND_SIZE*ICON_BPP) + + /* Set icon data. */ + icon_data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ICON_SIZE); + icon_data->idReserved = 0; + icon_data->idType = 1; + icon_data->idCount = 1; + + icon_entry = icon_data->idEntries; + icon_entry->bWidth = ICON_WIDTH; + icon_entry->bHeight = ICON_HEIGHT; + icon_entry->bColorCount = 0; + icon_entry->bReserved = 0; + icon_entry->xHotspot = 1; + icon_entry->yHotspot = 1; + icon_entry->dwDIBSize = ICON_SIZE - sizeof(CURSORICONFILEDIR); + icon_entry->dwDIBOffset = sizeof(CURSORICONFILEDIR); + + icon_header = (BITMAPINFOHEADER *) ((BYTE *) icon_data + icon_entry->dwDIBOffset); + icon_header->biSize = sizeof(BITMAPINFOHEADER); + icon_header->biWidth = ICON_WIDTH; + icon_header->biHeight = ICON_HEIGHT*2; + icon_header->biPlanes = 1; + icon_header->biBitCount = ICON_BPP; + icon_header->biSizeImage = 0; /* Uncompressed bitmap. */ + + /* Create the icon. */ + handle = CreateFileA("icon.ico", FILE_ALL_ACCESS, 0, NULL, CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle != INVALID_HANDLE_VALUE, "CreateFileA failed. %u\n", GetLastError()); + ret = WriteFile(handle, icon_data, ICON_SIZE, &bytes_written, NULL); + ok(bytes_written == ICON_SIZE, "icon.ico created improperly.\n"); + CloseHandle(handle); + + /* Test loading an icon as a cursor. */ + SetLastError(0xdeadbeef); + handle = LoadImageA(NULL, "icon.ico", IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); + todo_wine + ok(handle != NULL, "LoadImage() failed.\n"); + error = GetLastError(); + ok(error == 0, "Last error: %u\n", error); + + /* Test the icon information. */ + SetLastError(0xdeadbeef); + ret = GetIconInfo(handle, &icon_info); + todo_wine + ok(ret, "GetIconInfo() failed.\n"); + error = GetLastError(); + ok(error == 0xdeadbeef, "Last error: %u\n", error); + + todo_wine { + ok(icon_info.fIcon == FALSE, "fIcon != FALSE.\n"); + ok(icon_info.xHotspot == 1, "xHotspot is %u.\n", icon_info.xHotspot); + ok(icon_info.yHotspot == 1, "yHotspot is %u.\n", icon_info.yHotspot); + ok(icon_info.hbmColor != NULL, "No hbmColor!\n"); + } + ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); + + /* Clean up. */ + SetLastError(0xdeadbeef); + ret = DestroyCursor(handle); + todo_wine + ok(ret, "DestroyCursor() failed.\n"); + error = GetLastError(); + ok(error == 0xdeadbeef, "Last error: %u\n", error); + + HeapFree(GetProcessHeap(), 0, icon_data); + DeleteFileA("icon.ico"); +} + static void test_DestroyCursor(void) { static const BYTE bmp_bits[4096]; @@ -662,6 +772,7 @@ START_TEST(cursoricon) test_CopyImage_Bitmap(32); test_initial_cursor(); test_CreateIcon(); + test_LoadImage(); test_DestroyCursor(); do_parent(); test_child_process();

1 0

Dmitry Timoshkov : user32: Add a z-order test for owned popup windows.
by Alexandre Julliard 20 Feb '08

20 Feb '08

Module: wine Branch: master Commit: 9f23c3f9d5cba98117dadca03cb68145a01539f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f23c3f9d5cba98117dadca03… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 19 20:17:13 2008 +0800 user32: Add a z-order test for owned popup windows. --- dlls/user32/tests/win.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 130 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 4be1d87..fefa2b2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -54,6 +54,7 @@ static HHOOK hhook; static const char* szAWRClass = "Winsize"; static HMENU hmenu; +static DWORD our_pid; #define COUNTOF(arr) (sizeof(arr)/sizeof(arr[0])) @@ -1724,6 +1725,7 @@ static void test_mdi(void) DispatchMessage(&msg); } */ + DestroyWindow(mdi_hwndMain); } static void test_icons(void) @@ -1789,6 +1791,8 @@ static void test_icons(void) /* make sure the big icon hasn't changed */ res = (HICON)SendMessageA( hwnd, WM_GETICON, ICON_BIG, 0 ); ok( res == icon2, "wrong big icon after set %p/%p\n", res, icon2 ); + + DestroyWindow( hwnd ); } static LRESULT WINAPI nccalcsize_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -2037,6 +2041,127 @@ static void test_children_zorder(HWND parent) test_window_tree(parent, complex_style_6, complex_order_6, 3); } +#define check_z_order(hwnd, next, prev, owner, topmost) \ + check_z_order_debug((hwnd), (next), (prev), (owner), (topmost), \ + __FILE__, __LINE__) + +static void check_z_order_debug(HWND hwnd, HWND next, HWND prev, HWND owner, + BOOL topmost, const char *file, int line) +{ + HWND test; + DWORD ex_style; + + test = GetWindow(hwnd, GW_HWNDNEXT); + /* skip foreign windows */ + while (test && (GetWindowThreadProcessId(test, NULL) != our_pid || + UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)) != GetModuleHandle(0))) + { + /*trace("skipping next %p (%p)\n", test, UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)));*/ + test = GetWindow(test, GW_HWNDNEXT); + } + ok_(file, line)(next == test, "expected next %p, got %p\n", next, test); + + test = GetWindow(hwnd, GW_HWNDPREV); + /* skip foreign windows */ + while (test && (GetWindowThreadProcessId(test, NULL) != our_pid || + UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)) != GetModuleHandle(0))) + { + /*trace("skipping prev %p (%p)\n", test, UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)));*/ + test = GetWindow(test, GW_HWNDPREV); + } + ok_(file, line)(prev == test, "expected prev %p, got %p\n", prev, test); + + test = GetWindow(hwnd, GW_OWNER); + ok_(file, line)(owner == test, "expected owner %p, got %p\n", owner, test); + + ex_style = GetWindowLong(hwnd, GWL_EXSTYLE); + ok_(file, line)(!(ex_style & WS_EX_TOPMOST) == !topmost, "expected %stopmost\n", topmost ? "" : "NOT "); +} + +static void test_popup_zorder(HWND hwnd_D, HWND hwnd_E) +{ + HWND hwnd_A, hwnd_B, hwnd_C, hwnd_F; + + trace("hwnd_D %p, hwnd_E %p\n", hwnd_D, hwnd_E); + + SetWindowPos(hwnd_E, hwnd_D, 0,0,0,0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE); + + check_z_order(hwnd_D, hwnd_E, 0, 0, FALSE); + check_z_order(hwnd_E, 0, hwnd_D, 0, FALSE); + + hwnd_F = CreateWindowEx(0, "MainWindowClass", "Owner window", + WS_OVERLAPPED | WS_CAPTION, + 100, 100, 100, 100, + 0, 0, GetModuleHandle(0), NULL); + trace("hwnd_F %p\n", hwnd_F); + check_z_order(hwnd_F, hwnd_D, 0, 0, FALSE); + + SetWindowPos(hwnd_F, hwnd_E, 0,0,0,0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE); + check_z_order(hwnd_F, 0, hwnd_E, 0, FALSE); + check_z_order(hwnd_E, hwnd_F, hwnd_D, 0, FALSE); + check_z_order(hwnd_D, hwnd_E, 0, 0, FALSE); + + hwnd_C = CreateWindowEx(0, "MainWindowClass", NULL, + WS_POPUP, + 100, 100, 100, 100, + hwnd_F, 0, GetModuleHandle(0), NULL); + trace("hwnd_C %p\n", hwnd_C); + check_z_order(hwnd_F, 0, hwnd_E, 0, FALSE); + check_z_order(hwnd_E, hwnd_F, hwnd_D, 0, FALSE); + check_z_order(hwnd_D, hwnd_E, hwnd_C, 0, FALSE); + check_z_order(hwnd_C, hwnd_D, 0, hwnd_F, FALSE); + + hwnd_B = CreateWindowEx(WS_EX_TOPMOST, "MainWindowClass", NULL, + WS_POPUP, + 100, 100, 100, 100, + hwnd_F, 0, GetModuleHandle(0), NULL); + trace("hwnd_B %p\n", hwnd_B); + check_z_order(hwnd_F, 0, hwnd_E, 0, FALSE); + check_z_order(hwnd_E, hwnd_F, hwnd_D, 0, FALSE); + check_z_order(hwnd_D, hwnd_E, hwnd_C, 0, FALSE); + check_z_order(hwnd_C, hwnd_D, hwnd_B, hwnd_F, FALSE); + check_z_order(hwnd_B, hwnd_C, 0, hwnd_F, TRUE); + + hwnd_A = CreateWindowEx(WS_EX_TOPMOST, "MainWindowClass", NULL, + WS_POPUP, + 100, 100, 100, 100, + 0, 0, GetModuleHandle(0), NULL); + trace("hwnd_A %p\n", hwnd_A); + check_z_order(hwnd_F, 0, hwnd_E, 0, FALSE); + check_z_order(hwnd_E, hwnd_F, hwnd_D, 0, FALSE); + check_z_order(hwnd_D, hwnd_E, hwnd_C, 0, FALSE); + check_z_order(hwnd_C, hwnd_D, hwnd_B, hwnd_F, FALSE); + check_z_order(hwnd_B, hwnd_C, hwnd_A, hwnd_F, TRUE); + check_z_order(hwnd_A, hwnd_B, 0, 0, TRUE); + + trace("A %p B %p C %p D %p E %p F %p\n", hwnd_A, hwnd_B, hwnd_C, hwnd_D, hwnd_E, hwnd_F); + + /* move hwnd_F and its popups up */ + SetWindowPos(hwnd_F, HWND_TOP, 0,0,0,0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE); + check_z_order(hwnd_E, 0, hwnd_D, 0, FALSE); + check_z_order(hwnd_D, hwnd_E, hwnd_F, 0, FALSE); + check_z_order(hwnd_F, hwnd_D, hwnd_C, 0, FALSE); + check_z_order(hwnd_C, hwnd_F, hwnd_B, hwnd_F, FALSE); + check_z_order(hwnd_B, hwnd_C, hwnd_A, hwnd_F, TRUE); + check_z_order(hwnd_A, hwnd_B, 0, 0, TRUE); + + /* move hwnd_F and its popups down */ +#if 0 /* enable once Wine is fixed to pass this test */ + SetWindowPos(hwnd_F, HWND_BOTTOM, 0,0,0,0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE); + check_z_order(hwnd_F, 0, hwnd_C, 0, FALSE); + check_z_order(hwnd_C, hwnd_F, hwnd_B, hwnd_F, FALSE); + check_z_order(hwnd_B, hwnd_C, hwnd_E, hwnd_F, FALSE); + check_z_order(hwnd_E, hwnd_B, hwnd_D, 0, FALSE); + check_z_order(hwnd_D, hwnd_E, hwnd_A, 0, FALSE); + check_z_order(hwnd_A, hwnd_D, 0, 0, TRUE); +#endif + + DestroyWindow(hwnd_A); + DestroyWindow(hwnd_B); + DestroyWindow(hwnd_C); + DestroyWindow(hwnd_F); +} + static void test_vis_rgn( HWND hwnd ) { RECT win_rect, rgn_rect; @@ -4450,17 +4575,19 @@ START_TEST(win) WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP, 100, 100, 200, 200, - 0, 0, 0, NULL); + 0, 0, GetModuleHandle(0), NULL); test_nonclient_area(hwndMain); hwndMain2 = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window 2", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP, 100, 100, 200, 200, - 0, 0, 0, NULL); + 0, 0, GetModuleHandle(0), NULL); assert( hwndMain ); assert( hwndMain2 ); + our_pid = GetWindowThreadProcessId(hwndMain, NULL); + /* Add the tests below this line */ test_params(); @@ -4482,6 +4609,7 @@ START_TEST(win) test_SetForegroundWindow(hwndMain); test_children_zorder(hwndMain); + test_popup_zorder(hwndMain2, hwndMain); test_keyboard_input(hwndMain); test_mouse_input(hwndMain); test_validatergn(hwndMain);

1 0

Alistair Leslie-Hughes : msxml3: Implement put_dataType.
by Alexandre Julliard 20 Feb '08

20 Feb '08

Module: wine Branch: master Commit: 3c4cc5fb88b0d80d8f65dd067c65d15256f5bac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c4cc5fb88b0d80d8f65dd067… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 20 16:03:41 2008 +1100 msxml3: Implement put_dataType. --- dlls/msxml3/node.c | 97 ++++++++++++- dlls/msxml3/tests/domdoc.c | 355 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 450 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c4cc5fb88b0d80d8f65d…

1 0

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLDOMAttribute .
by Alexandre Julliard 20 Feb '08

20 Feb '08

Module: wine Branch: master Commit: 6277bd3fe1e906bbd3c7a38e20b05994099232f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6277bd3fe1e906bbd3c7a38e2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 06:41:24 2008 +1100 msxml3: Implemented IDispatch for IXMLDOMAttribute. --- dlls/msxml3/attribute.c | 56 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 49c39fe..2681a76 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -106,8 +106,13 @@ static HRESULT WINAPI domattr_GetTypeInfoCount( IXMLDOMAttribute *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + domattr *This = impl_from_IXMLDOMAttribute( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI domattr_GetTypeInfo( @@ -115,8 +120,14 @@ static HRESULT WINAPI domattr_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + domattr *This = impl_from_IXMLDOMAttribute( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMAttribute_tid, ppTInfo); + + return hr; } static HRESULT WINAPI domattr_GetIDsOfNames( @@ -124,8 +135,24 @@ static HRESULT WINAPI domattr_GetIDsOfNames( REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + domattr *This = impl_from_IXMLDOMAttribute( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + if(!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IXMLDOMAttribute_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI domattr_Invoke( @@ -134,8 +161,21 @@ static HRESULT WINAPI domattr_Invoke( WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + domattr *This = impl_from_IXMLDOMAttribute( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IXMLDOMAttribute_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + return hr; } static HRESULT WINAPI domattr_get_nodeName(

1 0