November 2005 - Wine-Commits

wine/dlls/wininet http.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21270 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 06:01:59 Modified files: dlls/wininet : http.c Log message: Robert Shearman <rob(a)codeweavers.com> INTERNET_STATUS_HANDLE_CREATED notifications just send the handle, not an INTERNET_ASYNC_RESULT structure. The source handle in HTTP_Connect should be the parent's handle. Patch: http://cvs.winehq.org/patch.py?id=21270 Old revision New revision Changes Path 1.108 1.109 +5 -14 wine/dlls/wininet/http.c Index: wine/dlls/wininet/http.c diff -u -p wine/dlls/wininet/http.c:1.108 wine/dlls/wininet/http.c:1.109 --- wine/dlls/wininet/http.c:1.108 15 Nov 2005 12: 1:59 -0000 +++ wine/dlls/wininet/http.c 15 Nov 2005 12: 1:59 -0000 @@ -669,7 +669,6 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L HINTERNET handle = NULL; static const WCHAR szUrlForm[] = {'h','t','t','p',':','/','/','%','s',0}; DWORD len; - INTERNET_ASYNC_RESULT iar; TRACE("-->\n"); @@ -797,12 +796,9 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L HeapFree(GetProcessHeap(), 0, lpszUrl); - iar.dwResult = (DWORD_PTR)handle; - iar.dwError = ERROR_SUCCESS; - SendAsyncCallback(&lpwhs->hdr, dwContext, - INTERNET_STATUS_HANDLE_CREATED, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + INTERNET_STATUS_HANDLE_CREATED, &handle, + sizeof(handle)); /* * A STATUS_REQUEST_COMPLETE is NOT sent here as per my tests on windows @@ -1867,14 +1863,9 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW /* Don't send a handle created callback if this handle was created with InternetOpenUrl */ if (!(lpwhs->hdr.dwInternalFlags & INET_OPENURL)) { - INTERNET_ASYNC_RESULT iar; - - iar.dwResult = (DWORD_PTR)handle; - iar.dwError = ERROR_SUCCESS; - - SendAsyncCallback(&lpwhs->hdr, dwContext, - INTERNET_STATUS_HANDLE_CREATED, &iar, - sizeof(INTERNET_ASYNC_RESULT)); + SendAsyncCallback(&hIC->hdr, dwContext, + INTERNET_STATUS_HANDLE_CREATED, &handle, + sizeof(handle)); } bSuccess = TRUE;

1 0

