July 2008 - Wine-Commits - list.winehq.org

Owen Rudge : shell32: Add About dialog to Control Panel.
by Alexandre Julliard July 23, 2008

July 23, 2008

Module: wine Branch: master Commit: 6599f573ca087d81a2797666d46f2d4e323b6b99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6599f573ca087d81a2797666d… Author: Owen Rudge <owen(a)owenrudge.net> Date: Tue Jul 22 17:31:14 2008 +0100 shell32: Add About dialog to Control Panel. --- dlls/shell32/control.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 13fefaa..ca38edb 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -360,6 +360,17 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, SendMessageW(hWnd, WM_CLOSE, 0, 0); return 0; + case IDM_CPANEL_ABOUT: + { + WCHAR appName[MAX_STRING_LEN]; + + LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, + sizeof(appName) / sizeof(appName[0])); + ShellAboutW(hWnd, appName, NULL, NULL); + + return 0; + } + case FCIDM_SHVIEW_BIGICON: case FCIDM_SHVIEW_SMALLICON: case FCIDM_SHVIEW_LISTVIEW:

1 0

Owen Rudge : shell32: Add menu bar to Control Panel.
by Alexandre Julliard July 23, 2008

July 23, 2008

Module: wine Branch: master Commit: 95c6d1d8642ce6233d4692d45ef8cbb7ee3ad783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c6d1d8642ce6233d4692d45… Author: Owen Rudge <owen(a)owenrudge.net> Date: Tue Jul 22 17:31:03 2008 +0100 shell32: Add menu bar to Control Panel. --- dlls/shell32/control.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/cpanel.h | 7 ++++ dlls/shell32/shell32_Bg.rc | 22 ++++++++++++ dlls/shell32/shell32_Ca.rc | 23 ++++++++++++ dlls/shell32/shell32_Cn.rc | 22 ++++++++++++ dlls/shell32/shell32_Cs.rc | 22 ++++++++++++ dlls/shell32/shell32_Da.rc | 22 ++++++++++++ dlls/shell32/shell32_De.rc | 22 ++++++++++++ dlls/shell32/shell32_En.rc | 22 ++++++++++++ dlls/shell32/shell32_Eo.rc | 22 ++++++++++++ dlls/shell32/shell32_Es.rc | 22 ++++++++++++ dlls/shell32/shell32_Fi.rc | 22 ++++++++++++ dlls/shell32/shell32_Fr.rc | 22 ++++++++++++ dlls/shell32/shell32_Hu.rc | 22 ++++++++++++ dlls/shell32/shell32_It.rc | 22 ++++++++++++ dlls/shell32/shell32_Ja.rc | 22 ++++++++++++ dlls/shell32/shell32_Ko.rc | 23 ++++++++++++ dlls/shell32/shell32_Nl.rc | 22 ++++++++++++ dlls/shell32/shell32_No.rc | 22 ++++++++++++ dlls/shell32/shell32_Pl.rc | 22 ++++++++++++ dlls/shell32/shell32_Pt.rc | 47 ++++++++++++++++++++++++++ dlls/shell32/shell32_Ro.rc | 22 ++++++++++++ dlls/shell32/shell32_Ru.rc | 22 ++++++++++++ dlls/shell32/shell32_Si.rc | 22 ++++++++++++ dlls/shell32/shell32_Sk.rc | 22 ++++++++++++ dlls/shell32/shell32_Sv.rc | 22 ++++++++++++ dlls/shell32/shell32_Tr.rc | 22 ++++++++++++ dlls/shell32/shell32_Uk.rc | 22 ++++++++++++ dlls/shell32/shell32_Wa.rc | 22 ++++++++++++ dlls/shell32/shell32_Zh.rc | 22 ++++++++++++ dlls/shell32/shresdef.h | 5 +++ 31 files changed, 735 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95c6d1d8642ce6233d469…

1 0

Owen Rudge : shell32: Add code to process menu item selections.
by Alexandre Julliard July 23, 2008

July 23, 2008

