November 2015 - Wine-Commits

Austin English : sfc: Add SfcGetNextProtectedFile stub.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: c715127536a78166e58b165c390a57b704899d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c715127536a78166e58b165c3… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 27 00:12:04 2015 -0500 sfc: Add SfcGetNextProtectedFile stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sfc/sfc.spec | 2 +- dlls/sfc_os/sfc_os.c | 9 +++++++++ dlls/sfc_os/sfc_os.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/sfc/sfc.spec b/dlls/sfc/sfc.spec index 04307d2..bdd66db 100644 --- a/dlls/sfc/sfc.spec +++ b/dlls/sfc/sfc.spec @@ -7,7 +7,7 @@ 7 stub @ 8 stub @ 9 stub @ -@ stub SfcGetNextProtectedFile +@ stdcall SfcGetNextProtectedFile(long ptr) sfc_os.SfcGetNextProtectedFile @ stdcall SfcIsFileProtected(ptr wstr) sfc_os.SfcIsFileProtected @ stdcall SfcIsKeyProtected(long wstr long) sfc_os.SfcIsKeyProtected @ stub SfcWLEventLogoff diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index 5805342..9df38f8 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -49,6 +49,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } /****************************************************************** + * SfcGetNextProtectedFile [sfc_os.@] + */ +BOOL WINAPI SfcGetNextProtectedFile(HANDLE handle, PROTECTED_FILE_DATA *data) +{ + FIXME("%p %p\n", handle, data); + return FALSE; +} + +/****************************************************************** * SfcIsFileProtected [sfc_os.@] * * Check, if the given File is protected by the System diff --git a/dlls/sfc_os/sfc_os.spec b/dlls/sfc_os/sfc_os.spec index 1edcb83..6b216e0 100644 --- a/dlls/sfc_os/sfc_os.spec +++ b/dlls/sfc_os/sfc_os.spec @@ -1,3 +1,3 @@ -@ stub SfcGetNextProtectedFile +@ stdcall SfcGetNextProtectedFile(long ptr) @ stdcall SfcIsFileProtected(ptr wstr) @ stdcall SfcIsKeyProtected(long wstr long)

1 0

Austin English : kernel32: Add SetConsoleKeyShortcuts stub.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: 7c92862071bd7b5687ee0b01e9a2c56d0f87d2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c92862071bd7b5687ee0b01e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 2 11:29:47 2015 -0600 kernel32: Add SetConsoleKeyShortcuts stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 9 +++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index d4c4a05..363e763 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3239,6 +3239,15 @@ DWORD WINAPI GetNumberOfConsoleFonts(void) return 1; } + +BOOL WINAPI SetConsoleKeyShortcuts(BOOL set, BYTE keys, VOID *a, DWORD b) +{ + FIXME(": (%u %u %p %u) stub!\n", set, keys, a, b); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FONT_INFO fontinfo) { BOOL ret; diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 89292c9..958c6a7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1350,7 +1350,7 @@ @ stdcall SetConsoleIcon(ptr) @ stdcall SetConsoleInputExeNameA(ptr) @ stdcall SetConsoleInputExeNameW(ptr) -@ stub SetConsoleKeyShortcuts +@ stdcall SetConsoleKeyShortcuts(long long ptr long) @ stub SetConsoleLocalEUDC @ stub SetConsoleMaximumWindowSize @ stub SetConsoleMenuClose

1 0

Nikolay Sivov : dwrite: When assembling run bitmap combine instead of overwriting.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: d3b6b437ed17928b5c567f1d6af337dffbe73543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b6b437ed17928b5c567f1d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 2 23:34:21 2015 +0300 dwrite: When assembling run bitmap combine instead of overwriting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c00aeed..2c52840 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4269,7 +4269,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW if (type == DWRITE_TEXTURE_CLEARTYPE_3x1) { for (y = 0; y < height; y++) { for (x = 0; x < width; x++) - dst[3*x] = dst[3*x+1] = dst[3*x+2] = (src[x / 8] & masks[x % 8]) ? DWRITE_ALPHA_MAX : 0; + if (src[x / 8] & masks[x % 8]) + dst[3*x] = dst[3*x+1] = dst[3*x+2] = DWRITE_ALPHA_MAX; src += glyph_bitmap.pitch; dst += (analysis->bounds.right - analysis->bounds.left) * 3; } @@ -4277,7 +4278,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW else { for (y = 0; y < height; y++) { for (x = 0; x < width; x++) - dst[x] = (src[x / 8] & masks[x % 8]) ? DWRITE_ALPHA_MAX : 0; + if (src[x / 8] & masks[x % 8]) + dst[x] = DWRITE_ALPHA_MAX; src += get_dib_stride(width, 1); dst += analysis->bounds.right - analysis->bounds.left; } @@ -4287,7 +4289,7 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW /* at this point it's DWRITE_TEXTURE_CLEARTYPE_3x1 with 8bpp src bitmap */ for (y = 0; y < height; y++) { for (x = 0; x < width; x++) - dst[3*x] = dst[3*x+1] = dst[3*x+2] = src[x]; + dst[3*x] = dst[3*x+1] = dst[3*x+2] = src[x] | dst[3*x]; src += glyph_bitmap.pitch; dst += (analysis->bounds.right - analysis->bounds.left) * 3; }

