wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Huw Davies : riched20: Add support for the \shppict destination.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 2d23a95c96e709b19bd51faa2a8516694278e544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d23a95c96e709b19bd51faa2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 12:49:56 2015 +0000 riched20: Add support for the \shppict destination. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 30 ++++++++++++++++++++++++++++++ dlls/riched20/reader.c | 2 ++ dlls/riched20/rtf.h | 4 +++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 31d134f..98c7414 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1236,6 +1236,35 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm return ret; } +static void ME_RTFReadShpPictGroup( RTF_Info *info ) +{ + int level = 1; + + for (;;) + { + RTFGetToken (info); + + if (info->rtfClass == rtfEOF) return; + if (RTFCheckCM( info, rtfGroup, rtfEndGroup )) + { + if (--level == 0) break; + } + else if (RTFCheckCM( info, rtfGroup, rtfBeginGroup )) + { + level++; + } + else + { + RTFRouteToken( info ); + if (RTFCheckCM( info, rtfGroup, rtfEndGroup )) + level--; + } + } + + RTFRouteToken( info ); /* feed "}" back to router */ + return; +} + static DWORD read_hex_data( RTF_Info *info, BYTE **out ) { DWORD read = 0, size = 1024; @@ -1579,6 +1608,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre WriterInit(&parser); RTFInit(&parser); RTFSetReadHook(&parser, ME_RTFReadHook); + RTFSetDestinationCallback(&parser, rtfShpPict, ME_RTFReadShpPictGroup); RTFSetDestinationCallback(&parser, rtfPict, ME_RTFReadPictGroup); RTFSetDestinationCallback(&parser, rtfObject, ME_RTFReadObjectGroup); if (!parser.editor->bEmulateVersion10) /* v4.1 */ diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index e5202aa..0972911 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -1808,6 +1808,8 @@ static RTFKey rtfKey[] = { rtfDestination, rtfNeXTGraphic, "NeXTGraphic", 0 }, { rtfDestination, rtfNestTableProps, "nesttableprops", 0 }, { rtfDestination, rtfNoNestTables, "nonesttables", 0 }, + { rtfDestination, rtfShpPict, "shppict", 0 }, + { rtfDestination, rtfNonShpPict, "nonshppict", 0 }, /* * Font families diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 064ba60..335d098 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -184,7 +184,9 @@ # define rtfGenerator 74 # define rtfNestTableProps 75 # define rtfNoNestTables 76 -# define rtfMaxDestination 77 /* highest dest + 1 */ +# define rtfShpPict 77 +# define rtfNonShpPict 78 +# define rtfMaxDestination 79 /* highest dest + 1 */ # define rtfFontFamily 4 # define rtfFFNil 0

1 0

Huw Davies : riched20: Rewrite the picture destination parser to handle embedded groups.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: cfc891420096c8e999ee5b955d57b20742b768c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfc891420096c8e999ee5b955… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 12:49:55 2015 +0000 riched20: Rewrite the picture destination parser to handle embedded groups. Since almost every line of ME_RTFReadPictGroup() changed, I took the opportunity to re-format it. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 265 +++++++++++++++++++++++++++---------------------- 1 file changed, 145 insertions(+), 120 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index ae4a3ab..31d134f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1236,136 +1236,161 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm return ret; } -static void ME_RTFReadPictGroup(RTF_Info *info) +static DWORD read_hex_data( RTF_Info *info, BYTE **out ) { - SIZEL sz; - BYTE* buffer = NULL; - unsigned bufsz, bufidx; - BOOL flip; - BYTE val; - METAFILEPICT mfp; - HENHMETAFILE hemf; - HBITMAP hbmp; - enum gfxkind {gfx_unknown = 0, gfx_enhmetafile, gfx_metafile, gfx_dib} gfx = gfx_unknown; - - RTFGetToken (info); - if (info->rtfClass == rtfEOF) - return; - mfp.mm = MM_TEXT; - /* fetch picture type */ - if (RTFCheckMM (info, rtfPictAttr, rtfWinMetafile)) - { - mfp.mm = info->rtfParam; - gfx = gfx_metafile; - } - else if (RTFCheckMM (info, rtfPictAttr, rtfDevIndBitmap)) - { - if (info->rtfParam != 0) FIXME("dibitmap should be 0 (%d)\n", info->rtfParam); - gfx = gfx_dib; - } - else if (RTFCheckMM (info, rtfPictAttr, rtfEmfBlip)) - { - gfx = gfx_enhmetafile; - } - else - { - FIXME("%d %d\n", info->rtfMajor, info->rtfMinor); - goto skip_group; - } - sz.cx = sz.cy = 0; - /* fetch picture attributes */ - for (;;) - { - RTFGetToken (info); - if (info->rtfClass == rtfEOF) - return; - if (info->rtfClass == rtfText) - break; - if (!RTFCheckCM (info, rtfControl, rtfPictAttr)) - { - ERR("Expected picture attribute (%d %d)\n", - info->rtfClass, info->rtfMajor); - goto skip_group; - } - else if (RTFCheckMM (info, rtfPictAttr, rtfPicWid)) - { - if (gfx == gfx_metafile) mfp.xExt = info->rtfParam; - } - else if (RTFCheckMM (info, rtfPictAttr, rtfPicHt)) + DWORD read = 0, size = 1024; + BYTE *buf = HeapAlloc( GetProcessHeap(), 0, size ); + BYTE val; + BOOL flip; + + *out = NULL; + if (!buf) return 0; + + if (info->rtfClass != rtfText) { - if (gfx == gfx_metafile) mfp.yExt = info->rtfParam; + ERR("Called with incorrect token\n"); + return 0; } - else if (RTFCheckMM (info, rtfPictAttr, rtfPicGoalWid)) - sz.cx = info->rtfParam; - else if (RTFCheckMM (info, rtfPictAttr, rtfPicGoalHt)) - sz.cy = info->rtfParam; - else - FIXME("Non supported attribute: %d %d %d\n", info->rtfClass, info->rtfMajor, info->rtfMinor); - } - /* fetch picture data */ - bufsz = 1024; - bufidx = 0; - buffer = HeapAlloc(GetProcessHeap(), 0, bufsz); - val = info->rtfMajor; - for (flip = TRUE;; flip = !flip) - { - RTFGetToken (info); - if (info->rtfClass == rtfEOF) + + val = info->rtfMajor; + for (flip = TRUE;; flip = !flip) { - HeapFree(GetProcessHeap(), 0, buffer); - return; /* Warn ?? */ + RTFGetToken( info ); + if (info->rtfClass == rtfEOF) + { + HeapFree( GetProcessHeap(), 0, buf ); + return 0; + } + if (info->rtfClass != rtfText) break; + if (flip) + { + if (read >= size) + { + size *= 2; + buf = HeapReAlloc( GetProcessHeap(), 0, buf, size ); + if (!buf) return 0; + } + buf[read++] = RTFCharToHex(val) * 16 + RTFCharToHex(info->rtfMajor); + } + else + val = info->rtfMajor; } - if (RTFCheckCM(info, rtfGroup, rtfEndGroup)) - break; - if (info->rtfClass != rtfText) goto skip_group; - if (flip) + if (flip) FIXME("wrong hex string\n"); + + *out = buf; + return read; +} + +static void ME_RTFReadPictGroup(RTF_Info *info) +{ + SIZEL sz; + BYTE *buffer = NULL; + DWORD size = 0; + METAFILEPICT mfp; + HENHMETAFILE hemf; + HBITMAP hbmp; + enum gfxkind {gfx_unknown = 0, gfx_enhmetafile, gfx_metafile, gfx_dib} gfx = gfx_unknown; + int level = 1; + + mfp.mm = MM_TEXT; + sz.cx = sz.cy = 0; + + for (;;) { - if (bufidx >= bufsz && - !(buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, bufsz += 1024))) - goto skip_group; - buffer[bufidx++] = RTFCharToHex(val) * 16 + RTFCharToHex(info->rtfMajor); + RTFGetToken( info ); + + if (info->rtfClass == rtfText) + { + if (level == 1) + { + if (!buffer) + size = read_hex_data( info, &buffer ); + } + else + { + RTFSkipGroup( info ); + } + } /* We potentially have a new token so fall through. */ + + if (info->rtfClass == rtfEOF) return; + + if (RTFCheckCM( info, rtfGroup, rtfEndGroup )) + { + if (--level == 0) break; + continue; + } + if (RTFCheckCM( info, rtfGroup, rtfBeginGroup )) + { + level++; + continue; + } + if (!RTFCheckCM( info, rtfControl, rtfPictAttr )) + { + RTFRouteToken( info ); + if (RTFCheckCM( info, rtfGroup, rtfEndGroup )) + level--; + continue; + } + + if (RTFCheckMM( info, rtfPictAttr, rtfWinMetafile )) + { + mfp.mm = info->rtfParam; + gfx = gfx_metafile; + } + else if (RTFCheckMM( info, rtfPictAttr, rtfDevIndBitmap )) + { + if (info->rtfParam != 0) FIXME("dibitmap should be 0 (%d)\n", info->rtfParam); + gfx = gfx_dib; + } + else if (RTFCheckMM( info, rtfPictAttr, rtfEmfBlip )) + gfx = gfx_enhmetafile; + else if (RTFCheckMM( info, rtfPictAttr, rtfPicWid )) + mfp.xExt = info->rtfParam; + else if (RTFCheckMM( info, rtfPictAttr, rtfPicHt )) + mfp.yExt = info->rtfParam; + else if (RTFCheckMM( info, rtfPictAttr, rtfPicGoalWid )) + sz.cx = info->rtfParam; + else if (RTFCheckMM( info, rtfPictAttr, rtfPicGoalHt )) + sz.cy = info->rtfParam; + else + FIXME("Non supported attribute: %d %d %d\n", info->rtfClass, info->rtfMajor, info->rtfMinor); } - else - val = info->rtfMajor; - } - if (flip) FIXME("wrong hex string\n"); - switch (gfx) - { - case gfx_enhmetafile: - if ((hemf = SetEnhMetaFileBits(bufidx, buffer))) - ME_RTFInsertOleObject(info, hemf, NULL, &sz); - break; - case gfx_metafile: - if ((hemf = SetWinMetaFileBits(bufidx, buffer, NULL, &mfp))) - ME_RTFInsertOleObject(info, hemf, NULL, &sz); - break; - case gfx_dib: + if (buffer) { - BITMAPINFO* bi = (BITMAPINFO*)buffer; - HDC hdc = GetDC(0); - unsigned nc = bi->bmiHeader.biClrUsed; - - /* not quite right, especially for bitfields type of compression */ - if (!nc && bi->bmiHeader.biBitCount <= 8) - nc = 1 << bi->bmiHeader.biBitCount; - if ((hbmp = CreateDIBitmap(hdc, &bi->bmiHeader, - CBM_INIT, (char*)(bi + 1) + nc * sizeof(RGBQUAD), - bi, DIB_RGB_COLORS))) - ME_RTFInsertOleObject(info, NULL, hbmp, &sz); - ReleaseDC(0, hdc); + switch (gfx) + { + case gfx_enhmetafile: + if ((hemf = SetEnhMetaFileBits( size, buffer ))) + ME_RTFInsertOleObject( info, hemf, NULL, &sz ); + break; + case gfx_metafile: + if ((hemf = SetWinMetaFileBits( size, buffer, NULL, &mfp ))) + ME_RTFInsertOleObject( info, hemf, NULL, &sz ); + break; + case gfx_dib: + { + BITMAPINFO *bi = (BITMAPINFO*)buffer; + HDC hdc = GetDC(0); + unsigned nc = bi->bmiHeader.biClrUsed; + + /* not quite right, especially for bitfields type of compression */ + if (!nc && bi->bmiHeader.biBitCount <= 8) + nc = 1 << bi->bmiHeader.biBitCount; + if ((hbmp = CreateDIBitmap( hdc, &bi->bmiHeader, + CBM_INIT, (char*)(bi + 1) + nc * sizeof(RGBQUAD), + bi, DIB_RGB_COLORS)) ) + ME_RTFInsertOleObject( info, NULL, hbmp, &sz ); + ReleaseDC( 0, hdc ); + break; + } + default: + break; + } } - break; - default: - break; - } - HeapFree(GetProcessHeap(), 0, buffer); - RTFRouteToken (info); /* feed "}" back to router */ - return; -skip_group: - HeapFree(GetProcessHeap(), 0, buffer); - RTFSkipGroup(info); - RTFRouteToken(info); /* feed "}" back to router */ + HeapFree( GetProcessHeap(), 0, buffer ); + RTFRouteToken( info ); /* feed "}" back to router */ + return; } /* for now, lookup the \result part and use it, whatever the object */

