July 2009 - Wine-Commits - list.winehq.org

Hans Leidekker : fusion/tests: Initialize a variable.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 9ae618f98c6f34befadc10c938164bcf7f9e6736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae618f98c6f34befadc10c93… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 3 11:30:48 2009 +0200 fusion/tests: Initialize a variable. --- dlls/fusion/tests/asmname.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 442f00f..864ded5 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -726,6 +726,7 @@ static void test_CreateAssemblyNameObject(void) ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; + str[0] = '\0'; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); todo_wine

1 0

Alexandre Julliard : widl: Struct alignment should be the largest alignment of all the struct members .
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 064775c9a0acfa0e302008c863af158b914ed7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=064775c9a0acfa0e302008c86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 12:02:07 2009 +0200 widl: Struct alignment should be the largest alignment of all the struct members. --- tools/widl/typegen.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 861dada..5abf575 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1083,7 +1083,6 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align) { - int have_align = FALSE; unsigned int size = 0; const var_t *v; @@ -1092,11 +1091,7 @@ static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align { unsigned int falign = 0; unsigned int fsize = type_memsize(v->type, &falign); - if (!have_align) - { - *align = falign; - have_align = TRUE; - } + if (*align < falign) *align = falign; size = ROUND_SIZE(size, falign); size += fsize; } @@ -1128,7 +1123,7 @@ static unsigned int union_memsize(const var_list_t *fields, unsigned int *pmaxa) int get_padding(const var_list_t *fields) { unsigned short offset = 0; - int salign = -1; + unsigned int salign = 1; const var_t *f; if (!fields) @@ -1139,8 +1134,7 @@ int get_padding(const var_list_t *fields) type_t *ft = f->type; unsigned int align = 0; unsigned int size = type_memsize(ft, &align); - if (salign == -1) - salign = align; + if (align > salign) salign = align; offset = ROUND_SIZE(offset, align); offset += size; } @@ -2202,7 +2196,7 @@ static void write_struct_members(FILE *file, const type_t *type, { const var_t *field; unsigned short offset = 0; - int salign = -1; + unsigned int salign = 1; int padding; var_list_t *fields = type_struct_get_fields(type); @@ -2213,8 +2207,7 @@ static void write_struct_members(FILE *file, const type_t *type, { unsigned int align = 0; unsigned int size = type_memsize(ft, &align); - if (salign == -1) - salign = align; + if (salign < align) salign = align; if ((align - 1) & offset) { unsigned char fc = 0;

1 0

Henri Verbeet : wined3d: Don' t accept NULL as a valid result from glGetString().
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 17688365ed8a2f191e2a9f234bb43d053c64a1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17688365ed8a2f191e2a9f234… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:22 2009 +0200 wined3d: Don't accept NULL as a valid result from glGetString(). --- dlls/wined3d/directx.c | 759 ++++++++++++++++++++++++++---------------------- 1 files changed, 411 insertions(+), 348 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17688365ed8a2f191e2a9…

1 0

Nikolay Sivov : comctl32/listview: Remove parent creation test. It' s unrelated to ListView.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: ab527a6e0f3633332d74f28459f6e8c64f602b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab527a6e0f3633332d74f2845… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jul 3 12:36:24 2009 +0400 comctl32/listview: Remove parent creation test. It's unrelated to ListView. --- dlls/comctl32/tests/listview.c | 27 --------------------------- 1 files changed, 0 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d5bcbf5..d959deb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -89,31 +89,6 @@ static HWND subclass_editbox(HWND hwndListview); static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; -static const struct message create_parent_wnd_seq[] = { - { WM_GETMINMAXINFO, sent }, - { WM_NCCREATE, sent }, - { WM_NCCALCSIZE, sent|wparam, 0 }, - { WM_CREATE, sent }, - { WM_SHOWWINDOW, sent|wparam, 1 }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_QUERYNEWPALETTE, sent|optional }, - { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, - { WM_WINDOWPOSCHANGED, sent|optional }, - { WM_NCCALCSIZE, sent|wparam|optional, 1 }, - { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent|wparam, 1 }, - { WM_ACTIVATE, sent|wparam, 1 }, - { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, - { WM_IME_NOTIFY, sent|defwinproc|optional }, - { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, - /* Win9x adds SWP_NOZORDER below */ - { WM_WINDOWPOSCHANGED, sent, /*|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE*/ }, - { WM_NCCALCSIZE, sent|wparam|optional, 1 }, - { WM_SIZE, sent }, - { WM_MOVE, sent }, - { 0 } -}; - static const struct message create_ownerdrawfixed_parent_seq[] = { { WM_NOTIFYFORMAT, sent }, { WM_QUERYUISTATE, sent|optional }, /* Win2K and higher */ @@ -3707,9 +3682,7 @@ START_TEST(listview) init_msg_sequences(sequences, NUM_MSG_SEQUENCES); - flush_sequences(sequences, NUM_MSG_SEQUENCES); hwndparent = create_parent_window(FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, create_parent_wnd_seq, "create parent window", TRUE); flush_sequences(sequences, NUM_MSG_SEQUENCES); g_is_below_5 = is_below_comctl_5();

1 0

Alexandre Julliard : widl: Skip the existing correlation descriptor on unencapsulated unions when generating a different one .
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: fc7681a8ceae63a2d5c66a157e30338ed8a8f92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc7681a8ceae63a2d5c66a157… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 11:44:10 2009 +0200 widl: Skip the existing correlation descriptor on unencapsulated unions when generating a different one. --- tools/widl/typegen.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b60a53c..861dada 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1521,8 +1521,11 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) type_t *ft = f->type; if (type_get_type(ft) == TYPE_UNION && is_attr(f->attrs, ATTR_SWITCHIS)) { + short reloff; unsigned int absoff = ft->typestring_offset; - short reloff = absoff - (*tfsoff + 6); + if (is_attr(ft->attrs, ATTR_SWITCHTYPE)) + absoff += 8; /* we already have a corr descr, skip it */ + reloff = absoff - (*tfsoff + 6); print_file(file, 0, "/* %d */\n", *tfsoff); print_file(file, 2, "0x%x,\t/* FC_NON_ENCAPSULATED_UNION */\n", RPC_FC_NON_ENCAPSULATED_UNION); print_file(file, 2, "0x%x,\t/* FIXME: always FC_LONG */\n", RPC_FC_LONG); @@ -2509,6 +2512,7 @@ static unsigned int write_union_tfs(FILE *file, type_t *type, unsigned int *tfso *tfsoff += write_conf_or_var_desc(file, NULL, *tfsoff, st, &dummy_expr ); print_file(file, 2, "NdrFcShort(0x2),\t/* Offset= 2 (%u) */\n", *tfsoff + 2); *tfsoff += 2; + print_file(file, 0, "/* %u */\n", *tfsoff); } print_file(file, 2, "NdrFcShort(0x%hx),\t/* %d */\n", size, size);

1 0

Alexandre Julliard : widl: Take into account structure field alignment when computing offsets.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: f6d2b49145e16cacc694f08b5b4442358c7c6718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d2b49145e16cacc694f08b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 12:02:30 2009 +0200 widl: Take into account structure field alignment when computing offsets. --- tools/widl/typegen.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5abf575..9b39c63 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -59,6 +59,7 @@ struct expr_eval_routine const expr_t *expr; }; +static unsigned int field_memsize(const type_t *type, unsigned int *offset); static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align); static unsigned int write_struct_tfs(FILE *file, type_t *type, const char *name, unsigned int *tfsoff); static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *type, @@ -978,14 +979,13 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, if (fields) LIST_FOR_EACH_ENTRY( var, fields, const var_t, entry ) { - unsigned int align = 0; - /* FIXME: take alignment into account */ + unsigned int size = field_memsize( var->type, &offset ); if (var->name && !strcmp(var->name, subexpr->u.sval)) { correlation_variable = var->type; break; } - offset += type_memsize(var->type, &align); + offset += size; } if (!correlation_variable) error("write_conf_or_var_desc: couldn't find variable %s in structure\n", @@ -1081,6 +1081,16 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, return 4; } +/* return size and start offset of a data field based on current offset */ +static unsigned int field_memsize(const type_t *type, unsigned int *offset) +{ + unsigned int align = 0; + unsigned int size = type_memsize( type, &align ); + + *offset = ROUND_SIZE( *offset, align ); + return size; +} + static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align) { unsigned int size = 0; @@ -1511,8 +1521,8 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) if (fs) LIST_FOR_EACH_ENTRY(f, fs, var_t, entry) { - unsigned int align = 0; type_t *ft = f->type; + unsigned int size = field_memsize( ft, &offset ); if (type_get_type(ft) == TYPE_UNION && is_attr(f->attrs, ATTR_SWITCHIS)) { short reloff; @@ -1529,9 +1539,7 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) reloff, reloff, absoff); *tfsoff += 8; } - - /* FIXME: take alignment into account */ - offset += type_memsize(ft, &align); + offset += size; } }

1 0

Alexandre Julliard : widl: An ENUM16 is 32-bit wide in memory.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: d375d25d653f01a7f7e9fc37e885d2e6cb1fe482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d375d25d653f01a7f7e9fc37e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 12:06:31 2009 +0200 widl: An ENUM16 is 32-bit wide in memory. --- tools/widl/typegen.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9b39c63..3a5e2e5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1194,14 +1194,11 @@ unsigned int type_memsize(const type_t *t, unsigned int *align) case TYPE_ENUM: switch (get_enum_fc(t)) { + case RPC_FC_ENUM16: case RPC_FC_ENUM32: size = 4; if (size > *align) *align = size; break; - case RPC_FC_ENUM16: - size = 2; - if (size > *align) *align = size; - break; default: error("type_memsize: Unknown enum type\n"); size = 0;

1 0

Henri Verbeet : wined3d: Don' t abuse blending to disable color writes in surface_depth_blt().
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 532b99078e5e04faf97a9e24138243a65393f6b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=532b99078e5e04faf97a9e241… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:21 2009 +0200 wined3d: Don't abuse blending to disable color writes in surface_depth_blt(). --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3e0413e..454a86f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4334,14 +4334,14 @@ static void surface_depth_blt(IWineD3DSurfaceImpl *This, GLuint texture, GLsizei glPushAttrib(GL_ENABLE_BIT | GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_VIEWPORT_BIT); glDisable(GL_CULL_FACE); - glEnable(GL_BLEND); + glDisable(GL_BLEND); glDisable(GL_ALPHA_TEST); glDisable(GL_SCISSOR_TEST); glDisable(GL_STENCIL_TEST); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_ALWAYS); glDepthMask(GL_TRUE); - glBlendFunc(GL_ZERO, GL_ONE); + glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); glViewport(0, 0, w, h); surface_get_depth_blt_info(target, w, h, &info);

1 0

Henri Verbeet : wined3d: Get rid of wined3d_fake_gl_context_cs.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 23ce9d72b8b29525828b1270a8361ea02f4f9858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23ce9d72b8b29525828b1270a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 3 09:39:19 2009 +0200 wined3d: Get rid of wined3d_fake_gl_context_cs. --- dlls/wined3d/directx.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 513fbfe..b8534a6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -204,20 +204,8 @@ struct wined3d_fake_gl_ctx HGLRC gl_ctx; }; -static CRITICAL_SECTION wined3d_fake_gl_context_cs; -static CRITICAL_SECTION_DEBUG wined3d_fake_gl_context_cs_debug = -{ - 0, 0, &wined3d_fake_gl_context_cs, - { &wined3d_fake_gl_context_cs_debug.ProcessLocksList, - &wined3d_fake_gl_context_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": wined3d_fake_gl_context_cs") } -}; -static CRITICAL_SECTION wined3d_fake_gl_context_cs = { &wined3d_fake_gl_context_cs_debug, -1, 0, 0, 0, 0 }; - static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) { - EnterCriticalSection(&wined3d_fake_gl_context_cs); - TRACE_(d3d_caps)("Destroying fake GL context.\n"); if (!pwglMakeCurrent(NULL, NULL)) @@ -228,8 +216,6 @@ static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) pwglDeleteContext(ctx->gl_ctx); ReleaseDC(ctx->wnd, ctx->dc); DestroyWindow(ctx->wnd); - - LeaveCriticalSection(&wined3d_fake_gl_context_cs); } static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) @@ -237,8 +223,6 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) PIXELFORMATDESCRIPTOR pfd; int iPixelFormat; - EnterCriticalSection(&wined3d_fake_gl_context_cs); - TRACE("getting context...\n"); /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */ @@ -292,7 +276,6 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) } context_set_last_device(NULL); - LeaveCriticalSection(&wined3d_fake_gl_context_cs); return TRUE; fail: @@ -303,7 +286,6 @@ fail: if (ctx->wnd) DestroyWindow(ctx->wnd); ctx->wnd = NULL; - LeaveCriticalSection(&wined3d_fake_gl_context_cs); return FALSE; }

