wine-commits September 2018

wine-commits@winehq.org

2 participants
670 discussions

Alexandre Julliard : shell32: Re-add support for expanding ALLUSERSPROFILE for backward compatibility.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 4a6855a575c02aa1569aab8b2e96720fc02f3f26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a6855a575c02aa1569aab8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 13:00:15 2018 +0200 shell32: Re-add support for expanding ALLUSERSPROFILE for backward compatibility. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index dccfbba..f08474b 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -951,7 +951,8 @@ static const WCHAR Videos_Sample_VideosW[] = {'V','i','d','e','o','s','\\','S',' static const WCHAR WindowsW[] = {'W','i','n','d','o','w','s',0}; static const WCHAR Windows_Sidebar_GadgetsW[] = {'W','i','n','d','o','w','s',' ','S','i','d','e','b','a','r','\\','G','a','d','g','e','t','s',0}; static const WCHAR DefaultW[] = {'.','D','e','f','a','u','l','t','\0'}; -static const WCHAR AllUsersProfileW[] = {'%','P','U','B','L','I','C','%',0}; +static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'}; +static const WCHAR PublicProfileW[] = {'%','P','U','B','L','I','C','%',0}; static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'}; static const WCHAR ProgramDataVarW[] = {'%','P','r','o','g','r','a','m','D','a','t','a','%','\0'}; static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'}; @@ -3474,7 +3475,7 @@ static HRESULT _SHGetDefaultValue(BYTE folder, LPWSTR pszPath) strcpyW(pszPath, UserProfileW); break; case CSIDL_Type_AllUsers: - strcpyW(pszPath, AllUsersProfileW); + strcpyW(pszPath, PublicProfileW); break; case CSIDL_Type_ProgramData: strcpyW(pszPath, ProgramDataVarW); @@ -3812,6 +3813,17 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) PathAppendW(szDest, szAllUsers); PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); } + else if (!strncmpiW(szTemp, PublicProfileW, strlenW(PublicProfileW))) + { + WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; + + GetSystemDirectoryW(def_val, MAX_PATH); + strcpyW( def_val + 3, UsersPublicW ); + + hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); + PathAppendW(szDest, szAllUsers); + PathAppendW(szDest, szTemp + strlenW(PublicProfileW)); + } else if (!strncmpiW(szTemp, ProgramDataVarW, strlenW(ProgramDataVarW))) { WCHAR szProgramData[MAX_PATH], def_val[MAX_PATH];

1 0

Alexandre Julliard : shell32: Avoid infinite loop in _SHExpandEnvironmentStrings.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: ceea5bda14ecf4c8ce262fc7ab88df49e500bc38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceea5bda14ecf4c8ce262fc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:59:45 2018 +0200 shell32: Avoid infinite loop in _SHExpandEnvironmentStrings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index afd6340..dccfbba 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3855,22 +3855,15 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) } else { - DWORD ret = ExpandEnvironmentStringsW(szSrc, szDest, MAX_PATH); + DWORD ret = ExpandEnvironmentStringsW(szTemp, szDest, MAX_PATH); if (ret > MAX_PATH) hr = E_NOT_SUFFICIENT_BUFFER; else if (ret == 0) hr = HRESULT_FROM_WIN32(GetLastError()); - else - hr = S_OK; - } - if (SUCCEEDED(hr) && szDest[0] == '%') - strcpyW(szTemp, szDest); - else - { - /* terminate loop */ - szTemp[0] = '\0'; + else if (!strcmpW( szTemp, szDest )) break; /* nothing expanded */ } + if (SUCCEEDED(hr)) strcpyW(szTemp, szDest); } end: if (key)

1 0

