wine-commits May 2014

wine-commits@winehq.org

2 participants
404 discussions

Nikolay Sivov : comctl32/listview: Fix custom draw stage sequence.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: fa3e750e2cfc5fe763c2891f5fa47fec2ded43b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3e750e2cfc5fe763c2891f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 11 00:49:27 2014 +0400 comctl32/listview: Fix custom draw stage sequence. --- dlls/comctl32/listview.c | 321 +++++++++++++++++++++++++--------------- dlls/comctl32/tests/listview.c | 83 +++++++++-- 2 files changed, 269 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa3e750e2cfc5fe763c28…

1 0

Nikolay Sivov : setupapi: Make default context structure layout compatible.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: dcab5fe61bed87b291901ceff686894a64871d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcab5fe61bed87b291901ceff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 12 01:59:33 2014 +0400 setupapi: Make default context structure layout compatible. --- dlls/setupapi/queue.c | 13 ++++++++---- dlls/setupapi/tests/misc.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 1855e99..d57f8e1 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -39,9 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* context structure for the default queue callback */ struct default_callback_context { - HWND owner; - HWND progress; - UINT message; + DWORD magic; + HWND owner; + DWORD unk1[4]; + DWORD_PTR unk2[7]; + HWND progress; + UINT message; + DWORD_PTR unk3[5]; }; struct file_op @@ -1482,8 +1486,9 @@ PVOID WINAPI SetupInitDefaultQueueCallbackEx( HWND owner, HWND progress, UINT ms { struct default_callback_context *context; - if ((context = HeapAlloc( GetProcessHeap(), 0, sizeof(*context) ))) + if ((context = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*context) ))) { + context->magic = 0x43515053; /* "SPQC" */ context->owner = owner; context->progress = progress; context->message = msg; diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index db74fcb..cfe888b 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -731,6 +731,51 @@ static void test_SetupUninstallOEMInf(void) } } +struct default_callback_context +{ + DWORD magic; + HWND owner; + DWORD unk1[4]; + DWORD_PTR unk2[7]; + HWND progress; + UINT message; + DWORD_PTR unk3[5]; +}; + +static void test_defaultcallback(void) +{ + struct default_callback_context *ctxt; + static const DWORD magic = 0x43515053; /* "SPQC" */ + HWND owner, progress; + + owner = (HWND)0x123; + progress = (HWND)0x456; + ctxt = SetupInitDefaultQueueCallbackEx(owner, progress, WM_USER, 0, NULL); + ok(ctxt != NULL, "got %p\n", ctxt); + + ok(ctxt->magic == magic || broken(ctxt->magic != magic) /* win2000 */, "got magic 0x%08x\n", ctxt->magic); + if (ctxt->magic == magic) + { + ok(ctxt->owner == owner, "got %p, expected %p\n", ctxt->owner, owner); + ok(ctxt->progress == progress, "got %p, expected %p\n", ctxt->progress, progress); + ok(ctxt->message == WM_USER, "got %d, expected %d\n", ctxt->message, WM_USER); + SetupTermDefaultQueueCallback(ctxt); + } + else + { + win_skip("Skipping tests on old systems.\n"); + SetupTermDefaultQueueCallback(ctxt); + return; + } + + ctxt = SetupInitDefaultQueueCallback(owner); + ok(ctxt->magic == magic, "got magic 0x%08x\n", ctxt->magic); + ok(ctxt->owner == owner, "got %p, expected %p\n", ctxt->owner, owner); + ok(ctxt->progress == NULL, "got %p, expected %p\n", ctxt->progress, progress); + ok(ctxt->message == 0, "got %d\n", ctxt->message); + SetupTermDefaultQueueCallback(ctxt); +} + START_TEST(misc) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -760,4 +805,6 @@ START_TEST(misc) test_SetupUninstallOEMInf(); else win_skip("SetupUninstallOEMInfA is not available\n"); + + test_defaultcallback(); }

1 0