Module: wine Branch: master Commit: 9b2f6364acdd99a4b88deef2f72f1475aa0800c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b2f6364acdd99a4b88deef2f… Author: Owen Rudge <owen(a)owenrudge.net> Date: Tue Jul 22 17:31:08 2008 +0100 shell32: Add code to process menu item selections. --- dlls/shell32/control.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index eae5129..13fefaa 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -353,6 +353,59 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, Control_FreeCPlItems(hWnd, panel); PostQuitMessage(0); break; + case WM_COMMAND: + switch (LOWORD(lParam1)) + { + case IDM_CPANEL_EXIT: + SendMessageW(hWnd, WM_CLOSE, 0, 0); + return 0; + + case FCIDM_SHVIEW_BIGICON: + case FCIDM_SHVIEW_SMALLICON: + case FCIDM_SHVIEW_LISTVIEW: + case FCIDM_SHVIEW_REPORTVIEW: + return 0; + + default: + /* check if this is an applet */ + if ((LOWORD(lParam1) >= IDM_CPANEL_APPLET_BASE) && + (LOWORD(lParam1) <= IDM_CPANEL_APPLET_BASE + panel->total_subprogs)) + { + CPlItem *item; + HMENU hMenu, hSubMenu; + MENUITEMINFOW mii; + + /* retrieve the CPlItem structure from the menu item data */ + hMenu = GetMenu(hWnd); + + if (!hMenu) + break; + + hSubMenu = GetSubMenu(hMenu, 0); + + if (!hSubMenu) + break; + + mii.cbSize = sizeof(MENUITEMINFOW); + mii.fMask = MIIM_DATA; + + if (!GetMenuItemInfoW(hSubMenu, LOWORD(lParam1), FALSE, &mii)) + break; + + item = (CPlItem *) mii.dwItemData; + + /* execute the applet if item is valid */ + if (item) + item->applet->proc(item->applet->hWnd, CPL_DBLCLK, item->id, + item->applet->info[item->id].lData); + + return 0; + } + + break; + } + + break; case WM_PAINT: return Control_WndProc_Paint(panel, lParam1); case WM_LBUTTONUP:

1 0

Owen Rudge : shell32: Load Control Panel title from resources.
by Alexandre Julliard July 23, 2008

July 23, 2008

Module: wine Branch: master Commit: 08b1bdb8c0226af79b8c38ed804894af86b63cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b1bdb8c0226af79b8c38ed8… Author: Owen Rudge <owen(a)owenrudge.net> Date: Tue Jul 22 17:30:51 2008 +0100 shell32: Load Control Panel title from resources. --- dlls/shell32/control.c | 9 +++++++-- dlls/shell32/shell32_Bg.rc | 2 ++ dlls/shell32/shell32_Ca.rc | 5 +++++ dlls/shell32/shell32_Cn.rc | 2 ++ dlls/shell32/shell32_Cs.rc | 2 ++ dlls/shell32/shell32_Da.rc | 2 ++ dlls/shell32/shell32_De.rc | 2 ++ dlls/shell32/shell32_En.rc | 2 ++ dlls/shell32/shell32_Eo.rc | 2 ++ dlls/shell32/shell32_Es.rc | 2 ++ dlls/shell32/shell32_Fi.rc | 2 ++ dlls/shell32/shell32_Fr.rc | 2 ++ dlls/shell32/shell32_Hu.rc | 5 +++++ dlls/shell32/shell32_It.rc | 2 ++ dlls/shell32/shell32_Ja.rc | 2 ++ dlls/shell32/shell32_Ko.rc | 2 ++ dlls/shell32/shell32_Nl.rc | 2 ++ dlls/shell32/shell32_No.rc | 2 ++ dlls/shell32/shell32_Pl.rc | 2 ++ dlls/shell32/shell32_Pt.rc | 4 ++++ dlls/shell32/shell32_Ro.rc | 2 ++ dlls/shell32/shell32_Ru.rc | 2 ++ dlls/shell32/shell32_Si.rc | 2 ++ dlls/shell32/shell32_Sk.rc | 2 ++ dlls/shell32/shell32_Sv.rc | 5 +++++ dlls/shell32/shell32_Tr.rc | 2 ++ dlls/shell32/shell32_Uk.rc | 2 ++ dlls/shell32/shell32_Wa.rc | 5 +++++ dlls/shell32/shell32_Zh.rc | 2 ++ dlls/shell32/shresdef.h | 2 ++ 30 files changed, 79 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08b1bdb8c0226af79b8c3…

1 0

Ismael Barros : dplayx: Basic implementation of dpwsockx.dll, needed by dplayx.
by Alexandre Julliard July 23, 2008

July 23, 2008

