July 2016 - Wine-commits - list.winehq.org

Piotr Caban : ntdll: Keep drive letter size in RtlGetFullPathName_U when full path is specified.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: f333bf47a8077ecf634163c8a67dc2502ca8295c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f333bf47a8077ecf634163c8a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 28 14:24:05 2016 +0200 ntdll: Keep drive letter size in RtlGetFullPathName_U when full path is specified. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 2 +- dlls/ntdll/tests/path.c | 9 +++++---- dlls/shell32/tests/shelllink.c | 2 +- programs/cmd/tests/test_builtins.cmd.exp | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ae0646a..ac4807f 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -625,7 +625,7 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) case ABSOLUTE_DRIVE_PATH: /* c:\foo */ reqsize = sizeof(WCHAR); - tmp[0] = toupperW(name[0]); + tmp[0] = name[0]; ins_str = tmp; dep = 1; mark = 3; diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index cc7259e..c19189d 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -265,7 +265,7 @@ static void test_RtlGetFullPathName_U(void) { "c:/test/ .... .. ", "c:\\test\\", NULL}, { "c:/test/..", "c:\\", NULL}, { "c:/test/.. ", "c:\\test\\", NULL}, - { "c:/TEST", "c:\\test", "test"}, + { "c:/TEST", "c:\\TEST", "TEST"}, { "c:/test/file", "c:\\test\\file", "file"}, { "c:/test./file", "c:\\test\\file", "file"}, { "c:/test.. /file", "c:\\test.. \\file","file"}, @@ -279,6 +279,7 @@ static void test_RtlGetFullPathName_U(void) { "c:///test\\..\\file\\..\\//", "c:\\", NULL}, { "c:/test../file", "c:\\test.\\file", "file", "c:\\test..\\file", "file"}, /* vista */ + { "c:\\test", "c:\\test", "test"}, { NULL, NULL, NULL} }; @@ -325,14 +326,14 @@ static void test_RtlGetFullPathName_U(void) "Wrong result %d/%d for \"%s\"\n", ret, len, test->path ); ok(pRtlUnicodeToMultiByteN(rbufferA,MAX_PATH,&reslen,rbufferW,(lstrlenW(rbufferW) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); - ok(!lstrcmpiA(rbufferA,test->rname) || (test->alt_rname && !lstrcmpiA(rbufferA,test->alt_rname)), + ok(!lstrcmpA(rbufferA,test->rname) || (test->alt_rname && !lstrcmpA(rbufferA,test->alt_rname)), "Got \"%s\" expected \"%s\"\n",rbufferA,test->rname); if (file_part) { ok(pRtlUnicodeToMultiByteN(rfileA,MAX_PATH,&reslen,file_part,(lstrlenW(file_part) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); - ok((test->rfile && !lstrcmpiA(rfileA,test->rfile)) || - (test->alt_rfile && !lstrcmpiA(rfileA,test->alt_rfile)), + ok((test->rfile && !lstrcmpA(rfileA,test->rfile)) || + (test->alt_rfile && !lstrcmpA(rfileA,test->alt_rfile)), "Got \"%s\" expected \"%s\"\n",rfileA,test->rfile); } else diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index f7c091e..8af3c97 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -248,7 +248,7 @@ static void test_get_set(void) strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); ok(r==S_OK, "GetPath failed (0x%08x)\n", r); - ok(!strcmp(buffer, "C:\\nonexistent\\file") || + todo_wine ok(!strcmp(buffer, "C:\\nonexistent\\file") || broken(!strcmp(buffer, "C:\\\"c:\\nonexistent\\file\"")), /* NT4 */ "case doesn't match\n"); diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 82b13f7..67e75e0 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -980,7 +980,7 @@ a d a C r foo bar baz -(a)todo_wine@c:\ +c:\ ------ skip option c no output

1 0

Michael Stefaniuc : comctl32: Avoid using memset on RECTs.
by Alexandre Julliard 29 Jul '16

29 Jul '16

Module: wine Branch: master Commit: 2ea72e87174f6db962ab079e37b8269a72952477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea72e87174f6db962ab079e3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 15:39:57 2016 +0200 comctl32: Avoid using memset on RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 4 ++-- dlls/comctl32/tab.c | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 738c33b..08ca158 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -127,8 +127,8 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) * textHeight pixels large */ HDC hdc = GetDC(infoPtr->Self); RECT r; - memset (&r, 0, sizeof (r)); - r.bottom = max(infoPtr->minHeight, tm.tmHeight); + + SetRect(&r, 0, 0, 0, max(infoPtr->minHeight, tm.tmHeight)); if (SUCCEEDED(GetThemeBackgroundExtent(theme, hdc, SP_PANE, 0, &r, &r))) { height = r.bottom - r.top; diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 0ed9152..f8a5493 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -371,14 +371,8 @@ static BOOL TAB_InternalGetItemRect( (itemIndex < infoPtr->leftmostVisible))) { TRACE("Not Visible\n"); - /* need to initialize these to empty rects */ - if (itemRect) - { - memset(itemRect,0,sizeof(RECT)); - itemRect->bottom = infoPtr->tabHeight; - } - if (selectedRect) - memset(selectedRect,0,sizeof(RECT)); + SetRect(itemRect, 0, 0, 0, infoPtr->tabHeight); + SetRectEmpty(selectedRect); return FALSE; }

1 0

Henri Verbeet : wined3d: Unify the query get_data() implementations.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 70889d68664c1211caf5a845014953dfee66c8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70889d68664c1211caf5a8450… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 13:29:41 2016 +0200 wined3d: Unify the query get_data() implementations. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 215 +++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 6 +- 2 files changed, 85 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70889d68664c1211caf5a…

1 0

Henri Verbeet : wined3d: Unify the query issue() implementations.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 92e9f4401d9385d6315f70024e9021756de4a6f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e9f4401d9385d6315f70024… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 13:29:42 2016 +0200 wined3d: Unify the query issue() implementations. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 42 ++++++++++++------------------------------ dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index c6d3633..55e63e9 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -350,7 +350,14 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) { TRACE("query %p, flags %#x.\n", query, flags); - return query->query_ops->query_issue(query, flags); + query->query_ops->query_issue(query, flags); + + if (flags & WINED3DISSUE_BEGIN) + query->state = QUERY_BUILDING; + else + query->state = QUERY_SIGNALLED; + + return WINED3D_OK; } static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query) @@ -434,7 +441,7 @@ enum wined3d_query_type CDECL wined3d_query_get_type(const struct wined3d_query return query->type; } -static HRESULT wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD flags) { TRACE("query %p, flags %#x.\n", query, flags); @@ -449,16 +456,9 @@ static HRESULT wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD /* Started implicitly at query creation. */ ERR("Event query issued with START flag - what to do?\n"); } - - if (flags & WINED3DISSUE_BEGIN) - query->state = QUERY_BUILDING; - else - query->state = QUERY_SIGNALLED; - - return WINED3D_OK; } -static HRESULT wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD flags) { struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); struct wined3d_device *device = query->device; @@ -524,13 +524,6 @@ static HRESULT wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DW } } } - - if (flags & WINED3DISSUE_BEGIN) - query->state = QUERY_BUILDING; - else - query->state = QUERY_SIGNALLED; - - return WINED3D_OK; /* can be WINED3DERR_INVALIDCALL. */ } static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query) @@ -571,7 +564,7 @@ static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query) return available; } -static HRESULT wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags) { struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query); struct wined3d_device *device = query->device; @@ -593,11 +586,7 @@ static HRESULT wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DW GL_EXTCALL(glQueryCounter(tq->id, GL_TIMESTAMP)); checkGLcall("glQueryCounter()"); context_release(context); - - query->state = QUERY_SIGNALLED; } - - return WINED3D_OK; } static BOOL wined3d_timestamp_disjoint_query_ops_poll(struct wined3d_query *query) @@ -607,16 +596,9 @@ static BOOL wined3d_timestamp_disjoint_query_ops_poll(struct wined3d_query *quer return TRUE; } -static HRESULT wined3d_timestamp_disjoint_query_ops_issue(struct wined3d_query *query, DWORD flags) +static void wined3d_timestamp_disjoint_query_ops_issue(struct wined3d_query *query, DWORD flags) { TRACE("query %p, flags %#x.\n", query, flags); - - if (flags & WINED3DISSUE_BEGIN) - query->state = QUERY_BUILDING; - if (flags & WINED3DISSUE_END) - query->state = QUERY_SIGNALLED; - - return WINED3D_OK; } static const struct wined3d_query_ops event_query_ops = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c9e5d5c..b3acbbd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1380,7 +1380,7 @@ enum wined3d_query_state struct wined3d_query_ops { BOOL (*query_poll)(struct wined3d_query *query); - HRESULT (*query_issue)(struct wined3d_query *query, DWORD flags); + void (*query_issue)(struct wined3d_query *query, DWORD flags); }; struct wined3d_query

