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

Piotr Caban : msvcrt: Don't validate parameters in _itoa function.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: dce5c1f8e0f259837e6eabb0f8fd4ca20ccc8c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce5c1f8e0f259837e6eabb0f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 15 16:29:00 2013 +0200 msvcrt: Don't validate parameters in _itoa function. (cherry picked from commit f906be9ef46635e55d96944de0e45b5618c7e979) --- dlls/msvcrt/string.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 082029d..7225395 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -991,10 +991,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64(const char *nptr, char **endptr, int bas return MSVCRT_strtoui64_l(nptr, endptr, base, NULL); } -/********************************************************************* - * _ltoa_s (MSVCRT.@) - */ -int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) +static int ltoa_helper(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) { MSVCRT_ulong val; unsigned int digit; @@ -1002,14 +999,6 @@ int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) char buffer[33], *pos; size_t len; - if (!MSVCRT_CHECK_PMT(str != NULL)) return MSVCRT_EINVAL; - if (!MSVCRT_CHECK_PMT(size > 0)) return MSVCRT_EINVAL; - if (!MSVCRT_CHECK_PMT(radix >= 2 && radix <= 36)) - { - str[0] = '\0'; - return MSVCRT_EINVAL; - } - if (value < 0 && radix == 10) { is_negative = 1; @@ -1067,6 +1056,22 @@ int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) } /********************************************************************* + * _ltoa_s (MSVCRT.@) + */ +int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix) +{ + if (!MSVCRT_CHECK_PMT(str != NULL)) return MSVCRT_EINVAL; + if (!MSVCRT_CHECK_PMT(size > 0)) return MSVCRT_EINVAL; + if (!MSVCRT_CHECK_PMT(radix >= 2 && radix <= 36)) + { + str[0] = '\0'; + return MSVCRT_EINVAL; + } + + return ltoa_helper(value, str, size, radix); +} + +/********************************************************************* * _ltow_s (MSVCRT.@) */ int CDECL _ltow_s(MSVCRT_long value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) @@ -1150,6 +1155,14 @@ int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) } /********************************************************************* + * _itoa (MSVCRT.@) + */ +char* CDECL _itoa(int value, char *str, int radix) +{ + return ltoa_helper(value, str, MSVCRT_SIZE_MAX, radix) ? NULL : str; +} + +/********************************************************************* * _itow_s (MSVCRT.@) */ int CDECL _itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix)

1 0

Erich E. Hoover : hhctrl.ocx: Do not destroy the HTML Help window when HH_HELP_CONTEXT finds no context id of 0.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 357fcf732d64283661f7ee3643fb7a698bf19f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=357fcf732d64283661f7ee364… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Nov 6 11:59:16 2013 -0700 hhctrl.ocx: Do not destroy the HTML Help window when HH_HELP_CONTEXT finds no context id of 0. (cherry picked from commit 87b1115db1aeb39d09fa5cdf349b1c0d6fea7d9f) --- dlls/hhctrl.ocx/hhctrl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 3392715..8b42569 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -273,6 +273,8 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat url = FindContextAlias(info->pCHMInfo, data); if(!url) { + if(!data) /* there may legitimately be no context alias for id 0 */ + return info->WinType.hwndHelp; ReleaseHelpViewer(info); return NULL; }

1 0

