February 2013 - Wine-commits

André Hentschel : msvcrt: Add a new file for the ARM exception handling.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 874d077ca6d60f457dcf79f0604d519a4bee78d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=874d077ca6d60f457dcf79f06… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 26 23:42:33 2013 +0100 msvcrt: Add a new file for the ARM exception handling. --- dlls/crtdll/crtdll.spec | 4 +- dlls/msvcr100/msvcr100.spec | 18 ++-- dlls/msvcr70/msvcr70.spec | 10 +- dlls/msvcr71/msvcr71.spec | 12 ++-- dlls/msvcr80/msvcr80.spec | 16 ++-- dlls/msvcr90/msvcr90.spec | 16 ++-- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/except_arm.c | 187 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 17 ++++ dlls/msvcrt/msvcrt.spec | 18 ++-- dlls/msvcrt20/msvcrt20.spec | 6 +- dlls/msvcrt40/msvcrt40.spec | 6 +- dlls/msvcrtd/msvcrtd.spec | 6 +- include/msvcrt/setjmp.h | 22 +++++ include/winnt.h | 39 +++++++++ 15 files changed, 322 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=874d077ca6d60f457dcf7…

1 0

Byeongsik Jeon : gdi32: Fix the GdiGetCodePage() support ANSI_CHARSET font associated charset.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 1c846e70f0edce2908e05a48fb78442a97ac67cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c846e70f0edce2908e05a48f… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Feb 26 10:31:20 2013 +0900 gdi32: Fix the GdiGetCodePage() support ANSI_CHARSET font associated charset. --- dlls/gdi32/font.c | 55 ++++++++++++++++++++++++++++++ dlls/gdi32/freetype.c | 46 +++++++++++++++++++++++++ dlls/gdi32/tests/font.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b274b83..65e09d3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -590,11 +590,66 @@ HFONT WINAPI CreateFontW( INT height, INT width, INT esc, return CreateFontIndirectW( &logfont ); } +#define ASSOC_CHARSET_OEM 1 +#define ASSOC_CHARSET_ANSI 2 +#define ASSOC_CHARSET_SYMBOL 4 + +static DWORD get_associated_charset_info(void) +{ + static DWORD associated_charset = -1; + + if (associated_charset == -1) + { + static const WCHAR assoc_charset_reg_keyW[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\','F','o','n','t','A','s','s','o','c','\\', + 'A','s','s','o','c','i','a','t','e','d',' ','C','h','a','r','s','e','t','\0'}; + static const WCHAR ansiW[] = {'A','N','S','I','(','0','0',')','\0'}; + static const WCHAR oemW[] = {'O','E','M','(','F','F',')','\0'}; + static const WCHAR symbolW[] = {'S','Y','M','B','O','L','(','0','2',')','\0'}; + static const WCHAR yesW[] = {'Y','E','S','\0'}; + HKEY hkey; + WCHAR dataW[32]; + DWORD type, data_len; + + associated_charset = 0; + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, + assoc_charset_reg_keyW, &hkey) != ERROR_SUCCESS) + return 0; + + data_len = sizeof(dataW); + if (!RegQueryValueExW(hkey, ansiW, NULL, &type, (LPBYTE)dataW, &data_len) && + type == REG_SZ && !strcmpiW(dataW, yesW)) + associated_charset |= ASSOC_CHARSET_ANSI; + + data_len = sizeof(dataW); + if (!RegQueryValueExW(hkey, oemW, NULL, &type, (LPBYTE)dataW, &data_len) && + type == REG_SZ && !strcmpiW(dataW, yesW)) + associated_charset |= ASSOC_CHARSET_OEM; + + data_len = sizeof(dataW); + if (!RegQueryValueExW(hkey, symbolW, NULL, &type, (LPBYTE)dataW, &data_len) && + type == REG_SZ && !strcmpiW(dataW, yesW)) + associated_charset |= ASSOC_CHARSET_SYMBOL; + + RegCloseKey(hkey); + + TRACE("associated_charset = %d\n", associated_charset); + } + + return associated_charset; +} + static void update_font_code_page( DC *dc ) { CHARSETINFO csi; int charset = GetTextCharsetInfo( dc->hSelf, NULL, 0 ); + if (charset == ANSI_CHARSET && + get_associated_charset_info() & ASSOC_CHARSET_ANSI) + charset = DEFAULT_CHARSET; + /* Hmm, nicely designed api this one! */ if (TranslateCharsetInfo( ULongToPtr(charset), &csi, TCI_SRCCHARSET) ) dc->font_code_page = csi.ciACP; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b977b0d..d7cc777 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3505,6 +3505,46 @@ static void set_value_key(HKEY hkey, const char *name, const char *value) RegDeleteValueA(hkey, name); } +static void update_font_association_info(UINT current_ansi_codepage) +{ + static const char *font_assoc_reg_key = "System\\CurrentControlSet\\Control\\FontAssoc"; + static const char *assoc_charset_subkey = "Associated Charset"; + + if (is_dbcs_ansi_cp(current_ansi_codepage)) + { + HKEY hkey; + if (RegCreateKeyA(HKEY_LOCAL_MACHINE, font_assoc_reg_key, &hkey) == ERROR_SUCCESS) + { + HKEY hsubkey; + if (RegCreateKeyA(hkey, assoc_charset_subkey, &hsubkey) == ERROR_SUCCESS) + { + switch (current_ansi_codepage) + { + case 932: + set_value_key(hsubkey, "ANSI(00)", "NO"); + set_value_key(hsubkey, "OEM(FF)", "NO"); + set_value_key(hsubkey, "SYMBOL(02)", "NO"); + break; + case 936: + case 949: + case 950: + set_value_key(hsubkey, "ANSI(00)", "YES"); + set_value_key(hsubkey, "OEM(FF)", "YES"); + set_value_key(hsubkey, "SYMBOL(02)", "NO"); + break; + } + RegCloseKey(hsubkey); + } + + /* TODO: Associated DefaultFonts */ + + RegCloseKey(hkey); + } + } + else + RegDeleteTreeA(HKEY_LOCAL_MACHINE, font_assoc_reg_key); +} + static void update_font_info(void) { static const WCHAR logpixels[] = { 'L','o','g','P','i','x','e','l','s',0 }; @@ -3538,6 +3578,7 @@ static void update_font_info(void) if (is_dbcs_ansi_cp(ansi_cp)) use_default_fallback = TRUE; + buf[0] = 0; len = sizeof(buf); if (RegQueryValueExA(hkey, "Codepages", 0, &type, (BYTE *)buf, &len) == ERROR_SUCCESS && type == REG_SZ) { @@ -3615,6 +3656,11 @@ static void update_font_info(void) } if (!done) FIXME("there is no font defaults for codepages %u,%u\n", ansi_cp, oem_cp); + + /* update locale dependent font association info in registry. + update only when codepages changed, not logpixels. */ + if (strcmp(buf, cpbuf) != 0) + update_font_association_info(ansi_cp); } static BOOL init_freetype(void) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 943f584..b72a423 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2083,6 +2083,90 @@ static void test_font_charset(void) skip("Symbol or Wingdings is not installed\n"); } +static void test_GdiGetCodePage(void) +{ + static const struct _matching_data + { + UINT current_codepage; + LPCSTR lfFaceName; + UCHAR lfCharSet; + UINT expected_codepage; + } matching_data[] = { + {1251, "Arial", ANSI_CHARSET, 1252}, + {1251, "Tahoma", ANSI_CHARSET, 1252}, + + {1252, "Arial", ANSI_CHARSET, 1252}, + {1252, "Tahoma", ANSI_CHARSET, 1252}, + + {1253, "Arial", ANSI_CHARSET, 1252}, + {1253, "Tahoma", ANSI_CHARSET, 1252}, + + { 932, "Arial", ANSI_CHARSET, 1252}, /* Japanese Windows returns 1252, not 932 */ + { 932, "Tahoma", ANSI_CHARSET, 1252}, + { 932, "MS UI Gothic", ANSI_CHARSET, 1252}, + + { 936, "Arial", ANSI_CHARSET, 936}, + { 936, "Tahoma", ANSI_CHARSET, 936}, + { 936, "Simsun", ANSI_CHARSET, 936}, + + { 949, "Arial", ANSI_CHARSET, 949}, + { 949, "Tahoma", ANSI_CHARSET, 949}, + { 949, "Gulim", ANSI_CHARSET, 949}, + + { 950, "Arial", ANSI_CHARSET, 950}, + { 950, "Tahoma", ANSI_CHARSET, 950}, + { 950, "PMingLiU", ANSI_CHARSET, 950}, + }; + HDC hdc; + LOGFONT lf; + HFONT hfont; + UINT charset, acp; + DWORD codepage; + int i; + + if (!pGdiGetCodePage) + { + skip("GdiGetCodePage not available on this platform\n"); + return; + } + + acp = GetACP(); + + for (i = 0; i < sizeof(matching_data) / sizeof(struct _matching_data); i++) + { + /* only test data matched current locale codepage */ + if (matching_data[i].current_codepage != acp) + continue; + + if (!is_font_installed(matching_data[i].lfFaceName)) + { + skip("%s is not installed\n", matching_data[i].lfFaceName); + continue; + } + + hdc = GetDC(0); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -16; + lf.lfCharSet = matching_data[i].lfCharSet; + lstrcpyA(lf.lfFaceName, matching_data[i].lfFaceName); + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hfont = SelectObject(hdc, hfont); + charset = GetTextCharset(hdc); + codepage = pGdiGetCodePage(hdc); + trace("acp=%d, lfFaceName=%s, lfCharSet=%d, GetTextCharset=%d, GdiGetCodePage=%d, expected codepage=%d\n", + acp, lf.lfFaceName, lf.lfCharSet, charset, codepage, matching_data[i].expected_codepage); + ok(codepage == matching_data[i].expected_codepage, + "GdiGetCodePage should have returned %d, got %d\n", matching_data[i].expected_codepage, codepage); + + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); + } +} + static void test_GetFontUnicodeRanges(void) { LOGFONTA lf; @@ -4902,6 +4986,7 @@ START_TEST(font) test_GetOutlineTextMetrics(); test_SetTextJustification(); test_font_charset(); + test_GdiGetCodePage(); test_GetFontUnicodeRanges(); test_nonexistent_font(); test_orientation();

