November 2013 - Wine-Commits

Henri Verbeet : wined3d: wined3d_texture_bind() should never fail.
by Alexandre Julliard Nov. 20, 2013

Nov. 20, 2013

Module: wine Branch: master Commit: 7e72985358d892a430aa75ec06d6f2f9ebf8bfd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e72985358d892a430aa75ec0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 20 10:04:33 2013 +0100 wined3d: wined3d_texture_bind() should never fail. --- dlls/wined3d/texture.c | 71 ++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 33 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b7c2451..8bae223 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -143,13 +143,12 @@ void wined3d_texture_set_dirty(struct wined3d_texture *texture) } /* Context activation is done by the caller. */ -static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, +static void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb, BOOL *set_surface_desc) { const struct wined3d_gl_info *gl_info = context->gl_info; struct gl_texture *gl_tex; BOOL new_texture = FALSE; - HRESULT hr = WINED3D_OK; GLenum target; TRACE("texture %p, context %p, srgb %#x, set_surface_desc %p.\n", texture, context, srgb, set_surface_desc); @@ -173,6 +172,13 @@ static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, gl_info->gl_ops.gl.p_glGenTextures(1, &gl_tex->name); checkGLcall("glGenTextures"); TRACE("Generated texture %d.\n", gl_tex->name); + + if (!gl_tex->name) + { + ERR("Failed to generate a texture name.\n"); + return; + } + if (texture->resource.pool == WINED3D_POOL_DEFAULT) { /* Tell OpenGL to try and keep this texture in video ram (well mostly). */ @@ -213,39 +219,29 @@ static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, *set_surface_desc = FALSE; } - if (gl_tex->name) + context_bind_texture(context, target, gl_tex->name); + if (new_texture) { - context_bind_texture(context, target, gl_tex->name); - if (new_texture) + /* For a new texture we have to set the texture levels after + * binding the texture. Beware that texture rectangles do not + * support mipmapping, but set the maxmiplevel if we're relying + * on the partial GL_ARB_texture_non_power_of_two emulation with + * texture rectangles. (I.e., do not care about cond_np2 here, + * just look for GL_TEXTURE_RECTANGLE_ARB.) */ + if (target != GL_TEXTURE_RECTANGLE_ARB) { - /* For a new texture we have to set the texture levels after - * binding the texture. Beware that texture rectangles do not - * support mipmapping, but set the maxmiplevel if we're relying - * on the partial GL_ARB_texture_non_power_of_two emulation with - * texture rectangles. (I.e., do not care about cond_np2 here, - * just look for GL_TEXTURE_RECTANGLE_ARB.) */ - if (target != GL_TEXTURE_RECTANGLE_ARB) - { - TRACE("Setting GL_TEXTURE_MAX_LEVEL to %u.\n", texture->level_count - 1); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); - checkGLcall("glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture->level_count)"); - } - if (target == GL_TEXTURE_CUBE_MAP_ARB) - { - /* Cubemaps are always set to clamp, regardless of the sampler state. */ - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); - } + TRACE("Setting GL_TEXTURE_MAX_LEVEL to %u.\n", texture->level_count - 1); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + checkGLcall("glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture->level_count)"); + } + if (target == GL_TEXTURE_CUBE_MAP_ARB) + { + /* Cubemaps are always set to clamp, regardless of the sampler state. */ + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); } } - else - { - ERR("This texture doesn't have an OpenGL texture assigned to it.\n"); - hr = WINED3DERR_INVALIDCALL; - } - - return hr; } /* Context activation is done by the caller. */ @@ -601,17 +597,16 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, } /* Context activation is done by the caller. */ -static HRESULT texture2d_bind(struct wined3d_texture *texture, +static void texture2d_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { const struct wined3d_gl_info *gl_info = context->gl_info; BOOL set_gl_texture_desc; - HRESULT hr; TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb); - if (SUCCEEDED(hr = wined3d_texture_bind(texture, context, srgb, &set_gl_texture_desc)) - && set_gl_texture_desc && (texture->flags & WINED3D_TEXTURE_COND_NP2)) + wined3d_texture_bind(texture, context, srgb, &set_gl_texture_desc); + if (set_gl_texture_desc && (texture->flags & WINED3D_TEXTURE_COND_NP2)) { struct gl_texture *gl_tex = wined3d_texture_get_gl_texture(texture, texture->flags & WINED3D_TEXTURE_IS_SRGB); @@ -639,8 +634,6 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, gl_tex->states[WINED3DTEXSTA_MINFILTER] = WINED3D_TEXF_POINT; gl_tex->states[WINED3DTEXSTA_MIPFILTER] = WINED3D_TEXF_NONE; } - - return hr; } static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3DSRGB srgb) @@ -1012,14 +1005,14 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } /* Context activation is done by the caller. */ -static HRESULT texture3d_bind(struct wined3d_texture *texture, +static void texture3d_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { BOOL dummy; TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb); - return wined3d_texture_bind(texture, context, srgb, &dummy); + wined3d_texture_bind(texture, context, srgb, &dummy); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a220de9..16fae5a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2058,7 +2058,7 @@ struct gl_texture struct wined3d_texture_ops { - HRESULT (*texture_bind)(struct wined3d_texture *texture, + void (*texture_bind)(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb); void (*texture_preload)(struct wined3d_texture *texture, struct wined3d_context *context, enum WINED3DSRGB srgb);

1 0

Francois Gouget : wined3d: Make wined3d_device_create_cursor_texture() static.
by Alexandre Julliard Nov. 20, 2013

Nov. 20, 2013

Module: wine Branch: master Commit: dc22a57042f50a3e0db5fc41c1fd3ba8dfd8c293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc22a57042f50a3e0db5fc41c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 20 09:56:02 2013 +0100 wined3d: Make wined3d_device_create_cursor_texture() static. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8652f45..abce81c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3785,7 +3785,7 @@ void CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, struc wined3d_surface_decref(prev); } -struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device, +static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device, struct wined3d_surface *cursor_image) { struct wined3d_resource_desc desc;

1 0

Frédéric Delanoy : user32: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 20, 2013

Nov. 20, 2013

Module: wine Branch: master Commit: 762aef661318cb643ce393af40267f2d84f026c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=762aef661318cb643ce393af4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 01:26:25 2013 +0100 user32: Use BOOL type where appropriate. --- dlls/user32/cursoricon.c | 3 ++- dlls/user32/message.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 53089c2..3c31894 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1100,7 +1100,8 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, ani_header header = {0}; BOOL use_seq = FALSE; HCURSOR cursor = 0; - UINT i, error = 0; + UINT i; + BOOL error = FALSE; HICON *frames; riff_chunk_t root_chunk = { bits_size, bits }; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index b51b6de..2cd1472 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4205,7 +4205,7 @@ typedef struct BroadcastParm UINT msg; WPARAM wp; LPARAM lp; - DWORD success; + BOOL success; HWINSTA winsta; } BroadcastParm; @@ -4246,7 +4246,7 @@ static BOOL CALLBACK bcast_childwindow( HWND hw, LPARAM lp ) return TRUE; fail: - parm->success = 0; + parm->success = FALSE; return FALSE; } else if (parm->flags & BSF_POSTMESSAGE)

