February 2014 - Wine-commits

Nikolay Sivov : fntcache: Added stub Font Cache service.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: ee9c7dc0b647a9528c36749325f90c53e67b1ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9c7dc0b647a9528c3674932… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 25 08:45:37 2014 +0400 fntcache: Added stub Font Cache service. --- configure | 2 + configure.ac | 1 + dlls/fntcache/Makefile.in | 5 ++ dlls/fntcache/fntcache.spec | 3 ++ dlls/fntcache/main.c | 112 +++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 24 ++++++++-- 6 files changed, 143 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 8333561..a38957f 100755 --- a/configure +++ b/configure @@ -1028,6 +1028,7 @@ enable_explorerframe enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_faultrep enable_fltlib +enable_fntcache enable_fusion enable_fwpuclnt enable_gameux @@ -16849,6 +16850,7 @@ wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l wine_fn_config_dll faultrep enable_faultrep implib wine_fn_config_test dlls/faultrep/tests faultrep_test wine_fn_config_dll fltlib enable_fltlib +wine_fn_config_dll fntcache enable_fntcache wine_fn_config_dll fusion enable_fusion wine_fn_config_test dlls/fusion/tests fusion_test wine_fn_config_dll fwpuclnt enable_fwpuclnt diff --git a/configure.ac b/configure.ac index 224b8c5..3574343 100644 --- a/configure.ac +++ b/configure.ac @@ -2857,6 +2857,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) +WINE_CONFIG_DLL(fntcache) WINE_CONFIG_DLL(fusion) WINE_CONFIG_TEST(dlls/fusion/tests) WINE_CONFIG_DLL(fwpuclnt) diff --git a/dlls/fntcache/Makefile.in b/dlls/fntcache/Makefile.in new file mode 100644 index 0000000..4d5342c --- /dev/null +++ b/dlls/fntcache/Makefile.in @@ -0,0 +1,5 @@ +MODULE = fntcache.dll +IMPORTS = advapi32 + +C_SRCS = \ + main.c diff --git a/dlls/fntcache/fntcache.spec b/dlls/fntcache/fntcache.spec new file mode 100644 index 0000000..cd30994 --- /dev/null +++ b/dlls/fntcache/fntcache.spec @@ -0,0 +1,3 @@ +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stdcall -private ServiceMain(long ptr) diff --git a/dlls/fntcache/main.c b/dlls/fntcache/main.c new file mode 100644 index 0000000..91c20e0 --- /dev/null +++ b/dlls/fntcache/main.c @@ -0,0 +1,112 @@ +/* + * Font Cache service + * + * Copyright 2014 Nikolay Sivov for CodeWeavers + * + * 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 WIN32_LEAN_AND_MEAN +#include <windows.h> +#include "winsvc.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fontcache); + +static HINSTANCE hInst; +static SERVICE_STATUS_HANDLE service_handle; +static HANDLE stop_event; + +/*********************************************************************** + * DllMain (fntcache.@) + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + hInst = hinstDLL; + break; + } + + return TRUE; +} + +static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, void *event_data, void *context ) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + WINE_TRACE( "shutting down\n" ); + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + SetEvent( stop_event ); + return NO_ERROR; + default: + WINE_FIXME( "got service ctrl %x\n", ctrl ); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus( service_handle, &status ); + return NO_ERROR; + } +} + +/*********************************************************************** + * ServiceMain (fntcache.@) + */ +VOID WINAPI ServiceMain(DWORD argc, LPWSTR *argv) +{ + static const WCHAR fontcacheW[] = {'F','o','n','t','C','a','c','h','e',0}; + SERVICE_STATUS status; + + WINE_TRACE( "starting service\n" ); + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + + service_handle = RegisterServiceCtrlHandlerExW( fontcacheW, service_handler, NULL ); + if (!service_handle) + return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 10000; + SetServiceStatus( service_handle, &status ); + + WaitForSingleObject( stop_event, INFINITE ); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + WINE_TRACE( "service stopped\n" ); +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ac6c697..595d4b9 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -121,8 +121,9 @@ AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService -AddService=FontCache3.0.0.0,0,FontCacheService +AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService +AddService=FontCache,0,FontCacheService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -132,8 +133,9 @@ AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService -AddService=FontCache3.0.0.0,0,FontCacheService +AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService +AddService=FontCache,0,FontCacheService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -143,8 +145,9 @@ AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService -AddService=FontCache3.0.0.0,0,FontCacheService +AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService +AddService=FontCache,0,FontCacheService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -2989,7 +2992,7 @@ ServiceType=32 StartType=2 ErrorControl=1 -[FontCacheService] +[WPFFontCacheService] Description="Windows Presentation Foundation font cache service" DisplayName="Windows Presentation Foundation Font Cache 3.0.0.0" ServiceBinary="%10%\Microsoft.Net\Framework\v3.0\wpf\presentationfontcache.exe" @@ -3010,6 +3013,19 @@ ErrorControl=1 HKR,Parameters,"ServiceDll",,"%11%\srvsvc.dll" ;; HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"lanmanserver" +[FontCacheService] +AddReg=FontCacheServiceKeys +Description="Windows Font Cache Service" +DisplayName="Windows Font Cache Service" +ServiceBinary="%11%\svchost.exe -k netsvcs" +ServiceType=32 +StartType=3 +ErrorControl=1 + +[FontCacheServiceKeys] +HKR,Parameters,"ServiceDll",,"%11%\fntcache.dll" +;; HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"fontcache" + [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16

1 0

Nikolay Sivov : programs: Added stub wevtutil tool.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: 964c7d730587aa45427b2bae2bd196a73e0a8812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=964c7d730587aa45427b2bae2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 25 12:12:43 2014 +0400 programs: Added stub wevtutil tool. --- configure | 2 ++ configure.ac | 1 + programs/wevtutil/Makefile.in | 5 +++++ programs/wevtutil/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index a38957f..39f0213 100755 --- a/configure +++ b/configure @@ -1357,6 +1357,7 @@ enable_termsv enable_uninstaller enable_unlodctr enable_view +enable_wevtutil enable_wineboot enable_winebrowser enable_winecfg @@ -17338,6 +17339,7 @@ wine_fn_config_program termsv enable_termsv install wine_fn_config_program uninstaller enable_uninstaller install,po wine_fn_config_program unlodctr enable_unlodctr install wine_fn_config_program view enable_view install,po +wine_fn_config_program wevtutil enable_wevtutil install wine_fn_config_program wineboot enable_wineboot install,installbin,manpage,po wine_fn_config_program winebrowser enable_winebrowser install wine_fn_config_program winecfg enable_winecfg install,installbin,manpage,po diff --git a/configure.ac b/configure.ac index 3574343..540d5fe 100644 --- a/configure.ac +++ b/configure.ac @@ -3345,6 +3345,7 @@ WINE_CONFIG_PROGRAM(termsv,,[install]) WINE_CONFIG_PROGRAM(uninstaller,,[install,po]) WINE_CONFIG_PROGRAM(unlodctr,,[install]) WINE_CONFIG_PROGRAM(view,,[install,po]) +WINE_CONFIG_PROGRAM(wevtutil,,[install]) WINE_CONFIG_PROGRAM(wineboot,,[install,installbin,manpage,po]) WINE_CONFIG_PROGRAM(winebrowser,,[install]) WINE_CONFIG_PROGRAM(winecfg,,[install,installbin,manpage,po]) diff --git a/programs/wevtutil/Makefile.in b/programs/wevtutil/Makefile.in new file mode 100644 index 0000000..f6882b2 --- /dev/null +++ b/programs/wevtutil/Makefile.in @@ -0,0 +1,5 @@ +MODULE = wevtutil.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/wevtutil/main.c b/programs/wevtutil/main.c new file mode 100644 index 0000000..bd95d1f --- /dev/null +++ b/programs/wevtutil/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2014 Nikolay Sivov for CodeWeavers + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wevtutil); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Alistair Leslie-Hughes : dpnet: Add pointer tests and checks in EnumServiceProvider.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: bf681bff2ef2b11337536e98c73572b09503f412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf681bff2ef2b11337536e98c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 19 15:08:55 2014 +1100 dpnet: Add pointer tests and checks in EnumServiceProvider. --- dlls/dpnet/peer.c | 3 +++ dlls/dpnet/tests/peer.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 7b962a4..02b8d99 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -130,6 +130,9 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer TRACE("(%p)->(%p,%p,%p,%p,%p,%x): stub\n", iface, pguidServiceProvider, pguidApplication, pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); + if(!pcReturned || !pcbEnumData) + return E_POINTER; + if(!pguidServiceProvider) { req_size = sizeof(DPN_SERVICE_PROVIDER_INFO) + sizeof(dp_providerW); diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index d2f0ccf..aea67c9 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -59,6 +59,12 @@ static void test_enum_service_providers(void) size = 0; items = 0; + hr = IDirectPlay8Peer_EnumServiceProviders(peer, NULL, NULL, NULL, &size, NULL, 0); + ok(hr == E_POINTER, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Peer_EnumServiceProviders(peer, NULL, NULL, NULL, NULL, &items, 0); + ok(hr == E_POINTER, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + hr = IDirectPlay8Peer_EnumServiceProviders(peer, NULL, NULL, NULL, &size, &items, 0); ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); ok(size != 0, "size is unexpectedly 0\n");

1 0

Stefan Leichter : wtsapi32/tests: Add some tests for WTSEnumerateProcessesW.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: 26777a463800b1f784170b15065432dd824b4ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26777a463800b1f784170b150… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Wed Feb 19 21:30:39 2014 +0100 wtsapi32/tests: Add some tests for WTSEnumerateProcessesW. --- configure | 1 + configure.ac | 1 + dlls/wtsapi32/tests/Makefile.in | 5 ++ dlls/wtsapi32/tests/wtsapi.c | 106 +++++++++++++++++++++++++++++++++++++++ include/wtsapi32.h | 2 + 5 files changed, 115 insertions(+) diff --git a/configure b/configure index 39f0213..c6f4b39 100755 --- a/configure +++ b/configure @@ -17256,6 +17256,7 @@ wine_fn_config_dll wsnmp32 enable_wsnmp32 implib wine_fn_config_test dlls/wsnmp32/tests wsnmp32_test wine_fn_config_dll wsock32 enable_wsock32 implib wine_fn_config_dll wtsapi32 enable_wtsapi32 implib +wine_fn_config_test dlls/wtsapi32/tests wtsapi32_test wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng wine_fn_config_dll xapofx1_1 enable_xapofx1_1 diff --git a/configure.ac b/configure.ac index 540d5fe..098a5bd 100644 --- a/configure.ac +++ b/configure.ac @@ -3262,6 +3262,7 @@ WINE_CONFIG_DLL(wsnmp32,,[implib]) WINE_CONFIG_TEST(dlls/wsnmp32/tests) WINE_CONFIG_DLL(wsock32,,[implib]) WINE_CONFIG_DLL(wtsapi32,,[implib]) +WINE_CONFIG_TEST(dlls/wtsapi32/tests) WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) WINE_CONFIG_DLL(xapofx1_1) diff --git a/dlls/wtsapi32/tests/Makefile.in b/dlls/wtsapi32/tests/Makefile.in new file mode 100644 index 0000000..a398a80 --- /dev/null +++ b/dlls/wtsapi32/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wtsapi32.dll +IMPORTS = wtsapi32 + +C_SRCS = \ + wtsapi.c diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c new file mode 100644 index 0000000..4c2a9e9 --- /dev/null +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -0,0 +1,106 @@ +/* + * Copyright 2014 Stefan Leichter + * + * 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 <stdarg.h> +#include <stdlib.h> +#include <windef.h> +#include <winbase.h> +#include <winternl.h> +#include <wtsapi32.h> + +#include "wine/test.h" + +static void test_WTSEnumerateProcessesW(void) +{ + BOOL found = FALSE, ret; + DWORD count, i; + PWTS_PROCESS_INFOW info; + WCHAR *pname, nameW[MAX_PATH]; + + GetModuleFileNameW(NULL, nameW, MAX_PATH); + for (pname = nameW + lstrlenW(nameW); pname > nameW; pname--) + { + if(*pname == '/' || *pname == '\\') + { + pname++; + break; + } + } + + info = NULL; + SetLastError(0xdeadbeef); + ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 1, 1, &info, &count); + todo_wine + ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); + todo_wine + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + if (info) WTSFreeMemory(info); + + info = NULL; + SetLastError(0xdeadbeef); + ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 0, &info, &count); + todo_wine + ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); + todo_wine + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + if (info) WTSFreeMemory(info); + + info = NULL; + SetLastError(0xdeadbeef); + ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 2, &info, &count); + todo_wine + ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); + todo_wine + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + if (info) WTSFreeMemory(info); + + info = NULL; + SetLastError(0xdeadbeef); + ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, NULL, &count); + ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); + todo_wine + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + if (info) WTSFreeMemory(info); + + info = NULL; + SetLastError(0xdeadbeef); + ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, &info, NULL); + ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); + todo_wine + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + if (info) WTSFreeMemory(info); + + count = 0; + info = NULL; + SetLastError(0xdeadbeef); + ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, &info, &count); + ok(ret || broken(!ret), /* fails on Win2K with error ERROR_APP_WRONG_OS */ + "expected WTSEnumerateProcessesW to succeed; failed with %d\n", GetLastError()); + for(i = 0; ret && i < count; i++) + { + found = found || !lstrcmpW(pname, info[i].pProcessName); + } + todo_wine + ok(found || broken(!ret), "process name %s not found\n", wine_dbgstr_w(pname)); + if (info) WTSFreeMemory(info); +} + +START_TEST (wtsapi) +{ + test_WTSEnumerateProcessesW(); +} diff --git a/include/wtsapi32.h b/include/wtsapi32.h index f4bab56..d00a699 100644 --- a/include/wtsapi32.h +++ b/include/wtsapi32.h @@ -135,6 +135,8 @@ typedef struct _WTS_SERVER_INFOW DECL_WINELIB_TYPE_AW(WTS_SERVER_INFO) DECL_WINELIB_TYPE_AW(PWTS_SERVER_INFO) +#define WTS_CURRENT_SERVER_HANDLE ((HANDLE)NULL) + void WINAPI WTSCloseServer(HANDLE); BOOL WINAPI WTSConnectSessionA(ULONG, ULONG, PSTR, BOOL); BOOL WINAPI WTSConnectSessionW(ULONG, ULONG, PWSTR, BOOL);

