December 2018 - Wine-Commits

Andrew Eikum : winegcc: Pass -static-libstdc++ to the linker.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 590ccd0f5ce03dd2417d6ea057459f073a556ab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=590ccd0f5ce03dd2417d6ea0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 09:05:14 2018 -0600 winegcc: Pass -static-libstdc++ to the linker. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5136cf3..b5fa881 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -71,8 +71,9 @@ * * Linker Options * object-file-name -llibrary -nostartfiles -nodefaultlibs - * -nostdlib -s -static -static-libgcc -shared -shared-libgcc - * -symbolic -Wl,option -Xlinker option -u symbol --image-base + * -nostdlib -s -static -static-libgcc -static-libstdc++ + * -shared -shared-libgcc -symbolic -Wl,option + * -Xlinker option -u symbol --image-base * * Directory Options * -Bprefix -Idir -I- -Ldir -specs=file @@ -1288,8 +1289,9 @@ static int is_linker_arg(const char* arg) { static const char* link_switches[] = { - "-nostdlib", "-s", "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", - "-framework", "--coverage", "-fprofile-generate", "-fprofile-use" + "-nostdlib", "-s", "-static", "-static-libgcc", "-static-libstdc++", + "-shared", "-shared-libgcc", "-symbolic", "-framework", "--coverage", + "-fprofile-generate", "-fprofile-use" }; unsigned int j;

1 0

Zebediah Figura : setupapi: Delete all empty parent keys of a removed device key.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 8fff6eeb76a22bd21888e592f0646362cbac7934 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fff6eeb76a22bd21888e592… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 30 16:42:13 2018 -0600 setupapi: Delete all empty parent keys of a removed device key. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 17 +++++++++++++++++ dlls/setupapi/tests/devinst.c | 31 ------------------------------- 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5ae3fbd..82a45b4 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -578,7 +578,9 @@ static void remove_device_iface(struct device_iface *iface) static void remove_device(struct device *device) { + WCHAR id[MAX_DEVICE_ID_LEN], *p; struct device_iface *iface; + HKEY enum_key; LIST_FOR_EACH_ENTRY(iface, &device->interfaces, struct device_iface, entry) { @@ -587,6 +589,21 @@ static void remove_device(struct device *device) RegDeleteTreeW(device->key, NULL); RegDeleteKeyW(device->key, emptyW); + + /* delete all empty parents of the key */ + if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, 0, &enum_key)) + { + strcpyW(id, device->instanceId); + + while ((p = strrchrW(id, '\\'))) + { + *p = 0; + RegDeleteKeyW(enum_key, id); + } + + RegCloseKey(enum_key); + } + RegCloseKey(device->key); device->key = NULL; device->removed = TRUE; diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 07e082b..29f12c3 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -466,9 +466,6 @@ static void test_get_device_instance_id(void) static void test_register_device_info(void) { - static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'E','n','u','m','\\','R','o','o','t','\\','L','E','G','A','C','Y','_','B','O','G','U','S',0}; SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; @@ -526,9 +523,6 @@ static void test_register_device_info(void) ok(GetLastError() == ERROR_NO_MORE_ITEMS, "Got unexpected error %#x.\n", GetLastError()); SetupDiDestroyDeviceInfoList(set); - - /* remove once Wine is fixed */ - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); } static void check_device_iface_(int line, HDEVINFO set, SP_DEVINFO_DATA *device, @@ -662,10 +656,6 @@ static void test_device_iface(void) static void test_device_iface_detail(void) { - static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'E','n','u','m','\\','R','o','o','t','\\', - 'L','E','G','A','C','Y','_','B','O','G','U','S',0}; static const char path[] = "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; SP_DEVICE_INTERFACE_DETAIL_DATA_A *detail; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; @@ -737,9 +727,6 @@ static void test_device_iface_detail(void) heap_free(detail); SetupDiDestroyDeviceInfoList(set); - - /* remove once Wine is fixed */ - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); } static void test_device_key(void) @@ -849,7 +836,6 @@ todo_wine { SetupDiDestroyDeviceInfoList(set); /* remove once Wine is fixed */ - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, classKey); } @@ -890,9 +876,6 @@ static void test_register_device_iface(void) SetupDiDestroyDeviceInfoList(set); SetupDiDestroyDeviceInfoList(set2); - - /* remove once Wine is fixed */ - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); } static void test_registry_property_a(void) @@ -992,14 +975,7 @@ todo_wine { SetupDiDestroyDeviceInfoList(set); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, bogus, &key); -todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); - /* FIXME: Remove when Wine is fixed */ - if (res == ERROR_SUCCESS) - { - /* Wine doesn't delete the information currently */ - RegDeleteKeyA(HKEY_LOCAL_MACHINE, bogus); - } } static void test_registry_property_w(void) @@ -1103,14 +1079,7 @@ todo_wine { SetupDiDestroyDeviceInfoList(set); res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key); -todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Key should not exist.\n"); - /* FIXME: Remove when Wine is fixed */ - if (res == ERROR_SUCCESS) - { - /* Wine doesn't delete the information currently */ - RegDeleteKeyW(HKEY_LOCAL_MACHINE, bogus); - } } static void test_get_inf_class(void)

