wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Nikolay Sivov : msxml3: Add custom handling for DISPID_VALUE for node list.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: aaa8186a2ecc0bcdd6a3197efcd854afae81a642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa8186a2ecc0bcdd6a3197ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 17 10:16:41 2012 +0400 msxml3: Add custom handling for DISPID_VALUE for node list. --- dlls/msxml3/nodelist.c | 66 +++++++++++++++++++++++++++++++++---------- dlls/msxml3/tests/domdoc.c | 39 ++++++++++++++++++++++++-- 2 files changed, 86 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 756783d..c68eefc 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -329,28 +329,62 @@ static HRESULT xmlnodelist_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD fl TRACE("(%p)->(%x %x %x %p %p %p)\n", This, id, lcid, flags, params, res, ei); - V_VT(res) = VT_DISPATCH; - V_DISPATCH(res) = NULL; - - if (id < DISPID_DOM_COLLECTION_BASE || id > DISPID_DOM_COLLECTION_MAX) - return DISP_E_UNKNOWNNAME; - - switch(flags) + if (id >= DISPID_DOM_COLLECTION_BASE && id <= DISPID_DOM_COLLECTION_MAX) { - case INVOKE_PROPERTYGET: + switch(flags) { - IXMLDOMNode *disp = NULL; - - IXMLDOMNodeList_get_item(&This->IXMLDOMNodeList_iface, id - DISPID_DOM_COLLECTION_BASE, &disp); - V_DISPATCH(res) = (IDispatch*)disp; - break; + case DISPATCH_PROPERTYGET: + { + IXMLDOMNode *disp = NULL; + + V_VT(res) = VT_DISPATCH; + IXMLDOMNodeList_get_item(&This->IXMLDOMNodeList_iface, id - DISPID_DOM_COLLECTION_BASE, &disp); + V_DISPATCH(res) = (IDispatch*)disp; + break; + } + default: + { + FIXME("unimplemented flags %x\n", flags); + break; + } } - default: + } + else if (id == DISPID_VALUE) + { + switch(flags) { - FIXME("unimplemented flags %x\n", flags); - break; + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + case DISPATCH_PROPERTYGET: + case DISPATCH_METHOD: + { + IXMLDOMNode *item; + VARIANT index; + HRESULT hr; + + if (params->cArgs - params->cNamedArgs != 1) return DISP_E_BADPARAMCOUNT; + + VariantInit(&index); + hr = VariantChangeType(&index, params->rgvarg, 0, VT_I4); + if(FAILED(hr)) + { + FIXME("failed to convert arg, %s\n", debugstr_variant(params->rgvarg)); + return hr; + } + + IXMLDOMNodeList_get_item(&This->IXMLDOMNodeList_iface, V_I4(&index), &item); + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)item; + break; + } + default: + { + FIXME("DISPID_VALUE: unimplemented flags %x\n", flags); + break; + } } } + else + return DISP_E_UNKNOWNNAME; TRACE("ret %p\n", V_DISPATCH(res)); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6f2b465..d846db5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10005,6 +10005,34 @@ static void test_dispex(void) V_VT(&arg) = VT_I4; V_I2(&arg) = 0; + dispparams.cArgs = 0; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); + + V_VT(&arg) = VT_I4; + V_I2(&arg) = 0; + dispparams.cArgs = 2; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); + + V_VT(&arg) = VT_I4; + V_I2(&arg) = 0; dispparams.cArgs = 1; dispparams.cNamedArgs = 0; dispparams.rgdispidNamedArgs = NULL; @@ -10013,7 +10041,6 @@ static void test_dispex(void) V_VT(&ret) = VT_EMPTY; V_DISPATCH(&ret) = (void*)0x1; hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); @@ -10025,6 +10052,13 @@ todo_wine ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + dispparams.cArgs = 0; dispparams.cNamedArgs = 0; dispparams.rgdispidNamedArgs = NULL; @@ -10046,10 +10080,9 @@ todo_wine V_I4(&ret) = 1; hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); -todo_wine { ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); ok(V_I4(&ret) == 1, "got %d\n", V_I4(&ret)); -} + IXMLDOMNodeList_Release(node_list); /* IXMLDOMParseError */

1 0