1 0

Frédéric Delanoy : riched20: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 20, 2013

Nov. 20, 2013

Module: wine Branch: master Commit: e81412a4db1454fa8e63e0c1a91fd10c052f01c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81412a4db1454fa8e63e0c1a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 01:26:24 2013 +0100 riched20: Use BOOL type where appropriate. --- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 4 ++-- dlls/riched20/run.c | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e70bbbe..b82b543 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -247,7 +247,7 @@ static const WCHAR REListBox20W[] = {'R','E','L','i','s','t','B','o','x','2','0' static const WCHAR REComboBox20W[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; static HCURSOR hLeft; -int me_debug = 0; +BOOL me_debug = FALSE; HANDLE me_heap = NULL; static BOOL ME_ListBoxRegistered = FALSE; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 5893051..2f2dc96 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -144,7 +144,7 @@ int ME_CharFromPointContext(ME_Context *c, int cx, ME_Run *run, BOOL closest, BO int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, BOOL visual_order) DECLSPEC_HIDDEN; int ME_PointFromCharContext(ME_Context *c, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visual_order) DECLSPEC_HIDDEN; -int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; +BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) DECLSPEC_HIDDEN; ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; @@ -257,7 +257,7 @@ void ME_RTFParAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; void ME_RTFTblAttrHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; void ME_RTFSpecialCharHook(struct _RTF_Info *info) DECLSPEC_HIDDEN; void ME_StreamInFill(ME_InStream *stream) DECLSPEC_HIDDEN; -extern int me_debug DECLSPEC_HIDDEN; +extern BOOL me_debug DECLSPEC_HIDDEN; /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 8929fc5..263fee4 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -30,17 +30,17 @@ WINE_DECLARE_DEBUG_CHANNEL(richedit_lists); /****************************************************************************** * ME_CanJoinRuns * - * Returns 1 if two runs can be safely merged into one, 0 otherwise. - */ -int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) + * Returns TRUE if two runs can be safely merged into one, FALSE otherwise. + */ +BOOL ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) { if ((run1->nFlags | run2->nFlags) & MERF_NOJOIN) - return 0; + return FALSE; if (run1->style != run2->style) - return 0; + return FALSE; if ((run1->nFlags & MERF_STYLEFLAGS) != (run2->nFlags & MERF_STYLEFLAGS)) - return 0; - return 1; + return FALSE; + return TRUE; } void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift)

