May 2019 - Wine-Commits - list.winehq.org

Sven Baars : propsys/tests: Fix some ok() messages.
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: 7117219b3d1aa192260632b529c3641e6ece454e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7117219b3d1aa192260632b5… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu May 30 11:39:35 2019 +0200 propsys/tests: Fix some ok() messages. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 22117b5..77ffe05 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1485,13 +1485,13 @@ static void test_PropVariantToBuffer(void) UINT8 buffer[256]; hr = InitPropVariantFromBuffer(data, 10, &propvar); - ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + ok(hr == S_OK, "InitPropVariantFromBuffer failed 0x%08x.\n", hr); hr = PropVariantToBuffer(&propvar, NULL, 0); /* crash when cb isn't zero */ ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); PropVariantClear(&propvar); hr = InitPropVariantFromBuffer(data, 10, &propvar); - ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + ok(hr == S_OK, "InitPropVariantFromBuffer failed 0x%08x.\n", hr); hr = PropVariantToBuffer(&propvar, buffer, 10); ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); ok(!memcmp(buffer, data, 10) && !buffer[10], "got wrong buffer.\n"); @@ -1499,7 +1499,7 @@ static void test_PropVariantToBuffer(void) PropVariantClear(&propvar); hr = InitPropVariantFromBuffer(data, 10, &propvar); - ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + ok(hr == S_OK, "InitPropVariantFromBuffer failed 0x%08x.\n", hr); buffer[0] = 99; hr = PropVariantToBuffer(&propvar, buffer, 11); ok(hr == E_FAIL, "PropVariantToBuffer returned: 0x%08x.\n", hr); @@ -1508,7 +1508,7 @@ static void test_PropVariantToBuffer(void) PropVariantClear(&propvar); hr = InitPropVariantFromBuffer(data, 10, &propvar); - ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + ok(hr == S_OK, "InitPropVariantFromBuffer failed 0x%08x.\n", hr); hr = PropVariantToBuffer(&propvar, buffer, 9); ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); ok(!memcmp(buffer, data, 9) && !buffer[9], "got wrong buffer.\n");

1 0

Sven Baars : propsys/tests: Fix the PropVariantToBuffer tests.
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: 818838b70786b2e81eaddc451873c5837b5ceeb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=818838b70786b2e81eaddc45… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu May 30 11:39:34 2019 +0200 propsys/tests: Fix the PropVariantToBuffer tests. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 1be8817..22117b5 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1525,13 +1525,14 @@ static void test_PropVariantToBuffer(void) hr = SafeArrayAccessData(sa, &pdata); ok(hr == S_OK, "SafeArrayAccessData failed: 0x%08x.\n", hr); memcpy(pdata, data, sizeof(data)); + hr = SafeArrayUnaccessData(sa); + ok(hr == S_OK, "SafeArrayUnaccessData failed: 0x%08x.\n", hr); U(propvar).parray = sa; buffer[0] = 99; hr = PropVariantToBuffer(&propvar, buffer, 11); todo_wine ok(hr == E_FAIL, "PropVariantToBuffer returned: 0x%08x.\n", hr); ok(buffer[0] == 99, "got wrong buffer.\n"); memset(buffer, 0, sizeof(buffer)); - SafeArrayDestroy(sa); PropVariantClear(&propvar); PropVariantInit(&propvar); @@ -1544,12 +1545,13 @@ static void test_PropVariantToBuffer(void) hr = SafeArrayAccessData(sa, &pdata); ok(hr == S_OK, "SafeArrayAccessData failed: 0x%08x.\n", hr); memcpy(pdata, data, sizeof(data)); + hr = SafeArrayUnaccessData(sa); + ok(hr == S_OK, "SafeArrayUnaccessData failed: 0x%08x.\n", hr); U(propvar).parray = sa; hr = PropVariantToBuffer(&propvar, buffer, sizeof(data)); todo_wine ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); todo_wine ok(!memcmp(buffer, data, 10) && !buffer[10], "got wrong buffer.\n"); memset(buffer, 0, sizeof(buffer)); - SafeArrayDestroy(sa); PropVariantClear(&propvar); PropVariantInit(&propvar); @@ -1571,10 +1573,11 @@ static void test_PropVariantToBuffer(void) hr = SafeArrayAccessData(sa, &pdata); ok(hr == S_OK, "SafeArrayAccessData failed: 0x%08x.\n", hr); memcpy(pdata, data_int8, sizeof(data_int8)); + hr = SafeArrayUnaccessData(sa); + ok(hr == S_OK, "SafeArrayUnaccessData failed: 0x%08x.\n", hr); U(propvar).parray = sa; hr = PropVariantToBuffer(&propvar, buffer, sizeof(data_int8)); ok(hr == E_INVALIDARG, "PropVariantToBuffer failed: 0x%08x.\n", hr); - SafeArrayDestroy(sa); PropVariantClear(&propvar); }

