March 2007 - Wine-commits - list.winehq.org

Alexandre Julliard : wineps.drv: Return correct values for DESKTOPHORZ/ VERTRES since they are used to setup the visible region.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 6fdee15df9ba7cda179c754ed21acc38a96ceebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fdee15df9ba7cda179c754ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 6 18:28:17 2007 +0100 wineps.drv: Return correct values for DESKTOPHORZ/VERTRES since they are used to setup the visible region. --- dlls/wineps.drv/init.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index bd9c16c..23b6cfd 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -426,8 +426,10 @@ INT PSDRV_GetDeviceCaps( PSDRV_PDEVICE *physDev, INT cap ) return MulDiv(physDev->vertSize, 100, physDev->Devmode->dmPublic.dmScale); case HORZRES: + case DESKTOPHORZRES: return physDev->horzRes; case VERTRES: + case DESKTOPVERTRES: return physDev->vertRes; case BITSPIXEL: return (physDev->pi->ppd->ColorDevice != CD_False) ? 8 : 1; @@ -508,8 +510,6 @@ INT PSDRV_GetDeviceCaps( PSDRV_PDEVICE *physDev, INT cap ) case SCALINGFACTORX: case SCALINGFACTORY: case VREFRESH: - case DESKTOPVERTRES: - case DESKTOPHORZRES: case BLTALIGNMENT: return 0; default:

1 0

Byeong-Sik Jeon : gdi32: Add missing pFT_Done_Face().
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 0da17ff87b8c087a2ffdf3f6abc131062165b645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da17ff87b8c087a2ffdf3f6a… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Tue Mar 6 21:30:20 2007 +0900 gdi32: Add missing pFT_Done_Face(). --- dlls/gdi32/freetype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3c35edb..aa01ed4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1018,6 +1018,7 @@ static BOOL AddFontFileToList(const char *file, char *fake_family, const WCHAR * TRACE("Skipping Index %i: Incorrect Family name for replacement\n",(INT)face_index); HeapFree(GetProcessHeap(), 0, localised_family); num_faces = ft_face->num_faces; + pFT_Done_Face(ft_face); continue; } HeapFree(GetProcessHeap(), 0, localised_family);

1 0

Byeong-Sik Jeon : gdi32: Fix FontSubstitute values for Korean locale.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 52a9d1d934d8d338f19b1814604a539434081c49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a9d1d934d8d338f19b18146… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Tue Mar 6 22:06:33 2007 +0900 gdi32: Fix FontSubstitute values for Korean locale. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index aa01ed4..5f00116 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1805,7 +1805,7 @@ static const struct nls_update_font_list /* Korean */ { 949, 949, "vga949.fon", "hvgafix.fon", "hvgasys.fon", "coure.fon", "serife.fon", "smalle.fon", "sserife.fon", - "Tahoma", "Times New Roman", /* FIXME unverified */ + "Gulim", "Batang", }, /* Chinese Traditional */ { 950, 950, "vga950.fon", "cvgafix.fon", "cvgasys.fon",

1 0

Francois Gouget : dplayx/tests: Add missing '\n' to ok() call.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 2c595a1a639d0bea2f62ce83862ed1b4fa8c1002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c595a1a639d0bea2f62ce838… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 6 14:25:20 2007 +0100 dplayx/tests: Add missing '\n' to ok() call. --- dlls/dplayx/tests/dplayx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 92f9865..e6f39e8 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -76,7 +76,7 @@ static void test_session_guid(LPDIRECTPLAY4 pDP) IDirectPlayX_GetSessionDesc(pDP, NULL, &sessionSize); newSession = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sessionSize); IDirectPlayX_GetSessionDesc(pDP, newSession, &sessionSize); - todo_wine ok( !IsEqualGUID(&newSession->guidInstance, &zeroGuid), "Session guid not initialized"); + todo_wine ok( !IsEqualGUID(&newSession->guidInstance, &zeroGuid), "Session guid not initialized\n"); HeapFree(GetProcessHeap(), 0, newSession); }

1 0

