January 2007 - Wine-Commits

Detlef Riekenberg : winspool: Support monitors without a name.
by Alexandre Julliard Jan. 12, 2007

Jan. 12, 2007

Module: wine Branch: master Commit: 9bdd900e71936e9734c86ac2460ddff079203eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bdd900e71936e9734c86ac24… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jan 11 13:05:16 2007 +0100 winspool: Support monitors without a name. --- dlls/winspool.drv/info.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 41b706c..9e165db 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -985,11 +985,13 @@ static monitor_t * monitor_load(LPCWSTR /* Is the Monitor already loaded? */ EnterCriticalSection(&monitor_handles_cs); - LIST_FOR_EACH_ENTRY(cursor, &monitor_handles, monitor_t, entry) - { - if (lstrcmpW(name, cursor->name) == 0) { - pm = cursor; - break; + if (name) { + LIST_FOR_EACH_ENTRY(cursor, &monitor_handles, monitor_t, entry) + { + if (cursor->name && (lstrcmpW(name, cursor->name) == 0)) { + pm = cursor; + break; + } } } @@ -1005,8 +1007,10 @@ static monitor_t * monitor_load(LPCWSTR LPMONITOREX pmonitorEx; DWORD len; - len = lstrlenW(MonitorsW) + lstrlenW(name) + 2; - regroot = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (name) { + len = lstrlenW(MonitorsW) + lstrlenW(name) + 2; + regroot = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + } if (regroot) { lstrcpyW(regroot, MonitorsW); @@ -1029,7 +1033,7 @@ static monitor_t * monitor_load(LPCWSTR pm->name = strdupW(name); pm->dllname = strdupW(driver); - if (!regroot || !pm->name || !pm->dllname) { + if ((name && (!regroot || !pm->name)) || !pm->dllname) { monitor_unload(pm); SetLastError(ERROR_NOT_ENOUGH_MEMORY); pm = NULL; @@ -1069,10 +1073,10 @@ static monitor_t * monitor_load(LPCWSTR } } - if (pInitializePrintMonitor != NULL) { + if (pInitializePrintMonitor && regroot) { pmonitorEx = pInitializePrintMonitor(regroot); - TRACE( "%p: LPMONITOREX from %s,InitializePrintMonitor(%s)\n", - pmonitorEx, debugstr_w(driver), debugstr_w(regroot)); + TRACE( "%p: LPMONITOREX from %s,InitializePrintMonitor(%s)\n", + pmonitorEx, debugstr_w(driver), debugstr_w(regroot)); if (pmonitorEx) { pm->dwMonitorSize = pmonitorEx->dwMonitorSize; @@ -1085,7 +1089,7 @@ static monitor_t * monitor_load(LPCWSTR } - if (!pm->monitor) { + if (!pm->monitor && regroot) { if (pInitializePrintMonitor2 != NULL) { FIXME("%s,InitializePrintMonitor2 not implemented\n", debugstr_w(driver)); }

1 0

Detlef Riekenberg : comdlg32: Move GetFileTitle(A/W/16) to filedlg.c, filedlg16.c.
by Alexandre Julliard Jan. 12, 2007

Jan. 12, 2007

Module: wine Branch: master Commit: 0678c87b3b9fdaad9480f03e8bc1bdf860f6847b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0678c87b3b9fdaad9480f03e8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 12 00:05:58 2007 +0100 comdlg32: Move GetFileTitle(A/W/16) to filedlg.c, filedlg16.c. --- dlls/comdlg32/Makefile.in | 1 - dlls/comdlg32/filedlg.c | 79 ++++++++++++++++++++++++++++ dlls/comdlg32/filedlg16.c | 9 +++ dlls/comdlg32/filetitle.c | 126 --------------------------------------------- 4 files changed, 88 insertions(+), 127 deletions(-) diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in index 35e180e..dded9a3 100644 --- a/dlls/comdlg32/Makefile.in +++ b/dlls/comdlg32/Makefile.in @@ -14,7 +14,6 @@ C_SRCS = \ filedlg.c \ filedlg31.c \ filedlgbrowser.c \ - filetitle.c \ finddlg32.c \ fontdlg.c \ printdlg.c diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 5fcdfd0..0c080c2 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3914,3 +3914,82 @@ BOOL WINAPI GetSaveFileNameW( else return GetFileDialog95W(ofn, SAVE_DIALOG); } + +/*********************************************************************** + * GetFileTitleA (COMDLG32.@) + * + * See GetFileTitleW. + */ +short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, WORD cbBuf) +{ + int ret; + UNICODE_STRING strWFile; + LPWSTR lpWTitle; + + RtlCreateUnicodeStringFromAsciiz(&strWFile, lpFile); + lpWTitle = RtlAllocateHeap( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR)); + ret = GetFileTitleW(strWFile.Buffer, lpWTitle, cbBuf); + if (!ret) WideCharToMultiByte( CP_ACP, 0, lpWTitle, -1, lpTitle, cbBuf, NULL, NULL ); + RtlFreeUnicodeString( &strWFile ); + RtlFreeHeap( GetProcessHeap(), 0, lpWTitle ); + return ret; +} + + +/*********************************************************************** + * GetFileTitleW (COMDLG32.@) + * + * Get the name of a file. + * + * PARAMS + * lpFile [I] name and location of file + * lpTitle [O] returned file name + * cbBuf [I] buffer size of lpTitle + * + * RETURNS + * Success: zero + * Failure: negative number. + */ +short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf) +{ + int i, len; + static const WCHAR brkpoint[] = {'*','[',']',0}; + TRACE("(%p %p %d);\n", lpFile, lpTitle, cbBuf); + + if(lpFile == NULL || lpTitle == NULL) + return -1; + + len = strlenW(lpFile); + + if (len == 0) + return -1; + + if(strpbrkW(lpFile, brkpoint)) + return -1; + + len--; + + if(lpFile[len] == '/' || lpFile[len] == '\\' || lpFile[len] == ':') + return -1; + + for(i = len; i >= 0; i--) + { + if (lpFile[i] == '/' || lpFile[i] == '\\' || lpFile[i] == ':') + { + i++; + break; + } + } + + if(i == -1) + i++; + + TRACE("---> '%s'\n", debugstr_w(&lpFile[i])); + + len = strlenW(lpFile+i)+1; + if(cbBuf < len) + return len; + + strcpyW(lpTitle, &lpFile[i]); + return 0; +} diff --git a/dlls/comdlg32/filedlg16.c b/dlls/comdlg32/filedlg16.c index 8014609..4159f1d 100644 --- a/dlls/comdlg32/filedlg16.c +++ b/dlls/comdlg32/filedlg16.c @@ -513,3 +513,12 @@ BOOL16 WINAPI GetSaveFileName16( TRACE("return lpstrFile='%s' !\n", (char *)MapSL(lpofn->lpstrFile)); return bRet; } + + +/*********************************************************************** + * GetFileTitle (COMMDLG.27) + */ +short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf) +{ + return GetFileTitleA(lpFile, lpTitle, cbBuf); +} diff --git a/dlls/comdlg32/filetitle.c b/dlls/comdlg32/filetitle.c deleted file mode 100644 index 753285b..0000000 --- a/dlls/comdlg32/filetitle.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - * COMMDLG - File Dialogs - * - * Copyright 1994 Martin Ayotte - * Copyright 1996 Albrecht Kleine - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winreg.h" -#include "winternl.h" -#include "wingdi.h" -#include "winuser.h" -#include "commdlg.h" -#include "cdlg.h" -#include "cdlg16.h" -#include "wine/unicode.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); - -/*********************************************************************** - * GetFileTitleA (COMDLG32.@) - * - * See GetFileTitleW. - */ -short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, WORD cbBuf) -{ - int ret; - UNICODE_STRING strWFile; - LPWSTR lpWTitle; - - RtlCreateUnicodeStringFromAsciiz(&strWFile, lpFile); - lpWTitle = RtlAllocateHeap( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR)); - ret = GetFileTitleW(strWFile.Buffer, lpWTitle, cbBuf); - if (!ret) WideCharToMultiByte( CP_ACP, 0, lpWTitle, -1, lpTitle, cbBuf, NULL, NULL ); - RtlFreeUnicodeString( &strWFile ); - RtlFreeHeap( GetProcessHeap(), 0, lpWTitle ); - return ret; -} - - -/*********************************************************************** - * GetFileTitleW (COMDLG32.@) - * - * Get the name of a file. - * - * PARAMS - * lpFile [I] name and location of file - * lpTitle [O] returned file name - * cbBuf [I] buffer size of lpTitle - * - * RETURNS - * Success: zero - * Failure: negative number. - */ -short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf) -{ - int i, len; - static const WCHAR brkpoint[] = {'*','[',']',0}; - TRACE("(%p %p %d);\n", lpFile, lpTitle, cbBuf); - - if(lpFile == NULL || lpTitle == NULL) - return -1; - - len = strlenW(lpFile); - - if (len == 0) - return -1; - - if(strpbrkW(lpFile, brkpoint)) - return -1; - - len--; - - if(lpFile[len] == '/' || lpFile[len] == '\\' || lpFile[len] == ':') - return -1; - - for(i = len; i >= 0; i--) - { - if (lpFile[i] == '/' || lpFile[i] == '\\' || lpFile[i] == ':') - { - i++; - break; - } - } - - if(i == -1) - i++; - - TRACE("---> '%s'\n", debugstr_w(&lpFile[i])); - - len = strlenW(lpFile+i)+1; - if(cbBuf < len) - return len; - - strcpyW(lpTitle, &lpFile[i]); - return 0; -} - - -/*********************************************************************** - * GetFileTitle (COMMDLG.27) - */ -short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf) -{ - return GetFileTitleA(lpFile, lpTitle, cbBuf); -}

1 0

Alexandre Julliard : preloader: Remove reserved ranges that we failed to allocate.
by Alexandre Julliard Jan. 12, 2007

Jan. 12, 2007

Module: wine Branch: master Commit: 13029a253661614603c2ed8a42c0ada536905e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13029a253661614603c2ed8a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 11 12:35:42 2007 +0100 preloader: Remove reserved ranges that we failed to allocate. --- loader/preloader.c | 54 ++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 40 insertions(+), 14 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index b1e2e53..a56060e 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -949,6 +949,31 @@ error: fatal_error( "invalid WINEPRELOADRESERVE value '%s'\n", str ); } +/* check if address is in one of the reserved ranges */ +static int is_addr_reserved( const void *addr ) +{ + int i; + + for (i = 0; preload_info[i].size; i++) + { + if ((const char *)addr >= (const char *)preload_info[i].addr && + (const char *)addr < (const char *)preload_info[i].addr + preload_info[i].size) + return 1; + } + return 0; +} + +/* remove a range from the preload list */ +static void remove_preload_range( int i ) +{ + while (preload_info[i].size) + { + preload_info[i].addr = preload_info[i+1].addr; + preload_info[i].size = preload_info[i+1].size; + i++; + } +} + /* * is_in_preload_range * @@ -956,18 +981,10 @@ error: */ static int is_in_preload_range( const ElfW(auxv_t) *av, int type ) { - int i; - - while (av->a_type != type && av->a_type != AT_NULL) av++; - - if (av->a_type == type) + while (av->a_type != AT_NULL) { - for (i = 0; preload_info[i].size; i++) - { - if ((char *)av->a_un.a_val >= (char *)preload_info[i].addr && - (char *)av->a_un.a_val < (char *)preload_info[i].addr + preload_info[i].size) - return 1; - } + if (av->a_type == type) return is_addr_reserved( (const void *)av->a_un.a_val ); + av++; } return 0; } @@ -1039,12 +1056,21 @@ void* wld_start( void **stack ) /* reserve memory that Wine needs */ if (reserve) preload_reserve( reserve ); for (i = 0; preload_info[i].size; i++) - wld_mmap( preload_info[i].addr, preload_info[i].size, - PROT_NONE, MAP_FIXED | MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, -1, 0 ); + { + if (wld_mmap( preload_info[i].addr, preload_info[i].size, PROT_NONE, + MAP_FIXED | MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, -1, 0 ) == (void *)-1) + { + wld_printf( "preloader: Warning: failed to reserve range %x-%x\n", + preload_info[i].addr, (char *)preload_info[i].addr + preload_info[i].size ); + remove_preload_range( i ); + i--; + } + } /* add an executable page at the top of the address space to defeat * broken no-exec protections that play with the code selector limit */ - wld_mprotect( (char *)0x80000000 - page_size, page_size, PROT_EXEC | PROT_READ ); + if (is_addr_reserved( (char *)0x80000000 - page_size )) + wld_mprotect( (char *)0x80000000 - page_size, page_size, PROT_EXEC | PROT_READ ); /* load the main binary */ map_so_lib( argv[1], &main_binary_map );

1 0

Alexandre Julliard : preloader: Added printf format checking and fix some formats.
by Alexandre Julliard Jan. 12, 2007

Jan. 12, 2007

Module: wine Branch: master Commit: 092ac1fbf58be1abfc3f01bbb7beec2e3ad59875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092ac1fbf58be1abfc3f01bbb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 11 12:46:06 2007 +0100 preloader: Added printf format checking and fix some formats. --- loader/preloader.c | 40 +++++++++++++++++++++++++++------------- 1 files changed, 27 insertions(+), 13 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index a56060e..5648158 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -358,12 +358,14 @@ static inline void *wld_memset( void *de * * %x prints a hex number * %s prints a string + * %p prints a pointer */ static int wld_vsprintf(char *buffer, const char *fmt, va_list args ) { static const char hex_chars[16] = "0123456789abcdef"; const char *p = fmt; char *str = buffer; + int i; while( *p ) { @@ -372,11 +374,23 @@ static int wld_vsprintf(char *buffer, co p++; if( *p == 'x' ) { - int i; unsigned int x = va_arg( args, unsigned int ); for(i=7; i>=0; i--) *str++ = hex_chars[(x>>(i*4))&0xf]; } + else if (p[0] == 'l' && p[1] == 'x') + { + unsigned long x = va_arg( args, unsigned long ); + for(i=7; i>=0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + p++; + } + else if( *p == 'p' ) + { + unsigned long x = (unsigned long)va_arg( args, void * ); + for(i=7; i>=0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + } else if( *p == 's' ) { char *s = va_arg( args, char * ); @@ -393,7 +407,7 @@ static int wld_vsprintf(char *buffer, co return str - buffer; } -static void wld_printf(const char *fmt, ... ) +static __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... ) { va_list args; char buffer[256]; @@ -405,7 +419,7 @@ static void wld_printf(const char *fmt, wld_write(2, buffer, len); } -static __attribute__((noreturn)) void fatal_error(const char *fmt, ... ) +static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ) { va_list args; char buffer[256]; @@ -453,8 +467,8 @@ static void dump_auxiliary( ElfW(auxv_t) for ( ; av->a_type != AT_NULL; av++) { for (i = 0; names[i].name; i++) if (names[i].val == av->a_type) break; - if (names[i].name) wld_printf("%s = %x\n", names[i].name, av->a_un.a_val); - else wld_printf( "%x = %x\n", av->a_type, av->a_un.a_val ); + if (names[i].name) wld_printf("%s = %lx\n", names[i].name, av->a_un.a_val); + else wld_printf( "%x = %lx\n", av->a_type, av->a_un.a_val ); } } #endif @@ -597,7 +611,7 @@ static void map_so_lib( const char *name { #ifdef DUMP_SEGMENTS - wld_printf( "ph = %x\n", ph ); + wld_printf( "ph = %p\n", ph ); wld_printf( " p_type = %x\n", ph->p_type ); wld_printf( " p_flags = %x\n", ph->p_flags ); wld_printf( " p_offset = %x\n", ph->p_offset ); @@ -696,8 +710,8 @@ static void map_so_lib( const char *name /* sanity check */ if ((char *)c->mapstart + maplength > preloader_start && (char *)c->mapstart <= preloader_end) - fatal_error( "%s: binary overlaps preloader (%x-%x)\n", - name, c->mapstart, (char *)c->mapstart + maplength ); + fatal_error( "%s: binary overlaps preloader (%p-%p)\n", + name, (char *)c->mapstart, (char *)c->mapstart + maplength ); ELF_FIXED_ADDRESS (loader, c->mapstart); } @@ -815,7 +829,7 @@ static void *find_symbol( const ElfW(Phd /* check the values */ #ifdef DUMP_SYMS - wld_printf("%x %x\n", phdr, num ); + wld_printf("%p %x\n", phdr, num ); #endif if( ( phdr == NULL ) || ( num == 0 ) ) { @@ -929,7 +943,7 @@ static void preload_reserve( const char else if ((char *)end > preloader_start && (char *)start <= preloader_end) { - wld_printf( "WINEPRELOADRESERVE range %x-%x overlaps preloader %x-%x\n", + wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", start, end, preloader_start, preloader_end ); start = end = NULL; } @@ -1048,7 +1062,7 @@ void* wld_start( void **stack ) preloader_end = (char *)((unsigned int)(_end + page_mask) & ~page_mask); #ifdef DUMP_AUX_INFO - wld_printf( "stack = %x\n", *stack ); + wld_printf( "stack = %p\n", *stack ); for( i = 0; i < *pargc; i++ ) wld_printf("argv[%x] = %s\n", i, argv[i]); dump_auxiliary( av ); #endif @@ -1060,7 +1074,7 @@ void* wld_start( void **stack ) if (wld_mmap( preload_info[i].addr, preload_info[i].size, PROT_NONE, MAP_FIXED | MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, -1, 0 ) == (void *)-1) { - wld_printf( "preloader: Warning: failed to reserve range %x-%x\n", + wld_printf( "preloader: Warning: failed to reserve range %p-%p\n", preload_info[i].addr, (char *)preload_info[i].addr + preload_info[i].size ); remove_preload_range( i ); i--; @@ -1117,7 +1131,7 @@ void* wld_start( void **stack ) set_auxiliary_values( av, new_av, delete_av, stack ); #ifdef DUMP_AUX_INFO - wld_printf("new stack = %x\n", *stack); + wld_printf("new stack = %p\n", *stack); wld_printf("jumping to %x\n", ld_so_map.l_entry); #endif

1 0

lostwages/ wwn/wn20010319_87.xml templates/en/ ...
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

ChangeSet ID: 30878 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/01/11 15:40:41 Modified files: wwn : wn20010319_87.xml templates/en : status_dlls.template status_changelog.template press.template Log message: Replace Latin-1 characters by the proper HTML entities. Patch: http://cvs.winehq.org/patch.py?id=30878 Old revision New revision Changes Path 1.4 1.5 +6 -6 lostwages/wwn/wn20010319_87.xml 1.44 1.45 +1 -1 lostwages/templates/en/status_dlls.template 1.52 1.53 +2 -2 lostwages/templates/en/status_changelog.template 1.41 1.42 +1 -1 lostwages/templates/en/press.template Index: lostwages/wwn/wn20010319_87.xml diff -u -p lostwages/wwn/wn20010319_87.xml:1.4 lostwages/wwn/wn20010319_87.xml:1.5 --- lostwages/wwn/wn20010319_87.xml:1.4 11 Jan 2007 21:40:41 -0000 +++ lostwages/wwn/wn20010319_87.xml 11 Jan 2007 21:40:41 -0000 @@ -125,9 +125,9 @@ However, no cooperation has been set up -Gérard Patel wrote a patch to help debugging some parts of Wine. +Gérard Patel wrote a patch to help debugging some parts of Wine. <ul> - <li><quote who="Gérard Patel">This implements a way to not output the + <li><quote who="Gérard Patel">This implements a way to not output the debug trace to disk until the user hits Alt + F12. The goal is to avoid too big trace files.</quote> This behavior would be triggered by using the -dt command line switch.</li> @@ -145,14 +145,14 @@ key that some apps may need.</quote> -Gérard didn't agree either. He tested, from a speed perspective, the +Gérard didn't agree either. He tested, from a speed perspective, the two options (turning off the output inside Wine versus using an external program), and found the former being twice as fast as the later on his machine. -Rob Farnum explained he also tried to achieve what Gérard did using a +Rob Farnum explained he also tried to achieve what Gérard did using a more generic approach: <quote who="Rob Farnum"> my modification allowed an external application to drive the debugging @@ -191,8 +191,8 @@ process.</quote> -However, all of these large evolutions didn't solve Gérard's first -needs:<quote who="Gérard Patel">What I wanted is something short and simple, so +However, all of these large evolutions didn't solve Gérard's first +needs:<quote who="Gérard Patel">What I wanted is something short and simple, so I could help people on the news group. The use of my patch could be explained in one line and it would have worked with Wine right 'out of the box' :-)... something the internal debugger does not do anymore Index: lostwages/templates/en/status_dlls.template diff -u -p lostwages/templates/en/status_dlls.template:1.44 lostwages/templates/en/status_dlls.template:1.45 --- lostwages/templates/en/status_dlls.template:1.44 11 Jan 2007 21:40:41 -0000 +++ lostwages/templates/en/status_dlls.template 11 Jan 2007 21:40:41 -0000 @@ -430,7 +430,7 @@ <a href="{$root}/site/?issue=167#Accessing%20ODBC%20Databases">#167</a>, <a href="{$root}/site/?issue=205#ODBC%20Fun%20-%20Tips%20and%20Tricks">#205</a></td> <td class="pct60">60% complete (no Windows ODBC driver support, only UNIX)</td> - <td>Alex Villacís Lasso</td> + <td>Alex Villacís Lasso</td> </tr> <tr> <td>odbccp32.dll</td> Index: lostwages/templates/en/status_changelog.template diff -u -p lostwages/templates/en/status_changelog.template:1.52 lostwages/templates/en/status_changelog.template:1.53 --- lostwages/templates/en/status_changelog.template:1.52 11 Jan 2007 21:40:41 -0000 +++ lostwages/templates/en/status_changelog.template 11 Jan 2007 21:40:41 -0000 @@ -7,7 +7,7 @@ <ul> <li>ADD - Paul Vriens as worker to wintrust.dll</li> <li>ADD - Mikołaj Zalewski as worker to comctl32.dll</li> - <li>Remove - Thomas Weidenmüller as worker on comctl32.dll</li> + <li>Remove - Thomas Weidenmüller as worker on comctl32.dll</li> <li>Remove - Phil Krylov as worker on comctl32.dll</li> <li>version.dll 85% -> 95%</li> <li>wintrust.dll 5% -> 10%</li> @@ -192,7 +192,7 @@ <li>Remove - Sami Nopanen as worker on cards.dll</li> <li>Remove - Sami Aario as worker on vdmdbg.dll</li> <li>Remove - Filip Navara as worker on comctl32.dll</li> - <li>Remove - Maxime Bellengé as worker on comctl32.dll</li> + <li>Remove - Maxime Bellengé as worker on comctl32.dll</li> <li>Remove - Dimitrie O. Paun as worker on comdlg32.dll</li> <li>Remove - Ulrich Czekalla as worker on cryptdll.dll</li> <li>Remove - Aric Stewart as worker on imm32.dll</li> Index: lostwages/templates/en/press.template diff -u -p lostwages/templates/en/press.template:1.41 lostwages/templates/en/press.template:1.42 --- lostwages/templates/en/press.template:1.41 11 Jan 2007 21:40:41 -0000 +++ lostwages/templates/en/press.template 11 Jan 2007 21:40:41 -0000 @@ -94,7 +94,7 @@ <li> <a href="http://www.desktoplinux.com/news/NS3643360142.html">DesktopLinux.com</a> December 27, 2004 - Linux platform for Windows apps gets better <li> <a href="http://www-128.ibm.com/developerworks/linux/library/l-emulat.html">IBM</a> December 21, 2004 - Write emulator-friendly Linux code <li> <a href="http://www.osnews.com/story.php?news_id=9150">OSNews</a> December 13, 2004 - Review: Xandros Desktop 3 Deluxe - <li> <a href="http://www.codeweavers.com/site/about/general/press/?id=20041116">CodeWeavers</a> November 16, 2004 - CodeWeavers Adds Support For Apple iTunes® In New CrossOver Office 4.0 + <li> <a href="http://www.codeweavers.com/site/about/general/press/?id=20041116">CodeWeavers</a> November 16, 2004 - CodeWeavers Adds Support For Apple iTunes® In New CrossOver Office 4.0 <li> <a href="http://www.newsforge.com/article.pl?sid=04/12/13/1342233">NewsForge</a> November 16, 2004 - QuickBooks: the missing link for small business Linux <li> <a href="http://www.pcworld.idg.com.au/index.php/id%3B1089332511%3Bfp%3B2%3Bfpid%3B37">PCWorld</a> October 18, 2004 - Crossing Over to Linux <li> <a href="http://searchopensource.techtarget.com/expert/KnowledgebaseAnswer/0,289625,…">SearchEnterpriseLinux</a> September 21, 2004 - Two ways to port Windows apps to Linux

1 0

lostwages/include html.php themes/winehq/conte ...
by Jeremy Newman Jan. 11, 2007

Jan. 11, 2007

ChangeSet ID: 30877 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/01/11 15:37:37 Modified files: include : html.php include/themes/winehq: content.template Log message: change default output encoding to UTF-8 Patch: http://cvs.winehq.org/patch.py?id=30877 Old revision New revision Changes Path 1.17 1.18 +1 -0 lostwages/include/html.php 1.10 1.11 +1 -1 lostwages/include/themes/winehq/content.template Index: lostwages/include/html.php diff -u -p lostwages/include/html.php:1.17 lostwages/include/html.php:1.18 --- lostwages/include/html.php:1.17 11 Jan 2007 21:37:37 -0000 +++ lostwages/include/html.php 11 Jan 2007 21:37:37 -0000 @@ -853,6 +853,7 @@ class html // HTTP HEADER (better header) function http_header ($title = "") { + header("Content-type: text/html; charset=UTF-8"); header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); header("Cache-Control: no-store, no-cache, must-revalidate"); Index: lostwages/include/themes/winehq/content.template diff -u -p lostwages/include/themes/winehq/content.template:1.10 lostwages/include/themes/winehq/content.template:1.11 --- lostwages/include/themes/winehq/content.template:1.10 11 Jan 2007 21:37:37 -0000 +++ lostwages/include/themes/winehq/content.template 11 Jan 2007 21:37:37 -0000 @@ -5,7 +5,7 @@ <title>{$page_title}</title> <meta HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT"> <meta HTTP-EQUIV="Pragma" CONTENT="no-cache"> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link rel="stylesheet" href="{$root}/winehq_styles.css" type="text/css"> </head>

1 0

lostwages/news 2007011101.xml
by Jeremy Newman Jan. 11, 2007

Jan. 11, 2007

ChangeSet ID: 30876 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/01/11 11:31:02 Modified files: news : 2007011101.xml Log message: winehq.org is not utf-8 at this time, fix utf char Patch: http://cvs.winehq.org/patch.py?id=30876 Old revision New revision Changes Path 1.1 1.2 +1 -1 lostwages/news/2007011101.xml Index: lostwages/news/2007011101.xml diff -u -p lostwages/news/2007011101.xml:1.1 lostwages/news/2007011101.xml:1.2 --- lostwages/news/2007011101.xml:1.1 11 Jan 2007 17:31: 2 -0000 +++ lostwages/news/2007011101.xml 11 Jan 2007 17:31: 2 -0000 @@ -1,6 +1,6 @@ <news> <date>January 11, 2007</date> - <title>CodeWeavers Unveils CrossOver® 6.0, for Mac and Linux</title> + <title>CodeWeavers Unveils CrossOver® 6.0, for Mac and Linux</title> <body> CodeWeavers <a href="http://crossover.codeweavers.com/pipermail/announce/2007-January/000036.html">announced</a>

1 0

lostwages/news 2007011101.xml
by Jeremy Newman Jan. 11, 2007

Jan. 11, 2007

ChangeSet ID: 30875 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/01/11 11:06:08 Added files: news : 2007011101.xml Log message: Tom Wickline <twickline(a)gmail.com> News about the release of CrossOver 6.0 for Mac and Linux! Patch: http://cvs.winehq.org/patch.py?id=30875 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2007011101.xml Index: lostwages/news/2007011101.xml diff -u -p /dev/null lostwages/news/2007011101.xml:1.1 --- /dev/null 11 Jan 2007 17: 6: 8 -0000 +++ lostwages/news/2007011101.xml 11 Jan 2007 17: 6: 8 -0000 @@ -0,0 +1,24 @@ +<news> + <date>January 11, 2007</date> + <title>CodeWeavers Unveils CrossOver® 6.0, for Mac and Linux</title> + <body> + CodeWeavers + <a href="http://crossover.codeweavers.com/pipermail/announce/2007-January/000036.html">announced</a> + the release of CrossOver 6.0 for Mac and Linux. Several new applications + and games are now supported and existing supported apps have had extensive bug fixes. + The big news most people will find exciting is the added support + for Outlook 2003, World of Warcraft, and a range of Steam based games such as Half-Life 2. + + Users of Intel based Mac systems can now seamlessly run many + Windows applications on their Mac without needing a Windows license. + Supported applications include Outlook, Visio, Project, Quicken, Steam based games + such as Half Life 2, and many more. + <ul> + <li><a href="http://www.codeweavers.com/about/general/press/?id=20070109a">Linux Press Release</a></li> + <li><a href="http://www.codeweavers.com/about/general/press/?id=20070109">Mac Press Release</a></li> + <li><a href="http://www.codeweavers.com/products/download_trial/">CrossOver Standard Trial</a></li> + <li><a href="http://www.codeweavers.com/products/cxoffice/change_log/">Change Log</a></li> + <li><a href="http://www.codeweavers.com/store/">CodeWeavers' Store</a></li></ul> + + </body> +</news>

1 0

tools/winetest dissect gather
by Jeremy Newman Jan. 11, 2007

Jan. 11, 2007

ChangeSet ID: 30874 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/01/11 11:03:43 Modified files: winetest : dissect gather Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Support Vista on test.winehq.org Patch: http://cvs.winehq.org/patch.py?id=30874 Old revision New revision Changes Path 1.17 1.18 +2 -0 tools/winetest/dissect 1.16 1.17 +12 -11 tools/winetest/gather Index: tools/winetest/dissect diff -u -p tools/winetest/dissect:1.17 tools/winetest/dissect:1.18 --- tools/winetest/dissect:1.17 11 Jan 2007 17: 3:43 -0000 +++ tools/winetest/dissect 11 Jan 2007 17: 3:43 -0000 @@ -130,6 +130,8 @@ if ($plid==1 && $major==4) { } elsif ($minor==2) { $version = "2003"; } + } elsif ($major==6) { + $version = "vista"; } } elsif ($plid==3) { $version = "ce$major$minor"; Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.16 tools/winetest/gather:1.17 --- tools/winetest/gather:1.16 11 Jan 2007 17: 3:43 -0000 +++ tools/winetest/gather 11 Jan 2007 17: 3:43 -0000 @@ -37,22 +37,23 @@ my $fileversion = 3; # digests: hashes report digests or "differ" to test names # visible: whether winetest ran on a visible desktop # tests: array of test hashes (name, tag, dir, results hash). -my %w95 = (name => "Win95"); -my %w98 = (name => "Win98"); -my %me = (name => "Me"); -my %nt3 = (name => "NT 3"); -my %nt4 = (name => "NT 4"); -my %w2k = (name => "2000"); -my %xp = (name => "XP"); -my %w2k3 = (name => "2003"); -my %wine = (name => "Wine"); +my %w95 = (name => "Win95"); +my %w98 = (name => "Win98"); +my %me = (name => "Me"); +my %nt3 = (name => "NT 3"); +my %nt4 = (name => "NT 4"); +my %w2k = (name => "2000"); +my %xp = (name => "XP"); +my %w2k3 = (name => "2003"); +my %vista = (name => "Vista"); +my %wine = (name => "Wine"); # Map dissect's IDs to the above hashes my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, - 2000=>\%w2k, xp=>\%xp, 2003=>\%w2k3, wine=>\%wine); + 2000=>\%w2k, xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, wine=>\%wine); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%wine); +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%wine); my ($outdated,undef) = glob "$datadir/*/outdated"; exit 2 unless defined $outdated;

1 0

Bill Medland : odbccp32: Implement SQLInstallerError(W).
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: 8d82a8c9b333080b2d57fb3d835b3988fe24278a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d82a8c9b333080b2d57fb3d8… Author: Bill Medland <billmedland(a)shaw.ca> Date: Wed Jan 10 11:43:41 2007 -0800 odbccp32: Implement SQLInstallerError(W). --- dlls/odbccp32/odbccp32.c | 231 ++++++++++++++++++++++++++++++++++++++++++-- dlls/odbccp32/tests/misc.c | 6 +- 2 files changed, 226 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d82a8c9b333080b2d57f…

1 0