April 2010 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Simply pass IWineD3DSurfaceImpl pointers to IWineD3DSurfaceImpl_BltOverride ().
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 553f429964baad21fa7e863564b29a06d15c1ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=553f429964baad21fa7e86356… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 11:02:35 2010 +0200 wined3d: Simply pass IWineD3DSurfaceImpl pointers to IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 191 +++++++++++++++++++++++++++--------------------- 1 files changed, 107 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=553f429964baad21fa7e8…

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_force_reload().
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 32b1f25f4beaeae419e86ed8123730a33c38a0b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32b1f25f4beaeae419e86ed81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 11:02:36 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_force_reload(). --- dlls/wined3d/surface.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c62d741..d768ff4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -463,11 +463,9 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, return hr; } -static void surface_force_reload(IWineD3DSurface *iface) +static void surface_force_reload(IWineD3DSurfaceImpl *surface) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - - This->Flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); + surface->Flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); } void surface_set_texture_name(IWineD3DSurface *iface, GLuint new_name, BOOL srgb) @@ -499,7 +497,7 @@ void surface_set_texture_name(IWineD3DSurface *iface, GLuint new_name, BOOL srgb } *name = new_name; - surface_force_reload(iface); + surface_force_reload(This); } void surface_set_texture_target(IWineD3DSurface *iface, GLenum target) @@ -520,7 +518,7 @@ void surface_set_texture_target(IWineD3DSurface *iface, GLenum target) } } This->texture_target = target; - surface_force_reload(iface); + surface_force_reload(This); } /* Context activation is done by the caller. */ @@ -2025,7 +2023,7 @@ static void surface_release_client_storage(IWineD3DSurface *iface) IWineD3DSurface_ModifyLocation(iface, SFLAG_INSRGBTEX, FALSE); IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); - surface_force_reload(iface); + surface_force_reload(This); } static HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC)

1 0

Piotr Caban : msvcr90: Added _recalloc implementation.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 40aa4dc459921631dff66989576bc264ee3a3540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40aa4dc459921631dff669895… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 26 12:33:02 2010 +0200 msvcr90: Added _recalloc implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.c | 27 +++++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 53cef75..0c69621 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -837,7 +837,7 @@ @ stub _pwctype @ cdecl _read(long ptr long) msvcrt._read @ stub _realloc_crt -@ stub _recalloc +@ cdecl _recalloc(ptr long long) msvcr90._recalloc @ stub _recalloc_crt @ stub _resetstkoflw @ cdecl _rmdir(str) msvcrt._rmdir diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 9d03767..eaf9d66 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -21,6 +21,8 @@ #include <stdarg.h> #include "stdlib.h" +#include "errno.h" +#include "malloc.h" #include "windef.h" #include "winbase.h" #include "wine/debug.h" @@ -131,3 +133,28 @@ void CDECL __clean_type_info_names_internal(void *p) { FIXME("(%p) stub\n", p); } + +/********************************************************************* + * _recalloc (MSVCR90.@) + */ +void* CDECL _recalloc(void* mem, size_t num, size_t size) +{ + size_t old_size; + void *ret; + + if(!mem) + return calloc(num, size); + + size = num*size; + old_size = _msize(mem); + + ret = realloc(mem, size); + if(!ret) { + *_errno() = ENOMEM; + return NULL; + } + + if(size>old_size) + memset((BYTE*)mem+old_size, 0, size-old_size); + return ret; +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d8f8e04..3bfd1b8 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -823,7 +823,7 @@ @ stub _pwctype @ cdecl _read(long ptr long) msvcrt._read @ stub _realloc_crt -@ stub _recalloc +@ cdecl _recalloc(ptr long long) @ stub _recalloc_crt @ stub _resetstkoflw @ cdecl _rmdir(str) msvcrt._rmdir

1 0