Module: wine Branch: master Commit: 9d2a1e8adcaa9c642922286b8672f46a984d9417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d2a1e8adcaa9c642922286b8… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Jul 22 22:23:16 2008 +0300 dplayx: Basic implementation of dpwsockx.dll, needed by dplayx. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/dpwsockx/Makefile.in | 13 ++++++++ dlls/dpwsockx/dpwsockx.spec | 3 ++ dlls/dpwsockx/dpwsockx_dll.h | 30 +++++++++++++++++++ dlls/dpwsockx/dpwsockx_main.c | 63 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 116 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1e7f4d8..6af86c4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -257,6 +257,7 @@ ALL_MAKEFILES = \ dlls/dpnet/Makefile \ dlls/dpnhpast/Makefile \ dlls/dpnlobby/Makefile \ + dlls/dpwsockx/Makefile \ dlls/dsound/Makefile \ dlls/dsound/tests/Makefile \ dlls/dssenh/Makefile \ @@ -688,6 +689,7 @@ dlls/dpnaddr/Makefile: dlls/dpnaddr/Makefile.in dlls/Makedll.rules dlls/dpnet/Makefile: dlls/dpnet/Makefile.in dlls/Makedll.rules dlls/dpnhpast/Makefile: dlls/dpnhpast/Makefile.in dlls/Makedll.rules dlls/dpnlobby/Makefile: dlls/dpnlobby/Makefile.in dlls/Makedll.rules +dlls/dpwsockx/Makefile: dlls/dpwsockx/Makefile.in dlls/Makedll.rules dlls/dsound/Makefile: dlls/dsound/Makefile.in dlls/Makedll.rules dlls/dsound/tests/Makefile: dlls/dsound/tests/Makefile.in dlls/Maketest.rules dlls/dssenh/Makefile: dlls/dssenh/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 7cfa0fd..746e742 100755 --- a/configure +++ b/configure @@ -21941,6 +21941,8 @@ ac_config_files="$ac_config_files dlls/dpnhpast/Makefile" ac_config_files="$ac_config_files dlls/dpnlobby/Makefile" +ac_config_files="$ac_config_files dlls/dpwsockx/Makefile" + ac_config_files="$ac_config_files dlls/dsound/Makefile" ac_config_files="$ac_config_files dlls/dsound/tests/Makefile" @@ -23248,6 +23250,7 @@ do "dlls/dpnet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnet/Makefile" ;; "dlls/dpnhpast/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnhpast/Makefile" ;; "dlls/dpnlobby/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnlobby/Makefile" ;; + "dlls/dpwsockx/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpwsockx/Makefile" ;; "dlls/dsound/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dsound/Makefile" ;; "dlls/dsound/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dsound/tests/Makefile" ;; "dlls/dssenh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dssenh/Makefile" ;; diff --git a/configure.ac b/configure.ac index 7417f30..57abe38 100644 --- a/configure.ac +++ b/configure.ac @@ -1801,6 +1801,7 @@ AC_CONFIG_FILES([dlls/dpnaddr/Makefile]) AC_CONFIG_FILES([dlls/dpnet/Makefile]) AC_CONFIG_FILES([dlls/dpnhpast/Makefile]) AC_CONFIG_FILES([dlls/dpnlobby/Makefile]) +AC_CONFIG_FILES([dlls/dpwsockx/Makefile]) AC_CONFIG_FILES([dlls/dsound/Makefile]) AC_CONFIG_FILES([dlls/dsound/tests/Makefile]) AC_CONFIG_FILES([dlls/dssenh/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 0eac4a0..e597876 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -90,6 +90,7 @@ BASEDIRS = \ dpnet \ dpnhpast \ dpnlobby \ + dpwsockx \ dsound \ dssenh \ dswave \ diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in new file mode 100644 index 0000000..cebac28 --- /dev/null +++ b/dlls/dpwsockx/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = dpwsockx.dll +IMPORTS = kernel32 + +C_SRCS = \ + dpwsockx_main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/dpwsockx/dpwsockx.spec b/dlls/dpwsockx/dpwsockx.spec new file mode 100644 index 0000000..5f84adc --- /dev/null +++ b/dlls/dpwsockx/dpwsockx.spec @@ -0,0 +1,3 @@ +1 stdcall SPInit(ptr) +3 stub DPWS_GetEnumPort +4 stub DPWS_BuildIPMessageHeader diff --git a/dlls/dpwsockx/dpwsockx_dll.h b/dlls/dpwsockx/dpwsockx_dll.h new file mode 100644 index 0000000..08ae11c --- /dev/null +++ b/dlls/dpwsockx/dpwsockx_dll.h @@ -0,0 +1,30 @@ +/* + * Copyright 2008 Ismael Barros Barros + * + * This library 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. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_DPWSOCKX_DLL_H +#define __WINE_DPWSOCKX_DLL_H + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wine/dplaysp.h" + + +HRESULT WINAPI SPInit( LPSPINITDATA ); + +#endif /* __WINE_DPWSOCKX_DLL_H */ diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c new file mode 100644 index 0000000..271915a --- /dev/null +++ b/dlls/dpwsockx/dpwsockx_main.c @@ -0,0 +1,63 @@ +/* Internet TCP/IP and IPX Connection For DirectPlay + * + * Copyright 2008 Ismael Barros Barros + * + * This library 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. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "dpwsockx_dll.h" +#include "wine/debug.h" +#include "dplay.h" +#include "wine/dplaysp.h" + + +WINE_DEFAULT_DEBUG_CHANNEL(dplay); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + /* TODO: Initialization */ + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + default: + break; + } + + return TRUE; +} + + +/****************************************************************** + * SPInit (DPWSOCKX.1) + */ +HRESULT WINAPI SPInit( LPSPINITDATA lpspData ) +{ + /* TODO: Initialize callbacks and needed fields in lpspData */ + return DPERR_UNSUPPORTED; +}

