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

Jeff Latimer : gdi: Add missing glyph code to GetGlyphIndices and tests.
by Alexandre Julliard 24 Aug '06

24 Aug '06

Module: wine Branch: master Commit: f667c06a0cce11537005a98874ba03480b17ab54 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f667c06a0cce11537005a98… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Aug 24 00:49:13 2006 +1000 gdi: Add missing glyph code to GetGlyphIndices and tests. --- dlls/gdi/freetype.c | 18 ++++++++++++++++-- dlls/gdi/tests/font.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index f82112f..1278b6a 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -2898,11 +2898,25 @@ static FT_UInt get_glyph_index(GdiFont f DWORD WineEngGetGlyphIndices(GdiFont font, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags) { - INT i; + int i; + WCHAR default_char = 0; + TEXTMETRICW textm; + + if (flags & GGI_MARK_NONEXISTING_GLYPHS) default_char = 0x001f; /* Indicate non existence */ for(i = 0; i < count; i++) + { pgi[i] = get_glyph_index(font, lpstr[i]); - + if (pgi[i] == 0) + { + if (!default_char) + { + WineEngGetTextMetrics(font, &textm); + default_char = textm.tmDefaultChar; + } + pgi[i] = default_char; + } + } return count; } diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c index c4ac60d..bfda353 100644 --- a/dlls/gdi/tests/font.c +++ b/dlls/gdi/tests/font.c @@ -391,6 +391,36 @@ static void test_text_extents(void) ReleaseDC(NULL, hdc); } +static void test_GetGlyphIndices() +{ + HDC hdc; + HFONT hfont; + DWORD charcount; + LOGFONTA lf; + DWORD flags = 0; + WCHAR testtext[] = {'T','e','s','t',0xffff,0}; + WORD glyphs[(sizeof(testtext)/2)-1]; + TEXTMETRIC textm; + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Symbol"); + lf.lfHeight = 20; + + hfont = CreateFontIndirectA(&lf); + hdc = GetDC(0); + + ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); + flags |= GGI_MARK_NONEXISTING_GLYPHS; + charcount = GetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %ld\n", charcount); + ok(glyphs[4] == 0x001f, "GetGlyphIndices should have returned a non existant char not %04x\n", glyphs[4]); + flags = 0; + charcount = GetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %ld\n", charcount); + ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndices should have returned a %04x not %04x\n", + textm.tmDefaultChar, glyphs[4]); +} + START_TEST(font) { test_logfont(); @@ -399,4 +429,5 @@ START_TEST(font) test_GdiGetCharDimensions(); test_GetCharABCWidthsW(); test_text_extents(); + test_GetGlyphIndices(); }

1 0

Mike McCormack : msi: Fix strings with lengths that are exact multiples of 2^16.
by Alexandre Julliard 24 Aug '06

24 Aug '06