1 0

Maarten Lankhorst : winepulse: Forward winmm functions to winealsa.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: 10c72255f2602a895e474d0f629b84e96ebdc479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c72255f2602a895e474d0f6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 2 11:52:40 2015 -0600 winepulse: Forward winmm functions to winealsa. PulseAudio doesn't support MIDI, so we forward to ALSA to provide MIDI support for winepulse users. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/winepulse.drv.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winepulse.drv/winepulse.drv.spec b/dlls/winepulse.drv/winepulse.drv.spec index 612bf46..288de87 100644 --- a/dlls/winepulse.drv/winepulse.drv.spec +++ b/dlls/winepulse.drv/winepulse.drv.spec @@ -3,3 +3,8 @@ @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs @ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager + +# WinMM driver functions +@ stdcall -private DriverProc(long long long long long) winealsa.drv.DriverProc +@ stdcall -private midMessage(long long long long long) winealsa.drv.midMessage +@ stdcall -private modMessage(long long long long long) winealsa.drv.modMessage

1 0

Bruno Jesus : iccvid: Use a separate argument for inverted decompressing.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: ddb47a13a0cffa63bceb424366b8e40dba3f33e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb47a13a0cffa63bceb42436… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 3 21:16:35 2015 +0800 iccvid: Use a separate argument for inverted decompressing. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iccvid/iccvid.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index e6e4419..1ef2db6 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -403,9 +403,10 @@ typedef void (*fn_cvid_v4)(unsigned char *frm, unsigned char *limit, * out_height - the height of the output frame * bit_per_pixel - the number of bits per pixel allocated to the output * frame (only 24 or 32 bpp are supported) + * inverted - if true the output frame is written top-down */ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, - unsigned char *output, unsigned int out_width, unsigned int out_height, int bit_per_pixel) + unsigned char *output, unsigned int out_width, unsigned int out_height, int bit_per_pixel, BOOL inverted) { cvid_codebook *v4_codebook, *v1_codebook, *codebook = NULL; unsigned long x, y, y_bottom, cnum, strip_id, chunk_id, @@ -424,13 +425,10 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, unsigned short height; unsigned short strips; } frame; - BOOL inverted; y = 0; y_bottom = 0; in_buffer = buf; - inverted = (int) out_height < 0; - if (inverted) out_height = -out_height; frame.flags = get_byte(); frame.length = get_byte() << 16; @@ -893,6 +891,7 @@ static LRESULT ICCVID_DecompressBegin( ICCVID_Info *info, LPBITMAPINFO in, LPBIT static LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD size ) { LONG width, height; + BOOL inverted; TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size); @@ -906,10 +905,10 @@ static LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD si width = icd->lpbiInput->biWidth; height = icd->lpbiInput->biHeight; - if (-icd->lpbiOutput->biHeight == height) height = -height; + inverted = -icd->lpbiOutput->biHeight == height; decode_cinepak(info->cvinfo, icd->lpInput, icd->lpbiInput->biSizeImage, - icd->lpOutput, width, height, info->bits_per_pixel); + icd->lpOutput, width, height, info->bits_per_pixel, inverted); return ICERR_OK; } @@ -917,6 +916,7 @@ static LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD si static LRESULT ICCVID_DecompressEx( ICCVID_Info *info, ICDECOMPRESSEX *icd, DWORD size ) { LONG width, height; + BOOL inverted; TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size); @@ -932,10 +932,10 @@ static LRESULT ICCVID_DecompressEx( ICCVID_Info *info, ICDECOMPRESSEX *icd, DWOR width = icd->lpbiSrc->biWidth; height = icd->lpbiSrc->biHeight; - if (-icd->lpbiDst->biHeight == height) height = -height; + inverted = -icd->lpbiDst->biHeight == height; decode_cinepak(info->cvinfo, icd->lpSrc, icd->lpbiSrc->biSizeImage, - icd->lpDst, width, height, info->bits_per_pixel); + icd->lpDst, width, height, info->bits_per_pixel, inverted); return ICERR_OK; }

