January 2017 - Wine-Commits

Józef Kucia : wined3d: Implement SM5 ubfe instruction.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 5f57848911e5eecdfe8f9f53fd478aa42c8f9b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f57848911e5eecdfe8f9f53f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:08 2017 +0100 wined3d: Implement SM5 ubfe instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e550318..785cd76 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3793,11 +3793,22 @@ static void shader_glsl_float16(const struct wined3d_shader_instruction *ins) static void shader_glsl_bitwise_op(const struct wined3d_shader_instruction *ins) { + struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct wined3d_shader_dst_param dst; struct glsl_src_param src[4]; + const char *instruction; unsigned int i, j; DWORD write_mask; + switch (ins->handler_idx) + { + case WINED3DSIH_BFI: instruction = "bitfieldInsert"; break; + case WINED3DSIH_UBFE: instruction = "bitfieldExtract"; break; + default: + ERR("Unhandled opcode %#x.\n", ins->handler_idx); + return; + } + dst = ins->dst[0]; for (i = 0; i < 4; ++i) { @@ -3808,10 +3819,12 @@ static void shader_glsl_bitwise_op(const struct wined3d_shader_instruction *ins) &dst, dst.reg.data_type))) continue; - for (j = 0; j < ARRAY_SIZE(src); ++j) + for (j = 0; j < ins->src_count; ++j) shader_glsl_add_src_param(ins, &ins->src[j], write_mask, &src[j]); - shader_addline(ins->ctx->buffer, "bitfieldInsert(%s, %s, %s & 0x1f, %s & 0x1f));\n", - src[3].param_str, src[2].param_str, src[1].param_str, src[0].param_str); + shader_addline(buffer, "%s(", instruction); + for (j = 0; j < ins->src_count - 2; ++j) + shader_addline(buffer, "%s, ", src[ins->src_count - j - 1].param_str); + shader_addline(buffer, "%s & 0x1f, %s & 0x1f));\n", src[1].param_str, src[0].param_str); } } @@ -9066,7 +9079,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2AR */ shader_glsl_texreg2ar, /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, - /* WINED3DSIH_UBFE */ NULL, + /* WINED3DSIH_UBFE */ shader_glsl_bitwise_op, /* WINED3DSIH_UDIV */ shader_glsl_udiv, /* WINED3DSIH_UGE */ shader_glsl_relop, /* WINED3DSIH_ULT */ shader_glsl_relop,

1 0

