May 2011 - Wine-Commits - list.winehq.org

Marcus Meissner : windowscodecs: Mark 3 vtables static.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 42ef8a5705bc80056fb4866cd60348d2e992e3df URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ef8a5705bc80056fb4866cd… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat May 28 10:49:31 2011 +0200 windowscodecs: Mark 3 vtables static. --- dlls/windowscodecs/stream.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index 1ed08f3..cd235a3 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -242,7 +242,7 @@ static HRESULT WINAPI StreamOnMemory_Clone(IStream *iface, } -const IStreamVtbl StreamOnMemory_Vtbl = +static const IStreamVtbl StreamOnMemory_Vtbl = { /*** IUnknown methods ***/ StreamOnMemory_QueryInterface, @@ -538,7 +538,7 @@ static HRESULT WINAPI StreamOnStreamRange_Clone(IStream *iface, } -const IStreamVtbl StreamOnStreamRange_Vtbl = +static const IStreamVtbl StreamOnStreamRange_Vtbl = { /*** IUnknown methods ***/ StreamOnStreamRange_QueryInterface, @@ -854,7 +854,7 @@ static HRESULT WINAPI IWICStreamImpl_InitializeFromIStreamRegion(IWICStream *ifa } -const IWICStreamVtbl WICStream_Vtbl = +static const IWICStreamVtbl WICStream_Vtbl = { /*** IUnknown methods ***/ IWICStreamImpl_QueryInterface,

1 0

Alexandre Julliard : widl: Don' t output callback conformances for non-interpreted functions.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 0486140c3dc934f9cc77d2db9f141d1c1c4dc34d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0486140c3dc934f9cc77d2db9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 28 13:38:25 2011 +0200 widl: Don't output callback conformances for non-interpreted functions. The Windows marshaller calls the callback with an invalid stack. --- tools/widl/typegen.c | 21 ++++++++++++++++++++- tools/widl/typegen.h | 1 + 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2c62987..8d93b331a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -908,6 +908,19 @@ static unsigned int write_procformatstring_type(FILE *file, int indent, return size; } +int is_interpreted_func( const type_t *iface, const var_t *func ) +{ + const char *str; + const type_t *ret_type = type_function_get_rettype( func->type ); + + /* return value must fit in a long_ptr for interpreted functions */ + if (type_get_type( ret_type ) == TYPE_BASIC && type_memsize( ret_type ) > pointer_size) + return 0; + if ((str = get_attrp( func->attrs, ATTR_OPTIMIZE ))) return !strcmp( str, "i" ); + if ((str = get_attrp( iface->attrs, ATTR_OPTIMIZE ))) return !strcmp( str, "i" ); + return 0; +} + static void write_procformatstring_func( FILE *file, int indent, const var_t *func, unsigned int *offset ) { @@ -1229,7 +1242,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, print_file(file, 2, "NdrFcShort(0x%hx),\t/* offset = %d */\n", (unsigned short)offset, offset); } - else + else if (!iface || is_interpreted_func( iface, current_func )) { unsigned int callback_offset = 0; struct expr_eval_routine *eval; @@ -1267,6 +1280,12 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, print_file(file, 2, "0x%x,\t/* %s */\n", RPC_FC_CALLBACK, "FC_CALLBACK"); print_file(file, 2, "NdrFcShort(0x%hx),\t/* %u */\n", (unsigned short)callback_offset, callback_offset); } + else /* output a dummy corr desc that isn't used */ + { + print_file(file, 2, "0x%x,\t/* Corr desc: unused for %s */\n", conftype, name); + print_file(file, 2, "0x0,\n" ); + print_file(file, 2, "NdrFcShort(0x0),\n" ); + } return 4; } diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 5d46614..f348bd3 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -82,6 +82,7 @@ void write_endpoints( FILE *f, const char *prefix, const str_list_t *list ); void write_exceptions( FILE *file ); unsigned int type_memsize(const type_t *t); int decl_indirect(const type_t *t); +int is_interpreted_func(const type_t *iface, const var_t *func); void write_parameters_init(FILE *file, int indent, const var_t *func, const char *local_var_prefix); void print(FILE *file, int indent, const char *format, va_list ap); expr_t *get_size_is_expr(const type_t *t, const char *name);

1 0

Marcus Meissner : wineoss.drv: Mark internal symbols with hidden visibility .
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: f8c8c13cc5d6d28ed8b60eab82f9fc0dabfd6f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c8c13cc5d6d28ed8b60eab8… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat May 28 10:49:32 2011 +0200 wineoss.drv: Mark internal symbols with hidden visibility. --- dlls/wineoss.drv/audio.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wineoss.drv/audio.h b/dlls/wineoss.drv/audio.h index 602e842..c917196 100644 --- a/dlls/wineoss.drv/audio.h +++ b/dlls/wineoss.drv/audio.h @@ -158,26 +158,26 @@ typedef struct { OSS_MSG_RING msgRing; } WINE_WAVEIN; -extern WINE_WAVEOUT WOutDev[MAX_WAVEDRV]; -extern WINE_WAVEIN WInDev[MAX_WAVEDRV]; -extern unsigned numOutDev; -extern unsigned numInDev; +extern WINE_WAVEOUT WOutDev[MAX_WAVEDRV] DECLSPEC_HIDDEN; +extern WINE_WAVEIN WInDev[MAX_WAVEDRV] DECLSPEC_HIDDEN; +extern unsigned numOutDev DECLSPEC_HIDDEN; +extern unsigned numInDev DECLSPEC_HIDDEN; -extern int getEnables(OSS_DEVICE *ossdev); -extern void copy_format(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2); +extern int getEnables(OSS_DEVICE *ossdev) DECLSPEC_HIDDEN; +extern void copy_format(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) DECLSPEC_HIDDEN; extern DWORD OSS_OpenDevice(OSS_DEVICE* ossdev, unsigned req_access, int* frag, int strict_format, - int sample_rate, int stereo, int fmt); + int sample_rate, int stereo, int fmt) DECLSPEC_HIDDEN; -extern void OSS_CloseDevice(OSS_DEVICE* ossdev); +extern void OSS_CloseDevice(OSS_DEVICE* ossdev) DECLSPEC_HIDDEN; -extern DWORD wodSetVolume(WORD wDevID, DWORD dwParam); +extern DWORD wodSetVolume(WORD wDevID, DWORD dwParam) DECLSPEC_HIDDEN; /* dscapture.c */ -extern DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv); -extern DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc); +extern DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv) DECLSPEC_HIDDEN; +extern DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc) DECLSPEC_HIDDEN; /* dsrender.c */ -extern DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv); -extern DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc); +extern DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv) DECLSPEC_HIDDEN; +extern DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) DECLSPEC_HIDDEN;

