January 2009 - Wine-commits

Henri Verbeet : wined3d: Don't use drawStridedFast() for drawing pretransformed vertices.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: bae1ec98ca010016eff3b28677f34f8aab414eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae1ec98ca010016eff3b2867… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 23 10:22:34 2009 +0100 wined3d: Don't use drawStridedFast() for drawing pretransformed vertices. This was exposed by adding EXT_vertex_array_bgra support, previously we would almost never hit this because color data being present would already prevent us from using drawStridedFast(). Thanks to Stefan for spotting this. --- dlls/wined3d/state.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 54e9733..e1aeeab 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4278,6 +4278,7 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo device->useDrawStridedSlow = FALSE; } } else if (fixup || (!dataLocations->u.s.pSize.lpData + && !dataLocations->position_transformed && (GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA) || (!dataLocations->u.s.diffuse.lpData && !dataLocations->u.s.specular.lpData))))

1 0

Henri Verbeet : wined3d: Don't use drawStridedFast() when pointsize data is present.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 0cc5f0d3ebf4a841ea11f71bac52c6946a61ff8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc5f0d3ebf4a841ea11f71ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 23 10:22:33 2009 +0100 wined3d: Don't use drawStridedFast() when pointsize data is present. --- dlls/wined3d/state.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ce85403..54e9733 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4277,10 +4277,11 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo load_numbered = TRUE; device->useDrawStridedSlow = FALSE; } - } else if (fixup || GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA) || - (dataLocations->u.s.pSize.lpData == NULL && - dataLocations->u.s.diffuse.lpData == NULL && - dataLocations->u.s.specular.lpData == NULL)) { + } else if (fixup || (!dataLocations->u.s.pSize.lpData + && (GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA) + || (!dataLocations->u.s.diffuse.lpData + && !dataLocations->u.s.specular.lpData)))) + { /* Load the vertex data using named arrays */ load_named = TRUE; device->useDrawStridedSlow = FALSE;

1 0

Henri Verbeet : wined3d: Take EXT_vertex_array_bgra into account in send_attribute() and loadNumberedArrays().
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: e82eef28f93cc4e4c89660c47d949cb0f3949b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82eef28f93cc4e4c89660c47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 23 10:22:33 2009 +0100 wined3d: Take EXT_vertex_array_bgra into account in send_attribute() and loadNumberedArrays(). --- dlls/wined3d/drawprim.c | 12 +++++++++++- dlls/wined3d/state.c | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 929565f..c9a8f4a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -534,8 +534,18 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, const DWORD type, co case WINED3DDECLTYPE_UBYTE4: GL_EXTCALL(glVertexAttrib4ubvARB(index, ptr)); break; - case WINED3DDECLTYPE_UBYTE4N: case WINED3DDECLTYPE_D3DCOLOR: + if (GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA)) + { + const DWORD *src = ptr; + DWORD c = *src & 0xff00ff00; + c |= (*src & 0xff0000) >> 16; + c |= (*src & 0xff) << 16; + GL_EXTCALL(glVertexAttrib4NubvARB(index, (GLubyte *)&c)); + break; + } + /* else fallthrough */ + case WINED3DDECLTYPE_UBYTE4N: GL_EXTCALL(glVertexAttrib4NubvARB(index, ptr)); break; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b15eacc..ce85403 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3925,8 +3925,18 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, case WINED3DDECLTYPE_UBYTE4: GL_EXTCALL(glVertexAttrib4NubvARB(i, ptr)); break; - case WINED3DDECLTYPE_UBYTE4N: case WINED3DDECLTYPE_D3DCOLOR: + if (GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA)) + { + const DWORD *src = (const DWORD *)ptr; + DWORD c = *src & 0xff00ff00; + c |= (*src & 0xff0000) >> 16; + c |= (*src & 0xff) << 16; + GL_EXTCALL(glVertexAttrib4NubvARB(i, (GLubyte *)&c)); + break; + } + /* else fallthrough */ + case WINED3DDECLTYPE_UBYTE4N: GL_EXTCALL(glVertexAttrib4NubvARB(i, ptr)); break;

1 0