1 0

Andrew Eikum : mmdevapi/tests: Remove todo_wine on some tests for winepulse.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: 69da3a24d24c8d995177aaaba601d63a75840519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69da3a24d24c8d995177aaaba… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 2 11:55:24 2015 -0600 mmdevapi/tests: Remove todo_wine on some tests for winepulse. winepulse succeeds where other drivers fail. Avoid todo_wine failures when running winepulse. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index afb99fc..865859b 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -244,7 +244,11 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); ok(frames2 == frames, "GetBuffer after ReleaseBuffer(0) %u/%u\n", frames2, frames); ok(pos2 == pos, "Position after ReleaseBuffer(0) %u/%u\n", (UINT)pos2, (UINT)pos); - todo_wine ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); + if(qpc2 != qpc) + /* FIXME: Some drivers fail */ + todo_wine ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); + else + ok(qpc2 == qpc, "HPC after ReleaseBuffer(0) %u vs. %u\n", (UINT)qpc2, (UINT)qpc); } /* trace after the GCP test because log output to MS-DOS console disturbs timing */ @@ -307,14 +311,23 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) if(hr == S_OK){ /* The discontinuity is reported here, but is this an old or new packet? */ - todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)){ + /* FIXME: Some drivers fail */ + todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + todo_wine ok(pos == sum + frames, "Position %u gap %d\n", + (UINT)pos, (UINT)pos - sum); + }else{ + ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + + /* Native's position is one period further than what we read. + * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: + * signal when the position jump left a gap. */ + ok(pos == sum + frames, "Position %u gap %d\n", + (UINT)pos, (UINT)pos - sum); + } + ok(pad == next, "GCP %u vs. BufferSize %u\n", (UINT32)pad, next); - /* Native's position is one period further than what we read. - * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: - * signal when the position jump left a gap. */ - todo_wine ok(pos == sum + frames, "Position %u gap %d\n", - (UINT)pos, (UINT)pos - sum); if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY) sum = pos; }

1 0

