May 2011 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Added _strlwr_s_l implementation.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 504231ff5a9b3daf6ee0816e29219c3ee1451c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=504231ff5a9b3daf6ee0816e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 11:38:41 2011 +0200 msvcrt: Added _strlwr_s_l implementation. --- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrt/string.c | 33 ++++++++++++++++++++++++++++++--- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a243f2f..bd41bac 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -904,6 +904,8 @@ void __cdecl _wsearchenv(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT MSVCRT_intptr_t __cdecl MSVCRT__spawnvpe(int, const char*, const char* const*, const char* const*); void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_wchar_t *func, const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg); +int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t); +int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 84b0194..678a2c9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -930,10 +930,10 @@ # stub _stricmp_l(str str ptr) @ cdecl _stricoll(str str) MSVCRT__stricoll # stub _stricoll_l(str str ptr) -@ cdecl _strlwr(str) ntdll._strlwr -# stub _strlwr_l(str ptr) +@ cdecl _strlwr(str) +@ cdecl _strlwr_l(str ptr) @ cdecl _strlwr_s(ptr long) -# stub _strlwr_s_l(ptr long ptr) +@ cdecl _strlwr_s_l(ptr long ptr) @ stub _strncoll(str str long) # stub _strncoll_l(str str long ptr) @ cdecl _strnicmp(str str long) ntdll._strnicmp diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 2b9d41e..10a86c5 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -51,12 +51,15 @@ char* CDECL _strdup(const char* str) } /********************************************************************* - * _strlwr_s (MSVCRT.@) + * _strlwr_s_l (MSVCRT.@) */ -int CDECL _strlwr_s(char *str, MSVCRT_size_t len) +int CDECL _strlwr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale) { char *ptr = str; + if(!locale) + locale = get_locale(); + if (!str || !len) { *MSVCRT__errno() = MSVCRT_EINVAL; @@ -78,7 +81,7 @@ int CDECL _strlwr_s(char *str, MSVCRT_size_t len) while (*str) { - *str = tolower(*str); + *str = MSVCRT__tolower_l(*str, locale); str++; } @@ -86,6 +89,30 @@ int CDECL _strlwr_s(char *str, MSVCRT_size_t len) } /********************************************************************* + * _strlwr_s (MSVCRT.@) + */ +int CDECL _strlwr_s(char *str, MSVCRT_size_t len) +{ + return _strlwr_s_l(str, len, NULL); +} + +/********************************************************************* + * _strlwr_l (MSVCRT.@) + */ +int CDECL _strlwr_l(char *str, MSVCRT__locale_t locale) +{ + return _strlwr_s_l(str, -1, locale); +} + +/********************************************************************* + * _strlwr (MSVCRT.@) + */ +int CDECL _strlwr(char *str) +{ + return _strlwr_s_l(str, -1, NULL); +} + +/********************************************************************* * _strnset (MSVCRT.@) */ char* CDECL MSVCRT__strnset(char* str, int value, MSVCRT_size_t len)

1 0