1 0

Ismael Barros : dplayx: Moved dplaysp.h to include/wine.
by Alexandre Julliard July 23, 2008

July 23, 2008

Module: wine Branch: master Commit: 4a4e5f269dfcd8fd7d26b3025b15000f9dd437ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4e5f269dfcd8fd7d26b3025… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Jul 22 22:23:05 2008 +0300 dplayx: Moved dplaysp.h to include/wine. --- dlls/dplayx/dplay.c | 2 +- dlls/dplayx/dplay_global.h | 2 +- dlls/dplayx/dplaysp.c | 2 +- dlls/dplayx/name_server.c | 2 +- dlls/dplayx/name_server.h | 2 +- {dlls/dplayx => include/wine}/dplaysp.h | 0 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 3623453..829a21c 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -38,7 +38,7 @@ #include "dplayx_global.h" #include "name_server.h" #include "dplayx_queue.h" -#include "dplaysp.h" +#include "wine/dplaysp.h" #include "dplay_global.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 095374d..3537c75 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -23,7 +23,7 @@ #include "windef.h" #include "winbase.h" -#include "dplaysp.h" +#include "wine/dplaysp.h" #include "lobbysp.h" #include "dplayx_queue.h" diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 33cfedd..5d2ba9f 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -23,7 +23,7 @@ #include "wine/debug.h" #include "dpinit.h" -#include "dplaysp.h" +#include "wine/dplaysp.h" #include "dplay_global.h" #include "name_server.h" #include "dplayx_messages.h" diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index ca73bd0..3527877 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -33,7 +33,7 @@ #include "dplayx_global.h" #include "name_server.h" -#include "dplaysp.h" +#include "wine/dplaysp.h" #include "dplayx_messages.h" #include "dplayx_queue.h" diff --git a/dlls/dplayx/name_server.h b/dlls/dplayx/name_server.h index 2df4a3b..a1d3dd7 100644 --- a/dlls/dplayx/name_server.h +++ b/dlls/dplayx/name_server.h @@ -24,7 +24,7 @@ #include "windef.h" #include "winbase.h" #include "dplay.h" -#include "dplaysp.h" +#include "wine/dplaysp.h" #include "dplayx_messages.h" #include "dplay_global.h" diff --git a/dlls/dplayx/dplaysp.h b/include/wine/dplaysp.h similarity index 100% rename from dlls/dplayx/dplaysp.h rename to include/wine/dplaysp.h

1 0

Alexandre Julliard : make_makefiles: Explicitly list the Wine headers that should be exported.
by Alexandre Julliard July 23, 2008

July 23, 2008

