April 2008 - Wine-commits - list.winehq.org

Andrew Talbot : dsound: Remove unused variable.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 13e405c149a147ae35f8637c49ca2d70de6b6cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e405c149a147ae35f8637c4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Apr 16 22:09:30 2008 +0100 dsound: Remove unused variable. --- dlls/dsound/mixer.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index fd2f671..3d3741b 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -324,7 +324,7 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2) void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD len, BOOL inmixer) { INT i, size; - BYTE *ibp, *obp, *ibp_begin, *obp_begin; + BYTE *ibp, *obp, *obp_begin; INT iAdvance = dsb->pwfx->nBlockAlign; INT oAdvance = dsb->device->pwfx->nBlockAlign; DWORD freqAcc, target_writepos = 0, overshot, maxlen; @@ -340,7 +340,6 @@ void DSOUND_MixToTemporary(const IDirectSoundBufferImpl *dsb, DWORD writepos, DW maxlen = DSOUND_secpos_to_bufpos(dsb, len, 0, NULL); ibp = dsb->buffer->memory + writepos; - ibp_begin = dsb->buffer->memory; if (!inmixer) obp_begin = dsb->tmp_buffer; else if (dsb->device->tmp_buffer_len < maxlen || !dsb->device->tmp_buffer)

1 0

Andrew Talbot : comdlg32: Remove unused variable.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 5d707bc2719c1f08338d2c3905306b6ca014e8a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d707bc2719c1f08338d2c390… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Apr 16 22:09:22 2008 +0100 comdlg32: Remove unused variable. --- dlls/comdlg32/filedlg31.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 10238de..c8fcf7e 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -143,10 +143,10 @@ static LPCWSTR FD31_GetFileType(LPCWSTR cfptr, LPCWSTR fptr, const WORD index) */ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) { - WCHAR buffer[BUFFILE]; - HWND hdlg, hdlgDir; - LRESULT lRet = TRUE; - HCURSOR hCursorWait, oldCursor; + WCHAR buffer[BUFFILE]; + HWND hdlg; + LRESULT lRet = TRUE; + HCURSOR hCursorWait, oldCursor; TRACE("Trying to change to %s\n", debugstr_w(newPath)); if ( newPath[0] && !SetCurrentDirectoryW( newPath )) @@ -180,7 +180,7 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) /* list of directories */ strcpyW(buffer, FILE_star); - if ((hdlgDir = GetDlgItem(hWnd, lst2)) != 0) { + if (GetDlgItem(hWnd, lst2) != 0) { lRet = DlgDirListW(hWnd, buffer, lst2, stc1, DDL_EXCLUSIVE | DDL_DIRECTORY); } SetCursor(oldCursor);

1 0

Marcus Meissner : winex11: Move code behind error return.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 0926fff545a7e7363de217df708a21979c05e500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0926fff545a7e7363de217df7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Apr 16 19:54:31 2008 +0100 winex11: Move code behind error return. --- dlls/winex11.drv/dib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 3d7bebf..f23592c 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4040,12 +4040,12 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, if (!(obj_size = GetObjectW( hbitmap, sizeof(dib), &dib ))) return 0; bitmap_type = DIB_GetBitmapInfo( (BITMAPINFOHEADER*)info, &width, &tempHeight, &descr.infoBpp, &descr.compression); - descr.lines = tempHeight; if (bitmap_type == -1) { ERR("Invalid bitmap\n"); return 0; } + descr.lines = tempHeight; core_header = (bitmap_type == 0); colorPtr = (LPBYTE) info + (WORD) info->bmiHeader.biSize;

1 0

Marcus Meissner : wined3d: Handle out of array bounds state.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 8d8b7ffbc79332f7748f8749d7bf30696253d0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8b7ffbc79332f7748f8749d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Apr 16 22:54:28 2008 +0200 wined3d: Handle out of array bounds state. --- dlls/wined3d/basetexture.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 000c2f2..1f14a20 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -435,16 +435,17 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface state = samplerStates[WINED3DSAMP_MAGFILTER]; if (state < WINED3DTEXF_NONE || state > WINED3DTEXF_ANISOTROPIC) { FIXME("Unrecognized or unsupported MAGFILTER* value %d\n", state); + } else { + glValue = (*This->baseTexture.magLookup)[state - WINED3DTEXF_NONE]; + TRACE("ValueMAG=%d setting MAGFILTER to %x\n", state, glValue); + glTexParameteri(textureDimensions, GL_TEXTURE_MAG_FILTER, glValue); + /* We need to reset the Anisotropic filtering state when we change the mag filter to WINED3DTEXF_ANISOTROPIC (this seems a bit weird, check the documentation to see how it should be switched off. */ + if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC) && WINED3DTEXF_ANISOTROPIC == state && + textureDimensions != GL_TEXTURE_RECTANGLE_ARB) { + glTexParameteri(textureDimensions, GL_TEXTURE_MAX_ANISOTROPY_EXT, samplerStates[WINED3DSAMP_MAXANISOTROPY]); + } + This->baseTexture.states[WINED3DTEXSTA_MAGFILTER] = state; } - glValue = (*This->baseTexture.magLookup)[state - WINED3DTEXF_NONE]; - TRACE("ValueMAG=%d setting MAGFILTER to %x\n", state, glValue); - glTexParameteri(textureDimensions, GL_TEXTURE_MAG_FILTER, glValue); - /* We need to reset the Anisotropic filtering state when we change the mag filter to WINED3DTEXF_ANISOTROPIC (this seems a bit weird, check the documentation to see how it should be switched off. */ - if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC) && WINED3DTEXF_ANISOTROPIC == state && - textureDimensions != GL_TEXTURE_RECTANGLE_ARB) { - glTexParameteri(textureDimensions, GL_TEXTURE_MAX_ANISOTROPY_EXT, samplerStates[WINED3DSAMP_MAXANISOTROPY]); - } - This->baseTexture.states[WINED3DTEXSTA_MAGFILTER] = state; } if(textureDimensions != GL_TEXTURE_RECTANGLE_ARB &&

1 0

James Hawkins : kernel32: Remove an invalid trace and comment.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: cd2f10a6d01f720b6019c2d9172df7a54e754e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd2f10a6d01f720b6019c2d91… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 16 15:38:46 2008 -0500 kernel32: Remove an invalid trace and comment. --- dlls/kernel32/tests/environ.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index c7737d0..e6dd1fc 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -242,12 +242,11 @@ static void test_ExpandEnvironmentStringsA(void) /* Try to get the required buffer size 'the natural way' */ strcpy(buf, "%EnvVar%"); ret_size = ExpandEnvironmentStringsA(buf, NULL, 0); - /* v5.1.2600.2945 (XP SP2) returns len + 2 here! */ - ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2 || ret_size == 0 /* Win95 */, - "ExpandEnvironmentStrings returned %d instead of %d\n", - ret_size, lstrlenA(value)+1); - if (ret_size == strlen(value)+2) - trace("ExpandEnvironmentStrings is buggy: it returned len + 2\n"); + ok(ret_size == strlen(value)+1 || /* win98 */ + ret_size == strlen(value)+2 || /* win2k, XP, win2k3 */ + ret_size == 0 /* Win95 */, + "ExpandEnvironmentStrings returned %d instead of %d, %d or %d\n", + ret_size, lstrlenA(value)+1, lstrlenA(value)+2, 0); /* Again, side-stepping the Win95 bug */ ret_size = ExpandEnvironmentStringsA(buf, buf1, 0);

