February 2015 - Wine-Commits

Michael Müller : gdi32: Fix arguments for OSMesaMakeCurrent when using 16 bit formats.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: e618ab65ed5b623785c58ea5ece6e39895d43063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e618ab65ed5b623785c58ea5e… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 3 11:07:38 2015 +0100 gdi32: Fix arguments for OSMesaMakeCurrent when using 16 bit formats. --- dlls/gdi32/dibdrv/opengl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 28a03f4..a25da208 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -251,6 +251,7 @@ static BOOL dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context ) HBITMAP bitmap; BITMAPOBJ *bmp; dib_info dib; + GLenum type; BOOL ret = FALSE; if (!context) @@ -281,7 +282,12 @@ static BOOL dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context ) TRACE( "context %p bits %p size %ux%u\n", context, bits, width, height ); - ret = pOSMesaMakeCurrent( context->context, bits, GL_UNSIGNED_BYTE, width, height ); + if (pixel_formats[context->format - 1].mesa == OSMESA_RGB_565) + type = GL_UNSIGNED_SHORT_5_6_5; + else + type = GL_UNSIGNED_BYTE; + + ret = pOSMesaMakeCurrent( context->context, bits, type, width, height ); if (ret) { pOSMesaPixelStore( OSMESA_ROW_LENGTH, abs( dib.stride ) * 8 / dib.bit_count );

1 0

Henri Verbeet : d3d10core: Implement d3d10_vertex_shader_SetPrivateData().
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: fe06bb149261ab4e4693c72e024dba447ec6c5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe06bb149261ab4e4693c72e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 10:11:31 2015 +0100 d3d10core: Implement d3d10_vertex_shader_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/shader.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index e03a5cb..dfd6149 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -200,6 +200,7 @@ struct d3d10_vertex_shader ID3D10VertexShader ID3D10VertexShader_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; ID3D10Device1 *device; }; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 1000054..31896e3 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -209,10 +209,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10Vertex static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10VertexShader *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateDataInterface(ID3D10VertexShader *iface, @@ -238,6 +240,9 @@ static const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl = static void STDMETHODCALLTYPE d3d10_vertex_shader_wined3d_object_destroyed(void *parent) { + struct d3d10_vertex_shader *shader = parent; + + wined3d_private_store_cleanup(&shader->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -257,12 +262,14 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 shader->ID3D10VertexShader_iface.lpVtbl = &d3d10_vertex_shader_vtbl; shader->refcount = 1; + wined3d_private_store_init(&shader->private_store); shader_info.input_signature = &input_signature; shader_info.output_signature = &output_signature; if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info))) { ERR("Failed to extract shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return hr; } @@ -278,6 +285,7 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 if (FAILED(hr)) { WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return E_INVALIDARG; }

1 0

Aric Stewart : imm32: Restrict cross-thread association and destruction.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: fdf37fe7443f13a16ea68fc44d96cece20bad70b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf37fe7443f13a16ea68fc44… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 25 11:45:26 2015 -0600 imm32: Restrict cross-thread association and destruction. --- dlls/imm32/imm.c | 23 ++++++++++++++++++- dlls/imm32/tests/imm32.c | 59 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2b3804e..481f98f 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -74,6 +74,7 @@ typedef struct tagInputContextData { DWORD dwLock; INPUTCONTEXT IMC; + DWORD threadID; ImmHkl *immKbd; UINT lastVK; @@ -523,6 +524,22 @@ static IMMThreadData* IMM_GetInitializedThreadData(HWND hWnd) return thread_data; } +static BOOL IMM_IsCrossThreadAccess(HWND hWnd, HIMC hIMC) +{ + InputContextData *data; + + if (hWnd) + { + DWORD thread = GetWindowThreadProcessId(hWnd, NULL); + if (thread != GetCurrentThreadId()) return TRUE; + } + data = get_imc_data(hIMC); + if (data && data->threadID != GetCurrentThreadId()) + return TRUE; + + return FALSE; +} + /*********************************************************************** * ImmAssociateContext (IMM32.@) */ @@ -543,6 +560,9 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (hIMC && data->IMC.hWnd == hWnd) return hIMC; + if (hIMC && IMM_IsCrossThreadAccess(hWnd, hIMC)) + return NULL; + thread_data = IMM_GetInitializedThreadData(hWnd); if (!thread_data) return NULL; @@ -770,6 +790,7 @@ HIMC WINAPI ImmCreateContext(void) IMM_DestroyContext(new_context); return 0; } + new_context->threadID = GetCurrentThreadId(); SendMessageW(GetFocus(), WM_IME_SELECT, TRUE, (LPARAM)GetKeyboardLayout(0)); new_context->immKbd->uSelected++; @@ -809,7 +830,7 @@ static BOOL IMM_DestroyContext(HIMC hIMC) */ BOOL WINAPI ImmDestroyContext(HIMC hIMC) { - if (!IMM_IsDefaultContext(hIMC)) + if (!IMM_IsDefaultContext(hIMC) && !IMM_IsCrossThreadAccess(NULL, hIMC)) return IMM_DestroyContext(hIMC); else return FALSE; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 34e82c6..d7854c6 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -416,6 +416,7 @@ typedef struct _igc_threadinfo { HWND hwnd; HANDLE event; HIMC himc; + HIMC u_himc; } igc_threadinfo; @@ -424,6 +425,7 @@ static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) HIMC h1,h2; HWND hwnd2; COMPOSITIONFORM cf; + CANDIDATEFORM cdf; POINT pt; MSG msg; @@ -452,6 +454,13 @@ static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) /* priming for later tests */ ImmSetCompositionWindow(h1, &cf); ImmSetStatusWindowPos(h1, &pt); + info->u_himc = ImmCreateContext(); + ImmSetOpenStatus(info->u_himc, TRUE); + cdf.dwIndex = 0; + cdf.dwStyle = CFS_CANDIDATEPOS; + cdf.ptCurrentPos.x = 0; + cdf.ptCurrentPos.y = 0; + ImmSetCandidateWindow(info->u_himc, &cdf); SetEvent(info->event); @@ -487,15 +496,23 @@ static void test_ImmThreads(void) ok(himc != otherHimc, "Windows from other threads should have different himc\n"); ok(otherHimc == threadinfo.himc, "Context from other thread should not change in main thread\n"); - if (0) /* FIXME: Causes wine to hang */ - { h1 = ImmAssociateContext(hwnd,otherHimc); ok(h1 == NULL, "Should fail to be able to Associate a default context from a different thread\n"); h1 = ImmGetContext(hwnd); ok(h1 == himc, "Context for window should remain unchanged\n"); ImmReleaseContext(hwnd,h1); - } + h1 = ImmAssociateContext(hwnd, threadinfo.u_himc); + ok (h1 == NULL, "Should fail to associate a context from a different thread\n"); + h1 = ImmGetContext(hwnd); + ok(h1 == himc, "Context for window should remain unchanged\n"); + ImmReleaseContext(hwnd,h1); + + h1 = ImmAssociateContext(threadinfo.hwnd, threadinfo.u_himc); + ok (h1 == NULL, "Should fail to associate a context from a different thread into a window from that thread.\n"); + h1 = ImmGetContext(threadinfo.hwnd); + ok(h1 == threadinfo.himc, "Context for window should remain unchanged\n"); + ImmReleaseContext(threadinfo.hwnd,h1); /* OpenStatus */ rc = ImmSetOpenStatus(himc, TRUE); @@ -509,8 +526,12 @@ static void test_ImmThreads(void) rc = ImmSetOpenStatus(otherHimc, TRUE); todo_wine ok(rc == 0, "ImmSetOpenStatus should fail\n"); + rc = ImmSetOpenStatus(threadinfo.u_himc, TRUE); + todo_wine ok(rc == 0, "ImmSetOpenStatus should fail\n"); rc = ImmGetOpenStatus(otherHimc); todo_wine ok(rc == 0, "ImmGetOpenStatus failed\n"); + rc = ImmGetOpenStatus(threadinfo.u_himc); + ok (rc == 1 || broken(rc == 0), "ImmGetOpenStatus should return 1\n"); rc = ImmSetOpenStatus(otherHimc, FALSE); todo_wine ok(rc == 0, "ImmSetOpenStatus should fail\n"); rc = ImmGetOpenStatus(otherHimc); @@ -524,8 +545,12 @@ static void test_ImmThreads(void) rc = ImmGetCompositionFontA(otherHimc, &lf); ok(rc != 0 || broken(rc == 0), "ImmGetCompositionFont failed\n"); + rc = ImmGetCompositionFontA(threadinfo.u_himc, &lf); + ok(rc != 0 || broken(rc == 0), "ImmGetCompositionFont user himc failed\n"); rc = ImmSetCompositionFontA(otherHimc, &lf); todo_wine ok(rc == 0, "ImmSetCompositionFont should fail\n"); + rc = ImmSetCompositionFontA(threadinfo.u_himc, &lf); + todo_wine ok(rc == 0, "ImmSetCompositionFont should fail\n"); /* CompositionWindow */ rc = ImmSetCompositionWindow(himc, &cf); @@ -535,8 +560,12 @@ static void test_ImmThreads(void) rc = ImmSetCompositionWindow(otherHimc, &cf); todo_wine ok(rc == 0, "ImmSetCompositionWindow should fail\n"); + rc = ImmSetCompositionWindow(threadinfo.u_himc, &cf); + todo_wine ok(rc == 0, "ImmSetCompositionWindow should fail\n"); rc = ImmGetCompositionWindow(otherHimc, &cf); ok(rc != 0 || broken(rc == 0), "ImmGetCompositionWindow failed\n"); + rc = ImmGetCompositionWindow(threadinfo.u_himc, &cf); + ok(rc != 0 || broken(rc == 0), "ImmGetCompositionWindow failed\n"); /* ConversionStatus */ rc = ImmGetConversionStatus(himc, &status, &sentence); @@ -546,8 +575,12 @@ static void test_ImmThreads(void) rc = ImmGetConversionStatus(otherHimc, &status, &sentence); ok(rc != 0 || broken(rc == 0), "ImmGetConversionStatus failed\n"); + rc = ImmGetConversionStatus(threadinfo.u_himc, &status, &sentence); + ok(rc != 0 || broken(rc == 0), "ImmGetConversionStatus failed\n"); rc = ImmSetConversionStatus(otherHimc, status, sentence); todo_wine ok(rc == 0, "ImmSetConversionStatus should fail\n"); + rc = ImmSetConversionStatus(threadinfo.u_himc, status, sentence); + todo_wine ok(rc == 0, "ImmSetConversionStatus should fail\n"); /* StatusWindowPos */ rc = ImmSetStatusWindowPos(himc, &pt); @@ -557,8 +590,24 @@ static void test_ImmThreads(void) rc = ImmSetStatusWindowPos(otherHimc, &pt); todo_wine ok(rc == 0, "ImmSetStatusWindowPos should fail\n"); + rc = ImmSetStatusWindowPos(threadinfo.u_himc, &pt); + todo_wine ok(rc == 0, "ImmSetStatusWindowPos should fail\n"); rc = ImmGetStatusWindowPos(otherHimc, &pt); ok(rc != 0 || broken(rc == 0), "ImmGetStatusWindowPos failed\n"); + rc = ImmGetStatusWindowPos(threadinfo.u_himc, &pt); + ok(rc != 0 || broken(rc == 0), "ImmGetStatusWindowPos failed\n"); + + h1 = ImmAssociateContext(threadinfo.hwnd, NULL); + ok (h1 == otherHimc, "ImmAssociateContext cross thread with NULL should work\n"); + h1 = ImmGetContext(threadinfo.hwnd); + ok (h1 == NULL, "CrossThread window context should be NULL\n"); + h1 = ImmAssociateContext(threadinfo.hwnd, h1); + ok (h1 == NULL, "Resetting cross thread context should fail\n"); + h1 = ImmGetContext(threadinfo.hwnd); + ok (h1 == NULL, "CrossThread window context should still be NULL\n"); + + rc = ImmDestroyContext(threadinfo.u_himc); + ok (rc == 0, "ImmDestroyContext Cross Thread should fail\n"); /* Candidate Window */ rc = ImmGetCandidateWindow(himc, 0, &cdf); @@ -576,6 +625,10 @@ static void test_ImmThreads(void) ok (rc == 0, "ImmGetCandidateWindow should fail\n"); rc = ImmSetCandidateWindow(otherHimc, &cdf); todo_wine ok (rc == 0, "ImmSetCandidateWindow should fail\n"); + rc = ImmGetCandidateWindow(threadinfo.u_himc, 0, &cdf); + ok (rc == 1 || broken( rc == 0), "ImmGetCandidateWindow should succeed\n"); + rc = ImmSetCandidateWindow(threadinfo.u_himc, &cdf); + todo_wine ok (rc == 0, "ImmSetCandidateWindow should fail\n"); ImmReleaseContext(threadinfo.hwnd,otherHimc); ImmReleaseContext(hwnd,himc);

