August 2006 - Wine-commits - list.winehq.org

Kai Blin : secur32: Copy helper buffer to output buffer before reusing helper buffer.
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: fe43d5d4842e2f2a5ff130d0078a165a69110408 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fe43d5d4842e2f2a5ff130d… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Aug 14 19:35:39 2006 +0200 secur32: Copy helper buffer to output buffer before reusing helper buffer. --- dlls/secur32/ntlm.c | 73 +++++++++++++++++++++++++++------------------------ 1 files changed, 38 insertions(+), 35 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 5750386..44e8ac0 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -577,6 +577,44 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In goto isc_end; } + phNewContext->dwUpper = ctxt_attr; + phNewContext->dwLower = (ULONG_PTR)helper; + + ret = SEC_E_OK; + } + + /* put the decoded client blob into the out buffer */ + + if (fContextReq & ISC_REQ_ALLOCATE_MEMORY) + { + if (pOutput) + { + pOutput->cBuffers = 1; + pOutput->pBuffers[0].pvBuffer = SECUR32_ALLOC(bin_len); + pOutput->pBuffers[0].cbBuffer = bin_len; + } + } + + if (!pOutput || !pOutput->cBuffers || pOutput->pBuffers[0].cbBuffer < bin_len) + { + TRACE("out buffer is NULL or has not enough space\n"); + ret = SEC_E_BUFFER_TOO_SMALL; + goto isc_end; + } + + if (!pOutput->pBuffers[0].pvBuffer) + { + TRACE("out buffer is NULL\n"); + ret = SEC_E_INTERNAL_ERROR; + goto isc_end; + } + + pOutput->pBuffers[0].cbBuffer = bin_len; + pOutput->pBuffers[0].BufferType = SECBUFFER_DATA; + memcpy(pOutput->pBuffers[0].pvBuffer, bin, bin_len); + + if(ret == SEC_E_OK) + { TRACE("Getting negotiated flags\n"); lstrcpynA(buffer, "GF", max_len - 1); if((ret = run_helper(helper, buffer, max_len, &buffer_len)) != SEC_E_OK) @@ -630,43 +668,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In memcpy(helper->session_key, bin, bin_len); } } - - phNewContext->dwUpper = ctxt_attr; - phNewContext->dwLower = (ULONG_PTR)helper; - - ret = SEC_E_OK; - } - - /* put the decoded client blob into the out buffer */ - - if (fContextReq & ISC_REQ_ALLOCATE_MEMORY) - { - if (pOutput) - { - pOutput->cBuffers = 1; - pOutput->pBuffers[0].pvBuffer = SECUR32_ALLOC(bin_len); - pOutput->pBuffers[0].cbBuffer = bin_len; - } } - if (!pOutput || !pOutput->cBuffers || pOutput->pBuffers[0].cbBuffer < bin_len) - { - TRACE("out buffer is NULL or has not enough space\n"); - ret = SEC_E_BUFFER_TOO_SMALL; - goto isc_end; - } - - if (!pOutput->pBuffers[0].pvBuffer) - { - TRACE("out buffer is NULL\n"); - ret = SEC_E_INTERNAL_ERROR; - goto isc_end; - } - - pOutput->pBuffers[0].cbBuffer = bin_len; - pOutput->pBuffers[0].BufferType = SECBUFFER_DATA; - memcpy(pOutput->pBuffers[0].pvBuffer, bin, bin_len); - if(ret != SEC_I_CONTINUE_NEEDED) { TRACE("Deleting password!\n");

1 0

Kai Blin : secur32: Add handling of feature flags and session key to AcceptSecurityContext.
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: cc17d97d2395f59f49e420f0f07d787e28187ca8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc17d97d2395f59f49e420f… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Aug 15 02:02:46 2006 +0200 secur32: Add handling of feature flags and session key to AcceptSecurityContext. --- dlls/secur32/ntlm.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 79 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 44e8ac0..affc2e5 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -734,7 +734,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) { SECURITY_STATUS ret; - char *buffer; + char *buffer, *want_flags = NULL; PBYTE bin; int buffer_len, bin_len, max_len = NTLM_MAX_BUF; ULONG ctxt_attr = 0; @@ -786,17 +786,26 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac bin_len = pInput->pBuffers[0].cbBuffer; /* Handle all the flags */ + want_flags = HeapAlloc(GetProcessHeap(), 0, 73); + if(want_flags == NULL) + { + TRACE("Failed to allocate memory for the want_flags!\n"); + ret = SEC_E_INSUFFICIENT_MEMORY; + goto asc_end; + } + lstrcpyA(want_flags, "SF"); if(fContextReq & ASC_REQ_ALLOCATE_MEMORY) { FIXME("ASC_REQ_ALLOCATE_MEMORY stub\n"); } if(fContextReq & ASC_REQ_CONFIDENTIALITY) { - FIXME("ASC_REQ_CONFIDENTIALITY stub\n"); + lstrcatA(want_flags, " NTLMSSP_FEATURE_SEAL"); } if(fContextReq & ASC_REQ_CONNECTION) { /* This is default, so we'll enable it */ + lstrcatA(want_flags, " NTLMSSP_FEATURE_SESSION_KEY"); ctxt_attr |= ASC_RET_CONNECTION; } if(fContextReq & ASC_REQ_EXTENDED_ERROR) @@ -805,7 +814,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac } if(fContextReq & ASC_REQ_INTEGRITY) { - FIXME("ASC_REQ_INTEGRITY stub\n"); + lstrcatA(want_flags, " NTLMSSP_FEATURE_SIGN"); } if(fContextReq & ASC_REQ_MUTUAL_AUTH) { @@ -825,6 +834,17 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac } /* Done with the flags */ + if(lstrlenA(want_flags) > 3) + { + TRACE("Server set want_flags: %s\n", debugstr_a(want_flags)); + lstrcpynA(buffer, want_flags, max_len - 1); + if((ret = run_helper(helper, buffer, max_len, &buffer_len)) != + SEC_E_OK) + goto asc_end; + if(!strncmp(buffer, "BH", 2)) + TRACE("Helper doesn't understand new command set\n"); + } + /* This is the YR request from the client, encode to base64 */ memcpy(bin, pInput->pBuffers[0].pvBuffer, bin_len); @@ -887,7 +907,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac ret = SEC_E_INCOMPLETE_MESSAGE; goto asc_end; } - + if(pInput->cBuffers < 1) { ret = SEC_E_INCOMPLETE_MESSAGE; @@ -937,12 +957,67 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac } pOutput->pBuffers[0].cbBuffer = 0; ret = SEC_E_OK; + + TRACE("Getting negotiated flags\n"); + lstrcpynA(buffer, "GF", max_len - 1); + if((ret = run_helper(helper, buffer, max_len, &buffer_len)) != SEC_E_OK) + goto asc_end; + + if(buffer_len < 3) + { + TRACE("No flags negotiated, or helper does not support GF command\n"); + } + else + { + TRACE("Negotiated %s\n", debugstr_a(buffer)); + sscanf(buffer + 3, "%lx", &(helper->neg_flags)); + TRACE("Stored 0x%08lx as flags\n", helper->neg_flags); + } + + TRACE("Getting session key\n"); + lstrcpynA(buffer, "GK", max_len - 1); + if((ret = run_helper(helper, buffer, max_len, &buffer_len)) != SEC_E_OK) + goto asc_end; + + if(buffer_len < 3) + TRACE("Helper does not support GK command\n"); + else + { + if(strncmp(buffer, "BH ", 3) == 0) + { + TRACE("Helper sent %s\n", debugstr_a(buffer+3)); + helper->valid_session_key = FALSE; + helper->session_key = HeapAlloc(GetProcessHeap(), 0, 16); + /*FIXME: Generate the dummy session key = MD4(MD4(password))*/ + memset(helper->session_key, 0 , 16); + } + else if(strncmp(buffer, "GK ", 3) == 0) + { + if((ret = decodeBase64(buffer+3, buffer_len-3, bin, max_len, + &bin_len)) != SEC_E_OK) + { + TRACE("Failed to decode session key\n"); + } + TRACE("Session key is %s\n", debugstr_a(buffer+3)); + helper->valid_session_key = TRUE; + if(!helper->session_key) + helper->session_key = HeapAlloc(GetProcessHeap(), 0, bin_len); + if(!helper->session_key) + { + TRACE("Failed to allocate memory for session key\n"); + ret = SEC_E_INTERNAL_ERROR; + goto asc_end; + } + memcpy(helper->session_key, bin, bin_len); + } + } } phNewContext->dwUpper = ctxt_attr; phNewContext->dwLower = (ULONG_PTR)helper; asc_end: + HeapFree(GetProcessHeap(), 0, want_flags); HeapFree(GetProcessHeap(), 0, buffer); HeapFree(GetProcessHeap(), 0, bin); return ret;

