March 2013 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Added jsstr_substr helper and use it in String object implementation.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 6e3895ad76835bede5b49426f3c5e37a73b61bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e3895ad76835bede5b49426f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 4 10:57:14 2013 +0100 jscript: Added jsstr_substr helper and use it in String object implementation. --- dlls/jscript/jsstr.h | 5 +++++ dlls/jscript/string.c | 27 +++++++++++++-------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 8ac7410..8883dcb 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -59,6 +59,11 @@ static inline BOOL jsstr_eq(jsstr_t *str1, jsstr_t *str2) return len == jsstr_length(str2) && !memcmp(str1->str, str2->str, len*sizeof(WCHAR)); } +static inline jsstr_t *jsstr_substr(jsstr_t *str, unsigned off, unsigned len) +{ + return jsstr_alloc_len(str->str+off, len); +} + int jsstr_cmp(jsstr_t*,jsstr_t*) DECLSPEC_HIDDEN; jsstr_t *jsstr_concat(jsstr_t*,jsstr_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index e607754..70be13a 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -276,7 +276,7 @@ static HRESULT String_charAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns } if(0 <= pos && pos < jsstr_length(str)) { - ret = jsstr_alloc_len(str->str+pos, 1); + ret = jsstr_substr(str, pos, 1); if(!ret) return E_OUTOFMEMORY; }else { @@ -649,10 +649,10 @@ static HRESULT rep_call(script_ctx_t *ctx, jsdisp_t *func, if(SUCCEEDED(hres)) { for(i=0; i < match->paren_count; i++) { - if(match->parens[i].index == -1) - tmp_str = jsstr_empty(); + if(match->parens[i].index != -1) + tmp_str = jsstr_substr(str, match->parens[i].index, match->parens[i].length); else - tmp_str = jsstr_alloc_len(str->str+match->parens[i].index, match->parens[i].length); + tmp_str = jsstr_empty(); if(!tmp_str) { hres = E_OUTOFMEMORY; break; @@ -1016,7 +1016,7 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi end = start; if(r) { - jsstr_t *retstr = jsstr_alloc_len(str->str+start, end-start); + jsstr_t *retstr = jsstr_substr(str, start, end-start); if(!retstr) { jsstr_release(str); return E_OUTOFMEMORY; @@ -1225,15 +1225,14 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } if(r) { - jsstr_t *ret = jsstr_alloc_len(str->str+start, end-start); - if(!ret) { - jsstr_release(str); - return E_OUTOFMEMORY; - } - *r = jsval_string(ret); + jsstr_t *ret = jsstr_substr(str, start, end-start); + if(ret) + *r = jsval_string(ret); + else + hres = E_OUTOFMEMORY; } jsstr_release(str); - return S_OK; + return hres; } /* ECMA-262 3rd Edition B.2.3 */ @@ -1280,7 +1279,7 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns hres = S_OK; if(r) { - jsstr_t *ret = jsstr_alloc_len(str->str+start, len); + jsstr_t *ret = jsstr_substr(str, start, len); if(ret) *r = jsval_string(ret); else @@ -1426,7 +1425,7 @@ static HRESULT String_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) TRACE("%p[%u] = %s\n", string, idx, debugstr_wn(string->str->str+idx, 1)); - ret = jsstr_alloc_len(string->str->str+idx, 1); + ret = jsstr_substr(string->str, idx, 1); if(!ret) return E_OUTOFMEMORY;

1 0

Jacek Caban : jscript: Use jsstr_substr in jsregexp.c where possible.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 20e85dd21b05436ee9393f0eac77231b69f13139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e85dd21b05436ee9393f0ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 4 10:57:24 2013 +0100 jscript: Use jsstr_substr in jsregexp.c where possible. --- dlls/jscript/jsregexp.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index d291580..f9b9992 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -346,10 +346,10 @@ static HRESULT create_match_array(script_ctx_t *ctx, jsstr_t *input, return hres; for(i=0; i < result->paren_count; i++) { - if(result->parens[i].index == -1) - str = jsstr_empty(); + if(result->parens[i].index != -1) + str = jsstr_substr(input, result->parens[i].index, result->parens[i].length); else - str = jsstr_alloc_len(input->str+result->parens[i].index, result->parens[i].length); + str = jsstr_empty(); if(!str) { hres = E_OUTOFMEMORY; break; @@ -866,7 +866,7 @@ static HRESULT RegExpConstr_leftContext(script_ctx_t *ctx, vdisp_t *jsthis, WORD case DISPATCH_PROPERTYGET: { jsstr_t *ret; - ret = jsstr_alloc_len(ctx->last_match->str, ctx->last_match_index); + ret = jsstr_substr(ctx->last_match, 0, ctx->last_match_index); if(!ret) return E_OUTOFMEMORY; @@ -892,7 +892,8 @@ static HRESULT RegExpConstr_rightContext(script_ctx_t *ctx, vdisp_t *jsthis, WOR case DISPATCH_PROPERTYGET: { jsstr_t *ret; - ret = jsstr_alloc(ctx->last_match->str+ctx->last_match_index+ctx->last_match_length); + ret = jsstr_substr(ctx->last_match, ctx->last_match_index+ctx->last_match_length, + jsstr_length(ctx->last_match) - ctx->last_match_index - ctx->last_match_length); if(!ret) return E_OUTOFMEMORY;

1 0

Alexandre Julliard : vbscript: Tweak enum macros to avoid confusing winapi_extract.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 1e7d7d098529da37bf64deea86caef08692bce9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7d7d098529da37bf64deea8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 4 11:19:50 2013 +0100 vbscript: Tweak enum macros to avoid confusing winapi_extract. --- dlls/vbscript/vbregexp.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 0aaa140..02e63ab 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -25,21 +25,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); #define REGEXP_TID_LIST \ - XDIID(RegExp2) \ - XDIID(Match2) \ - XDIID(MatchCollection2) \ + XDIID(RegExp2), \ + XDIID(Match2), \ + XDIID(MatchCollection2), \ XDIID(SubMatches) typedef enum { -#define XDIID(iface) iface ## _tid, -REGEXP_TID_LIST +#define XDIID(iface) iface ## _tid + REGEXP_TID_LIST, #undef XDIID REGEXP_LAST_tid } regexp_tid_t; static REFIID tid_ids[] = { -#define XDIID(iface) &IID_I ## iface, -REGEXP_TID_LIST +#define XDIID(iface) &IID_I ## iface + REGEXP_TID_LIST #undef XDIID };

1 0

Piotr Caban : msvcrt: Don' t duplicate standard handles during initialization.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: f565e4a3157d38b50a25fc3b90014474b59fceba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f565e4a3157d38b50a25fc3b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 15:04:07 2013 +0100 msvcrt: Don't duplicate standard handles during initialization. --- dlls/msvcrt/file.c | 50 +++++++++----------------------------------------- 1 files changed, 9 insertions(+), 41 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 612f470..c730bd7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -486,53 +486,21 @@ void msvcrt_init_io(void) if (msvcrt_get_ioinfo(MSVCRT_fdstart)->handle == INVALID_HANDLE_VALUE) break; } - if(!MSVCRT___pioinfo[0]) - msvcrt_alloc_fd_from(INVALID_HANDLE_VALUE, 0, 3); - - fdinfo = msvcrt_get_ioinfo(0); + fdinfo = msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - { - HANDLE std = GetStdHandle(STD_INPUT_HANDLE); - if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, - GetCurrentProcess(), &fdinfo->handle, - 0, TRUE, DUPLICATE_SAME_ACCESS)) - fdinfo->wxflag = WX_OPEN | WX_TEXT; - fdinfo->lookahead[0] = '\n'; - fdinfo->lookahead[1] = '\n'; - fdinfo->lookahead[2] = '\n'; - fdinfo->exflag = 0; - } + msvcrt_alloc_fd_from(GetStdHandle(STD_INPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDIN_FILENO); - fdinfo = msvcrt_get_ioinfo(1); + fdinfo = msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - { - HANDLE std = GetStdHandle(STD_OUTPUT_HANDLE); - if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, - GetCurrentProcess(), &fdinfo->handle, - 0, TRUE, DUPLICATE_SAME_ACCESS)) - fdinfo->wxflag = WX_OPEN | WX_TEXT; - fdinfo->lookahead[0] = '\n'; - fdinfo->lookahead[1] = '\n'; - fdinfo->lookahead[2] = '\n'; - fdinfo->exflag = 0; - } + msvcrt_alloc_fd_from(GetStdHandle(STD_OUTPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDOUT_FILENO); - fdinfo = msvcrt_get_ioinfo(2); + fdinfo = msvcrt_get_ioinfo(MSVCRT_STDERR_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - { - HANDLE std = GetStdHandle(STD_ERROR_HANDLE); - if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, - GetCurrentProcess(), &fdinfo->handle, - 0, TRUE, DUPLICATE_SAME_ACCESS)) - fdinfo->wxflag = WX_OPEN | WX_TEXT; - fdinfo->lookahead[0] = '\n'; - fdinfo->lookahead[1] = '\n'; - fdinfo->lookahead[2] = '\n'; - fdinfo->exflag = 0; - } + msvcrt_alloc_fd_from(GetStdHandle(STD_ERROR_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDERR_FILENO); - TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(0)->handle, - msvcrt_get_ioinfo(1)->handle, msvcrt_get_ioinfo(2)->handle); + TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO)->handle, + msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO)->handle, + msvcrt_get_ioinfo(MSVCRT_STDERR_FILENO)->handle); memset(MSVCRT__iob,0,3*sizeof(MSVCRT_FILE)); for (i = 0; i < 3; i++)

1 0

Piotr Caban : msvcrt: Reuse standard file descriptors after closing them.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: db92137f83671204f4a9f188a6a432f98ef6648b URL: http://source.winehq.org/git/wine.git/?a=commit;h=db92137f83671204f4a9f188a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 15:04:21 2013 +0100 msvcrt: Reuse standard file descriptors after closing them. --- dlls/msvcrt/file.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c730bd7..5b3bf5e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -251,40 +251,37 @@ static HANDLE msvcrt_fdtoh(int fd) /* INTERNAL: free a file entry fd */ static void msvcrt_free_fd(int fd) { - HANDLE old_handle; ioinfo *fdinfo; LOCK_FILES(); fdinfo = msvcrt_get_ioinfo(fd); - old_handle = fdinfo->handle; if(fdinfo != &MSVCRT___badioinfo) { fdinfo->handle = INVALID_HANDLE_VALUE; fdinfo->wxflag = 0; } TRACE(":fd (%d) freed\n",fd); - if (fd < 3) /* don't use 0,1,2 for user files */ + + if (fd < 3) { switch (fd) { case 0: - if (GetStdHandle(STD_INPUT_HANDLE) == old_handle) SetStdHandle(STD_INPUT_HANDLE, 0); + SetStdHandle(STD_INPUT_HANDLE, 0); break; case 1: - if (GetStdHandle(STD_OUTPUT_HANDLE) == old_handle) SetStdHandle(STD_OUTPUT_HANDLE, 0); + SetStdHandle(STD_OUTPUT_HANDLE, 0); break; case 2: - if (GetStdHandle(STD_ERROR_HANDLE) == old_handle) SetStdHandle(STD_ERROR_HANDLE, 0); + SetStdHandle(STD_ERROR_HANDLE, 0); break; } } - else - { - if (fd == MSVCRT_fdend - 1) - MSVCRT_fdend--; - if (fd < MSVCRT_fdstart) - MSVCRT_fdstart = fd; - } + + if (fd == MSVCRT_fdend - 1) + MSVCRT_fdend--; + if (fd < MSVCRT_fdstart) + MSVCRT_fdstart = fd; UNLOCK_FILES(); }

1 0

Piotr Caban : msvcrt: Added stdin close/open tests.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: cd7b71d3f416fcf34814af7b69bdb869375fca25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7b71d3f416fcf34814af7b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 15:04:31 2013 +0100 msvcrt: Added stdin close/open tests. --- dlls/msvcrt/tests/file.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 392b1a0..938161c 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1964,6 +1964,42 @@ static void test_dup2(void) ok(-1 == _dup2(0, -1), "expected _dup2 to fail when second arg is negative\n" ); } +static void test_stdin(void) +{ + HANDLE stdinh = GetStdHandle(STD_INPUT_HANDLE); + int stdin_dup, fd; + HANDLE h; + DWORD r; + + stdin_dup = _dup(STDIN_FILENO); + ok(stdin_dup != -1, "_dup(STDIN_FILENO) failed\n"); + + ok(stdinh == (HANDLE)_get_osfhandle(STDIN_FILENO), + "GetStdHandle(STD_INPUT_HANDLE) != _get_osfhandle(STDIN_FILENO)\n"); + + r = SetStdHandle(STD_INPUT_HANDLE, INVALID_HANDLE_VALUE); + ok(r == TRUE, "SetStdHandle returned %x, expected TRUE\n", r); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h == INVALID_HANDLE_VALUE, "h = %p\n", h); + + close(STDIN_FILENO); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h == NULL, "h != NULL\n"); + + fd = open("stdin.tst", O_WRONLY | O_CREAT, _S_IREAD |_S_IWRITE); + ok(fd != -1, "open failed\n"); + ok(fd == STDIN_FILENO, "fd = %d, expected STDIN_FILENO\n", fd); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h != NULL, "h == NULL\n"); + close(fd); + unlink("stdin.tst"); + + r = _dup2(stdin_dup, STDIN_FILENO); + ok(r != -1, "_dup2 failed\n"); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h != NULL, "h == NULL\n"); +} + START_TEST(file) { int arg_c; @@ -2019,6 +2055,7 @@ START_TEST(file) test_get_osfhandle(); test_setmaxstdio(); test_pipes(arg_v[0]); + test_stdin(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order

1 0

Andrew Talbot : winealsa.drv: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 23bf25b0c0c08427e2f65af2c16020afcfc788d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23bf25b0c0c08427e2f65af2c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 2 15:37:50 2013 +0000 winealsa.drv: Avoid signed-unsigned integer comparisons. --- dlls/winealsa.drv/mmdevdrv.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8c905e9..2948366 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -3396,7 +3396,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( IAudioStreamVolume *iface, UINT32 count, const float *levels) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - int i; + unsigned int i; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -3422,7 +3422,7 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( IAudioStreamVolume *iface, UINT32 count, float *levels) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - int i; + unsigned int i; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -3558,7 +3558,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - int i; + unsigned int i; TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, wine_dbgstr_guid(context)); @@ -3589,7 +3589,7 @@ static HRESULT WINAPI ChannelAudioVolume_GetAllVolumes( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - int i; + unsigned int i; TRACE("(%p)->(%d, %p)\n", session, count, levels);

1 0

Andrew Talbot : mscoree: Remove unneeded address-of operator from function name.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: edea85dea684a8440dd758dabc24fe9722ac7cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edea85dea684a8440dd758dab… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 2 15:37:44 2013 +0000 mscoree: Remove unneeded address-of operator from function name. --- dlls/mscoree/metahost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 6906075..fe529fd 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -318,7 +318,7 @@ void unload_all_runtimes(void) /* If the only references to mscoree are through dll's that were loaded by * Mono, shutting down the Mono runtime will free mscoree, so take a * reference to prevent that from happening. */ - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)&unload_all_runtimes, &handle); + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)unload_all_runtimes, &handle); for (i=0; i<NUM_ABI_VERSIONS; i++) {

1 0

Andrew Talbot : windowscodecs: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 81afb28818338a1511f5eaf3db80d1365c17f7da URL: http://source.winehq.org/git/wine.git/?a=commit;h=81afb28818338a1511f5eaf3d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 2 15:37:47 2013 +0000 windowscodecs: Avoid signed-unsigned integer comparisons. --- dlls/windowscodecs/icoformat.c | 2 +- dlls/windowscodecs/info.c | 7 ++++--- dlls/windowscodecs/jpegformat.c | 5 +++-- dlls/windowscodecs/main.c | 2 +- dlls/windowscodecs/metadatahandler.c | 4 ++-- dlls/windowscodecs/palette.c | 2 +- dlls/windowscodecs/scaler.c | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index ec09aa6..d245031 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -293,7 +293,7 @@ static HRESULT ReadIcoDib(IStream *stream, IcoFrameDecode *result) { /* If the alpha channel is fully transparent, we should ignore it. */ int nonzero_alpha = 0; - int i; + UINT i; for (i=0; i<(result->height*result->width); i++) { diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 3da5b20..7c87c5d 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -539,7 +539,8 @@ static HRESULT WINAPI BitmapDecoderInfo_MatchesPattern(IWICBitmapDecoderInfo *if WICBitmapPattern *patterns; UINT pattern_count=0, patterns_size=0; HRESULT hr; - int i, pos; + UINT i; + ULONG pos; BYTE *data=NULL; ULONG datasize=0; ULONG bytesread; @@ -1900,7 +1901,7 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) { ComponentEnum *This = impl_from_IEnumUnknown(iface); - int num_fetched=0; + ULONG num_fetched=0; ComponentEnumItem *item; HRESULT hr=S_OK; @@ -1929,7 +1930,7 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, static HRESULT WINAPI ComponentEnum_Skip(IEnumUnknown *iface, ULONG celt) { ComponentEnum *This = impl_from_IEnumUnknown(iface); - int i; + ULONG i; HRESULT hr=S_OK; TRACE("(%p,%u)\n", iface, celt); diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 1aca6d1..6f2653d 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -998,7 +998,8 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); jmp_buf jmpbuf; BYTE *swapped_data = NULL, *current_row; - int line, row_size; + UINT line; + int row_size; TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); EnterCriticalSection(&This->lock); @@ -1061,7 +1062,7 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface { if (This->format->swap_rgb) { - int x; + UINT x; memcpy(swapped_data, pbPixels + (cbStride * line), row_size); diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index b63edf5..967f80b 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -98,7 +98,7 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, if (row_offset % 8 == 0) { /* everything lines up on a byte boundary */ - UINT row; + INT row; const BYTE *src; BYTE *dst; diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 6b19f84..7615a6d 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -60,7 +60,7 @@ static inline MetadataHandler *impl_from_IWICPersistStream(IWICPersistStream *if static void MetadataHandler_FreeItems(MetadataHandler *This) { - int i; + DWORD i; for (i=0; i<This->item_count; i++) { @@ -555,7 +555,7 @@ static HRESULT WINAPI MetadataHandlerEnum_Next(IWICEnumMetadataItem *iface, MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); ULONG new_index; HRESULT hr=S_FALSE; - int i; + ULONG i; TRACE("(%p,%i)\n", iface, celt); diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 045f795..e21a073 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -592,7 +592,7 @@ static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGray static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha) { PaletteImpl *This = impl_from_IWICPalette(iface); - int i; + UINT i; TRACE("(%p,%p)\n", iface, pfHasAlpha); diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 5470d2b..03410e8 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -178,7 +178,7 @@ static void NearestNeighbor_CopyScanline(BitmapScaler *This, UINT dst_x, UINT dst_y, UINT dst_width, BYTE **src_data, UINT src_data_x, UINT src_data_y, BYTE *pbBuffer) { - int i; + UINT i; UINT bytesperpixel = This->bpp/8; UINT src_x, src_y;

1 0

Vincent Povirk : gdiplus: Store the image type on a Graphics object in case the image is freed.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 7b004c17149af7b9bedc72ff1ee30ea6f6f755c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b004c17149af7b9bedc72ff1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 2 14:28:01 2013 -0600 gdiplus: Store the image type on a Graphics object in case the image is freed. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index cb7330e..87f3b8b 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -154,6 +154,7 @@ struct GpGraphics{ BOOL owndc; BOOL alpha_hdc; GpImage *image; + ImageType image_type; SmoothingMode smoothing; CompositingQuality compqual; InterpolationMode interpolation; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 853027c..1150675 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2195,6 +2195,9 @@ GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) (*graphics)->hwnd = NULL; (*graphics)->owndc = FALSE; (*graphics)->image = image; + /* We have to store the image type here because the image may be freed + * before GdipDeleteGraphics is called, and metafiles need special treatment. */ + (*graphics)->image_type = image->type; (*graphics)->smoothing = SmoothingModeDefault; (*graphics)->compqual = CompositingQualityDefault; (*graphics)->interpolation = InterpolationModeBilinear; @@ -2389,7 +2392,7 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) if(!graphics) return InvalidParameter; if(graphics->busy) return ObjectBusy; - if (graphics->image && graphics->image->type == ImageTypeMetafile) + if (graphics->image && graphics->image_type == ImageTypeMetafile) { stat = METAFILE_GraphicsDeleted((GpMetafile*)graphics->image); if (stat != Ok)

1 0