1 0

Michael Stefaniuc : rsaenh/tests: Mark an old behavior as broken ( PVS-Studio).
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 899207b6c9ac8193467de068a98b6aba5ecefdd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=899207b6c9ac8193467de068a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 28 11:22:37 2015 +0100 rsaenh/tests: Mark an old behavior as broken (PVS-Studio). All newer Windows support salt in their AES provider. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/tests/rsaenh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 439d253..b7616fc 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1166,8 +1166,8 @@ static void test_aes(int keylen) /* Does AES provider support salt? */ result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); - ok((!result && GetLastError() == NTE_BAD_KEY) || result /* Win7 */, - "expected NTE_BAD_KEY, got %08x\n", GetLastError()); + todo_wine ok(result || broken(GetLastError() == NTE_BAD_KEY), /* Vista or older */ + "Expected OK, got last error %d\n", GetLastError()); if (result) ok(!dwLen, "unexpected salt length %d\n", dwLen);

1 0

Michael Stefaniuc : kernel32/tests: Simplify an ok() condition (PVS-Studio ).
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: bcff50a9d476a03b93e21577d76288833900e39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcff50a9d476a03b93e21577d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 28 11:21:13 2015 +0100 kernel32/tests: Simplify an ok() condition (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/comm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index cbd276b..97ec794 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -941,7 +941,8 @@ static void test_waittxempty(void) evtmask = 0; SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait); - ok((!res && GetLastError() == ERROR_IO_PENDING) || res /* busy system */, "%d: WaitCommEvent error %d\n", i, GetLastError()); + ok(res /* busy system */ || GetLastError() == ERROR_IO_PENDING, + "%d: WaitCommEvent error %d\n", i, GetLastError()); res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); if (i == 0)

