October 2013 - Wine-Commits

Dmitry Timoshkov : kernel32/tests: Fix file tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 8014c7cbbb21ed508804ebac20ff015349811afa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8014c7cbbb21ed508804ebac2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:55 2013 +0900 kernel32/tests: Fix file tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/file.c | 96 ++++++++++++++++++++++---------------------- 1 files changed, 48 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8014c7cbbb21ed508804e…

1 0

Dmitry Timoshkov : kernel32/tests: Fix console tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: fd65dfbac94612ef3274a99ecf888ecc93ca931f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd65dfbac94612ef3274a99ec… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:37 2013 +0900 kernel32/tests: Fix console tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/console.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index d2ce294..48c70a9 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -50,7 +50,7 @@ static BOOL (WINAPI *pVerifyConsoleIoHandle)(HANDLE handle); #define okCHAR(hCon, c, ch, attr) do { \ char __ch; WORD __attr; DWORD __len; BOOL expect; \ - expect = ReadConsoleOutputCharacter((hCon), &__ch, 1, (c), &__len) == 1 && __len == 1 && __ch == (ch); \ + expect = ReadConsoleOutputCharacterA((hCon), &__ch, 1, (c), &__len) == 1 && __len == 1 && __ch == (ch); \ ok(expect, "At (%d,%d): expecting char '%c'/%02x got '%c'/%02x\n", (c).X, (c).Y, (ch), (ch), __ch, __ch); \ expect = ReadConsoleOutputAttribute((hCon), &__attr, 1, (c), &__len) == 1 && __len == 1 && __attr == (attr); \ ok(expect, "At (%d,%d): expecting attr %04x got %04x\n", (c).X, (c).Y, (attr), __attr); \ @@ -179,7 +179,7 @@ static void testEmptyWrite(HANDLE hCon) ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left\n"); len = -1; - ok(WriteConsole(hCon, NULL, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); + ok(WriteConsoleA(hCon, NULL, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); okCURSOR(hCon, c); /* Passing a NULL lpBuffer with sufficiently large non-zero length succeeds @@ -188,22 +188,22 @@ static void testEmptyWrite(HANDLE hCon) if (0) { len = -1; - ok(!WriteConsole(hCon, NULL, 16, &len, NULL) && len == -1, "WriteConsole\n"); + ok(!WriteConsoleA(hCon, NULL, 16, &len, NULL) && len == -1, "WriteConsole\n"); okCURSOR(hCon, c); /* Cursor advances for this call. */ len = -1; - ok(WriteConsole(hCon, NULL, 128, &len, NULL) != 0 && len == 128, "WriteConsole\n"); + ok(WriteConsoleA(hCon, NULL, 128, &len, NULL) != 0 && len == 128, "WriteConsole\n"); } len = -1; - ok(WriteConsole(hCon, emptybuf, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); + ok(WriteConsoleA(hCon, emptybuf, 0, &len, NULL) != 0 && len == 0, "WriteConsole\n"); okCURSOR(hCon, c); /* WriteConsole does not halt on a null terminator and is happy to write * memory contents beyond the actual size of the buffer. */ len = -1; - ok(WriteConsole(hCon, emptybuf, 16, &len, NULL) != 0 && len == 16, "WriteConsole\n"); + ok(WriteConsoleA(hCon, emptybuf, 16, &len, NULL) != 0 && len == 16, "WriteConsole\n"); c.X += 16; okCURSOR(hCon, c); } @@ -219,7 +219,7 @@ static void testWriteSimple(HANDLE hCon) c.X = c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); c.Y = 0; for (c.X = 0; c.X < mylen; c.X++) { @@ -246,7 +246,7 @@ static void testWriteNotWrappedNotProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - 3; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-3\n"); - ret = WriteConsole(hCon, mytest, mylen, &len, NULL); + ret = WriteConsoleA(hCon, mytest, mylen, &len, NULL); ok(ret != 0 && len == mylen, "Couldn't write, ret = %d, len = %d\n", ret, len); c.Y = 0; for (p = mylen - 3; p < mylen; p++) @@ -265,7 +265,7 @@ static void testWriteNotWrappedNotProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - mylen; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-3\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); } static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) @@ -285,7 +285,7 @@ static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - 5; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-5\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); c.Y = 0; for (c.X = sbSize.X - 5; c.X < sbSize.X - 1; c.X++) { @@ -316,7 +316,7 @@ static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - 4; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-4\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); c.Y = 0; for (c.X = sbSize.X - 4; c.X < sbSize.X; c.X++) { @@ -336,7 +336,7 @@ static void testWriteNotWrappedProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - 3; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-4\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); c.Y = 0; for (p = mylen2 - 3; p < mylen2; p++) { @@ -369,7 +369,7 @@ static void testWriteWrappedNotProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - 9; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-9\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); c.Y = 0; for (p = 0; p < mylen; p++) { @@ -406,7 +406,7 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - 9; c.Y = 0; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-9\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); for (p = 0; p < 4; p++) { c.X = sbSize.X - 9 + p; @@ -431,7 +431,7 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize) c.X = sbSize.X - 3; c.Y = 2; ok(SetConsoleCursorPosition(hCon, c) != 0, "Cursor in upper-left-3\n"); - ok(WriteConsole(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); + ok(WriteConsoleA(hCon, mytest, mylen, &len, NULL) != 0 && len == mylen, "WriteConsole\n"); for (p = 0; p < 3; p++) { c.X = sbSize.X - 3 + p; @@ -504,7 +504,7 @@ static void testScroll(HANDLE hCon, COORD sbSize) clip.Top = 0; clip.Bottom = sbSize.Y - 1; - ok(ScrollConsoleScreenBuffer(hCon, &scroll, NULL, dst, &ci), "Scrolling SB\n"); + ok(ScrollConsoleScreenBufferA(hCon, &scroll, NULL, dst, &ci), "Scrolling SB\n"); for (c.Y = 0; c.Y < sbSize.Y; c.Y++) { @@ -539,7 +539,7 @@ static void testScroll(HANDLE hCon, COORD sbSize) clip.Top = 0; clip.Bottom = sbSize.Y - 1; - ok(ScrollConsoleScreenBuffer(hCon, &scroll, NULL, dst, &ci), "Scrolling SB\n"); + ok(ScrollConsoleScreenBufferA(hCon, &scroll, NULL, dst, &ci), "Scrolling SB\n"); for (c.Y = 0; c.Y < sbSize.Y; c.Y++) { @@ -574,7 +574,7 @@ static void testScroll(HANDLE hCon, COORD sbSize) clip.Bottom = min(H + H / 2, sbSize.Y - 1); SetLastError(0xdeadbeef); - ret = ScrollConsoleScreenBuffer(hCon, &scroll, &clip, dst, &ci); + ret = ScrollConsoleScreenBufferA(hCon, &scroll, &clip, dst, &ci); if (ret) { for (c.Y = 0; c.Y < sbSize.Y; c.Y++) @@ -617,7 +617,7 @@ static void testScroll(HANDLE hCon, COORD sbSize) clip.Top = H / 2; clip.Bottom = min(H + H / 2, sbSize.Y - 1); - ok(ScrollConsoleScreenBuffer(hCon, &scroll, &clip, dst, &ci), "Scrolling SB\n"); + ok(ScrollConsoleScreenBufferA(hCon, &scroll, &clip, dst, &ci), "Scrolling SB\n"); for (c.Y = 0; c.Y < sbSize.Y; c.Y++) { @@ -927,7 +927,7 @@ static void test_GetSetConsoleInputExeName(void) ok(ret, "GetConsoleInputExeNameA failed\n"); ok(error == ERROR_BUFFER_OVERFLOW, "got %u expected ERROR_BUFFER_OVERFLOW\n", error); - GetModuleFileNameA(GetModuleHandle(NULL), module, sizeof(module)); + GetModuleFileNameA(GetModuleHandleA(NULL), module, sizeof(module)); p = strrchr(module, '\\') + 1; ret = pGetConsoleInputExeNameA(sizeof(buffer)/sizeof(buffer[0]), buffer);