1 0

Andrew Talbot : usbd.sys: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: ec128b732482356fb640e25d88dd1ed482524008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec128b732482356fb640e25d8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 26 22:16:05 2013 +0000 usbd.sys: Avoid signed-unsigned integer comparisons. --- dlls/usbd.sys/usbd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index 485a24c..ff0362c 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -105,7 +105,7 @@ PURB WINAPI USBD_CreateConfigurationRequestEx( interfaceInfo = &urb->u.UrbSelectConfiguration.Interface; for (interfaceEntry = InterfaceList; interfaceEntry->InterfaceDescriptor; interfaceEntry++) { - int i; + ULONG i; USB_INTERFACE_DESCRIPTOR *currentInterface; USB_ENDPOINT_DESCRIPTOR *endpointDescriptor; interfaceInfo->InterfaceNumber = interfaceEntry->InterfaceDescriptor->bInterfaceNumber;

1 0

Andrew Talbot : urlmon: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: bc1a457b1ce4da8ffb0204cf4e3543a9483aa945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc1a457b1ce4da8ffb0204cf4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 26 22:16:03 2013 +0000 urlmon: Avoid signed-unsigned integer comparisons. --- dlls/urlmon/uri.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 90113f2..42cfe71 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -891,7 +891,7 @@ static BOOL ipv6_to_number(const ipv6_address *address, USHORT number[8]) { /* Means we just passed the elision and need to add its values to * 'number' before we do anything else. */ - DWORD j = 0; + INT j; for(j = 0; j < address->elision_size; j+=2) number[cur_component++] = 0; @@ -904,7 +904,8 @@ static BOOL ipv6_to_number(const ipv6_address *address, USHORT number[8]) { /* Case when the elision appears after the h16 components. */ if(!already_passed_elision && address->elision) { - for(i = 0; i < address->elision_size; i+=2) + INT j; + for(j = 0; j < address->elision_size; j+=2) number[cur_component++] = 0; }

1 0

Michael Stefaniuc : shell32: COM clean up for IPersistFolder3 in ShellFSFolder.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 90d88de2bfda806ce4d84cbec94d179ee2bc9211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d88de2bfda806ce4d84cbec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:33:53 2013 +0100 shell32: COM clean up for IPersistFolder3 in ShellFSFolder. --- dlls/shell32/shfldr_fs.c | 46 ++++++++++++++-------------------------------- 1 files changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 0d52156..f52c192 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -62,7 +62,7 @@ typedef struct { IUnknown IUnknown_inner; LONG ref; IShellFolder2 IShellFolder2_iface; - const IPersistFolder3Vtbl *lpvtblPersistFolder3; + IPersistFolder3 IPersistFolder3_iface; const IDropTargetVtbl *lpvtblDropTarget; const ISFHelperVtbl *lpvtblSFHelper; IUnknown *outer_unk; @@ -79,7 +79,7 @@ typedef struct { } IGenericSFImpl; static const IShellFolder2Vtbl sfvt; -static const IPersistFolder3Vtbl vt_FSFldr_PersistFolder3; /* IPersistFolder3 for a FS_Folder */ +static const IPersistFolder3Vtbl pfvt; static const IDropTargetVtbl dtvt; static const ISFHelperVtbl shvt; @@ -93,9 +93,9 @@ static inline IGenericSFImpl *impl_from_IShellFolder2(IShellFolder2 *iface) return CONTAINING_RECORD(iface, IGenericSFImpl, IShellFolder2_iface); } -static inline IGenericSFImpl *impl_from_IPersistFolder3( IPersistFolder3 *iface ) +static inline IGenericSFImpl *impl_from_IPersistFolder3(IPersistFolder3 *iface) { - return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblPersistFolder3)); + return CONTAINING_RECORD(iface, IGenericSFImpl, IPersistFolder3_iface); } static inline IGenericSFImpl *impl_from_IDropTarget( IDropTarget *iface ) @@ -112,10 +112,6 @@ static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) /* converts This to an interface pointer */ -#define _IPersist_(This) (&(This)->lpvtblPersistFolder3) -#define _IPersistFolder_(This) (&(This)->lpvtblPersistFolder3) -#define _IPersistFolder2_(This) (&(This)->lpvtblPersistFolder3) -#define _IPersistFolder3_(This) (&(This)->lpvtblPersistFolder3) #define _IDropTarget_(This) (&(This)->lpvtblDropTarget) #define _ISFHelper_(This) (&(This)->lpvtblSFHelper) @@ -146,14 +142,9 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, vo *ppvObj = &This->IUnknown_inner; else if (IsEqualIID(riid, &IID_IShellFolder) || IsEqualIID(riid, &IID_IShellFolder2)) *ppvObj = &This->IShellFolder2_iface; - else if (IsEqualIID (riid, &IID_IPersist)) - *ppvObj = _IPersist_ (This); - else if (IsEqualIID (riid, &IID_IPersistFolder)) - *ppvObj = _IPersistFolder_ (This); - else if (IsEqualIID (riid, &IID_IPersistFolder2)) - *ppvObj = _IPersistFolder2_ (This); - else if (IsEqualIID (riid, &IID_IPersistFolder3)) - *ppvObj = _IPersistFolder3_ (This); + else if (IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IPersistFolder) || + IsEqualIID(riid, &IID_IPersistFolder2) || IsEqualIID(riid, &IID_IPersistFolder3)) + *ppvObj = &This->IPersistFolder3_iface; else if (IsEqualIID (riid, &IID_ISFHelper)) *ppvObj = _ISFHelper_ (This); else if (IsEqualIID (riid, &IID_IDropTarget)) { @@ -238,7 +229,7 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) sf->ref = 0; sf->IUnknown_inner.lpVtbl = &unkvt; sf->IShellFolder2_iface.lpVtbl = &sfvt; - sf->lpvtblPersistFolder3 = &vt_FSFldr_PersistFolder3; + sf->IPersistFolder3_iface.lpVtbl = &pfvt; sf->lpvtblDropTarget = &dtvt; sf->lpvtblSFHelper = &shvt; sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; @@ -1427,28 +1418,22 @@ static const ISFHelperVtbl shvt = * IFSFldr_PersistFolder3_QueryInterface * */ -static HRESULT WINAPI -IFSFldr_PersistFolder3_QueryInterface (IPersistFolder3 * iface, REFIID iid, - LPVOID * ppvObj) +static HRESULT WINAPI IFSFldr_PersistFolder3_QueryInterface(IPersistFolder3 *iface, REFIID iid, + void **ppv) { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); - TRACE ("(%p)\n", This); - - return IUnknown_QueryInterface(This->outer_unk, iid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, iid, ppv); } /************************************************************************ * IFSFldr_PersistFolder3_AddRef * */ -static ULONG WINAPI -IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface) +static ULONG WINAPI IFSFldr_PersistFolder3_AddRef(IPersistFolder3 *iface) { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef(This->outer_unk); } @@ -1456,13 +1441,10 @@ IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface) * IFSFldr_PersistFolder3_Release * */ -static ULONG WINAPI -IFSFldr_PersistFolder3_Release (IPersistFolder3 * iface) +static ULONG WINAPI IFSFldr_PersistFolder3_Release(IPersistFolder3 *iface) { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_Release(This->outer_unk); } @@ -1615,7 +1597,7 @@ IFSFldr_PersistFolder3_GetFolderTargetInfo (IPersistFolder3 * iface, return E_NOTIMPL; } -static const IPersistFolder3Vtbl vt_FSFldr_PersistFolder3 = +static const IPersistFolder3Vtbl pfvt = { IFSFldr_PersistFolder3_QueryInterface, IFSFldr_PersistFolder3_AddRef,

1 0

Michael Stefaniuc : shell32: Get rid of a helper function.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 00a20667fa3437c851bdf0e46ec5ff08c47d122e URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a20667fa3437c851bdf0e46… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:35:00 2013 +0100 shell32: Get rid of a helper function. --- dlls/shell32/shfldr_fs.c | 31 ++++++++----------------------- 1 files changed, 8 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index f52c192..516750d 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1612,27 +1612,6 @@ static const IPersistFolder3Vtbl pfvt = /**************************************************************************** * ISFDropTarget implementation */ -static BOOL -ISFDropTarget_QueryDrop (IDropTarget * iface, DWORD dwKeyState, - LPDWORD pdwEffect) -{ - DWORD dwEffect = *pdwEffect; - - IGenericSFImpl *This = impl_from_IDropTarget(iface); - - *pdwEffect = DROPEFFECT_NONE; - - if (This->fAcceptFmt) { /* Does our interpretation of the keystate ... */ - *pdwEffect = KeyStateToDropEffect (dwKeyState); - - /* ... matches the desired effect ? */ - if (dwEffect & *pdwEffect) { - return TRUE; - } - } - return FALSE; -} - static HRESULT WINAPI ISFDropTarget_QueryInterface (IDropTarget * iface, REFIID riid, LPVOID * ppvObj) { @@ -1673,7 +1652,10 @@ ISFDropTarget_DragEnter (IDropTarget * iface, IDataObject * pDataObject, InitFormatEtc (fmt, This->cfShellIDList, TYMED_HGLOBAL); This->fAcceptFmt = IDataObject_QueryGetData (pDataObject, &fmt) == S_OK; - ISFDropTarget_QueryDrop (iface, dwKeyState, pdwEffect); + if (This->fAcceptFmt) + *pdwEffect = KeyStateToDropEffect(dwKeyState); + else + *pdwEffect = DROPEFFECT_NONE; return S_OK; } @@ -1689,7 +1671,10 @@ ISFDropTarget_DragOver (IDropTarget * iface, DWORD dwKeyState, POINTL pt, if (!pdwEffect) return E_INVALIDARG; - ISFDropTarget_QueryDrop (iface, dwKeyState, pdwEffect); + if (This->fAcceptFmt) + *pdwEffect = KeyStateToDropEffect(dwKeyState); + else + *pdwEffect = DROPEFFECT_NONE; return S_OK; }

1 0

Michael Stefaniuc : shell32: Finish the COM cleanup of ShellFSFolder.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: a5560ebee68aa6305dc67c3f826aa39b4591821f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5560ebee68aa6305dc67c3f8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:35:56 2013 +0100 shell32: Finish the COM cleanup of ShellFSFolder. --- dlls/shell32/shfldr_fs.c | 57 ++++++++++++++------------------------------- 1 files changed, 18 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 516750d..a88961c 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -63,8 +63,8 @@ typedef struct { LONG ref; IShellFolder2 IShellFolder2_iface; IPersistFolder3 IPersistFolder3_iface; - const IDropTargetVtbl *lpvtblDropTarget; - const ISFHelperVtbl *lpvtblSFHelper; + IDropTarget IDropTarget_iface; + ISFHelper ISFHelper_iface; IUnknown *outer_unk; CLSID *pclsid; @@ -98,23 +98,16 @@ static inline IGenericSFImpl *impl_from_IPersistFolder3(IPersistFolder3 *iface) return CONTAINING_RECORD(iface, IGenericSFImpl, IPersistFolder3_iface); } -static inline IGenericSFImpl *impl_from_IDropTarget( IDropTarget *iface ) +static inline IGenericSFImpl *impl_from_IDropTarget(IDropTarget *iface) { - return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblDropTarget)); + return CONTAINING_RECORD(iface, IGenericSFImpl, IDropTarget_iface); } -static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) +static inline IGenericSFImpl *impl_from_ISFHelper(ISFHelper *iface) { - return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblSFHelper)); + return CONTAINING_RECORD(iface, IGenericSFImpl, ISFHelper_iface); } - -/* - converts This to an interface pointer -*/ -#define _IDropTarget_(This) (&(This)->lpvtblDropTarget) -#define _ISFHelper_(This) (&(This)->lpvtblSFHelper) - /************************************************************************** * registers clipboardformat once */ @@ -146,10 +139,10 @@ static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, vo IsEqualIID(riid, &IID_IPersistFolder2) || IsEqualIID(riid, &IID_IPersistFolder3)) *ppvObj = &This->IPersistFolder3_iface; else if (IsEqualIID (riid, &IID_ISFHelper)) - *ppvObj = _ISFHelper_ (This); + *ppvObj = &This->ISFHelper_iface; else if (IsEqualIID (riid, &IID_IDropTarget)) { - *ppvObj = _IDropTarget_ (This); - SF_RegisterClipFmt (This); + *ppvObj = &This->IDropTarget_iface; + SF_RegisterClipFmt(This); } if (*ppvObj) { @@ -230,8 +223,8 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) sf->IUnknown_inner.lpVtbl = &unkvt; sf->IShellFolder2_iface.lpVtbl = &sfvt; sf->IPersistFolder3_iface.lpVtbl = &pfvt; - sf->lpvtblDropTarget = &dtvt; - sf->lpvtblSFHelper = &shvt; + sf->IDropTarget_iface.lpVtbl = &dtvt; + sf->ISFHelper_iface.lpVtbl = &shvt; sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; sf->outer_unk = pUnkOuter ? pUnkOuter : &sf->IUnknown_inner; @@ -1105,31 +1098,24 @@ static const IShellFolder2Vtbl sfvt = * ISFHelper for IShellFolder implementation */ -static HRESULT WINAPI -ISFHelper_fnQueryInterface (ISFHelper * iface, REFIID riid, LPVOID * ppvObj) +static HRESULT WINAPI ISFHelper_fnQueryInterface(ISFHelper *iface, REFIID riid, void **ppvObj) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } -static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface) +static ULONG WINAPI ISFHelper_fnAddRef(ISFHelper *iface) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef(This->outer_unk); } -static ULONG WINAPI ISFHelper_fnRelease (ISFHelper * iface) +static ULONG WINAPI ISFHelper_fnRelease(ISFHelper *iface) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - TRACE ("(%p)\n", This); - return IUnknown_Release(This->outer_unk); } @@ -1612,31 +1598,24 @@ static const IPersistFolder3Vtbl pfvt = /**************************************************************************** * ISFDropTarget implementation */ -static HRESULT WINAPI -ISFDropTarget_QueryInterface (IDropTarget * iface, REFIID riid, LPVOID * ppvObj) +static HRESULT WINAPI ISFDropTarget_QueryInterface(IDropTarget *iface, REFIID riid, void **ppv) { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); - - return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } -static ULONG WINAPI ISFDropTarget_AddRef (IDropTarget * iface) +static ULONG WINAPI ISFDropTarget_AddRef(IDropTarget *iface) { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); - return IUnknown_AddRef(This->outer_unk); } -static ULONG WINAPI ISFDropTarget_Release (IDropTarget * iface) +static ULONG WINAPI ISFDropTarget_Release(IDropTarget *iface) { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE ("(%p)\n", This); - return IUnknown_Release(This->outer_unk); }

