January 2009 - Wine-Commits

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put borderLeftStyle.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 44de20a0c7fb8c068e9c3af6a040afd91b890bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44de20a0c7fb8c068e9c3af6a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 13 18:30:17 2009 +1100 mshtml: Implement IHTMLStyle get/put borderLeftStyle. --- dlls/mshtml/htmlstyle.c | 41 ++++++++++++++++-- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3453f7b..3c79ac4 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -45,6 +45,8 @@ static const WCHAR attrBorder[] = {'b','o','r','d','e','r',0}; static const WCHAR attrBorderLeft[] = {'b','o','r','d','e','r','-','l','e','f','t',0}; +static const WCHAR attrBorderLeftStyle[] = + {'b','o','r','d','e','r','-','l','e','f','t','-','s','t','y','l','e',0}; static const WCHAR attrBorderWidth[] = {'b','o','r','d','e','r','-','w','i','d','t','h',0}; static const WCHAR attrColor[] = @@ -105,6 +107,7 @@ static const struct{ {attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE}, {attrBorder, DISPID_IHTMLSTYLE_BORDER}, {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, + {attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE}, {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, @@ -413,6 +416,32 @@ static HRESULT get_nsstyle_pos(HTMLStyle *This, styleid_t sid, float *p) return hres; } +static BOOL is_valid_border_style(BSTR v) +{ + static const WCHAR styleNone[] = {'n','o','n','e',0}; + static const WCHAR styleDotted[] = {'d','o','t','t','e','d',0}; + static const WCHAR styleDashed[] = {'d','a','s','h','e','d',0}; + static const WCHAR styleSolid[] = {'s','o','l','i','d',0}; + static const WCHAR styleDouble[] = {'d','o','u','b','l','e',0}; + static const WCHAR styleGroove[] = {'g','r','o','o','v','e',0}; + static const WCHAR styleRidge[] = {'r','i','d','g','e',0}; + static const WCHAR styleInset[] = {'i','n','s','e','t',0}; + static const WCHAR styleOutset[] = {'o','u','t','s','e','t',0}; + + TRACE("%s\n", debugstr_w(v)); + + if(!v || strcmpiW(v, styleNone) == 0 || strcmpiW(v, styleDotted) == 0 || + strcmpiW(v, styleDashed) == 0 || strcmpiW(v, styleSolid) == 0 || + strcmpiW(v, styleDouble) == 0 || strcmpiW(v, styleGroove) == 0 || + strcmpiW(v, styleRidge) == 0 || strcmpiW(v, styleInset) == 0 || + strcmpiW(v, styleOutset) == 0 ) + { + return TRUE; + } + + return FALSE; +} + #define HTMLSTYLE_THIS(iface) DEFINE_THIS(HTMLStyle, HTMLStyle, iface) static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, void **ppv) @@ -1473,15 +1502,19 @@ static HRESULT WINAPI HTMLStyle_get_borderBottomStyle(IHTMLStyle *iface, BSTR *p static HRESULT WINAPI HTMLStyle_put_borderLeftStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!is_valid_border_style(v)) + return E_INVALIDARG; + + return set_style_attr(This, STYLEID_BORDER_LEFT_STYLE, v, 0); } static HRESULT WINAPI HTMLStyle_get_borderLeftStyle(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_attr(This, STYLEID_BORDER_LEFT_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_width(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 2dedb03..6ea5136 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -36,6 +36,7 @@ typedef enum { STYLEID_BACKGROUND_IMAGE, STYLEID_BORDER, STYLEID_BORDER_LEFT, + STYLEID_BORDER_LEFT_STYLE, STYLEID_BORDER_WIDTH, STYLEID_COLOR, STYLEID_CURSOR, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 03068d1..3e9da25 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1790,6 +1790,108 @@ static void _test_doc_set_title(unsigned line, IHTMLDocument2 *doc, const char * SysFreeString(tmp); } +#define test_border_styles(p, n) _test_border_styles(__LINE__, p, n) +static void _test_border_styles(unsigned line, IHTMLStyle *pStyle, BSTR Name) +{ + HRESULT hres; + DISPID dispid; + + hres = IHTMLStyle_GetIDsOfNames(pStyle, &IID_NULL, (LPOLESTR*)&Name, 1, + LOCALE_USER_DEFAULT, &dispid); + ok_(__FILE__,line) (hres == S_OK, "GetIDsOfNames: %08x\n", hres); + if(hres == S_OK) + { + DISPPARAMS params = {NULL,NULL,0,0}; + DISPID dispidNamed = DISPID_PROPERTYPUT; + VARIANT ret; + VARIANT vDefault; + VARIANTARG arg; + + hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYGET, &params, &vDefault, NULL, NULL); + ok_(__FILE__,line) (hres == S_OK, "get_default. ret: %08x\n", hres); + + params.cArgs = 1; + params.cNamedArgs = 1; + params.rgdispidNamedArgs = &dispidNamed; + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = a2bstr("none"); + params.rgvarg = &arg; + hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL); + ok_(__FILE__,line) (hres == S_OK, "none. ret: %08x\n", hres); + VariantClear(&arg); + + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = a2bstr("dotted"); + hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL); + ok_(__FILE__,line) (hres == S_OK, "dotted. ret: %08x\n", hres); + VariantClear(&arg); + + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = a2bstr("dashed"); + hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL); + ok_(__FILE__,line) (hres == S_OK, "dashed. ret: %08x\n", hres); + VariantClear(&arg); + + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = a2bstr("solid"); + hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL); + ok_(__FILE__,line) (hres == S_OK, "solid. ret: %08x\n", hres); + VariantClear(&arg); + + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = a2bstr("double"); + hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL); + ok_(__FILE__,line) (hres == S_OK, "double. ret: %08x\n", hres); + VariantClear(&arg); + + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = a2bstr("groove"); + hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL); + ok_(__FILE__,line) (hres == S_OK, "groove. ret: %08x\n", hres); + VariantClear(&arg); + + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = a2bstr("ridge"); + hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL); + ok_(__FILE__,line) (hres == S_OK, "ridge. ret: %08x\n", hres); + VariantClear(&arg); + + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = a2bstr("inset"); + hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL); + ok_(__FILE__,line) (hres == S_OK, "inset. ret: %08x\n", hres); + VariantClear(&arg); + + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = a2bstr("outset"); + hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL); + ok_(__FILE__,line) (hres == S_OK, "outset. ret: %08x\n", hres); + VariantClear(&arg); + + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = a2bstr("invalid"); + hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL); + ok_(__FILE__,line) (FAILED(hres), "invalid value passed.\n"); + VariantClear(&arg); + + params.rgvarg = &vDefault; + hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL); + ok_(__FILE__,line) (hres == S_OK, "default. ret: %08x\n", hres); + } +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -2786,6 +2888,10 @@ static void test_default_style(IHTMLStyle *style) SysFreeString(str); + str = a2bstr("borderLeftStyle"); + test_border_styles(style, str); + SysFreeString(str); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Alexandre Julliard : user32: Use the message_data_t union when receiving a message.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 0ffd26ab17874db18c86e7acc72fd2de6a18ff36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ffd26ab17874db18c86e7acc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 15 12:50:59 2009 +0100 user32: Use the message_data_t union when receiving a message. --- dlls/user32/message.c | 46 +++++++++++++++++++-------------------- include/wine/server_protocol.h | 1 + server/protocol.def | 1 + 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 5719664..aad6b75 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2038,6 +2038,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags { NTSTATUS res; size_t size = 0; + const message_data_t *msg_data = buffer; SERVER_START_REQ( get_message ) { @@ -2093,27 +2094,24 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags info.flags = ISMEX_CALLBACK; break; case MSG_CALLBACK_RESULT: - if (size >= sizeof(struct callback_msg_data)) - { - const struct callback_msg_data *data = buffer; - call_sendmsg_callback( wine_server_get_ptr(data->callback), info.msg.hwnd, - info.msg.message, data->data, data->result ); - } + if (size >= sizeof(msg_data->callback)) + call_sendmsg_callback( wine_server_get_ptr(msg_data->callback.callback), + info.msg.hwnd, info.msg.message, + msg_data->callback.data, msg_data->callback.result ); continue; case MSG_WINEVENT: - if (size >= sizeof(struct winevent_msg_data)) + if (size >= sizeof(msg_data->winevent)) { WINEVENTPROC hook_proc; - const struct winevent_msg_data *data = buffer; - hook_proc = wine_server_get_ptr( data->hook_proc ); - size -= sizeof(*data); + hook_proc = wine_server_get_ptr( msg_data->winevent.hook_proc ); + size -= sizeof(msg_data->winevent); if (size) { WCHAR module[MAX_PATH]; size = min( size, (MAX_PATH - 1) * sizeof(WCHAR) ); - memcpy( module, buffer, size ); + memcpy( module, &msg_data->winevent + 1, size ); module[size / sizeof(WCHAR)] = 0; if (!(hook_proc = get_hook_proc( hook_proc, module ))) { @@ -2125,17 +2123,18 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags if (TRACE_ON(relay)) DPRINTF( "%04x:Call winevent proc %p (hook=%04x,event=%x,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04x,time=%x)\n", GetCurrentThreadId(), hook_proc, - data->hook, info.msg.message, info.msg.hwnd, info.msg.wParam, - info.msg.lParam, data->tid, info.msg.time); + msg_data->winevent.hook, info.msg.message, info.msg.hwnd, info.msg.wParam, + info.msg.lParam, msg_data->winevent.tid, info.msg.time); - hook_proc( wine_server_ptr_handle( data->hook ), info.msg.message, - info.msg.hwnd, info.msg.wParam, info.msg.lParam, data->tid, info.msg.time ); + hook_proc( wine_server_ptr_handle( msg_data->winevent.hook ), info.msg.message, + info.msg.hwnd, info.msg.wParam, info.msg.lParam, + msg_data->winevent.tid, info.msg.time ); if (TRACE_ON(relay)) DPRINTF( "%04x:Ret winevent proc %p (hook=%04x,event=%x,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04x,time=%x)\n", GetCurrentThreadId(), hook_proc, - data->hook, info.msg.message, info.msg.hwnd, info.msg.wParam, - info.msg.lParam, data->tid, info.msg.time); + msg_data->winevent.hook, info.msg.message, info.msg.hwnd, info.msg.wParam, + info.msg.lParam, msg_data->winevent.tid, info.msg.time); } continue; case MSG_OTHER_PROCESS: @@ -2149,13 +2148,12 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags } break; case MSG_HARDWARE: - if (size >= sizeof(struct hardware_msg_data)) + if (size >= sizeof(msg_data->hardware)) { - const struct hardware_msg_data *data = buffer; - info.msg.pt.x = data->x; - info.msg.pt.y = data->y; - hw_id = data->hw_id; - if (!process_hardware_message( &info.msg, hw_id, data->info, + info.msg.pt.x = msg_data->hardware.x; + info.msg.pt.y = msg_data->hardware.y; + hw_id = msg_data->hardware.hw_id; + if (!process_hardware_message( &info.msg, hw_id, msg_data->hardware.info, hwnd, first, last, flags & PM_REMOVE )) { TRACE("dropping msg %x\n", info.msg.message ); @@ -2164,7 +2162,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags *msg = info.msg; thread_info->GetMessagePosVal = MAKELONG( info.msg.pt.x, info.msg.pt.y ); thread_info->GetMessageTimeVal = info.msg.time; - thread_info->GetMessageExtraInfoVal = data->info; + thread_info->GetMessageExtraInfoVal = msg_data->hardware.info; if (buffer != local_buffer) HeapFree( GetProcessHeap(), 0, buffer ); HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, flags & PM_REMOVE, (LPARAM)msg, TRUE ); return TRUE; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index de80fc2..25d7cbd 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -202,6 +202,7 @@ struct winevent_msg_data typedef union { unsigned char bytes[1]; + struct hardware_msg_data hardware; struct callback_msg_data callback; struct winevent_msg_data winevent; } message_data_t; diff --git a/server/protocol.def b/server/protocol.def index 6d6be5b..b989472 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -218,6 +218,7 @@ struct winevent_msg_data typedef union { unsigned char bytes[1]; /* raw data for sent messages */ + struct hardware_msg_data hardware; struct callback_msg_data callback; struct winevent_msg_data winevent; } message_data_t;

1 0

Huw Davies : comdlg32: Remove a couple of obsolete WARN()s.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 358ab47023a319f24a2231d38ad91ed46c3ecd34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=358ab47023a319f24a2231d38… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 15 10:45:34 2009 +0000 comdlg32: Remove a couple of obsolete WARN()s. --- dlls/comdlg32/printdlg.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 6534ccc..ffc4fb3 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -604,10 +604,6 @@ static BOOL PRINTDLG_SetUpPaperComboBoxA(HWND hDlg, fwCapability_Words = DC_BINS; } - /* for some printer drivers, DeviceCapabilities calls a VXD to obtain the - * paper settings. As Wine doesn't allow VXDs, this results in a crash. - */ - WARN(" if your printer driver uses VXDs, expect a crash now!\n"); NrOfEntries = DeviceCapabilitiesA(PrinterName, PortName, fwCapability_Names, NULL, dm); if (NrOfEntries == 0) @@ -714,10 +710,6 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, fwCapability_Words = DC_BINS; } - /* for some printer drivers, DeviceCapabilities calls a VXD to obtain the - * paper settings. As Wine doesn't allow VXDs, this results in a crash. - */ - WARN(" if your printer driver uses VXDs, expect a crash now!\n"); NrOfEntries = DeviceCapabilitiesW(PrinterName, PortName, fwCapability_Names, NULL, dm); if (NrOfEntries == 0)

1 0

Huw Davies : comdlg32: Set the margin edit controls using unicode functions .
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: ef5daf38e7f50624c8bca7993f5da46fa82c4f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5daf38e7f50624c8bca7993… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 15 10:45:29 2009 +0000 comdlg32: Set the margin edit controls using unicode functions. --- dlls/comdlg32/printdlg.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index d28c5fe..6534ccc 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2417,18 +2417,17 @@ _c_inch2size(PAGESETUPDLGA *dlga,DWORD size) { return (size*254)/100; } -static void -_c_size2strA(PageSetupDataA *pda,DWORD size,LPSTR strout) { - strcpy(strout,"<undef>"); - if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) { - sprintf(strout,"%d",(size)/100); - return; - } - else { - sprintf(strout,"%din",(size)/1000); - return; - } +static void size2str(PageSetupDataA *pda, DWORD size, LPWSTR strout) +{ + static const WCHAR metric_format[] = {'%','d',0}; + static const WCHAR imperial_format[] = {'%','d','i','n',0}; + + if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) + wsprintfW(strout, metric_format, size / 100); + else + wsprintfW(strout, imperial_format, size / 1000); } + static void _c_size2strW(PageSetupDataW *pdw,DWORD size,LPWSTR strout) { static const char mm_fmt[] = "%.2f mm"; @@ -3263,7 +3262,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) HWND hDrawWnd; if (uMsg == WM_INITDIALOG) { /*Init dialog*/ - char str[100]; + WCHAR str[100]; pda = (PageSetupDataA*)lParam; pda->hDlg = hDlg; /* saving handle to main window to PageSetupDataA structure */ @@ -3324,14 +3323,14 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) pda->dlga->rtMargin.right = size; pda->dlga->rtMargin.bottom = size; } - _c_size2strA(pda,pda->dlga->rtMargin.left,str); - SetDlgItemTextA(hDlg,edt4,str); - _c_size2strA(pda,pda->dlga->rtMargin.top,str); - SetDlgItemTextA(hDlg,edt5,str); - _c_size2strA(pda,pda->dlga->rtMargin.right,str); - SetDlgItemTextA(hDlg,edt6,str); - _c_size2strA(pda,pda->dlga->rtMargin.bottom,str); - SetDlgItemTextA(hDlg,edt7,str); + size2str(pda, pda->dlga->rtMargin.left, str); + SetDlgItemTextW(hDlg, edt4, str); + size2str(pda, pda->dlga->rtMargin.top, str); + SetDlgItemTextW(hDlg, edt5, str); + size2str(pda, pda->dlga->rtMargin.right, str); + SetDlgItemTextW(hDlg, edt6, str); + size2str(pda, pda->dlga->rtMargin.bottom, str); + SetDlgItemTextW(hDlg, edt7, str); /* if paper disabled */ if (pda->dlga->Flags & PSD_DISABLEPAPER) {

1 0

Huw Davies : comdlg32: Simplify the margin initialization.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 680e5112e3a103d548e481a7f3c97922f45a059d URL: http://source.winehq.org/git/wine.git/?a=commit;h=680e5112e3a103d548e481a7f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 15 10:45:25 2009 +0000 comdlg32: Simplify the margin initialization. --- dlls/comdlg32/printdlg.c | 33 +++++++++++++++------------------ 1 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index a8c5b4b..d28c5fe 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3263,6 +3263,8 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) HWND hDrawWnd; if (uMsg == WM_INITDIALOG) { /*Init dialog*/ + char str[100]; + pda = (PageSetupDataA*)lParam; pda->hDlg = hDlg; /* saving handle to main window to PageSetupDataA structure */ @@ -3311,31 +3313,26 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) EnableWindow(GetDlgItem(hDlg,rad1),FALSE); EnableWindow(GetDlgItem(hDlg,rad2),FALSE); } + /* We fill them out enabled or not */ - if (pda->dlga->Flags & PSD_MARGINS) { - char str[100]; - _c_size2strA(pda,pda->dlga->rtMargin.left,str); - SetDlgItemTextA(hDlg,edt4,str); - _c_size2strA(pda,pda->dlga->rtMargin.top,str); - SetDlgItemTextA(hDlg,edt5,str); - _c_size2strA(pda,pda->dlga->rtMargin.right,str); - SetDlgItemTextA(hDlg,edt6,str); - _c_size2strA(pda,pda->dlga->rtMargin.bottom,str); - SetDlgItemTextA(hDlg,edt7,str); - } else { + if (!(pda->dlga->Flags & PSD_MARGINS)) + { /* default is 1 inch */ DWORD size = _c_inch2size(pda->dlga,1000); - char str[20]; - _c_size2strA(pda,size,str); - SetDlgItemTextA(hDlg,edt4,str); - SetDlgItemTextA(hDlg,edt5,str); - SetDlgItemTextA(hDlg,edt6,str); - SetDlgItemTextA(hDlg,edt7,str); pda->dlga->rtMargin.left = size; pda->dlga->rtMargin.top = size; pda->dlga->rtMargin.right = size; pda->dlga->rtMargin.bottom = size; - } + } + _c_size2strA(pda,pda->dlga->rtMargin.left,str); + SetDlgItemTextA(hDlg,edt4,str); + _c_size2strA(pda,pda->dlga->rtMargin.top,str); + SetDlgItemTextA(hDlg,edt5,str); + _c_size2strA(pda,pda->dlga->rtMargin.right,str); + SetDlgItemTextA(hDlg,edt6,str); + _c_size2strA(pda,pda->dlga->rtMargin.bottom,str); + SetDlgItemTextA(hDlg,edt7,str); + /* if paper disabled */ if (pda->dlga->Flags & PSD_DISABLEPAPER) { EnableWindow(GetDlgItem(hDlg,cmb2),FALSE);

1 0

Huw Davies : comdlg32: If a measurement system isn' t specified use the default one and update the Flags field to reflect this.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 40bed9c50498f6671efc97d642bcd3873bfe5d7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bed9c50498f6671efc97d64… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 15 10:45:21 2009 +0000 comdlg32: If a measurement system isn't specified use the default one and update the Flags field to reflect this. --- dlls/comdlg32/printdlg.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index c7e7d60..a8c5b4b 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2405,10 +2405,6 @@ static DWORD _c_10mm2size(PAGESETUPDLGA *dlga,DWORD size) { if (dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) return 10*size*100/254; - /* If we don't have a flag, we can choose one. Use millimeters - * to avoid confusing me - */ - dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS; return 10*size; } @@ -2417,13 +2413,8 @@ static DWORD _c_inch2size(PAGESETUPDLGA *dlga,DWORD size) { if (dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) return size; - if (dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) + else return (size*254)/100; - /* if we don't have a flag, we can choose one. Use millimeters - * to avoid confusing me - */ - dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS; - return (size*254)/100; } static void @@ -2433,13 +2424,10 @@ _c_size2strA(PageSetupDataA *pda,DWORD size,LPSTR strout) { sprintf(strout,"%d",(size)/100); return; } - if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) { + else { sprintf(strout,"%din",(size)/1000); return; } - pda->dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS; - sprintf(strout,"%d",(size)/100); - return; } static void _c_size2strW(PageSetupDataW *pdw,DWORD size,LPWSTR strout) { @@ -2508,6 +2496,14 @@ _c_str2sizeW(const PAGESETUPDLGW *dlga, LPCWSTR strin) { return _c_str2sizeA((const PAGESETUPDLGA *)dlga, buf); } +static inline BOOL is_default_metric(void) +{ + DWORD system; + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IMEASURE | LOCALE_RETURN_NUMBER, + (LPWSTR)&system, sizeof(system)); + return system == 0; +} + static BOOL pagesetup_papersizeA(PAGESETUPDLGA *dlg, const WORD paperword, LPPOINT size) { DEVNAMES *dn; @@ -3522,6 +3518,10 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) { return FALSE; } + if(!(setupdlg->Flags & (PSD_INTHOUSANDTHSOFINCHES | PSD_INHUNDREDTHSOFMILLIMETERS))) + setupdlg->Flags |= is_default_metric() ? + PSD_INHUNDREDTHSOFMILLIMETERS : PSD_INTHOUSANDTHSOFINCHES; + /* Initialize default printer struct. If no printer device info is specified retrieve the default printer data. */ if (!setupdlg->hDevMode || !setupdlg->hDevNames)

