February 2008 - Wine-commits

Roy Shea : qmgr: Add ServiceMain.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 5c51ad2c3f78cf801b7458a810c4490f85421ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c51ad2c3f78cf801b7458a81… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Mon Feb 11 11:09:34 2008 -0800 qmgr: Add ServiceMain. --- dlls/qmgr/Makefile.in | 5 +- dlls/qmgr/qmgr.spec | 1 + dlls/qmgr/service.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 142 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index 65812c3..a6c40ac 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -3,13 +3,14 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = qmgr.dll -IMPORTS = advpack advapi32 kernel32 +IMPORTS = advpack ole32 advapi32 kernel32 EXTRALIBS = -luuid C_SRCS = \ factory.c \ qmgr.c \ - qmgr_main.c + qmgr_main.c \ + service.c RC_SRCS = rsrc.rc diff --git a/dlls/qmgr/qmgr.spec b/dlls/qmgr/qmgr.spec index 0f9b073..2431c63 100644 --- a/dlls/qmgr/qmgr.spec +++ b/dlls/qmgr/qmgr.spec @@ -1,2 +1,3 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() +@ stdcall -private ServiceMain(long ptr) diff --git a/dlls/qmgr/service.c b/dlls/qmgr/service.c new file mode 100644 index 0000000..5e31b8f --- /dev/null +++ b/dlls/qmgr/service.c @@ -0,0 +1,138 @@ +/* + * ServiceMain function for qmgr running within svchost + * + * Copyright 2007 (C) 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 "windef.h" +#include "objbase.h" +#include "winsvc.h" +#include "bits.h" + +#include "qmgr.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qmgr); + +static WCHAR qmgr_nameW[] = {'B','I','T','S',0}; +static SERVICE_STATUS_HANDLE status_handle; +static SERVICE_STATUS status; +static HANDLE stop_event = NULL; + +static VOID +UpdateStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode, DWORD dwWaitHint) +{ + status.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + status.dwCurrentState = dwCurrentState; + if (dwCurrentState == SERVICE_START_PENDING) + status.dwControlsAccepted = 0; + else + status.dwControlsAccepted + = (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_PAUSE_CONTINUE + | SERVICE_ACCEPT_SHUTDOWN); + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = dwWaitHint; + + if (!SetServiceStatus(status_handle, &status)) { + ERR("failed to set service status\n"); + SetEvent(stop_event); + } +} + +/* Handle incoming ControlService signals */ +static DWORD WINAPI +ServiceHandler(DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context) +{ + switch (ctrl) { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + TRACE("shutting down service\n"); + UpdateStatus(SERVICE_STOP_PENDING, NO_ERROR, 0); + SetEvent(stop_event); + break; + default: + FIXME("ignoring handle service ctrl %x\n", ctrl); + UpdateStatus(status.dwCurrentState, NO_ERROR, 0); + break; + } + + return NO_ERROR; +} + +/* Main thread of the service */ +static BOOL +StartCount(void) +{ + HRESULT hr; + DWORD dwReg; + + TRACE("\n"); + + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + if (!SUCCEEDED(hr)) + return FALSE; + + hr = CoInitializeSecurity(NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_NONE, + RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, + NULL); + if (!SUCCEEDED(hr)) + return FALSE; + + hr = CoRegisterClassObject(&CLSID_BackgroundCopyManager, + (IUnknown *) &BITS_ClassFactory, + CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, + &dwReg); + if (!SUCCEEDED(hr)) + return FALSE; + + return TRUE; +} + +/* Service entry point */ +VOID WINAPI +ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) +{ + TRACE("\n"); + + stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); + if (!stop_event) { + ERR("failed to create stop_event\n"); + return; + } + + status_handle = RegisterServiceCtrlHandlerExW(qmgr_nameW, ServiceHandler, NULL); + if (!status_handle) { + ERR("failed to register handler: %u\n", GetLastError()); + return; + } + + UpdateStatus(SERVICE_START_PENDING, NO_ERROR, 3000); + if (!StartCount()) { + ERR("failed starting service thread\n"); + UpdateStatus(SERVICE_STOPPED, NO_ERROR, 0); + return; + } + + UpdateStatus(SERVICE_RUNNING, NO_ERROR, 0); + + WaitForSingleObject(stop_event, INFINITE); + UpdateStatus(SERVICE_STOPPED, NO_ERROR, 0); + CloseHandle(stop_event); + TRACE("service stoped\n"); +}

