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

Paul Vriens : advapi/service: Simplify DeleteService by using RegDeleteTree .
by Alexandre Julliard July 12, 2007

July 12, 2007

Module: wine Branch: master Commit: 05fec6c871f0c8c44cfb8752a81164c57f00a125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05fec6c871f0c8c44cfb8752a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jul 11 19:36:00 2007 +0200 advapi/service: Simplify DeleteService by using RegDeleteTree. --- dlls/advapi32/service.c | 25 +++++-------------------- 1 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 7bded19..462abdb 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1422,11 +1422,6 @@ CreateServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, BOOL WINAPI DeleteService( SC_HANDLE hService ) { struct sc_service *hsvc; - HKEY hKey; - WCHAR valname[MAX_PATH+1]; - INT index = 0; - LONG rc; - DWORD size; hsvc = sc_handle_get_handle_data(hService, SC_HTYPE_SERVICE); if (!hsvc) @@ -1434,24 +1429,14 @@ BOOL WINAPI DeleteService( SC_HANDLE hService ) SetLastError( ERROR_INVALID_HANDLE ); return FALSE; } - hKey = hsvc->hkey; - size = MAX_PATH+1; - /* Clean out the values */ - rc = RegEnumValueW(hKey, index, valname,&size,0,0,0,0); - while (rc == ERROR_SUCCESS) - { - RegDeleteValueW(hKey,valname); - index++; - size = MAX_PATH+1; - rc = RegEnumValueW(hKey, index, valname, &size,0,0,0,0); - } + /* Close the key to the service */ + RegCloseKey(hsvc->hkey); - RegCloseKey(hKey); - hsvc->hkey = NULL; + /* Delete the service under the Service Control Manager key */ + RegDeleteTreeW(hsvc->scm->hkey, hsvc->name); - /* delete the key */ - RegDeleteKeyW(hsvc->scm->hkey, hsvc->name); + hsvc->hkey = NULL; return TRUE; }

1 0

Hans Leidekker : pdh: Use GetTickCount64 instead of GetTickCount.
by Alexandre Julliard July 12, 2007

July 12, 2007

