wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

Alexandre Julliard : imm32: Make imm.dll into a stand-alone 16-bit module.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 1b937cac74a7849a1e74050f1a766b2c220fea67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b937cac74a7849a1e74050f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 23 20:32:06 2009 +0100 imm32: Make imm.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 4 ---- dlls/imm.dll16/Makefile.in | 13 +++++++++++++ dlls/{imm32/imm.spec => imm.dll16/imm.dll16.spec} | 0 dlls/imm32/Makefile.in | 2 -- 7 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 3853e12..0e05d6c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,6 @@ dlls/avifile.dll16 dlls/commdlg.dll16 dlls/ddeml.dll16 dlls/gdi.exe16 -dlls/imm.dll16 dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c dlls/jscript/parser.tab.h diff --git a/configure b/configure index 1dad9dc..86716d9 100755 --- a/configure +++ b/configure @@ -25656,6 +25656,14 @@ dlls/imagehlp/Makefile: dlls/imagehlp/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/imagehlp/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/imm.dll16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + imm.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/imm.dll16/Makefile: dlls/imm.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/imm.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/imm32/Makefile" test "x$enable_imm32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ imm32" @@ -29150,6 +29158,7 @@ do "dlls/ifsmgr.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ifsmgr.vxd/Makefile" ;; "dlls/imaadp32.acm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imaadp32.acm/Makefile" ;; "dlls/imagehlp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imagehlp/Makefile" ;; + "dlls/imm.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imm.dll16/Makefile" ;; "dlls/imm32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imm32/Makefile" ;; "dlls/imm32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/imm32/tests/Makefile" ;; "dlls/inetcomm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetcomm/Makefile" ;; diff --git a/configure.ac b/configure.ac index 160cabb..71baeeb 100644 --- a/configure.ac +++ b/configure.ac @@ -2021,6 +2021,7 @@ WINE_CONFIG_MAKEFILE([dlls/icmp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_D WINE_CONFIG_MAKEFILE([dlls/ifsmgr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/imaadp32.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/imagehlp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/imm.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/imm32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/imm32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/inetcomm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index cb7e694..0600f9a 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -22,7 +22,6 @@ WIN16_FILES = \ commdlg.dll16 \ ddeml.dll16 \ gdi.exe16 \ - imm.dll16 \ krnl386.exe16 \ mmsystem.dll16 \ msvideo.dll16 \ @@ -62,9 +61,6 @@ commdlg.dll16: gdi.exe16 wing.dll16: echo "gdi32.dll" >$@ -imm.dll16: - echo "imm32.dll" >$@ - krnl386.exe16 system.drv16 toolhelp.dll16: echo "kernel32.dll" >$@ diff --git a/dlls/imm.dll16/Makefile.in b/dlls/imm.dll16/Makefile.in new file mode 100644 index 0000000..7ea14e8 --- /dev/null +++ b/dlls/imm.dll16/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = imm.dll16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,imm32.dll + +SPEC_SRCS = imm.dll16.spec + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/imm32/imm.spec b/dlls/imm.dll16/imm.dll16.spec similarity index 100% rename from dlls/imm32/imm.spec rename to dlls/imm.dll16/imm.dll16.spec diff --git a/dlls/imm32/Makefile.in b/dlls/imm32/Makefile.in index 909f29b..52a5515 100644 --- a/dlls/imm32/Makefile.in +++ b/dlls/imm32/Makefile.in @@ -11,8 +11,6 @@ C_SRCS = \ RC_SRCS = version.rc -SPEC_SRCS16 = imm.spec - @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend

1 0

Alexandre Julliard : ctl3d32: Make ctl3d.dll and ctl3dv2. dll into stand-alone 16-bit modules.
by Alexandre Julliard 24 Mar '09

24 Mar '09

