February 2010 - Wine-Commits

Jörg Höhle : mciseq: Fix error code path in async command execution.
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: 6dadd15bdf9304e2cbe96cc1c25195d3a49b634e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dadd15bdf9304e2cbe96cc1c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Feb 11 18:34:14 2010 +0100 mciseq: Fix error code path in async command execution. --- dlls/mciseq/mcimidi.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 402b8d5..301428d 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -113,9 +113,6 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) TRACE("In thread after async command (%08x,%u,%08lx,%08lx)\n", sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); HeapFree(GetProcessHeap(), 0, sca); - ExitThread(ret); - WARN("Should not happen ? what's wrong\n"); - /* should not go after this point */ return ret; } @@ -147,7 +144,7 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD_PTR dwParam1, if ((handle = CreateThread(NULL, 0, MCI_SCAStarter, sca, 0, NULL)) == 0) { WARN("Couldn't allocate thread for async command handling, sending synchronously\n"); - return MCI_SCAStarter(&sca); + return MCI_SCAStarter(sca); } SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); CloseHandle(handle);

1 0

Jörg Höhle : mciavi: First check inputs, then ( perhaps) stop and act.
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: a34831df13a9609566fe3983f5439a7c76890f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34831df13a9609566fe3983f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Nov 26 08:46:55 2009 +0100 mciavi: First check inputs, then (perhaps) stop and act. --- dlls/mciavi32/mciavi.c | 28 ++++++---------------------- 1 files changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index cb24d6e..cfae27c 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -217,8 +217,6 @@ static DWORD MCIAVI_mciOpen(UINT wDevID, DWORD dwFlags, TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpOpenParms); - MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); - if (lpOpenParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; wma = (WINE_MCIAVI *)mciGetDriverData(wDevID); @@ -300,8 +298,6 @@ DWORD MCIAVI_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); - MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); - wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -676,13 +672,13 @@ static DWORD MCIAVI_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); - MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; + MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); + EnterCriticalSection(&wma->cs); if (dwFlags & MCI_SEEK_TO_START) { @@ -718,13 +714,13 @@ static DWORD MCIAVI_mciLoad(UINT wDevID, DWORD dwFlags, LPMCI_DGV_LOAD_PARMSW lp FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); - MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; + MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); + return 0; } @@ -737,8 +733,6 @@ static DWORD MCIAVI_mciRealize(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS l FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); - MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIAVI_mciGetOpenDev(wDevID); @@ -780,13 +774,13 @@ static DWORD MCIAVI_mciStep(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STEP_PARMS lpP FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); - MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; + MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); + return 0; } @@ -799,8 +793,6 @@ static DWORD MCIAVI_mciCue(UINT wDevID, DWORD dwFlags, LPMCI_DGV_CUE_PARMS lpPar FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); - MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIAVI_mciGetOpenDev(wDevID); @@ -818,8 +810,6 @@ static DWORD MCIAVI_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); - MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIAVI_mciGetOpenDev(wDevID); @@ -837,8 +827,6 @@ static DWORD MCIAVI_mciSignal(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SIGNAL_PARMS FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); - MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIAVI_mciGetOpenDev(wDevID); @@ -856,8 +844,6 @@ static DWORD MCIAVI_mciSetVideo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETVIDEO_P FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); - MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIAVI_mciGetOpenDev(wDevID); @@ -875,8 +861,6 @@ static DWORD MCIAVI_mciConfigure(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); - MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIAVI_mciGetOpenDev(wDevID);

1 0

Hans Leidekker : msi: Return the right error from ITERATE_RegisterTypeLibraries.
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: 82d50fa675dc829b69f0a18e39a5b3486072edcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d50fa675dc829b69f0a18e3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 12 10:33:00 2010 +0100 msi: Return the right error from ITERATE_RegisterTypeLibraries. --- dlls/msi/action.c | 2 +- dlls/msi/tests/install.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0f1877e..69e2b03 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2933,7 +2933,7 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param) if (FAILED(hr)) { ERR("Failed to load type library: %08x\n", hr); - return ERROR_FUNCTION_FAILED; + return ERROR_INSTALL_FAILURE; } ITypeLib_Release(tlib); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 83e7220..de826c3 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -8090,7 +8090,7 @@ static void test_register_typelib(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, "REGISTER_TYPELIB=1"); - todo_wine ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);

1 0