André Hentschel : include: Update a comment.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 2b2c5f35ac2708172fbc9a84576b3ec365759e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2c5f35ac2708172fbc9a845… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 11 20:17:18 2011 +0200 include: Update a comment. --- include/basetsd.h | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 852f6f4..922c91c 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -27,15 +27,13 @@ extern "C" { #endif /* defined(__cplusplus) */ /* - * Win32 was easy to implement under Unix since most (all?) 32-bit - * Unices uses the same type model (ILP32) as Win32, where int, long - * and pointer are 32-bit. + * Win32 was easy to implement under Unix since most 32-bit Unices use the same + * type model (ILP32) as Win32, where int, long and pointer are 32-bit. * - * Win64, however, will cause some problems when implemented under Unix. - * Linux/{Alpha, Sparc64} and most (all?) other 64-bit Unices use - * the LP64 type model where int is 32-bit and long and pointer are - * 64-bit. Win64 on the other hand uses the P64 (sometimes called LLP64) - * type model where int and long are 32 bit and pointer is 64-bit. + * Win64, however, can cause some problems. Most 64-bit Unices use the LP64 type + * model where int is 32-bit and long and pointer are 64-bit. Win64 on the other + * hand uses the LLP64 type model where int and long are 32 bit and pointer is + * 64-bit. */ #if defined(__x86_64__) && !defined(_WIN64)

1 0

Huw Davies : shdocvw: Cope with being called without an active document.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 0f9ba2b71c9917c0700100a63f07dd7fefaf112f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f9ba2b71c9917c0700100a63… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 11 19:18:54 2011 +0100 shdocvw: Cope with being called without an active document. --- dlls/shdocvw/dochost.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index edbd3c2..301ea32 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -326,6 +326,8 @@ void deactivate_document(DocHost *This) IHlinkTarget *hlink = NULL; HRESULT hres; + if(!This->document) return; + if(This->doc_navigate) { IUnknown_Release(This->doc_navigate); This->doc_navigate = NULL;

1 0

André Hentschel : winecfg: Update German translation.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: f464e4db6f467a3c772960a31a01f6b1280968bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f464e4db6f467a3c772960a31… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 11 20:37:01 2011 +0200 winecfg: Update German translation. --- programs/winecfg/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 3e4ab43..a1bdbd0 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -64,7 +64,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Fenstereinstellungen ",IDC_STATIC,8,4,244,84 - CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Im Vollbildmodus automatisch die &Maus einfangen",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Erlaube dem Fenstermanager die Fenster zu &dekorieren",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Erlaube dem Fenstermanager die &Fenster zu kontrollieren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Emuliere einen virtuellen Bildschirm",IDC_ENABLE_DESKTOP,"Button",

1 0

Aurimas Fišeras : winecfg: Update Lithuanian translation.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: d1bf3dc70a9ec1bd5d7c40aff9fbd8e87d6aa2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1bf3dc70a9ec1bd5d7c40aff… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed May 11 21:28:10 2011 +0300 winecfg: Update Lithuanian translation. --- programs/winecfg/Lt.rc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index a17085b..e705120 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -2,7 +2,7 @@ * WineCfg resources * Lithuanian Language Support * - * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * Copyright 2009-2011 Aurimas Fišeras <aurimas(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -65,7 +65,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Langų nuostatos ",IDC_STATIC,8,4,244,84 - CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatiškai &užvaldyti pelę viso ekrano languose",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Leisti langų tvarkytuvei &dekoruoti langus",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Leisti langų tvarkytuvei kontroliuoti &langus",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Emuliuoti virtualų darbalaukį",IDC_ENABLE_DESKTOP,"Button", @@ -76,7 +76,7 @@ BEGIN EDITTEXT IDC_DESKTOP_HEIGHT,133,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED GROUPBOX " Direct3D ",IDC_STATIC,8,95,244,49 - LTEXT "&Vertex Shader palaikymas: ",IDC_STATIC,15,110,90,32 + LTEXT "Verte&x Shader palaikymas: ",IDC_STATIC,15,110,90,32 COMBOBOX IDC_D3D_VSHADER_MODE,110,108,135,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Leisti &Pixel Shader (jei palaiko aparatinė įranga)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 @@ -132,7 +132,7 @@ IDD_DRIVECFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Diskų &atvaizdavimas ",IDC_STATIC,8,4,244,195 + GROUPBOX " Diskų atvai&zdavimas ",IDC_STATIC,8,4,244,195 LTEXT "Nepavyko prisijungti prie diskų tvarkytuvės, diskų konfigūracija negali būti redaguojama.", IDC_STATIC_MOUNTMGR_ERROR, 15,30,190,76 CONTROL "Listview",IDC_LIST_DRIVES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76 @@ -148,17 +148,17 @@ BEGIN LTEXT "&Tipas:",IDC_STATIC_TYPE,15,138,21,10 COMBOBOX IDC_COMBO_TYPE,45,135,97,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Rodyti papil&domas",IDC_BUTTON_SHOW_HIDE_ADVANCED,180,135,66,13 - LTEXT "De&vice:",IDC_STATIC_DEVICE,15,153,26,9 + PUSHBUTTON "&Rodyti papildomas",IDC_BUTTON_SHOW_HIDE_ADVANCED,180,135,66,13 + LTEXT "Įtai&sas:",IDC_STATIC_DEVICE,15,153,26,9 EDITTEXT IDC_EDIT_DEVICE,45,150,156,13,ES_AUTOHSCROLL | WS_TABSTOP PUSHBUTTON "Parinkti...",IDC_BUTTON_BROWSE_DEVICE,206,150,40,13 - LTEXT "&Vardas:",IDC_STATIC_LABEL,15,168,29,12 + LTEXT "Va&rdas:",IDC_STATIC_LABEL,15,168,29,12 EDITTEXT IDC_EDIT_LABEL,45,165,78,13,ES_AUTOHSCROLL | WS_TABSTOP LTEXT "N&umeris:",IDC_STATIC_SERIAL,15,183,29,12 EDITTEXT IDC_EDIT_SERIAL,45,180,78,13,ES_AUTOHSCROLL | WS_TABSTOP - CONTROL "Rodyti failus su taš&ku",IDC_SHOW_DOT_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,205,230,8 + CONTROL "Rodyti &failus su tašku",IDC_SHOW_DOT_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,205,230,8 END IDD_AUDIOCFG DIALOG 0, 0, 260, 220 @@ -169,7 +169,7 @@ BEGIN LTEXT "Pasirinkite garso tvarkyklę pažymėdami norimos tvarkyklės langelį. Garsą išjungti galima nepažymint nė vienos tvarkyklės. Kelių tvarkyklių pasirinkimas yra nerekomenduojamas. Tvarkyklę konfigūruoti galima spustelėjus dešiniuoju pelės klavišu.",IDC_STATIC,15,15,227,35 CONTROL "Įrenginiai",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,89 PUSHBUTTON "&Testuoti garsą",IDC_AUDIO_TEST,170,50,63,14 - PUSHBUTTON "&Valdymo skydelis",IDC_AUDIO_CONTROL_PANEL,170,70,63,14 + PUSHBUTTON "Valdymo &skydelis",IDC_AUDIO_CONTROL_PANEL,170,70,63,14 GROUPBOX " DirectSound ",IDC_STATIC,8,154,244,60 LTEXT "&Aparatinis spartinimas: ",IDC_STATIC,15,165,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,163,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

1 0

Frédéric Delanoy : winecfg: Update French translation.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 39c38cf024d8c7e74eef3af2abd23ad7f025afdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=39c38cf024d8c7e74eef3af2a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed May 11 21:04:57 2011 +0200 winecfg: Update French translation. --- programs/winecfg/Fr.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 64b3d2a..d73f782 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -66,8 +66,8 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Paramètres des fenêtres ",IDC_STATIC,8,4,244,92 - CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,16,230,16 - CONTROL "Permettre au gestionnaire de fenêtres de &décorer les fenêtres",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,36,230,8 + CONTROL "Capturer automatiquement la &souris dans les fenêtres plein écran",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,16,230,16 + CONTROL "Permettre au gestionnaire de fenêtres de &décorer les fenêtres",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Permettre au gestionnaire de fenêtres de &contrôler les fenêtres",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,50,230,8 CONTROL "Émuler un bureau virtuel",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,64,230,8

1 0

Thomas Mullaly : urlmon: Improve handling of error codes being returned from client OnStartBinding callback .
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: e7ea2d3bb5b5b61b9c8bb6cecb3fa474b2a0a6cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ea2d3bb5b5b61b9c8bb6cec… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sun May 1 23:29:53 2011 -0400 urlmon: Improve handling of error codes being returned from client OnStartBinding callback. --- dlls/urlmon/binding.c | 5 ++++- dlls/urlmon/tests/url.c | 14 ++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 0899027..5504f6f 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1494,7 +1494,10 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, IUri *uri, IBi hres = IBindStatusCallback_OnStartBinding(binding->callback, 0, &binding->IBinding_iface); if(FAILED(hres)) { WARN("OnStartBinding failed: %08x\n", hres); - stop_binding(binding, hres == E_ABORT ? hres : INET_E_DOWNLOAD_FAILURE, NULL); + if(hres != E_ABORT && hres != E_NOTIMPL) + hres = INET_E_DOWNLOAD_FAILURE; + + stop_binding(binding, hres, NULL); IBinding_Release(&binding->IBinding_iface); return hres; } diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 7c74865..0b57312 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -198,6 +198,7 @@ static IBinding *current_binding; static HANDLE complete_event, complete_event2; static HRESULT binding_hres; static HRESULT onsecurityproblem_hres; +static HRESULT abort_hres; static BOOL have_IHttpNegotiate2, use_bscex, is_async_prot; static BOOL test_redirect, use_cache_file, callback_read, no_callback, test_abort; static WCHAR cache_file_name[MAX_PATH]; @@ -1562,8 +1563,8 @@ static HRESULT WINAPI statusclb_OnStartBinding(IBindStatusCallbackEx *iface, DWO ok(hres == E_NOINTERFACE, "Could not get IID_IWinInetHttpInfo: %08x\n", hres); if(abort_start) { - binding_hres = E_ABORT; - return E_ABORT; + binding_hres = abort_hres; + return abort_hres; } return S_OK; @@ -2850,7 +2851,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) ok(hres == E_FAIL, "Got %08x\n", hres); CHECK_CALLED(OnStopBinding); } else if(abort_start) - ok(hres == E_ABORT, "IMoniker_BindToStorage failed: %08x, expected E_ABORT\n", hres); + ok(hres == abort_hres, "IMoniker_BindToStorage failed: %08x, expected %08x\n", hres, abort_hres); else if(abort_progress) ok(hres == MK_S_ASYNCHRONOUS, "IMoniker_BindToStorage failed: %08x\n", hres); else if(no_callback) { @@ -3634,7 +3635,12 @@ START_TEST(url) trace("http test (short response, to object)...\n"); test_BindToObject(HTTP_TEST, 0); - trace("http test (abort start binding)...\n"); + trace("http test (abort start binding E_NOTIMPL)...\n"); + abort_hres = E_NOTIMPL; + test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_START, TYMED_FILE); + + trace("http test (abort start binding E_ABORT)...\n"); + abort_hres = E_ABORT; test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_START, TYMED_FILE); trace("http test (abort progress)...\n");

1 0

Thomas Mullaly : urlmon: Honor E_ABORT for URLDownloadToFile status callbacks.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: 5fac827fd7b177a23639e986efae0e96f44aa2b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fac827fd7b177a23639e986e… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sun May 1 00:30:17 2011 -0400 urlmon: Honor E_ABORT for URLDownloadToFile status callbacks. --- dlls/urlmon/download.c | 28 +++++++++- dlls/urlmon/tests/url.c | 128 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 147 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/download.c b/dlls/urlmon/download.c index 9759e71..c20c87c 100644 --- a/dlls/urlmon/download.c +++ b/dlls/urlmon/download.c @@ -28,6 +28,7 @@ typedef struct { LONG ref; IBindStatusCallback *callback; + IBinding *binding; LPWSTR file_name; LPWSTR cache_file; } DownloadBSC; @@ -89,6 +90,8 @@ static ULONG WINAPI DownloadBSC_Release(IBindStatusCallback *iface) if(!ref) { if(This->callback) IBindStatusCallback_Release(This->callback); + if(This->binding) + IBinding_Release(This->binding); heap_free(This->file_name); heap_free(This->cache_file); heap_free(This); @@ -101,13 +104,19 @@ static HRESULT WINAPI DownloadBSC_OnStartBinding(IBindStatusCallback *iface, DWORD dwReserved, IBinding *pbind) { DownloadBSC *This = impl_from_IBindStatusCallback(iface); + HRESULT hres = S_OK; TRACE("(%p)->(%d %p)\n", This, dwReserved, pbind); - if(This->callback) - IBindStatusCallback_OnStartBinding(This->callback, dwReserved, pbind); + if(This->callback) { + hres = IBindStatusCallback_OnStartBinding(This->callback, dwReserved, pbind); - return S_OK; + IBinding_AddRef(pbind); + This->binding = pbind; + } + + /* Windows seems to ignore E_NOTIMPL if it's returned from the client. */ + return hres == E_NOTIMPL ? S_OK : hres; } static HRESULT WINAPI DownloadBSC_GetPriority(IBindStatusCallback *iface, LONG *pnPriority) @@ -132,6 +141,13 @@ static HRESULT on_progress(DownloadBSC *This, ULONG progress, ULONG progress_max return S_OK; hres = IBindStatusCallback_OnProgress(This->callback, progress, progress_max, status_code, status_text); + if(hres == E_ABORT) { + if(This->binding) + IBinding_Abort(This->binding); + else + FIXME("No binding, not sure what to do!\n"); + } + return hres; } @@ -191,6 +207,11 @@ static HRESULT WINAPI DownloadBSC_OnStopBinding(IBindStatusCallback *iface, if(This->callback) IBindStatusCallback_OnStopBinding(This->callback, hresult, szError); + if(This->binding) { + IBinding_Release(This->binding); + This->binding = NULL; + } + return S_OK; } @@ -311,6 +332,7 @@ static HRESULT DownloadBSC_Create(IBindStatusCallback *callback, LPCWSTR file_na ret->ref = 1; ret->file_name = heap_strdupW(file_name); ret->cache_file = NULL; + ret->binding = NULL; if(callback) IBindStatusCallback_AddRef(callback); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 0b57312..eb4d316 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1631,8 +1631,11 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u if(emulate_protocol && (test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST)) SetEvent(complete_event); - if(abort_progress) + if(abort_progress) { + if(filedwl_api) + binding_hres = E_ABORT; return E_ABORT; + } break; case BINDSTATUS_MIMETYPEAVAILABLE: @@ -1789,11 +1792,14 @@ static HRESULT WINAPI statusclb_OnStopBinding(IBindStatusCallbackEx *iface, HRES if (hresult == HRESULT_FROM_WIN32(ERROR_INTERNET_NAME_NOT_RESOLVED)) return S_OK; - if(filedwl_api) - ok(SUCCEEDED(hresult), "binding failed: %08x\n", hresult); - else if(invalid_cn_accepted) - ok(hresult == binding_hres, "binding failed: %08x, expected %08x\n", hresult, binding_hres); - else + if(filedwl_api) { + if(!abort_progress && !abort_start) + ok(SUCCEEDED(hresult), "binding failed: %08x\n", hresult); + else if(abort_start && abort_hres == E_NOTIMPL) + todo_wine ok(hresult == S_FALSE, "binding failed: %08x, expected S_FALSE\n", hresult); + else + ok(hresult == E_ABORT, "binding failed: %08x, expected E_ABORT\n", hresult); + } else ok(hresult == binding_hres, "binding failed: %08x, expected %08x\n", hresult, binding_hres); ok(szError == NULL, "szError should be NULL\n"); @@ -3328,6 +3334,113 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) ok(res, "DeleteFile failed: %u\n", GetLastError()); } +static void test_URLDownloadToFile_abort(void) +{ + HRESULT hres; + + init_bind_test(HTTP_TEST, BINDTEST_FILEDWLAPI|BINDTEST_ABORT_PROGRESS, TYMED_FILE); + + SET_EXPECT(GetBindInfo); + SET_EXPECT(QueryInterface_IInternetProtocol); + SET_EXPECT(QueryInterface_IServiceProvider); + SET_EXPECT(QueryService_IInternetProtocol); + SET_EXPECT(OnStartBinding); + SET_EXPECT(QueryInterface_IHttpNegotiate); + SET_EXPECT(QueryInterface_IHttpNegotiate2); + SET_EXPECT(BeginningTransaction); + SET_EXPECT(GetRootSecurityId); + SET_EXPECT(QueryInterface_IWindowForBindingUI); + SET_EXPECT(OnProgress_CONNECTING); + SET_EXPECT(OnProgress_SENDINGREQUEST); + SET_EXPECT(OnStopBinding); + + hres = URLDownloadToFileW(NULL, urls[HTTP_TEST], dwl_htmlW, 0, (IBindStatusCallback*)&bsc); + ok(hres == E_ABORT, "URLDownloadToFile failed: %08x, expected E_ABORT\n", hres); + + CHECK_CALLED(GetBindInfo); + CHECK_CALLED(QueryInterface_IInternetProtocol); + CHECK_CALLED(QueryInterface_IServiceProvider); + CHECK_CALLED(QueryService_IInternetProtocol); + CHECK_CALLED(OnStartBinding); + CHECK_CALLED(QueryInterface_IHttpNegotiate); + CHECK_CALLED(QueryInterface_IHttpNegotiate2); + CHECK_CALLED(BeginningTransaction); + CHECK_CALLED(GetRootSecurityId); + CLEAR_CALLED(QueryInterface_IWindowForBindingUI); + CHECK_CALLED(OnProgress_SENDINGREQUEST); + CLEAR_CALLED(OnProgress_CONNECTING); + CHECK_CALLED(OnStopBinding); + + init_bind_test(HTTP_TEST, BINDTEST_FILEDWLAPI|BINDTEST_ABORT_START, TYMED_FILE); + + SET_EXPECT(GetBindInfo); + SET_EXPECT(QueryInterface_IInternetProtocol); + SET_EXPECT(QueryInterface_IServiceProvider); + SET_EXPECT(QueryService_IInternetProtocol); + SET_EXPECT(OnStartBinding); + SET_EXPECT(OnStopBinding); + + abort_hres = E_ABORT; + hres = URLDownloadToFileW(NULL, urls[HTTP_TEST], dwl_htmlW, 0, (IBindStatusCallback*)&bsc); + ok(hres == E_ABORT, "URLDownloadToFile failed: %08x, expected E_ABORT\n", hres); + + CHECK_CALLED(GetBindInfo); + todo_wine CHECK_CALLED(QueryInterface_IInternetProtocol); + todo_wine CHECK_CALLED(QueryInterface_IServiceProvider); + todo_wine CHECK_CALLED(QueryService_IInternetProtocol); + CHECK_CALLED(OnStartBinding); + CHECK_CALLED(OnStopBinding); + + init_bind_test(HTTP_TEST, BINDTEST_FILEDWLAPI|BINDTEST_ABORT_START, TYMED_FILE); + + SET_EXPECT(GetBindInfo); + SET_EXPECT(QueryInterface_IInternetProtocol); + SET_EXPECT(QueryInterface_IServiceProvider); + SET_EXPECT(QueryService_IInternetProtocol); + SET_EXPECT(OnStartBinding); + SET_EXPECT(QueryInterface_IHttpNegotiate); + SET_EXPECT(QueryInterface_IHttpNegotiate2); + SET_EXPECT(BeginningTransaction); + SET_EXPECT(GetRootSecurityId); + SET_EXPECT(QueryInterface_IWindowForBindingUI); + SET_EXPECT(OnResponse); + SET_EXPECT(OnProgress_CONNECTING); + SET_EXPECT(OnProgress_SENDINGREQUEST); + SET_EXPECT(OnProgress_MIMETYPEAVAILABLE); + SET_EXPECT(OnProgress_BEGINDOWNLOADDATA); + SET_EXPECT(OnProgress_DOWNLOADINGDATA); + SET_EXPECT(OnProgress_ENDDOWNLOADDATA); + SET_EXPECT(OnStopBinding); + + /* URLDownloadToFile doesn't abort if E_NOTIMPL is returned from the + * IBindStatusCallback's OnStartBinding function. + */ + abort_hres = E_NOTIMPL; + hres = URLDownloadToFileW(NULL, urls[HTTP_TEST], dwl_htmlW, 0, (IBindStatusCallback*)&bsc); + ok(hres == S_OK, "URLDownloadToFile failed: %08x\n", hres); + + CHECK_CALLED(GetBindInfo); + CHECK_CALLED(QueryInterface_IInternetProtocol); + CHECK_CALLED(QueryInterface_IServiceProvider); + CHECK_CALLED(QueryService_IInternetProtocol); + CHECK_CALLED(OnStartBinding); + CHECK_CALLED(QueryInterface_IHttpNegotiate); + CHECK_CALLED(QueryInterface_IHttpNegotiate2); + CHECK_CALLED(BeginningTransaction); + CHECK_CALLED(GetRootSecurityId); + CLEAR_CALLED(QueryInterface_IWindowForBindingUI); + CHECK_CALLED(OnResponse); + CLEAR_CALLED(OnProgress_CONNECTING); + CHECK_CALLED(OnProgress_SENDINGREQUEST); + CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE); + CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA); + CHECK_CALLED(OnProgress_DOWNLOADINGDATA); + CHECK_CALLED(OnProgress_ENDDOWNLOADDATA); + CHECK_CALLED(OnStopBinding); + + DeleteFileA(dwl_htmlA); +} + static void set_file_url(char *path) { CHAR file_urlA[INTERNET_MAX_URL_LENGTH]; @@ -3728,6 +3841,9 @@ START_TEST(url) trace("test URLDownloadToFile for http protocol...\n"); test_URLDownloadToFile(HTTP_TEST, FALSE); + trace("test URLDownloadToFile abort...\n"); + test_URLDownloadToFile_abort(); + trace("test emulated http abort...\n"); test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_ABORT, TYMED_ISTREAM);