1 0

Nikolay Sivov : comdlg32/itemdlg: Fix setting NULL file name (Coverity).
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 384ece4d7ee45515a3b1185d266c0c807791cab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=384ece4d7ee45515a3b1185d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 28 15:18:33 2016 +0300 comdlg32/itemdlg: Fix setting NULL file name (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 12 ++++-------- dlls/comdlg32/tests/itemdlg.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 43261f4..8c2b9bc 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -384,14 +384,12 @@ static UINT get_file_name(FileDialogImpl *This, LPWSTR *str) static BOOL set_file_name(FileDialogImpl *This, LPCWSTR str) { - HWND hwnd_edit = GetDlgItem(This->dlg_hwnd, IDC_FILENAME); - if(This->set_filename) LocalFree(This->set_filename); - This->set_filename = StrDupW(str); + This->set_filename = str ? StrDupW(str) : NULL; - return SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str); + return SetDlgItemTextW(This->dlg_hwnd, IDC_FILENAME, This->set_filename); } static void fill_filename_from_selection(FileDialogImpl *This) @@ -2608,10 +2606,8 @@ static HRESULT WINAPI IFileDialog2_fnGetFileName(IFileDialog2 *iface, LPWSTR *ps return E_INVALIDARG; *pszName = NULL; - if(get_file_name(This, pszName)) - return S_OK; - else - return E_FAIL; + get_file_name(This, pszName); + return *pszName ? S_OK : E_FAIL; } static HRESULT WINAPI IFileDialog2_fnSetTitle(IFileDialog2 *iface, LPCWSTR pszTitle) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index b4fb480..d28e682 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -797,6 +797,21 @@ static void test_basics(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileOpenDialog_SetFileName(pfod, null); ok(hr == S_OK, "got 0x%08x\n", hr); + + filename = NULL; + hr = IFileOpenDialog_GetFileName(pfod, &filename); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!lstrcmpW(filename, null), "Strings do not match.\n"); + CoTaskMemFree(filename); + + hr = IFileOpenDialog_SetFileName(pfod, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + filename = (void*)0xdeadbeef; + hr = IFileOpenDialog_GetFileName(pfod, &filename); + ok(hr == E_FAIL, "Got 0x%08x\n", hr); + ok(filename == NULL, "got %p.\n", filename); + hr = IFileOpenDialog_SetFileName(pfod, txt); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileOpenDialog_GetFileName(pfod, &filename);

1 0

Andrey Gusev : xinput: Fix XInputGetBatteryInformation spec file entry.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: b271a1acfa90d496ba5d764382ff83a2447e3350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b271a1acfa90d496ba5d76438… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jul 28 16:15:22 2016 +0300 xinput: Fix XInputGetBatteryInformation spec file entry. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/xinput1_3.spec | 2 +- dlls/xinput1_4/xinput1_4.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec index af4f1e0..67805d1 100644 --- a/dlls/xinput1_3/xinput1_3.spec +++ b/dlls/xinput1_3/xinput1_3.spec @@ -4,5 +4,5 @@ 4 stdcall XInputGetCapabilities(long long ptr) 5 stdcall XInputEnable(long) 6 stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) -7 stdcall XInputGetBatteryInformation(long ptr ptr) +7 stdcall XInputGetBatteryInformation(long long ptr) 8 stdcall XInputGetKeystroke(long long ptr) diff --git a/dlls/xinput1_4/xinput1_4.spec b/dlls/xinput1_4/xinput1_4.spec index 9d08286..25a79a0 100644 --- a/dlls/xinput1_4/xinput1_4.spec +++ b/dlls/xinput1_4/xinput1_4.spec @@ -4,6 +4,6 @@ 4 stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities 5 stdcall XInputEnable(long) xinput1_3.XInputEnable 6 stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids -7 stdcall XInputGetBatteryInformation(long ptr ptr) xinput1_3.XInputGetBatteryInformation +7 stdcall XInputGetBatteryInformation(long long ptr) xinput1_3.XInputGetBatteryInformation 8 stdcall XInputGetKeystroke(long long ptr) xinput1_3.XInputGetKeystroke 10 stub XInputGetAudioDeviceIds(long ptr ptr ptr ptr)