Hans Leidekker : msi: Fix a memory leak in ITERATE_StartService.
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: f7879b43d50f71d073cc2b26792993044159e4d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7879b43d50f71d073cc2b267… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 12 10:33:23 2010 +0100 msi: Fix a memory leak in ITERATE_StartService. Found by Valgrind. --- dlls/msi/action.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 69e2b03..6ee3007 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4657,7 +4657,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) { MSIPACKAGE *package = param; MSICOMPONENT *comp; - SC_HANDLE scm, service = NULL; + SC_HANDLE scm = NULL, service = NULL; LPCWSTR *vector = NULL; LPWSTR name, args; DWORD event, numargs; @@ -4672,7 +4672,10 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) event = MSI_RecordGetInteger(rec, 3); if (!(event & msidbServiceControlEventStart)) - return ERROR_SUCCESS; + { + r = ERROR_SUCCESS; + goto done; + } scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); if (!scm)

1 0

Rico Schüller : d3d10/tests: Add effect shader test.
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: f816210c214318b0beba5ed6b90c6cd32dd3fd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f816210c214318b0beba5ed6b… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Feb 11 19:49:24 2010 +0100 d3d10/tests: Add effect shader test. --- dlls/d3d10/tests/effect.c | 1052 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 1052 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f816210c214318b0beba5…

1 0

Rico Schüller : d3d10/tests: Use a wrapper function for D3D10CreateEffectFromMemory().
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: 893b0b9d40b543066dfe701927daf9a033d49e9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=893b0b9d40b543066dfe70192… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Feb 11 19:49:02 2010 +0100 d3d10/tests: Use a wrapper function for D3D10CreateEffectFromMemory(). --- dlls/d3d10/tests/effect.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 5bbde06..0fbc17f 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -42,6 +42,19 @@ static ID3D10Device *create_device(void) return NULL; } +static inline HRESULT create_effect(DWORD *data, UINT flags, ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect) +{ + /* + * Don't use sizeof(data), use data[6] as size, + * because the DWORD data[] has only complete DWORDs and + * so it could happen that there are padded bytes at the end. + * + * The fx size (data[6]) could be up to 3 BYTEs smaller + * than the sizeof(data). + */ + return D3D10CreateEffectFromMemory(data, data[6], flags, device, effect_pool, effect); +} + /* * test_effect_constant_buffer_type */ @@ -82,15 +95,7 @@ static void test_effect_constant_buffer_type(ID3D10Device *device) LPCSTR string; unsigned int i; - /* - * Don't use sizeof(fx_test_ecbt), use fx_test_ecbt[6] as size, - * because the DWORD fx_test_ecbt[] has only complete DWORDs and - * so it could happen that there are padded bytes at the end. - * - * The fx size (fx_test_ecbt[6]) could be up to 3 BYTEs smaller - * than the sizeof(fx_test_ecbt). - */ - hr = D3D10CreateEffectFromMemory(fx_test_ecbt, fx_test_ecbt[6], 0, device, NULL, &effect); + hr = create_effect(fx_test_ecbt, 0, device, NULL, &effect); ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); @@ -252,7 +257,7 @@ static void test_effect_variable_type(ID3D10Device *device) LPCSTR string; unsigned int i; - hr = D3D10CreateEffectFromMemory(fx_test_evt, fx_test_evt[6], 0, device, NULL, &effect); + hr = create_effect(fx_test_evt, 0, device, NULL, &effect); ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); @@ -472,7 +477,7 @@ static void test_effect_variable_member(ID3D10Device *device) D3D10_EFFECT_VARIABLE_DESC desc; HRESULT hr; - hr = D3D10CreateEffectFromMemory(fx_test_evm, fx_test_evm[6], 0, device, NULL, &effect); + hr = create_effect(fx_test_evm, 0, device, NULL, &effect); ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); @@ -662,7 +667,7 @@ static void test_effect_variable_element(ID3D10Device *device) D3D10_EFFECT_TYPE_DESC type_desc; HRESULT hr; - hr = D3D10CreateEffectFromMemory(fx_test_eve, fx_test_eve[6], 0, device, NULL, &effect); + hr = create_effect(fx_test_eve, 0, device, NULL, &effect); ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); @@ -1347,7 +1352,7 @@ static void test_effect_variable_type_class(ID3D10Device *device) HRESULT hr; unsigned int variable_nr = 0; - hr = D3D10CreateEffectFromMemory(fx_test_evtc, fx_test_evtc[6], 0, device, NULL, &effect); + hr = create_effect(fx_test_evtc, 0, device, NULL, &effect); ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); /* get the null_constantbuffer, so that we can compare it to variables->GetParentConstantBuffer */ @@ -2359,7 +2364,7 @@ static void test_effect_constant_buffer_stride(ID3D10Device *device) {1, 0x10, 0x20, 0x20}, }; - hr = D3D10CreateEffectFromMemory(fx_test_ecbs, fx_test_ecbs[6], 0, device, NULL, &effect); + hr = create_effect(fx_test_ecbs, 0, device, NULL, &effect); ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); for (i=0; i<sizeof(tv_ecbs)/sizeof(tv_ecbs[0]); i++)