Francois Gouget : dplayx/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: eeb289ef91bd4454d87070841579f26f7e75144e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb289ef91bd4454d87070841… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 6 14:25:51 2007 +0100 dplayx/tests: Fix compilation on systems that don't support nameless unions. --- dlls/dplayx/tests/dplayx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index e6f39e8..af2a6ed 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -64,7 +64,7 @@ static void test_session_guid(LPDIRECTPLAY4 pDP) sessionDesc.dwSize = sizeof( DPSESSIONDESC2 ); memcpy(&sessionDesc.guidApplication, &appGuid, 16); sessionDesc.dwFlags = DPSESSION_CLIENTSERVER; - sessionDesc.lpszSessionNameA = name; + U1(sessionDesc).lpszSessionNameA = name; sessionDesc.dwMaxPlayers = 10; sessionDesc.dwCurrentPlayers = 0; IDirectPlayX_Open(pDP, &sessionDesc, DPOPEN_CREATE);

1 0

tools/winetest dissect gather resultform.html ...
by Jeremy Newman 06 Mar '07

06 Mar '07

ChangeSet ID: 30943 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/03/06 10:52:25 Modified files: winetest : dissect gather resultform.html summary.js winetest.conf Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Use skip information Patch: http://cvs.winehq.org/patch.py?id=30943 Old revision New revision Changes Path 1.21 1.22 +8 -8 tools/winetest/dissect 1.17 1.18 +6 -7 tools/winetest/gather 1.1 1.2 +4 -0 tools/winetest/resultform.html 1.2 1.3 +3 -1 tools/winetest/summary.js 1.3 1.4 +3 -0 tools/winetest/winetest.conf Index: tools/winetest/dissect diff -u -p tools/winetest/dissect:1.21 tools/winetest/dissect:1.22 --- tools/winetest/dissect:1.21 6 Mar 2007 16:52:25 -0000 +++ tools/winetest/dissect 6 Mar 2007 16:52:25 -0000 @@ -29,9 +29,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA use strict; -use vars qw/$builds $queuedir $datadir $maxmult/; +use vars qw/$builds $queuedir $datadir $maxmult $fileversion/; require "winetest.conf"; -my $fileversion = 3; use File::Temp qw/tempdir/; use Errno qw/ENOTEMPTY/; @@ -143,9 +142,9 @@ if ($wine) { /Test output:\r?/ or mydie "no test header: $_"; my ($unit, $test, $source, $rev, $result); -my ($lines,$total, $todo, $failed); +my ($lines,$total, $todo, $failed, $skipped); $unit = undef; # state machine starts -$total = $todo = $failed = 0; +$total = $todo = $failed = $skipped = 0; $lines = 0; while (<IN>) { if (!defined $unit) { # new test @@ -165,13 +164,14 @@ while (<IN>) { $total += $2; $todo += $3; $failed += $4; + $skipped += $5; print OUT; } elsif (s/$unit:$test done $(-?\d+)$\r?$//) { chomp; # current test ended if ($lines==0) { - $result = "failed $1 -"; + $result = "failed $1 - -"; } else { - $result = "$total $todo $failed"; + $result = "$total $todo $failed $skipped"; } FINISH: print SUM "- $unit $test $result $source $rev\n"; @@ -183,7 +183,7 @@ while (<IN>) { mydie "can't rename $tmpfile to $testfile: $!\n"; } $unit = undef; - $total = $todo = $failed = 0; + $total = $todo = $failed = $skipped = 0; $lines = 0; } else { # current test output print OUT; @@ -191,7 +191,7 @@ while (<IN>) { } if (defined $unit) { $_=""; - $result = "failed - -"; + $result = "failed - - -"; goto FINISH; } close SUM or mydie "error writing $tmpdir/summary.txt: $!"; Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.17 tools/winetest/gather:1.18 --- tools/winetest/gather:1.17 6 Mar 2007 16:52:25 -0000 +++ tools/winetest/gather 6 Mar 2007 16:52:25 -0000 @@ -27,9 +27,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA use strict; -use vars qw/$datadir/; +use vars qw/$datadir $fileversion/; require "winetest.conf"; -my $fileversion = 3; # Group result containers. Keys: # name: group name @@ -94,10 +93,10 @@ foreach my $file (glob "$datadir/$build/ next; } while (<TEST>) { - my ($digest, $unit, $test, $count, $todo, $error, + my ($digest, $unit, $test, $count, $todo, $error, $skipped, $source, $rev) = split; my $testname = "$unit:$test"; - $testref->{results}->{$testname} = [$count, $todo, $error]; + $testref->{results}->{$testname} = [$count, $todo, $error, $skipped]; $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/$source" . ($rev ne "-"?"#rev$rev":"") unless exists $alltests{$testname}; if ($count ne "failed") { @@ -215,7 +214,7 @@ sub singletest { print OUT " <td class=\"${vis}note\">.</td>\n"; } else { my $file = "$test->{dir}/$testname.txt"; - my ($count, $todo, $error) = @{$test->{results}->{$testname}}; + my ($count, $todo, $error, $skipped) = @{$test->{results}->{$testname}}; if ($count eq "failed") { my $msg = $todo eq "-"?"crash": $todo == 258?"timeout":"failed"; @@ -226,8 +225,8 @@ sub singletest { print OUT <<"EOF"; <td class="$vis$class"><a href="$file" - title="$count tests, $todo TODO, $error errors" - onMouseOver="refresh('$testname','$groupname $test->{tag}',$count,$todo,$error);" + title="$count tests, $todo TODO, $error errors, $skipped skipped" + onMouseOver="refresh('$testname','$groupname $test->{tag}',$count,$todo,$error,$skipped);" >$error</a></td> EOF } Index: tools/winetest/resultform.html diff -u -p tools/winetest/resultform.html:1.1 tools/winetest/resultform.html:1.2 --- tools/winetest/resultform.html:1.1 6 Mar 2007 16:52:25 -0000 +++ tools/winetest/resultform.html 6 Mar 2007 16:52:25 -0000 @@ -34,6 +34,10 @@ <td>Errors:</td> <td><input type="text" name="errors" size="6" readonly></td> </tr> + <tr> + <td>Skipped:</td> + <td><input type="text" name="skipped" size="6" readonly></td> + </tr> </form> </body> </html> Index: tools/winetest/summary.js diff -u -p tools/winetest/summary.js:1.2 tools/winetest/summary.js:1.3 --- tools/winetest/summary.js:1.2 6 Mar 2007 16:52:25 -0000 +++ tools/winetest/summary.js 6 Mar 2007 16:52:25 -0000 @@ -9,7 +9,7 @@ function isopen () { return result_window && result_window.document && result_window.document.results; } -function refresh (test, version, tests, todo, errors) { +function refresh (test, version, tests, todo, errors, skipped) { if (isopen ()) { var form = result_window.document.results; form.test.value = test; @@ -17,6 +17,7 @@ function refresh (test, version, tests, form.tests.value = tests; form.todo.value = todo; form.errors.value = errors; + form.skipped.value = skipped; result_window.focus (); } } @@ -31,5 +32,6 @@ function clone () { cf.tests.value = rf.tests.value; cf.todo.value = rf.todo.value; cf.errors.value = rf.errors.value; + cf.skipped.value = rf.skipped.value; } } Index: tools/winetest/winetest.conf diff -u -p tools/winetest/winetest.conf:1.3 tools/winetest/winetest.conf:1.4 --- tools/winetest/winetest.conf:1.3 6 Mar 2007 16:52:25 -0000 +++ tools/winetest/winetest.conf 6 Mar 2007 16:52:25 -0000 @@ -9,4 +9,7 @@ $datadir = "$root/data"; # Maximum number of reports for one version and tag $maxmult = 10; +# File version number +$fileversion = 4; + 1; # keep require happy

