December 2011 - Wine-commits

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: b1c791c7d315742d305eed03bf9ecd552af7024d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c791c7d315742d305eed03b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 13 22:36:48 2011 +0100 po: Update French translation. --- po/fr.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index c364b1b..eebaf7a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-06 00:09+0100\n" +"PO-Revision-Date: 2011-12-13 22:35+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3494,9 +3494,8 @@ msgid "Subscript out of range" msgstr "Indice hors limites" #: jscript.rc:28 -#, fuzzy msgid "Object required" -msgstr "Objet attendu" +msgstr "Objet requis" #: jscript.rc:29 msgid "Automation server can't create object" @@ -6817,9 +6816,8 @@ msgid "&Data Rate" msgstr "&Débit de données" #: msvfw32.rc:52 -#, fuzzy msgid "kB/s" -msgstr "ko/sec" +msgstr "ko/s" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)"

1 0

Alexandre Julliard : gdi32/tests: Add some tests for behavior of 32-bit DDBs.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 6752d3478f450deb1ba4489c47984abccdf892b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6752d3478f450deb1ba4489c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 17:34:58 2011 +0100 gdi32/tests: Add some tests for behavior of 32-bit DDBs. --- dlls/gdi32/tests/bitmap.c | 72 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 58 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index ba8ad84..9a34f63 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3601,22 +3601,24 @@ static void test_clipping(void) DeleteDC( hdcSrc ); } -static void test_32bit_bitmap_blt(void) +static void test_32bit_ddb(void) { - BITMAPINFO biDst; + char buffer[sizeof(BITMAPINFOHEADER) + sizeof(DWORD)]; + BITMAPINFO *biDst = (BITMAPINFO *)buffer; HBITMAP bmpSrc, bmpDst; HBITMAP oldSrc, oldDst; HDC hdcSrc, hdcDst, hdcScreen; - UINT32 *dstBuffer; - DWORD colorSrc = 0x11223344; - - memset(&biDst, 0, sizeof(BITMAPINFO)); - biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - biDst.bmiHeader.biWidth = 2; - biDst.bmiHeader.biHeight = -2; - biDst.bmiHeader.biPlanes = 1; - biDst.bmiHeader.biBitCount = 32; - biDst.bmiHeader.biCompression = BI_RGB; + HBRUSH brush; + DWORD *dstBuffer, *data; + DWORD colorSrc = 0x40201008; + + memset(biDst, 0, sizeof(BITMAPINFOHEADER)); + biDst->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + biDst->bmiHeader.biWidth = 1; + biDst->bmiHeader.biHeight = -1; + biDst->bmiHeader.biPlanes = 1; + biDst->bmiHeader.biBitCount = 32; + biDst->bmiHeader.biCompression = BI_RGB; hdcScreen = CreateCompatibleDC(0); if(GetDeviceCaps(hdcScreen, BITSPIXEL) != 32) @@ -3631,12 +3633,54 @@ static void test_32bit_bitmap_blt(void) oldSrc = SelectObject(hdcSrc, bmpSrc); hdcDst = CreateCompatibleDC(hdcScreen); - bmpDst = CreateDIBSection(hdcDst, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); + bmpDst = CreateDIBSection(hdcDst, biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0); oldDst = SelectObject(hdcDst, bmpDst); StretchBlt(hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, 1, 1, SRCCOPY); ok(dstBuffer[0] == colorSrc, "Expected color=%x, received color=%x\n", colorSrc, dstBuffer[0]); + if (pGdiAlphaBlend) + { + BLENDFUNCTION blend; + BOOL ret; + + blend.BlendOp = AC_SRC_OVER; + blend.BlendFlags = 0; + blend.SourceConstantAlpha = 128; + blend.AlphaFormat = 0; + dstBuffer[0] = 0x80808080; + ret = pGdiAlphaBlend( hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, 1, 1, blend ); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + ok(dstBuffer[0] == 0x60504844, "wrong color %x\n", dstBuffer[0]); + blend.AlphaFormat = AC_SRC_ALPHA; + dstBuffer[0] = 0x80808080; + ret = pGdiAlphaBlend( hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, 1, 1, blend ); + ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); + ok(dstBuffer[0] == 0x90807874, "wrong color %x\n", dstBuffer[0]); + } + + data = (DWORD *)biDst->bmiColors; + data[0] = 0x20304050; + brush = CreateDIBPatternBrushPt( biDst, DIB_RGB_COLORS ); + ok( brush != 0, "brush creation failed\n" ); + SelectObject( hdcSrc, brush ); + PatBlt( hdcSrc, 0, 0, 1, 1, PATCOPY ); + BitBlt( hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, SRCCOPY ); + ok(dstBuffer[0] == data[0], "Expected color=%x, received color=%x\n", data[0], dstBuffer[0]); + SelectObject( hdcSrc, GetStockObject(BLACK_BRUSH) ); + DeleteObject( brush ); + + biDst->bmiHeader.biBitCount = 24; + brush = CreateDIBPatternBrushPt( biDst, DIB_RGB_COLORS ); + ok( brush != 0, "brush creation failed\n" ); + SelectObject( hdcSrc, brush ); + PatBlt( hdcSrc, 0, 0, 1, 1, PATCOPY ); + BitBlt( hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, SRCCOPY ); + ok(dstBuffer[0] == (data[0] & ~0xff000000), + "Expected color=%x, received color=%x\n", data[0] & 0xff000000, dstBuffer[0]); + SelectObject( hdcSrc, GetStockObject(BLACK_BRUSH) ); + DeleteObject( brush ); + /* Tidy up */ SelectObject(hdcDst, oldDst); DeleteObject(bmpDst); @@ -5259,7 +5303,7 @@ START_TEST(bitmap) test_StretchDIBits(); test_GdiAlphaBlend(); test_GdiGradientFill(); - test_32bit_bitmap_blt(); + test_32bit_ddb(); test_bitmapinfoheadersize(); test_get16dibits(); test_clipping();