Akihiro Sagawa : taskmgr: Show whether the process is running under WOW64.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: 776849987d34a8c77fef97b07cbb79091c0d5e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=776849987d34a8c77fef97b07… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 11 23:54:29 2014 +0900 taskmgr: Show whether the process is running under WOW64. --- programs/taskmgr/perfdata.c | 8 ++++++++ programs/taskmgr/perfdata.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 110fe5a..aa19914 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -33,6 +33,7 @@ static PROCNTQSI pNtQuerySystemInformation = NULL; static PROCGGR pGetGuiResources = NULL; static PROCGPIC pGetProcessIoCounters = NULL; +static PROCISW64 pIsWow64Process = NULL; static CRITICAL_SECTION PerfDataCriticalSection; static PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ static PPERFDATA pPerfData = NULL; /* Most recent copy of perf data */ @@ -60,6 +61,7 @@ BOOL PerfDataInitialize(void) pNtQuerySystemInformation = (PROCNTQSI)GetProcAddress(GetModuleHandleW(wszNtdll), "NtQuerySystemInformation"); pGetGuiResources = (PROCGGR)GetProcAddress(GetModuleHandleW(wszUser32), "GetGuiResources"); pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandleW(wszKernel32), "GetProcessIoCounters"); + pIsWow64Process = (PROCISW64)GetProcAddress(GetModuleHandleW(wszKernel32), "IsWow64Process"); InitializeCriticalSection(&PerfDataCriticalSection); @@ -296,6 +298,8 @@ void PerfDataRefresh(void) } if (pGetProcessIoCounters) pGetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); + if (pIsWow64Process) + pIsWow64Process(hProcess, &pPerfData[Idx].Wow64Process); CloseHandle(hProcess); } pPerfData[Idx].UserTime.QuadPart = pSPI->UserTime.QuadPart; @@ -331,12 +335,16 @@ ULONG PerfDataGetProcessorSystemUsage(void) BOOL PerfDataGetImageName(ULONG Index, LPWSTR lpImageName, int nMaxCount) { + static const WCHAR proc32W[] = {' ','*','3','2',0}; BOOL bSuccessful; EnterCriticalSection(&PerfDataCriticalSection); if (Index < ProcessCount) { wcsncpy(lpImageName, pPerfData[Index].ImageName, nMaxCount); + if (pPerfData[Index].Wow64Process && + nMaxCount - lstrlenW(lpImageName) > 4 /* =lstrlenW(proc32W) */) + lstrcatW(lpImageName, proc32W); bSuccessful = TRUE; } else { bSuccessful = FALSE; diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index be6b819..d6a1602 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -47,6 +47,7 @@ typedef struct _PERFDATA TIME UserTime; TIME KernelTime; + BOOL Wow64Process; } PERFDATA, *PPERFDATA; /* SystemPageFileInformation (18) */ @@ -68,6 +69,7 @@ struct _SYSTEM_PAGEFILE_INFORMATION typedef LONG (WINAPI *PROCNTQSI)(UINT,PVOID,ULONG,PULONG); typedef DWORD (WINAPI *PROCGGR)(HANDLE,DWORD); typedef BOOL (WINAPI *PROCGPIC)(HANDLE,PIO_COUNTERS); +typedef BOOL (WINAPI *PROCISW64)(HANDLE,PBOOL); BOOL PerfDataInitialize(void); void PerfDataRefresh(void);

1 0

Alistair Leslie-Hughes : dxguid: Include dplobby8.h.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: 123c670f8e6201dcadaf6e6d4cafb5730c4c40c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123c670f8e6201dcadaf6e6d4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 10 20:55:49 2014 +1000 dxguid: Include dplobby8.h. --- dlls/dxguid/dxguid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dxguid/dxguid.c b/dlls/dxguid/dxguid.c index f923d9c..77d4194 100644 --- a/dlls/dxguid/dxguid.c +++ b/dlls/dxguid/dxguid.c @@ -40,6 +40,7 @@ #include "dplay.h" #include "dplay8.h" #include "dplobby.h" +#include "dplobby8.h" #include "dinput.h" #include "ddrawi.h" #include "dxdiag.h"

1 0

Frédéric Delanoy : user32/tests: Constify some arrays.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: b242d9cee36b8c8186c92d0bf86c067fc56b19c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b242d9cee36b8c8186c92d0bf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat May 10 19:01:06 2014 +0200 user32/tests: Constify some arrays. --- dlls/user32/tests/cursoricon.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index a7c3ca4..9540f3d 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -955,14 +955,14 @@ static void test_CreateIcon(void) /* Shamelessly ripped from dlls/oleaut32/tests/olepicture.c */ /* 1x1 pixel gif */ -static unsigned char gifimage[35] = { +static const unsigned char gifimage[35] = { 0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x00,0xff,0xff,0xff, 0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, 0x01,0x00,0x3b }; /* 1x1 pixel jpg */ -static unsigned char jpgimage[285] = { +static const unsigned char jpgimage[285] = { 0xff,0xd8,0xff,0xe0,0x00,0x10,0x4a,0x46,0x49,0x46,0x00,0x01,0x01,0x01,0x01,0x2c, 0x01,0x2c,0x00,0x00,0xff,0xdb,0x00,0x43,0x00,0x05,0x03,0x04,0x04,0x04,0x03,0x05, 0x04,0x04,0x04,0x05,0x05,0x05,0x06,0x07,0x0c,0x08,0x07,0x07,0x07,0x07,0x0f,0x0b, @@ -984,7 +984,7 @@ static unsigned char jpgimage[285] = { }; /* 1x1 pixel png */ -static unsigned char pngimage[285] = { +static const unsigned char pngimage[285] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53, 0xde,0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b, @@ -1005,14 +1005,14 @@ static unsigned char bmpimage[70] = { }; /* 1x1 pixel bmp using BITMAPCOREHEADER */ -static unsigned char bmpcoreimage[38] = { +static const unsigned char bmpcoreimage[38] = { 0x42,0x4d,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x22,0x00,0x00,0x00,0x0c,0x00, 0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xff,0xff,0xff,0x00,0x55,0x55, 0x55,0x00,0x00,0x00,0x00,0x00 }; /* 2x2 pixel gif */ -static unsigned char gif4pixel[42] = { +static const unsigned char gif4pixel[42] = { 0x47,0x49,0x46,0x38,0x37,0x61,0x02,0x00,0x02,0x00,0xa1,0x00,0x00,0x00,0x00,0x00, 0x39,0x62,0xfc,0xff,0x1a,0xe5,0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x02,0x00, 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b @@ -1059,7 +1059,7 @@ static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) ok(color_match(pixel, 0x00ffffff), "%s: Pixel is 0x%08x\n", test_desc, pixel); } -static void test_LoadImageFile(const char * test_desc, unsigned char * image_data, +static void test_LoadImageFile(const char * test_desc, const unsigned char * image_data, unsigned int image_size, const char * ext, BOOL expect_success) { HANDLE handle;

1 0

Vincent Povirk : ole32: STGM_NOSNAPSHOT implies deny write.
by Alexandre Julliard 12 May '14

12 May '14

Module: wine Branch: master Commit: b3e26be0cb80daf582e8c57fb58bf6851b089e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e26be0cb80daf582e8c57fb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 9 14:51:07 2014 -0500 ole32: STGM_NOSNAPSHOT implies deny write. --- dlls/ole32/storage32.c | 10 ++++++++++ dlls/ole32/storage32.h | 9 ++++++--- dlls/ole32/tests/storage32.c | 4 ++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 56d3229..786924b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2908,6 +2908,13 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) ULARGE_INTEGER cb; DWORD share_mode = STGM_SHARE_MODE(openFlags); + if (openFlags & STGM_NOSNAPSHOT) + { + /* STGM_NOSNAPSHOT implies deny write */ + if (share_mode == STGM_SHARE_DENY_READ) share_mode = STGM_SHARE_EXCLUSIVE; + else if (share_mode != STGM_SHARE_EXCLUSIVE) share_mode = STGM_SHARE_DENY_WRITE; + } + /* Wrap all other locking inside a single lock so we can check ranges safely */ offset.QuadPart = RANGELOCK_CHECKLOCKS; cb.QuadPart = 1; @@ -2954,6 +2961,9 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) if (SUCCEEDED(hr) && (share_mode == STGM_SHARE_DENY_WRITE || share_mode == STGM_SHARE_EXCLUSIVE)) hr = StorageImpl_LockOne(This, RANGELOCK_DENY_WRITE_FIRST, RANGELOCK_DENY_WRITE_LAST); + if (SUCCEEDED(hr) && (openFlags & STGM_NOSNAPSHOT) == STGM_NOSNAPSHOT) + hr = StorageImpl_LockOne(This, RANGELOCK_NOSNAPSHOT_FIRST, RANGELOCK_NOSNAPSHOT_LAST); + offset.QuadPart = RANGELOCK_CHECKLOCKS; cb.QuadPart = 1; ILockBytes_UnlockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE); diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 0b8bcc8..c6fe8b2 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -508,7 +508,8 @@ StgStreamImpl* StgStreamImpl_Construct( * In particular, ends of ranges may be wrong. 0x0 through 0x57: Unknown. Causes read-only exclusive opens to fail. - 0x58 through 0x7f: Priority mode. + 0x58 through 0x6b: Priority mode. + 0x6c through 0x7f: No snapshot mode. 0x80: Commit lock. 0x81 through 0x91: Priority mode, again. Not sure why it uses two regions. 0x92: Lock-checking lock. Held while opening so ranges can be tested without @@ -524,7 +525,9 @@ StgStreamImpl* StgStreamImpl_Construct( #define RANGELOCK_UNK1_FIRST 0x7fffff00 #define RANGELOCK_UNK1_LAST 0x7fffff57 #define RANGELOCK_PRIORITY1_FIRST 0x7fffff58 -#define RANGELOCK_PRIORITY1_LAST 0x7fffff7f +#define RANGELOCK_PRIORITY1_LAST 0x7fffff6b +#define RANGELOCK_NOSNAPSHOT_FIRST 0x7fffff6c +#define RANGELOCK_NOSNAPSHOT_LAST 0x7fffff7f #define RANGELOCK_COMMIT 0x7fffff80 #define RANGELOCK_PRIORITY2_FIRST 0x7fffff81 #define RANGELOCK_PRIORITY2_LAST 0x7fffff91 @@ -539,7 +542,7 @@ StgStreamImpl* StgStreamImpl_Construct( #define RANGELOCK_DENY_WRITE_LAST 0x7fffffe2 #define RANGELOCK_UNK2_FIRST 0x7fffffe3 #define RANGELOCK_UNK2_LAST 0x7fffffff -#define RANGELOCK_TRANSACTION_FIRST RANGELOCK_PRIORITY1_FIRST +#define RANGELOCK_TRANSACTION_FIRST RANGELOCK_COMMIT #define RANGELOCK_TRANSACTION_LAST RANGELOCK_CHECKLOCKS #define RANGELOCK_FIRST RANGELOCK_UNK1_FIRST #define RANGELOCK_LAST RANGELOCK_UNK2_LAST diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 5db9120..74b6def 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3156,6 +3156,7 @@ struct lock_test static const int priority_locked_bytes[] = { 0x58, 0x81, 0x93, -1 }; static const int rwex_locked_bytes[] = { 0x93, 0xa7, 0xbb, 0xcf, -1 }; static const int rw_locked_bytes[] = { 0x93, 0xa7, -1 }; +static const int nosn_locked_bytes[] = { 0x6c, 0x93, 0xa7, 0xcf, -1 }; static const int rwdw_locked_bytes[] = { 0x93, 0xa7, 0xcf, -1 }; static const int wodw_locked_bytes[] = { 0xa7, 0xcf, -1 }; static const int tr_locked_bytes[] = { 0x93, -1 }; @@ -3164,6 +3165,7 @@ static const int roex_locked_bytes[] = { 0x93, 0xbb, 0xcf, -1 }; static const int rwex_fail_ranges[] = { 0x93,0xe3, -1 }; static const int rw_fail_ranges[] = { 0xbb,0xe3, -1 }; +static const int rwdw_fail_ranges[] = { 0xa7,0xe3, -1 }; static const int dw_fail_ranges[] = { 0xa7,0xcf, -1 }; static const int tr_fail_ranges[] = { 0xbb,0xcf, -1 }; static const int pr_fail_ranges[] = { 0x80,0x81, 0xbb,0xcf, -1 }; @@ -3179,6 +3181,8 @@ static const struct lock_test lock_tests[] = { { STGM_SHARE_EXCLUSIVE|STGM_READWRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, FALSE }, { STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, FALSE }, { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_fail_ranges, FALSE }, + { STGM_READWRITE|STGM_TRANSACTED|STGM_NOSNAPSHOT, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, nosn_locked_bytes, rwdw_fail_ranges, FALSE }, + { STGM_READWRITE|STGM_TRANSACTED|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, rwdw_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, TRUE }, { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE },

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman 09 May '14

09 May '14

Module: website Branch: master Commit: 1d47644aa6bbc8e0593cb50bfae7a1a9f80aa883 URL: http://source.winehq.org/git/website.git/?a=commit;h=1d47644aa6bbc8e0593cb5… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri May 9 14:33:02 2014 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

André Hentschel : Add WWN369
by Jeremy Newman 09 May '14

09 May '14

Module: website Branch: master Commit: 5388934d8eaf5707ba9fa5f9ef5487cef9fe5a20 URL: http://source.winehq.org/git/website.git/?a=commit;h=5388934d8eaf5707ba9fa5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 9 21:28:40 2014 +0200 Add WWN369 --- news/de/2014050901.xml | 12 + news/en/2014050901.xml | 12 + wwn/en/wn20140509_369.xml | 701 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 725 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=5388934d8eaf5707ba…

1 0

André Hentschel : Add WWN369
by Jeremy Newman 09 May '14

09 May '14

Module: website Branch: master Commit: 0e82978b680e032346f6cdaa787dc5fd3ec28197 URL: http://source.winehq.org/git/website.git/?a=commit;h=0e82978b680e032346f6cd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 9 21:28:40 2014 +0200 Add WWN369 --- news/de/2014050901.xml | 12 + news/en/2014050901.xml | 12 + wwn/en/wn20140509_369.xml | 701 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 725 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=0e82978b680e032346…

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Client GetSPCaps.
by Alexandre Julliard 09 May '14

09 May '14

Module: wine Branch: master Commit: b01fc1aa6e12b426b3f539c44196c92331bad874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01fc1aa6e12b426b3f539c44… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 7 10:59:46 2014 +1000 dpnet: Implement IDirectPlay8Client GetSPCaps. --- dlls/dpnet/client.c | 20 +++++++++++++++++--- dlls/dpnet/dpnet_private.h | 2 ++ dlls/dpnet/tests/client.c | 25 ++++++++++++++++--------- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 43ffb59..abcc5f7 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -234,9 +234,21 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetSPCaps(IDirectPlay8Client *iface static HRESULT WINAPI IDirectPlay8ClientImpl_GetSPCaps(IDirectPlay8Client *iface, const GUID * const pguidSP, DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + + TRACE("(%p)->(%p,%p,%x)\n", This, pguidSP, pdpspCaps, dwFlags); + + if(!This->msghandler) + return DPNERR_UNINITIALIZED; + + if(pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) + { + return DPNERR_INVALIDPARAM; + } + + *pdpspCaps = This->spcaps; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ClientImpl_GetConnectionInfo(IDirectPlay8Client *iface, @@ -301,6 +313,8 @@ HRESULT DPNET_CreateDirectPlay8Client(IClassFactory *iface, IUnknown *pUnkOuter, client->IDirectPlay8Client_iface.lpVtbl = &DirectPlay8Client_Vtbl; client->ref = 1; + init_dpn_sp_caps(&client->spcaps); + hr = IDirectPlay8ClientImpl_QueryInterface(&client->IDirectPlay8Client_iface, riid, ppv); IDirectPlay8ClientImpl_Release(&client->IDirectPlay8Client_iface); diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 46aa8d5..af81474 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -53,6 +53,8 @@ struct IDirectPlay8ClientImpl PFNDPNMESSAGEHANDLER msghandler; DWORD flags; void *usercontext; + + DPN_SP_CAPS spcaps; }; /* ------------------- */ diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 0df99dd..bf0d26f 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -36,6 +36,7 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, static BOOL test_init_dp(void) { HRESULT hr; + DPN_SP_CAPS caps; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -43,6 +44,12 @@ static BOOL test_init_dp(void) hr = CoCreateInstance(&CLSID_DirectPlay8Client, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Client, (void **)&client); ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + memset(&caps, 0, sizeof(DPN_SP_CAPS)); + caps.dwSize = sizeof(DPN_SP_CAPS); + + hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_UNINITIALIZED, "GetSPCaps failed with %x\n", hr); + hr = IDirectPlay8Client_Initialize(client, NULL, NULL, 0); ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); @@ -160,24 +167,24 @@ static void test_get_sp_caps(void) memset(&caps, 0, sizeof(DPN_SP_CAPS)); hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); - todo_wine ok(hr == DPNERR_INVALIDPARAM, "GetSPCaps unexpectedly returned %x\n", hr); + ok(hr == DPNERR_INVALIDPARAM, "GetSPCaps unexpectedly returned %x\n", hr); caps.dwSize = sizeof(DPN_SP_CAPS); hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); - todo_wine ok((caps.dwFlags & + ok((caps.dwFlags & (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS)) == (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS), "unexpected flags %x\n", caps.dwFlags); - todo_wine ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); - todo_wine ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); - todo_wine ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); - todo_wine ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); - todo_wine ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); - todo_wine ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); - todo_wine ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), + ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); + ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); }

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
41
Older →

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 May 2014