Module: wine Branch: master Commit: 089411747ba5f56b99262d8cd3bfc9c0a807ba22 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=089411747ba5f56b99262d8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Aug 24 20:19:43 2006 +0900 msi: Fix strings with lengths that are exact multiples of 2^16. --- dlls/msi/table.c | 45 +++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 1a3ccb2..57cd4df 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -686,7 +686,7 @@ string_table *load_string_table( IStorag CHAR *data = NULL; USHORT *pool = NULL; UINT r, datasize = 0, poolsize = 0, codepage; - DWORD i, count, offset, len, n; + DWORD i, count, offset, len, n, refs; static const WCHAR szStringData[] = { '_','S','t','r','i','n','g','D','a','t','a',0 }; static const WCHAR szStringPool[] = { @@ -708,38 +708,51 @@ string_table *load_string_table( IStorag offset = 0; n = 1; - for( i=1; i<count; i++ ) + i = 1; + while( i<count ) { - len = pool[i*2]; + /* the string reference count is always the second word */ + refs = pool[i*2+1]; + + /* empty entries have two zeros, still have a string id */ + if (pool[i*2] == 0 && refs == 0) + { + i++; + n++; + continue; + } /* * If a string is over 64k, the previous string entry is made null * and its the high word of the length is inserted in the null string's * reference count field. */ - if( pool[i*2-2] == 0 && pool[i*2-1] ) - len += pool[i*2+1] * 0x10000; - - if( (offset + len) > datasize ) + if( pool[i*2] == 0) { - ERR("string table corrupt?\n"); - break; + len = (pool[i*2+3] << 16) + pool[i*2+2]; + i += 2; + } + else + { + len = pool[i*2]; + i += 1; } - /* don't add the high word of a string's length as a string */ - if ( len || !pool[i*2+1] ) + if ( (offset + len) > datasize ) { - r = msi_addstring( st, n, data+offset, len, pool[i*2+1] ); - if( r != n ) - ERR("Failed to add string %ld\n", n ); - n++; + ERR("string table corrupt?\n"); + break; } + r = msi_addstring( st, n, data+offset, len, refs ); + if( r != n ) + ERR("Failed to add string %ld\n", n ); + n++; offset += len; } if ( datasize != offset ) - ERR("string table load failed! (%08x != %08lx)\n", datasize, offset ); + ERR("string table load failed! (%08x != %08lx), please report\n", datasize, offset ); TRACE("Loaded %ld strings\n", count);

1 0

Robert Reif : advapi32: Output information on failed LsaQueryInformationPolicy tests.
by Alexandre Julliard 24 Aug '06

24 Aug '06

Module: wine Branch: master Commit: 58ce495599b38464649cdda7d062732908e65fe9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58ce495599b38464649cdda… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Aug 17 15:26:40 2006 -0400 advapi32: Output information on failed LsaQueryInformationPolicy tests. --- dlls/advapi32/tests/Makefile.in | 2 + dlls/advapi32/tests/lsa.c | 60 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in index 875b0c7..d60b31d 100644 --- a/dlls/advapi32/tests/Makefile.in +++ b/dlls/advapi32/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = advapi32.dll -IMPORTS = advapi32 kernel32 +IMPORTS = ole32 advapi32 kernel32 EXTRALIBS = -luuid CTESTS = \ diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index abc7f59..8158783 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -28,6 +28,9 @@ #include "winbase.h" #include "winreg.h" #include "winternl.h" #include "ntsecapi.h" +#include "sddl.h" +#include "winnls.h" +#include "objbase.h" #define INITGUID #include "guiddef.h" #include "wine/test.h" @@ -91,6 +94,25 @@ static void test_lsa(void) ok(status == STATUS_SUCCESS, "LsaQueryInformationPolicy(PolicyPrimaryDomainInformation) failed, returned 0x%08lx\n", status); if (status == STATUS_SUCCESS) { ok(primary_domain_info->Sid==0,"Sid should be NULL on the local computer\n"); + if (primary_domain_info->Sid) { + LPSTR strsid; + if (ConvertSidToStringSidA(primary_domain_info->Sid, &strsid)) + { + if (primary_domain_info->Name.Buffer) { + LPSTR name = NULL; + UINT len; + len = WideCharToMultiByte( CP_ACP, 0, primary_domain_info->Name.Buffer, -1, NULL, 0, NULL, NULL ); + name = LocalAlloc( 0, len ); + WideCharToMultiByte( CP_ACP, 0, primary_domain_info->Name.Buffer, -1, name, len, NULL, NULL ); + trace(" name: %s sid: %s\n", name, strsid); + LocalFree( name ); + } else + trace(" name: NULL sid: %s\n", strsid); + LocalFree( strsid ); + } + else + trace("invalid sid\n"); + } pLsaFreeMemory((LPVOID)primary_domain_info); } @@ -107,6 +129,44 @@ static void test_lsa(void) if (status == STATUS_SUCCESS) { ok(IsEqualGUID(&dns_domain_info->DomainGuid, &GUID_NULL), "DomainGUID should be GUID_NULL on local computer\n"); ok(dns_domain_info->Sid==0,"Sid should be NULL on the local computer\n"); + if (dns_domain_info->Sid || !IsEqualGUID(&dns_domain_info->DomainGuid, &GUID_NULL)) { + LPSTR strsid = NULL; + LPSTR name = NULL; + LPSTR domain = NULL; + LPSTR forest = NULL; + LPSTR guidstr = NULL; + WCHAR guidstrW[64]; + UINT len; + guidstr[0] = '\0'; + ConvertSidToStringSidA(dns_domain_info->Sid, &strsid); + StringFromGUID2(&dns_domain_info->DomainGuid, guidstrW, sizeof(guidstrW)/sizeof(WCHAR)); + len = WideCharToMultiByte( CP_ACP, 0, guidstrW, -1, NULL, 0, NULL, NULL ); + guidstr = LocalAlloc( 0, len ); + WideCharToMultiByte( CP_ACP, 0, guidstrW, -1, guidstr, len, NULL, NULL ); + if (dns_domain_info->Name.Buffer) { + len = WideCharToMultiByte( CP_ACP, 0, dns_domain_info->Name.Buffer, -1, NULL, 0, NULL, NULL ); + name = LocalAlloc( 0, len ); + WideCharToMultiByte( CP_ACP, 0, dns_domain_info->Name.Buffer, -1, name, len, NULL, NULL ); + } + if (dns_domain_info->DnsDomainName.Buffer) { + len = WideCharToMultiByte( CP_ACP, 0, dns_domain_info->DnsDomainName.Buffer, -1, NULL, 0, NULL, NULL ); + domain = LocalAlloc( 0, len ); + WideCharToMultiByte( CP_ACP, 0, dns_domain_info->DnsDomainName.Buffer, -1, name, len, NULL, NULL ); + } + if (dns_domain_info->DnsForestName.Buffer) { + len = WideCharToMultiByte( CP_ACP, 0, dns_domain_info->DnsForestName.Buffer, -1, NULL, 0, NULL, NULL ); + forest = LocalAlloc( 0, len ); + WideCharToMultiByte( CP_ACP, 0, dns_domain_info->DnsForestName.Buffer, -1, name, len, NULL, NULL ); + } + trace(" name: %s domain: %s forest: %s guid: %s sid: %s\n", + name ? name : "NULL", domain ? domain : "NULL", + forest ? forest : "NULL", guidstr, strsid ? strsid : "NULL"); + LocalFree( name ); + LocalFree( forest ); + LocalFree( domain ); + LocalFree( guidstr ); + LocalFree( strsid ); + } pLsaFreeMemory((LPVOID)dns_domain_info); }

1 0

docs/en wine-faq.sgml
by Alexandre Julliard 24 Aug '06

24 Aug '06

ChangeSet ID: 1156424105337641525621624 CVSROOT: /cvsroot/wine Module name: docs Changes by: ajulliard(a)sc8-pr-cvs9.sourceforge.net 2006/08/24 05:55:05 Modified files: en : wine-faq.sgml Log message: Updated the sourceforge repository address. Old revision New revision Changes Path 1.17 1.18 +1 -1 docs/en/wine-faq.sgml Index: docs/en/wine-faq.sgml diff -u -p docs/en/wine-faq.sgml:1.17 docs/en/wine-faq.sgml:1.18 --- docs/en/wine-faq.sgml 24 Aug 2006 12:55: 5 -0000 +++ /dev/null 24 Aug 2006 12:55: 5 -0000 @@ -36,7 +36,7 @@ CVS, edit it, and then send a patch. In order to get the docs, run the following CVS command:</para> <screen> -cvs -z3 -d:pserver:anonymous(a)cvs.sourceforge.net:/cvsroot/wine co -P docs +cvs -z3 -d:pserver:anonymous(a)wine.cvs.sourceforge.net:/cvsroot/wine co -P docs </screen> <para> When prompted for a password, just press the enter key. </para>

1 0

Mike McCormack : shell32: Fix compilation of test on MSVC6.
by Alexandre Julliard 24 Aug '06

24 Aug '06

Module: wine Branch: master Commit: 9949a3a46304395862d95620ed963a2fcabf4730 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9949a3a46304395862d9562… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Aug 24 19:16:01 2006 +0900 shell32: Fix compilation of test on MSVC6. --- dlls/shell32/tests/shlfileop.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 12b2862..3a9caa3 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -22,14 +22,20 @@ #include <stdarg.h> #include <stdio.h> #define WINE_NOWINSOCK -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" +#include <windows.h> #include "shellapi.h" #include "shlobj.h" #include "wine/test.h" +#ifndef INVALID_FILE_ATTRIBUTES +#define INVALID_FILE_ATTRIBUTES 0xffffffff +#endif + +#ifndef FOF_NORECURSION +#define FOF_NORECURSION 0x1000 +#endif + CHAR CURR_DIR[MAX_PATH]; static HMODULE hshell32;

1 0

Mike McCormack : shell32: Use kernel functions in preference to libwine ones.
by Alexandre Julliard 24 Aug '06

24 Aug '06

Module: wine Branch: master Commit: e5d9b2f189f79e454a635ee448f7bd6903c5c42e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e5d9b2f189f79e454a635ee… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Aug 24 19:16:26 2006 +0900 shell32: Use kernel functions in preference to libwine ones. --- dlls/shell32/shell32_main.h | 4 ++-- dlls/shell32/shlfileop.c | 29 ++++++++++++++--------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 4463da5..a17eec4 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -200,8 +200,8 @@ inline static void __SHCloneStrWtoA(char inline static void __SHCloneStrW(WCHAR ** target, const WCHAR * source) { - *target = SHAlloc( (strlenW(source)+1) * sizeof(WCHAR) ); - strcpyW(*target, source); + *target = SHAlloc( (lstrlenW(source)+1) * sizeof(WCHAR) ); + lstrcpyW(*target, source); } inline static WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 8391ba6..6ea52b0 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -40,7 +40,6 @@ #define NO_SHLWAPI_STREAM #include "shlwapi.h" #include "shell32_main.h" #include "undocshell.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "xdg.h" @@ -781,11 +780,11 @@ static inline void grow_list(FILE_LIST * */ static void add_file_to_entry(FILE_ENTRY *feFile, LPWSTR szFile) { - DWORD dwLen = strlenW(szFile) + 1; + DWORD dwLen = lstrlenW(szFile) + 1; LPWSTR ptr; feFile->szFullPath = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); - strcpyW(feFile->szFullPath, szFile); + lstrcpyW(feFile->szFullPath, szFile); ptr = StrRChrW(szFile, NULL, '\\'); if (ptr) @@ -794,9 +793,9 @@ static void add_file_to_entry(FILE_ENTRY feFile->szDirectory = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); lstrcpynW(feFile->szDirectory, szFile, dwLen); - dwLen = strlenW(feFile->szFullPath) - dwLen + 1; + dwLen = lstrlenW(feFile->szFullPath) - dwLen + 1; feFile->szFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); - strcpyW(feFile->szFilename, ptr + 1); /* skip over backslash */ + lstrcpyW(feFile->szFilename, ptr + 1); /* skip over backslash */ } feFile->bFromWildcard = FALSE; } @@ -809,11 +808,11 @@ static LPWSTR wildcard_to_file(LPWSTR sz ptr = StrRChrW(szWildCard, NULL, '\\'); dwDirLen = ptr - szWildCard + 1; - dwFullLen = dwDirLen + strlenW(szFileName) + 1; + dwFullLen = dwDirLen + lstrlenW(szFileName) + 1; szFullPath = HeapAlloc(GetProcessHeap(), 0, dwFullLen * sizeof(WCHAR)); lstrcpynW(szFullPath, szWildCard, dwDirLen + 1); - strcatW(szFullPath, szFileName); + lstrcatW(szFullPath, szFileName); return szFullPath; } @@ -878,7 +877,7 @@ static HRESULT parse_file_list(FILE_LIST } else { - strcpyW(szCurFile, ptr); + lstrcpyW(szCurFile, ptr); flList->feFiles[i].bFromRelative = FALSE; } @@ -900,7 +899,7 @@ static HRESULT parse_file_list(FILE_LIST } /* advance to the next string */ - ptr += strlenW(ptr) + 1; + ptr += lstrlenW(ptr) + 1; i++; } flList->dwNumFiles = i; @@ -939,13 +938,13 @@ static void copy_dir_to_dir(LPSHFILEOPST if (PathFileExistsW(szDestPath)) PathCombineW(szTo, szDestPath, feFrom->szFilename); else - strcpyW(szTo, szDestPath); + lstrcpyW(szTo, szDestPath); - szTo[strlenW(szTo) + 1] = '\0'; + szTo[lstrlenW(szTo) + 1] = '\0'; SHNotifyCreateDirectoryW(szTo, NULL); PathCombineW(szFrom, feFrom->szFullPath, wildCardFiles); - szFrom[strlenW(szFrom) + 1] = '\0'; + szFrom[lstrlenW(szFrom) + 1] = '\0'; memcpy(&fileOp, lpFileOp, sizeof(fileOp)); fileOp.pFrom = szFrom; @@ -1181,10 +1180,10 @@ static void move_dir_to_dir(LPSHFILEOPST SHNotifyCreateDirectoryW(szDestPath, NULL); PathCombineW(szFrom, feFrom->szFullPath, wildCardFiles); - szFrom[strlenW(szFrom) + 1] = '\0'; + szFrom[lstrlenW(szFrom) + 1] = '\0'; - strcpyW(szTo, szDestPath); - szTo[strlenW(szDestPath) + 1] = '\0'; + lstrcpyW(szTo, szDestPath); + szTo[lstrlenW(szDestPath) + 1] = '\0'; memcpy(&fileOp, lpFileOp, sizeof(fileOp)); fileOp.pFrom = szFrom;

1 0

Roderick Colenbrander : opengl32: Fix ATI OpenGL bug.
by Alexandre Julliard 24 Aug '06

24 Aug '06

Module: wine Branch: master Commit: f25cea1094a05860abe666c199b0793e195df49a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f25cea1094a05860abe666c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 23 23:11:52 2006 +0000 opengl32: Fix ATI OpenGL bug. --- dlls/opengl32/wgl.c | 45 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 45f6297..f1efe8c 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1276,21 +1276,50 @@ #endif static void wgl_initialize_glx(Display *display, int screen, glXGetProcAddressARB_t proc) { const char *server_glx_version = glXQueryServerString(display, screen, GLX_VERSION); - const char *server_glx_extensions = glXQueryServerString(display, screen, GLX_EXTENSIONS); - /* const char *client_glx_version = glXGetClientString(display, GLX_VERSION); - const char *client_glx_extensions = glXGetClientString(display, GLX_EXTENSIONS); - const char *glx_extensions = glXQueryExtensionsString(display, screen); - */ + const char *glx_extensions = NULL; + BOOL glx_direct = glXIsDirect(display, default_cx); memset(&wine_glx, 0, sizeof(wine_glx)); - if (!strcmp("1.2", server_glx_version)) { + /* In case of GLX you have direct and indirect rendering. Most of the time direct rendering is used + * as in general only that is hardware accelerated. In some cases like in case of remote X indirect + * rendering is used. + * + * The main problem for our OpenGL code is that we need certain GLX calls but their presence + * depends on the reported GLX client / server version and on the client / server extension list. + * Those don't have to be the same. + * + * In general the server GLX information should be used in case of indirect rendering. When direct + * rendering is used, the OpenGL client library is responsible for which GLX calls are available. + * Nvidia's OpenGL drivers are the best in terms of GLX features. At the moment of writing their + * 8762 drivers support 1.3 for the server and 1.4 for the client and they support lots of extensions. + * Unfortunately it is much more complicated for Mesa/DRI-based drivers and ATI's drivers. + * Both sets of drivers report a server version of 1.2 and the client version can be 1.3 or 1.4. + * Further in case of atleast ATI's drivers one crucial extension needed for our pixel format code + * is only available in the list of server extensions and not in the client list. + * + * The versioning checks below try to take into account the comments from above. + */ + + /* Based on the default opengl context we decide whether direct or indirect rendering is used. + * In case of indirect rendering we check if the GLX version of the server is 1.2 and else + * the client version is checked. + */ + if ( (!glx_direct && !strcmp("1.2", server_glx_version)) || (glx_direct && !strcmp("1.2", client_glx_version)) ) { wine_glx.version = 2; } else { wine_glx.version = 3; } + /* Depending on the use of direct or indirect rendering we need either the list of extensions + * exported by the client or by the server. + */ + if(glx_direct) + glx_extensions = glXGetClientString(display, GLX_EXTENSIONS); + else + glx_extensions = glXQueryServerString(display, screen, GLX_EXTENSIONS); + if (2 < wine_glx.version) { wine_glx.p_glXChooseFBConfig = proc( (const GLubyte *) "glXChooseFBConfig"); wine_glx.p_glXGetFBConfigAttrib = proc( (const GLubyte *) "glXGetFBConfigAttrib"); @@ -1299,12 +1328,12 @@ static void wgl_initialize_glx(Display * /*wine_glx.p_glXGetFBConfigs = proc( (const GLubyte *) "glXGetFBConfigs");*/ wine_glx.p_glXQueryDrawable = proc( (const GLubyte *) "glXQueryDrawable"); } else { - if (NULL != strstr(server_glx_extensions, "GLX_SGIX_fbconfig")) { + if (NULL != strstr(glx_extensions, "GLX_SGIX_fbconfig")) { wine_glx.p_glXChooseFBConfig = proc( (const GLubyte *) "glXChooseFBConfigSGIX"); wine_glx.p_glXGetFBConfigAttrib = proc( (const GLubyte *) "glXGetFBConfigAttribSGIX"); wine_glx.p_glXGetVisualFromFBConfig = proc( (const GLubyte *) "glXGetVisualFromFBConfigSGIX"); } else { - ERR(" glx_version as %s and GLX_SGIX_fbconfig extension is unsupported. Expect problems.\n", server_glx_version); + ERR(" glx_version as %s and GLX_SGIX_fbconfig extension is unsupported. Expect problems.\n", client_glx_version); } } /** try anyway to retrieve that calls, maybe they works using glx client tricks */

1 0

James Hawkins : msi: Add an initial implementation of the PathEdit control.
by Alexandre Julliard 24 Aug '06

24 Aug '06

Module: wine Branch: master Commit: 11b7097df8b12b4a4b7bd6485365089d502f9cec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11b7097df8b12b4a4b7bd64… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Aug 24 02:25:07 2006 -0500 msi: Add an initial implementation of the PathEdit control. --- dlls/msi/dialog.c | 89 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 75 insertions(+), 14 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 7eef61f..96e866e 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -64,6 +64,7 @@ struct msi_control_tag HMODULE hDll; float progress_current; float progress_max; + DWORD attributes; WCHAR name[1]; }; @@ -1354,10 +1355,81 @@ static UINT msi_dialog_progress_bar( msi /******************** Path Edit ********************************************/ +static LPWSTR msi_get_window_text( HWND hwnd ) +{ + UINT sz, r; + LPWSTR buf; + + sz = 0x20; + buf = msi_alloc( sz*sizeof(WCHAR) ); + while ( buf ) + { + r = GetWindowTextW( hwnd, buf, sz ); + if ( r < (sz - 1) ) + break; + sz *= 2; + buf = msi_realloc( buf, sz*sizeof(WCHAR) ); + } + + return buf; +} + +static UINT msi_dialog_pathedit_handler( msi_dialog *dialog, + msi_control *control, WPARAM param ) +{ + LPCWSTR prop; + LPWSTR buf, indirect = NULL; + + if( HIWORD(param) != EN_KILLFOCUS ) + return ERROR_SUCCESS; + + prop = control->property; + if ( control->attributes & msidbControlAttributesIndirect ) + { + indirect = msi_dup_property( dialog->package, control->property ); + prop = indirect; + } + + /* FIXME: verify the new path */ + buf = msi_get_window_text( control->hwnd ); + MSI_SetPropertyW( dialog->package, prop, buf ); + + TRACE("edit %s contents changed, set %s\n", debugstr_w(control->name), + debugstr_w(prop)); + + msi_free( buf ); + msi_free( indirect ); + + return ERROR_SUCCESS; +} + static UINT msi_dialog_pathedit_control( msi_dialog *dialog, MSIRECORD *rec ) { - FIXME("not implemented properly\n"); - return msi_dialog_edit_control( dialog, rec ); + msi_control *control; + LPCWSTR prop; + LPWSTR val, indirect = NULL; + + control = msi_dialog_add_control( dialog, rec, szEdit, + WS_BORDER | WS_TABSTOP ); + control->handler = msi_dialog_pathedit_handler; + control->attributes = MSI_RecordGetInteger( rec, 8 ); + + prop = MSI_RecordGetString( rec, 9 ); + if ( prop ) + control->property = strdupW( prop ); + + if ( control->attributes & msidbControlAttributesIndirect ) + { + indirect = msi_dup_property( dialog->package, control->property ); + prop = indirect; + } + + val = msi_dup_property( dialog->package, prop ); + SetWindowTextW( control->hwnd, val ); + msi_free( val ); + msi_free( indirect ); + + return ERROR_SUCCESS; } /* radio buttons are a bit different from normal controls */ @@ -2354,7 +2426,6 @@ static UINT msi_dialog_checkbox_handler( static UINT msi_dialog_edit_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) { - UINT sz, r; LPWSTR buf; if( HIWORD(param) != EN_CHANGE ) @@ -2363,17 +2434,7 @@ static UINT msi_dialog_edit_handler( msi TRACE("edit %s contents changed, set %s\n", debugstr_w(control->name), debugstr_w(control->property)); - sz = 0x20; - buf = msi_alloc( sz*sizeof(WCHAR) ); - while( buf ) - { - r = GetWindowTextW( control->hwnd, buf, sz ); - if( r < (sz-1) ) - break; - sz *= 2; - buf = msi_realloc( buf, sz*sizeof(WCHAR) ); - } - + buf = msi_get_window_text( control->hwnd ); MSI_SetPropertyW( dialog->package, control->property, buf ); msi_free( buf );

1 0

Roderick Colenbrander : configure: Extend the current OpenGL/ Direct3D warning code.
by Alexandre Julliard 24 Aug '06

24 Aug '06

Module: wine Branch: master Commit: bc66d7edde877877ef7f601926520fc2e3209a43 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc66d7edde877877ef7f601… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Aug 24 01:11:27 2006 +0200 configure: Extend the current OpenGL/Direct3D warning code. --- configure | 40 +++++++++++++++++++++++++++++----------- configure.ac | 30 +++++++++++++++++++++++------- 2 files changed, 52 insertions(+), 18 deletions(-) diff --git a/configure b/configure index f96eb86..624329c 100755 --- a/configure +++ b/configure @@ -9347,7 +9347,7 @@ done then { echo "$as_me:$LINENO: checking for up-to-date OpenGL version" >&5 echo $ECHO_N "checking for up-to-date OpenGL version... $ECHO_C" >&6; } -if test "${wine_cv_opengl_version_OK+set}" = set; then +if test "${wine_cv_opengl_header_version_OK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -9399,20 +9399,20 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - wine_cv_opengl_version_OK="yes" + wine_cv_opengl_header_version_OK="yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wine_cv_opengl_version_OK="no" + wine_cv_opengl_header_version_OK="no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $wine_cv_opengl_version_OK" >&5 -echo "${ECHO_T}$wine_cv_opengl_version_OK" >&6; } +{ echo "$as_me:$LINENO: result: $wine_cv_opengl_header_version_OK" >&5 +echo "${ECHO_T}$wine_cv_opengl_header_version_OK" >&6; } if test "$wine_cv_opengl_version_OK" = "yes" then @@ -9515,6 +9515,8 @@ This prevents linking to OpenGL. Delete echo "$as_me: error: /usr/X11R6/lib/libGL.a is present on your system. This prevents linking to OpenGL. Delete the file and restart configure." >&2;} { (exit 1); exit 1; }; } + else + wine_cv_opengl_libs_found="no" fi fi @@ -9688,9 +9690,10 @@ if test $ac_cv_lib_glut_glutMainLoop = y fi + else + wine_cv_opengl_headers_found="no" fi fi - NASLIBS="" @@ -25726,13 +25729,28 @@ echo "$as_me: WARNING: isn't what you wa echo "$as_me: WARNING: packages of Xlib/Xfree86 at the very least." >&2;} fi -if test "$wine_cv_opengl_version_OK" = "no" +if test "$wine_cv_opengl_headers_found" = "no" -o "$wine_cv_opengl_header_version_OK" = "no" -o "$wine_cv_opengl_libs_found" = "no" then echo >&2 - { echo "$as_me:$LINENO: WARNING: Old Mesa headers detected. Wine will be built without Direct3D" >&5 -echo "$as_me: WARNING: Old Mesa headers detected. Wine will be built without Direct3D" >&2;} - { echo "$as_me:$LINENO: WARNING: support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)" >&5 -echo "$as_me: WARNING: support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)" >&2;} + { echo "$as_me:$LINENO: WARNING: Wine will be build without OpenGL or Direct3D support" >&5 +echo "$as_me: WARNING: Wine will be build without OpenGL or Direct3D support" >&2;} + { echo "$as_me:$LINENO: WARNING: because something is wrong with the OpenGL setup:" >&5 +echo "$as_me: WARNING: because something is wrong with the OpenGL setup:" >&2;} + if test "$wine_cv_opengl_headers_found" = "no" + then + { echo "$as_me:$LINENO: WARNING: No OpenGL development headers were found" >&5 +echo "$as_me: WARNING: No OpenGL development headers were found" >&2;} + fi + if test "$wine_cv_opengl_header_version_OK" = "no" + then + { echo "$as_me:$LINENO: WARNING: Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)" >&5 +echo "$as_me: WARNING: Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)" >&2;} + fi + if test "$wine_cv_opengl_libs_found" = "no" + then + { echo "$as_me:$LINENO: WARNING: No OpenGL library found on this system." >&5 +echo "$as_me: WARNING: No OpenGL library found on this system." >&2;} + fi fi if test "$wine_cv_msg_freetype" = "yes" diff --git a/configure.ac b/configure.ac index 72a41a0..806c840 100644 --- a/configure.ac +++ b/configure.ac @@ -401,12 +401,12 @@ #endif]) if test "$ac_cv_header_GL_gl_h" = "yes" -a "$ac_cv_header_GL_glx_h" = "yes" then dnl Check for some problems due to old Mesa versions - AC_CACHE_CHECK([for up-to-date OpenGL version], wine_cv_opengl_version_OK, + AC_CACHE_CHECK([for up-to-date OpenGL version], wine_cv_opengl_header_version_OK, AC_TRY_COMPILE( [#include <GL/gl.h>], [GLenum test = GL_UNSIGNED_SHORT_5_6_5;], - [wine_cv_opengl_version_OK="yes"], - [wine_cv_opengl_version_OK="no"] + [wine_cv_opengl_header_version_OK="yes"], + [wine_cv_opengl_header_version_OK="no"] ) ) @@ -427,6 +427,9 @@ #endif]) then AC_MSG_ERROR([/usr/X11R6/lib/libGL.a is present on your system. This prevents linking to OpenGL. Delete the file and restart configure.]) + else + dnl The compile test most likely failed because no libGL.so was found + wine_cv_opengl_libs_found="no" fi fi @@ -444,9 +447,10 @@ This prevents linking to OpenGL. Delete [AC_SUBST(GLUT_LIBS,"-lglut -lXmu -lXi") AC_SUBST(GLUT32FILES,'$(GLUT32FILES)')],, $OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXmu -lXi -lX11 $X_EXTRA_LIBS) + else + wine_cv_opengl_headers_found="no" fi fi - dnl **** Check for NAS **** AC_SUBST(NASLIBS,"") AC_CHECK_HEADERS(audio/audiolib.h, @@ -2013,11 +2017,23 @@ then AC_MSG_WARN([ packages of Xlib/Xfree86 at the very least.]) fi -if test "$wine_cv_opengl_version_OK" = "no" +if test "$wine_cv_opengl_headers_found" = "no" -o "$wine_cv_opengl_header_version_OK" = "no" -o "$wine_cv_opengl_libs_found" = "no" then echo >&2 - AC_MSG_WARN([Old Mesa headers detected. Wine will be built without Direct3D]) - AC_MSG_WARN([support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/).]) + AC_MSG_WARN([Wine will be build without OpenGL or Direct3D support]) + AC_MSG_WARN([because something is wrong with the OpenGL setup:]) + if test "$wine_cv_opengl_headers_found" = "no" + then + AC_MSG_WARN([No OpenGL development headers were found]) + fi + if test "$wine_cv_opengl_header_version_OK" = "no" + then + AC_MSG_WARN([Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/).]) + fi + if test "$wine_cv_opengl_libs_found" = "no" + then + AC_MSG_WARN([No OpenGL library found on this system.]) + fi fi if test "$wine_cv_msg_freetype" = "yes"