1 0

Alex Henrie : wsdapi: Turn a constant and several variables into static constants.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 133af46568ca0fac1dc37be43caa0903f2ad58ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=133af46568ca0fac1dc37be4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:06:51 2018 -0700 wsdapi: Turn a constant and several variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 6 +++--- dlls/wsdapi/xml.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index e123398..2ecc013 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -364,7 +364,7 @@ HRESULT register_namespaces(IWSDXMLContext *xml_context) static BOOL create_guid(LPWSTR buffer) { - const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; + static const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; WCHAR* uuidString = NULL; UUID uuid; @@ -401,7 +401,7 @@ static void populate_soap_header(WSD_SOAP_HEADER *header, LPCWSTR to, LPCWSTR ac static LPWSTR ulonglong_to_string(void *parent, ULONGLONG value) { - WCHAR formatString[] = { '%','I','6','4','u', 0 }; + static const WCHAR formatString[] = { '%','I','6','4','u', 0 }; LPWSTR ret; ret = WSDAllocateLinkedMemory(parent, MAX_ULONGLONG_STRING_SIZE * sizeof(WCHAR)); @@ -560,7 +560,7 @@ static BOOL add_discovered_namespace(struct list *namespaces, WSDXML_NAMESPACE * static HRESULT build_types_list(LPWSTR buffer, size_t buffer_size, const WSD_NAME_LIST *list, struct list *namespaces) { - WCHAR format_string[] = { '%', 's', ':', '%', 's', 0 }; + static const WCHAR format_string[] = { '%', 's', ':', '%', 's', 0 }; LPWSTR current_buf_pos = buffer; size_t memory_needed = 0; const WSD_NAME_LIST *cur = list; diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 98bdec6..727d83a 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -380,7 +380,7 @@ static BOOL is_prefix_unique(struct list *namespaces, LPCWSTR prefix) static LPWSTR generate_namespace_prefix(IWSDXMLContextImpl *impl, void *parentMemoryBlock, LPCWSTR uri) { - WCHAR formatString[] = { 'u','n','%','d', 0 }; + static const WCHAR formatString[] = { 'u','n','%','d', 0 }; WCHAR suggestedPrefix[7]; /* Find a unique prefix */

1 0

Nikolay Sivov : gdi32: Fix function prototype when building without freetype.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: cfcfcadfcbd11b142799b55fae94fdf64bcf3152 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfcfcadfcbd11b142799b55f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 10:39:47 2018 +0300 gdi32: Fix function prototype when building without freetype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 87c55e0..e07aada 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -9168,7 +9168,7 @@ BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD unknown, UINT64 offset, vo /************************************************************************* * GetFontFileInfo (GDI32.@) */ -BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, DWORD size, DWORD *needed) +BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed) { *needed = 0; return FALSE;

1 0

Alex Henrie : winspool.drv: Make constant 'fmtW' static.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 4761c367e09f9268978388a5ce89459c8b476af6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4761c367e09f9268978388a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 2 16:06:39 2018 -0700 winspool.drv: Make constant 'fmtW' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fb268a0..e91138d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8208,8 +8208,8 @@ end: */ static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) { + static const WCHAR fmtW[] = {'l','p','r',' ','-','P','\'','%','s','\'',0}; WCHAR *cmd; - const WCHAR fmtW[] = {'l','p','r',' ','-','P','\'','%','s','\'',0}; BOOL r; cmd = HeapAlloc(GetProcessHeap(), 0, strlenW(printer_name) * sizeof(WCHAR) + sizeof(fmtW));

1 0

Nikolay Sivov : shlwapi: Forward SHOpenRegStream2() to shcore.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: cd77c562bb0be19cfc868f3dfcc0739db659adaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd77c562bb0be19cfc868f3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 10:40:58 2018 +0300 shlwapi: Forward SHOpenRegStream2() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/regstream.c | 129 ---------------------------------------------- dlls/shlwapi/shlwapi.spec | 4 +- 2 files changed, 2 insertions(+), 131 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 102d6b7..31df82a 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -397,135 +397,6 @@ static ISHRegStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) } /************************************************************************* - * SHOpenRegStream2A [SHLWAPI.@] - * - * Create a stream to read binary registry data. - * - * PARAMS - * hKey [I] Registry handle - * pszSubkey [I] The sub key name - * pszValue [I] The value name under the sub key - * dwMode [I] Unused - * - * RETURNS - * Success: An IStream interface referring to the registry data - * Failure: NULL, if the registry key could not be opened or is not binary. - */ -IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, - LPCSTR pszValue,DWORD dwMode) -{ - ISHRegStream *tmp; - HKEY hStrKey = NULL; - LPBYTE lpBuff = NULL; - DWORD dwLength = 0; - LONG ret; - - TRACE("(%p,%s,%s,0x%08x)\n", hKey, pszSubkey, pszValue, dwMode); - - if (dwMode == STGM_READ) - ret = RegOpenKeyExA(hKey, pszSubkey, 0, KEY_READ, &hStrKey); - else /* in write mode we make sure the subkey exits */ - ret = RegCreateKeyExA(hKey, pszSubkey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hStrKey, NULL); - - if (ret == ERROR_SUCCESS) - { - if (dwMode == STGM_READ || dwMode == STGM_READWRITE) - { - /* read initial data */ - ret = RegQueryValueExA(hStrKey, pszValue, 0, 0, 0, &dwLength); - if (ret == ERROR_SUCCESS && dwLength) - { - lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); - RegQueryValueExA(hStrKey, pszValue, 0, 0, lpBuff, &dwLength); - } - } - - if (!dwLength) - lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); - - tmp = IStream_Create(hStrKey, lpBuff, dwLength); - if(tmp) - { - if(pszValue) - { - int len = lstrlenA(pszValue) + 1; - tmp->u.keyNameA = HeapAlloc(GetProcessHeap(), 0, len); - memcpy(tmp->u.keyNameA, pszValue, len); - } - - tmp->dwMode = dwMode; - tmp->bUnicode = FALSE; - return &tmp->IStream_iface; - } - } - - HeapFree(GetProcessHeap(), 0, lpBuff); - if (hStrKey) - RegCloseKey(hStrKey); - return NULL; -} - -/************************************************************************* - * SHOpenRegStream2W [SHLWAPI.@] - * - * See SHOpenRegStream2A. - */ -IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey, - LPCWSTR pszValue, DWORD dwMode) -{ - ISHRegStream *tmp; - HKEY hStrKey = NULL; - LPBYTE lpBuff = NULL; - DWORD dwLength = 0; - LONG ret; - - TRACE("(%p,%s,%s,0x%08x)\n", hKey, debugstr_w(pszSubkey), - debugstr_w(pszValue), dwMode); - - if (dwMode == STGM_READ) - ret = RegOpenKeyExW(hKey, pszSubkey, 0, KEY_READ, &hStrKey); - else /* in write mode we make sure the subkey exits */ - ret = RegCreateKeyExW(hKey, pszSubkey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hStrKey, NULL); - - if (ret == ERROR_SUCCESS) - { - if (dwMode == STGM_READ || dwMode == STGM_READWRITE) - { - /* read initial data */ - ret = RegQueryValueExW(hStrKey, pszValue, 0, 0, 0, &dwLength); - if (ret == ERROR_SUCCESS && dwLength) - { - lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); - RegQueryValueExW(hStrKey, pszValue, 0, 0, lpBuff, &dwLength); - } - } - - if (!dwLength) - lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); - - tmp = IStream_Create(hStrKey, lpBuff, dwLength); - if(tmp) - { - if(pszValue) - { - int len = lstrlenW(pszValue) + 1; - tmp->u.keyNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - memcpy(tmp->u.keyNameW, pszValue, len * sizeof(WCHAR)); - } - - tmp->dwMode = dwMode; - tmp->bUnicode = TRUE; - return &tmp->IStream_iface; - } - } - - HeapFree(GetProcessHeap(), 0, lpBuff); - if (hStrKey) - RegCloseKey(hStrKey); - return NULL; -} - -/************************************************************************* * SHCreateStreamWrapper [SHLWAPI.@] * * Create an IStream object on a block of memory. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index f9e2570..9c01c3f 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -705,8 +705,8 @@ @ stdcall SHGetValueA ( long str str ptr ptr ptr ) @ stdcall SHGetValueW ( long wstr wstr ptr ptr ptr ) @ stdcall SHIsLowMemoryMachine(long) -@ stdcall SHOpenRegStream2A(long str str long) -@ stdcall SHOpenRegStream2W(long wstr wstr long) +@ stdcall SHOpenRegStream2A(long str str long) shcore.SHOpenRegStream2A +@ stdcall SHOpenRegStream2W(long wstr wstr long) shcore.SHOpenRegStream2W @ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA @ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW @ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr)

1 0

Nikolay Sivov : shlwapi: Forward IStream helpers to shcore.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 77a8ac36838131d39f8345de014bd1447807acb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77a8ac36838131d39f8345de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 10:40:59 2018 +0300 shlwapi: Forward IStream helpers to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/istream.c | 112 +--------------------------------------------- dlls/shlwapi/shlwapi.spec | 8 ++-- 2 files changed, 6 insertions(+), 114 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index ba9874b..37fa4c6 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -35,35 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); /************************************************************************* - * @ [SHLWAPI.184] - * - * Call IStream_Read() on a stream. - * - * PARAMS - * lpStream [I] IStream object - * lpvDest [O] Destination for data read - * ulSize [I] Size of data to read - * - * RETURNS - * Success: S_OK. ulSize bytes have been read from the stream into lpvDest. - * Failure: An HRESULT error code, or E_FAIL if the read succeeded but the - * number of bytes read does not match. - */ -HRESULT WINAPI SHIStream_Read(IStream *lpStream, LPVOID lpvDest, ULONG ulSize) -{ - ULONG ulRead; - HRESULT hRet; - - TRACE("(%p,%p,%u)\n", lpStream, lpvDest, ulSize); - - hRet = IStream_Read(lpStream, lpvDest, ulSize, &ulRead); - - if (SUCCEEDED(hRet) && ulRead != ulSize) - hRet = E_FAIL; - return hRet; -} - -/************************************************************************* * @ [SHLWAPI.166] * * Determine if a stream has 0 length. @@ -91,10 +62,10 @@ BOOL WINAPI SHIsEmptyStream(IStream *lpStream) } else { - DWORD dwDummy; + DWORD dummy, read_len; /* Try to read from the stream */ - if(SUCCEEDED(SHIStream_Read(lpStream, &dwDummy, sizeof(dwDummy)))) + if (SUCCEEDED(IStream_Read(lpStream, &dummy, sizeof(dummy), &read_len)) && read_len == sizeof(dummy)) { LARGE_INTEGER zero; zero.QuadPart = 0; @@ -105,82 +76,3 @@ BOOL WINAPI SHIsEmptyStream(IStream *lpStream) } return bRet; } - -/************************************************************************* - * @ [SHLWAPI.212] - * - * Call IStream_Write() on a stream. - * - * PARAMS - * lpStream [I] IStream object - * lpvSrc [I] Source for data to write - * ulSize [I] Size of data - * - * RETURNS - * Success: S_OK. ulSize bytes have been written to the stream from lpvSrc. - * Failure: An HRESULT error code, or E_FAIL if the write succeeded but the - * number of bytes written does not match. - */ -HRESULT WINAPI SHIStream_Write(IStream *lpStream, LPCVOID lpvSrc, ULONG ulSize) -{ - ULONG ulWritten; - HRESULT hRet; - - TRACE("(%p,%p,%d)\n", lpStream, lpvSrc, ulSize); - - hRet = IStream_Write(lpStream, lpvSrc, ulSize, &ulWritten); - - if (SUCCEEDED(hRet) && ulWritten != ulSize) - hRet = E_FAIL; - - return hRet; -} - -/************************************************************************* - * @ [SHLWAPI.213] - * - * Seek to the start of a stream. - * - * PARAMS - * lpStream [I] IStream object - * - * RETURNS - * Success: S_OK. The current position within the stream is updated - * Failure: An HRESULT error code. - */ -HRESULT WINAPI IStream_Reset(IStream *lpStream) -{ - LARGE_INTEGER zero; - TRACE("(%p)\n", lpStream); - zero.QuadPart = 0; - return IStream_Seek(lpStream, zero, 0, NULL); -} - -/************************************************************************* - * @ [SHLWAPI.214] - * - * Get the size of a stream. - * - * PARAMS - * lpStream [I] IStream object - * lpulSize [O] Destination for size - * - * RETURNS - * Success: S_OK. lpulSize contains the size of the stream. - * Failure: An HRESULT error code. - */ -HRESULT WINAPI IStream_Size(IStream *lpStream, ULARGE_INTEGER* lpulSize) -{ - STATSTG statstg; - HRESULT hRet; - - TRACE("(%p,%p)\n", lpStream, lpulSize); - - memset(&statstg, 0, sizeof(statstg)); - - hRet = IStream_Stat(lpStream, &statstg, 1); - - if (SUCCEEDED(hRet) && lpulSize) - *lpulSize = statstg.cbSize; - return hRet; -} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 9c01c3f..6e64a9c 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -181,7 +181,7 @@ 181 stdcall -noname SHEnableMenuItem(long long long) 182 stdcall -noname SHCheckMenuItem(long long long) 183 stdcall -noname SHRegisterClassA(ptr) -184 stdcall -ordinal IStream_Read(ptr ptr long) SHIStream_Read +184 stdcall -ordinal IStream_Read(ptr ptr long) shcore.IStream_Read 185 stdcall -ordinal SHMessageBoxCheckA(ptr str str long long str) 186 stdcall -noname SHSimulateDrop(ptr ptr long ptr ptr) 187 stdcall -noname SHLoadFromPropertyBag(ptr ptr) @@ -209,9 +209,9 @@ 209 stdcall -noname FDSA_Destroy(ptr) 210 stdcall -noname FDSA_InsertItem(ptr long ptr) 211 stdcall -noname FDSA_DeleteItem(ptr long) -212 stdcall -ordinal IStream_Write(ptr ptr long) SHIStream_Write -213 stdcall -ordinal IStream_Reset(ptr) -214 stdcall -ordinal IStream_Size(ptr ptr) +212 stdcall -ordinal IStream_Write(ptr ptr long) shcore.IStream_Write +213 stdcall -ordinal IStream_Reset(ptr) shcore.IStream_Reset +214 stdcall -ordinal IStream_Size(ptr ptr) shcore.IStream_Size 215 stdcall -ordinal SHAnsiToUnicode(str ptr long) 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) 217 stdcall -ordinal SHUnicodeToAnsi(wstr ptr ptr)

