wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Francois Gouget : po: Remove an extraneous full stop in an error message.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: a81e58f38ee966bdcddeef89c92a06095c6ab63c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81e58f38ee966bdcddeef89c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 11:21:41 2013 +0100 po: Remove an extraneous full stop in an error message. --- po/uk.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/uk.po b/po/uk.po index ac6d271..faf49b9 100644 --- a/po/uk.po +++ b/po/uk.po @@ -13880,7 +13880,7 @@ msgstr "Помилка: Командний рядок не підтримуєт #: wmic.rc:29 msgid "Error: Alias not found\n" -msgstr "Помилка: Псевдонім не знайдено.\n" +msgstr "Помилка: Псевдонім не знайдено\n" #: wmic.rc:30 msgid "Error: Invalid query\n"

1 0

Henri Verbeet : wined3d: Merge texture2d_unload() and texture3d_unload().
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 0d7b12696de77531061446880d341d6edea3a055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7b12696de77531061446880… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:21 2013 +0100 wined3d: Merge texture2d_unload() and texture3d_unload(). --- dlls/wined3d/texture.c | 53 ++++++++++++++--------------------------------- 1 files changed, 16 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 52a2bf9..08638a5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -94,7 +94,7 @@ static void gltexture_delete(const struct wined3d_gl_info *gl_info, struct gl_te tex->name = 0; } -static void wined3d_texture_unload(struct wined3d_texture *texture) +static void wined3d_texture_unload_gl_texture(struct wined3d_texture *texture) { struct wined3d_device *device = texture->resource.device; struct wined3d_context *context = NULL; @@ -132,7 +132,7 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) texture->texture_ops->texture_sub_resource_cleanup(sub_resource); } - wined3d_texture_unload(texture); + wined3d_texture_unload_gl_texture(texture); HeapFree(GetProcessHeap(), 0, texture->sub_resources); resource_cleanup(&texture->resource); } @@ -696,7 +696,14 @@ static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource wined3d_surface_decref(surface); } -static void texture2d_unload(struct wined3d_resource *resource) +static const struct wined3d_texture_ops texture2d_ops = +{ + texture2d_preload, + texture2d_sub_resource_add_dirty_region, + texture2d_sub_resource_cleanup, +}; + +static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); UINT sub_count = texture->level_count * texture->layer_count; @@ -711,19 +718,12 @@ static void texture2d_unload(struct wined3d_resource *resource) sub_resource->resource_ops->resource_unload(sub_resource); } - wined3d_texture_unload(texture); + wined3d_texture_unload_gl_texture(texture); } -static const struct wined3d_texture_ops texture2d_ops = -{ - texture2d_preload, - texture2d_sub_resource_add_dirty_region, - texture2d_sub_resource_cleanup, -}; - -static const struct wined3d_resource_ops texture2d_resource_ops = +static const struct wined3d_resource_ops texture_resource_ops = { - texture2d_unload, + wined3d_texture_unload, }; static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, @@ -794,7 +794,7 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi } if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, - desc, device, parent, parent_ops, &texture2d_resource_ops))) + desc, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x\n", hr); return hr; @@ -919,7 +919,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, - desc, device, parent, parent_ops, &texture2d_resource_ops))) + desc, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -1047,22 +1047,6 @@ static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource wined3d_volume_decref(volume); } -static void texture3d_unload(struct wined3d_resource *resource) -{ - struct wined3d_texture *texture = wined3d_texture_from_resource(resource); - UINT i; - - TRACE("texture %p.\n", texture); - - for (i = 0; i < texture->level_count; ++i) - { - struct wined3d_resource *sub_resource = texture->sub_resources[i]; - sub_resource->resource_ops->resource_unload(sub_resource); - } - - wined3d_texture_unload(texture); -} - static const struct wined3d_texture_ops texture3d_ops = { texture3d_preload, @@ -1070,11 +1054,6 @@ static const struct wined3d_texture_ops texture3d_ops = texture3d_sub_resource_cleanup, }; -static const struct wined3d_resource_ops texture3d_resource_ops = -{ - texture3d_unload, -}; - static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, UINT levels, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops) { @@ -1149,7 +1128,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct } if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, - desc, device, parent, parent_ops, &texture3d_resource_ops))) + desc, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr;

1 0

