April 2009 - Wine-commits - list.winehq.org

Detlef Riekenberg : msi/tests: Replace lstrcatW with memcpy to fix failures on win95.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: a26da7b7a37ea78476d0e10e813a38f61ffd86dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26da7b7a37ea78476d0e10e8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 17 15:18:44 2009 +0200 msi/tests: Replace lstrcatW with memcpy to fix failures on win95. --- dlls/msi/tests/automation.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 7229748..88ce287 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2331,7 +2331,6 @@ static void test_Installer_InstallProduct(void) static void test_Installer(void) { - static WCHAR szBackslash[] = { '\\',0 }; static WCHAR szCreateRecordException[] = { 'C','r','e','a','t','e','R','e','c','o','r','d',',','C','o','u','n','t',0 }; static WCHAR szIntegerDataException[] = { 'I','n','t','e','g','e','r','D','a','t','a',',','F','i','e','l','d',0 }; WCHAR szPath[MAX_PATH]; @@ -2395,8 +2394,9 @@ static void test_Installer(void) ok(len, "MultiByteToWideChar returned error %d\n", GetLastError()); if (!len) return; - lstrcatW(szPath, szBackslash); - lstrcatW(szPath, szMsifile); + /* lstrcatW does not work on win95 */ + szPath[len - 1] = '\\'; + memcpy(&szPath[len], szMsifile, sizeof(szMsifile)); /* Installer::OpenPackage */ hr = Installer_OpenPackage(szPath, 0, &pSession);

1 0

Paul TBBle Hampson : dinput: Add missing newline to trace message.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 98c1c8e741c0c684a097f48a484c0baeded8e239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c1c8e741c0c684a097f48a4… Author: Paul TBBle Hampson <Paul.Hampson(a)Pobox.com> Date: Sat Apr 18 22:21:30 2009 +1000 dinput: Add missing newline to trace message. --- dlls/dinput/dinput_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index f9ba1c6..9769d74 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -203,7 +203,7 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) { }; TRACE(" flags: "); if (dwFlags == 0) { - TRACE("DIEDFL_ALLDEVICES"); + TRACE("DIEDFL_ALLDEVICES\n"); return; } for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++)

1 0