Module: wine Branch: master Commit: d96e3964b701bec327d0f1cc67a38596493814cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d96e3964b701bec327d0f1cc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 23 11:40:43 2008 +0200 make_makefiles: Explicitly list the Wine headers that should be exported. --- .gitignore | 2 -- dlls/rpcrt4/epm_towers.h | 2 +- include/Makefile.in | 2 -- tools/make_makefiles | 33 ++++++++------------------------- 4 files changed, 9 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index a60cefd..72a2fdb 100644 --- a/.gitignore +++ b/.gitignore @@ -183,8 +183,6 @@ include/unknwn.h include/urlhist.h include/urlmon.h include/vmr9.h -include/wine/dcetypes.h -include/wine/epm.h include/wine/itss.h include/wine/svcctl.h include/wtypes.h diff --git a/dlls/rpcrt4/epm_towers.h b/dlls/rpcrt4/epm_towers.h index f38d487..3eec37a 100644 --- a/dlls/rpcrt4/epm_towers.h +++ b/dlls/rpcrt4/epm_towers.h @@ -19,7 +19,7 @@ * */ -#include "wine/epm.h" +#include "epm.h" #define EPM_PROTOCOL_DNET_NSP 0x04 #define EPM_PROTOCOL_OSI_TP4 0x05 diff --git a/include/Makefile.in b/include/Makefile.in index 0adef3c..99b06d9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -69,8 +69,6 @@ IDL_H_SRCS = \ urlhist.idl \ urlmon.idl \ vmr9.idl \ - wine/dcetypes.idl \ - wine/epm.idl \ wine/itss.idl \ wine/svcctl.idl \ wtypes.idl \ diff --git a/tools/make_makefiles b/tools/make_makefiles index d87b3ce..8f15011 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -104,30 +104,13 @@ my @ignore_srcs = ( [ 'IDL_S_SRCS', '\.idl', '_s.c' ], ); -my %private_headers = ( - "wine/irot.idl" => 1, - "wine/list.h" => 1, - "wine/mmsystem16.h" => 1, - "wine/mscvpdb.h" => 1, - "wine/port.h" => 1, - "wine/pthread.h" => 1, - "wine/rpcfc.h" => 1, - "wine/server.h" => 1, - "wine/server_protocol.h" => 1, - "wine/test.h" => 1, - "wine/wgl.h" => 1, - "wine/winaspi.h" => 1, - "wine/winbase16.h" => 1, - "wine/windef16.h" => 1, - "wine/wined3d_caps.h" => 1, - "wine/wined3d_gl.h" => 1, - "wine/wined3d_interface.h" => 1, - "wine/wined3d_types.h" => 1, - "wine/wingdi16.h" => 1, - "wine/winnet16.h" => 1, - "wine/winsock16.h" => 1, - "wine/winuser16.h" => 1, - "wine/wpp.h" => 1 +my %exported_wine_headers = ( + "wine/debug.h" => 1, + "wine/exception.h" => 1, + "wine/library.h" => 1, + "wine/unicode.h" => 1, + "wine/itss.idl" => 1, + "wine/svcctl.idl" => 1, ); my %private_idl_headers = ( @@ -654,7 +637,7 @@ sub update_includes() foreach my $incl (@includes) { if ($incl =~ /(.*)\//) { $subdirs{$1} = 1; } - next if ($private_headers{$incl}); + next if ($incl =~ /^wine\// && !$exported_wine_headers{$incl}); if ($incl =~ /stdole2\.idl$/) { push @tlb_srcs, $incl; } elsif ($private_idl_headers{$incl}) { push @h_srcs, $incl; } elsif ($incl =~ /\.h$/) { push @h_srcs, $incl; }

1 0

Dan Hipschman : include: Add WT_TRANSFER_IMPERSONATION to winnt.h.
by Alexandre Julliard July 23, 2008

July 23, 2008

Module: wine Branch: master Commit: d1a5011bb260f47c2a87e4f069af046253493500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a5011bb260f47c2a87e4f06… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 22 18:10:37 2008 -0700 include: Add WT_TRANSFER_IMPERSONATION to winnt.h. --- include/winnt.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index f9ae9d4..28a3986 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1913,6 +1913,7 @@ typedef CONTEXT *PCONTEXT; #define WT_EXECUTEINPERSISTENTTHREAD 0x80 #define WT_EXECUTEINLONGTHREAD 0x10 #define WT_EXECUTEDELETEWAIT 0x08 +#define WT_TRANSFER_IMPERSONATION 0x0100 #define EXCEPTION_CONTINUABLE 0

1 0

Dan Hipschman : ntdll: Implement RtlCreateTimer for kernel32' s CreateTimerQueueTimer.
by Alexandre Julliard July 23, 2008

July 23, 2008