1 0

Roberto Pungartnik : po: Portuguese (Brazil) translation fixes.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: f29c09dce2a4f2e75424588677b83d6a7d341348 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f29c09dce2a4f2e754245886… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sun Dec 2 22:35:56 2018 -0200 po: Portuguese (Brazil) translation fixes. Signed-off-by: Roberto Augusto Pungartnik <rpungartnik2gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 77 ++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f29c09dce2a4f2e75424…

1 0

Nikolay Sivov : user32/listbox: Use helper to test for selected state on painting.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 47058436426a306e7db8124508346204ee5865c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47058436426a306e7db81245… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 13:32:07 2018 +0300 user32/listbox: Use helper to test for selected state on painting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 3eee691..6dbf8d9 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -516,7 +516,13 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, INT index, UINT action, BOOL ignoreFocus ) { LB_ITEMDATA *item = NULL; - if (index < descr->nb_items) item = &descr->items[index]; + BOOL selected = FALSE; + + if (index < descr->nb_items) + { + item = &descr->items[index]; + selected = is_item_selected(descr, index); + } if (IS_OWNERDRAW(descr)) { @@ -547,7 +553,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, dis.hDC = hdc; dis.itemID = index; dis.itemState = 0; - if (item->selected) dis.itemState |= ODS_SELECTED; + if (selected) + dis.itemState |= ODS_SELECTED; if (!ignoreFocus && (descr->focus_item == index) && (descr->caret_on) && (descr->in_focus)) dis.itemState |= ODS_FOCUS; @@ -570,7 +577,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, DrawFocusRect( hdc, rect ); return; } - if (item && item->selected) + if (selected) { oldBk = SetBkColor( hdc, GetSysColor( COLOR_HIGHLIGHT ) ); oldText = SetTextColor( hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); @@ -595,7 +602,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, item->str, strlenW(item->str), descr->nb_tabs, descr->tabs, 0); } - if (item && item->selected) + if (selected) { SetBkColor( hdc, oldBk ); SetTextColor( hdc, oldText );

1 0

Alexandre Julliard : wineandroid: Specify the window scale directly in the constructor.
by Alexandre Julliard Dec. 3, 2018

Dec. 3, 2018

Module: wine Branch: master Commit: 357c2bb9f984122f06f9d9a75c004ff05c1b625e URL: https://source.winehq.org/git/wine.git/?a=commit;h=357c2bb9f984122f06f9d9a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 16:16:48 2018 +0100 wineandroid: Specify the window scale directly in the constructor. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 8013b3a..6e6bbff 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -348,16 +348,16 @@ public class WineActivity extends Activity protected WineWindowGroup window_group; protected WineWindowGroup client_group; - public WineWindow( int w, WineWindow parent ) + public WineWindow( int w, WineWindow parent, float scale ) { Log.i( LOGTAG, String.format( "create hwnd %08x", w )); hwnd = w; owner = 0; style = 0; - scale = 1.0f; visible = false; visible_rect = client_rect = new Rect( 0, 0, 0, 0 ); this.parent = parent; + this.scale = scale; children = new ArrayList<WineWindow>(); win_map.put( w, this ); if (parent != null) parent.children.add( this ); @@ -744,11 +744,11 @@ public class WineActivity extends Activity public TopView( Context context, int hwnd ) { super( context ); - desktop_window = new WineWindow( hwnd, null ); + desktop_window = new WineWindow( hwnd, null, 1.0f ); addView( desktop_window.create_whole_view() ); desktop_window.client_group.bringToFront(); - message_window = new WineWindow( WineWindow.HWND_MESSAGE, null ); + message_window = new WineWindow( WineWindow.HWND_MESSAGE, null, 1.0f ); message_window.create_window_groups(); } @@ -786,8 +786,7 @@ public class WineActivity extends Activity WineWindow win = get_window( hwnd ); if (win == null) { - win = new WineWindow( hwnd, get_window( parent )); - win.scale = scale; + win = new WineWindow( hwnd, get_window( parent ), scale ); win.create_window_groups(); if (win.parent == desktop_window) win.create_whole_view(); }

1 0