March 2007 - Wine-commits - list.winehq.org

Paul Vriens : mapi32/tests: Don' t run tests if functions are not implemented.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: 9f92437e291d45ba7800b72f9512a12b3f7b6adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f92437e291d45ba7800b72f9… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Mar 4 11:44:34 2007 +0100 mapi32/tests: Don't run tests if functions are not implemented. --- dlls/mapi32/tests/imalloc.c | 18 +++++++++++++++++- dlls/mapi32/tests/prop.c | 14 +++++++++++++- dlls/mapi32/tests/util.c | 19 ++++++++++++++++++- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/mapi32/tests/imalloc.c b/dlls/mapi32/tests/imalloc.c index f882a20..63c66f2 100644 --- a/dlls/mapi32/tests/imalloc.c +++ b/dlls/mapi32/tests/imalloc.c @@ -87,12 +87,28 @@ static void test_IMalloc(void) START_TEST(imalloc) { + SCODE ret; + hMapi32 = LoadLibraryA("mapi32.dll"); pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil(a)4"); if (!pScInitMapiUtil) + { + skip("ScInitMapiUtil is not available\n"); + FreeLibrary(hMapi32); + return; + } + + SetLastError(0xdeadbeef); + ret = pScInitMapiUtil(0); + if ((ret != S_OK) && (GetLastError() == ERROR_PROC_NOT_FOUND)) + { + skip("ScInitMapiUtil is not implemented\n"); + FreeLibrary(hMapi32); return; - pScInitMapiUtil(0); + } test_IMalloc(); + + FreeLibrary(hMapi32); } diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index ac397ff..d78eb36 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -1342,10 +1342,22 @@ static void test_IProp(void) START_TEST(prop) { + SCODE ret; + if(!InitFuncPtrs()) + { + skip("Needed functions are not available\n"); return; + } - pScInitMapiUtil(0); + SetLastError(0xdeadbeef); + ret = pScInitMapiUtil(0); + if ((ret != S_OK) && (GetLastError() == ERROR_PROC_NOT_FOUND)) + { + skip("ScInitMapiUtil is not implemented\n"); + FreeLibrary(hMapi32); + return; + } test_PropCopyMore(); test_UlPropSize(); diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index b2d156b..2ae42f1 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -169,12 +169,27 @@ static void test_IsBadBoundedStringPtr(void) START_TEST(util) { + SCODE ret; + hMapi32 = LoadLibraryA("mapi32.dll"); pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil(a)4"); + if (!pScInitMapiUtil) + { + skip("ScInitMapiUtil is not available\n"); + FreeLibrary(hMapi32); return; - pScInitMapiUtil(0); + } + + SetLastError(0xdeadbeef); + ret = pScInitMapiUtil(0); + if ((ret != S_OK) && (GetLastError() == ERROR_PROC_NOT_FOUND)) + { + skip("ScInitMapiUtil is not implemented\n"); + FreeLibrary(hMapi32); + return; + } test_SwapPword(); test_SwapPlong(); @@ -183,4 +198,6 @@ START_TEST(util) test_UlFromSzHex(); test_CbOfEncoded(); test_IsBadBoundedStringPtr(); + + FreeLibrary(hMapi32); }

1 0

Dmitry Timoshkov : gdi32: Avoid a needless goto.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: 17ac48b6a4dcfe73ba4256b89feabf0a710d587d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ac48b6a4dcfe73ba4256b89… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Mar 4 16:30:43 2007 +0800 gdi32: Avoid a needless goto. --- dlls/gdi32/font.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2578f33..3fc4420 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3223,14 +3223,14 @@ UINT WINAPI GetTextCharsetInfo(HDC hdc, LPFONTSIGNATURE fs, DWORD flags) UINT ret = DEFAULT_CHARSET; DC *dc = DC_GetDCPtr(hdc); - if (!dc) goto done; - - if (dc->gdiFont) - ret = WineEngGetTextCharsetInfo(dc->gdiFont, fs, flags); + if (dc) + { + if (dc->gdiFont) + ret = WineEngGetTextCharsetInfo(dc->gdiFont, fs, flags); - GDI_ReleaseObj(hdc); + GDI_ReleaseObj(hdc); + } -done: if (ret == DEFAULT_CHARSET && fs) memset(fs, 0, sizeof(FONTSIGNATURE)); return ret;