1 0

Alexandre Julliard : winex11: Add missing initialization of pattern brush style.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 59f790af046899b68744e80d7fafa72c25adbe41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f790af046899b68744e80d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 17:35:21 2011 +0100 winex11: Add missing initialization of pattern brush style. --- dlls/winex11.drv/xrender.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 02625eb..10e6cda 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2690,6 +2690,7 @@ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap physdev->x11dev->brush.pixmap = pixmap; physdev->x11dev->brush.fillStyle = FillTiled; physdev->x11dev->brush.pixel = 0; /* ignored */ + physdev->x11dev->brush.style = BS_PATTERN; wine_tsx11_unlock(); X11DRV_DIB_Unlock( physbitmap, TRUE );

1 0

Alexandre Julliard : wine.inf: Also create iexplorer. exe in the system directory for registration.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: f5956f1ac6a10acd188ac2de5dfa30663138b7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5956f1ac6a10acd188ac2de5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 18:01:25 2011 +0100 wine.inf: Also create iexplorer.exe in the system directory for registration. --- tools/wine.inf.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index a84b73e..2fdd3b7 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2536,6 +2536,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,mui, 11,gecko\plugin,npmshtml.dll 11,wbem,mofcomp.exe +11,,iexplore.exe 11,,winetest.exe,- 12,,mountmgr.sys,- ; registration order matters for these @@ -2562,6 +2563,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,notepad.exe 10,,regedit.exe 11,,explorer.exe +11,,iexplore.exe 11,,notepad.exe 11,,winetest.exe,- 12,,mountmgr.sys

1 0

