June 2015 - Wine-Commits - list.winehq.org

Ken Thomases : Revert "ntdll: Avoid one of the calls to getattrlist() when read_directory_getattrlist() checks the case sensitivity of the file system.".
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: e7fa76637858bffb2970606463008c8f6e62ce39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fa76637858bffb297060646… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 11 16:04:04 2015 -0500 Revert "ntdll: Avoid one of the calls to getattrlist() when read_directory_getattrlist() checks the case sensitivity of the file system.". This was wrong-headed and could never have worked. The second getattrlist() call that I was trying to avoid was only necessary when the first fails. Given that the first failed, its results can't be used to avoid the second, no matter what information we requested. This reverts commit 5514df9d4e4c14cafcc4284e12d26ad6c74709fe. --- dlls/ntdll/directory.c | 62 ++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 40 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index cd9fdb0..8e4db83 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -983,35 +983,43 @@ static void add_fs_cache( dev_t dev, fsid_t fsid, BOOLEAN case_sensitive ) } /*********************************************************************** - * get_dir_case_sensitivity_attr_by_id + * get_dir_case_sensitivity_attr * - * Checks if the volume with the specified device and file system IDs - * is case sensitive or not. Uses getattrlist(2). + * Checks if the volume containing the specified directory is case + * sensitive or not. Uses getattrlist(2). */ -static int get_dir_case_sensitivity_attr_by_id( dev_t dev, fsid_t fsid ) +static int get_dir_case_sensitivity_attr( const char *dir ) { char *mntpoint = NULL; struct attrlist attr; struct vol_caps caps; + struct get_fsid get_fsid; struct fs_cache *entry; + /* First get the FS ID of the volume */ + attr.bitmapcount = ATTR_BIT_MAP_COUNT; + attr.reserved = 0; + attr.commonattr = ATTR_CMN_DEVID|ATTR_CMN_FSID; + attr.volattr = attr.dirattr = attr.fileattr = attr.forkattr = 0; + get_fsid.size = 0; + if (getattrlist( dir, &attr, &get_fsid, sizeof(get_fsid), 0 ) != 0 || + get_fsid.size != sizeof(get_fsid)) + return -1; /* Try to look it up in the cache */ - entry = look_up_fs_cache( dev ); - if (entry && !memcmp( &entry->fsid, &fsid, sizeof(fsid_t) )) + entry = look_up_fs_cache( get_fsid.dev ); + if (entry && !memcmp( &entry->fsid, &get_fsid.fsid, sizeof(fsid_t) )) /* Cache lookup succeeded */ return entry->case_sensitive; /* Cache is stale at this point, we have to update it */ - mntpoint = get_device_mount_point( dev ); + mntpoint = get_device_mount_point( get_fsid.dev ); /* Now look up the case-sensitivity */ - attr.bitmapcount = ATTR_BIT_MAP_COUNT; - attr.reserved = attr.commonattr = 0; + attr.commonattr = 0; attr.volattr = ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES; - attr.dirattr = attr.fileattr = attr.forkattr = 0; if (getattrlist( mntpoint, &attr, &caps, sizeof(caps), 0 ) < 0) { RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); - add_fs_cache( dev, fsid, TRUE ); + add_fs_cache( get_fsid.dev, get_fsid.fsid, TRUE ); return TRUE; } RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); @@ -1028,34 +1036,11 @@ static int get_dir_case_sensitivity_attr_by_id( dev_t dev, fsid_t fsid ) else ret = TRUE; /* Update the cache */ - add_fs_cache( dev, fsid, ret ); + add_fs_cache( get_fsid.dev, get_fsid.fsid, ret ); return ret; } return FALSE; } - -/*********************************************************************** - * get_dir_case_sensitivity_attr - * - * Checks if the volume containing the specified directory is case - * sensitive or not. Uses getattrlist(2). - */ -static int get_dir_case_sensitivity_attr( const char *dir ) -{ - struct attrlist attr; - struct get_fsid get_fsid; - - /* First get the FS ID of the volume */ - attr.bitmapcount = ATTR_BIT_MAP_COUNT; - attr.reserved = 0; - attr.commonattr = ATTR_CMN_DEVID|ATTR_CMN_FSID; - attr.volattr = attr.dirattr = attr.fileattr = attr.forkattr = 0; - get_fsid.size = 0; - if (getattrlist( dir, &attr, &get_fsid, sizeof(get_fsid), 0 ) != 0 || - get_fsid.size != sizeof(get_fsid)) - return -1; - return get_dir_case_sensitivity_attr_by_id( get_fsid.dev, get_fsid.fsid ); -} #endif /*********************************************************************** @@ -2163,8 +2148,6 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer { u_int32_t length; struct attrreference name_reference; - dev_t devid; - fsid_t fsid; fsobj_type_t type; char name[NAME_MAX * 3 + 1]; } attrlist_buffer; @@ -2196,7 +2179,7 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer memset( &attrlist, 0, sizeof(attrlist) ); attrlist.bitmapcount = ATTR_BIT_MAP_COUNT; - attrlist.commonattr = ATTR_CMN_NAME | ATTR_CMN_DEVID | ATTR_CMN_FSID | ATTR_CMN_OBJTYPE; + attrlist.commonattr = ATTR_CMN_NAME | ATTR_CMN_OBJTYPE; ret = getattrlist( unix_name, &attrlist, &attrlist_buffer, sizeof(attrlist_buffer), FSOPT_NOFOLLOW ); /* If unix_name named a symlink, the above may have succeeded even if the symlink is broken. Check that with another call without FSOPT_NOFOLLOW. We don't ask for any attributes. */ @@ -2216,8 +2199,7 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer } else io->u.Status = STATUS_NO_MORE_FILES; } - else if ((errno == ENOENT || errno == ENOTDIR) && - !get_dir_case_sensitivity_attr_by_id( attrlist_buffer.devid, attrlist_buffer.fsid )) + else if ((errno == ENOENT || errno == ENOTDIR) && !get_dir_case_sensitivity(".")) { io->u.Status = STATUS_NO_MORE_FILES; ret = 0;

1 0

Ken Thomases : winecoreaudio: Fix build by importing advapi32.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: f634faaae30546742d05a3587d41a11d18132ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f634faaae30546742d05a3587… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 11 16:03:43 2015 -0500 winecoreaudio: Fix build by importing advapi32. This was missed in commit 3494fb7f72e994c6f309e525ea3d01edf9efae1a. --- dlls/winecoreaudio.drv/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index 532af48..25c6db2 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = winecoreaudio.drv -IMPORTS = uuid ole32 user32 +IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(COREAUDIO_LIBS)

1 0

Mark Harmstone : winecfg: Invalidate property sheet when font changed.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: 3b9ac1b18a25ea80121cbf16e98a515f844fa6f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9ac1b18a25ea80121cbf16e… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Jun 11 18:17:26 2015 +0100 winecfg: Invalidate property sheet when font changed. When you changed the font on the Desktop Integration tab, it wasn't enabling the Apply button. --- programs/winecfg/theme.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 8ffc9bb..8bc3c88 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1166,7 +1166,8 @@ static void on_select_font(HWND hDlg) cf.lpLogFont = &(metrics[index].lf); cf.Flags = CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT | CF_NOSCRIPTSEL | CF_NOVERTFONTS; - ChooseFontW(&cf); + if (ChooseFontW(&cf)) + SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); } INT_PTR CALLBACK

1 0

Piotr Caban : msvcr: Add _getch_nolock implementation.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: 3bd60974a9d6e7d16ae278824a40d1b5b58fcb5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd60974a9d6e7d16ae278824… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 11 17:54:13 2015 +0200 msvcr: Add _getch_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/console.c | 19 +++++++++++++++---- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9b47401..6e404f2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -890,7 +890,7 @@ @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() -@ stub _getch_nolock +@ cdecl _getch_nolock() @ cdecl _getche() @ stub _getche_nolock @ cdecl _getcwd(str long) MSVCRT__getcwd diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 66ec34c..28de3ab 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1238,7 +1238,7 @@ @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() -@ stub _getch_nolock +@ cdecl _getch_nolock() @ cdecl _getche() @ stub _getche_nolock @ cdecl _getcwd(str long) MSVCRT__getcwd diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2a3a813..c8ba7f7 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1236,7 +1236,7 @@ @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() -@ stub _getch_nolock +@ cdecl _getch_nolock() @ cdecl _getche() @ stub _getche_nolock @ cdecl _getcwd(str long) MSVCRT__getcwd diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e3de8ac..1570805 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -564,7 +564,7 @@ @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() -@ stub _getch_nolock +@ cdecl _getch_nolock() @ cdecl _getche() @ stub _getche_nolock @ cdecl _getcwd(str long) MSVCRT__getcwd diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2de0526..cab5922 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -541,7 +541,7 @@ @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch() -@ stub _getch_nolock +@ cdecl _getch_nolock() @ cdecl _getche() @ stub _getche_nolock @ cdecl _getcwd(str long) MSVCRT__getcwd diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 27c0ac2..82e8fb2 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -113,13 +113,12 @@ static const struct {unsigned vk; unsigned ch[4][2];} enh_map[] = { }; /********************************************************************* - * _getch (MSVCRT.@) + * _getch_nolock (MSVCR80.@) */ -int CDECL _getch(void) +int CDECL _getch_nolock(void) { int retval = MSVCRT_EOF; - LOCK_CONSOLE; if (__MSVCRT_console_buffer != MSVCRT_EOF) { retval = __MSVCRT_console_buffer; @@ -179,11 +178,23 @@ int CDECL _getch(void) if (mode) SetConsoleMode(MSVCRT_console_in, mode); } - UNLOCK_CONSOLE; return retval; } /********************************************************************* + * _getch (MSVCRT.@) + */ +int CDECL _getch(void) +{ + int ret; + + LOCK_CONSOLE; + ret = _getch_nolock(); + UNLOCK_CONSOLE; + return ret; +} + +/********************************************************************* * _putch (MSVCRT.@) */ int CDECL _putch(int c)

1 0

Marcus Meissner : msi: Free rec in error exit (Coverity).
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: d0cb2519b666fda68515f65662d72b39f6a1f455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0cb2519b666fda68515f6566… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jun 11 16:57:34 2015 +0200 msi: Free rec in error exit (Coverity). --- dlls/msi/patch.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index 5456359..f8f3eaf 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -710,7 +710,10 @@ static UINT patch_add_media( MSIPACKAGE *package, IStorage *storage, MSIPATCHINF msiobj_release( &rec->hdr ); continue; } - if (!(media = msi_alloc( sizeof( *media )))) goto done; + if (!(media = msi_alloc( sizeof( *media )))) { + msiobj_release( &rec->hdr ); + goto done; + } media->disk_id = disk_id; media->last_sequence = MSI_RecordGetInteger( rec, 2 ); media->prompt = msi_dup_record_field( rec, 3 );

1 0

Piotr Caban : msvcr: Add _getche_nolock implementation.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: 57754bdb296b05a6e081c3e6727cef55a4f7fe68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57754bdb296b05a6e081c3e67… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 11 17:54:39 2015 +0200 msvcr: Add _getche_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/console.c | 23 +++++++++++++++++------ 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 49b9232..002ed36 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -892,7 +892,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ stub _getdcwd_nolock diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 80e46e0..7b06c5f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1240,7 +1240,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ cdecl _getdiskfree(long ptr) MSVCRT__getdiskfree diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dba6752..64eb2f5 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1238,7 +1238,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ cdecl _getdiskfree(long ptr) MSVCRT__getdiskfree diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c45f447..0bef364 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -566,7 +566,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ stub _getdcwd_nolock diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6948d02..fafed02 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -543,7 +543,7 @@ @ cdecl _getch() @ cdecl _getch_nolock() @ cdecl _getche() -@ stub _getche_nolock +@ cdecl _getche_nolock() @ cdecl _getcwd(str long) MSVCRT__getcwd @ cdecl _getdcwd(long str long) MSVCRT__getdcwd @ stub _getdcwd_nolock diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 8801fc0..ed8b728 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -217,20 +217,31 @@ int CDECL _putch(int c) } /********************************************************************* - * _getche (MSVCRT.@) + * _getche_nolock (MSVCR80.@) */ -int CDECL _getche(void) +int CDECL _getche_nolock(void) { int retval; - LOCK_CONSOLE; - retval = _getch(); + retval = _getch_nolock(); if (retval != MSVCRT_EOF) - retval = _putch(retval); - UNLOCK_CONSOLE; + retval = _putch_nolock(retval); return retval; } /********************************************************************* + * _getche (MSVCRT.@) + */ +int CDECL _getche(void) +{ + int ret; + + LOCK_CONSOLE; + ret = _getche_nolock(); + UNLOCK_CONSOLE; + return ret; +} + +/********************************************************************* * _cgets (MSVCRT.@) */ char* CDECL _cgets(char* str)

