wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Austin English : include/ddk: Add KWAIT_BLOCK struct to ntddk.h.
by Alexandre Julliard 27 Jan '15

27 Jan '15

Module: wine Branch: master Commit: 59e3a851f21aaf9c188cc98b753af09ee7093cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e3a851f21aaf9c188cc98b7… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 26 16:14:19 2015 -0600 include/ddk: Add KWAIT_BLOCK struct to ntddk.h. --- include/ddk/ntddk.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 56f2f35..e9c3fba 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -140,6 +140,15 @@ typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION LARGE_INTEGER ValidDataLength; } FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION; +typedef struct _KWAIT_BLOCK { + LIST_ENTRY WaitListEntry; + struct _KTHREAD *RESTRICTED_POINTER Thread; + PVOID Object; + struct _KWAIT_BLOCK *RESTRICTED_POINTER NextWaitBlock; + USHORT WaitKey; + USHORT WaitType; +} KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; + typedef VOID (WINAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(PVOID,PVOID); typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO);

1 0

Andrew Eikum : winmm: Allow HMIXEROBJ handles in place of device IDs in mixerGetDevCaps.
by Alexandre Julliard 27 Jan '15

27 Jan '15

Module: wine Branch: master Commit: bbc5244c0b52f8ad90e82c284f3ec0c9d13c64a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc5244c0b52f8ad90e82c284… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 27 09:02:50 2015 -0600 winmm: Allow HMIXEROBJ handles in place of device IDs in mixerGetDevCaps. --- dlls/winmm/tests/mixer.c | 16 ++++++++++++++++ dlls/winmm/waveform.c | 17 ++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 982cf8b..82eb338 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -395,6 +395,14 @@ static void mixer_test_deviceA(int device) ok(rc==MMSYSERR_NOERROR, "mixerOpen: MMSYSERR_NOERROR expected, got %s\n",mmsys_error(rc)); if (rc==MMSYSERR_NOERROR) { + MIXERCAPSA capsA2; + + rc=mixerGetDevCapsA((UINT_PTR)mix,&capsA2,sizeof(capsA2)); + ok(rc==MMSYSERR_NOERROR, + "mixerGetDevCapsA: MMSYSERR_NOERROR expected, got %s\n", + mmsys_error(rc)); + ok(!strcmp(capsA2.szPname, capsA.szPname), "Got wrong device caps\n"); + for (d=0;d<capsA.cDestinations;d++) { MIXERLINEA mixerlineA; mixerlineA.cbStruct = 0; @@ -771,6 +779,14 @@ static void mixer_test_deviceW(int device) ok(rc==MMSYSERR_NOERROR, "mixerOpen: MMSYSERR_NOERROR expected, got %s\n",mmsys_error(rc)); if (rc==MMSYSERR_NOERROR) { + MIXERCAPSW capsW2; + + rc=mixerGetDevCapsW((UINT_PTR)mix,&capsW2,sizeof(capsW2)); + ok(rc==MMSYSERR_NOERROR, + "mixerGetDevCapsW: MMSYSERR_NOERROR expected, got %s\n", + mmsys_error(rc)); + ok(!lstrcmpW(capsW2.szPname, capsW.szPname), "Got wrong device caps\n"); + for (d=0;d<capsW.cDestinations;d++) { MIXERLINEW mixerlineW; mixerlineW.cbStruct = 0; diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index f381c16..ba74e02 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -122,6 +122,7 @@ struct _WINMM_MMDevice { WAVEOUTCAPSW out_caps; /* must not be modified outside of WINMM_InitMMDevices*/ WAVEINCAPSW in_caps; /* must not be modified outside of WINMM_InitMMDevices*/ WCHAR *dev_id; + EDataFlow dataflow; ISimpleAudioVolume *volume; @@ -510,6 +511,7 @@ static HRESULT WINMM_InitMMDevice(EDataFlow flow, IMMDevice *device, { HRESULT hr; + dev->dataflow = flow; if(flow == eRender){ dev->out_caps.wMid = 0xFF; dev->out_caps.wPid = 0xFF; @@ -3749,15 +3751,20 @@ UINT WINAPI mixerGetDevCapsW(UINT_PTR uDeviceID, LPMIXERCAPSW lpCaps, UINT uSize return MMSYSERR_NOERROR; if(uDeviceID >= g_outmmdevices_count + g_inmmdevices_count) + mmdevice = WINMM_GetMixerMMDevice((HMIXEROBJ)uDeviceID, + MIXER_OBJECTF_MIXER, NULL); + else if(uDeviceID < g_outmmdevices_count) + mmdevice = read_map(g_out_map, uDeviceID); + else + mmdevice = read_map(g_in_map, uDeviceID - g_outmmdevices_count); + + if(!mmdevice) return MMSYSERR_BADDEVICEID; - if(uDeviceID < g_outmmdevices_count){ - mmdevice = read_map(g_out_map, uDeviceID); + if(mmdevice->dataflow == eRender) memcpy(caps.szPname, mmdevice->out_caps.szPname, sizeof(caps.szPname)); - }else{ - mmdevice = read_map(g_in_map, uDeviceID - g_outmmdevices_count); + else memcpy(caps.szPname, mmdevice->in_caps.szPname, sizeof(caps.szPname)); - } caps.wMid = 0xFF; caps.wPid = 0xFF;

1 0

Mark Harmstone : mmdevapi: Allow PKEY_AudioEndpoint_PhysicalSpeakers to be overridden.
by Alexandre Julliard 27 Jan '15

27 Jan '15

Module: wine Branch: master Commit: 7b8dbc477661bf1ac151f499bb1c56557f30ff26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8dbc477661bf1ac151f499b… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Mon Jan 26 22:28:12 2015 +0000 mmdevapi: Allow PKEY_AudioEndpoint_PhysicalSpeakers to be overridden. --- dlls/mmdevapi/devenum.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index c140437..9a27520 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -372,7 +372,17 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st } if (flow != eCapture) - set_driver_prop_value(id, flow, &PKEY_AudioEndpoint_PhysicalSpeakers); + { + PROPVARIANT pv2; + + PropVariantInit(&pv2); + + /* make read-write by not overwriting if already set */ + if (FAILED(MMDevice_GetPropValue(id, flow, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv2)) || pv2.vt != VT_UI4) + set_driver_prop_value(id, flow, &PKEY_AudioEndpoint_PhysicalSpeakers); + + PropVariantClear(&pv2); + } RegCloseKey(keyprop); }

1 0

Charles Davis : configure: Check that we can link to QuickTime.framework before using it.
by Alexandre Julliard 27 Jan '15

27 Jan '15

Module: wine Branch: master Commit: b218e81de352e3cf457b08ad358ea42028358c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b218e81de352e3cf457b08ad3… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Jan 26 16:28:10 2015 -0700 configure: Check that we can link to QuickTime.framework before using it. --- configure | 34 +++++++++++++++++++++++++++++++--- configure.ac | 17 ++++++++++++++--- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 7413f28..0431209 100755 --- a/configure +++ b/configure @@ -7949,10 +7949,38 @@ done fi if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes" then - QUICKTIME_LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo" + ac_save_LIBS="$LIBS" + LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the QuickTime framework" >&5 +$as_echo_n "checking for the QuickTime framework... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <QuickTime/ImageCompression.h> +int +main () +{ +CodecManagerVersion(NULL); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + QUICKTIME_LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo" - enable_wineqtdecoder=${enable_wineqtdecoder:-yes} - else + enable_wineqtdecoder=${enable_wineqtdecoder:-yes} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ac_cv_header_QuickTime_ImageCompression_h=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_save_LIBS" + fi + if test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes" + then as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported." fi if test "$ac_cv_header_Carbon_Carbon_h" = "yes" diff --git a/configure.ac b/configure.ac index 95c230b..a931730 100644 --- a/configure.ac +++ b/configure.ac @@ -813,9 +813,20 @@ uninstall:: fi if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes" then - AC_SUBST(QUICKTIME_LIBS,"-framework QuickTime -framework ApplicationServices -framework CoreVideo") - enable_wineqtdecoder=${enable_wineqtdecoder:-yes} - else + dnl Make sure we can actually use the QuickTime framework + ac_save_LIBS="$LIBS" + LIBS="-framework QuickTime -framework ApplicationServices -framework CoreVideo $LIBS" + AC_MSG_CHECKING([for the QuickTime framework]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <QuickTime/ImageCompression.h>]],[[CodecManagerVersion(NULL);]])], + [AC_MSG_RESULT([yes]) + AC_SUBST(QUICKTIME_LIBS,"-framework QuickTime -framework ApplicationServices -framework CoreVideo") + enable_wineqtdecoder=${enable_wineqtdecoder:-yes}], + [AC_MSG_RESULT([no]) + ac_cv_header_QuickTime_ImageCompression_h=no]) + LIBS="$ac_save_LIBS" + fi + if test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes" + then WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) fi if test "$ac_cv_header_Carbon_Carbon_h" = "yes"

1 0

Jacek Caban : mshtml: Added URI_ flags declaration and improved debug traces.
by Alexandre Julliard 26 Jan '15

26 Jan '15

Module: wine Branch: master Commit: e62612b2c37e8fc0eccf5920d6483953cc5bc4db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62612b2c37e8fc0eccf5920d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 26 16:13:31 2015 +0100 mshtml: Added URI_ flags declaration and improved debug traces. --- dlls/mshtml/nsiface.idl | 21 +++++++++++++++++++++ dlls/mshtml/nsio.c | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 1d8e263..551406c 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2731,6 +2731,27 @@ interface nsIDirectoryServiceProvider2 : nsIDirectoryServiceProvider ] interface nsIProtocolHandler : nsISupports { + const unsigned long URI_STD = 0; + const unsigned long URI_NORELATIVE = (1<<0); + const unsigned long URI_NOAUTH = (1<<1); + const unsigned long ALLOWS_PROXY = (1<<2); + const unsigned long ALLOWS_PROXY_HTTP = (1<<3); + const unsigned long URI_INHERITS_SECURITY_CONTEXT = (1<<4); + const unsigned long URI_FORBIDS_AUTOMATIC_DOCUMENT_REPLACEMENT = (1<<5); + const unsigned long URI_LOADABLE_BY_ANYONE = (1<<6); + const unsigned long URI_DANGEROUS_TO_LOAD = (1<<7); + const unsigned long URI_IS_UI_RESOURCE = (1<<8); + const unsigned long URI_IS_LOCAL_FILE = (1<<9); + const unsigned long URI_LOADABLE_BY_SUBSUMERS = (1<<10); + const unsigned long URI_DOES_NOT_RETURN_DATA = (1<<11); + const unsigned long URI_IS_LOCAL_RESOURCE = (1<<12); + const unsigned long URI_OPENING_EXECUTES_SCRIPT = (1<<13); + const unsigned long URI_NON_PERSISTABLE = (1<<14); + const unsigned long URI_FORBIDS_COOKIE_ACCESS = (1<<15); + const unsigned long URI_CROSS_ORIGIN_NEEDS_WEBAPPS_PERM = (1<<16); + const unsigned long URI_SYNC_LOAD_IS_OK = (1<<17); + const unsigned long URI_SAFE_TO_LOAD_IN_SECURE_CONTEXT = (1<<18); + nsresult GetScheme(nsACString *aScheme); nsresult GetDefaultPort(int32_t *aDefaultPort); nsresult GetProtocolFlags(uint32_t *aProtocolFlags); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d8e1712..44662b5 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3622,18 +3622,48 @@ static nsresult NSAPI nsNetUtil_ParseContentType(nsINetUtil *iface, const nsACSt return nsINetUtil_ParseContentType(net_util, aTypeHeader, aCharset, aHadCharset, aContentType); } +static const char *debugstr_protocol_flags(UINT32 flags) +{ + switch(flags) { +#define X(f) case f: return #f + X(URI_STD); + X(URI_NORELATIVE); + X(URI_NOAUTH); + X(ALLOWS_PROXY); + X(ALLOWS_PROXY_HTTP); + X(URI_INHERITS_SECURITY_CONTEXT); + X(URI_FORBIDS_AUTOMATIC_DOCUMENT_REPLACEMENT); + X(URI_LOADABLE_BY_ANYONE); + X(URI_DANGEROUS_TO_LOAD); + X(URI_IS_UI_RESOURCE); + X(URI_IS_LOCAL_FILE); + X(URI_LOADABLE_BY_SUBSUMERS); + X(URI_DOES_NOT_RETURN_DATA); + X(URI_IS_LOCAL_RESOURCE); + X(URI_OPENING_EXECUTES_SCRIPT); + X(URI_NON_PERSISTABLE); + X(URI_FORBIDS_COOKIE_ACCESS); + X(URI_CROSS_ORIGIN_NEEDS_WEBAPPS_PERM); + X(URI_SYNC_LOAD_IS_OK); + X(URI_SAFE_TO_LOAD_IN_SECURE_CONTEXT); +#undef X + default: + return wine_dbg_sprintf("%08x", flags); + } +} + static nsresult NSAPI nsNetUtil_ProtocolHasFlags(nsINetUtil *iface, nsIURI *aURI, UINT32 aFlags, cpp_bool *_retval) { - TRACE("()\n"); + TRACE("(%p %s %p)\n", aURI, debugstr_protocol_flags(aFlags), _retval); return nsINetUtil_ProtocolHasFlags(net_util, aURI, aFlags, _retval); } static nsresult NSAPI nsNetUtil_URIChainHasFlags(nsINetUtil *iface, nsIURI *aURI, UINT32 aFlags, cpp_bool *_retval) { - TRACE("(%p %08x %p)\n", aURI, aFlags, _retval); + TRACE("(%p %s %p)\n", aURI, debugstr_protocol_flags(aFlags), _retval); - if(aFlags == (1<<11)) { + if(aFlags == URI_DOES_NOT_RETURN_DATA) { *_retval = FALSE; return NS_OK; }

1 0

Nikolay Sivov : dwrite: Make sure we don't have duplicates in locale/ value pairs for font names.
by Alexandre Julliard 26 Jan '15

26 Jan '15

Module: wine Branch: master Commit: 40d9a2b6d234e85d79d599df7dd8ae97e62fad0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d9a2b6d234e85d79d599df7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 26 13:39:18 2015 +0300 dwrite: Make sure we don't have duplicates in locale/value pairs for font names. --- dlls/dwrite/main.c | 20 +++++++++++++++++++- dlls/dwrite/opentype.c | 14 ++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 58273fe..5a2ce2c 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -383,14 +383,32 @@ HRESULT create_localizedstrings(IDWriteLocalizedStrings **strings) HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, const WCHAR *string) { struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + UINT32 i; + + /* make sure there's no duplicates */ + for (i = 0; i < This->count; i++) + if (!strcmpW(This->data[i].locale, locale)) + return S_OK; if (This->count == This->alloc) { + void *ptr; + + ptr = heap_realloc(This->data, 2*This->alloc*sizeof(struct localizedpair)); + if (!ptr) + return E_OUTOFMEMORY; + This->alloc *= 2; - This->data = heap_realloc(This->data, This->alloc*sizeof(struct localizedpair)); + This->data = ptr; } This->data[This->count].locale = heap_strdupW(locale); This->data[This->count].string = heap_strdupW(string); + if (!This->data[This->count].locale || !This->data[This->count].string) { + heap_free(This->data[This->count].locale); + heap_free(This->data[This->count].string); + return E_OUTOFMEMORY; + } + This->count++; return S_OK; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8fa5a54..7b3fb1f 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1194,6 +1194,14 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA if (FAILED(hr)) return hr; header = table_data; + + switch (header->format) { + case 0: + break; + default: + FIXME("unsupported NAME format %d\n", header->format); + } + storage_area = (LPBYTE)table_data + GET_BE_WORD(header->stringOffset); count = GET_BE_WORD(header->count); @@ -1219,6 +1227,12 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA continue; } + /* Skip such entries for now, as it's not clear which locale is implied when + unicode platform is used. Also fonts tend to duplicate those strings as + WIN platform entries. */ + if (platform == OPENTYPE_PLATFORM_UNICODE) + continue; + lang_id = GET_BE_WORD(record->languageID); length = GET_BE_WORD(record->length); offset = GET_BE_WORD(record->offset);

1 0

Nikolay Sivov : dwrite: Initial implementation of GetTypographicFeatures() .
by Alexandre Julliard 26 Jan '15

26 Jan '15

Module: wine Branch: master Commit: 6b0623fb2f13a83f6fb35aeab46686c6bf5e35ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b0623fb2f13a83f6fb35aeab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 25 21:25:48 2015 +0300 dwrite: Initial implementation of GetTypographicFeatures(). --- dlls/dwrite/analyzer.c | 249 ++++++++++++++++++++++++------------------- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 131 +++++++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 4 +- 4 files changed, 274 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b0623fb2f13a83f6fb35…

1 0

Austin English : kernel32: Add GetSystemFirmwareTable stub.
by Alexandre Julliard 26 Jan '15

26 Jan '15

Module: wine Branch: master Commit: fa804252423a4bbc309d38cf6ad50099bb15798f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa804252423a4bbc309d38cf6… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 22 22:49:59 2015 -0600 kernel32: Add GetSystemFirmwareTable stub. --- .../api-ms-win-core-sysinfo-l1-2-0.spec | 2 +- .../api-ms-win-core-sysinfo-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec index 47f4419..d3df6bd 100644 --- a/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec +++ b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec @@ -9,7 +9,7 @@ @ stdcall GetProductInfo(long long long long ptr) kernel32.GetProductInfo @ stdcall GetSystemDirectoryA(ptr long) kernel32.GetSystemDirectoryA @ stdcall GetSystemDirectoryW(ptr long) kernel32.GetSystemDirectoryW -@ stub GetSystemFirmwareTable +@ stdcall GetSystemFirmwareTable(long long ptr long) kernel32.GetSystemFirmwareTable @ stdcall GetSystemInfo(ptr) kernel32.GetSystemInfo @ stdcall GetSystemTime(ptr) kernel32.GetSystemTime @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec index 79bfc60..29262c5 100644 --- a/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec +++ b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec @@ -11,7 +11,7 @@ @ stdcall GetProductInfo(long long long long ptr) kernel32.GetProductInfo @ stdcall GetSystemDirectoryA(ptr long) kernel32.GetSystemDirectoryA @ stdcall GetSystemDirectoryW(ptr long) kernel32.GetSystemDirectoryW -@ stub GetSystemFirmwareTable +@ stdcall GetSystemFirmwareTable(long long ptr long) kernel32.GetSystemFirmwareTable @ stdcall GetSystemInfo(ptr) kernel32.GetSystemInfo @ stdcall GetSystemTime(ptr) kernel32.GetSystemTime @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bd6d644..71478dc 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -650,6 +650,7 @@ @ stdcall GetSystemDEPPolicy() @ stdcall GetSystemDirectoryA(ptr long) @ stdcall GetSystemDirectoryW(ptr long) +@ stdcall GetSystemFirmwareTable(long long ptr long) @ stdcall GetSystemInfo(ptr) @ stdcall GetSystemPowerStatus(ptr) @ stdcall GetSystemRegistryQuota(ptr ptr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8204dd9..b371e73 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4004,3 +4004,13 @@ HRESULT WINAPI UnregisterApplicationRestart(void) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return S_OK; } + +/*********************************************************************** + * GetSystemFirmwareTable (KERNEL32.@) + */ +UINT WINAPI GetSystemFirmwareTable(DWORD provider, DWORD id, PVOID buffer, DWORD size) +{ + FIXME("(%d %d %p %d):stub\n", provider, id, buffer, size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/include/winbase.h b/include/winbase.h index 3055d5f..561819d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2008,6 +2008,7 @@ WINBASEAPI HANDLE WINAPI GetStdHandle(DWORD); WINBASEAPI UINT WINAPI GetSystemDirectoryA(LPSTR,UINT); WINBASEAPI UINT WINAPI GetSystemDirectoryW(LPWSTR,UINT); #define GetSystemDirectory WINELIB_NAME_AW(GetSystemDirectory) +WINBASEAPI UINT WINAPI GetSystemFirmwareTable(DWORD,DWORD,PVOID,DWORD); WINBASEAPI VOID WINAPI GetSystemInfo(LPSYSTEM_INFO); WINBASEAPI BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS); WINBASEAPI BOOL WINAPI GetSystemRegistryQuota(PDWORD,PDWORD);

1 0

Austin English : include: Add minimal ntdef.h.
by Alexandre Julliard 26 Jan '15

26 Jan '15

Module: wine Branch: master Commit: cdc4022a54760dd691f1f87cd97cb8f5035d5b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc4022a54760dd691f1f87cd… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 22 13:56:40 2015 -0800 include: Add minimal ntdef.h. --- include/Makefile.in | 1 + include/ntdef.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index a5998d3..49ad276 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -471,6 +471,7 @@ SRCDIR_INCLUDES = \ ntddndis.h \ ntddscsi.h \ ntddstor.h \ + ntdef.h \ ntdsapi.h \ ntquery.h \ ntsecapi.h \ diff --git a/include/ntdef.h b/include/ntdef.h new file mode 100644 index 0000000..83ecffd --- /dev/null +++ b/include/ntdef.h @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2015 Austin English + * + * 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 _NTDEF_ +#define _NTDEF_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum _EVENT_TYPE { + NotificationEvent, + SynchronizationEvent +} EVENT_TYPE; + +typedef enum _TIMER_TYPE { + NotificationTimer, + SynchronizationTimer +} TIMER_TYPE; + +typedef enum _WAIT_TYPE { + WaitAll, + WaitAny, + WaitNotification +} WAIT_TYPE; + +#ifdef __cplusplus +} +#endif + +#endif /* _NTDEF_ */

1 0

Piotr Caban : msvcrt: Add _iswpunct_l implementation.
by Alexandre Julliard 26 Jan '15

26 Jan '15

Module: wine Branch: master Commit: ccaf87b2eab295392de36364b6fc93e845ae9e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccaf87b2eab295392de36364b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 23 17:51:02 2015 +0100 msvcrt: Add _iswpunct_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d4e9b35..a7df4b5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1025,7 +1025,7 @@ @ stub _iswgraph_l @ stub _iswlower_l @ stub _iswprint_l -@ stub _iswpunct_l +@ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ stub _iswupper_l @ stub _iswxdigit_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ef01e77..f696aaf 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1372,7 +1372,7 @@ @ stub _iswgraph_l @ stub _iswlower_l @ stub _iswprint_l -@ stub _iswpunct_l +@ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ stub _iswupper_l @ stub _iswxdigit_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c439652..58e708d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1376,7 +1376,7 @@ @ stub _iswgraph_l @ stub _iswlower_l @ stub _iswprint_l -@ stub _iswpunct_l +@ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ stub _iswupper_l @ stub _iswxdigit_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 3d57267..71a6347 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1243,7 +1243,7 @@ @ stub _iswgraph_l @ stub _iswlower_l @ stub _iswprint_l -@ stub _iswpunct_l +@ cdecl _iswpunct_l(long ptr) msvcr120._iswpunct_l @ cdecl _iswspace_l(long ptr) msvcr120._iswspace_l @ stub _iswupper_l @ stub _iswxdigit_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index aafc05c..68e7097 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -698,7 +698,7 @@ @ stub _iswgraph_l @ stub _iswlower_l @ stub _iswprint_l -@ stub _iswpunct_l +@ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ stub _iswupper_l @ stub _iswxdigit_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index da5d325..2d88683 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -675,7 +675,7 @@ @ stub _iswgraph_l @ stub _iswlower_l @ stub _iswprint_l -@ stub _iswpunct_l +@ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ stub _iswupper_l @ stub _iswxdigit_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4788dec..6d9b4c3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -641,7 +641,7 @@ # stub _iswgraph_l(long ptr) # stub _iswlower_l(long ptr) # stub _iswprint_l(long ptr) -# stub _iswpunct_l(long ptr) +@ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l # stub _iswupper_l(long ptr) # stub _iswxdigit_l(long ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index f4fd8a8..5bc544c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1588,6 +1588,14 @@ INT CDECL MSVCRT_iswprint( MSVCRT_wchar_t wc ) } /********************************************************************* + * _iswpunct_l (MSVCRT.@) + */ +INT CDECL MSVCRT__iswpunct_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return ispunctW( wc ); +} + +/********************************************************************* * iswpunct (MSVCRT.@) */ INT CDECL MSVCRT_iswpunct( MSVCRT_wchar_t wc )

1 0

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 January 2015