Module: wine Branch: master Commit: 9a19d8afa6fdc822bd2a2dec43650713a5759dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a19d8afa6fdc822bd2a2dec4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 23 20:31:01 2009 +0100 ctl3d32: Make ctl3d.dll and ctl3dv2.dll into stand-alone 16-bit modules. --- .gitignore | 2 - configure | 18 +++++++++++++++ configure.ac | 2 + dlls/Makefile.in | 5 ---- dlls/ctl3d.dll16/Makefile.in | 15 ++++++++++++ dlls/{ctl3d32 => ctl3d.dll16}/ctl3d.c | 24 -------------------- .../ctl3d.spec => ctl3d.dll16/ctl3d.dll16.spec} | 0 dlls/ctl3d32/Makefile.in | 6 ----- dlls/ctl3dv2.dll16/Makefile.in | 15 ++++++++++++ dlls/{ctl3d32 => ctl3dv2.dll16}/ctl3d.c | 24 -------------------- .../ctl3dv2.dll16.spec} | 0 11 files changed, 50 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a19d8afa6fdc822bd2a2…

1 0

Andrew Nguyen : ddraw/tests: Skip some cooperative level tests on NT4/Win95 .
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: e1a1ae5e1b253a2fce929a015e6f4d1e399e22b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a1ae5e1b253a2fce929a015… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Mar 23 01:42:58 2009 -0500 ddraw/tests: Skip some cooperative level tests on NT4/Win95. The DirectX SDK reports that cooperative level flags DDSCL_SETDEVICEWINDOW and DDSCL_SETFOCUSWINDOW are only available on Windows 98 and higher. --- dlls/ddraw/tests/ddrawmodes.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 67dd9d4..e0bf526 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -296,6 +296,13 @@ static void testcooperativelevels_normal(void) /* Set the focus window */ rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_SETFOCUSWINDOW); + + if (rc == DDERR_INVALIDPARAMS) + { + win_skip("NT4/Win95 do not support cooperative levels DDSCL_SETDEVICEWINDOW and DDSCL_SETFOCUSWINDOW\n"); + return; + } + ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW) returned: %x\n",rc); /* Set the focus window a second time*/ @@ -379,7 +386,8 @@ static void testcooperativelevels_exclusive(void) /* Set the focus window. Should fail */ rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_SETFOCUSWINDOW); - ok(rc==DDERR_HWNDALREADYSET,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW) returned: %x\n",rc); + ok(rc==DDERR_HWNDALREADYSET || + broken(rc==DDERR_INVALIDPARAMS) /* NT4/Win95 */,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW) returned: %x\n",rc); /* All done */

1 0

Andrew Nguyen : wine.inf: Add entry for fake ddeml.dll.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 61d44a30caf92244c63bc80138a9a844f33dbcc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d44a30caf92244c63bc8013… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Mar 23 01:35:00 2009 -0500 wine.inf: Add entry for fake ddeml.dll. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index aa82cc1..1f423a2 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2444,6 +2444,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,d3d8.dll 11,,d3d9.dll 11,,dbghelp.dll +11,,ddeml.dll 11,,ddhelp.exe 11,,ddraw.dll 11,,dosx.exe

1 0

