October 2011 - Wine-commits

Andrew Eikum : winecfg: Reload winmm for each sound test.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: b07a82c01dc0422719a98f20471f240b35d9e5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07a82c01dc0422719a98f204… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 5 13:39:46 2011 -0500 winecfg: Reload winmm for each sound test. Also localize the error dialog while we're in there. --- po/ar.po | 70 ++++++++++++++++++++++------------------- po/bg.po | 70 ++++++++++++++++++++++------------------- po/ca.po | 70 ++++++++++++++++++++++------------------- po/cs.po | 70 ++++++++++++++++++++++------------------- po/da.po | 71 ++++++++++++++++++++++------------------- po/de.po | 71 ++++++++++++++++++++++------------------- po/el.po | 70 ++++++++++++++++++++++------------------- po/en.po | 70 ++++++++++++++++++++++------------------- po/en_US.po | 70 ++++++++++++++++++++++------------------- po/eo.po | 70 ++++++++++++++++++++++------------------- po/es.po | 70 ++++++++++++++++++++++------------------- po/fa.po | 70 ++++++++++++++++++++++------------------- po/fi.po | 70 ++++++++++++++++++++++------------------- po/fr.po | 71 ++++++++++++++++++++++------------------- po/he.po | 70 ++++++++++++++++++++++------------------- po/hi.po | 70 ++++++++++++++++++++++------------------- po/hu.po | 70 ++++++++++++++++++++++------------------- po/it.po | 71 ++++++++++++++++++++++------------------- po/ja.po | 71 ++++++++++++++++++++++------------------- po/ko.po | 71 ++++++++++++++++++++++------------------- po/lt.po | 71 ++++++++++++++++++++++------------------- po/ml.po | 70 ++++++++++++++++++++++------------------- po/nb_NO.po | 71 ++++++++++++++++++++++------------------- po/nl.po | 71 ++++++++++++++++++++++------------------- po/or.po | 70 ++++++++++++++++++++++------------------- po/pa.po | 70 ++++++++++++++++++++++------------------- po/pl.po | 71 ++++++++++++++++++++++------------------- po/pt_BR.po | 71 ++++++++++++++++++++++------------------- po/pt_PT.po | 71 ++++++++++++++++++++++------------------- po/rm.po | 70 ++++++++++++++++++++++------------------- po/ro.po | 70 ++++++++++++++++++++++------------------- po/ru.po | 71 ++++++++++++++++++++++------------------- po/sk.po | 70 ++++++++++++++++++++++------------------- po/sl.po | 71 ++++++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 70 ++++++++++++++++++++++------------------- po/sr_RS(a)latin.po | 70 ++++++++++++++++++++++------------------- po/sv.po | 71 ++++++++++++++++++++++------------------- po/te.po | 70 ++++++++++++++++++++++------------------- po/th.po | 70 ++++++++++++++++++++++------------------- po/tr.po | 70 ++++++++++++++++++++++------------------- po/uk.po | 70 ++++++++++++++++++++++------------------- po/wa.po | 70 ++++++++++++++++++++++------------------- po/wine.pot | 70 ++++++++++++++++++++++------------------- po/zh_CN.po | 70 ++++++++++++++++++++++------------------- po/zh_TW.po | 70 ++++++++++++++++++++++------------------- programs/winecfg/Makefile.in | 2 +- programs/winecfg/audio.c | 37 ++++++++++++++++++++- programs/winecfg/resource.h | 2 + programs/winecfg/winecfg.rc | 2 + 49 files changed, 1720 insertions(+), 1488 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b07a82c01dc0422719a98…

1 0