Detlef Riekenberg : comdlg32/tests: Use win8 failure-code as default result .
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 1868fe651f55c58008e3d7c23e9e467c497f6aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1868fe651f55c58008e3d7c23… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Dec 16 13:32:19 2012 +0100 comdlg32/tests: Use win8 failure-code as default result. --- dlls/comdlg32/itemdlg.c | 2 +- dlls/comdlg32/tests/itemdlg.c | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 0fdfe0d..96ee5dc 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2729,7 +2729,7 @@ static HRESULT WINAPI IServiceProvider_fnQueryService(IServiceProvider *iface, REFIID riid, void **ppv) { FileDialogImpl *This = impl_from_IServiceProvider(iface); - HRESULT hr = E_FAIL; + HRESULT hr = E_NOTIMPL; TRACE("%p (%s, %s, %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); *ppv = NULL; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index ce05ed8..4e50926 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -277,17 +277,26 @@ static BOOL test_instantiation(void) IExplorerBrowser *peb; IShellBrowser *psb; + hr = IServiceProvider_QueryService(psp, &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser, (void**)&punk); + ok(hr == S_OK, "got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + + /* since win8, the result is E_NOTIMPL for all other services */ hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_IExplorerBrowser, (void**)&peb); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); if(SUCCEEDED(hr)) IExplorerBrowser_Release(peb); hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&psb); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); if(SUCCEEDED(hr)) IShellBrowser_Release(psb); hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_ICommDlgBrowser, (void**)&punk); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); - hr = IServiceProvider_QueryService(psp, &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser, (void**)&punk); - ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_IUnknown, (void**)&punk); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = IServiceProvider_QueryService(psp, &IID_IUnknown, &IID_IUnknown, (void**)&punk); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); IServiceProvider_Release(psp);

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: d5e735554bec044cd3fac402f1f36616b2f30a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e735554bec044cd3fac402f… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Dec 17 11:14:43 2012 +0900 po: Update Korean translation. --- po/ko.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ko.po b/po/ko.po index 0fa120c..524409d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3530,7 +3530,7 @@ msgstr "끝나지 않은 문자열 상수" #: jscript.rc:39 msgid "'return' statement outside of function" -msgstr "" +msgstr "함수 밖에 'return'문장이 있음 " #: jscript.rc:40 msgid "Can't have 'break' outside of loop" @@ -3542,7 +3542,7 @@ msgstr "루프 바깥에는 'continue'를 사용할 수 없음" #: jscript.rc:42 msgid "Label redefined" -msgstr "라벨이 정의되지 않음" +msgstr "라벨이 중복정의됨" #: jscript.rc:43 msgid "Label not found"

1 0

Alexandre Julliard : fonts: Make Tahoma start at character 32.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 9d71d29f26a6f89d4e603c60e355d2ed39153b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d71d29f26a6f89d4e603c60e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 17 14:04:28 2012 +0100 fonts: Make Tahoma start at character 32. --- fonts/tahoma.sfd | 2244 ++++++++++++++++++++++++++-------------------------- fonts/tahoma.ttf | Bin 101052 -> 100420 bytes fonts/tahomabd.sfd | 1720 ++++++++++++++++++++-------------------- fonts/tahomabd.ttf | Bin 92804 -> 92268 bytes 4 files changed, 1960 insertions(+), 2004 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d71d29f26a6f89d4e603…

1 0

Alexandre Julliard : user32: Fix copy/paste typo.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 72b3dfca7c9026b6fe718e5392b0b654ad1a6253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72b3dfca7c9026b6fe718e539… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 17 14:12:02 2012 +0100 user32: Fix copy/paste typo. --- dlls/user32/sysparams.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 07795ba..5029902 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1126,8 +1126,8 @@ static BOOL set_entry( void *ptr, UINT int_param, void *ptr_param, UINT flags ) name ##_VALNAME }, data, sizeof(data) } #define PATH_ENTRY(name) \ - struct sysparam_binary_entry entry_##name = { { get_path_entry, set_path_entry, init_path_entry, \ - name ##_VALNAME } } + struct sysparam_path_entry entry_##name = { { get_path_entry, set_path_entry, init_path_entry, \ + name ##_VALNAME } } #define FONT_ENTRY(name,weight) \ struct sysparam_font_entry entry_##name = { { get_font_entry, set_font_entry, init_font_entry, \

1 0