1 0

Aric Stewart : imm32: Limit cross thread access to ImmSet* functions.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: 5448acc37a9b8d4d5f3eea4fd74eed6657080e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5448acc37a9b8d4d5f3eea4fd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 25 11:45:31 2015 -0600 imm32: Limit cross thread access to ImmSet* functions. --- dlls/imm32/imm.c | 21 +++++++++++++++++++++ dlls/imm32/tests/imm32.c | 28 ++++++++++++++-------------- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 481f98f..3f5ad31 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2249,6 +2249,9 @@ BOOL WINAPI ImmSetCandidateWindow( if (!data || !lpCandidate) return FALSE; + if (IMM_IsCrossThreadAccess(NULL, hIMC)) + return FALSE; + TRACE("\t%x, %x, (%i,%i), (%i,%i - %i,%i)\n", lpCandidate->dwIndex, lpCandidate->dwStyle, lpCandidate->ptCurrentPos.x, lpCandidate->ptCurrentPos.y, @@ -2279,6 +2282,9 @@ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) return FALSE; } + if (IMM_IsCrossThreadAccess(NULL, hIMC)) + return FALSE; + memcpy(&data->IMC.lfFont.W,lplf,sizeof(LOGFONTA)); MultiByteToWideChar(CP_ACP, 0, lplf->lfFaceName, -1, data->IMC.lfFont.W.lfFaceName, LF_FACESIZE); @@ -2302,6 +2308,9 @@ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) return FALSE; } + if (IMM_IsCrossThreadAccess(NULL, hIMC)) + return FALSE; + data->IMC.lfFont.W = *lplf; ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT); ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); @@ -2443,6 +2452,9 @@ BOOL WINAPI ImmSetCompositionWindow( return FALSE; } + if (IMM_IsCrossThreadAccess(NULL, hIMC)) + return FALSE; + data->IMC.cfCompForm = *lpCompForm; if (IsWindowVisible(data->immKbd->UIWnd)) @@ -2477,6 +2489,9 @@ BOOL WINAPI ImmSetConversionStatus( return FALSE; } + if (IMM_IsCrossThreadAccess(NULL, hIMC)) + return FALSE; + if ( fdwConversion != data->IMC.fdwConversion ) { oldConversion = data->IMC.fdwConversion; @@ -2510,6 +2525,9 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) return FALSE; } + if (IMM_IsCrossThreadAccess(NULL, hIMC)) + return FALSE; + if (data->immKbd->UIWnd == NULL) { /* create the ime window */ @@ -2546,6 +2564,9 @@ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) return FALSE; } + if (IMM_IsCrossThreadAccess(NULL, hIMC)) + return FALSE; + TRACE("\t(%i,%i)\n", lpptPos->x, lpptPos->y); data->IMC.ptStatusWndPos = *lpptPos; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index d7854c6..870f5d2 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -525,15 +525,15 @@ static void test_ImmThreads(void) ok(rc == 0, "ImmGetOpenStatus failed\n"); rc = ImmSetOpenStatus(otherHimc, TRUE); - todo_wine ok(rc == 0, "ImmSetOpenStatus should fail\n"); + ok(rc == 0, "ImmSetOpenStatus should fail\n"); rc = ImmSetOpenStatus(threadinfo.u_himc, TRUE); - todo_wine ok(rc == 0, "ImmSetOpenStatus should fail\n"); + ok(rc == 0, "ImmSetOpenStatus should fail\n"); rc = ImmGetOpenStatus(otherHimc); - todo_wine ok(rc == 0, "ImmGetOpenStatus failed\n"); + ok(rc == 0, "ImmGetOpenStatus failed\n"); rc = ImmGetOpenStatus(threadinfo.u_himc); ok (rc == 1 || broken(rc == 0), "ImmGetOpenStatus should return 1\n"); rc = ImmSetOpenStatus(otherHimc, FALSE); - todo_wine ok(rc == 0, "ImmSetOpenStatus should fail\n"); + ok(rc == 0, "ImmSetOpenStatus should fail\n"); rc = ImmGetOpenStatus(otherHimc); ok(rc == 0, "ImmGetOpenStatus failed\n"); @@ -548,9 +548,9 @@ static void test_ImmThreads(void) rc = ImmGetCompositionFontA(threadinfo.u_himc, &lf); ok(rc != 0 || broken(rc == 0), "ImmGetCompositionFont user himc failed\n"); rc = ImmSetCompositionFontA(otherHimc, &lf); - todo_wine ok(rc == 0, "ImmSetCompositionFont should fail\n"); + ok(rc == 0, "ImmSetCompositionFont should fail\n"); rc = ImmSetCompositionFontA(threadinfo.u_himc, &lf); - todo_wine ok(rc == 0, "ImmSetCompositionFont should fail\n"); + ok(rc == 0, "ImmSetCompositionFont should fail\n"); /* CompositionWindow */ rc = ImmSetCompositionWindow(himc, &cf); @@ -559,9 +559,9 @@ static void test_ImmThreads(void) ok(rc != 0, "ImmGetCompositionWindow failed\n"); rc = ImmSetCompositionWindow(otherHimc, &cf); - todo_wine ok(rc == 0, "ImmSetCompositionWindow should fail\n"); + ok(rc == 0, "ImmSetCompositionWindow should fail\n"); rc = ImmSetCompositionWindow(threadinfo.u_himc, &cf); - todo_wine ok(rc == 0, "ImmSetCompositionWindow should fail\n"); + ok(rc == 0, "ImmSetCompositionWindow should fail\n"); rc = ImmGetCompositionWindow(otherHimc, &cf); ok(rc != 0 || broken(rc == 0), "ImmGetCompositionWindow failed\n"); rc = ImmGetCompositionWindow(threadinfo.u_himc, &cf); @@ -578,9 +578,9 @@ static void test_ImmThreads(void) rc = ImmGetConversionStatus(threadinfo.u_himc, &status, &sentence); ok(rc != 0 || broken(rc == 0), "ImmGetConversionStatus failed\n"); rc = ImmSetConversionStatus(otherHimc, status, sentence); - todo_wine ok(rc == 0, "ImmSetConversionStatus should fail\n"); + ok(rc == 0, "ImmSetConversionStatus should fail\n"); rc = ImmSetConversionStatus(threadinfo.u_himc, status, sentence); - todo_wine ok(rc == 0, "ImmSetConversionStatus should fail\n"); + ok(rc == 0, "ImmSetConversionStatus should fail\n"); /* StatusWindowPos */ rc = ImmSetStatusWindowPos(himc, &pt); @@ -589,9 +589,9 @@ static void test_ImmThreads(void) ok(rc != 0, "ImmGetStatusWindowPos failed\n"); rc = ImmSetStatusWindowPos(otherHimc, &pt); - todo_wine ok(rc == 0, "ImmSetStatusWindowPos should fail\n"); + ok(rc == 0, "ImmSetStatusWindowPos should fail\n"); rc = ImmSetStatusWindowPos(threadinfo.u_himc, &pt); - todo_wine ok(rc == 0, "ImmSetStatusWindowPos should fail\n"); + ok(rc == 0, "ImmSetStatusWindowPos should fail\n"); rc = ImmGetStatusWindowPos(otherHimc, &pt); ok(rc != 0 || broken(rc == 0), "ImmGetStatusWindowPos failed\n"); rc = ImmGetStatusWindowPos(threadinfo.u_himc, &pt); @@ -624,11 +624,11 @@ static void test_ImmThreads(void) rc = ImmGetCandidateWindow(otherHimc, 0, &cdf); ok (rc == 0, "ImmGetCandidateWindow should fail\n"); rc = ImmSetCandidateWindow(otherHimc, &cdf); - todo_wine ok (rc == 0, "ImmSetCandidateWindow should fail\n"); + ok (rc == 0, "ImmSetCandidateWindow should fail\n"); rc = ImmGetCandidateWindow(threadinfo.u_himc, 0, &cdf); ok (rc == 1 || broken( rc == 0), "ImmGetCandidateWindow should succeed\n"); rc = ImmSetCandidateWindow(threadinfo.u_himc, &cdf); - todo_wine ok (rc == 0, "ImmSetCandidateWindow should fail\n"); + ok (rc == 0, "ImmSetCandidateWindow should fail\n"); ImmReleaseContext(threadinfo.hwnd,otherHimc); ImmReleaseContext(hwnd,himc);

