April 2018 - Wine-Devel - list.winehq.org

[PATCH] include: Fix a couple of LSA typedefs.
by Hans Leidekker April 18, 2018

April 18, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- include/ntsecpkg.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index 7f64d06134..08373a2635 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -308,14 +308,15 @@ typedef struct _LSA_SECPKG_FUNCTION_TABLE { /* LSA-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI *PLSA_AP_INITIALIZE_PACKAGE)(ULONG, PLSA_DISPATCH_TABLE, PLSA_STRING, PLSA_STRING, PLSA_STRING *); -typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER)(LPWSTR, LPWSTR, LPWSTR, LPWSTR, - DWORD, DWORD, PHANDLE); -typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE)(PUNICODE_STRING, PVOID, ULONG, +typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER)(PLSA_CLIENT_REQUEST, SECURITY_LOGON_TYPE, + PVOID, PVOID, ULONG, PVOID *, PULONG, PLUID LogonId, PNTSTATUS, PLSA_TOKEN_INFORMATION_TYPE, + PVOID *, PLSA_UNICODE_STRING *, PLSA_UNICODE_STRING *); +typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PVOID *, PULONG, PNTSTATUS); typedef VOID (NTAPI *PLSA_AP_LOGON_TERMINATED)(PLUID); typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE_UNTRUSTED)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PVOID *, PULONG, PNTSTATUS); -typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE_PASSTHROUGH)(PUNICODE_STRING, +typedef NTSTATUS (NTAPI *PLSA_AP_CALL_PACKAGE_PASSTHROUGH)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PVOID *, PULONG, PNTSTATUS); typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER_EX)(PLSA_CLIENT_REQUEST, SECURITY_LOGON_TYPE, PVOID, PVOID, ULONG, PVOID *, PULONG, PLUID, PNTSTATUS, @@ -327,7 +328,7 @@ typedef NTSTATUS (NTAPI *PLSA_AP_LOGON_USER_EX2)(PLSA_CLIENT_REQUEST, PUNICODE_STRING *, PSECPKG_PRIMARY_CRED, PSECPKG_SUPPLEMENTAL_CRED_ARRAY *); typedef NTSTATUS (NTAPI SpInitializeFn)(ULONG_PTR, PSECPKG_PARAMETERS, PLSA_SECPKG_FUNCTION_TABLE); -typedef NTSTATUS (NTAPI SpShutDownFn)(void); +typedef NTSTATUS (NTAPI SpShutdownFn)(void); typedef NTSTATUS (NTAPI SpGetInfoFn)(PSecPkgInfoW); typedef NTSTATUS (NTAPI SpAcceptCredentialsFn)(SECURITY_LOGON_TYPE, PUNICODE_STRING, PSECPKG_PRIMARY_CRED, PSECPKG_SUPPLEMENTAL_CRED); @@ -411,7 +412,7 @@ typedef struct SECPKG_FUNCTION_TABLE { PLSA_AP_LOGON_USER_EX LogonUserEx; PLSA_AP_LOGON_USER_EX2 LogonUserEx2; SpInitializeFn *Initialize; - SpShutDownFn *Shutdown; + SpShutdownFn *Shutdown; SpGetInfoFn *GetInfo; SpAcceptCredentialsFn *AcceptCredentials; SpAcquireCredentialsHandleFn *SpAcquireCredentialsHandle; -- 2.11.0

1 0

[PATCH] webservices: Properly restore the reader position when the next element doesn't match.
by Hans Leidekker April 18, 2018

April 18, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 113 +++++++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 51 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a56bb7eb9f..79a1af63bf 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4346,6 +4346,24 @@ static HRESULT read_next_node( struct reader *reader ) return WS_E_INVALID_FORMAT; } +struct reader_pos +{ + struct node *node; + ULONG attr; +}; + +static void save_reader_position( const struct reader *reader, struct reader_pos *pos ) +{ + pos->node = reader->current; + pos->attr = reader->current_attr; +} + +static void restore_reader_position( struct reader *reader, const struct reader_pos *pos ) +{ + reader->current = pos->node; + reader->current_attr = pos->attr; +} + static HRESULT get_text( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const WS_XML_TEXT **ret, BOOL *found ) { @@ -4364,16 +4382,19 @@ static HRESULT get_text( struct reader *reader, WS_TYPE_MAPPING mapping, const W *found = TRUE; if (localname) { + struct reader_pos pos; HRESULT hr; + if (!match_element( reader->current, localname, ns )) { *found = FALSE; return S_OK; } + save_reader_position( reader, &pos ); if ((hr = read_next_node( reader )) != S_OK) return hr; if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) { - if (!move_to_parent_element( &reader->current )) return WS_E_INVALID_FORMAT; + restore_reader_position( reader, &pos ); *found = FALSE; return S_OK; } @@ -6021,8 +6042,7 @@ static HRESULT read_type_next_node( struct reader *reader ) static HRESULT read_type_next_element_node( struct reader *reader, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { - struct node *node; - ULONG attr; + struct reader_pos pos; HRESULT hr; if (!localname) return S_OK; /* assume reader is already correctly positioned */ @@ -6034,14 +6054,10 @@ static HRESULT read_type_next_element_node( struct reader *reader, const WS_XML_ } if (match_element( reader->current, localname, ns )) return S_OK; - node = reader->current; - attr = reader->current_attr; - + save_reader_position( reader, &pos ); if ((hr = read_type_next_node( reader )) != S_OK) return hr; if (match_element( reader->current, localname, ns )) return S_OK; - - reader->current = node; - reader->current_attr = attr; + restore_reader_position( reader, &pos ); return WS_E_INVALID_FORMAT; } @@ -6166,55 +6182,37 @@ static WS_READ_OPTION get_field_read_option( WS_TYPE type, ULONG options ) static HRESULT read_type_field( struct reader *, const WS_FIELD_DESCRIPTION *, WS_HEAP *, char *, ULONG ); -static HRESULT read_type_union( struct reader *reader, const WS_UNION_DESCRIPTION *desc, WS_READ_OPTION option, - WS_HEAP *heap, void *ret, ULONG size ) +static HRESULT read_type_union( struct reader *reader, const WS_UNION_DESCRIPTION *desc, WS_HEAP *heap, void *ret, + ULONG size, BOOL *found ) { - BOOL found = FALSE; + struct reader_pos pos; HRESULT hr; ULONG i; - switch (option) - { - case WS_READ_REQUIRED_VALUE: - case WS_READ_NILLABLE_VALUE: - if (size != desc->size) return E_INVALIDARG; - break; - - default: - return E_INVALIDARG; - } + if (size != desc->size) return E_INVALIDARG; + save_reader_position( reader, &pos ); if ((hr = read_type_next_node( reader )) != S_OK) return hr; - if (node_type( reader->current ) != WS_XML_NODE_TYPE_ELEMENT) return WS_E_INVALID_FORMAT; + for (i = 0; i < desc->fieldCount; i++) { - if ((found = match_element( reader->current, desc->fields[i]->field.localName, desc->fields[i]->field.ns ))) + if ((*found = match_element( reader->current, desc->fields[i]->field.localName, desc->fields[i]->field.ns ))) break; } - if (!found) *(int *)((char *)ret + desc->enumOffset) = desc->noneEnumValue; - else + if (!*found) { - ULONG offset = desc->fields[i]->field.offset; - if ((hr = read_type_field( reader, &desc->fields[i]->field, heap, ret, offset )) == S_OK) - *(int *)((char *)ret + desc->enumOffset) = desc->fields[i]->value; + *(int *)((char *)ret + desc->enumOffset) = desc->noneEnumValue; + restore_reader_position( reader, &pos ); } - - switch (option) + else { - case WS_READ_NILLABLE_VALUE: - if (!found) move_to_parent_element( &reader->current ); - break; - - case WS_READ_REQUIRED_VALUE: - if (!found) hr = WS_E_INVALID_FORMAT; - break; - - default: - return E_INVALIDARG; + ULONG offset = desc->fields[i]->field.offset; + if ((hr = read_type_field( reader, &desc->fields[i]->field, heap, ret, offset )) != S_OK) return hr; + *(int *)((char *)ret + desc->enumOffset) = desc->fields[i]->value; } - return hr; + return S_OK; } static HRESULT read_type( struct reader *, WS_TYPE_MAPPING, WS_TYPE, const WS_XML_STRING *, @@ -6251,17 +6249,28 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO } if (desc->type == WS_UNION_TYPE) - hr = read_type_union( reader, desc->typeDescription, option, heap, buf + offset, item_size ); + { + BOOL found; + hr = read_type_union( reader, desc->typeDescription, heap, buf + offset, item_size, &found ); + if (hr != S_OK) + { + ws_free( heap, buf, nb_allocated * item_size ); + return hr; + } + if (!found) break; + } else + { hr = read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->itemLocalName, desc->itemNs, desc->typeDescription, option, heap, buf + offset, item_size ); - - if (hr == WS_E_INVALID_FORMAT) break; - if (hr != S_OK) - { - ws_free( heap, buf, nb_allocated * item_size ); - return hr; + if (hr == WS_E_INVALID_FORMAT) break; + if (hr != S_OK) + { + ws_free( heap, buf, nb_allocated * item_size ); + return hr; + } } + offset += item_size; nb_items++; } @@ -6338,11 +6347,13 @@ static HRESULT read_type_field( struct reader *reader, const WS_FIELD_DESCRIPTIO break; case WS_ELEMENT_CHOICE_FIELD_MAPPING: + { + BOOL found; if (desc->type != WS_UNION_TYPE || !desc->typeDescription || (desc->options & (WS_FIELD_POINTER|WS_FIELD_NILLABLE))) return E_INVALIDARG; - hr = read_type_union( reader, desc->typeDescription, option, heap, ptr, size ); + hr = read_type_union( reader, desc->typeDescription, heap, ptr, size, &found ); break; - + } case WS_REPEATING_ELEMENT_FIELD_MAPPING: case WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING: { -- 2.11.0

1 0

[PATCH] shell32: Avoid some exception when property Set and Commit in shell32.dll
by Guillaume Gill April 18, 2018

April 18, 2018

>From b5332ae42d5dade2d114dc3c9ff9180215d8021b Mon Sep 17 00:00:00 2001 From: Guillaume GILL <gillg02(a)petitchinois.net> Date: Mon, 9 Apr 2018 21:28:03 +0200 Subject: [PATCH] shell32: Avoid some exception when property Set and Commit in shell32.dll Fixes https://bugs.winehq.org/show_bug.cgi?id=44866 Signed-off-by: Guillaume GILL <gillg02(a)petitchinois.net> --- dlls/shell32/shelllink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 6dca9ac..07c83d1 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2664,14 +2664,14 @@ static HRESULT WINAPI propertystore_SetValue(IPropertyStore *iface, REFPROPERTYK { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p)->(%p %p): stub\n", This, key, value); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI propertystore_Commit(IPropertyStore *iface) { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p): stub\n", This); - return E_NOTIMPL; + return S_OK; } static const IPropertyStoreVtbl propertystorevtbl = { -- 2.7.4

1 0

[PATCH] comctl32: Fix GroupBox can't have multiline text.
by Zhiyi Zhang April 18, 2018

April 18, 2018

GroupBox may have multiline text. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1b187e3834..1feb07ae64 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -282,9 +282,6 @@ static UINT BUTTON_BStoDT( DWORD style, DWORD ex_style ) default: dtStyle |= DT_VCENTER; break; } } - else - /* GroupBox's text is always single line and is top aligned. */ - dtStyle |= DT_SINGLELINE; return dtStyle; } -- 2.16.3