Module: wine Branch: master Commit: e1125c48b6971b8ca0091a1fa9396b892139cdf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1125c48b6971b8ca0091a1fa… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Jul 11 22:07:11 2007 +0200 pdh: Use GetTickCount64 instead of GetTickCount. --- dlls/pdh/pdh_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 62c99f0..d6149eb 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -157,7 +157,7 @@ static const WCHAR path_uptime[] = static void CALLBACK collect_uptime( struct counter *counter ) { - counter->two.largevalue = GetTickCount(); /* FIXME */ + counter->two.largevalue = GetTickCount64(); counter->status = PDH_CSTATUS_VALID_DATA; } @@ -421,7 +421,7 @@ PDH_STATUS WINAPI PdhGetRawCounterValue( PDH_HCOUNTER handle, LPDWORD type, value->CStatus = counter->status; value->TimeStamp.dwLowDateTime = counter->stamp.dwLowDateTime; value->TimeStamp.dwHighDateTime = counter->stamp.dwHighDateTime; - value->FirstValue = counter->one.largevalue;; + value->FirstValue = counter->one.largevalue; value->SecondValue = counter->two.largevalue; value->MultiCount = 1; /* FIXME */

1 0

Hans Leidekker : pdh: Fix two typos.
by Alexandre Julliard July 12, 2007

July 12, 2007

Module: wine Branch: master Commit: b2b4048f7a926018802784bc27500f1d830db362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b4048f7a926018802784bc2… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Jul 11 22:07:15 2007 +0200 pdh: Fix two typos. --- dlls/pdh/pdh_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index d6149eb..238bf16 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -386,12 +386,12 @@ PDH_STATUS WINAPI PdhGetFormattedCounterValue( PDH_HCOUNTER handle, DWORD format } else if (format & PDH_FMT_LARGE) { - if (format & PDH_FMT_1000) value->u.longValue = counter->two.largevalue * 1000; + if (format & PDH_FMT_1000) value->u.largeValue = counter->two.largevalue * 1000; else value->u.largeValue = counter->two.largevalue * pow( 10, factor ); } else if (format & PDH_FMT_DOUBLE) { - if (format & PDH_FMT_1000) value->u.longValue = counter->two.doublevalue * 1000; + if (format & PDH_FMT_1000) value->u.doubleValue = counter->two.doublevalue * 1000; else value->u.doubleValue = counter->two.doublevalue * pow( 10, factor ); } else

1 0

Thomas Weidenmueller : shlwapi: Use publicly defined structure DATABLOCK_HEADER instead of redefining it locally .
by Alexandre Julliard July 12, 2007

July 12, 2007

Module: wine Branch: master Commit: c15245d9cc0b0de917441aa178c8305ce45e8f29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15245d9cc0b0de917441aa17… Author: Thomas Weidenmueller <thomas(a)reactsoft.com> Date: Wed Jul 11 23:48:31 2007 +0200 shlwapi: Use publicly defined structure DATABLOCK_HEADER instead of redefining it locally. --- dlls/shlwapi/clist.c | 138 +++++++++++++++++++++++-------------------------- 1 files changed, 65 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c15245d9cc0b0de917441…

1 0

appdb/. application.css apidb.css
by WineHQ July 12, 2007

July 12, 2007

ChangeSet ID: 31249 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/11 19:44:56 Modified files: . : application.css apidb.css Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Apparently 'gold' isn't a standard color name. Switch back to using hex rgb color values. Patch: http://cvs.winehq.org/patch.py?id=31249 Old revision New revision Changes Path 1.10 1.11 +2 -2 appdb/application.css 1.21 1.22 +1 -1 appdb/apidb.css Index: appdb/application.css diff -u -p appdb/application.css:1.10 appdb/application.css:1.11 --- appdb/application.css:1.10 12 Jul 2007 0:44:56 -0000 +++ appdb/application.css 12 Jul 2007 0:44:56 -0000 @@ -44,13 +44,13 @@ table.historyTable { border: 1px; font-size: 12px; } td.platinum { background-color: #ECECEC; } -td.gold { background-color: gold; } +td.gold { background-color: #fff600; } td.silver { background-color: silver; } td.bronze { background-color: #fcba0a; } td.garbage { background-color: #999966; } td.platinum { background-color: #ECECEC; } -tr.gold { background-color: gold; } +tr.gold { background-color: #fff600; } tr.silver { background-color: silver; } tr.bronze { background-color: #fcba0a; } tr.garbage { background-color: #999966; } Index: appdb/apidb.css diff -u -p appdb/apidb.css:1.21 appdb/apidb.css:1.22 --- appdb/apidb.css:1.21 12 Jul 2007 0:44:56 -0000 +++ appdb/apidb.css 12 Jul 2007 0:44:56 -0000 @@ -134,7 +134,7 @@ p.indent { padding-left: 1em; /* App Support status */ .platinum { background-color: #ECECEC; } -.gold { background-color: gold; } +.gold { background-color: #fff600; } .silver { background-color: silver; } .bronze { background-color: #fcba0a; } .Garbage { background-color: #999966; }

1 0

Alexandre Julliard : user32/tests: Flush messages more aggressively in a couple of tests.
by Alexandre Julliard July 11, 2007

July 11, 2007

Module: wine Branch: master Commit: ec5e295ef287f72a3f13b724d10cb73c4d4ff759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5e295ef287f72a3f13b724d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 11 14:40:19 2007 +0200 user32/tests: Flush messages more aggressively in a couple of tests. --- dlls/user32/tests/msg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 19af1e3..6f9387f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5868,7 +5868,7 @@ static void test_accelerators(void) rc.top += (rc.bottom - rc.top)/2; SetCursorPos(rc.left, rc.top); - pump_msg_loop(hwnd, 0); + flush_events(); flush_sequence(); keybd_event(VK_MENU, 0, 0, 0); mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); @@ -8554,7 +8554,7 @@ static void test_TrackMouseEvent(void) * window and hittest, otherwise TrackMouseEvent calls don't have any * effect. */ - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + flush_events(); flush_sequence(); track_query(0, NULL, 0);

1 0

Kovács András : d3d10: Add stub for d3d10.dll.
by Alexandre Julliard July 11, 2007

July 11, 2007