1 0

Alexandre Julliard : include: Add inline wrappers for some underscore-prefixed math functions.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: a40574577072da11d8eda570e934636b5e83e528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a40574577072da11d8eda570e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 18:45:27 2013 +0200 include: Add inline wrappers for some underscore-prefixed math functions. --- include/msvcrt/math.h | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 4d0655e..34aa268 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -68,13 +68,13 @@ double __cdecl frexp(double, int*); double __cdecl modf(double, double*); double __cdecl fmod(double, double); -double __cdecl hypot(double, double); -double __cdecl j0(double); -double __cdecl j1(double); -double __cdecl jn(int, double); -double __cdecl y0(double); -double __cdecl y1(double); -double __cdecl yn(int, double); +double __cdecl _hypot(double, double); +double __cdecl _j0(double); +double __cdecl _j1(double); +double __cdecl _jn(int, double); +double __cdecl _y0(double); +double __cdecl _y1(double); +double __cdecl _yn(int, double); #ifdef __x86_64__ @@ -129,7 +129,7 @@ float __cdecl fmodf(float, float); #define fabsf(x) ((float)fabs((double)(x))) #define ldexpf(x,y) ((float)ldexp((double)(x),(y))) -float __cdecl hypotf(float, float); +float __cdecl _hypotf(float, float); int __cdecl _matherr(struct _exception*); double __cdecl _cabs(struct _complex); @@ -171,4 +171,15 @@ static const union { #endif /* !_MATH_DEFINES_DEFINED */ #endif /* _USE_MATH_DEFINES */ +static inline double hypot( double x, double y ) { return _hypot( x, y ); } +static inline double j0( double x ) { return _j0( x ); } +static inline double j1( double x ) { return _j1( x ); } +static inline double jn( int n, double x ) { return _jn( n, x ); } +static inline double y0( double x ) { return _y0( x ); } +static inline double y1( double x ) { return _y1( x ); } +static inline double yn( int n, double x ) { return _yn( n, x ); } +static inline double cabs(struct _complex z) { return _cabs( z ); } + +static inline float hypotf( float x, float y ) { return _hypotf( x, y ); } + #endif /* __WINE_MATH_H */