Sebastian Lackner : shlwapi: Fix UrlCombineW for URLs containing a quotation mark.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 0fabd379fe805f77615599c719d9aa17b5aee9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fabd379fe805f77615599c71… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 6 23:01:42 2013 +0100 shlwapi: Fix UrlCombineW for URLs containing a quotation mark. (cherry picked from commit 7ee2c24a8cb0ea3ca50d62634fc5772438c2ae39) --- dlls/shlwapi/url.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 102faf5..11589e4 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -665,6 +665,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, DWORD i, len, res1, res2, process_case = 0; LPWSTR work, preliminary, mbase, mrelative; static const WCHAR myfilestr[] = {'f','i','l','e',':','/','/','/','\0'}; + static const WCHAR fragquerystr[] = {'#','?',0}; HRESULT ret; TRACE("(base %s, Relative %s, Combine size %d, flags %08x)\n", @@ -736,17 +737,19 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, } } - /* If there is a '#' and the characters immediately preceding it are - * ".htm[l]", then begin looking for the last leaf starting from - * the '#'. Otherwise the '#' is not meaningful and just start - * looking from the end. */ - if ((work = strchrW(base.pszSuffix + sizeloc, '#'))) { + /* If there is a '?', then the remaining part can only contain a + * query string or fragment, so start looking for the last leaf + * from the '?'. Otherwise, if there is a '#' and the characters + * immediately preceding it are ".htm[l]", then begin looking for + * the last leaf starting from the '#'. Otherwise the '#' is not + * meaningful and just start looking from the end. */ + if ((work = strpbrkW(base.pszSuffix + sizeloc, fragquerystr))) { const WCHAR htmlW[] = {'.','h','t','m','l',0}; const int len_htmlW = 5; const WCHAR htmW[] = {'.','h','t','m',0}; const int len_htmW = 4; - if (base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS) + if (*work == '?' || base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS) manual_search = TRUE; else if (work - base.pszSuffix > len_htmW) { work -= len_htmW;

1 0

Qian Hong : wscript: Get extension name by strrchrW instead of strchrW.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: f2c1c3fe484335d2f801240d3d957d5639bd0969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c1c3fe484335d2f801240d3… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Nov 12 16:19:59 2013 +0800 wscript: Get extension name by strrchrW instead of strchrW. (cherry picked from commit fa9fec618d647e22da3e33b7ad8c7b7053d73fe7) --- programs/wscript/main.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 3d97bde..cebabed 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -361,7 +361,7 @@ static BOOL set_host_properties(const WCHAR *prop) int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { - const WCHAR *ext, *filename = NULL; + WCHAR *ext, *filepart, *filename = NULL; IActiveScriptParse *parser; IActiveScript *script; WCHAR **argv; @@ -391,14 +391,12 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm WINE_FIXME("No file name specified\n"); return 1; } - res = GetFullPathNameW(filename, sizeof(scriptFullName)/sizeof(WCHAR), scriptFullName, NULL); + res = GetFullPathNameW(filename, sizeof(scriptFullName)/sizeof(WCHAR), scriptFullName, &filepart); if(!res || res > sizeof(scriptFullName)/sizeof(WCHAR)) return 1; - ext = strchrW(filename, '.'); - if(!ext) - ext = filename; - if(!get_engine_clsid(ext, &clsid)) { + ext = strrchrW(filepart, '.'); + if(!ext || !get_engine_clsid(ext, &clsid)) { WINE_FIXME("Could not find engine for %s\n", wine_dbgstr_w(ext)); return 1; }

1 0

Alexander Dorofeyev : wined3d: Fix resultarg state handling in nvrc/ nvts code.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 773a6f3c70ee27511c1ec24fa4dd6842e528b7bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=773a6f3c70ee27511c1ec24fa… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sat Nov 2 08:14:46 2013 +0200 wined3d: Fix resultarg state handling in nvrc/nvts code. Resultarg affects both rgb and alpha register combiner output. Ensure that changing resultarg updates both. (cherry picked from commit a14793f50ba3acb0b99bb166b8534b255ff09ca2) --- dlls/wined3d/nvidia_texture_shader.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=773a6f3c70ee27511c1ec…

1 0

Piotr Caban : url: Add support for http protocol handling in FileProtocolHandlerA.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 6d47e09b913d0d42bbcec346778c6c6ac04b6c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d47e09b913d0d42bbcec3467… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 17 12:54:31 2013 +0200 url: Add support for http protocol handling in FileProtocolHandlerA. (cherry picked from commit f5ea78f6a1d67c68fb4cef89e0891933c72b624b) --- dlls/url/url_main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/url/url_main.c b/dlls/url/url_main.c index b65aa02..8ad413b 100644 --- a/dlls/url/url_main.c +++ b/dlls/url/url_main.c @@ -88,8 +88,7 @@ BOOL WINAPI InetIsOffline(DWORD flags) * int nShowCmd - How to display the operation. */ -HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, - int nShowCmd) +void WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, int nShowCmd) { CHAR pszPath[MAX_PATH]; DWORD size = MAX_PATH; @@ -97,12 +96,7 @@ HRESULT WINAPI FileProtocolHandlerA(HWND hWnd, HINSTANCE hInst, LPCSTR pszUrl, TRACE("(%p, %s, %d)\n",hWnd,debugstr_a(pszUrl),nShowCmd); - if(createpath != S_OK) - return E_FAIL; - - ShellExecuteA(hWnd,NULL,pszPath,NULL,NULL,nShowCmd); - - return S_OK; + ShellExecuteA(hWnd, NULL, createpath==S_OK ? pszPath : pszUrl, NULL, NULL, nShowCmd); } /***********************************************************************

1 0

Nikolay Sivov : rsaenh: Fail on unsupported flag values only in CryptHashData().
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: fa4cd5b4ee44db881cdd7f4614c4b3a6e42b53f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4cd5b4ee44db881cdd7f461… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 17 22:36:36 2013 +0400 rsaenh: Fail on unsupported flag values only in CryptHashData(). (cherry picked from commit bfd2c533beef454a61b24f92790f91099e607365) --- dlls/rsaenh/rsaenh.c | 2 +- include/wincrypt.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index b4e4b35..210ef19 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -4084,7 +4084,7 @@ BOOL WINAPI RSAENH_CPHashData(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST BYTE *pb TRACE("(hProv=%08lx, hHash=%08lx, pbData=%p, dwDataLen=%d, dwFlags=%08x)\n", hProv, hHash, pbData, dwDataLen, dwFlags); - if (dwFlags) + if (dwFlags & ~CRYPT_USERDATA) { SetLastError(NTE_BAD_FLAGS); return FALSE; diff --git a/include/wincrypt.h b/include/wincrypt.h index 617a9b9..d3d9f66 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3890,6 +3890,8 @@ typedef BOOL (WINAPI *PFN_CMSG_IMPORT_KEY_TRANS)( #define EXPORT_PRIVATE_KEYS 0x00000004 #define PKCS12_EXPORT_RESERVED_MASK 0xffff0000 +#define CRYPT_USERDATA 0x00000001 + /* function declarations */ /* advapi32.dll */ WINADVAPI BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *, LPCSTR, LPCSTR, DWORD, DWORD);

1 0

Jacek Caban : jscript: Improved error handling in numeric literal parser.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 8dcce6d50ada148ef65af0420bfd2fd2d275c014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcce6d50ada148ef65af0420… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 6 17:18:38 2013 +0100 jscript: Improved error handling in numeric literal parser. (cherry picked from commit 1a89ea7043e2ea10ff4a29c1c15f45ec80f3dbd7) --- dlls/jscript/lex.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index d6a0ba1..844ae91 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -456,6 +456,11 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li else exp += e; } + if(is_identifier_char(*ctx->ptr)) { + WARN("wrong char after zero\n"); + return lex_error(ctx, JS_E_MISSING_SEMICOLON); + } + *literal = new_double_literal(ctx, exp>=0 ? d*pow(10, exp) : d/pow(10, -exp)); return tNumericLiteral; } @@ -479,7 +484,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) if(ctx->ptr < ctx->end && is_identifier_char(*ctx->ptr)) { WARN("unexpected identifier char\n"); - return lex_error(ctx, E_FAIL); + return lex_error(ctx, JS_E_MISSING_SEMICOLON); } *literal = new_double_literal(ctx, l); @@ -514,9 +519,8 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) if(is_identifier_char(*ctx->ptr)) { WARN("wrong char after zero\n"); - return lex_error(ctx, E_FAIL); + return lex_error(ctx, JS_E_MISSING_SEMICOLON); } - } return parse_double_literal(ctx, l, literal);

