February 2006 - Wine-commits

Gerald Pfeifer : ntdll: Use struct mtget. mt_blkno on those systems providing that (and
by Alexandre Julliard 06 Feb '06

06 Feb '06

Module: wine Branch: refs/heads/master Commit: 571d9fb0f0ddbd9cf403771813b419c58b12a7b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=571d9fb0f0ddbd9cf403771… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Feb 6 20:59:44 2006 +0100 ntdll: Use struct mtget.mt_blkno on those systems providing that (and avoid using struct mtpos which may not be present on such systems). --- configure | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 - dlls/ntdll/tape.c | 8 ++++ include/config.h.in | 3 + 4 files changed, 125 insertions(+), 1 deletions(-) diff --git a/configure b/configure index fb51ce2..0e04c81 100755 --- a/configure +++ b/configure @@ -18300,6 +18300,119 @@ _ACEOF fi +echo "$as_me:$LINENO: checking for struct mtget.mt_blkno" >&5 +echo $ECHO_N "checking for struct mtget.mt_blkno... $ECHO_C" >&6 +if test "${ac_cv_member_struct_mtget_mt_blkno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_SYS_MTIO_H +#include <sys/mtio.h> +#endif + +int +main () +{ +static struct mtget ac_aggr; +if (ac_aggr.mt_blkno) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_mtget_mt_blkno=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_SYS_MTIO_H +#include <sys/mtio.h> +#endif + +int +main () +{ +static struct mtget ac_aggr; +if (sizeof ac_aggr.mt_blkno) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_mtget_mt_blkno=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_member_struct_mtget_mt_blkno=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct_mtget_mt_blkno" >&5 +echo "${ECHO_T}$ac_cv_member_struct_mtget_mt_blkno" >&6 +if test $ac_cv_member_struct_mtget_mt_blkno = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_MTGET_MT_BLKNO 1 +_ACEOF + + +fi echo "$as_me:$LINENO: checking for struct option.name" >&5 diff --git a/configure.ac b/configure.ac index 17caf2f..d808c88 100644 --- a/configure.ac +++ b/configure.ac @@ -1428,7 +1428,7 @@ dnl Check for siginfo_t members AC_CHECK_MEMBERS([siginfo_t.si_fd],,,[#include <signal.h>]) dnl Check for struct mtget members -AC_CHECK_MEMBERS([struct mtget.mt_blksiz, struct mtget.mt_gstat],,, +AC_CHECK_MEMBERS([struct mtget.mt_blksiz, struct mtget.mt_gstat, struct mtget.mt_blkno],,, [#ifdef HAVE_SYS_MTIO_H #include <sys/mtio.h> #endif]) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index 9a25ea8..b8403b8 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -238,7 +238,9 @@ static NTSTATUS TAPE_GetPosition( int fd { #ifdef HAVE_SYS_MTIO_H struct mtget get; +#ifndef HAVE_STRUCT_MTGET_MT_BLKNO struct mtpos pos; +#endif NTSTATUS status; TRACE( "fd: %d type: 0x%08lx\n", fd, type ); @@ -249,16 +251,22 @@ static NTSTATUS TAPE_GetPosition( int fd if (status != STATUS_SUCCESS) return status; +#ifndef HAVE_STRUCT_MTGET_MT_BLKNO status = TAPE_GetStatus( ioctl( fd, MTIOCPOS, &pos ) ); if (status != STATUS_SUCCESS) return status; +#endif switch (type) { case TAPE_ABSOLUTE_BLOCK: data->Type = type; data->Partition = get.mt_resid; +#ifdef HAVE_STRUCT_MTGET_MT_BLKNO + data->OffsetLow = get.mt_blkno; +#else data->OffsetLow = pos.mt_blkno; +#endif break; case TAPE_LOGICAL_BLOCK: case TAPE_PSEUDO_LOGICAL_BLOCK: diff --git a/include/config.h.in b/include/config.h.in index 62942f7..644f280 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -614,6 +614,9 @@ /* Define to 1 if `msg_accrights' is member of `struct msghdr'. */ #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS +/* Define to 1 if `mt_blkno' is member of `struct mtget'. */ +#undef HAVE_STRUCT_MTGET_MT_BLKNO + /* Define to 1 if `mt_blksiz' is member of `struct mtget'. */ #undef HAVE_STRUCT_MTGET_MT_BLKSIZ

1 0

Dmitry Timoshkov : wininet: Fix InternetQueryOption test to pass under Windows.
by Alexandre Julliard 06 Feb '06

06 Feb '06

Module: wine Branch: refs/heads/master Commit: 03434c728efd1b51e1cd102f5b4f9865ae04ef4b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03434c728efd1b51e1cd102… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 6 20:59:21 2006 +0100 wininet: Fix InternetQueryOption test to pass under Windows. --- dlls/wininet/tests/internet.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index b659ed9..aeeee4e 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -63,10 +63,9 @@ void InternetQueryOptionA_test() buffer=HeapAlloc(GetProcessHeap(),0,100); retval=InternetQueryOptionA(hinet,INTERNET_OPTION_USER_AGENT,buffer,&len); err=GetLastError(); - todo_wine ok(!strcmp(useragent,buffer),"Got wrong user agent string %s instead of %s\n",buffer,useragent); - todo_wine ok(len == strlen(useragent),"Got wrong user agent length %ld instead of %d\n",len,strlen(useragent)); - todo_wine ok(retval == 1,"Got wrong return value %d\n",retval); - ok(err == 0xdeadbeef, "Got wrong error code %ld\n",err); + todo_wine ok(len == strlen(useragent) + 1,"Got wrong user agent length %ld instead of %d\n", len, strlen(useragent) + 1); + ok(!retval, "Got wrong return value %d\n", retval); + todo_wine ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code %ld\n", err); HeapFree(GetProcessHeap(),0,buffer); hurl = InternetConnectA(hinet,"www.winehq.com",INTERNET_DEFAULT_HTTP_PORT,NULL,NULL,INTERNET_SERVICE_HTTP,0,0);

1 0

Phil Lodwick : winsock/tests: select() conformance test improvements.
by Alexandre Julliard 06 Feb '06

06 Feb '06

Module: wine Branch: refs/heads/master Commit: 96a46367a98fc62ac37fe3b360690a3f005d8018 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=96a46367a98fc62ac37fe3b… Author: Phil Lodwick <Phil.Lodwick(a)EFI.COM> Date: Mon Feb 6 20:59:08 2006 +0100 winsock/tests: select() conformance test improvements. Add OK tests around more function calls. Add two more todo_wine tests that fail. --- dlls/winsock/tests/sock.c | 57 ++++++++++++++++++++++++++++++--------------- 1 files changed, 38 insertions(+), 19 deletions(-) diff --git a/dlls/winsock/tests/sock.c b/dlls/winsock/tests/sock.c index 13f4173..ae9184e 100644 --- a/dlls/winsock/tests/sock.c +++ b/dlls/winsock/tests/sock.c @@ -1319,26 +1319,45 @@ static void test_WSAStringToAddressW(voi static void test_select(void) { - SOCKET fd; - - fd = socket(AF_INET, SOCK_STREAM, 0); - if (fd != INVALID_SOCKET) - { - fd_set readfds; - struct timeval select_timeout; - - FD_ZERO(&readfds); - FD_SET(fd, &readfds); - select_timeout.tv_sec=2; - select_timeout.tv_usec=0; - - todo_wine { - if (select((int) fd+1, &readfds, NULL, NULL, &select_timeout) != SOCKET_ERROR) - ok(!FD_ISSET(fd, &readfds), "FD should not be set\n"); - } - - closesocket(fd); + SOCKET fdRead, fdWrite; + fd_set readfds, writefds, exceptfds; + int maxfd; + int ret; + struct timeval select_timeout; + + fdRead = socket(AF_INET, SOCK_STREAM, 0); + ok( (fdRead != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); + fdWrite = socket(AF_INET, SOCK_STREAM, 0); + ok( (fdWrite != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); + + FD_ZERO(&readfds); + FD_ZERO(&writefds); + FD_ZERO(&exceptfds); + FD_SET(fdRead, &readfds); + FD_SET(fdWrite, &writefds); + FD_SET(fdRead, &exceptfds); + FD_SET(fdWrite, &exceptfds); + select_timeout.tv_sec=2; + select_timeout.tv_usec=0; + + maxfd = fdRead; + if (fdWrite > maxfd) + maxfd = fdWrite; + + todo_wine { + ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); + ok ( (ret == 0), "select should not return any socket handles\n"); + ok ( !FD_ISSET(fdRead, &readfds), "FD should not be set\n"); + ok ( !FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); } + + ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); + ok ( !FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n"); + + ret = closesocket(fdRead); + ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", ret); + ret = closesocket(fdWrite); + ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", ret); } /**************** Main program ***************/

1 0

Vitaliy Margolen : comctl32: Add month calendar tests.
by Alexandre Julliard 06 Feb '06

06 Feb '06

Module: wine Branch: refs/heads/master Commit: 38290cf9772a578deeebe4076d44574f2312a101 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38290cf9772a578deeebe40… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon Feb 6 20:58:48 2006 +0100 comctl32: Add month calendar tests. --- dlls/comctl32/tests/.gitignore | 1 + dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/monthcal.c | 69 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 0 deletions(-) create mode 100644 dlls/comctl32/tests/monthcal.c diff --git a/dlls/comctl32/tests/.gitignore b/dlls/comctl32/tests/.gitignore index 5ed31bc..c4d729a 100644 --- a/dlls/comctl32/tests/.gitignore +++ b/dlls/comctl32/tests/.gitignore @@ -3,6 +3,7 @@ comboex.ok dpa.ok header.ok imagelist.ok +monthcal.ok mru.ok progress.ok subclass.ok diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 1528964..87af63c 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -10,6 +10,7 @@ CTESTS = \ dpa.c \ header.c \ imagelist.c \ + monthcal.c \ mru.c \ progress.c \ subclass.c \ diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c new file mode 100644 index 0000000..82b41b3 --- /dev/null +++ b/dlls/comctl32/tests/monthcal.c @@ -0,0 +1,69 @@ +/* + * comctl32 month calendar unit tests + * + * Copyright (C) 2006 Vitaliy Margolen + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" + +#include "commctrl.h" + +#include "wine/test.h" + +void test_monthcal(void) +{ + HWND hwnd; + SYSTEMTIME st[2]; + INITCOMMONCONTROLSEX ic = {sizeof(INITCOMMONCONTROLSEX), ICC_DATE_CLASSES}; + + InitCommonControlsEx(&ic); + hwnd = CreateWindowA(MONTHCAL_CLASSA, "MonthCal", WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, + 0, 300, 300, 0, 0, NULL, NULL); + ok(hwnd != NULL, "Failed to create MonthCal\n"); + GetSystemTime(&st[0]); + st[0].wMonth = 5; + st[1] = st[0]; + + st[1].wMonth--; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Failed to set both min and max limits\n"); + st[1].wMonth += 2; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Failed to set both min and max limits\n"); + st[1].wYear --; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Failed to set both min and max limits\n"); + st[1].wYear += 1; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Failed to set both min and max limits\n"); + +/* This crashing Wine so commented untill fixed. + st[1].wMonth -= 3; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); +*/ + st[1].wMonth += 4; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); + st[1].wYear -= 3; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); + st[1].wYear += 4; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); +} + +START_TEST(monthcal) +{ + test_monthcal(); +}

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 06 Feb '06

06 Feb '06

Module: wine Branch: refs/heads/master Commit: 379b62c04ee5f134f0b38ead63cf7ca1aec61a7c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=379b62c04ee5f134f0b38ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 6 20:58:36 2006 +0100 Assorted spelling fixes. --- dlls/comctl32/progress.c | 2 +- dlls/crypt32/tests/str.c | 2 +- dlls/oleaut32/variant.h | 2 +- dlls/user/tests/menu.c | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index cfed7ec..9592cd6 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -132,7 +132,7 @@ static inline int get_bar_position( PROG * PROGRESS_Invalidate * * Don't be too clever about invalidating the progress bar. - * Installshield depends on this simple behaviour. + * InstallShield depends on this simple behaviour. */ static void PROGRESS_Invalidate( PROGRESS_INFO *infoPtr, INT old, INT new ) { diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index a099ba7..42fd271 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -1,7 +1,7 @@ /* * Unit test suite for crypt32.dll's Cert*ToStr and CertStrToName functions. * - * Copyright 2006 Juan Lang, Aric Stewart for Codeweavers + * Copyright 2006 Juan Lang, Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index 42c5e76..decf337 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -34,7 +34,7 @@ /* Get the extra flags from a variant pointer */ #define V_EXTRA_TYPE(v) (V_VT((v)) & VT_EXTRA_TYPE) -/* Missing in Windows but usefull VTBIT_* defines */ +/* Missing in Windows but useful VTBIT_* defines */ #define VTBIT_BOOL (1 << VT_BSTR) #define VTBIT_BSTR (1 << VT_BSTR) #define VTBIT_DATE (1 << VT_DATE) diff --git a/dlls/user/tests/menu.c b/dlls/user/tests/menu.c index 0ae0d2b..442cc97 100644 --- a/dlls/user/tests/menu.c +++ b/dlls/user/tests/menu.c @@ -125,7 +125,7 @@ static void register_menu_check_class(vo atomMenuCheckClass = RegisterClass(&wc); } -/* demonstrates that windows lock the menu object so that it is still valid +/* demonstrates that windows locks the menu object so that it is still valid * even after a client calls DestroyMenu on it */ static void test_menu_locked_by_window(void) { @@ -225,7 +225,7 @@ static void test_menu_ownerdraw(void) "Height is incorrect. Got %ld expected %d\n", MOD_rc[0].bottom - MOD_rc[0].top, MOD_SIZE); - /* test width/height of a OD menu bar as well */ + /* test width/height of an ownerdraw menu bar as well */ ret = DestroyMenu(hmenu); ok(ret, "DestroyMenu failed with error %ld\n", GetLastError()); hmenu = CreateMenu(); @@ -326,7 +326,7 @@ static void test_menu_add_string( void ) rc = SetMenuItemInfo( hmenu, 0, TRUE, &info ); ok (!rc, "SetMenuItemInfo unexpectedly worked\n"); - /* Just change ftype back and ensure data hasnt been freed */ + /* Just change ftype back and ensure data hasn't been freed */ info.fType= MFT_OWNERDRAW; /* Set as ownerdraw type */ info.dwTypeData= (char *)0xdeadbee3; rc = SetMenuItemInfo( hmenu, 0, TRUE, &info ); @@ -549,7 +549,7 @@ static void test_menu_iteminfo( void ) {, S, MIIM_TYPE, MFT_OWNERDRAW, -9, -9, 0, -9, -9, -9, NULL, 0, 0, }, empty, OK, ER ) TMII_DONE - /* can not combine MIIM_TYPE with some other flags */ + /* cannot combine MIIM_TYPE with some other flags */ TMII_INSMI( {, S, MIIM_TYPE|MIIM_STRING, MFT_STRING, -1, -1, -1, -1, -1, -1, txt, 6, -1, }, ER) TMII_GMII ( {, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, {, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, @@ -887,7 +887,7 @@ static void test_menu_iteminfo( void ) } /* - The following tests try to confirm the algorithum used to return the menu items + The following tests try to confirm the algorithm used to return the menu items when there is a collision between a menu item and a popup menu */ void test_menu_search_bycommand( void ) @@ -1021,7 +1021,7 @@ void test_menu_search_bycommand( void ) rc = InsertMenuItem(hmenu, 0, TRUE, &info ); ok (rc, "Inserting the menuitem failed\n"); - /* Search by id - returns the item which preceeds the popup menu */ + /* Search by id - returns the item which precedes the popup menu */ memset( &info, 0, sizeof info ); strback[0] = 0x00; info.cbSize = sizeof(MENUITEMINFO); @@ -1068,7 +1068,7 @@ void test_menu_search_bycommand( void ) rc = InsertMenuItem(hmenuSub, 1, TRUE, &info ); ok (rc, "Inserting the sub menu menuitem 2 failed\n"); - /* Prove that you cant query the id of a popup directly (By position) */ + /* Prove that you can't query the id of a popup directly (By position) */ id = GetMenuItemID(hmenu, 0); ok (id == -1, "Getting the sub menu id should have failed because its a popup (gave %x)\n", id);

1 0

Francois Gouget : Add trailing '\n's to ok() and trace() calls.
by Alexandre Julliard 06 Feb '06

06 Feb '06

Module: wine Branch: refs/heads/master Commit: d0c5f1498cd9570c3c72e698061de06c5e0aa221 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d0c5f1498cd9570c3c72e69… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 6 20:58:14 2006 +0100 Add trailing '\n's to ok() and trace() calls. --- dlls/secur32/tests/main.c | 8 ++++---- dlls/winspool/tests/info.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/tests/main.c b/dlls/secur32/tests/main.c index 7d35014..3c75f9e 100644 --- a/dlls/secur32/tests/main.c +++ b/dlls/secur32/tests/main.c @@ -206,14 +206,14 @@ SECURITY_STATUS setupBuffers(PSecBufferD PSecBuffer sec_buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(SecBuffer)); if(sec_buffer == NULL){ - trace("in_buf: sec_buffer == NULL"); + trace("in_buf: sec_buffer == NULL\n"); return SEC_E_INSUFFICIENT_MEMORY; } buffer = HeapAlloc(GetProcessHeap(), 0, size); if(buffer == NULL){ - trace("in_buf: buffer == NULL"); + trace("in_buf: buffer == NULL\n"); return SEC_E_INSUFFICIENT_MEMORY; } @@ -239,14 +239,14 @@ SECURITY_STATUS setupBuffers(PSecBufferD PBYTE buffer = NULL; if(sec_buffer == NULL){ - trace("out_buf: sec_buffer == NULL"); + trace("out_buf: sec_buffer == NULL\n"); return SEC_E_INSUFFICIENT_MEMORY; } buffer = HeapAlloc(GetProcessHeap(), 0, size); if(buffer == NULL){ - trace("out_buf: buffer == NULL"); + trace("out_buf: buffer == NULL\n"); return SEC_E_INSUFFICIENT_MEMORY; } diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index c2a559e..62989ba 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -249,7 +249,7 @@ static void test_GetPrinterDriverDirecto res = GetPrinterDriverDirectoryA( NULL, NULL, 1, NULL, cbBuf, NULL); ok(res || (GetLastError() == RPC_X_NULL_REF_POINTER), "returned %d with %ld (expected '!=0' or '0' with " \ - "RPC_X_NULL_REF_POINTER)", res, GetLastError()); + "RPC_X_NULL_REF_POINTER)\n", res, GetLastError()); /* with a valid buffer, but level is too large */

1 0

Francois Gouget : security: Fix the UnsealMessage() forward.
by Alexandre Julliard 06 Feb '06

06 Feb '06

Module: wine Branch: refs/heads/master Commit: f71c5b4ee3df4e5eb80b976d1b4a827c55b189f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f71c5b4ee3df4e5eb80b976… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 6 20:57:56 2006 +0100 security: Fix the UnsealMessage() forward. --- dlls/security/security.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/security/security.spec b/dlls/security/security.spec index 58855fc..02f9f0a 100644 --- a/dlls/security/security.spec +++ b/dlls/security/security.spec @@ -32,5 +32,5 @@ @ stdcall QuerySecurityPackageInfoW(wstr ptr) secur32.QuerySecurityPackageInfoW @ stdcall RevertSecurityContext(ptr) secur32.RevertSecurityContext @ stdcall SealMessage(ptr long ptr long) secur32.EncryptMessage -@ stdcall UnsealMessage(ptr ptr long ptr) secur32.DecyptMessage +@ stdcall UnsealMessage(ptr ptr long ptr) secur32.DecryptMessage @ stdcall VerifySignature(ptr ptr long ptr) secur32.VerifySignature

1 0

Roderick Colenbrander : wined3d: Texture fixes.
by Alexandre Julliard 06 Feb '06

06 Feb '06

Module: wine Branch: refs/heads/master Commit: 694efd7c6fd557a9c761b805122dc9d5fad1c69d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=694efd7c6fd557a9c761b80… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Feb 6 20:57:42 2006 +0100 wined3d: Texture fixes. Set video memory capabilities, add some checks to SetTexture and update some comments. --- dlls/wined3d/device.c | 11 +++++++++++ dlls/wined3d/directx.c | 4 +++- dlls/wined3d/surface.c | 10 ++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d98933c..635dd5b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4436,6 +4436,17 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetTex return D3DERR_INVALIDCALL; } + if(pTexture != NULL) { + /* SetTexture isn't allowed on textures in D3DPOOL_SCRATCH; The same is + * the case for D3DPOOL_SYSTEMMEM textures unless D3DDEVCAPS_TEXTURESYSTEMMORY is set. + * We don't check the caps as GetDeviceCaps is inefficient and we don't set the cap anyway. + */ + if(((IWineD3DTextureImpl*)pTexture)->resource.pool == D3DPOOL_SCRATCH || ((IWineD3DTextureImpl*)pTexture)->resource.pool == D3DPOOL_SYSTEMMEM) { + WARN("(%p) Attempt to set scratch texture rejected\n", pTexture); + return D3DERR_INVALIDCALL; + } + } + oldTexture = This->updateStateBlock->textures[Stage]; TRACE("GL_LIMITS %d\n",GL_LIMITS(textures)); TRACE("(%p) : oldtexture(%p)\n", This,oldTexture); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 01b4103..f117f6f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1456,8 +1456,10 @@ HRESULT WINAPI IWineD3DImpl_GetDeviceCap *pCaps->DevCaps = D3DDEVCAPS_DRAWPRIMTLVERTEX | D3DDEVCAPS_HWTRANSFORMANDLIGHT | + D3DDEVCAPS_EXECUTEVIDEOMEMORY | D3DDEVCAPS_PUREDEVICE | - D3DDEVCAPS_HWRASTERIZATION; + D3DDEVCAPS_HWRASTERIZATION | + D3DDEVCAPS_TEXTUREVIDEOMEMORY; *pCaps->PrimitiveMiscCaps = D3DPMISCCAPS_CULLCCW | diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 06d5a89..0c928a5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -912,8 +912,14 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LoadT This->Dirty = FALSE; - /* Resources are placed in system RAM and do not need to be recreated when a device is lost. These resources are not bound by device size or format restrictions. Because of this, these resources cannot be accessed by the Direct3D device nor set as textures or render targets. However, these resources can always be created, locked, and copied. */ - if (This->resource.pool == D3DPOOL_SCRATCH || This->resource.pool == D3DPOOL_SYSTEMMEM) /*never store scratch or system mem textures in the video ram*/ + /* Resources are placed in system RAM and do not need to be recreated when a device is lost. + * These resources are not bound by device size or format restrictions. Because of this, + * these resources cannot be accessed by the Direct3D device nor set as textures or render targets. + * However, these resources can always be created, locked, and copied. + * In general never store scratch or system mem textures in the video ram. However it is allowed + * for system memory textures when D3DDEVCAPS_TEXTURESYSTEMMEMORY is set but it isn't right now. + */ + if (This->resource.pool == D3DPOOL_SCRATCH || This->resource.pool == D3DPOOL_SYSTEMMEM) { FIXME("(%p) Operation not supported for scratch or SYSTEMMEM textures\n",This); return D3DERR_INVALIDCALL;

1 0

Huw Davies : oleaut32: Fixes and tests for CreateDispTypeInfo.
by Alexandre Julliard 06 Feb '06

06 Feb '06

Module: wine Branch: refs/heads/master Commit: 7000aca824780255f9342c5e645eac1f76b5a71a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7000aca824780255f9342c5… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 6 20:57:09 2006 +0100 oleaut32: Fixes and tests for CreateDispTypeInfo. CreateDispTypeInfo returns the typeinfo of a coclass which implements the described interface. --- dlls/oleaut32/tests/typelib.c | 150 +++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 131 +++++++++++++++++++++++++----------- 2 files changed, 240 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7000aca824780255f93…

1 0

lostwages/templates/en status_multimedia.template
by Jeremy Newman 06 Feb '06

06 Feb '06

ChangeSet ID: 22809 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/02/06 13:40:03 Modified files: templates/en : status_multimedia.template Log message: Tom Wickline <twickline(a)gmail.com> move msacm.dll to Multimedia DLLs Patch: http://cvs.winehq.org/patch.py?id=22809 Old revision New revision Changes Path 1.15 1.16 +7 -8 lostwages/templates/en/status_multimedia.template Index: lostwages/templates/en/status_multimedia.template diff -u -p lostwages/templates/en/status_multimedia.template:1.15 lostwages/templates/en/status_multimedia.template:1.16 --- lostwages/templates/en/status_multimedia.template:1.15 6 Feb 2006 19:40: 3 -0000 +++ lostwages/templates/en/status_multimedia.template 6 Feb 2006 19:40: 3 -0000 @@ -130,14 +130,6 @@ </tr> <td colspan="5"><strong>MSACM Codecs</strong></td> <tr> - <tr> - <td>msacm.dll</td> - <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/h…">Multimedia Functions</a></a></td> - <td>None</td> - <td class="pct70">70% complete</td> - <td>Alex Villacís Lasso</td> - </tr> - <tr> <td>ADPCM</td> <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wcedshow/h…">ACM Wrapper Filter</a></td> <td>None</td> @@ -203,6 +195,13 @@ <td>Dmitry Timoshkov</td> </tr> <tr> + <td>msacm.dll</td> + <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/h…">Multimedia Functions</a></a></td> + <td>None</td> + <td class="pct70">70% complete</td> + <td>Alex Villacís Lasso</td> + </tr> + <tr> <td>winmm.dll</td> <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/multimed/h…">Multimedia Functions</a></td> <td><a href="{$root}/site/?issue=244#WinMM%20Timer%20Events">#244</a></td>

1 0