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

Francois Gouget : winex11.drv: We must include Xlib.h before Xrandr.h.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 98c605d6c7e5679d2eb7903c1ee3434ae1775134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c605d6c7e5679d2eb7903c1… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 11 16:24:29 2012 +0200 winex11.drv: We must include Xlib.h before Xrandr.h. --- dlls/winex11.drv/xrandr.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index f818a61..53d16c9 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(xrandr); #ifdef SONAME_LIBXRANDR +#include <X11/Xlib.h> #include <X11/extensions/Xrandr.h> #include "x11drv.h"

1 0

Jacek Caban : vbscript: Added LCase implementation.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: a1428c78b0799aec481bca0253cfc94c19b7e3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1428c78b0799aec481bca025… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 11 10:23:37 2012 +0200 vbscript: Added LCase implementation. --- dlls/vbscript/global.c | 29 +++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 14 ++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index a812d91..c3b650f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -582,8 +582,33 @@ static HRESULT Global_StrComp(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, V static HRESULT Global_LCase(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + if(V_VT(arg) == VT_NULL) { + if(res) + V_VT(res) = VT_NULL; + return S_OK; + } + + hres = to_string(arg, &str); + if(FAILED(hres)) + return hres; + + if(res) { + WCHAR *ptr; + + for(ptr = str; *ptr; ptr++) + *ptr = tolowerW(*ptr); + + V_VT(res) = VT_BSTR; + V_BSTR(res) = str; + }else { + SysFreeString(str); + } + return S_OK; } static HRESULT Global_UCase(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 fe6f9b0..4914e7a 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -159,4 +159,18 @@ TestUCase 0.123, "0.123" TestUCase Empty, "" Call ok(getVT(UCase(Null)) = "VT_NULL", "getVT(UCase(Null)) = " & getVT(UCase(Null))) +Sub TestLCase(str, ex) + x = LCase(str) + Call ok(x = ex, "LCase(" & str & ") = " & x & " expected " & ex) +End Sub + +TestLCase "test", "test" +TestLCase "123aBC?", "123abc?" +TestLCase "", "" +TestLCase 1, "1" +TestLCase true, "true" +TestLCase 0.123, "0.123" +TestLCase Empty, "" +Call ok(getVT(LCase(Null)) = "VT_NULL", "getVT(LCase(Null)) = " & getVT(LCase(Null))) + Call reportSuccess()

1 0

Hans Leidekker : wbemprox: Add support for evaluating string comparisons.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: bd1bdb167d528b2d57d0d49bdf29be5f7273c1d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1bdb167d528b2d57d0d49bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 11 14:02:16 2012 +0200 wbemprox: Add support for evaluating string comparisons. --- dlls/wbemprox/query.c | 58 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 50 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 798fda3..1d2eca7 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -226,9 +226,9 @@ void destroy_view( struct view *view ) heap_free( view ); } -static BOOL eval_like( LONGLONG lval, LONGLONG rval ) +static BOOL eval_like( const WCHAR *lstr, const WCHAR *rstr ) { - const WCHAR *p = (const WCHAR *)(INT_PTR)lval, *q = (const WCHAR *)(INT_PTR)rval; + const WCHAR *p = lstr, *q = rstr; while (*p && *q) { @@ -244,10 +244,48 @@ static BOOL eval_like( LONGLONG lval, LONGLONG rval ) return TRUE; } +static HRESULT eval_strcmp( UINT op, const WCHAR *lstr, const WCHAR *rstr, LONGLONG *val ) +{ + switch (op) + { + case OP_EQ: + *val = !strcmpW( lstr, rstr ); + break; + case OP_GT: + *val = strcmpW( lstr, rstr ) > 0; + break; + case OP_LT: + *val = strcmpW( lstr, rstr ) < 0; + break; + case OP_LE: + *val = strcmpW( lstr, rstr ) <= 0; + break; + case OP_GE: + *val = strcmpW( lstr, rstr ) >= 0; + break; + case OP_NE: + *val = strcmpW( lstr, rstr ); + break; + case OP_LIKE: + *val = eval_like( lstr, rstr ); + break; + default: + ERR("unhandled operator %u\n", op); + return WBEM_E_INVALID_QUERY; + } + return S_OK; +} + +static inline BOOL is_strcmp( const struct complex_expr *expr ) +{ + return ((expr->left->type == EXPR_PROPVAL && expr->right->type == EXPR_SVAL) || + (expr->left->type == EXPR_SVAL && expr->right->type == EXPR_PROPVAL)); +} + static HRESULT eval_cond( const struct table *, UINT, const struct expr *, LONGLONG * ); -static BOOL eval_binary( const struct table *table, UINT row, const struct complex_expr *expr, - LONGLONG *val ) +static HRESULT eval_binary( const struct table *table, UINT row, const struct complex_expr *expr, + LONGLONG *val ) { HRESULT lret, rret; LONGLONG lval, rval; @@ -256,6 +294,13 @@ static BOOL eval_binary( const struct table *table, UINT row, const struct compl rret = eval_cond( table, row, expr->right, &rval ); if (lret != S_OK || rret != S_OK) return WBEM_E_INVALID_QUERY; + if (is_strcmp( expr )) + { + const WCHAR *lstr = (const WCHAR *)(INT_PTR)lval; + const WCHAR *rstr = (const WCHAR *)(INT_PTR)rval; + + return eval_strcmp( expr->op, lstr, rstr, val ); + } switch (expr->op) { case OP_EQ: @@ -282,11 +327,8 @@ static BOOL eval_binary( const struct table *table, UINT row, const struct compl case OP_NE: *val = (lval != rval); break; - case OP_LIKE: - *val = eval_like( lval, rval ); - break; default: - ERR("unknown operator %u\n", expr->op); + ERR("unhandled operator %u\n", expr->op); return WBEM_E_INVALID_QUERY; } return S_OK;

1 0

Jacek Caban : vbscript: Added UCase implementation.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 0708b77b9b50a28e818562c727fa32e7d93e024a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0708b77b9b50a28e818562c72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 11 10:23:22 2012 +0200 vbscript: Added UCase implementation. --- dlls/vbscript/global.c | 53 +++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/tests/api.vbs | 14 +++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index eaf4383..a812d91 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -122,6 +122,30 @@ static HRESULT to_int(VARIANT *v, int *ret) return S_OK; } +static HRESULT to_string(VARIANT *v, BSTR *ret) +{ + static const WCHAR trueW[] = {'T','r','u','e',0}; + static const WCHAR falseW[] = {'F','a','l','s','e',0}; + + switch(V_VT(v)) { + case VT_BOOL: + *ret = SysAllocString(V_BOOL(v) ? trueW : falseW); + return *ret ? S_OK : E_OUTOFMEMORY; + default: { + VARIANT dst; + HRESULT hres; + + V_VT(&dst) = VT_EMPTY; + hres = VariantChangeTypeEx(&dst, v, MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT), 0, VT_BSTR); + if(FAILED(hres)) + return hres; + + *ret = V_BSTR(&dst); + return S_OK; + } + } +} + static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) { IInternetHostSecurityManager *secmgr = NULL; @@ -564,8 +588,33 @@ static HRESULT Global_LCase(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_UCase(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + if(V_VT(arg) == VT_NULL) { + if(res) + V_VT(res) = VT_NULL; + return S_OK; + } + + hres = to_string(arg, &str); + if(FAILED(hres)) + return hres; + + if(res) { + WCHAR *ptr; + + for(ptr = str; *ptr; ptr++) + *ptr = toupperW(*ptr); + + V_VT(res) = VT_BSTR; + V_BSTR(res) = str; + }else { + SysFreeString(str); + } + return S_OK; } static HRESULT Global_LTrim(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 67c365d..fe6f9b0 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -145,4 +145,18 @@ TestMid2 "test", 2, "est" TestMid2 "test", 4, "t" TestMid2 "test", 5, "" +Sub TestUCase(str, ex) + x = UCase(str) + Call ok(x = ex, "UCase(" & str & ") = " & x & " expected " & ex) +End Sub + +TestUCase "test", "TEST" +TestUCase "123aBC?", "123ABC?" +TestUCase "", "" +TestUCase 1, "1" +TestUCase true, "TRUE" +TestUCase 0.123, "0.123" +TestUCase Empty, "" +Call ok(getVT(UCase(Null)) = "VT_NULL", "getVT(UCase(Null)) = " & getVT(UCase(Null))) + Call reportSuccess()

1 0

Francois Gouget : gdi32: Remove an unused wgl debugging channel.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 7b782d435ea623c0707c91804c45102dcff9b6a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b782d435ea623c0707c91804… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 11 16:24:17 2012 +0200 gdi32: Remove an unused wgl debugging channel. --- dlls/gdi32/opengl.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 1db261e..cafe3c3 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -34,9 +34,7 @@ #include "winternl.h" #include "winnt.h" #include "gdi_private.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(wgl); static const WCHAR opengl32W[] = {'o','p','e','n','g','l','3','2','.','d','l','l',0}; static HMODULE opengl32;

1 0

Detlef Riekenberg : credui: Add a stub for CredUIInitControls.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: eec0adac1461980ba56dc54fcde22689b23300c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eec0adac1461980ba56dc54fc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jul 6 00:35:36 2012 +0200 credui: Add a stub for CredUIInitControls. --- dlls/credui/credui.spec | 2 +- dlls/credui/credui_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui.spec b/dlls/credui/credui.spec index 974849b..d32a602 100644 --- a/dlls/credui/credui.spec +++ b/dlls/credui/credui.spec @@ -2,7 +2,7 @@ @ stub CredUICmdLinePromptForCredentialsW @ stub CredUIConfirmCredentialsA @ stdcall CredUIConfirmCredentialsW(wstr long) -@ stub CredUIInitControls +@ stdcall CredUIInitControls() @ stub CredUIParseUserNameA @ stdcall CredUIParseUserNameW(wstr ptr long ptr long) @ stub CredUIPromptForCredentialsA diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 9d09b03..1409c20 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -800,3 +800,12 @@ DWORD WINAPI CredUIReadSSOCredW(PCWSTR pszRealm, PWSTR *ppszUsername) *ppszUsername = NULL; return ERROR_NOT_FOUND; } + +/****************************************************************************** + * CredUIInitControls [CREDUI.@] + */ +BOOL WINAPI CredUIInitControls(void) +{ + FIXME("() stub\n"); + return TRUE; +}

1 0

Dan Kegel : wininet: Don't evaluate netconn_get_avail_data() twice in netconn_read().
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 766eecaf07fb66ff4df4a89e49661d9d4e61073b URL: http://source.winehq.org/git/wine.git/?a=commit;h=766eecaf07fb66ff4df4a89e4… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Jul 7 17:34:52 2012 -0700 wininet: Don't evaluate netconn_get_avail_data() twice in netconn_read(). --- dlls/wininet/http.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7f82cb8..28f82a3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2317,7 +2317,7 @@ static BOOL end_of_read_data( http_request_t *req ) /* fetch some more data into the read buffer (the read section must be held) */ static DWORD refill_read_buffer(http_request_t *req, read_mode_t read_mode, DWORD *read_bytes) { - DWORD res, read=0; + DWORD res, read=0, want; if(req->read_size == sizeof(req->read_buf)) return ERROR_SUCCESS; @@ -2328,8 +2328,10 @@ static DWORD refill_read_buffer(http_request_t *req, read_mode_t read_mode, DWOR req->read_pos = 0; } + want = sizeof(req->read_buf) - req->read_size; res = req->data_stream->vtbl->read(req->data_stream, req, req->read_buf+req->read_size, - sizeof(req->read_buf)-req->read_size, &read, read_mode); + want, &read, read_mode); + assert(read <= want); req->read_size += read; TRACE("read %u bytes, read_size %u\n", read, req->read_size); @@ -2370,8 +2372,11 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, size = min(size, netconn_stream->content_length-netconn_stream->content_read); - if(read_mode == READMODE_NOBLOCK) - size = min(size, netconn_get_avail_data(stream, req)); + if(read_mode == READMODE_NOBLOCK) { + DWORD avail = netconn_get_avail_data(stream, req); + if (size > avail) + size = avail; + } if(size && req->netconn) { if(NETCON_recv(req->netconn, buf, size, read_mode == READMODE_SYNC ? MSG_WAITALL : 0, &len) != ERROR_SUCCESS)

1 0

Aric Stewart : comdlg32: Do not use GetDlgItemText to get combo box text during an CBN_SELCHANGE notification .
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: aefd9b553327f33c4272ad05d053ef30adb8f191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aefd9b553327f33c4272ad05d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 3 10:21:47 2012 -0500 comdlg32: Do not use GetDlgItemText to get combo box text during an CBN_SELCHANGE notification. --- dlls/comdlg32/printdlg.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 435d2e8..57b077b 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1783,9 +1783,13 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, /* FALLTHROUGH */ case cmb4: /* Printer combobox */ if (HIWORD(wParam)==CBN_SELCHANGE) { - char PrinterName[256]; - GetDlgItemTextA(hDlg, LOWORD(wParam), PrinterName, 255); + char *PrinterName; + INT index = SendDlgItemMessageW(hDlg, LOWORD(wParam), CB_GETCURSEL, 0, 0); + INT length = SendDlgItemMessageW(hDlg, LOWORD(wParam), CB_GETLBTEXTLEN, index, 0); + PrinterName = HeapAlloc(GetProcessHeap(),0,length+1); + SendDlgItemMessageA(hDlg, LOWORD(wParam), CB_GETLBTEXT, index, (LPARAM)PrinterName); PRINTDLG_ChangePrinterA(hDlg, PrinterName, PrintStructures); + HeapFree(GetProcessHeap(),0,PrinterName); } break; @@ -1934,9 +1938,14 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, /* FALLTHROUGH */ case cmb4: /* Printer combobox */ if (HIWORD(wParam)==CBN_SELCHANGE) { - WCHAR PrinterName[256]; - GetDlgItemTextW(hDlg, LOWORD(wParam), PrinterName, 255); + WCHAR *PrinterName; + INT index = SendDlgItemMessageW(hDlg, LOWORD(wParam), CB_GETCURSEL, 0, 0); + INT length = SendDlgItemMessageW(hDlg, LOWORD(wParam), CB_GETLBTEXTLEN, index, 0); + + PrinterName = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(length+1)); + SendDlgItemMessageW(hDlg, LOWORD(wParam), CB_GETLBTEXT, index, (LPARAM)PrinterName); PRINTDLG_ChangePrinterW(hDlg, PrinterName, PrintStructures); + HeapFree(GetProcessHeap(),0,PrinterName); } break; @@ -3378,10 +3387,14 @@ static BOOL pagesetup_wm_command(HWND hDlg, WPARAM wParam, LPARAM lParam, pagese case cmb1: /* Printer combo */ if(msg == CBN_SELCHANGE) { - WCHAR name[256]; - GetDlgItemTextW(hDlg, id, name, sizeof(name) / sizeof(name[0])); + WCHAR *name; + INT index = SendDlgItemMessageW(hDlg, id, CB_GETCURSEL, 0, 0); + INT length = SendDlgItemMessageW(hDlg, id, CB_GETLBTEXTLEN, index, 0); + name = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(length+1)); + SendDlgItemMessageW(hDlg, id, CB_GETLBTEXT, index, (LPARAM)name); pagesetup_change_printer(name, data); pagesetup_init_combos(hDlg, data); + HeapFree(GetProcessHeap(),0,name); } break; case cmb2: /* Paper combo */

1 0

Jacek Caban : mshtml: Simplify ASServiceProvider_QueryService.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 8bb4a6b3ea242cd6434c2f95493532d37a11900e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb4a6b3ea242cd6434c2f954… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 11 13:51:18 2012 +0200 mshtml: Simplify ASServiceProvider_QueryService. --- dlls/mshtml/script.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index d742b99..7b39963 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -573,10 +573,10 @@ static HRESULT WINAPI ASServiceProvider_QueryService(IServiceProvider *iface, RE if(IsEqualGUID(&SID_SInternetHostSecurityManager, guidService)) { TRACE("(%p)->(SID_SInternetHostSecurityManager)\n", This); - if(!This->window || !This->window->base.inner_window->doc) + if(!This->window || !This->window->doc) return E_NOINTERFACE; - return IInternetHostSecurityManager_QueryInterface(&This->window->base.inner_window->doc->IInternetHostSecurityManager_iface, + return IInternetHostSecurityManager_QueryInterface(&This->window->doc->IInternetHostSecurityManager_iface, riid, ppv); }

1 0

Jacek Caban : mshtml: Moved binding list to HTMLInnerWindow.
by Alexandre Julliard July 11, 2012

July 11, 2012

Module: wine Branch: master Commit: 94f0f884fdbe0a728695486db59acff1d9a0b199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f0f884fdbe0a728695486db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 11 13:51:00 2012 +0200 mshtml: Moved binding list to HTMLInnerWindow. --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmlwindow.c | 3 +- dlls/mshtml/mshtml_private.h | 9 ++++--- dlls/mshtml/navigate.c | 51 +++++++++++++++++++---------------------- dlls/mshtml/nsio.c | 6 ++-- dlls/mshtml/persist.c | 2 +- dlls/mshtml/script.c | 2 +- 8 files changed, 37 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=94f0f884fdbe0a7286954…

1 0