wine/dlls/wininet netconnection.c internet.h
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21269 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 06:01:40 Modified files: dlls/wininet : netconnection.c internet.h Log message: Robert Shearman <rob(a)codeweavers.com> SSL doesn't need to use a different socket to unsecure communications. Patch: http://cvs.winehq.org/patch.py?id=21269 Old revision New revision Changes Path 1.14 1.15 +40 -69 wine/dlls/wininet/netconnection.c 1.39 1.40 +0 -1 wine/dlls/wininet/internet.h Index: wine/dlls/wininet/netconnection.c diff -u -p wine/dlls/wininet/netconnection.c:1.14 wine/dlls/wininet/netconnection.c:1.15 --- wine/dlls/wininet/netconnection.c:1.14 15 Nov 2005 12: 1:40 -0000 +++ wine/dlls/wininet/netconnection.c 15 Nov 2005 12: 1:40 -0000 @@ -102,7 +102,6 @@ void NETCON_init(WININET_NETCONNECTION * { #ifdef HAVE_OPENSSL_SSL_H TRACE("using SSL connection\n"); - connection->ssl_sock = -1; if (OpenSSL_ssl_handle) /* already initilzed everything */ return; OpenSSL_ssl_handle = wine_dlopen(SONAME_LIBSSL, RTLD_NOW, NULL, 0); @@ -174,22 +173,10 @@ void NETCON_init(WININET_NETCONNECTION * BOOL NETCON_connected(WININET_NETCONNECTION *connection) { - if (!connection->useSSL) - { - if (connection->socketFD == -1) - return FALSE; - return TRUE; - } + if (connection->socketFD == -1) + return FALSE; else - { -#ifdef HAVE_OPENSSL_SSL_H - if (connection->ssl_sock == -1) - return FALSE; return TRUE; -#else - return FALSE; -#endif - } } /****************************************************************************** @@ -200,22 +187,15 @@ BOOL NETCON_connected(WININET_NETCONNECT BOOL NETCON_create(WININET_NETCONNECTION *connection, int domain, int type, int protocol) { - if (!connection->useSSL) - { - connection->socketFD = socket(domain, type, protocol); - if (connection->socketFD == -1) - return FALSE; - return TRUE; - } - else - { -#ifdef HAVE_OPENSSL_SSL_H - connection->ssl_sock = socket(domain, type, protocol); - return TRUE; -#else - return FALSE; +#ifndef HAVE_OPENSSL_SSL_H + if (connection->useSSL) + return FALSE; #endif - } + + connection->socketFD = socket(domain, type, protocol); + if (connection->socketFD == -1) + return FALSE; + return TRUE; } /****************************************************************************** @@ -224,31 +204,27 @@ BOOL NETCON_create(WININET_NETCONNECTION */ BOOL NETCON_close(WININET_NETCONNECTION *connection) { + int result; + if (!NETCON_connected(connection)) return FALSE; - if (!connection->useSSL) - { - int result; - result = closesocket(connection->socketFD); - connection->socketFD = -1; - if (result == -1) - return FALSE; - return TRUE; - } - else - { + + result = closesocket(connection->socketFD); + connection->socketFD = -1; + #ifdef HAVE_OPENSSL_SSL_H - closesocket(connection->ssl_sock); - connection->ssl_sock = -1; + if (connection->useSSL) + { HeapFree(GetProcessHeap(),0,connection->peek_msg_mem); connection->peek_msg = NULL; connection->peek_msg_mem = NULL; - /* FIXME should we call SSL_shutdown here?? Probably on whatever is the - * opposite of NETCON_init.... */ - return TRUE; -#else - return FALSE; -#endif + /* FIXME should we call SSL_shutdown here?? Probably on whatever is the + * opposite of NETCON_init.... */ } +#endif + + if (result == -1) + return FALSE; + return TRUE; } /****************************************************************************** @@ -258,42 +234,37 @@ BOOL NETCON_close(WININET_NETCONNECTION BOOL NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr, unsigned int addrlen) { + int result; + if (!NETCON_connected(connection)) return FALSE; - if (!connection->useSSL) + + result = connect(connection->socketFD, serv_addr, addrlen); + if (result == -1) { - int result; - result = connect(connection->socketFD, serv_addr, addrlen); - if (result == -1) - { - closesocket(connection->socketFD); - connection->socketFD = -1; - return FALSE; - } - return TRUE; + closesocket(connection->socketFD); + connection->socketFD = -1; + return FALSE; } - else - { + #ifdef HAVE_OPENSSL_SSL_H + if (connection->useSSL) + { BIO *sbio; ctx = pSSL_CTX_new(meth); connection->ssl_s = pSSL_new(ctx); - if (connect(connection->ssl_sock, serv_addr, addrlen) == -1) - return FALSE; - - sbio = pBIO_new_socket(connection->ssl_sock, BIO_NOCLOSE); + sbio = pBIO_new_socket(connection->socketFD, BIO_NOCLOSE); pSSL_set_bio(connection->ssl_s, sbio, sbio); if (pSSL_connect(connection->ssl_s) <= 0) { ERR("ssl couldn't connect\n"); return FALSE; } - return TRUE; -#else - return FALSE; -#endif } +#endif + + return TRUE; } /****************************************************************************** Index: wine/dlls/wininet/internet.h diff -u -p wine/dlls/wininet/internet.h:1.39 wine/dlls/wininet/internet.h:1.40 --- wine/dlls/wininet/internet.h:1.39 15 Nov 2005 12: 1:40 -0000 +++ wine/dlls/wininet/internet.h 15 Nov 2005 12: 1:40 -0000 @@ -61,7 +61,6 @@ typedef struct int socketFD; #ifdef HAVE_OPENSSL_SSL_H SSL *ssl_s; - int ssl_sock; char *peek_msg; char *peek_msg_mem; #endif

