March 2014 - Wine-commits - list.winehq.org

Thomas Faber : comctl32: Make Str* functions private.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 6609a42334a1c04b0346440b4fb24294f21c693c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6609a42334a1c04b0346440b4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Wed Mar 26 11:03:49 2014 +0100 comctl32: Make Str* functions private. --- dlls/comctl32/comctl32.spec | 52 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index ef638a4..0dff369 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -62,32 +62,32 @@ 341 stdcall -noname SendNotify(long long long ptr) 342 stdcall -noname SendNotifyEx(long long long ptr long) 345 stdcall -ordinal TaskDialogIndirect(ptr ptr ptr ptr) -350 stdcall -noname StrChrA(str str) -351 stdcall -noname StrRChrA(str str long) -352 stdcall -noname StrCmpNA(str str long) -353 stdcall -noname StrCmpNIA(str str long) -354 stdcall -noname StrStrA(str str) -355 stdcall -noname StrStrIA(str str) -356 stdcall -noname StrCSpnA(str str) -357 stdcall -noname StrToIntA(str) -358 stdcall -noname StrChrW(wstr long) -359 stdcall -noname StrRChrW(wstr wstr long) -360 stdcall -noname StrCmpNW(wstr wstr long) -361 stdcall -noname StrCmpNIW(wstr wstr long) -362 stdcall -noname StrStrW(wstr wstr) -363 stdcall -noname StrStrIW(wstr wstr) -364 stdcall -noname StrCSpnW(wstr wstr) -365 stdcall -noname StrToIntW(wstr) -366 stdcall -noname StrChrIA(str long) -367 stdcall -noname StrChrIW(wstr long) -368 stdcall -noname StrRChrIA(str str long) -369 stdcall -noname StrRChrIW(wstr wstr long) -372 stdcall -noname StrRStrIA(str str str) -373 stdcall -noname StrRStrIW(wstr wstr wstr) -374 stdcall -noname StrCSpnIA(str str) -375 stdcall -noname StrCSpnIW(wstr wstr) -376 stdcall -noname IntlStrEqWorkerA(long str str long) -377 stdcall -noname IntlStrEqWorkerW(long wstr wstr long) +350 stdcall -noname -private StrChrA(str str) +351 stdcall -noname -private StrRChrA(str str long) +352 stdcall -noname -private StrCmpNA(str str long) +353 stdcall -noname -private StrCmpNIA(str str long) +354 stdcall -noname -private StrStrA(str str) +355 stdcall -noname -private StrStrIA(str str) +356 stdcall -noname -private StrCSpnA(str str) +357 stdcall -noname -private StrToIntA(str) +358 stdcall -noname -private StrChrW(wstr long) +359 stdcall -noname -private StrRChrW(wstr wstr long) +360 stdcall -noname -private StrCmpNW(wstr wstr long) +361 stdcall -noname -private StrCmpNIW(wstr wstr long) +362 stdcall -noname -private StrStrW(wstr wstr) +363 stdcall -noname -private StrStrIW(wstr wstr) +364 stdcall -noname -private StrCSpnW(wstr wstr) +365 stdcall -noname -private StrToIntW(wstr) +366 stdcall -noname -private StrChrIA(str long) +367 stdcall -noname -private StrChrIW(wstr long) +368 stdcall -noname -private StrRChrIA(str str long) +369 stdcall -noname -private StrRChrIW(wstr wstr long) +372 stdcall -noname -private StrRStrIA(str str str) +373 stdcall -noname -private StrRStrIW(wstr wstr wstr) +374 stdcall -noname -private StrCSpnIA(str str) +375 stdcall -noname -private StrCSpnIW(wstr wstr) +376 stdcall -noname -private IntlStrEqWorkerA(long str str long) +377 stdcall -noname -private IntlStrEqWorkerW(long wstr wstr long) 382 stdcall -noname SmoothScrollWindow(ptr) 383 stub -noname DoReaderMode 384 stdcall -noname SetPathWordBreakProc(ptr long)

1 0