1 0

Francois Gouget : oleview: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: e0f2593446810b44422422bd86b049ad380fdca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f2593446810b44422422bd8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 4 02:00:13 2007 +0100 oleview: Fix compilation on systems that don't support nameless unions. --- programs/oleview/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 49568bb..b417c57 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -470,7 +470,7 @@ int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) { VARIANT var; VariantInit(&var); - if (VariantChangeType(&var, pVarDesc->lpvarValue, 0, VT_BSTR) == S_OK) + if (VariantChangeType(&var, U(*pVarDesc).lpvarValue, 0, VT_BSTR) == S_OK) { AddToStrW(wszText, wszConst); AddToStrW(wszText, wszSpace);

1 0

Francois Gouget : cmd: Remove unneeded NONAMELESS* defines and ifdefs.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: e8007d9d7bbdd7ebbe62407299ce39dd84d46b99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8007d9d7bbdd7ebbe6240729… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 5 10:26:16 2007 +0100 cmd: Remove unneeded NONAMELESS* defines and ifdefs. --- programs/cmd/directory.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 6a70eb8..ea652f9 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -25,8 +25,6 @@ * environment-variable and batch parameter substitution already done. */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define WIN32_LEAN_AND_MEAN #include "wcmd.h" @@ -224,13 +222,8 @@ void WCMD_list_directory (char *search_path, int level) { WCMD_output ("%s", (fd+i)->cFileName); tmp_width = tmp_width + strlen((fd+i)->cFileName) ; file_count++; -#ifndef NONAMELESSSTRUCT - file_size.LowPart = (fd+i)->nFileSizeLow; - file_size.HighPart = (fd+i)->nFileSizeHigh; -#else file_size.u.LowPart = (fd+i)->nFileSizeLow; file_size.u.HighPart = (fd+i)->nFileSizeHigh; -#endif byte_count.QuadPart += file_size.QuadPart; } cur_width = cur_width + widest; @@ -257,13 +250,8 @@ void WCMD_list_directory (char *search_path, int level) { } else { file_count++; -#ifndef NONAMELESSSTRUCT - file_size.LowPart = (fd+i)->nFileSizeLow; - file_size.HighPart = (fd+i)->nFileSizeHigh; -#else file_size.u.LowPart = (fd+i)->nFileSizeLow; file_size.u.HighPart = (fd+i)->nFileSizeHigh; -#endif byte_count.QuadPart += file_size.QuadPart; if (!bare) { WCMD_output ("%10s %8s %10s %s\n",

1 0