1 0

Dylan Smith : include: Replace a THIS, with THIS_ for a method with parameters.
by Alexandre Julliard 12 May '11

12 May '11

Module: wine Branch: master Commit: a61c7b9c2166fe2ad56d5c25cf3f0f0bf6fc971d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61c7b9c2166fe2ad56d5c25c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed May 11 16:34:16 2011 -0400 include: Replace a THIS, with THIS_ for a method with parameters. --- include/d3dx9anim.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 1a91c94..142acba 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -349,7 +349,7 @@ DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown) STDMETHOD_(D3DXEVENTHANDLE, KeyTrackEnable)(THIS_ UINT track, BOOL new_enable, DOUBLE start_time) PURE; STDMETHOD_(D3DXEVENTHANDLE, KeyPriorityBlend)(THIS_ FLOAT new_blend_weight, DOUBLE start_time, DOUBLE duration, D3DXTRANSITION_TYPE transition) PURE; - STDMETHOD(UnkeyEvent)(THIS, D3DXEVENTHANDLE event) PURE; + STDMETHOD(UnkeyEvent)(THIS_ D3DXEVENTHANDLE event) PURE; STDMETHOD(UnkeyAllTrackEvents)(THIS_ UINT track) PURE; STDMETHOD(UnkeyAllPriorityBlends)(THIS) PURE; STDMETHOD_(D3DXEVENTHANDLE, GetCurrentTrackEvent)(THIS_ UINT track, D3DXEVENT_TYPE event_type) PURE;