Hugh McMaster : regsvr32: Replace printf calls with WriteConsole function.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 412a4f13f676fe105d75da5d2b9b399916c64f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=412a4f13f676fe105d75da5d2… Author: Hugh McMaster <hugh.mcmaster(a)masterindexing.com> Date: Wed Mar 19 11:54:57 2014 +1100 regsvr32: Replace printf calls with WriteConsole function. --- configure | 2 +- configure.ac | 2 +- po/ar.po | 70 +++++++++++++++++++++++++++++++++ po/bg.po | 68 ++++++++++++++++++++++++++++++++ po/ca.po | 70 +++++++++++++++++++++++++++++++++ po/cs.po | 70 +++++++++++++++++++++++++++++++++ po/da.po | 70 +++++++++++++++++++++++++++++++++ po/de.po | 70 +++++++++++++++++++++++++++++++++ po/el.po | 68 ++++++++++++++++++++++++++++++++ po/en.po | 84 +++++++++++++++++++++++++++++++++++++++ po/en_US.po | 84 +++++++++++++++++++++++++++++++++++++++ po/eo.po | 68 ++++++++++++++++++++++++++++++++ po/es.po | 70 +++++++++++++++++++++++++++++++++ po/fa.po | 68 ++++++++++++++++++++++++++++++++ po/fi.po | 70 +++++++++++++++++++++++++++++++++ po/fr.po | 70 +++++++++++++++++++++++++++++++++ po/he.po | 70 +++++++++++++++++++++++++++++++++ po/hi.po | 68 ++++++++++++++++++++++++++++++++ po/hr.po | 70 +++++++++++++++++++++++++++++++++ po/hu.po | 70 +++++++++++++++++++++++++++++++++ po/it.po | 70 +++++++++++++++++++++++++++++++++ po/ja.po | 70 +++++++++++++++++++++++++++++++++ po/ko.po | 70 +++++++++++++++++++++++++++++++++ po/lt.po | 70 +++++++++++++++++++++++++++++++++ po/ml.po | 68 ++++++++++++++++++++++++++++++++ po/nb_NO.po | 70 +++++++++++++++++++++++++++++++++ po/nl.po | 70 +++++++++++++++++++++++++++++++++ po/or.po | 68 ++++++++++++++++++++++++++++++++ po/pa.po | 68 ++++++++++++++++++++++++++++++++ po/pl.po | 70 +++++++++++++++++++++++++++++++++ po/pt_BR.po | 70 +++++++++++++++++++++++++++++++++ po/pt_PT.po | 70 +++++++++++++++++++++++++++++++++ po/rm.po | 68 ++++++++++++++++++++++++++++++++ po/ro.po | 70 +++++++++++++++++++++++++++++++++ po/ru.po | 70 +++++++++++++++++++++++++++++++++ po/sk.po | 68 ++++++++++++++++++++++++++++++++ po/sl.po | 70 +++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 69 ++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 69 ++++++++++++++++++++++++++++++++ po/sv.po | 70 +++++++++++++++++++++++++++++++++ po/te.po | 68 ++++++++++++++++++++++++++++++++ po/th.po | 68 ++++++++++++++++++++++++++++++++ po/tr.po | 70 +++++++++++++++++++++++++++++++++ po/uk.po | 70 +++++++++++++++++++++++++++++++++ po/wa.po | 68 ++++++++++++++++++++++++++++++++ po/wine.pot | 68 ++++++++++++++++++++++++++++++++ po/zh_CN.po | 68 ++++++++++++++++++++++++++++++++ po/zh_TW.po | 70 +++++++++++++++++++++++++++++++++ programs/regsvr32/Makefile.in | 2 +- programs/regsvr32/regsvr32.c | 87 +++++++++++++++++++++++++++++------------ programs/regsvr32/regsvr32.h | 34 ++++++++++++++++ programs/regsvr32/regsvr32.rc | 35 ++++++++++++++++- 52 files changed, 3349 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=412a4f13f676fe105d75d…

1 0