1 0

wine/dlls/kernel/tests thread.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21268 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 06:00:41 Modified files: dlls/kernel/tests: thread.c Log message: Paul Vriens <Paul.Vriens(a)xs4all.nl> Corrected last error information. Make sure we can run the tests on win9x. Patch: http://cvs.winehq.org/patch.py?id=21268 Old revision New revision Changes Path 1.31 1.32 +21 -2 wine/dlls/kernel/tests/thread.c Index: wine/dlls/kernel/tests/thread.c diff -u -p wine/dlls/kernel/tests/thread.c:1.31 wine/dlls/kernel/tests/thread.c:1.32 --- wine/dlls/kernel/tests/thread.c:1.31 15 Nov 2005 12: 0:41 -0000 +++ wine/dlls/kernel/tests/thread.c 15 Nov 2005 12: 0:41 -0000 @@ -626,18 +626,37 @@ static void test_SetThreadContext(void) { CONTEXT ctx; int *stack; - HANDLE thread = CreateThread( NULL, 0, threadFunc6, (void *)2, CREATE_SUSPENDED, NULL ); + HANDLE thread; + DWORD threadid; + DWORD prevcount; + + SetLastError(0xdeadbeef); + thread = CreateThread( NULL, 0, threadFunc6, (void *)2, CREATE_SUSPENDED, &threadid ); + ok( thread != NULL, "CreateThread failed : (%ld)\n", GetLastError() ); + if (!thread) + { + trace("Thread creation failed, skipping rest of test\n"); + return; + } ctx.ContextFlags = CONTEXT_FULL; + SetLastError(0xdeadbeef); ok( GetThreadContext( thread, &ctx ), "GetThreadContext failed : (%ld)\n", GetLastError() ); + /* simulate a call to set_test_val(10) */ stack = (int *)ctx.Esp; stack[-1] = 10; stack[-2] = ctx.Eip; ctx.Esp -= 2 * sizeof(int *); ctx.Eip = (DWORD)set_test_val; + SetLastError(0xdeadbeef); ok( SetThreadContext( thread, &ctx ), "SetThreadContext failed : (%ld)\n", GetLastError() ); - ResumeThread( thread ); + + SetLastError(0xdeadbeef); + prevcount = ResumeThread( thread ); + ok ( prevcount == 1, "Previous suspend count (%ld) instead of 1, last error : (%ld)\n", + prevcount, GetLastError() ); + WaitForSingleObject( thread, INFINITE ); ok( test_value == 20, "test_value %d instead of 20\n", test_value ); }

1 0

