December 2014 - Wine-commits

Sebastian Lackner : shlwapi: Add implementation for StrCatChainW.
by Alexandre Julliard 16 Dec '14

16 Dec '14

Module: wine Branch: master Commit: 4b33a339cc5328b1c117f5ed0cbde1a6c4f6b7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b33a339cc5328b1c117f5ed0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Dec 7 22:55:31 2014 +0100 shlwapi: Add implementation for StrCatChainW. Based on a patch by Huw Campbell. --- .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 2 +- dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/string.c | 41 +++++++ dlls/shlwapi/tests/string.c | 122 +++++++++++++++++++++ 4 files changed, 165 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec index 9d266fa..7736645 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec @@ -86,7 +86,7 @@ @ stdcall SHRegSetUSValueW( wstr wstr long ptr long long) shlwapi.SHRegSetUSValueW @ stdcall StrCatBuffA(str str long) shlwapi.StrCatBuffA @ stdcall StrCatBuffW(wstr wstr long) shlwapi.StrCatBuffW -@ stub StrCatChainW +@ stdcall StrCatChainW(ptr long long wstr) shlwapi.StrCatChainW @ stdcall StrChrA(str long) shlwapi.StrChrA @ stdcall StrChrIA(str long) shlwapi.StrChrIA @ stdcall StrChrIW(wstr long) shlwapi.StrChrIW diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index b7aac08..6b6ead2 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -759,6 +759,7 @@ @ stdcall StrCSpnW (wstr wstr) @ stdcall StrCatBuffA (str str long) @ stdcall StrCatBuffW (wstr wstr long) +@ stdcall StrCatChainW (ptr long long wstr) @ stdcall StrCatW (ptr wstr) @ stdcall StrChrA (str long) @ stdcall StrChrIA (str long) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 9ba6038..ca2f9b9 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -459,6 +459,47 @@ LPWSTR WINAPI StrCatW(LPWSTR lpszStr, LPCWSTR lpszSrc) } /************************************************************************* + * StrCatChainW [SHLWAPI.@] + * + * Concatenates two unicode strings. + * + * PARAMS + * lpszStr [O] Initial string + * cchMax [I] Length of destination buffer + * ichAt [I] Offset from the destination buffer to begin concatenation + * lpszCat [I] String to concatenate + * + * RETURNS + * The offset from the beginning of pszDst to the terminating NULL. + */ +DWORD WINAPI StrCatChainW(LPWSTR lpszStr, DWORD cchMax, DWORD ichAt, LPCWSTR lpszCat) +{ + TRACE("(%s,%u,%d,%s)\n", debugstr_w(lpszStr), cchMax, ichAt, debugstr_w(lpszCat)); + + if (ichAt == -1) + ichAt = strlenW(lpszStr); + + if (!cchMax) + return ichAt; + + if (ichAt == cchMax) + ichAt--; + + if (lpszCat && ichAt < cchMax) + { + lpszStr += ichAt; + while (ichAt < cchMax - 1 && *lpszCat) + { + *lpszStr++ = *lpszCat++; + ichAt++; + } + *lpszStr = 0; + } + + return ichAt; +} + +/************************************************************************* * StrCpyW [SHLWAPI.@] * * Copy a string to another string. diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index c72b774..ac14db0 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -48,6 +48,7 @@ static DWORD (WINAPI *pSHAnsiToAnsi)(LPCSTR,LPSTR,int); static DWORD (WINAPI *pSHUnicodeToUnicode)(LPCWSTR,LPWSTR,int); static LPSTR (WINAPI *pStrCatBuffA)(LPSTR,LPCSTR,INT); static LPWSTR (WINAPI *pStrCatBuffW)(LPWSTR,LPCWSTR,INT); +static DWORD (WINAPI *pStrCatChainW)(LPWSTR,DWORD,DWORD,LPCWSTR); static LPSTR (WINAPI *pStrCpyNXA)(LPSTR,LPCSTR,int); static LPWSTR (WINAPI *pStrCpyNXW)(LPWSTR,LPCWSTR,int); static LPSTR (WINAPI *pStrFormatByteSize64A)(LONGLONG,LPSTR,UINT); @@ -1481,6 +1482,125 @@ static void test_StrStrNIW(void) } } +static void test_StrCatChainW(void) +{ + static const WCHAR deadbeefW[] = {'D','e','A','d','B','e','E','f',0}; + static const WCHAR deadW[] = {'D','e','A','d',0}; + static const WCHAR beefW[] = {'B','e','E','f',0}; + + WCHAR buf[32 + 1]; + DWORD ret; + + if (!pStrCatChainW) + { + win_skip("StrCatChainW is not available\n"); + return; + } + + /* Test with NULL buffer */ + ret = pStrCatChainW(NULL, 0, 0, beefW); + ok(ret == 0, "Expected StrCatChainW to return 0, got %u\n", ret); + + /* Test with empty buffer */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 0, 0, beefW); + ok(ret == 0, "Expected StrCatChainW to return 0, got %u\n", ret); + ok(buf[0] == 0x1111, "Expected buf[0] = 0x1111, got %x\n", buf[0]); + + memcpy(buf, deadbeefW, sizeof(deadbeefW)); + ret = pStrCatChainW(buf, 0, -1, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + /* Append data to existing string with offset = -1 */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 32, 0, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + ret = pStrCatChainW(buf, 32, -1, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + /* Append data at a fixed offset */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 32, 0, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + ret = pStrCatChainW(buf, 32, 4, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + /* Buffer exactly sufficient for string + terminating null */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 5, 0, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* Buffer too small, string will be truncated */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 4, 0, deadW); + if (ret == 4) + { + /* Windows 2000 and XP uses a slightly different implementation + * for StrCatChainW, which doesn't ensure that strings are null- + * terminated. Skip test if we detect such an implementation. */ + win_skip("Windows2000/XP behaviour detected for StrCatChainW, skipping tests\n"); + return; + } + ok(ret == 3, "Expected StrCatChainW to return 3, got %u\n", ret); + ok(!memcmp(buf, deadW, 3 * sizeof(WCHAR)), "Buffer contains wrong data\n"); + ok(!buf[3], "String is not nullterminated\n"); + ok(buf[4] == 0x1111, "Expected buf[4] = 0x1111, got %x\n", buf[4]); + + /* Overwrite part of an existing string */ + ret = pStrCatChainW(buf, 4, 1, beefW); + ok(ret == 3, "Expected StrCatChainW to return 3, got %u\n", ret); + ok(buf[0] == 'D', "Expected buf[0] = 'D', got %x\n", buf[0]); + ok(buf[1] == 'B', "Expected buf[1] = 'B', got %x\n", buf[1]); + ok(buf[2] == 'e', "Expected buf[2] = 'e', got %x\n", buf[2]); + ok(!buf[3], "String is not nullterminated\n"); + ok(buf[4] == 0x1111, "Expected buf[4] = 0x1111, got %x\n", buf[4]); + + /* Test appending to full buffer */ + memset(buf, 0x11, sizeof(buf)); + memcpy(buf, deadbeefW, sizeof(deadbeefW)); + memcpy(buf + 9, deadW, sizeof(deadW)); + ret = pStrCatChainW(buf, 9, 8, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + ok(!memcmp(buf + 9, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* Offset points at the end of the buffer */ + ret = pStrCatChainW(buf, 9, 9, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + ok(!memcmp(buf + 9, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* Offset points outside of the buffer */ + ret = pStrCatChainW(buf, 9, 10, beefW); + ok(ret == 10, "Expected StrCatChainW to return 10, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + ok(!memcmp(buf + 9, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* The same but without nullterminated string */ + memcpy(buf, deadbeefW, sizeof(deadbeefW)); + ret = pStrCatChainW(buf, 5, -1, deadW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + ret = pStrCatChainW(buf, 5, 5, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + ok(buf[5] == 'e', "Expected buf[5] = 'e', got %x\n", buf[5]); + + ret = pStrCatChainW(buf, 5, 6, deadW); + ok(ret == 6, "Expected StrCatChainW to return 6, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + ok(buf[5] == 'e', "Expected buf[5] = 'e', got %x\n", buf[5]); +} + START_TEST(string) { HMODULE hShlwapi; @@ -1500,6 +1620,7 @@ START_TEST(string) pSHUnicodeToUnicode = (void *)GetProcAddress(hShlwapi, (LPSTR)346); pStrCatBuffA = (void *)GetProcAddress(hShlwapi, "StrCatBuffA"); pStrCatBuffW = (void *)GetProcAddress(hShlwapi, "StrCatBuffW"); + pStrCatChainW = (void *)GetProcAddress(hShlwapi, "StrCatChainW"); pStrCpyNXA = (void *)GetProcAddress(hShlwapi, (LPSTR)399); pStrCpyNXW = (void *)GetProcAddress(hShlwapi, (LPSTR)400); pStrChrNW = (void *)GetProcAddress(hShlwapi, "StrChrNW"); @@ -1565,6 +1686,7 @@ START_TEST(string) test_StrStrIW(); test_StrStrNW(); test_StrStrNIW(); + test_StrCatChainW(); CoUninitialize(); }

1 0

Andrew Eikum : mshtml: Support new window targets for FORM elements.
by Alexandre Julliard 16 Dec '14

16 Dec '14

Module: wine Branch: master Commit: 8df27741242e12060d1984ffa78a057bd7718209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df27741242e12060d1984ffa… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Dec 16 09:13:05 2014 -0600 mshtml: Support new window targets for FORM elements. --- dlls/mshtml/binding.h | 4 ++-- dlls/mshtml/hlink.c | 2 +- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlform.c | 27 +++++++++++++++------------ dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/navigate.c | 36 +++++++++++++++++++++++++----------- 6 files changed, 45 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 073f2fb..e40735c 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -138,9 +138,9 @@ HRESULT set_moniker(HTMLOuterWindow*,IMoniker*,IUri*,IBindCtx*,nsChannelBSC*,BOO void prepare_for_binding(HTMLDocument*,IMoniker*,DWORD) DECLSPEC_HIDDEN; HRESULT super_navigate(HTMLOuterWindow*,IUri*,DWORD,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; HRESULT load_uri(HTMLOuterWindow*,IUri*,DWORD) DECLSPEC_HIDDEN; -HRESULT navigate_new_window(HTMLOuterWindow*,IUri*,const WCHAR*,IHTMLWindow2**) DECLSPEC_HIDDEN; +HRESULT navigate_new_window(HTMLOuterWindow*,IUri*,const WCHAR*,request_data_t*,IHTMLWindow2**) DECLSPEC_HIDDEN; HRESULT navigate_url(HTMLOuterWindow*,const WCHAR*,IUri*,DWORD) DECLSPEC_HIDDEN; -HRESULT submit_form(HTMLOuterWindow*,IUri*,nsIInputStream*) DECLSPEC_HIDDEN; +HRESULT submit_form(HTMLOuterWindow*,const WCHAR*,IUri*,nsIInputStream*) DECLSPEC_HIDDEN; void init_bscallback(BSCallback*,const BSCallbackVtbl*,IMoniker*,DWORD) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/hlink.c b/dlls/mshtml/hlink.c index 4e63498..7ce0423 100644 --- a/dlls/mshtml/hlink.c +++ b/dlls/mshtml/hlink.c @@ -85,7 +85,7 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L FIXME("JumpLocation not supported\n"); if(!This->doc_obj->client) - return navigate_new_window(This->window, This->window->uri, NULL, NULL); + return navigate_new_window(This->window, This->window->uri, NULL, NULL, NULL); return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); } diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index df95c2b..6650a44 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -65,7 +65,7 @@ static HRESULT navigate_anchor_window(HTMLAnchorElement *This, const WCHAR *targ if(FAILED(hres)) return hres; - hres = navigate_new_window(This->element.node.doc->basedoc.window, uri, target, NULL); + hres = navigate_new_window(This->element.node.doc->basedoc.window, uri, target, NULL, NULL); IUri_Release(uri); return hres; } diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index e901dbe..2b2a62f 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -389,6 +389,7 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) IUri *uri; nsresult nsres; HRESULT hres; + BOOL use_new_window; TRACE("(%p)->()\n", This); @@ -404,22 +405,21 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) nsAString_Init(&target_str, NULL); nsres = nsIDOMHTMLFormElement_GetTarget(This->nsform, &target_str); - if(NS_SUCCEEDED(nsres)) { - BOOL use_new_window; + if(NS_SUCCEEDED(nsres)) window = get_target_window(this_window, &target_str, &use_new_window); - if(use_new_window) - FIXME("submit to new window is not supported\n"); - } - nsAString_Finish(&target_str); - if(!window) + + if(!window && !use_new_window) { + nsAString_Finish(&target_str); return S_OK; + } /* * FIXME: We currently don't use our submit implementation for sub-windows because * load_nsuri can't support post data. We should fix it. */ - if(!window->doc_obj || window->doc_obj->basedoc.window != window) { + if(window && (!window->doc_obj || window->doc_obj->basedoc.window != window)) { nsres = nsIDOMHTMLFormElement_Submit(This->nsform); + nsAString_Finish(&target_str); IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); if(NS_FAILED(nsres)) { ERR("Submit failed: %08x\n", nsres); @@ -442,13 +442,16 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) } nsAString_Finish(&action_uri_str); if(SUCCEEDED(hres)) { - window->readystate_locked++; - hres = submit_form(window, uri, post_stream); - window->readystate_locked--; + const PRUnichar *target; + + nsAString_GetData(&target_str, &target); + hres = submit_form(window, target, uri, post_stream); IUri_Release(uri); } - IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + nsAString_Finish(&target_str); + if(window) + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); if(post_stream) nsIInputStream_Release(post_stream); return hres; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6c6c328..82bb374 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -967,7 +967,7 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, if(FAILED(hres)) return hres; - hres = navigate_new_window(window, uri, name, pomWindowResult); + hres = navigate_new_window(window, uri, name, NULL, pomWindowResult); IUri_Release(uri); return hres; } diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 85e47aa..2ac12ea 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2107,7 +2107,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC return hres; } -HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *name, IHTMLWindow2 **ret) +HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *name, request_data_t *request_data, IHTMLWindow2 **ret) { IWebBrowser2 *web_browser; IHTMLWindow2 *new_window; @@ -2115,7 +2115,12 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam nsChannelBSC *bsc; HRESULT hres; - hres = create_channelbsc(NULL, NULL, NULL, 0, FALSE, &bsc); + if(request_data) + hres = create_channelbsc(NULL, request_data->headers, + request_data->post_data, request_data->post_data_len, FALSE, + &bsc); + else + hres = create_channelbsc(NULL, NULL, NULL, 0, FALSE, &bsc); if(FAILED(hres)) return hres; @@ -2322,23 +2327,32 @@ static HRESULT translate_uri(HTMLOuterWindow *window, IUri *orig_uri, BSTR *ret_ return S_OK; } -HRESULT submit_form(HTMLOuterWindow *window, IUri *submit_uri, nsIInputStream *post_stream) +HRESULT submit_form(HTMLOuterWindow *window, const WCHAR *target, IUri *submit_uri, nsIInputStream *post_stream) { request_data_t request_data = {NULL}; - BSTR display_uri; - IUri *uri; HRESULT hres; hres = read_post_data_stream(post_stream, TRUE, NULL, &request_data); if(FAILED(hres)) return hres; - hres = translate_uri(window, submit_uri, &display_uri, &uri); - if(SUCCEEDED(hres)) { - hres = navigate_uri(window, uri, display_uri, &request_data, BINDING_NAVIGATED|BINDING_SUBMIT); - IUri_Release(uri); - SysFreeString(display_uri); - } + if(window) { + IUri *uri; + BSTR display_uri; + + window->readystate_locked++; + + hres = translate_uri(window, submit_uri, &display_uri, &uri); + if(SUCCEEDED(hres)) { + hres = navigate_uri(window, uri, display_uri, &request_data, BINDING_NAVIGATED|BINDING_SUBMIT); + IUri_Release(uri); + SysFreeString(display_uri); + } + + window->readystate_locked--; + }else + hres = navigate_new_window(window, submit_uri, target, &request_data, NULL); + release_request_data(&request_data); return hres; }

1 0

Sebastian Lackner : psapi: Implement semi-stub for K32EnumProcessModulesEx.
by Alexandre Julliard 16 Dec '14

16 Dec '14

Module: wine Branch: master Commit: cacc9ae888b005efa5a04f5a1559b9a9d21598eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cacc9ae888b005efa5a04f5a1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 29 23:00:53 2014 +0100 psapi: Implement semi-stub for K32EnumProcessModulesEx. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/module.c | 14 ++++++++++++++ dlls/psapi/psapi.spec | 1 + include/psapi.h | 1 + 4 files changed, 17 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 886eb42..c79b5d7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -803,6 +803,7 @@ @ stdcall K32EnumPageFilesA(ptr ptr) @ stdcall K32EnumPageFilesW(ptr ptr) @ stdcall K32EnumProcessModules(long ptr long ptr) +@ stdcall K32EnumProcessModulesEx(long ptr long ptr long) @ stdcall K32EnumProcesses(ptr long ptr) @ stdcall K32GetDeviceDriverBaseNameA(ptr ptr long) @ stdcall K32GetDeviceDriverBaseNameW(ptr ptr long) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index ca4cf41..2a87e66 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1247,6 +1247,20 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, } /*********************************************************************** + * K32EnumProcessModulesEx (KERNEL32.@) + * + * NOTES + * Returned list is in load order. + */ +BOOL WINAPI K32EnumProcessModulesEx(HANDLE process, HMODULE *lphModule, + DWORD cb, DWORD *needed, DWORD filter) +{ + FIXME("(%p, %p, %d, %p, %d) semi-stub\n", + process, lphModule, cb, needed, filter); + return K32EnumProcessModules(process, lphModule, cb, needed); +} + +/*********************************************************************** * K32GetModuleBaseNameW (KERNEL32.@) */ DWORD WINAPI K32GetModuleBaseNameW(HANDLE process, HMODULE module, diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index 45a1325..d6116f8 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -3,6 +3,7 @@ @ stdcall EnumPageFilesA(ptr ptr) kernel32.K32EnumPageFilesA @ stdcall EnumPageFilesW(ptr ptr) kernel32.K32EnumPageFilesW @ stdcall EnumProcessModules(long ptr long ptr) kernel32.K32EnumProcessModules +@ stdcall EnumProcessModulesEx(long ptr long ptr long) kernel32.K32EnumProcessModulesEx @ stdcall EnumProcesses(ptr long ptr) kernel32.K32EnumProcesses @ stdcall GetDeviceDriverBaseNameA(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameA @ stdcall GetDeviceDriverBaseNameW(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameW diff --git a/include/psapi.h b/include/psapi.h index f031724..fbdd903 100644 --- a/include/psapi.h +++ b/include/psapi.h @@ -81,6 +81,7 @@ extern "C" { BOOL WINAPI EnumProcesses(DWORD*, DWORD, DWORD*); BOOL WINAPI EnumProcessModules(HANDLE, HMODULE*, DWORD, LPDWORD); +BOOL WINAPI EnumProcessModulesEx(HANDLE, HMODULE*, DWORD, LPDWORD, DWORD); DWORD WINAPI GetModuleBaseNameA(HANDLE, HMODULE, LPSTR, DWORD); DWORD WINAPI GetModuleBaseNameW(HANDLE, HMODULE, LPWSTR, DWORD); #define GetModuleBaseName WINELIB_NAME_AW(GetModuleBaseName)

1 0

Alistair Leslie-Hughes : jscript: Support PROPERTYGET in Date Value.
by Alexandre Julliard 15 Dec '14

15 Dec '14

Module: wine Branch: master Commit: 6e8490a582db3ce5bdfb7b7461614dfedabe3e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e8490a582db3ce5bdfb7b746… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 12 13:47:54 2014 +1100 jscript: Support PROPERTYGET in Date Value. --- dlls/jscript/date.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 81b714f..8d62975 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -1925,6 +1925,8 @@ static HRESULT Date_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign switch(flags) { case INVOKE_FUNC: return throw_type_error(ctx, JS_E_FUNCTION_EXPECTED, NULL); + case INVOKE_PROPERTYGET: + return dateobj_to_string( (DateInstance*)jsthis->u.jsdisp, r); default: FIXME("unimplemented flags %x\n", flags); return E_NOTIMPL;

1 0

Jacek Caban : jscript: Added test of Date object default value.
by Alexandre Julliard 15 Dec '14

15 Dec '14

Module: wine Branch: master Commit: ceaf8bfd837946edf179408ea380c11dd98e6805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceaf8bfd837946edf179408ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 13 11:47:52 2014 +1100 jscript: Added test of Date object default value. --- dlls/jscript/tests/run.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 122db60..1adc25d 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1945,6 +1945,30 @@ static HRESULT parse_script_expr(const char *expr, VARIANT *res) return hres; } +static void test_default_value(void) +{ + DISPPARAMS dp = {0}; + IDispatch *disp; + VARIANT v; + HRESULT hres; + + hres = parse_script_expr("new Date()", &v); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d", V_VT(&v)); + disp = V_DISPATCH(&v); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK || broken(hres == 0x8000ffff), "Invoke failed: %08x\n", hres); + if(hres == S_OK) + { + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + } + + VariantClear(&v); + IDispatch_Release(disp); +} + static void test_script_exprs(void) { VARIANT v; @@ -1988,6 +2012,8 @@ static void test_script_exprs(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + test_default_value(); + testing_expr = FALSE; }

1 0

Michael Stefaniuc : oleaut32/tests: Remove duplicated subexpressions ( PVS-Studio).
by Alexandre Julliard 15 Dec '14

15 Dec '14

Module: wine Branch: master Commit: e85db0891be3c00771b1834d11adb12fcf634c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85db0891be3c00771b1834d1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 15 13:30:10 2014 +0100 oleaut32/tests: Remove duplicated subexpressions (PVS-Studio). --- dlls/oleaut32/tests/vartest.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 28983ff..d15adcb 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -6051,7 +6051,6 @@ static void test_VarAnd(void) else if (leftvt == VT_I4 || rightvt == VT_I4 || leftvt == VT_UINT || rightvt == VT_UINT || leftvt == VT_INT || rightvt == VT_INT || - leftvt == VT_UINT || rightvt == VT_UINT || leftvt == VT_R4 || rightvt == VT_R4 || leftvt == VT_R8 || rightvt == VT_R8 || leftvt == VT_CY || rightvt == VT_CY ||

1 0

Martin Storsjo : combase: Implement creation and deletion of HSTRING objects.
by Alexandre Julliard 15 Dec '14

15 Dec '14

Module: wine Branch: master Commit: e79460cd5c1a3cb47b06cae0542accc301bf00ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79460cd5c1a3cb47b06cae05… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 15 10:24:48 2014 +0200 combase: Implement creation and deletion of HSTRING objects. --- configure | 1 + configure.ac | 1 + .../api-ms-win-core-winrt-string-l1-1-0.spec | 8 +- dlls/combase/Makefile.in | 3 +- dlls/combase/combase.spec | 8 +- dlls/combase/string.c | 144 +++++++++++++++++++++ dlls/combase/tests/Makefile.in | 4 + dlls/combase/tests/string.c | 128 ++++++++++++++++++ tools/make_specfiles | 1 + 9 files changed, 289 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e79460cd5c1a3cb47b06c…

1 0

Martin Storsjo : combase: Implement functions for accessing HSTRING objects.
by Alexandre Julliard 15 Dec '14

15 Dec '14

Module: wine Branch: master Commit: 998006e41d5cdcbee1396b7985d79d0fc16e5af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=998006e41d5cdcbee1396b798… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 15 10:24:49 2014 +0200 combase: Implement functions for accessing HSTRING objects. --- .../api-ms-win-core-winrt-string-l1-1-0.spec | 8 +-- dlls/combase/combase.spec | 8 +-- dlls/combase/string.c | 67 ++++++++++++++++++++++ dlls/combase/tests/string.c | 65 ++++++++++++++++++++- 4 files changed, 139 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec index 7658867..cb6bb5e 100644 --- a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec @@ -13,14 +13,14 @@ @ stdcall WindowsDeleteString(ptr) combase.WindowsDeleteString @ stub WindowsDeleteStringBuffer @ stdcall WindowsDuplicateString(ptr ptr) combase.WindowsDuplicateString -@ stub WindowsGetStringLen -@ stub WindowsGetStringRawBuffer +@ stdcall WindowsGetStringLen(ptr) combase.WindowsGetStringLen +@ stdcall WindowsGetStringRawBuffer(ptr ptr) combase.WindowsGetStringRawBuffer @ stub WindowsInspectString -@ stub WindowsIsStringEmpty +@ stdcall WindowsIsStringEmpty(ptr) combase.WindowsIsStringEmpty @ stub WindowsPreallocateStringBuffer @ stub WindowsPromoteStringBuffer @ stub WindowsReplaceString -@ stub WindowsStringHasEmbeddedNull +@ stdcall WindowsStringHasEmbeddedNull(ptr ptr) combase.WindowsStringHasEmbeddedNull @ stub WindowsSubstring @ stub WindowsSubstringWithSpecifiedLength @ stub WindowsTrimStringEnd diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index f399d25..e0136f0 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -294,14 +294,14 @@ @ stdcall WindowsDeleteString(ptr) @ stub WindowsDeleteStringBuffer @ stdcall WindowsDuplicateString(ptr ptr) -@ stub WindowsGetStringLen -@ stub WindowsGetStringRawBuffer +@ stdcall WindowsGetStringLen(ptr) +@ stdcall WindowsGetStringRawBuffer(ptr ptr) @ stub WindowsInspectString -@ stub WindowsIsStringEmpty +@ stdcall WindowsIsStringEmpty(ptr) @ stub WindowsPreallocateStringBuffer @ stub WindowsPromoteStringBuffer @ stub WindowsReplaceString -@ stub WindowsStringHasEmbeddedNull +@ stdcall WindowsStringHasEmbeddedNull(ptr ptr) @ stub WindowsSubstring @ stub WindowsSubstringWithSpecifiedLength @ stub WindowsTrimStringEnd diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 4eefc6c..09519a1 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -33,6 +33,8 @@ struct hstring_private LONG refcount; }; +static const WCHAR empty[1]; + C_ASSERT(sizeof(struct hstring_private) <= sizeof(HSTRING_HEADER)); static inline struct hstring_private *impl_from_HSTRING(HSTRING string) @@ -142,3 +144,68 @@ HRESULT WINAPI WindowsDuplicateString(HSTRING str, HSTRING *out) *out = str; return S_OK; } + +/*********************************************************************** + * WindowsGetStringLen (combase.@) + */ +UINT32 WINAPI WindowsGetStringLen(HSTRING str) +{ + struct hstring_private *priv = impl_from_HSTRING(str); + if (str == NULL) + return 0; + return priv->length; +} + +/*********************************************************************** + * WindowsGetStringRawBuffer (combase.@) + */ +LPCWSTR WINAPI WindowsGetStringRawBuffer(HSTRING str, UINT32 *len) +{ + struct hstring_private *priv = impl_from_HSTRING(str); + if (str == NULL) + { + if (len) + *len = 0; + return empty; + } + if (len) + *len = priv->length; + return priv->buffer; +} + +/*********************************************************************** + * WindowsStringHasEmbeddedNull (combase.@) + */ +HRESULT WINAPI WindowsStringHasEmbeddedNull(HSTRING str, BOOL *out) +{ + UINT32 i; + struct hstring_private *priv = impl_from_HSTRING(str); + if (out == NULL) + return E_INVALIDARG; + if (str == NULL) + { + *out = FALSE; + return S_OK; + } + for (i = 0; i < priv->length; i++) + { + if (priv->buffer[i] == '\0') + { + *out = TRUE; + return S_OK; + } + } + *out = FALSE; + return S_OK; +} + +/*********************************************************************** + * WindowsIsStringEmpty (combase.@) + */ +BOOL WINAPI WindowsIsStringEmpty(HSTRING str) +{ + struct hstring_private *priv = impl_from_HSTRING(str); + if (str == NULL) + return TRUE; + return priv->length == 0; +} diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 01a63f7..ec5e517 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -31,6 +31,10 @@ static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); static HRESULT (WINAPI *pWindowsCreateStringReference)(LPCWSTR, UINT32, HSTRING_HEADER *, HSTRING *); static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); static HRESULT (WINAPI *pWindowsDuplicateString)(HSTRING, HSTRING *); +static UINT32 (WINAPI *pWindowsGetStringLen)(HSTRING); +static LPCWSTR (WINAPI *pWindowsGetStringRawBuffer)(HSTRING, UINT32 *); +static BOOL (WINAPI *pWindowsIsStringEmpty)(HSTRING); +static HRESULT (WINAPI *pWindowsStringHasEmbeddedNull)(HSTRING, BOOL *); #define SET(x) p##x = (void*)GetProcAddress(hmod, #x) @@ -46,14 +50,42 @@ static BOOL init_functions(void) SET(WindowsCreateStringReference); SET(WindowsDeleteString); SET(WindowsDuplicateString); + SET(WindowsGetStringLen); + SET(WindowsGetStringRawBuffer); + SET(WindowsIsStringEmpty); + SET(WindowsStringHasEmbeddedNull); return TRUE; } #undef SET -static const WCHAR input_string[] = { 'a', 'b', 'c', 'd', 'e', 'f', '\0' }; +#define check_string(str, content, length, has_null) _check_string(__LINE__, str, content, length, has_null) +static void _check_string(int line, HSTRING str, LPCWSTR content, UINT32 length, BOOL has_null) +{ + BOOL out_null; + BOOL empty = length == 0; + UINT32 out_length; + LPCWSTR ptr; + + ok_(__FILE__, line)(pWindowsIsStringEmpty(str) == empty, "WindowsIsStringEmpty failed\n"); + ok_(__FILE__, line)(pWindowsStringHasEmbeddedNull(str, &out_null) == S_OK, "pWindowsStringHasEmbeddedNull failed\n"); + ok_(__FILE__, line)(out_null == has_null, "WindowsStringHasEmbeddedNull failed\n"); + ok_(__FILE__, line)(pWindowsGetStringLen(str) == length, "WindowsGetStringLen failed\n"); + ptr = pWindowsGetStringRawBuffer(str, &out_length); + /* WindowsGetStringRawBuffer should return a non-null, null terminated empty string + * even if str is NULL. */ + ok_(__FILE__, line)(ptr != NULL, "WindowsGetStringRawBuffer returned null\n"); + ok_(__FILE__, line)(out_length == length, "WindowsGetStringRawBuffer returned incorrect length\n"); + ptr = pWindowsGetStringRawBuffer(str, NULL); + ok_(__FILE__, line)(ptr != NULL, "WindowsGetStringRawBuffer returned null\n"); + ok_(__FILE__, line)(ptr[length] == '\0', "WindowsGetStringRawBuffer doesn't return a null terminated buffer\n"); + ok_(__FILE__, line)(memcmp(ptr, content, sizeof(*content) * length) == 0, "Incorrect string content\n"); +} + +static const WCHAR input_string[] = { 'a', 'b', 'c', 'd', 'e', 'f', '\0', '\0' }; static const WCHAR input_empty_string[] = { '\0' }; +static const WCHAR input_embed_null[] = { 'a', '\0', 'c', '\0', 'e', 'f', '\0' }; static void test_create_delete(void) { @@ -62,6 +94,7 @@ static void test_create_delete(void) /* Test normal creation of a string */ ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); + check_string(str, input_string, 6, FALSE); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); /* Test error handling in WindowsCreateString */ ok(pWindowsCreateString(input_string, 6, NULL) == E_INVALIDARG, "Incorrect error handling\n"); @@ -72,6 +105,7 @@ static void test_create_delete(void) /* Test creation of a string reference */ ok(pWindowsCreateStringReference(input_string, 6, &header, &str) == S_OK, "Failed to create string ref\n"); + check_string(str, input_string, 6, FALSE); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n"); /* Test error handling in WindowsCreateStringReference */ @@ -85,6 +119,7 @@ static void test_create_delete(void) /* Test creating a string without a null-termination at the specified length */ ok(pWindowsCreateString(input_string, 3, &str) == S_OK, "Failed to create string\n"); + check_string(str, input_string, 3, FALSE); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); /* Test an empty string */ @@ -119,10 +154,38 @@ static void test_duplicate(void) ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string\n"); } +static void test_access(void) +{ + HSTRING str; + HSTRING_HEADER header; + + /* Test handling of a NULL string */ + check_string(NULL, NULL, 0, FALSE); + + /* Test strings with embedded null chars */ + ok(pWindowsCreateString(input_embed_null, 6, &str) == S_OK, "Failed to create string\n"); + check_string(str, input_embed_null, 6, TRUE); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + ok(pWindowsCreateStringReference(input_embed_null, 6, &header, &str) == S_OK, "Failed to create string ref\n"); + check_string(str, input_embed_null, 6, TRUE); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n"); + + /* Test normal creation of a string with trailing null */ + ok(pWindowsCreateString(input_string, 7, &str) == S_OK, "Failed to create string\n"); + check_string(str, input_string, 7, TRUE); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + ok(pWindowsCreateStringReference(input_string, 7, &header, &str) == S_OK, "Failed to create string ref\n"); + check_string(str, input_string, 7, TRUE); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n"); +} + START_TEST(string) { if (!init_functions()) return; test_create_delete(); test_duplicate(); + test_access(); }

1 0

Martin Storsjo : combase: Implement functions for HSTRING_BUFFER.
by Alexandre Julliard 15 Dec '14

15 Dec '14

Module: wine Branch: master Commit: 0d490f3a49653ec3e4d9f797fd74b2aeb679c9be URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d490f3a49653ec3e4d9f797f… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 15 10:24:50 2014 +0200 combase: Implement functions for HSTRING_BUFFER. --- .../api-ms-win-core-winrt-string-l1-1-0.spec | 6 +-- dlls/combase/combase.spec | 6 +-- dlls/combase/string.c | 57 ++++++++++++++++++++++ dlls/combase/tests/string.c | 56 +++++++++++++++++++++ 4 files changed, 119 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec index cb6bb5e..2361a1d 100644 --- a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec @@ -11,14 +11,14 @@ @ stdcall WindowsCreateString(ptr long ptr) combase.WindowsCreateString @ stdcall WindowsCreateStringReference(wstr long ptr ptr) combase.WindowsCreateStringReference @ stdcall WindowsDeleteString(ptr) combase.WindowsDeleteString -@ stub WindowsDeleteStringBuffer +@ stdcall WindowsDeleteStringBuffer(ptr) combase.WindowsDeleteStringBuffer @ stdcall WindowsDuplicateString(ptr ptr) combase.WindowsDuplicateString @ stdcall WindowsGetStringLen(ptr) combase.WindowsGetStringLen @ stdcall WindowsGetStringRawBuffer(ptr ptr) combase.WindowsGetStringRawBuffer @ stub WindowsInspectString @ stdcall WindowsIsStringEmpty(ptr) combase.WindowsIsStringEmpty -@ stub WindowsPreallocateStringBuffer -@ stub WindowsPromoteStringBuffer +@ stdcall WindowsPreallocateStringBuffer(long ptr ptr) combase.WindowsPreallocateStringBuffer +@ stdcall WindowsPromoteStringBuffer(ptr ptr) combase.WindowsPromoteStringBuffer @ stub WindowsReplaceString @ stdcall WindowsStringHasEmbeddedNull(ptr ptr) combase.WindowsStringHasEmbeddedNull @ stub WindowsSubstring diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index e0136f0..ac095ce 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -292,14 +292,14 @@ @ stdcall WindowsCreateString(ptr long ptr) @ stdcall WindowsCreateStringReference(wstr long ptr ptr) @ stdcall WindowsDeleteString(ptr) -@ stub WindowsDeleteStringBuffer +@ stdcall WindowsDeleteStringBuffer(ptr) @ stdcall WindowsDuplicateString(ptr ptr) @ stdcall WindowsGetStringLen(ptr) @ stdcall WindowsGetStringRawBuffer(ptr ptr) @ stub WindowsInspectString @ stdcall WindowsIsStringEmpty(ptr) -@ stub WindowsPreallocateStringBuffer -@ stub WindowsPromoteStringBuffer +@ stdcall WindowsPreallocateStringBuffer(long ptr ptr) +@ stdcall WindowsPromoteStringBuffer(ptr ptr) @ stub WindowsReplaceString @ stdcall WindowsStringHasEmbeddedNull(ptr ptr) @ stub WindowsSubstring diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 09519a1..5fe4321 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -47,6 +47,11 @@ static inline struct hstring_private *impl_from_HSTRING_HEADER(HSTRING_HEADER *h return (struct hstring_private *)header; } +static inline struct hstring_private *impl_from_HSTRING_BUFFER(HSTRING_BUFFER buffer) +{ + return (struct hstring_private *)buffer; +} + static BOOL alloc_string(UINT32 len, HSTRING *out) { struct hstring_private *priv; @@ -146,6 +151,58 @@ HRESULT WINAPI WindowsDuplicateString(HSTRING str, HSTRING *out) } /*********************************************************************** + * WindowsPreallocateStringBuffer (combase.@) + */ +HRESULT WINAPI WindowsPreallocateStringBuffer(UINT32 len, WCHAR **outptr, + HSTRING_BUFFER *out) +{ + struct hstring_private *priv; + HSTRING str; + if (outptr == NULL || out == NULL) + return E_POINTER; + if (len == 0) + { + *outptr = (LPWSTR)empty; + *out = NULL; + return S_OK; + } + + if (!alloc_string(len, &str)) + return E_OUTOFMEMORY; + priv = impl_from_HSTRING(str); + *outptr = priv->buffer; + *out = (HSTRING_BUFFER)str; + return S_OK; +} + +/*********************************************************************** + * WindowsDeleteStringBuffer (combase.@) + */ +HRESULT WINAPI WindowsDeleteStringBuffer(HSTRING_BUFFER buf) +{ + return WindowsDeleteString((HSTRING)buf); +} + +/*********************************************************************** + * WindowsPromoteStringBuffer (combase.@) + */ +HRESULT WINAPI WindowsPromoteStringBuffer(HSTRING_BUFFER buf, HSTRING *out) +{ + struct hstring_private *priv = impl_from_HSTRING_BUFFER(buf); + if (out == NULL) + return E_POINTER; + if (buf == NULL) + { + *out = NULL; + return S_OK; + } + if (priv->buffer[priv->length] != 0 || priv->reference || priv->refcount != 1) + return E_INVALIDARG; + *out = (HSTRING)buf; + return S_OK; +} + +/*********************************************************************** * WindowsGetStringLen (combase.@) */ UINT32 WINAPI WindowsGetStringLen(HSTRING str) diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index ec5e517..72eaa84 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -30,10 +30,13 @@ static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); static HRESULT (WINAPI *pWindowsCreateStringReference)(LPCWSTR, UINT32, HSTRING_HEADER *, HSTRING *); static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); +static HRESULT (WINAPI *pWindowsDeleteStringBuffer)(HSTRING_BUFFER); static HRESULT (WINAPI *pWindowsDuplicateString)(HSTRING, HSTRING *); static UINT32 (WINAPI *pWindowsGetStringLen)(HSTRING); static LPCWSTR (WINAPI *pWindowsGetStringRawBuffer)(HSTRING, UINT32 *); static BOOL (WINAPI *pWindowsIsStringEmpty)(HSTRING); +static HRESULT (WINAPI *pWindowsPreallocateStringBuffer)(UINT32, WCHAR **, HSTRING_BUFFER *); +static HRESULT (WINAPI *pWindowsPromoteStringBuffer)(HSTRING_BUFFER, HSTRING *); static HRESULT (WINAPI *pWindowsStringHasEmbeddedNull)(HSTRING, BOOL *); #define SET(x) p##x = (void*)GetProcAddress(hmod, #x) @@ -49,10 +52,13 @@ static BOOL init_functions(void) SET(WindowsCreateString); SET(WindowsCreateStringReference); SET(WindowsDeleteString); + SET(WindowsDeleteStringBuffer); SET(WindowsDuplicateString); SET(WindowsGetStringLen); SET(WindowsGetStringRawBuffer); SET(WindowsIsStringEmpty); + SET(WindowsPreallocateStringBuffer); + SET(WindowsPromoteStringBuffer); SET(WindowsStringHasEmbeddedNull); return TRUE; } @@ -181,6 +187,55 @@ static void test_access(void) ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n"); } +static void test_string_buffer(void) +{ + /* Initialize ptr to NULL to make sure it actually is set in the first + * test below. */ + HSTRING_BUFFER buf = NULL; + WCHAR *ptr = NULL; + HSTRING str; + + /* Test creation of an empty buffer */ + ok(pWindowsPreallocateStringBuffer(0, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n"); + ok(buf == NULL, "Empty string buffer isn't a null string\n"); + ok(ptr != NULL, "Empty string didn't return a buffer pointer\n"); + ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n"); + ok(str == NULL, "Empty string isn't a null string\n"); + check_string(str, input_empty_string, 0, FALSE); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + ok(pWindowsDeleteStringBuffer(NULL) == S_OK, "Failed to delete null string buffer\n"); + + /* Test creation and deletion of string buffers */ + ok(pWindowsPreallocateStringBuffer(6, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n"); + ok(pWindowsDeleteStringBuffer(buf) == S_OK, "Failed to delete string buffer\n"); + + /* Test creation and promotion of string buffers */ + ok(pWindowsPreallocateStringBuffer(6, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n"); + ok(ptr[6] == '\0', "Preallocated string buffer didn't have null termination\n"); + memcpy(ptr, input_string, 6 * sizeof(*input_string)); + ok(pWindowsPromoteStringBuffer(buf, NULL) == E_POINTER, "Incorrect error handling\n"); + ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n"); + check_string(str, input_string, 6, FALSE); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + /* Test error handling in preallocation */ + ok(pWindowsPreallocateStringBuffer(6, NULL, &buf) == E_POINTER, "Incorrect error handling\n"); + ok(pWindowsPreallocateStringBuffer(6, &ptr, NULL) == E_POINTER, "Incorrect error handling\n"); + + ok(pWindowsPreallocateStringBuffer(6, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n"); + ptr[6] = 'a'; /* Overwrite the buffer's null termination, promotion should fail */ + ok(pWindowsPromoteStringBuffer(buf, &str) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsDeleteStringBuffer(buf) == S_OK, "Failed to delete string buffer\n"); + + /* Test strings with trailing null chars */ + ok(pWindowsPreallocateStringBuffer(7, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n"); + memcpy(ptr, input_string, 7 * sizeof(*input_string)); + ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n"); + check_string(str, input_string, 7, TRUE); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); +} + START_TEST(string) { if (!init_functions()) @@ -188,4 +243,5 @@ START_TEST(string) test_create_delete(); test_duplicate(); test_access(); + test_string_buffer(); }

1 0

Andrew Eikum : winmm: Allow larger MMTIME sizes.
by Alexandre Julliard 15 Dec '14

15 Dec '14

Module: wine Branch: master Commit: cba322d71d317bc52e9de5a057723bf5d6dc1e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba322d71d317bc52e9de5a05… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 15 10:21:52 2014 -0600 winmm: Allow larger MMTIME sizes. --- dlls/winmm/tests/wave.c | 7 ++++++- dlls/winmm/waveform.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index d370461..4dcc577 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -487,7 +487,12 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, DWORD returned; mmtime.wType = TIME_BYTES; - rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); + rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime) - 1); + ok(rc==MMSYSERR_ERROR, + "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); + + mmtime.wType = TIME_BYTES; + rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime) + 1); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); if (mmtime.wType != TIME_BYTES && winetest_debug > 1) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 32083b8..f381c16 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2981,9 +2981,12 @@ UINT WINAPI waveOutGetPosition(HWAVEOUT hWaveOut, LPMMTIME lpTime, { TRACE("(%p, %p, %u)\n", hWaveOut, lpTime, uSize); - if(!uSize || !lpTime || uSize != sizeof(MMTIME)) + if(!uSize || !lpTime) return MMSYSERR_INVALPARAM; + if(uSize < sizeof(MMTIME)) + return MMSYSERR_ERROR; + return WINMM_GetPosition((HWAVE)hWaveOut, lpTime); } @@ -3602,9 +3605,12 @@ UINT WINAPI waveInGetPosition(HWAVEIN hWaveIn, LPMMTIME lpTime, { TRACE("(%p, %p, %u)\n", hWaveIn, lpTime, uSize); - if(!uSize || !lpTime || uSize != sizeof(MMTIME)) + if(!uSize || !lpTime) return MMSYSERR_INVALPARAM; + if(uSize < sizeof(MMTIME)) + return MMSYSERR_ERROR; + return WINMM_GetPosition((HWAVE)hWaveIn, lpTime); }

1 0