wine-commits July 2007

wine-commits@winehq.org

3 participants
957 discussions

Maarten Lankhorst : dsound: Make sure secondary_remainder and buflen are aligned to primary buffer in mixer .
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: f94114a88d5685ef1ac97626817c5477e5640cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94114a88d5685ef1ac976268… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 12 12:26:19 2007 +0200 dsound: Make sure secondary_remainder and buflen are aligned to primary buffer in mixer. --- dlls/dsound/mixer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 7b4864e..64ac3c9 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -432,6 +432,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO int secondary_remainder = dsb->buflen - dsb->buf_mixpos; int adjusted_remainder = MulDiv(dsb->device->pwfx->nAvgBytesPerSec, secondary_remainder, dsb->nAvgBytesPerSec); assert(adjusted_remainder >= 0); + adjusted_remainder -= adjusted_remainder % dsb->device->pwfx->nBlockAlign; /* data alignment */ /* The adjusted remainder must be at least one sample, * otherwise we will never reach the end of the * secondary buffer, as there will perpetually be a @@ -588,7 +589,7 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD playpos, DWORD wri { /* The buffer's primary_mixpos may be before or after the the device * buffer's mixpos, but both must be ahead of writepos. */ - DWORD primary_done; + DWORD primary_done, buflen = dsb->buflen / dsb->pwfx->nBlockAlign * dsb->device->pwfx->nBlockAlign; TRACE("(%p,%d,%d,%d)\n",dsb,playpos,writepos,mixlen); TRACE("writepos=%d, buf_mixpos=%d, primary_mixpos=%d, mixlen=%d\n", writepos, dsb->buf_mixpos, dsb->primary_mixpos, mixlen); @@ -611,7 +612,7 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD playpos, DWORD wri TRACE("mixlen (primary) = %i\n", mixlen); /* clip to valid length */ - mixlen = (dsb->buflen < mixlen) ? dsb->buflen : mixlen; + mixlen = (buflen < mixlen) ? buflen : mixlen; TRACE("primary_done=%d, mixlen (buffer)=%d\n", primary_done, mixlen);

1 0