Hugh McMaster : regsvr32: Move silent check to the output_write function.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 3858ea03a3f94d205a2d9429a04783735de6092f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3858ea03a3f94d205a2d9429a… Author: Hugh McMaster <hugh.mcmaster(a)masterindexing.com> Date: Wed Mar 19 12:03:49 2014 +1100 regsvr32: Move silent check to the output_write function. --- programs/regsvr32/regsvr32.c | 50 ++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 33 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index c795f42..624acd6 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -72,6 +72,8 @@ static void __cdecl output_write(UINT id, ...) char *str; DWORD len, nOut, ret; + if (Silent) return; + if (!LoadStringA(GetModuleHandleA(NULL), id, fmt, sizeof(fmt)/sizeof(fmt[0]))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); @@ -112,16 +114,13 @@ static VOID *LoadProc(const char* strDll, const char* procName, HMODULE* DllHand *DllHandle = LoadLibraryExA(strDll, 0, LOAD_WITH_ALTERED_SEARCH_PATH); if(!*DllHandle) { - if(!Silent) - output_write(STRING_DLL_LOAD_FAILED, strDll); - + output_write(STRING_DLL_LOAD_FAILED, strDll); ExitProcess(1); } proc = (VOID *) GetProcAddress(*DllHandle, procName); if(!proc) { - if(!Silent) - output_write(STRING_PROC_NOT_IMPLEMENTED, procName, strDll); + output_write(STRING_PROC_NOT_IMPLEMENTED, procName, strDll); FreeLibrary(*DllHandle); return NULL; } @@ -141,13 +140,10 @@ static int RegisterDll(const char* strDll) hr = pfRegister(); if(FAILED(hr)) { - if(!Silent) - output_write(STRING_REGISTER_FAILED, strDll); - + output_write(STRING_REGISTER_FAILED, strDll); return -1; } - if(!Silent) - output_write(STRING_REGISTER_SUCCESSFUL, strDll); + output_write(STRING_REGISTER_SUCCESSFUL, strDll); if(DllHandle) FreeLibrary(DllHandle); @@ -167,13 +163,10 @@ static int UnregisterDll(char* strDll) hr = pfUnregister(); if(FAILED(hr)) { - if(!Silent) - output_write(STRING_UNREGISTER_FAILED, strDll); - + output_write(STRING_UNREGISTER_FAILED, strDll); return -1; } - if(!Silent) - output_write(STRING_UNREGISTER_SUCCESSFUL, strDll); + output_write(STRING_UNREGISTER_SUCCESSFUL, strDll); if(DllHandle) FreeLibrary(DllHandle); @@ -193,22 +186,16 @@ static int InstallDll(BOOL install, char *strDll, WCHAR *command_line) hr = pfInstall(install, command_line); if(FAILED(hr)) { - if(!Silent) - { - if (install) - output_write(STRING_INSTALL_FAILED, strDll); - else - output_write(STRING_UNINSTALL_FAILED, strDll); - } - return -1; - } - if(!Silent) - { if (install) - output_write(STRING_INSTALL_SUCCESSFUL, strDll); + output_write(STRING_INSTALL_FAILED, strDll); else - output_write(STRING_UNINSTALL_SUCCESSFUL, strDll); + output_write(STRING_UNINSTALL_FAILED, strDll); + return -1; } + if (install) + output_write(STRING_INSTALL_SUCCESSFUL, strDll); + else + output_write(STRING_UNINSTALL_SUCCESSFUL, strDll); if(DllHandle) FreeLibrary(DllHandle); @@ -320,11 +307,8 @@ int main(int argc, char* argv[]) if (!DllFound) { - if(!Silent) - { - output_write(STRING_HEADER); - output_write(STRING_USAGE); - } + output_write(STRING_HEADER); + output_write(STRING_USAGE); return 1; }

1 0

Kai Tietz : corerror.h: Merge with mingw-w64's extensions.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 83b6b22ff89451125654a6fcfad859b5800c00a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83b6b22ff89451125654a6fcf… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Wed Mar 26 15:18:00 2014 +0100 corerror.h: Merge with mingw-w64's extensions. --- include/corerror.h | 1145 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 1140 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83b6b22ff89451125654a…

1 0

Alistair Leslie-Hughes : dbghelp: Improve dwarf support.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: b816a8e629ee2debe5eaec6bbebf085d0e2aecac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b816a8e629ee2debe5eaec6bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 14 16:24:10 2014 +1100 dbghelp: Improve dwarf support. --- dlls/dbghelp/dwarf.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 159f9bb..e7c36b0 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1440,6 +1440,9 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, switch (child->abbrev->tag) { + case DW_TAG_array_type: + dwarf2_parse_array_type(ctx, di); + break; case DW_TAG_member: /* FIXME: should I follow the sibling stuff ?? */ dwarf2_parse_udt_member(ctx, child, (struct symt_udt*)di->symt); @@ -1710,7 +1713,10 @@ static void dwarf2_parse_subprogram_label(dwarf2_subprogram_t* subpgm, static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, struct symt_block* parent_block, - dwarf2_debug_info_t* di); + dwarf2_debug_info_t* di); + +static struct symt* dwarf2_parse_subroutine_type(dwarf2_parse_context_t* ctx, + dwarf2_debug_info_t* di); static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, struct symt_block* parent_block, @@ -1801,6 +1807,12 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, case DW_TAG_variable: dwarf2_parse_variable(subpgm, block, child); break; + case DW_TAG_pointer_type: + dwarf2_parse_pointer_type(subpgm->ctx, di); + break; + case DW_TAG_subroutine_type: + dwarf2_parse_subroutine_type(subpgm->ctx, di); + break; case DW_TAG_lexical_block: dwarf2_parse_subprogram_block(subpgm, block, child); break; @@ -1930,6 +1942,9 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, case DW_TAG_inlined_subroutine: dwarf2_parse_inlined_subroutine(&subpgm, NULL, child); break; + case DW_TAG_pointer_type: + dwarf2_parse_pointer_type(subpgm.ctx, di); + break; case DW_TAG_subprogram: /* FIXME: likely a declaration (to be checked) * skip it for now

1 0

Piotr Caban : user32: Change SetFocus behavior on windows with parent and no WS_CHILD flag.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 1cf3d8caa4df59490343ef9427ea5c6bc2af44c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf3d8caa4df59490343ef942… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 26 12:54:38 2014 +0100 user32: Change SetFocus behavior on windows with parent and no WS_CHILD flag. --- dlls/user32/focus.c | 1 + dlls/user32/tests/win.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index bd2e572..c47a82d 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -277,6 +277,7 @@ HWND WINAPI SetFocus( HWND hwnd ) HWND parent; LONG style = GetWindowLongW( hwndTop, GWL_STYLE ); if (style & (WS_MINIMIZE | WS_DISABLED)) return 0; + if (!(style & WS_CHILD)) break; parent = GetAncestor( hwndTop, GA_PARENT ); if (!parent || parent == GetDesktopWindow()) { diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f8c919a..cb74b8e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3724,6 +3724,25 @@ todo_wine check_active_state(popup, 0, popup); SetActiveWindow(parent); + SetFocus(popup); + check_active_state(popup, 0, popup); + + EnableWindow(child1, FALSE); + check_active_state(popup, 0, popup); + SetFocus(parent); + check_active_state(parent, 0, parent); + SetFocus(popup); + check_active_state(popup, 0, popup); + EnableWindow(child1, TRUE); + + ShowWindow(child1, SW_MINIMIZE); + SetFocus(parent); + check_active_state(parent, 0, parent); + SetFocus(popup); + check_active_state(popup, 0, popup); + ShowWindow(child1, SW_HIDE); + + SetActiveWindow(parent); SetFocus(parent); check_active_state(parent, 0, parent);

1 0

Michael Stefaniuc : shell32: Simplify the creation of an IEnumIDList.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 0aff99771d03de4432f26dfff31fdb854c611dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aff99771d03de4432f26dfff… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 25 23:33:45 2014 +0100 shell32: Simplify the creation of an IEnumIDList. --- dlls/shell32/shfldr_unixfs.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 10b2879..3e8ad1e 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -971,14 +971,12 @@ static HRESULT WINAPI ShellFolder2_ParseDisplayName(IShellFolder2* iface, HWND h return result; } -static IUnknown *UnixSubFolderIterator_Constructor(UnixFolder *pUnixFolder, SHCONTF fFilter); +static IEnumIDList *UnixSubFolderIterator_Constructor(UnixFolder *pUnixFolder, SHCONTF fFilter); static HRESULT WINAPI ShellFolder2_EnumObjects(IShellFolder2* iface, HWND hwndOwner, SHCONTF grfFlags, IEnumIDList** ppEnumIDList) { UnixFolder *This = impl_from_IShellFolder2(iface); - IUnknown *newIterator; - HRESULT hr; TRACE("(%p)->(%p 0x%08x %p)\n", This, hwndOwner, grfFlags, ppEnumIDList); @@ -987,11 +985,8 @@ static HRESULT WINAPI ShellFolder2_EnumObjects(IShellFolder2* iface, HWND hwndOw return E_UNEXPECTED; } - newIterator = UnixSubFolderIterator_Constructor(This, grfFlags); - hr = IUnknown_QueryInterface(newIterator, &IID_IEnumIDList, (void**)ppEnumIDList); - IUnknown_Release(newIterator); - - return hr; + *ppEnumIDList = UnixSubFolderIterator_Constructor(This, grfFlags); + return S_OK; } static HRESULT CreateUnixFolder(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv, const CLSID *pCLSID); @@ -2521,21 +2516,20 @@ static const IEnumIDListVtbl UnixSubFolderIterator_IEnumIDList_Vtbl = { UnixSubFolderIterator_IEnumIDList_Clone }; -static IUnknown *UnixSubFolderIterator_Constructor(UnixFolder *pUnixFolder, SHCONTF fFilter) { +static IEnumIDList *UnixSubFolderIterator_Constructor(UnixFolder *pUnixFolder, SHCONTF fFilter) +{ UnixSubFolderIterator *iterator; TRACE("(pUnixFolder=%p)\n", pUnixFolder); - - iterator = SHAlloc((ULONG)sizeof(UnixSubFolderIterator)); + + iterator = SHAlloc(sizeof(*iterator)); iterator->lpIEnumIDListVtbl = &UnixSubFolderIterator_IEnumIDList_Vtbl; - iterator->m_cRef = 0; + iterator->m_cRef = 1; iterator->m_fFilter = fFilter; iterator->m_dirFolder = opendir(pUnixFolder->m_pszPath); lstrcpyA(iterator->m_szFolder, pUnixFolder->m_pszPath); - UnixSubFolderIterator_IEnumIDList_AddRef((IEnumIDList*)iterator); - - return (IUnknown*)iterator; + return (IEnumIDList*)iterator; } #else /* __MINGW32__ || _MSC_VER */

1 0

Michael Stefaniuc : shell32: COM cleanup for IEnumIDList.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: c13e106e73e1c8dd00fe20823bb72bdb73e422cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13e106e73e1c8dd00fe20823… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 25 23:40:52 2014 +0100 shell32: COM cleanup for IEnumIDList. --- dlls/shell32/shfldr_unixfs.c | 49 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 3e8ad1e..8f93e7f 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -170,9 +170,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); #if !defined(__MINGW32__) && !defined(_MSC_VER) -#define ADJUST_THIS(c,m,p) ((c*)(((long)p)-(long)&(((c*)0)->lp##m##Vtbl))) -#define STATIC_CAST(i,p) ((i*)&p->lp##i##Vtbl) - #define LEN_SHITEMID_FIXED_PART ((USHORT) \ ( sizeof(USHORT) /* SHITEMID's cb field. */ \ + sizeof(PIDLTYPE) /* PIDLDATA's type field. */ \ @@ -2368,13 +2365,18 @@ HRESULT WINAPI MyDocuments_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID /* UnixSubFolderIterator object layout and typedef. */ typedef struct _UnixSubFolderIterator { - const IEnumIDListVtbl *lpIEnumIDListVtbl; - LONG m_cRef; + IEnumIDList IEnumIDList_iface; + LONG ref; SHCONTF m_fFilter; DIR *m_dirFolder; char m_szFolder[FILENAME_MAX]; } UnixSubFolderIterator; +static inline UnixSubFolderIterator *impl_from_IEnumIDList(IEnumIDList *iface) +{ + return CONTAINING_RECORD(iface, UnixSubFolderIterator, IEnumIDList_iface); +} + static void UnixSubFolderIterator_Destroy(UnixSubFolderIterator *iterator) { TRACE("(iterator=%p)\n", iterator); @@ -2400,35 +2402,34 @@ static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_QueryInterface(IEnumIDLi IEnumIDList_AddRef(iface); return S_OK; } - + static ULONG WINAPI UnixSubFolderIterator_IEnumIDList_AddRef(IEnumIDList* iface) { - UnixSubFolderIterator *This = ADJUST_THIS(UnixSubFolderIterator, IEnumIDList, iface); + UnixSubFolderIterator *This = impl_from_IEnumIDList(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(iface=%p)\n", iface); - - return InterlockedIncrement(&This->m_cRef); + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI UnixSubFolderIterator_IEnumIDList_Release(IEnumIDList* iface) { - UnixSubFolderIterator *This = ADJUST_THIS(UnixSubFolderIterator, IEnumIDList, iface); - ULONG cRef; - - TRACE("(iface=%p)\n", iface); + UnixSubFolderIterator *This = impl_from_IEnumIDList(iface); + ULONG ref = InterlockedDecrement(&This->ref); - cRef = InterlockedDecrement(&This->m_cRef); - - if (!cRef) + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) UnixSubFolderIterator_Destroy(This); - return cRef; + return ref; } static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Next(IEnumIDList* iface, ULONG celt, LPITEMIDLIST* rgelt, ULONG* pceltFetched) { - UnixSubFolderIterator *This = ADJUST_THIS(UnixSubFolderIterator, IEnumIDList, iface); + UnixSubFolderIterator *This = impl_from_IEnumIDList(iface); ULONG i = 0; /* This->m_dirFolder will be NULL if the user doesn't have access rights for the dir. */ @@ -2487,8 +2488,8 @@ static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Skip(IEnumIDList* iface, static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Reset(IEnumIDList* iface) { - UnixSubFolderIterator *This = ADJUST_THIS(UnixSubFolderIterator, IEnumIDList, iface); - + UnixSubFolderIterator *This = impl_from_IEnumIDList(iface); + TRACE("(iface=%p)\n", iface); if (This->m_dirFolder) @@ -2523,13 +2524,13 @@ static IEnumIDList *UnixSubFolderIterator_Constructor(UnixFolder *pUnixFolder, S TRACE("(pUnixFolder=%p)\n", pUnixFolder); iterator = SHAlloc(sizeof(*iterator)); - iterator->lpIEnumIDListVtbl = &UnixSubFolderIterator_IEnumIDList_Vtbl; - iterator->m_cRef = 1; + iterator->IEnumIDList_iface.lpVtbl = &UnixSubFolderIterator_IEnumIDList_Vtbl; + iterator->ref = 1; iterator->m_fFilter = fFilter; iterator->m_dirFolder = opendir(pUnixFolder->m_pszPath); lstrcpyA(iterator->m_szFolder, pUnixFolder->m_pszPath); - return (IEnumIDList*)iterator; + return &iterator->IEnumIDList_iface; } #else /* __MINGW32__ || _MSC_VER */