1 0

Alexandre Julliard : imm32: Add a helper function to get the default context.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: 29ce21e25de5495520e13a9d797edbd7bfb0f1cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ce21e25de5495520e13a9d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 26 22:50:44 2015 +0900 imm32: Add a helper function to get the default context. --- dlls/imm32/imm.c | 84 ++++++++++++++++++++++++++------------------------------ 1 file changed, 39 insertions(+), 45 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3f5ad31..07ab598 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -494,34 +494,45 @@ static InputContextData* get_imc_data(HIMC hIMC) return data; } -static IMMThreadData* IMM_GetInitializedThreadData(HWND hWnd) +static HIMC get_default_context( HWND hwnd ) { - IMMThreadData* thread_data = IMM_GetThreadDataForWindow(hWnd); + HIMC ret; + IMMThreadData* thread_data = IMM_GetThreadDataForWindow( hwnd ); - if (!thread_data) - return NULL; + if (!thread_data) return 0; - if (!thread_data->defaultContext && thread_data->threadID == GetCurrentThreadId()) + if (thread_data->defaultContext) { - HIMC defaultContext; + ret = thread_data->defaultContext; LeaveCriticalSection(&threaddata_cs); - defaultContext = ImmCreateContext(); - if (defaultContext) - ((InputContextData*)defaultContext)->threadDefault = TRUE; - thread_data = IMM_GetThreadDataForWindow(hWnd); - if (!thread_data) - { - IMM_DestroyContext(defaultContext); - return NULL; - } + return ret; + } - if (thread_data->defaultContext) /* someone beat us */ - IMM_DestroyContext(defaultContext); - else - thread_data->defaultContext = defaultContext; + /* can't create a default context in another thread */ + if (thread_data->threadID != GetCurrentThreadId()) + { + LeaveCriticalSection(&threaddata_cs); + return 0; } - return thread_data; + LeaveCriticalSection(&threaddata_cs); + + ret = ImmCreateContext(); + if (!ret) return 0; + ((InputContextData*)ret)->threadDefault = TRUE; + + /* thread_data is in the current thread so we can assume it's still valid */ + EnterCriticalSection(&threaddata_cs); + + if (thread_data->defaultContext) /* someone beat us */ + { + IMM_DestroyContext( ret ); + ret = thread_data->defaultContext; + } + else thread_data->defaultContext = ret; + + LeaveCriticalSection(&threaddata_cs); + return ret; } static BOOL IMM_IsCrossThreadAccess(HWND hWnd, HIMC hIMC) @@ -547,7 +558,6 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) { HIMC old = NULL; InputContextData *data = get_imc_data(hIMC); - IMMThreadData* thread_data = NULL; TRACE("(%p, %p):\n", hWnd, hIMC); @@ -563,20 +573,17 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (hIMC && IMM_IsCrossThreadAccess(hWnd, hIMC)) return NULL; - thread_data = IMM_GetInitializedThreadData(hWnd); - if (!thread_data) - return NULL; - if (hWnd) { + HIMC defaultContext = get_default_context( hWnd ); old = RemovePropW(hWnd,szwWineIMCProperty); if (old == NULL) - old = thread_data->defaultContext; + old = defaultContext; else if (old == (HIMC)-1) old = NULL; - if (hIMC != thread_data->defaultContext) + if (hIMC != defaultContext) { if (hIMC == NULL) /* Meaning disable imm for that window*/ SetPropW(hWnd,szwWineIMCProperty,(HANDLE)-1); @@ -591,7 +598,6 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) old_data->IMC.hWnd = NULL; } } - LeaveCriticalSection(&threaddata_cs); if (!hIMC) return old; @@ -633,18 +639,8 @@ static BOOL CALLBACK _ImmAssociateContextExEnumProc(HWND hwnd, LPARAM lParam) */ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) { - IMMThreadData* thread_data = NULL; - HIMC defaultContext = NULL; - TRACE("(%p, %p, 0x%x):\n", hWnd, hIMC, dwFlags); - thread_data = IMM_GetInitializedThreadData(hWnd); - if (!thread_data) - return FALSE; - - defaultContext = thread_data->defaultContext; - LeaveCriticalSection(&threaddata_cs); - if (!hWnd) return FALSE; @@ -654,8 +650,12 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) ImmAssociateContext(hWnd,hIMC); return TRUE; case IACE_DEFAULT: + { + HIMC defaultContext = get_default_context( hWnd ); + if (!defaultContext) return FALSE; ImmAssociateContext(hWnd,defaultContext); return TRUE; + } case IACE_IGNORENOCONTEXT: if (GetPropW(hWnd,szwWineIMCProperty)) ImmAssociateContext(hWnd,hIMC); @@ -1496,7 +1496,6 @@ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) HIMC WINAPI ImmGetContext(HWND hWnd) { HIMC rc; - IMMThreadData* thread_data; TRACE("%p\n", hWnd); @@ -1506,22 +1505,17 @@ HIMC WINAPI ImmGetContext(HWND hWnd) return NULL; } - thread_data = IMM_GetInitializedThreadData(hWnd); - if (!thread_data) - return NULL; - rc = GetPropW(hWnd,szwWineIMCProperty); if (rc == (HIMC)-1) rc = NULL; else if (rc == NULL) - rc = thread_data->defaultContext; + rc = get_default_context( hWnd ); if (rc) { InputContextData *data = rc; data->IMC.hWnd = hWnd; } - LeaveCriticalSection(&threaddata_cs); TRACE("returning %p\n", rc);