Module: wine Branch: master Commit: 0db109ffadf5541d506edc571e865ae808d7394f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db109ffadf5541d506edc571… Author: Kovács András <andras(a)csevego.net> Date: Mon Jul 9 14:06:40 2007 +0200 d3d10: Add stub for d3d10.dll. --- .gitignore | 1 + Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/d3d10/Makefile.in | 16 ++++++++++++++++ dlls/d3d10/d3d10.spec | 29 +++++++++++++++++++++++++++++ dlls/d3d10/d3d10_main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d10/version.rc | 26 ++++++++++++++++++++++++++ 9 files changed, 124 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 91f9dc7..7895cc8 100644 --- a/.gitignore +++ b/.gitignore @@ -162,6 +162,7 @@ dlls/cryptdll/libcryptdll.def dlls/ctl3d.dll16 dlls/ctl3d32/libctl3d32.def dlls/ctl3dv2.dll16 +dlls/d3d10/version.res dlls/d3d8/libd3d8.def dlls/d3d8/tests/*.ok dlls/d3d8/tests/d3d8_crosstest.exe diff --git a/Makefile.in b/Makefile.in index e416465..9e422ae 100644 --- a/Makefile.in +++ b/Makefile.in @@ -189,6 +189,7 @@ ALL_MAKEFILES = \ dlls/cryptdll/Makefile \ dlls/cryptnet/Makefile \ dlls/ctl3d32/Makefile \ + dlls/d3d10/Makefile \ dlls/d3d8/Makefile \ dlls/d3d8/tests/Makefile \ dlls/d3d9/Makefile \ @@ -548,6 +549,7 @@ dlls/crypt32/tests/Makefile: dlls/crypt32/tests/Makefile.in dlls/Maketest.rules dlls/cryptdll/Makefile: dlls/cryptdll/Makefile.in dlls/Makedll.rules dlls/cryptnet/Makefile: dlls/cryptnet/Makefile.in dlls/Makedll.rules dlls/ctl3d32/Makefile: dlls/ctl3d32/Makefile.in dlls/Makedll.rules +dlls/d3d10/Makefile: dlls/d3d10/Makefile.in dlls/Makedll.rules dlls/d3d8/Makefile: dlls/d3d8/Makefile.in dlls/Makedll.rules dlls/d3d8/tests/Makefile: dlls/d3d8/tests/Makefile.in dlls/Maketest.rules dlls/d3d9/Makefile: dlls/d3d9/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 5a85caf..483725a 100755 --- a/configure +++ b/configure @@ -20190,6 +20190,8 @@ ac_config_files="$ac_config_files dlls/cryptnet/Makefile" ac_config_files="$ac_config_files dlls/ctl3d32/Makefile" +ac_config_files="$ac_config_files dlls/d3d10/Makefile" + ac_config_files="$ac_config_files dlls/d3d8/Makefile" ac_config_files="$ac_config_files dlls/d3d8/tests/Makefile" @@ -21413,6 +21415,7 @@ do "dlls/cryptdll/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptdll/Makefile" ;; "dlls/cryptnet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/Makefile" ;; "dlls/ctl3d32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctl3d32/Makefile" ;; + "dlls/d3d10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/Makefile" ;; "dlls/d3d8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d8/Makefile" ;; "dlls/d3d8/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d8/tests/Makefile" ;; "dlls/d3d9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d9/Makefile" ;; diff --git a/configure.ac b/configure.ac index 9ab2c77..2dd7cb9 100644 --- a/configure.ac +++ b/configure.ac @@ -1567,6 +1567,7 @@ AC_CONFIG_FILES([dlls/crypt32/tests/Makefile]) AC_CONFIG_FILES([dlls/cryptdll/Makefile]) AC_CONFIG_FILES([dlls/cryptnet/Makefile]) AC_CONFIG_FILES([dlls/ctl3d32/Makefile]) +AC_CONFIG_FILES([dlls/d3d10/Makefile]) AC_CONFIG_FILES([dlls/d3d8/Makefile]) AC_CONFIG_FILES([dlls/d3d8/tests/Makefile]) AC_CONFIG_FILES([dlls/d3d9/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 9cc2ec7..30fcd3e 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -40,6 +40,7 @@ BASEDIRS = \ cryptdll \ cryptnet \ ctl3d32 \ + d3d10 \ d3d8 \ d3d9 \ d3dim \ diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in new file mode 100644 index 0000000..99b3e80 --- /dev/null +++ b/dlls/d3d10/Makefile.in @@ -0,0 +1,16 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3d10.dll +IMPORTS = wined3d kernel32 +EXTRALIBS = -ldxguid -luuid + +C_SRCS = \ + d3d10_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec new file mode 100644 index 0000000..f15453a --- /dev/null +++ b/dlls/d3d10/d3d10.spec @@ -0,0 +1,29 @@ +@ stub D3D10CompileEffectFromMemory +@ stub D3D10CompileShader +@ stub D3D10CreateBlob +@ stub D3D10CreateDevice +@ stub D3D10CreateDeviceAndSwapChain +@ stub D3D10CreateEffectFromMemory +@ stub D3D10CreateEffectPoolFromMemory +@ stub D3D10CreateStateBlock +@ stub D3D10DisassembleEffect +@ stub D3D10DisassembleShader +@ stub D3D10GetGeometryShaderProfile +@ stub D3D10GetInputAndOutputSignatureBlob +@ stub D3D10GetInputSignatureBlob +@ stub D3D10GetOutputSignatureBlob +@ stub D3D10GetPixelShaderProfile +@ stub D3D10GetShaderDebugInfo +@ stub D3D10GetVersion +@ stub D3D10GetVertexShaderProfile +@ stub D3D10PreprocessShader +@ stub D3D10ReflectShader +@ stub D3D10RegisterLayers +@ stub D3D10StateBlockMaskDifference +@ stub D3D10StateBlockMaskDisableAll +@ stub D3D10StateBlockMaskDisableCapture +@ stub D3D10StateBlockMaskEnableAll +@ stub D3D10StateBlockMaskEnableCapture +@ stub D3D10StateBlockMaskGetSetting +@ stub D3D10StateBlockMaskIntersect +@ stub D3D10StateBlockMaskUnion diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c new file mode 100644 index 0000000..8d80c41 --- /dev/null +++ b/dlls/d3d10/d3d10_main.c @@ -0,0 +1,45 @@ +/* + * Direct3D 10 + * + * Copyright 2007 Andras Kovacs + * + * 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 "winuser.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10); + +/* At process attach */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("fdwReason=%d\n", fdwReason); + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hInstDLL ); + break; + } + return TRUE; +} diff --git a/dlls/d3d10/version.rc b/dlls/d3d10/version.rc new file mode 100644 index 0000000..4811325 --- /dev/null +++ b/dlls/d3d10/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2007 Andras Kovacs + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Direct3D" +#define WINE_FILENAME_STR "d3d10.dll" +#define WINE_FILEVERSION 6,0,6000,16386 +#define WINE_FILEVERSION_STR "6.0.6000.16386" +#define WINE_PRODUCTVERSION 6,0,6000,16386 +#define WINE_PRODUCTVERSION_STR "6.0.6000.16386" + +#include "wine/wine_common_ver.rc"