1 0

Roy Shea : qmgr: Add some tests.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 884e7e7b5661a398e0ce36a585f5b6698517ffb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=884e7e7b5661a398e0ce36a58… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Mon Feb 11 11:09:34 2008 -0800 qmgr: Add some tests. --- .gitignore | 4 +++ Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/qmgr/tests/Makefile.in | 13 +++++++++ dlls/qmgr/tests/qmgr.c | 56 +++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 ++ programs/winetest/winetest.rc | 1 + 9 files changed, 84 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 9fd3548..9702e70 100644 --- a/.gitignore +++ b/.gitignore @@ -395,6 +395,9 @@ dlls/qedit/tests/testlist.c dlls/qmgr/qmgr_local.h dlls/qmgr/qmgr_local_i.c dlls/qmgr/rsrc.res +dlls/qmgr/tests/*.ok +dlls/qmgr/tests/qmgr_crosstest.exe +dlls/qmgr/tests/testlist.c dlls/qmgrprxy/qmgrprxy.h dlls/qmgrprxy/qmgrprxy_i.c dlls/qmgrprxy/qmgrprxy_p.c @@ -780,6 +783,7 @@ programs/winetest/opengl32_test.exe programs/winetest/pdh_test.exe programs/winetest/psapi_test.exe programs/winetest/qedit_test.exe +programs/winetest/qmgr_test.exe programs/winetest/quartz_test.exe programs/winetest/riched20_test.exe programs/winetest/riched32_test.exe diff --git a/Makefile.in b/Makefile.in index 6347f93..e650d0c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -383,6 +383,7 @@ ALL_MAKEFILES = \ dlls/qedit/Makefile \ dlls/qedit/tests/Makefile \ dlls/qmgr/Makefile \ + dlls/qmgr/tests/Makefile \ dlls/qmgrprxy/Makefile \ dlls/quartz/Makefile \ dlls/quartz/tests/Makefile \ @@ -796,6 +797,7 @@ dlls/qcap/Makefile: dlls/qcap/Makefile.in dlls/Makedll.rules dlls/qedit/Makefile: dlls/qedit/Makefile.in dlls/Makedll.rules dlls/qedit/tests/Makefile: dlls/qedit/tests/Makefile.in dlls/Maketest.rules dlls/qmgr/Makefile: dlls/qmgr/Makefile.in dlls/Makedll.rules +dlls/qmgr/tests/Makefile: dlls/qmgr/tests/Makefile.in dlls/Maketest.rules dlls/qmgrprxy/Makefile: dlls/qmgrprxy/Makefile.in dlls/Makedll.rules dlls/quartz/Makefile: dlls/quartz/Makefile.in dlls/Makedll.rules dlls/quartz/tests/Makefile: dlls/quartz/tests/Makefile.in dlls/Maketest.rules diff --git a/configure b/configure index 3d81b67..66622a1 100755 --- a/configure +++ b/configure @@ -21617,6 +21617,8 @@ ac_config_files="$ac_config_files dlls/qedit/tests/Makefile" ac_config_files="$ac_config_files dlls/qmgr/Makefile" +ac_config_files="$ac_config_files dlls/qmgr/tests/Makefile" + ac_config_files="$ac_config_files dlls/qmgrprxy/Makefile" ac_config_files="$ac_config_files dlls/quartz/Makefile" @@ -22754,6 +22756,7 @@ do "dlls/qedit/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qedit/Makefile" ;; "dlls/qedit/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qedit/tests/Makefile" ;; "dlls/qmgr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgr/Makefile" ;; + "dlls/qmgr/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgr/tests/Makefile" ;; "dlls/qmgrprxy/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgrprxy/Makefile" ;; "dlls/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/Makefile" ;; "dlls/quartz/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index 1272088..ba0355a 100644 --- a/configure.ac +++ b/configure.ac @@ -1882,6 +1882,7 @@ AC_CONFIG_FILES([dlls/qcap/Makefile]) AC_CONFIG_FILES([dlls/qedit/Makefile]) AC_CONFIG_FILES([dlls/qedit/tests/Makefile]) AC_CONFIG_FILES([dlls/qmgr/Makefile]) +AC_CONFIG_FILES([dlls/qmgr/tests/Makefile]) AC_CONFIG_FILES([dlls/qmgrprxy/Makefile]) AC_CONFIG_FILES([dlls/quartz/Makefile]) AC_CONFIG_FILES([dlls/quartz/tests/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 643ab54..6885d2a 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -327,6 +327,7 @@ TESTSUBDIRS = \ pdh/tests \ psapi/tests \ qedit/tests \ + qmgr/tests \ quartz/tests \ riched20/tests \ riched32/tests \ diff --git a/dlls/qmgr/tests/Makefile.in b/dlls/qmgr/tests/Makefile.in new file mode 100644 index 0000000..e16d5fc --- /dev/null +++ b/dlls/qmgr/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = qmgr.dll +IMPORTS = ole32 kernel32 + +CTESTS = \ + qmgr.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/qmgr/tests/qmgr.c b/dlls/qmgr/tests/qmgr.c new file mode 100644 index 0000000..0051751 --- /dev/null +++ b/dlls/qmgr/tests/qmgr.c @@ -0,0 +1,56 @@ +/* + * Unit test suite for bits functions + * + * Copyright 2007 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 <stdio.h> + +#define COBJMACROS + +#include "wine/test.h" +#include "initguid.h" +#include "bits.h" + +static void +test_CreateInstance(void) +{ + HRESULT hres; + ULONG res; + IBackgroundCopyManager *manager = NULL; + + /* Creating BITS instance */ + hres = CoCreateInstance(&CLSID_BackgroundCopyManager, NULL, CLSCTX_LOCAL_SERVER, + &IID_IBackgroundCopyManager, (void **) &manager); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + if(hres != S_OK) { + skip("Unable to create bits instance.\n"); + return; + } + + /* Releasing bits manager */ + res = IBackgroundCopyManager_Release(manager); + ok(res == 0, "Bad ref count on release: %u\n", res); + +} + +START_TEST(qmgr) +{ + CoInitialize(NULL); + test_CreateInstance(); + CoUninitialize(); +} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index c3f6715..7502927 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -71,6 +71,7 @@ TESTBINS = \ pdh_test.exe \ psapi_test.exe \ qedit_test.exe \ + qmgr_test.exe \ quartz_test.exe \ riched20_test.exe \ riched32_test.exe \ @@ -199,6 +200,8 @@ psapi_test.exe: $(DLLDIR)/psapi/tests/psapi_test.exe$(DLLEXT) cp $(DLLDIR)/psapi/tests/psapi_test.exe$(DLLEXT) $@ && $(STRIP) $@ qedit_test.exe: $(DLLDIR)/qedit/tests/qedit_test.exe$(DLLEXT) cp $(DLLDIR)/qedit/tests/qedit_test.exe$(DLLEXT) $@ && $(STRIP) $@ +qmgr_test.exe: $(DLLDIR)/qmgr/tests/qmgr_test.exe$(DLLEXT) + cp $(DLLDIR)/qmgr/tests/qmgr_test.exe$(DLLEXT) $@ && $(STRIP) $@ quartz_test.exe: $(DLLDIR)/quartz/tests/quartz_test.exe$(DLLEXT) cp $(DLLDIR)/quartz/tests/quartz_test.exe$(DLLEXT) $@ && $(STRIP) $@ riched20_test.exe: $(DLLDIR)/riched20/tests/riched20_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 0bcb214..def64a0 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -129,6 +129,7 @@ opengl32_test.exe TESTRES "opengl32_test.exe" pdh_test.exe TESTRES "pdh_test.exe" psapi_test.exe TESTRES "psapi_test.exe" qedit_test.exe TESTRES "qedit_test.exe" +qmgr_test.exe TESTRES "qmgr_test.exe" quartz_test.exe TESTRES "quartz_test.exe" riched20_test.exe TESTRES "riched20_test.exe" riched32_test.exe TESTRES "riched32_test.exe"

