wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Ken Thomases : winecoreaudio: Fix build by importing advapi32.
by Alexandre Julliard 12 Jun '15

12 Jun '15

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 12 Jun '15

12 Jun '15

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 _ungetch_nolock implementation.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 853d4343dba89b8df47d4f21f2170b52fcea1fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=853d4343dba89b8df47d4f21f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 11 17:54:44 2015 +0200 msvcr: Add _ungetch_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 | 17 +++++++++++++---- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 002ed36..194554b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1410,7 +1410,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7b06c5f..9114632 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1768,7 +1768,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 64eb2f5..9537d79 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1782,7 +1782,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0bef364..00f7ab2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1090,7 +1090,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fafed02..9384a3f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1065,7 +1065,7 @@ @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @ cdecl _ungetch(long) -@ stub _ungetch_nolock +@ cdecl _ungetch_nolock(long) @ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock @ stub _ungetwch @ stub _ungetwch_nolock diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index ed8b728..0acaa03 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -280,19 +280,28 @@ char* CDECL _cgets(char* str) } /********************************************************************* - * _ungetch (MSVCRT.@) + * _ungetch_nolock (MSVCRT.@) */ -int CDECL _ungetch(int c) +int CDECL _ungetch_nolock(int c) { int retval = MSVCRT_EOF; - LOCK_CONSOLE; if (c != MSVCRT_EOF && __MSVCRT_console_buffer == MSVCRT_EOF) retval = __MSVCRT_console_buffer = c; - UNLOCK_CONSOLE; return retval; } /********************************************************************* + * _ungetch (MSVCRT.@) + */ +int CDECL _ungetch(int c) +{ + LOCK_CONSOLE; + c = _ungetch_nolock(c); + UNLOCK_CONSOLE; + return c; +} + +/********************************************************************* * _kbhit (MSVCRT.@) */ int CDECL _kbhit(void)

1 0

Piotr Caban : msvcr: Add _getche_nolock implementation.
by Alexandre Julliard 12 Jun '15

12 Jun '15

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 12 Jun '15

12 Jun '15

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

Piotr Caban : msvcr: Add _getch_nolock implementation.
by Alexandre Julliard 12 Jun '15

12 Jun '15

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 12 Jun '15

12 Jun '15

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

Jacek Caban : gdiplus: Added version 1.1 manifest.
by Alexandre Julliard 11 Jun '15

11 Jun '15

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 11 Jun '15

11 Jun '15

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

Huw Davies : shell32/tests: Fix failing test on Win 2k.
by Alexandre Julliard 11 Jun '15

11 Jun '15

Module: wine Branch: master Commit: 905e7aad0e759371a4013c7ac65fa337ecfa17a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905e7aad0e759371a4013c7ac… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 11 11:18:55 2015 +0100 shell32/tests: Fix failing test on Win 2k. --- dlls/shell32/tests/shlview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index cab0630..6525dd2 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -661,7 +661,7 @@ if (0) hwnd_view = NULL; hr = IShellView_CreateViewWindow(view, NULL, &settings, &test_shellbrowser, &r, &hwnd_view); - ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(hr == S_OK || broken(hr == S_FALSE), "got (0x%08x)\n", hr); ok(hwnd_view != 0, "got %p\n", hwnd_view); hwnd2 = (HWND)0xdeadbeef;

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
61
Older →

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 June 2015