1 0

Nikolay Sivov : strmbase: Fully cleanup on initialization failure ( Coverity).
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 0c823e83690804923b19c4f36096fbf62d0e3bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c823e83690804923b19c4f36… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 28 15:43:21 2016 +0300 strmbase: Fully cleanup on initialization failure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index d100cc9..63b9ec2 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -111,11 +111,11 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e IEnumMediaTypesImpl * pEnumMediaTypes = CoTaskMemAlloc(sizeof(IEnumMediaTypesImpl)); AM_MEDIA_TYPE amt; + *ppEnum = NULL; + if (!pEnumMediaTypes) - { - *ppEnum = NULL; return E_OUTOFMEMORY; - } + pEnumMediaTypes->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypesImpl_Vtbl; pEnumMediaTypes->refCount = 1; pEnumMediaTypes->uIndex = 0; @@ -129,14 +129,13 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e pEnumMediaTypes->enumMediaDetails.cMediaTypes = i; pEnumMediaTypes->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i); + memset(pEnumMediaTypes->enumMediaDetails.pMediaTypes, 0, sizeof(AM_MEDIA_TYPE) * i); for (i = 0; i < pEnumMediaTypes->enumMediaDetails.cMediaTypes; i++) { enumFunc(basePin,i,&amt); if (FAILED(CopyMediaType(&pEnumMediaTypes->enumMediaDetails.pMediaTypes[i], &amt))) { - while (i--) - FreeMediaType(&pEnumMediaTypes->enumMediaDetails.pMediaTypes[i]); - CoTaskMemFree(pEnumMediaTypes->enumMediaDetails.pMediaTypes); + IEnumMediaTypes_Release(&pEnumMediaTypes->IEnumMediaTypes_iface); return E_OUTOFMEMORY; } }