1 0

Alexandre Julliard : uuid: Fixed the CLSID_Picture_EnhMetafile definition.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 5721560e8bef42299b4f19bcc14a82190cadca64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5721560e8bef42299b4f19bcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 19 20:09:39 2008 +0100 uuid: Fixed the CLSID_Picture_EnhMetafile definition. --- dlls/uuid/uuid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index d209696..b00a2a7 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -95,7 +95,7 @@ DEFINE_GUID(CLSID_Picture_Metafile, 0x00000315,0x0000,0x0000,0xc0,0x00,0x0 DEFINE_GUID(CLSID_StaticMetafile, 0x00000315,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_Picture_Dib, 0x00000316,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_StaticDib, 0x00000316,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_Picture_EnhMetafile, 0x00000316,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_Picture_EnhMetafile, 0x00000319,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_DCOMAccessControl, 0x0000031d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_ComBinding, 0x00000328,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);

1 0

Peter Oberndorfer : user32: Fix caption bar being drawn 1 pixel too high.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: a73a0aa613d31176b04c4f4f55bc14c96b2b2c0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73a0aa613d31176b04c4f4f5… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Sun Feb 17 21:14:50 2008 +0100 user32: Fix caption bar being drawn 1 pixel too high. --- dlls/user32/nonclient.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 503f7c1..f822c40 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -309,7 +309,7 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, } else { DWORD style = GetWindowLongW (hwnd, GWL_STYLE); - NC_DrawCaptionBar (hdc, rect, style, uFlags & DC_ACTIVE, uFlags & DC_GRADIENT); + NC_DrawCaptionBar (hdc, &rc, style, uFlags & DC_ACTIVE, uFlags & DC_GRADIENT); } @@ -917,7 +917,7 @@ static void NC_DrawCaption( HDC hdc, RECT *rect, HWND hwnd, DWORD style, r.bottom--; SystemParametersInfoW (SPI_GETGRADIENTCAPTIONS, 0, &gradient, 0); - NC_DrawCaptionBar (hdc, rect, style, active, gradient); + NC_DrawCaptionBar (hdc, &r, style, active, gradient); if ((style & WS_SYSMENU) && !(exStyle & WS_EX_TOOLWINDOW)) { if (NC_DrawSysButton (hwnd, hdc, FALSE))

1 0

Stefan Leichter : user32: Add some tests for GetMouseMovePointsEx.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 9b478283c5fb73f95c59ef6df49bbd75c83687e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b478283c5fb73f95c59ef6df… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Feb 16 19:35:22 2008 +0100 user32: Add some tests for GetMouseMovePointsEx. --- dlls/user32/tests/input.c | 141 +++++++++++++++++++++++++++++++++++++++++++++ include/winuser.h | 11 ++++ 2 files changed, 152 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index fc4d731..c115907 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -60,6 +60,7 @@ static HWND hWndTest; static long timetag = 0x10000000; static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); +static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); #define MAXKEYEVENTS 6 #define MAXKEYMESSAGES MAXKEYEVENTS /* assuming a key event generates one @@ -157,6 +158,7 @@ static void init_function_pointers(void) trace("GetProcAddress(%s) failed\n", #func); GET_PROC(SendInput) + GET_PROC(GetMouseMovePointsEx) #undef GET_PROC } @@ -674,6 +676,140 @@ static void test_mouse_ll_hook(void) SetCursorPos(pt_org.x, pt_org.y); } +static void test_GetMouseMovePointsEx(void) +{ +#define BUFLIM 64 +#define MYERROR 0xdeadbeef + int count, retval; + MOUSEMOVEPOINT in; + MOUSEMOVEPOINT out[200]; + POINT point; + + /* Get a valid content for the input struct */ + if(!GetCursorPos(&point)) { + skip("GetCursorPos() failed with error %u\n", GetLastError()); + return; + } + memset(&in, 0, sizeof(MOUSEMOVEPOINT)); + in.x = point.x; + in.y = point.y; + + /* test first parameter + * everything different than sizeof(MOUSEMOVEPOINT) + * is expected to fail with ERROR_INVALID_PARAMETER + */ + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(0, &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); + ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT)-1, &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); + ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT)+1, &in, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); + ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + /* test second and third parameter + */ + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), NULL, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); + ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); + ok(ERROR_NOACCESS == GetLastError(), + "expected error ERROR_NOACCESS, got %u\n", GetLastError()); + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, NULL, BUFLIM, GMMP_USE_DISPLAY_POINTS); + ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); + ok(ERROR_NOACCESS == GetLastError(), + "expected error ERROR_NOACCESS, got %u\n", GetLastError()); + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), NULL, NULL, BUFLIM, GMMP_USE_DISPLAY_POINTS); + ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); + ok(ERROR_NOACCESS == GetLastError(), + "expected error ERROR_NOACCESS, got %u\n", GetLastError()); + + SetLastError(MYERROR); + count = 0; + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, NULL, count, GMMP_USE_DISPLAY_POINTS); + todo_wine { + ok(retval == count, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + ok(MYERROR == GetLastError(), + "expected error %d, got %u\n", MYERROR, GetLastError()); + } + + /* test fourth parameter + * a value higher than 64 is expected to fail with ERROR_INVALID_PARAMETER + */ + SetLastError(MYERROR); + count = -1; + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + ok(retval == count, "expected GetMouseMovePointsEx to fail, got %d\n", retval); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(MYERROR); + count = 0; + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + todo_wine { + ok(retval == count, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + ok(MYERROR == GetLastError(), + "expected error %d, got %u\n", MYERROR, GetLastError()); + } + + SetLastError(MYERROR); + count = BUFLIM; + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, count, GMMP_USE_DISPLAY_POINTS); + todo_wine { + ok(retval == count, "expected GetMouseMovePointsEx to succeed, got %d\n", retval); + ok(MYERROR == GetLastError(), + "expected error %d, got %u\n", MYERROR, GetLastError()); + } + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, out, BUFLIM+1, GMMP_USE_DISPLAY_POINTS); + ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + /* it was not possible to force an error with the fifth parameter on win2k */ + + /* test combinations of wrong parameters to see which error wins */ + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT)-1, NULL, out, BUFLIM, GMMP_USE_DISPLAY_POINTS); + ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT)-1, &in, NULL, BUFLIM, GMMP_USE_DISPLAY_POINTS); + ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), NULL, out, BUFLIM+1, GMMP_USE_DISPLAY_POINTS); + ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(MYERROR); + retval = pGetMouseMovePointsEx(sizeof(MOUSEMOVEPOINT), &in, NULL, BUFLIM+1, GMMP_USE_DISPLAY_POINTS); + ok(retval == -1, "expected GetMouseMovePointsEx to fail, got %d\n", retval); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "expected error ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + +#undef BUFLIM +#undef MYERROR +} + START_TEST(input) { init_function_pointers(); @@ -686,4 +822,9 @@ START_TEST(input) test_Input_blackbox(); test_keynames(); test_mouse_ll_hook(); + + if(pGetMouseMovePointsEx) + test_GetMouseMovePointsEx(); + else + skip("GetMouseMovePointsEx is not available\n"); } diff --git a/include/winuser.h b/include/winuser.h index 6e61e10..b7b0475 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -181,6 +181,17 @@ typedef struct tagMOUSEKEYS DWORD dwReserved2; } MOUSEKEYS, *LPMOUSEKEYS; +/* struct and defines for GetMouseMovePointsEx */ +#define GMMP_USE_DISPLAY_POINTS 1 +#define GMMP_USE_HIGH_RESOLUTION_POINTS 2 + +typedef struct tagMOUSEMOVEPOINT { + int x; + int y; + DWORD time; + ULONG_PTR dwExtraInfo; +} MOUSEMOVEPOINT,*PMOUSEMOVEPOINT,*LPMOUSEMOVEPOINT; + /* flags for STICKYKEYS dwFlags field */ #define SKF_AUDIBLEFEEDBACK 0x00000040 #define SKF_AVAILABLE 0x00000002

