wine-commits January 2007

wine-commits@winehq.org

4 participants
893 discussions

Stefan Dösinger : wined3d: Remove IWineD3DDevice_ApplyStateChanges.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 197ec1c179b4367ae25783cb08a1b2a616562e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197ec1c179b4367ae25783cb0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 2 00:07:55 2007 +0100 wined3d: Remove IWineD3DDevice_ApplyStateChanges. --- dlls/wined3d/device.c | 82 +------------------------------------- dlls/wined3d/state.c | 27 ++++++++----- dlls/wined3d/stateblock.c | 4 -- include/wine/wined3d_interface.h | 3 - 4 files changed, 18 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=197ec1c179b4367ae2578…

1 0

Stefan Dösinger : wined3d: Move WINED3DTS_TEXTURETRANSFORMFLAGS to the state table.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: c10efb3492037dd1f5327ea83b39886ffb67f20e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c10efb3492037dd1f5327ea83… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jan 1 23:53:59 2007 +0100 wined3d: Move WINED3DTS_TEXTURETRANSFORMFLAGS to the state table. --- dlls/wined3d/device.c | 103 ------------------------------------------------- dlls/wined3d/state.c | 69 +++++++++++++++++++++++++-------- 2 files changed, 52 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c10efb3492037dd1f5327…

1 0

Alexandre Julliard : preloader: Reset both AT_SYSINFO and AT_SYSINFO_EHDR when one of them conflicts.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 4d9f3dfae10102fdd464d102f01b8f2e1fcc5fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9f3dfae10102fdd464d102f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 12:21:45 2007 +0100 preloader: Reset both AT_SYSINFO and AT_SYSINFO_EHDR when one of them conflicts. --- loader/preloader.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 381b8e4..b1e2e53 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -1076,8 +1076,11 @@ void* wld_start( void **stack ) i = 0; /* delete sysinfo values if addresses conflict */ - if (is_in_preload_range( av, AT_SYSINFO )) delete_av[i++].a_type = AT_SYSINFO; - if (is_in_preload_range( av, AT_SYSINFO_EHDR )) delete_av[i++].a_type = AT_SYSINFO_EHDR; + if (is_in_preload_range( av, AT_SYSINFO ) || is_in_preload_range( av, AT_SYSINFO_EHDR )) + { + delete_av[i++].a_type = AT_SYSINFO; + delete_av[i++].a_type = AT_SYSINFO_EHDR; + } delete_av[i].a_type = AT_NULL; /* get rid of first argument */

1 0