1 0

Piotr Caban : msvcr: Add _putch_nolock implementation.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: 0a600ccde8473465c47bf1c4d67da5d0a98dfb69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a600ccde8473465c47bf1c4d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 11 17:54:28 2015 +0200 msvcr: Add _putch_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/console.c | 22 +++++++++++++++------- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6e404f2..49b9232 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1234,7 +1234,7 @@ @ cdecl _purecall() @ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) -@ stub _putch_nolock +@ cdecl _putch_nolock(long) @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 28de3ab..80e46e0 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1592,7 +1592,7 @@ @ cdecl _purecall() @ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) -@ stub _putch_nolock +@ cdecl _putch_nolock(long) @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c8ba7f7..dba6752 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1600,7 +1600,7 @@ @ cdecl _purecall() @ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) -@ stub _putch_nolock +@ cdecl _putch_nolock(long) @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1570805..c45f447 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -909,7 +909,7 @@ @ cdecl _purecall() @ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) -@ stub _putch_nolock +@ cdecl _putch_nolock(long) @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index cab5922..6948d02 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -884,7 +884,7 @@ @ cdecl _purecall() @ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock @ cdecl _putch(long) -@ stub _putch_nolock +@ cdecl _putch_nolock(long) @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 82e8fb2..8801fc0 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -195,17 +195,25 @@ int CDECL _getch(void) } /********************************************************************* - * _putch (MSVCRT.@) + * _putch_nolock (MSVCR80.@) */ -int CDECL _putch(int c) +int CDECL _putch_nolock(int c) { - int retval = MSVCRT_EOF; DWORD count; - LOCK_CONSOLE; if (WriteConsoleA(MSVCRT_console_out, &c, 1, &count, NULL) && count == 1) - retval = c; - UNLOCK_CONSOLE; - return retval; + return c; + return MSVCRT_EOF; +} + +/********************************************************************* + * _putch (MSVCRT.@) + */ +int CDECL _putch(int c) +{ + LOCK_CONSOLE; + c = _putch_nolock(c); + UNLOCK_CONSOLE; + return c; } /*********************************************************************

1 0

Jacek Caban : gdiplus: Added version 1.1 manifest.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 39797dcfb250c4b4497fa003ae67b873427daa37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39797dcfb250c4b4497fa003a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 11 12:49:35 2015 +0200 gdiplus: Added version 1.1 manifest. --- dlls/gdiplus/gdiplus.rc | 3 +++ dlls/gdiplus/gdiplus11.manifest | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/dlls/gdiplus/gdiplus.rc b/dlls/gdiplus/gdiplus.rc index 56f6c22..5c7e2cf 100644 --- a/dlls/gdiplus/gdiplus.rc +++ b/dlls/gdiplus/gdiplus.rc @@ -20,3 +20,6 @@ /* @makedep: gdiplus.manifest */ WINE_MANIFEST 24 gdiplus.manifest + +/* @makedep: gdiplus11.manifest */ +WINE_MANIFEST11 24 gdiplus11.manifest diff --git a/dlls/gdiplus/gdiplus11.manifest b/dlls/gdiplus/gdiplus11.manifest new file mode 100644 index 0000000..c39804b --- /dev/null +++ b/dlls/gdiplus/gdiplus11.manifest @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.7601.23038" processorArchitecture="" publicKeyToken="6595b64144ccf1df"/> + <file name="gdiplus.dll"/> +</assembly>