1 0

Andrew Eikum : services: Monitor process handles for process quit.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: 1e783dbfaad7e290a7659e829141acf0a831f965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e783dbfaad7e290a7659e829… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Feb 26 07:46:14 2015 -0600 services: Monitor process handles for process quit. --- programs/services/rpc.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 3a206c7..0d74b5b 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1623,7 +1623,7 @@ DWORD events_loop(void) { struct timeout_queue_elem *iter, *iter_safe; DWORD err; - HANDLE wait_handles[2]; + HANDLE wait_handles[MAXIMUM_WAIT_OBJECTS]; DWORD timeout = INFINITE; wait_handles[0] = __wine_make_process_system(); @@ -1636,13 +1636,29 @@ DWORD events_loop(void) do { - err = WaitForMultipleObjects(2, wait_handles, FALSE, timeout); + DWORD num_handles = 2; + + /* monitor tracked process handles for process end */ + EnterCriticalSection(&timeout_queue_cs); + LIST_FOR_EACH_ENTRY(iter, &timeout_queue, struct timeout_queue_elem, entry) + { + if(num_handles == MAXIMUM_WAIT_OBJECTS){ + WINE_TRACE("Exceeded maximum wait object count\n"); + break; + } + wait_handles[num_handles] = iter->service_entry->process; + num_handles++; + } + LeaveCriticalSection(&timeout_queue_cs); + + err = WaitForMultipleObjects(num_handles, wait_handles, FALSE, timeout); WINE_TRACE("Wait returned %d\n", err); - if(err==WAIT_OBJECT_0+1 || err==WAIT_TIMEOUT) + if(err > WAIT_OBJECT_0 || err == WAIT_TIMEOUT) { FILETIME cur_time; ULARGE_INTEGER time; + DWORD idx = 0; GetSystemTimeAsFileTime(&cur_time); time.u.LowPart = cur_time.dwLowDateTime; @@ -1652,7 +1668,8 @@ DWORD events_loop(void) timeout = INFINITE; LIST_FOR_EACH_ENTRY_SAFE(iter, iter_safe, &timeout_queue, struct timeout_queue_elem, entry) { - if(CompareFileTime(&cur_time, &iter->time) >= 0) + if(CompareFileTime(&cur_time, &iter->time) >= 0 || + (err > WAIT_OBJECT_0 + 1 && idx == err - WAIT_OBJECT_0 - 2)) { LeaveCriticalSection(&timeout_queue_cs); iter->func(iter->service_entry); @@ -1673,6 +1690,7 @@ DWORD events_loop(void) if(time_diff.QuadPart < timeout) timeout = time_diff.QuadPart; } + idx++; } LeaveCriticalSection(&timeout_queue_cs);

1 0

Andrew Eikum : advapi32: Partially implement NotifyServiceStatusChangeW.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: afa965a152672dcd24e0a9cb4483871a778ee2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa965a152672dcd24e0a9cb4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 25 14:29:12 2015 -0600 advapi32: Partially implement NotifyServiceStatusChangeW. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/service.c | 34 +++++++++++ dlls/advapi32/tests/service.c | 131 ++++++++++++++++++++++++++++++++++++++++++ include/winsvc.h | 37 ++++++++++++ 4 files changed, 203 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 322360d..e7b7cf7 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -496,7 +496,7 @@ @ stdcall NotifyChangeEventLog (long long) # @ stub NotifyServiceStatusChange # @ stub NotifyServiceStatusChangeA -# @ stub NotifyServiceStatusChangeW +@ stdcall NotifyServiceStatusChangeW(ptr long ptr) @ stdcall ObjectCloseAuditAlarmA(str ptr long) @ stdcall ObjectCloseAuditAlarmW(wstr ptr long) # @ stub ObjectDeleteAuditAlarmA diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index ae002c9..4657bd9 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2335,3 +2335,37 @@ BOOL WINAPI EnumDependentServicesW( SC_HANDLE hService, DWORD dwServiceState, *lpServicesReturned = 0; return TRUE; } + +/****************************************************************************** + * NotifyServiceStatusChangeW [ADVAPI32.@] + */ +DWORD WINAPI NotifyServiceStatusChangeW(SC_HANDLE hService, DWORD dwNotifyMask, + SERVICE_NOTIFYW *pNotifyBuffer) +{ + DWORD dummy; + BOOL ret; + SERVICE_STATUS_PROCESS st; + + FIXME("%p 0x%x %p - semi-stub\n", hService, dwNotifyMask, pNotifyBuffer); + + ret = QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (void*)&st, sizeof(st), &dummy); + if (ret) + { + /* dwNotifyMask is a set of bitflags in same order as SERVICE_ statuses */ + if (dwNotifyMask & (1 << (st.dwCurrentState - SERVICE_STOPPED))) + { + pNotifyBuffer->dwNotificationStatus = ERROR_SUCCESS; + memcpy(&pNotifyBuffer->ServiceStatus, &st, sizeof(pNotifyBuffer->ServiceStatus)); + pNotifyBuffer->dwNotificationTriggered = 1 << (st.dwCurrentState - SERVICE_STOPPED); + pNotifyBuffer->pszServiceNames = NULL; + TRACE("Queueing notification: 0x%x\n", pNotifyBuffer->dwNotificationTriggered); + QueueUserAPC((PAPCFUNC)pNotifyBuffer->pfnNotifyCallback, + GetCurrentThread(), (ULONG_PTR)pNotifyBuffer); + } + } + + /* TODO: If the service is not currently in a matching state, we should + * tell `services` to monitor it. */ + + return ERROR_SUCCESS; +} diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 0fc8e3a..f87508b 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -50,6 +50,7 @@ static BOOL (WINAPI *pQueryServiceStatusEx)(SC_HANDLE, SC_STATUS_TYPE, LPBYTE, DWORD, LPDWORD); static BOOL (WINAPI *pQueryServiceObjectSecurity)(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD); +static DWORD (WINAPI *pNotifyServiceStatusChangeW)(SC_HANDLE,DWORD,SERVICE_NOTIFYW*); static void init_function_pointers(void) { @@ -63,6 +64,7 @@ static void init_function_pointers(void) pQueryServiceConfig2W= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2W"); pQueryServiceStatusEx= (void*)GetProcAddress(hadvapi32, "QueryServiceStatusEx"); pQueryServiceObjectSecurity = (void*)GetProcAddress(hadvapi32, "QueryServiceObjectSecurity"); + pNotifyServiceStatusChangeW = (void*)GetProcAddress(hadvapi32, "NotifyServiceStatusChangeW"); } static void test_open_scm(void) @@ -2195,6 +2197,75 @@ static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, DWORD is_nt4 return le1; } +struct notify_data { + SERVICE_NOTIFYW notify; + SC_HANDLE svc; +}; + +void CALLBACK cb_stopped(void *user) +{ + struct notify_data *data = user; + BOOL br; + + ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, + "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); + ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_STOPPED, + "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); + ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_STOPPED, + "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); + + br = StartServiceA(data->svc, 0, NULL); + ok(br, "StartService failed: %u\n", GetLastError()); +} + +void CALLBACK cb_running(void *user) +{ + struct notify_data *data = user; + BOOL br; + SERVICE_STATUS status; + + ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, + "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); + ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_RUNNING, + "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); + ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_RUNNING, + "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); + + br = ControlService(data->svc, SERVICE_CONTROL_STOP, &status); + ok(br, "ControlService failed: %u\n", GetLastError()); +} + +static void test_servicenotify(SC_HANDLE svc) +{ + DWORD dr; + struct notify_data data; + + if(!pNotifyServiceStatusChangeW){ + win_skip("No NotifyServiceStatusChangeW\n"); + return; + } + + memset(&data.notify, 0, sizeof(data.notify)); + data.notify.dwVersion = SERVICE_NOTIFY_STATUS_CHANGE; + data.notify.pfnNotifyCallback = &cb_stopped; + data.notify.pContext = &data; + data.svc = svc; + + dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); + ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); + + dr = SleepEx(100, TRUE); + ok(dr == WAIT_IO_COMPLETION, "APC wasn't called\n"); + + data.notify.pfnNotifyCallback = &cb_running; + + dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); + ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); + + dr = SleepEx(100, TRUE); + ok(dr == WAIT_IO_COMPLETION, "APC wasn't called\n"); +} + static void test_start_stop(void) { BOOL ret; @@ -2267,6 +2338,13 @@ static void test_start_stop(void) le = try_start_stop(svc_handle, displayname, is_nt4); ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); + /* create a real service and test notifications */ + sprintf(cmd, "%s service serve", selfname); + displayname = "Winetest Service"; + ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); + ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); + test_servicenotify(svc_handle); + cleanup: if (svc_handle) { @@ -2370,6 +2448,57 @@ static void test_refcount(void) CloseServiceHandle(scm_handle); } +static DWORD WINAPI ctrl_handler(DWORD ctl, DWORD type, void *data, void *user) +{ + HANDLE evt = user; + + switch(ctl){ + case SERVICE_CONTROL_STOP: + SetEvent(evt); + break; + case SERVICE_CONTROL_INTERROGATE: + return NO_ERROR; + } + + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static void WINAPI service_main(DWORD argc, char **argv) +{ + SERVICE_STATUS_HANDLE st_handle; + SERVICE_STATUS st; + HANDLE evt = CreateEventW(0, FALSE, FALSE, 0); + + st_handle = RegisterServiceCtrlHandlerExA("", &ctrl_handler, evt); + + st.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + st.dwServiceSpecificExitCode = 0; + st.dwCurrentState = SERVICE_RUNNING; + st.dwWin32ExitCode = NO_ERROR; + st.dwWaitHint = 0; + st.dwControlsAccepted = SERVICE_ACCEPT_STOP; + st.dwCheckPoint = 0; + + SetServiceStatus(st_handle, &st); + + WaitForSingleObject(evt, 5000); + + st.dwCurrentState = SERVICE_STOPPED; + + SetServiceStatus(st_handle, &st); +} + +static void run_service(void) +{ + char empty[] = {0}; + SERVICE_TABLE_ENTRYA table[] = { + {empty, &service_main }, + {0, 0} + }; + + StartServiceCtrlDispatcherA(table); +} + START_TEST(service) { SC_HANDLE scm_handle; @@ -2380,6 +2509,8 @@ START_TEST(service) GetFullPathNameA(myARGV[0], sizeof(selfname), selfname, NULL); if (myARGC >= 3) { + if (strcmp(myARGV[2], "serve") == 0) + run_service(); return; } diff --git a/include/winsvc.h b/include/winsvc.h index c1af509..7d768f5 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -159,6 +159,43 @@ typedef struct _SERVICE_STATUS_PROCESS DWORD dwServiceFlags; } SERVICE_STATUS_PROCESS, *LPSERVICE_STATUS_PROCESS; +#define SERVICE_NOTIFY_STATUS_CHANGE 2 + +#define SERVICE_NOTIFY_STOPPED 0x1 +#define SERVICE_NOTIFY_START_PENDING 0x2 +#define SERVICE_NOTIFY_STOP_PENDING 0x4 +#define SERVICE_NOTIFY_RUNNING 0x8 +#define SERVICE_NOTIFY_CONTINUE_PENDING 0x10 +#define SERVICE_NOTIFY_PAUSE_PENDING 0x20 +#define SERVICE_NOTIFY_PAUSED 0x40 +#define SERVICE_NOTIFY_CREATED 0x80 +#define SERVICE_NOTIFY_DELETED 0x100 +#define SERVICE_NOTIFY_DELETE_PENDING 0x200 + +typedef void (CALLBACK *PFN_SC_NOTIFY_CALLBACK)(void *); + +typedef struct _SERVICE_NOTIFY_2A { + DWORD dwVersion; + PFN_SC_NOTIFY_CALLBACK pfnNotifyCallback; + void *pContext; + DWORD dwNotificationStatus; + SERVICE_STATUS_PROCESS ServiceStatus; + DWORD dwNotificationTriggered; + char *pszServiceNames; +} SERVICE_NOTIFY_2A, SERVICE_NOTIFYA; + +typedef struct _SERVICE_NOTIFY_2W { + DWORD dwVersion; + PFN_SC_NOTIFY_CALLBACK pfnNotifyCallback; + void *pContext; + DWORD dwNotificationStatus; + SERVICE_STATUS_PROCESS ServiceStatus; + DWORD dwNotificationTriggered; + WCHAR *pszServiceNames; +} SERVICE_NOTIFY_2W, SERVICE_NOTIFYW; + +DWORD WINAPI NotifyServiceStatusChangeW(SC_HANDLE,DWORD,SERVICE_NOTIFYW*); + typedef enum _SC_STATUS_TYPE { SC_STATUS_PROCESS_INFO = 0 } SC_STATUS_TYPE;

1 0

Alexandre Julliard : imm32: Simplify the helper functions to retrieve the thread data.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: c84fd8586a21e665db18dcaaa46d5c185fddb403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84fd8586a21e665db18dcaaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 26 22:59:51 2015 +0900 imm32: Simplify the helper functions to retrieve the thread data. --- dlls/imm32/imm.c | 50 ++++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 07ab598..1fc553d 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -225,43 +225,29 @@ static DWORD convert_candidatelist_AtoW( return ret; } -static IMMThreadData* IMM_GetThreadData(DWORD id) +static IMMThreadData *IMM_GetThreadData(HWND hwnd) { IMMThreadData *data; + DWORD process, thread; - if (!id) id = GetCurrentThreadId(); + if (hwnd) + { + if (!(thread = GetWindowThreadProcessId(hwnd, &process))) return NULL; + if (process != GetCurrentProcessId()) return NULL; + } + else thread = GetCurrentThreadId(); EnterCriticalSection(&threaddata_cs); LIST_FOR_EACH_ENTRY(data, &ImmThreadDataList, IMMThreadData, entry) - { - if (data->threadID == id) - return data; - } + if (data->threadID == thread) return data; - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(IMMThreadData)); - data->threadID = id; + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); + data->threadID = thread; list_add_head(&ImmThreadDataList,&data->entry); - TRACE("Thread Data Created (%x)\n",id); - + TRACE("Thread Data Created (%x)\n",thread); return data; } -static IMMThreadData* IMM_GetThreadDataForWindow(HWND hwnd) -{ - DWORD process; - DWORD thread = 0; - - if (hwnd) - { - thread = GetWindowThreadProcessId(hwnd, &process); - if (process != GetCurrentProcessId()) - return NULL; - } - - return IMM_GetThreadData(thread); -} - static BOOL IMM_IsDefaultContext(HIMC imc) { InputContextData *data = get_imc_data(imc); @@ -497,7 +483,7 @@ static InputContextData* get_imc_data(HIMC hIMC) static HIMC get_default_context( HWND hwnd ) { HIMC ret; - IMMThreadData* thread_data = IMM_GetThreadDataForWindow( hwnd ); + IMMThreadData* thread_data = IMM_GetThreadData( hwnd ); if (!thread_data) return 0; @@ -1625,7 +1611,7 @@ BOOL WINAPI ImmGetConversionStatus( HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { HWND ret, new = NULL; - IMMThreadData* thread_data = IMM_GetThreadDataForWindow(hWnd); + IMMThreadData* thread_data = IMM_GetThreadData(hWnd); if (!thread_data) return NULL; if (thread_data->hwndDefault == NULL && thread_data->threadID == GetCurrentThreadId()) @@ -1634,12 +1620,8 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) LeaveCriticalSection(&threaddata_cs); new = CreateWindowExW( WS_EX_TOOLWINDOW, szwIME, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, 0, 0); - thread_data = IMM_GetThreadDataForWindow(hWnd); - if (!thread_data) - { - DestroyWindow(new); - return NULL; - } + /* thread_data is in the current thread so we can assume it's still valid */ + EnterCriticalSection(&threaddata_cs); /* See if anyone beat us */ if (thread_data->hwndDefault == NULL) {

1 0

Andrew Eikum : advapi32/tests: Don't test service timeout.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: 48f0f16311260648d16f75e9d50e4e284f09f05a URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f0f16311260648d16f75e9d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 25 14:28:49 2015 -0600 advapi32/tests: Don't test service timeout. --- dlls/advapi32/tests/service.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index ad81a25..0fc8e3a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2267,18 +2267,6 @@ static void test_start_stop(void) le = try_start_stop(svc_handle, displayname, is_nt4); ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); - /* And finally with a service that plays dead, forcing a timeout. - * This time we will put no quotes. That should work too, even if there are - * spaces in the path. - */ - sprintf(cmd, "%s service sleep", selfname); - displayname = "Winetest Sleep Service"; - ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); - ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - - le = try_start_stop(svc_handle, displayname, is_nt4); - ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); - cleanup: if (svc_handle) { @@ -2392,10 +2380,6 @@ START_TEST(service) GetFullPathNameA(myARGV[0], sizeof(selfname), selfname, NULL); if (myARGC >= 3) { - if (strcmp(myARGV[2], "sleep") == 0) - /* Cause a service startup timeout */ - Sleep(90000); - /* then, or if myARGV[2] == "exit", just exit */ return; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_vertex_shader_SetPrivateDataInterface().
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: e8dc68a8e4674713139030592f9849dde9d34a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8dc68a8e4674713139030592… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 10:11:32 2015 +0100 d3d10core: Implement d3d10_vertex_shader_SetPrivateDataInterface(). --- dlls/d3d10core/shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 31896e3..bb0e596 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -220,9 +220,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10Vertex static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateDataInterface(ID3D10VertexShader *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&shader->private_store, guid, data); } static const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl =

1 0