1 0

Tim Schwartz : net.exe: Converted strings to resources.
by Alexandre Julliard July 11, 2007

July 11, 2007

Module: wine Branch: master Commit: ef59d47d93f53964a4c93da20788dfaa86a1f9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef59d47d93f53964a4c93da20… Author: Tim Schwartz <tim(a)sanityinternet.com> Date: Mon Jul 9 11:25:48 2007 -0500 net.exe: Converted strings to resources. --- .gitignore | 1 + programs/net/En.rc | 40 ++++++++++++++++++++++++++++++++++++++ programs/net/Makefile.in | 4 ++- programs/net/net.c | 48 +++++++++++++++++++++++++-------------------- programs/net/resources.h | 32 ++++++++++++++++++++++++++++++ programs/net/rsrc.rc | 24 +++++++++++++++++++++++ 6 files changed, 127 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 2aba4ae..91f9dc7 100644 --- a/.gitignore +++ b/.gitignore @@ -781,6 +781,7 @@ programs/msiexec/msiexec programs/msiexec/msiexec.ico programs/msiexec/rsrc.res programs/net/net +programs/net/rsrc.res programs/notepad/notepad programs/notepad/rsrc.res programs/oleview/oleview diff --git a/programs/net/En.rc b/programs/net/En.rc new file mode 100644 index 0000000..f3d8f4f --- /dev/null +++ b/programs/net/En.rc @@ -0,0 +1,40 @@ +/* + * NET.EXE - Wine-compatible net program + * English language support + * + * Copyright (C) 2007 Tim Schwartz + * + * 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 + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "The syntax of this command is:\n\nNET [ HELP | START | STOP ]\n" + STRING_START_USAGE, "Specify service name to start.\n" + STRING_STOP_USAGE, "Specify service name to stop.\n" + STRING_STOP_DEP, "Stopping dependent service: %s\n" + STRING_CANT_STOP, "Could not stop service %s\n" + STRING_NO_SCM, "Could not get handle to service control manager.\n" + STRING_NO_SVCHANDLE, "Could not get handle to service.\n" + STRING_START_SVC, "The %s service is starting.\n" + STRING_START_SVC_SUCCESS, "The %s service was started successfully.\n" + STRING_START_SVC_FAIL, "The %s service failed to start.\n" + STRING_STOP_SVC, "The %s service is stopping.\n" + STRING_STOP_SVC_SUCCESS, "The %s service was stopped successfully.\n" + STRING_STOP_SVC_FAIL, "The %s service failed to stop.\n" + STRING_HELP_USAGE, "The syntax of this command is:\n\nNET HELP command\n -or-\nNET command /HELP\n\n Commands available are:\n NET HELP NET START NET STOP\n" +} diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in index d72a9ba..5364f4e 100644 --- a/programs/net/Makefile.in +++ b/programs/net/Makefile.in @@ -4,10 +4,12 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = net.exe APPMODE = -mconsole -IMPORTS = advapi32 kernel32 +IMPORTS = user32 advapi32 kernel32 C_SRCS = net.c +RC_SRCS = rsrc.rc + @MAKE_PROG_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/net/net.c b/programs/net/net.c index 0fd85e9..73e1763 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -19,10 +19,23 @@ #include <stdio.h> #include <string.h> #include <windows.h> +#include "resources.h" #define NET_START 0001 #define NET_STOP 0002 +int output_string(int msg, ...) +{ + char msg_buffer[8192]; + va_list arguments; + + LoadString(GetModuleHandle(NULL), msg, msg_buffer, sizeof(msg_buffer)); + va_start(arguments, msg); + vprintf(msg_buffer, arguments); + va_end(arguments); + return 0; +} + static BOOL StopService(SC_HANDLE SCManager, SC_HANDLE serviceHandle) { LPENUM_SERVICE_STATUS dependencies = NULL; @@ -41,11 +54,11 @@ static BOOL StopService(SC_HANDLE SCManager, SC_HANDLE serviceHandle) { for(counter = 0; counter < count; counter++) { - printf("Stopping dependent service: %s\n", dependencies[counter].lpDisplayName); + output_string(STRING_STOP_DEP, dependencies[counter].lpDisplayName); dependent_serviceHandle = OpenService(SCManager, dependencies[counter].lpServiceName, SC_MANAGER_ALL_ACCESS); if(dependent_serviceHandle) result = StopService(SCManager, dependent_serviceHandle); CloseServiceHandle(dependent_serviceHandle); - if(!result) printf("Could not stop service %s\n", dependencies[counter].lpDisplayName); + if(!result) output_string(STRING_CANT_STOP, dependencies[counter].lpDisplayName); } } } @@ -65,13 +78,13 @@ static BOOL net_service(int operation, char *service_name) SCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); if(!SCManager) { - printf("Couldn't get handle to SCManager.\n"); + output_string(STRING_NO_SCM); return FALSE; } serviceHandle = OpenService(SCManager, service_name, SC_MANAGER_ALL_ACCESS); if(!serviceHandle) { - printf("Couldn't get handle to service.\n"); + output_string(STRING_NO_SVCHANDLE); CloseServiceHandle(SCManager); return FALSE; } @@ -83,20 +96,18 @@ static BOOL net_service(int operation, char *service_name) switch(operation) { case NET_START: - printf("The %s service is starting.\n", service_display_name); + output_string(STRING_START_SVC, service_display_name); result = StartService(serviceHandle, 0, NULL); - printf("The %s service ", service_display_name); - if(!result) printf("failed to start.\n"); - else printf("was started successfully.\n"); + if(result) output_string(STRING_START_SVC_SUCCESS); + else output_string(STRING_START_SVC_FAIL); break; case NET_STOP: - printf("The %s service is stopping.\n", service_display_name); + output_string(STRING_STOP_SVC, service_display_name); result = StopService(SCManager, serviceHandle); - printf("The %s service ", service_display_name); - if(!result) printf("failed to stop.\n"); - else printf("was stopped successfully.\n"); + if(result) output_string(STRING_STOP_SVC_SUCCESS, service_display_name); + else output_string(STRING_STOP_SVC_FAIL, service_display_name); break; } @@ -107,27 +118,22 @@ static BOOL net_service(int operation, char *service_name) int main(int argc, char *argv[]) { - if (argc < 2) { - printf("The syntax of this command is:\n\n"); - printf("NET [ HELP | START | STOP ]\n"); + output_string(STRING_USAGE); return 1; } if(!strcasecmp(argv[1], "help")) { - printf("The syntax of this command is:\n\n"); - printf("NET HELP command\n -or-\nNET command /HELP\n\n"); - printf(" Commands available are:\n"); - printf(" NET HELP NET START NET STOP\n"); + output_string(STRING_HELP_USAGE); } if(!strcasecmp(argv[1], "start")) { if(argc < 3) { - printf("Specify service name to start.\n"); + output_string(STRING_START_USAGE); return 1; } @@ -142,7 +148,7 @@ int main(int argc, char *argv[]) { if(argc < 3) { - printf("Specify service name to stop.\n"); + output_string(STRING_STOP_USAGE); return 1; } diff --git a/programs/net/resources.h b/programs/net/resources.h new file mode 100644 index 0000000..4c1c167 --- /dev/null +++ b/programs/net/resources.h @@ -0,0 +1,32 @@ +/* + * Copyright 2007 Tim Schwartz + * + * 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 + */ + +#define STRING_USAGE 101 +#define STRING_START_USAGE 102 +#define STRING_STOP_USAGE 103 +#define STRING_STOP_DEP 104 +#define STRING_CANT_STOP 105 +#define STRING_NO_SCM 106 +#define STRING_NO_SVCHANDLE 107 +#define STRING_START_SVC 108 +#define STRING_START_SVC_SUCCESS 109 +#define STRING_START_SVC_FAIL 110 +#define STRING_STOP_SVC 111 +#define STRING_STOP_SVC_SUCCESS 112 +#define STRING_STOP_SVC_FAIL 113 +#define STRING_HELP_USAGE 114 diff --git a/programs/net/rsrc.rc b/programs/net/rsrc.rc new file mode 100644 index 0000000..8cfa23a --- /dev/null +++ b/programs/net/rsrc.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2007 Tim Schwartz + * + * 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 <windows.h> +#include "resources.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "En.rc"