2 1

[v2 PATCH] shell32: Implement SHCreateSessionKey.
by Alistair Leslie-Hughes April 18, 2018

April 18, 2018

This implementation is based on the Geoff Chappell description. Based off patch by Dmitry Timoshkov. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shellreg.c | 35 ++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellole.c | 26 ++++++++++++++++++++++---- 2 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c index 356ec4e8bd..cacf3ac19f 100644 --- a/dlls/shell32/shellreg.c +++ b/dlls/shell32/shellreg.c @@ -34,6 +34,7 @@ #include "undocshell.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -148,13 +149,41 @@ HRESULT WINAPI SHRegCloseKey (HKEY hkey) return RegCloseKey( hkey ); } +static BOOL WINAPI create_session_key(INIT_ONCE *once, void *param, void **context) +{ + static const WCHAR session_format[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','S','e','s','s','i','o','n','I','n','f','o','\\','%','d',0}; + DWORD session; + HKEY hkey_session; + LPWSTR session_reg_str = param; + + if(!ProcessIdToSessionId( GetCurrentProcessId(), &session)) + return FALSE; + + sprintfW(session_reg_str, session_format, session); + + if (RegCreateKeyExW(HKEY_CURRENT_USER, session_reg_str, 0, NULL, + REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey_session, NULL)) + return FALSE; + + RegCloseKey(hkey_session); + TRACE("session key %s\n", debugstr_w(session_reg_str)); + return TRUE; +} + /************************************************************************* * SHCreateSessionKey [SHELL32.723] * */ HRESULT WINAPI SHCreateSessionKey(REGSAM access, HKEY *hkey) { - FIXME("stub: %d %p\n", access, hkey); - *hkey = NULL; - return E_NOTIMPL; + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + static WCHAR session_reg_str[MAX_PATH]; + + InitOnceExecuteOnce(&init_once, create_session_key, session_reg_str, NULL); + + TRACE("using session key %s\n", debugstr_w(session_reg_str)); + return RegOpenKeyExW(HKEY_CURRENT_USER, session_reg_str, 0, access, hkey); } diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index f611faf908..1f61bef0f0 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -76,6 +76,7 @@ static HRESULT (WINAPI *pSHPropStgWriteMultiple)(IPropertyStorage*, UINT*, ULONG, const PROPSPEC*, PROPVARIANT*, PROPID); static HRESULT (WINAPI *pSHCreateQueryCancelAutoPlayMoniker)(IMoniker**); static HRESULT (WINAPI *pSHCreateSessionKey)(REGSAM, HKEY*); +static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); static void init(void) { @@ -86,6 +87,7 @@ static void init(void) pSHPropStgWriteMultiple = (void*)GetProcAddress(hmod, "SHPropStgWriteMultiple"); pSHCreateQueryCancelAutoPlayMoniker = (void*)GetProcAddress(hmod, "SHCreateQueryCancelAutoPlayMoniker"); pSHCreateSessionKey = (void*)GetProcAddress(hmod, (char*)723); + pSHGetPathFromIDListEx = (void*)GetProcAddress(hmod, "SHGetPathFromIDListEx"); } static HRESULT WINAPI PropertyStorage_QueryInterface(IPropertyStorage *This, @@ -862,8 +864,15 @@ static void test_DragQueryFile(void) static void test_SHCreateSessionKey(void) { + static const WCHAR session_format[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','S','e','s','s','i','o','n','I','n','f','o','\\','%','d',0}; HKEY hkey, hkey2; HRESULT hr; + DWORD session; + WCHAR sessionW[MAX_PATH]; + LONG ret; if (!pSHCreateSessionKey) { @@ -877,17 +886,26 @@ static void test_SHCreateSessionKey(void) hkey = (HKEY)0xdeadbeef; hr = pSHCreateSessionKey(0, &hkey); todo_wine ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); - ok(hkey == NULL, "got %p\n", hkey); + todo_wine ok(hkey == NULL, "got %p\n", hkey); hr = pSHCreateSessionKey(KEY_READ, &hkey); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateSessionKey(KEY_READ, &hkey2); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); RegCloseKey(hkey); RegCloseKey(hkey2); + + /* Check the registery */ + ProcessIdToSessionId( GetCurrentProcessId(), &session); + wsprintfW(sessionW, session_format, session); + + ret = RegOpenKeyW(HKEY_CURRENT_USER, sessionW, &hkey); + /* Fails on XP and w2k3, SHGetPathFromIDListEx available for Vista+ */ + ok(!ret || (ret && !pSHGetPathFromIDListEx), "key not found\n"); + RegCloseKey(hkey); } static void test_dragdrophelper(void) -- 2.17.0

