September 2014 - Wine-commits

Andrei Slăvoiu : wined3d: Pass the capabilities directly to d3d_level_from_gl_info and rename it to d3d_level_from_caps.
by Alexandre Julliard 23 Sep '14

23 Sep '14

Module: wine Branch: master Commit: 9d0f924d1b0b694f0d71742267a66be625bccc21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0f924d1b0b694f0d7174226… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Sun Sep 21 22:58:17 2014 +0300 wined3d: Pass the capabilities directly to d3d_level_from_gl_info and rename it to d3d_level_from_caps. --- dlls/wined3d/directx.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 925ff98..5d84533 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1679,47 +1679,33 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_NVIDIA; } -static const struct wined3d_shader_backend_ops *select_shader_backend(const struct wined3d_gl_info *gl_info); -static const struct fragment_pipeline *select_fragment_implementation(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_backend_ops *shader_backend_ops); - -static enum wined3d_d3d_level d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) +static enum wined3d_d3d_level d3d_level_from_caps(const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps, DWORD glsl_version) { - struct shader_caps shader_caps; - struct fragment_caps fragment_caps; - const struct wined3d_shader_backend_ops *shader_backend; - const struct fragment_pipeline *fragment_pipeline; - - shader_backend = select_shader_backend(gl_info); - shader_backend->shader_get_caps(gl_info, &shader_caps); - - if (shader_caps.vs_version >= 5) + if (shader_caps->vs_version >= 5) return WINED3D_D3D_LEVEL_11; - if (shader_caps.vs_version == 4) + if (shader_caps->vs_version == 4) { /* No backed supports SM 5 at the moment */ - if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 00)) + if (glsl_version >= MAKEDWORD_VERSION(4, 00)) return WINED3D_D3D_LEVEL_11; return WINED3D_D3D_LEVEL_10; } - if (shader_caps.vs_version == 3) + if (shader_caps->vs_version == 3) { /* Wine can not use SM 4 on mesa drivers as the necessary functionality is not exposed * on compatibility contexts */ - if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) + if (glsl_version >= MAKEDWORD_VERSION(1, 30)) return WINED3D_D3D_LEVEL_10; return WINED3D_D3D_LEVEL_9_SM3; } - if (shader_caps.vs_version == 2) + if (shader_caps->vs_version == 2) return WINED3D_D3D_LEVEL_9_SM2; - if (shader_caps.vs_version == 1) + if (shader_caps->vs_version == 1) return WINED3D_D3D_LEVEL_8; - fragment_pipeline = select_fragment_implementation(gl_info, shader_backend); - fragment_pipeline->get_caps(gl_info, &fragment_caps); - - if (fragment_caps.TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) + if (fragment_caps->TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) return WINED3D_D3D_LEVEL_7; - if (fragment_caps.MaxSimultaneousTextures > 1) + if (fragment_caps->MaxSimultaneousTextures > 1) return WINED3D_D3D_LEVEL_6; return WINED3D_D3D_LEVEL_5; @@ -2280,8 +2266,8 @@ card_vendor_table[] = }; -static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - enum wined3d_gl_vendor *gl_vendor, enum wined3d_pci_vendor *card_vendor) +static enum wined3d_pci_device wined3d_guess_card(const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps, + DWORD glsl_version, const char *gl_renderer, enum wined3d_gl_vendor *gl_vendor, enum wined3d_pci_vendor *card_vendor) { /* A Direct3D device object contains the PCI id (vendor + device) of the * videocard which is used for rendering. Various applications use this @@ -2334,7 +2320,7 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * * memory can be overruled using a registry setting. */ unsigned int i; - enum wined3d_d3d_level d3d_level = d3d_level_from_gl_info(gl_info); + enum wined3d_d3d_level d3d_level = d3d_level_from_caps(shader_caps, fragment_caps, glsl_version); enum wined3d_pci_device device; for (i = 0; i < (sizeof(card_vendor_table) / sizeof(*card_vendor_table)); ++i) @@ -3031,7 +3017,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) card_vendor = wined3d_guess_card_vendor(gl_vendor_str, gl_renderer_str); TRACE("Found GL_VENDOR (%s)->(0x%04x/0x%04x).\n", debugstr_a(gl_vendor_str), gl_vendor, card_vendor); - device = wined3d_guess_card(gl_info, gl_renderer_str, &gl_vendor, &card_vendor); + device = wined3d_guess_card(&shader_caps, &fragment_caps, gl_info->glsl_version, gl_renderer_str, &gl_vendor, &card_vendor); TRACE("Found (fake) card: 0x%x (vendor id), 0x%x (device id).\n", card_vendor, device); gl_info->wrap_lookup[WINED3D_TADDRESS_WRAP - WINED3D_TADDRESS_WRAP] = GL_REPEAT;

