February 2009 - Wine-commits

Francois Gouget : imm32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: ca8a2da6c197466c049daa85451fc2c4792eefc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8a2da6c197466c049daa854… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 24 00:03:16 2009 +0100 imm32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/imm32/tests/imm32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 3329928..7e7f752 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -162,7 +162,7 @@ static int init(void) { imc = ImmGetContext(hwnd); if (!imc) { - skip("IME support not implemented\n"); + win_skip("IME support not implemented\n"); return 0; } ImmReleaseContext(hwnd, imc);

1 0

Alexandre Julliard : winegcc: Allow creating an executable with an arbitrary extension.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: f0daa7e9b04f300034b332a80f3f4c192bba0d70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0daa7e9b04f300034b332a80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 23 17:18:19 2009 +0100 winegcc: Allow creating an executable with an arbitrary extension. --- tools/winegcc/winegcc.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 2ac08f2..327366c 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -552,21 +552,16 @@ static void build(struct options* opts) } /* generate app loader only for .exe */ - if (opts->shared || strendswith(output_file, ".exe.so")) + if (opts->shared || strendswith(output_file, ".so")) generate_app_loader = 0; /* normalize the filename a bit: strip .so, ensure it has proper ext */ if (strendswith(output_file, ".so")) output_file[strlen(output_file) - 3] = 0; - if (opts->shared) - { - if ((output_name = strrchr(output_file, '/'))) output_name++; - else output_name = output_file; - if (!strchr(output_name, '.')) - output_file = strmake("%s.dll", output_file); - } - else if (!strendswith(output_file, ".exe")) - output_file = strmake("%s.exe", output_file); + if ((output_name = strrchr(output_file, '/'))) output_name++; + else output_name = output_file; + if (!strchr(output_name, '.')) + output_file = strmake("%s.%s", output_file, opts->shared ? "dll" : "exe"); /* get the filename from the path */ if ((output_name = strrchr(output_file, '/'))) output_name++; @@ -798,10 +793,7 @@ static void build(struct options* opts) /* create the loader script */ if (generate_app_loader) - { - if (strendswith(output_file, ".exe")) output_file[strlen(output_file) - 4] = 0; - create_file(output_file, 0755, app_loader_template, strmake("%s.exe.so", output_name)); - } + create_file(output_file, 0755, app_loader_template, strmake("%s.so", output_name)); }

1 0

Alexandre Julliard : configure: Disable VxD and DOS modules when 16-bit support is disabled.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 776820e53c9b7f208e2c4b33affb9e48c6ae56f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=776820e53c9b7f208e2c4b33a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 23 17:46:33 2009 +0100 configure: Disable VxD and DOS modules when 16-bit support is disabled. --- configure | 28 ++++++++++++---------------- configure.ac | 25 ++++++++++--------------- 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/configure b/configure index d51df86..2b9b4e4 100755 --- a/configure +++ b/configure @@ -3886,11 +3886,18 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ esac case $host_cpu in - *i[3456789]86*) - enable_win16=${enable_win16:-yes} - ;; - *) - enable_win16=${enable_win16:-no} + *i[3456789]86*) enable_win16=${enable_win16:-yes} ;; + *) enable_win16=${enable_win16:-no} ;; +esac + +WIN16_FILES="\$(WIN16_FILES)" + +WIN16_INSTALL="\$(WIN16_INSTALL)" + +if test "x$enable_win16" != "xyes" +then + WIN16_FILES="" + WIN16_INSTALL="" enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} @@ -3903,17 +3910,6 @@ case $host_cpu in enable_w32skrnl=${enable_w32skrnl:-no} enable_winedos=${enable_winedos:-no} enable_winevdm=${enable_winevdm:-no} - ;; -esac - -WIN16_FILES="\$(WIN16_FILES)" - -WIN16_INSTALL="\$(WIN16_INSTALL)" - -if test "x$enable_win16" != "xyes" -then - WIN16_FILES="" - WIN16_INSTALL="" fi { $as_echo "$as_me:$LINENO: checking for the directory containing the Wine tools" >&5 diff --git a/configure.ac b/configure.ac index ad1cdd7..8db0c51 100644 --- a/configure.ac +++ b/configure.ac @@ -124,12 +124,16 @@ esac dnl enable_win16 defaults to yes on x86, to no on other CPUs case $host_cpu in - *i[[3456789]]86*) - enable_win16=${enable_win16:-yes} - ;; - *) - enable_win16=${enable_win16:-no} -dnl disable some modules by default on non-x86 + *i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;; + *) enable_win16=${enable_win16:-no} ;; +esac + +AC_SUBST(WIN16_FILES,"\$(WIN16_FILES)") +AC_SUBST(WIN16_INSTALL,"\$(WIN16_INSTALL)") +if test "x$enable_win16" != "xyes" +then + WIN16_FILES="" + WIN16_INSTALL="" enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} enable_monodebg_vxd=${enable_monodebg_vxd:-no} @@ -142,15 +146,6 @@ dnl disable some modules by default on non-x86 enable_w32skrnl=${enable_w32skrnl:-no} enable_winedos=${enable_winedos:-no} enable_winevdm=${enable_winevdm:-no} - ;; -esac - -AC_SUBST(WIN16_FILES,"\$(WIN16_FILES)") -AC_SUBST(WIN16_INSTALL,"\$(WIN16_INSTALL)") -if test "x$enable_win16" != "xyes" -then - WIN16_FILES="" - WIN16_INSTALL="" fi AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,