1 0

James Hawkins : msi: Non-compressed files may come before the list of compressed files in the file sequence .
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: 75cc5f1e5e174d8a926b90a5eb004d5f6729e504 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=75cc5f1e5e174d8a926b90a… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 14 16:05:54 2006 -0700 msi: Non-compressed files may come before the list of compressed files in the file sequence. --- dlls/msi/files.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 75238f1..81c5ac4 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -460,9 +460,6 @@ static UINT ready_media_for_file( MSIPAC return ERROR_FUNCTION_FAILED; } - seq = MSI_RecordGetInteger(row,2); - mi->last_sequence = seq; - volume = MSI_RecordGetString(row, 5); prompt = MSI_RecordGetString(row, 3); @@ -486,6 +483,9 @@ static UINT ready_media_for_file( MSIPAC return rc; } + seq = MSI_RecordGetInteger(row,2); + mi->last_sequence = seq; + cab = MSI_RecordGetString(row,4); if (cab) {

1 0

Dan Hipschman : widl: Pass the right size to MIDL_memset in generated proxy code.
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: 47519f08a706b81db78391768a6027eb6d116076 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=47519f08a706b81db783917… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Aug 14 16:45:56 2006 -0700 widl: Pass the right size to MIDL_memset in generated proxy code. --- tools/widl/proxy.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 9bba5c5..3d3e717 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -172,10 +172,8 @@ static void clear_output_vars( var_t *ar if (is_attr(arg->attrs, ATTR_OUT) && !is_attr(arg->attrs, ATTR_IN)) { print_proxy( "if(%s)\n", arg->name ); indent++; - print_proxy( "MIDL_memset( %s, 0, sizeof( ", arg->name ); + print_proxy( "MIDL_memset( %s, 0, sizeof( *%s ));\n", arg->name, arg->name ); indent--; - write_type(proxy, arg->type, arg, arg->tname); - fprintf( proxy, " ));\n" ); } arg = PREV_LINK(arg); }

1 0

Eric Pouech : winedbg: Correctly protect system inclusion ( needed for Mingw compilation).
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: 9e9f8af5529205f525e917e57b39e5f853d01f5c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e9f8af5529205f525e917e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Aug 13 20:46:40 2006 +0200 winedbg: Correctly protect system inclusion (needed for Mingw compilation). --- programs/winedbg/gdbproxy.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index e6b61e9..bb808c2 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -34,27 +34,36 @@ #include <signal.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -#include <sys/poll.h> -#include <sys/wait.h> +#ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +#endif +#ifdef HAVE_SYS_WAIT_H +# include <sys/wait.h> +#endif #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif -#include <netinet/in.h> -#include <netinet/tcp.h> +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_TCP_H +# include <netinet/tcp.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +/* if we don't have poll support on this system + * we won't provide gdb proxy support here... + */ +#ifdef HAVE_POLL + #include "debugger.h" #include "windef.h" #include "winbase.h" #include "tlhelp32.h" -/* those two are needed only for the SHOWNORMAL flag */ -#include "wingdi.h" -#include "winuser.h" - #define GDBPXY_TRC_LOWLEVEL 0x01 #define GDBPXY_TRC_PACKET 0x02 #define GDBPXY_TRC_COMMAND 0x04 @@ -2280,9 +2289,11 @@ static int gdb_remote(unsigned flags) wait(NULL); return 0; } +#endif int gdb_main(int argc, char* argv[]) { +#ifdef HAVE_POLL unsigned gdb_flags = 0; argc--; argv++; @@ -2305,6 +2316,9 @@ int gdb_main(int argc, char* argv[]) if (dbg_active_attach(argc, argv) == start_ok || dbg_active_launch(argc, argv) == start_ok) return gdb_remote(gdb_flags); +#else + fprintf(stderr, "GdbProxy mode not supported on this platform\n"); +#endif return -1; }

1 0

Andrew Talbot : dnsapi/tests: Write-strings warnings fix.
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: eed737ea8ffb8a957a69b138e9637571906b9c27 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eed737ea8ffb8a957a69b13… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Aug 14 20:47:25 2006 +0100 dnsapi/tests: Write-strings warnings fix. --- dlls/dnsapi/tests/name.c | 71 +++++++++++++++++++++++++++++----------------- 1 files changed, 44 insertions(+), 27 deletions(-) diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index fb65e18..d59e19e 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -168,35 +168,52 @@ static void test_DnsValidateName_A( void static void test_DnsNameCompare_A( void ) { + static CHAR empty[] = "", + dot[] = ".", + dotdot[] = "..", + A[] = "A", + a[] = "a", + B[] = "B", + b[] = "b", + A_dot_B[] = "A.B", + a_dot_a[] = "a.a", + a_dot_b[] = "a.b", + a_dot_b_dot[] = "a.b.", + a_dot_b_dotdot[] = "a.b..", + B_dot_A[] = "B.A", + b_dot_a[] = "b.a", + b_dot_a_dot[] = "b.a.", + b_dot_a_dotdot[] = "b.a.."; + ok( pDnsNameCompare_A( NULL, NULL ) == TRUE, "failed unexpectedly\n" ); - ok( pDnsNameCompare_A( "", "" ) == TRUE, "failed unexpectedly\n" ); - ok( pDnsNameCompare_A( ".", "" ) == TRUE, "failed unexpectedly\n" ); - ok( pDnsNameCompare_A( "", "." ) == TRUE, "failed unexpectedly\n" ); - ok( pDnsNameCompare_A( ".", ".." ) == TRUE, "failed unexpectedly\n" ); - ok( pDnsNameCompare_A( "..", "." ) == TRUE, "failed unexpectedly\n" ); - ok( pDnsNameCompare_A( "a", "a" ) == TRUE, "failed unexpectedly\n" ); - ok( pDnsNameCompare_A( "a", "A" ) == TRUE, "failed unexpectedly\n" ); - ok( pDnsNameCompare_A( "A", "a" ) == TRUE, "failed unexpectedly\n" ); - ok( pDnsNameCompare_A( "a.b", "A.B" ) == TRUE, "failed unexpectedly\n" ); - ok( pDnsNameCompare_A( "a.b", "a.b" ) == TRUE, "failed unexpectedly\n" ); - ok( pDnsNameCompare_A( "a.b.", "a.b." ) == TRUE, "failed unexpectedly\n" ); - ok( pDnsNameCompare_A( "a.b..", "a.b.." ) == TRUE, "failed unexpectedly\n" ); - - ok( pDnsNameCompare_A( "", NULL ) == FALSE, "succeeded unexpectedly\n" ); - ok( pDnsNameCompare_A( NULL, "" ) == FALSE, "succeeded unexpectedly\n" ); - - ok( pDnsNameCompare_A( "a", "b" ) == FALSE, "succeeded unexpectedly\n" ); - ok( pDnsNameCompare_A( "a", "B" ) == FALSE, "succeeded unexpectedly\n" ); - ok( pDnsNameCompare_A( "A", "b" ) == FALSE, "succeeded unexpectedly\n" ); - ok( pDnsNameCompare_A( "a.b", "B.A" ) == FALSE, "succeeded unexpectedly\n" ); - ok( pDnsNameCompare_A( "a.b.", "b.a." ) == FALSE, "succeeded unexpectedly\n" ); - ok( pDnsNameCompare_A( "a.b", "a.a" ) == FALSE, "succeeded unexpectedly\n" ); - ok( pDnsNameCompare_A( "a.b..", "b.a.." ) == FALSE, "succeeded unexpectedly\n" ); - ok( pDnsNameCompare_A( "a.b.", "b.a.." ) == FALSE, "succeeded unexpectedly\n" ); - ok( pDnsNameCompare_A( "a.b..", "b.a." ) == FALSE, "succeeded unexpectedly\n" ); - ok( pDnsNameCompare_A( "a.b.", "b.a" ) == FALSE, "succeeded unexpectedly\n" ); - ok( pDnsNameCompare_A( "a.b", "b.a." ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsNameCompare_A( empty, empty ) == TRUE, "failed unexpectedly\n" ); + ok( pDnsNameCompare_A( dot, empty ) == TRUE, "failed unexpectedly\n" ); + ok( pDnsNameCompare_A( empty, dot ) == TRUE, "failed unexpectedly\n" ); + ok( pDnsNameCompare_A( dot, dotdot ) == TRUE, "failed unexpectedly\n" ); + ok( pDnsNameCompare_A( dotdot, dot ) == TRUE, "failed unexpectedly\n" ); + ok( pDnsNameCompare_A( a, a ) == TRUE, "failed unexpectedly\n" ); + ok( pDnsNameCompare_A( a, A ) == TRUE, "failed unexpectedly\n" ); + ok( pDnsNameCompare_A( A, a ) == TRUE, "failed unexpectedly\n" ); + ok( pDnsNameCompare_A( a_dot_b, A_dot_B ) == TRUE, "failed unexpectedly\n" ); + ok( pDnsNameCompare_A( a_dot_b, a_dot_b ) == TRUE, "failed unexpectedly\n" ); + ok( pDnsNameCompare_A( a_dot_b_dot, a_dot_b_dot ) == TRUE, "failed unexpectedly\n" ); + ok( pDnsNameCompare_A( a_dot_b_dotdot, a_dot_b_dotdot ) == TRUE, "failed unexpectedly\n" ); + + ok( pDnsNameCompare_A( empty, NULL ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsNameCompare_A( NULL, empty ) == FALSE, "succeeded unexpectedly\n" ); + + ok( pDnsNameCompare_A( a, b ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsNameCompare_A( a, B ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsNameCompare_A( A, b ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsNameCompare_A( a_dot_b, B_dot_A ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsNameCompare_A( a_dot_b_dot, b_dot_a_dot ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsNameCompare_A( a_dot_b, a_dot_a ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsNameCompare_A( a_dot_b_dotdot, b_dot_a_dotdot ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsNameCompare_A( a_dot_b_dot, b_dot_a_dotdot ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsNameCompare_A( a_dot_b_dotdot, b_dot_a_dot ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsNameCompare_A( a_dot_b_dot, b_dot_a ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsNameCompare_A( a_dot_b, b_dot_a_dot ) == FALSE, "succeeded unexpectedly\n" ); } START_TEST(name)

1 0

Andrew Talbot : cabinet/tests: Write-strings warnings fix.
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: 64db35a993fd6a64eed36031f90cf9e865021984 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64db35a993fd6a64eed3603… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Aug 14 19:09:02 2006 +0100 cabinet/tests: Write-strings warnings fix. --- dlls/cabinet/tests/extract.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index e31318b..a9b71e6 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -298,6 +298,10 @@ static void create_cab_file(void) CCAB cabParams; HFCI hfci; ERF erf; + static CHAR a_txt[] = "a.txt", + b_txt[] = "b.txt", + testdir_c_txt[] = "testdir\\c.txt", + testdir_d_txt[] = "testdir\\d.txt"; BOOL res; set_cab_parameters(&cabParams); @@ -308,10 +312,10 @@ static void create_cab_file(void) ok(hfci != NULL, "Failed to create an FCI context\n"); - add_file(hfci, "a.txt"); - add_file(hfci, "b.txt"); - add_file(hfci, "testdir\\c.txt"); - add_file(hfci, "testdir\\d.txt"); + add_file(hfci, a_txt); + add_file(hfci, b_txt); + add_file(hfci, testdir_c_txt); + add_file(hfci, testdir_d_txt); res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); ok(res, "Failed to flush the cabinet\n");

1 0

Alexandre Julliard : configure: Only link against libpoll where really necessary.
by Alexandre Julliard 15 Aug '06

15 Aug '06

Module: wine Branch: master Commit: 1089260f29fe9341a66a5be27670c8fcd81a2326 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1089260f29fe9341a66a5be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 11:41:59 2006 +0200 configure: Only link against libpoll where really necessary. --- configure | 181 ++++++++++++++++++++++-------------------- configure.ac | 8 +- dlls/kernel/Makefile.in | 2 dlls/ws2_32/Makefile.in | 1 include/config.h.in | 6 + programs/winedbg/Makefile.in | 1 server/Makefile.in | 1 7 files changed, 106 insertions(+), 94 deletions(-) diff --git a/configure b/configure index 847cb4f..10c6b50 100755 --- a/configure +++ b/configure @@ -756,6 +756,7 @@ SOCKETLIBS MAIN_BINARY EXTRA_BINARIES LDD +LIBPOLL LIBOBJS LTLIBOBJS' ac_subst_files='MAKE_RULES @@ -7777,93 +7778,6 @@ _ACEOF fi - -{ echo "$as_me:$LINENO: checking for poll in -lpoll" >&5 -echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; } -if test "${ac_cv_lib_poll_poll+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpoll $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char poll (); -int -main () -{ -return poll (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 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' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_poll_poll=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_poll_poll=no -fi - -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5 -echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; } -if test $ac_cv_lib_poll_poll = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBPOLL 1 -_ACEOF - - LIBS="-lpoll $LIBS" - -fi - { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then @@ -19406,6 +19320,7 @@ fi + for ac_func in \ _lwp_create \ _lwp_self \ @@ -19447,6 +19362,7 @@ for ac_func in \ memmove \ mmap \ pclose \ + poll \ popen \ prctl \ pread \ @@ -19583,6 +19499,94 @@ fi done +if test "$ac_cv_func_poll" = no +then + { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5 +echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; } +if test "${ac_cv_lib_poll_poll+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpoll $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char poll (); +int +main () +{ +return poll (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 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' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_poll_poll=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_poll_poll=no +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5 +echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; } +if test $ac_cv_lib_poll_poll = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_POLL 1 +_ACEOF + LIBPOLL="-lpoll" + +fi + +fi { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 @@ -25532,11 +25536,12 @@ SOCKETLIBS!$SOCKETLIBS$ac_delim MAIN_BINARY!$MAIN_BINARY$ac_delim EXTRA_BINARIES!$EXTRA_BINARIES$ac_delim LDD!$LDD$ac_delim +LIBPOLL!$LIBPOLL$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 1c8477d..e530ff4 100644 --- a/configure.ac +++ b/configure.ac @@ -144,8 +144,6 @@ dnl Check for -lresolv for Solaris AC_CHECK_FUNCS(inet_aton,,AC_CHECK_LIB(resolv,inet_aton)) dnl Check for -lxpg4 for FreeBSD AC_CHECK_LIB(xpg4,_xpg4_setrunelocale) -dnl Check for -lpoll for Mac OS X/Darwin -AC_CHECK_LIB(poll,poll) dnl Check for -lpthread AC_CHECK_LIB(pthread,pthread_create,AC_SUBST(LIBPTHREAD,"-lpthread")) @@ -1304,6 +1302,7 @@ AC_CHECK_FUNCS(\ memmove \ mmap \ pclose \ + poll \ popen \ prctl \ pread \ @@ -1332,6 +1331,11 @@ AC_CHECK_FUNCS(\ waitpid \ ) +dnl Check for -lpoll for Mac OS X/Darwin +if test "$ac_cv_func_poll" = no +then + AC_CHECK_LIB(poll,poll,[AC_DEFINE(HAVE_POLL,1) AC_SUBST(LIBPOLL,"-lpoll")]) +fi dnl **** Check for types **** diff --git a/dlls/kernel/Makefile.in b/dlls/kernel/Makefile.in index dd71a6f..b64c23c 100644 --- a/dlls/kernel/Makefile.in +++ b/dlls/kernel/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = kernel32.dll IMPORTLIB = libkernel32.$(IMPLIBEXT) IMPORTS = ntdll -EXTRALIBS = @COREFOUNDATIONLIB@ +EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@ BASEADDRESS = 0x7b800000 SPEC_SRCS16 = \ diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index 0962434..d3b58b6 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -7,6 +7,7 @@ MODULE = ws2_32.dll IMPORTLIB = libws2_32.$(IMPLIBEXT) IMPORTS = iphlpapi kernel32 ntdll DELAYIMPORTS = user32 +EXTRALIBS = @LIBPOLL@ C_SRCS = \ async.c \ diff --git a/include/config.h.in b/include/config.h.in index 5cb7384..129baaf 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -320,9 +320,6 @@ #undef HAVE_LIBNSL /* Define to 1 if you have the `ossaudio' library (-lossaudio). */ #undef HAVE_LIBOSSAUDIO -/* Define to 1 if you have the `poll' library (-lpoll). */ -#undef HAVE_LIBPOLL - /* Define to 1 if you have the `resolv' library (-lresolv). */ #undef HAVE_LIBRESOLV @@ -503,6 +500,9 @@ #undef HAVE_PCLOSE /* Define to 1 if the system has the type `pid_t'. */ #undef HAVE_PID_T +/* Define to 1 if you have the `poll' function. */ +#undef HAVE_POLL + /* Define to 1 if you have the <poll.h> header file. */ #undef HAVE_POLL_H diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 480f025..79b71d3 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -6,6 +6,7 @@ MODULE = winedbg.exe APPMODE = -mconsole IMPORTS = psapi dbghelp advapi32 kernel32 ntdll DELAYIMPORTS = user32 +EXTRALIBS = @LIBPOLL@ C_SRCS = \ be_alpha.c \ diff --git a/server/Makefile.in b/server/Makefile.in index 4e35fcf..afa6539 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = .. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none +EXTRALIBS = @LIBPOLL@ C_SRCS = \ atom.c \

1 0

Frank Richter : user: Initialize size of nonclients struct in load_nonclient_metrics.
by Alexandre Julliard 14 Aug '06

14 Aug '06

Module: wine Branch: master Commit: e1e02dfcc2b4f073feb8c81d3c45f6724bae7a44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e1e02dfcc2b4f073feb8c81… Author: Frank Richter <frank.richter(a)gmail.com> Date: Mon Aug 14 20:09:50 2006 +0200 user: Initialize size of nonclients struct in load_nonclient_metrics. --- dlls/user/sysparams.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index de0677f..353e5f4 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -1026,6 +1026,7 @@ static void load_nonclient_metrics(void) NONCLIENTMETRICSW ncm; INT r; + ncm.cbSize = sizeof (ncm); if (RegOpenKeyExW (HKEY_CURRENT_USER, METRICS_REGKEY, 0, KEY_QUERY_VALUE, &hkey) != ERROR_SUCCESS) hkey = 0;

1 0

Frank Richter : user: Fix SPI_SETICONTITLELOGFONT to check for LOGFONTW size.
by Alexandre Julliard 14 Aug '06

14 Aug '06

Module: wine Branch: master Commit: b3399ad2e4b57e4ca4de6d02ab32ce5305aadf7d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b3399ad2e4b57e4ca4de6d0… Author: Frank Richter <frank.richter(a)gmail.com> Date: Mon Aug 14 20:10:23 2006 +0200 user: Fix SPI_SETICONTITLELOGFONT to check for LOGFONTW size. --- dlls/user/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 353e5f4..8bb2114 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -1478,7 +1478,7 @@ #define WINE_SPI_WARN(x) \ break; case SPI_SETICONTITLELOGFONT: /* 34 */ - if( uiParam == sizeof( ICONMETRICSW)) { + if( uiParam == sizeof(LOGFONTW)) { ret = SYSPARAMS_SaveLogFont( SPI_SETICONTITLELOGFONT_REGKEY, SPI_SETICONTITLELOGFONT_VALNAME, (LOGFONTW *)pvParam, fWinIni); if( ret) {

1 0