wine/dlls/msi package.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21267 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 06:00:14 Modified files: dlls/msi : package.c Log message: Mike McCormack <mike(a)codeweavers.com> Set the Installed property if the product is already installed. Patch: http://cvs.winehq.org/patch.py?id=21267 Old revision New revision Changes Path 1.66 1.67 +40 -33 wine/dlls/msi/package.c Index: wine/dlls/msi/package.c diff -u -p wine/dlls/msi/package.c:1.66 wine/dlls/msi/package.c:1.67 --- wine/dlls/msi/package.c:1.66 15 Nov 2005 12: 0:14 -0000 +++ wine/dlls/msi/package.c 15 Nov 2005 12: 0:14 -0000 @@ -31,7 +31,6 @@ #include "wine/debug.h" #include "msi.h" #include "msiquery.h" -#include "msipriv.h" #include "objidl.h" #include "wincrypt.h" #include "winuser.h" @@ -39,6 +38,9 @@ #include "wine/unicode.h" #include "objbase.h" +#include "msipriv.h" +#include "action.h" + WINE_DEFAULT_DEBUG_CHANNEL(msi); static void MSI_FreePackage( MSIOBJECTHDR *arg) @@ -121,6 +123,30 @@ static UINT clone_properties(MSIDATABASE } /* + * set_installed_prop + * + * Sets the "Installed" property to indicate that + * the product is installed for the current user. + */ +static UINT set_installed_prop( MSIPACKAGE *package ) +{ + static const WCHAR szInstalled[] = { + 'I','n','s','t','a','l','l','e','d',0 }; + WCHAR val[2] = { '1', 0 }; + HKEY hkey = 0; + UINT r; + + r = MSIREG_OpenUninstallKey( package->ProductCode, &hkey, FALSE ); + if (r == ERROR_SUCCESS) + { + RegCloseKey( hkey ); + MSI_SetPropertyW( package, szInstalled, val ); + } + + return r; +} + +/* * There are a whole slew of these we need to set * * @@ -203,29 +229,14 @@ static VOID set_installer_properties(MSI static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; static const WCHAR szScreenFormat[] = {'%','d',0}; -/* - * Other things I notice set - * -SystemLanguageID -ComputerName -UserLanguageID -LogonUser -VirtualMemory -Intel -ShellAdvSupport -DefaultUIFont -VersionDatabase -PackagecodeChanging -ProductState -CaptionHeight -BorderTop -BorderSide -TextHeight -RedirectedDllSupport -Time -Date -Privileged -*/ + /* + * Other things that probably should be set: + * + * SystemLanguageID ComputerName UserLanguageID LogonUser VirtualMemory + * Intel ShellAdvSupport DefaultUIFont VersionDatabase PackagecodeChanging + * ProductState CaptionHeight BorderTop BorderSide TextHeight + * RedirectedDllSupport Time Date Privileged + */ SHGetFolderPathW(NULL,CSIDL_PROGRAM_FILES_COMMON,NULL,0,pth); strcatW(pth,cszbs); @@ -357,6 +368,8 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABA { static const WCHAR szLevel[] = { 'U','I','L','e','v','e','l',0 }; static const WCHAR szpi[] = {'%','i',0}; + static const WCHAR szProductCode[] = { + 'P','r','o','d','u','c','t','C','o','d','e',0}; MSIPACKAGE *package = NULL; WCHAR uilevel[10]; @@ -393,6 +406,9 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABA set_installer_properties(package); sprintfW(uilevel,szpi,gUILevel); MSI_SetPropertyW(package, szLevel, uilevel); + + package->ProductCode = msi_dup_property( package, szProductCode ); + set_installed_prop( package ); } return package; @@ -431,8 +447,6 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIDATABASE *db = NULL; MSIPACKAGE *package; MSIHANDLE handle; - DWORD size; - static const WCHAR szProductCode[]= {'P','r','o','d','u','c','t','C','o','d','e',0}; UINT r; TRACE("%s %p\n", debugstr_w(szPackage), pPackage); @@ -478,13 +492,6 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSI_SetPropertyW( package, Database, szPackage ); } - /* this property must exist */ - size = 0; - MSI_GetPropertyW(package,szProductCode,NULL,&size); - size ++; - package->ProductCode = msi_alloc(size * sizeof(WCHAR)); - MSI_GetPropertyW(package,szProductCode,package->ProductCode, &size); - *pPackage = package; return ERROR_SUCCESS;

1 0