Jacek Caban : inetcomm: Read content encoding from MIME header.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 56dc24695e6ac5141030e9c820cfd379a7a3a134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56dc24695e6ac5141030e9c82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 31 11:46:39 2017 +0100 inetcomm: Read content encoding from MIME header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 24 +++++++++++++++++++++++- dlls/inetcomm/tests/mimeole.c | 10 ++-------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 91c902f..d8253d9 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -765,6 +765,22 @@ static void init_content_type(MimeBody *body, header_t *header) body->content_sub_type = strdupA(slash + 1); } +static void init_content_encoding(MimeBody *body, header_t *header) +{ + const char *encoding = header->value.u.pszVal; + + if(!strcasecmp(encoding, "base64")) + body->encoding = IET_BASE64; + else if(!strcasecmp(encoding, "quoted-printable")) + body->encoding = IET_QP; + else if(!strcasecmp(encoding, "7bit")) + body->encoding = IET_7BIT; + else if(!strcasecmp(encoding, "8bit")) + body->encoding = IET_8BIT; + else + FIXME("unknown encoding %s\n", debugstr_a(encoding)); +} + static HRESULT parse_headers(MimeBody *body, IStream *stm) { char *header_buf, *cur_header_ptr; @@ -780,8 +796,14 @@ static HRESULT parse_headers(MimeBody *body, IStream *stm) read_value(header, &cur_header_ptr); list_add_tail(&body->headers, &header->entry); - if(header->prop->id == PID_HDR_CNTTYPE) + switch(header->prop->id) { + case PID_HDR_CNTTYPE: init_content_type(body, header); + break; + case PID_HDR_CNTXFER: + init_content_encoding(body, header); + break; + } } HeapFree(GetProcessHeap(), 0, header_buf); diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 16ad06c..8028ca8 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -150,7 +150,6 @@ static void test_CreateBody(void) IStream *in; LARGE_INTEGER off; ULARGE_INTEGER pos; - ENCODINGTYPE enc; ULONG count, found_param, i; MIMEPARAMINFO *param_info; IMimeAllocator *alloc; @@ -191,9 +190,7 @@ static void test_CreateBody(void) hr = IMimeBody_IsContentType(body, "text", "plain"); todo_wine ok(hr == S_OK, "ret %08x\n", hr); - hr = IMimeBody_GetCurrentEncoding(body, &enc); - ok(hr == S_OK, "ret %08x\n", hr); - ok(enc == IET_8BIT, "encoding %d\n", enc); + test_current_encoding(body, IET_8BIT); memset(&offsets, 0xcc, sizeof(offsets)); hr = IMimeBody_GetOffsets(body, &offsets); @@ -658,7 +655,6 @@ static void test_CreateMessage(void) ok(count == 2, "got %d\n", count); if(count == 2) { - ENCODINGTYPE encoding; IMimeBody *attachment; PROPVARIANT prop; @@ -670,9 +666,7 @@ static void test_CreateMessage(void) hr = IMimeBody_IsContentType(attachment, "multipart", NULL); ok(hr == S_FALSE, "ret %08x\n", hr); - hr = IMimeBody_GetCurrentEncoding(attachment, &encoding); - ok(hr == S_OK, "ret %08x\n", hr); - todo_wine ok(encoding == IET_8BIT, "ret %d\n", encoding); + test_current_encoding(attachment, IET_8BIT); prop.vt = VT_LPSTR; hr = IMimeBody_GetProp(attachment, "Content-Transfer-Encoding", 0, &prop);

1 0

Bruno Jesus : mciqtz32: Implement MCI_DGV_PLAY_REPEAT.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 71fbaba42690efd8363e0c9f5fac2158b07a977c URL: http://source.winehq.org/git/wine.git/?a=commit;h=71fbaba42690efd8363e0c9f5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 25 23:01:25 2017 -0200 mciqtz32: Implement MCI_DGV_PLAY_REPEAT. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 41 +++++++++++++++++++++++++++++------------ dlls/mciqtz32/mciqtz_private.h | 3 +++ 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 54f3b78..1aec326 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -359,6 +359,18 @@ static DWORD CALLBACK MCIQTZ_notifyThread(LPVOID parm) } } while (hr == S_OK && event_code != EC_COMPLETE); if (hr == S_OK && event_code == EC_COMPLETE) { + /* Repeat the music by seeking and running again */ + if (wma->mci_flags & MCI_DGV_PLAY_REPEAT) { + TRACE("repeat media as requested\n"); + IMediaControl_Stop(wma->pmctrl); + IMediaSeeking_SetPositions(wma->seek, + &wma->seek_start, + AM_SEEKING_AbsolutePositioning, + &wma->seek_stop, + AM_SEEKING_AbsolutePositioning); + IMediaControl_Run(wma->pmctrl); + continue; + } old = InterlockedExchangePointer(&wma->callback, NULL); if (old) mciDriverNotify(old, wma->notify_devid, MCI_NOTIFY_SUCCESSFUL); @@ -387,9 +399,8 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms { WINE_MCIQTZ* wma; HRESULT hr; - REFERENCE_TIME time1 = 0, time2 = 0; GUID format; - DWORD pos1; + DWORD start_flags; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -408,23 +419,29 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms mciDriverNotify(old, wma->notify_devid, MCI_NOTIFY_ABORTED); } + wma->mci_flags = dwFlags; IMediaSeeking_GetTimeFormat(wma->seek, &format); if (dwFlags & MCI_FROM) { if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) - time1 = lpParms->dwFrom * 10000; + wma->seek_start = lpParms->dwFrom * 10000; else - time1 = lpParms->dwFrom; - pos1 = AM_SEEKING_AbsolutePositioning; - } else - pos1 = AM_SEEKING_NoPositioning; + wma->seek_start = lpParms->dwFrom; + start_flags = AM_SEEKING_AbsolutePositioning; + } else { + wma->seek_start = 0; + start_flags = AM_SEEKING_NoPositioning; + } if (dwFlags & MCI_TO) { if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) - time2 = lpParms->dwTo * 10000; + wma->seek_stop = lpParms->dwTo * 10000; else - time2 = lpParms->dwTo; - } else - IMediaSeeking_GetDuration(wma->seek, &time2); - IMediaSeeking_SetPositions(wma->seek, &time1, pos1, &time2, AM_SEEKING_AbsolutePositioning); + wma->seek_stop = lpParms->dwTo; + } else { + wma->seek_stop = 0; + IMediaSeeking_GetDuration(wma->seek, &wma->seek_stop); + } + IMediaSeeking_SetPositions(wma->seek, &wma->seek_start, start_flags, + &wma->seek_stop, AM_SEEKING_AbsolutePositioning); hr = IMediaControl_Run(wma->pmctrl); if (FAILED(hr)) { diff --git a/dlls/mciqtz32/mciqtz_private.h b/dlls/mciqtz32/mciqtz_private.h index 27939aa..aa6fad9 100644 --- a/dlls/mciqtz32/mciqtz_private.h +++ b/dlls/mciqtz32/mciqtz_private.h @@ -37,6 +37,9 @@ typedef struct { IBasicVideo* vidbasic; IBasicAudio* audio; DWORD time_format; + DWORD mci_flags; + REFERENCE_TIME seek_start; + REFERENCE_TIME seek_stop; UINT command_table; HWND parent; MCIDEVICEID notify_devid;

1 0

Nikolay Sivov : dwrite: Added support for DWRITE_WORD_WRAPPING_CHARACTER mode.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 76c31950fea8dd354b89ea961a3f6a4e840d8e32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c31950fea8dd354b89ea961… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 31 14:43:10 2017 +0300 dwrite: Added support for DWRITE_WORD_WRAPPING_CHARACTER mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 3d931cb..adc3493 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1868,6 +1868,14 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust *textpos += metrics.length; } +static BOOL layout_can_wrap_after(const struct dwrite_textlayout *layout, UINT32 cluster) +{ + if (layout->format.wrapping == DWRITE_WORD_WRAPPING_CHARACTER) + return TRUE; + + return layout->clustermetrics[cluster].canWrapLineAfter; +} + static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) { BOOL is_rtl = layout->format.readingdir == DWRITE_READING_DIRECTION_RIGHT_TO_LEFT; @@ -1907,7 +1915,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) if (overflow) break; - if (layout->clustermetrics[i].canWrapLineAfter) + if (layout_can_wrap_after(layout, i)) last_breaking_point = i; width += layout->clustermetrics[i].width; i++; @@ -1916,7 +1924,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) if (overflow) { /* Overflown on whitespace, ignore it */ - if (layout->clustermetrics[i].isWhitespace && layout->clustermetrics[i].canWrapLineAfter) + if (layout->clustermetrics[i].isWhitespace && layout_can_wrap_after(layout, i)) i = i; /* Use most recently found breaking point */ else if (last_breaking_point != ~0u) { @@ -1926,7 +1934,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) else { /* Otherwise proceed forward to next newline or breaking point */ for (; i < layout->cluster_count; i++) - if (layout->clustermetrics[i].canWrapLineAfter || layout->clustermetrics[i].isNewline) + if (layout_can_wrap_after(layout, i) || layout->clustermetrics[i].isNewline) break; } }