Henri Verbeet : wined3d: Merge surface_bind_and_dirtify() and volume_bind_and_dirtify() into wined3d_texture_bind_and_dirtify().
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: f91eab6d3e4462357709080a4c9cbb74d93320a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91eab6d3e4462357709080a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:20 2013 +0100 wined3d: Merge surface_bind_and_dirtify() and volume_bind_and_dirtify() into wined3d_texture_bind_and_dirtify(). --- dlls/wined3d/surface.c | 34 ++++++---------------------------- dlls/wined3d/texture.c | 22 ++++++++++++++++++++++ dlls/wined3d/volume.c | 36 +++++++----------------------------- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 37 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f91eab6d3e44623577090…

1 0

Henri Verbeet : wined3d: Get rid of surface_bind().
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 2e63e8f9cca29ffbdf418cca6e137c5b5c110418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e63e8f9cca29ffbdf418cca6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:19 2013 +0100 wined3d: Get rid of surface_bind(). --- dlls/wined3d/surface.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a339f02..a3877ce 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -595,14 +595,6 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) } /* Context activation is done by the caller. */ -static void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) -{ - TRACE("surface %p, context %p, srgb %#x.\n", surface, context, srgb); - - wined3d_texture_bind(surface->container, context, srgb); -} - -/* Context activation is done by the caller. */ static void surface_bind_and_dirtify(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { @@ -621,7 +613,7 @@ static void surface_bind_and_dirtify(struct wined3d_surface *surface, if (active_sampler != WINED3D_UNMAPPED_STAGE) context_invalidate_state(context, STATE_SAMPLER(active_sampler)); - surface_bind(surface, context, srgb); + wined3d_texture_bind(surface->container, context, srgb); } static void surface_force_reload(struct wined3d_surface *surface) @@ -2083,7 +2075,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P surface_prepare_texture(dst_surface, context, FALSE); else surface_load_location(dst_surface, SFLAG_INTEXTURE); - surface_bind(dst_surface, context, FALSE); + wined3d_texture_bind(dst_surface->container, context, FALSE); data.buffer_object = src_surface->pbo; data.addr = src_surface->resource.allocatedMemory;

1 0

Henri Verbeet : wined3d: Return early in wined3d_texture_bind() if the GL texture already has a name.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 2ca86bcab61a1be851dd2d5cedf1cce6d7f50663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca86bcab61a1be851dd2d5ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:18 2013 +0100 wined3d: Return early in wined3d_texture_bind() if the GL texture already has a name. --- dlls/wined3d/texture.c | 172 +++++++++++++++++++++++------------------------ 1 files changed, 84 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ca86bcab61a1be851dd2…

1 0

Henri Verbeet : wined3d: Merge texture2d_bind() and texture3d_bind() into wined3d_texture_bind().
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 6b90248aec898b232feb1a90b7af084b4af04dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b90248aec898b232feb1a90b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:17 2013 +0100 wined3d: Merge texture2d_bind() and texture3d_bind() into wined3d_texture_bind(). --- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 5 +-- dlls/wined3d/texture.c | 86 ++++++++++++---------------------------- dlls/wined3d/volume.c | 3 +- dlls/wined3d/wined3d_private.h | 4 +- 5 files changed, 30 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b90248aec898b232feb1…

1 0

Frédéric Delanoy : scrrun: Use BOOL type where appropriate.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: cfe12f96665233060eea9f914ed33b836eababea URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe12f96665233060eea9f914… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 23:39:32 2013 +0100 scrrun: Use BOOL type where appropriate. --- dlls/scrrun/filesystem.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index ee89b76..0d360d3 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -89,12 +89,12 @@ static inline HRESULT create_error(DWORD err) } } -static int textstream_check_iomode(struct textstream *This, enum iotype type) +static BOOL textstream_check_iomode(struct textstream *This, enum iotype type) { if (type == IORead) return This->mode == ForWriting || This->mode == ForAppending; else - return 1; + return TRUE; } static HRESULT WINAPI textstream_QueryInterface(ITextStream *iface, REFIID riid, void **obj)

1 0