Piotr Caban : msvcrt: Added btowc implementation.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 815840e972fd70d2d4bfd32df5422cdc8e5ef738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=815840e972fd70d2d4bfd32df… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 26 12:33:19 2010 +0200 msvcrt: Added btowc implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/locale.c | 16 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0c69621..b8e89e4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1235,7 +1235,7 @@ @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ stub bsearch_s -@ stub btowc +@ cdecl btowc(long) msvcrt.btowc @ cdecl calloc(long long) msvcrt.calloc @ cdecl ceil(double) msvcrt.ceil @ cdecl clearerr(ptr) msvcrt.clearerr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3bfd1b8..141592d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1219,7 +1219,7 @@ @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch @ stub bsearch_s -@ stub btowc +@ cdecl btowc(long) msvcrt.btowc @ cdecl calloc(long long) msvcrt.calloc @ cdecl ceil(double) msvcrt.ceil @ cdecl clearerr(ptr) msvcrt.clearerr diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 84bd73b..546f20c 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -485,6 +485,22 @@ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, MSVCRT_wchar_t *buffer, i } /********************************************************************* + * btowc(MSVCRT.@) + */ +MSVCRT_wint_t CDECL MSVCRT_btowc(int c) +{ + MSVCRT__locale_t locale = get_locale(); + unsigned char letter = c; + MSVCRT_wchar_t ret; + + if(!MultiByteToWideChar(locale->locinfo->lc_handle[MSVCRT_LC_CTYPE], + 0, (LPCSTR)&letter, 1, &ret, 1)) + return 0; + + return ret; +} + +/********************************************************************* * __crtGetStringTypeW(MSVCRT.@) * * This function was accepting different number of arguments in older diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0909cd0..156ab2e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1165,7 +1165,7 @@ @ cdecl atol(str) ntdll.atol @ cdecl bsearch(ptr ptr long long ptr) ntdll.bsearch # stub bsearch_s -# stub btowc +@ cdecl btowc(long) MSVCRT_btowc @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil @ cdecl clearerr(ptr) MSVCRT_clearerr

1 0

Piotr Caban : msvcrt: Change strtod_l implementation.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: f76eef74018852253b03d305432b4864c724bed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76eef74018852253b03d3054… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 26 12:33:28 2010 +0200 msvcrt: Change strtod_l implementation. --- dlls/msvcrt/string.c | 104 ++++++++++++++++++++++++++++++++------------ dlls/msvcrt/tests/string.c | 34 +++++++++++++-- 2 files changed, 106 insertions(+), 32 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 830fe51..6829e25 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -23,8 +23,11 @@ #define _ISOC99_SOURCE #include "config.h" +#include "wine/port.h" #include <stdlib.h> +#include <math.h> +#include <limits.h> #include <errno.h> #include "msvcrt.h" #include "wine/debug.h" @@ -141,13 +144,10 @@ double CDECL MSVCRT_atof( const char *str ) */ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t locale) { - const char *p, *dec_point=NULL, *exp=NULL; - char *copy; + unsigned __int64 d=0, hlp; + int exp=0, sign=1; + const char *p; double ret; - int err = errno; - - if(!locale) - locale = get_locale(); if(!str) { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); @@ -155,45 +155,93 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca return 0; } + if(!locale) + locale = get_locale(); + /* FIXME: use *_l functions */ p = str; while(isspace(*p)) p++; - if(*p=='+' || *p=='-') + + if(*p == '-') { + sign = -1; p++; - while(isdigit(*p)) + } else if(*p == '+') p++; - if(*p == *locale->locinfo->lconv->decimal_point) { - if(*p!='.') - dec_point = p; + + while(isdigit(*p)) { + hlp = d*10+*(p++)-'0'; + if(d>MSVCRT_UI64_MAX/10 || hlp<d) { + exp++; + break; + } else + d = hlp; + } + while(isdigit(*p)) { + exp++; p++; } - while(isdigit(*p)) + + if(*p == *locale->locinfo->lconv->decimal_point) p++; - if(*p=='d' || *p=='D') - exp = p; - /* FIXME: don't copy input string */ - if((dec_point || exp) && (copy=_strdup(str))) { - if(dec_point) - copy[dec_point-str] = '.'; + while(isdigit(*p)) { + hlp = d*10+*(p++)-'0'; + if(d>MSVCRT_UI64_MAX/10 || hlp<d) + break; - if(exp) - copy[exp-str] = 'e'; + d = hlp; + exp--; + } + while(isdigit(*p)) + p++; - ret = strtod(copy, end); + if(p == str) { if(end) - *end = (char*)str+(*end-copy); + *end = (char*)str; + return 0.0; + } - MSVCRT_free(copy); - } else - ret = strtod(str, end); + if(*p=='e' || *p=='E' || *p=='d' || *p=='D') { + int e=0, s=1; - if(err != errno) - *MSVCRT__errno() = errno; + p++; + if(*p == '-') { + s = -1; + p++; + } else if(*p == '+') + p++; + + if(isdigit(*p)) { + while(isdigit(*p)) { + if(e>INT_MAX/10 || (e=e*10+*p-'0')<0) + e = INT_MAX; + p++; + } + e *= s; - return ret; + if(exp<0 && e<0 && exp+e>=0) exp = INT_MIN; + else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX; + else exp += e; + } else { + if(*p=='-' || *p=='+') + p--; + p--; + } + } + + if(exp>0) + ret = (double)sign*d*pow(10, exp); + else + ret = (double)sign*d/pow(10, -exp); + if((d && ret==0.0) || isinf(ret)) + *MSVCRT__errno() = MSVCRT_ERANGE; + + if(end) + *end = (char*)p; + + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 433a318..5d61687 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1081,7 +1081,7 @@ static void test__strtoi64(void) } static inline BOOL almost_equal(double d1, double d2) { - if(d1-d2>-1e-16 && d1-d2<1e-16) + if(d1-d2>-1e-30 && d1-d2<1e-30) return TRUE; return FALSE; } @@ -1093,6 +1093,7 @@ static void test__strtod(void) const char double3[] = "INF"; const char double4[] = ".21e12"; const char double5[] = "214353e-3"; + const char overflow[] = "1d9999999999999999999"; char *end; double d; @@ -1106,8 +1107,8 @@ static void test__strtod(void) ok(end == double2+7, "incorrect end (%d)\n", end-double2); d = strtod(double3, &end); - todo_wine ok(almost_equal(d, 0), "d = %lf\n", d); - todo_wine ok(end == double3, "incorrect end (%d)\n", end-double3); + ok(almost_equal(d, 0), "d = %lf\n", d); + ok(end == double3, "incorrect end (%d)\n", end-double3); d = strtod(double4, &end); ok(almost_equal(d, 210000000000.0), "d = %lf\n", d); @@ -1127,12 +1128,37 @@ static void test__strtod(void) } d = strtod("12.1", NULL); - todo_wine ok(almost_equal(d, 12.0), "d = %lf\n", d); + ok(almost_equal(d, 12.0), "d = %lf\n", d); d = strtod("12,1", NULL); ok(almost_equal(d, 12.1), "d = %lf\n", d); setlocale(LC_ALL, "C"); + + /* Precision tests */ + d = strtod("0.1", NULL); + ok(almost_equal(d, 0.1), "d = %lf\n", d); + d = strtod("-0.1", NULL); + ok(almost_equal(d, -0.1), "d = %lf\n", d); + d = strtod("0.1281832188491894198128921", NULL); + ok(almost_equal(d, 0.1281832188491894198128921), "d = %lf\n", d); + d = strtod("0.82181281288121", NULL); + ok(almost_equal(d, 0.82181281288121), "d = %lf\n", d); + d = strtod("21921922352523587651128218821", NULL); + ok(almost_equal(d, 21921922352523587651128218821.0), "d = %lf\n", d); + d = strtod("0.1d238", NULL); + ok(almost_equal(d, 0.1e238L), "d = %lf\n", d); + d = strtod("0.1D-4736", NULL); + ok(almost_equal(d, 0.1e-4736L), "d = %lf\n", d); + + errno = 0xdeadbeef; + d = strtod(overflow, &end); + ok(errno == ERANGE, "errno = %x\n", errno); + ok(end == overflow+21, "incorrect end (%d)\n", end-overflow); + + errno = 0xdeadbeef; + strtod("-1d309", NULL); + ok(errno == ERANGE, "errno = %x\n", errno); } START_TEST(string)