wine/ server/queue.c dlls/user/input.c
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21266 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 09:17:09 Modified files: server : queue.c dlls/user : input.c Log message: Added support for the QS_ALLPOSTMESSAGE flag. Patch: http://cvs.winehq.org/patch.py?id=21266 Old revision New revision Changes Path 1.70 1.71 +5 -4 wine/server/queue.c 1.8 1.9 +6 -3 wine/dlls/user/input.c Index: wine/server/queue.c diff -u -p wine/server/queue.c:1.70 wine/server/queue.c:1.71 --- wine/server/queue.c:1.70 14 Nov 2005 15:17: 9 -0000 +++ wine/server/queue.c 14 Nov 2005 15:17: 9 -0000 @@ -471,7 +471,7 @@ static void remove_queue_message( struct if (list_empty( &queue->msg_list[kind] )) clear_queue_bits( queue, QS_SENDMESSAGE ); break; case POST_MESSAGE: - if (list_empty( &queue->msg_list[kind] )) clear_queue_bits( queue, QS_POSTMESSAGE ); + if (list_empty( &queue->msg_list[kind] )) clear_queue_bits( queue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE ); break; } free_message( msg ); @@ -1420,7 +1420,7 @@ void post_message( user_handle_t win, un msg->data_size = 0; list_add_tail( &thread->queue->msg_list[POST_MESSAGE], &msg->entry ); - set_queue_bits( thread->queue, QS_POSTMESSAGE ); + set_queue_bits( thread->queue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE ); } release_object( thread ); } @@ -1592,7 +1592,7 @@ DECL_HANDLER(send_message) break; } list_add_tail( &recv_queue->msg_list[POST_MESSAGE], &msg->entry ); - set_queue_bits( recv_queue, QS_POSTMESSAGE ); + set_queue_bits( recv_queue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE ); break; case MSG_HARDWARE: queue_hardware_message( recv_queue, msg ); @@ -1631,7 +1631,8 @@ DECL_HANDLER(get_message) if (req->flags & GET_MSG_SENT_ONLY) goto done; /* nothing else to check */ /* clear changed bits so we can wait on them if we don't find a message */ - queue->changed_bits = 0; + if (req->get_first == 0 && req->get_last == ~0U) queue->changed_bits = 0; + else queue->changed_bits &= QS_ALLPOSTMESSAGE; /* then check for posted messages */ if (get_posted_message( queue, get_win, req->get_first, req->get_last, req->flags, reply )) Index: wine/dlls/user/input.c diff -u -p wine/dlls/user/input.c:1.8 wine/dlls/user/input.c:1.9 --- wine/dlls/user/input.c:1.8 14 Nov 2005 15:17: 9 -0000 +++ wine/dlls/user/input.c 14 Nov 2005 15:17: 9 -0000 @@ -236,11 +236,14 @@ DWORD WINAPI GetQueueStatus( UINT flags { DWORD ret = 0; - if (flags & ~0xff) - FIXME("QS_xxxx flags (%04x) are not handled\n", flags & ~0xff); + if (flags & ~(QS_ALLINPUT | QS_ALLPOSTMESSAGE | QS_SMRESULT)) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } /* check for pending X events */ - USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); + USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, flags, 0 ); SERVER_START_REQ( get_queue_status ) {

1 0

wine/dlls/urlmon tests/url.c urlmon_main.h umo ...
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21265 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 09:12:43 Modified files: dlls/urlmon/tests: url.c dlls/urlmon : urlmon_main.h umon.c Makefile.in Added files: dlls/urlmon : binding.c Log message: Jacek Caban <jack(a)itma.pwr.wroc.pl> Beginning of true BindToStorage implementation. Patch: http://cvs.winehq.org/patch.py?id=21265 Old revision New revision Changes Path 1.12 1.13 +299 -39 wine/dlls/urlmon/tests/url.c 1.15 1.16 +2 -0 wine/dlls/urlmon/urlmon_main.h 1.67 1.68 +5 -4 wine/dlls/urlmon/umon.c 1.31 1.32 +1 -0 wine/dlls/urlmon/Makefile.in Added 1.1 +0 -0 wine/dlls/urlmon/binding.c

1 0