1 0

ByeongSik Jeon : imm32: Implement ImmSetConversionStatus.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 511753196f4ec733dd40196a209baf3cb40193ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=511753196f4ec733dd40196a2… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Wed Apr 16 19:01:29 2008 +0900 imm32: Implement ImmSetConversionStatus. --- dlls/imm32/imm.c | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c03d6fd..4eac53a 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1761,16 +1761,27 @@ BOOL WINAPI ImmSetCompositionWindow( BOOL WINAPI ImmSetConversionStatus( HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) { - static int shown = 0; + InputContextData *data = (InputContextData*)hIMC; - if (!shown) { - FIXME("(%p, %d, %d): stub\n", - hIMC, fdwConversion, fdwSentence - ); - shown = 1; - } - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%p %d %d\n", hIMC, fdwConversion, fdwSentence); + + if (!data) + return FALSE; + + if ( fdwConversion != data->IMC.fdwConversion ) + { + data->IMC.fdwConversion = fdwConversion; + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCONVERSIONMODE); + ImmInternalSendIMENotify(data, IMN_SETCONVERSIONMODE, 0); + } + if ( fdwSentence != data->IMC.fdwSentence ) + { + data->IMC.fdwSentence = fdwSentence; + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETSENTENCEMODE); + ImmInternalSendIMENotify(data, IMN_SETSENTENCEMODE, 0); + } + + return TRUE; } /***********************************************************************

1 0

Aric Stewart : imm32: Create the IME UI window with the IME instance so the registered class can be found .
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 1eece6eee65e18ffda46113b310d9c37997f03dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eece6eee65e18ffda46113b3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 16 14:30:13 2008 -0500 imm32: Create the IME UI window with the IME instance so the registered class can be found. --- dlls/imm32/imm.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 4eac53a..c267a70 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -92,7 +92,6 @@ typedef struct _tagIMMThreadData { HWND hwndDefault; } IMMThreadData; -static HANDLE hImeInst; static DWORD tlsIndex = 0; static struct list ImmHklList = LIST_INIT(ImmHklList); @@ -294,7 +293,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - hImeInst = hInstDLL; IMM_RegisterMessages(); tlsIndex = TlsAlloc(); IMM_InitThreadData(); @@ -1800,8 +1798,8 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) { /* create the ime window */ data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW, - data->immKbd->imeClassName, - NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, hImeInst, 0); + data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, + 0, data->immKbd->hIME, 0); SetWindowLongW(data->imeWnd, IMMGWL_IMC, (LONG)data); IMM_GetThreadData()->hwndDefault = data->imeWnd; }