2 1

[PATCH 1/2] msi: Store a record's associated query privately.
by Zebediah Figura April 18, 2018

April 18, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/msipriv.h | 4 +--- dlls/msi/msiquery.c | 5 +++-- dlls/msi/record.c | 48 ------------------------------------------------ 3 files changed, 4 insertions(+), 53 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index b2b3e7c..9bc6413 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -131,7 +131,6 @@ typedef struct tagMSIFIELD union { INT iVal; - INT_PTR pVal; LPWSTR szwVal; IStream *stream; } u; @@ -141,6 +140,7 @@ typedef struct tagMSIFIELD typedef struct tagMSIRECORD { MSIOBJECTHDR hdr; + MSIQUERY *query; UINT count; /* as passed to MsiCreateRecord */ MSIFIELD fields[1]; /* nb. array size is count+1 */ } MSIRECORD; @@ -813,13 +813,11 @@ extern UINT MSI_RecordGetIStream( MSIRECORD *, UINT, IStream **) DECLSPEC_HIDDEN extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, UINT ) DECLSPEC_HIDDEN; extern MSIRECORD *MSI_CreateRecord( UINT ) DECLSPEC_HIDDEN; extern UINT MSI_RecordSetInteger( MSIRECORD *, UINT, int ) DECLSPEC_HIDDEN; -extern UINT MSI_RecordSetIntPtr( MSIRECORD *, UINT, INT_PTR ) DECLSPEC_HIDDEN; extern UINT MSI_RecordSetStringW( MSIRECORD *, UINT, LPCWSTR ) DECLSPEC_HIDDEN; extern BOOL MSI_RecordIsNull( MSIRECORD *, UINT ) DECLSPEC_HIDDEN; extern UINT MSI_RecordGetStringW( MSIRECORD * , UINT, LPWSTR, LPDWORD) DECLSPEC_HIDDEN; extern UINT MSI_RecordGetStringA( MSIRECORD *, UINT, LPSTR, LPDWORD) DECLSPEC_HIDDEN; extern int MSI_RecordGetInteger( MSIRECORD *, UINT ) DECLSPEC_HIDDEN; -extern INT_PTR MSI_RecordGetIntPtr( MSIRECORD *, UINT ) DECLSPEC_HIDDEN; extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, LPDWORD) DECLSPEC_HIDDEN; extern UINT MSI_RecordSetStream(MSIRECORD *, UINT, IStream *) DECLSPEC_HIDDEN; extern UINT MSI_RecordGetFieldCount( const MSIRECORD *rec ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index f8ed4ce..1ba3076 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -374,7 +374,8 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) if (r == ERROR_SUCCESS) { query->row ++; - MSI_RecordSetIntPtr(*prec, 0, (INT_PTR)query); + (*prec)->query = query; + MSI_RecordSetInteger(*prec, 0, 1); } return r; @@ -608,7 +609,7 @@ UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec ) if ( !view || !view->ops->modify) return ERROR_FUNCTION_FAILED; - if ( mode == MSIMODIFY_UPDATE && MSI_RecordGetIntPtr( rec, 0 ) != (INT_PTR)query ) + if ( mode == MSIMODIFY_UPDATE && rec->query != query ) return ERROR_FUNCTION_FAILED; r = view->ops->modify( view, mode, rec, query->row ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index de45191..8254b17 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -46,7 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); #define MSIFIELD_INT 1 #define MSIFIELD_WSTR 3 #define MSIFIELD_STREAM 4 -#define MSIFIELD_INTPTR 5 static void MSI_FreeField( MSIFIELD *field ) { @@ -54,7 +53,6 @@ static void MSI_FreeField( MSIFIELD *field ) { case MSIFIELD_NULL: case MSIFIELD_INT: - case MSIFIELD_INTPTR: break; case MSIFIELD_WSTR: msi_free( field->u.szwVal); @@ -190,9 +188,6 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, case MSIFIELD_INT: out->u.iVal = in->u.iVal; break; - case MSIFIELD_INTPTR: - out->u.pVal = in->u.pVal; - break; case MSIFIELD_WSTR: if ((str = msi_strdupW( in->u.szwVal, in->len ))) { @@ -216,32 +211,6 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, return r; } -INT_PTR MSI_RecordGetIntPtr( MSIRECORD *rec, UINT iField ) -{ - int ret; - - TRACE( "%p %d\n", rec, iField ); - - if( iField > rec->count ) - return MININT_PTR; - - switch( rec->fields[iField].type ) - { - case MSIFIELD_INT: - return rec->fields[iField].u.iVal; - case MSIFIELD_INTPTR: - return rec->fields[iField].u.pVal; - case MSIFIELD_WSTR: - if( string2intW( rec->fields[iField].u.szwVal, &ret ) ) - return ret; - return MININT_PTR; - default: - break; - } - - return MININT_PTR; -} - int MSI_RecordGetInteger( MSIRECORD *rec, UINT iField) { int ret = 0; @@ -255,8 +224,6 @@ int MSI_RecordGetInteger( MSIRECORD *rec, UINT iField) { case MSIFIELD_INT: return rec->fields[iField].u.iVal; - case MSIFIELD_INTPTR: - return rec->fields[iField].u.pVal; case MSIFIELD_WSTR: if( string2intW( rec->fields[iField].u.szwVal, &ret ) ) return ret; @@ -311,20 +278,6 @@ UINT WINAPI MsiRecordClearData( MSIHANDLE handle ) return ERROR_SUCCESS; } -UINT MSI_RecordSetIntPtr( MSIRECORD *rec, UINT iField, INT_PTR pVal ) -{ - TRACE("%p %u %ld\n", rec, iField, pVal); - - if( iField > rec->count ) - return ERROR_INVALID_PARAMETER; - - MSI_FreeField( &rec->fields[iField] ); - rec->fields[iField].type = MSIFIELD_INTPTR; - rec->fields[iField].u.pVal = pVal; - - return ERROR_SUCCESS; -} - UINT MSI_RecordSetInteger( MSIRECORD *rec, UINT iField, int iVal ) { TRACE("%p %u %d\n", rec, iField, iVal); @@ -1095,7 +1048,6 @@ void dump_record(MSIRECORD *rec) case MSIFIELD_NULL: TRACE("(null)"); break; case MSIFIELD_INT: TRACE("%d", rec->fields[i].u.iVal); break; case MSIFIELD_WSTR: TRACE("%s", debugstr_w(rec->fields[i].u.szwVal)); break; - case MSIFIELD_INTPTR: TRACE("%ld", rec->fields[i].u.pVal); break; case MSIFIELD_STREAM: TRACE("%p", rec->fields[i].u.stream); break; } if (i < rec->count) TRACE(", "); -- 2.7.4