1 0

Alexandre Julliard : jscript: Reorganize StringConstr_value slightly to avoid confusing gcc.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 82c4fa35aad73b328b59e9c39444f03ca4814032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c4fa35aad73b328b59e9c39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 16:26:35 2013 +0200 jscript: Reorganize StringConstr_value slightly to avoid confusing gcc. --- dlls/jscript/string.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 8ef1656..3ca29af 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1645,26 +1645,21 @@ static HRESULT StringConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags break; } case DISPATCH_CONSTRUCT: { + jsstr_t *str; jsdisp_t *ret; if(argc) { - jsstr_t *str; - hres = to_string(ctx, argv[0], &str); if(FAILED(hres)) return hres; - - hres = create_string(ctx, str, &ret); - jsstr_release(str); }else { - hres = create_string(ctx, jsstr_empty(), &ret); + str = jsstr_empty(); } - if(FAILED(hres)) - return hres; - - *r = jsval_obj(ret); - break; + hres = create_string(ctx, str, &ret); + if (SUCCEEDED(hres)) *r = jsval_obj(ret); + jsstr_release(str); + return hres; } default:

1 0

Alexandre Julliard : wineps: Return the size directly from get_bbox to avoid compiler warnings.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 54ec6fca6ea4fdef8df0a81072a50c047c0572a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ec6fca6ea4fdef8df0a8107… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 14:50:53 2013 +0200 wineps: Return the size directly from get_bbox to avoid compiler warnings. --- dlls/wineps.drv/download.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index f476843..e5b57f7 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -169,16 +169,15 @@ static BOOL is_room_for_font(PSDRV_PDEVICE *physDev) * the font size we'll get the data directly from the TrueType HEAD table rather * than using GetOutlineTextMetrics. */ -static BOOL get_bbox(HDC hdc, RECT *rc, UINT *emsize) +static UINT get_bbox(HDC hdc, RECT *rc) { BYTE head[54]; /* the head table is 54 bytes long */ if(GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, head, sizeof(head)) == GDI_ERROR) { ERR("Can't retrieve head table\n"); - return FALSE; + return 0; } - *emsize = GET_BE_WORD(head + 18); /* unitsPerEm */ if(rc) { rc->left = (signed short)GET_BE_WORD(head + 36); /* xMin */ @@ -186,7 +185,7 @@ static BOOL get_bbox(HDC hdc, RECT *rc, UINT *emsize) rc->right = (signed short)GET_BE_WORD(head + 40); /* xMax */ rc->top = (signed short)GET_BE_WORD(head + 42); /* yMax */ } - return TRUE; + return GET_BE_WORD(head + 18); /* unitsPerEm */ } /**************************************************************************** @@ -231,7 +230,7 @@ static UINT calc_ppem_for_height(HDC hdc, LONG height) if(ascent + descent == 0) return height; - get_bbox(hdc, NULL, &emsize); + emsize = get_bbox(hdc, NULL); return MulDiv(emsize, height, ascent + descent); } @@ -314,9 +313,9 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev, BOOL vertical) if(physDev->font.fontinfo.Download == NULL) { RECT bbox; - UINT emsize; + UINT emsize = get_bbox(dev->hdc, &bbox); - if (!get_bbox(dev->hdc, &bbox, &emsize)) { + if (!emsize) { HeapFree(GetProcessHeap(), 0, ps_name); HeapFree(GetProcessHeap(), 0, potm); return FALSE;