1 0

Gerald Pfeifer : d3d9: Make D3DFVF_TEXTUREFORMAT4 and friends unsigned.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 75d62d24d1ac83838dda22476309670e3ef27e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d62d24d1ac83838dda22476… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Oct 27 12:07:00 2015 +0100 d3d9: Make D3DFVF_TEXTUREFORMAT4 and friends unsigned. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9types.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 111d242..cec42ec 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -60,10 +60,10 @@ #define D3DCS_PLANE5 __MSABI_LONG(0x800) #define D3DCS_ALL __MSABI_LONG(0xFFF) -#define D3DFVF_TEXTUREFORMAT1 3 -#define D3DFVF_TEXTUREFORMAT2 0 -#define D3DFVF_TEXTUREFORMAT3 1 -#define D3DFVF_TEXTUREFORMAT4 2 +#define D3DFVF_TEXTUREFORMAT1 3u +#define D3DFVF_TEXTUREFORMAT2 0u +#define D3DFVF_TEXTUREFORMAT3 1u +#define D3DFVF_TEXTUREFORMAT4 2u #define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16)) #define D3DFVF_TEXCOORDSIZE2(CoordIndex) (D3DFVF_TEXTUREFORMAT2) #define D3DFVF_TEXCOORDSIZE3(CoordIndex) (D3DFVF_TEXTUREFORMAT3 << (CoordIndex*2 + 16))