1 0

Michael Stefaniuc : shell32: Move IFSFolder_Constructor() to avoid forward declarations.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 8a40df9800f874b5dc1fee45f3da133e06a5c8db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a40df9800f874b5dc1fee45f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 26 23:36:58 2013 +0100 shell32: Move IFSFolder_Constructor() to avoid forward declarations. --- dlls/shell32/shfldr_fs.c | 74 ++++++++++++++++++--------------------------- 1 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index a88961c..6730733 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -78,11 +78,6 @@ typedef struct { BOOL fAcceptFmt; /* flag for pending Drop */ } IGenericSFImpl; -static const IShellFolder2Vtbl sfvt; -static const IPersistFolder3Vtbl pfvt; -static const IDropTargetVtbl dtvt; -static const ISFHelperVtbl shvt; - static inline IGenericSFImpl *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, IGenericSFImpl, IUnknown_inner); @@ -199,45 +194,6 @@ static const shvheader GenericSFHeader[] = { #define GENERICSHELLVIEWCOLUMNS 5 /************************************************************************** -* IFSFolder_Constructor -* -* NOTES -* creating undocumented ShellFS_Folder as part of an aggregation -* {F3364BA0-65B9-11CE-A9BA-00AA004AE837} -* -*/ -HRESULT WINAPI -IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) -{ - IGenericSFImpl *sf; - - TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); - - if (pUnkOuter && !IsEqualIID (riid, &IID_IUnknown)) - return CLASS_E_NOAGGREGATION; - sf = LocalAlloc (LMEM_ZEROINIT, sizeof (IGenericSFImpl)); - if (!sf) - return E_OUTOFMEMORY; - - sf->ref = 0; - sf->IUnknown_inner.lpVtbl = &unkvt; - sf->IShellFolder2_iface.lpVtbl = &sfvt; - sf->IPersistFolder3_iface.lpVtbl = &pfvt; - sf->IDropTarget_iface.lpVtbl = &dtvt; - sf->ISFHelper_iface.lpVtbl = &shvt; - sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; - sf->outer_unk = pUnkOuter ? pUnkOuter : &sf->IUnknown_inner; - - if (FAILED(IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv))) { - IUnknown_Release(&sf->IUnknown_inner); - return E_NOINTERFACE; - } - - TRACE ("--%p\n", *ppv); - return S_OK; -} - -/************************************************************************** * IShellFolder_fnQueryInterface */ static HRESULT WINAPI IShellFolder_fnQueryInterface(IShellFolder2 *iface, REFIID riid, @@ -1689,3 +1645,33 @@ static const IDropTargetVtbl dtvt = { ISFDropTarget_DragLeave, ISFDropTarget_Drop }; + +HRESULT WINAPI IFSFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv) +{ + IGenericSFImpl *sf; + HRESULT hr; + + TRACE("outer_unk=%p %s\n", outer_unk, shdebugstr_guid(riid)); + + if (outer_unk && !IsEqualIID(riid, &IID_IUnknown)) + return CLASS_E_NOAGGREGATION; + + sf = LocalAlloc(LMEM_ZEROINIT, sizeof(*sf)); + if (!sf) + return E_OUTOFMEMORY; + + sf->ref = 1; + sf->IUnknown_inner.lpVtbl = &unkvt; + sf->IShellFolder2_iface.lpVtbl = &sfvt; + sf->IPersistFolder3_iface.lpVtbl = &pfvt; + sf->IDropTarget_iface.lpVtbl = &dtvt; + sf->ISFHelper_iface.lpVtbl = &shvt; + sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; + sf->outer_unk = outer_unk ? outer_unk : &sf->IUnknown_inner; + + hr = IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv); + IUnknown_Release(&sf->IUnknown_inner); + + TRACE ("--%p\n", *ppv); + return hr; +}

1 0

André Hentschel : api-ms-win*: Update spec files.
by Alexandre Julliard 27 Feb '13

27 Feb '13

Module: wine Branch: master Commit: 91cec0e82af0e3f0e79df1db60b55155905bdd98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91cec0e82af0e3f0e79df1db6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 26 23:41:33 2013 +0100 api-ms-win*: Update spec files. --- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 83dc129..e7744a7 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -15,7 +15,7 @@ @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx @ stub AddAuditAccessObjectAce -@ stub AddMandatoryAce +@ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges @ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr) advapi32.AllocateAndInitializeSid diff --git a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec index eacfd60..9d266fa 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec @@ -1,6 +1,6 @@ @ stdcall GetAcceptLanguagesW(ptr ptr) shlwapi.GetAcceptLanguagesW @ stdcall HashData(ptr long ptr long) shlwapi.HashData -@ stub IsInternetESCEnabled +@ stdcall IsInternetESCEnabled() shlwapi.IsInternetESCEnabled @ stdcall ParseURLW(wstr ptr) shlwapi.ParseURLW @ stdcall PathAddBackslashA(str) shlwapi.PathAddBackslashA @ stdcall PathAddBackslashW(wstr) shlwapi.PathAddBackslashW diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index 9b8ebcf..548ae83 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -15,7 +15,7 @@ @ stdcall AddAuditAccessAce(ptr long long ptr long long) advapi32.AddAuditAccessAce @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) advapi32.AddAuditAccessAceEx @ stub AddAuditAccessObjectAce -@ stub AddMandatoryAce +@ stdcall AddMandatoryAce(ptr long long long ptr) advapi32.AddMandatoryAce @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) advapi32.AdjustTokenGroups @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) advapi32.AdjustTokenPrivileges @ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr) advapi32.AllocateAndInitializeSid