1 0

Alexandre Julliard : kernel32: Implemented GetTickCount64.
by Alexandre Julliard July 11, 2007

July 11, 2007

Module: wine Branch: master Commit: 40fb7ca168c92174a5aa22a8a9b64231fecbeb65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40fb7ca168c92174a5aa22a8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 11 14:04:54 2007 +0200 kernel32: Implemented GetTickCount64. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/kernel_main.c | 20 +++++++++++++++++++- include/winbase.h | 1 + 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 32bf8e3..d30ec36 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -636,6 +636,7 @@ @ stdcall GetThreadSelectorEntry(long long ptr) @ stdcall GetThreadTimes(long ptr ptr ptr ptr) @ stdcall GetTickCount() +@ stdcall -ret64 GetTickCount64() @ stdcall GetTimeFormatA(long long ptr str ptr long) @ stdcall GetTimeFormatW(long long ptr wstr ptr long) @ stdcall GetTimeZoneInformation(ptr) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 5e72cee..846f787 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -46,6 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(process); extern int __wine_set_signal_handler(unsigned, int (*)(unsigned)); +static ULONGLONG server_start_time; + /*********************************************************************** * KERNEL thread initialisation routine */ @@ -112,12 +114,16 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) static BOOL process_attach( HMODULE module ) { SYSTEM_INFO si; + SYSTEM_TIMEOFDAY_INFORMATION ti; RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; /* FIXME: should probably be done in ntdll */ GetSystemInfo( &si ); NtCurrentTeb()->Peb->NumberOfProcessors = si.dwNumberOfProcessors; + NtQuerySystemInformation( SystemTimeOfDayInformation, &ti, sizeof(ti), NULL ); + server_start_time = ti.liKeBootTime.QuadPart; + /* Setup registry locale information */ LOCALE_InitRegistry(); @@ -236,6 +242,18 @@ INT WINAPI MulDiv( INT nMultiplicand, INT nMultiplier, INT nDivisor) } +/****************************************************************************** + * GetTickCount64 (KERNEL32.@) + */ +ULONGLONG WINAPI GetTickCount64(void) +{ + LARGE_INTEGER now; + + NtQuerySystemTime( &now ); + return (now.QuadPart - server_start_time) / 10000; +} + + /*********************************************************************** * GetTickCount (KERNEL32.@) * @@ -254,5 +272,5 @@ INT WINAPI MulDiv( INT nMultiplicand, INT nMultiplier, INT nDivisor) */ DWORD WINAPI GetTickCount(void) { - return NtGetTickCount(); + return GetTickCount64(); } diff --git a/include/winbase.h b/include/winbase.h index 26691bb..af6a38c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1679,6 +1679,7 @@ DWORD WINAPI GetTempPathA(DWORD,LPSTR); DWORD WINAPI GetTempPathW(DWORD,LPWSTR); #define GetTempPath WINELIB_NAME_AW(GetTempPath) DWORD WINAPI GetTickCount(void); +ULONGLONG WINAPI GetTickCount64(void); DWORD WINAPI GetTimeZoneInformation(LPTIME_ZONE_INFORMATION); BOOL WINAPI GetThreadContext(HANDLE,CONTEXT *); INT WINAPI GetThreadPriority(HANDLE);