Frédéric Delanoy : propsys: Use BOOL type where appropriate.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: bb9d1986a957c934431e69608c0ff994fc2bd1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9d1986a957c934431e69608… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 23:39:31 2013 +0100 propsys: Use BOOL type where appropriate. --- dlls/propsys/propvar.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 69b2e60..fd22c9d 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -69,46 +69,46 @@ static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest, } static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, - int dest_signed, LONGLONG *res) + BOOL dest_signed, LONGLONG *res) { - int src_signed; + BOOL src_signed; switch (pv->vt) { case VT_I1: - src_signed = 1; + src_signed = TRUE; *res = pv->u.cVal; break; case VT_UI1: - src_signed = 0; + src_signed = FALSE; *res = pv->u.bVal; break; case VT_I2: - src_signed = 1; + src_signed = TRUE; *res = pv->u.iVal; break; case VT_UI2: - src_signed = 0; + src_signed = FALSE; *res = pv->u.uiVal; break; case VT_I4: - src_signed = 1; + src_signed = TRUE; *res = pv->u.lVal; break; case VT_UI4: - src_signed = 0; + src_signed = FALSE; *res = pv->u.ulVal; break; case VT_I8: - src_signed = 1; + src_signed = TRUE; *res = pv->u.hVal.QuadPart; break; case VT_UI8: - src_signed = 0; + src_signed = FALSE; *res = pv->u.uhVal.QuadPart; break; case VT_EMPTY: - src_signed = 0; + src_signed = FALSE; *res = 0; break; default: @@ -144,7 +144,7 @@ HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 16, 1, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 16, TRUE, &res); if (SUCCEEDED(hr)) *ret = (SHORT)res; return hr; } @@ -156,7 +156,7 @@ HRESULT WINAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 32, 1, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 32, TRUE, &res); if (SUCCEEDED(hr)) *ret = (LONG)res; return hr; } @@ -168,7 +168,7 @@ HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 64, 1, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res); if (SUCCEEDED(hr)) *ret = (LONGLONG)res; return hr; } @@ -180,7 +180,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 16, 0, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 16, FALSE, &res); if (SUCCEEDED(hr)) *ret = (USHORT)res; return hr; } @@ -192,7 +192,7 @@ HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 32, 0, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 32, FALSE, &res); if (SUCCEEDED(hr)) *ret = (ULONG)res; return hr; } @@ -204,7 +204,7 @@ HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 64, 0, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 64, FALSE, &res); if (SUCCEEDED(hr)) *ret = (ULONGLONG)res; return hr; } @@ -497,10 +497,10 @@ HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid) } } -static int isemptyornull(const PROPVARIANT *propvar) +static BOOL isemptyornull(const PROPVARIANT *propvar) { if (propvar->vt == VT_EMPTY || propvar->vt == VT_NULL) - return 1; + return TRUE; if ((propvar->vt & VT_ARRAY) == VT_ARRAY) { int i; @@ -512,7 +512,7 @@ static int isemptyornull(const PROPVARIANT *propvar) return i == propvar->u.parray->cDims; } /* FIXME: vectors, byrefs, errors? */ - return 0; + return FALSE; } INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2,

1 0

