wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Vincent Povirk : ole32: Don' t treat the header as a big block in StorageImpl_SaveFileHeader.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: f3db25fc2589cec8cc9aa64ba1adc3410e7d2384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3db25fc2589cec8cc9aa64ba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 10 13:57:35 2010 -0600 ole32: Don't treat the header as a big block in StorageImpl_SaveFileHeader. --- dlls/ole32/storage32.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0d07aed..9f43264 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3399,29 +3399,35 @@ static HRESULT StorageImpl_LoadFileHeader( /****************************************************************************** * Storage32Impl_SaveFileHeader * - * This method will save to the file the header, i.e. big block -1. + * This method will save to the file the header */ static void StorageImpl_SaveFileHeader( StorageImpl* This) { - BYTE headerBigBlock[BIG_BLOCK_SIZE]; + BYTE headerBigBlock[HEADER_SIZE]; int index; - BOOL success; + HRESULT hr; + ULARGE_INTEGER offset; + DWORD bytes_read, bytes_written; /* * Get a pointer to the big block of data containing the header. */ - success = StorageImpl_ReadBigBlock(This, -1, headerBigBlock); + offset.u.HighPart = 0; + offset.u.LowPart = 0; + hr = StorageImpl_ReadAt(This, offset, headerBigBlock, HEADER_SIZE, &bytes_read); + if (SUCCEEDED(hr) && bytes_read != HEADER_SIZE) + hr = STG_E_FILENOTFOUND; /* * If the block read failed, the file is probably new. */ - if (!success) + if (FAILED(hr)) { /* * Initialize for all unknown fields. */ - memset(headerBigBlock, 0, BIG_BLOCK_SIZE); + memset(headerBigBlock, 0, HEADER_SIZE); /* * Initialize the magic number. @@ -3492,7 +3498,7 @@ static void StorageImpl_SaveFileHeader( /* * Write the big block back to the file. */ - StorageImpl_WriteBigBlock(This, -1, headerBigBlock); + StorageImpl_WriteAt(This, offset, headerBigBlock, HEADER_SIZE, &bytes_written); } /******************************************************************************

1 0

Vincent Povirk : ole32: Don' t treat the header as a big block in StorageImpl_LoadFileHeader.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 7f3211f3831368b9639321a66e748b563b233e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3211f3831368b9639321a66… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 10 13:49:04 2010 -0600 ole32: Don't treat the header as a big block in StorageImpl_LoadFileHeader. The header is always 512 bytes, regardless of the big block size. --- dlls/ole32/storage32.c | 17 +++++++++++------ dlls/ole32/storage32.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f1a98e1..0d07aed 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3290,26 +3290,31 @@ static void StorageImpl_SetNextBlockInChain( /****************************************************************************** * Storage32Impl_LoadFileHeader * - * This method will read in the file header, i.e. big block index -1. + * This method will read in the file header */ static HRESULT StorageImpl_LoadFileHeader( StorageImpl* This) { - HRESULT hr = STG_E_FILENOTFOUND; - BYTE headerBigBlock[BIG_BLOCK_SIZE]; - BOOL success; + HRESULT hr; + BYTE headerBigBlock[HEADER_SIZE]; int index; + ULARGE_INTEGER offset; + DWORD bytes_read; TRACE("\n"); /* * Get a pointer to the big block of data containing the header. */ - success = StorageImpl_ReadBigBlock(This, -1, headerBigBlock); + offset.u.HighPart = 0; + offset.u.LowPart = 0; + hr = StorageImpl_ReadAt(This, offset, headerBigBlock, HEADER_SIZE, &bytes_read); + if (SUCCEEDED(hr) && bytes_read != HEADER_SIZE) + hr = STG_E_FILENOTFOUND; /* * Extract the information from the header. */ - if (success) + if (SUCCEEDED(hr)) { /* * Check for the "magic number" signature and return an error if it is not diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 03328b2..b1c835b 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -79,6 +79,8 @@ static const ULONG DIRENTRY_NULL = 0xFFFFFFFF; #define RAW_DIRENTRY_SIZE 0x00000080 +#define HEADER_SIZE 512 + /* * Type of child entry link */

1 0

Andrew Nguyen : wine.inf: Add LSA key under the HKLM control key.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 671136693ba07cd3d15a15f57900a75b76150324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=671136693ba07cd3d15a15f57… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Mar 8 14:40:51 2010 -0600 wine.inf: Add LSA key under the HKLM control key. --- 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 9c9721a..7ad4291 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -620,6 +620,7 @@ HKLM,Software\Microsoft\TermServLicensing,,16 HKLM,Software\Microsoft\Transaction Server,,16 HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 +HKLM,System\CurrentControlSet\Control\Lsa,,16 HKLM,System\CurrentControlSet\Control\VMM32Files,,16 HKCU,AppEvents\Schemes\Apps\Explorer\Navigating\.Current,,,"" HKCU,Software\Microsoft\Protected Storage System Provider,,16

1 0

Yann Droneaud : configure: Fixed <linux/ppdev.h> test.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: dd33ee99b9b4370af9dcff7a3fab951bba19caf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd33ee99b9b4370af9dcff7a3… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Mon Mar 8 14:46:46 2010 +0100 configure: Fixed <linux/ppdev.h> test. --- configure | 3 +++ configure.ac | 5 ++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/configure b/configure index f3eec77..110c350 100755 --- a/configure +++ b/configure @@ -10119,6 +10119,9 @@ if test "${ac_cv_c_ppdev+set}" = set; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif #include <linux/ppdev.h> int main () diff --git a/configure.ac b/configure.ac index e3787eb..b077e2d 100644 --- a/configure.ac +++ b/configure.ac @@ -1266,7 +1266,10 @@ test "x$FREETYPELIBS" = "x" && enable_fonts=${enable_fonts:-no} dnl **** Check for parport (currently Linux only) **** AC_CACHE_CHECK([for parport header/ppdev.h], ac_cv_c_ppdev, - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <linux/ppdev.h>]], [[ioctl (1,PPCLAIM,0)]])], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif +#include <linux/ppdev.h>]], [[ioctl (1,PPCLAIM,0)]])], [ac_cv_c_ppdev="yes"],[ac_cv_c_ppdev="no"])) if test "$ac_cv_c_ppdev" = "yes" then

1 0

Yann Droneaud : cmd: Fixed uninitialised field in WCMD_addCommand() ( Valgrind).
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 727df7a2ef98af08f95b5930359055219d97ca6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=727df7a2ef98af08f95b59303… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Sun Mar 7 22:37:23 2010 +0100 cmd: Fixed uninitialised field in WCMD_addCommand() (Valgrind). --- programs/cmd/wcmdmain.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b2243e3..b86801c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1636,6 +1636,8 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, } else { thisEntry->command = NULL; + thisEntry->redirects = NULL; + thisEntry->pipeFile[0] = 0x00; } /* Fill in other fields */

1 0

Gerald Pfeifer : ntdll: Avoid compiler warning in the default case in append_entry.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: dfa200d1e896c4d56e751fa2a0a83c909394a3f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa200d1e896c4d56e751fa2a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Mar 6 22:39:37 2010 +0100 ntdll: Avoid compiler warning in the default case in append_entry. --- dlls/ntdll/directory.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index ecd9418..865c2fa 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1120,6 +1120,7 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK default: assert(0); + return NULL; } memcpy( filename, long_nameW, total_len - ((char *)filename - (char *)info) ); io->Information += total_len;

1 0

Gerald Pfeifer : comdlg32: Remove unused parameters from CFn_WMMeasureItem and CFn_WMDrawItem.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 3ecea9f8265de7796d426aefd8b7c8aaf623050b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ecea9f8265de7796d426aefd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Mar 6 14:55:51 2010 +0100 comdlg32: Remove unused parameters from CFn_WMMeasureItem and CFn_WMDrawItem. --- dlls/comdlg32/fontdlg.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 1ad881c..80f1ad9 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -766,7 +766,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) /*********************************************************************** * CFn_WMMeasureItem [internal] */ -static LRESULT CFn_WMMeasureItem(HWND hDlg, WPARAM wParam, LPARAM lParam) +static LRESULT CFn_WMMeasureItem(HWND hDlg, LPARAM lParam) { HDC hdc; HFONT hfontprev; @@ -794,7 +794,7 @@ static LRESULT CFn_WMMeasureItem(HWND hDlg, WPARAM wParam, LPARAM lParam) /*********************************************************************** * CFn_WMDrawItem [internal] */ -static LRESULT CFn_WMDrawItem(HWND hDlg, WPARAM wParam, LPARAM lParam) +static LRESULT CFn_WMDrawItem(LPARAM lParam) { HBRUSH hBrush; WCHAR buffer[40]; @@ -1190,9 +1190,9 @@ static INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, switch (uMsg) { case WM_MEASUREITEM: - return CFn_WMMeasureItem(hDlg, wParam, lParam); + return CFn_WMMeasureItem(hDlg,lParam); case WM_DRAWITEM: - return CFn_WMDrawItem(hDlg, wParam, lParam); + return CFn_WMDrawItem(lParam); case WM_COMMAND: return CFn_WMCommand(hDlg, wParam, lParam, lpcfw); case WM_DESTROY: @@ -1239,9 +1239,9 @@ static INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, switch (uMsg) { case WM_MEASUREITEM: - return CFn_WMMeasureItem(hDlg, wParam, lParam); + return CFn_WMMeasureItem(hDlg, lParam); case WM_DRAWITEM: - return CFn_WMDrawItem(hDlg, wParam, lParam); + return CFn_WMDrawItem(lParam); case WM_COMMAND: return CFn_WMCommand(hDlg, wParam, lParam, lpcf); case WM_DESTROY:

1 0

Gerald Pfeifer : comdlg32: Removed unused parameters from FILEDLG95_OnWMSize, FILEDLG95_OnWMCommand, and FD32_WMMeasureItem.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 27b7f2596892db9966557ccbf010309be9dd15e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b7f2596892db9966557ccbf… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Mar 6 14:49:41 2010 +0100 comdlg32: Removed unused parameters from FILEDLG95_OnWMSize, FILEDLG95_OnWMCommand, and FD32_WMMeasureItem. --- dlls/comdlg32/filedlg.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 58b57cc..5f90fe1 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -176,7 +176,7 @@ static SIZE MemDialogSize = { 0, 0}; /* keep size of the (resizable) dialog */ /* Internal functions used by the dialog */ static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam); static LRESULT FILEDLG95_FillControls(HWND hwnd, WPARAM wParam, LPARAM lParam); -static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam); +static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam); static LRESULT FILEDLG95_OnWMGetIShellBrowser(HWND hwnd); static BOOL FILEDLG95_OnOpen(HWND hwnd); static LRESULT FILEDLG95_InitControls(HWND hwnd); @@ -991,7 +991,7 @@ static LRESULT FILEDLG95_OnWMGetMMI( HWND hwnd, LPMINMAXINFO mmiptr) * vertically or horizontally to get out of the way. Only the "grip" * is moved in both directions to stay in the corner. */ -static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam) +static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam) { RECT rc, rcview; int chgx, chgy; @@ -1223,11 +1223,11 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l return 0; } case WM_SIZE: - return FILEDLG95_OnWMSize(hwnd, wParam, lParam); + return FILEDLG95_OnWMSize(hwnd, wParam); case WM_GETMINMAXINFO: return FILEDLG95_OnWMGetMMI( hwnd, (LPMINMAXINFO)lParam); case WM_COMMAND: - return FILEDLG95_OnWMCommand(hwnd, wParam, lParam); + return FILEDLG95_OnWMCommand(hwnd, wParam); case WM_DRAWITEM: { switch(((LPDRAWITEMSTRUCT)lParam)->CtlID) @@ -1733,7 +1733,7 @@ void FILEDLG95_Clean(HWND hwnd) * * WM_COMMAND message handler */ -static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) +static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam) { WORD wNotifyCode = HIWORD(wParam); /* notification code */ WORD wID = LOWORD(wParam); /* item, control, or accelerator identifier */ @@ -3799,7 +3799,7 @@ BOOL FD32_GetTemplate(PFD31_DATA lfs) /*********************************************************************** * FD32_WMMeasureItem [internal] */ -static LONG FD32_WMMeasureItem(HWND hWnd, WPARAM wParam, LPARAM lParam) +static LONG FD32_WMMeasureItem(LPARAM lParam) { LPMEASUREITEMSTRUCT lpmeasure; @@ -3832,7 +3832,7 @@ static INT_PTR CALLBACK FD32_FileOpenDlgProc(HWND hWnd, UINT wMsg, return FD31_WMInitDialog(hWnd, wParam, lParam); case WM_MEASUREITEM: - return FD32_WMMeasureItem(hWnd, wParam, lParam); + return FD32_WMMeasureItem(lParam); case WM_DRAWITEM: return FD31_WMDrawItem(hWnd, wParam, lParam, !lfs->open, (DRAWITEMSTRUCT *)lParam);

1 0

Gerald Pfeifer : comdlg32: Removed unused parameters from PRINTDLG_WMInitDialogW and PRINTDLG_WMInitDialogA .
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 4b25c6e6adeb9ef565fc0f7205b11948fe21a8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b25c6e6adeb9ef565fc0f720… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Mar 6 14:42:25 2010 +0100 comdlg32: Removed unused parameters from PRINTDLG_WMInitDialogW and PRINTDLG_WMInitDialogA. --- dlls/comdlg32/printdlg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index f653251..74a06ff 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1504,7 +1504,7 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, * PRINTDLG_WMCommand [internal] */ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, - LPARAM lParam, PRINT_PTRA* PrintStructures) + PRINT_PTRA* PrintStructures) { LPPRINTDLGA lppd = PrintStructures->lpPrintDlg; UINT PrinterComboID = (lppd->Flags & PD_PRINTSETUP) ? cmb1 : cmb4; @@ -1658,7 +1658,7 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, } static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, - LPARAM lParam, PRINT_PTRW* PrintStructures) + PRINT_PTRW* PrintStructures) { LPPRINTDLGW lppd = PrintStructures->lpPrintDlg; UINT PrinterComboID = (lppd->Flags & PD_PRINTSETUP) ? cmb1 : cmb4; @@ -1846,7 +1846,7 @@ static INT_PTR CALLBACK PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, switch (uMsg) { case WM_COMMAND: - return PRINTDLG_WMCommandA(hDlg, wParam, lParam, PrintStructures); + return PRINTDLG_WMCommandA(hDlg, wParam, PrintStructures); case WM_DESTROY: DestroyIcon(PrintStructures->hCollateIcon); @@ -1892,7 +1892,7 @@ static INT_PTR CALLBACK PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, switch (uMsg) { case WM_COMMAND: - return PRINTDLG_WMCommandW(hDlg, wParam, lParam, PrintStructures); + return PRINTDLG_WMCommandW(hDlg, wParam, PrintStructures); case WM_DESTROY: DestroyIcon(PrintStructures->hCollateIcon);

1 0

Juan Lang : iphlpapi: Check for ifr_hwaddr member of struct ifreq.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 984c3b2ccb83655209b969296e311b36fcf836be URL: http://source.winehq.org/git/wine.git/?a=commit;h=984c3b2ccb83655209b969296… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 12 10:38:46 2010 -0800 iphlpapi: Check for ifr_hwaddr member of struct ifreq. --- configure | 17 +++++++++++++++++ configure.ac | 9 +++++++++ dlls/iphlpapi/ifenum.c | 2 +- include/config.h.in | 3 +++ 4 files changed, 30 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 3807a70..f3eec77 100755 --- a/configure +++ b/configure @@ -13429,6 +13429,23 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_hwaddr" "ac_cv_member_struct_ifreq_ifr_hwaddr" "#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NET_IF_H +# include <net/if.h> +#endif +" +if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_IFREQ_IFR_HWADDR 1 +_ACEOF + + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timezone variable" >&5 $as_echo_n "checking for timezone variable... " >&6; } if test "${ac_cv_have_timezone+set}" = set; then : diff --git a/configure.ac b/configure.ac index 8eb37a2..e3787eb 100644 --- a/configure.ac +++ b/configure.ac @@ -2047,6 +2047,15 @@ AC_CHECK_MEMBERS([struct icmpstat.icps_outhist],,, #include <netinet/icmp_var.h> #endif]) +dnl Check for struct ifreq.ifr_hwaddr +AC_CHECK_MEMBERS([struct ifreq.ifr_hwaddr],,, +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NET_IF_H +# include <net/if.h> +#endif]) + dnl Check for the external timezone variables timezone and daylight AC_CACHE_CHECK([for timezone variable], ac_cv_have_timezone, AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[timezone = 1]])],[ac_cv_have_timezone="yes"],[ac_cv_have_timezone="no"])) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index d348229..02c6a9d 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -298,7 +298,7 @@ static DWORD getInterfaceMaskByName(const char *name) return ret; } -#if defined (SIOCGIFHWADDR) +#if defined (SIOCGIFHWADDR) && defined (HAVE_STRUCT_IFREQ_IFR_HWADDR) static DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, PDWORD type) { diff --git a/include/config.h.in b/include/config.h.in index 7c34980..fb8a79b 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -777,6 +777,9 @@ /* Define to 1 if `icps_outhist' is a member of `struct icmpstat'. */ #undef HAVE_STRUCT_ICMPSTAT_ICPS_OUTHIST +/* Define to 1 if `ifr_hwaddr' is a member of `struct ifreq'. */ +#undef HAVE_STRUCT_IFREQ_IFR_HWADDR + /* Define to 1 if `msg_accrights' is a member of `struct msghdr'. */ #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
92
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 2010