Andrew Eikum : mmdevapi: Attempt to determine default devices from the registry.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 66724f617ef8871c91619dbbf8ce12a0e90a6258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66724f617ef8871c91619dbbf… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 5 13:39:53 2011 -0500 mmdevapi: Attempt to determine default devices from the registry. This uses a new, Wine-specific registry key <HKCU\Software\Wine\Drivers\wine<driver>.drv> to determine the correct device to use for the various defaults. The drivers still supply their own defaults which will be chosen if no registry entry is defined. For portability we use a driver-specific key in order to support default devices for each of the driver backends. --- dlls/mmdevapi/devenum.c | 70 ++++++++++++++++++++++++++++++++++++++++++---- dlls/mmdevapi/main.c | 7 ++-- dlls/mmdevapi/mmdevapi.h | 2 + 3 files changed, 70 insertions(+), 9 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 6b6cfb6..06a1adf 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -909,21 +909,79 @@ static HRESULT WINAPI MMDevEnum_EnumAudioEndpoints(IMMDeviceEnumerator *iface, E static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *iface, EDataFlow flow, ERole role, IMMDevice **device) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); + WCHAR reg_key[256]; + HKEY key; + HRESULT hr; + + static const WCHAR slashW[] = {'\\',0}; + static const WCHAR reg_out_nameW[] = {'D','e','f','a','u','l','t','O','u','t','p','u','t',0}; + static const WCHAR reg_vout_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','O','u','t','p','u','t',0}; + static const WCHAR reg_in_nameW[] = {'D','e','f','a','u','l','t','I','n','p','u','t',0}; + static const WCHAR reg_vin_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','I','n','p','u','t',0}; + TRACE("(%p)->(%u,%u,%p)\n", This, flow, role, device); if (!device) return E_POINTER; + + if((flow != eRender && flow != eCapture) || + (role != eConsole && role != eMultimedia && role != eCommunications)){ + WARN("Unknown flow (%u) or role (%u)\n", flow, role); + return E_INVALIDARG; + } + *device = NULL; + if(!drvs.module_name[0]) + return E_NOTFOUND; + + lstrcpyW(reg_key, drv_keyW); + lstrcatW(reg_key, slashW); + lstrcatW(reg_key, drvs.module_name); + + if(RegOpenKeyW(HKEY_CURRENT_USER, reg_key, &key) == ERROR_SUCCESS){ + const WCHAR *reg_x_name, *reg_vx_name; + WCHAR def_id[256]; + DWORD size = sizeof(def_id); + + if(flow == eRender){ + reg_x_name = reg_out_nameW; + reg_vx_name = reg_vout_nameW; + }else{ + reg_x_name = reg_in_nameW; + reg_vx_name = reg_vin_nameW; + } + + if(role == eCommunications && + RegQueryValueExW(key, reg_vx_name, 0, NULL, + (BYTE*)def_id, &size) == ERROR_SUCCESS){ + hr = IMMDeviceEnumerator_GetDevice(iface, def_id, device); + if(SUCCEEDED(hr)){ + RegCloseKey(key); + return S_OK; + } + + TRACE("Unable to find voice device %s\n", wine_dbgstr_w(def_id)); + } + + if(RegQueryValueExW(key, reg_x_name, 0, NULL, + (BYTE*)def_id, &size) == ERROR_SUCCESS){ + hr = IMMDeviceEnumerator_GetDevice(iface, def_id, device); + if(SUCCEEDED(hr)){ + RegCloseKey(key); + return S_OK; + } + + TRACE("Unable to find device %s\n", wine_dbgstr_w(def_id)); + } + + RegCloseKey(key); + } + if (flow == eRender) *device = &MMDevice_def_play->IMMDevice_iface; - else if (flow == eCapture) - *device = &MMDevice_def_rec->IMMDevice_iface; else - { - WARN("Unknown flow %u\n", flow); - return E_INVALIDARG; - } + *device = &MMDevice_def_rec->IMMDevice_iface; if (!*device) return E_NOTFOUND; diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index c2c3562..c0e2ff6 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -53,6 +53,9 @@ static HINSTANCE instance; DriverFuncs drvs; +const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\','D','r','i','v','e','r','s',0}; + static const char *get_priority_string(int prio) { switch(prio){ @@ -106,8 +109,6 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) static BOOL init_driver(void) { - static const WCHAR drv_key[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s',0}; static const WCHAR drv_value[] = {'A','u','d','i','o',0}; static WCHAR default_list[] = {'a','l','s','a',',','o','s','s',',', @@ -120,7 +121,7 @@ static BOOL init_driver(void) if(drvs.module) return TRUE; - if(RegOpenKeyW(HKEY_CURRENT_USER, drv_key, &key) == ERROR_SUCCESS){ + if(RegOpenKeyW(HKEY_CURRENT_USER, drv_keyW, &key) == ERROR_SUCCESS){ DWORD size = sizeof(reg_list); if(RegQueryValueExW(key, drv_value, 0, NULL, (BYTE*)reg_list, diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 6ad1ab3..98e0825 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -75,3 +75,5 @@ typedef struct MMDevice { extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC_HIDDEN; extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) DECLSPEC_HIDDEN; + +extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN;

1 0

Huw Davies : winex11: Initialise the dib color table.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 82f4538c552bebd361cc9a8ecfa0e37b9c2db2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f4538c552bebd361cc9a8ec… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 17:48:23 2011 -0500 winex11: Initialise the dib color table. --- dlls/winex11.drv/mouse.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 0ba57d1..033f94c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -726,6 +726,15 @@ static Cursor create_xcursor_cursor( HDC hdc, const ICONINFOEXW *iinfo, HANDLE i goto cleanup; } info->bmiHeader.biBitCount = 1; + info->bmiColors[0].rgbRed = 0; + info->bmiColors[0].rgbGreen = 0; + info->bmiColors[0].rgbBlue = 0; + info->bmiColors[0].rgbReserved = 0; + info->bmiColors[1].rgbRed = 0xff; + info->bmiColors[1].rgbGreen = 0xff; + info->bmiColors[1].rgbBlue = 0xff; + info->bmiColors[1].rgbReserved = 0; + mask_size = ((width + 31) / 32 * 4) * height; /* width_bytes * height */ info->bmiHeader.biSizeImage = mask_size; hbmMask = CreateDIBSection( hdc, info, DIB_RGB_COLORS, (VOID **) &mask_bits, NULL, 0);

1 0

Huw Davies : gdi32: Display the depth of a bitmap rather than the total number colors.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 9969b8dec1e08e5645a013627e0b696abb774fc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9969b8dec1e08e5645a013627… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 5 09:11:20 2011 -0500 gdi32: Display the depth of a bitmap rather than the total number colors. --- dlls/gdi32/bitmap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 9c77016..7c8fa54 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -332,8 +332,8 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) if (bm.bmBits) SetBitmapBits( hbitmap, bm.bmHeight * bm.bmWidthBytes, bm.bmBits ); - TRACE("%dx%d, %d colors returning %p\n", bm.bmWidth, bm.bmHeight, - 1 << (bm.bmPlanes * bm.bmBitsPixel), hbitmap); + TRACE("%dx%d, bpp %d planes %d: returning %p\n", bm.bmWidth, bm.bmHeight, + bm.bmBitsPixel, bm.bmPlanes, hbitmap); return hbitmap; }

1 0

Nikolay Sivov : msxml3: Accept disabled parameter entities feature.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 1bd501ab3e4a09e2acd6b996643137f649a9f4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd501ab3e4a09e2acd6b9966… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 5 09:20:32 2011 -0500 msxml3: Accept disabled parameter entities feature. --- dlls/msxml3/saxreader.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0460533..77373f1 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -206,6 +206,11 @@ static const WCHAR FeatureExternalGeneralEntitiesW[] = { '-','e','n','t','i','t','i','e','s',0 }; +static const WCHAR FeatureExternalParameterEntitiesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','e','x','t','e','r','n','a','l','-','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 +}; + static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) @@ -2614,6 +2619,9 @@ static HRESULT WINAPI saxxmlreader_putFeature( if (!strcmpW(FeatureExternalGeneralEntitiesW, feature) && value == VARIANT_FALSE) return set_feature_value(This, ExternalGeneralEntities, value); + if (!strcmpW(FeatureExternalParameterEntitiesW, feature) && value == VARIANT_FALSE) + return set_feature_value(This, ExternalParameterEntities, value); + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; }

1 0

Nikolay Sivov : msxml3: Accept lexical handler parameter entities switch.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: cc4c6946238300979fc421a79f9f6b8800979b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc4c6946238300979fc421a79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 5 09:37:40 2011 -0500 msxml3: Accept lexical handler parameter entities switch. --- dlls/msxml3/saxreader.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 77373f1..b7cd432 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -64,7 +64,8 @@ enum ReaderFeatures ServerHttpRequest = 1 << 11, SuppressValidationfatalError = 1 << 12, UseInlineSchema = 1 << 13, - UseSchemaLocation = 1 << 14 + UseSchemaLocation = 1 << 14, + LexicalHandlerParEntities = 1 << 15 }; struct bstrpool @@ -211,6 +212,11 @@ static const WCHAR FeatureExternalParameterEntitiesW[] = { '/','e','x','t','e','r','n','a','l','-','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 }; +static const WCHAR FeatureLexicalHandlerParEntitiesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','l','e','x','i','c','a','l','-','h','a','n','d','l','e','r','/','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 +}; + static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) @@ -2622,6 +2628,12 @@ static HRESULT WINAPI saxxmlreader_putFeature( if (!strcmpW(FeatureExternalParameterEntitiesW, feature) && value == VARIANT_FALSE) return set_feature_value(This, ExternalParameterEntities, value); + if (!strcmpW(FeatureLexicalHandlerParEntitiesW, feature)) + { + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); + return set_feature_value(This, LexicalHandlerParEntities, value); + } + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; }

1 0

Andrew Talbot : mapi32: Mark some fall-throughs in a switch statement.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: 203085dcee5c9af56f32d7d13a460fb10b342b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203085dcee5c9af56f32d7d13… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 4 22:48:33 2011 +0100 mapi32: Mark some fall-throughs in a switch statement. --- dlls/mapi32/prop.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 75c1b1e..5173412 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -221,31 +221,39 @@ ULONG WINAPI UlPropSize(LPSPropValue lpProp) switch (PROP_TYPE(lpProp->ulPropTag)) { case PT_MV_I2: ulRet = lpProp->Value.MVi.cValues; + /* fall through */ case PT_BOOLEAN: case PT_I2: ulRet *= sizeof(USHORT); break; case PT_MV_I4: ulRet = lpProp->Value.MVl.cValues; + /* fall through */ case PT_ERROR: case PT_I4: ulRet *= sizeof(LONG); break; case PT_MV_I8: ulRet = lpProp->Value.MVli.cValues; + /* fall through */ case PT_I8: ulRet *= sizeof(LONG64); break; case PT_MV_R4: ulRet = lpProp->Value.MVflt.cValues; + /* fall through */ case PT_R4: ulRet *= sizeof(float); break; case PT_MV_APPTIME: case PT_MV_R8: ulRet = lpProp->Value.MVdbl.cValues; + /* fall through */ case PT_APPTIME: case PT_R8: ulRet *= sizeof(double); break; case PT_MV_CURRENCY: ulRet = lpProp->Value.MVcur.cValues; + /* fall through */ case PT_CURRENCY: ulRet *= sizeof(CY); break; case PT_MV_SYSTIME: ulRet = lpProp->Value.MVft.cValues; + /* fall through */ case PT_SYSTIME: ulRet *= sizeof(FILETIME); break; case PT_MV_CLSID: ulRet = lpProp->Value.MVguid.cValues; + /* fall through */ case PT_CLSID: ulRet *= sizeof(GUID); break; case PT_MV_STRING8: ulRet = 0u;

1 0

Andrew Talbot : msacm32: Mark fall-through in switch statement.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: a051be53d25251f1d3208ebab67e0137d7c1ad2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a051be53d25251f1d3208ebab… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 4 22:48:37 2011 +0100 msacm32: Mark fall-through in switch statement. --- dlls/msacm32/msacm32_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c index d3160e3..6552812 100644 --- a/dlls/msacm32/msacm32_main.c +++ b/dlls/msacm32/msacm32_main.c @@ -87,6 +87,7 @@ DWORD WINAPI acmGetVersion(void) return 0x04000565; /* 4.0.1381 */ default: FIXME("%x not supported\n", version.dwPlatformId); + /* fall through */ case VER_PLATFORM_WIN32_WINDOWS: return 0x04030000; /* 4.3.0 */ }

1 0

Andrew Talbot : mshtml: Mark some fall-throughs in switch statements.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: 76a6404c2660c8cbf0249901c7bce76c01ac5a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a6404c2660c8cbf0249901c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 4 22:48:41 2011 +0100 mshtml: Mark some fall-throughs in switch statements. --- dlls/mshtml/dispex.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 44d0911..75b3f87 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -559,6 +559,7 @@ static HRESULT function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR case DISPATCH_METHOD|DISPATCH_PROPERTYGET: if(!res) return E_INVALIDARG; + /* fall through */ case DISPATCH_METHOD: hres = typeinfo_invoke(This->obj, This->info, flags, params, res, ei); break; @@ -611,6 +612,7 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, case DISPATCH_METHOD|DISPATCH_PROPERTYGET: if(!res) return E_INVALIDARG; + /* fall through */ case DISPATCH_METHOD: hres = typeinfo_invoke(This, func, flags, dp, res, ei); break; @@ -653,6 +655,7 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, } default: FIXME("Unimplemented flags %x\n", flags); + /* fall through */ case DISPATCH_PROPERTYPUT: hres = E_NOTIMPL; } @@ -932,6 +935,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPATCH_METHOD|DISPATCH_PROPERTYGET: if(!pvarRes) return E_INVALIDARG; + /* fall through */ case DISPATCH_METHOD: { DISPID named_arg = DISPID_THIS; DISPPARAMS dp = {NULL, &named_arg, 0, 1};

1 0

Thomas Faber : kernel32/tests: Fix MSVC build in file.c and pipe.c.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: bcbaefe8b51d0fad238579d1076111e19a5fa8a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcbaefe8b51d0fad238579d10… Author: Thomas Faber <thfabba(a)gmx.de> Date: Tue Oct 4 22:45:49 2011 +0200 kernel32/tests: Fix MSVC build in file.c and pipe.c. --- dlls/kernel32/tests/file.c | 2 +- dlls/kernel32/tests/pipe.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3ed3f66..772e439 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -38,7 +38,7 @@ static BOOL (WINAPI *pReplaceFileA)(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOI static BOOL (WINAPI *pReplaceFileW)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPVOID, LPVOID); static UINT (WINAPI *pGetSystemWindowsDirectoryA)(LPSTR, UINT); static BOOL (WINAPI *pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); -static DWORD WINAPI (*pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); +static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); /* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 890a50e..ab85ad5 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -36,7 +36,7 @@ static HANDLE alarm_event; static BOOL (WINAPI *pDuplicateTokenEx)(HANDLE,DWORD,LPSECURITY_ATTRIBUTES, SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); -static DWORD WINAPI (*pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); +static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); static BOOL user_apc_ran; static void CALLBACK user_apc(ULONG_PTR param)

1 0