1 0

Alexandre Julliard : kernel32: Print a nicer error message when 16-bit/ DOS apps cannot be launched.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 3d0cf96f011f4ec5bcda8ad1ab92b4293c6a1690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d0cf96f011f4ec5bcda8ad1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 23 17:46:50 2009 +0100 kernel32: Print a nicer error message when 16-bit/DOS apps cannot be launched. --- dlls/kernel32/process.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index bb8c428..405bfc7 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1048,7 +1048,18 @@ void CDECL __wine_kernel_init(void) if (!getenv("WINEPRELOADRESERVE")) exec_process( main_exe_name ); /* if we get back here, it failed */ } - + else if (error == ERROR_MOD_NOT_FOUND) + { + if ((p = strrchrW( main_exe_name, '\\' ))) p++; + else p = main_exe_name; + if (!strcmpiW( p, winevdmW ) && __wine_main_argc > 3) + { + /* args 1 and 2 are --app-name full_path */ + MESSAGE( "wine: could not run %s: 16-bit/DOS support missing\n", + debugstr_w(__wine_main_wargv[3]) ); + ExitProcess( ERROR_BAD_EXE_FORMAT ); + } + } FormatMessageA( FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, msg, sizeof(msg), NULL ); MESSAGE( "wine: could not load %s: %s", debugstr_w(main_exe_name), msg ); ExitProcess( error );

1 0

Paul Vriens : winetest: Don' t use W-functions in winetest to avoid issues on Win9x.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 95e03b727dbe8b257e72a29f3b7cb01464b466a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95e03b727dbe8b257e72a29f3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Feb 23 20:05:31 2009 +0100 winetest: Don't use W-functions in winetest to avoid issues on Win9x. --- programs/winetest/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 5423ddb..74a4307 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -335,7 +335,7 @@ static DWORD wait_process( HANDLE process, DWORD timeout ) { wait = MsgWaitForMultipleObjects( 1, &process, FALSE, timeout - diff, QS_ALLINPUT ); if (wait != WAIT_OBJECT_0 + 1) return wait; - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); diff = GetTickCount() - start; } return WAIT_TIMEOUT;

1 0

Francois Gouget : make_makefiles: Add 'use strict'.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 44eb0090d7fcc8f707e2ad8a71a985e052e73645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44eb0090d7fcc8f707e2ad8a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 23 23:47:56 2009 +0100 make_makefiles: Add 'use strict'. --- tools/make_makefiles | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index c1a58e6..7f04e22 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -19,6 +19,8 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # +use strict; + # Make rules files my %makerules = (

1 0

Francois Gouget : schannel/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: b2f2e53fc87a7dcff9ac6f2c6808751509cdbb78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f2e53fc87a7dcff9ac6f2c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 23 23:48:54 2009 +0100 schannel/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/schannel/tests/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 9492a97..ddfffc4 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -177,7 +177,7 @@ START_TEST(main) { HMODULE hMod = LoadLibraryA("schannel.dll"); if (!hMod) { - skip("schannel.dll not found.\n"); + win_skip("schannel.dll not available\n"); return; } @@ -189,7 +189,7 @@ START_TEST(main) testInitialize(); testGetInfo(); } - else skip( "schannel functions not found\n" ); + else win_skip( "schannel functions not found\n" ); FreeLibrary(hMod); }

1 0