1 0

Evan Stade : gdiplus: Changed calls to floor to floorf.
by Alexandre Julliard July 11, 2007

July 11, 2007

Module: wine Branch: master Commit: 6544d9ee3e149234991406f188b357dd0d9d253b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6544d9ee3e149234991406f18… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 10 18:39:34 2007 -0700 gdiplus: Changed calls to floor to floorf. --- dlls/gdiplus/graphics.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3a88295..af1089a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -208,8 +208,8 @@ static void draw_cap(HDC hdc, COLORREF color, GpLineCap cap, REAL size, /* Using roundr here can make the triangle float off the end of the * line. */ - pt[0].x = ((x2 - x1) >= 0 ? floor(x2 - dx) : ceil(x2 - dx)); - pt[0].y = ((y2 - y1) >= 0 ? floor(y2 - dy) : ceil(y2 - dy)); + pt[0].x = ((x2 - x1) >= 0 ? floorf(x2 - dx) : ceilf(x2 - dx)); + pt[0].y = ((y2 - y1) >= 0 ? floorf(y2 - dy) : ceilf(y2 - dy)); pt[1].x = roundr(pt[0].x + 2.0 * dx); pt[1].y = roundr(pt[0].y + 2.0 * dy); @@ -226,8 +226,8 @@ static void draw_cap(HDC hdc, COLORREF color, GpLineCap cap, REAL size, dx = -cos(M_PI_2 + theta) * size * invert; dy = -sin(M_PI_2 + theta) * size * invert; - pt[0].x = ((x2 - x1) >= 0 ? floor(x2 - dx) : ceil(x2 - dx)); - pt[0].y = ((y2 - y1) >= 0 ? floor(y2 - dy) : ceil(y2 - dy)); + pt[0].x = ((x2 - x1) >= 0 ? floorf(x2 - dx) : ceilf(x2 - dx)); + pt[0].y = ((y2 - y1) >= 0 ? floorf(y2 - dy) : ceilf(y2 - dy)); pt[1].x = roundr(pt[0].x + 2.0 * dx); pt[1].y = roundr(pt[0].y + 2.0 * dy);

1 0