Alexandre Julliard : user32: Properly fixup font system parameters with positive height.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 71bb8c5e7c2373904a362a7a0afef7e7524a5b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71bb8c5e7c2373904a362a7a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 15 21:59:09 2012 +0100 user32: Properly fixup font system parameters with positive height. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index f17db6e..07795ba 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -915,9 +915,9 @@ static BOOL get_font_entry( union sysparam_all_entry *entry, UINT int_param, voi switch (load_entry( &entry->hdr, &font, sizeof(font) )) { case sizeof(font): - entry->font.val = font; if (font.lfHeight > 0) /* positive height value means points ( inch/72 ) */ font.lfHeight = -MulDiv( font.lfHeight, get_display_dpi(), 72 ); + entry->font.val = font; break; case sizeof(LOGFONT16): /* win9x-winME format */ SYSPARAMS_LogFont16To32W( (LOGFONT16 *)&font, &entry->font.val );

1 0

Alexandre Julliard : include: Force stack alignment also on Linux to work around the ABI breakage.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 4adfb787f4e8c36a37ce1d53a7e6df16d03ecd8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4adfb787f4e8c36a37ce1d53a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 15 16:49:47 2012 +0100 include: Force stack alignment also on Linux to work around the ABI breakage. --- include/windef.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/windef.h b/include/windef.h index 9cf98e7..eb59353 100644 --- a/include/windef.h +++ b/include/windef.h @@ -53,7 +53,7 @@ extern "C" { #ifndef __stdcall # ifdef __i386__ # ifdef __GNUC__ -# ifdef __APPLE__ /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */ +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__)) # else # define __stdcall __attribute__((__stdcall__)) @@ -72,7 +72,7 @@ extern "C" { #ifndef __cdecl # if defined(__i386__) && defined(__GNUC__) -# ifdef __APPLE__ /* Mac OS X uses 16-byte aligned stack and not a 4-byte one */ +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__)) # else # define __cdecl __attribute__((__cdecl__))

1 0

Andrew Talbot : gdi32: Indentation fix.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 0653f7a64d7c5c26b8b3ed255d9169ae208a58c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0653f7a64d7c5c26b8b3ed255… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 18:55:12 2012 +0000 gdi32: Indentation fix. --- dlls/gdi32/font.c | 101 +++++++++++++++++++++++++++------------------------- 1 files changed, 52 insertions(+), 49 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 33e603c..6574761 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3127,13 +3127,13 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount, */ DWORD WINAPI GetCharacterPlacementW( - HDC hdc, /* [in] Device context for which the rendering is to be done */ - LPCWSTR lpString, /* [in] The string for which information is to be returned */ - INT uCount, /* [in] Number of WORDS in string. */ - INT nMaxExtent, /* [in] Maximum extent the string is to take (in HDC logical units) */ - GCP_RESULTSW *lpResults,/* [in/out] A pointer to a GCP_RESULTSW struct */ - DWORD dwFlags /* [in] Flags specifying how to process the string */ - ) + HDC hdc, /* [in] Device context for which the rendering is to be done */ + LPCWSTR lpString, /* [in] The string for which information is to be returned */ + INT uCount, /* [in] Number of WORDS in string. */ + INT nMaxExtent, /* [in] Maximum extent the string is to take (in HDC logical units) */ + GCP_RESULTSW *lpResults, /* [in/out] A pointer to a GCP_RESULTSW struct */ + DWORD dwFlags /* [in] Flags specifying how to process the string */ + ) { DWORD ret=0; SIZE size; @@ -3144,66 +3144,69 @@ GetCharacterPlacementW( TRACE("lStructSize=%d, lpOutString=%p, lpOrder=%p, lpDx=%p, lpCaretPos=%p\n" "lpClass=%p, lpGlyphs=%p, nGlyphs=%u, nMaxFit=%d\n", - lpResults->lStructSize, lpResults->lpOutString, lpResults->lpOrder, - lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass, - lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit); - - if(dwFlags&(~GCP_REORDER)) FIXME("flags 0x%08x ignored\n", dwFlags); - if(lpResults->lpClass) FIXME("classes not implemented\n"); + lpResults->lStructSize, lpResults->lpOutString, lpResults->lpOrder, + lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass, + lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit); + + if(dwFlags&(~GCP_REORDER)) + FIXME("flags 0x%08x ignored\n", dwFlags); + if(lpResults->lpClass) + FIXME("classes not implemented\n"); if (lpResults->lpCaretPos && (dwFlags & GCP_REORDER)) FIXME("Caret positions for complex scripts not implemented\n"); - nSet = (UINT)uCount; - if(nSet > lpResults->nGlyphs) - nSet = lpResults->nGlyphs; + nSet = (UINT)uCount; + if(nSet > lpResults->nGlyphs) + nSet = lpResults->nGlyphs; - /* return number of initialized fields */ - lpResults->nGlyphs = nSet; + /* return number of initialized fields */ + lpResults->nGlyphs = nSet; - if((dwFlags&GCP_REORDER)==0 ) - { - /* Treat the case where no special handling was requested in a fastpath way */ - /* copy will do if the GCP_REORDER flag is not set */ - if(lpResults->lpOutString) - memcpy( lpResults->lpOutString, lpString, nSet * sizeof(WCHAR)); - - if(lpResults->lpOrder) - { - for(i = 0; i < nSet; i++) - lpResults->lpOrder[i] = i; - } - } else - { - BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString, - nSet, lpResults->lpOrder, NULL, NULL ); - } + if((dwFlags&GCP_REORDER)==0 ) + { + /* Treat the case where no special handling was requested in a fastpath way */ + /* copy will do if the GCP_REORDER flag is not set */ + if(lpResults->lpOutString) + memcpy( lpResults->lpOutString, lpString, nSet * sizeof(WCHAR)); - /* FIXME: Will use the placement chars */ - if (lpResults->lpDx) - { - int c; - for (i = 0; i < nSet; i++) - { - if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c)) - lpResults->lpDx[i]= c; - } - } + if(lpResults->lpOrder) + { + for(i = 0; i < nSet; i++) + lpResults->lpOrder[i] = i; + } + } + else + { + BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString, + nSet, lpResults->lpOrder, NULL, NULL ); + } + + /* FIXME: Will use the placement chars */ + if (lpResults->lpDx) + { + int c; + for (i = 0; i < nSet; i++) + { + if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c)) + lpResults->lpDx[i]= c; + } + } if (lpResults->lpCaretPos && !(dwFlags & GCP_REORDER)) { int pos = 0; - + lpResults->lpCaretPos[0] = 0; for (i = 1; i < nSet; i++) if (GetTextExtentPoint32W(hdc, &(lpString[i - 1]), 1, &size)) lpResults->lpCaretPos[i] = (pos += size.cx); } - + if(lpResults->lpGlyphs) - GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0); + GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0); if (GetTextExtentPoint32W(hdc, lpString, uCount, &size)) - ret = MAKELONG(size.cx, size.cy); + ret = MAKELONG(size.cx, size.cy); return ret; }

