January 2014 - Wine-Commits

Hans Leidekker : advapi32: Perform a case-insensitive match on the credential target name.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: ed13665827ebc90f4726a366c048c6ee063d0664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed13665827ebc90f4726a366c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 27 14:35:38 2013 +0100 advapi32: Perform a case-insensitive match on the credential target name. (cherry picked from commit 0c56639a6aff582689f66e0273cecabd00212715) --- dlls/advapi32/cred.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index e17dfb6..58dd72d 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -746,7 +746,7 @@ static BOOL registry_credential_matches_filter(HKEY hkeyCred, LPCWSTR filter) debugstr_w(target_name)); p = strchrW(filter, '*'); - ret = CompareStringW(GetThreadLocale(), 0, filter, + ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, filter, (p && !p[1] ? p - filter : -1), target_name, (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; @@ -818,7 +818,7 @@ static BOOL mac_credential_matches_filter(void *data, UInt32 data_len, const WCH TRACE("comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(target_name)); p = strchrW(filter, '*'); - ret = CompareStringW(GetThreadLocale(), 0, filter, + ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, filter, (p && !p[1] ? p - filter : -1), target_name, (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; HeapFree(GetProcessHeap(), 0, target_name);

1 0

Henri Verbeet : d3d8: Clear pBits and Pitch when d3d8_surface_LockRect() fails.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 991156264ad8ebbcd52a663070b51377c37c327f URL: http://source.winehq.org/git/wine.git/?a=commit;h=991156264ad8ebbcd52a66307… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 12 11:00:25 2013 +0100 d3d8: Clear pBits and Pitch when d3d8_surface_LockRect() fails. This is a only slightly modified version of a patch by Lasse Rasinen. (cherry picked from commit b83a0b9d3ee88b5a09700bc3a25d3ae3a49aa84f) --- dlls/d3d8/surface.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 2196011..fed590f 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -273,8 +273,16 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect, flags); wined3d_mutex_unlock(); - locked_rect->Pitch = map_desc.row_pitch; - locked_rect->pBits = map_desc.data; + if (SUCCEEDED(hr)) + { + locked_rect->Pitch = map_desc.row_pitch; + locked_rect->pBits = map_desc.data; + } + else + { + locked_rect->Pitch = 0; + locked_rect->pBits = NULL; + } return hr; }

1 0

Andrew Eikum : msacm32: Don't clear DONE flag in Un,PrepareHeader.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 91885649dba90a90bdb5bd10ac659ca6354743b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91885649dba90a90bdb5bd10a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 4 10:06:02 2013 -0600 msacm32: Don't clear DONE flag in Un,PrepareHeader. (cherry picked from commit 3cb2ddfd09d5986614e028aa413e71e7624d2470) --- dlls/msacm32/stream.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index 0b336dd..bdfc3cc 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -311,9 +311,6 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, if (fdwPrepare) ret = MMSYSERR_INVALFLAG; - if (pash->fdwStatus & ACMSTREAMHEADER_STATUSF_DONE) - return MMSYSERR_NOERROR; - /* Note: the ACMSTREAMHEADER and ACMDRVSTREAMHEADER structs are of same * size. some fields are private to msacm internals, and are exposed * in ACMSTREAMHEADER in the dwReservedDriver array @@ -334,7 +331,7 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_PREPARE, (LPARAM)&was->drvInst, (LPARAM)padsh); if (ret == MMSYSERR_NOERROR || ret == MMSYSERR_NOTSUPPORTED) { ret = MMSYSERR_NOERROR; - padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_DONE|ACMSTREAMHEADER_STATUSF_INQUEUE); + padsh->fdwStatus &= ~ACMSTREAMHEADER_STATUSF_INQUEUE; padsh->fdwStatus |= ACMSTREAMHEADER_STATUSF_PREPARED; padsh->fdwPrepared = padsh->fdwStatus; padsh->dwPrepared = 0; @@ -477,7 +474,7 @@ MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_UNPREPARE, (LPARAM)&was->drvInst, (LPARAM)padsh); if (ret == MMSYSERR_NOERROR || ret == MMSYSERR_NOTSUPPORTED) { ret = MMSYSERR_NOERROR; - padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_DONE|ACMSTREAMHEADER_STATUSF_INQUEUE|ACMSTREAMHEADER_STATUSF_PREPARED); + padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_INQUEUE|ACMSTREAMHEADER_STATUSF_PREPARED); } TRACE("=> (%d)\n", ret); return ret;

1 0

Lasse Rasinen : d3d9: Update locked_rect only if wined3d_surface_map succeeds.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: d84188656c947670c0e668345aa7c09a5d5e52c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d84188656c947670c0e668345… Author: Lasse Rasinen <lrasinen(a)iki.fi> Date: Mon Oct 28 18:48:17 2013 +0200 d3d9: Update locked_rect only if wined3d_surface_map succeeds. (cherry picked from commit eeefed3dd02f5299e38d308ee6d9ba6998722bdd) --- dlls/d3d9/surface.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index a031c6e..419be07 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -293,8 +293,11 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface, hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect, flags); wined3d_mutex_unlock(); - locked_rect->Pitch = map_desc.row_pitch; - locked_rect->pBits = map_desc.data; + if (SUCCEEDED(hr)) + { + locked_rect->Pitch = map_desc.row_pitch; + locked_rect->pBits = map_desc.data; + } return hr; }

1 0

Daniel Lehman : kernel32: Use ANSI code page if current thread locale has no code page.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 79137646a078c55afc4f91665c5e09f0a7824c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=79137646a078c55afc4f91665… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 31 11:03:18 2013 -0700 kernel32: Use ANSI code page if current thread locale has no code page. (cherry picked from commit 37dad12971ba08df39f54dcde833a5ce70a98eda) --- dlls/kernel32/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 9ddf078..22903d5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -215,6 +215,7 @@ static const union cptable *get_codepage_table( unsigned int codepage ) case CP_THREAD_ACP: if (NtCurrentTeb()->CurrentLocale == GetUserDefaultLCID()) return ansi_cptable; codepage = get_lcid_codepage( NtCurrentTeb()->CurrentLocale ); + if (!codepage) return ansi_cptable; /* fall through */ default: if (codepage == ansi_cptable->info.codepage) return ansi_cptable;

1 0

Piotr Caban : msvcr110: Forward _libm_sse2_*_precise functions to __libm_sse2_*.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 51310fc9b082fad213ea7a04455117e929f7a731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51310fc9b082fad213ea7a044… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 23 15:54:02 2013 +0200 msvcr110: Forward _libm_sse2_*_precise functions to __libm_sse2_*. (cherry picked from commit ed8ab4415306631a144342dcc2b883c7887f05bd) --- dlls/msvcr110/msvcr110.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 343d26b..fbc2c1f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1385,17 +1385,17 @@ @ cdecl _kbhit() msvcrt._kbhit @ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind @ stub _lfind_s -@ stub -arch=i386 _libm_sse2_acos_precise -@ stub -arch=i386 _libm_sse2_asin_precise -@ stub -arch=i386 _libm_sse2_atan_precise -@ stub -arch=i386 _libm_sse2_cos_precise -@ stub -arch=i386 _libm_sse2_exp_precise -@ stub -arch=i386 _libm_sse2_log10_precise -@ stub -arch=i386 _libm_sse2_log_precise -@ stub -arch=i386 _libm_sse2_pow_precise -@ stub -arch=i386 _libm_sse2_sin_precise +@ cdecl -arch=i386 _libm_sse2_acos_precise() msvcrt.__libm_sse2_acos +@ cdecl -arch=i386 _libm_sse2_asin_precise() msvcrt.__libm_sse2_asin +@ cdecl -arch=i386 _libm_sse2_atan_precise() msvcrt.__libm_sse2_atan +@ cdecl -arch=i386 _libm_sse2_cos_precise() msvcrt.__libm_sse2_cos +@ cdecl -arch=i386 _libm_sse2_exp_precise() msvcrt.__libm_sse2_exp +@ cdecl -arch=i386 _libm_sse2_log10_precise() msvcrt.__libm_sse2_log10 +@ cdecl -arch=i386 _libm_sse2_log_precise() msvcrt.__libm_sse2_log +@ cdecl -arch=i386 _libm_sse2_pow_precise() msvcrt.__libm_sse2_pow +@ cdecl -arch=i386 _libm_sse2_sin_precise() msvcrt.__libm_sse2_sin @ stub -arch=i386 _libm_sse2_sqrt_precise -@ stub -arch=i386 _libm_sse2_tan_precise +@ cdecl -arch=i386 _libm_sse2_tan_precise() msvcrt.__libm_sse2_tan @ cdecl _loaddll(str) msvcrt._loaddll @ cdecl -arch=x86_64 _local_unwind(ptr ptr) msvcrt._local_unwind @ cdecl -arch=i386 _local_unwind2(ptr long) msvcrt._local_unwind2

1 0

Andrew Eikum : mmdevapi: Fill buffer with silence in IAudioRenderClient:: GetBuffer.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 3c148a76f2486a0884a67d049ada3a3ad853fc81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c148a76f2486a0884a67d049… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 12 10:17:21 2013 -0600 mmdevapi: Fill buffer with silence in IAudioRenderClient::GetBuffer. (cherry picked from commit a5975bb6013a45d36b4b554e6e31cf087ab30982) --- dlls/winealsa.drv/mmdevdrv.c | 22 ++++++++++++++++------ dlls/winecoreaudio.drv/mmdevdrv.c | 27 +++++++++++++++------------ dlls/wineoss.drv/mmdevdrv.c | 22 ++++++++++++++-------- 3 files changed, 45 insertions(+), 26 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index ce4b2c8..32da8a1 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2448,6 +2448,18 @@ static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) return AudioClient_Release(&This->IAudioClient_iface); } +static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; + if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || + (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + This->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * This->fmt->nBlockAlign); + else + memset(buffer, 0, frames * This->fmt->nBlockAlign); +} + static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { @@ -2497,6 +2509,8 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, This->getbuf_last = frames; } + silence_buffer(This, *data, frames); + LeaveCriticalSection(&This->lock); return S_OK; @@ -2550,12 +2564,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( else buffer = This->tmp_buffer; - if(flags & AUDCLNT_BUFFERFLAGS_SILENT){ - if(This->fmt->wBitsPerSample == 8) - memset(buffer, 128, written_frames * This->fmt->nBlockAlign); - else - memset(buffer, 0, written_frames * This->fmt->nBlockAlign); - } + if(flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(This, buffer, written_frames); if(This->getbuf_last < 0) alsa_wrap_buffer(This, buffer, written_frames); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index d4250a7..92be329 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1966,6 +1966,18 @@ static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) return AudioClient_Release(&This->IAudioClient_iface); } +static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; + if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || + (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + This->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * This->fmt->nBlockAlign); + else + memset(buffer, 0, frames * This->fmt->nBlockAlign); +} + static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { @@ -2036,6 +2048,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, This->getbuf_last = frames; *data = This->public_buffer->mAudioData; + silence_buffer(This, *data, frames); OSSpinLockUnlock(&This->lock); @@ -2075,18 +2088,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( return AUDCLNT_E_INVALID_SIZE; } - if(flags & AUDCLNT_BUFFERFLAGS_SILENT){ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; - if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || - (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - This->fmt->wBitsPerSample == 8) - memset(This->public_buffer->mAudioData, 128, - frames * This->fmt->nBlockAlign); - else - memset(This->public_buffer->mAudioData, 0, - frames * This->fmt->nBlockAlign); - } + if(flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(This, This->public_buffer->mAudioData, frames); This->public_buffer->mAudioDataByteSize = frames * This->fmt->nBlockAlign; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 0db7bb7..e13880e 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1354,12 +1354,16 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, return S_OK; } -static void oss_silence_buffer(ACImpl *This, BYTE *buf, UINT32 frames) -{ - if(This->fmt->wBitsPerSample == 8) - memset(buf, 128, frames * This->fmt->nBlockAlign); +static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; + if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || + (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + This->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * This->fmt->nBlockAlign); else - memset(buf, 0, frames * This->fmt->nBlockAlign); + memset(buffer, 0, frames * This->fmt->nBlockAlign); } static void oss_write_data(ACImpl *This) @@ -1406,7 +1410,7 @@ static void oss_write_data(ACImpl *This) to_write_bytes = to_write_frames * This->fmt->nBlockAlign; if(This->session->mute) - oss_silence_buffer(This, buf, to_write_frames); + silence_buffer(This, buf, to_write_frames); written_bytes = write(This->fd, buf, to_write_bytes); if(written_bytes < 0){ @@ -1432,7 +1436,7 @@ static void oss_write_data(ACImpl *This) to_write_bytes = to_write_frames * This->fmt->nBlockAlign; if(This->session->mute) - oss_silence_buffer(This, This->local_buffer, to_write_frames); + silence_buffer(This, This->local_buffer, to_write_frames); written_bytes = write(This->fd, This->local_buffer, to_write_bytes); if(written_bytes < 0){ @@ -1830,6 +1834,8 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, This->getbuf_last = frames; } + silence_buffer(This, *data, frames); + LeaveCriticalSection(&This->lock); return S_OK; @@ -1886,7 +1892,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( buffer = This->tmp_buffer; if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - oss_silence_buffer(This, buffer, written_frames); + silence_buffer(This, buffer, written_frames); if(This->getbuf_last < 0) oss_wrap_buffer(This, buffer, written_frames);

1 0

André Hentschel : wineboot: Add hardware registry keys on ARM.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 917a688034241b1dd121d685a1cf39971a1f800e URL: http://source.winehq.org/git/wine.git/?a=commit;h=917a688034241b1dd121d685a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 10 22:44:52 2013 +0100 wineboot: Add hardware registry keys on ARM. (cherry picked from commit cc2866d52159759d9f29157877d00686eafa5393) --- programs/wineboot/wineboot.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 385e7dc..8782173 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -177,6 +177,7 @@ static void create_hardware_registry_keys(void) static const WCHAR IdentifierW[] = {'I','d','e','n','t','i','f','i','e','r',0}; static const WCHAR ProcessorNameStringW[] = {'P','r','o','c','e','s','s','o','r','N','a','m','e','S','t','r','i','n','g',0}; static const WCHAR SysidW[] = {'A','T',' ','c','o','m','p','a','t','i','b','l','e',0}; + static const WCHAR ARMSysidW[] = {'A','R','M',' ','p','r','o','c','e','s','s','o','r',' ','f','a','m','i','l','y',0}; static const WCHAR mhzKeyW[] = {'~','M','H','z',0}; static const WCHAR VendorIdentifierW[] = {'V','e','n','d','o','r','I','d','e','n','t','i','f','i','e','r',0}; static const WCHAR VenidIntelW[] = {'G','e','n','u','i','n','e','I','n','t','e','l',0}; @@ -184,6 +185,8 @@ static void create_hardware_registry_keys(void) static const WCHAR PercentDW[] = {'%','d',0}; static const WCHAR IntelCpuDescrW[] = {'x','8','6',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','S','t','e','p','p','i','n','g',' ','%','d',0}; + static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','7',' ','M','o','d','e','l',' ','%','X', + ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; static const WCHAR IntelCpuStringW[] = {'I','n','t','e','l','(','R',')',' ','P','e','n','t','i','u','m','(','R',')',' ','4',' ', 'C','P','U',' ','2','.','4','0','G','H','z',0}; unsigned int i; @@ -202,7 +205,16 @@ static void create_hardware_registry_keys(void) memset( power_info, 0, sizeof_power_info ); /*TODO: report 64bit processors properly*/ - sprintfW( idW, IntelCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + switch(sci.Architecture) + { + case PROCESSOR_ARCHITECTURE_ARM: + sprintfW( idW, ARMCpuDescrW, sci.Level, sci.Revision ); + break; + default: + case PROCESSOR_ARCHITECTURE_INTEL: + sprintfW( idW, IntelCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + break; + } if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, SystemW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &system_key, NULL )) @@ -211,9 +223,19 @@ static void create_hardware_registry_keys(void) return; } - set_reg_value( system_key, IdentifierW, SysidW ); + switch(sci.Architecture) + { + case PROCESSOR_ARCHITECTURE_ARM: + set_reg_value( system_key, IdentifierW, ARMSysidW ); + break; + default: + case PROCESSOR_ARCHITECTURE_INTEL: + set_reg_value( system_key, IdentifierW, SysidW ); + break; + } - if (RegCreateKeyExW( system_key, fpuW, 0, NULL, REG_OPTION_VOLATILE, + if (sci.Architecture == PROCESSOR_ARCHITECTURE_ARM || + RegCreateKeyExW( system_key, fpuW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &fpu_key, NULL )) fpu_key = 0; if (RegCreateKeyExW( system_key, cpuW, 0, NULL, REG_OPTION_VOLATILE, @@ -230,13 +252,14 @@ static void create_hardware_registry_keys(void) { RegSetValueExW( hkey, FeatureSetW, 0, REG_DWORD, (BYTE *)&sci.FeatureSet, sizeof(DWORD) ); set_reg_value( hkey, IdentifierW, idW ); - /*TODO; report amd's properly*/ + /*TODO; report ARM and AMD properly*/ set_reg_value( hkey, ProcessorNameStringW, IntelCpuStringW ); set_reg_value( hkey, VendorIdentifierW, VenidIntelW ); RegSetValueExW( hkey, mhzKeyW, 0, REG_DWORD, (BYTE *)&power_info[i].MaxMhz, sizeof(DWORD) ); RegCloseKey( hkey ); } - if (!RegCreateKeyExW( fpu_key, numW, 0, NULL, REG_OPTION_VOLATILE, + if (sci.Architecture != PROCESSOR_ARCHITECTURE_ARM && + !RegCreateKeyExW( fpu_key, numW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) { set_reg_value( hkey, IdentifierW, idW );

1 0

André Hentschel : wineboot: Add environment registry keys on ARM.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 9560a8508b65e4ac0b5d530d1848837b3a4a9117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9560a8508b65e4ac0b5d530d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 10 22:40:36 2013 +0100 wineboot: Add environment registry keys on ARM. (cherry picked from commit 6e0b88006fd04fb9ef0f3303b27271a0d36f060e) --- programs/wineboot/wineboot.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index b8512e3..385e7dc 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -276,6 +276,7 @@ static void create_environment_registry_keys( void ) static const WCHAR NumProcW[] = {'N','U','M','B','E','R','_','O','F','_','P','R','O','C','E','S','S','O','R','S',0}; static const WCHAR ProcArchW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0}; static const WCHAR x86W[] = {'x','8','6',0}; + static const WCHAR armW[] = {'A','R','M',0}; static const WCHAR IA64W[] = {'I','A','6','4',0}; static const WCHAR AMD64W[] = {'A','M','D','6','4',0}; static const WCHAR ProcIdW[] = {'P','R','O','C','E','S','S','O','R','_','I','D','E','N','T','I','F','I','E','R',0}; @@ -285,6 +286,8 @@ static void create_environment_registry_keys( void ) static const WCHAR Percent04XW[] = {'%','0','4','x',0}; static const WCHAR IntelCpuDescrW[] = {'%','s',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','S','t','e','p','p','i','n','g',' ','%','d',',',' ','G','e','n','u','i','n','e','I','n','t','e','l',0}; + static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','7',' ','M','o','d','e','l',' ','%','X', + ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; HKEY env_key; SYSTEM_CPU_INFORMATION sci; @@ -301,14 +304,23 @@ static void create_environment_registry_keys( void ) switch(sci.Architecture) { case PROCESSOR_ARCHITECTURE_AMD64: arch = AMD64W; break; + case PROCESSOR_ARCHITECTURE_ARM: arch = armW; break; case PROCESSOR_ARCHITECTURE_IA64: arch = IA64W; break; default: case PROCESSOR_ARCHITECTURE_INTEL: arch = x86W; break; } set_reg_value( env_key, ProcArchW, arch ); - /* TODO: currently hardcoded Intel, add different processors */ - sprintfW( buffer, IntelCpuDescrW, arch, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + switch(sci.Architecture) + { + case PROCESSOR_ARCHITECTURE_ARM: + sprintfW( buffer, ARMCpuDescrW, sci.Level, sci.Revision ); + break; + default: + case PROCESSOR_ARCHITECTURE_INTEL: + sprintfW( buffer, IntelCpuDescrW, arch, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + break; + } set_reg_value( env_key, ProcIdW, buffer ); sprintfW( buffer, PercentDW, sci.Level );

1 0

André Hentschel : ntdll: Improved reporting of CPU Level and Revision on ARM.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 7b9949c9e4a2e9c655f574e2a9f1d8175e9203f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b9949c9e4a2e9c655f574e2a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 10 22:40:23 2013 +0100 ntdll: Improved reporting of CPU Level and Revision on ARM. (cherry picked from commit eef5e45ee6aae7029ec3ec0565fbbdc2ee29b59f) --- dlls/ntdll/nt.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8a53d03..1eff375 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1080,10 +1080,16 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) while (isspace(*value)) value++; if ((s = strchr(value,'\n'))) *s='\0'; - if (!strcasecmp(line, "CPU architecture")) + if (!strcasecmp(line, "CPU part")) { if (isdigit(value[0])) - info->Level = atoi(value); + info->Level = strtol(value, NULL, 16); + continue; + } + if (!strcasecmp(line, "CPU revision")) + { + if (isdigit(value[0])) + info->Revision = atoi(value); continue; } if (!strcasecmp(line, "features"))

1 0