1 0

Alistair Leslie-Hughes : include: Add interface INetCfgLock.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 1db600d44badeccc8e16ba8cfbd7bc1e96d267d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db600d44badeccc8e16ba8cf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 26 11:54:32 2014 +1100 include: Add interface INetCfgLock. --- include/netcfgx.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/netcfgx.idl b/include/netcfgx.idl index 75c0a94..d51407f 100644 --- a/include/netcfgx.idl +++ b/include/netcfgx.idl @@ -26,6 +26,9 @@ import "wtypes.idl"; #define vi_progid(str) #endif +cpp_quote("#define NETCFG_E_ALREADY_INITIALIZED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0xA020)") +cpp_quote("#define NETCFG_E_NO_WRITE_LOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0xA024)") + [ local, object, @@ -91,6 +94,20 @@ interface IEnumNetCfgComponent : IUnknown [ local, object, + uuid(c0e8ae9f-306e-11d1-aacf-00805fc1270e), + pointer_default(unique) +] +interface INetCfgLock : IUnknown +{ + HRESULT AcquireWriteLock ([in] DWORD cmsTimeout, [in] LPCWSTR pszwClientDescription, + [out] LPWSTR* ppszwClientDescription); + HRESULT ReleaseWriteLock (); + HRESULT IsWriteLocked ([out] LPWSTR* ppszwClientDescription); +}; + +[ + local, + object, uuid(c0e8ae93-306e-11d1-aacf-00805fc1270e), pointer_default(unique) ]

