January 2017 - Wine-commits

Andrey Gusev : setupapi: Add CM_Get_Child_Ex stub.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: afa920a73fbcea3fd9459b1b53976ab1b6e99735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa920a73fbcea3fd9459b1b5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 27 14:32:30 2017 +0200 setupapi: Add CM_Get_Child_Ex stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ include/cfgmgr32.h | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 9551fc0..efc5dbb 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -43,7 +43,7 @@ @ stub CM_Free_Res_Des_Ex @ stub CM_Free_Res_Des_Handle @ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child -@ stub CM_Get_Child_Ex +@ stdcall CM_Get_Child_Ex(ptr long long ptr) setupapi.CM_Get_Child_Ex @ stub CM_Get_Class_Key_NameA @ stub CM_Get_Class_Key_NameW @ stub CM_Get_Class_Key_Name_ExA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index e77369b..88476d6 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -54,7 +54,7 @@ @ stub CM_Free_Res_Des_Ex @ stub CM_Free_Res_Des_Handle @ stdcall CM_Get_Child(ptr long long) -@ stub CM_Get_Child_Ex +@ stdcall CM_Get_Child_Ex(ptr long long ptr) @ stub CM_Get_Class_Key_NameA @ stub CM_Get_Class_Key_NameW @ stub CM_Get_Class_Key_Name_ExA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 9b71c1c..a738eec 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -101,6 +101,16 @@ CONFIGRET WINAPI CM_Get_Child( } /*********************************************************************** + * CM_Get_Child_Ex (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Child_Ex( + PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p 0x%08x 0x%08x %p: stub\n", pdnDevInst, dnDevInst, ulFlags, hMachine); + return CR_SUCCESS; +} + +/*********************************************************************** * CM_Get_Device_ID_ExA (SETUPAPI.@) */ DWORD WINAPI CM_Get_Device_ID_ExA( diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 4606389..8573067 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -210,6 +210,7 @@ CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); CMAPI CONFIGRET WINAPI CM_Open_DevNode_Key(DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, REGDISPOSITION disposition, PHKEY phkDevice, ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Child(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags); +CMAPI CONFIGRET WINAPI CM_Get_Child_Ex(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine); #ifdef __cplusplus }

1 0

Andrey Gusev : setupapi: Add CM_Get_Sibling_Ex stub.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 1ce40299941f03fb14ca73e771c1d6ea0090165a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce40299941f03fb14ca73e77… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 27 15:19:44 2017 +0200 setupapi: Add CM_Get_Sibling_Ex stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ include/cfgmgr32.h | 5 +++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index efc5dbb..2ccd29b 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -113,7 +113,7 @@ @ stub CM_Get_Res_Des_Data_Size @ stub CM_Get_Res_Des_Data_Size_Ex @ stub CM_Get_Sibling -@ stub CM_Get_Sibling_Ex +@ stdcall CM_Get_Sibling_Ex(ptr long long ptr) setupapi.CM_Get_Sibling_Ex @ stdcall CM_Get_Version() setupapi.CM_Get_Version @ stub CM_Get_Version_Ex @ stub CM_Intersect_Range_List diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 88476d6..ab2090d 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -124,7 +124,7 @@ @ stub CM_Get_Res_Des_Data_Size @ stub CM_Get_Res_Des_Data_Size_Ex @ stub CM_Get_Sibling -@ stub CM_Get_Sibling_Ex +@ stdcall CM_Get_Sibling_Ex(ptr long long ptr) @ stdcall CM_Get_Version() @ stub CM_Get_Version_Ex @ stub CM_Intersect_Range_List diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index a738eec..9ea23b7 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -499,6 +499,16 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(LPGUID class, ULONG prop, PULON return CR_FAILURE; } +/*********************************************************************** + * CM_Get_Sibling_Ex (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Sibling_Ex( + PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p 0x%08x 0x%08x %p: stub\n", pdnDevInst, DevInst, ulFlags, hMachine); + return CR_FAILURE; +} + CONFIGRET WINAPI CM_Reenumerate_DevNode(DEVINST dnDevInst, ULONG ulFlags) { FIXME("0x%08x 0x%08x: stub\n", dnDevInst, ulFlags); diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 8573067..b8def60 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -189,6 +189,8 @@ CMAPI CONFIGRET WINAPI CM_Create_DevNodeA(PDEVINST,DEVINSTID_A,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Create_DevNodeW(PDEVINST,DEVINSTID_W,DEVINST,ULONG); #define CM_Create_DevNode WINELIB_NAME_AW(CM_Create_DevNode) CMAPI CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_Child(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags); +CMAPI CONFIGRET WINAPI CM_Get_Child_Ex(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Device_IDA(DEVINST,PSTR,ULONG,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_IDW(DEVINST,PWSTR,ULONG,ULONG); #define CM_Get_Device_ID WINELIB_NAME_AW(CM_Get_Device_ID) @@ -203,14 +205,13 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_Sibling_Ex(PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags, HMACHINE hMachine); CMAPI WORD WINAPI CM_Get_Version(void); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST,DEVINSTID_A,ULONG); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST,DEVINSTID_W,ULONG); #define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode) CMAPI CONFIGRET WINAPI CM_Open_DevNode_Key(DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, REGDISPOSITION disposition, PHKEY phkDevice, ULONG ulFlags); -CMAPI CONFIGRET WINAPI CM_Get_Child(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags); -CMAPI CONFIGRET WINAPI CM_Get_Child_Ex(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine); #ifdef __cplusplus }

1 0

Aric Stewart : hid: Implement HidP_MaxDataListLength.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 6bf21e1a5443b98860d0acd2e134dae0f13f0f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf21e1a5443b98860d0acd2e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 27 07:17:53 2017 -0600 hid: Implement HidP_MaxDataListLength. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 20 ++++++++++++++++++++ include/ddk/hidpi.h | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 205b626..fe8002e 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -32,7 +32,7 @@ @ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) @ stdcall HidP_GetValueCaps(long ptr ptr ptr) @ stdcall HidP_InitializeReportForID(long long ptr ptr long) -@ stub HidP_MaxDataListLength +@ stdcall HidP_MaxDataListLength(long ptr) @ stdcall HidP_MaxUsageListLength(long long ptr) @ stub HidP_SetData @ stub HidP_SetScaledUsageValue diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index d031b67..da57665 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -763,3 +763,23 @@ NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollect return rc; } + +ULONG WINAPI HidP_MaxDataListLength(HIDP_REPORT_TYPE ReportType, PHIDP_PREPARSED_DATA PreparsedData) +{ + WINE_HIDP_PREPARSED_DATA *data = (WINE_HIDP_PREPARSED_DATA *)PreparsedData; + TRACE("(%i, %p)\n", ReportType, PreparsedData); + if (data->magic != HID_MAGIC) + return 0; + + switch(ReportType) + { + case HidP_Input: + return data->caps.NumberInputDataIndices; + case HidP_Output: + return data->caps.NumberOutputDataIndices; + case HidP_Feature: + return data->caps.NumberFeatureDataIndices; + default: + return 0; + } +} diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 2b0eebd..902fa79 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -181,6 +181,7 @@ NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, UL NTSTATUS WINAPI HidP_GetSpecificButtonCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_BUTTON_CAPS *ButtonCaps, USHORT *ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_VALUE_CAPS *ValueCaps, USHORT *ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, ULONG *UsageLength, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); +ULONG WINAPI HidP_MaxDataListLength(HIDP_REPORT_TYPE ReportType, PHIDP_PREPARSED_DATA PreparsedData); #ifndef FACILITY_HID_ERROR_CODE #define FACILITY_HID_ERROR_CODE 0x11

1 0

Aric Stewart : hid: Implement HidP_GetData.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: a8ab3107cf2c6e9344da1f2537fbbb350eec97a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ab3107cf2c6e9344da1f253… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 27 07:18:01 2017 -0600 hid: Implement HidP_GetData. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 95 ++++++++++++++++++++++++++++++++++++++++++ dlls/hidclass.sys/descriptor.c | 29 +++++++++++-- include/ddk/hidpi.h | 10 +++++ 4 files changed, 131 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8ab3107cf2c6e9344da1…

1 0

Jacek Caban : inetcomm: Moved sub_stream_t implementation before MimeBody implementation.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: bb5056eaf44629cc56305d5ec59a6e5ad4c5906c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb5056eaf44629cc56305d5ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:59:08 2017 +0100 inetcomm: Moved sub_stream_t implementation before MimeBody implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 2287 +++++++++++++++++++++++------------------------ 1 file changed, 1142 insertions(+), 1145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb5056eaf44629cc56305…

1 0

Jacek Caban : inetcomm: Don' t restore base stream position in sub stream Read.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 393512d03b4f7c8d74137b78ed48f4c26552b13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=393512d03b4f7c8d74137b78e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:59:21 2017 +0100 inetcomm: Don't restore base stream position in sub stream Read. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index c06b740..74b834c 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -230,13 +230,10 @@ static HRESULT WINAPI sub_stream_Read( { sub_stream_t *This = impl_from_IStream(iface); HRESULT hr; - ULARGE_INTEGER base_pos; LARGE_INTEGER tmp_pos; TRACE("(%p, %d, %p)\n", pv, cb, pcbRead); - tmp_pos.QuadPart = 0; - IStream_Seek(This->base, tmp_pos, STREAM_SEEK_CUR, &base_pos); tmp_pos.QuadPart = This->pos.QuadPart + This->start.QuadPart; IStream_Seek(This->base, tmp_pos, STREAM_SEEK_SET, NULL); @@ -247,9 +244,6 @@ static HRESULT WINAPI sub_stream_Read( This->pos.QuadPart += *pcbRead; - tmp_pos.QuadPart = base_pos.QuadPart; - IStream_Seek(This->base, tmp_pos, STREAM_SEEK_SET, NULL); - return hr; }

1 0

Jacek Caban : inetcomm: Return a new instance of stream in IMimeBody:: GetData.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 0b8066674b465c44642d6584a5e706d6c1a590f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8066674b465c44642d6584a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:59:35 2017 +0100 inetcomm: Return a new instance of stream in IMimeBody::GetData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 74b834c..0f0da61 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -442,6 +442,22 @@ static HRESULT create_sub_stream(IStream *stream, ULARGE_INTEGER start, ULARGE_I return S_OK; } +static HRESULT get_stream_size(IStream *stream, ULARGE_INTEGER *size) +{ + STATSTG statstg = {NULL}; + LARGE_INTEGER zero; + HRESULT hres; + + hres = IStream_Stat(stream, &statstg, STATFLAG_NONAME); + if(SUCCEEDED(hres)) { + *size = statstg.cbSize; + return S_OK; + } + + zero.QuadPart = 0; + return IStream_Seek(stream, zero, STREAM_SEEK_END, size); +} + static inline MimeBody *impl_from_IMimeBody(IMimeBody *iface) { return CONTAINING_RECORD(iface, MimeBody, IMimeBody_iface); @@ -1505,11 +1521,16 @@ static HRESULT WINAPI MimeBody_GetData( IStream** ppStream) { MimeBody *This = impl_from_IMimeBody(iface); + ULARGE_INTEGER start, size; + HRESULT hres; + FIXME("(%p)->(%d, %p). Ignoring encoding type.\n", This, ietEncoding, ppStream); - *ppStream = This->data; - IStream_AddRef(*ppStream); - return S_OK; + start.QuadPart = 0; + hres = get_stream_size(This->data, &size); + if(SUCCEEDED(hres)) + hres = create_sub_stream(This->data, start, size, ppStream); + return hres; } static HRESULT WINAPI MimeBody_SetData(

1 0

Jacek Caban : inetcomm/tests: Added a helper for creating stream from string.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: c99b874a68a3ab9a6c767ae1993c633a99718713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99b874a68a3ab9a6c767ae19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:59:43 2017 +0100 inetcomm/tests: Added a helper for creating stream from string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 924e0e3..7e510c5 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -82,6 +82,25 @@ static void test_CreateSecurity(void) IMimeSecurity_Release(sec); } +static IStream *create_stream_from_string(const char *data) +{ + LARGE_INTEGER off; + IStream *stream; + HRESULT hr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IStream_Write(stream, data, strlen(data), NULL); + ok(hr == S_OK, "Write failed: %08x\n", hr); + + off.QuadPart = 0; + hr = IStream_Seek(stream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Seek failed: %08x\n", hr); + + return stream; +} + static void test_CreateBody(void) { HRESULT hr; @@ -103,11 +122,7 @@ static void test_CreateBody(void) ok(hr == MIME_E_NO_DATA, "ret %08x\n", hr); ok(handle == NULL, "handle %p\n", handle); - hr = CreateStreamOnHGlobal(NULL, TRUE, &in); - ok(hr == S_OK, "ret %08x\n", hr); - IStream_Write(in, msg1, sizeof(msg1) - 1, NULL); - off.QuadPart = 0; - IStream_Seek(in, off, STREAM_SEEK_SET, NULL); + in = create_stream_from_string(msg1); /* Need to call InitNew before Load otherwise Load crashes with native inetcomm */ hr = IMimeBody_InitNew(body); @@ -212,7 +227,6 @@ static void test_CreateMessage(void) HRESULT hr; IMimeMessage *msg; IStream *stream; - LARGE_INTEGER pos; LONG ref; HBODY hbody, hbody2; IMimeBody *body; @@ -230,10 +244,7 @@ static void test_CreateMessage(void) hr = MimeOleCreateMessage(NULL, &msg); ok(hr == S_OK, "ret %08x\n", hr); - CreateStreamOnHGlobal(NULL, TRUE, &stream); - IStream_Write(stream, msg1, sizeof(msg1) - 1, NULL); - pos.QuadPart = 0; - IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + stream = create_stream_from_string(msg1); hr = IMimeMessage_Load(msg, stream); ok(hr == S_OK, "ret %08x\n", hr);

1 0

Jacek Caban : inetcomm/tests: Added more IMimeBody:: SetData and GetData tests.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: b0902a487d3c7de62f391e5599a89e63a0639d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0902a487d3c7de62f391e559… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 16:00:03 2017 +0100 inetcomm/tests: Added more IMimeBody::SetData and GetData tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 275 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 275 insertions(+) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 7e510c5..9fbaeec 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -32,6 +32,36 @@ #include "wine/test.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + expect_ ## func = FALSE; \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(Stream_Read); +DEFINE_EXPECT(Stream_Stat); +DEFINE_EXPECT(Stream_Seek); +DEFINE_EXPECT(Stream_Seek_END); + static const char msg1[] = "MIME-Version: 1.0\r\n" "Content-Type: multipart/mixed;\r\n" @@ -212,6 +242,250 @@ static void test_CreateBody(void) IMimeBody_Release(body); } +typedef struct { + IStream IStream_iface; + LONG ref; + unsigned pos; +} TestStream; + +static inline TestStream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, TestStream, IStream_iface); +} + +static HRESULT WINAPI Stream_QueryInterface(IStream *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ISequentialStream, riid) || IsEqualGUID(&IID_IStream, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Stream_AddRef(IStream *iface) +{ + TestStream *This = impl_from_IStream(iface); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI Stream_Release(IStream *iface) +{ + TestStream *This = impl_from_IStream(iface); + return InterlockedDecrement(&This->ref); +} + +static HRESULT WINAPI Stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) +{ + TestStream *This = impl_from_IStream(iface); + BYTE *output = pv; + unsigned i; + + CHECK_EXPECT(Stream_Read); + + for(i = 0; i < cb; i++) + output[i] = '0' + This->pos++; + *pcbRead = i; + return S_OK; +} + +static HRESULT WINAPI Stream_Write(IStream *iface, const void *pv, ULONG cb, ULONG *pcbWritten) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static DWORD expect_seek_pos; + +static HRESULT WINAPI Stream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, + ULARGE_INTEGER *plibNewPosition) +{ + TestStream *This = impl_from_IStream(iface); + + if(dwOrigin == STREAM_SEEK_END) { + CHECK_EXPECT(Stream_Seek_END); + ok(dlibMove.QuadPart == expect_seek_pos, "unexpected seek pos %u\n", dlibMove.u.LowPart); + if(plibNewPosition) + plibNewPosition->QuadPart = 10; + return S_OK; + } + + CHECK_EXPECT(Stream_Seek); + + ok(dlibMove.QuadPart == expect_seek_pos, "unexpected seek pos %u\n", dlibMove.u.LowPart); + ok(dwOrigin == STREAM_SEEK_SET, "dwOrigin = %d\n", dwOrigin); + This->pos = dlibMove.QuadPart; + if(plibNewPosition) + plibNewPosition->QuadPart = This->pos; + return S_OK; +} + +static HRESULT WINAPI Stream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_CopyTo(IStream *iface, IStream *pstm, ULARGE_INTEGER cb, + ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_Commit(IStream *iface, DWORD grfCommitFlags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_Revert(IStream *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, DWORD dwLockType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_UnlockRegion(IStream *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_Stat(IStream *iface, STATSTG *pstatstg, DWORD dwStatFlag) +{ + CHECK_EXPECT(Stream_Stat); + ok(dwStatFlag == STATFLAG_NONAME, "dwStatFlag = %x\n", dwStatFlag); + return E_NOTIMPL; +} + +static HRESULT WINAPI Stream_Clone(IStream *iface, IStream **ppstm) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IStreamVtbl StreamVtbl = { + Stream_QueryInterface, + Stream_AddRef, + Stream_Release, + Stream_Read, + Stream_Write, + Stream_Seek, + Stream_SetSize, + Stream_CopyTo, + Stream_Commit, + Stream_Revert, + Stream_LockRegion, + Stream_UnlockRegion, + Stream_Stat, + Stream_Clone +}; + +static TestStream *create_test_stream(void) +{ + TestStream *stream; + stream = HeapAlloc(GetProcessHeap(), 0, sizeof(*stream)); + stream->IStream_iface.lpVtbl = &StreamVtbl; + stream->ref = 1; + stream->pos = 0; + return stream; +} + +#define test_stream_read(a,b,c,d) _test_stream_read(__LINE__,a,b,c,d) +static void _test_stream_read(unsigned line, IStream *stream, HRESULT exhres, const char *exdata, unsigned read_size) +{ + ULONG read = 0xdeadbeed, exread = strlen(exdata); + char buf[1024]; + HRESULT hres; + + if(read_size == -1) + read_size = sizeof(buf)-1; + + hres = IStream_Read(stream, buf, read_size, &read); + ok_(__FILE__,line)(hres == exhres, "Read returned %08x, expected %08x\n", hres, exhres); + ok_(__FILE__,line)(read == exread, "unexpected read size %u, expected %u\n", read, exread); + buf[read] = 0; + ok_(__FILE__,line)(read == exread && !memcmp(buf, exdata, read), "unexpected data %s\n", buf); +} + +static void test_SetData(void) +{ + IStream *stream, *stream2; + TestStream *test_stream; + IMimeBody *body; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_IMimeBody, NULL, CLSCTX_INPROC_SERVER, &IID_IMimeBody, (void**)&body); + ok(hr == S_OK, "ret %08x\n", hr); + + /* Need to call InitNew before Load otherwise Load crashes with native inetcomm */ + hr = IMimeBody_InitNew(body); + ok(hr == S_OK, "ret %08x\n", hr); + + stream = create_stream_from_string(msg1); + hr = IMimeBody_Load(body, stream); + ok(hr == S_OK, "ret %08x\n", hr); + IStream_Release(stream); + + test_stream = create_test_stream(); + hr = IMimeBody_SetData(body, IET_BINARY, "text", "plain", &IID_IStream, &test_stream->IStream_iface); + + ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_IsContentType(body, "text", "plain"); + todo_wine + ok(hr == S_OK, "ret %08x\n", hr); + + SET_EXPECT(Stream_Stat); + SET_EXPECT(Stream_Seek_END); + hr = IMimeBody_GetData(body, IET_BINARY, &stream); + CHECK_CALLED(Stream_Stat); + CHECK_CALLED(Stream_Seek_END); + ok(hr == S_OK, "GetData failed %08x\n", hr); + ok(stream != &test_stream->IStream_iface, "unexpected stream\n"); + + SET_EXPECT(Stream_Seek); + SET_EXPECT(Stream_Read); + test_stream_read(stream, S_OK, "012", 3); + CHECK_CALLED(Stream_Seek); + CHECK_CALLED(Stream_Read); + + SET_EXPECT(Stream_Stat); + SET_EXPECT(Stream_Seek_END); + hr = IMimeBody_GetData(body, IET_BINARY, &stream2); + CHECK_CALLED(Stream_Stat); + CHECK_CALLED(Stream_Seek_END); + ok(hr == S_OK, "GetData failed %08x\n", hr); + ok(stream2 != stream, "unexpected stream\n"); + + SET_EXPECT(Stream_Seek); + SET_EXPECT(Stream_Read); + test_stream_read(stream2, S_OK, "01", 2); + CHECK_CALLED(Stream_Seek); + CHECK_CALLED(Stream_Read); + + expect_seek_pos = 3; + SET_EXPECT(Stream_Seek); + SET_EXPECT(Stream_Read); + test_stream_read(stream, S_OK, "345", 3); + CHECK_CALLED(Stream_Seek); + CHECK_CALLED(Stream_Read); + + IStream_Release(stream); + IStream_Release(stream2); + IStream_Release(&test_stream->IStream_iface); + IMimeBody_Release(body); +} + static void test_Allocator(void) { HRESULT hr; @@ -844,6 +1118,7 @@ START_TEST(mimeole) test_CreateVirtualStream(); test_CreateSecurity(); test_CreateBody(); + test_SetData(); test_Allocator(); test_CreateMessage(); test_MessageSetProp();

1 0

Jacek Caban : inetcomm: Test current encoding in test_SetData.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 3c8f5c581d93c36b04c58de35d27b0397c56de52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c8f5c581d93c36b04c58de35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 16:00:20 2017 +0100 inetcomm: Test current encoding in test_SetData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 9fbaeec..5d7bb9a 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -131,6 +131,17 @@ static IStream *create_stream_from_string(const char *data) return stream; } +#define test_current_encoding(a,b) _test_current_encoding(__LINE__,a,b) +static void _test_current_encoding(unsigned line, IMimeBody *mime_body, ENCODINGTYPE encoding) +{ + ENCODINGTYPE current_encoding; + HRESULT hres; + + hres = IMimeBody_GetCurrentEncoding(mime_body, &current_encoding); + ok_(__FILE__,line)(hres == S_OK, "GetCurrentEncoding failed: %08x\n", hres); + ok_(__FILE__,line)(current_encoding == encoding, "encoding = %d, expected %d\n", current_encoding, encoding); +} + static void test_CreateBody(void) { HRESULT hr; @@ -158,9 +169,7 @@ static void test_CreateBody(void) hr = IMimeBody_InitNew(body); ok(hr == S_OK, "ret %08x\n", hr); - hr = IMimeBody_GetCurrentEncoding(body, &enc); - ok(hr == S_OK, "ret %08x\n", hr); - ok(enc == IET_7BIT, "encoding %d\n", enc); + test_current_encoding(body, IET_7BIT); hr = IMimeBody_Load(body, in); ok(hr == S_OK, "ret %08x\n", hr); @@ -445,6 +454,8 @@ static void test_SetData(void) todo_wine ok(hr == S_OK, "ret %08x\n", hr); + test_current_encoding(body, IET_BINARY); + SET_EXPECT(Stream_Stat); SET_EXPECT(Stream_Seek_END); hr = IMimeBody_GetData(body, IET_BINARY, &stream);

1 0