Alexandre Julliard : setupapi: Specify the correct binary file name when registering an executable.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: f9c8afd320a71ed4a04fbbd199844738a84068b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c8afd320a71ed4a04fbbd19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 14 18:09:18 2011 +0100 setupapi: Specify the correct binary file name when registering an executable. --- dlls/setupapi/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index e73b769..947a512 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -549,7 +549,7 @@ static BOOL do_register_dll( struct register_dll_info *info, const WCHAR *path, memset( &startup, 0, sizeof(startup) ); startup.cb = sizeof(startup); TRACE( "executing %s\n", debugstr_w(cmd_line) ); - res = CreateProcessW( NULL, cmd_line, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &process_info ); + res = CreateProcessW( path, cmd_line, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &process_info ); HeapFree( GetProcessHeap(), 0, cmd_line ); if (!res) {

1 0

Alexandre Julliard : kernel32: Don' t run a nonexistent builtin from CreateProcess when filename is not specified .
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: fe7652d0aff8a3c419190f51031a40af81c9de3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7652d0aff8a3c419190f510… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 20:25:53 2011 +0100 kernel32: Don't run a nonexistent builtin from CreateProcess when filename is not specified. --- dlls/kernel32/process.c | 27 ++++----------------------- 1 files changed, 4 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 0fc2c2b..ad389ec 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -242,24 +242,15 @@ static HANDLE open_exe_file( const WCHAR *name, struct binary_info *binary_info * * Open an exe file, and return the full name and file handle. * Returns FALSE if file could not be found. - * If file exists but cannot be opened, returns TRUE and set handle to INVALID_HANDLE_VALUE. - * If file is a builtin exe, returns TRUE and sets handle to 0. */ static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, HANDLE *handle, struct binary_info *binary_info ) { TRACE("looking for %s\n", debugstr_w(name) ); - if (!SearchPathW( NULL, name, exeW, buflen, buffer, NULL )) - { - if (contains_path( name ) && get_builtin_path( name, exeW, buffer, buflen, binary_info )) - { - *handle = 0; - return TRUE; - } + if (!SearchPathW( NULL, name, exeW, buflen, buffer, NULL ) && /* no builtin found, try native without extension in case it is a Unix app */ - if (!SearchPathW( NULL, name, NULL, buflen, buffer, NULL )) return FALSE; - } + !SearchPathW( NULL, name, NULL, buflen, buffer, NULL )) return FALSE; TRACE( "Trying native exe %s\n", debugstr_w(buffer) ); if ((*handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, @@ -2173,11 +2164,7 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, memcpy( name, cmdline + 1, len * sizeof(WCHAR) ); name[len] = 0; - if (!find_exe_file( name, buffer, buflen, handle, binary_info )) - { - if (!get_builtin_path( name, exeW, buffer, buflen, binary_info )) goto done; - *handle = 0; - } + if (!find_exe_file( name, buffer, buflen, handle, binary_info )) goto done; ret = cmdline; /* no change necessary */ goto done; } @@ -2205,13 +2192,7 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, if (!ret) { - if (first_space) *first_space = 0; /* try only the first word as a builtin */ - if (get_builtin_path( name, exeW, buffer, buflen, binary_info )) - { - *handle = 0; - ret = cmdline; - } - else SetLastError( ERROR_FILE_NOT_FOUND ); + SetLastError( ERROR_FILE_NOT_FOUND ); } else if (first_space) /* build a new command-line with quotes */ {

1 0

Francois Gouget : include: Move some definitions from iptypes.h to nldef.h.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 58fdd9ac1d51e3e3090168eee2a768690a37e557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58fdd9ac1d51e3e3090168eee… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 13 21:04:31 2011 +0100 include: Move some definitions from iptypes.h to nldef.h. Include nldef.h where appropriate. --- include/Makefile.in | 1 + include/iptypes.h | 30 ++++-------------------------- include/mstcpip.h | 2 ++ include/nldef.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 26 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index bea68f0..6bd9020 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -406,6 +406,7 @@ SRCDIR_INCLUDES = \ msxmldid.h \ nb30.h \ ndrtypes.h \ + nldef.h \ npapi.h \ nspapi.h \ ntddcdrm.h \ diff --git a/include/iptypes.h b/include/iptypes.h index 8ce7df6..997388e 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -21,6 +21,7 @@ #include <time.h> #include <ifdef.h> +#include <nldef.h> #define MAX_ADAPTER_DESCRIPTION_LENGTH 128 #define MAX_ADAPTER_NAME_LENGTH 256 @@ -87,32 +88,9 @@ typedef struct { UINT EnableDns; } FIXED_INFO, *PFIXED_INFO; -typedef enum { - IpPrefixOriginOther = 0, - IpPrefixOriginManual, - IpPrefixOriginWellKnown, - IpPrefixOriginDhcp, - IpPrefixOriginRouterAdvertisement, - IpPrefixOriginUnchanged = 16 -} IP_PREFIX_ORIGIN; - -typedef enum { - IpSuffixOriginOther = 0, - IpSuffixOriginManual, - IpSuffixOriginWellKnown, - IpSuffixOriginDhcp, - IpSuffixOriginLinkLayerAddress, - IpSuffixOriginRandom, - IpSuffixOriginUnchanged = 16 -} IP_SUFFIX_ORIGIN; - -typedef enum { - IpDadStateInvalid = 0, - IpDadStateTentative, - IpDadStateDuplicate, - IpDadStateDeprecated, - IpDadStatePreferred -} IP_DAD_STATE; +typedef NL_PREFIX_ORIGIN IP_PREFIX_ORIGIN; +typedef NL_SUFFIX_ORIGIN IP_SUFFIX_ORIGIN; +typedef NL_DAD_STATE IP_DAD_STATE; #ifdef _WINSOCK2API_ diff --git a/include/mstcpip.h b/include/mstcpip.h index 147e135..cb3ce8d 100644 --- a/include/mstcpip.h +++ b/include/mstcpip.h @@ -18,6 +18,8 @@ #ifndef __WINE_MSTCPIP_H #define __WINE_MSTCPIP_H +#include <nldef.h> + struct tcp_keepalive { ULONG onoff; diff --git a/include/nldef.h b/include/nldef.h new file mode 100644 index 0000000..abce1af --- /dev/null +++ b/include/nldef.h @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2003 Juan Lang + * + * 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 + */ +#ifndef __WINE_NLDEF_H +#define __WINE_NLDEF_H + +typedef enum +{ + IpPrefixOriginOther = 0, + IpPrefixOriginManual, + IpPrefixOriginWellKnown, + IpPrefixOriginDhcp, + IpPrefixOriginRouterAdvertisement, + IpPrefixOriginUnchanged = 16, +} NL_PREFIX_ORIGIN; + +typedef enum +{ + IpSuffixOriginOther = 0, + IpSuffixOriginManual, + IpSuffixOriginWellKnown, + IpSuffixOriginDhcp, + IpSuffixOriginLinkLayerAddress, + IpSuffixOriginRandom, + IpSuffixOriginUnchanged = 16, +} NL_SUFFIX_ORIGIN; + +typedef enum +{ + IpDadStateInvalid = 0, + IpDadStateTentative, + IpDadStateDuplicate, + IpDadStateDeprecated, + IpDadStatePreferred, +} NL_DAD_STATE; + +#endif /* __WINE_NLDEF_H */

1 0

Francois Gouget : include: Split iprtrmib.h into multiple mib.h files.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: cf76be61b2e151df155b29e021b5d915f4dd0440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf76be61b2e151df155b29e02… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 13 21:04:41 2011 +0100 include: Split iprtrmib.h into multiple mib.h files. Include them where appropriate. --- include/Makefile.in | 4 + include/ifmib.h | 65 +++++++++++++ include/ipmib.h | 165 +++++++++++++++++++++++++++++++++ include/iprtrmib.h | 257 +-------------------------------------------------- include/nldef.h | 19 ++++ include/tcpmib.h | 79 ++++++++++++++++ include/udpmib.h | 48 ++++++++++ 7 files changed, 383 insertions(+), 254 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf76be61b2e151df155b2…

1 0

Francois Gouget : include: Define the MIB_IF_OPER_STATUS_XXX constants using an enumeration in ipifcons .h.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: 732f5a7239b99cf29a2ca0d471df7e93f8168949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=732f5a7239b99cf29a2ca0d47… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 13 21:10:40 2011 +0100 include: Define the MIB_IF_OPER_STATUS_XXX constants using an enumeration in ipifcons.h. --- dlls/iphlpapi/ifenum.c | 2 +- dlls/iphlpapi/ifenum.h | 2 +- dlls/iphlpapi/iphlpapi_main.c | 3 ++- include/ipifcons.h | 17 ++++++++++------- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index e749cce..b4a956c 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -586,7 +586,7 @@ DWORD getInterfaceMtuByName(const char *name, PDWORD mtu) return ret; } -DWORD getInterfaceStatusByName(const char *name, PDWORD status) +DWORD getInterfaceStatusByName(const char *name, INTERNAL_IF_OPER_STATUS *status) { DWORD ret; int fd; diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index 228d7ee..5600b0b 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -119,6 +119,6 @@ ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs char *toIPAddressString(unsigned int addr, char string[16]) DECLSPEC_HIDDEN; DWORD getInterfaceMtuByName(const char *name, PDWORD mtu) DECLSPEC_HIDDEN; -DWORD getInterfaceStatusByName(const char *name, PDWORD status) DECLSPEC_HIDDEN; +DWORD getInterfaceStatusByName(const char *name, INTERNAL_IF_OPER_STATUS *status) DECLSPEC_HIDDEN; #endif /* ndef WINE_IFENUM_H_ */ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 28185a8..3f72403 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -803,7 +803,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, { char name[IF_NAMESIZE], *ptr = (char *)aa + sizeof(IP_ADAPTER_ADDRESSES), *src; WCHAR *dst; - DWORD buflen, type, status; + DWORD buflen, type; + INTERNAL_IF_OPER_STATUS status; memset(aa, 0, sizeof(IP_ADAPTER_ADDRESSES)); aa->u.s.Length = sizeof(IP_ADAPTER_ADDRESSES); diff --git a/include/ipifcons.h b/include/ipifcons.h index 7fa0a11..d50f129 100644 --- a/include/ipifcons.h +++ b/include/ipifcons.h @@ -231,11 +231,14 @@ #define MIB_IF_ADMIN_STATUS_DOWN 2 #define MIB_IF_ADMIN_STATUS_TESTING 3 -#define MIB_IF_OPER_STATUS_NON_OPERATIONAL 0 -#define MIB_IF_OPER_STATUS_UNREACHABLE 1 -#define MIB_IF_OPER_STATUS_DISCONNECTED 2 -#define MIB_IF_OPER_STATUS_CONNECTING 3 -#define MIB_IF_OPER_STATUS_CONNECTED 4 -#define MIB_IF_OPER_STATUS_OPERATIONAL 5 +typedef enum _INTERNAL_IF_OPER_STATUS +{ + MIB_IF_OPER_STATUS_NON_OPERATIONAL = 0, + MIB_IF_OPER_STATUS_UNREACHABLE = 1, + MIB_IF_OPER_STATUS_DISCONNECTED = 2, + MIB_IF_OPER_STATUS_CONNECTING = 3, + MIB_IF_OPER_STATUS_CONNECTED = 4, + MIB_IF_OPER_STATUS_OPERATIONAL = 5, +} INTERNAL_IF_OPER_STATUS; -#endif /* WINE_ROUTING_IPIFCONS_H__ */ +#endif /* WINE_IPIFCONS_H__ */

1 0

Francois Gouget : include: Add the Dll(Un)RegisterServer() prototypes to olectl.h.
by Alexandre Julliard 14 Dec '11

14 Dec '11

Module: wine Branch: master Commit: a78067fee3fca78d49515c850c81c92f544a3dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78067fee3fca78d49515c850… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 13 21:10:45 2011 +0100 include: Add the Dll(Un)RegisterServer() prototypes to olectl.h. --- include/olectl.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/olectl.h b/include/olectl.h index cda17f6..3ccf09c 100644 --- a/include/olectl.h +++ b/include/olectl.h @@ -183,6 +183,10 @@ typedef VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; #define LP_VGACOLOR 0x2 #define LP_COLOR 0x4 +HRESULT WINAPI DllRegisterServer(void); + +HRESULT WINAPI DllUnregisterServer(void); + HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon); HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams);

1 0