1 0

Vincent Povirk : gdiplus: Fix StringFormatFlagsLineLimit handling.
by Alexandre Julliard Nov. 20, 2013

Nov. 20, 2013

Module: wine Branch: master Commit: fbcbd09bb3c160be88e789bc7b04e0296ef50f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcbd09bb3c160be88e789bc7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 19 15:56:49 2013 -0600 gdiplus: Fix StringFormatFlagsLineLimit handling. --- dlls/gdiplus/graphics.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 366fa0e..c2a5d42 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4572,7 +4572,11 @@ GpStatus gdip_format_string(HDC hdc, bounds.Width = size.cx; if(height + size.cy > nheight) + { + if (format->attr & StringFormatFlagsLineLimit) + break; bounds.Height = nheight - (height + size.cy); + } else bounds.Height = size.cy; @@ -4615,7 +4619,7 @@ GpStatus gdip_format_string(HDC hdc, /* Stop if this was a linewrap (but not if it was a linebreak). */ if ((lret == fitcpy) && format && - (format->attr & (StringFormatFlagsNoWrap | StringFormatFlagsLineLimit))) + (format->attr & StringFormatFlagsNoWrap)) break; }

1 0

Vincent Povirk : windowscodecs: Use alpha options in CreateBitmapFromHBITMAP.
by Alexandre Julliard Nov. 20, 2013

Nov. 20, 2013

Module: wine Branch: master Commit: 8dafdd0a565385495be6c8d3c463d84d90a6f153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dafdd0a565385495be6c8d3c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 19 13:03:53 2013 -0600 windowscodecs: Use alpha options in CreateBitmapFromHBITMAP. --- dlls/windowscodecs/imgfactory.c | 15 ++++++++++++++- dlls/windowscodecs/tests/bitmap.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index bb4cf67..d31baa2 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -687,7 +687,20 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFact format = GUID_WICPixelFormat24bppBGR; break; case 32: - format = GUID_WICPixelFormat32bppBGR; + switch (option) + { + case WICBitmapUseAlpha: + format = GUID_WICPixelFormat32bppBGRA; + break; + case WICBitmapUsePremultipliedAlpha: + format = GUID_WICPixelFormat32bppPBGRA; + break; + case WICBitmapIgnoreAlpha: + format = GUID_WICPixelFormat32bppBGR; + break; + default: + return E_INVALIDARG; + } break; case 48: format = GUID_WICPixelFormat48bppRGB; diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 8de990a..14726f1 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -846,6 +846,41 @@ todo_wine IWICBitmap_Release(bitmap); DeleteObject(hbmp); DeleteObject(hpal); + + /* 32bpp alpha */ + hbmp = create_dib(2, 2, 32, NULL, NULL); + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, NULL, WICBitmapUseAlpha, &bitmap); + ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); + + hr = IWICBitmap_GetPixelFormat(bitmap, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + IWICBitmap_Release(bitmap); + + /* 32bpp pre-multiplied alpha */ + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, NULL, WICBitmapUsePremultipliedAlpha, &bitmap); + ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); + + hr = IWICBitmap_GetPixelFormat(bitmap, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppPBGRA), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + IWICBitmap_Release(bitmap); + + /* 32bpp no alpha */ + hr = IWICImagingFactory_CreateBitmapFromHBITMAP(factory, hbmp, NULL, WICBitmapIgnoreAlpha, &bitmap); + ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); + + hr = IWICBitmap_GetPixelFormat(bitmap, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGR), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + IWICBitmap_Release(bitmap); + DeleteObject(hbmp); } static void test_clipper(void)