1 0

Akihiro Sagawa : imm32/tests: Add ImmDisableIME tests.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: 77da0b8b4f26376b3f6b44f6d2993f96e3167851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77da0b8b4f26376b3f6b44f6d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 28 21:33:31 2016 +0900 imm32/tests: Add ImmDisableIME tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index c7ae168..e0a0b33 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -173,7 +173,7 @@ static void msg_spy_cleanup(void) { */ static const char wndcls[] = "winetest_imm32_wndcls"; static enum { PHASE_UNKNOWN, FIRST_WINDOW, SECOND_WINDOW, - CREATE_CANCEL, NCCREATE_CANCEL } test_phase; + CREATE_CANCEL, NCCREATE_CANCEL, IME_DISABLED } test_phase; static HWND hwnd; static HWND get_ime_window(void); @@ -189,6 +189,7 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) default_ime_wnd = get_ime_window(); switch(test_phase) { case FIRST_WINDOW: + case IME_DISABLED: ok(!default_ime_wnd, "expected no IME windows\n"); break; case SECOND_WINDOW: @@ -209,6 +210,9 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) todo_wine_if(test_phase == FIRST_WINDOW || test_phase == CREATE_CANCEL) ok(default_ime_wnd != NULL, "expected IME window existence\n"); break; + case IME_DISABLED: + ok(!default_ime_wnd, "expected no IME windows\n"); + break; default: break; /* do nothing */ } @@ -222,6 +226,9 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) todo_wine_if(test_phase == FIRST_WINDOW || test_phase == CREATE_CANCEL) ok(default_ime_wnd != NULL, "expected IME window existence\n"); break; + case IME_DISABLED: + ok(!default_ime_wnd, "expected no IME windows\n"); + break; default: break; /* do nothing */ } @@ -1002,6 +1009,23 @@ static DWORD WINAPI test_default_ime_window_cancel_cb(void *arg) return 1; } +static DWORD WINAPI test_default_ime_disabled_cb(void *arg) +{ + HWND hWnd, default_ime_wnd; + + ok(!get_ime_window(), "Expected no IME windows\n"); + ImmDisableIME(GetCurrentThreadId()); + test_phase = IME_DISABLED; + hWnd = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + default_ime_wnd = ImmGetDefaultIMEWnd(hWnd); + todo_wine ok(!default_ime_wnd, "Expected no IME windows\n"); + DestroyWindow(hWnd); + return 1; +} + static void test_default_ime_window_creation(void) { HANDLE thread; @@ -1038,6 +1062,10 @@ static void test_default_ime_window_creation(void) } } + thread = CreateThread(NULL, 0, test_default_ime_disabled_cb, NULL, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + test_phase = PHASE_UNKNOWN; }