Anders Jonsson : winefile: Update Swedish translation.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 2ce82aec19167d12cfd5c0570cdfd12c4f602d4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce82aec19167d12cfd5c0570… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Fri Jan 23 10:17:44 2009 +0100 winefile: Update Swedish translation. --- programs/winefile/Sv.rc | 60 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 57 insertions(+), 3 deletions(-) diff --git a/programs/winefile/Sv.rc b/programs/winefile/Sv.rc index 78b6065..6905c5e 100644 --- a/programs/winefile/Sv.rc +++ b/programs/winefile/Sv.rc @@ -4,6 +4,7 @@ * * Copyright 2005 David Nordenberg * Copyright 2008 Daniel Nylander <po(a)danielnylander.se> + * Copyright 2009 Anders Jonsson * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -125,7 +126,7 @@ IDM_WINEFILE MENU FIXED IMPURE POPUP "&F�nster" { MENUITEM "Nytt &f�nster", ID_WINDOW_NEW MENUITEM "�verlappande\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ + MENUITEM "Ordna &horisontellt", ID_WINDOW_TILE_HORZ MENUITEM "Ordna &vertikalt\tCtrl+F4", ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT @@ -171,10 +172,63 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Bl�ddra", 254, 158, 43, 47, 14 } +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Efter filtyp" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Namn:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Filtyp",-1,7,23,87,56 + CONTROL "&Kataloger",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Program",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "&Dokument",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Andra filer",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Visa g�mda/&system-filer",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Egenskaper f�r %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,191,29,50,14 + LTEXT "&Filnamn:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "F&ull s�kv�g:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Sist �ndrad:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Version:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Cop&yright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Storlek:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Attribut",-1,7,79,158,46 + CONTROL "Sk&rivskyddad",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&Dold",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Arkiv",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&Komprimerad",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Versionsinfo",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Verkst�ll teckensnittsinst�llningar" - IDS_FONT_SEL_ERROR "Ett fel uppstog n�r ett nytt teckensnitt valdes." + IDS_FONT_SEL_ERROR "Ett fel uppstod n�r ett nytt teckensnitt valdes." } STRINGTABLE @@ -187,7 +241,7 @@ STRINGTABLE IDS_SHELL "Skal" IDS_TITLEFMT "%s - %s" IDS_NO_IMPL "Inte implementerat �nnu" - IDS_WINE_FILE "Wine File" + IDS_WINE_FILE "Winefile" } STRINGTABLE

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10Buffer implementation.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 6d2d5318c474f97f9ecaec3b059b62cb9afd86e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2d5318c474f97f9ecaec3b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 23 10:22:34 2009 +0100 d3d10core: Add a stub ID3D10Buffer implementation. --- dlls/d3d10core/Makefile.in | 1 + dlls/d3d10core/buffer.c | 164 ++++++++++++++++++++++++++++++++++++ dlls/d3d10core/d3d10core_private.h | 8 ++ dlls/d3d10core/device.c | 20 ++++- 4 files changed, 191 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index 6521150..80f0def 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -7,6 +7,7 @@ IMPORTLIB = d3d10core IMPORTS = dxguid uuid dxgi kernel32 C_SRCS = \ + buffer.c \ d3d10core_main.c \ device.c \ texture2d.c \ diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c new file mode 100644 index 0000000..b6d60af --- /dev/null +++ b/dlls/d3d10core/buffer.c @@ -0,0 +1,164 @@ +/* + * Copyright 2009 Henri Verbeet 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 "wine/port.h" + +#include "d3d10core_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_buffer_QueryInterface(ID3D10Buffer *iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10Buffer) + || IsEqualGUID(riid, &IID_ID3D10Resource) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_buffer_AddRef(ID3D10Buffer *iface) +{ + struct d3d10_buffer *This = (struct d3d10_buffer *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_buffer_Release(ID3D10Buffer *iface) +{ + struct d3d10_buffer *This = (struct d3d10_buffer *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_buffer_GetDevice(ID3D10Buffer *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buffer *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10Resource methods */ + +static void STDMETHODCALLTYPE d3d10_buffer_GetType(ID3D10Buffer *iface, D3D10_RESOURCE_DIMENSION *resource_dimension) +{ + FIXME("iface %p, resource_dimension %p stub!\n", iface, resource_dimension); +} + +static void STDMETHODCALLTYPE d3d10_buffer_SetEvictionPriority(ID3D10Buffer *iface, UINT eviction_priority) +{ + FIXME("iface %p, eviction_priority %u stub!\n", iface, eviction_priority); +} + +static UINT STDMETHODCALLTYPE d3d10_buffer_GetEvictionPriority(ID3D10Buffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +/* ID3D10Buffer methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP map_type, UINT map_flags, void **data) +{ + FIXME("iface %p, map_type %u, map_flags %#x, data %p stub!\n", iface, map_type, map_flags, data); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface) +{ + FIXME("iface %p stub!\n", iface); +} + +static void STDMETHODCALLTYPE d3d10_buffer_GetDesc(ID3D10Buffer *iface, D3D10_BUFFER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +const struct ID3D10BufferVtbl d3d10_buffer_vtbl = +{ + /* IUnknown methods */ + d3d10_buffer_QueryInterface, + d3d10_buffer_AddRef, + d3d10_buffer_Release, + /* ID3D10DeviceChild methods */ + d3d10_buffer_GetDevice, + d3d10_buffer_GetPrivateData, + d3d10_buffer_SetPrivateData, + d3d10_buffer_SetPrivateDataInterface, + /* ID3D10Resource methods */ + d3d10_buffer_GetType, + d3d10_buffer_SetEvictionPriority, + d3d10_buffer_GetEvictionPriority, + /* ID3D10Buffer methods */ + d3d10_buffer_Map, + d3d10_buffer_Unmap, + d3d10_buffer_GetDesc, +}; diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index ab79a80..b9e3a49 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -62,6 +62,14 @@ struct d3d10_texture2d IWineD3DSurface *wined3d_surface; }; +/* ID3D10Buffer */ +extern const struct ID3D10BufferVtbl d3d10_buffer_vtbl; +struct d3d10_buffer +{ + const struct ID3D10BufferVtbl *vtbl; + LONG refcount; +}; + /* ID3D10RenderTargetView */ extern const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl; struct d3d10_rendertarget_view diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 5268ac4..71291cf 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -558,9 +558,25 @@ static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device *iface) static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device *iface, const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data, ID3D10Buffer **buffer) { - FIXME("iface %p, desc %p, data %p, buffer %p stub!\n", iface, desc, data, buffer); + struct d3d10_buffer *object; - return E_NOTIMPL; + FIXME("iface %p, desc %p, data %p, buffer %p partial stub!\n", iface, desc, data, buffer); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 buffer object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_buffer_vtbl; + object->refcount = 1; + + *buffer = (ID3D10Buffer *)object; + + TRACE("Created ID3D10Buffer %p\n", object); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture1D(ID3D10Device *iface,

1 0

Alexandre Julliard : user32/tests: Don't try to do hook tests if we can' t set hooks.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: c83b4e230c8621d99236d120713a480a7f54da04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83b4e230c8621d99236d1207… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 23 13:14:05 2009 +0100 user32/tests: Don't try to do hook tests if we can't set hooks. --- dlls/user32/tests/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 19c89ad..a3d1627 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11380,7 +11380,7 @@ START_TEST(msg) test_accelerators(); test_timers(); test_timers_no_wnd(); - test_set_hook(); + if (hCBT_hook) test_set_hook(); test_DestroyWindow(); test_DispatchMessage(); test_SendMessageTimeout();

1 0

Michael Stefaniuc : winealsa.drv: Remove superfluous pointer casts.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: aea94788e4187944f688061a9ea4ad7beab21a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea94788e4187944f688061a9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 23 10:36:15 2009 +0100 winealsa.drv: Remove superfluous pointer casts. --- dlls/winealsa.drv/dscapture.c | 4 ++-- dlls/winealsa.drv/midi.c | 13 ++++++------- dlls/winealsa.drv/mixer.c | 14 +++++++------- dlls/winealsa.drv/wavein.c | 2 +- dlls/winealsa.drv/waveout.c | 2 +- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 872a80c..304a5eb 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -477,7 +477,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_QueryInterface(PIDSCDRIVERBUFFE if ( IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDsCaptureDriverBuffer) ) { IDsCaptureDriverBuffer_AddRef(iface); - *ppobj = (LPVOID)iface; + *ppobj = iface; return DS_OK; } @@ -494,7 +494,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_QueryInterface(PIDSCDRIVERBUFFE IDsDriverNotify_AddRef((PIDSDRIVERNOTIFY)This->notify); } IDsDriverNotify_AddRef((PIDSDRIVERNOTIFY)This->notify); - *ppobj = (LPVOID)This->notify; + *ppobj = This->notify; return DS_OK; } diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 24a9b65..b62a885 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -376,7 +376,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) { int pos = 0; int len = ev->data.ext.len; - LPBYTE ptr = (BYTE*) ev->data.ext.ptr; + LPBYTE ptr = ev->data.ext.ptr; LPMIDIHDR lpMidiHdr; EnterCriticalSection(&crit_sect); @@ -393,7 +393,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)lpMidiHdr->lpNext; + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime) != MMSYSERR_NOERROR) WARN("Couldn't notify client\n"); } @@ -594,10 +594,9 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) } else { LPMIDIHDR ptr; - for (ptr = MidiInDev[wDevID].lpQueueHdr; - ptr->lpNext != 0; - ptr = (LPMIDIHDR)ptr->lpNext); - ptr->lpNext = (struct midihdr_tag*)lpMidiHdr; + for (ptr = MidiInDev[wDevID].lpQueueHdr; ptr->lpNext != 0; + ptr = ptr->lpNext); + ptr->lpNext = lpMidiHdr; } LeaveCriticalSection(&crit_sect); @@ -666,7 +665,7 @@ static DWORD midReset(WORD wDevID) (DWORD_PTR)MidiInDev[wDevID].lpQueueHdr, dwTime) != MMSYSERR_NOERROR) { WARN("Couldn't notify client\n"); } - MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)MidiInDev[wDevID].lpQueueHdr->lpNext; + MidiInDev[wDevID].lpQueueHdr = MidiInDev[wDevID].lpQueueHdr->lpNext; } LeaveCriticalSection(&crit_sect); diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 426656d..e5cd347 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -915,7 +915,7 @@ static DWORD MIX_GetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW TRACE("%s MIXERCONTROLDETAILS_UNSIGNED[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels); - mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)mctrld->paDetails; + mcdu = mctrld->paDetails; if (mctrld->cChannels != 1 && mmixer->lines[line].chans != mctrld->cChannels) { @@ -966,7 +966,7 @@ static DWORD MIX_GetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels); - mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)mctrld->paDetails; + mcdb = mctrld->paDetails; if (line == 1) for (chn = 0; chn <= SND_MIXER_SCHN_LAST; ++chn) @@ -1009,7 +1009,7 @@ static DWORD MIX_GetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels); - mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)mctrld->paDetails; + mcdb = mctrld->paDetails; for (x = 0; x<mmixer->chans; ++x) if (line != x && mmixer->lines[x].dst == line) @@ -1045,7 +1045,7 @@ static DWORD MIX_GetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW if (ct->c.dwControlType == MIXERCONTROL_CONTROLTYPE_MUX || ct->c.dwControlType == MIXERCONTROL_CONTROLTYPE_MIXER) { - LPMIXERCONTROLDETAILS_LISTTEXTW mcdlt = (LPMIXERCONTROLDETAILS_LISTTEXTW)mctrld->paDetails; + LPMIXERCONTROLDETAILS_LISTTEXTW mcdlt = mctrld->paDetails; int i, j; for (i = j = 0; j < mmixer->chans; ++j) @@ -1143,7 +1143,7 @@ static DWORD MIX_SetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW } TRACE("%s MIXERCONTROLDETAILS_UNSIGNED[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels); - mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)mctrld->paDetails; + mcdu = mctrld->paDetails; for (chn=0; chn<mctrld->cChannels;++chn) { @@ -1191,7 +1191,7 @@ static DWORD MIX_SetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels); - mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)mctrld->paDetails; + mcdb = mctrld->paDetails; if (line == 1) /* Mute/unmute capturing */ for (i = 0; i <= SND_MIXER_SCHN_LAST; ++i) { @@ -1219,7 +1219,7 @@ static DWORD MIX_SetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW } TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels); - mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)mctrld->paDetails; + mcdb = mctrld->paDetails; for (x=i=0; x < mmixer->chans; ++x) if (line != x && mmixer->lines[x].dst == line) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 89ad9df..d6337bc 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -142,7 +142,7 @@ static void widRecorder_ReadHeaders(WINE_WAVEDEV * wwi) static DWORD CALLBACK widRecorder(LPVOID pmt) { WORD uDevID = (DWORD_PTR)pmt; - WINE_WAVEDEV* wwi = (WINE_WAVEDEV*)&WInDev[uDevID]; + WINE_WAVEDEV* wwi = &WInDev[uDevID]; WAVEHDR* lpWaveHdr; DWORD dwSleepTime; DWORD bytesRead; diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index b99731b..b785dce 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -521,7 +521,7 @@ static DWORD wodPlayer_FeedDSP(WINE_WAVEDEV* wwo) static DWORD CALLBACK wodPlayer(LPVOID pmt) { WORD uDevID = (DWORD_PTR)pmt; - WINE_WAVEDEV* wwo = (WINE_WAVEDEV*)&WOutDev[uDevID]; + WINE_WAVEDEV* wwo = &WOutDev[uDevID]; DWORD dwNextFeedTime = INFINITE; /* Time before DSP needs feeding */ DWORD dwNextNotifyTime = INFINITE; /* Time before next wave completion */ DWORD dwSleepTime;

1 0

Jacek Caban : shdocvw: Fixed tests on IE7.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: da5372beed92930d79c7c3ec0decfff49c9df8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5372beed92930d79c7c3ec0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 23 02:06:09 2009 +0100 shdocvw: Fixed tests on IE7. --- dlls/shdocvw/tests/webbrowser.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 76dfbf7..dc8b6b2 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -582,7 +582,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe break; case DISPID_SETSECURELOCKICON: - CHECK_EXPECT(Invoke_SETSECURELOCKICON); + CHECK_EXPECT2(Invoke_SETSECURELOCKICON); ok(pDispParams->rgvarg != NULL, "rgvarg == NULL\n"); ok(pDispParams->cArgs == 1, "cArgs=%d, expected 1\n", pDispParams->cArgs); @@ -1081,10 +1081,10 @@ static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface, DOCHOSTUIINFO *pInfo) { - CHECK_EXPECT(GetHostInfo); + CHECK_EXPECT2(GetHostInfo); ok(pInfo != NULL, "pInfo=NULL\n"); if(pInfo) { - ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO), "pInfo->cbSize=%u\n", pInfo->cbSize); + ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO) || broken(!pInfo->cbSize), "pInfo->cbSize=%u\n", pInfo->cbSize); ok(!pInfo->dwFlags, "pInfo->dwFlags=%08x, expected 0\n", pInfo->dwFlags); ok(!pInfo->dwDoubleClick, "pInfo->dwDoubleClick=%08x, expected 0\n", pInfo->dwDoubleClick); ok(!pInfo->pchHostCss, "pInfo->pchHostCss=%p, expected NULL\n", pInfo->pchHostCss);

