January 2014 - Wine-commits

Dmitry Timoshkov : include: Redefine security privilege names without using TEXT macro.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 81991c093e80806df70fed2009ecedecd709e15a URL: http://source.winehq.org/git/wine.git/?a=commit;h=81991c093e80806df70fed200… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:50 2013 +0900 include: Redefine security privilege names without using TEXT macro. (cherry picked from commit ebc7dcc630723c09e8f2f73f4364504025343907) --- include/winnt.h | 152 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 123 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81991c093e80806df70fe…

1 0

Alexandre Julliard : winemac: Only register the IME class when needed.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: ee573a246db74a6d464d9a14637b96ec1d6c1966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee573a246db74a6d464d9a146… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 11:31:10 2013 +0200 winemac: Only register the IME class when needed. (cherry picked from commit 5435dad997cee166f47ca7681b61b4472841bab5) --- dlls/winemac.drv/ime.c | 1 + dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 7 ++++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index bed094d..8279148 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -566,6 +566,7 @@ static void UpdateDataInDefaultIMEWindow(HIMC hIMC, HWND hwnd, BOOL showable) BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) { TRACE("\n"); + IME_RegisterClasses( macdrv_module ); lpIMEInfo->dwPrivateDataSize = sizeof(IMEPRIVATE); lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 0c35ce1..98aa600 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -38,6 +38,7 @@ extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; extern BOOL allow_vsync DECLSPEC_HIDDEN; extern BOOL allow_set_gamma DECLSPEC_HIDDEN; +extern HMODULE macdrv_module DECLSPEC_HIDDEN; extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index d27ce94..0f4b056 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -52,6 +52,7 @@ BOOL allow_vsync = TRUE; BOOL allow_set_gamma = TRUE; int left_option_is_alt = 0; int right_option_is_alt = 0; +HMODULE macdrv_module = 0; /************************************************************************** @@ -183,7 +184,7 @@ static void setup_options(void) /*********************************************************************** * process_attach */ -static BOOL process_attach( HINSTANCE instance ) +static BOOL process_attach(void) { SessionAttributeBits attributes; OSStatus status; @@ -205,7 +206,6 @@ static BOOL process_attach( HINSTANCE instance ) set_app_icon(); macdrv_clipboard_process_attach(); - IME_RegisterClasses( instance ); return TRUE; } @@ -299,7 +299,8 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) switch(reason) { case DLL_PROCESS_ATTACH: - ret = process_attach( hinst ); + macdrv_module = hinst; + ret = process_attach(); break; case DLL_THREAD_DETACH: thread_detach();

1 0

Ken Thomases : winemac: Disable software GL rendering unless it' s enabled via a new registry setting, AllowSoftwareRendering.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: dd4fe90edd73e49b9d356368641ad53d3228d925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd4fe90edd73e49b9d3563686… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 21 16:37:05 2013 -0500 winemac: Disable software GL rendering unless it's enabled via a new registry setting, AllowSoftwareRendering. (cherry picked from commit 742c48b3489a21dd373221aa10bb648dd02c86d8) --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++++ dlls/winemac.drv/opengl.c | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 98aa600..992a7cd 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -38,6 +38,7 @@ extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; extern BOOL allow_vsync DECLSPEC_HIDDEN; extern BOOL allow_set_gamma DECLSPEC_HIDDEN; +extern BOOL allow_software_rendering DECLSPEC_HIDDEN; extern HMODULE macdrv_module DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 0f4b056..c44a267 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -52,6 +52,7 @@ BOOL allow_vsync = TRUE; BOOL allow_set_gamma = TRUE; int left_option_is_alt = 0; int right_option_is_alt = 0; +BOOL allow_software_rendering = FALSE; HMODULE macdrv_module = 0; @@ -176,6 +177,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "RightOptionIsAlt", buffer, sizeof(buffer))) right_option_is_alt = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "AllowSoftwareRendering", buffer, sizeof(buffer))) + allow_software_rendering = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ee9d254..f090821 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -618,6 +618,11 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA attribs[n++] = kCGLPFAAccelerated; attribs[n++] = kCGLPFANoRecovery; } + else if (!allow_software_rendering) + { + TRACE("ignoring software renderer because AllowSoftwareRendering is off\n"); + return; + } n_stack[++n_stack_idx] = n; for (double_buffer = 0; double_buffer <= 1; double_buffer++)

1 0

