October 2009 - Wine-commits

Hans Leidekker : msi: Allocate MSISCRIPT structure at package creation time .
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: b7a81df4522c1fba50f609af3d9dda95f8ee1364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a81df4522c1fba50f609af3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:13:54 2009 +0200 msi: Allocate MSISCRIPT structure at package creation time. --- dlls/msi/action.c | 1 - dlls/msi/package.c | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e08f25a..e108701 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6394,7 +6394,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, MSI_SetPropertyW(package, szAction, szInstall); - package->script = msi_alloc_zero(sizeof(MSISCRIPT)); package->script->InWhatSequence = SEQUENCE_INSTALL; if (szPackagePath) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 06e3416..9c92842 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -969,6 +969,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) MSI_SetPropertyW( package, OriginalDatabase, fullpath ); } + package->script = msi_alloc_zero( sizeof(MSISCRIPT) ); *pPackage = package; return ERROR_SUCCESS;

1 0

Hans Leidekker : msi: Get rid of some redundant initializations.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 534f20bc49741a271df10ef5353de3f4c52ef3a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=534f20bc49741a271df10ef53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:14:20 2009 +0200 msi: Get rid of some redundant initializations. --- dlls/msi/database.c | 2 -- dlls/msi/msiquery.c | 2 -- dlls/msi/package.c | 9 --------- dlls/msi/preview.c | 1 - dlls/msi/suminfo.c | 1 - 5 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 4db7c01..8d0ee42 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -191,8 +191,6 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) db->mode = szMode; if (created) db->deletefile = strdupW( szDBPath ); - else - db->deletefile = NULL; list_init( &db->tables ); list_init( &db->transforms ); diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 5a46f9b..b973382 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -126,9 +126,7 @@ UINT MSI_DatabaseOpenViewW(MSIDATABASE *db, return ERROR_FUNCTION_FAILED; msiobj_addref( &db->hdr ); - query->row = 0; query->db = db; - query->view = NULL; list_init( &query->mem ); r = MSI_ParseSQL( db, szQuery, &query->view, &query->mem ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 9c92842..fa0cd6f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -744,15 +744,6 @@ static MSIPACKAGE *msi_alloc_package( void ) list_init( &package->RunningActions ); list_init( &package->sourcelist_info ); list_init( &package->sourcelist_media ); - - package->patch = NULL; - package->ActionFormat = NULL; - package->LastAction = NULL; - package->dialog = NULL; - package->next_dialog = NULL; - package->scheduled_action_running = FALSE; - package->commit_action_running = FALSE; - package->rollback_action_running = FALSE; } return package; diff --git a/dlls/msi/preview.c b/dlls/msi/preview.c index a2b3f32..458e4a1 100644 --- a/dlls/msi/preview.c +++ b/dlls/msi/preview.c @@ -54,7 +54,6 @@ static MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE *db ) if( preview ) { preview->package = package; - preview->dialog = 0; msiobj_addref( &package->hdr ); } msiobj_release( &package->hdr ); diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index ef16665..d3db44a 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -443,7 +443,6 @@ MSISUMMARYINFO *MSI_GetSummaryInformationW( IStorage *stg, UINT uiUpdateCount ) if( !si ) return si; - memset( si->property, 0, sizeof si->property ); si->update_count = uiUpdateCount; IStorage_AddRef( stg ); si->storage = stg;

1 0

