November 2006 - Wine-Commits

Dmitry Timoshkov : winex11.drv: Make some data const.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: 0bde8135fca1e4342b1e8cfbfb448ca3f45afe53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bde8135fca1e4342b1e8cfbf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:03:00 2006 +0800 winex11.drv: Make some data const. --- dlls/winex11.drv/xfont.c | 73 ++++++++++++++++++++++----------------------- 1 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 699a68c..656cd40 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -77,15 +77,15 @@ typedef struct __fontAlias static fontAlias *aliasTable = NULL; -static const char* INIFontMetrics = "cachedmetrics."; -static const char* INIFontSection = "Software\\Wine\\X11 Driver\\Fonts"; -static const char* INIAliasSection = "Alias"; -static const char* INIIgnoreSection = "Ignore"; -static const char* INIDefault = "Default"; -static const char* INIDefaultFixed = "DefaultFixed"; -static const char* INIGlobalMetrics = "FontMetrics"; -static const char* INIDefaultSerif = "DefaultSerif"; -static const char* INIDefaultSansSerif = "DefaultSansSerif"; +static const char INIFontMetrics[] = "cachedmetrics."; +static const char INIFontSection[] = "Software\\Wine\\X11 Driver\\Fonts"; +static const char INIAliasSection[] = "Alias"; +static const char INIIgnoreSection[] = "Ignore"; +static const char INIDefault[] = "Default"; +static const char INIDefaultFixed[] = "DefaultFixed"; +static const char INIGlobalMetrics[] = "FontMetrics"; +static const char INIDefaultSerif[] = "DefaultSerif"; +static const char INIDefaultSansSerif[] = "DefaultSansSerif"; /* FIXME - are there any more Latin charsets ? */ @@ -229,39 +229,38 @@ typedef struct __fet { LPCSTR prefix; const SuffixCharset* sufch; - struct __fet* next; + const struct __fet* next; } fontEncodingTemplate; /* Note: we can attach additional encoding mappings to the end * of this table at runtime. */ -static fontEncodingTemplate __fETTable[] = { - { "ansi", sufch_ansi, &__fETTable[1] }, - { "ascii", sufch_ansi, &__fETTable[2] }, - { "iso646.1991", sufch_iso646, &__fETTable[3] }, - { "iso8859", sufch_iso8859, &__fETTable[4] }, - { "microsoft", sufch_microsoft, &__fETTable[5] }, - { "tcvn", sufch_tcvn, &__fETTable[6] }, - { "tis620.2533", sufch_tis620, &__fETTable[7] }, - { "viscii1.1", sufch_viscii, &__fETTable[8] }, - { "windows", sufch_windows, &__fETTable[9] }, - { "koi8", sufch_koi8, &__fETTable[10]}, - { "jisx0201.1976",sufch_jisx0201, &__fETTable[11]}, - { "jisc6226.1978",sufch_jisx0208, &__fETTable[12]}, - { "jisx0208.1983",sufch_jisx0208, &__fETTable[13]}, - { "jisx0208.1990",sufch_jisx0208, &__fETTable[14]}, - { "jisx0212.1990",sufch_jisx0212, &__fETTable[15]}, - { "ksc5601.1987", sufch_ksc5601, &__fETTable[16]}, - { "gb2312.1980", sufch_gb2312, &__fETTable[17]}, - { "big5", sufch_big5, &__fETTable[18]}, - { "unicode", sufch_unicode, &__fETTable[19]}, - { "iso10646", sufch_iso10646, &__fETTable[20]}, - { "cp", sufch_windows, &__fETTable[21]}, - { "dec", sufch_dec, &__fETTable[22]}, +static const fontEncodingTemplate fETTable[] = { + { "ansi", sufch_ansi, &fETTable[1] }, + { "ascii", sufch_ansi, &fETTable[2] }, + { "iso646.1991", sufch_iso646, &fETTable[3] }, + { "iso8859", sufch_iso8859, &fETTable[4] }, + { "microsoft", sufch_microsoft, &fETTable[5] }, + { "tcvn", sufch_tcvn, &fETTable[6] }, + { "tis620.2533", sufch_tis620, &fETTable[7] }, + { "viscii1.1", sufch_viscii, &fETTable[8] }, + { "windows", sufch_windows, &fETTable[9] }, + { "koi8", sufch_koi8, &fETTable[10]}, + { "jisx0201.1976",sufch_jisx0201, &fETTable[11]}, + { "jisc6226.1978",sufch_jisx0208, &fETTable[12]}, + { "jisx0208.1983",sufch_jisx0208, &fETTable[13]}, + { "jisx0208.1990",sufch_jisx0208, &fETTable[14]}, + { "jisx0212.1990",sufch_jisx0212, &fETTable[15]}, + { "ksc5601.1987", sufch_ksc5601, &fETTable[16]}, + { "gb2312.1980", sufch_gb2312, &fETTable[17]}, + { "big5", sufch_big5, &fETTable[18]}, + { "unicode", sufch_unicode, &fETTable[19]}, + { "iso10646", sufch_iso10646, &fETTable[20]}, + { "cp", sufch_windows, &fETTable[21]}, + { "dec", sufch_dec, &fETTable[22]}, /* NULL prefix matches anything so put it last */ { NULL, sufch_any, NULL }, }; -static fontEncodingTemplate* fETTable = __fETTable; /* a charset database for known facenames */ struct CharsetBindingInfo @@ -628,7 +627,7 @@ static void LFD_GetStyle( fontInfo* fi, static int LFD_InitFontInfo( fontInfo* fi, const LFD* lfd, LPCSTR fullname ) { int i, j, dec_style_check, scalability; - fontEncodingTemplate* boba; + const fontEncodingTemplate* boba; const char* ridiculous = "font '%s' has ridiculous %s\n"; const char* lpstr; @@ -759,7 +758,7 @@ static int LFD_InitFontInfo( fontInfo* f fi->df.dfCharSet = ANSI_CHARSET; - for( i = 0, boba = fETTable; boba; boba = boba->next, i++ ) + for( i = 0, boba = &fETTable[0]; boba; boba = boba->next, i++ ) { if (!boba->prefix || !strcasecmp(lpstr, boba->prefix)) { @@ -1004,7 +1003,7 @@ static BOOL LFD_ComposeLFD( const fontOb if (uRelax <= 5) { - fontEncodingTemplate* boba = fETTable; + const fontEncodingTemplate* boba = &fETTable[0]; for(i = fo->fi->fi_encoding >> 8; i; i--) boba = boba->next; aLFD.charset_registry = boba->prefix ? boba->prefix : any;

1 0

Dmitry Timoshkov : ntdll: Make some data const.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: 1f1d2ddf5bf8f1bdb0c2082ab4aac6348441a65d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1d2ddf5bf8f1bdb0c2082ab… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 29 18:02:45 2006 +0800 ntdll: Make some data const. --- dlls/ntdll/om.c | 4 ++-- dlls/ntdll/path.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 5d2a7d6..af03e7d 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -155,8 +155,8 @@ NtQuerySecurityObject( IN ULONG Length, OUT PULONG ResultLength) { - static SID_IDENTIFIER_AUTHORITY localSidAuthority = {SECURITY_NT_AUTHORITY}; - static SID_IDENTIFIER_AUTHORITY worldSidAuthority = {SECURITY_WORLD_SID_AUTHORITY}; + static const SID_IDENTIFIER_AUTHORITY localSidAuthority = {SECURITY_NT_AUTHORITY}; + static const SID_IDENTIFIER_AUTHORITY worldSidAuthority = {SECURITY_WORLD_SID_AUTHORITY}; BYTE Buffer[256]; PISECURITY_DESCRIPTOR_RELATIVE psd = (PISECURITY_DESCRIPTOR_RELATIVE)Buffer; UINT BufferIndex = sizeof(SECURITY_DESCRIPTOR_RELATIVE); diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index e4af89a..a42682d 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -896,7 +896,7 @@ DWORD WINAPI RtlGetLongestNtPathLength(v BOOLEAN WINAPI RtlIsNameLegalDOS8Dot3( const UNICODE_STRING *unicode, OEM_STRING *oem, BOOLEAN *spaces ) { - static const char* illegal = "*?<>|\"+=,;[]:/\\\345"; + static const char illegal[] = "*?<>|\"+=,;[]:/\\\345"; int dot = -1; int i; char buffer[12];

1 0

Kai Blin : secur32: Improve version detection, move all the version detection to ntlm.c.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: 3dc6390e721d83c2e11465db88d6998bfb61d502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc6390e721d83c2e11465db8… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Nov 29 10:58:02 2006 +0100 secur32: Improve version detection, move all the version detection to ntlm.c. Also, as starting with Samba 3.0.24, ntlm_auth will have all the features we need, require that as minimal version and remove odd old-version compatibility hacks. --- dlls/secur32/dispatcher.c | 20 +++++++++++--------- dlls/secur32/ntlm.c | 21 ++++++++++++--------- dlls/secur32/secur32_priv.h | 4 +++- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index c150a14..5d82172 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -20,6 +20,7 @@ #include "config.h" #include <stdarg.h> +#include <stdio.h> #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -109,7 +110,7 @@ SECURITY_STATUS fork_helper(PNegoHelper else { *new_helper = helper; - helper->version = -1; + helper->major = helper->minor = helper->micro = -1; helper->password = NULL; helper->com_buf = NULL; helper->com_buf_size = 0; @@ -273,6 +274,7 @@ void check_version(PNegoHelper helper) { char temp[80]; char *newline; + int major = 0, minor = 0, micro = 0, ret; TRACE("Checking version of helper\n"); if(helper != NULL) @@ -286,18 +288,18 @@ void check_version(PNegoHelper helper) temp[len] = 0; TRACE("Exact version is %s\n", debugstr_a(temp)); - if(strncmp(temp+8, "4", 1) == 0) + ret = sscanf(temp, "Version %d.%d.%d", &major, &minor, &micro); + if(ret != 3) { - helper->version = 4; - } - else if(strncmp(temp+8, "3", 1) == 0) - { - helper->version = 3; + ERR("Failed to get the helper version.\n"); + helper->major = helper->minor = helper->micro = -1; } else { - TRACE("Unknown version!\n"); - helper->version = -1; + TRACE("Version recognized: %d.%d.%d\n", major, minor, micro); + helper->major = major; + helper->minor = minor; + helper->micro = micro; } } } diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 9ca3993..86d61cf 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -34,7 +34,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); #define NTLM_MAX_BUF 1904 - +#define MIN_NTLM_AUTH_MAJOR_VERSION 3 +#define MIN_NTLM_AUTH_MINOR_VERSION 0 +#define MIN_NTLM_AUTH_MICRO_VERSION 24 static CHAR ntlm_auth[] = "ntlm_auth"; @@ -524,7 +526,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In != SEC_E_OK) goto isc_end; if(!strncmp(buffer, "BH", 2)) - TRACE("Helper doesn't understand new command set\n"); + ERR("Helper doesn't understand new command set. Expect more things to fail.\n"); } lstrcpynA(buffer, "YR", max_len-1); @@ -545,8 +547,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In max_len-1, &bin_len)) != SEC_E_OK) goto isc_end; - /* We need to set NTLMSSP_NEGOTIATE_ALWAYS_SIGN manually for now */ - bin[13] |= 0x80; /* put the decoded client blob into the out buffer */ ret = SEC_I_CONTINUE_NEEDED; @@ -653,7 +653,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In if(buffer_len < 3) { - TRACE("No flags negotiated, or helper does not support GF command\n"); + TRACE("No flags negotiated.\n"); helper->neg_flags = 0l; } else @@ -670,7 +670,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In if(strncmp(buffer, "BH", 2) == 0) { - TRACE("Helper does not understand command or no key negotiated.\n"); + TRACE("No key negotiated.\n"); helper->valid_session_key = FALSE; helper->session_key = HeapAlloc(GetProcessHeap(), 0, 16); /*Generate the dummy session key = MD4(MD4(password))*/ @@ -1753,12 +1753,15 @@ void SECUR32_initNTLMSP(void) { /* Cheat and allocate a helper anyway, so cleanup later will work. */ helper = HeapAlloc(GetProcessHeap(),0, sizeof(PNegoHelper)); - helper->version = -1; + helper->major = helper->minor = helper->micro = -1; } else check_version(helper); - if(helper->version > 2) + if( (helper->major > MIN_NTLM_AUTH_MAJOR_VERSION) || + (helper->major = MIN_NTLM_AUTH_MAJOR_VERSION && + helper->minor >= MIN_NTLM_AUTH_MINOR_VERSION && + helper->micro >= MIN_NTLM_AUTH_MICRO_VERSION) ) { SecureProvider *provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL); SECUR32_addPackages(provider, 1L, &infoA, &infoW); @@ -1766,7 +1769,7 @@ void SECUR32_initNTLMSP(void) else { ERR("%s was not found or is outdated. " - "Make sure that ntlm_auth >= 3.x is in your path.\n", + "Make sure that ntlm_auth >= 3.0.24 is in your path.\n", ntlm_auth); } cleanup_helper(helper); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 7ca43f0..29c48e7 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -65,7 +65,9 @@ typedef struct _NegoHelper { int pwlen; int pipe_in; int pipe_out; - int version; + int major; + int minor; + int micro; char *com_buf; int com_buf_size; int com_buf_offset;

1 0

Mike McCormack : msi: Update the UI in one place only in ACTION_ProcessComponents.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: a3a2eaea9319fdd38a75928f7d2e7b35084cedde URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a2eaea9319fdd38a75928f7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Nov 29 16:36:58 2006 +0900 msi: Update the UI in one place only in ACTION_ProcessComponents. --- dlls/msi/action.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index da8a76c..c61a70b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2700,7 +2700,7 @@ static UINT ACTION_ProcessComponents(MSI continue; squash_guid(comp->ComponentId,squished_cc); - + msi_free(comp->FullKeypath); comp->FullKeypath = resolve_keypath( package, comp ); @@ -2738,14 +2738,6 @@ static UINT ACTION_ProcessComponents(MSI } RegCloseKey(hkey2); - - /* UI stuff */ - uirow = MSI_CreateRecord(3); - MSI_RecordSetStringW(uirow,1,package->ProductCode); - MSI_RecordSetStringW(uirow,2,comp->ComponentId); - MSI_RecordSetStringW(uirow,3,comp->FullKeypath); - ui_actiondata(package,szProcessComponents,uirow); - msiobj_release( &uirow->hdr ); } else if (ACTION_VerifyComponentForAction( comp, INSTALLSTATE_ABSENT)) { @@ -2763,14 +2755,16 @@ static UINT ACTION_ProcessComponents(MSI if (res == ERROR_NO_MORE_ITEMS) RegDeleteKeyW(hkey,squished_cc); - /* UI stuff */ - uirow = MSI_CreateRecord(2); - MSI_RecordSetStringW(uirow,1,package->ProductCode); - MSI_RecordSetStringW(uirow,2,comp->ComponentId); - ui_actiondata(package,szProcessComponents,uirow); - msiobj_release( &uirow->hdr ); } - } + + /* UI stuff */ + uirow = MSI_CreateRecord(3); + MSI_RecordSetStringW(uirow,1,package->ProductCode); + MSI_RecordSetStringW(uirow,2,comp->ComponentId); + MSI_RecordSetStringW(uirow,3,comp->FullKeypath); + ui_actiondata(package,szProcessComponents,uirow); + msiobj_release( &uirow->hdr ); + } RegCloseKey(hkey); return rc; }

1 0

Mike McCormack : msi: Advertise components of a feature that has the msidbFeatureAttributesFavorAdvertise property .
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: 1770c9125df872ed2eb8071ce9be70dbf239eddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1770c9125df872ed2eb8071ce… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Nov 29 16:37:07 2006 +0900 msi: Advertise components of a feature that has the msidbFeatureAttributesFavorAdvertise property. --- dlls/msi/action.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 668b49e..da8a76c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1807,7 +1807,11 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa if (component->ForceLocalState) msi_component_set_state( component, INSTALLSTATE_LOCAL ); - if (feature->Attributes == msidbFeatureAttributesFavorLocal) + if (feature->Attributes == msidbFeatureAttributesFavorAdvertise) + { + msi_component_set_state( component, INSTALLSTATE_ADVERTISED ); + } + else if (feature->Attributes == msidbFeatureAttributesFavorLocal) { if (!(component->Attributes & msidbComponentAttributesSourceOnly)) msi_component_set_state( component, INSTALLSTATE_LOCAL );

1 0

Kai Blin : ws2_32: Implement SO_GET_MAX_MSG_SIZE for getsockopt.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: 7e6b7d21b94269f80602674169883bd20c442ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e6b7d21b94269f8060267416… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Nov 28 18:43:49 2006 +0100 ws2_32: Implement SO_GET_MAX_MSG_SIZE for getsockopt. --- dlls/ws2_32/socket.c | 13 +++++++++++++ dlls/ws2_32/tests/sock.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e5aeed5..50443de 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1828,6 +1828,19 @@ INT WINAPI WS_getsockopt(SOCKET s, INT l return 0; } + if (level == WS_SOL_SOCKET && optname == WS_SO_MAX_MSG_SIZE) + { + if(!optlen || *optlen < sizeof(int) || !optval) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + TRACE("getting global SO_MAX_MSG_SIZE = 65507\n"); + *(int *)optval = 65507; + *optlen = sizeof(int); + return 0; + } + #ifdef HAVE_IPX if(level == NSPROTO_IPX) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 837eec1..c8b9cc8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1410,6 +1410,47 @@ static void test_select(void) } +static void test_extendedSocketOptions() +{ + WSADATA wsa; + SOCKET sock; + struct sockaddr_in sa; + int sa_len = sizeof(struct sockaddr_in); + int optval, optlen = sizeof(int), ret; + + if(WSAStartup(MAKEWORD(2,0), &wsa)){ + trace("Winsock failed: 0x%08x. Aborting test\n", WSAGetLastError()); + return; + } + + memset(&sa, 0, sa_len); + + sa.sin_family = AF_INET; + sa.sin_port = htons(0); + sa.sin_addr.s_addr = htonl(INADDR_ANY); + + if((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0){ + trace("Creating the socket failed: 0x%08x\n", WSAGetLastError()); + WSACleanup(); + return; + } + + if(bind(sock, (struct sockaddr *) &sa, sa_len) < 0){ + trace("Failed to bind socket: 0x%08x\n", WSAGetLastError()); + closesocket(sock); + WSACleanup(); + return; + } + + ret = getsockopt(sock, SOL_SOCKET, SO_MAX_MSG_SIZE, (char *)&optval, (int *)&optlen); + + ok(ret == 0, "getsockopt failed to query SO_MAX_MSG_SIZE, return value is 0x%08x\n", ret); + ok(optval == 65507, "SO_MAX_MSG_SIZE reported %d, expected 65507\n", optval); + + closesocket(sock); + WSACleanup(); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -1419,6 +1460,7 @@ START_TEST( sock ) test_set_getsockopt(); test_so_reuseaddr(); + test_extendedSocketOptions(); for (i = 0; i < NUM_TESTS; i++) { @@ -1438,6 +1480,6 @@ START_TEST( sock ) test_WSAStringToAddressW(); test_select(); - + Exit(); }

1 0

Andrew Talbot : comctl32: Cast-qual warnings fix.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: 63246a539680b3bced86dea3870da2f17b329a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=63246a539680b3bced86dea38… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Nov 28 22:23:42 2006 +0000 comctl32: Cast-qual warnings fix. --- dlls/comctl32/propsheet.c | 67 +++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 29 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index a865f51..7261d19 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -276,11 +276,13 @@ static INT PROPSHEET_FindPageByResId(Pro static void PROPSHEET_AtoW(LPCWSTR *tostr, LPCSTR frstr) { INT len; + WCHAR *to; TRACE("<%s>\n", frstr); len = MultiByteToWideChar(CP_ACP, 0, frstr, -1, 0, 0); - *tostr = Alloc(len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, frstr, -1, (LPWSTR)*tostr, len); + to = Alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, frstr, -1, to, len); + *tostr = to; } /****************************************************************************** @@ -314,8 +316,10 @@ static BOOL PROPSHEET_CollectSheetInfoA( if (HIWORD(lppsh->pszCaption)) { int len = MultiByteToWideChar(CP_ACP, 0, lppsh->pszCaption, -1, NULL, 0); - psInfo->ppshheader.pszCaption = Alloc( len*sizeof (WCHAR) ); - MultiByteToWideChar(CP_ACP, 0, lppsh->pszCaption, -1, (LPWSTR) psInfo->ppshheader.pszCaption, len); + WCHAR *caption = Alloc( len*sizeof (WCHAR) ); + + MultiByteToWideChar(CP_ACP, 0, lppsh->pszCaption, -1, caption, len); + psInfo->ppshheader.pszCaption = caption; } } psInfo->nPages = lppsh->nPages; @@ -368,8 +372,9 @@ static BOOL PROPSHEET_CollectSheetInfoW( if (HIWORD(lppsh->pszCaption)) { int len = strlenW(lppsh->pszCaption); - psInfo->ppshheader.pszCaption = Alloc( (len+1)*sizeof(WCHAR) ); - strcpyW( (WCHAR *)psInfo->ppshheader.pszCaption, lppsh->pszCaption ); + WCHAR *caption = Alloc( (len+1)*sizeof(WCHAR) ); + + psInfo->ppshheader.pszCaption = strcpyW( caption, lppsh->pszCaption ); } } psInfo->nPages = lppsh->nPages; @@ -402,7 +407,7 @@ static BOOL PROPSHEET_CollectPageInfo(LP PropSheetInfo * psInfo, int index) { - DLGTEMPLATE* pTemplate; + const DLGTEMPLATE* pTemplate; const WORD* p; DWORD dwFlags; int width, height; @@ -431,7 +436,7 @@ static BOOL PROPSHEET_CollectPageInfo(LP * Process page template. */ if (dwFlags & PSP_DLGINDIRECT) - pTemplate = (DLGTEMPLATE*)lppsp->u.pResource; + pTemplate = lppsp->u.pResource; else if(dwFlags & PSP_INTERNAL_UNICODE ) { HRSRC hResource = FindResourceW(lppsp->hInstance, @@ -459,7 +464,7 @@ static BOOL PROPSHEET_CollectPageInfo(LP p = (const WORD *)pTemplate; - if (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF) + if (((const MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF) { /* DLGTEMPLATEEX (not defined in any std. header file) */ @@ -545,6 +550,7 @@ static BOOL PROPSHEET_CollectPageInfo(LP WCHAR szTitle[256]; const WCHAR *pTitle; static const WCHAR pszNull[] = { '(','n','u','l','l',')',0 }; + WCHAR *text; int len; if ( !HIWORD( lppsp->pszTitle ) ) @@ -561,8 +567,8 @@ static BOOL PROPSHEET_CollectPageInfo(LP pTitle = lppsp->pszTitle; len = strlenW(pTitle); - psInfo->proppage[index].pszText = Alloc( (len+1)*sizeof (WCHAR) ); - strcpyW( (LPWSTR)psInfo->proppage[index].pszText,pTitle); + text = Alloc( (len+1)*sizeof (WCHAR) ); + psInfo->proppage[index].pszText = strcpyW( text, pTitle); } /* @@ -1238,11 +1244,11 @@ PROPSHEET_WizardSubclassProc(HWND hwnd, * See also dialog.c/DIALOG_ParseTemplate32(). */ -static UINT GetTemplateSize(DLGTEMPLATE* pTemplate) +static UINT GetTemplateSize(const DLGTEMPLATE* pTemplate) { const WORD* p = (const WORD *)pTemplate; - BOOL istemplateex = (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF); + BOOL istemplateex = (((const MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF); WORD nrofitems; UINT ret; @@ -1307,7 +1313,7 @@ static UINT GetTemplateSize(DLGTEMPLATE* p += lstrlenW((LPCWSTR)p) + 1; /* font, if DS_SETFONT set */ - if ((DS_SETFONT & ((istemplateex)? ((MyDLGTEMPLATEEX*)pTemplate)->style : + if ((DS_SETFONT & ((istemplateex)? ((const MyDLGTEMPLATEEX*)pTemplate)->style : pTemplate->style))) { p+=(istemplateex)?3:1; @@ -1332,7 +1338,7 @@ static UINT GetTemplateSize(DLGTEMPLATE* p++; break; case 0xffff: - TRACE("class ordinal 0x%08x\n",*(DWORD*)p); + TRACE("class ordinal 0x%08x\n",*(const DWORD*)p); p += 2; break; default: @@ -1348,7 +1354,7 @@ static UINT GetTemplateSize(DLGTEMPLATE* p++; break; case 0xffff: - TRACE("text ordinal 0x%08x\n",*(DWORD*)p); + TRACE("text ordinal 0x%08x\n",*(const DWORD*)p); p += 2; break; default: @@ -1360,7 +1366,7 @@ static UINT GetTemplateSize(DLGTEMPLATE* --nrofitems; } - ret = (p - (WORD*)pTemplate) * sizeof(WORD); + ret = (p - (const WORD*)pTemplate) * sizeof(WORD); TRACE("%p %p size 0x%08x\n", p, pTemplate, ret); return ret; } @@ -2788,7 +2794,7 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHE PropSheetInfo* psInfo = (PropSheetInfo*) GlobalAlloc(GPTR, sizeof(PropSheetInfo)); UINT i, n; - BYTE* pByte; + const BYTE* pByte; TRACE("(%p)\n", lppsh); @@ -2796,7 +2802,7 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHE psInfo->proppage = (PropPageInfo*) Alloc(sizeof(PropPageInfo) * lppsh->nPages); - pByte = (BYTE*) psInfo->ppshheader.u3.ppsp; + pByte = (const BYTE*) psInfo->ppshheader.u3.ppsp; for (n = i = 0; i < lppsh->nPages; i++, n++) { @@ -2805,7 +2811,7 @@ INT_PTR WINAPI PropertySheetA(LPCPROPSHE else { psInfo->proppage[n].hpage = CreatePropertySheetPageA((LPCPROPSHEETPAGEA)pByte); - pByte += ((LPPROPSHEETPAGEA)pByte)->dwSize; + pByte += ((LPCPROPSHEETPAGEA)pByte)->dwSize; } if (!PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEW)psInfo->proppage[n].hpage, @@ -2839,7 +2845,7 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHE PropSheetInfo* psInfo = (PropSheetInfo*) GlobalAlloc(GPTR, sizeof(PropSheetInfo)); UINT i, n; - BYTE* pByte; + const BYTE* pByte; TRACE("(%p)\n", lppsh); @@ -2847,7 +2853,7 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHE psInfo->proppage = (PropPageInfo*) Alloc(sizeof(PropPageInfo) * lppsh->nPages); - pByte = (BYTE*) psInfo->ppshheader.u3.ppsp; + pByte = (const BYTE*) psInfo->ppshheader.u3.ppsp; for (n = i = 0; i < lppsh->nPages; i++, n++) { @@ -2856,7 +2862,7 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHE else { psInfo->proppage[n].hpage = CreatePropertySheetPageW((LPCPROPSHEETPAGEW)pByte); - pByte += ((LPPROPSHEETPAGEW)pByte)->dwSize; + pByte += ((LPCPROPSHEETPAGEW)pByte)->dwSize; } if (!PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEW)psInfo->proppage[n].hpage, @@ -2943,8 +2949,9 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee if (HIWORD( ppsp->u.pszTemplate )) { int len = strlen(lpPropSheetPage->u.pszTemplate) + 1; - ppsp->u.pszTemplate = Alloc( len ); - strcpy( (LPSTR)ppsp->u.pszTemplate, lpPropSheetPage->u.pszTemplate ); + char *template = Alloc( len ); + + ppsp->u.pszTemplate = (LPWSTR)strcpy( template, lpPropSheetPage->u.pszTemplate ); } } @@ -3008,8 +3015,9 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee if (HIWORD( ppsp->u.pszTemplate )) { int len = strlenW(lpPropSheetPage->u.pszTemplate) + 1; - ppsp->u.pszTemplate = Alloc( len * sizeof (WCHAR) ); - strcpyW( (WCHAR *)ppsp->u.pszTemplate, lpPropSheetPage->u.pszTemplate ); + WCHAR *template = Alloc( len * sizeof (WCHAR) ); + + ppsp->u.pszTemplate = strcpyW( template, lpPropSheetPage->u.pszTemplate ); } } @@ -3018,8 +3026,9 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee if (HIWORD( ppsp->u2.pszIcon )) { int len = strlenW(lpPropSheetPage->u2.pszIcon) + 1; - ppsp->u2.pszIcon = Alloc( len * sizeof (WCHAR) ); - strcpyW( (WCHAR *)ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon ); + WCHAR *icon = Alloc( len * sizeof (WCHAR) ); + + ppsp->u2.pszIcon = strcpyW( icon, lpPropSheetPage->u2.pszIcon ); } }

1 0

Dmitry Timoshkov : msi: Synchronize msi exports with what PSDK has.
by Alexandre Julliard Nov. 29, 2006

Nov. 29, 2006

Module: wine Branch: master Commit: d4877a32f1e777290c02d64ce82e94bb3d6bdb8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4877a32f1e777290c02d64ce… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Nov 28 21:49:09 2006 +0800 msi: Synchronize msi exports with what PSDK has. --- dlls/msi/msi.spec | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 1bc1aef..420205f 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -230,6 +230,51 @@ 234 stub MsiDeleteUserDataW 235 stub Migrate10CachedPackagesA 236 stub Migrate10CachedPackagesW +237 stub MsiRemovePatchesA +238 stub MsiRemovePatchesW +239 stub MsiApplyMultiplePatchesA +240 stub MsiApplyMultiplePatchesW +241 stub MsiExtractPatchXMLDataA +242 stub MsiExtractPatchXMLDataW +243 stub MsiGetPatchInfoExA +244 stub MsiGetPatchInfoExW +245 stub MsiEnumProductsExA +246 stub MsiEnumProductsExW +247 stub MsiGetProductInfoExA +248 stub MsiGetProductInfoExW +249 stub MsiQueryComponentStateA +250 stub MsiQueryComponentStateW +251 stub MsiQueryFeatureStateExA +252 stub MsiQueryFeatureStateExW +253 stub MsiDeterminePatchSequenceA +254 stub MsiDeterminePatchSequenceW +255 stub MsiSourceListAddSourceExA +256 stub MsiSourceListAddSourceExW +257 stub MsiSourceListClearSourceA +258 stub MsiSourceListClearSourceW +259 stub MsiSourceListClearAllExA +260 stub MsiSourceListClearAllExW +261 stub MsiSourceListForceResolutionExA +262 stub MsiSourceListForceResolutionExW +263 stub MsiSourceListEnumSourcesA +264 stub MsiSourceListEnumSourcesW +265 stub MsiSourceListGetInfoA +266 stub MsiSourceListGetInfoW +267 stub MsiSourceListSetInfoA +268 stub MsiSourceListSetInfoW +269 stub MsiEnumPatchesExA +270 stub MsiEnumPatchesExW +271 stub MsiSourceListEnumMediaDisksA +272 stub MsiSourceListEnumMediaDisksW +273 stub MsiSourceListAddMediaDiskA +274 stub MsiSourceListAddMediaDiskW +275 stub MsiSourceListClearMediaDiskA +276 stub MsiSourceListClearMediaDiskW +277 stub MsiDetermineApplicablePatchesA +278 stub MsiDetermineApplicablePatchesW +279 stub MsiMessageBoxExA +280 stub MsiMessageBoxExW +281 stub MsiSetExternalUIRecord @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr)

1 0

Detlef Riekenberg : localspl: Add initial tests for AddPortW.
by Alexandre Julliard Nov. 28, 2006

Nov. 28, 2006

Module: wine Branch: master Commit: 603ecd298da05ca3d4e428327e97f3e366ca5923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=603ecd298da05ca3d4e428327… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 28 00:45:10 2006 +0100 localspl: Add initial tests for AddPortW. --- dlls/localspl/tests/localmon.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index ada1a76..55a1a9c 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -74,6 +74,35 @@ static WCHAR portname_fileW[] = {'F','I' static WCHAR portname_lpt1W[] = {'L','P','T','1',':',0}; /* ########################### */ + +static void test_AddPort(void) +{ + DWORD res; + + /* moved to localui.dll since w2k */ + if (!pAddPort) return; + +#if 0 + /* NT4 crash on this test */ + res = pAddPort(NULL, 0, NULL); +#endif + + /* Testing-Results (localmon.dll from NT4.0): + - The Servername is ignored + - Case of MonitorName is ignored + */ + + SetLastError(0xdeadbeef); + res = pAddPort(NULL, 0, emptyW); + ok(!res, "returned %d with 0x%x (expected '0')\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + res = pAddPort(NULL, 0, does_not_existW); + ok(!res, "returned %d with 0x%x (expected '0')\n", res, GetLastError()); + +} + +/* ########################### */ static void test_ConfigurePort(void) { @@ -319,6 +348,7 @@ START_TEST(localmon) } test_InitializePrintMonitor(); + test_AddPort(); test_ConfigurePort(); test_DeletePort(); test_EnumPorts();

1 0

Detlef Riekenberg : spoolss: Implement AllocSplStr + DllFreeSplStr.
by Alexandre Julliard Nov. 28, 2006

Nov. 28, 2006

Module: wine Branch: master Commit: 0e57af887e9f3c981355eb465f18a2e51711349c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e57af887e9f3c981355eb465… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 28 00:42:28 2006 +0100 spoolss: Implement AllocSplStr + DllFreeSplStr. --- dlls/spoolss/spoolss.spec | 4 +- dlls/spoolss/spoolss_main.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index 0862626..c96c9c2 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -12,7 +12,7 @@ @ stub AddPrinterDriverW @ stub AddPrinterExW @ stub AddPrinterW -@ stub AllocSplStr +@ stdcall AllocSplStr(wstr) @ stub AppendPrinterNotifyInfoData @ stub BuildOtherNamesFromMachineName @ stub CallDrvDevModeConversion @@ -40,7 +40,7 @@ @ stub DeletePrinterKeyW @ stdcall DllAllocSplMem(long) @ stdcall DllFreeSplMem(ptr) -@ stub DllFreeSplStr +@ stdcall DllFreeSplStr(wstr) @ stub EndDocPrinter @ stub EndPagePrinter @ stub EnumFormsW diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index d39cac3..a4a08e6 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -47,6 +47,35 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, } /****************************************************************** + * AllocSplStr [SPOOLSS.@] + * + * Create a copy from the String on the Spooler-Heap + * + * PARAMS + * pwstr [I] PTR to the String to copy + * + * RETURNS + * Failure: NULL + * Success: PTR to the copied String + * + */ +LPWSTR WINAPI AllocSplStr(LPCWSTR pwstr) +{ + LPWSTR res = NULL; + DWORD len; + + TRACE("(%s)\n", debugstr_w(pwstr)); + if (!pwstr) return NULL; + + len = (lstrlenW(pwstr) + 1) * sizeof(WCHAR); + res = HeapAlloc(GetProcessHeap(), 0, len); + if (res) lstrcpyW(res, pwstr); + + TRACE("returning %p\n", res); + return res; +} + +/****************************************************************** * DllAllocSplMem [SPOOLSS.@] * * Allocate cleared memory from the spooler heap @@ -93,3 +122,23 @@ BOOL WINAPI DllFreeSplMem(LPBYTE memory) TRACE("(%p)\n", memory); return HeapFree(GetProcessHeap(), 0, memory); } + +/****************************************************************** + * DllFreeSplStr [SPOOLSS.@] + * + * Free the allocated Spooler-String + * + * PARAMS + * pwstr [I] PTR to the WSTR, allocated by AllocSplStr + * + * RETURNS + * Failure: FALSE + * Success: TRUE + * + */ + +BOOL WINAPI DllFreeSplStr(LPWSTR pwstr) +{ + TRACE("(%s) PTR: %p\n", debugstr_w(pwstr), pwstr); + return HeapFree(GetProcessHeap(), 0, pwstr); +}

1 0