Francois Gouget : cmd: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: e46b99d2385d5d2fc2cf84d950c79dc7d7580d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46b99d2385d5d2fc2cf84d95… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 4 01:59:59 2007 +0100 cmd: Fix compilation on systems that don't support nameless unions. --- programs/cmd/batch.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index eb1bd09..cb09d47 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -603,13 +603,13 @@ void WCMD_call (char *command) { /* Save the current file position, call the same file, restore position */ li.QuadPart = 0; - li.LowPart = SetFilePointer(context -> h, li.LowPart, - &li.HighPart, FILE_CURRENT); + li.u.LowPart = SetFilePointer(context -> h, li.u.LowPart, + &li.u.HighPart, FILE_CURRENT); WCMD_batch (param1, command, 1, gotoLabel, context->h); - SetFilePointer(context -> h, li.LowPart, - &li.HighPart, FILE_BEGIN); + SetFilePointer(context -> h, li.u.LowPart, + &li.u.HighPart, FILE_BEGIN); } else { printf("Cannot call batch label outside of a batch script\n"); }

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: 4a1435aa799bd4585332c9275dbd881b529b664d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1435aa799bd4585332c9275… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 4 01:59:36 2007 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/visual.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 0972565..e2eef0c 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -313,16 +313,16 @@ static void clear_test(IDirect3DDevice7 *device) ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); /* Positive x, negative y */ - rect[0].x1 = 0; - rect[0].y1 = 480; - rect[0].x2 = 320; - rect[0].y2 = 240; + U1(rect[0]).x1 = 0; + U2(rect[0]).y1 = 480; + U3(rect[0]).x2 = 320; + U4(rect[0]).y2 = 240; /* Positive x, positive y */ - rect[1].x1 = 0; - rect[1].y1 = 0; - rect[1].x2 = 320; - rect[1].y2 = 240; + U1(rect[1]).x1 = 0; + U2(rect[1]).y1 = 0; + U3(rect[1]).x2 = 320; + U4(rect[1]).y2 = 240; /* Clear 2 rectangles with one call. Shows that a positive value is returned, but the negative rectangle * is ignored, the positive is still cleared afterwards */ @@ -330,10 +330,10 @@ static void clear_test(IDirect3DDevice7 *device) ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); /* negative x, negative y */ - rect_negneg.x1 = 640; - rect_negneg.x1 = 240; - rect_negneg.x2 = 320; - rect_negneg.y2 = 0; + U1(rect_negneg).x1 = 640; + U2(rect_negneg).y1 = 240; + U3(rect_negneg).x2 = 320; + U4(rect_negneg).y2 = 0; hr = IDirect3DDevice7_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr);

1 0