Frédéric Delanoy : propsys/tests: Use BOOL type where appropriate.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: d51e50cbaf1c321f2b3800ddda8cf20ecbbc5712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51e50cbaf1c321f2b3800ddd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 23:39:30 2013 +0100 propsys/tests: Use BOOL type where appropriate. --- dlls/propsys/tests/propsys.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index df4b8d7..0a81779 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -115,9 +115,9 @@ static void test_PSStringFromPropertyKey(void) UINT cch; HRESULT hr_expect; const WCHAR *buf_expect; - int hr_broken; + BOOL hr_broken; HRESULT hr2; - int buf_broken; + BOOL buf_broken; const WCHAR *buf2; } testcases[] = { @@ -125,15 +125,15 @@ static void test_PSStringFromPropertyKey(void) {&prop, NULL, 0, E_POINTER}, {&prop, NULL, PKEYSTR_MAX, E_POINTER}, {NULL, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {NULL, out, PKEYSTR_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_fillerW, 0, 0, 1, fillerW}, + {NULL, out, PKEYSTR_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_fillerW, FALSE, 0, TRUE, fillerW}, {&prop, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, {&prop, out, GUIDSTRING_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, {&prop, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {&prop, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncatedW, 1, S_OK, 1, truncatedW}, - {&prop, out, PKEYSTR_MAX - 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated2W, 1, S_OK, 1, truncated2W}, - {&prop, out, PKEYSTR_MAX - 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated3W, 1, S_OK, 1, truncated3W}, + {&prop, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncatedW, TRUE, S_OK, TRUE, truncatedW}, + {&prop, out, PKEYSTR_MAX - 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated2W, TRUE, S_OK, TRUE, truncated2W}, + {&prop, out, PKEYSTR_MAX - 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated3W, TRUE, S_OK, TRUE, truncated3W}, {&prop, out, PKEYSTR_MAX, S_OK, expectedW}, - {&prop2, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated4W, 1, S_OK, 1, truncated4W}, + {&prop2, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated4W, TRUE, S_OK, TRUE, truncated4W}, {&prop2, out, GUIDSTRING_MAX + 6, S_OK, expected2W}, {&prop2, out, PKEYSTR_MAX, S_OK, expected2W}, {&prop3, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},

1 0

Frédéric Delanoy : oleaut32: Use BOOL type where appropriate.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 128e4575e5126e6e79f537693b1dae10a684f7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=128e4575e5126e6e79f537693… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 23:39:29 2013 +0100 oleaut32: Use BOOL type where appropriate. --- dlls/oleaut32/olepicture.c | 22 +++++++++++----------- dlls/oleaut32/tmarshal.c | 11 ++++------- dlls/oleaut32/typelib.c | 2 +- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 2772a2f..5e81766 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1527,9 +1527,9 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) return hr; } -static int serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLength) +static BOOL serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLength) { - int iSuccess = 0; + BOOL success = FALSE; HDC hDC; BITMAPINFO * pInfoBitmap; int iNumPaletteEntries; @@ -1585,17 +1585,17 @@ static int serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLengt sizeof(BITMAPINFOHEADER) + iNumPaletteEntries * sizeof(RGBQUAD), pPixelData, pInfoBitmap->bmiHeader.biSizeImage); - iSuccess = 1; + success = TRUE; HeapFree(GetProcessHeap(), 0, pPixelData); HeapFree(GetProcessHeap(), 0, pInfoBitmap); - return iSuccess; + return success; } -static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) +static BOOL serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) { ICONINFO infoIcon; - int iSuccess = 0; + BOOL success = FALSE; *ppBuffer = NULL; *pLength = 0; if (GetIconInfo(hIcon, &infoIcon)) { @@ -1717,7 +1717,7 @@ static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) /* Write out everything produced so far to the stream */ *ppBuffer = pIconData; *pLength = iDataSize; - iSuccess = 1; + success = TRUE; } else { /* printf("ERROR: unable to get bitmap information via GetDIBits() (error %u)\n", @@ -1740,7 +1740,7 @@ static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) printf("ERROR: Unable to get icon information (error %u)\n", GetLastError()); } - return iSuccess; + return success; } static HRESULT WINAPI OLEPictureImpl_Save( @@ -1751,7 +1751,7 @@ static HRESULT WINAPI OLEPictureImpl_Save( unsigned int iDataSize; DWORD header[2]; ULONG dummy; - int iSerializeResult = 0; + BOOL serializeResult = FALSE; OLEPictureImpl *This = impl_from_IPersistStream(iface); TRACE("%p %p %d\n", This, pStm, fClearDirty); @@ -1785,7 +1785,7 @@ static HRESULT WINAPI OLEPictureImpl_Save( if (This->bIsDirty || !This->data) { switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) { case BITMAP_FORMAT_BMP: - iSerializeResult = serializeBMP(This->desc.u.bmp.hbitmap, &pIconData, &iDataSize); + serializeResult = serializeBMP(This->desc.u.bmp.hbitmap, &pIconData, &iDataSize); break; case BITMAP_FORMAT_JPEG: FIXME("(%p,%p,%d), PICTYPE_BITMAP (format JPEG) not implemented!\n",This,pStm,fClearDirty); @@ -1801,7 +1801,7 @@ static HRESULT WINAPI OLEPictureImpl_Save( break; } - if (!iSerializeResult) + if (!serializeResult) { hResult = E_FAIL; break; diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 3856f32..0dec7e7 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -647,14 +647,11 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { } /* Whether we pass this type by reference or by value */ -static int +static BOOL _passbyref(const TYPEDESC *td, ITypeInfo *tinfo) { - if (td->vt == VT_USERDEFINED || - td->vt == VT_VARIANT || - td->vt == VT_PTR) - return 1; - - return 0; + return (td->vt == VT_USERDEFINED || + td->vt == VT_VARIANT || + td->vt == VT_PTR); } static HRESULT diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0dd3f64..1ebc38b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3137,7 +3137,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, /* Read in NE header */ nehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); - if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return 0; + if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return FALSE; resTabSize = nehd.ne_restab - nehd.ne_rsrctab; if ( !resTabSize )

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
57
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 November 2013