1 0

Andrew Talbot : rsaenh: Declare some functions static.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 149ee9bf3ba89069e0e579c8fb7caae45b61fd24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=149ee9bf3ba89069e0e579c8f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 22 22:07:54 2009 +0000 rsaenh: Declare some functions static. --- dlls/rsaenh/mpi.c | 278 ++++++++++++++++++++++++------------------------ dlls/rsaenh/tomcrypt.h | 29 ----- 2 files changed, 139 insertions(+), 168 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 1a5affd..0eb91f3 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -232,6 +232,28 @@ mp_zero (mp_int * a) memset (a->dp, 0, sizeof (mp_digit) * a->alloc); } +/* b = |a| + * + * Simple function copies the input and fixes the sign to positive + */ +static int +mp_abs (const mp_int * a, mp_int * b) +{ + int res; + + /* copy a to b */ + if (a != b) { + if ((res = mp_copy (a, b)) != MP_OKAY) { + return res; + } + } + + /* force the sign of b to positive */ + b->sign = MP_ZPOS; + + return MP_OKAY; +} + /* computes the modular inverse via binary extended euclidean algorithm, * that is c = 1/a mod b * @@ -793,7 +815,7 @@ static int fast_s_mp_sqr (const mp_int * a, mp_int * b) * Simple algorithm which zeroes the int, grows it then just sets one bit * as required. */ -int +static int mp_2expt (mp_int * a, int b) { int res; @@ -815,28 +837,6 @@ mp_2expt (mp_int * a, int b) return MP_OKAY; } -/* b = |a| - * - * Simple function copies the input and fixes the sign to positive - */ -int -mp_abs (const mp_int * a, mp_int * b) -{ - int res; - - /* copy a to b */ - if (a != b) { - if ((res = mp_copy (a, b)) != MP_OKAY) { - return res; - } - } - - /* force the sign of b to positive */ - b->sign = MP_ZPOS; - - return MP_OKAY; -} - /* high level addition (handles signs) */ int mp_add (mp_int * a, mp_int * b, mp_int * c) { @@ -870,7 +870,7 @@ int mp_add (mp_int * a, mp_int * b, mp_int * c) /* single digit addition */ -int +static int mp_add_d (mp_int * a, mp_digit b, mp_int * c) { int res, ix, oldused; @@ -1205,6 +1205,57 @@ mp_mod_2d (const mp_int * a, int b, mp_int * c) return MP_OKAY; } +/* shift right a certain amount of digits */ +static void mp_rshd (mp_int * a, int b) +{ + int x; + + /* if b <= 0 then ignore it */ + if (b <= 0) { + return; + } + + /* if b > used then simply zero it and return */ + if (a->used <= b) { + mp_zero (a); + return; + } + + { + register mp_digit *bottom, *top; + + /* shift the digits down */ + + /* bottom */ + bottom = a->dp; + + /* top [offset into digits] */ + top = a->dp + b; + + /* this is implemented as a sliding window where + * the window is b-digits long and digits from + * the top of the window are copied to the bottom + * + * e.g. + + b-2 | b-1 | b0 | b1 | b2 | ... | bb | ----> + /\ | ----> + \-------------------/ ----> + */ + for (x = 0; x < (a->used - b); x++) { + *bottom++ = *top++; + } + + /* zero the top digits */ + for (; x < a->used; x++) { + *bottom++ = 0; + } + } + + /* remove excess digits */ + a->used -= b; +} + /* shift right by a certain bit count (store quotient in c, optional remainder in d) */ static int mp_div_2d (const mp_int * a, int b, mp_int * c, mp_int * d) { @@ -3096,7 +3147,7 @@ static const mp_digit __prime_tab[] = { * * sets result to 0 if not, 1 if yes */ -int mp_prime_is_divisible (const mp_int * a, int *result) +static int mp_prime_is_divisible (const mp_int * a, int *result) { int err, ix; mp_digit res; @@ -3120,68 +3171,6 @@ int mp_prime_is_divisible (const mp_int * a, int *result) return MP_OKAY; } -/* performs a variable number of rounds of Miller-Rabin - * - * Probability of error after t rounds is no more than - - * - * Sets result to 1 if probably prime, 0 otherwise - */ -int mp_prime_is_prime (mp_int * a, int t, int *result) -{ - mp_int b; - int ix, err, res; - - /* default to no */ - *result = MP_NO; - - /* valid value of t? */ - if (t <= 0 || t > PRIME_SIZE) { - return MP_VAL; - } - - /* is the input equal to one of the primes in the table? */ - for (ix = 0; ix < PRIME_SIZE; ix++) { - if (mp_cmp_d(a, __prime_tab[ix]) == MP_EQ) { - *result = 1; - return MP_OKAY; - } - } - - /* first perform trial division */ - if ((err = mp_prime_is_divisible (a, &res)) != MP_OKAY) { - return err; - } - - /* return if it was trivially divisible */ - if (res == MP_YES) { - return MP_OKAY; - } - - /* now perform the miller-rabin rounds */ - if ((err = mp_init (&b)) != MP_OKAY) { - return err; - } - - for (ix = 0; ix < t; ix++) { - /* set the prime */ - mp_set (&b, __prime_tab[ix]); - - if ((err = mp_prime_miller_rabin (a, &b, &res)) != MP_OKAY) { - goto __B; - } - - if (res == MP_NO) { - goto __B; - } - } - - /* passed the test */ - *result = MP_YES; -__B:mp_clear (&b); - return err; -} - /* Miller-Rabin test of "a" to the base of "b" as described in * HAC pp. 139 Algorithm 4.24 * @@ -3189,7 +3178,7 @@ __B:mp_clear (&b); * Randomly the chance of error is no more than 1/4 and often * very much lower. */ -int mp_prime_miller_rabin (mp_int * a, const mp_int * b, int *result) +static int mp_prime_miller_rabin (mp_int * a, const mp_int * b, int *result) { mp_int n1, y, r; int s, j, err; @@ -3264,6 +3253,68 @@ __N1:mp_clear (&n1); return err; } +/* performs a variable number of rounds of Miller-Rabin + * + * Probability of error after t rounds is no more than + + * + * Sets result to 1 if probably prime, 0 otherwise + */ +static int mp_prime_is_prime (mp_int * a, int t, int *result) +{ + mp_int b; + int ix, err, res; + + /* default to no */ + *result = MP_NO; + + /* valid value of t? */ + if (t <= 0 || t > PRIME_SIZE) { + return MP_VAL; + } + + /* is the input equal to one of the primes in the table? */ + for (ix = 0; ix < PRIME_SIZE; ix++) { + if (mp_cmp_d(a, __prime_tab[ix]) == MP_EQ) { + *result = 1; + return MP_OKAY; + } + } + + /* first perform trial division */ + if ((err = mp_prime_is_divisible (a, &res)) != MP_OKAY) { + return err; + } + + /* return if it was trivially divisible */ + if (res == MP_YES) { + return MP_OKAY; + } + + /* now perform the miller-rabin rounds */ + if ((err = mp_init (&b)) != MP_OKAY) { + return err; + } + + for (ix = 0; ix < t; ix++) { + /* set the prime */ + mp_set (&b, __prime_tab[ix]); + + if ((err = mp_prime_miller_rabin (a, &b, &res)) != MP_OKAY) { + goto __B; + } + + if (res == MP_NO) { + goto __B; + } + } + + /* passed the test */ + *result = MP_YES; +__B:mp_clear (&b); + return err; +} + static const struct { int k, t; } sizes[] = { @@ -3574,57 +3625,6 @@ int mp_reduce_setup (mp_int * a, const mp_int * b) return mp_div (a, b, a, NULL); } -/* shift right a certain amount of digits */ -void mp_rshd (mp_int * a, int b) -{ - int x; - - /* if b <= 0 then ignore it */ - if (b <= 0) { - return; - } - - /* if b > used then simply zero it and return */ - if (a->used <= b) { - mp_zero (a); - return; - } - - { - register mp_digit *bottom, *top; - - /* shift the digits down */ - - /* bottom */ - bottom = a->dp; - - /* top [offset into digits] */ - top = a->dp + b; - - /* this is implemented as a sliding window where - * the window is b-digits long and digits from - * the top of the window are copied to the bottom - * - * e.g. - - b-2 | b-1 | b0 | b1 | b2 | ... | bb | ----> - /\ | ----> - \-------------------/ ----> - */ - for (x = 0; x < (a->used - b); x++) { - *bottom++ = *top++; - } - - /* zero the top digits */ - for (; x < a->used; x++) { - *bottom++ = 0; - } - } - - /* remove excess digits */ - a->used -= b; -} - /* set to a digit */ void mp_set (mp_int * a, mp_digit b) { diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h index 0efa086..aaaac98 100644 --- a/dlls/rsaenh/tomcrypt.h +++ b/dlls/rsaenh/tomcrypt.h @@ -275,12 +275,6 @@ void mp_clamp(mp_int *a); /* ---> digit manipulation <--- */ -/* right shift by "b" digits */ -void mp_rshd(mp_int *a, int b); - -/* computes a = 2**b */ -int mp_2expt(mp_int *a, int b); - /* Counts the number of lsbs which are zero before the first zero bit */ int mp_cnt_lsb(const mp_int *a); @@ -304,9 +298,6 @@ int mp_and(mp_int *a, mp_int *b, mp_int *c); /* b = -a */ int mp_neg(mp_int *a, mp_int *b); -/* b = |a| */ -int mp_abs(const mp_int *a, mp_int *b); - /* compare a to b */ int mp_cmp(const mp_int *a, const mp_int *b); @@ -333,9 +324,6 @@ int mp_mod(const mp_int *a, mp_int *b, mp_int *c); /* compare against a single digit */ int mp_cmp_d(const mp_int *a, mp_digit b); -/* c = a + b */ -int mp_add_d(mp_int *a, mp_digit b, mp_int *c); - /* c = a - b */ int mp_sub_d(mp_int *a, mp_digit b, mp_int *c); @@ -427,33 +415,16 @@ int mp_exptmod(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d); /* number of primes */ #define PRIME_SIZE 256 -/* result=1 if a is divisible by one of the first PRIME_SIZE primes */ -int mp_prime_is_divisible(const mp_int *a, int *result); - /* performs one Fermat test of "a" using base "b". * Sets result to 0 if composite or 1 if probable prime */ int mp_prime_fermat(mp_int *a, mp_int *b, int *result); -/* performs one Miller-Rabin test of "a" using base "b". - * Sets result to 0 if composite or 1 if probable prime - */ -int mp_prime_miller_rabin(mp_int *a, const mp_int *b, int *result); - /* This gives [for a given bit size] the number of trials required * such that Miller-Rabin gives a prob of failure lower than 2^-96 */ int mp_prime_rabin_miller_trials(int size); -/* performs t rounds of Miller-Rabin on "a" using the first - * t prime bases. Also performs an initial sieve of trial - * division. Determines if "a" is prime with probability - * of error no more than (1/4)**t. - * - * Sets result to 1 if probably prime, 0 otherwise - */ -int mp_prime_is_prime(mp_int *a, int t, int *result); - /* finds the next prime after the number "a" using "t" trials * of Miller-Rabin. *

1 0

Austin English : iphlpapi: Include netinet/if_inarp.h for NetBSD.
by Alexandre Julliard 23 Jan '09

23 Jan '09

Module: wine Branch: master Commit: 337067a89d39a6bf20d53e4930f42bb7d9145302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=337067a89d39a6bf20d53e493… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 22 10:44:06 2009 -0600 iphlpapi: Include netinet/if_inarp.h for NetBSD. --- configure | 2 ++ configure.ac | 1 + dlls/iphlpapi/ipstats.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 9 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f327766..bf76813 100755 --- a/configure +++ b/configure @@ -7926,6 +7926,7 @@ done + for ac_header in \ netinet/ip.h \ net/if.h \ @@ -7934,6 +7935,7 @@ for ac_header in \ net/if_types.h \ net/route.h \ netinet/if_ether.h \ + netinet/if_inarp.h \ netinet/in_pcb.h \ netinet/ip_icmp.h \ netinet/ip_var.h \ diff --git a/configure.ac b/configure.ac index 1a2828d..66ad0ac 100644 --- a/configure.ac +++ b/configure.ac @@ -386,6 +386,7 @@ AC_CHECK_HEADERS(\ net/if_types.h \ net/route.h \ netinet/if_ether.h \ + netinet/if_inarp.h \ netinet/in_pcb.h \ netinet/ip_icmp.h \ netinet/ip_var.h \ diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 5d0be71..32e24e3 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -64,6 +64,9 @@ #ifdef HAVE_NETINET_IF_ETHER_H #include <netinet/if_ether.h> #endif +#ifdef HAVE_NETINET_IF_INARP_H +#include <netinet/if_inarp.h> +#endif #ifdef HAVE_NETINET_IP_H #include <netinet/ip.h> #endif diff --git a/include/config.h.in b/include/config.h.in index db83db0..11dc1c6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -456,6 +456,9 @@ /* Define to 1 if you have the <netinet/if_ether.h> header file. */ #undef HAVE_NETINET_IF_ETHER_H +/* Define to 1 if you have the <netinet/if_inarp.h> header file. */ +#undef HAVE_NETINET_IF_INARP_H + /* Define to 1 if you have the <netinet/in.h> header file. */ #undef HAVE_NETINET_IN_H

1 0