2 3

[PATCH] msi: Don't cache the base URL.
by Hans Leidekker April 18, 2018

April 18, 2018

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/dialog.c | 2 +- dlls/msi/media.c | 40 ++++++++++++++++++++++++++++++---------- dlls/msi/msipriv.h | 3 +-- dlls/msi/package.c | 25 +++---------------------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index ec3258129a..61c6ab07e3 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4113,7 +4113,7 @@ static MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE *db ) MSIPREVIEW *preview = NULL; MSIPACKAGE *package; - package = MSI_CreatePackage( db, NULL ); + package = MSI_CreatePackage( db ); if (package) { preview = alloc_msiobject( MSIHANDLETYPE_PREVIEW, sizeof(MSIPREVIEW), MSI_ClosePreview ); diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 0bb883b34a..3d4a8c09eb 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -678,6 +678,14 @@ static UINT get_drive_type(const WCHAR *path) return GetDriveTypeW(root); } +static WCHAR *get_base_url( MSIDATABASE *db ) +{ + WCHAR *p, *ret = NULL, *orig_db = msi_dup_property( db, szOriginalDatabase ); + if (UrlIsW( orig_db, URLIS_URL ) && (ret = strdupW( orig_db )) && (p = strrchrW( ret, '/'))) p[1] = 0; + msi_free( orig_db ); + return ret; +} + UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) { static const WCHAR query[] = { @@ -685,7 +693,7 @@ UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) 'W','H','E','R','E',' ','`','L','a','s','t','S','e','q','u','e','n','c','e','`',' ', '>','=',' ','%','i',' ','O','R','D','E','R',' ','B','Y',' ','`','D','i','s','k','I','d','`',0}; MSIRECORD *row; - LPWSTR source_dir, source; + WCHAR *source_dir, *source, *base_url = NULL; DWORD options; if (Sequence <= mi->last_sequence) /* already loaded */ @@ -721,9 +729,9 @@ UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) source = source_dir; options |= MSISOURCETYPE_MEDIA; } - else if (package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) + else if ((base_url = get_base_url(package->db))) { - source = package->BaseURL; + source = base_url; options |= MSISOURCETYPE_URL; } else @@ -739,8 +747,10 @@ UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) msi_package_add_info(package, package->Context, options, INSTALLPROPERTY_LASTUSEDSOURCEW, source); - msi_free(source_dir); TRACE("sequence %u -> cabinet %s disk id %u\n", Sequence, debugstr_w(mi->cabinet), mi->disk_id); + + msi_free(base_url); + msi_free(source_dir); return ERROR_SUCCESS; } @@ -851,6 +861,8 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) if (mi->cabinet) { + WCHAR *base_url; + /* cabinet is internal, no checks needed */ if (mi->cabinet[0] == '#') return ERROR_SUCCESS; @@ -858,14 +870,21 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) /* package should be downloaded */ if (compressed && GetFileAttributesW( cabinet_file ) == INVALID_FILE_ATTRIBUTES && - package->BaseURL && UrlIsW( package->BaseURL, URLIS_URL )) + (base_url = get_base_url( package->db ))) { - WCHAR temppath[MAX_PATH], *p; + WCHAR temppath[MAX_PATH], *p, *url; - if ((rc = msi_download_file( cabinet_file, temppath )) != ERROR_SUCCESS) + msi_free( cabinet_file ); + if (!(url = msi_alloc( (strlenW( base_url ) + strlenW( mi->cabinet ) + 1) * sizeof(WCHAR) ))) { - ERR("failed to download %s (%u)\n", debugstr_w(cabinet_file), rc); - msi_free( cabinet_file ); + return ERROR_OUTOFMEMORY; + } + strcpyW( url, base_url ); + strcatW( url, mi->cabinet ); + if ((rc = msi_download_file( url, temppath )) != ERROR_SUCCESS) + { + ERR("failed to download %s (%u)\n", debugstr_w(url), rc); + msi_free( url ); return rc; } if ((p = strrchrW( temppath, '\\' ))) *p = 0; @@ -873,7 +892,8 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) PathAddBackslashW( mi->sourcedir ); msi_free( mi->cabinet ); mi->cabinet = strdupW( p + 1 ); - msi_free( cabinet_file ); + + msi_free( url ); return ERROR_SUCCESS; } } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index b2b3e7ce6b..f47cd1265b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -423,7 +423,6 @@ typedef struct tagMSIPACKAGE struct list RunningActions; - LPWSTR BaseURL; LPWSTR PackagePath; LPWSTR ProductCode; LPWSTR localfile; @@ -861,7 +860,7 @@ extern UINT msi_view_get_row(MSIDATABASE *, MSIVIEW *, UINT, MSIRECORD **) DECLS extern UINT MSI_SetInstallLevel( MSIPACKAGE *package, int iInstallLevel ) DECLSPEC_HIDDEN; /* package internals */ -extern MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *, LPCWSTR ) DECLSPEC_HIDDEN; +extern MSIPACKAGE *MSI_CreatePackage( MSIDATABASE * ) DECLSPEC_HIDDEN; extern UINT MSI_OpenPackageW( LPCWSTR szPackage, MSIPACKAGE **pPackage ) DECLSPEC_HIDDEN; extern UINT MSI_SetTargetPathW( MSIPACKAGE *, LPCWSTR, LPCWSTR ) DECLSPEC_HIDDEN; extern INT MSI_ProcessMessageVerbatim( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index b154423be7..d741a349b4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -321,7 +321,6 @@ static void free_package_structures( MSIPACKAGE *package ) msi_free_patchinfo( patch ); } - msi_free( package->BaseURL ); msi_free( package->PackagePath ); msi_free( package->ProductCode ); msi_free( package->ActionFormat ); @@ -1056,7 +1055,7 @@ void msi_adjust_privilege_properties( MSIPACKAGE *package ) msi_set_property( package->db, szAdminUser, szOne, -1 ); } -MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) +MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db ) { static const WCHAR fmtW[] = {'%','u',0}; MSIPACKAGE *package; @@ -1077,7 +1076,6 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) package->LastActionResult = MSI_NULL_INTEGER; package->WordCount = 0; package->PackagePath = strdupW( db->path ); - package->BaseURL = strdupW( base_url ); create_temp_property_table( package ); msi_clone_properties( package->db ); @@ -1447,15 +1445,13 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) MSIPACKAGE *package; MSIHANDLE handle; MSIRECORD *data_row, *info_row; - LPWSTR ptr, base_url = NULL; UINT r; WCHAR localfile[MAX_PATH], cachefile[MAX_PATH]; LPCWSTR file = szPackage; DWORD index = 0; MSISUMMARYINFO *si; BOOL delete_on_close = FALSE; - LPWSTR productname; - WCHAR *info_template; + WCHAR *info_template, *productname; TRACE("%s %p\n", debugstr_w(szPackage), pPackage); @@ -1487,30 +1483,19 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) return r; file = cachefile; - - base_url = strdupW( szPackage ); - if (!base_url) - return ERROR_OUTOFMEMORY; - - ptr = strrchrW( base_url, '/' ); - if (ptr) *(ptr + 1) = '\0'; } r = get_local_package( file, localfile ); if (r != ERROR_SUCCESS || GetFileAttributesW( localfile ) == INVALID_FILE_ATTRIBUTES) { r = msi_create_empty_local_file( localfile, dotmsi ); if (r != ERROR_SUCCESS) - { - msi_free ( base_url ); return r; - } if (!CopyFileW( file, localfile, FALSE )) { r = GetLastError(); WARN("unable to copy package %s to %s (%u)\n", debugstr_w(file), debugstr_w(localfile), r); DeleteFileW( localfile ); - msi_free ( base_url ); return r; } delete_on_close = TRUE; @@ -1518,13 +1503,9 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) TRACE("opening package %s\n", debugstr_w( localfile )); r = MSI_OpenDatabaseW( localfile, MSIDBOPEN_TRANSACT, &db ); if (r != ERROR_SUCCESS) - { - msi_free ( base_url ); return r; - } } - package = MSI_CreatePackage( db, base_url ); - msi_free( base_url ); + package = MSI_CreatePackage( db ); msiobj_release( &db->hdr ); if (!package) return ERROR_INSTALL_PACKAGE_INVALID; package->localfile = strdupW( localfile ); -- 2.11.0