1 0

Andrew Talbot : comctl32: Indentation fix.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 85ebbadcb09993b0a91415c2a8447c5bb64969d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85ebbadcb09993b0a91415c2a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:16 2012 +0000 comctl32: Indentation fix. --- dlls/comctl32/datetime.c | 20 ++++++++++---------- dlls/comctl32/toolbar.c | 6 +++--- dlls/comctl32/treeview.c | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 748e0fc..faecba0 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -205,16 +205,16 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy systime->wHour, systime->wMinute, systime->wSecond); if (flag == GDT_VALID) { - if (systime->wYear == 0 || - systime->wMonth < 1 || systime->wMonth > 12 || - systime->wDay < 1 || - systime->wDay > MONTHCAL_MonthLength(systime->wMonth, systime->wYear) || - systime->wHour > 23 || - systime->wMinute > 59 || - systime->wSecond > 59 || - systime->wMilliseconds > 999 - ) - return FALSE; + if (systime->wYear == 0 || + systime->wMonth < 1 || systime->wMonth > 12 || + systime->wDay < 1 || + systime->wDay > MONTHCAL_MonthLength(systime->wMonth, systime->wYear) || + systime->wHour > 23 || + systime->wMinute > 59 || + systime->wSecond > 59 || + systime->wMilliseconds > 999 + ) + return FALSE; /* Windows returns true if the date is valid but outside the limits set */ if (DATETIME_IsDateInValidRange(infoPtr, systime) == FALSE) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c26d70e..2a98b6b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5212,9 +5212,9 @@ TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr) if (infoPtr->himlInt) ImageList_Destroy (infoPtr->himlInt); - TOOLBAR_DeleteImageList(&infoPtr->himlDef, &infoPtr->cimlDef); - TOOLBAR_DeleteImageList(&infoPtr->himlDis, &infoPtr->cimlDis); - TOOLBAR_DeleteImageList(&infoPtr->himlHot, &infoPtr->cimlHot); + TOOLBAR_DeleteImageList(&infoPtr->himlDef, &infoPtr->cimlDef); + TOOLBAR_DeleteImageList(&infoPtr->himlDis, &infoPtr->cimlDis); + TOOLBAR_DeleteImageList(&infoPtr->himlHot, &infoPtr->cimlHot); /* delete default font */ DeleteObject (infoPtr->hDefaultFont); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 22d7180..b0cbc7a 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3164,10 +3164,10 @@ TREEVIEW_Sort(TREEVIEW_INFO *infoPtr, HTREEITEM parent, { int visOrder = infoPtr->firstVisible->visibleOrder; - if (parent == infoPtr->root) - TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL); - else - TREEVIEW_RecalculateVisibleOrder(infoPtr, parent); + if (parent == infoPtr->root) + TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL); + else + TREEVIEW_RecalculateVisibleOrder(infoPtr, parent); if (TREEVIEW_IsChildOf(parent, infoPtr->firstVisible)) {

1 0

Andrew Talbot : comdlg32: Indentation fix.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: c8092a04ced5c133eb6b8de72f89c10680f182a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8092a04ced5c133eb6b8de72… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:22 2012 +0000 comdlg32: Indentation fix. --- dlls/comdlg32/filedlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 0c674c5..eeac384 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1793,8 +1793,8 @@ static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam) flags |= SWP_NOSIZE; SetRectEmpty(&rc); } - SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM, - 0, 0, rc.right, rc.bottom, flags); + SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM, + 0, 0, rc.right, rc.bottom, flags); } else {

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2012