1 0

Rob Shearman : msi: Fix the value parameter of IWineMsiRemotePackage:: FormatRecord to have the right level of indirection for an [out] parameter.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 4a75b8bf092fe4f7b2bf8afe6693ad566cb1b22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a75b8bf092fe4f7b2bf8afe6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 16 17:22:52 2008 +0100 msi: Fix the value parameter of IWineMsiRemotePackage::FormatRecord to have the right level of indirection for an [out] parameter. Remove the redundant size parameter and simplify the client code such that the remote function is only called once, with the value being automatically allocated. Add corresponding code on the server side to automatically allocate said value. --- dlls/msi/format.c | 17 +---------------- dlls/msi/msiserver.idl | 2 +- dlls/msi/package.c | 13 +++++++++++-- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index f58f517..454142a 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -921,28 +921,13 @@ UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, HRESULT hr; IWineMsiRemotePackage *remote_package; BSTR value = NULL; - DWORD len; awstring wstr; remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall ); if (remote_package) { - len = 0; hr = IWineMsiRemotePackage_FormatRecord( remote_package, hRecord, - NULL, &len ); - if (FAILED(hr)) - goto done; - - len++; - value = SysAllocStringLen( NULL, len ); - if (!value) - { - r = ERROR_OUTOFMEMORY; - goto done; - } - - hr = IWineMsiRemotePackage_FormatRecord( remote_package, hRecord, - value, &len ); + &value ); if (FAILED(hr)) goto done; diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index d5b47ac..37aa91e 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -70,7 +70,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT SetComponentState( [in] BSTR component, [in] INSTALLSTATE state ); HRESULT GetLanguage( [out] LANGID *language ); HRESULT SetInstallLevel( [in] int level ); - HRESULT FormatRecord( [in] MSIHANDLE record, [out] BSTR value, [out] DWORD *size ); + HRESULT FormatRecord( [in] MSIHANDLE record, [out] BSTR *value ); HRESULT EvaluateCondition( [in] BSTR condition ); } diff --git a/dlls/msi/package.c b/dlls/msi/package.c index a587a63..f11b068 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1812,10 +1812,19 @@ static HRESULT WINAPI mrp_SetInstallLevel( IWineMsiRemotePackage *iface, int lev } static HRESULT WINAPI mrp_FormatRecord( IWineMsiRemotePackage *iface, MSIHANDLE record, - BSTR value, DWORD *size ) + BSTR *value) { + DWORD size = 0; msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); - UINT r = MsiFormatRecordW(This->package, record, (LPWSTR)value, size); + UINT r = MsiFormatRecordW(This->package, record, NULL, &size); + if (r == ERROR_SUCCESS) + { + *value = SysAllocStringLen(NULL, size); + if (!*value) + return E_OUTOFMEMORY; + size++; + r = MsiFormatRecordW(This->package, record, *value, &size); + } return HRESULT_FROM_WIN32(r); }