1 0

Jacek Caban : setupapi: Allow more than one Wine manifest in a DLL.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 00f1b7534b6a4039244a8cc4ad9a9763c226947b URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f1b7534b6a4039244a8cc4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 11 12:49:27 2015 +0200 setupapi: Allow more than one Wine manifest in a DLL. --- dlls/setupapi/fakedll.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index fdd9bea..d521b0a 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -701,8 +701,13 @@ static BOOL create_manifest( const xmlstr_t *arch, const xmlstr_t *name, const x return ret; } -static void register_manifest( const WCHAR *dll_name, const char *manifest, DWORD len, - const void *dll_data, size_t dll_size ) +struct dll_data { + const WCHAR *name; + const void *data; + SIZE_T size; +}; + +static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR *res_name, LONG_PTR arg ) { #ifdef __i386__ static const char current_arch[] = "x86"; @@ -711,10 +716,22 @@ static void register_manifest( const WCHAR *dll_name, const char *manifest, DWOR #else static const char current_arch[] = "none"; #endif + static const WCHAR manifestW[] = {'W','I','N','E','_','M','A','N','I','F','E','S','T'}; + const struct dll_data *dll_data = (const struct dll_data*)arg; xmlbuf_t buffer; xmlstr_t elem, attr_name, attr_value; xmlstr_t name, version, arch, key, lang; BOOL end = FALSE, error; + const char *manifest; + SIZE_T len; + HRSRC rsrc; + + if (IS_INTRESOURCE(res_name) || strncmpW( res_name, manifestW, sizeof(manifestW)/sizeof(WCHAR) )) + return TRUE; + + rsrc = FindResourceW( module, res_name, type ); + manifest = LoadResource( module, rsrc ); + len = SizeofResource( module, rsrc ); buffer.ptr = manifest; buffer.end = manifest + len; @@ -747,17 +764,19 @@ static void register_manifest( const WCHAR *dll_name, const char *manifest, DWOR memcpy( new_buffer + strlen(new_buffer), arch.ptr, len - (arch.ptr - manifest) ); arch.ptr = current_arch; arch.len = strlen( current_arch ); - if (create_winsxs_dll( dll_name, &arch, &name, &key, &version, &lang, dll_data, dll_size )) + if (create_winsxs_dll( dll_data->name, &arch, &name, &key, &version, &lang, dll_data->data, dll_data->size )) create_manifest( &arch, &name, &key, &version, &lang, new_buffer, len + arch.len ); HeapFree( GetProcessHeap(), 0, new_buffer ); } else { - if (create_winsxs_dll( dll_name, &arch, &name, &key, &version, &lang, dll_data, dll_size )) + if (create_winsxs_dll( dll_data->name, &arch, &name, &key, &version, &lang, dll_data->data, dll_data->size )) create_manifest( &arch, &name, &key, &version, &lang, manifest, len ); } } } + + return TRUE; } static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR name, LONG_PTR arg ) @@ -783,18 +802,13 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size static const WCHAR atlW[] = {'a','t','l','1','0','0','.','d','l','l',0}; static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; - static const WCHAR manifestW[] = {'W','I','N','E','_','M','A','N','I','F','E','S','T',0}; const IMAGE_RESOURCE_DIRECTORY *resdir; LDR_RESOURCE_INFO info; HRESULT hr = S_OK; HMODULE module = (HMODULE)((ULONG_PTR)data | 1); - HRSRC rsrc; + struct dll_data dll_data = { name, data, size }; - if ((rsrc = FindResourceW( module, manifestW, (LPWSTR)RT_MANIFEST ))) - { - char *manifest = LoadResource( module, rsrc ); - register_manifest( name, manifest, SizeofResource( module, rsrc ), data, size ); - } + EnumResourceNamesW( module, (WCHAR*)RT_MANIFEST, register_manifest, (LONG_PTR)&dll_data ); info.Type = (ULONG_PTR)regtypeW; if (LdrFindResourceDirectory_U( module, &info, 1, &resdir )) return;

1 0

Michael Müller : d3d8: Mark one more function as hotpatchable.
by Alexandre Julliard June 11, 2015

June 11, 2015

Module: wine Branch: master Commit: 002446b1e7ecd9fcaaef807fea94bbae16179a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=002446b1e7ecd9fcaaef807fe… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Feb 28 21:24:54 2015 +0100 d3d8: Mark one more function as hotpatchable. --- dlls/d3d8/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 067a3e0..44fc02a 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -86,7 +86,7 @@ static ULONG WINAPI d3d8_swapchain_Release(IDirect3DSwapChain8 *iface) return ref; } -static HRESULT WINAPI d3d8_swapchain_Present(IDirect3DSwapChain8 *iface, +static HRESULT WINAPI DECLSPEC_HOTPATCH d3d8_swapchain_Present(IDirect3DSwapChain8 *iface, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region) {

1 0