Andrew Talbot : advapi32: Replace const pointer parameters with correct pointers to const.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: a170f762c01fe8360c9d50bf690e1e1c6d4c54e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a170f762c01fe8360c9d50bf6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 3 23:46:12 2007 +0000 advapi32: Replace const pointer parameters with correct pointers to const. --- dlls/advapi32/crypt_lmhash.c | 18 +++++++++--------- dlls/advapi32/tests/crypt_lmhash.c | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/crypt_lmhash.c b/dlls/advapi32/crypt_lmhash.c index a7e8e55..2e379d4 100644 --- a/dlls/advapi32/crypt_lmhash.c +++ b/dlls/advapi32/crypt_lmhash.c @@ -73,7 +73,7 @@ NTSTATUS WINAPI SystemFunction006( LPCSTR password, LPSTR hash ) * see http://davenport.sourceforge.net/ntlm.html#theLmResponse * */ -NTSTATUS WINAPI SystemFunction008(const LPBYTE challenge, const LPBYTE hash, LPBYTE response) +NTSTATUS WINAPI SystemFunction008(const BYTE *challenge, const BYTE *hash, LPBYTE response) { BYTE key[7*3]; @@ -95,7 +95,7 @@ NTSTATUS WINAPI SystemFunction008(const LPBYTE challenge, const LPBYTE hash, LPB * * Seems to do the same as SystemFunction008 ... */ -NTSTATUS WINAPI SystemFunction009(const LPBYTE challenge, const LPBYTE hash, LPBYTE response) +NTSTATUS WINAPI SystemFunction009(const BYTE *challenge, const BYTE *hash, LPBYTE response) { return SystemFunction008(challenge, hash, response); } @@ -115,7 +115,7 @@ NTSTATUS WINAPI SystemFunction009(const LPBYTE challenge, const LPBYTE hash, LPB * Failure: STATUS_UNSUCCESSFUL * */ -NTSTATUS WINAPI SystemFunction001(const LPBYTE data, const LPBYTE key, LPBYTE output) +NTSTATUS WINAPI SystemFunction001(const BYTE *data, const BYTE *key, LPBYTE output) { if (!data || !output) return STATUS_UNSUCCESSFUL; @@ -138,7 +138,7 @@ NTSTATUS WINAPI SystemFunction001(const LPBYTE data, const LPBYTE key, LPBYTE ou * Failure: STATUS_UNSUCCESSFUL * */ -NTSTATUS WINAPI SystemFunction002(const LPBYTE data, const LPBYTE key, LPBYTE output) +NTSTATUS WINAPI SystemFunction002(const BYTE *data, const BYTE *key, LPBYTE output) { if (!data || !output) return STATUS_UNSUCCESSFUL; @@ -160,7 +160,7 @@ NTSTATUS WINAPI SystemFunction002(const LPBYTE data, const LPBYTE key, LPBYTE ou * Failure: STATUS_UNSUCCESSFUL * */ -NTSTATUS WINAPI SystemFunction003(const LPBYTE key, LPBYTE output) +NTSTATUS WINAPI SystemFunction003(const BYTE *key, LPBYTE output) { if (!output) return STATUS_UNSUCCESSFUL; @@ -310,7 +310,7 @@ NTSTATUS WINAPI SystemFunction005(const struct ustring *in, * Success: STATUS_SUCCESS * Failure: STATUS_UNSUCCESSFUL if the input or output buffer is NULL */ -NTSTATUS WINAPI SystemFunction012(const LPBYTE in, const LPBYTE key, LPBYTE out) +NTSTATUS WINAPI SystemFunction012(const BYTE *in, const BYTE *key, LPBYTE out) { if (!in || !out) return STATUS_UNSUCCESSFUL; @@ -339,7 +339,7 @@ NTSTATUS WINAPI SystemFunction012(const LPBYTE in, const LPBYTE key, LPBYTE out) * Success: STATUS_SUCCESS * Failure: STATUS_UNSUCCESSFUL if the input or output buffer is NULL */ -NTSTATUS WINAPI SystemFunction013(const LPBYTE in, const LPBYTE key, LPBYTE out) +NTSTATUS WINAPI SystemFunction013(const BYTE *in, const BYTE *key, LPBYTE out) { if (!in || !out) return STATUS_UNSUCCESSFUL; @@ -362,7 +362,7 @@ NTSTATUS WINAPI SystemFunction013(const LPBYTE in, const LPBYTE key, LPBYTE out) * RETURNS * Success: STATUS_SUCCESS */ -NTSTATUS WINAPI SystemFunction024(const LPBYTE in, const LPBYTE key, LPBYTE out) +NTSTATUS WINAPI SystemFunction024(const BYTE *in, const BYTE *key, LPBYTE out) { BYTE deskey[0x10]; @@ -390,7 +390,7 @@ NTSTATUS WINAPI SystemFunction024(const LPBYTE in, const LPBYTE key, LPBYTE out) * RETURNS * Success: STATUS_SUCCESS */ -NTSTATUS WINAPI SystemFunction025(const LPBYTE in, const LPBYTE key, LPBYTE out) +NTSTATUS WINAPI SystemFunction025(const BYTE *in, const BYTE *key, LPBYTE out) { BYTE deskey[0x10]; diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index 3a2dd79..bac7e17 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -34,14 +34,14 @@ struct ustring { unsigned char *Buffer; }; -typedef NTSTATUS (WINAPI *fnSystemFunction001)(const LPBYTE, const LPBYTE, LPBYTE); -typedef NTSTATUS (WINAPI *fnSystemFunction002)(const LPBYTE, const LPBYTE, LPBYTE); -typedef NTSTATUS (WINAPI *fnSystemFunction003)(const LPBYTE, LPBYTE); +typedef NTSTATUS (WINAPI *fnSystemFunction001)(const BYTE *, const BYTE *, LPBYTE); +typedef NTSTATUS (WINAPI *fnSystemFunction002)(const BYTE *, const BYTE *, LPBYTE); +typedef NTSTATUS (WINAPI *fnSystemFunction003)(const BYTE *, LPBYTE); typedef NTSTATUS (WINAPI *fnSystemFunction004)(const struct ustring *, const struct ustring *, struct ustring *); typedef NTSTATUS (WINAPI *fnSystemFunction005)(const struct ustring *, const struct ustring *, struct ustring *); typedef VOID (WINAPI *fnSystemFunction006)( PCSTR passwd, PSTR lmhash ); -typedef NTSTATUS (WINAPI *fnSystemFunction008)(const LPBYTE, const LPBYTE, LPBYTE); -typedef NTSTATUS (WINAPI *fnSystemFunction009)(const LPBYTE, const LPBYTE, LPBYTE); +typedef NTSTATUS (WINAPI *fnSystemFunction008)(const BYTE *, const BYTE *, LPBYTE); +typedef NTSTATUS (WINAPI *fnSystemFunction009)(const BYTE *, const BYTE *, LPBYTE); typedef int (WINAPI *descrypt)(unsigned char *, unsigned char *, unsigned char *); typedef NTSTATUS (WINAPI *fnSystemFunction030)(void*, void*); typedef NTSTATUS (WINAPI *fnSystemFunction032)(struct ustring *, struct ustring *);