1 0

Frédéric Delanoy : ole32: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 20, 2013

Nov. 20, 2013

Module: wine Branch: master Commit: 37abf45e6cf21808528810dd5bc001e797e7c257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37abf45e6cf21808528810dd5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 01:26:23 2013 +0100 ole32: Use BOOL type where appropriate. --- dlls/ole32/storage32.c | 56 ++++++++++++++++++++++++------------------------ dlls/ole32/storage32.h | 4 +- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fa2d3c0..9c71f85 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -138,20 +138,20 @@ typedef struct TransactedDirEntry DirRef transactedParentEntry; /* True if this entry is being used. */ - int inuse; + BOOL inuse; /* True if data is up to date. */ - int read; + BOOL read; /* True if this entry has been modified. */ - int dirty; + BOOL dirty; /* True if this entry's stream has been modified. */ - int stream_dirty; + BOOL stream_dirty; /* True if this entry has been deleted in the transacted storage, but the * delete has not yet been committed. */ - int deleted; + BOOL deleted; /* If this entry's stream has been modified, a reference to where the stream * is stored in the snapshot file. */ @@ -4383,7 +4383,7 @@ static DirRef TransactedSnapshotImpl_FindFreeEntry(TransactedSnapshotImpl *This) This->entries_size = new_size; } - This->entries[result].inuse = 1; + This->entries[result].inuse = TRUE; This->firstFreeEntry = result+1; @@ -4404,7 +4404,7 @@ static DirRef TransactedSnapshotImpl_CreateStubEntry( entry->newTransactedParentEntry = entry->transactedParentEntry = parentEntryRef; - entry->read = 0; + entry->read = FALSE; } return stubEntryRef; @@ -4449,7 +4449,7 @@ static HRESULT TransactedSnapshotImpl_EnsureReadEntry( if (SUCCEEDED(hr)) { memcpy(&This->entries[entry].data, &data, sizeof(DirEntry)); - This->entries[entry].read = 1; + This->entries[entry].read = TRUE; } } @@ -4488,7 +4488,7 @@ static HRESULT TransactedSnapshotImpl_MakeStreamDirty( } if (SUCCEEDED(hr)) - This->entries[entry].stream_dirty = 1; + This->entries[entry].stream_dirty = TRUE; if (This->entries[entry].transactedParentEntry != DIRENTRY_NULL) { @@ -4498,7 +4498,7 @@ static HRESULT TransactedSnapshotImpl_MakeStreamDirty( delete_ref = TransactedSnapshotImpl_CreateStubEntry(This, This->entries[entry].transactedParentEntry); if (delete_ref != DIRENTRY_NULL) - This->entries[delete_ref].deleted = 1; + This->entries[delete_ref].deleted = TRUE; This->entries[entry].transactedParentEntry = This->entries[entry].newTransactedParentEntry = DIRENTRY_NULL; } @@ -4792,9 +4792,9 @@ static HRESULT WINAPI TransactedSnapshotImpl_Commit( { StorageBaseImpl_StreamSetSize(This->scratch, entry->stream_entry, zero); StorageBaseImpl_DestroyDirEntry(This->scratch, entry->stream_entry); - entry->stream_dirty = 0; + entry->stream_dirty = FALSE; } - entry->dirty = 0; + entry->dirty = FALSE; entry->transactedParentEntry = entry->newTransactedParentEntry; } } @@ -4894,8 +4894,8 @@ static HRESULT TransactedSnapshotImpl_CreateDirEntry(StorageBaseImpl *base, new_entry = &This->entries[new_ref]; new_entry->newTransactedParentEntry = new_entry->transactedParentEntry = DIRENTRY_NULL; - new_entry->read = 1; - new_entry->dirty = 1; + new_entry->read = TRUE; + new_entry->dirty = TRUE; memcpy(&new_entry->data, newData, sizeof(DirEntry)); *index = new_ref; @@ -4920,7 +4920,7 @@ static HRESULT TransactedSnapshotImpl_WriteDirEntry(StorageBaseImpl *base, if (index != This->base.storageDirEntry) { - This->entries[index].dirty = 1; + This->entries[index].dirty = TRUE; if (data->size.QuadPart == 0 && This->entries[index].transactedParentEntry != DIRENTRY_NULL) @@ -4931,7 +4931,7 @@ static HRESULT TransactedSnapshotImpl_WriteDirEntry(StorageBaseImpl *base, delete_ref = TransactedSnapshotImpl_CreateStubEntry(This, This->entries[index].transactedParentEntry); if (delete_ref != DIRENTRY_NULL) - This->entries[delete_ref].deleted = 1; + This->entries[delete_ref].deleted = TRUE; This->entries[index].transactedParentEntry = This->entries[index].newTransactedParentEntry = DIRENTRY_NULL; } @@ -4972,7 +4972,7 @@ static HRESULT TransactedSnapshotImpl_DestroyDirEntry(StorageBaseImpl *base, } else { - This->entries[index].deleted = 1; + This->entries[index].deleted = TRUE; } return S_OK; @@ -5048,7 +5048,7 @@ static HRESULT TransactedSnapshotImpl_StreamSetSize(StorageBaseImpl *base, This->entries[index].stream_entry, zero); StorageBaseImpl_DestroyDirEntry(This->scratch, This->entries[index].stream_entry); - This->entries[index].stream_dirty = 0; + This->entries[index].stream_dirty = FALSE; } else if (This->entries[index].transactedParentEntry != DIRENTRY_NULL) { @@ -5056,7 +5056,7 @@ static HRESULT TransactedSnapshotImpl_StreamSetSize(StorageBaseImpl *base, delete_ref = TransactedSnapshotImpl_CreateStubEntry(This, This->entries[index].transactedParentEntry); if (delete_ref != DIRENTRY_NULL) - This->entries[delete_ref].deleted = 1; + This->entries[delete_ref].deleted = TRUE; This->entries[index].transactedParentEntry = This->entries[index].newTransactedParentEntry = DIRENTRY_NULL; } @@ -6038,10 +6038,10 @@ HRESULT BlockChainStream_GetBlockAtOffset(BlockChainStream *This, { if (!StorageImpl_WriteBigBlock(This->parentStorage, result->sector, result->data)) return STG_E_WRITEFAULT; - result->dirty = 0; + result->dirty = FALSE; } - result->read = 0; + result->read = FALSE; result->index = index; result->sector = *sector; } @@ -6066,9 +6066,9 @@ BlockChainStream* BlockChainStream_Construct( newStream->indexCacheLen = 0; newStream->indexCacheSize = 0; newStream->cachedBlocks[0].index = 0xffffffff; - newStream->cachedBlocks[0].dirty = 0; + newStream->cachedBlocks[0].dirty = FALSE; newStream->cachedBlocks[1].index = 0xffffffff; - newStream->cachedBlocks[1].dirty = 0; + newStream->cachedBlocks[1].dirty = FALSE; newStream->blockToEvict = 0; if (FAILED(BlockChainStream_UpdateIndexCache(newStream))) @@ -6090,7 +6090,7 @@ HRESULT BlockChainStream_Flush(BlockChainStream* This) if (This->cachedBlocks[i].dirty) { if (StorageImpl_WriteBigBlock(This->parentStorage, This->cachedBlocks[i].sector, This->cachedBlocks[i].data)) - This->cachedBlocks[i].dirty = 0; + This->cachedBlocks[i].dirty = FALSE; else return STG_E_WRITEFAULT; } @@ -6230,7 +6230,7 @@ HRESULT BlockChainStream_ReadAt(BlockChainStream* This, if (FAILED(StorageImpl_ReadBigBlock(This->parentStorage, cachedBlock->sector, cachedBlock->data, &read)) && !read) return STG_E_READFAULT; - cachedBlock->read = 1; + cachedBlock->read = TRUE; } memcpy(bufferWalker, cachedBlock->data+offsetInBlock, bytesToReadInBuffer); @@ -6318,8 +6318,8 @@ HRESULT BlockChainStream_WriteAt(BlockChainStream* This, memcpy(cachedBlock->data+offsetInBlock, bufferWalker, bytesToWrite); bytesWrittenAt = bytesToWrite; - cachedBlock->read = 1; - cachedBlock->dirty = 1; + cachedBlock->read = TRUE; + cachedBlock->dirty = TRUE; } blockNoInSequence++; @@ -6421,7 +6421,7 @@ static BOOL BlockChainStream_Shrink(BlockChainStream* This, if (This->cachedBlocks[i].index >= numBlocks) { This->cachedBlocks[i].index = 0xffffffff; - This->cachedBlocks[i].dirty = 0; + This->cachedBlocks[i].dirty = FALSE; } } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index ba46aff..c75b02a 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -523,8 +523,8 @@ typedef struct BlockChainBlock { ULONG index; ULONG sector; - int read; - int dirty; + BOOL read; + BOOL dirty; BYTE data[MAX_BIG_BLOCK_SIZE]; } BlockChainBlock;

1 0

Francois Gouget : netapi32: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Nov. 20, 2013

Nov. 20, 2013

Module: wine Branch: master Commit: 19d8c27d12948e8a9b1c9fd78fc45d3e2b2ab37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d8c27d12948e8a9b1c9fd78… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 20 09:55:57 2013 +0100 netapi32: Remove WINAPI on static functions where not needed. --- dlls/netapi32/netapi32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 68d8872..74635dc 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -314,7 +314,7 @@ static NET_API_STATUS share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDW return status; } -static NET_API_STATUS WINAPI share_del( LMSTR servername, LMSTR netname, DWORD reserved ) +static NET_API_STATUS share_del( LMSTR servername, LMSTR netname, DWORD reserved ) { char *server = NULL, *share; NET_API_STATUS status; @@ -419,7 +419,7 @@ static NET_API_STATUS share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDW ERR( "\n" ); return ERROR_NOT_SUPPORTED; } -NET_API_STATUS WINAPI share_del( LMSTR servername, LMSTR netname, DWORD reserved ) +static NET_API_STATUS share_del( LMSTR servername, LMSTR netname, DWORD reserved ) { ERR( "\n" ); return ERROR_NOT_SUPPORTED;

1 0

Frédéric Delanoy : wine_release: Amend filename of translated manpages.
by Alexandre Julliard Nov. 20, 2013

Nov. 20, 2013

Module: tools Branch: master Commit: 05bfbca81151ff9cf322ef5e7bff8026341f0938 URL: http://source.winehq.org/git/tools.git/?a=commit;h=05bfbca81151ff9cf322ef5e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 19 22:43:42 2013 +0100 wine_release: Amend filename of translated manpages. --- wine_release | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wine_release b/wine_release index 3e986bc..4091e73 100755 --- a/wine_release +++ b/wine_release @@ -66,15 +66,15 @@ then manpages="\ loader/wine.man \ - loader/wine.de.man \ - loader/wine.fr.man \ - loader/wine.pl.man \ + loader/wine.de.UTF-8.man \ + loader/wine.fr.UTF-8.man \ + loader/wine.pl.UTF-8.man \ server/wineserver.man \ - server/wineserver.de.man \ - server/wineserver.fr.man \ + server/wineserver.de.UTF-8.man \ + server/wineserver.fr.UTF-8.man \ tools/winemaker.man \ - tools/winemaker.de.man \ - tools/winemaker.fr.man \ + tools/winemaker.de.UTF-8.man \ + tools/winemaker.fr.UTF-8.man \ tools/widl/widl.man \ tools/winebuild/winebuild.man \ tools/winedump/winedump.man \ @@ -92,7 +92,7 @@ then then lang="en" fi - groff -man -T html -P -l -k -K utf8 $f | $tools_dir/html2template -o $name.template && mv -f $name.template $templates_dir/$lang/docs/`basename $name .$lang`.template + groff -man -T html -P -l -k -K utf8 $f | $tools_dir/html2template -o $name.template && mv -f $name.template $templates_dir/$lang/docs/`basename $name .$lang.UTF-8`.template done make -s htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI

1 0

Sebastian Lackner : winex11: Send XEMBED_REQUEST_FOCUS request for embedded windows.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

Module: wine Branch: master Commit: 2e0ca3e74669b55f5d64b39e8fd32dc052652d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0ca3e74669b55f5d64b39e8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 13 16:59:38 2013 +0100 winex11: Send XEMBED_REQUEST_FOCUS request for embedded windows. --- dlls/winex11.drv/event.c | 57 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 64188bc..767c003 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -183,6 +183,31 @@ static inline void free_event_data( XEvent *event ) } /*********************************************************************** + * xembed_request_focus + */ +static void xembed_request_focus( Display *display, Window window, DWORD timestamp ) +{ + XEvent xev; + + xev.xclient.type = ClientMessage; + xev.xclient.window = window; + xev.xclient.message_type = x11drv_atom(_XEMBED); + xev.xclient.serial = 0; + xev.xclient.display = display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + + xev.xclient.data.l[0] = timestamp; + xev.xclient.data.l[1] = XEMBED_REQUEST_FOCUS; + xev.xclient.data.l[2] = 0; + xev.xclient.data.l[3] = 0; + xev.xclient.data.l[4] = 0; + + XSendEvent(display, window, False, NoEventMask, &xev); + XFlush( display ); +} + +/*********************************************************************** * X11DRV_register_event_handler * * Register a handler for a given event type. @@ -532,14 +557,14 @@ static inline BOOL can_activate_window( HWND hwnd ) /********************************************************************** * set_input_focus * - * Try to force focus for non-managed windows. + * Try to force focus for embedded or non-managed windows. */ -static void set_input_focus( Display *display, Window window ) +static void set_input_focus( struct x11drv_win_data *data ) { XWindowChanges changes; DWORD timestamp; - if (!window) return; + if (!data->whole_window) return; if (EVENT_x11_time_to_win32_time(0)) /* ICCCM says don't use CurrentTime, so try to use last message time if possible */ @@ -550,8 +575,13 @@ static void set_input_focus( Display *display, Window window ) /* Set X focus and install colormap */ changes.stack_mode = Above; - XConfigureWindow( display, window, CWStackMode, &changes ); - XSetInputFocus( display, window, RevertToParent, timestamp ); + XConfigureWindow( data->display, data->whole_window, CWStackMode, &changes ); + + if (data->embedder) + xembed_request_focus( data->display, data->embedder, timestamp ); + else + XSetInputFocus( data->display, data->whole_window, RevertToParent, timestamp ); + } /********************************************************************** @@ -904,7 +934,7 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { HWND hwndFocus = GetFocus(); if (hwndFocus && IsChild( hwnd, hwndFocus )) - set_input_focus( data->display, data->whole_window ); + set_input_focus( data ); } release_win_data( data ); } @@ -1365,9 +1395,18 @@ void CDECL X11DRV_SetFocus( HWND hwnd ) { struct x11drv_win_data *data; - if (!(hwnd = GetAncestor( hwnd, GA_ROOT ))) return; - if (!(data = get_win_data( hwnd ))) return; - if (!data->managed) set_input_focus( data->display, data->whole_window ); + HWND parent; + + for (;;) + { + if (!(data = get_win_data( hwnd ))) return; + if (data->embedded) break; + parent = GetAncestor( hwnd, GA_PARENT ); + if (!parent || parent == GetDesktopWindow()) break; + release_win_data( data ); + hwnd = parent; + } + if (!data->managed || data->embedder) set_input_focus( data ); release_win_data( data ); }

1 0