Jörg Höhle : winecoreaudio: Move ERR&WARN out of OSSpinLock sections.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: f6ac7696af8a93b0b1f645d2013090f2479419c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ac7696af8a93b0b1f645d20… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 17 15:25:51 2009 +0200 winecoreaudio: Move ERR&WARN out of OSSpinLock sections. --- dlls/winecoreaudio.drv/audio.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index e1c4a41..835d1a9 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -984,8 +984,8 @@ static DWORD wodClose(WORD wDevID, WINE_WAVEOUT_INSTANCE* wwo) OSSpinLockLock(&wwo->lock); if (wwo->lpQueuePtr) { - WARN("buffers still playing !\n"); OSSpinLockUnlock(&wwo->lock); + WARN("buffers still playing !\n"); ret = WAVERR_STILLPLAYING; } else { @@ -1953,8 +1953,8 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->format.wf.nChannels, wwi->format.wf.nSamplesPerSec, wwi->format.wBitsPerSample, &frameCount)) { - ERR("AudioUnit_CreateInputUnit failed\n"); OSSpinLockUnlock(&wwi->lock); + ERR("AudioUnit_CreateInputUnit failed\n"); return MMSYSERR_ERROR; } @@ -1963,10 +1963,10 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->format.wBitsPerSample, frameCount, TRUE); if (wwi->bufferList == NULL) { - ERR("Failed to allocate buffer list\n"); AudioUnitUninitialize(wwi->audioUnit); AudioUnit_CloseAudioUnit(wwi->audioUnit); OSSpinLockUnlock(&wwi->lock); + ERR("Failed to allocate buffer list\n"); return MMSYSERR_NOMEM; } @@ -1975,11 +1975,11 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->bufferListCopy = HeapAlloc(GetProcessHeap(), 0, AUDIOBUFFERLISTSIZE(wwi->bufferList->mNumberBuffers)); if (wwi->bufferListCopy == NULL) { - ERR("Failed to allocate buffer list copy\n"); widHelper_DestroyAudioBufferList(wwi->bufferList); AudioUnitUninitialize(wwi->audioUnit); AudioUnit_CloseAudioUnit(wwi->audioUnit); OSSpinLockUnlock(&wwi->lock); + ERR("Failed to allocate buffer list copy\n"); return MMSYSERR_NOMEM; } memcpy(wwi->bufferListCopy, wwi->bufferList, AUDIOBUFFERLISTSIZE(wwi->bufferList->mNumberBuffers));

1 0

Tommy Schultz Lassen : msvcr71: Add _vscprintf and _vscwprintf.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 1931173ac8575fb80911e643165bb9ffdea7e4a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1931173ac8575fb80911e6431… Author: Tommy Schultz Lassen <wine(a)krynn.dk> Date: Sat Oct 17 09:53:16 2009 +0200 msvcr71: Add _vscprintf and _vscwprintf. --- dlls/msvcr71/msvcr71.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 7552ca3..0beec0c 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -545,8 +545,8 @@ @ cdecl _unlock(long) msvcrt._unlock @ cdecl _utime(str ptr) msvcrt._utime @ stub _utime64 -@ stub _vscprintf -@ stub _vscwprintf +@ cdecl _vscprintf(str ptr) msvcrt._vscprintf +@ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf @ cdecl _vsnprintf(ptr long ptr ptr) msvcrt._vsnprintf @ cdecl _vsnwprintf(ptr long wstr long) msvcrt._vsnwprintf @ cdecl _waccess(wstr long) msvcrt._waccess

1 0

Alexandre Julliard : netapi32/tests: Don' t try to get the size of a freed buffer.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 5b5054c10ed05d8a352a3d09a014650f61b0793c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5054c10ed05d8a352a3d09a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 19 16:06:07 2009 +0200 netapi32/tests: Don't try to get the size of a freed buffer. --- dlls/netapi32/tests/apibuf.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 0972e76..3400726 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -54,7 +54,6 @@ static void run_apibuf_tests(void) ok(pNetApiBufferFree(p) == NERR_Success, "Freed\n"); - ok(pNetApiBufferSize(p, &dwSize) == NERR_Success, "Got size\n"); ok(pNetApiBufferSize(NULL, &dwSize) == ERROR_INVALID_PARAMETER, "Error for NULL pointer\n"); /* border reallocate cases */

1 0