1 0

André Hentschel : winemaker: Let winegcc generate the app loader script.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 35c743bfec64f8bb61a661611dd3f1537fac2fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c743bfec64f8bb61a661611… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 11 19:00:31 2011 +0200 winemaker: Let winegcc generate the app loader script. --- tools/winemaker | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 33fb3d2..a561076 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -2448,7 +2448,7 @@ sub generate_project_files($) print FILEO " \$(SUBDIRS)"; } if (@{@$project[$P_TARGETS]} > 0) { - print FILEO " \$(DLLS:%=%.so) \$(EXES:%=%.so)"; + print FILEO " \$(DLLS:%=%.so) \$(EXES)"; } print FILEO "\n\n"; print FILEO "### Build rules\n"; @@ -2482,7 +2482,7 @@ sub generate_project_files($) print FILEO "\n"; print FILEO "clean:: \$(SUBDIRS:%=%/__clean__) \$(EXTRASUBDIRS:%=%/__clean__)\n"; print FILEO "\t\$(RM) \$(CLEAN_FILES) \$(RC_SRCS:.rc=.res) \$(C_SRCS:.c=.o) \$(CXX_SRCS:.cpp=.o)\n"; - print FILEO "\t\$(RM) \$(DLLS:%=%.so) \$(EXES:%=%.so) \$(EXES:%.exe=%)\n"; + print FILEO "\t\$(RM) \$(DLLS:%=%.so) \$(EXES) \$(EXES:%=%.so)\n"; print FILEO "\n"; print FILEO "\$(SUBDIRS:%=%/__clean__): dummy\n"; print FILEO "\tcd `dirname \$\@` && \$(MAKE) clean\n"; @@ -2503,7 +2503,7 @@ sub generate_project_files($) } elsif (@$target[$T_TYPE] == $TT_DLL) { print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS) \$(${canon}_MODULE:.dll=.spec)\n"; } else { - print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS)\n"; + print FILEO "\$(${canon}_MODULE): \$(${canon}_OBJS)\n"; } if (@{@$target[$T_SOURCES_CXX]} > 0 or @{@$project_settings[$T_SOURCES_CXX]} > 0) { print FILEO "\t\$(CXX)";

1 0