1 0

Andrey Turkin : qmgr: Make credentials stubs return success code.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 347ab8993bf2921bf6252fac0f6774fa6c9db339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=347ab8993bf2921bf6252fac0… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Thu Jan 15 12:40:18 2009 +0300 qmgr: Make credentials stubs return success code. --- dlls/qmgr/job.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index a82b39f..3baa893 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -503,7 +503,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_SetCredentials( BG_AUTH_CREDENTIALS *cred) { FIXME("Not implemented\n"); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI BITS_IBackgroundCopyJob_RemoveCredentials( @@ -512,7 +512,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_RemoveCredentials( BG_AUTH_SCHEME scheme) { FIXME("Not implemented\n"); - return E_NOTIMPL; + return S_OK; } static const IBackgroundCopyJob2Vtbl BITS_IBackgroundCopyJob_Vtbl =

1 0

Henri Verbeet : dsound: Don't convert single samples at a time.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 5570a1da8e0a5f12c0bb7cdf1576afa9cb762dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5570a1da8e0a5f12c0bb7cdf1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 15 09:58:45 2009 +0100 dsound: Don't convert single samples at a time. This gives a minor performance improvement. --- dlls/dsound/dsound_convert.c | 250 +++++++++++++++++++++++++++++++----------- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 34 ++---- 3 files changed, 197 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5570a1da8e0a5f12c0bb7…

1 0

Henri Verbeet : wined3d: Remove some comments.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 44240eff2721b07c29b761501774bf17462f11c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44240eff2721b07c29b761501… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 15 09:58:45 2009 +0100 wined3d: Remove some comments. --- dlls/wined3d/device.c | 44 ------------------------------------------- dlls/wined3d/state.c | 8 +------ dlls/wined3d/surface_base.c | 6 +---- 3 files changed, 2 insertions(+), 56 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 74645b4..f8607ac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -576,17 +576,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, return WINED3D_OK; } -/* ************************************ -MSDN: -[in] Render targets are not lockable unless the application specifies TRUE for Lockable. Note that lockable render targets reduce performance on some graphics hardware. - -Discard - [in] Set this flag to TRUE to enable z-buffer discarding, and FALSE otherwise. - -If this flag is set, the contents of the depth stencil buffer will be invalid after calling either IDirect3DDevice9::Present or IDirect3DDevice9::SetDepthStencilSurface with a different depth surface. - -******************************** */ - static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, UINT Width, UINT Height, WINED3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IWineD3DSurface **ppSurface,WINED3DRESOURCETYPE Type, DWORD Usage, WINED3DPOOL Pool, WINED3DMULTISAMPLE_TYPE MultiSample ,DWORD MultisampleQuality, HANDLE* pSharedHandle, WINED3DSURFTYPE Impl, IUnknown *parent) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DSurfaceImpl *object; /*NOTE: impl ref allowed since this is a create function */ @@ -597,28 +586,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, U HRESULT hr; TRACE("(%p) Create surface\n",This); - - /** FIXME: Check ranges on the inputs are valid - * MSDN - * MultisampleQuality - * [in] Quality level. The valid range is between zero and one less than the level - * returned by pQualityLevels used by IDirect3D9::CheckDeviceMultiSampleType. - * Passing a larger value returns the error WINED3DERR_INVALIDCALL. The MultisampleQuality - * values of paired render targets, depth stencil surfaces, and the MultiSample type - * must all match. - *******************************/ - - - /** - * TODO: Discard MSDN - * [in] Set this flag to TRUE to enable z-buffer discarding, and FALSE otherwise. - * - * If this flag is set, the contents of the depth stencil buffer will be - * invalid after calling either IDirect3DDevice9::Present or * IDirect3DDevice9::SetDepthStencilSurface - * with a different depth surface. - * - *This flag has the same behavior as the constant, D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL, in D3DPRESENTFLAG. - ***************************/ if(MultisampleQuality > 0) { FIXME("MultisampleQuality set to %d, substituting 0\n", MultisampleQuality); @@ -1605,11 +1572,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice* iface, object->orig_fmt = Mode.Format; formatDesc = getFormatDescEntry(Mode.Format, NULL, NULL); - /** MSDN: If Windowed is TRUE and either of the BackBufferWidth/Height values is zero, - * then the corresponding dimension of the client area of the hDeviceWindow - * (or the focus window, if hDeviceWindow is NULL) is taken. - **********************/ - if (pPresentationParameters->Windowed && ((pPresentationParameters->BackBufferWidth == 0) || (pPresentationParameters->BackBufferHeight == 0) || @@ -2767,10 +2729,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetStreamSource(IWineD3DDevice *iface, return WINED3D_OK; } - /* Need to do a getParent and pass the references up */ - /* MSDN says ..... When an application no longer holds a reference to this interface, the interface will automatically be freed. - which suggests that we shouldn't be ref counting? and do need a _release on the stream source to reset the stream source - so for now, just count internally */ if (pStreamData != NULL) { IWineD3DVertexBufferImpl *vbImpl = (IWineD3DVertexBufferImpl *) pStreamData; InterlockedIncrement(&vbImpl->bindCount); @@ -7499,7 +7457,6 @@ static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IW /* TODO: nothing really? */ break; case WINED3DRTYPE_VERTEXBUFFER: - /* MSDN: When an application no longer holds a references to this interface, the interface will automatically be freed. */ { int streamNumber; TRACE("Cleaning up stream pointers\n"); @@ -7525,7 +7482,6 @@ static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IW } break; case WINED3DRTYPE_INDEXBUFFER: - /* MSDN: When an application no longer holds a references to this interface, the interface will automatically be freed.*/ if (This->updateStateBlock != NULL ) { /* ==NULL when device is being destroyed */ if (This->updateStateBlock->pIndexData == (IWineD3DIndexBuffer *)resource) { This->updateStateBlock->pIndexData = NULL; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0c84a50..67fc1c7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1867,10 +1867,6 @@ static void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTE op = WINED3DTOP_SELECTARG1; } - /* From MSDN (WINED3DTSS_ALPHAARG1) : - The default argument is WINED3DTA_TEXTURE. If no texture is set for this stage, - then the default argument is WINED3DTA_DIFFUSE. - FIXME? If texture added/removed, may need to reset back as well? */ if (isAlpha && This->stateBlock->textures[Stage] == NULL && arg1 == WINED3DTA_TEXTURE) { get_src_and_opr(WINED3DTA_DIFFUSE, isAlpha, &src1, &opr1); } else { @@ -3114,9 +3110,7 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine /* Values 0-7 are indexes into the FVF tex coords - See comments in DrawPrimitive * - * FIXME: From MSDN: The WINED3DTSS_TCI_* flags are mutually exclusive. If you include - * one flag, you can still specify an index value, which the system uses to - * determine the texture wrapping mode. + * FIXME: When using generated texture coordinates, the index value is used to specify the wrapping mode. * eg. SetTextureStageState( 0, WINED3DTSS_TEXCOORDINDEX, WINED3DTSS_TCI_CAMERASPACEPOSITION | 1 ); * means use the vertex position (camera-space) as the input texture coordinates * for this texture stage, and the wrap mode set in the WINED3DRS_WRAP1 render diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index af1c8bd..70dee04 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -166,11 +166,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetContainer(IWineD3DSurface* iface, REFI ERR("Called without a valid ppContainer.\n"); } - /** From MSDN: - * If the surface is created using CreateImageSurface/CreateOffscreenPlainSurface, CreateRenderTarget, - * or CreateDepthStencilSurface, the surface is considered stand alone. In this case, - * GetContainer will return the Direct3D device used to create the surface. - */ + /* Standalone surfaces return the device as container. */ if (This->container) { container = This->container; } else {

1 0

Henri Verbeet : wined3d: Implement a R5G6B5 to X8R8G8B8 surface format converter.
by Alexandre Julliard Jan. 15, 2009

Jan. 15, 2009

Module: wine Branch: master Commit: 17b94f6034f106ebd08c5ed26c39d881d7347f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b94f6034f106ebd08c5ed26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 15 09:58:45 2009 +0100 wined3d: Implement a R5G6B5 to X8R8G8B8 surface format converter. Based on a patch by Mike Ruprecht. --- dlls/wined3d/surface_base.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 9ee5c75..af1c8bd 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -702,6 +702,46 @@ static void convert_r32f_r16f(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD } } +static void convert_r5g6b5_x8r8g8b8(const BYTE *src, BYTE *dst, + DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) +{ + static const unsigned char convert_5to8[] = + { + 0x00, 0x08, 0x10, 0x19, 0x21, 0x29, 0x31, 0x3a, + 0x42, 0x4a, 0x52, 0x5a, 0x63, 0x6b, 0x73, 0x7b, + 0x84, 0x8c, 0x94, 0x9c, 0xa5, 0xad, 0xb5, 0xbd, + 0xc5, 0xce, 0xd6, 0xde, 0xe6, 0xef, 0xf7, 0xff, + }; + static const unsigned char convert_6to8[] = + { + 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14, 0x18, 0x1c, + 0x20, 0x24, 0x28, 0x2d, 0x31, 0x35, 0x39, 0x3d, + 0x41, 0x45, 0x49, 0x4d, 0x51, 0x55, 0x59, 0x5d, + 0x61, 0x65, 0x69, 0x6d, 0x71, 0x75, 0x79, 0x7d, + 0x82, 0x86, 0x8a, 0x8e, 0x92, 0x96, 0x9a, 0x9e, + 0xa2, 0xa6, 0xaa, 0xae, 0xb2, 0xb6, 0xba, 0xbe, + 0xc2, 0xc6, 0xca, 0xce, 0xd2, 0xd7, 0xdb, 0xdf, + 0xe3, 0xe7, 0xeb, 0xef, 0xf3, 0xf7, 0xfb, 0xff, + }; + unsigned int x, y; + + TRACE("Converting %ux%u pixels, pitches %u %u\n", w, h, pitch_in, pitch_out); + + for (y = 0; y < h; ++y) + { + const WORD *src_line = (const WORD *)(src + y * pitch_in); + DWORD *dst_line = (DWORD *)(dst + y * pitch_out); + for (x = 0; x < w; ++x) + { + WORD pixel = src_line[x]; + dst_line[x] = 0xff000000 + | convert_5to8[(pixel & 0xf800) >> 11] << 16 + | convert_6to8[(pixel & 0x07e0) >> 5] << 8 + | convert_5to8[(pixel & 0x001f)]; + } + } +} + struct d3dfmt_convertor_desc { WINED3DFORMAT from, to; void (*convert)(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h); @@ -710,6 +750,7 @@ struct d3dfmt_convertor_desc { static const struct d3dfmt_convertor_desc convertors[] = { {WINED3DFMT_R32F, WINED3DFMT_R16F, convert_r32f_r16f}, + {WINED3DFMT_R5G6B5, WINED3DFMT_X8R8G8B8, convert_r5g6b5_x8r8g8b8}, }; static inline const struct d3dfmt_convertor_desc *find_convertor(WINED3DFORMAT from, WINED3DFORMAT to)

1 0