Andrew Talbot : oleaut32: Constify some variables.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 16e9c35910ae78a8c5cd7a5c11da4cf75b9ddf7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=16e9c35910ae78a8c5cd7a5c1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jul 26 22:24:58 2007 +0100 oleaut32: Constify some variables. --- dlls/oleaut32/typelib2.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 874d8a8..41ee8e6 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -322,7 +322,7 @@ static int ctl2_find_guid( */ static int ctl2_find_name( ICreateTypeLib2Impl *This, /* [I] The typelib to operate against. */ - char *name) /* [I] The encoded name to find. */ + const char *name) /* [I] The encoded name to find. */ { int offset; int *namestruct; @@ -331,7 +331,7 @@ static int ctl2_find_name( while (offset != -1) { namestruct = (int *)&This->typelib_segment_data[MSFT_SEG_NAME][offset]; - if (!((namestruct[2] ^ *((int *)name)) & 0xffff00ff)) { + if (!((namestruct[2] ^ *((const int *)name)) & 0xffff00ff)) { /* hash codes and lengths match, final test */ if (!strncasecmp(name+4, (void *)(namestruct+3), name[0])) break; } @@ -828,7 +828,7 @@ static HRESULT ctl2_set_custdata( */ static int ctl2_encode_typedesc( ICreateTypeLib2Impl *This, /* [I] The type library in which to encode the TYPEDESC. */ - TYPEDESC *tdesc, /* [I] The type description to encode. */ + const TYPEDESC *tdesc, /* [I] The type description to encode. */ int *encoded_tdesc, /* [O] The encoded type description. */ int *width, /* [O] The width of the type, or NULL. */ int *alignment, /* [O] The alignment of the type, or NULL. */ @@ -3225,7 +3225,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetLibFlags(ICreateTypeLib2 * iface, UIN return S_OK; } -static int ctl2_write_chunk(HANDLE hFile, void *segment, int length) +static int ctl2_write_chunk(HANDLE hFile, const void *segment, int length) { DWORD dwWritten; if (!WriteFile(hFile, segment, length, &dwWritten, 0)) {

1 0

Steven Edwards : version: VerQueryValueA/W NULL pointer check.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: e1347ecdc5a588a41c7cd5864e39ca13c65da4fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1347ecdc5a588a41c7cd5864… Author: Steven Edwards <winehacker(a)gmail.com> Date: Thu Jul 26 15:42:16 2007 -0400 version: VerQueryValueA/W NULL pointer check. --- dlls/version/info.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 82ca86f..907cd23 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -771,6 +771,9 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, TRACE("(%p,%s,%p,%p)\n", pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen ); + if (!pBlock) + return FALSE; + if ( !VersionInfoIs16( info ) ) { BOOL ret; @@ -823,6 +826,9 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, TRACE("(%p,%s,%p,%p)\n", pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen ); + if (!pBlock) + return FALSE; + if ( VersionInfoIs16( info ) ) { BOOL ret;

1 0

Roderick Colenbrander : wgl: Fix a typo in the WGL_TEXTURE_TARGET_ARB emulation code.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 6f3e8a2fcf0d119a66bd07a01a0ee3313f638417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3e8a2fcf0d119a66bd07a01… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Jul 27 11:00:19 2007 +0200 wgl: Fix a typo in the WGL_TEXTURE_TARGET_ARB emulation code. --- dlls/winex11.drv/opengl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 353ee60..d6202e5 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2246,9 +2246,9 @@ static GLboolean WINAPI X11DRV_wglQueryPbufferARB(HPBUFFERARB hPbuffer, int iAtt return GL_FALSE; } switch (object->texture_target) { - case GL_TEXTURE_1D: *piValue = WGL_TEXTURE_CUBE_MAP_ARB; break; - case GL_TEXTURE_2D: *piValue = WGL_TEXTURE_1D_ARB; break; - case GL_TEXTURE_CUBE_MAP: *piValue = WGL_TEXTURE_2D_ARB; break; + case GL_TEXTURE_1D: *piValue = WGL_TEXTURE_1D_ARB; break; + case GL_TEXTURE_2D: *piValue = WGL_TEXTURE_2D_ARB; break; + case GL_TEXTURE_CUBE_MAP: *piValue = WGL_TEXTURE_CUBE_MAP_ARB; break; } } }

1 0

Roderick Colenbrander : wgl: Enable offscreen pixelformats for pbuffers.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 4682f8f77a0988f9fcc9053ad531b82c6c7e6e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4682f8f77a0988f9fcc9053ad… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Jul 26 20:32:22 2007 +0200 wgl: Enable offscreen pixelformats for pbuffers. --- dlls/winex11.drv/opengl.c | 43 +++++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0112465..353ee60 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -70,7 +70,7 @@ WINE_DECLARE_DEBUG_CHANNEL(fps); typedef struct wine_glcontext { HDC hdc; XVisualInfo *vis; - GLXFBConfig fb_conf; + GLXFBConfig fbconfig; GLXContext ctx; BOOL do_escape; X11DRV_PDEVICE *physDev; @@ -227,6 +227,7 @@ MAKE_FUNCPTR(glXQueryServerString) MAKE_FUNCPTR(glXGetFBConfigs) MAKE_FUNCPTR(glXChooseFBConfig) MAKE_FUNCPTR(glXCreatePbuffer) +MAKE_FUNCPTR(glXCreateNewContext) MAKE_FUNCPTR(glXDestroyPbuffer) MAKE_FUNCPTR(glXGetFBConfigAttrib) MAKE_FUNCPTR(glXGetVisualFromFBConfig) @@ -385,6 +386,7 @@ LOAD_FUNCPTR(glXQueryServerString) /* GLX 1.3 */ LOAD_FUNCPTR(glXCreatePbuffer) +LOAD_FUNCPTR(glXCreateNewContext) LOAD_FUNCPTR(glXDestroyPbuffer) LOAD_FUNCPTR(glXMakeContextCurrent) LOAD_FUNCPTR(glXGetCurrentReadDrawable) @@ -564,9 +566,9 @@ static int describeContext(Wine_GLContext* ctx) { int tmp; int ctx_vis_id; TRACE(" Context %p have (vis:%p):\n", ctx, ctx->vis); - pglXGetFBConfigAttrib(gdi_display, ctx->fb_conf, GLX_FBCONFIG_ID, &tmp); + pglXGetFBConfigAttrib(gdi_display, ctx->fbconfig, GLX_FBCONFIG_ID, &tmp); TRACE(" - FBCONFIG_ID 0x%x\n", tmp); - pglXGetFBConfigAttrib(gdi_display, ctx->fb_conf, GLX_VISUAL_ID, &tmp); + pglXGetFBConfigAttrib(gdi_display, ctx->fbconfig, GLX_VISUAL_ID, &tmp); TRACE(" - VISUAL_ID 0x%x\n", tmp); ctx_vis_id = tmp; return ctx_vis_id; @@ -1312,11 +1314,13 @@ HGLRC X11DRV_wglCreateContext(X11DRV_PDEVICE *physDev) /* First, get the visual in use by the X11DRV */ if (!gdi_display) return 0; - fmt = ConvertPixelFormatWGLtoGLX(gdi_display, hdcPF, FALSE /* Offscreen */, &fmt_count); - /* We can only render using the iPixelFormat (1) of Wine's Main visual, we need to get the corresponding GLX format. - * If this fails something is very wrong on the system. */ + fmt = ConvertPixelFormatWGLtoGLX(gdi_display, hdcPF, TRUE /* Offscreen */, &fmt_count); + /* We can render using the iPixelFormat (1) of Wine's Main visual AND using some offscreen formats. + * Note that standard WGL-calls don't recognize offscreen-only formats. For that reason pbuffers + * use a sort of 'proxy' HDC (wglGetPbufferDCARB). + * If this fails something is very wrong on the system. */ if(!fmt) { - ERR("Cannot get FB Config for main iPixelFormat 1, expect problems!\n"); + ERR("Cannot get FB Config for iPixelFormat %d, expect problems!\n", hdcPF); SetLastError(ERROR_INVALID_PIXEL_FORMAT); return NULL; } @@ -1340,7 +1344,7 @@ HGLRC X11DRV_wglCreateContext(X11DRV_PDEVICE *physDev) wine_tsx11_unlock(); ret->hdc = hdc; ret->physDev = physDev; - ret->fb_conf = fmt->fbconfig; + ret->fbconfig = fmt->fbconfig; /*ret->vis = vis;*/ ret->vis = pglXGetVisualFromFBConfig(gdi_display, fmt->fbconfig); @@ -1527,7 +1531,11 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { * We are certain that the drawable and context are compatible as we only allow compatible formats. */ TRACE(" Creating GLX Context\n"); - ctx->ctx = pglXCreateContext(gdi_display, ctx->vis, NULL, type == OBJ_MEMDC ? False : True); + if(ctx->vis) + ctx->ctx = pglXCreateContext(gdi_display, ctx->vis, NULL, type == OBJ_MEMDC ? False : True); + else /* Create a GLX Context for a pbuffer */ + ctx->ctx = pglXCreateNewContext(gdi_display, ctx->fbconfig, GLX_RGBA_TYPE, NULL, True); + TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); } TRACE(" make current for dis %p, drawable %p, ctx %p\n", gdi_display, (void*) drawable, ctx->ctx); @@ -1617,7 +1625,11 @@ BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { if (org->ctx == NULL) { wine_tsx11_lock(); describeContext(org); - org->ctx = pglXCreateContext(gdi_display, org->vis, NULL, GetObjectType(org->physDev->hdc) == OBJ_MEMDC ? False : True); + + if(org->vis) + org->ctx = pglXCreateContext(gdi_display, org->vis, NULL, GetObjectType(org->physDev->hdc) == OBJ_MEMDC ? False : True); + else /* Create a GLX Context for a pbuffer */ + org->ctx = pglXCreateNewContext(gdi_display, org->fbconfig, GLX_RGBA_TYPE, NULL, True); wine_tsx11_unlock(); TRACE(" created a delayed OpenGL context (%p) for Wine context %p\n", org->ctx, org); } @@ -1625,7 +1637,10 @@ BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { wine_tsx11_lock(); describeContext(dest); /* Create the destination context with display lists shared */ - dest->ctx = pglXCreateContext(gdi_display, dest->vis, org->ctx, GetObjectType(org->physDev->hdc) == OBJ_MEMDC ? False : True); + if(dest->vis) + dest->ctx = pglXCreateContext(gdi_display, dest->vis, org->ctx, GetObjectType(org->physDev->hdc) == OBJ_MEMDC ? False : True); + else /* Create a GLX Context for a pbuffer */ + dest->ctx = pglXCreateNewContext(gdi_display, dest->fbconfig, GLX_RGBA_TYPE, org->ctx, True); wine_tsx11_unlock(); TRACE(" created a delayed OpenGL context (%p) for Wine context %p sharing lists with OpenGL ctx %p\n", dest->ctx, dest, org->ctx); return TRUE; @@ -1860,7 +1875,7 @@ static void WINAPI X11DRV_wglGetIntegerv(GLenum pname, GLint* params) GLXContext gl_ctx = pglXGetCurrentContext(); Wine_GLContext* ret = get_context_from_GLXContext(gl_ctx); - pglXGetFBConfigAttrib(gdi_display, ret->fb_conf, GLX_ALPHA_SIZE, params); + pglXGetFBConfigAttrib(gdi_display, ret->fbconfig, GLX_ALPHA_SIZE, params); TRACE("returns GL_ALPHA_BITS as '%d'\n", *params); break; } @@ -1953,7 +1968,7 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, } /* Convert the WGL pixelformat to a GLX format, if it fails then the format is invalid */ - fmt = ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, FALSE /* Offscreen */, &nCfgs); + fmt = ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, TRUE /* Offscreen */, &nCfgs); if(!fmt) { ERR("(%p): unexpected iPixelFormat(%d) > nFormats(%d), returns NULL\n", hdc, iPixelFormat, nCfgs); SetLastError(ERROR_INVALID_PIXEL_FORMAT); @@ -2395,7 +2410,7 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF /* Convert the WGL pixelformat to a GLX one, if this fails then most likely the iPixelFormat isn't supoprted. * We don't have to fail yet as a program can specify an invaled iPixelFormat (lets say 0) if it wants to query * the number of supported WGL formats. Whether the iPixelFormat is valid is handled in the for-loop below. */ - fmt = ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, FALSE /* Offscreen */, &nWGLFormats); + fmt = ConvertPixelFormatWGLtoGLX(gdi_display, iPixelFormat, TRUE /* Offscreen */, &nWGLFormats); if(!fmt) { WARN("Unable to convert iPixelFormat %d to a GLX one!\n", iPixelFormat); }

1 0

Roderick Colenbrander : wgl: Replace the GLXFBConfigIDs in the pixelformat list with real GLXFBConfigs.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 4a96be5a72deb97182dc9f58913a22a0364ce7ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a96be5a72deb97182dc9f589… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Jul 26 19:23:39 2007 +0200 wgl: Replace the GLXFBConfigIDs in the pixelformat list with real GLXFBConfigs. --- dlls/winex11.drv/opengl.c | 280 +++++++++++++++------------------------------ 1 files changed, 94 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a96be5a72deb97182dc9…

1 0

Roderick Colenbrander : wgl: Fill the format table with offscreen pixelformats which are needed for pbuffers .
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: cfd81827ac211c67115c9c241e7f54b5f48949a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd81827ac211c67115c9c241… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Jul 26 18:13:08 2007 +0200 wgl: Fill the format table with offscreen pixelformats which are needed for pbuffers. --- dlls/winex11.drv/opengl.c | 103 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 82 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfd81827ac211c67115c9…

1 0

Alexandre Julliard : msvcrt: Get rid of the now unused strndup/ wstrndup functions.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 1f5a4a8046c2494bcae4a659e5193a965eee39da URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f5a4a8046c2494bcae4a659e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 27 12:18:44 2007 +0200 msvcrt: Get rid of the now unused strndup/wstrndup functions. --- dlls/msvcrt/msvcrt.h | 2 -- dlls/msvcrt/string.c | 17 ----------------- dlls/msvcrt/wcs.c | 17 ----------------- 3 files changed, 0 insertions(+), 36 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index c0bebba..cf3c531 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -115,8 +115,6 @@ extern thread_data_t *msvcrt_get_thread_data(void); extern int MSVCRT___lc_codepage; void msvcrt_set_errno(int); -char* msvcrt_strndup(const char*,unsigned int); -MSVCRT_wchar_t *msvcrt_wstrndup(const MSVCRT_wchar_t*, unsigned int); void _purecall(void); void _amsg_exit(int errnum); diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index ec4bd70..d1973a3 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -30,23 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -/* INTERNAL: MSVCRT_malloc() based strndup */ -char* msvcrt_strndup(const char* buf, unsigned int size) -{ - char* ret; - unsigned int len = strlen(buf), max_len; - - max_len = size <= len? size : len + 1; - - ret = MSVCRT_malloc(max_len); - if (ret) - { - memcpy(ret,buf,max_len); - ret[max_len] = 0; - } - return ret; -} - /********************************************************************* * _mbsdup (MSVCRT.@) * _strdup (MSVCRT.@) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 32668a3..92dd644 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -30,23 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -/* INTERNAL: MSVCRT_malloc() based wstrndup */ -MSVCRT_wchar_t* msvcrt_wstrndup(const MSVCRT_wchar_t *buf, unsigned int size) -{ - MSVCRT_wchar_t* ret; - unsigned int len = strlenW(buf), max_len; - - max_len = size <= len? size : len + 1; - - ret = MSVCRT_malloc(max_len * sizeof (MSVCRT_wchar_t)); - if (ret) - { - memcpy(ret,buf,max_len * sizeof (MSVCRT_wchar_t)); - ret[max_len] = 0; - } - return ret; -} - /********************************************************************* * _wcsdup (MSVCRT.@) */

1 0

Alexandre Julliard : msvcrt: Fixed errno setting in malloc, HeapAlloc doesn 't set last error.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: 00c81e9d9f6e72d3184540b4b1267dcbbfb86d4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c81e9d9f6e72d3184540b4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 27 12:18:15 2007 +0200 msvcrt: Fixed errno setting in malloc, HeapAlloc doesn't set last error. --- dlls/msvcrt/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 0158435..ab6dd01 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -272,7 +272,7 @@ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) { void *ret = HeapAlloc(GetProcessHeap(),0,size); if (!ret) - msvcrt_set_errno(GetLastError()); + msvcrt_set_errno(MSVCRT_ENOMEM); return ret; }

1 0

Alexandre Julliard : msvcrt: Fixed buffer allocation in _getcwd/_wgetcwd.
by Alexandre Julliard 27 Jul '07

27 Jul '07

Module: wine Branch: master Commit: b2acafad44c306860bd42ae6b9278cafbe3dc659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2acafad44c306860bd42ae6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 27 12:17:58 2007 +0200 msvcrt: Fixed buffer allocation in _getcwd/_wgetcwd. --- dlls/msvcrt/dir.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 0232c4d..21a3115 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -419,11 +419,10 @@ char* CDECL _getcwd(char * buf, int size) if (!buf) { - if (size < 0) - return _strdup(dir); - return msvcrt_strndup(dir,size); + if (size <= dir_len) size = dir_len + 1; + if (!(buf = MSVCRT_malloc( size ))) return NULL; } - if (dir_len >= size) + else if (dir_len >= size) { *MSVCRT__errno() = MSVCRT_ERANGE; return NULL; /* buf too small */ @@ -447,9 +446,8 @@ MSVCRT_wchar_t* CDECL _wgetcwd(MSVCRT_wchar_t * buf, int size) if (!buf) { - if (size < 0) - return _wcsdup(dir); - return msvcrt_wstrndup(dir,size); + if (size <= dir_len) size = dir_len + 1; + if (!(buf = MSVCRT_malloc( size * sizeof(WCHAR) ))) return NULL; } if (dir_len >= size) {

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2007