Andrew Nguyen : gdiplus: Stub GdipBitmapSetResolution.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: f82a086f56b55136ce5fa489285de2c45d54a78e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f82a086f56b55136ce5fa4892… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Apr 20 02:46:36 2009 -0500 gdiplus: Stub GdipBitmapSetResolution. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 17f4951..ba98518 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -43,7 +43,7 @@ @ stdcall GdipBitmapGetPixel(ptr long long ptr) @ stdcall GdipBitmapLockBits(ptr ptr long long ptr) @ stub GdipBitmapSetPixel -@ stub GdipBitmapSetResolution +@ stdcall GdipBitmapSetResolution(ptr long long) @ stdcall GdipBitmapUnlockBits(ptr ptr) @ stdcall GdipClearPathMarkers(ptr) @ stub GdipCloneBitmapArea diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 8a4dcc2..5552225 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -192,6 +192,13 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, return Ok; } +GpStatus WINGDIPAPI GdipBitmapSetResolution(GpBitmap* bitmap, REAL xdpi, REAL ydpi) +{ + FIXME("(%p, %.2f, %.2f)\n", bitmap, xdpi, ydpi); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, BitmapData* lockeddata) {

1 0

Nicolas Le Cam : msi/tests: Test MsiRecordGetString on null and empty strings.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: edac581d6afdc6e1eb1252d82f4f6200900f0c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edac581d6afdc6e1eb1252d82… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Apr 16 01:06:21 2009 +0200 msi/tests: Test MsiRecordGetString on null and empty strings. --- dlls/msi/tests/record.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 8f2b963..ca70494 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -122,15 +122,47 @@ static void test_msirecord(void) r = MsiRecordGetInteger(h, 0); ok(r == 1, "failed to get integer\n"); - /* same record, but add a string to it */ + /* same record, but add a null or empty string to it */ r = MsiRecordSetString(h, 0, NULL); ok(r == ERROR_SUCCESS, "Failed to set null string at 0\n"); r = MsiRecordIsNull(h, 0); ok(r == TRUE, "null string not null field\n"); + r = MsiRecordDataSize(h, 0); + ok(r == 0, "size of string record is strlen\n"); + buf[0] = 0; + sz = sizeof buf; + r = MsiRecordGetStringA(h, 0, buf, &sz); + ok(r == ERROR_SUCCESS, "Failed to get string at 0\n"); + ok(buf[0] == 0, "MsiRecordGetStringA returned the wrong string\n"); + ok(sz == 0, "MsiRecordGetStringA returned the wrong length\n"); + bufW[0] = 0; + sz = sizeof bufW / sizeof bufW[0]; + r = MsiRecordGetStringW(h, 0, bufW, &sz); + ok(r == ERROR_SUCCESS, "Failed to get string at 0\n"); + ok(bufW[0] == 0, "MsiRecordGetStringW returned the wrong string\n"); + todo_wine + ok(sz == 0, "MsiRecordGetStringW returned the wrong length\n"); r = MsiRecordSetString(h, 0, ""); ok(r == ERROR_SUCCESS, "Failed to set empty string at 0\n"); r = MsiRecordIsNull(h, 0); ok(r == TRUE, "null string not null field\n"); + r = MsiRecordDataSize(h, 0); + ok(r == 0, "size of string record is strlen\n"); + buf[0] = 0; + sz = sizeof buf; + r = MsiRecordGetStringA(h, 0, buf, &sz); + ok(r == ERROR_SUCCESS, "Failed to get string at 0\n"); + ok(buf[0] == 0, "MsiRecordGetStringA returned the wrong string\n"); + ok(sz == 0, "MsiRecordGetStringA returned the wrong length\n"); + bufW[0] = 0; + sz = sizeof bufW / sizeof bufW[0]; + r = MsiRecordGetStringW(h, 0, bufW, &sz); + ok(r == ERROR_SUCCESS, "Failed to get string at 0\n"); + ok(bufW[0] == 0, "MsiRecordGetStringW returned the wrong string\n"); + todo_wine + ok(sz == 0, "MsiRecordGetStringW returned the wrong length\n"); + + /* same record, but add a string to it */ r = MsiRecordSetString(h,0,str); ok(r == ERROR_SUCCESS, "Failed to set string at 0\n"); r = MsiRecordGetInteger(h, 0);

1 0

Christian Costa : mciqtz32: Fix some traces.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: d2a6b23dc279aa1a02fcfd0f704127a3481b3f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a6b23dc279aa1a02fcfd0f7… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Apr 16 20:29:06 2009 +0200 mciqtz32: Fix some traces. --- dlls/mciqtz32/mciqtz.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index da3e09a..c0ec81c 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -60,7 +60,7 @@ static DWORD MCIQTZ_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) { WINE_MCIQTZ* wma; - TRACE("%s, %p\n", debugstr_w(str), modp); + TRACE("(%s, %p)\n", debugstr_w(str), modp); /* session instance */ if (!modp) @@ -83,7 +83,7 @@ static DWORD MCIQTZ_drvClose(DWORD dwDevID) { WINE_MCIQTZ* wma; - TRACE("%04x\n", dwDevID); + TRACE("(%04x)\n", dwDevID); /* finish all outstanding things */ MCIQTZ_mciClose(dwDevID, MCI_WAIT, NULL); @@ -105,7 +105,7 @@ static DWORD MCIQTZ_drvConfigure(DWORD dwDevID) { WINE_MCIQTZ* wma; - TRACE("%04x\n", dwDevID); + TRACE("(%04x)\n", dwDevID); MCIQTZ_mciStop(dwDevID, MCI_WAIT, NULL);

1 0

Christian Costa : mciqtz32: Hook MCI_STOP.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 586d9cf5696de3b849a6ecf19ca4af0bd33c6a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=586d9cf5696de3b849a6ecf19… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Apr 16 20:29:12 2009 +0200 mciqtz32: Hook MCI_STOP. --- dlls/mciqtz32/mciqtz.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index c0ec81c..15dd6b4 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -449,9 +449,9 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_CLOSE_DRIVER: return MCIQTZ_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); + case MCI_STOP: return MCIQTZ_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); case MCI_RECORD: - case MCI_STOP: case MCI_SET: case MCI_PAUSE: case MCI_RESUME:

1 0

Christian Costa : mciqtz32: Show messages in hex as they are defines in headers.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 93009ebbeda2a28817630de8453a399d2c606794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93009ebbeda2a28817630de84… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Apr 16 20:29:17 2009 +0200 mciqtz32: Show messages in hex as they are defines in headers. --- dlls/mciqtz32/mciqtz.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 15dd6b4..0719c91 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -484,18 +484,18 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_UNDO: case MCI_CONFIGURE: case MCI_RESTORE: - FIXME("Unimplemented command [%u]\n", wMsg); + FIXME("Unimplemented command [%08X]\n", wMsg); break; case MCI_SPIN: case MCI_ESCAPE: - WARN("Unsupported command [%u]\n", wMsg); + WARN("Unsupported command [%08X]\n", wMsg); break; case MCI_OPEN: case MCI_CLOSE: FIXME("Shouldn't receive a MCI_OPEN or CLOSE message\n"); break; default: - TRACE("Sending msg [%u] to default driver proc\n", wMsg); + TRACE("Sending msg [%08X] to default driver proc\n", wMsg); return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); }