1 0

Alexandre Julliard : winemac: Only register the IME class when needed.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 5435dad997cee166f47ca7681b61b4472841bab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5435dad997cee166f47ca7681… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 11:31:10 2013 +0200 winemac: Only register the IME class when needed. --- dlls/winemac.drv/ime.c | 1 + dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 7 ++++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 5fca8fe..53a10f3 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -566,6 +566,7 @@ static void UpdateDataInDefaultIMEWindow(HIMC hIMC, HWND hwnd, BOOL showable) BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) { TRACE("\n"); + IME_RegisterClasses( macdrv_module ); lpIMEInfo->dwPrivateDataSize = sizeof(IMEPRIVATE); lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 860d29d..24c3f65 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -38,6 +38,7 @@ extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; extern BOOL allow_vsync DECLSPEC_HIDDEN; extern BOOL allow_set_gamma DECLSPEC_HIDDEN; +extern HMODULE macdrv_module DECLSPEC_HIDDEN; extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 5317c8b..b86c8ae 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -52,6 +52,7 @@ BOOL allow_vsync = TRUE; BOOL allow_set_gamma = TRUE; int left_option_is_alt = 0; int right_option_is_alt = 0; +HMODULE macdrv_module = 0; /************************************************************************** @@ -183,7 +184,7 @@ static void setup_options(void) /*********************************************************************** * process_attach */ -static BOOL process_attach( HINSTANCE instance ) +static BOOL process_attach(void) { SessionAttributeBits attributes; OSStatus status; @@ -205,7 +206,6 @@ static BOOL process_attach( HINSTANCE instance ) set_app_icon(); macdrv_clipboard_process_attach(); - IME_RegisterClasses( instance ); return TRUE; } @@ -301,7 +301,8 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) switch(reason) { case DLL_PROCESS_ATTACH: - ret = process_attach( hinst ); + macdrv_module = hinst; + ret = process_attach(); break; case DLL_THREAD_DETACH: thread_detach();

1 0

Ken Thomases : libwine: Fix a potential write through a null pointer. ( Clang).
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: e577e4b3e646b0a296ce9bbd73f728cc3f92c20e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e577e4b3e646b0a296ce9bbd7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:55:47 2013 -0500 libwine: Fix a potential write through a null pointer. (Clang). --- libs/wine/loader.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index f59942d..5c0192d 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -985,10 +985,13 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize { if (pread( fd, magic, 2, 0 ) == 2 && magic[0] == 'M' && magic[1] == 'Z') { - static const char msg[] = "MZ format"; - size_t len = min( errorsize, sizeof(msg) ); - memcpy( error, msg, len ); - error[len - 1] = 0; + if (error && errorsize) + { + static const char msg[] = "MZ format"; + size_t len = min( errorsize, sizeof(msg) ); + memcpy( error, msg, len ); + error[len - 1] = 0; + } close( fd ); return NULL; }

1 0

Ken Thomases : winemac: Fix a leak in macdrv_CountClipboardFormats(). ( Clang).
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 3ececfd2a5dd5d183511425f24cfbd0aeb9e58f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ececfd2a5dd5d183511425f2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:55:21 2013 -0500 winemac: Fix a leak in macdrv_CountClipboardFormats(). (Clang). --- dlls/winemac.drv/clipboard.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 73c4dfa..ee63c10 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1716,6 +1716,7 @@ INT CDECL macdrv_CountClipboardFormats(void) } } + CFRelease(types); CFRelease(seen_formats); TRACE(" -> %d\n", ret); return ret;