Andrew Nguyen : tapi32: Stub lineGetIDW.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 626a13fd579fe5fa1413e6ad28481e2b29f4e7ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=626a13fd579fe5fa1413e6ad2… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Mar 23 01:34:55 2009 -0500 tapi32: Stub lineGetIDW. --- dlls/tapi32/line.c | 22 ++++++++++++++++++---- dlls/tapi32/tapi32.spec | 1 + include/tapi.h | 5 +++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 9cd624f..6ccdf13 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -497,12 +497,26 @@ DWORD WINAPI lineGetDevConfigA(DWORD dwDeviceID, LPVARSTRING lpDeviceConfig, LPC } /*********************************************************************** - * lineGetID (TAPI32.@) + * lineGetIDW (TAPI32.@) */ -DWORD WINAPI lineGetIDA(HLINE hLine, DWORD dwAddressID, HCALL hCall, DWORD dwSelect, LPVARSTRING lpDeviceID, LPCSTR lpszDeviceClass) +DWORD WINAPI lineGetIDW(HLINE hLine, DWORD dwAddressID, HCALL hCall, DWORD dwSelect, + LPVARSTRING lpDeviceID, LPCWSTR lpszDeviceClass) { - FIXME("(%p, %08x, %p, %08x, %p, %s): stub.\n", hLine, dwAddressID, hCall, dwSelect, lpDeviceID, lpszDeviceClass); - return 0; + FIXME("(%p, %08x, %p, %08x, %p, %s): stub.\n", hLine, dwAddressID, hCall, + dwSelect, lpDeviceID, + debugstr_w(lpszDeviceClass)); + return LINEERR_OPERATIONFAILED; +} + +/*********************************************************************** + * lineGetIDA (TAPI32.@) + */ +DWORD WINAPI lineGetIDA(HLINE hLine, DWORD dwAddressID, HCALL hCall, DWORD dwSelect, + LPVARSTRING lpDeviceID, LPCSTR lpszDeviceClass) +{ + FIXME("(%p, %08x, %p, %08x, %p, %s): stub.\n", hLine, dwAddressID, hCall, + dwSelect, lpDeviceID, lpszDeviceClass); + return LINEERR_OPERATIONFAILED; } /*********************************************************************** diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 3f37e8f..ce7a04d 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -48,6 +48,7 @@ @ stdcall lineGetDevConfigA(long ptr str) @ stdcall lineGetID(long long long long ptr str) lineGetIDA @ stdcall lineGetIDA(long long long long ptr str) +@ stdcall lineGetIDW(long long long long ptr wstr) @ stdcall lineGetIcon(long str ptr) lineGetIconA @ stdcall lineGetIconA(long str ptr) @ stdcall lineGetLineDevStatus(long ptr) lineGetLineDevStatusA diff --git a/include/tapi.h b/include/tapi.h index d031d00..ca2c4c8 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -892,7 +892,9 @@ DWORD WINAPI lineGetDevCapsA(HLINEAPP,DWORD,DWORD,DWORD,LPLINEDEVCAPS); DWORD WINAPI lineGetDevCapsW(HLINEAPP,DWORD,DWORD,DWORD,LPLINEDEVCAPS); #define lineGetDevCaps WINELIB_NAME_AW(lineGetDevCaps); DWORD WINAPI lineGetDevConfig(DWORD,LPVARSTRING,LPCSTR); -DWORD WINAPI lineGetID(HLINE,DWORD,HCALL,DWORD,LPVARSTRING,LPCSTR); +DWORD WINAPI lineGetIDA(HLINE,DWORD,HCALL,DWORD,LPVARSTRING,LPCSTR); +DWORD WINAPI lineGetIDW(HLINE,DWORD,HCALL,DWORD,LPVARSTRING,LPCWSTR); +#define lineGetID WINELIB_NAME_AW(lineGetID); DWORD WINAPI lineGetIcon(DWORD,LPCSTR,HICON *); DWORD WINAPI lineGetLineDevStatus(HLINE,LPLINEDEVSTATUS); DWORD WINAPI lineGetNewCalls(HLINE,DWORD,DWORD,LPLINECALLLIST); @@ -964,7 +966,6 @@ DWORD WINAPI lineGetAppPriorityA(LPCSTR,DWORD,LPLINEEXTENSIONID const,DWORD,LPVA DWORD WINAPI lineGetCallInfoA(HCALL,LPLINECALLINFO); DWORD WINAPI lineGetCountryA(DWORD,DWORD,LPLINECOUNTRYLIST); DWORD WINAPI lineGetDevConfigA(DWORD,LPVARSTRING,LPCSTR); -DWORD WINAPI lineGetIDA(HLINE,DWORD,HCALL,DWORD,LPVARSTRING,LPCSTR); DWORD WINAPI lineGetIconA(DWORD,LPCSTR,HICON *); DWORD WINAPI lineGetLineDevStatusA(HLINE,LPLINEDEVSTATUS); DWORD WINAPI lineGetRequestA(HLINEAPP,DWORD,LPVOID);

1 0

Andrew Nguyen : tapi32: Stub lineMakeCallW.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 9ef447be92e3d5d1b70694581032627b85997b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef447be92e3d5d1b70694581… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Mar 23 01:34:46 2009 -0500 tapi32: Stub lineMakeCallW. --- dlls/tapi32/line.c | 21 +++++++++++++++++---- dlls/tapi32/tapi32.spec | 1 + include/tapi.h | 5 +++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 7145aa0..9cd624f 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -1005,12 +1005,25 @@ LONG WINAPI lineInitializeExA(LPHLINEAPP lphLineApp, HINSTANCE hInstance, LINECA } /*********************************************************************** - * lineMakeCall (TAPI32.@) + * lineMakeCallW (TAPI32.@) */ -DWORD WINAPI lineMakeCallA(HLINE hLine, LPHCALL lphCall, LPCSTR lpszDestAddress, DWORD dwCountryCode, LPLINECALLPARAMS lpCallParams) +DWORD WINAPI lineMakeCallW(HLINE hLine, LPHCALL lphCall, LPCWSTR lpszDestAddress, + DWORD dwCountryCode, LPLINECALLPARAMS lpCallParams) { - FIXME("(%p, %p, %s, %08x, %p): stub.\n", hLine, lphCall, lpszDestAddress, dwCountryCode, lpCallParams); - return 1; + FIXME("(%p, %p, %s, %08x, %p): stub.\n", hLine, lphCall, debugstr_w(lpszDestAddress), + dwCountryCode, lpCallParams); + return LINEERR_OPERATIONFAILED; +} + +/*********************************************************************** + * lineMakeCallA (TAPI32.@) + */ +DWORD WINAPI lineMakeCallA(HLINE hLine, LPHCALL lphCall, LPCSTR lpszDestAddress, + DWORD dwCountryCode, LPLINECALLPARAMS lpCallParams) +{ + FIXME("(%p, %p, %s, %08x, %p): stub.\n", hLine, lphCall, lpszDestAddress, + dwCountryCode, lpCallParams); + return LINEERR_OPERATIONFAILED; } /*********************************************************************** diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 645e7e0..3f37e8f 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -69,6 +69,7 @@ @ stdcall lineInitializeExA(ptr long ptr str ptr ptr ptr) @ stdcall lineMakeCall(long ptr str long ptr) lineMakeCallA @ stdcall lineMakeCallA(long ptr str long ptr) +@ stdcall lineMakeCallW(long ptr wstr long ptr) @ stdcall lineMonitorDigits(long long) @ stdcall lineMonitorMedia(long long) @ stdcall lineMonitorTones(long ptr long) diff --git a/include/tapi.h b/include/tapi.h index 9f0b695..d031d00 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -909,7 +909,9 @@ DWORD WINAPI lineInitialize(LPHLINEAPP,HINSTANCE,LINECALLBACK,LPCSTR,LPDWORD); LONG WINAPI lineInitializeExA(LPHLINEAPP,HINSTANCE,LINECALLBACK,LPCSTR,LPDWORD,LPDWORD,LPLINEINITIALIZEEXPARAMS); LONG WINAPI lineInitializeExW(LPHLINEAPP,HINSTANCE,LINECALLBACK,LPCWSTR,LPDWORD,LPDWORD,LPLINEINITIALIZEEXPARAMS); #define lineInitializeEx WINELIB_NAME_AW(lineInitializeEx) -DWORD WINAPI lineMakeCall(HLINE,LPHCALL,LPCSTR,DWORD,LPLINECALLPARAMS); +DWORD WINAPI lineMakeCallA(HLINE,LPHCALL,LPCSTR,DWORD,LPLINECALLPARAMS); +DWORD WINAPI lineMakeCallW(HLINE,LPHCALL,LPCWSTR,DWORD,LPLINECALLPARAMS); +#define lineMakeCall WINELIB_NAMEAW(lineMakeCall); DWORD WINAPI lineMonitorDigits(HCALL,DWORD); DWORD WINAPI lineMonitorMedia(HCALL,DWORD); DWORD WINAPI lineMonitorTones(HCALL,LPLINEMONITORTONE,DWORD); @@ -968,7 +970,6 @@ DWORD WINAPI lineGetLineDevStatusA(HLINE,LPLINEDEVSTATUS); DWORD WINAPI lineGetRequestA(HLINEAPP,DWORD,LPVOID); DWORD WINAPI lineGetTranslateCapsA(HLINEAPP,DWORD,LPLINETRANSLATECAPS); DWORD WINAPI lineHandoffA(HCALL,LPCSTR,DWORD); -DWORD WINAPI lineMakeCallA(HLINE,LPHCALL,LPCSTR,DWORD,LPLINECALLPARAMS); DWORD WINAPI lineOpenA(HLINEAPP,DWORD,LPHLINE,DWORD,DWORD,DWORD,DWORD,DWORD,LPLINECALLPARAMS); DWORD WINAPI lineParkA(HCALL,DWORD,LPCSTR,LPVARSTRING); DWORD WINAPI linePickupA(HLINE,DWORD,LPHCALL,LPCSTR,LPCSTR);

1 0

Andrew Nguyen : tapi32: Stub lineGetDevCapsW.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: af38006ad1ab107601b0f060a897eb7c322799f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af38006ad1ab107601b0f060a… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Mar 23 01:34:41 2009 -0500 tapi32: Stub lineGetDevCapsW. --- dlls/tapi32/line.c | 21 +++++++++++++++++---- dlls/tapi32/tapi32.spec | 1 + include/tapi.h | 5 +++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 7ff1221..7145aa0 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -466,12 +466,25 @@ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTR } /*********************************************************************** - * lineGetDevCaps (TAPI32.@) + * lineGetDevCapsW (TAPI32.@) */ -DWORD WINAPI lineGetDevCapsA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps) +DWORD WINAPI lineGetDevCapsW(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, + DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps) { - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpLineDevCaps); - return 0; + FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + dwExtVersion, lpLineDevCaps); + return LINEERR_OPERATIONFAILED; +} + +/*********************************************************************** + * lineGetDevCapsA (TAPI32.@) + */ +DWORD WINAPI lineGetDevCapsA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, + DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps) +{ + FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + dwExtVersion, lpLineDevCaps); + return LINEERR_OPERATIONFAILED; } /*********************************************************************** diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index d4faaff..645e7e0 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -43,6 +43,7 @@ @ stdcall lineGetCountryA(long long ptr) @ stdcall lineGetDevCaps(long long long long ptr) lineGetDevCapsA @ stdcall lineGetDevCapsA(long long long long ptr) +@ stdcall lineGetDevCapsW(long long long long ptr) @ stdcall lineGetDevConfig(long ptr str) lineGetDevConfigA @ stdcall lineGetDevConfigA(long ptr str) @ stdcall lineGetID(long long long long ptr str) lineGetIDA diff --git a/include/tapi.h b/include/tapi.h index fdb5e9f..9f0b695 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -888,7 +888,9 @@ DWORD WINAPI lineGetCallInfo(HCALL,LPLINECALLINFO); DWORD WINAPI lineGetCallStatus(HCALL,LPLINECALLSTATUS); DWORD WINAPI lineGetConfRelatedCalls(HCALL,LPLINECALLLIST); DWORD WINAPI lineGetCountry(DWORD,DWORD,LPLINECOUNTRYLIST); -DWORD WINAPI lineGetDevCaps(HLINEAPP,DWORD,DWORD,DWORD,LPLINEDEVCAPS); +DWORD WINAPI lineGetDevCapsA(HLINEAPP,DWORD,DWORD,DWORD,LPLINEDEVCAPS); +DWORD WINAPI lineGetDevCapsW(HLINEAPP,DWORD,DWORD,DWORD,LPLINEDEVCAPS); +#define lineGetDevCaps WINELIB_NAME_AW(lineGetDevCaps); DWORD WINAPI lineGetDevConfig(DWORD,LPVARSTRING,LPCSTR); DWORD WINAPI lineGetID(HLINE,DWORD,HCALL,DWORD,LPVARSTRING,LPCSTR); DWORD WINAPI lineGetIcon(DWORD,LPCSTR,HICON *); @@ -959,7 +961,6 @@ DWORD WINAPI lineGetAddressStatusA(HLINE,DWORD,LPLINEADDRESSSTATUS); DWORD WINAPI lineGetAppPriorityA(LPCSTR,DWORD,LPLINEEXTENSIONID const,DWORD,LPVARSTRING,LPDWORD); DWORD WINAPI lineGetCallInfoA(HCALL,LPLINECALLINFO); DWORD WINAPI lineGetCountryA(DWORD,DWORD,LPLINECOUNTRYLIST); -DWORD WINAPI lineGetDevCapsA(HLINEAPP,DWORD,DWORD,DWORD,LPLINEDEVCAPS); DWORD WINAPI lineGetDevConfigA(DWORD,LPVARSTRING,LPCSTR); DWORD WINAPI lineGetIDA(HLINE,DWORD,HCALL,DWORD,LPVARSTRING,LPCSTR); DWORD WINAPI lineGetIconA(DWORD,LPCSTR,HICON *);

1 0

James Hawkins : winebuild: Document the correlation of spec-> ordinals and spec->limit with an assertion (Coverity 902).
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 665a0424cda2b390060e99659965597e5cea9775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=665a0424cda2b390060e99659… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:32:51 2009 -0700 winebuild: Document the correlation of spec->ordinals and spec->limit with an assertion (Coverity 902). --- tools/winebuild/spec16.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 7c6fc45..2ce3b0c 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -549,6 +549,7 @@ static void output_module16( DLLSPEC *spec ) if (!spec->ordinals) { + assert(spec->limit == 0); spec->ordinals = xmalloc( sizeof(spec->ordinals[0]) ); spec->ordinals[0] = NULL; }

1 0

James Hawkins : cmd: Fix a memory leak (Coverity 904).
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 474276d5691337fbceaa62bf7b322c8761cea231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474276d5691337fbceaa62bf7… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:32:22 2009 -0700 cmd: Fix a memory leak (Coverity 904). --- programs/cmd/wcmdmain.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index f90ca8c..c58077b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -699,8 +699,8 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { WCHAR *searchIn; WCHAR *searchFor; - s = WCMD_strdupW(endOfVar + 1); if (equalspos == NULL) return start+1; + s = WCMD_strdupW(endOfVar + 1); /* Null terminate both strings */ thisVar[strlenW(thisVar)-1] = 0x00; @@ -712,7 +712,6 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { searchFor = WCMD_strdupW(colonpos+1); CharUpperBuff(searchFor, strlenW(colonpos+1)); - /* Handle wildcard case */ if (*(colonpos+1) == '*') { /* Search for string to replace */ @@ -723,7 +722,6 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { strcpyW(start, replacewith); strcatW(start, thisVarContents + (found-searchIn) + strlenW(searchFor+1)); strcatW(start, s); - free(s); } else { /* Copy as it */ strcpyW(start, thisVarContents); @@ -749,6 +747,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { thisVarContents + (lastFound-searchIn)); strcatW(outputposn, s); } + free(s); free(searchIn); free(searchFor); return start;

1 0

James Hawkins : twain_32: Fix the use of an uninitialized variable ( Coverity 908).
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 0b74259f9d52e6c90c2412d22bf9a489845a7364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b74259f9d52e6c90c2412d22… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Mar 22 14:31:56 2009 -0700 twain_32: Fix the use of an uninitialized variable (Coverity 908). --- dlls/twain_32/tests/dsm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 835f09c..6a53188 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -329,6 +329,7 @@ static void test_resolution(TW_IDENTITY *appid, TW_IDENTITY *source, TW_UINT16 c "Error [rc %d|cc %d] doing MSG_GETDEFAULT for type 0x%x\n", rc, status.ConditionCode, captype); if (rc == TWRC_SUCCESS) { + get_onevalue(cap.hContainer, &val, &type); ok(type == TWTY_FIX32, "GETDEFAULT for RESOLUTION is not type FIX32, is type %d\n", type); memcpy(&default_value, &val, sizeof(default_value)); GlobalFree(cap.hContainer);

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2009