1 0

Vincent Povirk : msi/tests: Add tests for [un]registering progids.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: b4daf7a7f01565da17831dc59c74a7d4b389f538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4daf7a7f01565da17831dc59… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 24 15:00:55 2014 -0600 msi/tests: Add tests for [un]registering progids. --- dlls/msi/tests/action.c | 216 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 216 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 4d1af05..371860d 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -21,6 +21,7 @@ #define _WIN32_MSI 300 #include <stdio.h> +#include <stdlib.h> #include <windows.h> #include <msiquery.h> @@ -1330,6 +1331,85 @@ static const char rei_install_exec_seq_dat[] = "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rpi_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "progid.txt\tprogid\tprogid.txt\t1000\t\t\t8192\t1\n"; + +static const char rpi_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "progid\t\t\tprogid feature\t1\t2\tMSITESTDIR\t0\n"; + +static const char rpi_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "progid\tprogid\n"; + +static const char rpi_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "progid\t{89A98345-F8A1-422E-A48B-0250B5809F2D}\tMSITESTDIR\t0\t\tprogid.txt\n"; + +static const char rpi_appid_dat[] = + "AppId\tRemoteServerName\tLocalService\tServiceParameters\tDllSurrogate\tActivateAtStorage\tRunAsInteractiveUser\n" + "s38\tS255\tS255\tS255\tS255\tI2\tI2\n" + "AppId\tAppId\n" + "{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}\t\t\t\t\t\t\n"; + +static const char rpi_class_dat[] = + "CLSID\tContext\tComponent_\tProgId_Default\tDescription\tAppId_\tFileTypeMask\tIcon_\tIconIndex\tDefInprocHandler\tArgument\tFeature_\tAttributes\n" + "s38\ts32\ts72\tS255\tL255\tS38\tS255\tS72\tI2\tS32\tS255\ts38\tI2\n" + "Class\tCLSID\tContext\tComponent_\n" + "{110913E7-86D1-4BF3-9922-BA103FCDDDFA}\tLocalServer\tprogid\tWinetest.Class.1\tdescription\t{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}\tmask1;mask2\t\t\t2\t\tprogid\t\n" + "{904E6BC9-F57F-4412-B460-D40DE2F256E2}\tLocalServer\tprogid\tWinetest.VerClass\tdescription\t{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}\tmask1;mask2\t\t\t2\t\tprogid\t\n" + "{57C413FB-CA02-498A-81F6-7E769BDB7C97}\tLocalServer\tprogid\t\tdescription\t{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}\tmask1;mask2\t\t\t2\t\tprogid\t\n"; + +static const char rpi_extension_dat[] = + "Extension\tComponent_\tProgId_\tMIME_\tFeature_\n" + "s255\ts72\tS255\tS64\ts38\n" + "Extension\tExtension\tComponent_\n"; + +static const char rpi_progid_dat[] = + "ProgId\tProgId_Parent\tClass_\tDescription\tIcon_\tIconIndex\n" + "s255\tS255\tS38\tL255\tS72\tI2\n" + "ProgId\tProgId\n" + "Winetest.Class.1\t\t{110913E7-86D1-4BF3-9922-BA103FCDDDFA}\tdescription\t\t\n" + "Winetest.Class\tWinetest.Class.1\t\tdescription\t\t\n" + "Winetest.Class.2\t\t{110913E7-86D1-4BF3-9922-BA103FCDDDFA}\tdescription\t\t\n" + "Winetest.VerClass.1\t\t{904E6BC9-F57F-4412-B460-D40DE2F256E2}\tdescription\t\t\n" + "Winetest.VerClass\tWinetest.VerClass.1\t\tdescription\t\t\n" + "Winetest.NoProgIdClass.1\t\t{57C413FB-CA02-498A-81F6-7E769BDB7C97}\tdescription\t\t\n" + "Winetest.NoProgIdClass\tWinetest.NoProgIdClass.1\t\tdescription\t\t\n" + "Winetest.Orphaned\t\t\tdescription\t\t\n" + "Winetest.Orphaned2\t\t\tdescription\t\t\n"; + +static const char rpi_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "UnregisterClassInfo\t\t3000\n" + "UnregisterProgIdInfo\t\t3400\n" + "RegisterClassInfo\t\t4000\n" + "RegisterProgIdInfo\t\t4400\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + static const char rmi_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -1894,6 +1974,22 @@ static const msi_table rei_tables[] = ADD_TABLE(property) }; +static const msi_table rpi_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(rpi_component), + ADD_TABLE(rpi_feature), + ADD_TABLE(rpi_feature_comp), + ADD_TABLE(rpi_file), + ADD_TABLE(rpi_appid), + ADD_TABLE(rpi_class), + ADD_TABLE(rpi_extension), + ADD_TABLE(rpi_progid), + ADD_TABLE(rpi_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + static const msi_table rmi_tables[] = { ADD_TABLE(directory), @@ -6216,6 +6312,125 @@ error: DeleteFileA(msifile); } +static void test_register_progid_info(void) +{ + UINT r; + LONG res; + HKEY hkey; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + create_test_files(); + create_file("msitest\\progid.txt", 1000); + create_database(msifile, rpi_tables, sizeof(rpi_tables) / sizeof(msi_table)); + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, "Winetest.Orphaned", 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + ok(res == ERROR_SUCCESS, "key not created\n"); + RegCloseKey(hkey); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + if (is_64bit) + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Wow6432Node\\CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); + else + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); + ok(res == ERROR_SUCCESS, "key not created\n"); + RegCloseKey(hkey); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class.1", &hkey); + ok(res == ERROR_SUCCESS, "key not created\n"); + RegCloseKey(hkey); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class", &hkey); + ok(res == ERROR_SUCCESS, "key not created\n"); + RegCloseKey(hkey); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class.2", &hkey); + ok(res == ERROR_SUCCESS, "key not created\n"); + RegCloseKey(hkey); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.VerClass.1", &hkey); + ok(res == ERROR_SUCCESS, "key not created\n"); + RegCloseKey(hkey); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.VerClass", &hkey); + ok(res == ERROR_SUCCESS, "key not created\n"); + RegCloseKey(hkey); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.NoProgIdClass.1", &hkey); + todo_wine ok(res == ERROR_FILE_NOT_FOUND, "key created\n"); + if (res == ERROR_SUCCESS) RegCloseKey(hkey); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.NoProgIdClass", &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "key created\n"); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Orphaned", &hkey); + todo_wine ok(res == ERROR_SUCCESS, "key deleted\n"); + if (res == ERROR_SUCCESS) RegCloseKey(hkey); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Orphaned2", &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "key created\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + if (is_64bit) + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Wow6432Node\\CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); + else + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class.1", &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class", &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class.2", &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.VerClass.1", &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.VerClass", &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.NoProgIdClass.1", &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.NoProgIdClass", &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Orphaned", &hkey); + todo_wine ok(res == ERROR_SUCCESS, "key deleted\n"); + if (res == ERROR_SUCCESS) RegCloseKey(hkey); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Orphaned2", &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + + ok(!delete_pf("msitest\\progid.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + +error: + DeleteFileA("msitest\\progid.txt"); + delete_test_files(); + DeleteFileA(msifile); + RegDeleteKeyA(HKEY_CLASSES_ROOT, "Winetest.Orphaned"); +} + static void test_register_mime_info(void) { UINT r; @@ -6586,6 +6801,7 @@ START_TEST(action) test_remove_env_strings(); test_register_class_info(); test_register_extension_info(); + test_register_progid_info(); test_register_mime_info(); test_publish_assemblies(); test_remove_existing_products();