Vincent Povirk : gdiplus: Placeable is optional in GdipCreateMetafileFromWmf.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: 2dc568589794ae1110bbe6c534b1e3a2b7baeec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc568589794ae1110bbe6c53… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 2 15:20:39 2015 -0600 gdiplus: Placeable is optional in GdipCreateMetafileFromWmf. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 25 +++++++++++++++---------- dlls/gdiplus/tests/image.c | 17 +++++++++++++++++ 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ad1b7fc..922c101 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1076,7 +1076,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, TRACE("(%p, %d, %p, %p)\n", hwmf, delete, placeable, metafile); - if(!hwmf || !metafile || !placeable) + if(!hwmf || !metafile) return InvalidParameter; *metafile = NULL; @@ -1094,15 +1094,20 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, if (retval == Ok) { - (*metafile)->image.xres = (REAL)placeable->Inch; - (*metafile)->image.yres = (REAL)placeable->Inch; - (*metafile)->bounds.X = ((REAL)placeable->BoundingBox.Left) / ((REAL)placeable->Inch); - (*metafile)->bounds.Y = ((REAL)placeable->BoundingBox.Top) / ((REAL)placeable->Inch); - (*metafile)->bounds.Width = (REAL)(placeable->BoundingBox.Right - - placeable->BoundingBox.Left); - (*metafile)->bounds.Height = (REAL)(placeable->BoundingBox.Bottom - - placeable->BoundingBox.Top); - (*metafile)->metafile_type = MetafileTypeWmfPlaceable; + if (placeable) + { + (*metafile)->image.xres = (REAL)placeable->Inch; + (*metafile)->image.yres = (REAL)placeable->Inch; + (*metafile)->bounds.X = ((REAL)placeable->BoundingBox.Left) / ((REAL)placeable->Inch); + (*metafile)->bounds.Y = ((REAL)placeable->BoundingBox.Top) / ((REAL)placeable->Inch); + (*metafile)->bounds.Width = (REAL)(placeable->BoundingBox.Right - + placeable->BoundingBox.Left); + (*metafile)->bounds.Height = (REAL)(placeable->BoundingBox.Bottom - + placeable->BoundingBox.Top); + (*metafile)->metafile_type = MetafileTypeWmfPlaceable; + } + else + (*metafile)->metafile_type = MetafileTypeWmf; (*metafile)->image.format = ImageFormatWMF; if (delete) DeleteMetaFile(hwmf); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index c14f684..d3e7202 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1544,6 +1544,22 @@ static void test_createfromwmf(void) GdipDisposeImage(img); } +static void test_createfromwmf_noplaceable(void) +{ + HMETAFILE hwmf; + GpImage *img; + GpStatus stat; + + hwmf = SetMetaFileBitsEx(sizeof(wmfimage)-sizeof(WmfPlaceableFileHeader), + wmfimage+sizeof(WmfPlaceableFileHeader)); + ok(hwmf != 0, "SetMetaFileBitsEx failed\n"); + + stat = GdipCreateMetafileFromWmf(hwmf, TRUE, NULL, (GpMetafile**)&img); + expect(Ok, stat); + + GdipDisposeImage(img); +} + static void test_resolution(void) { GpStatus stat; @@ -4758,6 +4774,7 @@ START_TEST(image) test_getrawformat(); test_loadwmf(); test_createfromwmf(); + test_createfromwmf_noplaceable(); test_resolution(); test_createhbitmap(); test_getthumbnail();

1 0

Dmitry Timoshkov : msi: Make sure to reset the 'in_quotes' state in all cases.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: 2ee784e62416c9443bc6d227281556b4655ced00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee784e62416c9443bc6d2272… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 18:09:00 2015 +0800 msi: Make sure to reset the 'in_quotes' state in all cases. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 7 +++---- dlls/msi/tests/install.c | 9 ++++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index df73652..136bfbb 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -255,8 +255,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) len++; break; default: - if (!count) in_quotes = FALSE; - else in_quotes = TRUE; + if (count) in_quotes = TRUE; len++; break; } @@ -277,8 +276,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) break; default: state = state_token; - if (!count) in_quotes = FALSE; - else in_quotes = TRUE; + if (count) in_quotes = TRUE; len++; break; } @@ -287,6 +285,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) default: break; } if (!ignore) *out++ = *p; + if (!count) in_quotes = FALSE; } done: diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 6b86cd2..9cd579b 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4716,11 +4716,14 @@ static void test_propcase(void) ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); - r = MsiInstallProductA(msifile, "BLAHBLAH=\"Copyright \"\"My Company\"\" 2015\" MyProp=42"); + r = MsiInstallProductA(msifile, "Prop1=\"Copyright \"\"My Company\"\" 2015\" MyProp=42"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + + r = MsiInstallProductA(msifile, "Prop1=\"\"\"install.exe\"\" /Install\" MyProp=\"42\""); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); -todo_wine ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); -todo_wine ok(delete_pf("msitest", FALSE), "Directory not created\n"); error:

1 0

Vincent Povirk : gdiplus: Return Ok from GdipSetMetafileDownLevelRasterizationLimit.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: c7bdc8881204a88d68104fbb77e961a04e74756c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7bdc8881204a88d68104fbb7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 2 15:16:29 2015 -0600 gdiplus: Return Ok from GdipSetMetafileDownLevelRasterizationLimit. Until we have a reason to use this value (application asks for it or we're building the emf part of a dual emf+), there's no need to worry about this. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 6d7048a..ad1b7fc 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1141,14 +1141,9 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream *stream, GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile *metafile, UINT limitDpi) { - static int calls; - TRACE("(%p,%u)\n", metafile, limitDpi); - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics* ref,

1 0

Sebastian Lackner : winepulse.drv: Add a missing linebreak to ERR message.
by Alexandre Julliard Nov. 3, 2015

Nov. 3, 2015

Module: wine Branch: master Commit: 64e83ddcad40d3f2ec5c290d71cd06689a9229b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e83ddcad40d3f2ec5c290d7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 3 01:25:21 2015 +0100 winepulse.drv: Add a missing linebreak to ERR message. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index cf94d05..6b69488 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -434,7 +434,7 @@ static HRESULT pulse_connect(void) { if (!(pulse_thread = CreateThread(NULL, 0, pulse_mainloop_thread, NULL, 0, NULL))) { - ERR("Failed to create mainloop thread."); + ERR("Failed to create mainloop thread.\n"); return E_FAIL; } SetThreadPriority(pulse_thread, THREAD_PRIORITY_TIME_CRITICAL);

1 0