wine/tools/widl header.c
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21264 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 09:12:24 Modified files: tools/widl : header.c Log message: Huw Davies <huw(a)codeweavers.com> Prefix [putref] property names with putref_. Patch: http://cvs.winehq.org/patch.py?id=21264 Old revision New revision Changes Path 1.37 1.38 +2 -0 wine/tools/widl/header.c Index: wine/tools/widl/header.c diff -u -p wine/tools/widl/header.c:1.37 wine/tools/widl/header.c:1.38 --- wine/tools/widl/header.c:1.37 14 Nov 2005 15:12:24 -0000 +++ wine/tools/widl/header.c 14 Nov 2005 15:12:24 -0000 @@ -105,6 +105,8 @@ void write_name(FILE *h, var_t *v) fprintf(h, "get_" ); else if (is_attr( v->attrs, ATTR_PROPPUT )) fprintf(h, "put_" ); + else if (is_attr( v->attrs, ATTR_PROPPUTREF )) + fprintf(h, "putref_" ); fprintf(h, "%s", v->name); }

1 0

wine/dlls/user tests/sysparams.c sysparams.c
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21263 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 09:12:14 Modified files: dlls/user/tests: sysparams.c dlls/user : sysparams.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Fix SysparametersInfoA( SPI_SETICONMETRICS), the A<->W conversion was rather broken. Make the SPI_{G|S}ETICONMETRICS functions more consistent with those for SPI_ICON{HORIZONTAL|VERTICAL}SPACING, SPI_{G|S}ICONTITLEWRAP and SPI_{G|S}ICONTITLELOGFONT. Accordingly extend the corresponding tests. Patch: http://cvs.winehq.org/patch.py?id=21263 Old revision New revision Changes Path 1.42 1.43 +142 -73 wine/dlls/user/tests/sysparams.c 1.40 1.41 +57 -21 wine/dlls/user/sysparams.c

1 0

wine/dlls/msvcrt tests/cpp.c undname.c
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21262 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 09:11:39 Modified files: dlls/msvcrt/tests: cpp.c dlls/msvcrt : undname.c Log message: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Undname: Allow more then one coded character in demangle_datatype. Patch: http://cvs.winehq.org/patch.py?id=21262 Old revision New revision Changes Path 1.6 1.7 +29 -5 wine/dlls/msvcrt/tests/cpp.c 1.3 1.4 +13 -13 wine/dlls/msvcrt/undname.c Index: wine/dlls/msvcrt/tests/cpp.c diff -u -p wine/dlls/msvcrt/tests/cpp.c:1.6 wine/dlls/msvcrt/tests/cpp.c:1.7 --- wine/dlls/msvcrt/tests/cpp.c:1.6 14 Nov 2005 15:11:39 -0000 +++ wine/dlls/msvcrt/tests/cpp.c 14 Nov 2005 15:11:39 -0000 @@ -818,13 +818,37 @@ static void test_rtti(void) ok (casted == NULL, "Cast succeeded\n"); } +struct _demangle { + LPCSTR mangled; + LPCSTR result; + BOOL test_in_wine; +}; + static void test_demangle(void) { - char * name = NULL; - static const char * mangled = ".ABVVec4(a)ref2@dice@@"; - static const char * result = "class dice::ref2::Vec4 const &"; - name = p__unDName(0, mangled + 1, 0,pmalloc,pfree,0x2800); - ok(name != NULL && !strcmp(name,result),"Got name %s\n", name); + char * name; + struct _demangle demangle[]={ +/* { "BlaBla"," ?? ::Bla", FALSE}, */ + { "ABVVec4(a)ref2@dice@@","class dice::ref2::Vec4 const &",TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$0H@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,7>", TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$0HO@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,126>",TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$0HOA@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,2016>",TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$0HOAA@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,32256>",TRUE}, + { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE}, +/* { "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$011@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG(a)W4CDB_WYSIWYG_BITS_ENUM@@$011@@@",FALSE}, */ + }; + int i, num_test = (sizeof(demangle)/sizeof(struct _demangle)); + + for (i=0; i < num_test; i++) { + + name = NULL; + name = p__unDName(0, demangle[i].mangled, 0,pmalloc,pfree,0x2800); + if ( demangle[i].test_in_wine) + ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\"\n", name); + else + todo_wine ok(name != NULL && !strcmp(name,demangle[i].result), "Got name %s\n", name); + + } } START_TEST(cpp) Index: wine/dlls/msvcrt/undname.c diff -u -p wine/dlls/msvcrt/undname.c:1.3 wine/dlls/msvcrt/undname.c:1.4 --- wine/dlls/msvcrt/undname.c:1.3 14 Nov 2005 15:11:39 -0000 +++ wine/dlls/msvcrt/undname.c 14 Nov 2005 15:11:39 -0000 @@ -23,6 +23,7 @@ #include "wine/port.h" #include <assert.h> +#include <stdio.h> #include "msvcrt.h" #include "wine/debug.h" @@ -598,6 +599,7 @@ static BOOL demangle_datatype(struct par { char dt; BOOL add_pmt = TRUE; + int num_args=0; assert(ct); ct->left = ct->right = NULL; @@ -713,24 +715,22 @@ static BOOL demangle_datatype(struct par ct->left = ptr; sym->current += 2; } - else if ((sym->current[1] >= 'A' && sym->current[1] <= 'P') && - sym->current[2] == '@') + else if (sym->current[1] >= 'A' && sym->current[1] <= 'P') { - char* ptr; - ptr = und_alloc(sym, 3); - if (sym->current[1] <= 'J') + while (sym->current[1] >= 'A' && sym->current[1] <= 'P') { - ptr[0] = '0' + sym->current[1] - 'A'; - ptr[1] = 0; + num_args *= 16; + num_args += sym->current[1] - 'A'; + sym->current += 1; } - else + if(sym->current[1] == '@') { - ptr[0] = '1'; - ptr[1] = sym->current[1] - 'K' + '0'; - ptr[2] = 0; + char *ptr; + ptr = und_alloc(sym, 17); + sprintf(ptr,"%d",num_args); + ct->left = ptr; + sym->current += 1; } - ct->left = ptr; - sym->current += 3; } else goto done; break;