Ken Thomases : winemac: Send WM_CANCELMODE when keyboard layout changes from Cocoa side.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 58f2168742191ed3fea4beeee0c5936fe3bfc634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f2168742191ed3fea4beeee… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 23 20:13:10 2013 -0500 winemac: Send WM_CANCELMODE when keyboard layout changes from Cocoa side. The standard keyboard shortcut for switching the keyboard layout is Command- Space, but the Mac driver never sees the Space key press. So, Wine only sees a press and release of Alt, which puts focus on the menu bar. This prevents that focus change. (cherry picked from commit 35f0cf26b0225f31d662c834d55997a7a4bf3c59) --- dlls/winemac.drv/keyboard.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index cc25789..206ee8d 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -843,6 +843,8 @@ void macdrv_keyboard_changed(const macdrv_event *event) thread_data->dead_key_state = 0; macdrv_compute_keyboard_layout(thread_data); + + SendMessageW(GetActiveWindow(), WM_CANCELMODE, 0, 0); }

1 0

Daniel Lehman : kernel32: Don't use depth in RtlInterlockedFlushSList.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: cae03c156dd654beb13aaa0535c84e7cb78a7dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae03c156dd654beb13aaa053… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 22 22:47:26 2013 -0700 kernel32: Don't use depth in RtlInterlockedFlushSList. Depth wraps around at 65536 but list supports more elements. (cherry picked from commit 0669a8aca2dec4eaf6632e368832a8aec1c48ffd) --- dlls/ntdll/rtl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index bbcd454..0bad4a0 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1080,7 +1080,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER list) SLIST_HEADER old, new; #ifdef _WIN64 - if (!list->Header16.Depth) return NULL; + if (!list->Header16.NextEntry) return NULL; new.s.Alignment = new.s.Region = 0; new.Header16.HeaderType = 1; /* we use the 16-byte header */ do @@ -1090,7 +1090,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER list) } while (!interlocked_cmpxchg128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); return (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); #else - if (!list->s.Depth) return NULL; + if (!list->s.Next.Next) return NULL; new.Alignment = 0; do {

1 0

