June 2013 - Wine-commits - list.winehq.org

André Hentschel : difxapi: Add stubs for DriverPackageGetPath{A, W}.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 849bbd90ac3aeec8c4136fc2521d8f2f85bff545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=849bbd90ac3aeec8c4136fc25… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 2 14:37:51 2013 +0200 difxapi: Add stubs for DriverPackageGetPath{A,W}. --- dlls/difxapi/difxapi.spec | 4 ++-- dlls/difxapi/main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/difxapi/difxapi.spec b/dlls/difxapi/difxapi.spec index 8ce068d..ad03719 100644 --- a/dlls/difxapi/difxapi.spec +++ b/dlls/difxapi/difxapi.spec @@ -1,7 +1,7 @@ @ stub DIFXAPISetLogCallbackA @ stub DIFXAPISetLogCallbackW -@ stub DriverPackageGetPathA -@ stub DriverPackageGetPathW +@ stdcall DriverPackageGetPathA(str ptr ptr) +@ stdcall DriverPackageGetPathW(wstr ptr ptr) @ stdcall DriverPackageInstallA(str long ptr ptr) @ stdcall DriverPackageInstallW(wstr long ptr ptr) @ stdcall DriverPackagePreinstallA(str long) diff --git a/dlls/difxapi/main.c b/dlls/difxapi/main.c index 8f3f339..820a4b3 100644 --- a/dlls/difxapi/main.c +++ b/dlls/difxapi/main.c @@ -64,3 +64,15 @@ DWORD WINAPI DriverPackageUninstallW(LPCWSTR inf, DWORD flags, PCINSTALLERINFO_W if (reboot) *reboot = FALSE; return ERROR_SUCCESS; } + +DWORD WINAPI DriverPackageGetPathA(LPCSTR inf, CHAR *dest, DWORD *count) +{ + FIXME("(%s, %p, %p) stub\n", wine_dbgstr_a(inf), dest, count); + return ERROR_UNSUPPORTED_TYPE; +} + +DWORD WINAPI DriverPackageGetPathW(LPCWSTR inf, WCHAR *dest, DWORD *count) +{ + FIXME("(%s, %p, %p) stub\n", wine_dbgstr_w(inf), dest, count); + return ERROR_UNSUPPORTED_TYPE; +}

1 0

