wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Francois Gouget : attrib: Make ATTRIB_wprintf() static.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: f720ccdc282d5937d91d423b8d163d78079bee84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f720ccdc282d5937d91d423b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 8 12:18:04 2011 +0200 attrib: Make ATTRIB_wprintf() static. --- programs/attrib/attrib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 33bf3c4..0ca64c3 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -45,7 +45,7 @@ static WCHAR *ATTRIB_LoadMessage(UINT id) { * and hence required WriteConsoleW to output it, however if file i/o is * redirected, it needs to be WriteFile'd using OEM (not ANSI) format * ========================================================================= */ -int ATTRIB_wprintf(const WCHAR *format, ...) { +static int ATTRIB_wprintf(const WCHAR *format, ...) { static WCHAR *output_bufW = NULL; static char *output_bufA = NULL;

1 0

Frédéric Delanoy : cmd: Fix IF operands parsing for '==' operator.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 712276c7bf561ae3bf34e851c1d794568cd5b8f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=712276c7bf561ae3bf34e851c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 6 19:19:44 2011 +0200 cmd: Fix IF operands parsing for '==' operator. --- programs/cmd/builtins.c | 13 +++++++++++-- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 9dbeb93..9c4f72a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1525,9 +1525,18 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { WCMD_parameter(p, 2+negate, &command, NULL); } else if ((s = strstrW (p, eqeqW))) { + /* We need to get potential surrounding double quotes, so param1/2 can't be used */ + WCHAR *leftPart, *leftPartEnd, *rightPart, *rightPartEnd; s += 2; - test = caseInsensitive ? (!lstrcmpiW(condition, WCMD_parameter(s, 0, NULL, NULL))) - : (!lstrcmpW (condition, WCMD_parameter(s, 0, NULL, NULL))); + WCMD_parameter(p, 0+negate+caseInsensitive, &leftPart, &leftPartEnd); + WCMD_parameter(p, 1+negate+caseInsensitive, &rightPart, &rightPartEnd); + test = caseInsensitive + ? (CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + leftPart, leftPartEnd-leftPart+1, + rightPart, rightPartEnd-rightPart+1) == CSTR_EQUAL) + : (CompareStringW(LOCALE_SYSTEM_DEFAULT, 0, + leftPart, leftPartEnd-leftPart+1, + rightPart, rightPartEnd-rightPart+1) == CSTR_EQUAL); WCMD_parameter(s, 1, &command, NULL); } else { diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 514a635..90dfb45 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -382,15 +382,15 @@ NUL if/else should work with blocks if seems to work else seems to work -@todo_wine@if seems not to detect /c as parameter +if seems not to detect /c as parameter Testing case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work if /I seems to work Testing string comparisons equal -@todo_wine@non equal -@todo_wine@non equal +non equal +non equal equal Testing tabs handling doom

1 0

Frédéric Delanoy : cmd: Add an output parameter to WCMD_parameter to point to the end of the extracted param , if requested.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 3627c289585466b1cb04601339de0d3da55becc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3627c289585466b1cb0460133… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 6 19:19:43 2011 +0200 cmd: Add an output parameter to WCMD_parameter to point to the end of the extracted param, if requested. --- programs/cmd/batch.c | 12 ++++++++---- programs/cmd/builtins.c | 34 +++++++++++++++++----------------- programs/cmd/directory.c | 2 +- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 10 +++++----- 5 files changed, 32 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3627c289585466b1cb046…

1 0

Frédéric Delanoy : cmd: Clarify WCMD_if function.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 191056ad5cab8e309ba793bd09d55e0a2b417435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=191056ad5cab8e309ba793bd0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 6 19:19:42 2011 +0200 cmd: Clarify WCMD_if function. --- programs/cmd/builtins.c | 31 ++++++++++--------------------- 1 files changed, 10 insertions(+), 21 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1320b32..35797f1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1497,7 +1497,8 @@ void WCMD_popd (void) { void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { - int negate = 0, test = 0; + int negate; /* Negate condition */ + int test; /* Condition evaluation result */ WCHAR condition[MAX_PATH], *command, *s; static const WCHAR notW[] = {'n','o','t','\0'}; static const WCHAR errlvlW[] = {'e','r','r','o','r','l','e','v','e','l','\0'}; @@ -1505,40 +1506,28 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { static const WCHAR defdW[] = {'d','e','f','i','n','e','d','\0'}; static const WCHAR eqeqW[] = {'=','=','\0'}; static const WCHAR parmI[] = {'/','I','\0'}; + int caseInsensitive = (strstrW(quals, parmI) != NULL); - if (!lstrcmpiW (param1, notW)) { - negate = 1; - strcpyW (condition, param2); - } - else { - strcpyW (condition, param1); - } + negate = !lstrcmpiW(param1,notW); + strcpyW(condition, (negate ? param2 : param1)); WINE_TRACE("Condition: %s\n", wine_dbgstr_w(condition)); if (!lstrcmpiW (condition, errlvlW)) { - if (errorlevel >= atoiW(WCMD_parameter (p, 1+negate, NULL))) test = 1; + test = (errorlevel >= atoiW(WCMD_parameter(p, 1+negate, NULL))); WCMD_parameter (p, 2+negate, &command); } else if (!lstrcmpiW (condition, existW)) { - if (GetFileAttributesW(WCMD_parameter (p, 1+negate, NULL)) != INVALID_FILE_ATTRIBUTES) { - test = 1; - } + test = (GetFileAttributesW(WCMD_parameter(p, 1+negate, NULL)) != INVALID_FILE_ATTRIBUTES); WCMD_parameter (p, 2+negate, &command); } else if (!lstrcmpiW (condition, defdW)) { - if (GetEnvironmentVariableW(WCMD_parameter (p, 1+negate, NULL), NULL, 0) > 0) { - test = 1; - } + test = (GetEnvironmentVariableW(WCMD_parameter(p, 1+negate, NULL), NULL, 0) > 0); WCMD_parameter (p, 2+negate, &command); } else if ((s = strstrW (p, eqeqW))) { s += 2; - if (strstrW (quals, parmI) == NULL) { - if (!lstrcmpW (condition, WCMD_parameter (s, 0, NULL))) test = 1; - } - else { - if (!lstrcmpiW (condition, WCMD_parameter (s, 0, NULL))) test = 1; - } + test = caseInsensitive ? (!lstrcmpiW(condition, WCMD_parameter(s, 0, NULL))) + : (!lstrcmpW (condition, WCMD_parameter(s, 0, NULL))); WCMD_parameter (s, 1, &command); } else {

1 0

Frédéric Delanoy : cmd: Simplify WCMD_parameter function.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 7b9af2268226665252c7c447d5ce47480efe5e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b9af2268226665252c7c447d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 6 19:19:41 2011 +0200 cmd: Simplify WCMD_parameter function. --- programs/cmd/batch.c | 78 ++++++++++++++++++-------------------------------- 1 files changed, 28 insertions(+), 50 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index a978ef1..53330ff 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -138,59 +138,37 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN */ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where) { - - int i = 0; - static WCHAR param[MAX_PATH]; - WCHAR *p; - - if (where != NULL) *where = NULL; - p = param; - while (TRUE) { - switch (*s) { - case ' ': /* Skip leading spaces */ - case '\t': /* Treat tabs as spaces */ - s++; - break; - case '"': - if (where != NULL && i==n) *where = s; - s++; - while ((*s != '\0') && (*s != '"')) { - *p++ = *s++; - } - if (i == n) { - *p = '\0'; - return param; - } - if (*s == '"') s++; - param[0] = '\0'; - i++; - p = param; - break; - /* The code to handle bracketed parms is removed because it should no longer - be necessary after the multiline support has been added and the for loop - set of data is now parseable individually. */ - case '\0': - return param; - default: - /* Only return where if it is for the right parameter */ - if (where != NULL && i==n) *where = s; - while ((*s != '\0') && (*s != ' ') && (*s != ',') && (*s != '=') && (*s != '\t')) { - *p++ = *s++; - } - if (i == n && (p!=param)) { - *p = '\0'; - return param; - } - /* Skip double delimiters, eg. dir a.a,,,,,b.b */ - if (p != param) { - param[0] = '\0'; - i++; + int curParamNb = 0; + static WCHAR param[MAX_PATH]; + WCHAR *p = s, *q; + BOOL quotesDelimited; + + if (where != NULL) *where = NULL; + param[0] = '\0'; + while (TRUE) { + while (*p && ((*p == ' ') || (*p == ',') || (*p == '=') || (*p == '\t'))) + p++; + if (*p == '\0') return param; + + quotesDelimited = (*p == '"'); + if (where != NULL && curParamNb == n) *where = p; + + if (quotesDelimited) { + q = ++p; + while (*p && *p != '"') p++; } else { - s++; /* Skip delimiter */ + q = p; + while (*p && (*p != ' ') && (*p != ',') && (*p != '=') && (*p != '\t')) + p++; } - p = param; + if (curParamNb == n) { + memcpy(param, q, (p - q) * sizeof(WCHAR)); + param[p-q] = '\0'; + return param; + } + if (quotesDelimited && *p == '"') p++; + curParamNb++; } - } } /****************************************************************************

1 0

Frédéric Delanoy : cmd: Fix misleading WCMD_parameter documentation.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 40c6ff8abe8e48d59516e83f306b581bbb5121cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c6ff8abe8e48d59516e83f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 6 19:19:40 2011 +0200 cmd: Fix misleading WCMD_parameter documentation. --- programs/cmd/batch.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index f010f28..a978ef1 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -113,12 +113,28 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN } /******************************************************************* - * WCMD_parameter - extract a parameter from a command line. + * WCMD_parameter * - * Returns the 'n'th delimited parameter on the command line (zero-based). - * Parameter is in static storage overwritten on the next call. - * Parameters in quotes (and brackets) are handled. - * Also returns a pointer to the location of the parameter in the command line. + * Extracts a delimited parameter from an input string + * + * PARAMS + * s [I] input string, non NULL + * n [I] # of the (possibly double quotes-delimited) parameter to return + * Starts at 0 + * where [O] if non NULL, pointer to the start of the nth parameter in s, + * potentially a " character + * + * RETURNS + * Success: Returns the nth delimited parameter found in s. + * *where points to the start of the param, possibly a starting + * double quotes character + * Failure: Returns an empty string if the param is not found. + * *where is set to NULL + * + * NOTES + * Return value is stored in static storage, hence is overwritten + * after each call. + * Doesn't include any potentially delimiting double quotes */ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where) {

1 0

Francois Gouget : ddraw: Remove WINAPI on static functions where not needed .
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 489527fe44e5f61e974d7563892fce8a98e81a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=489527fe44e5f61e974d75638… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 8 11:01:41 2011 +0200 ddraw: Remove WINAPI on static functions where not needed. --- dlls/ddraw/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 081d4e1..d70e355 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -875,7 +875,7 @@ static HRESULT WINAPI ddraw_surface1_GetAttachedSurface(IDirectDrawSurface *ifac * For more details, see IWineD3DSurface::LockRect * *****************************************************************************/ -static HRESULT WINAPI surface_lock(IDirectDrawSurfaceImpl *This, +static HRESULT surface_lock(IDirectDrawSurfaceImpl *This, RECT *Rect, DDSURFACEDESC2 *DDSD, DWORD Flags, HANDLE h) { WINED3DLOCKED_RECT LockedRect;

1 0

Alexander Morozov : query: Add stub for LoadIFilter.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: ba6f99c239bfd7264f868702875dd9597b022be8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6f99c239bfd7264f8687028… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Aug 19 15:16:33 2011 +0400 query: Add stub for LoadIFilter. --- dlls/query/query.spec | 2 +- dlls/query/query_main.c | 7 +++++++ dlls/shell32/recyclebin.c | 2 +- include/ntquery.h | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/query/query.spec b/dlls/query/query.spec index 612ea2d..71b9874 100644 --- a/dlls/query/query.spec +++ b/dlls/query/query.spec @@ -33,7 +33,7 @@ @ stub InitializeFILTERPerformanceData @ stub _LoadBHIFilter@16 @ stub LoadBinaryFilter -@ stub LoadIFilter +@ stdcall LoadIFilter(wstr ptr ptr) @ stub LoadTextFilter @ stub LocateCatalogs @ stdcall LocateCatalogsA(str long ptr ptr ptr ptr) diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index 2d4e4ae..3414aec 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -98,3 +98,10 @@ HRESULT WINAPI LocateCatalogsW(WCHAR const *pwszScope, ULONG iBm, iBm, pwszMachine, pcMachine, pwszCat, pcCat); return CI_E_NOT_RUNNING; } + +HRESULT WINAPI LoadIFilter(WCHAR const *pwcsPath, IUnknown *pUnkOuter, void **ppIUnk) +{ + FIXME("%s %p %p\n", debugstr_w(pwcsPath), pUnkOuter, ppIUnk); + *ppIUnk = NULL; + return E_NOTIMPL; +} diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index eec9e00..4a8cec4 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -31,8 +31,8 @@ #include "winbase.h" #include "winreg.h" #include "winuser.h" -#include "ntquery.h" #include "shlwapi.h" +#include "ntquery.h" #include "shlobj.h" #include "shresdef.h" #include "shellfolder.h" diff --git a/include/ntquery.h b/include/ntquery.h index fc78c32..928dafc 100644 --- a/include/ntquery.h +++ b/include/ntquery.h @@ -74,6 +74,7 @@ STDAPI CIState(WCHAR const *, WCHAR const *, CI_STATE *); STDAPI LocateCatalogsA(CHAR const *, ULONG, CHAR *, ULONG *, CHAR *, ULONG *); STDAPI LocateCatalogsW(WCHAR const *, ULONG, WCHAR *, ULONG *, WCHAR *, ULONG *); #define LocateCatalogs WINELIB_NAME_AW(LocateCatalogs) +STDAPI LoadIFilter(WCHAR const *, IUnknown *, void **); #ifdef __cplusplus }

1 0

Louis Lenders : dpnet/tests: Add tests for IDirectPlay8Peer_EnumServiceProviders.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 7844535700a65a2852a7b365e71c3c7a9950cdbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7844535700a65a2852a7b365e… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Aug 29 22:56:35 2011 +0200 dpnet/tests: Add tests for IDirectPlay8Peer_EnumServiceProviders. --- configure | 1 + configure.ac | 1 + dlls/dpnet/tests/Makefile.in | 7 ++ dlls/dpnet/tests/peer.c | 135 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 0379352..caef433 100755 --- a/configure +++ b/configure @@ -14800,6 +14800,7 @@ wine_fn_config_dll dplayx enable_dplayx implib wine_fn_config_test dlls/dplayx/tests dplayx_test wine_fn_config_dll dpnaddr enable_dpnaddr wine_fn_config_dll dpnet enable_dpnet implib +wine_fn_config_test dlls/dpnet/tests dpnet_test wine_fn_config_dll dpnhpast enable_dpnhpast wine_fn_config_dll dpnlobby enable_dpnlobby wine_fn_config_dll dpwsockx enable_dpwsockx diff --git a/configure.ac b/configure.ac index 40ea431..e12fb37 100644 --- a/configure.ac +++ b/configure.ac @@ -2493,6 +2493,7 @@ WINE_CONFIG_DLL(dplayx,,[implib]) WINE_CONFIG_TEST(dlls/dplayx/tests) WINE_CONFIG_DLL(dpnaddr) WINE_CONFIG_DLL(dpnet,,[implib]) +WINE_CONFIG_TEST(dlls/dpnet/tests) WINE_CONFIG_DLL(dpnhpast) WINE_CONFIG_DLL(dpnlobby) WINE_CONFIG_DLL(dpwsockx) diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in new file mode 100644 index 0000000..58d5c94 --- /dev/null +++ b/dlls/dpnet/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = dpnet.dll +IMPORTS = dpnet ole32 + +C_SRCS = \ + peer.c + +@MAKE_TEST_RULES@ diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c new file mode 100644 index 0000000..afbea42 --- /dev/null +++ b/dlls/dpnet/tests/peer.c @@ -0,0 +1,135 @@ +/* + * Copyright 2011 Louis Lenders + * + * 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 INITGUID +#define WIN32_LEAN_AND_MEAN +#include <stdio.h> + +#include <dplay8.h> +#include "wine/test.h" + +static char *show_guid(const GUID *guid, char *buf) +{ + sprintf(buf, + "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + + return buf; +} + +static IDirectPlay8Peer* peer = NULL; + +static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + return S_OK; +} + +static void test_init_dp(void) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok(hr == S_OK, "CoInitialize failed with %x\n", hr); + + hr = CoCreateInstance(&CLSID_DirectPlay8Peer, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Peer, (void **)&peer); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8Peer_Initialize(peer, NULL, DirectPlayMessageHandler, 0); + todo_wine ok(hr == S_OK, "IDirectPlay8Peer_Initialize failed with %x\n", hr); +} + +static void test_enum_service_providers(void) +{ + DPN_SERVICE_PROVIDER_INFO *serv_prov_info; + DWORD items, size; + DWORD i; + HRESULT hr; + char guid[39] ; + + size = 0; + items = 0; + + hr = IDirectPlay8Peer_EnumServiceProviders(peer, NULL, NULL, NULL, &size, &items, 0); + todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = (DPN_SERVICE_PROVIDER_INFO*) HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Peer_EnumServiceProviders(peer, NULL, NULL, serv_prov_info, &size, &items, 0); + todo_wine ok(hr == S_OK, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(items != 0, "Found unexpectedly no service providers\n"); + + trace("number of items found: %d\n", items); + + for (i=0;i<items;i++) + { + trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info->pwszName)); + trace("Found guid: %s\n", show_guid(&serv_prov_info->guid, guid)); + + serv_prov_info++; + } + + serv_prov_info -= items; /* set pointer back */ + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + size = 0; + items = 0; + + hr = IDirectPlay8Peer_EnumServiceProviders(peer, &CLSID_DP8SP_TCPIP, NULL, NULL, &size, &items, 0); + todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = (DPN_SERVICE_PROVIDER_INFO*) HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Peer_EnumServiceProviders(peer, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); + todo_wine ok(hr == S_OK, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(items != 0, "Found unexpectedly no adapter\n"); + + for (i=0;i<items;i++) + { + trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info->pwszName)); + trace("Found adapter guid: %s\n", show_guid(&serv_prov_info->guid, guid)); + + serv_prov_info++; + } + + serv_prov_info -= items; /* set pointer back */ + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); +} + +static void test_cleanup_dp(void) +{ + HRESULT hr; + + hr = IDirectPlay8Peer_Close(peer, 0); + ok(hr == S_OK, "IDirectPlay8Peer_Close failed with %x\n", hr); + + hr = IDirectPlay8Peer_Release(peer); + ok(hr == S_OK, "IDirectPlay8Peer_Release failed with %x\n", hr); + + CoUninitialize(); +} + +START_TEST(peer) +{ + test_init_dp(); + test_enum_service_providers(); + test_cleanup_dp(); +}

1 0

Francois Gouget : services: Issue a fixme when a service fails to start.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: d49473335390718e461041ee16a3d9b04302ea0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49473335390718e461041ee1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 1 16:06:20 2011 +0200 services: Issue a fixme when a service fails to start. --- programs/services/services.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 742f17d..2aa3683 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -295,7 +295,9 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) argv[0] = service->name; argv[1] = NULL; err = service_start(service, 1, argv); - /* FIXME: do something if the service failed to start */ + if (err != ERROR_SUCCESS) + WINE_FIXME("Auto-start service %s failed to start: %d\n", + wine_dbgstr_w(service->name), err); release_service(service); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011