Alexandre Julliard : user32/tests: Use the correct lparam in the WM_DDE_ACK reply.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 9390bc921e012888d488e8314a4379bc76e2c4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9390bc921e012888d488e8314… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 19 16:21:50 2009 +0200 user32/tests: Use the correct lparam in the WM_DDE_ACK reply. --- dlls/user32/tests/dde.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 9e1da70..202bb41 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -211,7 +211,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA executed = TRUE; - lparam = ReuseDDElParam(lparam, WM_DDE_EXECUTE, WM_DDE_ACK, DDE_FACK, HIWORD(lparam)); + lparam = ReuseDDElParam(lparam, WM_DDE_EXECUTE, WM_DDE_ACK, DDE_FACK, lparam); PostMessageA(client, WM_DDE_ACK, (WPARAM)hwnd, lparam); break;

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 323f163af41c1f07326eee015f2c48744da565e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=323f163af41c1f07326eee015… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:28:08 2009 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/dsurface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 1a6023f..e05c967 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3220,7 +3220,7 @@ static void GetDCFormatTest(void) ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd.dwWidth = 64; ddsd.dwHeight = 64; - ddsd.ddpfPixelFormat = testdata[i].fmt; + U4(ddsd).ddpfPixelFormat = testdata[i].fmt; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface, NULL);

1 0

Francois Gouget : shlwapi: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: af6c873b5489eaad656d01b09581d9788b0b5f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6c873b5489eaad656d01b09… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:29:10 2009 +0200 shlwapi: Fix compilation on systems that don't support nameless unions. --- dlls/shlwapi/regstream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index eb906a7..4dc15ad 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -221,7 +221,7 @@ static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, D return STG_E_INVALIDFUNCTION; /* we cut off the high part here */ - This->dwPos = tmp.LowPart; + This->dwPos = tmp.u.LowPart; if (plibNewPosition) plibNewPosition->QuadPart = This->dwPos; @@ -240,7 +240,7 @@ static HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewS TRACE("(%p, %s)\n", This, wine_dbgstr_longlong(libNewSize.QuadPart)); /* we cut off the high part here */ - newLen = libNewSize.LowPart; + newLen = libNewSize.u.LowPart; newBuf = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->pbBuffer, newLen); if (!newBuf) return STG_E_INSUFFICIENTMEMORY;

1 0

Francois Gouget : shell32: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 915b69e2a72dabe9fb03ce1b52558f1d2040817e URL: http://source.winehq.org/git/wine.git/?a=commit;h=915b69e2a72dabe9fb03ce1b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:28:22 2009 +0200 shell32: Fix compilation on systems that don't support nameless unions. --- dlls/shell32/tests/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 7d9e7b2..5e97f61 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1408,7 +1408,7 @@ static void hook_WaitForInputIdle(void *new_func) /* Search for the correct imported module by walking the import descriptors */ import_descriptor = (PIMAGE_IMPORT_DESCRIPTOR)(base + import_directory_rva); - while (import_descriptor->OriginalFirstThunk != 0) + while (U(*import_descriptor).OriginalFirstThunk != 0) { char *import_module_name; @@ -1423,7 +1423,7 @@ static void hook_WaitForInputIdle(void *new_func) * arrays. We need the import name table to find the imported * routine and the import address table to patch the address, so * walk them side by side */ - int_entry = (PIMAGE_THUNK_DATA)(base + import_descriptor->OriginalFirstThunk); + int_entry = (PIMAGE_THUNK_DATA)(base + U(*import_descriptor).OriginalFirstThunk); iat_entry = (PIMAGE_THUNK_DATA)(base + import_descriptor->FirstThunk); while (int_entry->u1.Ordinal != 0) {

1 0

Francois Gouget : comctl32: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard 19 Oct '09

19 Oct '09

Module: wine Branch: master Commit: 32bba6222b79681ad4da606362d53550f36c3b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32bba6222b79681ad4da60636… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 17 20:35:12 2009 +0200 comctl32: Add a trailing '\n' to a Wine trace. --- dlls/comctl32/tab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 22af8d7..15534af 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -312,7 +312,7 @@ static LRESULT TAB_SetCurFocus (TAB_INFO *infoPtr, INT iItem) static inline LRESULT TAB_SetToolTips (TAB_INFO *infoPtr, HWND hwndToolTip) { - TRACE("%p %p", infoPtr, hwndToolTip); + TRACE("%p %p\n", infoPtr, hwndToolTip); infoPtr->hwndToolTip = hwndToolTip; return 0; }

1 0