Alexandre Julliard : programs: Only create executable wrappers for programs that get installed in the bin directory .
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: a6b91685b727b154de268c43753d09a538c7b6f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b91685b727b154de268c437… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 23 17:15:14 2009 +0100 programs: Only create executable wrappers for programs that get installed in the bin directory. --- .gitignore | 37 ------------------------------------- configure | 14 ++++++++++++++ configure.ac | 13 +++++++++++++ programs/Makefile.in | 9 ++++++++- programs/Makeprog.rules.in | 8 ++------ programs/winetest/Makefile.in | 7 ++----- tools/make_makefiles | 2 +- 7 files changed, 40 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 9ec7ed5..cf63122 100644 --- a/.gitignore +++ b/.gitignore @@ -226,46 +226,18 @@ loader/wine.de.man loader/wine.fr.man loader/wine.man programs/Makeprog.rules -programs/cacls/cacls -programs/clock/clock -programs/cmd/cmd -programs/cmdlgtst/cmdlgtst -programs/control/control -programs/eject/eject -programs/expand/expand -programs/explorer/explorer -programs/hh/hh -programs/icinfo/icinfo -programs/iexplore/iexplore -programs/lodctr/lodctr programs/msiexec/msiexec -programs/net/net programs/notepad/notepad -programs/oleview/oleview -programs/progman/progman -programs/reg/reg programs/regedit/regedit programs/regsvr32/regsvr32 programs/rpcss/epm.h programs/rpcss/epm_s.c programs/rpcss/irot.h programs/rpcss/irot_s.c -programs/rpcss/rpcss -programs/rundll32/rundll32 -programs/secedit/secedit -programs/services/services programs/services/svcctl.h programs/services/svcctl_s.c -programs/spoolsv/spoolsv -programs/start/start -programs/svchost/svchost -programs/taskmgr/taskmgr -programs/uninstaller/uninstaller -programs/unlodctr/unlodctr -programs/view/view programs/wineapploader programs/wineboot/wineboot -programs/winebrowser/winebrowser programs/winecfg/winecfg programs/wineconsole/wineconsole programs/winedbg/dbg.tab.c @@ -273,21 +245,12 @@ programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c programs/winedbg/winedbg programs/winedbg/winedbg.man -programs/winedevice/winedevice programs/winefile/winefile -programs/winemenubuilder/winemenubuilder programs/winemine/winemine programs/winepath/winepath programs/winetest/*_test.exe programs/winetest/tests.rc -programs/winetest/winetest -programs/winevdm/winevdm programs/winhlp32/macro.lex.yy.c -programs/winhlp32/winhlp32 -programs/winver/winver -programs/wordpad/wordpad -programs/write/write -programs/xcopy/xcopy server/wineserver server/wineserver-installed server/wineserver.fr.man diff --git a/configure b/configure index fc0362f..d51df86 100755 --- a/configure +++ b/configure @@ -639,6 +639,7 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS +ALL_PROGRAM_BIN_WRAPPERS ALL_WINETEST_DEPENDS ALL_PROGRAM_BIN_INSTALL_DIRS ALL_PROGRAM_INSTALL_DIRS @@ -28001,6 +28002,19 @@ $testname: \$(DLLDIR)/$dir/$testname\$(DLLEXT) fi done +test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" + +ALL_PROGRAM_BIN_WRAPPERS="" + +for dir in $ALL_PROGRAM_BIN_INSTALL_DIRS +do + if test "$dir" != "\\" + then + ALL_PROGRAM_BIN_WRAPPERS="$ALL_PROGRAM_BIN_WRAPPERS \\ + $dir/$dir" + fi +done + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure diff --git a/configure.ac b/configure.ac index e1e98fa..ad1cdd7 100644 --- a/configure.ac +++ b/configure.ac @@ -2338,6 +2338,19 @@ $testname: \$(DLLDIR)/$dir/$testname\$(DLLEXT) fi done +dnl Don't install in bin dir for Windows build +test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" + +AC_SUBST(ALL_PROGRAM_BIN_WRAPPERS,"") +for dir in $ALL_PROGRAM_BIN_INSTALL_DIRS +do + if test "$dir" != "\\" + then + ALL_PROGRAM_BIN_WRAPPERS="$ALL_PROGRAM_BIN_WRAPPERS \\ + $dir/$dir" + fi +done + AC_OUTPUT if test "$no_create" = "yes" diff --git a/programs/Makefile.in b/programs/Makefile.in index 7bd60b2..3bc7abd 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -6,6 +6,7 @@ VPATH = @srcdir@ SUBDIRS = @ALL_PROGRAM_DIRS@ INSTALLSUBDIRS = @ALL_PROGRAM_INSTALL_DIRS@ INSTALLPROGS = @ALL_PROGRAM_BIN_INSTALL_DIRS@ +BIN_WRAPPERS = @ALL_PROGRAM_BIN_WRAPPERS@ INSTALLDIRS = $(DESTDIR)$(bindir) @@ -13,11 +14,14 @@ PROGRAMS = wineapploader @MAKE_RULES@ -all: $(PROGRAMS) $(SUBDIRS) +all: $(PROGRAMS) $(SUBDIRS) $(BIN_WRAPPERS) wineapploader: wineapploader.in sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) +$(BIN_WRAPPERS): $(WINEWRAPPER) + $(RM) $@ && $(LN) $(WINEWRAPPER) $@ + # Rules for installation .PHONY: install-apploader install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__) @@ -39,6 +43,9 @@ uninstall:: -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS) -rmdir $(DESTDIR)$(dlldir) +clean:: + $(RM) $(BIN_WRAPPERS) + # Rules for testing check test:: $(SUBDIRS:%=%/__test__) diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index ea39636..1f9fe78 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -12,22 +12,18 @@ DLLFLAGS = @DLLFLAGS@ DEFS = $(EXTRADEFS) ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) -BASEMODULE = $(MODULE:.exe=) RUNTESTFLAGS= -q -P wine -T $(TOPOBJDIR) INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(mandir)/man$(prog_manext) @MAKE_RULES@ -all: $(MODULE)$(DLLEXT) $(BASEMODULE)$(EXEEXT) +all: $(MODULE)$(DLLEXT) # Rules for .so main module $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in $(WINEGCC) $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) -$(BASEMODULE): $(WINEWRAPPER) - $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@ - # Rules for .exe main module $(MODULE): $(OBJS) $(RCOBJS) Makefile.in @@ -60,4 +56,4 @@ install install-lib:: install_prog$(DLLEXT) uninstall:: uninstall_prog$(DLLEXT) clean:: - $(RM) $(BASEMODULE) $(MODULE) + $(RM) $(MODULE) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 20fd2ba..298ca1a 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -36,7 +36,7 @@ tests.rc: Makefile.in $(TOPOBJDIR)/config.status (for i in $(TESTBINS); do echo "$$i TESTRES \"$$i\""; done) >$@ || ($(RM) $@ && false) clean:: - $(RM) tests.rc dist.res winetest-dist winetest-dist.exe $(TESTBINS) + $(RM) tests.rc dist.res winetest-dist.exe $(TESTBINS) depend: tests.rc @@ -44,14 +44,11 @@ depend: tests.rc .PHONY: dist -dist: winetest-dist.exe$(DLLEXT) winetest-dist$(EXEEXT) +dist: winetest-dist.exe$(DLLEXT) winetest-dist.exe.so: $(OBJS) dist.res Makefile.in $(WINEGCC) $(APPMODE) $(OBJS) dist.res -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) -winetest-dist: $(WINEWRAPPER) - $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@ - winetest-dist.exe: $(OBJS) dist.res.o Makefile.in $(CC) $(APPMODE) $(OBJS) dist.res.o -o $@ -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) $(ALL_LIBS) -upx -9 -qqq $@ diff --git a/tools/make_makefiles b/tools/make_makefiles index e73fabb..c1a58e6 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -541,7 +541,7 @@ sub update_gitignore(@) } if ($dir =~ /^programs\/(.*)\/$/) { - push @ignores, "$dir$1"; + push @ignores, "$dir$1" if $bin_install{$1}; } }

1 0

Andrew Nguyen : tapi32: Stub lineAddProviderW.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 1f5c71fa485767a8dcd8f7a795c644f36543e925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f5c71fa485767a8dcd8f7a79… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Feb 23 04:25:10 2009 -0600 tapi32: Stub lineAddProviderW. --- dlls/tapi32/line.c | 13 +++++++++++-- dlls/tapi32/tapi32.spec | 1 + include/tapi.h | 5 +++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 692e37f..7ff1221 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -53,12 +53,21 @@ DWORD WINAPI lineAccept(HCALL hCall, LPCSTR lpsUserUserInfo, DWORD dwSize) } /*********************************************************************** - * lineAddProvider (TAPI32.@) + * lineAddProviderA (TAPI32.@) */ DWORD WINAPI lineAddProviderA(LPCSTR lpszProviderName, HWND hwndOwner, LPDWORD lpdwPermanentProviderID) { FIXME("(%s, %p, %p): stub.\n", lpszProviderName, hwndOwner, lpdwPermanentProviderID); - return 1; + return LINEERR_OPERATIONFAILED; +} + +/*********************************************************************** + * lineAddProviderW (TAPI32.@) + */ +DWORD WINAPI lineAddProviderW(LPCWSTR lpszProviderName, HWND hwndOwner, LPDWORD lpdwPermanentProviderID) +{ + FIXME("(%s, %p, %p): stub.\n", wine_dbgstr_w(lpszProviderName), hwndOwner, lpdwPermanentProviderID); + return LINEERR_OPERATIONFAILED; } /*********************************************************************** diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 440456d..d4faaff 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -1,6 +1,7 @@ @ stdcall lineAccept(long str long) @ stdcall lineAddProvider(str long ptr) lineAddProviderA @ stdcall lineAddProviderA(str long ptr) +@ stdcall lineAddProviderW(wstr long ptr) @ stdcall lineAddToConference(long long) @ stdcall lineAnswer(long str long) @ stdcall lineBlindTransfer(long str long) lineBlindTransferA diff --git a/include/tapi.h b/include/tapi.h index 9a8cd04..fdb5e9f 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -859,7 +859,9 @@ typedef struct varstring_tag { /* line functions */ DWORD WINAPI lineAccept(HCALL,LPCSTR,DWORD); -DWORD WINAPI lineAddProvider(LPCSTR,HWND,LPDWORD); +DWORD WINAPI lineAddProviderA(LPCSTR,HWND,LPDWORD); +DWORD WINAPI lineAddProviderW(LPCWSTR,HWND,LPDWORD); +#define lineAddProvider WINELIB_NAME_AW(lineAddProvider) DWORD WINAPI lineAddToConference(HCALL,HCALL); DWORD WINAPI lineAnswer(HCALL,LPCSTR,DWORD); DWORD WINAPI lineBlindTransfer(HCALL,LPCSTR,DWORD); @@ -944,7 +946,6 @@ DWORD WINAPI lineUncompleteCall(HLINE,DWORD); DWORD WINAPI lineUnHold(HCALL); DWORD WINAPI lineUnpark(HLINE,DWORD,LPHCALL,LPCSTR); -DWORD WINAPI lineAddProviderA(LPCSTR,HWND,LPDWORD); DWORD WINAPI lineBlindTransferA(HCALL,LPCSTR,DWORD); DWORD WINAPI lineConfigDialogA(DWORD,HWND,LPCSTR); DWORD WINAPI lineConfigDialogEditA(DWORD,HWND,LPCSTR,LPVOID const,DWORD,LPVARSTRING);

