November 2015 - Wine-commits

Dmitry Timoshkov : ntdll: Avoid path buffer re-allocation step for common dll name lengths.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: beeeb2a528bf3a46675cdc85973ec131f82079cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=beeeb2a528bf3a46675cdc859… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 10 14:18:05 2015 +0800 ntdll: Avoid path buffer re-allocation step for common dll name lengths. For instance c:\windows\system32\advapi32.dll is 33 characters long with 0-terminator. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 831f049..74feb97 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2208,7 +2208,7 @@ overflow: static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_MODREF** pwm ) { enum loadorder loadorder; - WCHAR buffer[32]; + WCHAR buffer[64]; WCHAR *filename; ULONG size; WINE_MODREF *main_exe;

1 0

Nikolay Sivov : kernel32: GetLocaleInfoA() doesn' t support LOCALE_SSHORTTIME.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 982c3ede72793eb3c874befacf6589974763b213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=982c3ede72793eb3c874befac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 17:40:07 2015 +0300 kernel32: GetLocaleInfoA() doesn't support LOCALE_SSHORTTIME. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 3 ++- dlls/kernel32/tests/locale.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index c0a66ef..6dc0d05 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1295,7 +1295,8 @@ INT WINAPI GetLocaleInfoA( LCID lcid, LCTYPE lctype, LPSTR buffer, INT len ) SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - if (lctype & LOCALE_RETURN_GENITIVE_NAMES ) + if (((lctype & ~LOCALE_LOCALEINFOFLAGSMASK) == LOCALE_SSHORTTIME) || + (lctype & LOCALE_RETURN_GENITIVE_NAMES)) { SetLastError( ERROR_INVALID_FLAGS ); return 0; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 1e4fd2a..b34767b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3358,6 +3358,7 @@ static void test_EnumUILanguageA(void) } static char date_fmt_buf[1024]; +static WCHAR date_fmt_bufW[1024]; static BOOL CALLBACK enum_datetime_procA(LPSTR fmt) { @@ -3366,6 +3367,12 @@ static BOOL CALLBACK enum_datetime_procA(LPSTR fmt) return TRUE; } +static BOOL CALLBACK enum_datetime_procW(WCHAR *fmt) +{ + lstrcatW(date_fmt_bufW, fmt); + return FALSE; +} + static void test_EnumDateFormatsA(void) { char *p, buf[256]; @@ -3473,6 +3480,60 @@ static void test_EnumTimeFormatsA(void) ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); } +static void test_EnumTimeFormatsW(void) +{ + LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + WCHAR bufW[256]; + BOOL ret; + + date_fmt_bufW[0] = 0; + ret = EnumTimeFormatsW(enum_datetime_procW, lcid, 0); + ok(ret, "EnumTimeFormatsW(0) error %d\n", GetLastError()); + ret = GetLocaleInfoW(lcid, LOCALE_STIMEFORMAT, bufW, sizeof(bufW)/sizeof(bufW[0])); + ok(ret, "GetLocaleInfoW(LOCALE_STIMEFORMAT) error %d\n", GetLastError()); + ok(!lstrcmpW(date_fmt_bufW, bufW), "expected \"%s\" got \"%s\"\n", wine_dbgstr_w(date_fmt_bufW), + wine_dbgstr_w(bufW)); + + date_fmt_bufW[0] = 0; + ret = EnumTimeFormatsW(enum_datetime_procW, lcid, LOCALE_USE_CP_ACP); + ok(ret, "EnumTimeFormatsW(LOCALE_USE_CP_ACP) error %d\n", GetLastError()); + ret = GetLocaleInfoW(lcid, LOCALE_STIMEFORMAT, bufW, sizeof(bufW)/sizeof(bufW[0])); + ok(ret, "GetLocaleInfoW(LOCALE_STIMEFORMAT) error %d\n", GetLastError()); + ok(!lstrcmpW(date_fmt_bufW, bufW), "expected \"%s\" got \"%s\"\n", wine_dbgstr_w(date_fmt_bufW), + wine_dbgstr_w(bufW)); + + /* TIME_NOSECONDS is Win7+ feature */ + date_fmt_bufW[0] = 0; + ret = EnumTimeFormatsW(enum_datetime_procW, lcid, TIME_NOSECONDS); + if (!ret && GetLastError() == ERROR_INVALID_FLAGS) + skip("EnumTimeFormatsW doesn't support TIME_NOSECONDS\n"); + else { + char buf[256]; + + todo_wine + ok(ret, "EnumTimeFormatsW(TIME_NOSECONDS) error %d\n", GetLastError()); + ret = GetLocaleInfoW(lcid, LOCALE_SSHORTTIME, bufW, sizeof(bufW)/sizeof(bufW[0])); + ok(ret, "GetLocaleInfoW(LOCALE_SSHORTTIME) error %d\n", GetLastError()); + todo_wine + ok(!lstrcmpW(date_fmt_bufW, bufW), "expected \"%s\" got \"%s\"\n", wine_dbgstr_w(date_fmt_bufW), + wine_dbgstr_w(bufW)); + + /* EnumTimeFormatsA doesn't support this flag */ + ret = EnumTimeFormatsA(enum_datetime_procA, lcid, TIME_NOSECONDS); + todo_wine { + ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "EnumTimeFormatsA(TIME_NOSECONDS) ret %d, error %d\n", ret, + GetLastError()); + + ret = EnumTimeFormatsA(NULL, lcid, TIME_NOSECONDS); + ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "EnumTimeFormatsA(TIME_NOSECONDS) ret %d, error %d\n", ret, + GetLastError()); + } + /* And it's not supported by GetLocaleInfoA either */ + ret = GetLocaleInfoA(lcid, LOCALE_SSHORTTIME, buf, sizeof(buf)/sizeof(buf[0])); + ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "GetLocaleInfoA(LOCALE_SSHORTTIME) ret %d, error %d\n", ret, + GetLastError()); + } +} static void test_GetCPInfo(void) { BOOL ret; @@ -4506,6 +4567,7 @@ START_TEST(locale) InitFunctionPointers(); test_EnumTimeFormatsA(); + test_EnumTimeFormatsW(); test_EnumDateFormatsA(); test_GetLocaleInfoA(); test_GetLocaleInfoW();

1 0

Nikolay Sivov : kernel32: EnumTimeFormatsA() doesn' t support TIME_NOSECONDS.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 6f35351f81452344beb3a631bad1806613496b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f35351f81452344beb3a631b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 17:40:08 2015 +0300 kernel32: EnumTimeFormatsA() doesn't support TIME_NOSECONDS. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 6 ++++++ dlls/kernel32/tests/locale.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 48adb11..9ca3e07 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1930,6 +1930,12 @@ BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) { char buf[256]; + if (flags & ~LOCALE_USE_CP_ACP) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + if (!proc) { SetLastError(ERROR_INVALID_PARAMETER); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b34767b..6fa2627 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3520,14 +3520,13 @@ static void test_EnumTimeFormatsW(void) /* EnumTimeFormatsA doesn't support this flag */ ret = EnumTimeFormatsA(enum_datetime_procA, lcid, TIME_NOSECONDS); - todo_wine { ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "EnumTimeFormatsA(TIME_NOSECONDS) ret %d, error %d\n", ret, GetLastError()); ret = EnumTimeFormatsA(NULL, lcid, TIME_NOSECONDS); ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "EnumTimeFormatsA(TIME_NOSECONDS) ret %d, error %d\n", ret, GetLastError()); - } + /* And it's not supported by GetLocaleInfoA either */ ret = GetLocaleInfoA(lcid, LOCALE_SSHORTTIME, buf, sizeof(buf)/sizeof(buf[0])); ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "GetLocaleInfoA(LOCALE_SSHORTTIME) ret %d, error %d\n", ret,