1 0

Ken Thomases : winemac: Rename some confusingly-named variables.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 49197e811bb1f1cbf5f0a669db464060a1bcec91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49197e811bb1f1cbf5f0a669d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:55:00 2013 -0500 winemac: Rename some confusingly-named variables. --- dlls/winemac.drv/clipboard.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 9cfe283..73c4dfa 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -918,25 +918,25 @@ static HANDLE import_utf8_to_text(CFDataRef data) static HANDLE import_utf8_to_unicodetext(CFDataRef data) { const BYTE *src; - unsigned long data_len; + unsigned long src_len; unsigned long new_lines = 0; LPSTR dst; unsigned long i, j; HANDLE unicode_handle = NULL; src = CFDataGetBytePtr(data); - data_len = CFDataGetLength(data); - for (i = 0; i < data_len; i++) + src_len = CFDataGetLength(data); + for (i = 0; i < src_len; i++) { if (src[i] == '\n') new_lines++; } - if ((dst = HeapAlloc(GetProcessHeap(), 0, data_len + new_lines + 1))) + if ((dst = HeapAlloc(GetProcessHeap(), 0, src_len + new_lines + 1))) { UINT count; - for (i = 0, j = 0; i < data_len; i++) + for (i = 0, j = 0; i < src_len; i++) { if (src[i] == '\n') dst[j++] = '\r'; @@ -1000,25 +1000,25 @@ static HANDLE import_utf16_to_text(CFDataRef data) static HANDLE import_utf16_to_unicodetext(CFDataRef data) { const WCHAR *src; - unsigned long data_len; + unsigned long src_len; unsigned long new_lines = 0; LPWSTR dst; unsigned long i, j; HANDLE unicode_handle; src = (const WCHAR *)CFDataGetBytePtr(data); - data_len = CFDataGetLength(data) / sizeof(WCHAR); - for (i = 0; i < data_len; i++) + src_len = CFDataGetLength(data) / sizeof(WCHAR); + for (i = 0; i < src_len; i++) { if (src[i] == '\n') new_lines++; } - if ((unicode_handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (data_len + new_lines + 1) * sizeof(WCHAR)))) + if ((unicode_handle = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, (src_len + new_lines + 1) * sizeof(WCHAR)))) { dst = GlobalLock(unicode_handle); - for (i = 0, j = 0; i < data_len; i++) + for (i = 0, j = 0; i < src_len; i++) { if (src[i] == '\n') dst[j++] = '\r'; @@ -1351,27 +1351,27 @@ static CFDataRef export_unicodetext_to_utf16(HANDLE data) { CFMutableDataRef ret; const WCHAR *src; - INT dst_len; + INT src_len; src = GlobalLock(data); if (!src) return NULL; - dst_len = GlobalSize(data) / sizeof(WCHAR); - if (dst_len) dst_len--; /* Leave off null terminator. */ - ret = CFDataCreateMutable(NULL, dst_len * sizeof(WCHAR)); + src_len = GlobalSize(data) / sizeof(WCHAR); + if (src_len) src_len--; /* Leave off null terminator. */ + ret = CFDataCreateMutable(NULL, src_len * sizeof(WCHAR)); if (ret) { LPWSTR dst; int i, j; - CFDataSetLength(ret, dst_len * sizeof(WCHAR)); + CFDataSetLength(ret, src_len * sizeof(WCHAR)); dst = (LPWSTR)CFDataGetMutableBytePtr(ret); /* Remove carriage returns */ - for (i = 0, j = 0; i < dst_len; i++) + for (i = 0, j = 0; i < src_len; i++) { if (src[i] == '\r' && - (i + 1 >= dst_len || src[i + 1] == '\n' || src[i + 1] == '\0')) + (i + 1 >= src_len || src[i + 1] == '\n' || src[i + 1] == '\0')) continue; dst[j++] = src[i]; }

1 0

Frédéric Delanoy : shell32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 44b2fd269ecfe31d1c25e6982390749a909027c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b2fd269ecfe31d1c25e6982… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 19 15:28:49 2013 +0200 shell32/tests: Use BOOL type where appropriate. --- dlls/shell32/tests/brsfolder.c | 4 ++-- dlls/shell32/tests/shellpath.c | 6 +++--- dlls/shell32/tests/shlexec.c | 2 +- dlls/shell32/tests/shlfolder.c | 7 ++++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index f8e8e16..ad062d0 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -296,9 +296,9 @@ static int CALLBACK selection_callback(HWND hwnd, UINT uMsg, LPARAM lParam, LPAR ok(!ret, "SendMessage returned: %u\n", ret); SendMessage(hwnd, WM_COMMAND, IDOK, 0); - return TRUE; + return 1; default: - return FALSE; + return 0; } } diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 729a341..5014d9f 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -687,12 +687,12 @@ static char **myARGV; static char base[MAX_PATH]; static char selfname[MAX_PATH]; -static int init(void) +static BOOL init(void) { myARGC = winetest_get_mainargs(&myARGV); - if (!GetCurrentDirectoryA(sizeof(base), base)) return 0; + if (!GetCurrentDirectoryA(sizeof(base), base)) return FALSE; strcpy(selfname, myARGV[0]); - return 1; + return TRUE; } static void doChild(const char *arg) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 131e334..9e5ce32 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1885,7 +1885,7 @@ static void test_find_executable(void) } if (rc > 32) { - int equal; + BOOL equal; equal=strcmp(command, argv0) == 0 || /* NT4 returns an extra 0x8 character! */ (strlen(command) == strlen(argv0)+1 && strncmp(command, argv0, strlen(argv0)) == 0); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 169426e..c866800 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3001,13 +3001,14 @@ static inline IUnknownImpl *impl_from_IUnknown(IUnknown *iface) static HRESULT WINAPI unk_fnQueryInterface(IUnknown *iunk, REFIID riid, void** punk) { IUnknownImpl *This = impl_from_IUnknown(iunk); - UINT i, found; - for(i = found = 0; This->ifaces[i].id != NULL; i++) + UINT i; + BOOL found = FALSE; + for(i = 0; This->ifaces[i].id != NULL; i++) { if(IsEqualIID(This->ifaces[i].id, riid)) { This->ifaces[i].count++; - found = 1; + found = TRUE; break; } }

1 0