1 0

Huw Davies : wineps: Return 32 even for monochrome printers.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: 7c684cc81ceab2431db3e425645a1d5f0b60dae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c684cc81ceab2431db3e4256… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 25 15:53:10 2014 +0000 wineps: Return 32 even for monochrome printers. Returning 1 led to CreateCompatibleBitmap producing 1 bpp bitmaps, which is not correct. --- dlls/wineps.drv/init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index ec98f04..fde65c2 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -503,7 +503,9 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) case DESKTOPVERTRES: return physDev->vertRes; case BITSPIXEL: - return (physDev->pi->ppd->ColorDevice != CD_False) ? 32 : 1; + /* Although Windows returns 1 for monochrome printers, we want + CreateCompatibleBitmap to provide something other than 1 bpp */ + return 32; case PLANES: return 1; case NUMBRUSHES:

1 0

André Hentschel : kernel32/tests: Remove unused assertion header.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: 7f9756e1ea2146d3c5958ce53ecd0286d478988c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9756e1ea2146d3c5958ce53… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 21 22:06:38 2014 +0100 kernel32/tests: Remove unused assertion header. --- dlls/kernel32/tests/version.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index bd379fa..e27ea4c 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -21,8 +21,6 @@ /* Needed for PRODUCT_* defines and GetProductInfo() */ #define _WIN32_WINNT 0x0600 -#include <assert.h> - #include "wine/test.h" #include "winbase.h"