Alexandre Julliard : shell32: Assume that system directory always contains a drive letter.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 54530bc4933ae1014c3697c95e22b8ca5a275bc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54530bc4933ae1014c3697c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:48:49 2018 +0200 shell32: Assume that system directory always contains a drive letter. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index fd375a3..afd6340 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3792,8 +3792,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) /* get the system drive */ GetSystemDirectoryW(def_val, MAX_PATH); - if (def_val[1] == ':') strcpyW( def_val + 3, szDefaultProfileDirW ); - else FIXME("non-drive system paths unsupported\n"); + strcpyW( def_val + 3, szDefaultProfileDirW ); hr = _SHGetProfilesValue(key, ProfilesDirectoryW, szProfilesPrefix, def_val ); } @@ -3807,8 +3806,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; GetSystemDirectoryW(def_val, MAX_PATH); - if (def_val[1] == ':') strcpyW( def_val + 3, UsersPublicW ); - else FIXME("non-drive system paths unsupported\n"); + strcpyW( def_val + 3, UsersPublicW ); hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); PathAppendW(szDest, szAllUsers); @@ -3833,8 +3831,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) if (!in_registry) { GetSystemDirectoryW(def_val, MAX_PATH); - if (def_val[1] == ':') strcpyW( def_val + 3, ProgramDataW ); - else FIXME("non-drive system paths unsupported\n"); + strcpyW( def_val + 3, ProgramDataW ); } hr = _SHGetProfilesValue(key, ProgramDataW, szProgramData, def_val); @@ -3854,16 +3851,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) else if (!strncmpiW(szTemp, SystemDriveW, strlenW(SystemDriveW))) { GetSystemDirectoryW(szDest, MAX_PATH); - if (szDest[1] != ':') - { - FIXME("non-drive system paths unsupported\n"); - hr = E_FAIL; - } - else - { - strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1); - hr = S_OK; - } + strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1); } else {

1 0

Nikolay Sivov : opcservices: Implement RelationshipExists().
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 89c2553503bae0539530fc13e37a96dd4e65a39f URL: https://source.winehq.org/git/wine.git/?a=commit;h=89c2553503bae0539530fc13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:15 2018 +0300 opcservices: Implement RelationshipExists(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 37 ++++++++++++++++++++++++++---------- dlls/opcservices/tests/opcservices.c | 19 ++++++++++++++++++ 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index d0d39a9..370b42e 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -580,11 +580,25 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) return refcount; } +static struct opc_relationship *opc_relationshipset_get_item(struct opc_relationship_set *relationship_set, + const WCHAR *id) +{ + size_t i; + + for (i = 0; i < relationship_set->count; i++) + { + if (!strcmpW(id, relationship_set->relationships[i]->id)) + return relationship_set->relationships[i]; + } + + return NULL; +} + static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet *iface, const WCHAR *id, IOpcRelationship **relationship) { struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); - size_t i; + struct opc_relationship *ret; TRACE("iface %p, id %s, relationship %p.\n", iface, debugstr_w(id), relationship); @@ -596,14 +610,10 @@ static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet * if (!id) return E_POINTER; - for (i = 0; i < relationship_set->count; i++) + if ((ret = opc_relationshipset_get_item(relationship_set, id))) { - if (!strcmpW(id, relationship_set->relationships[i]->id)) - { - *relationship = &relationship_set->relationships[i]->IOpcRelationship_iface; - IOpcRelationship_AddRef(*relationship); - break; - } + *relationship = &ret->IOpcRelationship_iface; + IOpcRelationship_AddRef(*relationship); } return *relationship ? S_OK : OPC_E_NO_SUCH_RELATIONSHIP; @@ -632,9 +642,16 @@ static HRESULT WINAPI opc_relationship_set_DeleteRelationship(IOpcRelationshipSe static HRESULT WINAPI opc_relationship_set_RelationshipExists(IOpcRelationshipSet *iface, const WCHAR *id, BOOL *exists) { - FIXME("iface %p, id %s, exists %p stub!\n", iface, debugstr_w(id), exists); + struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); - return E_NOTIMPL; + TRACE("iface %p, id %s, exists %p.\n", iface, debugstr_w(id), exists); + + if (!id || !exists) + return E_POINTER; + + *exists = opc_relationshipset_get_item(relationship_set, id) != NULL; + + return S_OK; } static HRESULT WINAPI opc_relationship_set_GetEnumerator(IOpcRelationshipSet *iface, diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 63809aa..4bb3d64 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -241,6 +241,7 @@ static void test_relationship(void) DWORD mode; HRESULT hr; WCHAR *id; + BOOL ret; BSTR str; factory = create_factory(); @@ -284,6 +285,19 @@ todo_wine ok(SUCCEEDED(hr), "Failed to get id, hr %#x.\n", hr); ok(lstrlenW(id) == 9 && *id == 'R', "Unexpected relationship id %s.\n", wine_dbgstr_w(id)); + ret = 123; + hr = IOpcRelationshipSet_RelationshipExists(rels, NULL, &ret); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(ret == 123, "Unexpected result %d.\n", ret); + + hr = IOpcRelationshipSet_RelationshipExists(rels, id, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + ret = FALSE; + hr = IOpcRelationshipSet_RelationshipExists(rels, id, &ret); + ok(SUCCEEDED(hr), "Failed to get relationship, hr %#x.\n", hr); + ok(ret, "Unexpected result %d.\n", ret); + hr = IOpcRelationshipSet_GetRelationship(rels, id, &rel3); ok(SUCCEEDED(hr), "Failed to get relationship, hr %#x.\n", hr); IOpcRelationship_Release(rel3); @@ -302,6 +316,11 @@ todo_wine ok(hr == OPC_E_NO_SUCH_RELATIONSHIP, "Unexpected hr %#x.\n", hr); ok(rel3 == NULL, "Expected null pointer.\n"); + ret = TRUE; + hr = IOpcRelationshipSet_RelationshipExists(rels, id, &ret); + ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(!ret, "Unexpected result %d.\n", ret); + CoTaskMemFree(id); hr = IOpcRelationship_GetTargetUri(rel, &uri);

1 0

Nikolay Sivov : opcservices: Implement GetRelationship().
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 7e310f87fe1c781dcdbba854df84db29c86d1238 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e310f87fe1c781dcdbba854… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:14 2018 +0300 opcservices: Implement GetRelationship(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 25 +++++++++++++++++++++++-- dlls/opcservices/tests/opcservices.c | 21 ++++++++++++++++++++- include/opcbase.idl | 1 + 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 00f4a4f..d0d39a9 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -583,9 +583,30 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet *iface, const WCHAR *id, IOpcRelationship **relationship) { - FIXME("iface %p, id %s, relationship %p stub!\n", iface, debugstr_w(id), relationship); + struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); + size_t i; - return E_NOTIMPL; + TRACE("iface %p, id %s, relationship %p.\n", iface, debugstr_w(id), relationship); + + if (!relationship) + return E_POINTER; + + *relationship = NULL; + + if (!id) + return E_POINTER; + + for (i = 0; i < relationship_set->count; i++) + { + if (!strcmpW(id, relationship_set->relationships[i]->id)) + { + *relationship = &relationship_set->relationships[i]->IOpcRelationship_iface; + IOpcRelationship_AddRef(*relationship); + break; + } + } + + return *relationship ? S_OK : OPC_E_NO_SUCH_RELATIONSHIP; } static HRESULT WINAPI opc_relationship_set_CreateRelationship(IOpcRelationshipSet *iface, const WCHAR *id, diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index a2a032f..63809aa 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -232,8 +232,8 @@ static void test_relationship(void) static const WCHAR typeW[] = {'t','y','p','e',0}; static const WCHAR rootW[] = {'/',0}; IUri *target_uri, *target_uri2, *uri; + IOpcRelationship *rel, *rel2, *rel3; IOpcUri *source_uri, *source_uri2; - IOpcRelationship *rel, *rel2; IOpcRelationshipSet *rels; IOpcFactory *factory; IOpcPackage *package; @@ -283,6 +283,25 @@ todo_wine hr = IOpcRelationship_GetId(rel, &id); ok(SUCCEEDED(hr), "Failed to get id, hr %#x.\n", hr); ok(lstrlenW(id) == 9 && *id == 'R', "Unexpected relationship id %s.\n", wine_dbgstr_w(id)); + + hr = IOpcRelationshipSet_GetRelationship(rels, id, &rel3); + ok(SUCCEEDED(hr), "Failed to get relationship, hr %#x.\n", hr); + IOpcRelationship_Release(rel3); + + hr = IOpcRelationshipSet_GetRelationship(rels, id, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + rel3 = (void *)0xdeadbeef; + hr = IOpcRelationshipSet_GetRelationship(rels, NULL, &rel3); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(rel3 == NULL, "Expected null pointer.\n"); + + *id = 'r'; + rel3 = (void *)0xdeadbeef; + hr = IOpcRelationshipSet_GetRelationship(rels, id, &rel3); + ok(hr == OPC_E_NO_SUCH_RELATIONSHIP, "Unexpected hr %#x.\n", hr); + ok(rel3 == NULL, "Expected null pointer.\n"); + CoTaskMemFree(id); hr = IOpcRelationship_GetTargetUri(rel, &uri); diff --git a/include/opcbase.idl b/include/opcbase.idl index 80f459f..ca42ceb 100644 --- a/include/opcbase.idl +++ b/include/opcbase.idl @@ -42,3 +42,4 @@ typedef [v1_enum] enum } OPC_URI_TARGET_MODE; cpp_quote("#define OPC_E_INVALID_RELATIONSHIP_TARGET MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x12)") +cpp_quote("#define OPC_E_NO_SUCH_RELATIONSHIP MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x48)")

1 0

Nikolay Sivov : opcservices: Implement GetCompressionOptions().
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: c2d8323f2318903848e67a63e36a33560ac0770f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2d8323f2318903848e67a63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:13 2018 +0300 opcservices: Implement GetCompressionOptions(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 20d7b4e..00f4a4f 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -221,9 +221,12 @@ static HRESULT WINAPI opc_part_GetContentType(IOpcPart *iface, LPWSTR *type) static HRESULT WINAPI opc_part_GetCompressionOptions(IOpcPart *iface, OPC_COMPRESSION_OPTIONS *options) { - FIXME("iface %p, options %p stub!\n", iface, options); + struct opc_part *part = impl_from_IOpcPart(iface); - return E_NOTIMPL; + TRACE("iface %p, options %p.\n", iface, options); + + *options = part->compression_options; + return S_OK; } static const IOpcPartVtbl opc_part_vtbl =

1 0

Nikolay Sivov : opcservices: Implement writing stub compressed package.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 80579d63444a7a10d68a5e0c9660862d7c456f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80579d63444a7a10d68a5e0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:12 2018 +0300 opcservices: Implement writing stub compressed package. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 4 +- dlls/opcservices/compress.c | 366 +++++++++++++++++++++++++++++++++++++++++ dlls/opcservices/factory.c | 5 +- dlls/opcservices/opc_private.h | 8 + dlls/opcservices/package.c | 55 +++++++ 5 files changed, 435 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=80579d63444a7a10d68a…

1 0

Nikolay Sivov : opcservices: Implement GetSourceUri().
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 951741e649dad4728cf95383022a0c01df528c8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=951741e649dad4728cf95383… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:11 2018 +0300 opcservices: Implement GetSourceUri(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 2 +- dlls/opcservices/opc_private.h | 2 +- dlls/opcservices/package.c | 40 ++++++++++++++++++++++++++------ dlls/opcservices/tests/opcservices.c | 45 ++++++++++++++++++++++++++++++++---- 4 files changed, 76 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=951741e649dad4728cf9…

1 0

Alexandre Julliard : gdi32: Don' t return screen resolution on printer devices.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: wine Branch: master Commit: d99f6821183ef16457f5cedb13289bc715d11f09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d99f6821183ef16457f5cedb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 5 19:52:16 2018 +0200 gdi32: Don't return screen resolution on printer devices. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/tests/dc.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 6580008..ce60d11 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -355,7 +355,7 @@ static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case SCALINGFACTORY: return 0; case VREFRESH: return GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY ? 1 : 0; case DESKTOPHORZRES: - if (pGetSystemMetrics) + if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && pGetSystemMetrics) { DPI_AWARENESS_CONTEXT context; UINT ret; @@ -366,7 +366,7 @@ static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) } return GetDeviceCaps( dev->hdc, HORZRES ); case DESKTOPVERTRES: - if (pGetSystemMetrics) + if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && pGetSystemMetrics) { DPI_AWARENESS_CONTEXT context; UINT ret; diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 5ad3b31..5eec74a 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -471,6 +471,12 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale } else { + ok( GetDeviceCaps( ref_dc, DESKTOPHORZRES ) == GetDeviceCaps( ref_dc, HORZRES ), + "Got DESKTOPHORZRES %d on %s, expected %d\n", + GetDeviceCaps( ref_dc, DESKTOPHORZRES ), descr, GetDeviceCaps( ref_dc, HORZRES )); + ok( GetDeviceCaps( ref_dc, DESKTOPVERTRES ) == GetDeviceCaps( ref_dc, VERTRES ), + "Got DESKTOPVERTRES %d on %s, expected %d\n", + GetDeviceCaps( ref_dc, DESKTOPVERTRES ), descr, GetDeviceCaps( ref_dc, VERTRES )); SetRect( &ref_rect, 0, 0, GetDeviceCaps( ref_dc, DESKTOPHORZRES ), GetDeviceCaps( ref_dc, DESKTOPVERTRES ) ); }

1 0

Nikolay Sivov : xmllite/reader: Fix compiler warning.
by Alexandre Julliard 05 Sep '18

05 Sep '18

Module: wine Branch: master Commit: fc62dac4dcee46343c7d8b20f0707e2875594a12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc62dac4dcee46343c7d8b20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 5 18:42:38 2018 +0300 xmllite/reader: Fix compiler warning. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9cb7f3b..f10c718 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1019,9 +1019,9 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding encoded_buffer *src = &readerinput->buffer->encoded; encoded_buffer *dest = &readerinput->buffer->utf16; int len, dest_len; + UINT cp = ~0u; HRESULT hr; WCHAR *ptr; - UINT cp; hr = get_code_page(enc, &cp); if (FAILED(hr)) return;

1 0

← Newer
1
...
59
60
61
62
63
64
65
66
67
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 September 2018