1 0

Akihiro Sagawa : imm32: Implement ImmDisableIME.
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: ba2e025b94fa3705d439803a545129c32e8818af URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba2e025b94fa3705d439803a5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 28 21:33:33 2016 +0900 imm32: Implement ImmDisableIME. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 36 ++++++++++++++++++++++++++++++------ dlls/imm32/tests/imm32.c | 2 +- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3c805dc..d9c9782 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -95,6 +95,7 @@ typedef struct _tagIMMThreadData { DWORD threadID; HIMC defaultContext; HWND hwndDefault; + BOOL disableIME; } IMMThreadData; static struct list ImmHklList = LIST_INIT(ImmHklList); @@ -116,6 +117,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = 0, 0, { (DWORD_PTR)(__FILE__ ": threaddata_cs") } }; static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static BOOL disable_ime; #define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) #define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) @@ -225,17 +227,26 @@ static DWORD convert_candidatelist_AtoW( return ret; } -static IMMThreadData *IMM_GetThreadData(HWND hwnd) +static IMMThreadData *IMM_GetThreadData(HWND hwnd, DWORD thread) { IMMThreadData *data; - DWORD process, thread; + DWORD process; if (hwnd) { if (!(thread = GetWindowThreadProcessId(hwnd, &process))) return NULL; if (process != GetCurrentProcessId()) return NULL; } - else thread = GetCurrentThreadId(); + else if (thread) + { + HANDLE h = OpenThread(THREAD_QUERY_INFORMATION, FALSE, thread); + if (!h) return NULL; + process = GetProcessIdOfThread(h); + CloseHandle(h); + if (process != GetCurrentProcessId()) return NULL; + } + else + thread = GetCurrentThreadId(); EnterCriticalSection(&threaddata_cs); LIST_FOR_EACH_ENTRY(data, &ImmThreadDataList, IMMThreadData, entry) @@ -492,7 +503,7 @@ static InputContextData* get_imc_data(HIMC hIMC) static HIMC get_default_context( HWND hwnd ) { HIMC ret; - IMMThreadData* thread_data = IMM_GetThreadData( hwnd ); + IMMThreadData* thread_data = IMM_GetThreadData( hwnd, 0 ); if (!thread_data) return 0; @@ -822,7 +833,14 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) */ BOOL WINAPI ImmDisableIME(DWORD idThread) { - FIXME("(%d): stub\n", idThread); + if (idThread == (DWORD)-1) + disable_ime = TRUE; + else { + IMMThreadData *thread_data = IMM_GetThreadData(NULL, idThread); + if (!thread_data) return FALSE; + thread_data->disableIME = TRUE; + LeaveCriticalSection(&threaddata_cs); + } return TRUE; } @@ -1606,11 +1624,17 @@ BOOL WINAPI ImmGetConversionStatus( HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { HWND ret, new = NULL; - IMMThreadData* thread_data = IMM_GetThreadData(hWnd); + IMMThreadData* thread_data = IMM_GetThreadData(hWnd, 0); if (!thread_data) return NULL; if (thread_data->hwndDefault == NULL && thread_data->threadID == GetCurrentThreadId()) { + if (thread_data->disableIME || disable_ime) + { + TRACE("IME for this thread is disabled\n"); + LeaveCriticalSection(&threaddata_cs); + return NULL; + } /* Do not create the window inside of a critical section */ LeaveCriticalSection(&threaddata_cs); new = CreateWindowExW( WS_EX_TOOLWINDOW, diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index e0a0b33..f0f32a7 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1021,7 +1021,7 @@ static DWORD WINAPI test_default_ime_disabled_cb(void *arg) CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); default_ime_wnd = ImmGetDefaultIMEWnd(hWnd); - todo_wine ok(!default_ime_wnd, "Expected no IME windows\n"); + ok(!default_ime_wnd, "Expected no IME windows\n"); DestroyWindow(hWnd); return 1; }

