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

Akihiro Sagawa : msvcrt: Add a helper function to flush all buffers.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 58d6a9a331811312968077c77a9805ab85c35afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d6a9a331811312968077c77… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 12 21:14:06 2012 +0900 msvcrt: Add a helper function to flush all buffers. --- dlls/msvcrt/file.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7fbe07e..b057f9e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -748,13 +748,11 @@ int CDECL MSVCRT__wunlink(const MSVCRT_wchar_t *path) return -1; } -/* _flushall calls MSVCRT_fflush which calls _flushall */ +/* flush_all_buffers calls MSVCRT_fflush which calls flush_all_buffers */ int CDECL MSVCRT_fflush(MSVCRT_FILE* file); -/********************************************************************* - * _flushall (MSVCRT.@) - */ -int CDECL MSVCRT__flushall(void) +/* INTERNAL: Flush all stream buffer */ +static int msvcrt_flush_all_buffers(int mask) { int i, num_flushed = 0; MSVCRT_FILE *file; @@ -765,7 +763,7 @@ int CDECL MSVCRT__flushall(void) if (file->_flag) { - if(file->_flag & MSVCRT__IOWRT) { + if(file->_flag & mask) { MSVCRT_fflush(file); num_flushed++; } @@ -778,6 +776,14 @@ int CDECL MSVCRT__flushall(void) } /********************************************************************* + * _flushall (MSVCRT.@) + */ +int CDECL MSVCRT__flushall(void) +{ + return msvcrt_flush_all_buffers(MSVCRT__IOWRT); +} + +/********************************************************************* * fflush (MSVCRT.@) */ int CDECL MSVCRT_fflush(MSVCRT_FILE* file)

1 0

Akihiro Sagawa : msvcrt: Add support for _flushall to clear all input buffer.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: cf7479ca85924eb754857ea2ff8509606f10c1d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7479ca85924eb754857ea2f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 12 21:14:07 2012 +0900 msvcrt: Add support for _flushall to clear all input buffer. --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b057f9e..1c56eee 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -780,7 +780,7 @@ static int msvcrt_flush_all_buffers(int mask) */ int CDECL MSVCRT__flushall(void) { - return msvcrt_flush_all_buffers(MSVCRT__IOWRT); + return msvcrt_flush_all_buffers(MSVCRT__IOWRT | MSVCRT__IOREAD); } /********************************************************************* @@ -789,7 +789,7 @@ int CDECL MSVCRT__flushall(void) int CDECL MSVCRT_fflush(MSVCRT_FILE* file) { if(!file) { - MSVCRT__flushall(); + msvcrt_flush_all_buffers(MSVCRT__IOWRT); } else if(file->_flag & MSVCRT__IOWRT) { int res; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 6d745d9..0f94083 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -635,7 +635,7 @@ static void test_fflush( void ) ok(ret >= 0, "unexpected ret %d\n", ret); memset(buf2, '?', sizeof(buf2)); fread(buf2, 1, sizeof(buf2), tempfh); - todo_wine ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); + ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); fclose(tempfh);

1 0

Kusanagi Kouichi : gdi32: find_face_from_filename() needs to take font replacements into account.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 6a49adeee6f889913bc960ce3483d83a1d777ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a49adeee6f889913bc960ce3… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Mar 14 21:01:49 2012 +0900 gdi32: find_face_from_filename() needs to take font replacements into account. --- dlls/gdi32/freetype.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4d4a37d..ec39814 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -890,6 +890,14 @@ static inline FT_Fixed FT_FixedFromFIXED(FIXED f) } +static const struct list *get_face_list_from_family(const Family *family) +{ + if (!list_empty(&family->faces)) + return &family->faces; + else + return family->replacement; +} + static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_name) { Family *family; @@ -903,9 +911,11 @@ static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_n LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) { + const struct list *face_list; if(face_name && strcmpiW(face_name, family->FamilyName)) continue; - LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + face_list = get_face_list_from_family(family); + LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) { if (!face->file) continue; @@ -1957,14 +1967,6 @@ static SYSTEM_LINKS *find_font_link(const WCHAR *name) return NULL; } -static const struct list *get_face_list_from_family(const Family *family) -{ - if (!list_empty(&family->faces)) - return &family->faces; - else - return family->replacement; -} - static void populate_system_links(const WCHAR *name, const WCHAR *const *values) { const WCHAR *value;

1 0

Austin English : wusa: Add stub program.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: bec293f3ffe4c62dd83af9ff622ce961e8e2e79b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bec293f3ffe4c62dd83af9ff6… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Mar 4 14:34:36 2012 -0800 wusa: Add stub program. --- configure | 1 + configure.ac | 1 + programs/wusa/Makefile.in | 7 +++++++ programs/wusa/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 045d4f5..fc75580 100755 --- a/configure +++ b/configure @@ -15510,6 +15510,7 @@ wine_fn_config_program wordpad enable_wordpad install,po wine_fn_config_program write enable_write install,po wine_fn_config_program wscript enable_wscript install wine_fn_config_test programs/wscript/tests wscript.exe_test +wine_fn_config_program wusa enable_wusa install wine_fn_config_program xcopy enable_xcopy install,po wine_fn_config_makefile server enable_server install-lib,manpage wine_fn_config_tool tools install-dev,install-lib,manpage diff --git a/configure.ac b/configure.ac index 27db29c..63c2fb4 100644 --- a/configure.ac +++ b/configure.ac @@ -3019,6 +3019,7 @@ WINE_CONFIG_PROGRAM(wordpad,,[install,po]) WINE_CONFIG_PROGRAM(write,,[install,po]) WINE_CONFIG_PROGRAM(wscript,,[install]) WINE_CONFIG_TEST(programs/wscript/tests) +WINE_CONFIG_PROGRAM(wusa,,[install]) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) WINE_CONFIG_MAKEFILE([server],,[install-lib,manpage]) WINE_CONFIG_TOOL(tools,[install-dev,install-lib,manpage]) diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in new file mode 100644 index 0000000..01978d5 --- /dev/null +++ b/programs/wusa/Makefile.in @@ -0,0 +1,7 @@ +MODULE = wusa.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/wusa/main.c b/programs/wusa/main.c new file mode 100644 index 0000000..aa7a38f --- /dev/null +++ b/programs/wusa/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2012 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wusa); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Stefan Leichter : mgmtapi: New stub dll.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: f91c9cc44a93fcc0779ea5c3a256c0fdec052387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91c9cc44a93fcc0779ea5c3a… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Mar 9 00:31:49 2012 +0100 mgmtapi: New stub dll. --- configure | 1 + configure.ac | 1 + dlls/mgmtapi/Makefile.in | 5 +++++ dlls/mgmtapi/mgmtapi.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/mgmtapi/mgmtapi.spec | 9 +++++++++ 5 files changed, 57 insertions(+), 0 deletions(-) diff --git a/configure b/configure index fc75580..3a62558 100755 --- a/configure +++ b/configure @@ -15115,6 +15115,7 @@ wine_fn_config_dll mcicda enable_mcicda wine_fn_config_dll mciqtz32 enable_mciqtz32 wine_fn_config_dll mciseq enable_mciseq wine_fn_config_dll mciwave enable_mciwave +wine_fn_config_dll mgmtapi enable_mgmtapi wine_fn_config_dll midimap enable_midimap wine_fn_config_dll mlang enable_mlang implib wine_fn_config_test dlls/mlang/tests mlang_test diff --git a/configure.ac b/configure.ac index 63c2fb4..472ef12 100644 --- a/configure.ac +++ b/configure.ac @@ -2624,6 +2624,7 @@ WINE_CONFIG_DLL(mcicda) WINE_CONFIG_DLL(mciqtz32) WINE_CONFIG_DLL(mciseq) WINE_CONFIG_DLL(mciwave) +WINE_CONFIG_DLL(mgmtapi) WINE_CONFIG_DLL(midimap) WINE_CONFIG_DLL(mlang,,[implib]) WINE_CONFIG_TEST(dlls/mlang/tests) diff --git a/dlls/mgmtapi/Makefile.in b/dlls/mgmtapi/Makefile.in new file mode 100644 index 0000000..fde16ae --- /dev/null +++ b/dlls/mgmtapi/Makefile.in @@ -0,0 +1,5 @@ +MODULE = mgmtapi.dll + +C_SRCS = mgmtapi.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/mgmtapi/mgmtapi.c b/dlls/mgmtapi/mgmtapi.c new file mode 100644 index 0000000..0cde5d5 --- /dev/null +++ b/dlls/mgmtapi/mgmtapi.c @@ -0,0 +1,41 @@ +/* + * Copyright 2012 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mgmtapi); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/mgmtapi/mgmtapi.spec b/dlls/mgmtapi/mgmtapi.spec new file mode 100644 index 0000000..9166cd4 --- /dev/null +++ b/dlls/mgmtapi/mgmtapi.spec @@ -0,0 +1,9 @@ +@ stub SnmpMgrClose +@ stub SnmpMgrCtl +@ stub SnmpMgrGetTrap +@ stub SnmpMgrGetTrapEx +@ stub SnmpMgrOidToStr +@ stub SnmpMgrOpen +@ stub SnmpMgrrequest +@ stub SnmpMgrStrToOid +@ stub SnmpMgrTrapListen

1 0

Austin English : kernel32: Add stubs for DeleteVolumeMountPointA/W.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 1726427113b141535c2bb9e93879e409b7d00c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1726427113b141535c2bb9e93… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 12 19:16:20 2012 -0500 kernel32: Add stubs for DeleteVolumeMountPointA/W. --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/volume.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d933155..0bdad73 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -289,8 +289,8 @@ @ stdcall DeleteTimerQueue(long) @ stdcall DeleteTimerQueueEx (long long) @ stdcall DeleteTimerQueueTimer(long long long) -# @ stub DeleteVolumeMountPointA -# @ stub DeleteVolumeMountPointW +@ stdcall DeleteVolumeMountPointA(str) +@ stdcall DeleteVolumeMountPointW(wstr) @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) @ stdcall DisableThreadLibraryCalls(long) @ stdcall DisconnectNamedPipe(long) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 5d7a07d..23bcca1 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -2058,3 +2058,21 @@ BOOL WINAPI FindVolumeMountPointClose(HANDLE h) FIXME("(%p), stub!\n", h); return FALSE; } + +/*********************************************************************** + * DeleteVolumeMountPointA (KERNEL32.@) + */ +BOOL WINAPI DeleteVolumeMountPointA(LPCSTR mountpoint) +{ + FIXME("(%s), stub!\n", debugstr_a(mountpoint)); + return FALSE; +} + +/*********************************************************************** + * DeleteVolumeMountPointW (KERNEL32.@) + */ +BOOL WINAPI DeleteVolumeMountPointW(LPCWSTR mountpoint) +{ + FIXME("(%s), stub!\n", debugstr_w(mountpoint)); + return FALSE; +}

1 0

Alexandre Julliard : comdlg32: Implement WM_CHOOSEFONT_GETLOGFONT in the font dialog.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 66ea6464c20ba24f7844b4eaba4e2e0621a87142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ea6464c20ba24f7844b4eab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 13 22:12:07 2012 +0100 comdlg32: Implement WM_CHOOSEFONT_GETLOGFONT in the font dialog. --- dlls/comdlg32/fontdlg.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index c081e91..25dc1e4 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1194,9 +1194,14 @@ static INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, case WM_DESTROY: return CFn_WMDestroy(hDlg, lpcfw); case WM_CHOOSEFONT_GETLOGFONT: + { + LOGFONTA *logfont = (LOGFONTA *)lParam; TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n", lParam); - FIXME("current logfont back to caller\n"); + memcpy( logfont, lpcfw->lpLogFont, FIELD_OFFSET( LOGFONTA, lfFaceName )); + WideCharToMultiByte( CP_ACP, 0, lpcfw->lpLogFont->lfFaceName, LF_FACESIZE, + logfont->lfFaceName, LF_FACESIZE, NULL, NULL ); break; + } case WM_PAINT: return CFn_WMPaint(hDlg, wParam, lParam, lpcfw); } @@ -1242,7 +1247,7 @@ static INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, return TRUE; case WM_CHOOSEFONT_GETLOGFONT: TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n", lParam); - FIXME("current logfont back to caller\n"); + memcpy( (LOGFONTW *)lParam, lpcf->lpLogFont, sizeof(LOGFONTW) ); break; case WM_PAINT: return CFn_WMPaint(hDlg, wParam, lParam, lpcf);

1 0

Henri Verbeet : ddraw: Don' t return a pointer to the implementation in ddraw7_QueryInterface().
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: f6bb0a901621fc694359941b1e4027d4d35e08e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bb0a901621fc694359941b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 13 20:31:33 2012 +0100 ddraw: Don't return a pointer to the implementation in ddraw7_QueryInterface(). --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3ce18db..2231e05 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -161,7 +161,7 @@ static HRESULT WINAPI ddraw7_QueryInterface(IDirectDraw7 *iface, REFIID refiid, if ( IsEqualGUID( &IID_IUnknown, refiid ) || IsEqualGUID( &IID_IDirectDraw7, refiid ) ) { - *obj = This; + *obj = &This->IDirectDraw7_iface; TRACE("(%p) Returning IDirectDraw7 interface at %p\n", This, *obj); } else if ( IsEqualGUID( &IID_IDirectDraw4, refiid ) )

1 0

Henri Verbeet : ddraw: Don' t return a pointer to the implementation in IDirect3DDeviceImpl_7_QueryInterface ().
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 9157006fc17fb8f17adc8536391ef562d2f690f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9157006fc17fb8f17adc85363… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 13 20:31:34 2012 +0100 ddraw: Don't return a pointer to the implementation in IDirect3DDeviceImpl_7_QueryInterface(). --- dlls/ddraw/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e7f3faf..fb65272 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -175,7 +175,7 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, TRACE("(%p) Returning IDirect3DDevice3 interface at %p\n", This, *obj); } else if ( IsEqualGUID( &IID_IDirect3DDevice7 , refiid ) ) { - *obj = This; + *obj = &This->IDirect3DDevice7_iface; TRACE("(%p) Returning IDirect3DDevice7 interface at %p\n", This, *obj); }

1 0

Henri Verbeet : ddraw: Don' t return a pointer to the implementation in IDirect3DMaterialImpl_QueryInterface ().
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: d92a103fc0ac8ea84cb82cf9179b5e1c97a92294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92a103fc0ac8ea84cb82cf91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 13 20:31:35 2012 +0100 ddraw: Don't return a pointer to the implementation in IDirect3DMaterialImpl_QueryInterface(). --- dlls/ddraw/material.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 24b932f..fd9a253 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -94,7 +94,7 @@ static HRESULT WINAPI IDirect3DMaterialImpl_QueryInterface(IDirect3DMaterial3 *i } if ( IsEqualGUID( &IID_IDirect3DMaterial3, riid ) ) { IDirect3DMaterial3_AddRef(&This->IDirect3DMaterial3_iface); - *obp = This; + *obp = &This->IDirect3DMaterial3_iface; TRACE(" Creating IDirect3DMaterial3 interface %p\n", *obp); return S_OK; }

1 0