1 0

Roy Shea : qmgr: Implement DLL server registration.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 313a903a8503ff674eb18a7514012c0f56117ca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=313a903a8503ff674eb18a751… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Mon Feb 11 11:09:02 2008 -0800 qmgr: Implement DLL server registration. --- .gitignore | 1 + dlls/qmgr/Makefile.in | 4 +- dlls/qmgr/qmgr.h | 11 ++++ dlls/qmgr/qmgr.inf | 16 ++++++ dlls/qmgr/qmgr.spec | 4 +- dlls/qmgr/qmgr_main.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/qmgr/rsrc.rc | 20 +++++++ tools/wine.inf | 2 + 8 files changed, 184 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 807044c..9fd3548 100644 --- a/.gitignore +++ b/.gitignore @@ -394,6 +394,7 @@ dlls/qedit/tests/qedit_crosstest.exe dlls/qedit/tests/testlist.c dlls/qmgr/qmgr_local.h dlls/qmgr/qmgr_local_i.c +dlls/qmgr/rsrc.res dlls/qmgrprxy/qmgrprxy.h dlls/qmgrprxy/qmgrprxy_i.c dlls/qmgrprxy/qmgrprxy_p.c diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index a19eea6..65812c3 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = qmgr.dll -IMPORTS = kernel32 +IMPORTS = advpack advapi32 kernel32 EXTRALIBS = -luuid C_SRCS = \ @@ -11,6 +11,8 @@ C_SRCS = \ qmgr.c \ qmgr_main.c +RC_SRCS = rsrc.rc + IDL_I_SRCS = qmgr_local.idl @MAKE_DLL_RULES@ diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 9b708c8..3ad314d 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -27,6 +27,8 @@ #define COBJMACROS #include "bits.h" +#include <string.h> + /* Background copy manager vtbl and related data */ typedef struct { @@ -43,4 +45,13 @@ extern ClassFactoryImpl BITS_ClassFactory; HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj); +/* Little helper functions */ +static inline char * +qmgr_strdup(const char *s) +{ + size_t n = strlen(s) + 1; + char *d = HeapAlloc(GetProcessHeap(), 0, n); + return d ? memcpy(d, s, n) : NULL; +} + #endif /* __QMGR_H__ */ diff --git a/dlls/qmgr/qmgr.inf b/dlls/qmgr/qmgr.inf new file mode 100644 index 0000000..ef51f9b --- /dev/null +++ b/dlls/qmgr/qmgr.inf @@ -0,0 +1,16 @@ +[version] +Signature="$CHICAGO$" + +[RegisterDll] +AddReg = Qmgr.Reg + +[UnregisterDll] +DelReg = Qmgr.Reg + +[Qmgr.Reg] +HKCR,"AppID\BITS","AppID",,"%CLSID_BackgroundCopyQMgr%" +HKCR,"AppID\%CLSID_BackgroundCopyQMgr%","LocalService",,"BITS" +HKCR,"CLSID\%CLSID_BackgroundCopyManager%","AppID",,"%CLSID_BackgroundCopyQMgr%" + +HKLM,"Software\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"BITS" +HKLM,"System\CurrentControlSet\Services\BITS\Parameters","ServiceDll",0x00020000,"qmgr.dll" diff --git a/dlls/qmgr/qmgr.spec b/dlls/qmgr/qmgr.spec index 1a63b32..0f9b073 100644 --- a/dlls/qmgr/qmgr.spec +++ b/dlls/qmgr/qmgr.spec @@ -1,2 +1,2 @@ -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c index d00ac2d..0af2007 100644 --- a/dlls/qmgr/qmgr_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -21,15 +21,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +#include <stdio.h> -#include "windef.h" -#include "winbase.h" +#include "objbase.h" +#include "winuser.h" +#include "winreg.h" +#include "advpub.h" +#include "olectl.h" +#include "winsvc.h" + +#include "bits.h" +#include "qmgr.h" +#include "initguid.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(qmgr); +/* Handle to the base address of this DLL */ +static HINSTANCE hInst; + +/* Other GUIDs used by this module */ +DEFINE_GUID(CLSID_BackgroundCopyQMgr, 0x69AD4AEE, 0x51BE, 0x439b, 0xA9,0x2C, 0x86,0xAE,0x49,0x0E,0x8B,0x30); + /* Entry point for DLL */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -41,6 +55,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); + hInst = hinstDLL; break; case DLL_PROCESS_DETACH: break; @@ -48,3 +63,114 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +static HRESULT init_register_strtable(STRTABLEA *strtable) +{ +#define CLSID_EXPANSION_ENTRY(id) { "CLSID_" #id, &CLSID_ ## id } + static const struct { + const char *name; + const CLSID *clsid; + } expns[] = { + CLSID_EXPANSION_ENTRY(BackgroundCopyQMgr), + CLSID_EXPANSION_ENTRY(BackgroundCopyManager) + }; +#undef CLSID_EXPANSION_ENTRY + static STRENTRYA pse[sizeof expns / sizeof expns[0]]; + int i; + + strtable->cEntries = sizeof pse / sizeof pse[0]; + strtable->pse = pse; + for (i = 0; i < strtable->cEntries; i++) { + static const char dummy_sample[] = "{12345678-1234-1234-1234-123456789012}"; + const CLSID *clsid = expns[i].clsid; + pse[i].pszName = qmgr_strdup(expns[i].name); + pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, sizeof dummy_sample); + if (!pse[i].pszName || !pse[i].pszValue) + return E_OUTOFMEMORY; + sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], + clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], + clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); + } + + return S_OK; +} + +static void cleanup_register_strtable(STRTABLEA *strtable) +{ + int i; + for (i = 0; i < strtable->cEntries; i++) { + HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName); + HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue); + if (!strtable->pse[i].pszName || !strtable->pse[i].pszValue) + return; + } +} + +static HRESULT register_service(BOOL do_register) +{ + static const WCHAR name[] = { 'B','I','T','S', 0 }; + static const WCHAR path[] = { 's','v','c','h','o','s','t','.','e','x','e', + ' ','-','k',' ','n','e','t','s','v','c','s', 0 }; + SC_HANDLE scm, service; + HRESULT hr = S_OK; + + scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if (!scm) + return SELFREG_E_CLASS; + + if (do_register) + service = CreateServiceW(scm, name, name, SERVICE_ALL_ACCESS, + SERVICE_WIN32_OWN_PROCESS, + SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, + path, NULL, NULL, NULL, NULL, NULL); + else + service = OpenServiceW(scm, name, DELETE); + + + CloseServiceHandle(scm); + if (!service) + return SELFREG_E_CLASS; + + if (!do_register) + hr = DeleteService(service) ? S_OK : SELFREG_E_CLASS; + + CloseServiceHandle(service); + return hr; +} + +/* Use an INF file to register or unregister the DLL */ +static HRESULT register_server(BOOL do_register) +{ + HRESULT hr; + STRTABLEA strtable; + + TRACE("(%x)\n", do_register); + + hr = register_service(do_register); + if (FAILED(hr)) { + ERR("register_service failed: %d\n", GetLastError()); + return hr; + } + + hr = init_register_strtable(&strtable); + if (SUCCEEDED(hr)) + hr = RegInstallA(hInst, do_register ? "RegisterDll" : "UnregisterDll", + &strtable); + cleanup_register_strtable(&strtable); + + if (FAILED(hr)) + ERR("RegInstall failed: %08x\n", hr); + + return hr; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return register_server(TRUE); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return register_server(FALSE); +} diff --git a/dlls/qmgr/rsrc.rc b/dlls/qmgr/rsrc.rc new file mode 100644 index 0000000..dfc64d0 --- /dev/null +++ b/dlls/qmgr/rsrc.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2007 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 + */ + +/* @makedep: qmgr.inf */ +REGINST REGINST qmgr.inf diff --git a/tools/wine.inf b/tools/wine.inf index 35dcb9a..672a163 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2196,6 +2196,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,objsel.dll,1 11,,qcap.dll,1 11,,qedit.dll,1 +11,,qmgr.dll,1 +11,,qmgrprxy.dll,1 11,,quartz.dll,1 11,,rsaenh.dll,1 11,,shdocvw.dll,1

