September 2010 - Wine-commits

Gerald Pfeifer : urlmon/tests: Simplify test_IUriBuilder_GetPorttest_IUriBuilder_GetPort a bit.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: 9387fe19a0a874b888bd7c67cb051eca9d7ad4a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9387fe19a0a874b888bd7c67c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Sep 4 23:56:38 2010 +0200 urlmon/tests: Simplify test_IUriBuilder_GetPorttest_IUriBuilder_GetPort a bit. --- dlls/urlmon/tests/uri.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 09cc3b6..9206ce0 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -6445,13 +6445,11 @@ static void test_IUriBuilder_GetPort(IUriBuilder *builder, const uri_builder_tes } if(SUCCEEDED(hr)) { DWORD expected; - BOOL got_port = FALSE; hr = IUri_GetPort(uri, &expected); ok(SUCCEEDED(hr), "Error: Expected IUri_Port to succeed, but got 0x%08x instead on uri_builder_tests[%d].\n", hr, test_index); - got_port = hr == S_OK; hr = IUriBuilder_GetPort(builder, &has_port, &received); todo_wine {

1 0

Gerald Pfeifer : gdi32/tests: Fix a test description in test_logpen.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: b2e2793e28d52712ce78808535b3e6b581af5737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e2793e28d52712ce7880853… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 5 00:14:45 2010 +0200 gdi32/tests: Fix a test description in test_logpen. --- dlls/gdi32/tests/pen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 460288d..5a5c063 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -293,7 +293,7 @@ static void test_logpen(void) ok(ext_pen.elp.elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen.elp.elpHatch); ok(ext_pen.elp.elpNumEntries == 2, "expected 0, got %x\n", ext_pen.elp.elpNumEntries); ok(ext_pen.elp.elpStyleEntry[0] == 0xabc, "expected 0xabc, got %x\n", ext_pen.elp.elpStyleEntry[0]); - ok(ext_pen.elp.elpStyleEntry[1] == 0xdef, "expected 0xabc, got %x\n", ext_pen.elp.elpStyleEntry[1]); + ok(ext_pen.elp.elpStyleEntry[1] == 0xdef, "expected 0xdef, got %x\n", ext_pen.elp.elpStyleEntry[1]); break; default:

1 0

Andrew Talbot : dmusic: Constify a variable.
by Alexandre Julliard 06 Sep '10

06 Sep '10

Module: wine Branch: master Commit: ab683fee33b6a80bf0a0c38b0594477fe40177e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab683fee33b6a80bf0a0c38b0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Sep 5 12:36:31 2010 +0100 dmusic: Constify a variable. --- dlls/dmusic/dmusic_main.c | 2 +- dlls/dmusic/dmusic_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 9c0e78f..6cd92ab 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -187,7 +187,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) * */ /* dwPatch from MIDILOCALE */ -DWORD MIDILOCALE2Patch (LPMIDILOCALE pLocale) { +DWORD MIDILOCALE2Patch (const MIDILOCALE *pLocale) { DWORD dwPatch = 0; if (!pLocale) return 0; dwPatch |= (pLocale->ulBank & F_INSTRUMENT_DRUMS); /* set drum bit */ diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 2de7e8a..e7668a4 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -266,7 +266,7 @@ typedef struct { #define GE(x) { &x, #x } /* dwPatch from MIDILOCALE */ -extern DWORD MIDILOCALE2Patch (LPMIDILOCALE pLocale); +extern DWORD MIDILOCALE2Patch (const MIDILOCALE *pLocale); /* MIDILOCALE from dwPatch */ extern void Patch2MIDILOCALE (DWORD dwPatch, LPMIDILOCALE pLocale);

1 0

André Hentschel : Wine 1.3.2 freigegeben
by Jeremy Newman 03 Sep '10

03 Sep '10

Module: website Branch: master Commit: 5285a42945c9bfec1bed86b7b3270e5593f7c84c URL: http://source.winehq.org/git/website.git/?a=commit;h=5285a42945c9bfec1bed86… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 3 20:05:18 2010 +0200 Wine 1.3.2 freigegeben --- news/de/2010090301.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2010090301.xml b/news/de/2010090301.xml new file mode 100644 index 0000000..a1f1cb9 --- /dev/null +++ b/news/de/2010090301.xml @@ -0,0 +1,15 @@ +<news> +<date>3. September 2010</date> +<title>Wine 1.3.2 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Update der Gecko Engine, jetzt auch als 64-Bit Version.</li> + <li>Neue Implementierung der Linux Konsolenunterstützung.</li> + <li>Viele neue Funktionen in den C Runtime Dlls.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.2.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.2
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: website Branch: master Commit: 1d39150eee1a07262c0bf8ea9bcbadf5e64b0e05 URL: http://source.winehq.org/git/website.git/?a=commit;h=1d39150eee1a07262c0bf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 3 19:47:43 2010 +0200 Wine release 1.3.2 --- news/en/2010090301.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2010090301.xml b/news/en/2010090301.xml new file mode 100644 index 0000000..62f34ed --- /dev/null +++ b/news/en/2010090301.xml @@ -0,0 +1,15 @@ +<news> +<date>September 3, 2010</date> +<title>Wine 1.3.2 Released</title> +<body> + The Wine development release 1.3.2 is now available. + <a href="{$root}/announce/1.3.2">What's new</a> in this release: +<ul> + <li>Update of the Gecko engine, now including a 64-bit version.</li> + <li>New implementation of console support on Unix terminals.</li> + <li>Many new functions in the C runtime dlls.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.2.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

Alexandre Julliard : Release 1.3.2.
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: 75af4023079d16976cf937fb0e0ef061cb3883cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=75af4023079d16976cf937fb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 3 19:39:05 2010 +0200 Release 1.3.2. --- ANNOUNCE | 1337 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 646 insertions(+), 711 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75af4023079d16976cf93…

1 0

Tag wine-1.3.2 : Alexandre Julliard : Release 1.3.2
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: refs/tags/wine-1.3.2 Tag: 196c67636fb97e6ea6428d0d0a364824ed561040 URL: http://source.winehq.org/git/wine.git/?a=tag;h=196c67636fb97e6ea6428d0d0a36… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 3 19:39:07 2010 +0200 Release 1.3.2

1 0

Mariusz Pluciński : gameux/tests: Verify registry values created by GameExplorer.
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: 2f398b8c2530b1d26ef041caf395844b32b98b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f398b8c2530b1d26ef041caf… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Fri Sep 3 11:24:48 2010 +0200 gameux/tests: Verify registry values created by GameExplorer. --- dlls/gameux/tests/gameexplorer.c | 172 +++++++++++++++++++++++++++++++++++++- dlls/gameux/tests/rsrc.rc | 2 + dlls/gameux/tests/test.gdf.xml | 1 + 3 files changed, 171 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f398b8c2530b1d26ef04…

1 0

Piotr Caban : msvcp90/tests: Fix basic_string<wchar_t>.size tests.
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: 960a248da66b33edef31f0fcf513e21452e06edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=960a248da66b33edef31f0fcf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 3 12:07:19 2010 +0200 msvcp90/tests: Fix basic_string<wchar_t>.size tests. --- dlls/msvcp90/tests/string.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index dc9a1ee..cb0b74b 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -407,7 +407,7 @@ static void test_basic_string_wchar(void) { ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str1); ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); - size = (size_t)call_func1(p_basic_string_char_size, &str1); + size = (size_t)call_func1(p_basic_string_wchar_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); memset(&str2, 0, sizeof(basic_string_wchar)); @@ -423,7 +423,7 @@ static void test_basic_string_wchar(void) { ok(str[0]=='t' && str[1]=='t' && str[2]=='\0', "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str2); ok(str[0]=='t' && str[1]=='t' && str[2]=='\0', "str = %s\n", wine_dbgstr_w(str)); - size = (size_t)call_func1(p_basic_string_char_size, &str1); + size = (size_t)call_func1(p_basic_string_wchar_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); call_func3(p_basic_string_wchar_erase, &str2, 1, 100); @@ -431,7 +431,7 @@ static void test_basic_string_wchar(void) { ok(str[0]=='t' && str[1]=='\0', "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str2); ok(str[0]=='t' && str[1]=='\0', "str = %s\n", wine_dbgstr_w(str)); - size = (size_t)call_func1(p_basic_string_char_size, &str1); + size = (size_t)call_func1(p_basic_string_wchar_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); call_func3(p_basic_string_wchar_assign_cstr_len, &str2, test, 4);

1 0

Jörg Höhle : winmm: Correctly parse the MCI Sysinfo command.
by Alexandre Julliard 03 Sep '10

03 Sep '10

Module: wine Branch: master Commit: 565c56c61f1afa6c56734034f53333b748d83656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=565c56c61f1afa6c56734034f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Sep 3 06:33:52 2010 +0200 winmm: Correctly parse the MCI Sysinfo command. --- dlls/winmm/mci.c | 79 ++++++++++++++++++++++++++++++++++------------- dlls/winmm/tests/mci.c | 23 +++++++++++++- 2 files changed, 78 insertions(+), 24 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 7a3cd8f..b7799c8 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -544,6 +544,23 @@ static DWORD MCI_GetDevTypeFromFileName(LPCWSTR fileName, LPWSTR buf, UINT len) return MCIERR_EXTENSION_NOT_FOUND; } +/************************************************************************** + * MCI_GetDevTypeFromResource [internal] + */ +static UINT MCI_GetDevTypeFromResource(LPCWSTR lpstrName) +{ + WCHAR buf[32]; + UINT uDevType; + for (uDevType = MCI_DEVTYPE_FIRST; uDevType <= MCI_DEVTYPE_LAST; uDevType++) { + if (LoadStringW(hWinMM32Instance, uDevType, buf, sizeof(buf) / sizeof(WCHAR))) { + /* FIXME: ignore digits suffix */ + if (!strcmpiW(buf, lpstrName)) + return uDevType; + } + } + return 0; +} + #define MAX_MCICMDTABLE 20 #define MCI_COMMAND_TABLE_NOT_LOADED 0xFFFE @@ -1319,21 +1336,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, HeapFree(GetProcessHeap(), 0, devType); if (dwRet) goto errCleanUp; - } else if (!strcmpW(verb, wszSysinfo)) { - /* System commands are not subject to auto-open. */ - /* It's too early to handle Sysinfo here because the - * requirements on dev depend on the flags: - * alias with INSTALLNAME, name like "waveaudio" - * with QUANTITY and NAME. */ - data[4] = MCI_ALL_DEVICE_ID; - if (MCI_ALL_DEVICE_ID != uDevID) { - /* FIXME: Map device name like waveaudio to MCI_DEVTYPE_xyz */ - uDevID = mciGetDeviceIDW(dev); - wmd = MCI_GetDriver(uDevID); - if (wmd) - data[4] = wmd->wType; - } - } else if (!strcmpW(verb, wszSound) || !strcmpW(verb, wszBreak)) { + } else if (!strcmpW(verb, wszSysinfo) || !strcmpW(verb, wszSound) || !strcmpW(verb, wszBreak)) { /* Prevent auto-open for system commands. */ } else if ((MCI_ALL_DEVICE_ID != uDevID) && !(wmd = MCI_GetDriver(mciGetDeviceIDW(dev)))) { /* auto open */ @@ -1409,11 +1412,32 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, data[0] = (DWORD_PTR)hwndCallback; } - if (wMsg == MCI_OPEN && strcmpW(verb, wszOpen)) { - ERR("Cannot open with command %s\n", debugstr_w(verb)); - dwRet = MCIERR_INTERNAL; - wMsg = 0; - goto errCleanUp; + switch (wMsg) { + case MCI_OPEN: + if (strcmpW(verb, wszOpen)) { + FIXME("Cannot open with command %s\n", debugstr_w(verb)); + dwRet = MCIERR_INTERNAL; + wMsg = 0; + goto errCleanUp; + } + break; + case MCI_SYSINFO: + /* Requirements on dev depend on the flags: + * alias with INSTALLNAME, name like "digitalvideo" + * with QUANTITY and NAME. */ + { + LPMCI_SYSINFO_PARMSW lpParms = (LPMCI_SYSINFO_PARMSW)data; + lpParms->wDeviceType = MCI_ALL_DEVICE_ID; + if (uDevID != MCI_ALL_DEVICE_ID) { + if (dwFlags & MCI_SYSINFO_INSTALLNAME) + wmd = MCI_GetDriver(mciGetDeviceIDW(dev)); + else if (!(lpParms->wDeviceType = MCI_GetDevTypeFromResource(dev))) { + dwRet = MCIERR_DEVICE_TYPE_REQUIRED; + goto errCleanUp; + } + } + } + break; } TRACE("[%d, %s, %08x, %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx]\n", @@ -1799,7 +1823,17 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm } else { TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers of type %d\n", lpParms->wDeviceType); FIXME("Don't know how to get # of MCI devices of a given type\n"); - cnt = 1; + /* name = LoadStringW(hWinMM32Instance, LOWORD(lpParms->wDeviceType)) + * then lookup registry and/or system.ini for name, ignoring digits suffix */ + switch (LOWORD(lpParms->wDeviceType)) { + case MCI_DEVTYPE_CD_AUDIO: + case MCI_DEVTYPE_WAVEFORM_AUDIO: + case MCI_DEVTYPE_SEQUENCER: + cnt = 1; + break; + default: /* "digitalvideo" gets 0 because it's not in the registry */ + cnt = 0; + } } } *(DWORD*)lpParms->lpstrReturn = cnt; @@ -1814,7 +1848,8 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm wmd->lpstrDeviceType); } else { *lpParms->lpstrReturn = 0; - ret = MCIERR_INVALID_DEVICE_ID; + ret = (uDevID == MCI_ALL_DEVICE_ID) + ? MCIERR_CANNOT_USE_ALL : MCIERR_INVALID_DEVICE_NAME; } TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 382ff6a..8adc46b 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -263,6 +263,19 @@ static void test_mciParser(HWND hwnd) err = mciSendString("open all", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_CANNOT_USE_ALL,"open all: %s\n", dbg_mcierr(err)); + /* avivideo is not a known MCI_DEVTYPE resource name */ + err = mciSendString("sysinfo avivideo quantity", buf, sizeof(buf), hwnd); + ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo sequencer quantity: %s\n", dbg_mcierr(err)); + + err = mciSendString("sysinfo digitalvideo quantity", buf, sizeof(buf), hwnd); + ok(!err,"sysinfo digitalvideo quantity: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf,"0"), "sysinfo digitalvideo quantity returned %s\n", buf); + + /* quantity 0 yet open 1 (via type "avivideo"), fun */ + err = mciSendString("sysinfo digitalvideo quantity open", buf, sizeof(buf), hwnd); + ok(!err,"sysinfo digitalvideo quantity open: %s\n", dbg_mcierr(err)); + if(!err) ok(!strcmp(buf,"1"), "sysinfo digitalvideo quantity open returned %s\n", buf); + err = mciSendString("put a window at 0 0", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_BAD_INTEGER,"put incomplete rect: %s\n", dbg_mcierr(err)); @@ -425,10 +438,16 @@ static void test_openCloseWAVE(HWND hwnd) if(!err) ok(!strcmp(buf,"mysound"), "sysinfo short name returned %s\n", buf); err = mciSendString("sysinfo mysound quantity open", buf, sizeof(buf), hwnd); - todo_wine ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo alias quantity returned %s\n", dbg_mcierr(err)); + ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo alias quantity: %s\n", dbg_mcierr(err)); err = mciSendString("sysinfo nosuchalias quantity open", buf, sizeof(buf), hwnd); - todo_wine ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo unknown quantity open returned %s\n", dbg_mcierr(err)); + ok(err==MCIERR_DEVICE_TYPE_REQUIRED,"sysinfo unknown quantity open: %s\n", dbg_mcierr(err)); + + err = mciSendString("sysinfo all installname", buf, sizeof(buf), hwnd); + ok(err==MCIERR_CANNOT_USE_ALL,"sysinfo all installname: %s\n", dbg_mcierr(err)); + + err = mciSendString("sysinfo nodev installname", buf, sizeof(buf), hwnd); + ok(err==MCIERR_INVALID_DEVICE_NAME,"sysinfo nodev installname: %s\n", dbg_mcierr(err)); err = mciGetDeviceID("all"); ok(MCI_ALL_DEVICE_ID==err || /* Win9x */(UINT16)MCI_ALL_DEVICE_ID==err,"mciGetDeviceID all returned %u, expected %d\n", err, MCI_ALL_DEVICE_ID);

1 0