Vincent Povirk : xinput1_3: Make XInputGetState patchable.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 15da8cc6f9b2e0cfa178e3729eb66abf68f4e497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15da8cc6f9b2e0cfa178e3729… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 25 16:18:24 2013 -0500 xinput1_3: Make XInputGetState patchable. (cherry picked from commit b29c2b050defc9137f88d5927edb5675c8f4a5f5) --- dlls/xinput1_3/xinput1_3_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index a2a83dd..63f725b 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -65,7 +65,7 @@ DWORD WINAPI XInputSetState(DWORD dwUserIndex, XINPUT_VIBRATION* pVibration) return ERROR_BAD_ARGUMENTS; } -DWORD WINAPI XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) { static int warn_once;

1 0

Piotr Caban : comctl32: Fix a typo in UPDOWN_OffsetVal that breaks UDS_WRAP flag support.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 33134b39457f5eca261c4389ebf1daeacee3402f URL: http://source.winehq.org/git/wine.git/?a=commit;h=33134b39457f5eca261c4389e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 28 09:56:18 2013 +0100 comctl32: Fix a typo in UPDOWN_OffsetVal that breaks UDS_WRAP flag support. (cherry picked from commit 22a132938229e9fcb33a905787318a96bee4c33c) --- dlls/comctl32/updown.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 0761774..23a633e 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -150,7 +150,7 @@ static BOOL UPDOWN_OffsetVal(UPDOWN_INFO *infoPtr, int delta) (infoPtr->MaxVal < infoPtr->MinVal ? -1 : 1) * (infoPtr->MinVal - infoPtr->MaxVal) + (delta < 0 ? 1 : -1); - } if ((infoPtr->MaxVal > infoPtr->MinVal && infoPtr->CurVal+delta > infoPtr->MaxVal) + } else if ((infoPtr->MaxVal > infoPtr->MinVal && infoPtr->CurVal+delta > infoPtr->MaxVal) || (infoPtr->MaxVal < infoPtr->MinVal && infoPtr->CurVal+delta < infoPtr->MaxVal)) { delta = infoPtr->MaxVal - infoPtr->CurVal; } else {

1 0

Alexandre Julliard : wmc: Don't put timestamps in generated files.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 4665c33a77abdf3bf0f82470581afa94cc75b42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4665c33a77abdf3bf0f824705… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 28 14:18:37 2013 +0100 wmc: Don't put timestamps in generated files. (cherry picked from commit f775f3e105f3c923368114aa839140d173f1f4d0) --- tools/wmc/wmc.c | 2 -- tools/wmc/wmc.h | 3 --- tools/wmc/write.c | 17 +++++------------ 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index a08d733..9d34a40 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -174,8 +174,6 @@ int main(int argc,char *argv[]) signal( SIGHUP, exit_on_signal ); #endif - now = time(NULL); - /* First rebuild the commandline to put in destination */ /* Could be done through env[], but not all OS-es support it */ cmdlen = 5; /* for "wmc " and \0 */ diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index cf6d430..9ef9ac7 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -21,8 +21,6 @@ #ifndef __WMC_WMC_H #define __WMC_WMC_H -#include <time.h> /* For time_t */ - #include "wmctypes.h" /* @@ -51,7 +49,6 @@ extern char *output_name; extern char *input_name; extern char *header_name; extern char *cmdline; -extern time_t now; extern int line_number; extern int char_number; diff --git a/tools/wmc/write.c b/tools/wmc/write.c index cf170d4..19cd5b3 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -91,7 +91,6 @@ static const char str_header[] = "/* This file is generated with wmc version " PACKAGE_VERSION ". Do not edit! */\n" "/* Source : %s */\n" "/* Cmdline: %s */\n" - "/* Date : %s */\n" "\n" ; @@ -178,11 +177,9 @@ void write_h_file(const char *fname) perror(fname); exit(1); } - cptr = ctime(&now); - killnl(cptr, 0); - fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline, cptr); - fprintf(fp, "#ifndef __WMCGENERATED_%08lx_H\n", (long)now); - fprintf(fp, "#define __WMCGENERATED_%08lx_H\n", (long)now); + fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline); + fprintf(fp, "#ifndef __WMCGENERATED_H\n"); + fprintf(fp, "#define __WMCGENERATED_H\n"); fprintf(fp, "\n"); /* Write severity and facility aliases */ @@ -501,18 +498,14 @@ static void write_rcinline(FILE *fp) void write_rc_file(const char *fname) { - FILE *fp; - char *cptr; + FILE *fp = fopen(fname, "w"); - fp = fopen(fname, "w"); if(!fp) { perror(fname); exit(1); } - cptr = ctime(&now); - killnl(cptr, 0); - fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline, cptr); + fprintf(fp, str_header, input_name ? input_name : "<stdin>", cmdline); if(rcinline) write_rcinline(fp);

1 0

Nikolay Sivov : wshom.ocx: Silence failure to query IDispatchEx from IWshShell3.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: d313a000354629ea57513cb6d95d7ffae0b0835d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d313a000354629ea57513cb6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 27 12:27:45 2013 +0400 wshom.ocx: Silence failure to query IDispatchEx from IWshShell3. (cherry picked from commit f3c805be67df81713bd7b6130d03dace50688a49) --- dlls/wshom.ocx/shell.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index bc6a839..17d0306 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -21,6 +21,7 @@ #include "shellapi.h" #include "shlobj.h" +#include "dispex.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -576,14 +577,21 @@ static HRESULT WINAPI WshShell3_QueryInterface(IWshShell3 *iface, REFIID riid, v { TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + *ppv = NULL; + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch) || IsEqualGUID(riid, &IID_IWshShell3)) { *ppv = iface; - }else { + } + else if (IsEqualGUID(riid, &IID_IDispatchEx)) + { + return E_NOINTERFACE; + } + else + { FIXME("Unknown iface %s\n", debugstr_guid(riid)); - *ppv = NULL; return E_NOINTERFACE; }

1 0

Nikolay Sivov : wshom.ocx: Implement IWshShell3::ExpandEnvironmentStrings( ).
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 73ab03c3a2f9b4bef109f2dca3b1b570a470a394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73ab03c3a2f9b4bef109f2dca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 27 12:28:06 2013 +0400 wshom.ocx: Implement IWshShell3::ExpandEnvironmentStrings(). (cherry picked from commit 71ecb55661a8cf14a0e19b94749f1d8957c9ab16) --- dlls/wshom.ocx/shell.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 17d0306..385d2a3 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -745,10 +745,26 @@ static HRESULT WINAPI WshShell3_CreateShortcut(IWshShell3 *iface, BSTR PathLink, return WshShortcut_Create(PathLink, Shortcut); } -static HRESULT WINAPI WshShell3_ExpandEnvironmentStrings(IWshShell3 *iface, BSTR Src, BSTR* out_Dst) +static HRESULT WINAPI WshShell3_ExpandEnvironmentStrings(IWshShell3 *iface, BSTR Src, BSTR* Dst) { - FIXME("(%s %p): stub\n", debugstr_w(Src), out_Dst); - return E_NOTIMPL; + DWORD ret; + + TRACE("(%s %p)\n", debugstr_w(Src), Dst); + + if (!Src || !Dst) return E_POINTER; + + ret = ExpandEnvironmentStringsW(Src, NULL, 0); + *Dst = SysAllocStringLen(NULL, ret); + if (!*Dst) return E_OUTOFMEMORY; + + if (ExpandEnvironmentStringsW(Src, *Dst, ret)) + return S_OK; + else + { + SysFreeString(*Dst); + *Dst = NULL; + return HRESULT_FROM_WIN32(GetLastError()); + } } static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR Name, VARIANT* out_Value)

1 0