1 0

Dylan Smith : include: Pack ACMDRVSTREAMHEADER since ACMSTREAMHEADER is packed.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 836308ff17ad82836f23dd4f3ff61df4d1ccaadc URL: http://source.winehq.org/git/wine.git/?a=commit;h=836308ff17ad82836f23dd4f3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat May 28 18:02:49 2011 -0400 include: Pack ACMDRVSTREAMHEADER since ACMSTREAMHEADER is packed. --- include/msacmdrv.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/msacmdrv.h b/include/msacmdrv.h index 6436404..3933ea1 100644 --- a/include/msacmdrv.h +++ b/include/msacmdrv.h @@ -109,6 +109,7 @@ typedef struct _ACMDRVSTREAMINSTANCE } ACMDRVSTREAMINSTANCE, *PACMDRVSTREAMINSTANCE; typedef struct _ACMDRVSTREAMHEADER *PACMDRVSTREAMHEADER; +#include <pshpack1.h> typedef struct _ACMDRVSTREAMHEADER { DWORD cbStruct; DWORD fdwStatus; @@ -135,6 +136,7 @@ typedef struct _ACMDRVSTREAMHEADER { LPBYTE pbPreparedDst; DWORD cbPreparedDstLength; } ACMDRVSTREAMHEADER; +#include <poppack.h> typedef struct _ACMDRVSTREAMSIZE {

1 0