1 0

Gerald Pfeifer : d3dx9_36: Remove variable nul which is not really used from D3DXVector4Test.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: d30629ff74fd2c7ab28b2b32f5e81ee495073916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30629ff74fd2c7ab28b2b32f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 16:30:50 2010 +0200 d3dx9_36: Remove variable nul which is not really used from D3DXVector4Test. --- dlls/d3dx9_36/tests/math.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9cc9248..832798f 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1308,13 +1308,12 @@ static void D3DXVector3Test(void) static void D3DXVector4Test(void) { - D3DXVECTOR4 expectedvec, gotvec, nul, u, v, w, x; + D3DXVECTOR4 expectedvec, gotvec, u, v, w, x; LPD3DXVECTOR4 funcpointer; D3DXVECTOR4 expectedtrans, gottrans; D3DXMATRIX mat; FLOAT coeff1, coeff2, expected, got, scale; - nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; nul.w = 0.0f; u.x = 1.0f; u.y = 2.0f; u.z = 4.0f; u.w = 10.0; v.x = -3.0f; v.y = 4.0f; v.z = -5.0f; v.w = 7.0; w.x = 4.0f; w.y =6.0f; w.z = -2.0f; w.w = 1.0f;

1 0

Gerald Pfeifer : gdi32: Remove variable retb which is not really used from test_closefigure.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 6cad49da4bfe0da243b9478b8a84b443bf02db45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cad49da4bfe0da243b9478b8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 16:46:48 2010 +0200 gdi32: Remove variable retb which is not really used from test_closefigure. --- dlls/gdi32/tests/path.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 66cd039..43f3d62 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -393,7 +393,6 @@ done: } static void test_closefigure(void) { - BOOL retb; int nSize, nSizeWitness; HDC hdc = GetDC(0); @@ -402,7 +401,7 @@ static void test_closefigure(void) { LineTo(hdc, 95, 0); LineTo(hdc, 0, 95); - retb = CloseFigure(hdc); + CloseFigure(hdc); EndPath(hdc); nSize = GetPath(hdc, NULL, NULL, 0);

1 0

Gerald Pfeifer : msvidc32: Remove variable bit_per_pixel which is not really used from CRAM_Decompress and CRAM_DecompressEx .
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: ba9b207274870b4abbbe45ccb1556f3918f32c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9b207274870b4abbbe45ccb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 22:48:17 2010 +0200 msvidc32: Remove variable bit_per_pixel which is not really used from CRAM_Decompress and CRAM_DecompressEx. --- dlls/msvidc32/msvideo1.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 68a52c6..71ed2d7 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -385,7 +385,6 @@ static LRESULT CRAM_DecompressBegin( Msvideo1Context *info, LPBITMAPINFO in, LPB static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD size ) { LONG width, height, stride, sz; - WORD bit_per_pixel; TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size); @@ -396,7 +395,6 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD width = icd->lpbiInput->biWidth; height = icd->lpbiInput->biHeight; - bit_per_pixel = icd->lpbiInput->biBitCount; stride = width; /* in bytes or 16bit words */ sz = icd->lpbiInput->biSizeImage; @@ -417,7 +415,6 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DWORD size ) { LONG width, height, stride, sz; - WORD bit_per_pixel; TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size); @@ -428,7 +425,6 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW width = icd->lpbiSrc->biWidth; height = icd->lpbiSrc->biHeight; - bit_per_pixel = icd->lpbiSrc->biBitCount; stride = width; sz = icd->lpbiSrc->biSizeImage;

1 0

Gerald Pfeifer : quartz: Fix return value for StdMediaSample2_GetTime in error cases.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 6c016ac039dd325c4335f454762899a8f3f829ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c016ac039dd325c4335f4547… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 23:00:54 2010 +0200 quartz: Fix return value for StdMediaSample2_GetTime in error cases. --- dlls/quartz/memallocator.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 7f799c9..16b94e3 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -534,7 +534,7 @@ static HRESULT WINAPI StdMediaSample2_GetTime(IMediaSample2 * iface, REFERENCE_T hr = S_OK; } - return S_OK; + return hr; } static HRESULT WINAPI StdMediaSample2_SetTime(IMediaSample2 * iface, REFERENCE_TIME * pStart, REFERENCE_TIME * pEnd)