1 0

Nikolay Sivov : fonts: Fix a typo in copyright text.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: aa2cba4e78905a5cb98b8eca68d4ddb72b589048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa2cba4e78905a5cb98b8eca6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Apr 13 21:27:10 2009 -0400 fonts: Fix a typo in copyright text. --- fonts/tahoma.sfd | 2 +- fonts/tahoma.ttf | Bin 85796 -> 85796 bytes fonts/tahomabd.sfd | 2 +- fonts/tahomabd.ttf | Bin 76628 -> 76624 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fonts/tahoma.sfd b/fonts/tahoma.sfd index e4e3e63..c9b3720 100644 --- a/fonts/tahoma.sfd +++ b/fonts/tahoma.sfd @@ -3,7 +3,7 @@ FontName: WineTahoma FullName: Tahoma FamilyName: Tahoma Weight: Regular -Copyright: Copyright (c) 2004 Larry Snyder, Based on Bitstream Vera Sans Copyright (c) 2003 by Bitstream, Inc. Font renamed in accordance with former's license. Please do not contact Bitstream Inc. for any reason regaurding this font. +Copyright: Copyright (c) 2004 Larry Snyder, Based on Bitstream Vera Sans Copyright (c) 2003 by Bitstream, Inc. Font renamed in accordance with former's license. Please do not contact Bitstream Inc. for any reason regarding this font. Version: 000.001 FONDName: WineTahoma DefaultBaseFilename: tahoma diff --git a/fonts/tahoma.ttf b/fonts/tahoma.ttf index 1059dfc..016286f 100644 Binary files a/fonts/tahoma.ttf and b/fonts/tahoma.ttf differ diff --git a/fonts/tahomabd.sfd b/fonts/tahomabd.sfd index 87b893b..327f7ec 100644 --- a/fonts/tahomabd.sfd +++ b/fonts/tahomabd.sfd @@ -3,7 +3,7 @@ FontName: WineTahomaBold FullName: Tahoma Bold FamilyName: Tahoma Weight: Bold -Copyright: Copyright (c) 2004 Larry Snyder, Based on Bitstream Vera Sans Copyright (c) 2003 by Bitstream, Inc. Font renamed in accordance with former's license. Please do not contact Bitstream Inc. for any reason regaurding this font. +Copyright: Copyright (c) 2004 Larry Snyder, Based on Bitstream Vera Sans Copyright (c) 2003 by Bitstream, Inc. Font renamed in accordance with former's license. Please do not contact Bitstream Inc. for any reason regarding this font. Version: 000.001 FONDName: WineTahomaBold DefaultBaseFilename: tahomabd diff --git a/fonts/tahomabd.ttf b/fonts/tahomabd.ttf index 8fedd31..091174b 100644 Binary files a/fonts/tahomabd.ttf and b/fonts/tahomabd.ttf differ

1 0

Francois Gouget : dinput: Add a trailing '\n' to ERR() messages.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 14e03d770a9991a208cfb3ea683f7f145d5b9938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e03d770a9991a208cfb3ea6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 20 15:10:22 2009 +0200 dinput: Add a trailing '\n' to ERR() messages. --- dlls/dinput/joystick_osx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 8d7f209..57a8559 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -205,7 +205,7 @@ static int find_osx_devices(void) tIOReturn = IOHIDManagerOpen( gIOHIDManagerRef, 0L); if ( kIOReturnSuccess != tIOReturn ) { - ERR("Couldn't open IOHIDManager."); + ERR("Couldn't open IOHIDManager.\n"); return 0; }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 5ef481922f9255df6a42e7eceb18c21b7b43f0d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef481922f9255df6a42e7ece… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 20 14:47:23 2009 +0200 Assorted spelling fixes. --- dlls/dinput/joystick_private.h | 2 +- dlls/gdiplus/font.c | 2 +- dlls/msxml3/node.c | 2 +- dlls/sane.ds/options.c | 2 +- dlls/spoolss/router.c | 2 +- dlls/user32/tests/combo.c | 2 +- dlls/user32/tests/menu.c | 10 +++++----- dlls/user32/tests/sysparams.c | 2 +- dlls/winealsa.drv/waveout.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wineesd.drv/audio.c | 2 +- dlls/winejack.drv/audio.c | 2 +- dlls/winenas.drv/audio.c | 2 +- dlls/wineoss.drv/audio.c | 2 +- dlls/wininet/cookie.c | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ef481922f9255df6a42e…

1 0