1 0

Huw Davies : gdi32: Pass a DC pointer to get_mono_dc_colors().
by Alexandre Julliard 28 Jul '16

28 Jul '16

Module: wine Branch: master Commit: cf386b8b6442d41074d78c1fe5fe8920e070490e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf386b8b6442d41074d78c1fe… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 28 10:49:46 2016 +0100 gdi32: Pass a DC pointer to get_mono_dc_colors(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 12 ++++++------ dlls/gdi32/dib.c | 2 +- dlls/gdi32/dibdrv/bitblt.c | 3 ++- dlls/gdi32/gdi_private.h | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 7e9a096..2506c02 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -222,10 +222,10 @@ static DWORD blend_bits( const BITMAPINFO *src_info, const struct gdi_image_bits } /* helper to retrieve either both colors or only the background color for monochrome blits */ -void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) +void get_mono_dc_colors( DC *dc, BITMAPINFO *info, int count ) { RGBQUAD *colors = info->bmiColors; - COLORREF color = GetBkColor( hdc ); + COLORREF color = dc->backgroundColor; colors[count - 1].rgbRed = GetRValue( color ); colors[count - 1].rgbGreen = GetGValue( color ); @@ -234,7 +234,7 @@ void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) if (count > 1) { - color = GetTextColor( hdc ); + color = dc->textColor; colors[0].rgbRed = GetRValue( color ); colors[0].rgbGreen = GetGValue( color ); colors[0].rgbBlue = GetBValue( color ); @@ -275,7 +275,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, /* 1-bpp source without a color table uses the destination DC colors */ if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) - get_mono_dc_colors( dst_dev->hdc, src_info, 2 ); + get_mono_dc_colors( dc_dst, src_info, 2 ); if (dst_info->bmiHeader.biBitCount == 1 && !dst_colors) { @@ -283,9 +283,9 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, * that contains only the background color; except with a 1-bpp source, * in which case it uses the source colors */ if (src_info->bmiHeader.biBitCount > 1) - get_mono_dc_colors( src_dev->hdc, dst_info, 1 ); + get_mono_dc_colors( dc_src, dst_info, 1 ); else - get_mono_dc_colors( src_dev->hdc, dst_info, 2 ); + get_mono_dc_colors( dc_src, dst_info, 2 ); } if (!(err = convert_bits( src_info, src, dst_info, &bits ))) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 9a1414e..c47729d 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -581,7 +581,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he if (dst_info->bmiHeader.biBitCount == 1 && !dst_colors) { if (src_info->bmiHeader.biBitCount > 1) - get_mono_dc_colors( dev->hdc, dst_info, 1 ); + get_mono_dc_colors( dc, dst_info, 1 ); else { memcpy( dst_info->bmiColors, src_info->bmiColors, 2 * sizeof(dst_info->bmiColors[0]) ); diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 41311fa..d865ffb 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -985,6 +985,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, const struct gdi_image_bits *bits, struct bitblt_coords *src, struct bitblt_coords *dst, DWORD rop ) { + DC *dc = get_physdev_dc( dev ); struct clipped_rects clipped_rects; DWORD ret = ERROR_SUCCESS; dib_info src_dib; @@ -1000,7 +1001,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, /* For mask_rect, 1-bpp source without a color table uses the destination DC colors */ if (info->bmiHeader.biBitCount == 1 && pdev->dib.bit_count != 1 && !info->bmiHeader.biClrUsed) - get_mono_dc_colors( dev->hdc, info, 2 ); + get_mono_dc_colors( dc, info, 2 ); init_dib_info_from_bitmapinfo( &src_dib, info, bits->ptr ); src_dib.bits.is_copy = bits->is_copy; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a837215..de8db4c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -199,7 +199,7 @@ extern BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_c extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, BITMAPINFO *dst_info, struct bitblt_coords *dst, struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; -extern void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) DECLSPEC_HIDDEN; +extern void get_mono_dc_colors( DC *dc, BITMAPINFO *info, int count ) DECLSPEC_HIDDEN; /* brush.c */ extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN;

1 0