1 0

James Hawkins : user32: Fix a test that fails in XP and win2k3.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: b8bdb1304b503007a819c7fca1044904c0eb4155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8bdb1304b503007a819c7fca… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 16 15:33:31 2008 -0500 user32: Fix a test that fails in XP and win2k3. --- dlls/user32/tests/sysparams.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 320bd04..7623a67 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2554,11 +2554,13 @@ static void test_EnumDisplaySettings(void) num = 1; while (1) { - SetLastError (0xdeadbeef); - if (!EnumDisplaySettings(NULL, num++, &devmode)) { - DWORD le = GetLastError(); - ok (le == ERROR_NO_MORE_FILES, "Last error on EnumDisplaySettings was %d, expected ERROR_NO_MORE_FILES\n", le); - break; + SetLastError (0xdeadbeef); + if (!EnumDisplaySettings(NULL, num++, &devmode)) { + DWORD le = GetLastError(); + ok(le == ERROR_NO_MORE_FILES || + le == 0xdeadbeef, /* XP, 2003 */ + "Expected ERROR_NO_MORE_FILES or 0xdeadbeef, got %d\n", le); + break; } } }

1 0

James Hawkins : kernel32: Split the GetComputerName/ Ex tests into their own test functions.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 25c02c884f68e15bd2db84fec7f5aac7757f59f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c02c884f68e15bd2db84fec… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 16 15:36:09 2008 -0500 kernel32: Split the GetComputerName/Ex tests into their own test functions. --- dlls/kernel32/tests/environ.c | 40 +++++++++++++++++++++++++++++++++------- 1 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 958da24..fb33304 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -25,6 +25,17 @@ #include "winbase.h" #include "winerror.h" +static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); +static BOOL (WINAPI *pGetComputerNameExW)(COMPUTER_NAME_FORMAT,LPWSTR,LPDWORD); + +static void init_functionpointers(void) +{ + HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); + + pGetComputerNameExA = (void *)GetProcAddress(hkernel32, "GetComputerNameExA"); + pGetComputerNameExW = (void *)GetProcAddress(hkernel32, "GetComputerNameExW"); +} + static void test_GetSetEnvironmentVariableA(void) { char buf[256]; @@ -291,9 +302,6 @@ static void test_ExpandEnvironmentStringsA(void) SetEnvironmentVariableA("EnvVar", NULL); } -static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); -static BOOL (WINAPI *pGetComputerNameExW)(COMPUTER_NAME_FORMAT,LPWSTR,LPDWORD); - static void test_GetComputerName(void) { DWORD size; @@ -347,11 +355,18 @@ static void test_GetComputerName(void) ok(ret, "GetComputerNameW failed with error %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, nameW); } +} + +static void test_GetComputerNameExA(void) +{ + DWORD size; + BOOL ret; + LPSTR name; + DWORD error; - pGetComputerNameExA = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "GetComputerNameExA"); if (!pGetComputerNameExA) { - skip("GetComputerNameExA function not implemented, so not testing\n"); + skip("GetComputerNameExA function not implemented\n"); return; } @@ -402,11 +417,18 @@ static void test_GetComputerName(void) ok(ret, "GetComputerNameExA(ComputerNameNetBIOS) failed with error %d\n", GetLastError()); trace("NetBIOS name is \"%s\"\n", name); HeapFree(GetProcessHeap(), 0, name); +} + +static void test_GetComputerNameExW(void) +{ + DWORD size; + BOOL ret; + LPWSTR nameW; + DWORD error; - pGetComputerNameExW = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "GetComputerNameExW"); if (!pGetComputerNameExW) { - skip("GetComputerNameExW function not implemented, so not testing\n"); + skip("GetComputerNameExW function not implemented\n"); return; } @@ -453,8 +475,12 @@ static void test_GetComputerName(void) START_TEST(environ) { + init_functionpointers(); + test_GetSetEnvironmentVariableA(); test_GetSetEnvironmentVariableW(); test_ExpandEnvironmentStringsA(); test_GetComputerName(); + test_GetComputerNameExA(); + test_GetComputerNameExW(); }

1 0