October 2007 - Wine-Commits

Gerald Pfeifer : gdi32: Avoid compiler warning in WineEngGetGlyphOutline().
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 4e60df85d87c00119d4a2af4ddc08b4b87f871e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e60df85d87c00119d4a2af4d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 14 13:52:00 2007 +0200 gdi32: Avoid compiler warning in WineEngGetGlyphOutline(). --- dlls/gdi32/freetype.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4ece12c..a79f41d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3837,10 +3837,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, mult = 16; else if(format == GGO_GRAY8_BITMAP) mult = 64; - else if(format == WINE_GGO_GRAY16_BITMAP) + else /* format == WINE_GGO_GRAY16_BITMAP */ return needed; - else - assert(0); + break; } default:

1 0

Chris Robinson : wined3d: Don't report filtering for WINED3DFMT_R32F.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: eaaa2a82f238a7ec0f095733b430a690f648ed0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaaa2a82f238a7ec0f095733b… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Oct 14 15:25:48 2007 -0700 wined3d: Don't report filtering for WINED3DFMT_R32F. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6aadb70..ca1f44e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1582,6 +1582,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if (Usage & WINED3DUSAGE_QUERY_FILTER) { switch (CheckFormat) { /* Filtering not supported */ + case WINED3DFMT_R32F: case WINED3DFMT_A32B32G32R32F: TRACE_(d3d_caps)("[FAILED]\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Gerald Pfeifer : comctl32/tests: Avoid remove redundant invocation of MAKEINRESOURCEA for IDC_ARROW and IDC_IBEAM .
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 2cb5298a4c270d691b6c66bfd5df01209ac71165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb5298a4c270d691b6c66bfd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 14 19:00:39 2007 +0200 comctl32/tests: Avoid remove redundant invocation of MAKEINRESOURCEA for IDC_ARROW and IDC_IBEAM. --- dlls/comctl32/tests/comboex.c | 2 +- dlls/comctl32/tests/header.c | 2 +- dlls/comctl32/tests/progress.c | 2 +- dlls/comctl32/tests/rebar.c | 2 +- dlls/comctl32/tests/toolbar.c | 2 +- dlls/comctl32/tests/treeview.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index f4d8fc8..8f436ca 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -200,7 +200,7 @@ static void init(void) { wc.cbWndExtra = 0; wc.hInstance = GetModuleHandleA(NULL); wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, MAKEINTRESOURCEA(IDC_ARROW)); + wc.hCursor = LoadCursorA(NULL, IDC_ARROW); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = ComboExTestClass; diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 92a5714..e80944f 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1493,7 +1493,7 @@ static void init(void) { wc.cbWndExtra = 0; wc.hInstance = GetModuleHandleA(NULL); wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, MAKEINTRESOURCEA(IDC_ARROW)); + wc.hCursor = LoadCursorA(NULL, IDC_ARROW); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = "HeaderTestClass"; diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index cfc0393..a13d01a 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -88,7 +88,7 @@ static void init(void) wc.cbWndExtra = 0; wc.hInstance = GetModuleHandleA(NULL); wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, MAKEINTRESOURCEA(IDC_ARROW)); + wc.hCursor = LoadCursorA(NULL, IDC_ARROW); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = progressTestClass; diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 2b318d2..3d8bd70 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -800,7 +800,7 @@ START_TEST(rebar) wc.cbWndExtra = 0; wc.hInstance = GetModuleHandleA(NULL); wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, MAKEINTRESOURCEA(IDC_IBEAM)); + wc.hCursor = LoadCursorA(NULL, IDC_IBEAM); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = "MyTestWnd"; diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 77d721b..b094a4b 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1101,7 +1101,7 @@ START_TEST(toolbar) wc.cbWndExtra = 0; wc.hInstance = GetModuleHandleA(NULL); wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, MAKEINTRESOURCEA(IDC_IBEAM)); + wc.hCursor = LoadCursorA(NULL, IDC_IBEAM); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = "MyTestWnd"; diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 17d33a5..2981db7 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -663,7 +663,7 @@ START_TEST(treeview) wc.cbWndExtra = 0; wc.hInstance = GetModuleHandleA(NULL); wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, MAKEINTRESOURCEA(IDC_IBEAM)); + wc.hCursor = LoadCursorA(NULL, IDC_IBEAM); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = "MyTestWnd";