1 0

André Hentschel : oleview: Fix bytecount for memmoves (Coverity).
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: dd3c58c497a58189f5ead6d223f3f8d610d4b3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd3c58c497a58189f5ead6d22… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:08 2017 +0100 oleview: Fix bytecount for memmoves (Coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/details.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index b194f6f..fda9b7c 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -139,7 +139,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad } else if(addings && !memcmp(wszName, wszProxyStubClsid32, sizeof(WCHAR[17]))) { - lenData = sizeof(WCHAR[MAX_LOAD_STRING]); + lenData = sizeof(wszData); RegQueryValueW(hCurKey, NULL, wszData, (LONG *)&lenData); RegCloseKey(hCurKey); @@ -155,7 +155,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad RegCloseKey(hCurKey); - memmove(&wszData[6], wszData, lenData * sizeof(WCHAR)); + memmove(&wszData[6], wszData, lenData); memcpy(wszData, wszCLSID, sizeof(WCHAR[6])); wszData[5] = '\\'; @@ -183,7 +183,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad RegCloseKey(hCurKey); - memmove(&wszData[8], wszData, lenData * sizeof(WCHAR)); + memmove(&wszData[8], wszData, lenData); memcpy(wszData, wszTypeLib, sizeof(WCHAR[8])); wszData[7] = '\\'; RegOpenKeyW(HKEY_CLASSES_ROOT, wszData, &hCurKey); @@ -229,12 +229,11 @@ static void CreateReg(WCHAR *buffer) *path = '\\'; path += 1; - lenTree = sizeof(WCHAR[MAX_LOAD_STRING]); + lenTree = sizeof(wszTree); if(RegQueryValueW(hKey, NULL, wszTree, (LONG *)&lenTree) == ERROR_SUCCESS) { - memmove(&wszTree[lenBuffer-lastLenBuffer+3], wszTree, - lenTree * sizeof(WCHAR)); + memmove(&wszTree[lenBuffer-lastLenBuffer+3], wszTree, lenTree); memcpy(wszTree, &buffer[lastLenBuffer], (lenBuffer - lastLenBuffer) * sizeof(WCHAR));

1 0

Bruno Jesus : notepad: Only skip valid command options.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: bd19402b6d3f6efa30e3b7d088c4bbebd716a2c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd19402b6d3f6efa30e3b7d08… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 31 01:31:33 2017 -0200 notepad: Only skip valid command options. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/notepad/main.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 20e887b..6f567a9 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -615,7 +615,7 @@ static int AlertFileDoesNotExist(LPCWSTR szFileName) static void HandleCommandLine(LPWSTR cmdline) { - WCHAR delimiter; + WCHAR delimiter, *ptr; BOOL opt_print = FALSE; /* skip white space */ @@ -630,22 +630,29 @@ static void HandleCommandLine(LPWSTR cmdline) if (*cmdline == delimiter) cmdline++; - while (*cmdline == ' ' || *cmdline == '-' || *cmdline == '/') + ptr = cmdline; + while (*ptr == ' ' || *ptr == '-' || *ptr == '/') { WCHAR option; - if (*cmdline++ == ' ') continue; + if (*ptr++ == ' ') continue; - option = *cmdline; - if (option) cmdline++; - while (*cmdline == ' ') cmdline++; + option = *ptr; + if (option) ptr++; + while (*ptr == ' ') ptr++; switch(option) { case 'p': case 'P': - opt_print = TRUE; + { + if (!opt_print) + { + opt_print = TRUE; + cmdline = ptr; + } break; + } } }

1 0

Nikolay Sivov : regedit: Clear value list when tree root is selected.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: c5f26bf56ddbf314374825fae9f66b6def582a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f26bf56ddbf314374825fae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 28 16:37:52 2017 +0300 regedit: Clear value list when tree root is selected. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 08eeec1..2211d68 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -174,6 +174,15 @@ static void OnTreeSelectionChanged(HWND hwndTV, HWND hwndLV, HTREEITEM hItem, BO if (bRefreshLV) { LPWSTR keyPath; HKEY hRootKey = NULL; + HTREEITEM rootitem; + + rootitem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_ROOT, 0); + if (rootitem == hItem) + { + SendMessageW(hwndLV, LVM_DELETEALLITEMS, 0, 0); + return; + } + keyPath = GetItemPath(hwndTV, hItem, &hRootKey); RefreshListView(hwndLV, hRootKey, keyPath, NULL); HeapFree(GetProcessHeap(), 0, keyPath);

1 0

Austin English : ntoskrnl.exe: Add IoCreateFile stub.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: a8222a0437441fc3cb83413c869259b860faf46d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8222a0437441fc3cb83413c8… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 17:24:31 2017 -0600 ntoskrnl.exe: Add IoCreateFile stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7527659..1ab3a4e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3159,3 +3159,15 @@ BOOL WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, KDP FIXME("stub: %p %s %u %p\n", timer, wine_dbgstr_longlong(duetime.QuadPart), period, dpc); return TRUE; } + +/*********************************************************************** + * IoCreateFile (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateFile(HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + IO_STATUS_BLOCK *io, LARGE_INTEGER *alloc_size, ULONG attributes, ULONG sharing, + ULONG disposition, ULONG create_options, VOID *ea_buffer, ULONG ea_length, + CREATE_FILE_TYPE file_type, VOID *parameters, ULONG options ) +{ + FIXME(": stub\n"); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index bc37a76..bd02586 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -339,7 +339,7 @@ @ stdcall IoCreateDevice(ptr long ptr long long long ptr) @ stub IoCreateDisk @ stdcall IoCreateDriver(ptr ptr) -@ stub IoCreateFile +@ stdcall IoCreateFile(ptr long ptr ptr long long long ptr long long ptr long ptr long) @ stub IoCreateFileSpecifyDeviceObjectHint @ stub IoCreateNotificationEvent @ stub IoCreateStreamFileObject diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 95de8d0..4c696f7 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -737,6 +737,12 @@ typedef enum _BUS_QUERY_ID_TYPE { BusQueryDeviceSerialNumber } BUS_QUERY_ID_TYPE, *PBUS_QUERY_ID_TYPE; +typedef enum _CREATE_FILE_TYPE { + CreateFileTypeNone, + CreateFileTypeNamedPipe, + CreateFileTypeMailslot +} CREATE_FILE_TYPE; + typedef enum { DevicePropertyDeviceDescription, DevicePropertyHardwareID,

1 0

Bruno Jesus : wlanapi/tests: Add tests for WlanOpenHandle.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 4371e1c53f3d8ed3d9cf8a344d5325c05f4d97d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4371e1c53f3d8ed3d9cf8a344… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 30 04:59:40 2017 -0200 wlanapi/tests: Add tests for WlanOpenHandle. Manually tested on XP and Windows 8 with real wireless card. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/tests/wlanapi.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index 3e6ac7a..c0bc658 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -24,6 +24,76 @@ #include "wine/test.h" +static void test_WlanOpenHandle(void) +{ + HANDLE bad_handle = (HANDLE) 0xdeadcafe, handle = bad_handle; + DWORD ret, neg_version = 0xdeadbeef, reserved = 0xdead; + BOOL is_xp; + + /* invalid version requested */ + ret = WlanOpenHandle(0, NULL, &neg_version, &handle); + is_xp = ret == ERROR_SUCCESS; + if (!is_xp) /* the results in XP differ completely from all other versions */ + { +todo_wine + ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %d\n", ret); + ok(neg_version == 0xdeadbeef, "neg_vesion changed\n"); + ok(handle == bad_handle, "handle changed\n"); + ret = WlanOpenHandle(10, NULL, &neg_version, &handle); +todo_wine + ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %d\n", ret); + ok(neg_version == 0xdeadbeef, "neg_vesion changed\n"); + ok(handle == bad_handle, "handle changed\n"); + + /* reserved parameter must not be used */ + ret = WlanOpenHandle(1, &reserved, &neg_version, &handle); +todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(neg_version == 0xdeadbeef, "neg_vesion changed\n"); + ok(handle == bad_handle, "handle changed\n"); + + /* invalid parameters */ + ret = WlanOpenHandle(1, NULL, NULL, &handle); +todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(handle == bad_handle, "bad handle\n"); + ret = WlanOpenHandle(1, NULL, &neg_version, NULL); +todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(neg_version == 0xdeadbeef, "neg_vesion changed\n"); + } + else + { + ok(neg_version == 1, "Expected 1, got %d\n", neg_version); + ok(handle != bad_handle && handle, "handle changed\n"); + ret = WlanCloseHandle(handle, NULL); + ok(ret == 0, "Expected 0, got %d\n", ret); + } + + /* good tests */ +todo_wine { + ret = WlanOpenHandle(1, NULL, &neg_version, &handle); + ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(neg_version == 1, "Expected 1, got %d\n", neg_version); + ok(handle != bad_handle && handle, "handle changed\n"); + ret = WlanCloseHandle(handle, NULL); + ok(ret == 0, "Expected 0, got %d\n", ret); + + ret = WlanOpenHandle(2, NULL, &neg_version, &handle); + ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + if (!is_xp) /* XP does not support client version 2 */ + ok(neg_version == 2, "Expected 2, got %d\n", neg_version); + else + ok(neg_version == 1, "Expected 1, got %d\n", neg_version); + ok(handle != bad_handle && handle, "bad handle\n"); + ret = WlanCloseHandle(handle, NULL); + ok(ret == 0, "Expected 0, got %d\n", ret); + + ret = WlanCloseHandle(NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 0, got %d\n", ret); +} +} + START_TEST(wlanapi) { HANDLE handle; @@ -36,4 +106,6 @@ START_TEST(wlanapi) win_skip("No wireless service running\n"); return; } + + test_WlanOpenHandle(); }

1 0

Bruno Jesus : wlanapi: Implement WlanAllocateMemory/ WlanFreeMemory with tests.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 25a9e2c6e24d4f369b3c31f7e1a0c6d7534438cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a9e2c6e24d4f369b3c31f7e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 30 04:59:41 2017 -0200 wlanapi: Implement WlanAllocateMemory/WlanFreeMemory with tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 25 +++++++++++++++++++++++++ dlls/wlanapi/tests/wlanapi.c | 18 ++++++++++++++++++ dlls/wlanapi/wlanapi.spec | 4 ++-- include/wlanapi.h | 2 ++ 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index cf6a684..5eeb515 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -46,6 +46,31 @@ DWORD WINAPI WlanOpenHandle(DWORD client_version, void *reserved, DWORD *negotia return ERROR_CALL_NOT_IMPLEMENTED; } +void WINAPI WlanFreeMemory(void *ptr) +{ + TRACE("(%p)\n", ptr); + + HeapFree(GetProcessHeap(), 0, ptr); +} + +void *WINAPI WlanAllocateMemory(DWORD size) +{ + void *ret; + + TRACE("(%d)", size); + + if (!size) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + ret = HeapAlloc(GetProcessHeap(), 0, size); + if (!ret) + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + + return ret; +} BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *reserved) { diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index c0bc658..a35a7c9 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -94,6 +94,23 @@ todo_wine { } } +static void test_WlanAllocateFreeMemory(void) +{ + void *ptr; + + SetLastError(0xdeadbeef); + ptr = WlanAllocateMemory(0); + ok(ptr == NULL, "Expected NULL, got %p\n", ptr); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", GetLastError()); + + ptr = WlanAllocateMemory(1024); + ok(ptr != NULL, "Expected non-NULL\n"); + + WlanFreeMemory(ptr); + + WlanFreeMemory(NULL); /* return is void, proves that won't crash */ +} + START_TEST(wlanapi) { HANDLE handle; @@ -108,4 +125,5 @@ START_TEST(wlanapi) } test_WlanOpenHandle(); + test_WlanAllocateFreeMemory(); } diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index 59454f4..a11b857 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -1,11 +1,11 @@ -@ stub WlanAllocateMemory +@ stdcall WlanAllocateMemory(long) @ stdcall WlanCloseHandle(ptr ptr) @ stub WlanConnect @ stub WlanDeleteProfile @ stub WlanDisconnect @ stdcall WlanEnumInterfaces(long ptr ptr) @ stub WlanExtractPsdIEDataList -@ stub WlanFreeMemory +@ stdcall WlanFreeMemory(ptr) @ stub WlanGetAvailableNetworkList @ stub WlanGetFilterList @ stub WlanGetInterfaceCapability diff --git a/include/wlanapi.h b/include/wlanapi.h index 73b4583..f6ef60d 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -48,5 +48,7 @@ typedef struct _WLAN_INTERFACE_INFO_LIST DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *); +void *WINAPI WlanAllocateMemory(DWORD); +void WINAPI WlanFreeMemory(void *); #endif /* _WLAN_WLANAPI_H */

1 0