Marcus Meissner : mpr: Added missing pointer dereference (Coverity).
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: c1833ea96345dbfe6f1f7ec0e60242bb2617a3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1833ea96345dbfe6f1f7ec0e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 29 23:24:16 2011 +0200 mpr: Added missing pointer dereference (Coverity). --- dlls/mpr/wnet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 2c57aaa..946f47e 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1173,7 +1173,7 @@ static DWORD _enumerateContextW(PWNetEnumerator enumerator, LPDWORD lpcCount, if (ret == WN_SUCCESS) { /* reflect the fact that we already enumerated "Entire Network" */ - lpcCount++; + (*lpcCount)++; *lpBufferSize = bufferSize + bytesNeeded; } else

1 0

Alexandre Julliard : Wine release 1.3.21
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: website Branch: master Commit: 6e97ee3c36d3aac885f1b579f9f773c3f5fe6d3c URL: http://source.winehq.org/git/website.git/?a=commit;h=6e97ee3c36d3aac885f1b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 20:35:36 2011 +0200 Wine release 1.3.21 --- news/en/2011052701.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2011052701.xml b/news/en/2011052701.xml new file mode 100644 index 0000000..639a606 --- /dev/null +++ b/news/en/2011052701.xml @@ -0,0 +1,18 @@ +<news> +<date>May 27, 2011</date> +<title>Wine 1.3.21 Released</title> +<body> + The Wine development release 1.3.21 is now available. + <a href="{$root}/announce/1.3.21">What's new</a> in this release: +<ul> + <li>Support for installation rollbacks in MSI.</li> + <li>8- and 16-bit bitmap formats in the DIB engine.</li> + <li>Fixes in the XInput2 mouse support.</li> + <li>Better support for text shaping in Uniscribe.</li> + <li>Improvements to the Item common dialog.</li> + <li>More MSVC runtime functions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.21.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.3.21 : Alexandre Julliard : Release 1.3.21
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: refs/tags/wine-1.3.21 Tag: 190a5d85e614ded20ead075efe6f3a23ef7b4a1b URL: http://source.winehq.org/git/wine.git/?a=tag;h=190a5d85e614ded20ead075efe6f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 20:27:04 2011 +0200 Release 1.3.21

1 0

Alexandre Julliard : Release 1.3.21.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: 3d318679c65729deb0339fe31761c87223132c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d318679c65729deb0339fe31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 20:27:04 2011 +0200 Release 1.3.21. --- ANNOUNCE | 1155 +++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 634 insertions(+), 541 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d318679c65729deb0339…

1 0

Frédéric Delanoy : wrc: Fix spelling/ grammar in manpage.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: a53468b489aeff90f43656eb79ee19fdebeab62a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53468b489aeff90f43656eb7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 27 16:19:31 2011 +0200 wrc: Fix spelling/grammar in manpage. --- tools/wrc/wrc.man.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index 99bc13d..16ed347 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -39,7 +39,7 @@ messages, 16=preprocessor scanner and 32=preprocessor parser trace. .TP .I \fB\-\-endianess\fR=\fIe\fR Win32 only; set output byte\-ordering, where \fIe\fR is one of n[ative], -l[ittle] or b[ig]. Only resources in source-form can be reorderd. Native +l[ittle] or b[ig]. Only resources in source-form can be reordered. Native ordering depends on the system on which \fBwrc\fR was built. You can see the native ordering by typing \fIwrc \-h\fR. .TP @@ -188,12 +188,12 @@ CHARACTERISTICS 876 .B wrc was written by Bertho A. Stultiens and is a nearly complete rewrite of the first wine resource compiler (1994) by Martin von Loewis. -Additional resource\-types were contributed Ulrich Czekalla and Albert +Additional resource\-types were contributed by Ulrich Czekalla and Albert den Haan. Many cleanups by Dimitrie O. Paun in 2002-2003. Bugfixes have been contributed by many Wine developers. .SH BUGS \- The preprocessor recognizes variable argument macros, but does not -expanded them correctly. +expand them correctly. .br \- Error reporting should be more precise, as currently the column and line number reported are those of the next token.

1 0

Huw Davies : gdi32/tests: Add tests for 8bpp brushes.
by Alexandre Julliard May 27, 2011

May 27, 2011

Module: wine Branch: master Commit: 73a4178ad12d751cb7e9ad09a3f3931328afbe57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a4178ad12d751cb7e9ad09a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 27 14:43:11 2011 +0100 gdi32/tests: Add tests for 8bpp brushes. --- dlls/gdi32/tests/dib.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index bb30215..675c07b 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -94,6 +94,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "ef654fedcb494dae79559f4db8b691ae2d522a3f", "a694872f38e66a7ff471440c3e6a9310ef78328a", "d7398de15b2837a58a62a701ca1b3384625afec4", + "a78b28472bb7ff480ddedd06b9cf2daa775fa7ae", "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", "8b66f14d51ecdeea12bc993302bb9b7d3ec085a1", "7da9dd3d40d44d92deb9883fb7110443c2d5769a", @@ -120,6 +121,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "66da15b6780a4ca3b3d2eb1d1dba4e30f7b74964", "42fefefe4435570fa8038ec759140c66c76570e9", "3369889a67d6c79a24ee15f7d14374f9995215e4", + "473a1fd07df800c87a5d3286b642ace10c61c6af", "4851c5b7d5bc18590e787c0c218a592ef504e738", "9aa506e3df33e0d5298755aa4144e10eb4b5adcf", "abdf003699364fe45fab7dc61e67c606d0063b40", @@ -146,6 +148,7 @@ static const char *sha1_graphics_r5g5b5[] = "5c636ffadec10fbe440b552fe6436f3dbc607dcf", "4aac89fc18c128eddb69eea658272af53138a1cb", "9d21bcfdeaf1ca5d47eb823bdefc24d7a95f4f56", + "6daaf945a955928c5c124c880522ca4634fb2343", "3a50ce21b3563a604b4fc9f247a30f5a981f1ba6", "d7d97e28ed316f6596c737eb83baa5948d86b673", "ecc2991277d7314f55b00e0f284ae3703aeef81e", @@ -172,6 +175,7 @@ static const char *sha1_graphics_r4g4b4[] = "dbc8d66b419880108793db91c05766c0c6efd86d", "6092ccbab6b6e073c6ac8244d122f2cfc453aa38", "32b6e0aa79b7e96cd0ab2da167f6463c011023a8", + "1d283aa4d2b2114f7809fe59357d590c7c779aa7", "d591232bbc2592462c819a9486750f64180518fd", "0e183a4c30b3da345129cffe33fe0fc593d8666b", "f14d9a4bd8a365b7c8f068a0dad481b6eb2b178b", @@ -198,6 +202,7 @@ static const char *sha1_graphics_8[] = "196d832d283bf642d2e481e5452ca175f7902761", "9552f48b88982633a44001227abb847dae4d06b0", "cfc67c325c7cdf96d90af9b3cceb8d0504cbb3b0", + "7262364067e03c7fa498af1d59d228d6c63b460e", "1f13ea0034db4b0ffa4ddcff9664fd892058f9cd", "3caf512cfddfd463d0750cfe3cadb58548eb2ae8", "4e5e7d5fd64818b2b3d3e793c88f603b699d2f0f", @@ -371,6 +376,7 @@ static const RECT rectangles[] = static const BITMAPINFOHEADER dib_brush_header_32 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 32, BI_RGB, 0, 0, 0, 0, 0}; static const BITMAPINFOHEADER dib_brush_header_555 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 16, BI_RGB, 0, 0, 0, 0, 0}; +static const BITMAPINFOHEADER dib_brush_header_8 = {sizeof(BITMAPINFOHEADER), 16, -16, 1, 8, BI_RGB, 0, 0, 0, 0, 0}; static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) { @@ -638,6 +644,44 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh SetBrushOrgEx(hdc, 0, 0, NULL); + /* 8 bpp dib pattern brush */ + + brush_bi->bmiHeader = dib_brush_header_8; + brush_bi->bmiHeader.biClrUsed = 3; + memset(brush_bi->bmiColors, 0, brush_bi->bmiHeader.biClrUsed * sizeof(RGBQUAD)); + brush_bi->bmiColors[0].rgbRed = 0xff; + brush_bi->bmiColors[1].rgbRed = 0xff; + brush_bi->bmiColors[1].rgbGreen = 0xff; + brush_bi->bmiColors[1].rgbBlue = 0xff; + + brush_bits = (BYTE*)brush_bi + sizeof(BITMAPINFOHEADER) + brush_bi->bmiHeader.biClrUsed * sizeof(RGBQUAD); + memset(brush_bits, 0, 16 * 16 * sizeof(BYTE)); + brush_bits[0] = brush_bits[1] = 1; + brush_bits[16] = brush_bits[17] = 2; + brush_bits[32] = brush_bits[33] = 6; + + dib_brush = CreateDIBPatternBrushPt(brush_bi, DIB_RGB_COLORS); + + SelectObject(hdc, dib_brush); + SetBrushOrgEx(hdc, 1, 1, NULL); + + for(i = 0, y = 10; i < 256; i++) + { + BOOL ret; + + if(!rop_uses_src(rop3[i])) + { + ret = PatBlt(hdc, 10 + i, y, 100, 20, rop3[i]); + ok(ret, "got FALSE for %x\n", rop3[i]); + y += 25; + } + } + compare_hash(bmi, bits, sha1, "top-down 8 bpp dib brush patblt"); + memset(bits, 0xcc, dib_size); + + SelectObject(hdc, orig_brush); + DeleteObject(dib_brush); + /* Rectangle */ SelectObject(hdc, solid_pen);

1 0