Module: wine Branch: master Commit: d343f2baf76413eb690cbc44a0d56ed39915328d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d343f2baf76413eb690cbc44a… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Jul 22 18:10:08 2008 -0700 ntdll: Implement RtlCreateTimer for kernel32's CreateTimerQueueTimer. --- dlls/kernel32/sync.c | 14 +++++++---- dlls/kernel32/tests/sync.c | 7 ----- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/threadpool.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 5 files changed, 68 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 7bce445..c739a5b 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1085,16 +1085,20 @@ BOOL WINAPI DeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) * * RETURNS * nonzero on success or zero on failure - * - * BUGS - * Unimplemented */ BOOL WINAPI CreateTimerQueueTimer( PHANDLE phNewTimer, HANDLE TimerQueue, WAITORTIMERCALLBACK Callback, PVOID Parameter, DWORD DueTime, DWORD Period, ULONG Flags ) { - FIXME("stub\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + NTSTATUS status = RtlCreateTimer(phNewTimer, TimerQueue, Callback, + Parameter, DueTime, Period, Flags); + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; } diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 697f905..05f67dc 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -622,7 +622,6 @@ static void test_timer_queue(void) ret = pCreateTimerQueueTimer(&t1, q, timer_queue_cb1, &n1, 0, 0, 0); ok(ret, "CreateTimerQueueTimer\n"); - todo_wine ok(t1 != NULL, "CreateTimerQueueTimer\n"); /* A slow one. */ @@ -631,7 +630,6 @@ static void test_timer_queue(void) ret = pCreateTimerQueueTimer(&t2, q, timer_queue_cb1, &n2, 0, 100, 0); ok(ret, "CreateTimerQueueTimer\n"); - todo_wine ok(t2 != NULL, "CreateTimerQueueTimer\n"); /* A fast one. */ @@ -640,7 +638,6 @@ static void test_timer_queue(void) ret = pCreateTimerQueueTimer(&t3, q, timer_queue_cb1, &n3, 0, 10, 0); ok(ret, "CreateTimerQueueTimer\n"); - todo_wine ok(t3 != NULL, "CreateTimerQueueTimer\n"); /* Start really late (it won't start). */ @@ -649,7 +646,6 @@ static void test_timer_queue(void) ret = pCreateTimerQueueTimer(&t4, q, timer_queue_cb1, &n4, 10000, 10, 0); ok(ret, "CreateTimerQueueTimer\n"); - todo_wine ok(t4 != NULL, "CreateTimerQueueTimer\n"); /* Start soon, but delay so long it won't run again. */ @@ -658,7 +654,6 @@ static void test_timer_queue(void) ret = pCreateTimerQueueTimer(&t5, q, timer_queue_cb1, &n5, 0, 10000, 0); ok(ret, "CreateTimerQueueTimer\n"); - todo_wine ok(t5 != NULL, "CreateTimerQueueTimer\n"); /* Give them a chance to do some work. */ @@ -706,7 +701,6 @@ static void test_timer_queue(void) 10, 0); d2.t = t2; ok(ret, "CreateTimerQueueTimer\n"); - todo_wine ok(t2 != NULL, "CreateTimerQueueTimer\n"); d3.t = t3 = NULL; @@ -717,7 +711,6 @@ static void test_timer_queue(void) 10, 0); d3.t = t3; ok(ret, "CreateTimerQueueTimer\n"); - todo_wine ok(t3 != NULL, "CreateTimerQueueTimer\n"); Sleep(200); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0be408e..595a5f6 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -488,7 +488,7 @@ @ stdcall RtlCreateSecurityDescriptor(ptr long) # @ stub RtlCreateSystemVolumeInformationFolder @ stub RtlCreateTagHeap -# @ stub RtlCreateTimer +@ stdcall RtlCreateTimer(ptr ptr ptr ptr long long long) @ stdcall RtlCreateTimerQueue(ptr) @ stdcall RtlCreateUnicodeString(ptr wstr) @ stdcall RtlCreateUnicodeStringFromAsciiz(ptr str) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index aa03959..c698cb7 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -543,6 +543,12 @@ struct timer_queue struct list timers; }; +static void queue_remove_timer(struct queue_timer *t) +{ + list_remove(&t->entry); + RtlFreeHeap(GetProcessHeap(), 0, t); +} + /*********************************************************************** * RtlCreateTimerQueue (NTDLL.@) * @@ -587,6 +593,12 @@ NTSTATUS WINAPI RtlCreateTimerQueue(PHANDLE NewTimerQueue) NTSTATUS WINAPI RtlDeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) { struct timer_queue *q = TimerQueue; + struct queue_timer *t, *temp; + + RtlEnterCriticalSection(&q->cs); + LIST_FOR_EACH_ENTRY_SAFE(t, temp, &q->timers, struct queue_timer, entry) + queue_remove_timer(t); + RtlLeaveCriticalSection(&q->cs); RtlDeleteCriticalSection(&q->cs); RtlFreeHeap(GetProcessHeap(), 0, q); @@ -600,3 +612,48 @@ NTSTATUS WINAPI RtlDeleteTimerQueueEx(HANDLE TimerQueue, HANDLE CompletionEvent) return STATUS_PENDING; } } + +/*********************************************************************** + * RtlCreateTimer (NTDLL.@) + * + * Creates a new timer associated with the given queue. + * + * PARAMS + * NewTimer [O] The newly created timer. + * TimerQueue [I] The queue to hold the timer. + * Callback [I] The callback to fire. + * Parameter [I] The argument for the callback. + * DueTime [I] The delay, in milliseconds, before first firing the + * timer. + * Period [I] The period, in milliseconds, at which to fire the timer + * after the first callback. If zero, the timer will only + * fire once. It still needs to be deleted with + * RtlDeleteTimer. + * Flags [I] Flags controling the execution of the callback. In + * addition to the WT_* thread pool flags (see + * RtlQueueWorkItem), WT_EXECUTEINTIMERTHREAD and + * WT_EXECUTEONLYONCE are supported. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + */ +NTSTATUS WINAPI RtlCreateTimer(PHANDLE NewTimer, HANDLE TimerQueue, + RTL_WAITORTIMERCALLBACKFUNC Callback, + PVOID Parameter, DWORD DueTime, DWORD Period, + ULONG Flags) +{ + struct timer_queue *q = TimerQueue; + struct queue_timer *t = RtlAllocateHeap(GetProcessHeap(), 0, sizeof *t); + if (!t) + return STATUS_NO_MEMORY; + + FIXME("timer expiration unimplemented\n"); + + RtlEnterCriticalSection(&q->cs); + list_add_tail(&q->timers, &t->entry); + RtlLeaveCriticalSection(&q->cs); + + *NewTimer = t; + return STATUS_SUCCESS; +} diff --git a/include/winternl.h b/include/winternl.h index 7b8e055..30bd0e5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2118,6 +2118,7 @@ NTSYSAPI HANDLE WINAPI RtlCreateHeap(ULONG,PVOID,SIZE_T,SIZE_T,PVOID,PRTL_HEA NTSYSAPI NTSTATUS WINAPI RtlCreateProcessParameters(RTL_USER_PROCESS_PARAMETERS**,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,PWSTR,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*); NTSYSAPI NTSTATUS WINAPI RtlCreateSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlCreateTimerQueue(PHANDLE); +NTSYSAPI NTSTATUS WINAPI RtlCreateTimer(PHANDLE, HANDLE, RTL_WAITORTIMERCALLBACKFUNC, PVOID, DWORD, DWORD, ULONG); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeString(PUNICODE_STRING,LPCWSTR); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCSTR); NTSYSAPI NTSTATUS WINAPI RtlCreateUserThread(HANDLE,const SECURITY_DESCRIPTOR*,BOOLEAN,PVOID,SIZE_T,SIZE_T,PRTL_THREAD_START_ROUTINE,void*,HANDLE*,CLIENT_ID*);

