June 2017 - Wine-commits - list.winehq.org

Alexandre Julliard : Wine release 2.10
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: website Branch: master Commit: f98e7a06ca1323a82d96b28433dca54926fea04b URL: http://source.winehq.org/git/website.git/?a=commit;h=f98e7a06ca1323a82d96b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 19:44:08 2017 +0200 Wine release 2.10 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017060901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017060901.xml b/news/en/2017060901.xml new file mode 100644 index 0000000..43c515c --- /dev/null +++ b/news/en/2017060901.xml @@ -0,0 +1,17 @@ +<news> +<date>June 9, 2017</date> +<title>Wine 2.10 Released</title> +<body> + The Wine development release 2.10 is now available. + <a href="{$root}/announce/2.10">What's new</a> in this release: +<ul> + <li>Initial version of the Android graphics driver.</li> + <li>Dictionary support in WebServices.</li> + <li>A number of Direct2D fixes.</li> + <li>User interface improvements in RegEdit.</li> + <li>OLE clipboard cache fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.10.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Josh DuBois : wineandroid: Implement GetKeyNameText.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 86534e0dd55d972b35ccecf2e9a2b3f53059d3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86534e0dd55d972b35ccecf2e… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Fri Jun 9 09:19:42 2017 +0200 wineandroid: Implement GetKeyNameText. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 172 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 173 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index b3ac76f..9afb73a 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -522,6 +522,118 @@ static const WORD vkey_to_scancode[] = 0, /* 0xff undefined */ }; +static const struct +{ + DWORD vkey; + const char *name; +} vkey_names[] = { + { VK_ADD, "Num +" }, + { VK_BACK, "Backspace" }, + { VK_CAPITAL, "Caps Lock" }, + { VK_CONTROL, "Ctrl" }, + { VK_DECIMAL, "Num Del" }, + { VK_DELETE | 0x100, "Delete" }, + { VK_DIVIDE | 0x100, "Num /" }, + { VK_DOWN | 0x100, "Down" }, + { VK_END | 0x100, "End" }, + { VK_ESCAPE, "Esc" }, + { VK_F1, "F1" }, + { VK_F2, "F2" }, + { VK_F3, "F3" }, + { VK_F4, "F4" }, + { VK_F5, "F5" }, + { VK_F6, "F6" }, + { VK_F7, "F7" }, + { VK_F8, "F8" }, + { VK_F9, "F9" }, + { VK_F10, "F10" }, + { VK_F11, "F11" }, + { VK_F12, "F12" }, + { VK_F13, "F13" }, + { VK_F14, "F14" }, + { VK_F15, "F15" }, + { VK_F16, "F16" }, + { VK_F17, "F17" }, + { VK_F18, "F18" }, + { VK_F19, "F19" }, + { VK_F20, "F20" }, + { VK_F21, "F21" }, + { VK_F22, "F22" }, + { VK_F23, "F23" }, + { VK_F24, "F24" }, + { VK_HELP | 0x100, "Help" }, + { VK_HOME | 0x100, "Home" }, + { VK_INSERT | 0x100, "Insert" }, + { VK_LCONTROL, "Ctrl" }, + { VK_LEFT | 0x100, "Left" }, + { VK_LMENU, "Alt" }, + { VK_LSHIFT, "Shift" }, + { VK_LWIN | 0x100, "Win" }, + { VK_MENU, "Alt" }, + { VK_MULTIPLY, "Num *" }, + { VK_NEXT | 0x100, "Page Down" }, + { VK_NUMLOCK | 0x100, "Num Lock" }, + { VK_NUMPAD0, "Num 0" }, + { VK_NUMPAD1, "Num 1" }, + { VK_NUMPAD2, "Num 2" }, + { VK_NUMPAD3, "Num 3" }, + { VK_NUMPAD4, "Num 4" }, + { VK_NUMPAD5, "Num 5" }, + { VK_NUMPAD6, "Num 6" }, + { VK_NUMPAD7, "Num 7" }, + { VK_NUMPAD8, "Num 8" }, + { VK_NUMPAD9, "Num 9" }, + { VK_OEM_CLEAR, "Num Clear" }, + { VK_OEM_NEC_EQUAL | 0x100, "Num =" }, + { VK_PRIOR | 0x100, "Page Up" }, + { VK_RCONTROL | 0x100, "Right Ctrl" }, + { VK_RETURN, "Return" }, + { VK_RETURN | 0x100, "Num Enter" }, + { VK_RIGHT | 0x100, "Right" }, + { VK_RMENU | 0x100, "Right Alt" }, + { VK_RSHIFT, "Right Shift" }, + { VK_RWIN | 0x100, "Right Win" }, + { VK_SEPARATOR, "Num ," }, + { VK_SHIFT, "Shift" }, + { VK_SPACE, "Space" }, + { VK_SUBTRACT, "Num -" }, + { VK_TAB, "Tab" }, + { VK_UP | 0x100, "Up" }, + { VK_VOLUME_DOWN | 0x100, "Volume Down" }, + { VK_VOLUME_MUTE | 0x100, "Mute" }, + { VK_VOLUME_UP | 0x100, "Volume Up" }, + { VK_OEM_MINUS, "-" }, + { VK_OEM_PLUS, "=" }, + { VK_OEM_1, ";" }, + { VK_OEM_2, "/" }, + { VK_OEM_3, "`" }, + { VK_OEM_4, "[" }, + { VK_OEM_5, "\\" }, + { VK_OEM_6, "]" }, + { VK_OEM_7, "'" }, + { VK_OEM_COMMA, "," }, + { VK_OEM_PERIOD, "." }, +}; + +static UINT scancode_to_vkey( UINT scan ) +{ + UINT j; + + for (j = 0; j < sizeof(vkey_to_scancode)/sizeof(vkey_to_scancode[0]); j++) + if (vkey_to_scancode[j] == scan) + return j; + return 0; +} + +static const char* vkey_to_name( UINT vkey ) +{ + UINT j; + + for (j = 0; j < sizeof(vkey_names)/sizeof(vkey_names[0]); j++) + if (vkey_names[j].vkey == vkey) + return vkey_names[j].name; + return NULL; +} /*********************************************************************** * keyboard_event @@ -649,3 +761,63 @@ INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, TRACE( "returning %d / %s\n", strlenW( buffer ), debugstr_wn(buf, strlenW( buffer ))); return strlenW( buffer ); } + + +/*********************************************************************** + * ANDROID_GetKeyNameText + */ +INT CDECL ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) +{ + int scancode, vkey, len; + const char *name; + char key[2]; + + scancode = (lparam >> 16) & 0x1FF; + vkey = scancode_to_vkey( scancode ); + + if (lparam & (1 << 25)) + { + /* Caller doesn't care about distinctions between left and + right keys. */ + switch (vkey) + { + case VK_LSHIFT: + case VK_RSHIFT: + vkey = VK_SHIFT; break; + case VK_LCONTROL: + case VK_RCONTROL: + vkey = VK_CONTROL; break; + case VK_LMENU: + case VK_RMENU: + vkey = VK_MENU; break; + } + } + + if (scancode & 0x100) vkey |= 0x100; + + if ((vkey >= 0x30 && vkey <= 0x39) || (vkey >= 0x41 && vkey <= 0x5a)) + { + key[0] = vkey; + if (vkey >= 0x41) + key[0] += 0x20; + key[1] = 0; + name = key; + } + else + { + name = vkey_to_name( vkey ); + } + + len = MultiByteToWideChar( CP_UTF8, 0, name, -1, buffer, size ); + if (len) len--; + + if (!len) + { + static const WCHAR format[] = {'K','e','y',' ','0','x','%','0','2','x',0}; + snprintfW( buffer, size, format, vkey ); + len = strlenW( buffer ); + } + + TRACE( "lparam 0x%08x -> %s\n", lparam, debugstr_w( buffer )); + return len; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 1a74624..4e7815a 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -4,6 +4,7 @@ # USER driver +@ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo

1 0

Josh DuBois : wineandroid: Implement MapVirtualKeyEx.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 0d565d0118af1989c57fa27e831ac7815a05fe19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d565d0118af1989c57fa27e8… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Fri Jun 9 09:20:20 2017 +0200 wineandroid: Implement MapVirtualKeyEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 64 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 65 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 9afb73a..fb70445 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -36,6 +36,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(keyboard); +WINE_DECLARE_DEBUG_CHANNEL(key); static const UINT keycode_to_vkey[] = { @@ -821,3 +822,66 @@ INT CDECL ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) TRACE( "lparam 0x%08x -> %s\n", lparam, debugstr_w( buffer )); return len; } + + +/*********************************************************************** + * ANDROID_MapVirtualKeyEx + */ +UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) +{ + UINT ret = 0; + const char *s; + + TRACE_(key)( "code=0x%x, maptype=%d, hkl %p\n", code, maptype, hkl ); + + switch (maptype) + { + case MAPVK_VK_TO_VSC_EX: + case MAPVK_VK_TO_VSC: + /* vkey to scancode */ + switch (code) + { + case VK_SHIFT: + code = VK_LSHIFT; + break; + case VK_CONTROL: + code = VK_LCONTROL; + break; + case VK_MENU: + code = VK_LMENU; + break; + } + if (code < sizeof(vkey_to_scancode) / sizeof(vkey_to_scancode[0])) ret = vkey_to_scancode[code]; + break; + case MAPVK_VSC_TO_VK: + case MAPVK_VSC_TO_VK_EX: + /* scancode to vkey */ + ret = scancode_to_vkey( code ); + if (maptype == MAPVK_VSC_TO_VK) + switch (ret) + { + case VK_LSHIFT: + case VK_RSHIFT: + ret = VK_SHIFT; break; + case VK_LCONTROL: + case VK_RCONTROL: + ret = VK_CONTROL; break; + case VK_LMENU: + case VK_RMENU: + ret = VK_MENU; break; + } + break; + case MAPVK_VK_TO_CHAR: + s = vkey_to_name( code ); + if (s && (strlen( s ) == 1)) + ret = s[0]; + else + ret = 0; + break; + default: + FIXME( "Unknown maptype %d\n", maptype ); + break; + } + TRACE_(key)( "returning 0x%04x\n", ret ); + return ret; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 4e7815a..89ec528 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -5,6 +5,7 @@ # USER driver @ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText +@ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo

1 0

Hans Leidekker : wineandroid: Implement GetKeyboardLayout.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: e545a85351ad72f9c6c7f9abdfdfebe621b1509b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e545a85351ad72f9c6c7f9abd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 9 09:20:49 2017 +0200 wineandroid: Implement GetKeyboardLayout. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 19 +++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 20 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index fb70445..81af8e3 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -885,3 +885,22 @@ UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) TRACE_(key)( "returning 0x%04x\n", ret ); return ret; } + + +/*********************************************************************** + * ANDROID_GetKeyboardLayout + */ +HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) +{ + ULONG_PTR layout = GetUserDefaultLCID(); + LANGID langid; + + langid = PRIMARYLANGID(LANGIDFROMLCID( layout )); + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + layout = MAKELONG( layout, 0xe001 ); /* IME */ + else + layout |= layout << 16; + + FIXME( "returning %lx\n", layout ); + return (HKL)layout; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 89ec528..bd42cb1 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -5,6 +5,7 @@ # USER driver @ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText +@ cdecl GetKeyboardLayout(long) ANDROID_GetKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors

1 0

Hans Leidekker : wineandroid: Implement VkKeyScanEx.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 86b82b8f73f749fe59a007710c52ee0c91375b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b82b8f73f749fe59a007710… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 9 09:21:15 2017 +0200 wineandroid: Implement VkKeyScanEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 29 +++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 30 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 81af8e3..741b76a 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -616,6 +616,23 @@ static const struct { VK_OEM_PERIOD, "." }, }; +static const SHORT char_vkey_map[] = +{ + 0x332, 0x241, 0x242, 0x003, 0x244, 0x245, 0x246, 0x247, 0x008, 0x009, + 0x20d, 0x24b, 0x24c, 0x00d, 0x24e, 0x24f, 0x250, 0x251, 0x252, 0x253, + 0x254, 0x255, 0x256, 0x257, 0x258, 0x259, 0x25a, 0x01b, 0x2dc, 0x2dd, + 0x336, 0x3bd, 0x020, 0x131, 0x1de, 0x133, 0x134, 0x135, 0x137, 0x0de, + 0x139, 0x130, 0x138, 0x1bb, 0x0bc, 0x0bd, 0x0be, 0x0bf, 0x030, 0x031, + 0x032, 0x033, 0x034, 0x035, 0x036, 0x037, 0x038, 0x039, 0x1ba, 0x0ba, + 0x1bc, 0x0bb, 0x1be, 0x1bf, 0x132, 0x141, 0x142, 0x143, 0x144, 0x145, + 0x146, 0x147, 0x148, 0x149, 0x14a, 0x14b, 0x14c, 0x14d, 0x14e, 0x14f, + 0x150, 0x151, 0x152, 0x153, 0x154, 0x155, 0x156, 0x157, 0x158, 0x159, + 0x15a, 0x0db, 0x0dc, 0x0dd, 0x136, 0x1bd, 0x0c0, 0x041, 0x042, 0x043, + 0x044, 0x045, 0x046, 0x047, 0x048, 0x049, 0x04a, 0x04b, 0x04c, 0x04d, + 0x04e, 0x04f, 0x050, 0x051, 0x052, 0x053, 0x054, 0x055, 0x056, 0x057, + 0x058, 0x059, 0x05a, 0x1db, 0x1dc, 0x1dd, 0x1c0, 0x208 +}; + static UINT scancode_to_vkey( UINT scan ) { UINT j; @@ -904,3 +921,15 @@ HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) FIXME( "returning %lx\n", layout ); return (HKL)layout; } + + +/*********************************************************************** + * ANDROID_VkKeyScanEx + */ +SHORT CDECL ANDROID_VkKeyScanEx( WCHAR ch, HKL hkl ) +{ + SHORT ret = -1; + if (ch < sizeof(char_vkey_map) / sizeof(char_vkey_map[0])) ret = char_vkey_map[ch]; + TRACE_(key)( "ch %04x hkl %p -> %04x\n", ch, hkl, ret ); + return ret; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index bd42cb1..918140f 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -8,6 +8,7 @@ @ cdecl GetKeyboardLayout(long) ANDROID_GetKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx +@ cdecl VkKeyScanEx(long long) ANDROID_VkKeyScanEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo @ cdecl CreateWindow(long) ANDROID_CreateWindow

1 0

Hans Leidekker : wineandroid: Synchronize keyboard lock state.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 4f4ede56e9f5d97029b37434badd77e80ece2e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4ede56e9f5d97029b37434b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 9 09:21:52 2017 +0200 wineandroid: Synchronize keyboard lock state. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 2 ++ dlls/wineandroid.drv/keyboard.c | 63 +++++++++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 1 + 3 files changed, 66 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index ca026fa..0c3f35f 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -81,6 +81,7 @@ enum android_window_messages extern HWND get_capture_window(void) DECLSPEC_HIDDEN; extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; +extern void update_keyboard_lock_state( WORD vkey, UINT state ) DECLSPEC_HIDDEN; /* JNI entry points */ extern void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) DECLSPEC_HIDDEN; @@ -125,6 +126,7 @@ union event_data { enum event_type type; HWND hwnd; + UINT lock_state; INPUT input; } kbd; }; diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 741b76a..e6e1d02 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -33,6 +33,7 @@ #include "android.h" #include "wine/unicode.h" +#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(keyboard); @@ -653,6 +654,67 @@ static const char* vkey_to_name( UINT vkey ) return NULL; } +static BOOL get_async_key_state( BYTE state[256] ) +{ + BOOL ret; + + SERVER_START_REQ( get_key_state ) + { + req->tid = 0; + req->key = -1; + wine_server_set_reply( req, state, 256 ); + ret = !wine_server_call( req ); + } + SERVER_END_REQ; + return ret; +} + +static void send_keyboard_input( HWND hwnd, WORD vkey, WORD scan, DWORD flags ) +{ + INPUT input; + + input.type = INPUT_KEYBOARD; + input.u.ki.wVk = vkey; + input.u.ki.wScan = scan; + input.u.ki.dwFlags = flags; + input.u.ki.time = 0; + input.u.ki.dwExtraInfo = 0; + + __wine_send_input( hwnd, &input ); +} + +/*********************************************************************** + * update_keyboard_lock_state + */ +void update_keyboard_lock_state( WORD vkey, UINT state ) +{ + BYTE keystate[256]; + + if (!get_async_key_state( keystate )) return; + + if (!(keystate[VK_CAPITAL] & 0x01) != !(state & AMETA_CAPS_LOCK_ON) && vkey != VK_CAPITAL) + { + TRACE( "adjusting CapsLock state (%02x)\n", keystate[VK_CAPITAL] ); + send_keyboard_input( 0, VK_CAPITAL, 0x3a, 0 ); + send_keyboard_input( 0, VK_CAPITAL, 0x3a, KEYEVENTF_KEYUP ); + } + + if (!(keystate[VK_NUMLOCK] & 0x01) != !(state & AMETA_NUM_LOCK_ON) && (vkey & 0xff) != VK_NUMLOCK) + { + TRACE( "adjusting NumLock state (%02x)\n", keystate[VK_NUMLOCK] ); + send_keyboard_input( 0, VK_NUMLOCK, 0x45, KEYEVENTF_EXTENDEDKEY ); + send_keyboard_input( 0, VK_NUMLOCK, 0x45, KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP ); + } + + if (!(keystate[VK_SCROLL] & 0x01) != !(state & AMETA_SCROLL_LOCK_ON) && vkey != VK_SCROLL) + { + TRACE( "adjusting ScrollLock state (%02x)\n", keystate[VK_SCROLL] ); + send_keyboard_input( 0, VK_SCROLL, 0x46, 0 ); + send_keyboard_input( 0, VK_SCROLL, 0x46, KEYEVENTF_KEYUP ); + } +} + + /*********************************************************************** * keyboard_event * @@ -671,6 +733,7 @@ jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, jint k } data.type = KEYBOARD_EVENT; data.kbd.hwnd = LongToHandle( win ); + data.kbd.lock_state = state; data.kbd.input.type = INPUT_KEYBOARD; data.kbd.input.u.ki.wVk = keycode_to_vkey[keycode]; data.kbd.input.u.ki.wScan = vkey_to_scancode[data.kbd.input.u.ki.wVk]; diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 2ddcdf1..33f2240 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -482,6 +482,7 @@ static int process_events( DWORD mask ) TRACE("KEYDOWN hwnd %p vkey %x '%c' scancode %x\n", event->data.kbd.hwnd, event->data.kbd.input.u.ki.wVk, event->data.kbd.input.u.ki.wVk, event->data.kbd.input.u.ki.wScan ); + update_keyboard_lock_state( event->data.kbd.input.u.ki.wVk, event->data.kbd.lock_state ); __wine_send_input( 0, &event->data.kbd.input ); break;