Dmitry Timoshkov : server: Mark the process as disconnected from desktop/ winstation before closing its handles.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: df6c2a841824cf9edb438f9aea2ccb25922b671b URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6c2a841824cf9edb438f9ae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 3 18:15:15 2013 +0900 server: Mark the process as disconnected from desktop/winstation before closing its handles. --- dlls/kernel32/tests/process.c | 1 - server/process.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 64e333e..9d3e983 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1957,7 +1957,6 @@ static void test_TerminateProcess(void) SetLastError(0xdeadbeef); ret = TerminateProcess(pi.hProcess, 0); -todo_wine ok(ret, "TerminateProcess error %u\n", GetLastError()); CloseHandle(pi.hProcess); diff --git a/server/process.c b/server/process.c index 61d9d17..f1046c0 100644 --- a/server/process.c +++ b/server/process.c @@ -628,9 +628,9 @@ static void process_killed( struct process *process ) assert( list_empty( &process->thread_list )); process->end_time = current_time; if (!process->is_system) close_process_desktop( process ); - close_process_handles( process ); process->winstation = 0; process->desktop = 0; + close_process_handles( process ); if (process->idle_event) { release_object( process->idle_event );

1 0

Hans Leidekker : msi: Don' t defer custom actions in the UI sequence if they match the currently running script .
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: b64fabf39e923ebfaa9a77ed9dea05acf7e38dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b64fabf39e923ebfaa9a77ed9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 3 12:09:54 2013 +0200 msi: Don't defer custom actions in the UI sequence if they match the currently running script. --- dlls/msi/action.c | 10 ++++------ dlls/msi/custom.c | 4 ++-- dlls/msi/msipriv.h | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1fa065b..d964787 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -635,14 +635,12 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package) /******************************************************** * ACTION helper functions and functions that perform the actions *******************************************************/ -static BOOL ACTION_HandleCustomAction( MSIPACKAGE* package, LPCWSTR action, - UINT* rc, UINT script, BOOL force ) +static BOOL ACTION_HandleCustomAction( MSIPACKAGE *package, LPCWSTR action, UINT *rc, UINT script ) { BOOL ret=FALSE; UINT arc; - arc = ACTION_CustomAction(package, action, script, force); - + arc = ACTION_CustomAction( package, action, script ); if (arc != ERROR_CALL_NOT_IMPLEMENTED) { *rc = arc; @@ -7650,7 +7648,7 @@ UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script) handled = ACTION_HandleStandardAction(package, action, &rc); if (!handled) - handled = ACTION_HandleCustomAction(package, action, &rc, script, TRUE); + handled = ACTION_HandleCustomAction(package, action, &rc, script); if (!handled) { @@ -7672,7 +7670,7 @@ UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT scrip handled = ACTION_HandleStandardAction(package, action, &rc); if (!handled) - handled = ACTION_HandleCustomAction(package, action, &rc, script, FALSE); + handled = ACTION_HandleCustomAction(package, action, &rc, script); if( !handled && ACTION_DialogBox(package, action) == ERROR_SUCCESS ) handled = TRUE; diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 33be99b..eadb355 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1172,7 +1172,7 @@ static UINT defer_custom_action( MSIPACKAGE *package, const WCHAR *action, UINT return ERROR_SUCCESS; } -UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL execute) +UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action, UINT script ) { static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', @@ -1212,7 +1212,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL if (type & msidbCustomActionTypeNoImpersonate) WARN("msidbCustomActionTypeNoImpersonate not handled\n"); - if (!execute || !action_type_matches_script( type, script )) + if (!action_type_matches_script( type, script )) { rc = defer_custom_action( package, action, type ); goto end; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 018f405..773e8c1 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -977,7 +977,7 @@ extern HINSTANCE msi_hInstance DECLSPEC_HIDDEN; extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script) DECLSPEC_HIDDEN; extern UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT script) DECLSPEC_HIDDEN; extern void ACTION_FinishCustomActions( const MSIPACKAGE* package) DECLSPEC_HIDDEN; -extern UINT ACTION_CustomAction(MSIPACKAGE *package,const WCHAR *action, UINT script, BOOL execute) DECLSPEC_HIDDEN; +extern UINT ACTION_CustomAction(MSIPACKAGE *, const WCHAR *, UINT) DECLSPEC_HIDDEN; /* actions in other modules */ extern UINT ACTION_AppSearch(MSIPACKAGE *package) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : ole32/tests: Fix crash under NT.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 0f4c77d8779d5e14e8f97226abbeddebdd9804c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f4c77d8779d5e14e8f97226a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 2 20:19:57 2013 +1000 ole32/tests: Fix crash under NT. --- dlls/ole32/tests/storage32.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 9d99c38..3514fdd 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3071,11 +3071,13 @@ if (hr == S_OK) { /* reader mode */ hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READ | STGM_SHARE_DENY_NONE, NULL, 0, &stg); - ok(hr == S_OK, "got %08x\n", hr); - - hr = IStorage_QueryInterface(stg, &IID_IDirectWriterLock, (void**)&dwlock); - ok(hr == E_NOINTERFACE, "got %08x\n", hr); - IStorage_Release(stg); + ok(hr == S_OK || broken(hr == STG_E_INVALIDFLAG), "got %08x\n", hr); + if(hr == S_OK) + { + hr = IStorage_QueryInterface(stg, &IID_IDirectWriterLock, (void**)&dwlock); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + IStorage_Release(stg); + } /* writer mode */ hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READWRITE | STGM_SHARE_DENY_WRITE, NULL, 0, &stg);

