September 2013 - Wine-Commits

Piotr Caban : msvcp80: Make it possible to shrink allocated memory in basic_string::reserve.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 69677bda344f24c0e1dc8048d24632e2722c7b99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69677bda344f24c0e1dc8048d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 24 15:48:44 2013 +0200 msvcp80: Make it possible to shrink allocated memory in basic_string::reserve. --- dlls/msvcp80/string.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp80/string.c b/dlls/msvcp80/string.c index aeb19b0..83dceac 100644 --- a/dlls/msvcp80/string.c +++ b/dlls/msvcp80/string.c @@ -916,8 +916,8 @@ void __thiscall MSVCP_basic_string_char_reserve(basic_string_char *this, MSVCP_s if(len > size) return; - basic_string_char_grow(this, size, FALSE); - basic_string_char_eos(this, len); + if(basic_string_char_grow(this, size, TRUE)) + basic_string_char_eos(this, len); } /* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ @@ -2767,8 +2767,8 @@ void __thiscall MSVCP_basic_string_wchar_reserve(basic_string_wchar *this, MSVCP if(len > size) return; - basic_string_wchar_grow(this, size, FALSE); - basic_string_wchar_eos(this, len); + if(basic_string_wchar_grow(this, size, TRUE)) + basic_string_wchar_eos(this, len); } /* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ */

1 0

Michael Stefaniuc : shell32: Avoid using CONST.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 787bc8719a7a14f71a414b018b793cd7d7a56a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=787bc8719a7a14f71a414b018… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 24 12:28:44 2013 +0200 shell32: Avoid using CONST. --- dlls/shell32/shellord.c | 8 ++------ dlls/shell32/undocshell.h | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 31891e4..8da849f 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -596,12 +596,8 @@ HRESULT WINAPI SHDoDragDrop( * ArrangeWindows [SHELL32.184] * */ -WORD WINAPI ArrangeWindows( - HWND hwndParent, - DWORD dwReserved, - LPCRECT lpRect, - WORD cKids, - CONST HWND * lpKids) +WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect, + WORD cKids, const HWND *lpKids) { FIXME("(%p 0x%08x %p 0x%04x %p):stub.\n", hwndParent, dwReserved, lpRect, cKids, lpKids); diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index fa0ac05..3f3372a 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -486,12 +486,8 @@ BOOL WINAPI SHWaitForFileToOpen( DWORD dwFlags, DWORD dwTimeout); -WORD WINAPI ArrangeWindows( - HWND hwndParent, - DWORD dwReserved, - LPCRECT lpRect, - WORD cKids, - CONST HWND * lpKids); +WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect, + WORD cKids, const HWND *lpKids); /* RegisterShellHook types */ #define RSH_DEREGISTER 0

1 0

Dmitry Timoshkov : gdiplus: GdipTransformRegion should not fail for an empty path.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: ec9a0d85705941e024c366a2f740a5f9e3d1419f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9a0d85705941e024c366a2f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:25:57 2013 +0900 gdiplus: GdipTransformRegion should not fail for an empty path. --- dlls/gdiplus/region.c | 3 +++ dlls/gdiplus/tests/region.c | 1 - 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index d797459..7186518 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1310,6 +1310,9 @@ static GpStatus transform_region_element(region_element* element, GpMatrix *matr } /* Fall-through to do the actual conversion. */ case RegionDataPath: + if (!element->elementdata.pathdata.path->pathdata.Count) + return Ok; + stat = GdipTransformMatrixPoints(matrix, element->elementdata.pathdata.path->pathdata.Points, element->elementdata.pathdata.path->pathdata.Count); diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 7d20c3c..dd2f76d 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -381,7 +381,6 @@ static void test_getregiondata(void) status = GdipCreateMatrix(&matrix); expect(Ok, status); status = GdipTransformRegion(region, matrix); -todo_wine expect(Ok, status); GdipDeleteMatrix(matrix);

1 0