Dmitry Timoshkov : gdi32: Remove redundant debug channel, use the default one instead.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 2cbf7d4d91e8f5bfd1c2c5c398dadcb599694d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cbf7d4d91e8f5bfd1c2c5c39… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jan 2 16:25:07 2007 +0800 gdi32: Remove redundant debug channel, use the default one instead. --- dlls/gdi32/font.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 22ebd8a..b92ea82 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -37,7 +37,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(font); -WINE_DECLARE_DEBUG_CHANNEL(gdi); /* Device -> World size conversion */ @@ -3000,8 +2999,8 @@ BOOL WINAPI GetCharABCWidthsFloatW( HDC BOOL WINAPI GetCharWidthFloatA(HDC hdc, UINT iFirstChar, UINT iLastChar, PFLOAT pxBuffer) { - FIXME_(gdi)("GetCharWidthFloatA, stub\n"); - return 0; + FIXME("%p, %u, %u, %p: stub!\n", hdc, iFirstChar, iLastChar, pxBuffer); + return 0; } /************************************************************************* @@ -3010,8 +3009,8 @@ BOOL WINAPI GetCharWidthFloatA(HDC hdc, BOOL WINAPI GetCharWidthFloatW(HDC hdc, UINT iFirstChar, UINT iLastChar, PFLOAT pxBuffer) { - FIXME_(gdi)("GetCharWidthFloatW, stub\n"); - return 0; + FIXME("%p, %u, %u, %p: stub!\n", hdc, iFirstChar, iLastChar, pxBuffer); + return 0; }

1 0

Jeff Latimer : ntdll: Remove an unnecessary NULL check.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 588a350f6d29e6f90c1ff9e4f461578e3dbb402a URL: http://source.winehq.org/git/wine.git/?a=commit;h=588a350f6d29e6f90c1ff9e4f… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Jan 2 16:25:30 2007 +1100 ntdll: Remove an unnecessary NULL check. --- dlls/ntdll/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 038b755..543fcfb 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2212,8 +2212,8 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHA SERVER_START_REQ( create_mailslot ) { req->access = DesiredAccess; - req->attributes = (attr) ? attr->Attributes : 0; - req->rootdir = attr ? attr->RootDirectory : 0; + req->attributes = attr->Attributes; + req->rootdir = attr->RootDirectory; req->max_msgsize = MaxMessageSize; req->read_timeout = (TimeOut->QuadPart <= 0) ? TimeOut->QuadPart / -10000 : -1; wine_server_add_data( req, attr->ObjectName->Buffer,

1 0

Mike McCormack : kernel32: Implement CopyFileWithProgress.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: b9910cb36dad3f0ee8f4d15023ee67956e91f8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9910cb36dad3f0ee8f4d1502… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jan 2 11:40:00 2007 +0900 kernel32: Implement CopyFileWithProgress. --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/path.c | 38 +++++++++++++++++++++++++++++++------- include/winbase.h | 3 +++ 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7502bb8..9eba016 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -795,8 +795,8 @@ @ stdcall MoveFileExA(str str long) @ stdcall MoveFileExW(wstr wstr long) @ stdcall MoveFileW(wstr wstr) -# @ stub MoveFileWithProgressA -# @ stub MoveFileWithProgressW +@ stdcall MoveFileWithProgressA(str str ptr ptr long) +@ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) @ stdcall MulDiv(long long long) @ stdcall MultiByteToWideChar(long long str long ptr long) # @ stub NlsConvertIntegerToString diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 56823da..39fc176 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -982,9 +982,11 @@ BOOL WINAPI CopyFileExA(LPCSTR sourceFil /************************************************************************** - * MoveFileExW (KERNEL32.@) + * MoveFileWithProgressW (KERNEL32.@) */ -BOOL WINAPI MoveFileExW( LPCWSTR source, LPCWSTR dest, DWORD flag ) +BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, + LPPROGRESS_ROUTINE fnProgress, + LPVOID param, DWORD flag ) { FILE_BASIC_INFORMATION info; UNICODE_STRING nt_name; @@ -994,7 +996,8 @@ BOOL WINAPI MoveFileExW( LPCWSTR source, HANDLE source_handle = 0, dest_handle; ANSI_STRING source_unix, dest_unix; - TRACE("(%s,%s,%04x)\n", debugstr_w(source), debugstr_w(dest), flag); + TRACE("(%s,%s,%p,%p,%04x)\n", + debugstr_w(source), debugstr_w(dest), fnProgress, param, flag ); if (flag & MOVEFILE_DELAY_UNTIL_REBOOT) return add_boot_rename_entry( source, dest, flag ); @@ -1087,7 +1090,10 @@ BOOL WINAPI MoveFileExW( LPCWSTR source, NtClose( source_handle ); RtlFreeAnsiString( &source_unix ); RtlFreeAnsiString( &dest_unix ); - return (CopyFileW( source, dest, TRUE ) && DeleteFileW( source )); + if (!CopyFileExW( source, dest, fnProgress, + param, NULL, COPY_FILE_FAIL_IF_EXISTS )) + return FALSE; + return DeleteFileW( source ); } FILE_SetDosError(); /* if we created the destination, remove it */ @@ -1124,9 +1130,11 @@ error: } /************************************************************************** - * MoveFileExA (KERNEL32.@) + * MoveFileWithProgressA (KERNEL32.@) */ -BOOL WINAPI MoveFileExA( LPCSTR source, LPCSTR dest, DWORD flag ) +BOOL WINAPI MoveFileWithProgressA( LPCSTR source, LPCSTR dest, + LPPROGRESS_ROUTINE fnProgress, + LPVOID param, DWORD flag ) { WCHAR *sourceW, *destW; BOOL ret; @@ -1139,11 +1147,27 @@ BOOL WINAPI MoveFileExA( LPCSTR source, else destW = NULL; - ret = MoveFileExW( sourceW, destW, flag ); + ret = MoveFileWithProgressW( sourceW, destW, fnProgress, param, flag ); HeapFree( GetProcessHeap(), 0, destW ); return ret; } +/************************************************************************** + * MoveFileExW (KERNEL32.@) + */ +BOOL WINAPI MoveFileExW( LPCWSTR source, LPCWSTR dest, DWORD flag ) +{ + return MoveFileWithProgressW( source, dest, NULL, NULL, flag ); +} + +/************************************************************************** + * MoveFileExA (KERNEL32.@) + */ +BOOL WINAPI MoveFileExA( LPCSTR source, LPCSTR dest, DWORD flag ) +{ + return MoveFileWithProgressA( source, dest, NULL, NULL, flag ); +} + /************************************************************************** * MoveFileW (KERNEL32.@) diff --git a/include/winbase.h b/include/winbase.h index 7e29103..600094a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1831,6 +1831,9 @@ BOOL WINAPI MoveFileW(LPCWSTR,LPC BOOL WINAPI MoveFileExA(LPCSTR,LPCSTR,DWORD); BOOL WINAPI MoveFileExW(LPCWSTR,LPCWSTR,DWORD); #define MoveFileEx WINELIB_NAME_AW(MoveFileEx) +BOOL WINAPI MoveFileWithProgressA(LPCSTR,LPCSTR,LPPROGRESS_ROUTINE,LPVOID,DWORD); +BOOL WINAPI MoveFileWithProgressW(LPCWSTR,LPCWSTR,LPPROGRESS_ROUTINE,LPVOID,DWORD); +#define MoveFileWithProgress WINELIB_NAME_AW(MoveFileWithProgress) INT WINAPI MulDiv(INT,INT,INT); BOOL WINAPI NotifyChangeEventLog(HANDLE,HANDLE); BOOL WINAPI ObjectCloseAuditAlarmA(LPCSTR,LPVOID,BOOL);

1 0

Roderick Colenbrander : winex11.drv: Remove get_drawable.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 86d4a9e078dc06cbd7cc39d74129f100bfbe98f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d4a9e078dc06cbd7cc39d74… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Jan 1 22:37:54 2007 +0100 winex11.drv: Remove get_drawable. --- dlls/winex11.drv/opengl.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 384a29b..e0ce8b0 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -529,21 +529,6 @@ static inline Wine_GLContext *get_contex } /** - * get_drawable (internal) - * - * Retrieve the GLX drawable to use on a given DC. - */ -inline static Drawable get_drawable( HDC hdc ) -{ - GLXDrawable drawable; - enum x11drv_escape_codes escape = X11DRV_GET_GLX_DRAWABLE; - - if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, - sizeof(drawable), (LPSTR)&drawable )) drawable = 0; - return drawable; -} - -/** * get_hdc_from_Drawable (internal) * * For use by wglGetCurrentReadDCARB.

1 0

Roderick Colenbrander : winecfg: Remove desktop double buffering option.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 3ff86bcfb7f416f0d67c6464338fe3d3b40b4458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ff86bcfb7f416f0d67c64643… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Jan 1 17:56:44 2007 +0100 winecfg: Remove desktop double buffering option. --- programs/winecfg/Bg.rc | 1 - programs/winecfg/Cs.rc | 1 - programs/winecfg/De.rc | 1 - programs/winecfg/En.rc | 2 -- programs/winecfg/Es.rc | 1 - programs/winecfg/Fi.rc | 1 - programs/winecfg/Fr.rc | 1 - programs/winecfg/Hu.rc | 1 - programs/winecfg/It.rc | 1 - programs/winecfg/Ja.rc | 1 - programs/winecfg/Ko.rc | 1 - programs/winecfg/Nl.rc | 1 - programs/winecfg/No.rc | 1 - programs/winecfg/Pt.rc | 2 -- programs/winecfg/Ru.rc | 1 - programs/winecfg/Tr.rc | 1 - programs/winecfg/x11drvdlg.c | 16 ---------------- 17 files changed, 0 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ff86bcfb7f416f0d67c6…

1 0

Roderick Colenbrander : winex11.drv: Remove desktop double buffering option .
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 1b3fec96993e034260f52f78aecf9fe29c4390dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3fec96993e034260f52f78a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Jan 1 17:56:44 2007 +0100 winex11.drv: Remove desktop double buffering option. --- dlls/winex11.drv/x11drv_main.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index a06f7ea..f6d241a 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -89,8 +89,6 @@ int alloc_system_colors = 256; DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; int xrender_error_base = 0; -static BOOL desktop_dbl_buf = TRUE; - static x11drv_error_callback err_callback; /* current callback for error */ static Display *err_callback_display; /* display callback is set for */ static void *err_callback_arg; /* error callback argument */ @@ -351,9 +349,6 @@ static void setup_options(void) if (!get_config_key( hkey, appkey, "ClientSideAntiAliasWithRender", buffer, sizeof(buffer) )) client_side_antialias_with_render = IS_OPTION_TRUE( buffer[0] ); - if (!get_config_key( hkey, appkey, "DesktopDoubleBuffered", buffer, sizeof(buffer) )) - desktop_dbl_buf = IS_OPTION_TRUE( buffer[0] ); - if (!get_config_key( hkey, appkey, "UseXIM", buffer, sizeof(buffer) )) use_xim = IS_OPTION_TRUE( buffer[0] ); @@ -419,7 +414,7 @@ static BOOL process_attach(void) if (!screen_depth) screen_depth = DefaultDepthOfScreen( screen ); /* If OpenGL is available, change the default visual, etc as necessary */ - if (desktop_dbl_buf && (desktop_vi = X11DRV_setup_opengl_visual( display ))) + if ((desktop_vi = X11DRV_setup_opengl_visual( display ))) { visual = desktop_vi->visual; screen = ScreenOfDisplay(display, desktop_vi->screen);

1 0

Reinhard Karcher : ntdll: Fix NtQueryDirectoryFile handling of short names on vfat filesystems.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: a736ac3f3e00a2355e634de1418df4da485aa015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a736ac3f3e00a2355e634de14… Author: Reinhard Karcher <rkarcher(a)frey.de> Date: Sat Dec 30 09:36:06 2006 +0100 ntdll: Fix NtQueryDirectoryFile handling of short names on vfat filesystems. --- dlls/ntdll/directory.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 3786b91..c0933bc 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1513,13 +1513,13 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HA if ((cwd = open(".", O_RDONLY)) != -1 && fchdir( fd ) != -1) { - if (mask && !mempbrkW( mask->Buffer, wszWildcards, mask->Length / sizeof(WCHAR) ) && - read_directory_stat( fd, io, buffer, length, single_entry, mask, restart_scan ) != -1) - goto done; #ifdef VFAT_IOCTL_READDIR_BOTH if ((read_directory_vfat( fd, io, buffer, length, single_entry, mask, restart_scan )) != -1) goto done; #endif + if (mask && !mempbrkW( mask->Buffer, wszWildcards, mask->Length / sizeof(WCHAR) ) && + read_directory_stat( fd, io, buffer, length, single_entry, mask, restart_scan ) != -1) + goto done; #ifdef USE_GETDENTS if ((read_directory_getdents( fd, io, buffer, length, single_entry, mask, restart_scan )) != -1) goto done;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2007