1 0

Gerald Pfeifer : libwine: Conditionally provide reserve_area().
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 3ab66cd00fd40811bcc397fafb2bf3daae8751d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab66cd00fd40811bcc397faf… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 14 13:11:02 2007 +0200 libwine: Conditionally provide reserve_area(). --- libs/wine/mmap.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index d7fd31b..8b79580 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -243,6 +243,7 @@ static inline int mmap_reserve( void *addr, size_t size ) * * Reserve as much memory as possible in the given area. */ +#if defined(__i386__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) /* commented out until FreeBSD gets fixed */ static void reserve_area( void *addr, void *end ) { size_t size = (char *)end - (char *)addr; @@ -285,6 +286,7 @@ static void reserve_area( void *addr, void *end ) } #endif } +#endif /***********************************************************************

1 0

Gerald Pfeifer : kernel32: Use FIELD_OFFSET instead of pointer cast.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 1a0f1bc6cec2e61cd8a4292c44a5278bffbf84e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0f1bc6cec2e61cd8a4292c4… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 14 13:18:29 2007 +0200 kernel32: Use FIELD_OFFSET instead of pointer cast. --- dlls/kernel32/system.c | 2 +- dlls/kernel32/thunk.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/system.c b/dlls/kernel32/system.c index ab38467..9395d83 100644 --- a/dlls/kernel32/system.c +++ b/dlls/kernel32/system.c @@ -174,7 +174,7 @@ static void call_timer_proc16( WORD timer ) context.SegGs = wine_get_gs(); context.SegCs = SELECTOROF( proc ); context.Eip = OFFSETOF( proc ); - context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + (WORD)&((STACK16FRAME*)0)->bp; + context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); context.Eax = timer; WOWCallback16Ex( 0, WCB16_REGS, 0, NULL, (DWORD *)&context ); diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index 096d6b3..c35302e 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -462,7 +462,7 @@ void WINAPI __regs_QT_Thunk( CONTEXT86 *context ) context16.Eip = LOWORD(context->Edx); /* point EBP to the STACK16FRAME on the stack * for the call_to_16 to set up the register content on calling */ - context16.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + (WORD)&((STACK16FRAME*)0)->bp; + context16.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); /* * used to be (problematic): @@ -594,7 +594,7 @@ void WINAPI __regs_FT_Thunk( CONTEXT86 *context ) context16.SegGs = wine_get_gs(); context16.SegCs = HIWORD(callTarget); context16.Eip = LOWORD(callTarget); - context16.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + (WORD)&((STACK16FRAME*)0)->bp; + context16.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); argsize = context->Ebp-context->Esp-0x40; if (argsize > sizeof(newstack)) argsize = sizeof(newstack); @@ -760,7 +760,7 @@ void WINAPI __regs_Common32ThkLS( CONTEXT86 *context ) context16.Edi = LOWORD(context->Ecx); context16.SegCs = HIWORD(context->Eax); context16.Eip = LOWORD(context->Eax); - context16.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + (WORD)&((STACK16FRAME*)0)->bp; + context16.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); argsize = HIWORD(context->Edx) * 4; @@ -820,7 +820,7 @@ void WINAPI __regs_OT_32ThkLSF( CONTEXT86 *context ) context16.SegGs = wine_get_gs(); context16.SegCs = HIWORD(context->Edx); context16.Eip = LOWORD(context->Edx); - context16.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + (WORD)&((STACK16FRAME*)0)->bp; + context16.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); argsize = 2 * *(WORD *)context->Esp + 2;

1 0

Jacek Caban : msimtf: Added msimtf.dll.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 44a808fba5ccedcb24ac7bdb3ba6d47013e9f02c URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a808fba5ccedcb24ac7bdb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 14 19:31:45 2007 +0200 msimtf: Added msimtf.dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/msimtf/Makefile.in | 12 +++++++ dlls/msimtf/main.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msimtf/msimtf.spec | 6 +++ 7 files changed, 107 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3ff8abb..de3da4b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -298,6 +298,7 @@ ALL_MAKEFILES = \ dlls/msi/Makefile \ dlls/msi/tests/Makefile \ dlls/msimg32/Makefile \ + dlls/msimtf/Makefile \ dlls/msisys.ocx/Makefile \ dlls/msnet32/Makefile \ dlls/msrle32/Makefile \ @@ -669,6 +670,7 @@ dlls/mshtml/tests/Makefile: dlls/mshtml/tests/Makefile.in dlls/Maketest.rules dlls/msi/Makefile: dlls/msi/Makefile.in dlls/Makedll.rules dlls/msi/tests/Makefile: dlls/msi/tests/Makefile.in dlls/Maketest.rules dlls/msimg32/Makefile: dlls/msimg32/Makefile.in dlls/Makedll.rules +dlls/msimtf/Makefile: dlls/msimtf/Makefile.in dlls/Makedll.rules dlls/msisys.ocx/Makefile: dlls/msisys.ocx/Makefile.in dlls/Makedll.rules dlls/msnet32/Makefile: dlls/msnet32/Makefile.in dlls/Makedll.rules dlls/msrle32/Makefile: dlls/msrle32/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 9e1e78b..51b8f62 100755 --- a/configure +++ b/configure @@ -20552,6 +20552,8 @@ ac_config_files="$ac_config_files dlls/msi/tests/Makefile" ac_config_files="$ac_config_files dlls/msimg32/Makefile" +ac_config_files="$ac_config_files dlls/msimtf/Makefile" + ac_config_files="$ac_config_files dlls/msisys.ocx/Makefile" ac_config_files="$ac_config_files dlls/msnet32/Makefile" @@ -21690,6 +21692,7 @@ do "dlls/msi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msi/Makefile" ;; "dlls/msi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msi/tests/Makefile" ;; "dlls/msimg32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msimg32/Makefile" ;; + "dlls/msimtf/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msimtf/Makefile" ;; "dlls/msisys.ocx/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msisys.ocx/Makefile" ;; "dlls/msnet32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msnet32/Makefile" ;; "dlls/msrle32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msrle32/Makefile" ;; diff --git a/configure.ac b/configure.ac index 6bb3faa..153e269 100644 --- a/configure.ac +++ b/configure.ac @@ -1696,6 +1696,7 @@ AC_CONFIG_FILES([dlls/mshtml/tests/Makefile]) AC_CONFIG_FILES([dlls/msi/Makefile]) AC_CONFIG_FILES([dlls/msi/tests/Makefile]) AC_CONFIG_FILES([dlls/msimg32/Makefile]) +AC_CONFIG_FILES([dlls/msimtf/Makefile]) AC_CONFIG_FILES([dlls/msisys.ocx/Makefile]) AC_CONFIG_FILES([dlls/msnet32/Makefile]) AC_CONFIG_FILES([dlls/msrle32/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 4871eba..c08e25a 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -121,6 +121,7 @@ BASEDIRS = \ mshtml.tlb \ msi \ msimg32 \ + msimtf \ msisys.ocx \ msnet32 \ msrle32 \ diff --git a/dlls/msimtf/Makefile.in b/dlls/msimtf/Makefile.in new file mode 100644 index 0000000..2ec6168 --- /dev/null +++ b/dlls/msimtf/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = msimtf.dll +IMPORTS = kernel32 + +C_SRCS = main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c new file mode 100644 index 0000000..5659647 --- /dev/null +++ b/dlls/msimtf/main.c @@ -0,0 +1,82 @@ +/* + * Copyright 2007 Jacek Caban for CodeWeavers + * + * 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msimtf); + +/****************************************************************** + * DllMain (msimtf.@) + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +/****************************************************************** + * DllGetClassObject (msimtf.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/****************************************************************** + * DllCanUnloadNow (msimtf.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME("()\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (msimtf.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("()\n"); + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (msimtf.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("()\n"); + return S_OK; +} diff --git a/dlls/msimtf/msimtf.spec b/dlls/msimtf/msimtf.spec new file mode 100644 index 0000000..ea3b7de --- /dev/null +++ b/dlls/msimtf/msimtf.spec @@ -0,0 +1,6 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stub MsimtfIsGuidMapEnable +@ stub MsimtfIsWindowFiltered

1 0

Allan Tong : shell32: Fix a memory leak.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 155cd24fd5369e726556621456f9d4967328f9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=155cd24fd5369e72655662145… Author: Allan Tong <actong88(a)gmail.com> Date: Sun Oct 14 04:05:37 2007 -0400 shell32: Fix a memory leak. --- dlls/shell32/systray.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 2258eb9..cb67fd8 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -169,7 +169,11 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) GetBitmapBits(iconinfo.hbmMask, cbMaskBits, buffer); buffer += cbMaskBits; GetBitmapBits(iconinfo.hbmColor, cbColourBits, buffer); - buffer += cbColourBits; + + /* Reset pointer to allocated block so it can be freed later. + * Note that cds.lpData cannot be passed to HeapFree since it + * points to nid when no icon info is found. */ + buffer = cds.lpData; DeleteObject(iconinfo.hbmMask); DeleteObject(iconinfo.hbmColor);