1 0

Piotr Caban : user32: Return early on child windows in DrawMenuBar.
by Alexandre Julliard 23 Sep '14

23 Sep '14

Module: wine Branch: master Commit: dcdf4dbf151606416abfe54b4436096cae433ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcdf4dbf151606416abfe54b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 23 16:51:53 2014 +0200 user32: Return early on child windows in DrawMenuBar. --- dlls/user32/menu.c | 2 ++ dlls/user32/tests/msg.c | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 9e05dd4..f0eb66b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4360,6 +4360,8 @@ BOOL WINAPI DrawMenuBar( HWND hWnd ) if (!IsWindow( hWnd )) return FALSE; + if (!WIN_ALLOWED_MENU(GetWindowLongW( hWnd, GWL_STYLE ))) + return TRUE; if ((hMenu = GetMenu( hWnd )) && (lppop = MENU_GetMenu( hMenu ))) { lppop->Height = 0; /* Make sure we call MENU_MenuBarCalcSize */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6badca1..90b87cb 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4871,6 +4871,18 @@ static void test_messages(void) flush_events(); ok_sequence(WmDrawMenuBarSeq, "DrawMenuBar", FALSE); ok(SetCursorPos(pos.x, pos.y), "SetCursorPos failed\n"); + + DestroyWindow(hwnd); + + hwnd = CreateWindowExA(0, "TestDialogClass", NULL, WS_CHILD|WS_VISIBLE, + 0, 0, 100, 100, hparent, 0, GetModuleHandleA(0), NULL); + ok(hwnd != 0, "Failed to create custom dialog window\n"); + flush_events(); + flush_sequence(); + ok(DrawMenuBar(hwnd), "DrawMenuBar failed: %d\n", GetLastError()); + flush_events(); + ok_sequence(WmEmptySeq, "DrawMenuBar for a child window", FALSE); + DestroyWindow(hwnd); flush_sequence();

1 0

Marcus Meissner : dwrite: Use correct variable (Coverity).
by Alexandre Julliard 22 Sep '14

22 Sep '14

Module: wine Branch: master Commit: 23aaef96a28a382c94a301248779ccc192e4defc URL: http://source.winehq.org/git/wine.git/?a=commit;h=23aaef96a28a382c94a301248… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 21 17:00:16 2014 +0200 dwrite: Use correct variable (Coverity). --- dlls/dwrite/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3a17064..945bfbf 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -957,7 +957,7 @@ static void test_FontLoader(void) ok(face == DWRITE_FONT_FACE_TYPE_UNKNOWN, "got %i\n", face); ok(count == 0, "got %i\n", count); - hr = IDWriteFactory_CreateFontFace(factory, type, 1, &ffile, 0, 0, &fface); + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_CFF, 1, &ffile, 0, 0, &fface); ok(hr == 0x8faecafe, "got 0x%08x\n", hr); IDWriteFontFile_Release(ffile);

1 0

Marcus Meissner : dwrite: Fixed NULL ptr deref before check (Coverity).
by Alexandre Julliard 22 Sep '14

22 Sep '14

Module: wine Branch: master Commit: 90774871c844e2bb39b8d6350f48b4a12ede1ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=90774871c844e2bb39b8d6350… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 21 14:44:43 2014 +0200 dwrite: Fixed NULL ptr deref before check (Coverity). --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index efa305e..6e7de46 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -390,9 +390,9 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace *iface, UIN TRACE("(%p)->(%u %p %p %p %p)\n", This, table_tag, table_data, table_size, context, exists); table = heap_alloc(sizeof(struct dwrite_fonttable)); - table->magic = DWRITE_FONTTABLE_MAGIC; if (!table) return E_OUTOFMEMORY; + table->magic = DWRITE_FONTTABLE_MAGIC; *exists = FALSE; for (i = 0; i < This->data->file_count && !(*exists); i++)

1 0

Marcus Meissner : dwrite: Avoid NULL ptr dereference (Coverity).
by Alexandre Julliard 22 Sep '14

22 Sep '14

Module: wine Branch: master Commit: d684d776c24bfb2b680dff8675d597919df9c19b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d684d776c24bfb2b680dff867… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 21 14:26:13 2014 +0200 dwrite: Avoid NULL ptr dereference (Coverity). --- dlls/dwrite/layout.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0b33b92..f6b1e8c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -271,6 +271,8 @@ static struct layout_range *alloc_layout_range_from(struct layout_range *from, c static void free_layout_range(struct layout_range *range) { + if (!range) + return; if (range->object) IDWriteInlineObject_Release(range->object); if (range->effect)

1 0

Jacek Caban : vbscript: Don't try to convert int to short in return_int.
by Alexandre Julliard 22 Sep '14

22 Sep '14

Module: wine Branch: master Commit: 85b989927f0118dda8900e1db897de7f3f505ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b989927f0118dda8900e1db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 22 15:52:13 2014 +0200 vbscript: Don't try to convert int to short in return_int. --- dlls/vbscript/global.c | 28 ++++------------------------ dlls/vbscript/tests/api.vbs | 2 ++ dlls/vbscript/tests/error.vbs | 1 + 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 311c892..2901623 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -112,9 +112,6 @@ static HRESULT return_short(VARIANT *res, short val) static HRESULT return_int(VARIANT *res, int val) { - if((short)val == val) - return return_short(res, val); - if(res) { V_VT(res) = VT_I4; V_I4(res) = val; @@ -417,9 +414,7 @@ static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI if(!res) return DISP_E_BADVARTYPE; - V_VT(res) = VT_I4; - V_I4(res) = i; - return S_OK; + return return_int(res, i); } static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -1778,12 +1773,7 @@ static HRESULT Global_ScriptEngineMajorVersion(vbdisp_t *This, VARIANT *arg, uns assert(args_cnt == 0); - if(res) { - V_VT(res) = VT_I4; - V_I4(res) = VBSCRIPT_MAJOR_VERSION; - } - - return S_OK; + return return_int(res, VBSCRIPT_MAJOR_VERSION); } static HRESULT Global_ScriptEngineMinorVersion(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -1792,12 +1782,7 @@ static HRESULT Global_ScriptEngineMinorVersion(vbdisp_t *This, VARIANT *arg, uns assert(args_cnt == 0); - if(res) { - V_VT(res) = VT_I4; - V_I4(res) = VBSCRIPT_MINOR_VERSION; - } - - return S_OK; + return return_int(res, VBSCRIPT_MINOR_VERSION); } static HRESULT Global_ScriptEngineBuildVersion(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -1806,12 +1791,7 @@ static HRESULT Global_ScriptEngineBuildVersion(vbdisp_t *This, VARIANT *arg, uns assert(args_cnt == 0); - if(res) { - V_VT(res) = VT_I4; - V_I4(res) = VBSCRIPT_BUILD_VERSION; - } - - return S_OK; + return return_int(res, VBSCRIPT_BUILD_VERSION); } static HRESULT Global_FormatNumber(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index d688e17..9e64412 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -242,6 +242,7 @@ Call ok(x = 2, "InStr returned " & x) x = InStr("abcd", "bc") Call ok(x = 2, "InStr returned " & x) +Call ok(getVT(x) = "VT_I4*", "getVT(InStr) returned " & getVT(x)) x = InStr("abc", "bc") Call ok(x = 2, "InStr returned " & x) @@ -335,6 +336,7 @@ Call ok(Len("") = 0, "Len() = " & Len("")) Call ok(Len(1) = 1, "Len(1) = " & Len(1)) Call ok(isNull(Len(null)), "Len(null) = " & Len(null)) Call ok(Len(empty) = 0, "Len(empty) = " & Len(empty)) +Call ok(getVT(Len("abc")) = "VT_I4", "getVT(Len(abc)) = " & getVT(Len("abc"))) Call ok(Space(1) = " ", "Space(1) = " & Space(1) & """") Call ok(Space(0) = "", "Space(0) = " & Space(0) & """") diff --git a/dlls/vbscript/tests/error.vbs b/dlls/vbscript/tests/error.vbs index 830344c..3bf03df 100644 --- a/dlls/vbscript/tests/error.vbs +++ b/dlls/vbscript/tests/error.vbs @@ -75,6 +75,7 @@ const RPC_S_SERVER_UNAVAILABLE = &h800706BA& const CO_E_SERVER_EXEC_FAILURE = &h80080005& call ok(Err.Number = 0, "Err.Number = " & Err.Number) +call ok(getVT(Err.Number) = "VT_I4", "getVT(Err.Number) = " & getVT(Err.Number)) dim calledFunc

1 0

Nikolay Sivov : usp10: Use proper type for return value.
by Alexandre Julliard 22 Sep '14

22 Sep '14

Module: wine Branch: master Commit: e65307f29f18fff724d2630e6263169a5a4d9f46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e65307f29f18fff724d2630e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 22 19:21:47 2014 +0400 usp10: Use proper type for return value. --- dlls/usp10/usp10_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 77bb20d..504bd55 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -208,7 +208,7 @@ static inline BOOL is_consonant( int type ) return (type == lex_Ra || type == lex_Consonant); } -static inline WCHAR get_table_entry( const unsigned short *table, WCHAR ch ) +static inline unsigned short get_table_entry( const unsigned short *table, WCHAR ch ) { return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; }

1 0

Nikolay Sivov : dwrite: Use proper type for return value.
by Alexandre Julliard 22 Sep '14

22 Sep '14

Module: wine Branch: master Commit: 2c6cc0be468d8668043ed414218aa020226f8905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6cc0be468d8668043ed4142… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 22 19:22:27 2014 +0400 dwrite: Use proper type for return value. --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 740b61e..bec0235 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -381,7 +381,7 @@ static inline void set_break_condition(UINT32 pos, enum BreakConditionLocation l } } -static inline WCHAR get_table_entry(const unsigned short *table, WCHAR ch) +static inline unsigned short get_table_entry(const unsigned short *table, WCHAR ch) { return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; }

1 0

Marcus Meissner : wbemprox: Fixed a memory leak in get_sd (Coverity).
by Alexandre Julliard 22 Sep '14

22 Sep '14

Module: wine Branch: master Commit: e0905d780e1d94a24659f76b59562d659066a15d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0905d780e1d94a24659f76b5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 21 14:23:08 2014 +0200 wbemprox: Fixed a memory leak in get_sd (Coverity). --- dlls/wbemprox/security.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/security.c b/dlls/wbemprox/security.c index 0ff6c0b..d3057e0 100644 --- a/dlls/wbemprox/security.c +++ b/dlls/wbemprox/security.c @@ -120,8 +120,11 @@ static HRESULT get_sd( SECURITY_DESCRIPTOR **sd, DWORD *size ) if (SUCCEEDED(hr)) { - if (!MakeSelfRelativeSD(&absolute_sd, *sd, size)) + if (!MakeSelfRelativeSD(&absolute_sd, *sd, size)) { + HeapFree( GetProcessHeap(), 0, *sd ); + *sd = NULL; hr = E_FAIL; + } } return hr;

1 0

Qian Hong : mshtml: Using UTF-8 as default charset in bind_mon_to_wstr.
by Alexandre Julliard 22 Sep '14

22 Sep '14

Module: wine Branch: master Commit: 2eeffe8acd829ebeb4bbabc6c7e1ebd0725e40ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eeffe8acd829ebeb4bbabc6c… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Sep 20 00:48:00 2014 +0800 mshtml: Using UTF-8 as default charset in bind_mon_to_wstr. --- dlls/mshtml/navigate.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index c29e211..195f82e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -938,7 +938,6 @@ static const BSCallbackVtbl BufferBSCVtbl = { HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) { BufferBSC *bsc; - int cp = CP_ACP; WCHAR *text; HRESULT hres; @@ -981,19 +980,17 @@ HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) break; case BOM_UTF8: - cp = CP_UTF8; - /* fallthrough */ default: { DWORD len; - len = MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, NULL, 0); + len = MultiByteToWideChar(CP_UTF8, 0, bsc->buf, bsc->bsc.readed, NULL, 0); text = heap_alloc((len+1)*sizeof(WCHAR)); if(!text) { hres = E_OUTOFMEMORY; break; } - MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, text, len); + MultiByteToWideChar(CP_UTF8, 0, bsc->buf, bsc->bsc.readed, text, len); text[len] = 0; } }

1 0