1 0

Alistair Leslie-Hughes : ole32/tests: Check function pointer.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: f0806fd68c9f11f20175dae1ca82ba09d514845c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0806fd68c9f11f20175dae1c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 2 20:25:15 2013 +1000 ole32/tests: Check function pointer. --- dlls/ole32/tests/compobj.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index d0adf79..f2cdf6d 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -431,6 +431,12 @@ static void test_CoGetClassObject(void) CloseHandle(info.wait); CloseHandle(info.stop); + if (!pRegOverridePredefKey) + { + win_skip("RegOverridePredefKey not available\n"); + return; + } + pCoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk);

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetVarHelpContext.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 5ae88daf6334ec47a1689971dd8f182574416340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae88daf6334ec47a1689971d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 31 15:06:14 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetVarHelpContext. --- dlls/oleaut32/typelib.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b6f2e92..098100d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9220,8 +9220,16 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext(ICreateTypeInfo2 *ifa UINT index, DWORD helpContext) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %d - stub\n", This, index, helpContext); - return E_NOTIMPL; + TLBVarDesc *var_desc = &This->vardescs[index]; + + TRACE("%p %u %d\n", This, index, helpContext); + + if(index >= This->cVars) + return TYPE_E_ELEMENTNOTFOUND; + + var_desc->HelpContext = helpContext; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetMops(ICreateTypeInfo2 *iface,

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetVarDocString.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 4b2201b11c0900cd5113881ce19adb0684e86975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b2201b11c0900cd5113881ce… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 31 15:06:31 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetVarDocString. --- dlls/oleaut32/typelib.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 098100d..d52d461 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9196,8 +9196,19 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarDocString(ICreateTypeInfo2 *iface UINT index, LPOLESTR docString) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %s - stub\n", This, index, wine_dbgstr_w(docString)); - return E_NOTIMPL; + TLBVarDesc *var_desc = &This->vardescs[index]; + + TRACE("%p %u %s\n", This, index, wine_dbgstr_w(docString)); + + if(!docString) + return E_INVALIDARG; + + if(index >= This->cVars) + return TYPE_E_ELEMENTNOTFOUND; + + var_desc->HelpString = TLB_append_str(&This->pTypeLib->string_list, docString); + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext(ICreateTypeInfo2 *iface,

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::AddVarDesc.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 205671f355ccb33914fa48a5d247b438f44d8677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=205671f355ccb33914fa48a5d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 31 15:06:34 2013 -0500 oleaut32: Implement ICreateTypeInfo::AddVarDesc. --- dlls/oleaut32/typelib.c | 56 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d52d461..77c68ab 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1734,7 +1734,12 @@ static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeInfoImpl **typeinfos, return NULL; } -static TLBVarDesc *TLBVarDesc_Constructor(UINT n) +static void TLBVarDesc_Constructor(TLBVarDesc *var_desc) +{ + list_init(&var_desc->custdata_list); +} + +static TLBVarDesc *TLBVarDesc_Alloc(UINT n) { TLBVarDesc *ret; @@ -1743,7 +1748,7 @@ static TLBVarDesc *TLBVarDesc_Constructor(UINT n) return NULL; while(n){ - list_init(&ret[n-1].custdata_list); + TLBVarDesc_Constructor(&ret[n-1]); --n; } @@ -2451,7 +2456,7 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, TRACE_(typelib)("\n"); - ptvd = *pptvd = TLBVarDesc_Constructor(cVars); + ptvd = *pptvd = TLBVarDesc_Alloc(cVars); MSFT_ReadLEDWords(&infolen,sizeof(INT), pcx, offset); MSFT_ReadLEDWords(&recoffset,sizeof(INT), pcx, offset + infolen + ((cFuncs+cVars)*2+cFuncs + 1)*sizeof(INT)); @@ -3876,7 +3881,7 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign unsigned short i; WORD *pType; - pVarDesc = pTI->vardescs = TLBVarDesc_Constructor(cVars); + pVarDesc = pTI->vardescs = TLBVarDesc_Alloc(cVars); for(pItem = (SLTG_Variable *)pFirstItem, i = 0; i < cVars; pItem = (SLTG_Variable *)(pBlk + pItem->next), i++, ++pVarDesc) { @@ -9113,8 +9118,47 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface, UINT index, VARDESC *varDesc) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %p - stub\n", This, index, varDesc); - return E_NOTIMPL; + TLBVarDesc *var_desc; + + TRACE("%p %u %p\n", This, index, varDesc); + + if (This->vardescs){ + UINT i; + + This->vardescs = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->vardescs, + sizeof(TLBVarDesc) * (This->cVars + 1)); + + if (index < This->cVars) { + memmove(This->vardescs + index + 1, This->vardescs + index, + (This->cVars - index) * sizeof(TLBVarDesc)); + var_desc = This->vardescs + index; + } else + var_desc = This->vardescs + This->cVars; + + /* move custdata lists to the new memory location */ + for(i = 0; i < This->cVars + 1; ++i){ + if(index != i){ + TLBVarDesc *var = &This->vardescs[i]; + if(var->custdata_list.prev == var->custdata_list.next) + list_init(&var->custdata_list); + else{ + var->custdata_list.prev->next = &var->custdata_list; + var->custdata_list.next->prev = &var->custdata_list; + } + } + } + } else + var_desc = This->vardescs = heap_alloc(sizeof(TLBVarDesc)); + + memset(var_desc, 0, sizeof(TLBVarDesc)); + TLBVarDesc_Constructor(var_desc); + var_desc->vardesc = *varDesc; + + ++This->cVars; + + This->needs_layout = TRUE; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames(ICreateTypeInfo2 *iface,

1 0

André Hentschel : winecfg: Add more room for the license.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 09fb0ca5eed93c16ebc33b965e0c72f7a34edb7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=09fb0ca5eed93c16ebc33b965… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 31 23:15:31 2013 +0200 winecfg: Add more room for the license. --- programs/winecfg/winecfg.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 1f06c77..f856de1 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -130,7 +130,7 @@ BEGIN LTEXT "",IDC_ABT_PANEL_TEXT,160,43,140,8 CONTROL "",IDC_ABT_WEB_LINK,"SysLink", LWS_TRANSPARENT, 105,53,106,8 LTEXT "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", - IDC_ABT_LICENSE_TEXT,105,64,145,60 + IDC_ABT_LICENSE_TEXT,105,64,145,66 GROUPBOX "Windows registration information", IDC_STATIC, 15, 155, 230, 55 LTEXT "&Owner:", IDC_STATIC, 22, 171, 40, 20 EDITTEXT IDC_ABT_OWNER, 75, 171, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP

1 0

André Hentschel : winetest: Report number of failures in more places.
by Alexandre Julliard 03 Jun '13

03 Jun '13

Module: wine Branch: master Commit: 010399a3f75e08f5bae92ad22f65b633f21b5483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=010399a3f75e08f5bae92ad22… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 1 00:09:43 2013 +0200 winetest: Report number of failures in more places. --- programs/winetest/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index f4ebee6..135e18e 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1072,7 +1072,7 @@ run_tests (char *logname, char *outdir) } report (R_DELTA, 0, "Running: Done"); - report (R_STATUS, "Cleaning up"); + report (R_STATUS, "Cleaning up - %u failures", failures); CloseHandle( logfile ); logfile = 0; if (!outdir) @@ -1353,7 +1353,7 @@ int main( int argc, char *argv[] ) if (!send_file (logname) && !DeleteFileA(logname)) report (R_WARNING, "Can't remove logfile: %u", GetLastError()); } else run_tests (logname, outdir); - report (R_STATUS, "Finished"); + report (R_STATUS, "Finished - %u failures", failures); } if (poweroff) {

1 0