1 0

wine/tools wine.inf
by Alexandre Julliard Nov. 14, 2005

Nov. 14, 2005

ChangeSet ID: 21261 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/14 09:11:26 Modified files: tools : wine.inf Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Add default version information. Patch: http://cvs.winehq.org/patch.py?id=21261 Old revision New revision Changes Path 1.47 1.48 +30 -0 wine/tools/wine.inf Index: wine/tools/wine.inf diff -u -p wine/tools/wine.inf:1.47 wine/tools/wine.inf:1.48 --- wine/tools/wine.inf:1.47 14 Nov 2005 15:11:26 -0000 +++ wine/tools/wine.inf 14 Nov 2005 15:11:26 -0000 @@ -44,13 +44,35 @@ AddReg=\ OLE,\ Tapi +[DefaultInstall.NT] +RegisterDlls=RegisterDllsSection +UpdateInis=SystemIni +AddReg=\ + Classes,\ + ControlClass,\ + CurrentVersion,\ + Debugger,\ + Desktop,\ + Metrics,\ + DirectX,\ + Environment,\ + Fonts,\ + MCI,\ + Misc,\ + Nls,\ + OLE,\ + Tapi,\ + VersionInfo + [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" Mci32Str="Software\Microsoft\Windows NT\CurrentVersion\MCI32" Desktop="Control Panel\Desktop" Metrics="Control Panel\Desktop\WindowMetrics" CurrentVersion="Software\Microsoft\Windows\CurrentVersion" +CurrentVersionNT="Software\Microsoft\Windows NT\CurrentVersion" FontSubStr="Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" +Control="System\CurrentControlSet\Control" [Classes] HKCR,.avi,"Content Type",,"video/avi" @@ -2084,3 +2106,11 @@ system.ini, drivers32,,"VIDC.CVID=iccvid system.ini, drivers32,,"; VIDC.IV50=ir50_32.dll" system.ini, drivers32,,"; VIDC.IV31=ir32_32.dll" system.ini, drivers32,,"; VIDC.IV32=ir32_32.dll" + +[VersionInfo] +HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.0" +HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 4" +HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2195" +HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" +HKLM,%Control%\Windows,"CSDVersion",0x10003,0x400 +HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"

1 0