1 0

Sven Baars : shell32: Fix an item identifier list leak (Valgrind).
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: 0d0fa46553e17efd6f72b25aad3563e8c60b365d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d0fa46553e17efd6f72b25a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 31 20:15:44 2019 +0200 shell32: Fix an item identifier list leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/brsfolder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 37363a1..d71ec62 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -783,6 +783,8 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) browsefolder_callback( info->lpBrowseInfo, hWnd, BFFM_INITIALIZED, 0 ); + ILFree(computer_pidl); + return TRUE; }

1 0

Sven Baars : user32: Fix some leaks on error path (Coverity).
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: 381c4e7b667555147ef24ee19fff2f766b7303c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=381c4e7b667555147ef24ee1… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 31 11:12:18 2019 +0200 user32: Fix some leaks on error path (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 2085fd3..56ea249 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -141,6 +141,8 @@ static void find_hid_devices(void) if (!hid_devices) { ERR("Failed to allocate memory.\n"); + CloseHandle(file); + heap_free(path); goto done; } }

1 0

Sven Baars : shell32/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: 4aad5655f249594f7bb92427bdf1138031ba33d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aad5655f249594f7bb92427… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 31 20:39:43 2019 +0200 shell32/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index beee31f..87e9141 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3856,6 +3856,8 @@ static void test_ShellItemArrayEnumItems(void) for(i = 0; i < done; i++) ILFree(apidl[i]); } + + IShellFolder_Release(psf); }

1 0

