June 2011 - Wine-commits - list.winehq.org

Damjan Jovanovic : msvcrt: The time passed to utime functions can be NULL.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: c28baa7b96aaf721478ef6899181d3133607c9dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28baa7b96aaf721478ef6899… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Jun 20 06:27:41 2011 +0200 msvcrt: The time passed to utime functions can be NULL. --- dlls/msvcrt/file.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b3d1ddc..385771e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1477,10 +1477,15 @@ int CDECL _futime64(int fd, struct MSVCRT___utimbuf64 *t) */ int CDECL _futime32(int fd, struct MSVCRT___utimbuf32 *t) { - struct MSVCRT___utimbuf64 t64; - t64.actime = t->actime; - t64.modtime = t->modtime; - return _futime64( fd, &t64 ); + if (t) + { + struct MSVCRT___utimbuf64 t64; + t64.actime = t->actime; + t64.modtime = t->modtime; + return _futime64( fd, &t64 ); + } + else + return _futime64( fd, NULL ); } /********************************************************************* @@ -2402,10 +2407,15 @@ int CDECL _utime64(const char* path, struct MSVCRT___utimbuf64 *t) */ int CDECL _utime32(const char* path, struct MSVCRT___utimbuf32 *t) { - struct MSVCRT___utimbuf64 t64; - t64.actime = t->actime; - t64.modtime = t->modtime; - return _utime64( path, &t64 ); + if (t) + { + struct MSVCRT___utimbuf64 t64; + t64.actime = t->actime; + t64.modtime = t->modtime; + return _utime64( path, &t64 ); + } + else + return _utime64( path, NULL ); } /********************************************************************* @@ -2444,10 +2454,15 @@ int CDECL _wutime64(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf64 *t) */ int CDECL _wutime32(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf32 *t) { - struct MSVCRT___utimbuf64 t64; - t64.actime = t->actime; - t64.modtime = t->modtime; - return _wutime64( path, &t64 ); + if (t) + { + struct MSVCRT___utimbuf64 t64; + t64.actime = t->actime; + t64.modtime = t->modtime; + return _wutime64( path, &t64 ); + } + else + return _wutime64( path, NULL ); } /*********************************************************************

1 0

Jerome Leclanche : wininet: Fix a warning when compiling --without-openssl.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: f30616e2578977aefa2ae7cfc3659c03ad136c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30616e2578977aefa2ae7cfc… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon Jun 20 06:16:31 2011 +0100 wininet: Fix a warning when compiling --without-openssl. --- dlls/wininet/netconnection.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 6c67f28..060acc6 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -656,10 +656,10 @@ int sock_get_error( int err ) */ DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) { - void *ssl_s; DWORD res = ERROR_NOT_SUPPORTED; - #ifdef SONAME_LIBSSL + void *ssl_s; + /* can't connect if we are already connected */ if (connection->ssl_s) {

1 0

Andrew Eikum : mmdevapi: Don't crash if a driver fails to load.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: f50829c36e389d1fae176a53ec6e4a050ba3f9e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50829c36e389d1fae176a53e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 17 15:49:51 2011 -0500 mmdevapi: Don't crash if a driver fails to load. --- dlls/mmdevapi/devenum.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index f8ec363..7acc3f6 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -824,6 +824,9 @@ HRESULT MMDevEnum_Create(REFIID riid, void **ppv) { MMDevEnumImpl *This = MMDevEnumerator; + if(!drvs.pGetAudioEndpoint) + return AUDCLNT_E_SERVICE_NOT_RUNNING; + if (!This) { This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));

1 0

Andrew Eikum : mmdevapi: Fix refcounts in IAudioClient::GetService.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: a93efd5346b689d04762b763819e3db2304373d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a93efd5346b689d04762b7638… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 20 09:31:22 2011 -0500 mmdevapi: Fix refcounts in IAudioClient::GetService. --- dlls/winealsa.drv/mmdevdrv.c | 16 ++++++++++++---- dlls/winecoreaudio.drv/mmdevdrv.c | 26 ++++++++++++++++++-------- dlls/wineoss.drv/mmdevdrv.c | 16 ++++++++++++---- 3 files changed, 42 insertions(+), 16 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index b96e5f5..23f76e3 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1666,16 +1666,20 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } + IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } + IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); *ppv = &This->IAudioCaptureClient_iface; }else if(IsEqualIID(riid, &IID_IAudioClock)){ + IAudioClock_AddRef(&This->IAudioClock_iface); *ppv = &This->IAudioClock_iface; }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){ + IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface); *ppv = &This->IAudioStreamVolume_iface; }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ if(!This->session_wrapper){ @@ -1684,7 +1688,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - } + }else + IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface); *ppv = &This->session_wrapper->IAudioSessionControl2_iface; }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ @@ -1694,7 +1699,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - } + }else + IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface); *ppv = &This->session_wrapper->IChannelAudioVolume_iface; }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ @@ -1704,13 +1710,13 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - } + }else + ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface); *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; } if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); LeaveCriticalSection(&This->lock); return S_OK; } @@ -2245,6 +2251,8 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ret->ISimpleAudioVolume_iface.lpVtbl = &SimpleAudioVolume_Vtbl; ret->IChannelAudioVolume_iface.lpVtbl = &ChannelAudioVolume_Vtbl; + ret->ref = 1; + ret->client = client; if(client){ ret->session = client->session; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index fd5e5ad..fd3ed1b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1459,16 +1459,20 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, OSSpinLockUnlock(&This->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } + IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ OSSpinLockUnlock(&This->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } + IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); *ppv = &This->IAudioCaptureClient_iface; }else if(IsEqualIID(riid, &IID_IAudioClock)){ + IAudioClock_AddRef(&This->IAudioClock_iface); *ppv = &This->IAudioClock_iface; }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){ + IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface); *ppv = &This->IAudioStreamVolume_iface; }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ if(!This->session_wrapper){ @@ -1477,7 +1481,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, OSSpinLockUnlock(&This->lock); return E_OUTOFMEMORY; } - } + }else + IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface); *ppv = &This->session_wrapper->IAudioSessionControl2_iface; }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ @@ -1487,7 +1492,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, OSSpinLockUnlock(&This->lock); return E_OUTOFMEMORY; } - } + }else + IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface); *ppv = &This->session_wrapper->IChannelAudioVolume_iface; }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ @@ -1497,13 +1503,13 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, OSSpinLockUnlock(&This->lock); return E_OUTOFMEMORY; } - } + }else + ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface); *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; } if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); OSSpinLockUnlock(&This->lock); return S_OK; } @@ -2035,6 +2041,8 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ret->ISimpleAudioVolume_iface.lpVtbl = &SimpleAudioVolume_Vtbl; ret->IChannelAudioVolume_iface.lpVtbl = &ChannelAudioVolume_Vtbl; + ret->ref = 1; + ret->client = client; if(client){ ret->session = client->session; @@ -2082,10 +2090,12 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ - OSSpinLockLock(&This->client->lock); - This->client->session_wrapper = NULL; - OSSpinLockUnlock(&This->client->lock); - AudioClient_Release(&This->client->IAudioClient_iface); + if(This->client){ + OSSpinLockLock(&This->client->lock); + This->client->session_wrapper = NULL; + OSSpinLockUnlock(&This->client->lock); + AudioClient_Release(&This->client->IAudioClient_iface); + } HeapFree(GetProcessHeap(), 0, This); } return ref; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c6f561e..c8359a9 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1381,16 +1381,20 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } + IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } + IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); *ppv = &This->IAudioCaptureClient_iface; }else if(IsEqualIID(riid, &IID_IAudioClock)){ + IAudioClock_AddRef(&This->IAudioClock_iface); *ppv = &This->IAudioClock_iface; }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){ + IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface); *ppv = &This->IAudioStreamVolume_iface; }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ if(!This->session_wrapper){ @@ -1399,7 +1403,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - } + }else + IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface); *ppv = &This->session_wrapper->IAudioSessionControl2_iface; }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ @@ -1409,7 +1414,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - } + }else + IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface); *ppv = &This->session_wrapper->IChannelAudioVolume_iface; }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ @@ -1419,13 +1425,13 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - } + }else + ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface); *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; } if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); LeaveCriticalSection(&This->lock); return S_OK; } @@ -1951,6 +1957,8 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ret->ISimpleAudioVolume_iface.lpVtbl = &SimpleAudioVolume_Vtbl; ret->IChannelAudioVolume_iface.lpVtbl = &ChannelAudioVolume_Vtbl; + ret->ref = 1; + ret->client = client; if(client){ ret->session = client->session;

1 0

Andrew Eikum : winealsa.drv: Be less choosey about sample rates.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: c6312990ab6f39edd9cc68a28aa5a74686fe1651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6312990ab6f39edd9cc68a28… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 17 15:49:55 2011 -0500 winealsa.drv: Be less choosey about sample rates. --- dlls/winealsa.drv/mmdevdrv.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 23f76e3..02b0438 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1146,12 +1146,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, goto exit; } - if(fmt->nSamplesPerSec < min || fmt->nSamplesPerSec > max || - (fmt->nSamplesPerSec != 48000 && - fmt->nSamplesPerSec != 44100 && - fmt->nSamplesPerSec != 22050 && - fmt->nSamplesPerSec != 11025 && - fmt->nSamplesPerSec != 8000)){ + if(fmt->nSamplesPerSec < min || fmt->nSamplesPerSec > max){ hr = AUDCLNT_E_UNSUPPORTED_FORMAT; goto exit; }

1 0

Andrew Eikum : mmdevapi: Implement ISimpleAudioVolume::{Set, Get}Mute.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 0085689f5df0396963de8ce18efb11baa29f0d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0085689f5df0396963de8ce18… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 20 09:31:51 2011 -0500 mmdevapi: Implement ISimpleAudioVolume::{Set, Get}Mute. --- dlls/mmdevapi/tests/capture.c | 16 ++++---- dlls/mmdevapi/tests/render.c | 17 +++++---- dlls/winealsa.drv/mmdevdrv.c | 44 ++++++++++++++++++++---- dlls/winecoreaudio.drv/mmdevdrv.c | 29 +++++++++++++--- dlls/wineoss.drv/mmdevdrv.c | 67 ++++++++++++++++++++++++++++-------- 5 files changed, 128 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0085689f5df0396963de8…

1 0

Stefan Dösinger : wined3d: Use base_vertex_index in drawStridedSlow, and only for indexed draws.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 2daa16c96ce5ce2a9bff2634574358687cfd866a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2daa16c96ce5ce2a9bff26345… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 18 00:43:06 2011 +0200 wined3d: Use base_vertex_index in drawStridedSlow, and only for indexed draws. --- dlls/wined3d/drawprim.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index d5a656e..3d86782 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -75,7 +75,7 @@ static void drawStridedSlow(struct wined3d_device *device, const struct wined3d_ UINT vx_index; const struct wined3d_state *state = &device->stateBlock->state; const struct wined3d_stream_state *streams = state->streams; - LONG SkipnStrides = startIdx + state->load_base_vertex_index; + LONG SkipnStrides = startIdx; BOOL pixelShader = use_ps(state); BOOL specular_fog = FALSE; const BYTE *texCoords[WINED3DDP_MAXTEXCOORD]; @@ -230,9 +230,9 @@ static void drawStridedSlow(struct wined3d_device *device, const struct wined3d_ { /* Indexed so work out the number of strides to skip */ if (idxSize == 2) - SkipnStrides = pIdxBufS[startIdx + vx_index] + state->load_base_vertex_index; + SkipnStrides = pIdxBufS[startIdx + vx_index] + state->base_vertex_index; else - SkipnStrides = pIdxBufL[startIdx + vx_index] + state->load_base_vertex_index; + SkipnStrides = pIdxBufL[startIdx + vx_index] + state->base_vertex_index; } tmp_tex_mask = tex_mask;

1 0

Stefan Dösinger : wined3d: Link STATE_BASEVERTEXINDEX to STATE_VDECL.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 73cec67c14ff6e8f454e949d2c7507ec550d88f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73cec67c14ff6e8f454e949d2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 18 13:47:34 2011 +0200 wined3d: Link STATE_BASEVERTEXINDEX to STATE_VDECL. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 632388c..568ae87 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5063,7 +5063,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_SAMPLER(18), /* Vertex sampler 2 */ { STATE_SAMPLER(18), sampler }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(19), /* Vertex sampler 3 */ { STATE_SAMPLER(19), sampler }, WINED3D_GL_EXT_NONE }, { STATE_BASEVERTEXINDEX, { 0, NULL, }, ARB_DRAW_ELEMENTS_BASE_VERTEX }, - { STATE_BASEVERTEXINDEX, { STATE_STREAMSRC, NULL, }, WINED3D_GL_EXT_NONE }, + { STATE_BASEVERTEXINDEX, { STATE_VDECL, NULL, }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, };

1 0

Jacek Caban : include: Moved DXGI_FORMAT declaration to dxgiformat.h.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: a1d55ee77b1931c8f255f237f1010e1b985e860c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d55ee77b1931c8f255f237f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 18 15:06:13 2011 +0200 include: Moved DXGI_FORMAT declaration to dxgiformat.h. --- include/Makefile.in | 1 + include/dxgiformat.h | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/dxgitype.idl | 94 +--------------------------------------- 3 files changed, 119 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1d55ee77b1931c8f255f…

1 0

Piotr Caban : msvcrt: Fix __p__pctype implementation.
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 4debdd6ac815df5d6748c76b9d238efc44b4ffbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4debdd6ac815df5d6748c76b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 17 20:29:57 2011 +0200 msvcrt: Fix __p__pctype implementation. --- dlls/msvcrt/ctype.c | 8 ++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 2805afb..6bf4948 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -59,6 +59,14 @@ WORD MSVCRT__ctype [257] = { unsigned short *MSVCRT__pctype = NULL; /********************************************************************* + * __p__pctype (MSVCRT.@) + */ +unsigned short** CDECL MSVCRT___p__pctype(void) +{ + return &get_locinfo()->pctype; +} + +/********************************************************************* * __pctype_func (MSVCRT.@) */ const unsigned short* CDECL MSVCRT___pctype_func(void) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0308067..41d95bc 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -236,7 +236,7 @@ @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ cdecl __p__osver() -@ cdecl __p__pctype() MSVCRT___pctype_func +@ cdecl __p__pctype() MSVCRT___p__pctype @ cdecl __p__pgmptr() @ stub __p__pwctype() @ cdecl __p__timezone() MSVCRT___p__timezone

1 0