March 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : winetest: Display index entries as mixed if there were some successful runs.
by Alexandre Julliard March 4, 2009

March 4, 2009

Module: tools Branch: master Commit: 5625bcedb364cc36ce22f4fbc97296c62062ffe5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=5625bcedb364cc36ce22f4fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 12:05:00 2009 +0100 winetest: Display index entries as mixed if there were some successful runs. --- winetest/build-index | 11 ++++++----- winetest/gather | 6 +++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 6516cfa..621e7dc 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -83,11 +83,11 @@ foreach my $build (@builds) { while (<TOTAL>) { - if (/^([A-Za-z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/) + if (/^([A-Za-z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)(?:\s+(\d+))?/) { - my ($name, $runs, $tests, $errors, $todos) = ($1, $2, $3, $4, $5); + my ($name, $runs, $tests, $errors, $todos, $successes) = ($1, $2, $3, $4, $5, $6); $versions{$name}++; - $build_ver{$name} = [ $runs, $tests, $errors, $todos ]; + $build_ver{$name} = [ $runs, $tests, $errors, $todos, $successes ]; } } close TOTAL; @@ -233,12 +233,13 @@ foreach my $build (@builds) } else { - my ($runs, $tests, $errors, $todos) = @{$counts}; + my ($runs, $tests, $errors, $todos, $successes) = @{$counts}; my $href = $runs > 1 ? "$build->{name}/#group_$ver->{name}" : "$build->{name}"; my $title = $runs > 1 ? "$runs test runs, " : ""; $title .= "$tests unit tests, $errors have errors"; $title .= ", $todos have todos" if ($todos); - my $class = $errors ? ($todos ? "fail also-todo" : "fail") : ($todos ? "todo" : "pass"); + my $class = $errors ? ($successes ? "mixed" : "fail") . ($todos ? " also-todo" : "") + : ($todos ? "todo" : "pass"); printf OUT "<td class=\"result %s\"><a title=\"%s\" href=\"%s\">%u</a></td>", $class, $title, $href, $errors || $todos; $total_runs++; $total_tests += $tests; diff --git a/winetest/gather b/winetest/gather index bbe7cc0..d3bb878 100755 --- a/winetest/gather +++ b/winetest/gather @@ -282,6 +282,7 @@ foreach my $group (@groups) { next unless exists $group->{reports}; foreach my $report (@{$group->{reports}}, $group) { $report->{errors} = 0; + $report->{successes} = 0; $report->{todos} = 0; foreach my $testname (sort keys %alltests) { my $result = $report->{$testname}; @@ -298,6 +299,9 @@ foreach my $group (@groups) { } } } + foreach my $report (@{$group->{reports}}) { + $group->{successes}++ if !$report->{errors}; + } } # Write out the tables @@ -624,7 +628,7 @@ sub build_totals($) # Ignore groups with no reports next; } - printf TOTAL "%s %u %u %u %u\n", $report->{group}->{name}, $report_count, $unit_count, $report->{errors}, $report->{todos}; + printf TOTAL "%s %u %u %u %u %u\n", $report->{group}->{name}, $report_count, $unit_count, $report->{errors}, $report->{todos}, $report->{successes}; } close TOTAL; rename "$datadir/$build/total.txt.new", "$datadir/$build/total.txt" or unlink "$datadir/$build/total.txt";

1 0

Alexandre Julliard : winetest: Test URL is no longer needed for building winetest.exe.
by Alexandre Julliard March 4, 2009

March 4, 2009

Module: tools Branch: master Commit: eb6c0ad4108bc66ae97b74a6e8a25ad2619361ed URL: http://source.winehq.org/git/tools.git/?a=commit;h=eb6c0ad4108bc66ae97b74a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 12:04:37 2009 +0100 winetest: Test URL is no longer needed for building winetest.exe. --- winetest/make-winetest | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/winetest/make-winetest b/winetest/make-winetest index d104ede..4fcd05b 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -90,8 +90,7 @@ umask 022 make include && make -C dlls testsubdirs && cd programs/winetest && - echo "$desturl/winetest-$head.exe" > tests.url && - uname -a > build.nfo && + $mingw32-gcc -v 2> build.nfo && make dist) || exit # install everything @@ -117,8 +116,7 @@ umask 022 make include && make -C dlls testsubdirs && cd programs/winetest && - echo "$desturl/winetest64-$head.exe" > tests.url && - uname -a > build.nfo && + $mingw64-gcc -v 2> build.nfo && make dist) || exit chmod 644 build-mingw64/programs/winetest/winetest-dist.exe

1 0

Ricardo Filipe : setupapi: Implement SetupPromptForDiskA by wrapping around W version.
by Alexandre Julliard March 4, 2009

March 4, 2009

Module: wine Branch: master Commit: 24a10fc9aca34984a6372e21fdbcb3b83c36a812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a10fc9aca34984a6372e21f… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Mon Mar 2 16:21:28 2009 +0000 setupapi: Implement SetupPromptForDiskA by wrapping around W version. --- dlls/setupapi/dialog.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 14 -------------- 2 files changed, 45 insertions(+), 14 deletions(-) diff --git a/dlls/setupapi/dialog.c b/dlls/setupapi/dialog.c index aaa9453..21135cd 100644 --- a/dlls/setupapi/dialog.c +++ b/dlls/setupapi/dialog.c @@ -183,6 +183,51 @@ static INT_PTR CALLBACK promptdisk_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR } /*********************************************************************** + * SetupPromptForDiskA (SETUPAPI.@) + */ +UINT WINAPI SetupPromptForDiskA(HWND hwndParent, PCSTR DialogTitle, PCSTR DiskName, + PCSTR PathToSource, PCSTR FileSought, PCSTR TagFile, DWORD DiskPromptStyle, + PSTR PathBuffer, DWORD PathBufferSize, PDWORD PathRequiredSize) +{ + WCHAR *DialogTitleW, *DiskNameW, *PathToSourceW; + WCHAR *FileSoughtW, *TagFileW, PathBufferW[MAX_PATH]; + UINT ret, length; + + TRACE("%p, %s, %s, %s, %s, %s, 0x%08x, %p, %d, %p\n", hwndParent, debugstr_a(DialogTitle), + debugstr_a(DiskName), debugstr_a(PathToSource), debugstr_a(FileSought), + debugstr_a(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize, + PathRequiredSize); + + DialogTitleW = strdupAtoW(DialogTitle); + DiskNameW = strdupAtoW(DiskName); + PathToSourceW = strdupAtoW(PathToSource); + FileSoughtW = strdupAtoW(FileSought); + TagFileW = strdupAtoW(TagFile); + + ret = SetupPromptForDiskW(hwndParent, DialogTitleW, DiskNameW, PathToSourceW, + FileSoughtW, TagFileW, DiskPromptStyle, PathBufferW, MAX_PATH, PathRequiredSize); + + HeapFree(GetProcessHeap(), 0, DialogTitleW); + HeapFree(GetProcessHeap(), 0, DiskNameW); + HeapFree(GetProcessHeap(), 0, PathToSourceW); + HeapFree(GetProcessHeap(), 0, FileSoughtW); + HeapFree(GetProcessHeap(), 0, TagFileW); + + if(ret == DPROMPT_SUCCESS) + { + length = WideCharToMultiByte(CP_ACP, 0, PathBufferW, -1, NULL, 0, NULL, NULL); + if(PathRequiredSize) *PathRequiredSize = length; + if(PathBuffer) + { + if(length > PathBufferSize) + return DPROMPT_BUFFERTOOSMALL; + WideCharToMultiByte(CP_ACP, 0, PathBufferW, -1, PathBuffer, length, NULL, NULL); + } + } + return ret; +} + +/*********************************************************************** * SetupPromptForDiskW (SETUPAPI.@) */ UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR DiskName, diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 287cb7e..3997447 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -247,20 +247,6 @@ BOOL WINAPI SetupDiGetClassImageList(PSP_CLASSIMAGELIST_DATA ClassImageListData) } /*********************************************************************** - * SetupPromptForDiskA (SETUPAPI.@) - */ -UINT WINAPI SetupPromptForDiskA(HWND hwndParent, PCSTR DialogTitle, PCSTR DiskName, - PCSTR PathToSource, PCSTR FileSought, PCSTR TagFile, DWORD DiskPromptStyle, - PSTR PathBuffer, DWORD PathBufferSize, PDWORD PathRequiredSize) -{ - FIXME("%p %s %s %s %s %s %d %p %d %p: stub\n", hwndParent, debugstr_a(DialogTitle), - debugstr_a(DiskName), debugstr_a(PathToSource), debugstr_a(FileSought), - debugstr_a(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize, - PathRequiredSize); - return 0; -} - -/*********************************************************************** * CM_Locate_DevNodeA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags)

1 0

Jörg Höhle : d3d9/tests: Fix typos in text.
by Alexandre Julliard March 4, 2009

March 4, 2009

Module: wine Branch: master Commit: 7a4ed158840d7665a4e34aa29196cce5b0668842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a4ed158840d7665a4e34aa29… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Mar 2 09:11:59 2009 +0100 d3d9/tests: Fix typos in text. --- dlls/d3d9/tests/visual.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4cb3497..cf589a5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8578,23 +8578,23 @@ static void pointsize_test(IDirect3DDevice9 *device) /* ptsize = 16, ptsize_max = 1 --> point has size 1 */ color = getPixelColor(device, 448-4, 64-4); - ok(color == 0x000000ff, "pSize: Pixel (448-4),(64-4) has color 0x%08x, expected 0x00ffffff\n", color); + ok(color == 0x000000ff, "pSize: Pixel (448-4),(64-4) has color 0x%08x, expected 0x000000ff\n", color); color = getPixelColor(device, 448+4, 64+4); - ok(color == 0x000000ff, "pSize: Pixel (448+4),(64+4) has color 0x%08x, expected 0x00ffffff\n", color); + ok(color == 0x000000ff, "pSize: Pixel (448+4),(64+4) has color 0x%08x, expected 0x000000ff\n", color); /* ptsize = 4, ptsize_max = 1, ptsize_min = 16 --> point has size 1 */ color = getPixelColor(device, 512-4, 64-4); - ok(color == 0x000000ff, "pSize: Pixel (448-4),(64-4) has color 0x%08x, expected 0x00ffffff\n", color); + ok(color == 0x000000ff, "pSize: Pixel (512-4),(64-4) has color 0x%08x, expected 0x000000ff\n", color); color = getPixelColor(device, 512+4, 64+4); - ok(color == 0x000000ff, "pSize: Pixel (448+4),(64+4) has color 0x%08x, expected 0x00ffffff\n", color); + ok(color == 0x000000ff, "pSize: Pixel (512+4),(64+4) has color 0x%08x, expected 0x000000ff\n", color); /* ptsize = 1, ptsize_max = default(64), ptsize_min = 16 --> point has size 16 * Don't be overly picky - just show that the point is bigger than 1 pixel */ color = getPixelColor(device, 576-4, 64-4); - ok(color == 0x00ffffff, "pSize: Pixel (448-4),(64-4) has color 0x%08x, expected 0x00ffffff\n", color); + ok(color == 0x00ffffff, "pSize: Pixel (576-4),(64-4) has color 0x%08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 576+4, 64+4); - ok(color == 0x00ffffff, "pSize: Pixel (448+4),(64+4) has color 0x%08x, expected 0x00ffffff\n", color); + ok(color == 0x00ffffff, "pSize: Pixel (576+4),(64+4) has color 0x%08x, expected 0x00ffffff\n", color); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSIZE, *((DWORD *) (&ptsize_orig))); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed hr=%08x\n", hr); @@ -8878,7 +8878,7 @@ static void pixelshader_blending_test(IDirect3DDevice9 *device) b0 >= max(b1, 1) - 1 && b0 <= b1 + 1, "Offscreen failed for %s: Got color %#08x, expected %#08x.\n", test_formats[fmt_index].fmtName, color, test_formats[fmt_index].resultColorBlending); } else { - /* No pixel shader blending is supported so expected garbage.The type of 'garbage' depends on the driver version and OS. + /* No pixel shader blending is supported so expect garbage. The type of 'garbage' depends on the driver version and OS. * E.g. on G16R16 ati reports (on old r9600 drivers) 0x00ffffff and on modern ones 0x002010ff which is also what Nvidia * reports. On Vista Nvidia seems to report 0x00ffffff on Geforce7 cards. */ color = getPixelColor(device, 320, 240);

1 0

Alexandre Julliard : kernel32/tests: Improve some failure messages in the pipe tests.
by Alexandre Julliard March 4, 2009

March 4, 2009

Module: wine Branch: master Commit: 3e84960c2042aa7e4e420b01e5a19e9045c4dea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e84960c2042aa7e4e420b01e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 15:45:48 2009 +0100 kernel32/tests: Improve some failure messages in the pipe tests. --- dlls/kernel32/tests/pipe.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index f4c5ad4..51197ec 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -670,8 +670,8 @@ static DWORD CALLBACK serverThreadMain4(LPVOID arg) trace("Server calling overlapped ConnectNamedPipe...\n"); success = ConnectNamedPipe(hnp, &oConnect); err = GetLastError(); - ok(!success && (err == ERROR_IO_PENDING || err == ERROR_PIPE_CONNECTED) , "overlapped ConnectNamedPipe\n"); - trace("overlapped ConnectNamedPipe returned.\n"); + ok(!success && (err == ERROR_IO_PENDING || err == ERROR_PIPE_CONNECTED), + "overlapped ConnectNamedPipe got %u err %u\n", success, err ); if (!success && err == ERROR_IO_PENDING) { trace("ConnectNamedPipe GetQueuedCompletionStatus\n"); success = GetQueuedCompletionStatus(hcompletion, &dummy, &compkey, &oResult, 0); @@ -712,7 +712,7 @@ static DWORD CALLBACK serverThreadMain4(LPVOID arg) success = WriteFile(hnp, buf, readden, &written, &oWrite); trace("Server WriteFile returned...\n"); err = GetLastError(); - ok(success || err == ERROR_IO_PENDING, "overlapped WriteFile\n"); + ok(success || err == ERROR_IO_PENDING, "overlapped WriteFile failed, err=%u\n", err); success = GetQueuedCompletionStatus(hcompletion, &written, &compkey, &oResult, 10000); ok(success, "WriteFile GetQueuedCompletionStatus failed, errno=%i\n", GetLastError()); @@ -726,7 +726,8 @@ static DWORD CALLBACK serverThreadMain4(LPVOID arg) /* finish this connection, wait for next one */ ok(FlushFileBuffers(hnp), "FlushFileBuffers\n"); - ok(DisconnectNamedPipe(hnp), "DisconnectNamedPipe\n"); + success = DisconnectNamedPipe(hnp); + ok(success, "DisconnectNamedPipe failed, err %u\n", GetLastError()); } ok(CloseHandle(hnp), "CloseHandle named pipe failed, err=%i\n", GetLastError());

1 0

Paul Vriens : kernel32/tests: Correct an ok() statement.
by Alexandre Julliard March 4, 2009

March 4, 2009

Module: wine Branch: master Commit: 54845cd40afef51a2c55f617c1f746ab833d59ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=54845cd40afef51a2c55f617c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Mar 4 13:55:07 2009 +0100 kernel32/tests: Correct an ok() statement. --- dlls/kernel32/tests/console.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index fa94679..a54ff5c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -942,7 +942,8 @@ START_TEST(console) ok(hConIn != INVALID_HANDLE_VALUE, "Opening ConIn\n"); ok(hConOut != INVALID_HANDLE_VALUE, "Opening ConOut\n"); - ok(ret = GetConsoleScreenBufferInfo(hConOut, &sbi), "Getting sb info\n"); + ret = GetConsoleScreenBufferInfo(hConOut, &sbi); + ok(ret, "Getting sb info\n"); if (!ret) return; /* Non interactive tests */

1 0

Alexandre Julliard : user32: Make mouse. drv into a stand-alone 16-bit module.
by Alexandre Julliard March 4, 2009

March 4, 2009

Module: wine Branch: master Commit: d62c05f72049c25f317ff3c538c33c5069e11902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62c05f72049c25f317ff3c53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:32:56 2009 +0100 user32: Make mouse.drv into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 3 +-- dlls/mouse.drv16/Makefile.in | 19 +++++++++++++++++++ dlls/{user32/mouse16.c => mouse.drv16/mouse.c} | 6 +++--- .../mouse.drv16.spec} | 6 +++--- dlls/{user32/resources => mouse.drv16}/mouse.rc | 0 dlls/user32/Makefile.in | 9 --------- 9 files changed, 38 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 9247205..4f084d3 100644 --- a/.gitignore +++ b/.gitignore @@ -47,7 +47,6 @@ dlls/libwinspool.def dlls/libxinput.def dlls/lzexpand.dll16 dlls/mmsystem.dll16 -dlls/mouse.drv16 dlls/msacm.dll16 dlls/mshtml.tlb/mshtml_tlb.tlb dlls/mshtml/nsiface.h diff --git a/configure b/configure index 30f8970..f182c34 100755 --- a/configure +++ b/configure @@ -3908,6 +3908,7 @@ then enable_keyboard_drv16=${enable_keyboard_drv16:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} + enable_mouse_drv16=${enable_mouse_drv16:-no} enable_stress_dll16=${enable_stress_dll16:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no} @@ -25786,6 +25787,14 @@ dlls/mountmgr.sys/Makefile: dlls/mountmgr.sys/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mountmgr.sys/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/mouse.drv16/Makefile" +test "x$enable_mouse_drv16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + mouse.drv16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/mouse.drv16/Makefile: dlls/mouse.drv16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/mouse.drv16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mpr/Makefile" test "x$enable_mpr" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ mpr" @@ -28886,6 +28895,7 @@ do "dlls/mmdevldr.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmdevldr.vxd/Makefile" ;; "dlls/monodebg.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/monodebg.vxd/Makefile" ;; "dlls/mountmgr.sys/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mountmgr.sys/Makefile" ;; + "dlls/mouse.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mouse.drv16/Makefile" ;; "dlls/mpr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mpr/Makefile" ;; "dlls/mprapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mprapi/Makefile" ;; "dlls/msacm32.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msacm32.drv/Makefile" ;; diff --git a/configure.ac b/configure.ac index f9b2e04..c5ac0db 100644 --- a/configure.ac +++ b/configure.ac @@ -145,6 +145,7 @@ then enable_keyboard_drv16=${enable_keyboard_drv16:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} + enable_mouse_drv16=${enable_mouse_drv16:-no} enable_stress_dll16=${enable_stress_dll16:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no} @@ -2060,6 +2061,7 @@ WINE_CONFIG_MAKEFILE([dlls/mlang/tests/Makefile],[dlls/Maketest.rules],[dlls],[A WINE_CONFIG_MAKEFILE([dlls/mmdevldr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/monodebg.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mountmgr.sys/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mouse.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mpr/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mprapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/msacm32.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index def2518..84f9363 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -29,7 +29,6 @@ WIN16_FILES = \ krnl386.exe16 \ lzexpand.dll16 \ mmsystem.dll16 \ - mouse.drv16 \ msacm.dll16 \ msvideo.dll16 \ ole2.dll16 \ @@ -120,7 +119,7 @@ shell.dll16: twain.dll16: echo "twain_32.dll" >$@ -ddeml.dll16 mouse.drv16 user.exe16: +ddeml.dll16 user.exe16: echo "user32.dll" >$@ ver.dll16: diff --git a/dlls/mouse.drv16/Makefile.in b/dlls/mouse.drv16/Makefile.in new file mode 100644 index 0000000..982e9b7 --- /dev/null +++ b/dlls/mouse.drv16/Makefile.in @@ -0,0 +1,19 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mouse.drv16 +IMPORTS = user32 kernel32 + +EXTRADLLFLAGS = -Wb,--subsystem,win16 +EXTRARCFLAGS = -O res16 + +SPEC_SRCS = mouse.drv16.spec + +C_SRCS = mouse.c + +RC_SRCS = mouse.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/user32/mouse16.c b/dlls/mouse.drv16/mouse.c similarity index 94% rename from dlls/user32/mouse16.c rename to dlls/mouse.drv16/mouse.c index 7cb653d..b2e074e 100644 --- a/dlls/user32/mouse16.c +++ b/dlls/mouse.drv16/mouse.c @@ -47,7 +47,7 @@ static FARPROC16 DefMouseEventProc; /*********************************************************************** * Inquire (MOUSE.1) */ -WORD WINAPI MOUSE_Inquire(LPMOUSEINFO mouseInfo) +WORD WINAPI Inquire16(LPMOUSEINFO mouseInfo) { mouseInfo->msExist = TRUE; mouseInfo->msRelative = FALSE; @@ -65,7 +65,7 @@ WORD WINAPI MOUSE_Inquire(LPMOUSEINFO mouseInfo) /*********************************************************************** * Enable (MOUSE.2) */ -VOID WINAPI MOUSE_Enable( FARPROC16 proc ) +VOID WINAPI Enable16( FARPROC16 proc ) { DefMouseEventProc = proc; } @@ -73,7 +73,7 @@ VOID WINAPI MOUSE_Enable( FARPROC16 proc ) /*********************************************************************** * Disable (MOUSE.3) */ -VOID WINAPI MOUSE_Disable(VOID) +VOID WINAPI Disable16(void) { DefMouseEventProc = 0; } diff --git a/dlls/user32/mouse.drv.spec b/dlls/mouse.drv16/mouse.drv16.spec similarity index 53% rename from dlls/user32/mouse.drv.spec rename to dlls/mouse.drv16/mouse.drv16.spec index 71d406c..c45cc6a 100644 --- a/dlls/user32/mouse.drv.spec +++ b/dlls/mouse.drv16/mouse.drv16.spec @@ -1,6 +1,6 @@ -1 pascal -ret16 Inquire(ptr) MOUSE_Inquire -2 pascal -ret16 Enable(segptr) MOUSE_Enable -3 pascal -ret16 Disable() MOUSE_Disable +1 pascal -ret16 Inquire(ptr) Inquire16 +2 pascal -ret16 Enable(segptr) Enable16 +3 pascal -ret16 Disable() Disable16 4 stub MOUSEGETINTVECT 5 stub GETSETMOUSEDATA #Control Panel thinks this is implemented if it is available diff --git a/dlls/user32/resources/mouse.rc b/dlls/mouse.drv16/mouse.rc similarity index 100% rename from dlls/user32/resources/mouse.rc rename to dlls/mouse.drv16/mouse.rc diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 511db73..da8cb8c 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -10,7 +10,6 @@ DELAYIMPORTS = imm32 SPEC_SRCS16 = \ ddeml.spec \ - mouse.drv.spec \ user.exe.spec C_SRCS = \ @@ -67,7 +66,6 @@ C_SRCS16 = \ bidi16.c \ comm16.c \ hook16.c \ - mouse16.c \ network.c \ user16.c \ wnd16.c @@ -77,7 +75,6 @@ RC_SRCS = resources/user32.rc SVG_SRCS = resources/oic_winlogo.svg RC_SRCS16 = \ - resources/mouse.rc \ resources/version16.rc EXTRASUBDIRS = resources @@ -89,12 +86,6 @@ EXTRASUBDIRS = resources user.exe.spec.o: user.exe.spec resources/version16.res $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --heap 65520 --main-module $(MODULE) --res resources/version16.res --export $(SRCDIR)/user.exe.spec -mouse.drv.spec.o: mouse.drv.spec resources/mouse.res - $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --main-module $(MODULE) --res resources/mouse.res --export $(SRCDIR)/mouse.drv.spec - -resources/mouse.res: resources/mouse.rc - $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/mouse.rc - resources/version16.res: resources/version16.rc $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/version16.rc

1 0

Alexandre Julliard : user32: Make keyboard. drv into a stand-alone 16-bit module.
by Alexandre Julliard March 4, 2009

March 4, 2009

Module: wine Branch: master Commit: c2e52469fe089a5232b5c0d2aeb7606f5847f5ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2e52469fe089a5232b5c0d2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:30:37 2009 +0100 user32: Make keyboard.drv into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 +++++ configure.ac | 2 + dlls/Makefile.in | 3 +- dlls/keyboard.drv16/Makefile.in | 15 ++++++++ dlls/{user32/kbd16.c => keyboard.drv16/keyboard.c} | 39 ++++++-------------- .../keyboard.drv16.spec} | 6 ++-- dlls/user32/Makefile.in | 2 - 8 files changed, 43 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 3dddfaf..9247205 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,6 @@ dlls/kernel32/nls/winerr_enu.mc.rc dlls/kernel32/nls/winerr_fra.mc.rc dlls/kernel32/nls/winerr_kor.mc.rc dlls/kernel32/nls/winerr_nor.mc.rc -dlls/keyboard.drv16 dlls/krnl386.exe16 dlls/libd3dx9.def dlls/libwinspool.def diff --git a/configure b/configure index ab40d14..30f8970 100755 --- a/configure +++ b/configure @@ -3905,6 +3905,7 @@ then enable_dispdib_dll16=${enable_dispdib_dll16:-no} enable_display_drv16=${enable_display_drv16:-no} enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} + enable_keyboard_drv16=${enable_keyboard_drv16:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} enable_stress_dll16=${enable_stress_dll16:-no} @@ -25617,6 +25618,14 @@ dlls/kernel32/tests/Makefile: dlls/kernel32/tests/Makefile.in dlls/Maketest.rule ac_config_files="$ac_config_files dlls/kernel32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/keyboard.drv16/Makefile" +test "x$enable_keyboard_drv16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + keyboard.drv16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/keyboard.drv16/Makefile: dlls/keyboard.drv16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/keyboard.drv16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/loadperf/Makefile" test "x$enable_loadperf" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ loadperf" @@ -28856,6 +28865,7 @@ do "dlls/jscript/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/jscript/tests/Makefile" ;; "dlls/kernel32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/kernel32/Makefile" ;; "dlls/kernel32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/kernel32/tests/Makefile" ;; + "dlls/keyboard.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/keyboard.drv16/Makefile" ;; "dlls/loadperf/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/loadperf/Makefile" ;; "dlls/localspl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localspl/Makefile" ;; "dlls/localspl/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localspl/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index 8322dbf..f9b2e04 100644 --- a/configure.ac +++ b/configure.ac @@ -142,6 +142,7 @@ then enable_dispdib_dll16=${enable_dispdib_dll16:-no} enable_display_drv16=${enable_display_drv16:-no} enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} + enable_keyboard_drv16=${enable_keyboard_drv16:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} enable_stress_dll16=${enable_stress_dll16:-no} @@ -2038,6 +2039,7 @@ WINE_CONFIG_MAKEFILE([dlls/jscript/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL WINE_CONFIG_MAKEFILE([dlls/jscript/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/kernel32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/kernel32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/keyboard.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/loadperf/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/localspl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/localspl/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index e09d7cb..def2518 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -26,7 +26,6 @@ WIN16_FILES = \ ddeml.dll16 \ gdi.exe16 \ imm.dll16 \ - keyboard.drv16 \ krnl386.exe16 \ lzexpand.dll16 \ mmsystem.dll16 \ @@ -121,7 +120,7 @@ shell.dll16: twain.dll16: echo "twain_32.dll" >$@ -ddeml.dll16 keyboard.drv16 mouse.drv16 user.exe16: +ddeml.dll16 mouse.drv16 user.exe16: echo "user32.dll" >$@ ver.dll16: diff --git a/dlls/keyboard.drv16/Makefile.in b/dlls/keyboard.drv16/Makefile.in new file mode 100644 index 0000000..ef8c36c --- /dev/null +++ b/dlls/keyboard.drv16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = keyboard.drv16 +IMPORTS = user32 kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16 + +SPEC_SRCS = keyboard.drv16.spec + +C_SRCS = keyboard.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/user32/kbd16.c b/dlls/keyboard.drv16/keyboard.c similarity index 84% rename from dlls/user32/kbd16.c rename to dlls/keyboard.drv16/keyboard.c index ffc53ef..f42ee4b 100644 --- a/dlls/user32/kbd16.c +++ b/dlls/keyboard.drv16/keyboard.c @@ -54,7 +54,7 @@ static LPBYTE pKeyStateTable; /*********************************************************************** * Inquire (KEYBOARD.1) */ -WORD WINAPI KEYBOARD_Inquire(LPKBINFO kbInfo) +WORD WINAPI Inquire16(LPKBINFO kbInfo) { kbInfo->Begin_First_Range = 0; kbInfo->End_First_Range = 0; @@ -68,7 +68,7 @@ WORD WINAPI KEYBOARD_Inquire(LPKBINFO kbInfo) /*********************************************************************** * Enable (KEYBOARD.2) */ -VOID WINAPI KEYBOARD_Enable( FARPROC16 proc, LPBYTE lpKeyState ) +VOID WINAPI Enable16( FARPROC16 proc, LPBYTE lpKeyState ) { DefKeybEventProc = proc; pKeyStateTable = lpKeyState; @@ -79,12 +79,21 @@ VOID WINAPI KEYBOARD_Enable( FARPROC16 proc, LPBYTE lpKeyState ) /*********************************************************************** * Disable (KEYBOARD.3) */ -VOID WINAPI KEYBOARD_Disable(VOID) +VOID WINAPI Disable16(VOID) { DefKeybEventProc = NULL; pKeyStateTable = NULL; } +/**************************************************************************** + * ToAscii (KEYBOARD.4) + */ +INT16 WINAPI ToAscii16(UINT16 virtKey,UINT16 scanCode, LPBYTE lpKeyState, + LPVOID lpChar, UINT16 flags) +{ + return ToAscii( virtKey, scanCode, lpKeyState, lpChar, flags ); +} + /*********************************************************************** * AnsiToOem (KEYBOARD.5) */ @@ -185,27 +194,3 @@ void WINAPI OemToAnsiBuff16( LPCSTR s, LPSTR d, UINT16 len ) { if (len != 0) OemToCharBuffA( s, d, len ); } - -/**************************************************************************** - * ToAscii (KEYBOARD.4) - * - * The ToAscii function translates the specified virtual-key code and keyboard - * state to the corresponding Windows character or characters. - * - * If the specified key is a dead key, the return value is negative. Otherwise, - * it is one of the following values: - * Value Meaning - * 0 The specified virtual key has no translation for the current state of the keyboard. - * 1 One Windows character was copied to the buffer. - * 2 Two characters were copied to the buffer. This usually happens when a - * dead-key character (accent or diacritic) stored in the keyboard layout cannot - * be composed with the specified virtual key to form a single character. - * - * FIXME : should do the above (return 2 for non matching deadchar+char combinations) - * - */ -INT16 WINAPI ToAscii16(UINT16 virtKey,UINT16 scanCode, LPBYTE lpKeyState, - LPVOID lpChar, UINT16 flags) -{ - return ToAscii( virtKey, scanCode, lpKeyState, lpChar, flags ); -} diff --git a/dlls/user32/keyboard.drv.spec b/dlls/keyboard.drv16/keyboard.drv16.spec similarity index 86% rename from dlls/user32/keyboard.drv.spec rename to dlls/keyboard.drv16/keyboard.drv16.spec index 230b18e..88dc7a7 100644 --- a/dlls/user32/keyboard.drv.spec +++ b/dlls/keyboard.drv16/keyboard.drv16.spec @@ -1,6 +1,6 @@ -1 pascal -ret16 Inquire(ptr) KEYBOARD_Inquire -2 pascal -ret16 Enable(segptr ptr) KEYBOARD_Enable -3 pascal -ret16 Disable() KEYBOARD_Disable +1 pascal -ret16 Inquire(ptr) Inquire16 +2 pascal -ret16 Enable(segptr ptr) Enable16 +3 pascal -ret16 Disable() Disable16 4 pascal -ret16 ToAscii(word word ptr ptr word) ToAscii16 5 pascal -ret16 AnsiToOem(str ptr) AnsiToOem16 6 pascal -ret16 OemToAnsi(str ptr) OemToAnsi16 diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 2bfc65b..511db73 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -10,7 +10,6 @@ DELAYIMPORTS = imm32 SPEC_SRCS16 = \ ddeml.spec \ - keyboard.drv.spec \ mouse.drv.spec \ user.exe.spec @@ -68,7 +67,6 @@ C_SRCS16 = \ bidi16.c \ comm16.c \ hook16.c \ - kbd16.c \ mouse16.c \ network.c \ user16.c \

1 0

Alexandre Julliard : user32: Make display. drv into a stand-alone 16-bit module.
by Alexandre Julliard March 4, 2009

March 4, 2009

Module: wine Branch: master Commit: 02ada6e477096528b58b2cb4c103139e872cb600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ada6e477096528b58b2cb4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:28:32 2009 +0100 user32: Make display.drv into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 3 +-- dlls/display.drv16/Makefile.in | 19 +++++++++++++++++++ dlls/{user32 => display.drv16}/display.c | 13 ++++++------- .../display.drv16.spec} | 8 ++++---- .../{user32/resources => display.drv16}/display.rc | 4 ++-- dlls/display.drv16/oic_hand.ico | Bin 0 -> 766 bytes dlls/user32/Makefile.in | 9 --------- 10 files changed, 44 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 3ac1e38..3dddfaf 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,6 @@ dlls/compobj.dll16 dlls/ctl3d.dll16 dlls/ctl3dv2.dll16 dlls/ddeml.dll16 -dlls/display.drv16 dlls/gdi.exe16 dlls/imm.dll16 dlls/jscript/jsglobal.tlb diff --git a/configure b/configure index f050c84..ab40d14 100755 --- a/configure +++ b/configure @@ -3903,6 +3903,7 @@ then WIN16_INSTALL="" enable_comm_drv16=${enable_comm_drv16:-no} enable_dispdib_dll16=${enable_dispdib_dll16:-no} + enable_display_drv16=${enable_display_drv16:-no} enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} @@ -25032,6 +25033,14 @@ dlls/dispdib.dll16/Makefile: dlls/dispdib.dll16/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dispdib.dll16/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/display.drv16/Makefile" +test "x$enable_display_drv16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + display.drv16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/display.drv16/Makefile: dlls/display.drv16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/display.drv16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dmband/Makefile" test "x$enable_dmband" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ dmband" @@ -28774,6 +28783,7 @@ do "dlls/dinput/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dinput/tests/Makefile" ;; "dlls/dinput8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dinput8/Makefile" ;; "dlls/dispdib.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dispdib.dll16/Makefile" ;; + "dlls/display.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/display.drv16/Makefile" ;; "dlls/dmband/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmband/Makefile" ;; "dlls/dmcompos/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmcompos/Makefile" ;; "dlls/dmime/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmime/Makefile" ;; diff --git a/configure.ac b/configure.ac index 68cf600..8322dbf 100644 --- a/configure.ac +++ b/configure.ac @@ -140,6 +140,7 @@ then WIN16_INSTALL="" enable_comm_drv16=${enable_comm_drv16:-no} enable_dispdib_dll16=${enable_dispdib_dll16:-no} + enable_display_drv16=${enable_display_drv16:-no} enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} @@ -1964,6 +1965,7 @@ WINE_CONFIG_MAKEFILE([dlls/dinput/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/dinput/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/dinput8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dispdib.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/display.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dmband/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dmcompos/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dmime/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 340e8b6..e09d7cb 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -24,7 +24,6 @@ WIN16_FILES = \ ctl3d.dll16 \ ctl3dv2.dll16 \ ddeml.dll16 \ - display.drv16 \ gdi.exe16 \ imm.dll16 \ keyboard.drv16 \ @@ -122,7 +121,7 @@ shell.dll16: twain.dll16: echo "twain_32.dll" >$@ -ddeml.dll16 display.drv16 keyboard.drv16 mouse.drv16 user.exe16: +ddeml.dll16 keyboard.drv16 mouse.drv16 user.exe16: echo "user32.dll" >$@ ver.dll16: diff --git a/dlls/display.drv16/Makefile.in b/dlls/display.drv16/Makefile.in new file mode 100644 index 0000000..06c0531 --- /dev/null +++ b/dlls/display.drv16/Makefile.in @@ -0,0 +1,19 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = display.drv16 +IMPORTS = user32 kernel32 + +EXTRADLLFLAGS = -Wb,--subsystem,win16 +EXTRARCFLAGS = -O res16 + +SPEC_SRCS = display.drv16.spec + +C_SRCS = display.c + +RC_SRCS = display.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/user32/display.c b/dlls/display.drv16/display.c similarity index 87% rename from dlls/user32/display.c rename to dlls/display.drv16/display.c index 4288738..2476b63 100644 --- a/dlls/user32/display.c +++ b/dlls/display.drv16/display.c @@ -23,7 +23,6 @@ #include "wine/debug.h" #include "windef.h" #include "winbase.h" -#include "user_private.h" #include "wine/winuser16.h" WINE_DEFAULT_DEBUG_CHANNEL(cursor); @@ -39,7 +38,7 @@ typedef struct tagCURSORINFO16 /*********************************************************************** * Inquire (DISPLAY.101) */ -WORD WINAPI DISPLAY_Inquire(LPCURSORINFO16 lpCursorInfo) +WORD WINAPI Inquire16(LPCURSORINFO16 lpCursorInfo) { lpCursorInfo->wXMickeys = 1; lpCursorInfo->wYMickeys = 1; @@ -52,21 +51,21 @@ WORD WINAPI DISPLAY_Inquire(LPCURSORINFO16 lpCursorInfo) */ VOID WINAPI DISPLAY_SetCursor( struct tagCURSORICONINFO *lpCursor ) { - USER_Driver->pSetCursor(lpCursor); + FIXME("stub\n" ); } /*********************************************************************** * MoveCursor (DISPLAY.103) */ -VOID WINAPI DISPLAY_MoveCursor( WORD wAbsX, WORD wAbsY ) +VOID WINAPI MoveCursor16( WORD wAbsX, WORD wAbsY ) { - USER_Driver->pSetCursorPos(wAbsX, wAbsY); + SetCursorPos( wAbsX, wAbsY ); } /*********************************************************************** * CheckCursor (DISPLAY.104) */ -VOID WINAPI DISPLAY_CheckCursor( void ) +VOID WINAPI CheckCursor16( void ) { TRACE("stub\n" ); } @@ -79,7 +78,7 @@ VOID WINAPI DISPLAY_CheckCursor( void ) * wQueriedResID is the ID USER asks about. * lpsResName does often contain "OEMBIN". */ -DWORD WINAPI DISPLAY_GetDriverResourceID( WORD wQueriedResID, LPSTR lpsResName ) +DWORD WINAPI GetDriverResourceID16( WORD wQueriedResID, LPSTR lpsResName ) { if (wQueriedResID == 3) return (DWORD)1; diff --git a/dlls/user32/display.drv.spec b/dlls/display.drv16/display.drv16.spec similarity index 83% rename from dlls/user32/display.drv.spec rename to dlls/display.drv16/display.drv16.spec index 2a805d6..dc4ee5d 100644 --- a/dlls/user32/display.drv.spec +++ b/dlls/display.drv16/display.drv16.spec @@ -40,15 +40,15 @@ 90 stub Do_Polylines 91 stub Do_Scanlines 92 stub SaveScreenBitmap -101 pascal -ret16 Inquire(ptr) DISPLAY_Inquire +101 pascal -ret16 Inquire(ptr) Inquire16 102 pascal -ret16 SetCursor(ptr) DISPLAY_SetCursor -103 pascal -ret16 MoveCursor(word word) DISPLAY_MoveCursor -104 pascal -ret16 CheckCursor() DISPLAY_CheckCursor +103 pascal -ret16 MoveCursor(word word) MoveCursor16 +104 pascal -ret16 CheckCursor() CheckCursor16 400 stub PExtTextOut 401 stub PStrBlt 402 stub RExtTextOut 403 stub RStrBlt -450 pascal GetDriverResourceID(word str) DISPLAY_GetDriverResourceID +450 pascal GetDriverResourceID(word str) GetDriverResourceID16 500 pascal -ret16 UserRepaintDisable(word) UserRepaintDisable16 501 stub ORDINAL_ONLY1 502 stub ORDINAL_ONLY2 diff --git a/dlls/user32/resources/display.rc b/dlls/display.drv16/display.rc similarity index 96% rename from dlls/user32/resources/display.rc rename to dlls/display.drv16/display.rc index 243bf2d..570ab8f 100644 --- a/dlls/user32/resources/display.rc +++ b/dlls/display.drv16/display.rc @@ -53,5 +53,5 @@ 0x00000000L /* inactive caption text */ } -/* @makedep: resources/oic_hand.ico */ -1 ICON resources/oic_hand.ico +/* @makedep: oic_hand.ico */ +1 ICON oic_hand.ico diff --git a/dlls/display.drv16/oic_hand.ico b/dlls/display.drv16/oic_hand.ico new file mode 100644 index 0000000..502f1ac Binary files /dev/null and b/dlls/display.drv16/oic_hand.ico differ diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 28d6fbd..2bfc65b 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -10,7 +10,6 @@ DELAYIMPORTS = imm32 SPEC_SRCS16 = \ ddeml.spec \ - display.drv.spec \ keyboard.drv.spec \ mouse.drv.spec \ user.exe.spec @@ -68,7 +67,6 @@ C_SRCS = \ C_SRCS16 = \ bidi16.c \ comm16.c \ - display.c \ hook16.c \ kbd16.c \ mouse16.c \ @@ -81,7 +79,6 @@ RC_SRCS = resources/user32.rc SVG_SRCS = resources/oic_winlogo.svg RC_SRCS16 = \ - resources/display.rc \ resources/mouse.rc \ resources/version16.rc @@ -94,15 +91,9 @@ EXTRASUBDIRS = resources user.exe.spec.o: user.exe.spec resources/version16.res $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --heap 65520 --main-module $(MODULE) --res resources/version16.res --export $(SRCDIR)/user.exe.spec -display.drv.spec.o: display.drv.spec resources/display.res - $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --main-module $(MODULE) --res resources/display.res --export $(SRCDIR)/display.drv.spec - mouse.drv.spec.o: mouse.drv.spec resources/mouse.res $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --main-module $(MODULE) --res resources/mouse.res --export $(SRCDIR)/mouse.drv.spec -resources/display.res: resources/display.rc - $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/display.rc - resources/mouse.res: resources/mouse.rc $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/mouse.rc

1 0

Alexandre Julliard : gdi32: Make dispdib. dll into a stand-alone 16-bit module.
by Alexandre Julliard March 4, 2009

March 4, 2009

Module: wine Branch: master Commit: 86f54f4c8900db155ad9b11fabf644e0c1b644f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f54f4c8900db155ad9b11fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:27:05 2009 +0100 gdi32: Make dispdib.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 3 +-- dlls/dispdib.dll16/Makefile.in | 15 +++++++++++++++ dlls/{gdi32 => dispdib.dll16}/dispdib.c | 0 .../dispdib.dll16.spec} | 0 dlls/gdi32/Makefile.in | 2 -- 8 files changed, 28 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e2f73cc..3ac1e38 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,6 @@ dlls/compobj.dll16 dlls/ctl3d.dll16 dlls/ctl3dv2.dll16 dlls/ddeml.dll16 -dlls/dispdib.dll16 dlls/display.drv16 dlls/gdi.exe16 dlls/imm.dll16 diff --git a/configure b/configure index 605d713..f050c84 100755 --- a/configure +++ b/configure @@ -3902,6 +3902,7 @@ then WIN16_FILES="" WIN16_INSTALL="" enable_comm_drv16=${enable_comm_drv16:-no} + enable_dispdib_dll16=${enable_dispdib_dll16:-no} enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} @@ -25023,6 +25024,14 @@ dlls/dinput8/Makefile: dlls/dinput8/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dinput8/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/dispdib.dll16/Makefile" +test "x$enable_dispdib_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + dispdib.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/dispdib.dll16/Makefile: dlls/dispdib.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/dispdib.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dmband/Makefile" test "x$enable_dmband" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ dmband" @@ -28764,6 +28773,7 @@ do "dlls/dinput/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dinput/Makefile" ;; "dlls/dinput/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dinput/tests/Makefile" ;; "dlls/dinput8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dinput8/Makefile" ;; + "dlls/dispdib.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dispdib.dll16/Makefile" ;; "dlls/dmband/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmband/Makefile" ;; "dlls/dmcompos/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmcompos/Makefile" ;; "dlls/dmime/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dmime/Makefile" ;; diff --git a/configure.ac b/configure.ac index 41ba254..68cf600 100644 --- a/configure.ac +++ b/configure.ac @@ -139,6 +139,7 @@ then WIN16_FILES="" WIN16_INSTALL="" enable_comm_drv16=${enable_comm_drv16:-no} + enable_dispdib_dll16=${enable_dispdib_dll16:-no} enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} @@ -1962,6 +1963,7 @@ WINE_CONFIG_MAKEFILE([dlls/devenum/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL WINE_CONFIG_MAKEFILE([dlls/dinput/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dinput/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/dinput8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dispdib.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dmband/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dmcompos/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dmime/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index fe71dc6..340e8b6 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -24,7 +24,6 @@ WIN16_FILES = \ ctl3d.dll16 \ ctl3dv2.dll16 \ ddeml.dll16 \ - dispdib.dll16 \ display.drv16 \ gdi.exe16 \ imm.dll16 \ @@ -81,7 +80,7 @@ commdlg.dll16: ctl3d.dll16 ctl3dv2.dll16: echo "ctl3d32.dll" >$@ -dispdib.dll16 gdi.exe16 wing.dll16: +gdi.exe16 wing.dll16: echo "gdi32.dll" >$@ imm.dll16: diff --git a/dlls/dispdib.dll16/Makefile.in b/dlls/dispdib.dll16/Makefile.in new file mode 100644 index 0000000..9671dd3 --- /dev/null +++ b/dlls/dispdib.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = dispdib.dll16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16 + +SPEC_SRCS = dispdib.dll16.spec + +C_SRCS = dispdib.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/gdi32/dispdib.c b/dlls/dispdib.dll16/dispdib.c similarity index 100% rename from dlls/gdi32/dispdib.c rename to dlls/dispdib.dll16/dispdib.c diff --git a/dlls/gdi32/dispdib.spec b/dlls/dispdib.dll16/dispdib.dll16.spec similarity index 100% rename from dlls/gdi32/dispdib.spec rename to dlls/dispdib.dll16/dispdib.dll16.spec diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index dce15b8..fbd2d47 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -10,7 +10,6 @@ EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@ EXTRALIBS = @CARBONLIB@ SPEC_SRCS16 = \ - dispdib.spec \ gdi.exe.spec \ wing.spec @@ -55,7 +54,6 @@ C_SRCS = \ C_SRCS16 = \ bidi16.c \ - dispdib.c \ env.c \ gdi16.c \ metafile16.c \

1 0