Sven Baars : ntdll/tests: Fix a string leak (Valgrind).
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: 539ebebc943c2c305d45b1aaa83186b73adb7eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=539ebebc943c2c305d45b1aa… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 31 19:44:36 2019 +0200 ntdll/tests: Fix a string leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 84f97d4..931628b 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1335,6 +1335,8 @@ static void _test_object_type(unsigned line, HANDLE handle, const char *expected ok_(__FILE__,line)( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR), "unexpected len %u\n", len ); ok_(__FILE__,line)( str->Length == expect.Length && !memcmp( str->Buffer, expect.Buffer, expect.Length ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + + pRtlFreeUnicodeString( &expect ); } static void test_query_object(void)

1 0

Aric Stewart : mshtml: Handle NULL aNode in nsContextMenuListener_OnShowContextMenu.
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: 307f163f447d46c281c50100b900344f8d16f9db URL: https://source.winehq.org/git/wine.git/?a=commit;h=307f163f447d46c281c50100… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 31 09:53:48 2019 -0500 mshtml: Handle NULL aNode in nsContextMenuListener_OnShowContextMenu. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 702bc9b..6215500 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1601,6 +1601,9 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList TRACE("(%p)->(%08x %p %p)\n", This, aContextFlags, aEvent, aNode); + if (!aNode) + return NS_ERROR_FAILURE; + hres = get_node(aNode, TRUE, &node); if(FAILED(hres)) return NS_ERROR_FAILURE;

1 0

Nikolay Sivov : mf: Return presentation clock properties.
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: bd2e2141b0031ca5d0dc11f95effac3cc40b9c23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd2e2141b0031ca5d0dc11f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 13:11:31 2019 +0300 mf: Return presentation clock properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 7 +------ dlls/mf/tests/mf.c | 9 ++++++++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 9c2826f..14aac77 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -894,15 +894,10 @@ static HRESULT WINAPI present_clock_GetProperties(IMFPresentationClock *iface, M TRACE("%p, %p.\n", iface, props); EnterCriticalSection(&clock->cs); - if (clock->time_source) - { - FIXME("%p, %p.\n", iface, props); - hr = E_NOTIMPL; - } + hr = IMFPresentationTimeSource_GetProperties(clock->time_source, props); else hr = MF_E_CLOCK_NO_TIME_SOURCE; - LeaveCriticalSection(&clock->cs); return hr; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e07c824..b710d0a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1427,9 +1427,9 @@ static void test_presentation_clock(void) }; IMFClockStateSink test_sink = { &test_clock_sink_vtbl }; IMFPresentationTimeSource *time_source; + MFCLOCK_PROPERTIES props, props2; IMFRateControl *rate_control; IMFPresentationClock *clock; - MFCLOCK_PROPERTIES props; IMFShutdown *shutdown; LONGLONG clock_time; MFCLOCK_STATE state; @@ -1498,11 +1498,18 @@ todo_wine hr = IMFPresentationClock_SetTimeSource(clock, time_source); ok(hr == S_OK, "Failed to set time source, hr %#x.\n", hr); + hr = IMFPresentationTimeSource_GetProperties(time_source, &props2); + ok(hr == S_OK, "Failed to get time source properties, hr %#x.\n", hr); + hr = IMFPresentationClock_GetClockCharacteristics(clock, &value); ok(hr == S_OK, "Failed to get clock flags, hr %#x.\n", hr); ok(value == (MFCLOCK_CHARACTERISTICS_FLAG_FREQUENCY_10MHZ | MFCLOCK_CHARACTERISTICS_FLAG_IS_SYSTEM_CLOCK), "Unexpected clock flags %#x.\n", value); + hr = IMFPresentationClock_GetProperties(clock, &props); + ok(hr == S_OK, "Failed to get clock properties, hr %#x.\n", hr); + ok(!memcmp(&props, &props2, sizeof(props)), "Unexpected clock properties.\n"); + /* State changes. */ for (i = 0; i < ARRAY_SIZE(clock_state_change); ++i) {

1 0

Akihiro Sagawa : quartz: Ensure error text is terminated with NUL character.
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: fc4ef8692e82b3e480b76daf088f099897a790e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc4ef8692e82b3e480b76daf… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 30 22:58:09 2019 +0900 quartz: Ensure error text is terminated with NUL character. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 08287a7..282104e 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -313,7 +313,13 @@ DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPSTR buffer, DWORD maxlen) return 0; res = AMGetErrorTextW(hr, errorW, ARRAY_SIZE(errorW)); - return WideCharToMultiByte(CP_ACP, 0, errorW, res, buffer, maxlen, 0, 0); + if (!res) + return 0; + + res = WideCharToMultiByte(CP_ACP, 0, errorW, -1, NULL, 0, 0, 0); + if (res > maxlen || !res) + return 0; + return WideCharToMultiByte(CP_ACP, 0, errorW, -1, buffer, maxlen, 0, 0) - 1; } /***********************************************************************

1 0

Andrey Gusev : advapi32: Implement LookupAccountSidLocalA/W.
by Alexandre Julliard May 31, 2019

May 31, 2019

Module: wine Branch: master Commit: 7b8554b3b861563b7d23c8bc1881c162b666e79a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b8554b3b861563b7d23c8bc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 30 13:52:36 2019 +0300 advapi32: Implement LookupAccountSidLocalA/W. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47286 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 ++ dlls/advapi32/security.c | 30 ++++++++++++++++++++++ .../api-ms-win-security-lsalookup-l1-1-0.spec | 4 +-- .../api-ms-win-security-lsalookup-l1-1-1.spec | 4 +-- include/winbase.h | 3 +++ 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index a97161f..06c4f8f 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -430,6 +430,8 @@ @ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 8027434..2030ebf 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2316,6 +2316,21 @@ LookupAccountSidA( } /****************************************************************************** + * LookupAccountSidLocalA [ADVAPI32.@] + */ +BOOL WINAPI +LookupAccountSidLocalA( + PSID sid, + LPSTR account, + LPDWORD accountSize, + LPSTR domain, + LPDWORD domainSize, + PSID_NAME_USE name_use ) +{ + return LookupAccountSidA(NULL, sid, account, accountSize, domain, domainSize, name_use); +} + +/****************************************************************************** * LookupAccountSidW [ADVAPI32.@] * * PARAMS @@ -2492,6 +2507,21 @@ LookupAccountSidW( } /****************************************************************************** + * LookupAccountSidLocalW [ADVAPI32.@] + */ +BOOL WINAPI +LookupAccountSidLocalW( + PSID sid, + LPWSTR account, + LPDWORD accountSize, + LPWSTR domain, + LPDWORD domainSize, + PSID_NAME_USE name_use ) +{ + return LookupAccountSidW(NULL, sid, account, accountSize, domain, domainSize, name_use); +} + +/****************************************************************************** * SetFileSecurityA [ADVAPI32.@] * * See SetFileSecurityW. diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec index 9b45265..6e9e6ed 100644 --- a/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec +++ b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec @@ -1,7 +1,7 @@ @ stub LookupAccountNameLocalA @ stub LookupAccountNameLocalW -@ stub LookupAccountSidLocalA -@ stub LookupAccountSidLocalW +@ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalA +@ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalW @ stub LsaLookupClose @ stub LsaLookupFreeMemory @ stub LsaLookupGetDomainInfo diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec b/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec index 215c7b7..35a79f1 100644 --- a/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec +++ b/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec @@ -4,8 +4,8 @@ @ stub GetIdentityProviderInfoByName @ stub LookupAccountNameLocalA @ stub LookupAccountNameLocalW -@ stub LookupAccountSidLocalA -@ stub LookupAccountSidLocalW +@ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalA +@ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalW @ stub LsaLookupClose @ stub LsaLookupFreeMemory @ stub LsaLookupGetDomainInfo diff --git a/include/winbase.h b/include/winbase.h index 8b2eb2c..44bfe98 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2430,6 +2430,9 @@ WINADVAPI BOOL WINAPI LookupAccountNameW(LPCWSTR,LPCWSTR,PSID,LPDWORD,LP WINADVAPI BOOL WINAPI LookupAccountSidA(LPCSTR,PSID,LPSTR,LPDWORD,LPSTR,LPDWORD,PSID_NAME_USE); WINADVAPI BOOL WINAPI LookupAccountSidW(LPCWSTR,PSID,LPWSTR,LPDWORD,LPWSTR,LPDWORD,PSID_NAME_USE); #define LookupAccountSid WINELIB_NAME_AW(LookupAccountSid) +WINADVAPI BOOL WINAPI LookupAccountSidLocalA(PSID,LPSTR,LPDWORD,LPSTR,LPDWORD,PSID_NAME_USE); +WINADVAPI BOOL WINAPI LookupAccountSidLocalW(PSID,LPWSTR,LPDWORD,LPWSTR,LPDWORD,PSID_NAME_USE); +#define LookupAccountSidLocal WINELIB_NAME_AW(LookupAccountSidLocal) WINBASEAPI BOOL WINAPI LocalFileTimeToFileTime(const FILETIME*,LPFILETIME); WINBASEAPI BOOL WINAPI LockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI LockFileEx(HANDLE, DWORD, DWORD, DWORD, DWORD, LPOVERLAPPED);

1 0