1 0

Rico Schüller : wined3d: Use GL_EXT_texture_mirror_clamp when available.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 213fb721d23e76c66ed4aab52ce4e3c0c51662ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=213fb721d23e76c66ed4aab52… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Nov 6 21:33:15 2013 +0100 wined3d: Use GL_EXT_texture_mirror_clamp when available. (cherry picked from commit fb926490fed5d1d2dcfe71760c1c048fe2241d19) --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index aa4d710..7cceede 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -179,6 +179,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3 }, {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, + {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, {"GL_EXT_vertex_array_bgra", EXT_VERTEX_ARRAY_BGRA }, @@ -2948,6 +2949,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) if (!counter_bits) gl_info->supported[ARB_OCCLUSION_QUERY] = FALSE; } + if (!gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] && gl_info->supported[EXT_TEXTURE_MIRROR_CLAMP]) + { + TRACE(" IMPLIED: ATI_texture_mirror_once support (by EXT_texture_mirror_clamp).\n"); + gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] = TRUE; + } if (!gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] && gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) { TRACE(" IMPLIED: ARB_texture_mirror_clamp_to_edge support (by ATI_texture_mirror_once).\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 50d9bab..9925dd8 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -128,6 +128,7 @@ enum wined3d_gl_extension EXT_TEXTURE_ENV_DOT3, EXT_TEXTURE_FILTER_ANISOTROPIC, EXT_TEXTURE_LOD_BIAS, + EXT_TEXTURE_MIRROR_CLAMP, EXT_TEXTURE_SRGB, EXT_TEXTURE_SRGB_DECODE, EXT_VERTEX_ARRAY_BGRA,

1 0

Rico Schüller : opengl32: Use variables for file names.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 1e42c85a7b8a6f09e76a3faba706cc34f363b573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e42c85a7b8a6f09e76a3faba… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 1 18:18:05 2013 +0100 opengl32: Use variables for file names. (cherry picked from commit 3c08b95b3ba2438c6984678cb7340eef2901df39) --- dlls/opengl32/make_opengl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index fedf2a6..9817f8c 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -65,6 +65,8 @@ use strict; my $spec_file = "opengl32.spec"; my $norm_file = "opengl_norm.c"; my $ext_file = "opengl_ext.c"; +my $wgl_driver_file = "../../include/wine/wgl_driver.h"; +my $wgl_file = "../../include/wine/wgl.h"; # Set to 0 for removing the ENTER / LEAVE GL calls my $gen_thread_safe = 0; @@ -776,7 +778,7 @@ parse_enum_file( "enumext.spec", \%enums ); # Get the current wgl_driver.h version # my $wgl_version = 0; -open HEADER, "<../../include/wine/wgl_driver.h" or die "cannot open wgl_driver.h"; +open HEADER, "<$wgl_driver_file" or die "cannot open $wgl_driver_file"; while (<HEADER>) { next unless /^#define WINE_WGL_DRIVER_VERSION (\d+)/; @@ -788,8 +790,8 @@ close HEADER; # # Generate the wgl_driver.h file # -open HEADER, ">../../include/wine/wgl_driver.h" or die "cannot create wgl_driver.h"; -print HEADER "/* Automatically generated from http://www.opengl.org/registry/api files; DO NOT EDIT! */\n\n"; +open HEADER, ">$wgl_driver_file" or die "cannot create $wgl_driver_file"; +print HEADER "/* Automatically generated from http://www.opengl.org/registry files; DO NOT EDIT! */\n\n"; print HEADER "#ifndef __WINE_WGL_DRIVER_H\n"; print HEADER "#define __WINE_WGL_DRIVER_H\n\n"; print HEADER "#ifndef WINE_GLAPI\n"; @@ -841,8 +843,8 @@ close HEADER; # # Generate the wgl.h file # -open HEADER, ">../../include/wine/wgl.h" or die "cannot create wgl.h"; -print HEADER "/* Automatically generated from http://www.opengl.org/registry/api files; DO NOT EDIT! */\n\n"; +open HEADER, ">$wgl_file" or die "cannot create $wgl_file"; +print HEADER "/* Automatically generated from http://www.opengl.org/registry files; DO NOT EDIT! */\n\n"; print HEADER "#ifndef __WINE_WGL_H\n"; print HEADER "#define __WINE_WGL_H\n\n";

1 0

Ken Thomases : winemac: Fix search for clipboard format matching a pasteboard type so it can fail when it should.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 23a717b298f8035e5afd511301bb5d2a074b19be URL: http://source.winehq.org/git/wine.git/?a=commit;h=23a717b298f8035e5afd51130… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 6 06:58:42 2013 -0600 winemac: Fix search for clipboard format matching a pasteboard type so it can fail when it should. It had been acting as though the last registered clipboard format always matched any pasteboard type. (cherry picked from commit 7c0c30b4d650d663770e0bbf683946005506bb8d) --- dlls/winemac.drv/clipboard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index ee63c10..5d765f4 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -367,6 +367,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty } } + format = NULL; if (!current) { LPWSTR name;

1 0

Andrey Zhezherun : msvcp: Fixed complex division.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 28e90bcfb447d080c11cbe8a0af47bdd45bf53fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e90bcfb447d080c11cbe8a0… Author: Andrey Zhezherun <zhezherun(a)yandex.ru> Date: Mon Nov 4 09:41:25 2013 +0000 msvcp: Fixed complex division. (cherry picked from commit 44bf8dc4295c12b954a166aa72811fee022e0135) --- dlls/msvcp71/math.c | 40 ++++++++++++++++++++++------------------ dlls/msvcp90/math.c | 40 ++++++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 36 deletions(-) diff --git a/dlls/msvcp71/math.c b/dlls/msvcp71/math.c index 69e4509..7d56c70 100644 --- a/dlls/msvcp71/math.c +++ b/dlls/msvcp71/math.c @@ -1087,6 +1087,7 @@ complex_float* __cdecl complex_float_add_cf(complex_float *ret, const complex_fl /* ??$?KM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z */ complex_float* __cdecl complex_float_div(complex_float *ret, const complex_float *l, const complex_float *r) { + float tmp, den; if((!r->real && !r->imag) || _isnan(l->real) || _isnan(l->imag) || _isnan(r->real) || _isnan(r->imag)) { ret->real = std_numeric_limits_float_quiet_NaN(); @@ -1094,15 +1095,16 @@ complex_float* __cdecl complex_float_div(complex_float *ret, const complex_float return ret; } - ret->real = 0; - ret->imag = 0; - if(r->real) { - ret->real = l->real / r->real; - ret->imag = l->imag / r->real; - } - if(r->imag) { - ret->real += l->imag / r->imag; - ret->imag -= l->real / r->imag; + if (fabsf(r->real) >= fabsf(r->imag)) { + tmp = r->imag / r->real; + den = r->real + r->imag*tmp; + ret->real = (l->real + l->imag*tmp) / den; + ret->imag = (l->imag - l->real*tmp) / den; + } else { + tmp = r->real / r->imag; + den = r->real*tmp + r->imag; + ret->real = (l->real*tmp + l->imag) / den; + ret->imag = (l->imag*tmp - l->real) / den; } return ret; } @@ -1705,6 +1707,7 @@ complex_double* __cdecl complex_double_add_cd(complex_double *ret, const complex /* ??$?KO(a)std@@YA?AV?$complex(a)O@0(a)AEBV10@0(a)Z */ complex_double* __cdecl complex_double_div(complex_double *ret, const complex_double *l, const complex_double *r) { + double tmp, den; if((!r->real && !r->imag) || _isnan(l->real) || _isnan(l->imag) || _isnan(r->real) || _isnan(r->imag)) { ret->real = std_numeric_limits_double_quiet_NaN(); @@ -1712,15 +1715,16 @@ complex_double* __cdecl complex_double_div(complex_double *ret, const complex_do return ret; } - ret->real = 0; - ret->imag = 0; - if(r->real) { - ret->real = l->real / r->real; - ret->imag = l->imag / r->real; - } - if(r->imag) { - ret->real += l->imag / r->imag; - ret->imag -= l->real / r->imag; + if (fabs(r->real) >= fabs(r->imag)) { + tmp = r->imag / r->real; + den = r->real + r->imag*tmp; + ret->real = (l->real + l->imag*tmp) / den; + ret->imag = (l->imag - l->real*tmp) / den; + } else { + tmp = r->real / r->imag; + den = r->real*tmp + r->imag; + ret->real = (l->real*tmp + l->imag) / den; + ret->imag = (l->imag*tmp - l->real) / den; } return ret; } diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index e049d69..f804ac9 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1087,6 +1087,7 @@ complex_float* __cdecl complex_float_add_cf(complex_float *ret, const complex_fl /* ??$?KM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z */ complex_float* __cdecl complex_float_div(complex_float *ret, const complex_float *l, const complex_float *r) { + float tmp, den; if((!r->real && !r->imag) || _isnan(l->real) || _isnan(l->imag) || _isnan(r->real) || _isnan(r->imag)) { ret->real = std_numeric_limits_float_quiet_NaN(); @@ -1094,15 +1095,16 @@ complex_float* __cdecl complex_float_div(complex_float *ret, const complex_float return ret; } - ret->real = 0; - ret->imag = 0; - if(r->real) { - ret->real = l->real / r->real; - ret->imag = l->imag / r->real; - } - if(r->imag) { - ret->real += l->imag / r->imag; - ret->imag -= l->real / r->imag; + if (fabsf(r->real) >= fabsf(r->imag)) { + tmp = r->imag / r->real; + den = r->real + r->imag*tmp; + ret->real = (l->real + l->imag*tmp) / den; + ret->imag = (l->imag - l->real*tmp) / den; + } else { + tmp = r->real / r->imag; + den = r->real*tmp + r->imag; + ret->real = (l->real*tmp + l->imag) / den; + ret->imag = (l->imag*tmp - l->real) / den; } return ret; } @@ -1705,6 +1707,7 @@ complex_double* __cdecl complex_double_add_cd(complex_double *ret, const complex /* ??$?KO(a)std@@YA?AV?$complex(a)O@0(a)AEBV10@0(a)Z */ complex_double* __cdecl complex_double_div(complex_double *ret, const complex_double *l, const complex_double *r) { + double tmp, den; if((!r->real && !r->imag) || _isnan(l->real) || _isnan(l->imag) || _isnan(r->real) || _isnan(r->imag)) { ret->real = std_numeric_limits_double_quiet_NaN(); @@ -1712,15 +1715,16 @@ complex_double* __cdecl complex_double_div(complex_double *ret, const complex_do return ret; } - ret->real = 0; - ret->imag = 0; - if(r->real) { - ret->real = l->real / r->real; - ret->imag = l->imag / r->real; - } - if(r->imag) { - ret->real += l->imag / r->imag; - ret->imag -= l->real / r->imag; + if (fabs(r->real) >= fabs(r->imag)) { + tmp = r->imag / r->real; + den = r->real + r->imag*tmp; + ret->real = (l->real + l->imag*tmp) / den; + ret->imag = (l->imag - l->real*tmp) / den; + } else { + tmp = r->real / r->imag; + den = r->real*tmp + r->imag; + ret->real = (l->real*tmp + l->imag) / den; + ret->imag = (l->imag*tmp - l->real) / den; } return ret; }

1 0

Hans Leidekker : wbemprox: Implement Win32_BIOS.IdentificationCode and Win32_BIOS.SMBIOSBIOSVersion.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: d79ab7e8e40e1cda8862bc332d66c4978d81d123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d79ab7e8e40e1cda8862bc332… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 4 11:54:10 2013 +0100 wbemprox: Implement Win32_BIOS.IdentificationCode and Win32_BIOS.SMBIOSBIOSVersion. (cherry picked from commit 1eefe9dd8eb04234f86369974c629e0a78c6b311) --- dlls/wbemprox/builtin.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5242cf4..4d1d787 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -152,6 +152,8 @@ static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_idW[] = {'I','D',0}; +static const WCHAR prop_identificationcodeW[] = + {'I','d','e','n','t','i','f','i','c','a','t','i','o','n','C','o','d','e',0}; static const WCHAR prop_indexW[] = {'I','n','d','e','x',0}; static const WCHAR prop_interfaceindexW[] = @@ -214,6 +216,8 @@ static const WCHAR prop_servicepackminorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_servicetypeW[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; +static const WCHAR prop_smbiosbiosversionW[] = + {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; static const WCHAR prop_startmodeW[] = {'S','t','a','r','t','M','o','d','e',0}; static const WCHAR prop_sizeW[] = @@ -258,11 +262,13 @@ static const struct column col_baseboard[] = }; static const struct column col_bios[] = { - { prop_descriptionW, CIM_STRING }, - { prop_manufacturerW, CIM_STRING }, - { prop_releasedateW, CIM_DATETIME }, - { prop_serialnumberW, CIM_STRING }, - { prop_versionW, CIM_STRING|COL_FLAG_KEY } + { prop_descriptionW, CIM_STRING }, + { prop_identificationcodeW, CIM_STRING }, + { prop_manufacturerW, CIM_STRING }, + { prop_releasedateW, CIM_DATETIME }, + { prop_serialnumberW, CIM_STRING }, + { prop_smbiosbiosversionW, CIM_STRING }, + { prop_versionW, CIM_STRING|COL_FLAG_KEY } }; static const struct column col_cdromdrive[] = { @@ -454,6 +460,8 @@ static const WCHAR bios_releasedateW[] = {'2','0','1','2','0','6','0','8','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; static const WCHAR bios_serialnumberW[] = {'0',0}; +static const WCHAR bios_smbiosbiosversionW[] = + {'W','i','n','e',0}; static const WCHAR bios_versionW[] = {'W','I','N','E',' ',' ',' ','-',' ','1',0}; static const WCHAR cdromdrive_nameW[] = @@ -513,9 +521,11 @@ struct record_baseboard struct record_bios { const WCHAR *description; + const WCHAR *identificationcode; const WCHAR *manufacturer; const WCHAR *releasedate; const WCHAR *serialnumber; + const WCHAR *smbiosbiosversion; const WCHAR *version; }; struct record_cdromdrive @@ -701,7 +711,8 @@ static const struct record_baseboard data_baseboard[] = }; static const struct record_bios data_bios[] = { - { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, bios_versionW } + { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, + bios_smbiosbiosversionW, bios_versionW } }; static const struct record_diskdrive data_diskdrive[] = {

1 0

Hans Leidekker : wbemprox: Implement Win32_BaseBoard.Model and Win32_BaseBoard.Name.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 13e45236674cc33245753d1ae14120d768123303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e45236674cc33245753d1ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 4 11:53:46 2013 +0100 wbemprox: Implement Win32_BaseBoard.Model and Win32_BaseBoard.Name. (cherry picked from commit 796d4d0ccf780842a0f4b2e098add56df0288fac) --- dlls/wbemprox/builtin.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d310704..5242cf4 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -251,6 +251,8 @@ static const WCHAR prop_versionW[] = static const struct column col_baseboard[] = { { prop_manufacturerW, CIM_STRING }, + { prop_modelW, CIM_STRING }, + { prop_nameW, CIM_STRING }, { prop_serialnumberW, CIM_STRING }, { prop_tagW, CIM_STRING|COL_FLAG_KEY } }; @@ -503,6 +505,8 @@ static const WCHAR videocontroller_deviceidW[] = struct record_baseboard { const WCHAR *manufacturer; + const WCHAR *model; + const WCHAR *name; const WCHAR *serialnumber; const WCHAR *tag; }; @@ -693,7 +697,7 @@ struct record_videocontroller static const struct record_baseboard data_baseboard[] = { - { baseboard_manufacturerW, baseboard_serialnumberW, baseboard_tagW } + { baseboard_manufacturerW, baseboard_tagW, baseboard_tagW, baseboard_serialnumberW, baseboard_tagW } }; static const struct record_bios data_bios[] = {

1 0

Rico Schüller : wined3d: Use GL_ARB_texture_mirror_clamp_to_edge when available.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 447e483ff216d163c7f77c64f16965b1577cd5f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=447e483ff216d163c7f77c64f… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Nov 5 23:08:30 2013 +0100 wined3d: Use GL_ARB_texture_mirror_clamp_to_edge when available. (cherry picked from commit de9e1cdcae3ededfa20fb6d85f1785fe01b454de) --- dlls/wined3d/directx.c | 12 +++++++++--- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ae3f0db..aa4d710 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -133,6 +133,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3 }, {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, + {"GL_ARB_texture_mirror_clamp_to_edge", ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE}, {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO }, {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, @@ -2947,6 +2948,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) if (!counter_bits) gl_info->supported[ARB_OCCLUSION_QUERY] = FALSE; } + if (!gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] && gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + { + TRACE(" IMPLIED: ARB_texture_mirror_clamp_to_edge support (by ATI_texture_mirror_once).\n"); + gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] = TRUE; + } wined3d_adapter_init_limits(gl_info); @@ -3064,7 +3070,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->wrap_lookup[WINED3D_TADDRESS_BORDER - WINED3D_TADDRESS_WRAP] = gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP] = - gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; + gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] ? GL_MIRROR_CLAMP_TO_EDGE : GL_REPEAT; adapter->d3d_info.valid_rt_mask = 0; for (i = 0; i < gl_info->limits.buffers; ++i) @@ -4376,7 +4382,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte { caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; } - if (gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) { caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; } @@ -4394,7 +4400,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte { caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; } - if (gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) { caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 9c4af05..50d9bab 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -84,6 +84,7 @@ enum wined3d_gl_extension ARB_TEXTURE_ENV_DOT3, ARB_TEXTURE_FLOAT, ARB_TEXTURE_MIRRORED_REPEAT, + ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, ARB_TEXTURE_NON_POWER_OF_TWO, ARB_TEXTURE_RECTANGLE, ARB_TEXTURE_RG,

1 0