1 0

Francois Gouget : ddraw/tests: Fix some comma versus semi-colon mixups.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: 4f26fb0e0bde28673e5791f7b634d7dd97ee285f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f26fb0e0bde28673e5791f7b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 26 19:53:48 2014 +0100 ddraw/tests: Fix some comma versus semi-colon mixups. --- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index fb98dad..66a2662 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3692,7 +3692,7 @@ static void test_surface_lock(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; if (!(tests[i].caps & DDSCAPS_PRIMARYSURFACE)) @@ -3711,7 +3711,7 @@ static void test_surface_lock(void) hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, type %s, hr %#x.\n", tests[i].name, hr); - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); hr = IDirectDrawSurface_Lock(surface, NULL, &ddsd, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, type %s, hr %#x.\n", tests[i].name, hr); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ea89398..2a69a2f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4374,7 +4374,7 @@ static void test_surface_lock(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; if (!(tests[i].caps & DDSCAPS_PRIMARYSURFACE)) @@ -4393,7 +4393,7 @@ static void test_surface_lock(void) hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, type %s, hr %#x.\n", tests[i].name, hr); - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); hr = IDirectDrawSurface_Lock(surface, NULL, &ddsd, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, type %s, hr %#x.\n", tests[i].name, hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 7efdfe8..c29ed40 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4972,7 +4972,7 @@ static void test_surface_lock(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; if (!(tests[i].caps & DDSCAPS_PRIMARYSURFACE)) @@ -4992,7 +4992,7 @@ static void test_surface_lock(void) hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, type %s, hr %#x.\n", tests[i].name, hr); - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); hr = IDirectDrawSurface4_Lock(surface, NULL, &ddsd, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, type %s, hr %#x.\n", tests[i].name, hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 8210cf0..76a44fe 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4827,7 +4827,7 @@ static void test_surface_lock(void) goto done; } - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; ddsd.dwWidth = 64; @@ -4850,7 +4850,7 @@ static void test_surface_lock(void) if (!cubemap_supported && tests[i].caps2 & DDSCAPS2_CUBEMAP) continue; - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; if (!(tests[i].caps & DDSCAPS_PRIMARYSURFACE)) @@ -4870,7 +4870,7 @@ static void test_surface_lock(void) hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, type %s, hr %#x.\n", tests[i].name, hr); - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); hr = IDirectDrawSurface7_Lock(surface, NULL, &ddsd, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, type %s, hr %#x.\n", tests[i].name, hr);

1 0

Aric Stewart : dmime: Do not try to query a NULL direct sound buffer.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: fcae01672f2d480597a40850ff0386268b24791d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcae01672f2d480597a40850f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 26 18:03:35 2014 +0900 dmime: Do not try to query a NULL direct sound buffer. --- dlls/dmime/audiopath.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 6b7a2f0..66e218c 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -108,21 +108,22 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_GetObjectI FIXME("(%p, %d, %d, %d, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); switch (dwStage) { - case DMUS_PATH_BUFFER: - { - if (IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8)) { - IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSoundBuffer8, ppObject); - TRACE("returning %p\n",*ppObject); - return S_OK; - } else if (IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSound3DBuffer, ppObject); - TRACE("returning %p\n",*ppObject); - return S_OK; - } else { - FIXME("Bad iid\n"); - } - } - break; + case DMUS_PATH_BUFFER: + if (This->pDSBuffer) + { + if (IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8)) { + IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSoundBuffer8, ppObject); + TRACE("returning %p\n",*ppObject); + return S_OK; + } else if (IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { + IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSound3DBuffer, ppObject); + TRACE("returning %p\n",*ppObject); + return S_OK; + } else { + FIXME("Bad iid\n"); + } + } + break; case DMUS_PATH_PRIMARY_BUFFER: { if (IsEqualIID (iidInterface, &IID_IDirectSound3DListener)) {

1 0

Francois Gouget : d3d10_1: Make debug_d3d10_{driver_type, feature_level}() static.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: 305ff1287b224ac7e1b7584ec737cdbb7d08067f URL: http://source.winehq.org/git/wine.git/?a=commit;h=305ff1287b224ac7e1b7584ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 24 23:57:16 2014 +0100 d3d10_1: Make debug_d3d10_{driver_type,feature_level}() static. --- dlls/d3d10_1/d3d10_1_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index c1aa5eb..721fe7d 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -31,7 +31,7 @@ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte #define WINE_D3D10_TO_STR(x) case x: return #x -const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) +static const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) { switch (driver_type) { @@ -46,7 +46,7 @@ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) } } -const char *debug_d3d10_feature_level(D3D10_FEATURE_LEVEL1 feature_level) +static const char *debug_d3d10_feature_level(D3D10_FEATURE_LEVEL1 feature_level) { switch (feature_level) {

1 0