January 2006 - Wine-Commits

Mike McCormack : preloader: Allow compiling the preloader with -fstack-protector.
by Alexandre Julliard Jan. 26, 2006

Jan. 26, 2006

Module: wine Branch: refs/heads/master Commit: 7cd9a8f8dc9536393e4e6042ae18bfb89b8671e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7cd9a8f8dc9536393e4e604… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jan 26 13:21:54 2006 +0100 preloader: Allow compiling the preloader with -fstack-protector. --- loader/preloader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 040fb66..6f07692 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -155,6 +155,9 @@ struct wld_link_map { */ void __bb_init_func() { return; } +/* similar to the above but for -fstack-protector */ +void *__stack_chk_guard = 0; +void __stack_chk_fail(void) { return; } /* * The _start function is the entry and exit point of this program

1 0

appdb/admin editAppFamily.php
by WineHQ Jan. 26, 2006

Jan. 26, 2006

ChangeSet ID: 22544 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/25 19:19:01 Modified files: admin : editAppFamily.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix Edit Application Family back link Patch: http://cvs.winehq.org/patch.py?id=22544 Old revision New revision Changes Path 1.33 1.34 +1 -1 appdb/admin/editAppFamily.php Index: appdb/admin/editAppFamily.php diff -u -p appdb/admin/editAppFamily.php:1.33 appdb/admin/editAppFamily.php:1.34 --- appdb/admin/editAppFamily.php:1.33 26 Jan 2006 1:19: 1 -0000 +++ appdb/admin/editAppFamily.php 26 Jan 2006 1:19: 1 -0000 @@ -100,7 +100,7 @@ else echo html_frame_end(); echo "</form>"; - echo html_back_link(1,BASE."appview.php?appId=$ob->appId"); + echo html_back_link(1,BASE."appview.php?appId=$oApp->iAppId"); } apidb_footer();

1 0

lostwages/templates/en download.template
by Jeremy Newman Jan. 25, 2006

Jan. 25, 2006

ChangeSet ID: 22543 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/25 13:28:56 Modified files: templates/en : download.template Log message: Tony Lambregts <tony.lambregts(a)gmail.com> update note to the WineTools link Patch: http://cvs.winehq.org/patch.py?id=22543 Old revision New revision Changes Path 1.73 1.74 +5 -4 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.73 lostwages/templates/en/download.template:1.74 --- lostwages/templates/en/download.template:1.73 25 Jan 2006 19:28:56 -0000 +++ lostwages/templates/en/download.template 25 Jan 2006 19:28:56 -0000 @@ -118,11 +118,11 @@ for post-installation instructions.</b>< <td align=center bgcolor="#ffffff"> <a href="http://www.von-thadden.de/Joachim/WineTools/"> <img src="../images/distro/winetools.png" - width="50" height="50" alt="Wine Tools" border="0"> + width="50" height="50" alt="WineTools" border="0"> </a> </td> <td align=left bgcolor="#ffffff"> - <b><a href="http://www.von-thadden.de/Joachim/WineTools/">Wine Tools</a></b> - + <b><a href="http://www.von-thadden.de/Joachim/WineTools/">WineTools</a></b> - WineTools is a menu driven installer for installing Windows programs. This software lets you install the following Windows software: DCOM98, IE6, Windows Core Fonts, Windows System Software, Office & Office Viewer, @@ -131,8 +131,9 @@ for post-installation instructions.</b>< Thadden</a>.<br /> <div style="margin: 10px; padding: 5px; border: 1px solid #C0C0C0; background-color: #F0F0F0;"> <b>Note:</b> WineTools only recommended if installation or operability of - Windows software failed on pure Wine or because the Wine developers need - your feedback from testing. + Windows software failed on pure Wine. Since WineTools radically alters your + Wine configuration please do not report bugs in programs with WineTools + installed. </div> </td> </tr>

1 0

Vitaliy Margolen : user: Don't drop owned windows in WIN_EnumChildWindows.
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: dd57bbd1d2135d406f4cca60dca369ac6fe9aff5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd57bbd1d2135d406f4cca6… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Wed Jan 25 15:07:02 2006 +0100 user: Don't drop owned windows in WIN_EnumChildWindows. Add a few tests for this. --- dlls/user/tests/win.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- dlls/user/win.c | 2 -- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index 64525c4..d4045b1 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -94,6 +94,14 @@ BOOL CALLBACK EnumChildProc( HWND hwndCh return TRUE; } +/* will search for the given window */ +BOOL CALLBACK EnumChildProc1( HWND hwndChild, LPARAM lParam) +{ + trace("EnumChildProc1 on %p\n", hwndChild); + if ((HWND)lParam == hwndChild) return FALSE; + return TRUE; +} + static HWND create_tool_window( LONG style, HWND parent ) { HWND ret = CreateWindowExA(0, "ToolWindowClass", "Tool window 1", style, @@ -451,7 +459,9 @@ static void test_parent_owner(void) owner = create_tool_window( WS_OVERLAPPED, 0 ); - test = create_tool_window( WS_POPUP, NULL ); + test = create_tool_window( WS_POPUP, desktop ); + + ok( !GetWindow( test, GW_OWNER ), "Wrong owner window\n" ); numChildren = 0; ok( !EnumChildWindows( owner, EnumChildProc, (LPARAM)&numChildren ), "EnumChildWindows should have returned FALSE\n" ); @@ -471,6 +481,40 @@ static void test_parent_owner(void) ok( !EnumChildWindows( owner, EnumChildProc, (LPARAM)&numChildren ), "EnumChildWindows should have returned FALSE\n" ); ok( numChildren == 2, "numChildren should be 2 got %d\n", numChildren ); + DestroyWindow( child ); + + child = create_tool_window( WS_VISIBLE | WS_OVERLAPPEDWINDOW, owner ); + ok( GetWindow( child, GW_OWNER ) == owner, "Wrong owner window\n" ); + numChildren = 0; + ok( EnumChildWindows( owner, EnumChildProc, (LPARAM)&numChildren ), + "EnumChildWindows should have returned TRUE\n" ); + ok( numChildren == 1, "numChildren should be 1 got %d\n", numChildren ); + + ret = SetParent( child, owner ); + ok( GetWindow( child, GW_OWNER ) == owner, "Wrong owner window\n" ); + ok( ret == desktop, "SetParent return value %p expected %p\n", ret, desktop ); + numChildren = 0; + ok( !EnumChildWindows( owner, EnumChildProc, (LPARAM)&numChildren ), + "EnumChildWindows should have returned FALSE\n" ); + ok( numChildren == 2, "numChildren should be 2 got %d\n", numChildren ); + + ret = SetParent( child, NULL ); + ok( GetWindow( child, GW_OWNER ) == owner, "Wrong owner window\n" ); + ok( ret == owner, "SetParent return value %p expected %p\n", ret, owner ); + numChildren = 0; + ok( EnumChildWindows( owner, EnumChildProc, (LPARAM)&numChildren ), + "EnumChildWindows should have returned TRUE\n" ); + ok( numChildren == 1, "numChildren should be 1 got %d\n", numChildren ); + + /* even GW_OWNER == owner it's still a desktop's child */ + ok( !EnumChildWindows( desktop, EnumChildProc1, (LPARAM)child ), + "EnumChildWindows should have found %p and returned FALSE\n", child ); + + DestroyWindow( child ); + child = create_tool_window( WS_VISIBLE | WS_OVERLAPPEDWINDOW, NULL ); + + ok( !EnumChildWindows( desktop, EnumChildProc1, (LPARAM)child ), + "EnumChildWindows should have found %p and returned FALSE\n", child ); DestroyWindow( child ); DestroyWindow( test ); diff --git a/dlls/user/win.c b/dlls/user/win.c index 2f26cd7..237deeb 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -2812,8 +2812,6 @@ static BOOL WIN_EnumChildWindows( HWND * { /* Make sure that the window still exists */ if (!IsWindow( *list )) continue; - /* skip owned windows */ - if (GetWindow( *list, GW_OWNER )) continue; /* Build children list first */ childList = WIN_ListChildren( *list );

1 0

Alexandre Julliard : server: Allow opening a directory with write access (based on a patch
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: 471782ae29ff1191661fb4a5bdb92ed4d77d757f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=471782ae29ff1191661fb4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 15:06:48 2006 +0100 server: Allow opening a directory with write access (based on a patch by Mike McCormack). --- server/fd.c | 23 ++++++++++++++++++++--- server/file.c | 13 +------------ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/server/fd.c b/server/fd.c index ba182f4..a142acd 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1327,6 +1327,7 @@ struct fd *open_fd( const char *name, in struct closed_fd *closed_fd; struct fd *fd; const char *unlink_name = ""; + int rw_mode; if (!(fd = alloc_fd_object())) return NULL; @@ -1336,6 +1337,7 @@ struct fd *open_fd( const char *name, in release_object( fd ); return NULL; } + /* create the directory if needed */ if ((options & FILE_DIRECTORY_FILE) && (flags & O_CREAT)) { @@ -1349,11 +1351,26 @@ struct fd *open_fd( const char *name, in } flags &= ~(O_CREAT | O_EXCL | O_TRUNC); } - if ((fd->unix_fd = open( name, flags & ~O_TRUNC, *mode )) == -1) + + if ((access & FILE_UNIX_WRITE_ACCESS) && !(options & FILE_DIRECTORY_FILE)) { - file_set_error(); - goto error; + if (access & FILE_UNIX_READ_ACCESS) rw_mode = O_RDWR; + else rw_mode = O_WRONLY; } + else rw_mode = O_RDONLY; + + if ((fd->unix_fd = open( name, rw_mode | (flags & ~O_TRUNC), *mode )) == -1) + { + /* if we tried to open a directory for write access, retry read-only */ + if (errno != EISDIR || + !(access & FILE_UNIX_WRITE_ACCESS) || + (fd->unix_fd = open( name, O_RDONLY | (flags & ~O_TRUNC), *mode )) == -1) + { + file_set_error(); + goto error; + } + } + closed_fd->unix_fd = fd->unix_fd; closed_fd->unlink[0] = 0; fstat( fd->unix_fd, &st ); diff --git a/server/file.c b/server/file.c index bc8f63d..f488c55 100644 --- a/server/file.c +++ b/server/file.c @@ -141,7 +141,7 @@ static struct object *create_file( const { struct object *obj = NULL; struct fd *fd; - int flags, rw_mode; + int flags; char *name; mode_t mode; @@ -168,17 +168,6 @@ static struct object *create_file( const access = generic_file_map_access( access ); - rw_mode = 0; - if (access & FILE_UNIX_READ_ACCESS) rw_mode |= FILE_READ_DATA; - if (access & FILE_UNIX_WRITE_ACCESS) rw_mode |= FILE_WRITE_DATA; - switch(rw_mode) - { - case 0: break; - case FILE_READ_DATA: flags |= O_RDONLY; break; - case FILE_WRITE_DATA: flags |= O_WRONLY; break; - case FILE_READ_DATA|FILE_WRITE_DATA: flags |= O_RDWR; break; - } - /* FIXME: should set error to STATUS_OBJECT_NAME_COLLISION if file existed before */ fd = open_fd( name, flags | O_NONBLOCK | O_LARGEFILE, &mode, access, sharing, options ); if (!fd) goto done;

1 0

Alexandre Julliard : wtypes: Don't specify alignment for DOUBLE and DATE on MSVC.
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: cf675c1197b3ef15859e55fe41b5d28ea0ae4624 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf675c1197b3ef15859e55f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 15:03:46 2006 +0100 wtypes: Don't specify alignment for DOUBLE and DATE on MSVC. --- include/wtypes.idl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wtypes.idl b/include/wtypes.idl index f53e1bd..0e0fed7 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -181,7 +181,7 @@ typedef LONG_PTR LPARAM; cpp_quote("#endif /* winnt.h */") -cpp_quote("#if 0") /* for IDL only */ +cpp_quote("#ifdef _MSC_VER") /* for IDL and MSVC only */ typedef double DOUBLE; cpp_quote("#else") cpp_quote("typedef double DECLSPEC_ALIGN(8) DOUBLE;") @@ -599,7 +599,7 @@ typedef enum tagSTATFLAG { /******************** OLE Automation ********************/ -cpp_quote("#if 0") /* for IDL only */ +cpp_quote("#ifdef _MSC_VER") /* for IDL and MSVC only */ typedef double DATE; cpp_quote("#else") cpp_quote("typedef double DECLSPEC_ALIGN(8) DATE;")

1 0

Alexandre Julliard : wine.inf: Don't overwrite registry keys that users may want to change.
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: f8f34d9fabb2be7582158fc74548f092dc2682f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f8f34d9fabb2be7582158fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 13:19:43 2006 +0100 wine.inf: Don't overwrite registry keys that users may want to change. --- tools/wine.inf | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 97d0a2e..5b6e8d6 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -136,8 +136,8 @@ HKLM,%CurrentVersion%,"CommonFilesDir",, HKLM,%CurrentVersion%,"FirstInstallDateTime",1,21,81,7c,23 HKLM,%CurrentVersion%,"ProductId",,"12345-oem-0000001-54321" HKLM,%CurrentVersion%,"ProgramFilesDir",,"%16422%" -HKLM,%CurrentVersion%,"RegisteredOrganization",,"Change preferred organization in ~/.wine/system.reg" -HKLM,%CurrentVersion%,"RegisteredOwner",,"Change preferred owner in ~/.wine/system.reg" +HKLM,%CurrentVersion%,"RegisteredOrganization",2,"Change preferred organization in ~/.wine/system.reg" +HKLM,%CurrentVersion%,"RegisteredOwner",2,"Change preferred owner in ~/.wine/system.reg" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMax",,"3600" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMin",,"3" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"LastID",,"5" @@ -147,27 +147,27 @@ HKLM,Software\Microsoft\Windows NT\Curre HKLM,Software\Microsoft\Windows NT\CurrentVersion\Hotfix\Q246009,"Installed",,"1" [Debugger] -HKLM,Software\Microsoft\Windows NT\CurrentVersion\AeDebug,"Debugger",,"winedbg --auto %ld %ld" -HKLM,Software\Microsoft\Windows NT\CurrentVersion\AeDebug,"Auto",,"1" +HKLM,Software\Microsoft\Windows NT\CurrentVersion\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" +HKLM,Software\Microsoft\Windows NT\CurrentVersion\AeDebug,"Auto",2,"1" [Desktop] -HKCU,%Desktop%,"FontSmoothing",,"0" -HKCU,%Desktop%,"DragFullWindows",,"0" -HKCU,%Desktop%,"SmoothScroll",1,00,00,00,00 -HKCU,%Desktop%,"UserPreferencemask",1,00,00,00,00 +HKCU,%Desktop%,"FontSmoothing",2,"0" +HKCU,%Desktop%,"DragFullWindows",2,"0" +HKCU,%Desktop%,"SmoothScroll",3,00,00,00,00 +HKCU,%Desktop%,"UserPreferencemask",3,00,00,00,00 HKCU,%Desktop%,"LowPowerActive",,"0" [Metrics] -HKCU,%Metrics%,"ScrollWidth",,"16" -HKCU,%Metrics%,"ScrollHeight",,"16" -HKCU,%Metrics%,"CaptionWidth",,"18" -HKCU,%Metrics%,"CaptionHeight",,"18" -HKCU,%Metrics%,"SmCaptionWidth",,"13" -HKCU,%Metrics%,"SmCaptionHeight",,"15" -HKCU,%Metrics%,"MenuWidth",,"18" -HKCU,%Metrics%,"MenuHeight",,"18" -HKCU,%Metrics%,"BorderWidth",,"1" -HKCU,%Metrics%,"Shell Icon Size",,"32" +HKCU,%Metrics%,"ScrollWidth",2,"16" +HKCU,%Metrics%,"ScrollHeight",2,"16" +HKCU,%Metrics%,"CaptionWidth",2,"18" +HKCU,%Metrics%,"CaptionHeight",2,"18" +HKCU,%Metrics%,"SmCaptionWidth",2,"13" +HKCU,%Metrics%,"SmCaptionHeight",2,"15" +HKCU,%Metrics%,"MenuWidth",2,"18" +HKCU,%Metrics%,"MenuHeight",2,"18" +HKCU,%Metrics%,"BorderWidth",2,"1" +HKCU,%Metrics%,"Shell Icon Size",2,"32" [DirectX] HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0903" @@ -202,7 +202,7 @@ HKLM,Software\Microsoft\DirectPlay\Servi [Environment] HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",,"%11%\wcmd.exe" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",,"%11%;%10%" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",2,"%11%;%10%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ProgramFiles",,"%16422%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SYSTEMROOT",,"%10%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TEMP",,"%10%\temp" @@ -230,7 +230,7 @@ HKLM,%FontSubStr%,"Times New Roman CYR,2 HKLM,%FontSubStr%,"Times New Roman Greek,161",,"Times New Roman,161" HKLM,%FontSubStr%,"Times New Roman TUR,162",,"Times New Roman,162" HKLM,%FontSubStr%,"Tms Rmn",,"Times New Roman" -HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixels",0x10001,0x00000060 +HKLM,System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts,"LogPixels",0x10003,0x00000060 [MCI] HKLM,%Mci32Str%,"AVIVideo",,"mciavi32.dll"

1 0

Alexandre Julliard : kernel: Handle a failure to load winedos a bit more gracefully.
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: c93afe6bfc625b375e996c557101b29bb33d1f13 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c93afe6bfc625b375e996c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 13:19:11 2006 +0100 kernel: Handle a failure to load winedos a bit more gracefully. --- dlls/kernel/dosmem.c | 41 ++++++++++++++++++++++------------------- dlls/kernel/kernel_private.h | 2 +- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/kernel/dosmem.c b/dlls/kernel/dosmem.c index 30ca6cf..73bc2dc 100644 --- a/dlls/kernel/dosmem.c +++ b/dlls/kernel/dosmem.c @@ -80,7 +80,7 @@ static LONG WINAPI dosmem_handler(EXCEPT struct winedos_exports winedos; -void load_winedos(void) +BOOL load_winedos(void) { static HANDLE hRunOnce /* = 0 */; static HMODULE hWineDos /* = 0 */; @@ -88,7 +88,7 @@ void load_winedos(void) /* FIXME: this isn't 100% thread safe, as we won't catch access to 1MB while * loading winedos (and may return uninitialized valued) */ - if (hWineDos) return; + if (hWineDos) goto done; if (hRunOnce == 0) { HANDLE hEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -97,29 +97,31 @@ void load_winedos(void) HMODULE hModule; /* ok, we're the winning thread */ - VirtualProtect( DOSMEM_dosmem + DOSMEM_protect, - DOSMEM_SIZE - DOSMEM_protect, - PAGE_EXECUTE_READWRITE, NULL ); - if (!(hModule = LoadLibraryA( "winedos.dll" ))) + if (!VirtualProtect( DOSMEM_dosmem + DOSMEM_protect, + DOSMEM_SIZE - DOSMEM_protect, + PAGE_EXECUTE_READWRITE, NULL ) || + !(hModule = LoadLibraryA( "winedos.dll" ))) { ERR("Could not load winedos.dll, DOS subsystem unavailable\n"); - hWineDos = (HMODULE)1; /* not to try to load it again */ - return; + hModule = (HMODULE)1; /* not to try to load it again */ } + else + { #define GET_ADDR(func) winedos.func = (void *)GetProcAddress( hModule, #func ); - GET_ADDR(AllocDosBlock); - GET_ADDR(FreeDosBlock); - GET_ADDR(ResizeDosBlock); - GET_ADDR(inport); - GET_ADDR(outport); - GET_ADDR(EmulateInterruptPM); - GET_ADDR(CallBuiltinHandler); - GET_ADDR(BiosTick); + GET_ADDR(AllocDosBlock); + GET_ADDR(FreeDosBlock); + GET_ADDR(ResizeDosBlock); + GET_ADDR(inport); + GET_ADDR(outport); + GET_ADDR(EmulateInterruptPM); + GET_ADDR(CallBuiltinHandler); + GET_ADDR(BiosTick); #undef GET_ADDR + } RtlRemoveVectoredExceptionHandler( dosmem_handler ); hWineDos = hModule; SetEvent( hRunOnce ); - return; + goto done; } /* someone beat us here... */ CloseHandle( hEvent ); @@ -127,6 +129,8 @@ void load_winedos(void) /* and wait for the winner to have finished */ WaitForSingleObject( hRunOnce, INFINITE ); + done: + return (hWineDos != (HMODULE)1); } /****************************************************************** @@ -142,8 +146,7 @@ static LONG WINAPI dosmem_handler(EXCEPT if (addr >= (ULONG_PTR)DOSMEM_dosmem + DOSMEM_protect && addr < (ULONG_PTR)DOSMEM_dosmem + DOSMEM_SIZE) { - load_winedos(); - return EXCEPTION_CONTINUE_EXECUTION; + if (load_winedos()) return EXCEPTION_CONTINUE_EXECUTION; } } return EXCEPTION_CONTINUE_SEARCH; diff --git a/dlls/kernel/kernel_private.h b/dlls/kernel/kernel_private.h index 7139ffb..c40a04b 100644 --- a/dlls/kernel/kernel_private.h +++ b/dlls/kernel/kernel_private.h @@ -113,7 +113,7 @@ extern BOOL DOSMEM_Init(void); extern LPVOID DOSMEM_MapRealToLinear(DWORD); /* real-mode to linear */ extern LPVOID DOSMEM_MapDosToLinear(UINT); /* linear DOS to Wine */ extern UINT DOSMEM_MapLinearToDos(LPVOID); /* linear Wine to DOS */ -extern void load_winedos(void); +extern BOOL load_winedos(void); /* environ.c */ extern void ENV_CopyStartupInformation(void);

1 0

Alexandre Julliard : x11drv: Always set GC function to GXcopy for the BitBlt DIB optimization.
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: 0e08584462afd57c95af2cd4a5afa5a824975a66 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0e08584462afd57c95af2cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 13:18:27 2006 +0100 x11drv: Always set GC function to GXcopy for the BitBlt DIB optimization. --- dlls/x11drv/bitblt.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/x11drv/bitblt.c b/dlls/x11drv/bitblt.c index 23de307..47b7a1a 100644 --- a/dlls/x11drv/bitblt.c +++ b/dlls/x11drv/bitblt.c @@ -1591,6 +1591,10 @@ BOOL X11DRV_BitBlt( X11DRV_PDEVICE *phys } X11DRV_CoerceDIBSection( physDevDst, DIB_Status_GdiMod, FALSE ); + wine_tsx11_lock(); + XSetFunction( gdi_display, physDevDst->gc, GXcopy ); + wine_tsx11_unlock(); + X11DRV_DIB_CopyDIBSection( physDevSrc, physDevDst, xSrc, ySrc, xDst, yDst, width, height ); result = TRUE; goto END;

1 0

Mike Frysinger : winegcc: Pass -m32/-m64 along to the linker.
by Alexandre Julliard Jan. 25, 2006

Jan. 25, 2006

Module: wine Branch: refs/heads/master Commit: ff6b46656354e3da8295ce5d2aba6efee197c066 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff6b46656354e3da8295ce5… Author: Mike Frysinger <vapier(a)gentoo.org> Date: Wed Jan 25 13:15:34 2006 +0100 winegcc: Pass -m32/-m64 along to the linker. --- tools/winegcc/winegcc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 93153fd..e0a810e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -908,6 +908,8 @@ int main(int argc, char **argv) opts.gui_app = 0; else if (strcmp("-municode", argv[i]) == 0) opts.unicode_app = 1; + else if (strcmp("-m32", argv[i]) == 0 || strcmp("-m64", argv[i]) == 0) + raw_linker_arg = 1; break; case 'n': if (strcmp("-nostdinc", argv[i]) == 0)

1 0