1 0

Martin Storsjo : ucrtbase: Implement some printf functions.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: 255a7fe06758de5e69dfc4ab20cddc6e6e4d331d URL: http://source.winehq.org/git/wine.git/?a=commit;h=255a7fe06758de5e69dfc4ab2… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Oct 27 23:42:15 2015 +0200 ucrtbase: Implement some printf functions. Not all functions are implemented (yet not all variants are implemented in the normal msvcrt either). The new functions are more generalized and are C99 compliant. They take an options parameter that e.g. for the snprintf family of functions indicate whether the truncation and return value should be handled as before or in the standards compliant way. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 12 +- dlls/msvcrt/file.c | 28 ++ dlls/msvcrt/wcs.c | 94 ++++++ dlls/ucrtbase/tests/Makefile.in | 1 + dlls/ucrtbase/tests/printf.c | 329 +++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 12 +- 6 files changed, 464 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=255a7fe06758de5e69dfc…

1 0

Alexandre Julliard : makefiles: Automatically add RPATH support for programs that use libwine.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: a1515c68d4d4b4334f44b098debba2548a16ca38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1515c68d4d4b4334f44b098d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 10:56:21 2015 +0900 makefiles: Automatically add RPATH support for programs that use libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 48 +++++++++++++++++++----------------------------- configure.ac | 48 +++++++++++++++++++----------------------------- loader/Makefile.in | 2 -- server/Makefile.in | 14 ++------------ tools/makedep.c | 24 ++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1515c68d4d4b4334f44b…