1 0

Jacek Caban : include: Added dimm.idl.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: db0b392dc2b411cd4add70a20d1e64de838abde3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db0b392dc2b411cd4add70a20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 14 19:13:21 2007 +0200 include: Added dimm.idl. --- .gitignore | 1 + dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/dimm.idl | 588 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 591 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db0b392dc2b411cd4add7…

1 0

Juan Lang : iphlpapi: Implement GetAdapterIndex.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 72ef8729e6cedc6da525106a0dc8fbf3538e065c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ef8729e6cedc6da525106a0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Oct 13 16:39:10 2007 -0700 iphlpapi: Implement GetAdapterIndex. --- dlls/iphlpapi/iphlpapi_main.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d1ef762..c89af67 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -625,15 +625,22 @@ DWORD WINAPI FlushIpNetTable(DWORD dwIfIndex) * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h - * - * FIXME - * Stub, returns ERROR_NOT_SUPPORTED. */ DWORD WINAPI GetAdapterIndex(LPWSTR AdapterName, PULONG IfIndex) { - FIXME("(AdapterName %p, IfIndex %p): stub\n", AdapterName, IfIndex); - /* FIXME: implement using getInterfaceIndexByName */ - return ERROR_NOT_SUPPORTED; + char adapterName[MAX_ADAPTER_NAME]; + int i; + DWORD ret; + + TRACE("(AdapterName %p, IfIndex %p)\n", AdapterName, IfIndex); + /* The adapter name is guaranteed not to have any unicode characters, so + * this translation is never lossy */ + for (i = 0; i < sizeof(adapterName) - 1 && AdapterName[i]; i++) + adapterName[i] = (char)AdapterName[i]; + adapterName[i] = '\0'; + ret = getInterfaceIndexByName(adapterName, IfIndex); + TRACE("returning %d\n", ret); + return ret; }

