wine-commits August 2006

wine-commits@winehq.org

5 participants
746 discussions

James Hawkins : msi: Update the DirectoryCombo control in response to the DirectoryListUp event .
by Alexandre Julliard 29 Aug '06

29 Aug '06

Module: wine Branch: master Commit: 6320d0adef3003d3bc941856c29c6bbb41f09df8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6320d0adef3003d3bc94185… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 28 17:54:43 2006 -0700 msi: Update the DirectoryCombo control in response to the DirectoryListUp event. --- dlls/msi/dialog.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 5fa599f..0e19cf0 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1979,6 +1979,27 @@ static UINT msi_dialog_list_box( msi_dia /******************** Directory Combo ***************************************/ +static void msi_dialog_update_directory_combo( msi_dialog *dialog ) +{ + msi_control *control; + LPWSTR prop, path; + BOOL indirect; + + control = msi_dialog_find_control( dialog, szDirectoryCombo ); + indirect = control->attributes & msidbControlAttributesIndirect; + prop = msi_dialog_dup_property( dialog, control->property, indirect ); + path = msi_dup_property( dialog->package, prop ); + + PathStripPathW( path ); + PathRemoveBackslashW( path ); + + SendMessageW( control->hwnd, CB_INSERTSTRING, 0, (LPARAM)path ); + SendMessageW( control->hwnd, CB_SETCURSEL, 0, 0 ); + + msi_free( path ); + msi_free( prop ); +} + static UINT msi_dialog_directory_combo( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; @@ -2035,6 +2056,7 @@ UINT msi_dialog_directorylist_up( msi_di MSI_SetPropertyW( dialog->package, prop, path ); + msi_dialog_update_directory_combo( dialog ); msi_dialog_update_pathedit( dialog ); msi_free( path );

1 0

James Hawkins : msi: Update the PathEdit control in response to the DirectoryListUp event.
by Alexandre Julliard 29 Aug '06

29 Aug '06

Module: wine Branch: master Commit: 2dbaccbe606f7a1ddec13717ccb93f28457d9355 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2dbaccbe606f7a1ddec1371… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 28 17:54:18 2006 -0700 msi: Update the PathEdit control in response to the DirectoryListUp event. --- dlls/msi/dialog.c | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 4ff8632..5fa599f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -197,6 +197,17 @@ static LPWSTR msi_get_deformatted_field( return ret; } +static LPWSTR msi_dialog_dup_property( msi_dialog *dialog, LPCWSTR property, BOOL indirect ) +{ + if (!property) + return NULL; + + if (indirect) + return msi_dup_property( dialog->package, property ); + + return strdupW( property ); +} + /* * msi_dialog_get_style * @@ -1411,6 +1422,23 @@ static UINT msi_dialog_pathedit_handler( return ERROR_SUCCESS; } +static void msi_dialog_update_pathedit( msi_dialog *dialog ) +{ + msi_control *control; + LPWSTR prop, path; + BOOL indirect; + + control = msi_dialog_find_control( dialog, szPathEdit ); + indirect = control->attributes & msidbControlAttributesIndirect; + prop = msi_dialog_dup_property( dialog, control->property, indirect ); + + path = msi_dup_property( dialog->package, prop ); + SetWindowTextW( control->hwnd, path ); + + msi_free( path ); + msi_free( prop ); +} + static UINT msi_dialog_pathedit_control( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; @@ -1951,17 +1979,6 @@ static UINT msi_dialog_list_box( msi_dia /******************** Directory Combo ***************************************/ -static LPWSTR msi_dialog_dup_property( msi_dialog *dialog, LPCWSTR property, BOOL indirect ) -{ - if (!property) - return NULL; - - if (indirect) - return msi_dup_property( dialog->package, property ); - - return strdupW( property ); -} - static UINT msi_dialog_directory_combo( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; @@ -2018,6 +2035,8 @@ UINT msi_dialog_directorylist_up( msi_di MSI_SetPropertyW( dialog->package, prop, path ); + msi_dialog_update_pathedit( dialog ); + msi_free( path ); msi_free( prop );

1 0

James Hawkins : msi: Highlight the text in the PathEdit control.
by Alexandre Julliard 29 Aug '06

29 Aug '06

Module: wine Branch: master Commit: 7df642117c2e23949a329ba6d070f7078427c0fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7df642117c2e23949a329ba… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 28 17:53:20 2006 -0700 msi: Highlight the text in the PathEdit control. --- dlls/msi/dialog.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 465af05..4ff8632 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1434,6 +1434,9 @@ static UINT msi_dialog_pathedit_control( val = msi_dup_property( dialog->package, prop ); SetWindowTextW( control->hwnd, val ); + + SendMessageW( control->hwnd, EM_SETSEL, 0, -1 ); + msi_free( val ); msi_free( indirect );

1 0

Dan Kegel : msi: Callers of alloc_msihandle should handle failure.
by Alexandre Julliard 29 Aug '06

29 Aug '06

Module: wine Branch: master Commit: 337e1e202f636404933cbb721366306f0d59b788 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=337e1e202f636404933cbb7… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Aug 28 09:44:35 2006 -0700 msi: Callers of alloc_msihandle should handle failure. --- dlls/msi/action.c | 4 ++++ dlls/msi/database.c | 2 ++ dlls/msi/msi.c | 2 ++ dlls/msi/msiquery.c | 8 ++++++++ dlls/msi/package.c | 6 ++++++ dlls/msi/preview.c | 2 ++ dlls/msi/suminfo.c | 2 ++ 7 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ce47d31..da7d7e8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3146,6 +3146,10 @@ static UINT ACTION_PublishProduct(MSIPAC /* FIXME: Need to write more keys to the user registry */ hDb= alloc_msihandle( &package->db->hdr ); + if (!hDb) { + rc = ERROR_NOT_ENOUGH_MEMORY; + goto end; + } rc = MsiGetSummaryInformationW(hDb, NULL, 0, &hSumInfo); MsiCloseHandle(hDb); if (rc == ERROR_SUCCESS) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 0dc3f85..609db23 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -190,6 +190,8 @@ UINT WINAPI MsiOpenDatabaseW(LPCWSTR szD if( ret == ERROR_SUCCESS ) { *phDB = alloc_msihandle( &db->hdr ); + if (! *phDB) + ret = ERROR_NOT_ENOUGH_MEMORY; msiobj_release( &db->hdr ); } diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7b100a1..d15f222 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -124,6 +124,8 @@ UINT WINAPI MsiOpenProductW( LPCWSTR szP if( r == ERROR_SUCCESS ) { *phProduct = alloc_msihandle( &package->hdr ); + if (! *phProduct) + r = ERROR_NOT_ENOUGH_MEMORY; msiobj_release( &package->hdr ); } return r; diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 06c6bf9..27d93f6 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -254,6 +254,8 @@ UINT WINAPI MsiDatabaseOpenViewW(MSIHAND if( ret == ERROR_SUCCESS ) { *phView = alloc_msihandle( &query->hdr ); + if (! *phView) + ret = ERROR_NOT_ENOUGH_MEMORY; msiobj_release( &query->hdr ); } msiobj_release( &db->hdr ); @@ -365,6 +367,8 @@ UINT WINAPI MsiViewFetch(MSIHANDLE hView if( ret == ERROR_SUCCESS ) { *record = alloc_msihandle( &rec->hdr ); + if (! *record) + ret = ERROR_NOT_ENOUGH_MEMORY; msiobj_release( &rec->hdr ); } msiobj_release( &query->hdr ); @@ -532,6 +536,8 @@ UINT WINAPI MsiViewGetColumnInfo(MSIHAND } *hRec = alloc_msihandle( &rec->hdr ); + if (! *hRec) + r = ERROR_NOT_ENOUGH_MEMORY; out: msiobj_release( &query->hdr ); @@ -830,6 +836,8 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysW( if( r == ERROR_SUCCESS ) { *phRec = alloc_msihandle( &rec->hdr ); + if (! *phRec) + r = ERROR_NOT_ENOUGH_MEMORY; msiobj_release( &rec->hdr ); } msiobj_release( &db->hdr ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 5a22957..871ccbf 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -365,6 +365,10 @@ static UINT msi_get_word_count( MSIPACKA MSIHANDLE suminfo; MSIHANDLE hdb = alloc_msihandle( &package->db->hdr ); + if (!hdb) { + ERR("Unable to allocate handle\n"); + return 0; + } rc = MsiGetSummaryInformationW( hdb, NULL, 0, &suminfo ); MsiCloseHandle(hdb); if (rc != ERROR_SUCCESS) @@ -584,6 +588,8 @@ UINT WINAPI MsiOpenPackageExW(LPCWSTR sz if( ret == ERROR_SUCCESS ) { *phPackage = alloc_msihandle( &package->hdr ); + if (! *phPackage) + ret = ERROR_NOT_ENOUGH_MEMORY; msiobj_release( &package->hdr ); } diff --git a/dlls/msi/preview.c b/dlls/msi/preview.c index 7ee6c22..161bcc7 100644 --- a/dlls/msi/preview.c +++ b/dlls/msi/preview.c @@ -76,6 +76,8 @@ UINT WINAPI MsiEnableUIPreview( MSIHANDL *phPreview = alloc_msihandle( &preview->hdr ); msiobj_release( &preview->hdr ); r = ERROR_SUCCESS; + if (! *phPreview) + r = ERROR_NOT_ENOUGH_MEMORY; } msiobj_release( &db->hdr ); diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 6e07a3a..7b54752 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -468,6 +468,8 @@ UINT WINAPI MsiGetSummaryInformationW( M *pHandle = alloc_msihandle( &si->hdr ); if( *pHandle ) ret = ERROR_SUCCESS; + else + ret = ERROR_NOT_ENOUGH_MEMORY; msiobj_release( &si->hdr ); }

1 0

Dan Kegel : msi: Remove limit on number of handles.
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: 29f0803c0239fe2495ffddd96471cd03475dc0db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29f0803c0239fe2495ffddd… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Aug 28 07:51:30 2006 -0700 msi: Remove limit on number of handles. --- dlls/msi/handle.c | 35 +++++++++++++++++++++++++++++------ dlls/msi/msipriv.h | 1 - dlls/msi/tests/db.c | 7 +------ 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/msi/handle.c b/dlls/msi/handle.c index 1cd82b3..3bcdb46 100644 --- a/dlls/msi/handle.c +++ b/dlls/msi/handle.c @@ -57,7 +57,8 @@ typedef struct msi_handle_info_t DWORD dwThreadId; } msi_handle_info; -static msi_handle_info msihandletable[MSIMAXHANDLES]; +static msi_handle_info *msihandletable = NULL; +static int msihandletable_size = 0; MSIHANDLE alloc_msihandle( MSIOBJECTHDR *obj ) { @@ -67,11 +68,29 @@ MSIHANDLE alloc_msihandle( MSIOBJECTHDR EnterCriticalSection( &MSI_handle_cs ); /* find a slot */ - for(i=0; i<MSIMAXHANDLES; i++) + for(i=0; i<msihandletable_size; i++) if( !msihandletable[i].obj ) break; - if( (i>=MSIMAXHANDLES) || msihandletable[i].obj ) - goto out; + if( i==msihandletable_size ) + { + msi_handle_info *p; + int newsize; + if (msihandletable_size == 0) + { + newsize = 256; + p = msi_alloc_zero(newsize*sizeof(msi_handle_info)); + } + else + { + newsize = msihandletable_size * 2; + p = msi_realloc_zero(msihandletable, + newsize*sizeof(msi_handle_info)); + } + if (!p) + goto out; + msihandletable = p; + msihandletable_size = newsize; + } msiobj_addref( obj ); msihandletable[i].obj = obj; @@ -92,7 +111,7 @@ void *msihandle2msiinfo(MSIHANDLE handle handle--; if( handle<0 ) goto out; - if( handle>=MSIMAXHANDLES ) + if( handle>=msihandletable_size ) goto out; if( !msihandletable[handle].obj ) goto out; @@ -230,14 +249,18 @@ UINT WINAPI MsiCloseAllHandles(void) TRACE("\n"); - for(i=0; i<MSIMAXHANDLES; i++) + EnterCriticalSection( &MSI_handle_cs ); + for(i=0; i<msihandletable_size; i++) { if(msihandletable[i].dwThreadId == GetCurrentThreadId()) { + LeaveCriticalSection( &MSI_handle_cs ); MsiCloseHandle( i+1 ); + EnterCriticalSection( &MSI_handle_cs ); n++; } } + LeaveCriticalSection( &MSI_handle_cs ); return n; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index abaa347..6f771da 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -271,7 +271,6 @@ #define MSI_BUILDNUMBER 4000 #define GUID_SIZE 39 #define MSIHANDLE_MAGIC 0x4d434923 -#define MSIMAXHANDLES 0xf0 DEFINE_GUID(CLSID_IMsiServer, 0x000C101C,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_IMsiServerX1, 0x000C103E,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 0a5b230..6b5336d 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1376,12 +1376,7 @@ static void test_handle_limit(void) r = MsiDatabaseOpenView(hdb, szQueryBuf, &hviews[i]); ok( r == ERROR_SUCCESS, "failed to open query %d\n", i); ok( hviews[i] != 0xdeadbeeb, "no handle set\n"); - if (i < 0xef) - ok( hviews[i] != 0, "%d'th handle is NULL\n", i); - else - todo_wine { - ok( hviews[i] != 0, "%d'th handle is NULL\n", i); - } + ok( hviews[i] != 0, "%d'th handle is NULL\n", i); if (!hviews[i]) break; ok( (i == 0 || (hviews[i] != hviews[i-1])),

1 0

Dan Kegel : msi/tests: Add test to verify we can create 4000 msi handles.
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: 98ec9399c4ac33b84b6ff88338722e83f379d427 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=98ec9399c4ac33b84b6ff88… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Aug 28 07:41:55 2006 -0700 msi/tests: Add test to verify we can create 4000 msi handles. --- dlls/msi/tests/db.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 781c6a5..0a5b230 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1356,6 +1356,49 @@ static void test_markers(void) DeleteFileA(msifile); } +#define MY_NVIEWS 4000 /* Largest installer I've seen uses < 2k */ +static void test_handle_limit(void) +{ + int i; + MSIHANDLE hdb; + MSIHANDLE hviews[MY_NVIEWS]; + UINT r; + + /* create an empty db */ + hdb = create_db(); + ok( hdb, "failed to create db\n"); + + memset(hviews, 0, sizeof(hviews)); + + for (i=0; i<MY_NVIEWS; i++) { + static char szQueryBuf[256] = "SELECT * from `_Tables`"; + hviews[i] = 0xdeadbeeb; + r = MsiDatabaseOpenView(hdb, szQueryBuf, &hviews[i]); + ok( r == ERROR_SUCCESS, "failed to open query %d\n", i); + ok( hviews[i] != 0xdeadbeeb, "no handle set\n"); + if (i < 0xef) + ok( hviews[i] != 0, "%d'th handle is NULL\n", i); + else + todo_wine { + ok( hviews[i] != 0, "%d'th handle is NULL\n", i); + } + if (!hviews[i]) + break; + ok( (i == 0 || (hviews[i] != hviews[i-1])), + "got handle %p twice\n", (void *) hviews[i] ); + } + + for (i=0; i<MY_NVIEWS; i++) { + if (hviews[i] != 0 && hviews[i] != 0xdeadbeeb) { + r = MsiCloseHandle(hviews[i]); + ok( r == ERROR_SUCCESS, "failed to close view handle %d\n", i); + } + } + + r = MsiCloseHandle(hdb); + ok( r == ERROR_SUCCESS, "failed to close database\n"); +} + START_TEST(db) { test_msidatabase(); @@ -1371,4 +1414,5 @@ START_TEST(db) test_where(); test_msiimport(); test_markers(); + test_handle_limit(); }

1 0

Robert Shearman : quartz: Use the absolute height of the bitmap format as a negative values simply means it is a top-down bitmap .
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: 7d6dbed3cf85822d372cccf4b445548487c6939e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7d6dbed3cf85822d372cccf… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Aug 28 14:18:07 2006 +0100 quartz: Use the absolute height of the bitmap format as a negative values simply means it is a top-down bitmap. --- dlls/quartz/videorenderer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 02fcc7a..eaaada6 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -318,7 +318,7 @@ static DWORD VideoRenderer_SendSampleDat This->WindowPos.left = 0; This->WindowPos.top = 0; This->WindowPos.right = width; - This->WindowPos.bottom = height; + This->WindowPos.bottom = abs(height); GetClientRect(This->hWnd, &This->DestRect); This->init = TRUE; }

1 0

Robert Shearman : ole32: Return errors if the attempt to start a LocalService object fails.
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: 679dfb029dc42d7b4c9f54ba646d612f1c4e6981 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=679dfb029dc42d7b4c9f54b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Aug 28 14:19:13 2006 +0100 ole32: Return errors if the attempt to start a LocalService object fails. --- dlls/ole32/rpc.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index cf55b4c..32c8318 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -833,12 +833,17 @@ static HRESULT create_local_service(REFC RegQueryValueExW(hkey, szServiceParams, NULL, &type, (LPBYTE)args[0], &sz); } r = start_local_service(buf, num_args, (LPCWSTR *)args); - if (r==ERROR_SUCCESS) - hres = S_OK; + if (r != ERROR_SUCCESS) + hres = REGDB_E_CLASSNOTREG; /* FIXME: check retval */ HeapFree(GetProcessHeap(),0,args[0]); } + else + { + WARN("No LocalService value\n"); + hres = REGDB_E_CLASSNOTREG; /* FIXME: check retval */ + } RegCloseKey(hkey); - + return hres; }

1 0

Robert Shearman : ole32: AppId is a value under the clsid key, rather than a key.
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: f463b9d4225a2d3ef929db9fdf449799de67968c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f463b9d4225a2d3ef929db9… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Aug 28 14:18:56 2006 +0100 ole32: AppId is a value under the clsid key, rather than a key. --- dlls/ole32/compobj.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 7ce8a69..cd3a5c3 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1138,12 +1138,12 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REF HRESULT hr; /* read the AppID value under the class's key */ - hr = COM_OpenKeyForCLSID(clsid, szAppId, KEY_READ, &hkey); + hr = COM_OpenKeyForCLSID(clsid, NULL, KEY_READ, &hkey); if (FAILED(hr)) return hr; size = sizeof(buf); - res = RegQueryValueExW(hkey, NULL, NULL, &type, (LPBYTE)buf, &size); + res = RegQueryValueExW(hkey, szAppId, NULL, &type, (LPBYTE)buf, &size); RegCloseKey(hkey); if (res == ERROR_FILE_NOT_FOUND) return REGDB_E_KEYMISSING;

1 0

Robert Shearman : ole32: Fix functions defined without specifying argument types by changing them to "(void)".
by Alexandre Julliard 28 Aug '06

28 Aug '06

Module: wine Branch: master Commit: 90387059194b1feb8b1271c666cd8c44fe07e315 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=90387059194b1feb8b1271c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Aug 28 14:18:15 2006 +0100 ole32: Fix functions defined without specifying argument types by changing them to "(void)". --- dlls/ole32/compobj.c | 2 +- dlls/ole32/git.c | 2 +- dlls/ole32/ole2.c | 4 ++-- dlls/ole32/regsvr.c | 4 ++-- dlls/ole32/stubmanager.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 0208bc5..7ce8a69 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2347,7 +2347,7 @@ HRESULT WINAPI CoFileTimeNow( FILETIME * return S_OK; } -static void COM_RevokeAllClasses() +static void COM_RevokeAllClasses(void) { EnterCriticalSection( &csRegisteredClassList ); diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index a56e1d4..c750287 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -391,7 +391,7 @@ static const IGlobalInterfaceTableVtbl S }; /** This function constructs the GIT. It should only be called once **/ -void* StdGlobalInterfaceTable_Construct() +void* StdGlobalInterfaceTable_Construct(void) { StdGlobalInterfaceTableImpl* newGIT; diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index bf6847c..164970d 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1814,7 +1814,7 @@ void WINAPI ReleaseStgMedium( * * Initializes the OLE drag and drop data structures. */ -static void OLEDD_Initialize() +static void OLEDD_Initialize(void) { WNDCLASSA wndClass; @@ -2160,7 +2160,7 @@ static void OLEDD_TrackStateChange(Track * a button state mask equivalent to the one passed in the * WM_MOUSEMOVE wParam. */ -static DWORD OLEDD_GetButtonState() +static DWORD OLEDD_GetButtonState(void) { BYTE keyboardState[256]; DWORD keyMask = 0; diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c index fad8f8a..b127c0d 100644 --- a/dlls/ole32/regsvr.c +++ b/dlls/ole32/regsvr.c @@ -636,7 +636,7 @@ static const struct regsvr_interface int /*********************************************************************** * DllRegisterServer (OLE32.@) */ -HRESULT WINAPI DllRegisterServer() +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; @@ -651,7 +651,7 @@ HRESULT WINAPI DllRegisterServer() /*********************************************************************** * DllUnregisterServer (OLE32.@) */ -HRESULT WINAPI DllUnregisterServer() +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index e0b0007..f187404 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -739,7 +739,7 @@ static const IRemUnknownVtbl RemUnknown_ }; /* starts the IRemUnknown listener for the current apartment */ -HRESULT start_apartment_remote_unknown() +HRESULT start_apartment_remote_unknown(void) { IRemUnknown *pRemUnknown; HRESULT hr = S_OK;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2006