1 0

Gerald Pfeifer : msi: Remove unused parameter to msi_comp_find_prodcode().
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: db70edfc827c789447a21e389a4b5222b9b2f9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=db70edfc827c789447a21e389… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 17 21:22:44 2008 +0100 msi: Remove unused parameter to msi_comp_find_prodcode(). --- dlls/msi/msi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 72a17bb..13b693f 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -923,7 +923,7 @@ static BOOL msi_comp_find_package(LPCWSTR prodcode, MSIINSTALLCONTEXT context) return (res == ERROR_SUCCESS); } -static BOOL msi_comp_find_prodcode(LPCWSTR prodcode, LPWSTR squished_pc, +static BOOL msi_comp_find_prodcode(LPWSTR squished_pc, MSIINSTALLCONTEXT context, LPCWSTR comp, DWORD *sz) { @@ -983,7 +983,7 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, *pdwState = INSTALLSTATE_UNKNOWN; - if (!msi_comp_find_prodcode(szProductCode, squished_pc, dwContext, szComponent, &sz)) + if (!msi_comp_find_prodcode(squished_pc, dwContext, szComponent, &sz)) return ERROR_UNKNOWN_COMPONENT; if (sz == 0)

1 0

David Adam : d3dx8: Fix a typo in d3dx8math.h.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 5f68960f6fe228f2a77d7b9718c2b0e16e8b9581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f68960f6fe228f2a77d7b971… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Feb 19 08:50:44 2008 +0100 d3dx8: Fix a typo in d3dx8math.h. --- include/d3dx8math.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 66d8fea..2ee783f 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -380,7 +380,7 @@ DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown) #define ID3DXMatrixStack_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ID3DXMatrixStack_AddRef(p) (p)->lpVtbl->AddRef(p) #define ID3DXMatrixStack_Release(p) (p)->lpVtbl->Release(p) -#define ID3DXMAtrixStack_Pop(p) (p)->lpVtbl->Pop(p) +#define ID3DXMatrixStack_Pop(p) (p)->lpVtbl->Pop(p) #define ID3DXMatrixStack_Push(p) (p)->lpVtbl->Push(p) #define ID3DXMatrixStack_LoadIdentity(p) (p)->lpVtbl->LoadIdentity(p) #define ID3DXMatrixStack_LoadMatrix(p,a) (p)->lpVtbl->LoadMatrix(p,a)

1 0

Alexandre Julliard : dxguid: Add a few more iids.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: c0d6899945c09bfd2b8257d6d8ed6e968d0ad673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d6899945c09bfd2b8257d6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 19 19:49:34 2008 +0100 dxguid: Add a few more iids. --- dlls/dxguid/dxguid.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dxguid/dxguid.c b/dlls/dxguid/dxguid.c index ce2cce3..4f34a4f 100644 --- a/dlls/dxguid/dxguid.c +++ b/dlls/dxguid/dxguid.c @@ -39,9 +39,11 @@ #include "dmusici.h" #include "dmusics.h" #include "dplay.h" +#include "dplay8.h" #include "dplobby.h" #include "dinput.h" #include "ddrawi.h" +#include "dxdiag.h" #include "dxfile.h" #include "d3drm.h" #include "rmxfguid.h"

1 0

Alexandre Julliard : uuid: Remove a few iids that don't belong here.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 427cd9183aa2a4d955f6184fe8deb3ff0f5b52d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=427cd9183aa2a4d955f6184fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 19 20:09:19 2008 +0100 uuid: Remove a few iids that don't belong here. --- dlls/avifil32/factory.c | 7 +++---- dlls/dplayx/dpclassfactory.c | 4 ++++ dlls/mapi32/mapi32_main.c | 1 + dlls/mapi32/tests/prop.c | 1 + dlls/uuid/uuid.c | 7 ------- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 26a5ae2..6d9afa3 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -25,17 +25,16 @@ #include "wingdi.h" #include "winuser.h" #include "winerror.h" - #include "ole2.h" + +#include "initguid.h" #include "vfw.h" +#include "avifile_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(avifile); -#include "initguid.h" -#include "avifile_private.h" - HMODULE AVIFILE_hModule = NULL; static BOOL AVIFILE_bLocked; diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index 9ce483e..b01b984 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -24,9 +24,13 @@ #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "objbase.h" #include "winerror.h" #include "wine/debug.h" +#include "dplay.h" +#include "dplobby.h" +#include "initguid.h" #include "dpinit.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index edfa326..936d435 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winerror.h" #include "objbase.h" +#include "initguid.h" #include "mapix.h" #include "mapiform.h" #include "mapi.h" diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index d78eb36..adc1d85 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -24,6 +24,7 @@ #include "winuser.h" #include "winerror.h" #include "winnt.h" +#include "initguid.h" #include "mapiutil.h" #include "mapitags.h" diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 28cdec4..d209696 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -50,7 +50,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "shldisp.h" #include "comcat.h" #include "urlmon.h" -#include "mapiguid.h" #include "activscp.h" #include "dispex.h" #include "mlang.h" @@ -72,14 +71,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); /* FIXME: cguids declares GUIDs but does not define their values */ -/* other GUIDs */ - -#include "vfw.h" - /* GUIDs not declared in an exported header file */ -DEFINE_GUID(IID_IDirectPlaySP, 0x0c9f6360,0xcc61,0x11cf,0xac,0xec,0x00,0xaa,0x00,0x68,0x86,0xe3); DEFINE_GUID(IID_ISFHelper, 0x1fe68efb,0x1874,0x9812,0x56,0xdc,0x00,0x00,0x00,0x00,0x00,0x00); -DEFINE_GUID(IID_IDPLobbySP, 0x5a4e5a20,0x2ced,0x11d0,0xa8,0x89,0x00,0xa0,0xc9,0x05,0x43,0x3c); DEFINE_GUID(IID_IProxyManager, 0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b);

1 0