1 0

Dmitry Timoshkov : winex11.drv: Do not ignore the keysyms assigned to a group switch, it leads to side effects like missing KeyRelease events.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: d2092ae2bd1089a41d05e92b39757df8e1d6a69f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2092ae2bd1089a41d05e92b3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 6 16:53:39 2007 +0800 winex11.drv: Do not ignore the keysyms assigned to a group switch, it leads to side effects like missing KeyRelease events. --- dlls/winex11.drv/keyboard.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 7fbbca8..218919f 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1373,16 +1373,6 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) ascii_chars = XLookupString(event, Str, sizeof(Str), &keysym, NULL); wine_tsx11_unlock(); - /* Ignore some unwanted events */ - if ((keysym >= XK_ISO_Lock && keysym <= XK_ISO_Last_Group_Lock) || - keysym == XK_Mode_switch) - { - wine_tsx11_lock(); - TRACE("Ignoring %s keyboard event\n", XKeysymToString(keysym)); - wine_tsx11_unlock(); - return; - } - TRACE_(key)("state = %X nbyte = %d, status 0x%x\n", event->state, ascii_chars, status); if (status == XBufferOverflow) @@ -2555,9 +2545,9 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, ksname = "No Name"; if ((keysym >> 8) != 0xff) { - ERR("Please report: no char for keysym %04lX (%s) :\n", + WARN("no char for keysym %04lX (%s) :\n", keysym, ksname); - ERR("(virtKey=%X,scanCode=%X,keycode=%X,state=%X)\n", + WARN("virtKey=%X, scanCode=%X, keycode=%X, state=%X\n", virtKey, scanCode, e.keycode, e.state); } }

1 0

Alexandre Julliard : wine.inf: dwReserved values for DirectPlay providers should be dwords
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: c07da7067d64c1fc2bb2ce216e9d04f2aadb066c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c07da7067d64c1fc2bb2ce216… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 6 12:27:32 2007 +0100 wine.inf: dwReserved values for DirectPlay providers should be dwords (spotted by Alessandro Pignotti). --- tools/wine.inf | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 6a878f6..4475cbb 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -205,27 +205,27 @@ HKLM,Software\Microsoft\DirectMusic\Defaults,DefaultOutputPort,,"{58C2B4D0-46E7- HKLM,Software\Microsoft\DirectMusic\SoftwareSynths\{58C2B4D0-46E7-11D1-89AC-00A0C9054129},Description,,"Microsoft Software Synthesizer" HKLM,Software\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay,"DescriptionA",,"Internet TCP/IP Connection For DirectPlay" HKLM,Software\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay,"DescriptionW",,"Internet TCP/IP Connection For DirectPlay" -HKLM,Software\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay,"dwReserved1",,0x000001f4 -HKLM,Software\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay,"dwReserved2",,0x00000000 +HKLM,Software\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay,"dwReserved1",0x10001,0x000001f4 +HKLM,Software\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay,"dwReserved2",0x10001,0x00000000 HKLM,Software\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay,"Guid",,"{36E95EE0-8577-11cf-960C-0080C7534E82}" HKLM,Software\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay,"NATHelp",,"dpnhupnp.dll" HKLM,Software\Microsoft\DirectPlay\Service Providers\Internet TCP/IP Connection For DirectPlay,"Path",,"dpwsockx.dll" HKLM,Software\Microsoft\DirectPlay\Service Providers\IPX Connection For DirectPlay,"DescriptionA",,"IPX Connection For DirectPlay" HKLM,Software\Microsoft\DirectPlay\Service Providers\IPX Connection For DirectPlay,"DescriptionW",,"IPX Connection For DirectPlay" -HKLM,Software\Microsoft\DirectPlay\Service Providers\IPX Connection For DirectPlay,"dwReserved1",,0x00000032 -HKLM,Software\Microsoft\DirectPlay\Service Providers\IPX Connection For DirectPlay,"dwReserved2",,0x00000000 +HKLM,Software\Microsoft\DirectPlay\Service Providers\IPX Connection For DirectPlay,"dwReserved1",0x10001,0x00000032 +HKLM,Software\Microsoft\DirectPlay\Service Providers\IPX Connection For DirectPlay,"dwReserved2",0x10001,0x00000000 HKLM,Software\Microsoft\DirectPlay\Service Providers\IPX Connection For DirectPlay,"Guid",,"{685BC400-9D2C-11cf-A9CD-00AA006886E3}" HKLM,Software\Microsoft\DirectPlay\Service Providers\IPX Connection For DirectPlay,"Path",,"dpwsockx.dll" HKLM,Software\Microsoft\DirectPlay\Service Providers\Modem Connection For DirectPlay,"DescriptionA",,"Modem Connection For DirectPlay" HKLM,Software\Microsoft\DirectPlay\Service Providers\Modem Connection For DirectPlay,"DescriptionW",,"Modem Connection For DirectPlay" -HKLM,Software\Microsoft\DirectPlay\Service Providers\Modem Connection For DirectPlay,"dwReserved1",,0x00000000 -HKLM,Software\Microsoft\DirectPlay\Service Providers\Modem Connection For DirectPlay,"dwReserved2",,0x00000000 +HKLM,Software\Microsoft\DirectPlay\Service Providers\Modem Connection For DirectPlay,"dwReserved1",0x10001,0x00000000 +HKLM,Software\Microsoft\DirectPlay\Service Providers\Modem Connection For DirectPlay,"dwReserved2",0x10001,0x00000000 HKLM,Software\Microsoft\DirectPlay\Service Providers\Modem Connection For DirectPlay,"Guid",,"{44EAA760-CB68-11cf-9C4E-00A0C905425E}" HKLM,Software\Microsoft\DirectPlay\Service Providers\Modem Connection For DirectPlay,"Path",,"dpmodemx.dll" HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"DescriptionA",,"Serial Connection For DirectPlay" HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"DescriptionW",,"Serial Connection For DirectPlay" -HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"dwReserved1",,0x00000000 -HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"dwReserved2",,0x00000000 +HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"dwReserved1",0x10001,0x00000000 +HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"dwReserved2",0x10001,0x00000000 HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"Guid",,"{0F1D6860-88D9-11cf-9C4E-00A0C905425E}" HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"Path",,"dpmodemx.dll"

1 0

Detlef Riekenberg : serialui: Fix return type for CommConfigDialog.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 20a329831249f76205877512243bb59c308b69c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a329831249f762058775122… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Mar 6 05:40:56 2007 +0100 serialui: Fix return type for CommConfigDialog. --- dlls/kernel32/comm.c | 48 +++++++++++++++++++++------------------------- dlls/serialui/confdlg.c | 38 +++++++++++++++++++++--------------- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 8fc1033..076b761 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -1194,23 +1194,20 @@ BOOL WINAPI CommConfigDialogA( HWND hWnd, /* [in] parent window for the dialog */ LPCOMMCONFIG lpCommConfig) /* [out] pointer to struct to fill */ { - FARPROC lpfnCommDialog; - HMODULE hConfigModule; - BOOL r = FALSE; + LPWSTR lpDeviceW = NULL; + DWORD len; + BOOL r; TRACE("(%s, %p, %p)\n", debugstr_a(lpszDevice), hWnd, lpCommConfig); - hConfigModule = LoadLibraryW(lpszSerialUI); - if(!hConfigModule) - return FALSE; - - lpfnCommDialog = GetProcAddress(hConfigModule, "drvCommConfigDialogA"); - - if(lpfnCommDialog) - r = lpfnCommDialog(lpszDevice,hWnd,lpCommConfig); - - FreeLibrary(hConfigModule); - + if (lpszDevice) + { + len = MultiByteToWideChar( CP_ACP, 0, lpszDevice, -1, NULL, 0 ); + lpDeviceW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, lpszDevice, -1, lpDeviceW, len ); + } + r = CommConfigDialogW(lpDeviceW, hWnd, lpCommConfig); + HeapFree( GetProcessHeap(), 0, lpDeviceW ); return r; } @@ -1224,24 +1221,23 @@ BOOL WINAPI CommConfigDialogW( HWND hWnd, /* [in] parent window for the dialog */ LPCOMMCONFIG lpCommConfig) /* [out] pointer to struct to fill */ { - FARPROC lpfnCommDialog; + FARPROC pCommConfigDialog; HMODULE hConfigModule; - BOOL r = FALSE; + DWORD res = ERROR_INVALID_PARAMETER; TRACE("(%s, %p, %p)\n", debugstr_w(lpszDevice), hWnd, lpCommConfig); - hConfigModule = LoadLibraryW(lpszSerialUI); - if(!hConfigModule) - return FALSE; - - lpfnCommDialog = GetProcAddress(hConfigModule, "drvCommConfigDialogW"); - if(lpfnCommDialog) - r = lpfnCommDialog(lpszDevice,hWnd,lpCommConfig); - - FreeLibrary(hConfigModule); + if (hConfigModule) { + pCommConfigDialog = GetProcAddress(hConfigModule, "drvCommConfigDialogW"); + if (pCommConfigDialog) { + res = pCommConfigDialog(lpszDevice, hWnd, lpCommConfig); + } + FreeLibrary(hConfigModule); + } - return r; + if (res) SetLastError(res); + return (res == ERROR_SUCCESS); } /*********************************************************************** diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index 4de730d..6b5dbe2 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -376,10 +376,10 @@ static INT_PTR CALLBACK SERIALUI_ConfigDialogProc(HWND hWnd, UINT uMsg, WPARAM w { case IDOK: SERIALUI_DialogInfoToDCB(hWnd,info); - EndDialog(hWnd,1); + EndDialog(hWnd, ERROR_SUCCESS); return TRUE; case IDCANCEL: - EndDialog(hWnd,0); + EndDialog(hWnd, ERROR_CANCELLED); return TRUE; /* test code for Get/SetDefaultCommConfig begins */ case ID_GETDEFAULT: @@ -431,38 +431,44 @@ static VOID SERIALUI_strfree( LPWSTR strW ) /*********************************************************************** * drvCommConfigDialogW (SERIALUI.@) * - * Used by Win9x KERNEL to show a dialog for configuring a COMM port. + * Show a dialog for configuring a Serial Port. + * */ -BOOL WINAPI drvCommConfigDialogW( - LPCWSTR lpszName, - HWND hWndParent, - LPCOMMCONFIG lpCommConfig -) { +DWORD WINAPI drvCommConfigDialogW(LPCWSTR lpszName, HWND hWndParent, LPCOMMCONFIG lpCommConfig) +{ SERIALUI_DialogInfo info; + INT res; info.lpCommConfig = lpCommConfig; info.lpszDevice = lpszName; info.bConvert = FALSE; info.dwFlowControl = 0; - if(!lpCommConfig) - return FALSE; + if ((!lpCommConfig) || (!lpszName)) + return ERROR_INVALID_PARAMETER; - return DialogBoxParamW(SERIALUI_hModule, + if (lpCommConfig->dwSize < sizeof(COMMCONFIG)) + return ERROR_INSUFFICIENT_BUFFER; + + if (!lpszName[0]) + return ERROR_BADKEY; + + res = DialogBoxParamW( SERIALUI_hModule, MAKEINTRESOURCEW(IDD_SERIALUICONFIG), hWndParent, SERIALUI_ConfigDialogProc, (LPARAM)&info); + + return (res == -1) ? GetLastError() : res ; } /*********************************************************************** * drvCommConfigDialogA (SERIALUI.@) */ -BOOL WINAPI drvCommConfigDialogA( - LPCSTR lpszName, HWND hWndParent, LPCOMMCONFIG lpCommConfig ) +DWORD WINAPI drvCommConfigDialogA(LPCSTR lpszName, HWND hWndParent, LPCOMMCONFIG lpCommConfig) { LPWSTR strW = SERIALUI_strdup( lpszName ); - BOOL r = drvCommConfigDialogW( strW, hWndParent, lpCommConfig ); + DWORD r = drvCommConfigDialogW( strW, hWndParent, lpCommConfig ); SERIALUI_strfree( strW ); return r; } @@ -560,7 +566,8 @@ DWORD WINAPI drvGetDefaultCommConfigW( r = sizeof(comW) / sizeof(WCHAR); /* len of "com\0" */ lstrcpynW(szKeyName, lpszDevice, r); /* simulate a lstrcmpnW */ r--; - if( lstrcmpW(szKeyName, comW) || + + if( lstrcmpiW(szKeyName, comW) || (lpszDevice[r] < '1') || (lpszDevice[r] > '9') || lpszDevice[r+1]) { return ERROR_BADKEY; } @@ -593,7 +600,6 @@ DWORD WINAPI drvGetDefaultCommConfigW( else { /* FIXME: default to a hardcoded commconfig */ - lpCommConfig->dcb.DCBlength = sizeof(DCB); lpCommConfig->dcb.BaudRate = 9600; lpCommConfig->dcb.fBinary = TRUE;

1 0

Detlef Riekenberg : serialui/tests: Add some tests for CommConfigDialog.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 5365ce15e495997252d4d7f4b7c4b2b9a13ea919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5365ce15e495997252d4d7f4b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Mar 6 05:41:00 2007 +0100 serialui/tests: Add some tests for CommConfigDialog. --- dlls/serialui/tests/confdlg.c | 161 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 161 insertions(+), 0 deletions(-) diff --git a/dlls/serialui/tests/confdlg.c b/dlls/serialui/tests/confdlg.c index 95a850e..18cf90d 100644 --- a/dlls/serialui/tests/confdlg.c +++ b/dlls/serialui/tests/confdlg.c @@ -31,6 +31,8 @@ static HINSTANCE hdll; +static DWORD (WINAPI *pCommConfigDialogA)(LPCSTR, HWND, LPCOMMCONFIG); +static DWORD (WINAPI *pCommConfigDialogW)(LPCWSTR, HWND, LPCOMMCONFIG); static DWORD (WINAPI *pGetDefaultCommConfigA)(LPCSTR, LPCOMMCONFIG, LPDWORD); static DWORD (WINAPI *pGetDefaultCommConfigW)(LPCWSTR, LPCOMMCONFIG, LPDWORD); @@ -55,6 +57,14 @@ static LPCSTR load_functions(void) hdll = LoadLibraryA(ptr); if (!hdll) return ptr; + ptr = "drvCommConfigDialogA"; + pCommConfigDialogA = (VOID *) GetProcAddress(hdll, ptr); + if (!pCommConfigDialogA) return ptr; + + ptr = "drvCommConfigDialogW"; + pCommConfigDialogW = (VOID *) GetProcAddress(hdll, ptr); + if (!pCommConfigDialogW) return ptr; + ptr = "drvGetDefaultCommConfigA"; pGetDefaultCommConfigA = (VOID *) GetProcAddress(hdll, ptr); if (!pGetDefaultCommConfigA) return ptr; @@ -69,6 +79,155 @@ static LPCSTR load_functions(void) /* ################# */ +static void test_drvCommConfigDialogA(void) +{ + COMMCONFIG pCC[3]; + CHAR bufferA[16]; + DWORD i; + DWORD res; + DWORD len; + + + /* test ports "com1" - "com4" */ + for (i = 1; i < 5 ; i++) { + sprintf(bufferA, fmt_comA, i); + len = sizeof(pCC); + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pGetDefaultCommConfigA(bufferA, pCC, &len); + if (res == ERROR_CALL_NOT_IMPLEMENTED) { + /* NT does not implement the ANSI API */ + skip("*A not implemented\n"); + return; + } + + if (res == ERROR_SUCCESS) { + + if (winetest_interactive) { + SetLastError(0xdeadbeef); + res = pCommConfigDialogA(bufferA, NULL, pCC); + /* OK: ERROR_SUCCESS, Cancel: ERROR_CANCELLED */ + trace("returned %u with %u for '%s'\n", res, GetLastError(), bufferA); + } + + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pCommConfigDialogA(bufferA, NULL, pCC); + ok( res == ERROR_INSUFFICIENT_BUFFER, + "returned %u with %u for '%s' (expected ERROR_INSUFFICIENT_BUFFER)\n", + res, GetLastError(), bufferA); + + + SetLastError(0xdeadbeef); + res = pCommConfigDialogA(bufferA, NULL, NULL); + ok( res == ERROR_INVALID_PARAMETER, + "returned %u with %u for '%s' (expected ERROR_INVALID_PARAMETER)\n", + res, GetLastError(), bufferA); + } + } + + + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pCommConfigDialogA(emptyA, NULL, pCC); + ok( res == ERROR_INSUFFICIENT_BUFFER, + "returned %u with %u (expected ERROR_INSUFFICIENT_BUFFER)\n", + res, GetLastError()); + + + ZeroMemory(pCC, sizeof(pCC)); + pCC[0].dwSize = sizeof(COMMCONFIG); + SetLastError(0xdeadbeef); + res = pCommConfigDialogA(emptyA, NULL, pCC); + ok( res == ERROR_BADKEY, "returned %u with %u (expected ERROR_BADKEY)\n", + res, GetLastError()); + + + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pCommConfigDialogA(NULL, NULL, pCC); + ok( res == ERROR_INVALID_PARAMETER, + "returned %u with %u (expected ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); +} + +/* ################# */ + +static void test_drvCommConfigDialogW(void) +{ + COMMCONFIG pCC[3]; + CHAR bufferA[16]; + WCHAR bufferW[16]; + DWORD i; + DWORD res; + DWORD len; + + + /* test ports "com1" - "com4" */ + for (i = 1; i < 5 ; i++) { + sprintf(bufferA, fmt_comA, i); + MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + len = sizeof(pCC); + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pGetDefaultCommConfigW(bufferW, pCC, &len); + if (res == ERROR_CALL_NOT_IMPLEMENTED) { + skip("*W not implemented\n"); + return; + } + + if (res == ERROR_SUCCESS) { + + if (winetest_interactive) { + SetLastError(0xdeadbeef); + res = pCommConfigDialogW(bufferW, NULL, pCC); + /* OK: ERROR_SUCCESS, Cancel: ERROR_CANCELLED */ + trace("returned %u with %u for '%s'\n", res, GetLastError(), bufferA); + } + + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pCommConfigDialogW(bufferW, NULL, pCC); + ok( res == ERROR_INSUFFICIENT_BUFFER, + "returned %u with %u for '%s' (expected ERROR_INSUFFICIENT_BUFFER)\n", + res, GetLastError(), bufferA); + + SetLastError(0xdeadbeef); + res = pCommConfigDialogW(bufferW, NULL, NULL); + ok( res == ERROR_INVALID_PARAMETER, + "returned %u with %u for '%s' (expected ERROR_INVALID_PARAMETER)\n", + res, GetLastError(), bufferA); + } + } + + + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pCommConfigDialogW(emptyW, NULL, pCC); + ok( res == ERROR_INSUFFICIENT_BUFFER, + "returned %u with %u (expected ERROR_INSUFFICIENT_BUFFER)\n", + res, GetLastError()); + + + ZeroMemory(pCC, sizeof(pCC)); + pCC[0].dwSize = sizeof(COMMCONFIG); + SetLastError(0xdeadbeef); + res = pCommConfigDialogW(emptyW, NULL, pCC); + ok( res == ERROR_BADKEY, "returned %u with %u (expected ERROR_BADKEY)\n", + res, GetLastError()); + + + ZeroMemory(pCC, sizeof(pCC)); + SetLastError(0xdeadbeef); + res = pCommConfigDialogW(NULL, NULL, pCC); + ok( res == ERROR_INVALID_PARAMETER, + "returned %u with %u (expected ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); +} + + +/* ################# */ + static void test_drvGetDefaultCommConfigA(void) { COMMCONFIG pCC[3]; @@ -265,6 +424,8 @@ START_TEST(confdlg) return; } + test_drvCommConfigDialogA(); + test_drvCommConfigDialogW(); test_drvGetDefaultCommConfigA(); test_drvGetDefaultCommConfigW();

1 0