1 0

Jacek Caban : imm.h: Added REGISTERWORD[AW] declaration.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: a82428b1123390067f161108fb332a3d8e0bf13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82428b1123390067f161108f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 14 19:10:58 2007 +0200 imm.h: Added REGISTERWORD[AW] declaration. --- include/imm.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/imm.h b/include/imm.h index d8f1e4b..89473ed 100644 --- a/include/imm.h +++ b/include/imm.h @@ -28,6 +28,15 @@ extern "C" { typedef HANDLE HIMC; typedef HANDLE HIMCC; +typedef struct tagREGISTERWORDA { + LPSTR lpReading; + LPSTR lpWord; +} REGISTERWORDA, *PREGISTERWORDA, *NPREGISTERWORDA, *LPREGISTERWORDA; + +typedef struct tagREGISTERWORDW { + LPWSTR lpReading; + LPWSTR lpWord; +} REGISTERWORDW, *PREGISTERWORDW, *NPREGISTERWORDW, *LPREGISTERWORDW; typedef int (CALLBACK *REGISTERWORDENUMPROCA)(LPCSTR, DWORD, LPCSTR, LPVOID); typedef int (CALLBACK *REGISTERWORDENUMPROCW)(LPCWSTR, DWORD, LPCWSTR, LPVOID);

1 0