1 0

Roy Shea : mstask: Implement ClassFactory, DllGetClassObject, and DllCanUnloadNow.
by Alexandre Julliard July 23, 2008

July 23, 2008

Module: wine Branch: master Commit: dab039630cc52f1633d6f878b4ee8a8866d3a490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab039630cc52f1633d6f878b… Author: Roy Shea <royshea(a)gmail.com> Date: Tue Jul 22 16:54:07 2008 -0700 mstask: Implement ClassFactory, DllGetClassObject, and DllCanUnloadNow. --- dlls/mstask/Makefile.in | 1 + dlls/mstask/factory.c | 108 ++++++++++++++++++++++++++++++++++++++++++ dlls/mstask/mstask.spec | 4 +- dlls/mstask/mstask_main.c | 19 +++++++ dlls/mstask/mstask_private.h | 9 ++++ dlls/mstask/task_scheduler.c | 2 + 6 files changed, 141 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index b193ae7..2202e22 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -6,6 +6,7 @@ MODULE = mstask.dll IMPORTS = uuid kernel32 C_SRCS = \ + factory.c \ mstask_main.c \ task_scheduler.c diff --git a/dlls/mstask/factory.c b/dlls/mstask/factory.c new file mode 100644 index 0000000..8906d92 --- /dev/null +++ b/dlls/mstask/factory.c @@ -0,0 +1,108 @@ +/* + * Copyright (C) 2008 Google (Roy Shea) + * + * This library 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. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "mstask_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mstask); + +static HRESULT WINAPI MSTASK_IClassFactory_QueryInterface( + LPCLASSFACTORY iface, + REFIID riid, + LPVOID *ppvObj) +{ + ClassFactoryImpl *This = (ClassFactoryImpl *)iface; + + TRACE("IID: %s\n",debugstr_guid(riid)); + if (ppvObj == NULL) + return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) + { + *ppvObj = &This->lpVtbl; + IClassFactory_AddRef(iface); + return S_OK; + } + + WARN("Unknown interface: %s\n", debugstr_guid(riid)); + *ppvObj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI MSTASK_IClassFactory_AddRef(LPCLASSFACTORY iface) +{ + TRACE("\n"); + InterlockedIncrement(&dll_ref); + return 2; +} + +static ULONG WINAPI MSTASK_IClassFactory_Release(LPCLASSFACTORY iface) +{ + TRACE("\n"); + InterlockedDecrement(&dll_ref); + return 1; +} + +static HRESULT WINAPI MSTASK_IClassFactory_CreateInstance( + LPCLASSFACTORY iface, + LPUNKNOWN pUnkOuter, + REFIID riid, + LPVOID *ppvObj) +{ + HRESULT res; + IUnknown *punk = NULL; + *ppvObj = NULL; + + TRACE("IID: %s\n",debugstr_guid(riid)); + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + res = TaskSchedulerConstructor((LPVOID*) &punk); + if (FAILED(res)) + return res; + + res = ITaskScheduler_QueryInterface(punk, riid, ppvObj); + ITaskScheduler_Release(punk); + return res; +} + +static HRESULT WINAPI MSTASK_IClassFactory_LockServer( + LPCLASSFACTORY iface, + BOOL fLock) +{ + TRACE("\n"); + + if (fLock != FALSE) + MSTASK_IClassFactory_AddRef(iface); + else + MSTASK_IClassFactory_Release(iface); + return S_OK; +} + +static const IClassFactoryVtbl IClassFactory_Vtbl = +{ + MSTASK_IClassFactory_QueryInterface, + MSTASK_IClassFactory_AddRef, + MSTASK_IClassFactory_Release, + MSTASK_IClassFactory_CreateInstance, + MSTASK_IClassFactory_LockServer +}; + +ClassFactoryImpl MSTASK_ClassFactory = { &IClassFactory_Vtbl }; diff --git a/dlls/mstask/mstask.spec b/dlls/mstask/mstask.spec index a65cae0..24d5af5 100644 --- a/dlls/mstask/mstask.spec +++ b/dlls/mstask/mstask.spec @@ -1,6 +1,6 @@ @ stub ConvertAtJobsToTasks -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub GetNetScheduleAccountInformation @ stub NetrJobAdd @ stub NetrJobDel diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index b1984eb..61e0a99 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -21,6 +21,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mstask); +LONG dll_ref = 0; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -38,3 +40,20 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +{ + TRACE("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + if (IsEqualGUID(rclsid, &CLSID_CTaskScheduler)) { + return IClassFactory_QueryInterface((LPCLASSFACTORY)&MSTASK_ClassFactory, iid, ppv); + } + + FIXME("Not supported class: %s\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return dll_ref != 0 ? S_FALSE : S_OK; +} diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index 3a08e7a..3ddd2b9 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -29,6 +29,15 @@ #include "ole2.h" #include "mstask.h" +extern LONG dll_ref; + +typedef struct +{ + const IClassFactoryVtbl *lpVtbl; + LONG ref; +} ClassFactoryImpl; +extern ClassFactoryImpl MSTASK_ClassFactory; + typedef struct { const ITaskSchedulerVtbl *lpVtbl; diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 5d4768e..a1d52a8 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -25,6 +25,7 @@ static void TaskSchedulerDestructor(TaskSchedulerImpl *This) { TRACE("%p\n", This); HeapFree(GetProcessHeap(), 0, This); + InterlockedDecrement(&dll_ref); } static HRESULT WINAPI MSTASK_ITaskScheduler_QueryInterface( @@ -170,5 +171,6 @@ HRESULT TaskSchedulerConstructor(LPVOID *ppObj) This->ref = 1; *ppObj = &This->lpVtbl; + InterlockedIncrement(&dll_ref); return S_OK; }

1 0