1 0

Kusanagi Kouichi : winex11.drv: Simplify X11DRV_ImmSetInternalString.
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: 3739dcd6e55252e5205c85f09406159c6ab7e9a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3739dcd6e55252e5205c85f09… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Fri Feb 12 14:54:24 2010 +0900 winex11.drv: Simplify X11DRV_ImmSetInternalString. --- dlls/winex11.drv/xim.c | 125 ++++++++++++------------------------------------ 1 files changed, 31 insertions(+), 94 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 1e55431..944a631 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -58,112 +58,45 @@ static XIMStyle ximStyle = 0; static XIMStyle ximStyleRoot = 0; static XIMStyle ximStyleRequest = STYLE_CALLBACK; -static BOOL X11DRV_ImmSetInternalString(DWORD dwIndex, DWORD dwOffset, +static void X11DRV_ImmSetInternalString(DWORD dwOffset, DWORD selLength, LPWSTR lpComp, DWORD dwCompLen) { /* Composition strings are edited in chunks */ unsigned int byte_length = dwCompLen * sizeof(WCHAR); unsigned int byte_offset = dwOffset * sizeof(WCHAR); unsigned int byte_selection = selLength * sizeof(WCHAR); - BOOL rc = FALSE; + int byte_expansion = byte_length - byte_selection; + LPBYTE ptr_new; - TRACE("( %i, %i, %d, %p, %d):\n", dwOffset, selLength, dwIndex, lpComp, dwCompLen ); + TRACE("( %i, %i, %p, %d):\n", dwOffset, selLength, lpComp, dwCompLen ); - if (dwIndex == GCS_COMPSTR) + if (byte_expansion + dwCompStringLength >= dwCompStringSize) { - unsigned int i,j; - LPBYTE ptr_new; - LPBYTE ptr_old; - - if ((dwCompLen == 0) && (selLength == 0)) - { - /* DO Nothing */ - } - /* deletion occurred */ - else if ((dwCompLen== 0) && (selLength != 0)) - { - if (dwCompStringLength) - { - for (i = 0; i < byte_selection; i++) - { - if (byte_offset+byte_selection+i < - dwCompStringLength) - { - CompositionString[byte_offset + i] = - CompositionString[byte_offset + byte_selection + i]; - } - else - CompositionString[byte_offset + i] = 0; - } - /* clean up the end */ - dwCompStringLength -= byte_selection; - - i = dwCompStringLength; - while (i < dwCompStringSize) - { - CompositionString[i++] = 0; - } - } - } + if (CompositionString) + ptr_new = HeapReAlloc(GetProcessHeap(), 0, CompositionString, + dwCompStringSize + byte_expansion); else - { - int byte_expansion = byte_length - byte_selection; - - if (byte_expansion + dwCompStringLength >= dwCompStringSize) - { - if (CompositionString) - CompositionString = - HeapReAlloc(GetProcessHeap(), 0, - CompositionString, - dwCompStringSize + - byte_expansion); - else - CompositionString = - HeapAlloc(GetProcessHeap(), 0, dwCompStringSize + - byte_expansion); - - memset(&(CompositionString[dwCompStringSize]), 0, - byte_expansion); - - dwCompStringSize += byte_expansion; - } - - ptr_new = ((LPBYTE)lpComp); - ptr_old = CompositionString + byte_offset + byte_selection; - - dwCompStringLength += byte_expansion; + ptr_new = HeapAlloc(GetProcessHeap(), 0, + dwCompStringSize + byte_expansion); - for (j=0,i = byte_offset; i < dwCompStringSize; i++) - { - if (j < byte_length) - { - CompositionString[i] = ptr_new[j++]; - } - else - { - if (ptr_old < CompositionString + dwCompStringSize) - { - CompositionString[i] = *ptr_old; - ptr_old++; - } - else - CompositionString[i] = 0; - } - } + if (ptr_new == NULL) + { + ERR("Couldn't expand composition string buffer\n"); + return; } - rc = IME_SetCompositionString(SCS_SETSTR, CompositionString, - dwCompStringLength, NULL, 0); + CompositionString = ptr_new; + dwCompStringSize += byte_expansion; } - else if ((dwIndex == GCS_RESULTSTR) && (lpComp) && (dwCompLen)) - { - rc = IME_SetCompositionString(SCS_SETSTR, lpComp, - byte_length, NULL, 0); - IME_NotifyIME( NI_COMPOSITIONSTR, CPS_COMPLETE, 0); - } + ptr_new = CompositionString + byte_offset; + memmove(ptr_new + byte_length, ptr_new + byte_selection, + dwCompStringLength - byte_offset - byte_selection); + memcpy(ptr_new, lpComp, byte_length); + dwCompStringLength += byte_expansion; - return rc; + IME_SetCompositionString(SCS_SETSTR, CompositionString, + dwCompStringLength, NULL, 0); } void X11DRV_XIMLookupChars( const char *str, DWORD count ) @@ -172,6 +105,8 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) WCHAR *wcOutput; HWND focus; + TRACE("%p %u\n", str, count); + dwOutput = MultiByteToWideChar(CP_UNIXCP, 0, str, count, NULL, 0); wcOutput = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * dwOutput); if (wcOutput == NULL) @@ -181,7 +116,9 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) if ((focus = GetFocus())) IME_UpdateAssociation(focus); - X11DRV_ImmSetInternalString(GCS_RESULTSTR,0,0,wcOutput,dwOutput); + IME_SetCompositionString(SCS_SETSTR, wcOutput, + sizeof (WCHAR) * dwOutput, NULL, 0); + IME_NotifyIME(NI_COMPOSITIONSTR, CPS_COMPLETE, 0); HeapFree(GetProcessHeap(), 0, wcOutput); } @@ -244,20 +181,20 @@ static void XIMPreEditDrawCallback(XIM ic, XPointer client_data, /* ignore null */ dwOutput --; - X11DRV_ImmSetInternalString (GCS_COMPSTR, sel, len, wcOutput, dwOutput); + X11DRV_ImmSetInternalString (sel, len, wcOutput, dwOutput); HeapFree(GetProcessHeap(), 0, wcOutput); } } else { FIXME("wchar PROBIBILY WRONG\n"); - X11DRV_ImmSetInternalString (GCS_COMPSTR, sel, len, + X11DRV_ImmSetInternalString (sel, len, (LPWSTR)P_DR->text->string.wide_char, P_DR->text->length); } } else - X11DRV_ImmSetInternalString (GCS_COMPSTR, sel, len, NULL, 0); + X11DRV_ImmSetInternalString (sel, len, NULL, 0); IME_SetCursorPos(P_DR->caret); } TRACE("Finished\n");