1 0

Alexandre Julliard : tools: Move winemaker to its own directory.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: e619a15ac13a7fafe5e7d024c69256b8cb6458a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e619a15ac13a7fafe5e7d024c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 19:47:24 2015 +0900 tools: Move winemaker to its own directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 ++- configure.ac | 3 ++- tools/Makefile.in | 13 ------------- tools/winemaker/Makefile.in | 12 ++++++++++++ tools/{ => winemaker}/winemaker | 0 tools/{ => winemaker}/winemaker.de.UTF-8.man.in | 0 tools/{ => winemaker}/winemaker.fr.UTF-8.man.in | 0 tools/{ => winemaker}/winemaker.man.in | 0 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/configure b/configure index fd09324..534afff 100755 --- a/configure +++ b/configure @@ -18151,12 +18151,13 @@ wine_fn_config_program wusa enable_wusa install wine_fn_config_program xcopy enable_xcopy install,po wine_fn_config_test programs/xcopy/tests xcopy.exe_test wine_fn_config_makefile server enable_server clean,install-lib,manpage -wine_fn_config_tool tools clean,install-dev,manpage +wine_fn_config_tool tools clean wine_fn_config_tool tools/sfnt2fon clean wine_fn_config_tool tools/widl clean,install-dev,manpage wine_fn_config_tool tools/winebuild clean,install-dev,manpage wine_fn_config_tool tools/winedump clean,install-dev,manpage wine_fn_config_tool tools/winegcc clean,install-dev,manpage +wine_fn_config_tool tools/winemaker install-dev,manpage wine_fn_config_tool tools/wmc clean,install-dev,manpage wine_fn_config_tool tools/wrc clean,install-dev,manpage diff --git a/configure.ac b/configure.ac index 3180407..cdc68fe 100644 --- a/configure.ac +++ b/configure.ac @@ -3600,12 +3600,13 @@ WINE_CONFIG_PROGRAM(wusa,,[install]) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) WINE_CONFIG_TEST(programs/xcopy/tests) WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage]) -WINE_CONFIG_TOOL(tools,[clean,install-dev,manpage]) +WINE_CONFIG_TOOL(tools,[clean]) WINE_CONFIG_TOOL(tools/sfnt2fon,[clean]) WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/winedump,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/winegcc,[clean,install-dev,manpage]) +WINE_CONFIG_TOOL(tools/winemaker,[install-dev,manpage]) WINE_CONFIG_TOOL(tools/wmc,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/wrc,[clean,install-dev,manpage]) diff --git a/tools/Makefile.in b/tools/Makefile.in index 2ed8179..bc13cc9 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,11 +1,6 @@ PROGRAMS = \ make_xftmpl -MANPAGES = \ - winemaker.de.UTF-8.man.in \ - winemaker.fr.UTF-8.man.in \ - winemaker.man.in - C_SRCS = \ make_xftmpl.c @@ -13,11 +8,3 @@ IN_SRCS = \ wineapploader.in all: wineapploader - -.PHONY: install install-dev uninstall - -install install-dev:: install-man-pages - $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/winemaker diff --git a/tools/winemaker/Makefile.in b/tools/winemaker/Makefile.in new file mode 100644 index 0000000..7095ecf --- /dev/null +++ b/tools/winemaker/Makefile.in @@ -0,0 +1,12 @@ +MANPAGES = \ + winemaker.de.UTF-8.man.in \ + winemaker.fr.UTF-8.man.in \ + winemaker.man.in + +.PHONY: install install-dev uninstall + +install install-dev:: install-man-pages + $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker + +uninstall:: + $(RM) $(DESTDIR)$(bindir)/winemaker diff --git a/tools/winemaker b/tools/winemaker/winemaker similarity index 100% rename from tools/winemaker rename to tools/winemaker/winemaker diff --git a/tools/winemaker.de.UTF-8.man.in b/tools/winemaker/winemaker.de.UTF-8.man.in similarity index 100% rename from tools/winemaker.de.UTF-8.man.in rename to tools/winemaker/winemaker.de.UTF-8.man.in diff --git a/tools/winemaker.fr.UTF-8.man.in b/tools/winemaker/winemaker.fr.UTF-8.man.in similarity index 100% rename from tools/winemaker.fr.UTF-8.man.in rename to tools/winemaker/winemaker.fr.UTF-8.man.in diff --git a/tools/winemaker.man.in b/tools/winemaker/winemaker.man.in similarity index 100% rename from tools/winemaker.man.in rename to tools/winemaker/winemaker.man.in