1 0

Andrew Nguyen : hid: Stub HidD_GetFeature.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 45a1f85d15f92dee70a0fbae12dec2cef9d14886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a1f85d15f92dee70a0fbae1… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Feb 23 04:25:19 2009 -0600 hid: Stub HidD_GetFeature. --- dlls/hid/hid.spec | 2 +- dlls/hid/main.c | 8 ++++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 32d0687..0cdfd57 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -2,7 +2,7 @@ @ stub HidD_FreePreparsedData @ stub HidD_GetAttributes @ stub HidD_GetConfiguration -@ stub HidD_GetFeature +@ stdcall HidD_GetFeature(long ptr long) @ stdcall HidD_GetHidGuid(ptr) @ stub HidD_GetIndexedString @ stub HidD_GetInputReport diff --git a/dlls/hid/main.c b/dlls/hid/main.c index 1869bb5..62c7cbd 100644 --- a/dlls/hid/main.c +++ b/dlls/hid/main.c @@ -50,6 +50,14 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return TRUE; } +BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) +{ + static int count = 0; + if (!count++) + FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength); + return FALSE; +} + void WINAPI HidD_GetHidGuid(LPGUID guid) { TRACE("(%p)\n", guid); diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index ebaef11..4059d26 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -27,6 +27,7 @@ typedef LONG NTSTATUS; #endif +BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); void WINAPI HidD_GetHidGuid(LPGUID guid); #endif /* __WINE_HIDSDI_H */

1 0