Henri Verbeet : d3dx9: Get rid of the ID3DXMeshImpl typedef.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 778b644fc6e8218e40ef38a5db87e7d8232f015d URL: http://source.winehq.org/git/wine.git/?a=commit;h=778b644fc6e8218e40ef38a5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 09:48:48 2013 +0200 d3dx9: Get rid of the ID3DXMeshImpl typedef. --- dlls/d3dx9_36/mesh.c | 361 ++++++++++++++++++++++++++------------------------ 1 files changed, 185 insertions(+), 176 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=778b644fc6e8218e40ef3…

1 0

Jacek Caban : appwiz.cpl: Use asynchronous binding instead of separated thread to download addons.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: c9cef7153cbb5ee6d8962d592d3cf9ada09d06fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9cef7153cbb5ee6d8962d592… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 24 14:04:21 2013 +0200 appwiz.cpl: Use asynchronous binding instead of separated thread to download addons. --- dlls/appwiz.cpl/addons.c | 103 +++++++++++++++++++++++++++------------------ dlls/appwiz.cpl/appwiz.h | 18 ++++++++ 2 files changed, 80 insertions(+), 41 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b278a4a..d97e774 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -48,7 +48,6 @@ #include "res.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); @@ -107,6 +106,7 @@ static const addon_info_t *addon; static HWND install_dialog = NULL; static LPWSTR url = NULL; static IBinding *dwl_binding; +static WCHAR *msi_file; static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); static const WCHAR kernel32_dllW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; @@ -134,9 +134,11 @@ static BOOL sha_check(const WCHAR *file_name) SHA_CTX ctx; DWORD size, i; - file = CreateFileW(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); - if(file == INVALID_HANDLE_VALUE) + file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); + if(file == INVALID_HANDLE_VALUE) { + WARN("Could not open file: %u\n", GetLastError()); return FALSE; + } size = GetFileSize(file, NULL); @@ -186,8 +188,6 @@ static enum install_res install_file(const WCHAR *file_name) { ULONG res; - EnableWindow(GetDlgItem(install_dialog, IDCANCEL), 0); - res = MsiInstallProductW(file_name, NULL); if(res != ERROR_SUCCESS) { ERR("MsiInstallProduct failed: %u\n", res); @@ -488,23 +488,57 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, return S_OK; } + if(!msi_file) { + ERR("No MSI file\n"); + return E_FAIL; + } + set_status(IDS_INSTALLING); + EnableWindow(GetDlgItem(install_dialog, IDCANCEL), 0); + + if(sha_check(msi_file)) { + WCHAR *cache_file_name; + + install_file(msi_file); + + cache_file_name = get_cache_file_name(TRUE); + if(cache_file_name) { + MoveFileW(msi_file, cache_file_name); + heap_free(cache_file_name); + } + }else { + WCHAR message[256]; + + if(LoadStringW(hInst, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR))) + MessageBoxW(NULL, message, NULL, MB_ICONERROR); + } + + DeleteFileW(msi_file); + heap_free(msi_file); + msi_file = NULL; + + EndDialog(install_dialog, 0); return S_OK; } static HRESULT WINAPI InstallCallback_GetBindInfo(IBindStatusCallback *iface, DWORD* grfBINDF, BINDINFO* pbindinfo) { - /* FIXME */ - *grfBINDF = 0; + TRACE("()\n"); + + *grfBINDF = BINDF_ASYNCHRONOUS; return S_OK; } static HRESULT WINAPI InstallCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { - ERR("\n"); - return E_NOTIMPL; + if(!msi_file) { + msi_file = heap_strdupW(pstgmed->u.lpszFileName); + TRACE("got file name %s\n", debugstr_w(msi_file)); + } + + return S_OK; } static HRESULT WINAPI InstallCallback_OnObjectAvailable(IBindStatusCallback *iface, @@ -578,42 +612,29 @@ found: return url; } -static DWORD WINAPI download_proc(PVOID arg) +static BOOL start_download(void) { - WCHAR tmp_dir[MAX_PATH], tmp_file[MAX_PATH]; + IBindCtx *bind_ctx; + IMoniker *mon; + IUnknown *tmp; HRESULT hres; - GetTempPathW(sizeof(tmp_dir)/sizeof(WCHAR), tmp_dir); - GetTempFileNameW(tmp_dir, NULL, 0, tmp_file); - - TRACE("using temp file %s\n", debugstr_w(tmp_file)); - - hres = URLDownloadToFileW(NULL, url, tmp_file, 0, &InstallCallback); - if(FAILED(hres)) { - ERR("URLDownloadToFile failed: %08x\n", hres); - return 0; - } - - if(sha_check(tmp_file)) { - WCHAR *cache_file_name; - - install_file(tmp_file); - - cache_file_name = get_cache_file_name(TRUE); - if(cache_file_name) { - MoveFileW(tmp_file, cache_file_name); - heap_free(cache_file_name); - } - }else { - WCHAR message[256]; + hres = CreateURLMoniker(NULL, url, &mon); + if(FAILED(hres)) + return FALSE; - if(LoadStringW(hInst, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR))) - MessageBoxW(NULL, message, NULL, MB_ICONERROR); + hres = CreateAsyncBindCtx(0, &InstallCallback, NULL, &bind_ctx); + if(SUCCEEDED(hres)) { + hres = IMoniker_BindToStorage(mon, bind_ctx, NULL, &IID_IUnknown, (void**)&tmp); + IBindCtx_Release(bind_ctx); } + IMoniker_Release(mon); + if(FAILED(hres)) + return FALSE; - DeleteFileW(tmp_file); - EndDialog(install_dialog, 0); - return 0; + if(tmp) + IUnknown_Release(tmp); + return TRUE; } static void run_winebrowser(const WCHAR *url) @@ -683,8 +704,8 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA case ID_DWL_INSTALL: ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_SHOW); EnableWindow(GetDlgItem(hwnd, ID_DWL_INSTALL), 0); - CloseHandle( CreateThread(NULL, 0, download_proc, NULL, 0, NULL)); - return FALSE; + if(!start_download()) + EndDialog(install_dialog, 0); } } diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index 12c2126..77636ae 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/unicode.h" + typedef enum { ADDON_GECKO, ADDON_MONO @@ -40,6 +42,22 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } +static inline WCHAR *heap_strdupW(const WCHAR *str) +{ + WCHAR *ret; + + if(str) { + size_t size = strlenW(str)+1; + ret = heap_alloc(size*sizeof(WCHAR)); + if(ret) + memcpy(ret, str, size*sizeof(WCHAR)); + }else { + ret = NULL; + } + + return ret; +} + static inline WCHAR *heap_strdupAtoW(const char *str) { WCHAR *ret = NULL;