1 0

Andrew Talbot : winedump: Cast-qual warnings fix.
by Alexandre Julliard 24 Aug '06

24 Aug '06

Module: wine Branch: master Commit: d4c35ae0cb4ecfd63e2a500dc8c8159298675b1f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4c35ae0cb4ecfd63e2a500… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Aug 23 21:29:21 2006 +0100 winedump: Cast-qual warnings fix. --- tools/winedump/debug.c | 58 ++++++++++++++++++++++-------------------------- tools/winedump/dump.c | 14 ++++++------ 2 files changed, 33 insertions(+), 39 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 7cffa19..07ae75c 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -116,8 +116,8 @@ static int dump_cv_sst_module(const OMFD printf(" cSeg: %u\n", module->cSeg); printf(" Style: %c%c\n", module->Style[0], module->Style[1]); printf(" Name: %.*s\n", - *(BYTE*)((char*)(module + 1) + sizeof(OMFSegDesc) * module->cSeg), - (char*)(module + 1) + sizeof(OMFSegDesc) * module->cSeg + 1); + *(const BYTE*)((const char*)(module + 1) + sizeof(OMFSegDesc) * module->cSeg), + (const char*)(module + 1) + sizeof(OMFSegDesc) * module->cSeg + 1); segDesc = PRD(Offset(module + 1), sizeof(OMFSegDesc) * module->cSeg); if (!segDesc) {printf("Can't get the OMF-SegDesc, aborting\n"); return FALSE;} @@ -166,7 +166,7 @@ static int dump_cv_sst_global_pub(const { /* Point to the next PUBSYM32 in the table. */ - sym = (PUBSYM32*)curpos; + sym = (const PUBSYM32*)curpos; if (sym->reclen < sizeof(PUBSYM32)) break; @@ -264,7 +264,7 @@ static int dump_cv_sst_src_module(const if (!rawdata) {printf("Can't get srcModule subsection details, aborting\n");return FALSE;} /* FIXME: check ptr validity */ - sourceModule = (void*)rawdata; + sourceModule = (const void*)rawdata; printf (" Module table: Found %d file(s) and %d segment(s)\n", sourceModule->cFile, sourceModule->cSeg); for (i = 0; i < sourceModule->cFile; i++) @@ -274,9 +274,9 @@ static int dump_cv_sst_src_module(const } /* FIXME: check ptr validity */ - seg_info_dw = (void*)((char*)(sourceModule + 1) + + seg_info_dw = (const void*)((const char*)(sourceModule + 1) + sizeof(unsigned long) * (sourceModule->cFile - 1)); - seg_info_w = (unsigned short*)(&seg_info_dw[sourceModule->cSeg * 2]); + seg_info_w = (const unsigned short*)(&seg_info_dw[sourceModule->cSeg * 2]); for (i = 0; i < sourceModule->cSeg; i++) { printf (" Segment #%2d start = 0x%lx, end = 0x%lx, seg index = %u\n", @@ -299,14 +299,14 @@ static int dump_cv_sst_src_module(const * char file name (length is previous field) */ /* FIXME: check ptr validity */ - sourceFile = (void*)(rawdata + ofs); - seg_info_dw = (void*)((char*)sourceFile + 2 * sizeof(unsigned short) + + sourceFile = (const void*)(rawdata + ofs); + seg_info_dw = (const void*)((const char*)sourceFile + 2 * sizeof(unsigned short) + sourceFile->cSeg * sizeof(unsigned long)); ofs += 2 * sizeof(unsigned short) + 3 * sourceFile->cSeg * sizeof(unsigned long); printf(" File table: %.*s\n", - *(BYTE*)((char*)sourceModule + ofs), (char*)sourceModule + ofs + 1); + *(const BYTE*)((const char*)sourceModule + ofs), (const char*)sourceModule + ofs + 1); for (i = 0; i < sourceFile->cSeg; i++) { @@ -314,14 +314,14 @@ static int dump_cv_sst_src_module(const i + 1, seg_info_dw[i * 2], seg_info_dw[(i * 2) + 1], sourceFile->baseSrcLn[i]); } /* add file name length */ - ofs += *(BYTE*)((char*)sourceModule + ofs) + 1; + ofs += *(const BYTE*)((const char*)sourceModule + ofs) + 1; ofs = (ofs + 3) & ~3; for (i = 0; i < sourceModule->cSeg; i++) { - sourceLine = (void*)(rawdata + ofs); - seg_info_dw = (void*)((char*)sourceLine + 2 * sizeof(unsigned short)); - seg_info_w = (void*)(&seg_info_dw[sourceLine->cLnOff]); + sourceLine = (const void*)(rawdata + ofs); + seg_info_dw = (const void*)((const char*)sourceLine + 2 * sizeof(unsigned short)); + seg_info_w = (const void*)(&seg_info_dw[sourceLine->cLnOff]); printf (" Line table #%2d: Found %d line numbers for segment index %d\n", i, sourceLine->cLnOff, sourceLine->Seg); @@ -421,8 +421,8 @@ static void dump_codeview_headers(unsign if (memcmp(signature->Signature, "NB10", 4) == 0) { - struct {DWORD TimeStamp; DWORD Dunno; char Name[1];}* pdb_data; - pdb_data = (void*)(signature + 1); + const struct {DWORD TimeStamp; DWORD Dunno; char Name[1];} *pdb_data; + pdb_data = (const void *)(signature + 1); printf(" TimeStamp: %08lX (%s)\n", pdb_data->TimeStamp, get_time_str(pdb_data->TimeStamp)); @@ -485,7 +485,7 @@ static void dump_codeview_headers(unsign dump_codeview_all_modules(dirHeader); } -static const char* get_coff_name( PIMAGE_SYMBOL coff_sym, const char* coff_strtab ) +static const char *get_coff_name( const IMAGE_SYMBOL *coff_sym, const char *coff_strtab ) { static char namebuff[9]; const char* nampnt; @@ -508,21 +508,15 @@ static const char* get_coff_name( PIMA void dump_coff(unsigned long coffbase, unsigned long len, const void* pmt) { - PIMAGE_COFF_SYMBOLS_HEADER coff; - PIMAGE_SYMBOL coff_sym; - PIMAGE_SYMBOL coff_symbols; - PIMAGE_LINENUMBER coff_linetab; - char * coff_strtab; - const IMAGE_SECTION_HEADER * sectHead = pmt; - unsigned int i; - const char * nampnt; - int naux; - - coff = (PIMAGE_COFF_SYMBOLS_HEADER)PRD(coffbase, len); - - coff_symbols = (PIMAGE_SYMBOL) ((char *)coff + coff->LvaToFirstSymbol); - coff_linetab = (PIMAGE_LINENUMBER) ((char *)coff + coff->LvaToFirstLinenumber); - coff_strtab = (char *) (coff_symbols + coff->NumberOfSymbols); + const IMAGE_COFF_SYMBOLS_HEADER *coff = (const IMAGE_COFF_SYMBOLS_HEADER *)PRD(coffbase, len); + const IMAGE_SYMBOL *coff_sym; + const IMAGE_SYMBOL *coff_symbols = + (const IMAGE_SYMBOL *) ((const char *)coff + coff->LvaToFirstSymbol); + const char *coff_strtab = (const char *) (coff_symbols + coff->NumberOfSymbols); + const IMAGE_SECTION_HEADER *sectHead = pmt; + unsigned int i; + const char *nampnt; + int naux; printf("\nDebug table: COFF format. modbase %p, coffbase %p\n", PRD(0, 0), coff); printf(" ID | seg:offs [ abs ] | symbol/function name\n"); @@ -533,7 +527,7 @@ void dump_coff(unsigned long coffbase, u if( coff_sym->StorageClass == IMAGE_SYM_CLASS_FILE ) { - printf("file %s\n", (char *) (coff_sym + 1)); + printf("file %s\n", (const char *) (coff_sym + 1)); i += naux; continue; } diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index e3124e9..56c1df7 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -79,12 +79,12 @@ void dump_data( const unsigned char *ptr printf( "\n" ); } -const char* get_time_str(unsigned long _t) +const char *get_time_str(const unsigned long _t) { - time_t t = (time_t)_t; - const char *str = ctime(&t); - size_t len; - static char buf[128]; + const time_t t = (const time_t)_t; + const char *str = ctime(&t); + size_t len; + static char buf[128]; if (!str) /* not valid time */ { @@ -141,7 +141,7 @@ unsigned long Offset(const void* ptr) { if (ptr < dump_base) {printf("<<<<<ptr below\n");return 0;} if ((const char *)ptr >= (const char*)dump_base + dump_total_len) {printf("<<<<<ptr above\n");return 0;} - return (char*)ptr - (char*)dump_base; + return (const char *)ptr - (const char *)dump_base; } static void do_dump( enum FileSig sig, const void* pmt ) @@ -216,7 +216,7 @@ static enum FileSig check_headers(void) sig = SIG_UNKNOWN; break; default: - printf("No known main signature (%.2s/%x), aborting\n", (char*)pw, *pw); + printf("No known main signature (%.2s/%x), aborting\n", (const char *)pw, *pw); sig = SIG_UNKNOWN; }

1 0