1 0

Gerald Pfeifer : advapi32: Remove variable ret which is not really used from LsaLookupNames2.
by Alexandre Julliard 26 Apr '10

26 Apr '10

Module: wine Branch: master Commit: 0351f56e67c6137a4103bd382dbd27e3450d3144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0351f56e67c6137a4103bd382… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 24 22:53:35 2010 +0200 advapi32: Remove variable ret which is not really used from LsaLookupNames2. --- dlls/advapi32/lsa.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index b5dab21..50877cc 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -355,7 +355,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, { ULONG i, sid_size_total = 0, domain_size_max = 0, size; ULONG sid_size, domain_size, mapped; - BOOL ret, handled = FALSE; + BOOL handled = FALSE; SID_NAME_USE use; SID *sid; @@ -366,7 +366,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, { handled = FALSE; sid_size = domain_size = 0; - ret = lookup_name( &names[i], NULL, &sid_size, NULL, &domain_size, &use, &handled ); + lookup_name( &names[i], NULL, &sid_size, NULL, &domain_size, &use, &handled ); if (handled) { sid_size_total += sid_size; @@ -408,7 +408,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, handled = FALSE; sid_size = sid_size_total; domain_size = domain_size_max; - ret = lookup_name( &names[i], sid, &sid_size, domain.Buffer, &domain_size, &use, &handled ); + lookup_name( &names[i], sid, &sid_size, domain.Buffer, &domain_size, &use, &handled ); if (handled) { (*sids)[i].Sid = sid;

1 0