1 0

[PATCH v3] user32: Fix using DrawTextEx() to calculate rect with flag DT_BOTTOM.
by Zhiyi Zhang April 18, 2018

April 18, 2018

Supersede 144852. Thunderbird likes to mangle text :( Fix using DrawTextEx to calculate text rect with DT_BOTTOM flag set returns zero for text height. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/text.c | 12 ++++++++++++ dlls/user32/text.c | 45 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 3cc9571521..e07bb2f168 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -28,6 +28,8 @@ #include "winerror.h" #include "winnls.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + #define MODIFIED(rect) (rect.left == 10 && rect.right != 100 && rect.top == 10 && rect.bottom != 100) #define EMPTY(rect) (rect.left == rect.right && rect.bottom == rect.top) @@ -46,11 +48,13 @@ static void test_DrawTextCalcRect(void) static CHAR wordbreak_text[] = "line1 line2"; static WCHAR wordbreak_textW[] = {'l','i','n','e','1',' ','l','i','n','e','2',0}; static char tabstring[] = "one\ttwo"; + static DWORD alignments[] = {DT_TOP, DT_LEFT, DT_CENTER, DT_RIGHT, DT_VCENTER, DT_BOTTOM}; INT textlen, textheight, heightcheck; RECT rect = { 0, 0, 100, 0 }, rect2; BOOL ret; DRAWTEXTPARAMS dtp; BOOL conform_xp = TRUE; + INT i; /* Initialization */ hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, @@ -586,6 +590,14 @@ static void test_DrawTextCalcRect(void) ok(rect.top == rect2.top, "unexpected value %d, got %d\n", rect.top, rect2.top); ok(rect.bottom == rect2.bottom , "unexpected value %d, got %d\n", rect.bottom, rect2.bottom); + for (i = 0; i < ARRAY_SIZE(alignments); i++) + { + SetRectEmpty(&rect); + textheight = DrawTextA(hdc, tabstring, -1, &rect, DT_NOCLIP | DT_CALCRECT | DT_SINGLELINE | alignments[i]); + ok(textheight > 0, "Alignment 0x%08x got unexpected textheight %d\n", alignments[i], textheight); + ok(rect.right - rect.left > 0, "Alignment 0x%08x got unexpected rect width %d\n", alignments[i], + rect.right - rect.left); + } SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 0b5bd47461..6843386e22 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -874,17 +874,17 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, WCHAR *retstr, *p_retstr; size_t size_retstr; WCHAR line[MAX_BUFFER]; - int len, lh, count=i_count; + int len, lh, count = i_count, old_count, line_count = 0; TEXTMETRICW tm; int lmargin = 0, rmargin = 0; int x = rect->left, y = rect->top; int width = rect->right - rect->left; - int max_width = 0; + int max_width = 0, max_height = 0; int last_line; int tabwidth /* to keep gcc happy */ = 0; int prefix_offset; ellipsis_data ellip; - BOOL invert_y=FALSE; + BOOL invert_y = FALSE, is_fist_line = TRUE; TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, wine_dbgstr_rect(rect), flags); @@ -968,6 +968,29 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, } p_retstr = retstr; + old_count = count; + do + { + len = ARRAY_SIZE(line); + if (invert_y) + last_line = !(flags & DT_NOCLIP) && y - ((flags & DT_EDITCONTROL) ? 2 * lh - 1 : lh) < rect->bottom; + else + last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2 * lh - 1 : lh) > rect->bottom; + strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, + &prefix_offset, &ellip); + + if (invert_y) + y -= lh; + else + y += lh; + + line_count++; + } while (strPtr && !last_line); + max_height = line_count * lh; + + strPtr = str; + count = old_count; + y = rect->top; do { len = ARRAY_SIZE(line); @@ -981,11 +1004,15 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, size.cx) / 2; else if (flags & DT_RIGHT) x = rect->right - size.cx; - if (flags & DT_SINGLELINE) - { - if (flags & DT_VCENTER) y = rect->top + - (rect->bottom - rect->top) / 2 - size.cy / 2; - else if (flags & DT_BOTTOM) y = rect->bottom - size.cy; + if (is_fist_line) + { + if (flags & DT_VCENTER) + y = invert_y ? rect->top - (rect->bottom - rect->top) / 2 + max_height / 2 + : rect->top + (rect->bottom - rect->top) / 2 - max_height / 2; + else if (flags & DT_BOTTOM) + y = invert_y ? rect->bottom + max_height : rect->bottom - max_height; + + is_fist_line = FALSE; } if (!(flags & DT_CALCRECT)) @@ -1071,7 +1098,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, memcpy (str, retstr, size_retstr); HeapFree (GetProcessHeap(), 0, retstr); } - return y - rect->top; + return invert_y ? -max_height : max_height; } /*********************************************************************** -- 2.16.3

2 1

[PATCH v15 1/3] wmp: Add seeking and duration
by Anton Romanov April 18, 2018

April 18, 2018

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- Changed test.mp3 to be 10s cbr stereo. Looks like when gstreamer reports duration as half is because it gets confused by 1 channel mp3 dlls/wmp/player.c | 65 +++++++++++++++++++++++++++++++++------- dlls/wmp/tests/media.c | 38 +++++++++++++++++++++++ dlls/wmp/tests/rsrc.rc | 2 +- dlls/wmp/tests/test.mp3 | Bin 240333 -> 40377 bytes dlls/wmp/wmp_private.h | 3 ++ 5 files changed, 97 insertions(+), 11 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index f4ce62a447..8448916a80 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1396,8 +1396,21 @@ static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMembe static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstrItem, VARIANT_BOOL *pIsAvailable) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstrItem)); - return E_NOTIMPL; + static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrItem), pIsAvailable); + if (!This->filter_graph) { + *pIsAvailable = VARIANT_FALSE; + } else if (strcmpW(currentPosition, bstrItem) == 0) { + DWORD capabilities; + IMediaSeeking_GetCapabilities(This->media_seeking, &capabilities); + *pIsAvailable = (capabilities & AM_SEEKING_CanSeekAbsolute) ? + VARIANT_TRUE : VARIANT_FALSE; + } else { + FIXME("%s not implemented\n", debugstr_w(bstrItem)); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI WMPControls_play(IWMPControls *iface) @@ -1428,11 +1441,16 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) if (SUCCEEDED(hres)) hres = IGraphBuilder_RenderFile(This->filter_graph, media->url, NULL); + if (SUCCEEDED(hres)) + update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); if (SUCCEEDED(hres)) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaControl, (void**)&This->media_control); if (SUCCEEDED(hres)) - update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); + hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaSeeking, + (void**)&This->media_seeking); + if (SUCCEEDED(hres)) + hres = IMediaSeeking_SetTimeFormat(This->media_seeking, &TIME_FORMAT_MEDIA_TIME); if (SUCCEEDED(hres)) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaEvent, (void**)&This->media_event); @@ -1459,7 +1477,10 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) } if (SUCCEEDED(hres)) { + LONGLONG duration; update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsPlaying); + if (SUCCEEDED(IMediaSeeking_GetDuration(This->media_seeking, &duration))) + media->duration = (DOUBLE)duration / 10000000.0f; } else { update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsUndefined); } @@ -1482,11 +1503,14 @@ static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) if (This->media_event) { IMediaEvent_Release(This->media_event); } - + if (This->media_seeking) { + IMediaSeeking_Release(This->media_seeking); + } IGraphBuilder_Release(This->filter_graph); This->filter_graph = NULL; This->media_control = NULL; This->media_event = NULL; + This->media_seeking = NULL; update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistOpenNoMedia); update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsStopped); @@ -1517,15 +1541,33 @@ static HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) static HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%p)\n", This, pdCurrentPosition); - return E_NOTIMPL; + HRESULT hres; + LONGLONG currentPosition; + + TRACE("(%p)->(%p)\n", This, pdCurrentPosition); + if (!This->media_seeking) + return S_FALSE; + + hres = IMediaSeeking_GetCurrentPosition(This->media_seeking, &currentPosition); + *pdCurrentPosition = (DOUBLE) currentPosition / 10000000.0f; + TRACE("hres: %d, pos: %f\n", hres, *pdCurrentPosition); + return hres; } static HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) { + LONGLONG Current; + HRESULT hres; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%f)\n", This, dCurrentPosition); - return E_NOTIMPL; + TRACE("(%p)->(%f)\n", This, dCurrentPosition); + if (!This->media_seeking) + return S_FALSE; + + Current = 10000000 * dCurrentPosition; + hres = IMediaSeeking_SetPositions(This->media_seeking, &Current, + AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); + + return hres; } static HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) @@ -1762,9 +1804,12 @@ static HRESULT WINAPI WMPMedia_getMarkerName(IWMPMedia *iface, LONG MarkerNum, B static HRESULT WINAPI WMPMedia_get_duration(IWMPMedia *iface, DOUBLE *pDuration) { + /* MSDN: If this property is used with a media item other than the one + * specified in Player.currentMedia, it may not contain a valid value. */ WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%p)\n", This, pDuration); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pDuration); + *pDuration = This->duration; + return S_OK; } static HRESULT WINAPI WMPMedia_get_durationString(IWMPMedia *iface, BSTR *pbstrDuration) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index c2cd1cf941..a74cccd714 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -303,6 +303,11 @@ static BOOL test_wmp(void) static DWORD dw = 100; IWMPSettings *settings; BOOL test_ran = TRUE; + DOUBLE duration; + VARIANT_BOOL vbool; + IWMPMedia *media; + static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; + BSTR bstrcurrentPosition = SysAllocString(currentPosition); hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -338,6 +343,10 @@ static BOOL test_wmp(void) ok(hres == S_OK, "get_controls failed: %08x\n", hres); ok(controls != NULL, "controls = NULL\n"); + hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(vbool == VARIANT_FALSE, "unexpected value\n"); + hres = IWMPControls_play(controls); ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres); @@ -380,6 +389,34 @@ static BOOL test_wmp(void) /* MediaOpening happens only on xp, 2003 */ CLEAR_CALLED(OPENSTATE, wmposMediaOpening); + hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(vbool == VARIANT_TRUE, "unexpected value\n"); + + duration = 0.0; + hres = IWMPControls_get_currentPosition(controls, &duration); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + ok((int)duration == 0, "unexpected value %f\n", duration); + + duration = 5.0; + hres = IWMPControls_put_currentPosition(controls, duration); + ok(hres == S_OK, "IWMPControls_put_currentPosition failed: %08x\n", hres); + + duration = 0.0; + hres = IWMPControls_get_currentPosition(controls, &duration); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + /* builtin quartz does not handle this currently and resets to 0.0, works + * with native quartz */ + todo_wine ok((int)duration >= 5.0, "unexpected value %f\n", duration); + + hres = IWMPPlayer4_get_currentMedia(player4, &media); + ok(hres == S_OK, "IWMPPlayer4_get_currentMedia failed: %08x\n", hres); + hres = IWMPMedia_get_duration(media, &duration); + ok(hres == S_OK, "IWMPMedia_get_duration failed: %08x\n", hres); + ok(round(duration) == 10, "unexpected value: %f\n", duration); + trace("AAAA %f\n", duration); + IWMPMedia_Release(media); + SET_EXPECT(PLAYSTATE, wmppsStopped); /* The following happens on wine only since we close media on stop */ SET_EXPECT(OPENSTATE, wmposPlaylistOpenNoMedia); @@ -414,6 +451,7 @@ playback_skip: IOleObject_Release(oleobj); DeleteFileW(filename); SysFreeString(filename); + SysFreeString(bstrcurrentPosition); return test_ran; } diff --git a/dlls/wmp/tests/rsrc.rc b/dlls/wmp/tests/rsrc.rc index a92079e798..715399d524 100644 --- a/dlls/wmp/tests/rsrc.rc +++ b/dlls/wmp/tests/rsrc.rc @@ -18,7 +18,7 @@ #include "windef.h" -/* ffmpeg -ar 48000 -t 60 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 output.mp3 */ +/* ffmpeg -f lavfi -i anullsrc -t 10 -acodec libmp3lame -b:a 8k dlls/wmp/tests/test.mp3 */ /* @makedep: test.mp3 */ test.mp3 RCDATA "test.mp3" /* ffmpeg -ar 48000 -t 1 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 test1s.mp3 */ diff --git a/dlls/wmp/tests/test.mp3 b/dlls/wmp/tests/test.mp3 index 149a2cd346ee52ae179c46198ce290a5dd4d6251..b599b2dd3ba7befc42717f96e7ba629c658378b9 100644 GIT binary patch literal 40377 zcmeI30c2HC7{^cEq@=b=jKr)G(b{ZT5t+7XTA9{MBC0(vCC$i)WJ#1ti9}3dBt;UD z$V4PY5|Jj6h-5_K(d*u~d+)jD+;iT4p8Kxe^`GpX(a)7#Ikp5Og_-#hobUT=4Mop66v z?j0EDagOyuWcm(|<TrG-Y;137Yi%u^o%vNP^oJsIv-f0v$T{P@%$!jn#;%CW-1!R@ zEnd2;arug-=GAM~u3O*M(Ya~!maeVacI(a)2UzbCu@z`;XDaz~G!7#cn`a{A2KbLTHy zynOZgjhnY_kKMUDe((OnM~|O8efIpt#LHK&-%P%J_x{7jPoKYh{r3IG&*@*k{}leZ zSK?grpmWV_;p-KvGL7yz_d2!@Pwbm%%iqO9Lr&CB3vtZpn<vD=Cg-Z1f8$Q*G&@Fx zsO#(6)l=e-E%O8Zs90E%YX;+#d3AXTjFWXI)P1e|gygH0X(a)P;<3FQ+Qr!=8U36OIq z^dNz8N)wt)fSfy_siY<}#R(a5X%;!eJ7nON1>j0KMCB?V$D&|@=JruJ!_vnFOX&yX zsGLG86aa9nav(a)e~6Of~FDlQoTa8ypB(prEVmD6|yApl3^0#bSdkgGZ6z<eANYV3)X z6ROghF}9+B?@&XI50ZM}abrNP=5m!2`rmVvcZhe$t3;sq#P;?;<)|E$6V{JDJvQYJ zAX&Lmu;ByXSmkWsShiWVJvW#`RZ(a)Xv+g5$3T!qSEaNPehONYtDvyFwvN!=Za2OL)< z71jg<j*DP(MR0mSvhoewMh<|ZayD>Oj#bWcgE>?s6<D(a)y)rZPax!F}8<`8qpBjA1? zivPjGqys3Y%pnsrw-12h<3r`(Qn$Or37KU`Du<F92NeZYQ?m!GrpB+F+h8gEz-=n0 z&<X_r9N)l0tkfnTN99ypG6LYJoJ6Iy068kB(a)d`o!j>-k3^adbD<#b?v48T!2A5`QB z$WgfnF|PxFqjENId}6KArzup<rX0>yZkL(aVRG?&%7Mp8-5rVt9IGj-DOV(dUnEoN zHz=oE)ho0(a)0RYD(R*03_1mvikic3ZS9F>!(v=$&o<uqPF2*6RffRx?<<fxnu%#Q&$ zD(8cW9055h7a`_#0B}^!1}=4b3fP3y?JjXbX1lQp@$AbbHBRbsl(a)sEICf~rhp{bT{ zP)@lBR&mJ)fa4-qqS9J`9F@~}1t9=O<pNTA1CXO~Ixs&5;HaDrDslwms9c1Y*8#v$ zIU6`W;PC-3;T*!b%Iz|9x?*xkZI`9)4#fkG)s)pV;c80ds2r8!4z0Rk04oJPNUFGG z1i<k(a)QlipYfE<<6cm*K<N96)idION7ayl?S2H>ci4=Qp5<fvSPnAZWoQ8^p9)IH!~ z6H>Rk#0i=0#wx_KFPGFfsmoPPh`URC1Ly9NTE0O!<sw+cB_jZii(rXLYXNdpPU97X z034MINa+ngj>_r4{1||vaz3cY5s;&D5n^5k02iNfwhQq3W4l9O98L%UvYk)e9r_0> CCH<lR literal 240333 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 diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 3792e52abd..e8d534803f 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -42,6 +42,8 @@ typedef struct { LONG ref; WCHAR *url; + + DOUBLE duration; } WMPMedia; struct WindowsMediaPlayer { @@ -76,6 +78,7 @@ struct WindowsMediaPlayer { IGraphBuilder* filter_graph; IMediaControl* media_control; IMediaEvent* media_event; + IMediaSeeking* media_seeking; /* Async event notification */ HWND msg_window; -- 2.17.0

1 0

[PATCH] shell32: Avoid some exception when property Set and Commit in shell32.dll
by Guillaume Gill April 18, 2018

April 18, 2018

>From b5332ae42d5dade2d114dc3c9ff9180215d8021b Mon Sep 17 00:00:00 2001 From: Guillaume GILL <gillg02(a)petitchinois.net> Date: Mon, 9 Apr 2018 21:28:03 +0200 Subject: [PATCH] shell32: Avoid some exception when property Set and Commit in shell32.dll Fixes https://bugs.winehq.org/show_bug.cgi?id=44866 Signed-off-by: Guillaume GILL <gillg02(a)petitchinois.net> --- dlls/shell32/shelllink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 6dca9ac..07c83d1 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2664,14 +2664,14 @@ static HRESULT WINAPI propertystore_SetValue(IPropertyStore *iface, REFPROPERTYK { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p)->(%p %p): stub\n", This, key, value); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI propertystore_Commit(IPropertyStore *iface) { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p): stub\n", This); - return E_NOTIMPL; + return S_OK; } static const IPropertyStoreVtbl propertystorevtbl = { -- 2.7.4

1 0