1 0

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 1a1850afb8e64d6843a7d09fef9da05070236be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1850afb8e64d6843a7d09fe… Author: Can Taşan <betax34(a)hotmail.com> Date: Fri Jun 9 09:25:45 2017 +0200 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 83 ++++++++++++++++++++++------------------------------------------ 1 file changed, 28 insertions(+), 55 deletions(-) diff --git a/po/tr.po b/po/tr.po index e2dcbb1..c985c23 100644 --- a/po/tr.po +++ b/po/tr.po @@ -508,7 +508,7 @@ msgstr "Yazıcı" #: comdlg32.rc:228 msgid "&Default Printer" -msgstr "&Öntanımlı Yazıcı" +msgstr "&Varsayılan Yazıcı" #: comdlg32.rc:229 msgid "[none]" @@ -1003,7 +1003,7 @@ msgstr "Bir yazıcı hatası oluştu." #: comdlg32.rc:68 msgid "No default printer defined." -msgstr "Öntanımlı yazıcı tanımlanmamış." +msgstr "Varsayılan yazıcı tanımlanmamış." #: comdlg32.rc:69 msgid "Cannot find the printer." @@ -1163,7 +1163,7 @@ msgstr "Güç tasarruf kipi; " #: comdlg32.rc:77 msgid "Default Printer; " -msgstr "Öntanımlı Yazıcı; " +msgstr "Varsayılan Yazıcı; " #: comdlg32.rc:78 msgid "There are %d documents in the queue" @@ -9691,7 +9691,7 @@ msgstr "" "ECHO ON bir toplu işlem dosyasında tüm komutların çalıştırılmadan önce\n" "uçbirim aygıtında görüntülenmesini sağlar\n" "\n" -"ECHO OFF bir önceki ECHO ON (ECHO öntanımlı olarak kapalıdır)komutunun\n" +"ECHO OFF bir önceki ECHO ON (ECHO varsayılan olarak kapalıdır)komutunun\n" "tersini yapar. ECHO OFF çıktısının görüntülenmesini başına @ işareti\n" "getirerek engelleyebilirsiniz.\n" @@ -9874,7 +9874,7 @@ msgstr "" "$q Eşittir işareti $t Geçerli saat $v cmd sürümü\n" "\n" "Sadece PROMPT komutunu girerseniz komut istemi geçerli dizini (sürücü harfi\n" -"dahil) ve onu izleyen büyüktür (>) işareti içeren öntanımlı değerlere\n" +"dahil) ve onu izleyen büyüktür (>) işareti içeren varsayılan değerlere\n" "dönecektir.\n" "(PROMPT $p$g komutu gibi).\n" "\n" @@ -10208,7 +10208,7 @@ msgstr "" "ASSOC\t\tDosya uzantı ilişkilerini göster veya düzenle\n" "ATTRIB\t\tDOS dosya özelliklerini göster veya değiştir\n" "CALL\t\tToplu işlem dosyası içerisinden bir diğerini çalıştır\n" -"CD (CHDIR)\tGeçerli dizini değiştir\n" +"CD (CHDIR)\tŞimdiki dizini değiştir\n" "CHOICE\t\tSeçilebilir listeden bir tuşa basılmasını bekle\n" "CLS\t\tKonsol ekranını temizle\n" "COPY\t\tDosya kopyala\n" @@ -10233,7 +10233,7 @@ msgstr "" "REN (RENAME)\tDosyayı yeniden adlandır\n" "RD (RMDIR)\tAlt dizini sil\n" "SET\t\tÇevre değişkenlerini düzenle veya göster\n" -"SETLOCAL\tOrtam değişiklikleri yerelleştirmesini bir toply dosyada başlat\n" +"SETLOCAL\tOrtam değişiklikleri yerelleştirmesini bir toplu dosyada başlat\n" "START\t\tİlişkili programda bir program başlat veya bir belge aç\n" "TIME\t\tŞimdiki sistem saatini düzenle veya göster\n" "TITLE\t\tKomut istemi oturumu için pencere başlığını belirle\n" @@ -10265,7 +10265,7 @@ msgstr "%1 uzantısı için dosya ilişkilendirmesi eksik\n" #: cmd.rc:357 msgid "No open command associated with file type '%1'\n" -msgstr "'%1' dosya türü için ilişkilendirilmiş bir aç komutu yok\n" +msgstr "'%1' dosya türü için ilişkilendirilmiş bir açma komutu yok\n" #: cmd.rc:358 msgid "Overwrite %1?" @@ -10527,7 +10527,7 @@ msgstr "DHCP etkin" #: ipconfig.rc:49 msgid "Default gateway" -msgstr "Öntanımlı ağ geçidi" +msgstr "Varsayılan ağ geçidi" #: ipconfig.rc:50 msgid "IPv6 address" @@ -11141,7 +11141,7 @@ msgstr "" #: oleview.rc:180 msgid "Default Interface Viewer" -msgstr "Öntanımlı Arayüz Gösterici" +msgstr "Varsayılan Arayüz Gösterici" #: oleview.rc:183 msgid "Interface" @@ -11774,17 +11774,12 @@ msgid "&About Registry Editor" msgstr "Kayıt Defteri Düzenleyicisi &Hakkında" #: regedit.rc:89 regedit.rc:96 regedit.rc:229 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "genişletilmiş" +msgstr "Genişlet" #: regedit.rc:134 regedit.rc:232 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "İkili Değeri Değiştir..." +msgstr "İkili &Değeri Değiştir..." #: regedit.rc:266 msgid "Export registry" @@ -11883,14 +11878,11 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Sık kullanılan anahtarlara erişmek için komutları içerir" #: regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Kayıt düzenleyici hakkında yardım ve bilgi göstermek için komutları içerir" +"Kayıt Defteri Düzenleyicisi hakkında yardım ve bilgi göstermek için " +"komutları içerir" #: regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -11902,7 +11894,7 @@ msgstr "Veri" #: regedit.rc:154 msgid "Registry Editor" -msgstr "Kayıt Düzenleyici" +msgstr "Kayıt Defteri Düzenleyicisi" #: regedit.rc:220 msgid "Import Registry File" @@ -12136,16 +12128,12 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: '%1' kayıt sınıfı silinemiyor.\n" #: regedit.rc:430 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: '%1' satırı bilinmiyor.\n" +msgstr "regedit: Satır sözdizimi geçersiz.\n" #: regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" -msgstr "Kayıt düzenleyicisinden çıkar" +msgstr "Kayıt Defteri Düzenleyicisinden çıkar" #: regedit.rc:188 msgid "Adds keys to the favorites list" @@ -12160,8 +12148,6 @@ msgid "Shows or hides the status bar" msgstr "Durum çubuğunu gösterir veya gizler" #: regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "İki panel arasındaki ayracın konumunu değiştirir" @@ -12206,10 +12192,8 @@ msgid "Adds a new binary value" msgstr "Yeni bir ikili değer ekler" #: regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Yeni bir ikili değer ekler" +msgstr "Yeni bir 32-bit değer ekler" #: regedit.rc:177 msgid "Imports a text file into the registry" @@ -12224,10 +12208,8 @@ msgid "Prints all or part of the registry" msgstr "Sistem kaydının bir kısmını veya tümünü yazdırır" #: regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Kayıt Düzenleyici" +msgstr "Kayıt Defteri Düzenleyicisi Yardımını açar" #: regedit.rc:182 msgid "Displays program information, version number and copyright" @@ -12270,26 +12252,20 @@ msgid "Unable to query the registry key '%1'." msgstr "'%1' kayıt anahtarı sorgulanamıyor." #: regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Değer verisini değiştirir" +msgstr "Değer verisini ikili biçimde değiştirir" #: regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Yeni bir çoklu dize değeri ekler" #: regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Sistem kaydının seçilen kısmını metin dosyasına aktarır" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Yeni bir dize değeri ekler" +msgstr "Yeni bir genişletilebilir dize değeri ekler" #: regedit.rc:211 msgid "Confirm Key Delete" @@ -12303,11 +12279,8 @@ msgstr "" "istediğinizden emin misiniz?" #: regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "daraltılmış" +msgstr "Daralt" #: regsvr32.rc:32 msgid "" @@ -13744,7 +13717,7 @@ msgstr "devre dışı" #: winecfg.rc:61 msgid "Default Settings" -msgstr "Öntanımlı Ayarlar" +msgstr "Varsayılan Ayarlar" #: winecfg.rc:62 msgid "Wine Programs (*.exe; *.exe.so)" @@ -13787,7 +13760,7 @@ msgstr "" "Daha fazla sürücü ekleyemezsiniz.\n" "\n" "Her sürücünün A-Z aralığında bir harfi olmalıdır. Dolayısıyla 26'dan fazla " -"tanımlayamazsınız." +"sürücü tanımlayamazsınız." #: winecfg.rc:75 msgid "System drive" @@ -14064,7 +14037,7 @@ msgstr "Sadece geçerli oturuma uygula" #: wineconsole.rc:29 msgid "Set &Defaults" -msgstr "&Öntanımlı Ayarlar" +msgstr "&Varsayılan Ayarlar" #: wineconsole.rc:31 msgid "&Mark" @@ -14084,7 +14057,7 @@ msgstr "A&ra" #: wineconsole.rc:39 msgid "Setup - Default settings" -msgstr "Ayarla - Öntanımlı ayarlar" +msgstr "Ayarla - Vatsayılan ayarlar" #: wineconsole.rc:40 msgid "Setup - Current settings" @@ -14200,11 +14173,11 @@ msgstr "" #: winedbg.rc:61 msgid "Show &Details" -msgstr "Detayları &Göster" +msgstr "Ayrıntıları &Göster" #: winedbg.rc:66 msgid "Program Error Details" -msgstr "Program Hata Detayları" +msgstr "Program Hata Ayrıntıları" #: winedbg.rc:73 msgid ""