1 0

Alistair Leslie-Hughes : netcfgx: Add INetCfgLock support.
by Alexandre Julliard 26 Mar '14

26 Mar '14

Module: wine Branch: master Commit: 8a82aacec9fec20e948d1046ff941dbd8b0587be URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a82aacec9fec20e948d1046f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 26 11:54:56 2014 +1100 netcfgx: Add INetCfgLock support. --- dlls/netcfgx/netcfg.c | 75 ++++++++++++++++++++++++++++++++++++++++-- dlls/netcfgx/tests/netcfgx.c | 27 +++++++++++++++ 2 files changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/netcfgx/netcfg.c b/dlls/netcfgx/netcfg.c index 8653d29..43db0ef 100644 --- a/dlls/netcfgx/netcfg.c +++ b/dlls/netcfgx/netcfg.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL( netcfgx ); typedef struct NetConfiguration { INetCfg INetCfg_iface; + INetCfgLock INetCfgLock_iface; + LONG ref; } NetConfiguration; @@ -38,14 +40,24 @@ static inline NetConfiguration *impl_from_INetCfg(INetCfg *iface) return CONTAINING_RECORD(iface, NetConfiguration, INetCfg_iface); } +static inline NetConfiguration *impl_from_INetCfgLock(INetCfgLock *iface) +{ + return CONTAINING_RECORD(iface, NetConfiguration, INetCfgLock_iface); +} + static HRESULT WINAPI netcfg_QueryInterface(INetCfg *iface, REFIID riid, void **ppvObject) { - TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); + NetConfiguration *This = impl_from_INetCfg(iface); + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_INetCfg) || IsEqualGUID(riid, &IID_IUnknown)) { - *ppvObject = iface; + *ppvObject = &This->INetCfg_iface; + } + else if(IsEqualGUID(riid, &IID_INetCfgLock)) + { + *ppvObject = &This->INetCfgLock_iface; } else { @@ -53,7 +65,7 @@ static HRESULT WINAPI netcfg_QueryInterface(INetCfg *iface, REFIID riid, void ** return E_NOINTERFACE; } - INetCfg_AddRef( iface ); + IUnknown_AddRef((IUnknown*)*ppvObject); return S_OK; } @@ -153,6 +165,62 @@ static const struct INetCfgVtbl NetCfgVtbl = netcfg_QueryNetCfgClass }; + +static HRESULT WINAPI netcfglock_QueryInterface(INetCfgLock *iface, REFIID riid,void **ppvObject) +{ + NetConfiguration *This = impl_from_INetCfgLock(iface); + + return netcfg_QueryInterface(&This->INetCfg_iface, riid, ppvObject); +} + +static ULONG WINAPI netcfglock_AddRef(INetCfgLock *iface) +{ + NetConfiguration *This = impl_from_INetCfgLock(iface); + + return netcfg_AddRef(&This->INetCfg_iface); +} + +static ULONG WINAPI netcfglock_Release(INetCfgLock *iface) +{ + NetConfiguration *This = impl_from_INetCfgLock(iface); + return netcfg_Release(&This->INetCfg_iface); +} + +static HRESULT WINAPI netcfglock_AcquireWriteLock(INetCfgLock *iface, DWORD cmsTimeout, + LPCWSTR pszwClientDescription, LPWSTR *ppszwClientDescription) +{ + NetConfiguration *This = impl_from_INetCfgLock(iface); + FIXME("%p %d %s %p\n", This, cmsTimeout, debugstr_w(pszwClientDescription), ppszwClientDescription); + + return S_OK; +} + +static HRESULT WINAPI netcfglock_ReleaseWriteLock(INetCfgLock *iface) +{ + NetConfiguration *This = impl_from_INetCfgLock(iface); + FIXME("%p\n", This); + + return S_OK; +} + +static HRESULT WINAPI netcfglock_IsWriteLocked(INetCfgLock *iface, LPWSTR *ppszwClientDescription) +{ + NetConfiguration *This = impl_from_INetCfgLock(iface); + FIXME("%p %p\n", This, ppszwClientDescription); + + return E_NOTIMPL; +} + +static const struct INetCfgLockVtbl NetCfgLockVtbl = +{ + netcfglock_QueryInterface, + netcfglock_AddRef, + netcfglock_Release, + netcfglock_AcquireWriteLock, + netcfglock_ReleaseWriteLock, + netcfglock_IsWriteLocked +}; + HRESULT INetCfg_CreateInstance(IUnknown **ppUnk) { NetConfiguration *This; @@ -162,6 +230,7 @@ HRESULT INetCfg_CreateInstance(IUnknown **ppUnk) return E_OUTOFMEMORY; This->INetCfg_iface.lpVtbl = &NetCfgVtbl; + This->INetCfgLock_iface.lpVtbl = &NetCfgLockVtbl; This->ref = 1; *ppUnk = (IUnknown*)This; diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index 6427f85..2a9f0eb 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -26,17 +26,38 @@ void create_configuration(void) { static const WCHAR tcpipW[] = {'M','S','_','T','C','P','I','P',0}; + static const WCHAR myclient[] = {'M','Y',' ','C','L','I','E','N','T',0}; HRESULT hr; INetCfg *config = NULL; + INetCfgLock *netlock = NULL; INetCfgComponent *component = NULL; + LPWSTR client = NULL; hr = CoCreateInstance( &CLSID_CNetCfg, NULL, CLSCTX_ALL, &IID_INetCfg, (LPVOID*)&config); ok(hr == S_OK, "Failed to create object\n"); if(SUCCEEDED(hr)) { + hr = INetCfg_QueryInterface(config, &IID_INetCfgLock, (LPVOID*)&netlock); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = INetCfgLock_AcquireWriteLock(netlock, 5000, myclient, &client); + ok(hr == S_OK || + hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08x\n", hr); + if(hr == S_OK) + { + trace("Lock value: %s\n", wine_dbgstr_w(client)); + CoTaskMemFree(client); + } + else if(hr == E_ACCESSDENIED) + trace("Not run with Admin permissions\n"); + hr = INetCfg_Initialize(config, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); + /* AcquireWriteLock needs to be run before Initialize */ + hr = INetCfgLock_AcquireWriteLock(netlock, 5000, myclient, &client); + todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + hr = INetCfg_FindComponent(config, tcpipW, &component); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if(hr == S_OK) @@ -44,9 +65,15 @@ void create_configuration(void) INetCfgComponent_Release(component); } + hr = INetCfg_Apply(config); + todo_wine ok(hr == S_OK || hr == NETCFG_E_NO_WRITE_LOCK, "got 0x%08x\n", hr); + hr = INetCfg_Uninitialize(config); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = INetCfgLock_ReleaseWriteLock(netlock); + ok(hr == S_OK, "got 0x%08x\n", hr); + INetCfg_Release(config); } }

1 0