1 0

Michael Stefaniuc : msacm32: Build language resource files separately.
by Alexandre Julliard July 3, 2009

July 3, 2009

Module: wine Branch: master Commit: 9bb0f9c723a00703ab29ea9c015e1ffa354548da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb0f9c723a00703ab29ea9c0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 01:38:29 2009 +0200 msacm32: Build language resource files separately. Do not include them from an other rc file. --- dlls/msacm32/Makefile.in | 23 ++++++++++++++++++++++- dlls/msacm32/msacm.rc | 46 ---------------------------------------------- dlls/msacm32/msacm_Cs.rc | 2 ++ dlls/msacm32/msacm_Da.rc | 2 ++ dlls/msacm32/msacm_De.rc | 2 ++ dlls/msacm32/msacm_En.rc | 2 ++ dlls/msacm32/msacm_Es.rc | 2 ++ dlls/msacm32/msacm_Fr.rc | 2 ++ dlls/msacm32/msacm_Hu.rc | 2 ++ dlls/msacm32/msacm_It.rc | 2 ++ dlls/msacm32/msacm_Ja.rc | 4 ++-- dlls/msacm32/msacm_Ko.rc | 2 ++ dlls/msacm32/msacm_Lt.rc | 4 ++-- dlls/msacm32/msacm_Nl.rc | 2 ++ dlls/msacm32/msacm_No.rc | 2 ++ dlls/msacm32/msacm_Pl.rc | 3 +++ dlls/msacm32/msacm_Pt.rc | 2 ++ dlls/msacm32/msacm_Ro.rc | 4 ++-- dlls/msacm32/msacm_Ru.rc | 2 ++ dlls/msacm32/msacm_Si.rc | 4 ++-- dlls/msacm32/msacm_Sv.rc | 2 ++ dlls/msacm32/msacm_Tr.rc | 2 ++ dlls/msacm32/msacm_Zh.rc | 4 ++-- dlls/msacm32/wineacm.h | 3 +++ 24 files changed, 68 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bb0f9c723a00703ab29e…

1 0