1 0

Piotr Caban : msvcp60: Fix char_traits<wchar_t>::assign implementation.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: dbbe237985cdb645f9a1d0a223c62e24fa4cd6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbe237985cdb645f9a1d0a22… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 24 15:50:10 2013 +0200 msvcp60: Fix char_traits<wchar_t>::assign implementation. --- dlls/msvcp60/string.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 1f64621..01b535d 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -1809,9 +1809,15 @@ static MSVCP_size_t char_traits_wchar_length(const wchar_t *str) return wcslen((WCHAR*)str); } -static wchar_t* char_traits_wchar_assignn(wchar_t *str, MSVCP_size_t num, wchar_t c) +static wchar_t* char_traits_wchar_assignn(wchar_t *str, + MSVCP_size_t num, wchar_t c) { - return memset(str, c, num); + MSVCP_size_t i; + + for(i=0; i<num; i++) + str[i] = c; + + return str; } static int char_traits_wchar_compare(const wchar_t *s1,

1 0

Michael Stefaniuc : winemac.drv: Avoid using CONST.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 3a13dc5995fe3d94f12bb794913b3ad290eb9a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a13dc5995fe3d94f12bb7949… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 24 12:26:34 2013 +0200 winemac.drv: Avoid using CONST. --- dlls/winemac.drv/ime.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index bed094d..5fca8fe 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -613,7 +613,7 @@ LRESULT WINAPI ImeEscape(HIMC hIMC, UINT uSubFunc, LPVOID lpData) return 0; } -BOOL WINAPI ImeProcessKey(HIMC hIMC, UINT vKey, LPARAM lKeyData, CONST LPBYTE lpbKeyState) +BOOL WINAPI ImeProcessKey(HIMC hIMC, UINT vKey, LPARAM lKeyData, const LPBYTE lpbKeyState) { LPINPUTCONTEXT lpIMC; BOOL inIME; @@ -700,7 +700,7 @@ BOOL WINAPI ImeSetActiveContext(HIMC hIMC, BOOL fFlag) return TRUE; } -UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, CONST LPBYTE lpbKeyState, +UINT WINAPI ImeToAsciiEx(UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, LPDWORD lpdwTransKey, UINT fuState, HIMC hIMC) { UINT vkey;

1 0

Michael Stefaniuc : winex11.drv: Avoid using CONST.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 5fd4f943dcfa5a3e2df09f77c62d0971f170900a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd4f943dcfa5a3e2df09f77c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 24 12:27:27 2013 +0200 winex11.drv: Avoid using CONST. --- dlls/winex11.drv/ime.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 6a99c24..2822f3e 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -610,8 +610,7 @@ LRESULT WINAPI ImeEscape(HIMC hIMC, UINT uSubFunc, LPVOID lpData) return 0; } -BOOL WINAPI ImeProcessKey(HIMC hIMC, UINT vKey, LPARAM lKeyData, - CONST LPBYTE lpbKeyState) +BOOL WINAPI ImeProcessKey(HIMC hIMC, UINT vKey, LPARAM lKeyData, const LPBYTE lpbKeyState) { /* See the comment at the head of this file */ TRACE("We do no processing via this route\n"); @@ -661,9 +660,8 @@ BOOL WINAPI ImeSetActiveContext(HIMC hIMC,BOOL fFlag) return TRUE; } -UINT WINAPI ImeToAsciiEx (UINT uVKey, UINT uScanCode, - CONST LPBYTE lpbKeyState, LPDWORD lpdwTransKey, - UINT fuState, HIMC hIMC) +UINT WINAPI ImeToAsciiEx (UINT uVKey, UINT uScanCode, const LPBYTE lpbKeyState, + LPDWORD lpdwTransKey, UINT fuState, HIMC hIMC) { /* See the comment at the head of this file */ TRACE("We do no processing via this route\n");

1 0

Henri Verbeet : d3dx9: Get rid of the ID3DXLineImpl typedef.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: ffc66f471c903d4c9dc99996b1949f180baf77cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc66f471c903d4c9dc99996b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 09:48:47 2013 +0200 d3dx9: Get rid of the ID3DXLineImpl typedef. --- dlls/d3dx9_36/line.c | 289 ++++++++++++++++++++++---------------------------- 1 files changed, 126 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffc66f471c903d4c9dc99…

1 0

Henri Verbeet : wined3d: Get rid of the broken render target check for surface_blt_special().
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: ea4c3d5d5d3df37391a349542ce82b5a4f56d470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4c3d5d5d3df37391a349542… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 24 09:48:45 2013 +0200 wined3d: Get rid of the broken render target check for surface_blt_special(). This used to work out in practice because swapchain surfaces were always considered render targets, but that's no longer true. We can just remove the check, because surface_blt_special() already contains a proper check itself anyway. --- dlls/wined3d/surface.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c61f589..9d7accd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6777,15 +6777,9 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC } fallback: - /* Special cases for render targets. */ - if ((dst_surface->resource.usage & WINED3DUSAGE_RENDERTARGET) - || (src_surface && (src_surface->resource.usage & WINED3DUSAGE_RENDERTARGET))) - { - if (SUCCEEDED(surface_blt_special(dst_surface, &dst_rect, - src_surface, &src_rect, flags, fx, filter))) - return WINED3D_OK; - } + if (SUCCEEDED(surface_blt_special(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter))) + return WINED3D_OK; cpu:

1 0