1 0

Hans Leidekker : msi: Implement the UnregisterTypeLibraries standard action .
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: 98761037ab0bc6e9c68e2b9e1a25cab5b3abad3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=98761037ab0bc6e9c68e2b9e1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 12 10:32:35 2010 +0100 msi: Implement the UnregisterTypeLibraries standard action. --- dlls/msi/action.c | 70 ++++++++++++++++++++++++++++++++++---- dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 31870bd..0f1877e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2862,8 +2862,6 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param) HMODULE module; HRESULT hr; - static const WCHAR szTYPELIB[] = {'T','Y','P','E','L','I','B',0}; - component = MSI_RecordGetString(row,3); comp = get_loaded_component(package,component); if (!comp) @@ -2967,6 +2965,68 @@ static UINT ACTION_RegisterTypeLibraries(MSIPACKAGE *package) return rc; } +static UINT ITERATE_UnregisterTypeLibraries( MSIRECORD *row, LPVOID param ) +{ + MSIPACKAGE *package = param; + LPCWSTR component, guid; + MSICOMPONENT *comp; + GUID libid; + UINT version; + LCID language; + SYSKIND syskind; + HRESULT hr; + + component = MSI_RecordGetString( row, 3 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + if (!ACTION_VerifyComponentForAction( comp, INSTALLSTATE_ABSENT )) + { + TRACE("Skipping, component is not scheduled for uninstall\n"); + + comp->Action = comp->Installed; + return ERROR_SUCCESS; + } + comp->Action = INSTALLSTATE_ABSENT; + + guid = MSI_RecordGetString( row, 1 ); + CLSIDFromString( (LPWSTR)guid, &libid ); + version = MSI_RecordGetInteger( row, 4 ); + language = MSI_RecordGetInteger( row, 2 ); + +#ifdef _WIN64 + syskind = SYS_WIN64; +#else + syskind = SYS_WIN32; +#endif + + hr = UnRegisterTypeLib( &libid, (version >> 8) & 0xffff, version & 0xff, language, syskind ); + if (FAILED(hr)) + { + WARN("Failed to unregister typelib: %08x\n", hr); + } + + return ERROR_SUCCESS; +} + +static UINT ACTION_UnregisterTypeLibraries( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','T','y','p','e','L','i','b','`',0}; + + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_UnregisterTypeLibraries, package ); + msiobj_release( &view->hdr ); + return rc; +} + static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; @@ -6452,12 +6512,6 @@ static UINT ACTION_UnregisterProgIdInfo( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "UnregisterProgIdInfo", table ); } -static UINT ACTION_UnregisterTypeLibraries( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'T','y','p','e','L','i','b',0 }; - return msi_unimplemented_action_stub( package, "UnregisterTypeLibraries", table ); -} - typedef UINT (*STANDARDACTIONHANDLER)(MSIPACKAGE*); static const struct diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index f81184b..8022afc 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1075,6 +1075,7 @@ static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0}; static const WCHAR szProductID[] = {'P','r','o','d','u','c','t','I','D',0}; static const WCHAR szPIDTemplate[] = {'P','I','D','T','e','m','p','l','a','t','e',0}; static const WCHAR szPIDKEY[] = {'P','I','D','K','E','Y',0}; +static const WCHAR szTYPELIB[] = {'T','Y','P','E','L','I','B',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 96b5117..83e7220 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1320,6 +1320,50 @@ static const CHAR odbc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\ "Media\tDiskId\n" "1\t5\t\t\tDISK1\t\n"; +static const CHAR tl_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "typelib.dll\ttypelib\ttypelib.dll\t1000\t\t\t8192\t1\n"; + +static const CHAR tl_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "typelib\t\t\ttypelib feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR tl_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "typelib\ttypelib\n"; + +static const CHAR tl_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "typelib\t{BB4C26FD-89D8-4E49-AF1C-DB4DCB5BF1B0}\tMSITESTDIR\t0\t\ttypelib.dll\n"; + +static const CHAR tl_typelib_dat[] = "LibID\tLanguage\tComponent_\tVersion\tDescription\tDirectory_\tFeature_\tCost\n" + "s38\ti2\ts72\tI4\tL128\tS72\ts38\tI4\n" + "TypeLib\tLibID\tLanguage\tComponent_\n" + "{EAC5166A-9734-4D91-878F-1DD02304C66C}\t0\ttypelib\t1793\t\tMSITESTDIR\ttypelib\t\n"; + +static const CHAR tl_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "RegisterTypeLibraries\tREGISTER_TYPELIB=1\t3000\n" + "UnregisterTypeLibraries\t\t3100\n" + "RegisterProduct\t\t5100\n" + "PublishFeatures\t\t5200\n" + "PublishProduct\t\t5300\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2131,6 +2175,19 @@ static const msi_table odbc_tables[] = ADD_TABLE(property) }; +static const msi_table tl_tables[] = +{ + ADD_TABLE(tl_component), + ADD_TABLE(directory), + ADD_TABLE(tl_feature), + ADD_TABLE(tl_feature_comp), + ADD_TABLE(tl_file), + ADD_TABLE(tl_typelib), + ADD_TABLE(tl_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -8022,6 +8079,31 @@ static void test_install_remove_odbc(void) delete_test_files(); } +static void test_register_typelib(void) +{ + UINT r; + + create_test_files(); + create_file("msitest\\typelib.dll", 1000); + create_database(msifile, tl_tables, sizeof(tl_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, "REGISTER_TYPELIB=1"); + todo_wine ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\typelib.dll", TRUE), "file not removed\n"); + todo_wine ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -8121,6 +8203,7 @@ START_TEST(install) test_register_font(); test_validate_product_id(); test_install_remove_odbc(); + test_register_typelib(); DeleteFileA(log_file);

1 0

Detlef Riekenberg : shlwapi/tests: Remove GetLastError tests for GetAcceptLanguages, which uses HRESULT.
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: 7aac2c070dd490992973417374de1df15f4c973e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aac2c070dd49099297341737… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Feb 11 22:45:06 2010 +0100 shlwapi/tests: Remove GetLastError tests for GetAcceptLanguages, which uses HRESULT. --- dlls/shlwapi/tests/ordinal.c | 35 ----------------------------------- 1 files changed, 0 insertions(+), 35 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 31fced9..43b299c 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -55,33 +55,21 @@ static void test_GetAcceptLanguagesA(void) buffersize = sizeof(buffer); memset(buffer, 0, sizeof(buffer)); - SetLastError(ERROR_SUCCESS); retval = pGetAcceptLanguagesA( buffer, &buffersize); - if (!retval && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - win_skip("GetAcceptLanguagesA is not implemented\n"); - return; - } trace("GetAcceptLanguagesA: retval %08x, size %08x, buffer (%s)," " last error %u\n", retval, buffersize, buffer, GetLastError()); if(retval != S_OK) { trace("GetAcceptLanguagesA: skipping tests\n"); return; } - ok( (ERROR_NO_IMPERSONATION_TOKEN == GetLastError()) || - (ERROR_CLASS_DOES_NOT_EXIST == GetLastError()) || - (ERROR_PROC_NOT_FOUND == GetLastError()) || - (ERROR_SUCCESS == GetLastError()), "last error set to %u\n", GetLastError()); exactsize = strlen(buffer); - SetLastError(ERROR_SUCCESS); retval = pGetAcceptLanguagesA( NULL, NULL); ok(retval == E_FAIL || retval == E_INVALIDARG, /* w2k8 */ "function result wrong: got %08x; expected E_FAIL\n", retval); - ok(ERROR_SUCCESS == GetLastError(), "last error set to %u\n", GetLastError()); buffersize = sizeof(buffer); - SetLastError(ERROR_SUCCESS); retval = pGetAcceptLanguagesA( NULL, &buffersize); ok(retval == E_FAIL || retval == E_INVALIDARG, /* w2k8 */ @@ -89,42 +77,30 @@ static void test_GetAcceptLanguagesA(void) ok(buffersize == sizeof(buffer) || buffersize == 0, /* w2k8*/ "buffersize was changed and is not 0; size (%d))\n", buffersize); - ok(ERROR_SUCCESS == GetLastError(), "last error set to %u\n", GetLastError()); - SetLastError(ERROR_SUCCESS); retval = pGetAcceptLanguagesA( buffer, NULL); ok(retval == E_FAIL || retval == E_INVALIDARG, /* w2k8 */ "function result wrong: got %08x; expected E_FAIL\n", retval); - ok(ERROR_SUCCESS == GetLastError(), "last error set to %u\n", GetLastError()); buffersize = 0; memset(buffer, 0, sizeof(buffer)); - SetLastError(ERROR_SUCCESS); retval = pGetAcceptLanguagesA( buffer, &buffersize); ok(retval == E_FAIL || retval == E_INVALIDARG, /* w2k8 */ "function result wrong: got %08x; expected E_FAIL\n", retval); ok(buffersize == 0, "buffersize wrong(changed) got %08x; expected 0 (2nd parameter; not on Win2k)\n", buffersize); - ok(ERROR_SUCCESS == GetLastError(), "last error set to %u\n", GetLastError()); buffersize = buffersize2 = 1; memset(buffer, 0, sizeof(buffer)); - SetLastError(ERROR_SUCCESS); retval = pGetAcceptLanguagesA( buffer, &buffersize); switch(retval) { case 0L: if(buffersize == exactsize) { - ok( (ERROR_SUCCESS == GetLastError()) || - (ERROR_PROC_NOT_FOUND == GetLastError()) || (ERROR_NO_IMPERSONATION_TOKEN == GetLastError()), - "last error wrong: got %u; expected ERROR_SUCCESS(NT4)/" - "ERROR_PROC_NOT_FOUND(NT4)/ERROR_NO_IMPERSONATION_TOKEN(XP)\n", GetLastError()); ok(exactsize == strlen(buffer), "buffer content (length) wrong: got %08x, expected %08x\n", lstrlenA(buffer), exactsize); } else if((buffersize +1) == buffersize2) { - ok(ERROR_SUCCESS == GetLastError(), - "last error wrong: got %u; expected ERROR_SUCCESS\n", GetLastError()); ok(buffersize == strlen(buffer), "buffer content (length) wrong: got %08x, expected %08x\n", lstrlenA(buffer), buffersize); } else @@ -134,16 +110,12 @@ static void test_GetAcceptLanguagesA(void) case E_INVALIDARG: ok(buffersize == 0, "buffersize wrong: got %08x, expected 0 (2nd parameter;Win2k)\n", buffersize); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), - "last error wrong: got %u; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); ok(buffersize2 == strlen(buffer), "buffer content (length) wrong: got %08x, expected %08x\n", lstrlenA(buffer), buffersize2); break; case __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER): /* Win7 */ ok(buffersize == 0, "buffersize wrong: got %08x, expected 0 (2nd parameter;Win2k)\n", buffersize); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), - "last error wrong: got %u; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); break; default: ok( 0, "retval %08x, size %08x, buffer (%s), last error %u\n", @@ -153,12 +125,9 @@ static void test_GetAcceptLanguagesA(void) buffersize = buffersize2 = exactsize; memset(buffer, 0, sizeof(buffer)); - SetLastError(ERROR_SUCCESS); retval = pGetAcceptLanguagesA( buffer, &buffersize); switch(retval) { case 0L: - ok(ERROR_SUCCESS == GetLastError(), - "last error wrong: got %u; expected ERROR_SUCCESS\n", GetLastError()); if((buffersize == exactsize) /* XP */ || ((buffersize +1)== exactsize) /* 98 */) ok(buffersize == strlen(buffer), @@ -170,16 +139,12 @@ static void test_GetAcceptLanguagesA(void) case E_INVALIDARG: ok(buffersize == 0, "buffersize wrong: got %08x, expected 0 (2nd parameter;Win2k)\n", buffersize); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), - "last error wrong: got %u; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); ok(buffersize2 == strlen(buffer), "buffer content (length) wrong: got %08x, expected %08x\n", lstrlenA(buffer), buffersize2); break; case __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER): /* Win 7 */ ok(buffersize == 0, "buffersize wrong: got %08x, expected 0 (2nd parameter;Win2k)\n", buffersize); - ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), - "last error wrong: got %u; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); break; default: ok( 0, "retval %08x, size %08x, buffer (%s), last error %u\n",

1 0

Kusanagi Kouichi : winex11.drv: Fold X11DRV_ImmSetOpenStatus into XIMPreEditDoneCallback.
by Alexandre Julliard Feb. 12, 2010

Feb. 12, 2010

Module: wine Branch: master Commit: 30872b0ebfb784021f834210dfb7621a2b67f871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30872b0ebfb784021f834210d… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Fri Feb 12 14:54:33 2010 +0900 winex11.drv: Fold X11DRV_ImmSetOpenStatus into XIMPreEditDoneCallback. --- dlls/winex11.drv/xim.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 944a631..38b0a2c 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -122,25 +122,10 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) HeapFree(GetProcessHeap(), 0, wcOutput); } -static void X11DRV_ImmSetOpenStatus(BOOL fOpen) -{ - if (fOpen == FALSE) - { - if (dwCompStringSize) - HeapFree(GetProcessHeap(),0,CompositionString); - - dwCompStringSize = 0; - dwCompStringLength = 0; - CompositionString = NULL; - } - - IME_SetOpenStatus(fOpen); -} - static int XIMPreEditStartCallback(XIC ic, XPointer client_data, XPointer call_data) { TRACE("PreEditStartCallback %p\n",ic); - X11DRV_ImmSetOpenStatus(TRUE); + IME_SetOpenStatus(TRUE); ximInComposeMode = TRUE; return -1; } @@ -149,7 +134,12 @@ static void XIMPreEditDoneCallback(XIC ic, XPointer client_data, XPointer call_d { TRACE("PreeditDoneCallback %p\n",ic); ximInComposeMode = FALSE; - X11DRV_ImmSetOpenStatus(FALSE); + if (dwCompStringSize) + HeapFree(GetProcessHeap(), 0, CompositionString); + dwCompStringSize = 0; + dwCompStringLength = 0; + CompositionString = NULL; + IME_SetOpenStatus(FALSE); } static void XIMPreEditDrawCallback(XIM ic, XPointer client_data,

1 0