1 0

Alexandre Julliard : tools: Upgrade the config.guess/config.sub scripts.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: bf6c3a1226b200d78ce06f2a483ffdd03ce39185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6c3a1226b200d78ce06f2a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 14:24:33 2015 +0900 tools: Upgrade the config.guess/config.sub scripts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/config.guess | 354 ++++++++++++++++++++--------------------------------- tools/config.sub | 80 +++++++----- 2 files changed, 182 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf6c3a1226b200d78ce06…

1 0

Anton Baskanov : quartz: Add stub IAMStreamSelect to MPEG-1 Stream Splitter.
by Alexandre Julliard 28 Oct '15

28 Oct '15

Module: wine Branch: master Commit: b75eb2f91eb623d5560791e862596474e8ac5456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75eb2f91eb623d5560791e86… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Oct 22 22:54:47 2015 +0600 quartz: Add stub IAMStreamSelect to MPEG-1 Stream Splitter. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/mpegsplit.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++- include/axcore.idl | 39 +++++++++++++++++++ 2 files changed, 137 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 60dd82c..1fd8002 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -55,6 +55,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct MPEGSplitterImpl { ParserImpl Parser; + IAMStreamSelect IAMStreamSelect_iface; LONGLONG EndOfFile; LONGLONG position; DWORD begin_offset; @@ -64,11 +65,21 @@ typedef struct MPEGSplitterImpl BOOL seek; } MPEGSplitterImpl; +static inline MPEGSplitterImpl *impl_from_IBaseFilter( IBaseFilter *iface ) +{ + return CONTAINING_RECORD(iface, MPEGSplitterImpl, Parser.filter.IBaseFilter_iface); +} + static inline MPEGSplitterImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { return CONTAINING_RECORD(iface, MPEGSplitterImpl, Parser.sourceSeeking.IMediaSeeking_iface); } +static inline MPEGSplitterImpl *impl_from_IAMStreamSelect( IAMStreamSelect *iface ) +{ + return CONTAINING_RECORD(iface, MPEGSplitterImpl, IAMStreamSelect_iface); +} + static int MPEGSplitter_head_check(const BYTE *header) { /* If this is a possible start code, check for a system or video header */ @@ -752,9 +763,36 @@ static HRESULT MPEGSplitter_first_request(LPVOID iface) return hr; } +static HRESULT WINAPI MPEGSplitter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) +{ + MPEGSplitterImpl *This = impl_from_IBaseFilter(iface); + TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); + + *ppv = NULL; + + if ( IsEqualIID(riid, &IID_IUnknown) + || IsEqualIID(riid, &IID_IPersist) + || IsEqualIID(riid, &IID_IMediaFilter) + || IsEqualIID(riid, &IID_IBaseFilter) ) + *ppv = iface; + else if ( IsEqualIID(riid, &IID_IAMStreamSelect) ) + *ppv = &This->IAMStreamSelect_iface; + + if (*ppv) + { + IBaseFilter_AddRef(iface); + return S_OK; + } + + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + + return E_NOINTERFACE; +} + static const IBaseFilterVtbl MPEGSplitter_Vtbl = { - Parser_QueryInterface, + MPEGSplitter_QueryInterface, Parser_AddRef, Parser_Release, Parser_GetClassID, @@ -771,6 +809,64 @@ static const IBaseFilterVtbl MPEGSplitter_Vtbl = Parser_QueryVendorInfo }; +static HRESULT WINAPI AMStreamSelect_QueryInterface(IAMStreamSelect *iface, REFIID riid, void **ppv) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + return IBaseFilter_QueryInterface(&This->Parser.filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI AMStreamSelect_AddRef(IAMStreamSelect *iface) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + return IBaseFilter_AddRef(&This->Parser.filter.IBaseFilter_iface); +} + +static ULONG WINAPI AMStreamSelect_Release(IAMStreamSelect *iface) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + return IBaseFilter_Release(&This->Parser.filter.IBaseFilter_iface); +} + +static HRESULT WINAPI AMStreamSelect_Count(IAMStreamSelect *iface, DWORD *streams) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + FIXME("(%p/%p)->(%p) stub!\n", This, iface, streams); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMStreamSelect_Info(IAMStreamSelect *iface, LONG index, AM_MEDIA_TYPE **media_type, DWORD *flags, LCID *lcid, DWORD *group, WCHAR **name, IUnknown **object, IUnknown **unknown) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + FIXME("(%p/%p)->(%d,%p,%p,%p,%p,%p,%p,%p) stub!\n", This, iface, index, media_type, flags, lcid, group, name, object, unknown); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMStreamSelect_Enable(IAMStreamSelect *iface, LONG index, DWORD flags) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + FIXME("(%p/%p)->(%d,%x) stub!\n", This, iface, index, flags); + + return E_NOTIMPL; +} + +static const IAMStreamSelectVtbl AMStreamSelectVtbl = +{ + AMStreamSelect_QueryInterface, + AMStreamSelect_AddRef, + AMStreamSelect_Release, + AMStreamSelect_Count, + AMStreamSelect_Info, + AMStreamSelect_Enable +}; + HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { MPEGSplitterImpl *This; @@ -794,6 +890,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) CoTaskMemFree(This); return hr; } + This->IAMStreamSelect_iface.lpVtbl = &AMStreamSelectVtbl; This->seek = TRUE; /* Note: This memory is managed by the parser filter once created */ diff --git a/include/axcore.idl b/include/axcore.idl index b8c0e69..54523d5 100644 --- a/include/axcore.idl +++ b/include/axcore.idl @@ -655,3 +655,42 @@ enum tagAM_MEDIAEVENT_FLAGS { AM_MEDIAEVENT_NONOTIFY = 0x01 }; + +enum _AMSTREAMSELECTINFOFLAGS +{ + AMSTREAMSELECTINFO_ENABLED = 0x1, + AMSTREAMSELECTINFO_EXCLUSIVE = 0x2 +}; + +enum _AMSTREAMSELECTENABLEFLAGS +{ + AMSTREAMSELECTENABLE_ENABLE = 0x1, + AMSTREAMSELECTENABLE_ENABLEALL = 0x2 +}; + +[ +object, +uuid(c1960960-17f5-11d1-abe1-00a0c905f375), +pointer_default(unique) +] +interface IAMStreamSelect : IUnknown +{ + HRESULT Count( + [out] DWORD *streams); + + HRESULT Info( + [in] long index, + [out] AM_MEDIA_TYPE **media_type, + [out] DWORD *flags, + [out] LCID *lcid, + [out] DWORD *group, + [out] WCHAR **name, + [out] IUnknown **object, + [out] IUnknown **unknown); + + HRESULT Enable( + [in] long index, + [in] DWORD flags); +} + +typedef IAMStreamSelect *PAMSTREAMSELECT;

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
75
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 October 2015