1 0

Nikolay Sivov : kernel32: Added support for TIME_NOSECONDS, restructured EnumTimeFormats implementation.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 49e5b9c2a4d42b547509c9cc74e5215957218718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e5b9c2a4d42b547509c9cc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 17:40:09 2015 +0300 kernel32: Added support for TIME_NOSECONDS, restructured EnumTimeFormats implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 109 ++++++++++++++++++++++++++++--------------- dlls/kernel32/tests/locale.c | 4 +- 2 files changed, 73 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 9ca3e07..e421f54 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1920,69 +1920,104 @@ BOOL WINAPI EnumDateFormatsExEx(DATEFMT_ENUMPROCEXEX proc, const WCHAR *locale, return NLS_EnumDateFormats(&ctxt); } -/************************************************************************** - * EnumTimeFormatsA (KERNEL32.@) - * - * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle - * LOCALE_NOUSEROVERRIDE here as well? - */ -BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) -{ - char buf[256]; +struct enumtimeformats_context { + enum enum_callback_type type; /* callback kind */ + union { + TIMEFMT_ENUMPROCW callback; /* user callback pointer */ + } u; + LCID lcid; /* locale of interest */ + DWORD flags; + BOOL unicode; /* A vs W callback type, only for regular and Ex callbacks */ +}; - if (flags & ~LOCALE_USE_CP_ACP) - { - SetLastError(ERROR_INVALID_FLAGS); - return FALSE; - } +static BOOL NLS_EnumTimeFormats(struct enumtimeformats_context *ctxt) +{ + WCHAR bufW[256]; + char bufA[256]; + LCTYPE lctype; + INT ret; - if (!proc) + if (!ctxt->u.callback) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - switch (flags & ~LOCALE_USE_CP_ACP) + switch (ctxt->flags & ~LOCALE_USE_CP_ACP) { case 0: - if (GetLocaleInfoA(lcid, LOCALE_STIMEFORMAT | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf); + lctype = LOCALE_STIMEFORMAT; + break; + case TIME_NOSECONDS: + lctype = LOCALE_SSHORTTIME; break; - default: - FIXME("Unknown time format (%d)\n", flags); + FIXME("Unknown time format (%d)\n", ctxt->flags); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + + lctype |= ctxt->flags & LOCALE_USE_CP_ACP; + if (ctxt->unicode) + ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, sizeof(bufW)/sizeof(bufW[0])); + else + ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, sizeof(bufA)/sizeof(bufA[0])); + + if (ret) + { + switch (ctxt->type) + { + case CALLBACK_ENUMPROC: + ctxt->u.callback(ctxt->unicode ? bufW : (WCHAR*)bufA); + break; + default: + ; + } + } + return TRUE; } /************************************************************************** - * EnumTimeFormatsW (KERNEL32.@) + * EnumTimeFormatsA (KERNEL32.@) + * + * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle + * LOCALE_NOUSEROVERRIDE here as well? */ -BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) +BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) { - WCHAR buf[256]; + struct enumtimeformats_context ctxt; - if (!proc) + /* EnumTimeFormatsA doesn't support flags, EnumTimeFormatsW does. */ + if (flags & ~LOCALE_USE_CP_ACP) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_FLAGS); return FALSE; } - switch (flags & ~LOCALE_USE_CP_ACP) - { - case 0: - if (GetLocaleInfoW(lcid, LOCALE_STIMEFORMAT | (flags & LOCALE_USE_CP_ACP), buf, 256)) - proc(buf); - break; + ctxt.type = CALLBACK_ENUMPROC; + ctxt.u.callback = (TIMEFMT_ENUMPROCW)proc; + ctxt.lcid = lcid; + ctxt.flags = flags; + ctxt.unicode = FALSE; - default: - FIXME("Unknown time format (%d)\n", flags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - return TRUE; + return NLS_EnumTimeFormats(&ctxt); +} + +/************************************************************************** + * EnumTimeFormatsW (KERNEL32.@) + */ +BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) +{ + struct enumtimeformats_context ctxt; + + ctxt.type = CALLBACK_ENUMPROC; + ctxt.u.callback = proc; + ctxt.lcid = lcid; + ctxt.flags = flags; + ctxt.unicode = TRUE; + + return NLS_EnumTimeFormats(&ctxt); } struct enumcalendar_context { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 6fa2627..7b0212e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3506,15 +3506,13 @@ static void test_EnumTimeFormatsW(void) date_fmt_bufW[0] = 0; ret = EnumTimeFormatsW(enum_datetime_procW, lcid, TIME_NOSECONDS); if (!ret && GetLastError() == ERROR_INVALID_FLAGS) - skip("EnumTimeFormatsW doesn't support TIME_NOSECONDS\n"); + win_skip("EnumTimeFormatsW doesn't support TIME_NOSECONDS\n"); else { char buf[256]; - todo_wine ok(ret, "EnumTimeFormatsW(TIME_NOSECONDS) error %d\n", GetLastError()); ret = GetLocaleInfoW(lcid, LOCALE_SSHORTTIME, bufW, sizeof(bufW)/sizeof(bufW[0])); ok(ret, "GetLocaleInfoW(LOCALE_SSHORTTIME) error %d\n", GetLastError()); - todo_wine ok(!lstrcmpW(date_fmt_bufW, bufW), "expected \"%s\" got \"%s\"\n", wine_dbgstr_w(date_fmt_bufW), wine_dbgstr_w(bufW));

1 0

Nikolay Sivov : kernel32: Implement EnumTimeFormatsEx().
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 61c49bd78e5c96f14870e5c21a2ff75da7ac17b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c49bd78e5c96f14870e5c21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 17:40:10 2015 +0300 kernel32: Implement EnumTimeFormatsEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/lcformat.c | 22 ++++++++++++++++++++++ include/winnls.h | 2 ++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c324347..ff67e54 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -428,7 +428,7 @@ @ stdcall EnumSystemLocalesEx(ptr long long ptr) @ stdcall EnumSystemLocalesW(ptr long) @ stdcall EnumTimeFormatsA(ptr long long) -# @ stub EnumTimeFormatsEx +@ stdcall EnumTimeFormatsEx(ptr wstr long long) @ stdcall EnumTimeFormatsW(ptr long long) @ stdcall EnumUILanguagesA(ptr long long) @ stdcall EnumUILanguagesW(ptr long long) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index e421f54..0985e35 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1924,9 +1924,11 @@ struct enumtimeformats_context { enum enum_callback_type type; /* callback kind */ union { TIMEFMT_ENUMPROCW callback; /* user callback pointer */ + TIMEFMT_ENUMPROCEX callbackex; } u; LCID lcid; /* locale of interest */ DWORD flags; + LPARAM lParam; BOOL unicode; /* A vs W callback type, only for regular and Ex callbacks */ }; @@ -1970,6 +1972,9 @@ static BOOL NLS_EnumTimeFormats(struct enumtimeformats_context *ctxt) case CALLBACK_ENUMPROC: ctxt->u.callback(ctxt->unicode ? bufW : (WCHAR*)bufA); break; + case CALLBACK_ENUMPROCEX: + ctxt->u.callbackex(bufW, ctxt->lParam); + break; default: ; } @@ -2020,6 +2025,23 @@ BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) return NLS_EnumTimeFormats(&ctxt); } +/************************************************************************** + * EnumTimeFormatsEx (KERNEL32.@) + */ +BOOL WINAPI EnumTimeFormatsEx(TIMEFMT_ENUMPROCEX proc, const WCHAR *locale, DWORD flags, LPARAM lParam) +{ + struct enumtimeformats_context ctxt; + + ctxt.type = CALLBACK_ENUMPROCEX; + ctxt.u.callbackex = proc; + ctxt.lcid = LocaleNameToLCID(locale, 0); + ctxt.flags = flags; + ctxt.lParam = lParam; + ctxt.unicode = TRUE; + + return NLS_EnumTimeFormats(&ctxt); +} + struct enumcalendar_context { enum enum_callback_type type; /* callback kind */ union { diff --git a/include/winnls.h b/include/winnls.h index 2f899f8..4b4eb77 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -735,6 +735,7 @@ typedef struct _nlsversioninfoex { typedef BOOL (CALLBACK *CALINFO_ENUMPROCEXEX)(LPWSTR,CALID,LPWSTR,LPARAM); typedef BOOL (CALLBACK *DATEFMT_ENUMPROCEXEX)(LPWSTR,CALID,LPARAM); +typedef BOOL (CALLBACK *TIMEFMT_ENUMPROCEX)(LPWSTR,LPARAM); #if defined(STRICT) typedef BOOL (CALLBACK *CALINFO_ENUMPROCA)(LPSTR); typedef BOOL (CALLBACK *CALINFO_ENUMPROCW)(LPWSTR); @@ -862,6 +863,7 @@ WINBASEAPI BOOL WINAPI EnumLanguageGroupLocalesW(LANGGROUPLOCALE_ENUMPROC WINBASEAPI BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA,LCID,DWORD); WINBASEAPI BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW,LCID,DWORD); #define EnumTimeFormats WINELIB_NAME_AW(EnumTimeFormats) +WINBASEAPI BOOL WINAPI EnumTimeFormatsEx(TIMEFMT_ENUMPROCEX,LPCWSTR,DWORD,LPARAM); WINBASEAPI BOOL WINAPI EnumUILanguagesA(UILANGUAGE_ENUMPROCA,DWORD,LONG_PTR); WINBASEAPI BOOL WINAPI EnumUILanguagesW(UILANGUAGE_ENUMPROCW,DWORD,LONG_PTR); #define EnumUILanguages WINELIB_NAME_AW(EnumUILanguages)

1 0

Austin English : bthprops.cpl: Add stub dll.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: b6710c2a006234ac1a729881e7ca75d34cffb474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6710c2a006234ac1a729881e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 9 00:45:29 2015 -0600 bthprops.cpl: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/bthprops.cpl/Makefile.in | 1 + dlls/bthprops.cpl/bthprops.cpl.spec | 65 +++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+) diff --git a/configure b/configure index e1f69e0..35705f5 100755 --- a/configure +++ b/configure @@ -964,6 +964,7 @@ enable_avifil32 enable_avrt enable_bcrypt enable_browseui +enable_bthprops_cpl enable_cabinet enable_capi2032 enable_cards @@ -17465,6 +17466,7 @@ wine_fn_config_dll bcrypt enable_bcrypt wine_fn_config_test dlls/bcrypt/tests bcrypt_test wine_fn_config_dll browseui enable_browseui clean,po wine_fn_config_test dlls/browseui/tests browseui_test +wine_fn_config_dll bthprops.cpl enable_bthprops_cpl wine_fn_config_dll cabinet enable_cabinet implib wine_fn_config_test dlls/cabinet/tests cabinet_test wine_fn_config_dll capi2032 enable_capi2032 implib diff --git a/configure.ac b/configure.ac index b9f90c7..c6a8b3e 100644 --- a/configure.ac +++ b/configure.ac @@ -2822,6 +2822,7 @@ WINE_CONFIG_DLL(bcrypt) WINE_CONFIG_TEST(dlls/bcrypt/tests) WINE_CONFIG_DLL(browseui,,[clean,po]) WINE_CONFIG_TEST(dlls/browseui/tests) +WINE_CONFIG_DLL(bthprops.cpl) WINE_CONFIG_DLL(cabinet,,[implib]) WINE_CONFIG_TEST(dlls/cabinet/tests) WINE_CONFIG_DLL(capi2032,,[implib]) diff --git a/dlls/bthprops.cpl/Makefile.in b/dlls/bthprops.cpl/Makefile.in new file mode 100644 index 0000000..402ec46 --- /dev/null +++ b/dlls/bthprops.cpl/Makefile.in @@ -0,0 +1 @@ +MODULE = bthprops.cpl diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec new file mode 100644 index 0000000..bb7a6ff --- /dev/null +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -0,0 +1,65 @@ +@ stub BluetoothAddressToString +@ stub BluetoothAuthenticateDevice +@ stub BluetoothAuthenticateDeviceEx +@ stub BluetoothAuthenticateMultipleDevices +@ stub BluetoothAuthenticationAgent +@ stub BluetoothDisconnectDevice +@ stub BluetoothDisplayDeviceProperties +@ stub BluetoothEnableDiscovery +@ stub BluetoothEnableIncomingConnections +@ stub BluetoothEnumerateInstalledServices +@ stub BluetoothEnumerateInstalledServicesEx +@ stub BluetoothFindBrowseGroupClose +@ stub BluetoothFindClassIdClose +@ stub BluetoothFindDeviceClose +@ stub BluetoothFindFirstBrowseGroup +@ stub BluetoothFindFirstClassId +@ stub BluetoothFindFirstDevice +@ stub BluetoothFindFirstProfileDescriptor +@ stub BluetoothFindFirstProtocolDescriptorStack +@ stub BluetoothFindFirstProtocolEntry +@ stub BluetoothFindFirstRadio +@ stub BluetoothFindFirstService +@ stub BluetoothFindFirstServiceEx +@ stub BluetoothFindNextBrowseGroup +@ stub BluetoothFindNextClassId +@ stub BluetoothFindNextDevice +@ stub BluetoothFindNextProfileDescriptor +@ stub BluetoothFindNextProtocolDescriptorStack +@ stub BluetoothFindNextProtocolEntry +@ stub BluetoothFindNextRadio +@ stub BluetoothFindNextService +@ stub BluetoothFindProfileDescriptorClose +@ stub BluetoothFindProtocolDescriptorStackClose +@ stub BluetoothFindProtocolEntryClose +@ stub BluetoothFindRadioClose +@ stub BluetoothFindServiceClose +@ stub BluetoothGetDeviceInfo +@ stub BluetoothGetRadioInfo +@ stub BluetoothIsConnectable +@ stub BluetoothIsDiscoverable +@ stub BluetoothIsVersionAvailable +@ stub BluetoothMapClassOfDeviceToImageIndex +@ stub BluetoothMapClassOfDeviceToString +@ stub BluetoothRegisterForAuthentication +@ stub BluetoothRegisterForAuthenticationEx +@ stub BluetoothRemoveDevice +@ stub BluetoothSdpEnumAttributes +@ stub BluetoothSdpGetAttributeValue +@ stub BluetoothSdpGetContainerElementData +@ stub BluetoothSdpGetElementData +@ stub BluetoothSdpGetString +@ stub BluetoothSelectDevices +@ stub BluetoothSelectDevicesFree +@ stub BluetoothSendAuthenticationResponse +@ stub BluetoothSendAuthenticationResponseEx +@ stub BluetoothSetLocalServiceInfo +@ stub BluetoothSetServiceState +@ stub BluetoothUnregisterAuthentication +@ stub BluetoothUpdateDeviceRecord +@ stub BthpEnableAllServices +@ stub BthpFindPnpInfo +@ stub BthpMapStatusToErr +@ stub CPlApplet +@ stub DllCanUnloadNow +@ stub DllGetClassObject

1 0

Austin English : wmplayer: Add stub program.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: b871ebdc7756b5b5be4a6b6140fcda49fa77a22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b871ebdc7756b5b5be4a6b614… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 9 10:57:00 2015 -0600 wmplayer: Add stub program. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + loader/wine.inf.in | 2 ++ programs/wmplayer/Makefile.in | 7 +++++++ programs/wmplayer/main.c | 33 +++++++++++++++++++++++++++++++++ programs/wmplayer/version.rc | 27 +++++++++++++++++++++++++++ 6 files changed, 72 insertions(+) diff --git a/configure b/configure index 35705f5..7161077 100755 --- a/configure +++ b/configure @@ -1485,6 +1485,7 @@ enable_winetest enable_winhlp32 enable_winver enable_wmic +enable_wmplayer enable_wordpad enable_write enable_wscript @@ -18225,6 +18226,7 @@ wine_fn_config_program winhlp32 enable_winhlp32 install,po wine_fn_config_program winoldap.mod16 enable_win16 install wine_fn_config_program winver enable_winver install wine_fn_config_program wmic enable_wmic install,po +wine_fn_config_program wmplayer enable_wmplayer install wine_fn_config_program wordpad enable_wordpad install,po wine_fn_config_program write enable_write install,po wine_fn_config_program wscript enable_wscript clean,install diff --git a/configure.ac b/configure.ac index c6a8b3e..84420a9 100644 --- a/configure.ac +++ b/configure.ac @@ -3581,6 +3581,7 @@ WINE_CONFIG_PROGRAM(winhlp32,,[install,po]) WINE_CONFIG_PROGRAM(winoldap.mod16,enable_win16,[install]) WINE_CONFIG_PROGRAM(winver,,[install]) WINE_CONFIG_PROGRAM(wmic,,[install,po]) +WINE_CONFIG_PROGRAM(wmplayer,,[install]) WINE_CONFIG_PROGRAM(wordpad,,[install,po]) WINE_CONFIG_PROGRAM(write,,[install,po]) WINE_CONFIG_PROGRAM(wscript,,[clean,install]) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b6b1e00..343bc6a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2519,6 +2519,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msxml6.dll 11,,shdocvw.dll 16422,Internet Explorer,iexplore.exe +16422,Windows Media Player,wmplayer.exe 11,,* [FakeDlls] @@ -2567,6 +2568,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16410,Microsoft, 16412,Microsoft, 16422,Internet Explorer,iexplore.exe +16422,Windows Media Player,wmplayer.exe 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 11,,* diff --git a/programs/wmplayer/Makefile.in b/programs/wmplayer/Makefile.in new file mode 100644 index 0000000..be345a0 --- /dev/null +++ b/programs/wmplayer/Makefile.in @@ -0,0 +1,7 @@ +MODULE = wmplayer.exe +APPMODE = -mwindows -municode + +RC_SRCS = version.rc + +C_SRCS = \ + main.c diff --git a/programs/wmplayer/main.c b/programs/wmplayer/main.c new file mode 100644 index 0000000..899835f --- /dev/null +++ b/programs/wmplayer/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmplayer); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/programs/wmplayer/version.rc b/programs/wmplayer/version.rc new file mode 100644 index 0000000..4e29aac --- /dev/null +++ b/programs/wmplayer/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Windows Media Player" +#define WINE_FILENAME_STR "wmplayer.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 12,0,7601,18840 +#define WINE_FILEVERSION_STR "12.0.7601.18840" +#define WINE_PRODUCTVERSION 12,0,7601,18840 +#define WINE_PRODUCTVERSION_STR "12.0.7601.18840" + +#include "wine/wine_common_ver.rc"

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_IAGetPrimitiveTopology().
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 807e019da94c927586cf41f60dcabf66bd7e05c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=807e019da94c927586cf41f60… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:39 2015 +0100 d3d11: Implement d3d11_immediate_context_IAGetPrimitiveTopology(). 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/d3d11/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9f98104..3f80d43 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1010,7 +1010,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetPrimitiveTopology(ID3D11DeviceContext *iface, D3D11_PRIMITIVE_TOPOLOGY *topology) { - FIXME("iface %p, topology %p stub!\n", iface, topology); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, topology %p.\n", iface, topology); + + wined3d_mutex_lock(); + wined3d_device_get_primitive_type(device->wined3d_device, (enum wined3d_primitive_type *)topology); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShaderResources(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_VSSetConstantBuffers().
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: a2f48cc8545e5c8d2cf3dcb5f722ee8e66ef134e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f48cc8545e5c8d2cf3dcb5f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:40 2015 +0100 d3d11: Implement d3d11_immediate_context_VSSetConstantBuffers(). 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/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 3f80d43..f732cd2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -133,8 +133,21 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_SetPrivateDataInterface static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); + + wined3d_device_set_vs_cb(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShaderResources(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_VSSetShaderResources().
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 9b245ff05f5de6aca12556603b744e4365545fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b245ff05f5de6aca12556603… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 10 01:32:41 2015 +0100 d3d11: Implement d3d11_immediate_context_VSSetShaderResources(). 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/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f732cd2..32d5bb2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -423,7 +423,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IASetPrimitiveTopology(ID3 static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct d3d_shader_resource_view *view = unsafe_impl_from_ID3D11ShaderResourceView(views[i]); + + wined3d_device_set_vs_resource_view(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetSamplers(ID3D11DeviceContext *iface,

1 0