1 0

André Hentschel : winedbg: Add support for XML Target Descriptions to read Cpsr on ARM.
by Alexandre Julliard 26 Feb '13

26 Feb '13

Module: wine Branch: master Commit: 2d449b76e1b604af5d524c1f613833d1f47c3466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d449b76e1b604af5d524c1f6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 25 21:45:56 2013 +0100 winedbg: Add support for XML Target Descriptions to read Cpsr on ARM. --- programs/winedbg/gdbproxy.c | 45 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index bbd3898..580fb88 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -213,6 +213,7 @@ struct cpu_register #define REG(r,gs) {FIELD_OFFSET(CONTEXT, r), sizeof(((CONTEXT*)NULL)->r), gs} #ifdef __i386__ +static const char target_xml[] = ""; static struct cpu_register cpu_register_map[] = { REG(Eax, 4), REG(Ecx, 4), @@ -232,6 +233,7 @@ static struct cpu_register cpu_register_map[] = { REG(SegGs, 4), }; #elif defined(__powerpc__) +static const char target_xml[] = ""; static struct cpu_register cpu_register_map[] = { REG(Gpr0, 4), REG(Gpr1, 4), @@ -308,6 +310,7 @@ static struct cpu_register cpu_register_map[] = { /* see gdb/nlm/ppc.c */ }; #elif defined(__x86_64__) +static const char target_xml[] = ""; static struct cpu_register cpu_register_map[] = { REG(Rax, 8), REG(Rbx, 8), @@ -335,6 +338,7 @@ static struct cpu_register cpu_register_map[] = { REG(SegGs, 4), }; #elif defined(__sparc__) +static const char target_xml[] = ""; static struct cpu_register cpu_register_map[] = { REG(g0, 4), REG(g1, 4), @@ -370,6 +374,28 @@ static struct cpu_register cpu_register_map[] = { REG(i7, 4), }; #elif defined(__arm__) +static const char target_xml[] = + "l <target><architecture>arm</architecture>\n" + "<feature name=\"org.gnu.gdb.arm.core\">\n" + " <reg name=\"r0\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r1\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r2\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r3\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r4\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r5\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r6\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r7\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r8\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r9\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r10\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r11\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"r12\" bitsize=\"32\" type=\"uint32\"/>\n" + " <reg name=\"sp\" bitsize=\"32\" type=\"data_ptr\"/>\n" + " <reg name=\"lr\" bitsize=\"32\"/>\n" + " <reg name=\"pc\" bitsize=\"32\" type=\"code_ptr\"/>\n" + " <reg name=\"cpsr\" bitsize=\"32\"/>\n" + "</feature></target>\n"; + static struct cpu_register cpu_register_map[] = { REG(R0, 4), REG(R1, 4), @@ -387,8 +413,10 @@ static struct cpu_register cpu_register_map[] = { REG(Sp, 4), REG(Lr, 4), REG(Pc, 4), + REG(Cpsr, 4), }; #elif defined(__aarch64__) +static const char target_xml[] = ""; static struct cpu_register cpu_register_map[] = { REG(X0, 8), REG(X1, 8), @@ -1930,10 +1958,15 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) return packet_ok; if (strncmp(gdbctx->in_packet, "Supported", 9) == 0) { - /* no features supported */ - packet_reply_open(gdbctx); - packet_reply_close(gdbctx); - return packet_done; + if (strlen(target_xml)) + return packet_reply(gdbctx, "PacketSize=400;qXfer:features:read+", -1); + else + { + /* no features supported */ + packet_reply_open(gdbctx); + packet_reply_close(gdbctx); + return packet_done; + } } break; case 'T': @@ -1961,6 +1994,10 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) return packet_done; } break; + case 'X': + if (strlen(target_xml) && strncmp(gdbctx->in_packet, "Xfer:features:read:target.xml", 29) == 0) + return packet_reply(gdbctx, target_xml, -1); + break; } if (gdbctx->trace & GDBPXY_TRC_COMMAND_ERROR) fprintf(stderr, "Unknown or malformed query %*.*s\n",

1 0