1 0

Andrew Talbot : advapi32: Constify a variable.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: 201317ed5e7a943b31aded5589c4f8609c04b6a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=201317ed5e7a943b31aded558… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 3 22:36:05 2007 +0000 advapi32: Constify a variable. --- dlls/advapi32/crypt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index bd1a9c7..3a2f770 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -193,7 +193,7 @@ static BOOL CALLBACK CRYPT_ReturnhWnd(HWND *phWnd) if ( !(provider->pFuncs->p##name = (void*)GetProcAddress(provider->hModule, #name)) ) goto error #define CRYPT_GetProvFuncOpt(name) \ provider->pFuncs->p##name = (void*)GetProcAddress(provider->hModule, #name) -static PCRYPTPROV CRYPT_LoadProvider(PWSTR pImage) +static PCRYPTPROV CRYPT_LoadProvider(PCWSTR pImage) { PCRYPTPROV provider; DWORD errorcode = ERROR_NOT_ENOUGH_MEMORY;

1 0

Andrew Talbot : version: Constify some variables.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: 96c84497daf5ace6bb666f916084e3b4df4ac46a URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c84497daf5ace6bb666f916… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 3 22:36:49 2007 +0000 version: Constify some variables. --- dlls/version/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 56c9cd9..5d4314f 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -238,7 +238,7 @@ typedef struct */ static DWORD VERSION_GetFileVersionInfo_PE( LPCWSTR filename, DWORD datasize, LPVOID data ) { - VS_FIXEDFILEINFO *vffi; + const VS_FIXEDFILEINFO *vffi; DWORD len; BYTE *buf; HMODULE hModule; @@ -313,7 +313,7 @@ END: */ static DWORD VERSION_GetFileVersionInfo_16( LPCSTR filename, DWORD datasize, LPVOID data ) { - VS_FIXEDFILEINFO *vffi; + const VS_FIXEDFILEINFO *vffi; DWORD len, offset; BYTE *buf; HMODULE16 hModule;

1 0

Kai Blin : dplayx: Remove unneeded test, fix compilation on msvc++.
by Alexandre Julliard 05 Mar '07

05 Mar '07

Module: wine Branch: master Commit: cc549b27df055e3007e3d7e9236abc1c2e4dadba URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc549b27df055e3007e3d7e92… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Mar 3 12:44:17 2007 +0100 dplayx: Remove unneeded test, fix compilation on msvc++. --- dlls/dplayx/tests/dplayx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 836171e..92f9865 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -18,6 +18,7 @@ */ #include "wine/test.h" +#define INITGUID #include <dplay.h> static BOOL validSP = FALSE; /*This global variable is needed until wine has a working service provider @@ -32,7 +33,6 @@ static BOOL CALLBACK EnumConnectionsCallback(LPCGUID lpguidSP, LPVOID lpConnecti { /*I'm forcing TCP/IP Sevice provider*/ hr = IDirectPlayX_InitializeConnection((LPDIRECTPLAY4) lpContext, lpConnection, 0); - todo_wine ok( SUCCEEDED( hr ), "It's not possible to initialize TCP/IP service provider\n"); if( SUCCEEDED( hr )) validSP = TRUE; return FALSE;

1 0