1 0

Alex Henrie : adsldpc: Add stub DLL.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 67db7fe94ee20a95a1f821ff48be391259c4b10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67db7fe94ee20a95a1f821ff4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 8 09:14:10 2017 -0600 adsldpc: Add stub DLL. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/adsldpc/Makefile.in | 4 ++ dlls/adsldpc/adsldpc.spec | 175 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/adsldpc/main.c | 45 ++++++++++++ 5 files changed, 227 insertions(+) diff --git a/configure b/configure index d12d186..2964b81 100755 --- a/configure +++ b/configure @@ -873,6 +873,7 @@ enable_acledit enable_aclui enable_activeds enable_actxprxy +enable_adsldpc enable_advapi32 enable_advpack enable_amstream @@ -17757,6 +17758,7 @@ wine_fn_config_dll aclui enable_aclui implib wine_fn_config_dll activeds enable_activeds implib wine_fn_config_dll actxprxy enable_actxprxy clean wine_fn_config_lib adsiid +wine_fn_config_dll adsldpc enable_adsldpc wine_fn_config_dll advapi32 enable_advapi32 clean,implib wine_fn_config_test dlls/advapi32/tests advapi32_test wine_fn_config_dll advpack enable_advpack implib diff --git a/configure.ac b/configure.ac index d5e9456..2db5d6a 100644 --- a/configure.ac +++ b/configure.ac @@ -2701,6 +2701,7 @@ WINE_CONFIG_DLL(aclui,,[implib]) WINE_CONFIG_DLL(activeds,,[implib]) WINE_CONFIG_DLL(actxprxy,,[clean]) WINE_CONFIG_LIB(adsiid) +WINE_CONFIG_DLL(adsldpc) WINE_CONFIG_DLL(advapi32,,[clean,implib]) WINE_CONFIG_TEST(dlls/advapi32/tests) WINE_CONFIG_DLL(advpack,,[implib]) diff --git a/dlls/adsldpc/Makefile.in b/dlls/adsldpc/Makefile.in new file mode 100644 index 0000000..4dad141 --- /dev/null +++ b/dlls/adsldpc/Makefile.in @@ -0,0 +1,4 @@ +MODULE = adsldpc.dll + +C_SRCS = \ + main.c diff --git a/dlls/adsldpc/adsldpc.spec b/dlls/adsldpc/adsldpc.spec new file mode 100644 index 0000000..6b14e47 --- /dev/null +++ b/dlls/adsldpc/adsldpc.spec @@ -0,0 +1,175 @@ +@ stub ??0CLexer@@QAE(a)XZ +@ stub ??1CLexer@@QAE(a)XZ +@ stub ADSIPrint +@ stub ADsAbandonSearch +@ stub ADsCloseSearchHandle +@ stub ADsCreateAttributeDefinition +@ stub ADsCreateClassDefinition +@ stub ADsCreateDSObject +@ stub ADsCreateDSObjectExt +@ stub ADsDeleteAttributeDefinition +@ stub ADsDeleteClassDefinition +@ stub ADsDeleteDSObject +@ stub ADsEnumAttributes +@ stub ADsEnumClasses +@ stub ADsExecuteSearch +@ stub ADsFreeColumn +@ stub ADsGetColumn +@ stub ADsGetFirstRow +@ stub ADsGetNextColumnName +@ stub ADsGetNextRow +@ stub ADsGetObjectAttributes +@ stub ADsGetPreviousRow +@ stub ADsHelperGetCurrentRowMessage +@ stub ADsObject +@ stub ADsSetObjectAttributes +@ stub ADsSetSearchPreference +@ stub ADsWriteAttributeDefinition +@ stub ADsWriteClassDefinition +@ stub AdsTypeToLdapTypeCopyConstruct +@ stub AdsTypeToLdapTypeCopyDNWithBinary +@ stub AdsTypeToLdapTypeCopyDNWithString +@ stub AdsTypeToLdapTypeCopyGeneralizedTime +@ stub AdsTypeToLdapTypeCopyTime +@ stub BerBvFree +@ stub BerEncodingQuotaControl +@ stub BuildADsParentPath +@ stub BuildADsParentPathFromObjectInfo2 +@ stub BuildADsParentPathFromObjectInfo +@ stub BuildADsPathFromLDAPPath2 +@ stub BuildADsPathFromLDAPPath +@ stub BuildADsPathFromParent +@ stub BuildLDAPPathFromADsPath2 +@ stub BuildLDAPPathFromADsPath +@ stub ChangeSeparator +@ stub Component +@ stub ConvertSidToString +@ stub ConvertSidToU2Trustee +@ stub ConvertU2TrusteeToSid +@ stub FindEntryInSearchTable +@ stub FindSearchTableIndex +@ stub FreeObjectInfo +@ stub GetDefaultServer +@ stub GetDisplayName +@ stub GetDomainDNSNameForDomain +@ stub GetLDAPTypeName +@ stub ?GetNextToken(a)CLexer@@QAEJPAGPAK(a)Z +@ stub GetServerAndPort +@ stub GetSyntaxOfAttribute +@ stub InitObjectInfo +@ stub ?InitializePath(a)CLexer@@QAEJPAG(a)Z +@ stub IsGCNamespace +@ stub LdapAddExtS +@ stub LdapAddS +@ stub LdapAttributeFree +@ stub LdapCacheAddRef +@ stub LdapCloseObject +@ stub LdapCompareExt +@ stub LdapControlFree +@ stub LdapControlsFree +@ stub LdapCountEntries +@ stub LdapCrackUserDNtoNTLMUser2 +@ stub LdapCreatePageControl +@ stub LdapDeleteExtS +@ stub LdapDeleteS +@ stub LdapFirstAttribute +@ stub LdapFirstEntry +@ stub LdapGetDn +@ stub LdapGetNextPageS +@ stub LdapGetSchemaObjectCount +@ stub LdapGetSubSchemaSubEntryPath +@ stub LdapGetSyntaxIdOfAttribute +@ stub LdapGetSyntaxOfAttributeOnServer +@ stub LdapGetValues +@ stub LdapGetValuesLen +@ stub LdapInitializeSearchPreferences +@ stub LdapIsClassNameValidOnServer +@ stub LdapMakeSchemaCacheObsolete +@ stub LdapMemFree +@ stub LdapModDnS +@ stub LdapModifyExtS +@ stub LdapModifyS +@ stub LdapMsgFree +@ stub LdapNextAttribute +@ stub LdapNextEntry +@ stub LdapOpenObject2 +@ stub LdapOpenObject +@ stub LdapParsePageControl +@ stub LdapParseResult +@ stub LdapReadAttribute2 +@ stub LdapReadAttribute +@ stub LdapReadAttributeFast +@ stub LdapRenameExtS +@ stub LdapResult +@ stub LdapSearch +@ stub LdapSearchAbandonPage +@ stub LdapSearchExtS +@ stub LdapSearchInitPage +@ stub LdapSearchS +@ stub LdapSearchST +@ stub LdapTypeBinaryToString +@ stub LdapTypeCopyConstruct +@ stub LdapTypeFreeLdapModList +@ stub LdapTypeFreeLdapModObject +@ stub LdapTypeFreeLdapObjects +@ stub LdapTypeToAdsTypeDNWithBinary +@ stub LdapTypeToAdsTypeDNWithString +@ stub LdapTypeToAdsTypeGeneralizedTime +@ stub LdapTypeToAdsTypeUTCTime +@ stub LdapValueFree +@ stub LdapValueFreeLen +@ stub LdapcKeepHandleAround +@ stub LdapcSetStickyServer +@ stub PathName +@ stub ReadPagingSupportedAttr +@ stub ReadSecurityDescriptorControlType +@ stub ReadServerSupportsIsADAMControl +@ stub ReadServerSupportsIsADControl +@ stub SchemaAddRef +@ stub SchemaClose +@ stub SchemaGetClassInfo +@ stub SchemaGetClassInfoByIndex +@ stub SchemaGetObjectCount +@ stub SchemaGetPropertyInfo +@ stub SchemaGetPropertyInfoByIndex +@ stub SchemaGetStringsFromStringTable +@ stub SchemaGetSyntaxOfAttribute +@ stub SchemaIsClassAContainer +@ stub SchemaOpen +@ stub ?SetAtDisabler(a)CLexer@@QAEXH(a)Z +@ stub ?SetExclaimnationDisabler(a)CLexer@@QAEXH(a)Z +@ stub ?SetFSlashDisabler(a)CLexer@@QAEXH(a)Z +@ stub SortAndRemoveDuplicateOIDs +@ stub UnMarshallLDAPToLDAPSynID +@ stub intcmp +@ stub ADSIAbandonSearch +@ stub ADSICloseDSObject +@ stub ADSICloseSearchHandle +@ stub ADSICreateDSObject +@ stub ADSIDeleteDSObject +@ stub ADSIExecuteSearch +@ stub ADSIFreeColumn +@ stub ADSIGetColumn +@ stub ADSIGetFirstRow +@ stub ADSIGetNextColumnName +@ stub ADSIGetNextRow +@ stub ADSIGetObjectAttributes +@ stub ADSIGetPreviousRow +@ stub ADSIModifyRdn +@ stub ADSIOpenDSObject +@ stub ADSISetObjectAttributes +@ stub ADSISetSearchPreference +@ stub ADsDecodeBinaryData +@ stub ADsEncodeBinaryData +@ stub ADsGetLastError +@ stub ADsSetLastError +@ stub AdsTypeFreeAdsObjects +@ stub AllocADsMem +@ stub AllocADsStr +@ stub FreeADsMem +@ stub FreeADsStr +@ stub LdapTypeToAdsTypeCopyConstruct +@ stub MapADSTypeToLDAPType +@ stub MapLDAPTypeToADSType +@ stub ReallocADsMem +@ stub ReallocADsStr diff --git a/dlls/adsldpc/main.c b/dlls/adsldpc/main.c new file mode 100644 index 0000000..56eff5d --- /dev/null +++ b/dlls/adsldpc/main.c @@ -0,0 +1,45 @@ +/* + * Active Directory Services Lightweight Directory Provider C + * + * Copyright 2017 Alex Henrie + * + * 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(adsldpc); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Austin English : tdh: Add stub dll.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: b2d4b506b3c92cc93a1144b201e0e96fa14d10d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d4b506b3c92cc93a1144b20… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 8 16:39:41 2017 -0500 tdh: 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/tdh/Makefile.in | 4 ++++ dlls/tdh/tdh.spec | 34 ++++++++++++++++++++++++++++++++++ dlls/tdh/tdh_main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 84 insertions(+) diff --git a/configure b/configure index 2964b81..51904b5 100755 --- a/configure +++ b/configure @@ -1430,6 +1430,7 @@ enable_sxs enable_t2embed enable_tapi32 enable_taskschd +enable_tdh enable_tdi_sys enable_traffic enable_twain_32 @@ -18509,6 +18510,7 @@ wine_fn_config_test dlls/t2embed/tests t2embed_test wine_fn_config_dll tapi32 enable_tapi32 implib wine_fn_config_dll taskschd enable_taskschd clean wine_fn_config_test dlls/taskschd/tests taskschd_test +wine_fn_config_dll tdh enable_tdh wine_fn_config_dll tdi.sys enable_tdi_sys wine_fn_config_dll toolhelp.dll16 enable_win16 wine_fn_config_dll traffic enable_traffic diff --git a/configure.ac b/configure.ac index 2db5d6a..573d290 100644 --- a/configure.ac +++ b/configure.ac @@ -3452,6 +3452,7 @@ WINE_CONFIG_TEST(dlls/t2embed/tests) WINE_CONFIG_DLL(tapi32,,[implib]) WINE_CONFIG_DLL(taskschd,,[clean]) WINE_CONFIG_TEST(dlls/taskschd/tests) +WINE_CONFIG_DLL(tdh) WINE_CONFIG_DLL(tdi.sys) WINE_CONFIG_DLL(toolhelp.dll16,enable_win16) WINE_CONFIG_DLL(traffic) diff --git a/dlls/tdh/Makefile.in b/dlls/tdh/Makefile.in new file mode 100644 index 0000000..0a4693f --- /dev/null +++ b/dlls/tdh/Makefile.in @@ -0,0 +1,4 @@ +MODULE = tdh.dll + +C_SRCS = \ + tdh_main.c diff --git a/dlls/tdh/tdh.spec b/dlls/tdh/tdh.spec new file mode 100644 index 0000000..8702802 --- /dev/null +++ b/dlls/tdh/tdh.spec @@ -0,0 +1,34 @@ +@ stub TdhAggregatePayloadFilters +@ stub TdhApplyPayloadFilter +@ stub TdhCleanupPayloadEventFilterDescriptor +@ stub TdhCloseDecodingHandle +@ stub TdhCreatePayloadFilter +@ stub TdhDeletePayloadFilter +@ stub TdhEnumerateManifestProviderEvents +@ stub TdhEnumerateProviderFieldInformation +@ stub TdhEnumerateProviderFilters +@ stub TdhEnumerateProviders +@ stub TdhEnumerateRemoteWBEMProviderFieldInformation +@ stub TdhEnumerateRemoteWBEMProviders +@ stub TdhFormatProperty +@ stub TdhGetAllEventsInformation +@ stub TdhGetDecodingParameter +@ stub TdhGetEventInformation +@ stub TdhGetEventMapInformation +@ stub TdhGetManifestEventInformation +@ stub TdhGetProperty +@ stub TdhGetPropertyOffsetAndSize +@ stub TdhGetPropertySize +@ stub TdhGetWppMessage +@ stub TdhGetWppProperty +@ stub TdhLoadManifest +@ stub TdhLoadManifestFromBinary +@ stub TdhOpenDecodingHandle +@ stub TdhQueryProviderFieldInformation +@ stub TdhQueryRemoteWBEMProviderFieldInformation +@ stub TdhSetDecodingParameter +@ stub TdhUnloadManifest +@ stub TdhValidatePayloadFilter +@ stub TdhpFindMatchClassFromWBEM +@ stub TdhpGetBestTraceEventInfoWBEM +@ stub TdhpGetEventMapInfoWBEM diff --git a/dlls/tdh/tdh_main.c b/dlls/tdh/tdh_main.c new file mode 100644 index 0000000..5e10487 --- /dev/null +++ b/dlls/tdh/tdh_main.c @@ -0,0 +1,43 @@ +/* + * Copyright 2017 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(tdh); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Alistair Leslie-Hughes : dplayx: Implement IDirectPlay4 EnumConnections.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 2ef274b6087feeefdeb2750bf119a58b50c64046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef274b6087feeefdeb2750bf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 8 05:37:40 2017 +0000 dplayx: Implement IDirectPlay4 EnumConnections. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 4a80f1c..fde0681 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4490,8 +4490,8 @@ static HRESULT WINAPI IDirectPlay4Impl_EnumConnections( IDirectPlay4 *iface, const GUID *application, LPDPENUMCONNECTIONSCALLBACK enumcb, void *context, DWORD flags ) { IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); - FIXME( "(%p)->(%p,%p,%p,0x%08x): stub\n", This, application, enumcb, context, flags ); - return DP_OK; + return IDirectPlayX_EnumConnections( &This->IDirectPlay4A_iface, application, enumcb, context, + flags ); } static HRESULT WINAPI IDirectPlay3AImpl_EnumGroupsInGroup( IDirectPlay3A *iface, DPID group,

1 0