August 2011 - Wine-commits - list.winehq.org

Jacek Caban : msi: Ude default calling convention for internal functions.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 9ef5af540b560fd16c77efdc32f974bbf8dca3a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef5af540b560fd16c77efdc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 31 16:15:22 2011 +0200 msi: Ude default calling convention for internal functions. --- dlls/msi/automation.c | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 1be56b1..8dc1e44 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -67,7 +67,7 @@ struct AutomationObject { MSIHANDLE msiHandle; /* A function that is called from AutomationObject::Invoke, specific to this type of object. */ - HRESULT (STDMETHODCALLTYPE *funcInvoke)( + HRESULT (*funcInvoke)( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -80,7 +80,7 @@ struct AutomationObject { /* A function that is called from AutomationObject::Release when the object is being freed to free any private * data structures (or NULL) */ - void (STDMETHODCALLTYPE *funcFree)(AutomationObject* This); + void (*funcFree)(AutomationObject* This); }; /* @@ -151,11 +151,9 @@ HRESULT load_type_info(IDispatch *iface, ITypeInfo **pptinfo, REFIID clsid, LCID /* Create the automation object, placing the result in the pointer ppObj. The automation object is created * with the appropriate clsid and invocation function. */ -static HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, LPVOID *ppObj, REFIID clsid, - HRESULT (STDMETHODCALLTYPE *funcInvoke)(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*, - VARIANT*,EXCEPINFO*,UINT*), - void (STDMETHODCALLTYPE *funcFree)(AutomationObject*), - SIZE_T sizetPrivateData) +static HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, void **ppObj, REFIID clsid, + HRESULT (*funcInvoke)(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*), + void (*funcFree)(AutomationObject*), SIZE_T sizetPrivateData) { AutomationObject *object; HRESULT hr; @@ -732,7 +730,7 @@ static HRESULT DispGetParam_CopyOnly( &pdispparams->rgvarg[pos]); } -static HRESULT WINAPI SummaryInfoImpl_Invoke( +static HRESULT SummaryInfoImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -884,7 +882,7 @@ static HRESULT WINAPI SummaryInfoImpl_Invoke( return S_OK; } -static HRESULT WINAPI RecordImpl_Invoke( +static HRESULT RecordImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -975,7 +973,7 @@ static HRESULT WINAPI RecordImpl_Invoke( return S_OK; } -static HRESULT WINAPI ListImpl_Invoke( +static HRESULT ListImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -1034,7 +1032,7 @@ static HRESULT WINAPI ListImpl_Invoke( return S_OK; } -static void WINAPI ListImpl_Free(AutomationObject *This) +static void ListImpl_Free(AutomationObject *This) { ListData *data = private_data(This); ULONG idx; @@ -1044,7 +1042,7 @@ static void WINAPI ListImpl_Free(AutomationObject *This) msi_free(data->pVars); } -static HRESULT WINAPI ViewImpl_Invoke( +static HRESULT ViewImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -1151,7 +1149,7 @@ static HRESULT DatabaseImpl_LastErrorRecord(WORD wFlags, return S_OK; } -static HRESULT WINAPI DatabaseImpl_Invoke( +static HRESULT DatabaseImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -1236,7 +1234,7 @@ static HRESULT WINAPI DatabaseImpl_Invoke( return S_OK; } -static HRESULT WINAPI SessionImpl_Invoke( +static HRESULT SessionImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -2306,7 +2304,7 @@ done: return hr; } -static HRESULT WINAPI InstallerImpl_Invoke( +static HRESULT InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid,

1 0

Francois Gouget : po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Czech translation .
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 969dfda8a60f91dedc91e8c7e2c09367b3cac0ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=969dfda8a60f91dedc91e8c7e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 31 15:56:47 2011 +0200 po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Czech translation. --- po/cs.po | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/po/cs.po b/po/cs.po index 826a6b4..0ab84b8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7974,6 +7974,7 @@ msgid "Clock" msgstr "Hodiny" #: cmd.rc:30 +#, fuzzy msgid "ATTRIB shows or changes DOS file attributes.\n" msgstr "Nápověda k ATTRIB\n" @@ -7997,12 +7998,14 @@ msgstr "" "volanou procedurou jsou zděděny volajícím.\n" #: cmd.rc:41 +#, fuzzy msgid "" "CD <dir> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "Nápověda k CD\n" #: cmd.rc:42 +#, fuzzy msgid "CHDIR <dir> changes the current default directory.\n" msgstr "Nápověda k CHDIR\n" @@ -8011,22 +8014,27 @@ msgid "CLS clears the console screen.\n" msgstr "CLS vymaže obrazovku terminálu\n" #: cmd.rc:46 +#, fuzzy msgid "COPY <filename> copies a file.\n" msgstr "Nápověda k COPY\n" #: cmd.rc:47 +#, fuzzy msgid "CTTY changes the input/output device.\n" msgstr "Nápověda k CTTY\n" #: cmd.rc:48 +#, fuzzy msgid "DATE shows or changes the system date.\n" msgstr "Nápověda k DATE\n" #: cmd.rc:49 +#, fuzzy msgid "DEL <filename> deletes a file or set of files.\n" msgstr "Nápověda k DEL\n" #: cmd.rc:50 +#, fuzzy msgid "DIR lists the contents of a directory.\n" msgstr "Nápověda k DIR\n" @@ -8051,6 +8059,7 @@ msgstr "" "na terminálové zařízení.\n" #: cmd.rc:62 +#, fuzzy msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "Nápověda k ERASE\n" @@ -8096,6 +8105,7 @@ msgstr "" "GOTO se nedá použít interaktivně.\n" #: cmd.rc:85 +#, fuzzy msgid "" "HELP <command> shows brief help details on a topic.\n" "HELP without an argument shows all CMD built-in commands.\n" @@ -8136,10 +8146,12 @@ msgstr "" "Jmenovku si můžete zobrazit příkazem VOL.\n" #: cmd.rc:104 +#, fuzzy msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" msgstr "Nápověda k MD\n" #: cmd.rc:105 +#, fuzzy msgid "MKDIR <name> creates a subdirectory.\n" msgstr "Nápověda k MKDIR\n" @@ -8246,6 +8258,7 @@ msgstr "" "nejsou vykonány. REM je proto používán jako komentářový příkaz.\n" #: cmd.rc:157 +#, fuzzy msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "Nápověda k REN\n" @@ -8255,10 +8268,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "Nápověda k RENAME\n" #: cmd.rc:160 +#, fuzzy msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgstr "Nápověda k RD\n" #: cmd.rc:161 +#, fuzzy msgid "RMDIR <dir> deletes a subdirectory.\n" msgstr "Nápověda k RMDIR\n" @@ -8310,6 +8325,7 @@ msgstr "" "efekt, je-li zadán na příkazovou řádku.\n" #: cmd.rc:186 +#, fuzzy msgid "TIME sets or shows the current system time.\n" msgstr "Nápověda k TIME\n" @@ -8350,6 +8366,7 @@ msgid "VER displays the version of cmd you are running.\n" msgstr "VER zobrazí verzi spuštěného programu cmd.\n" #: cmd.rc:206 +#, fuzzy msgid "VOL shows the volume label of a disk device.\n" msgstr "Nápověda k VOL\n"

1 0

Francois Gouget : po: Fix some typography issues in the Bulgarian translation.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: ea82376dad4e15623960efa8ba329a79a2486581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea82376dad4e15623960efa8b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 31 16:01:20 2011 +0200 po: Fix some typography issues in the Bulgarian translation. --- po/bg.po | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/po/bg.po b/po/bg.po index 8acb202..a2259c4 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2228,7 +2228,7 @@ msgstr "&Отметки" #: ieframe.rc:52 regedit.rc:73 msgid "&Add to Favorites..." -msgstr "&Добави към отметките" +msgstr "&Добави към отметките..." #: ieframe.rc:55 shell32.rc:125 clock.rc:41 notepad.rc:57 oleview.rc:69 #: progman.rc:52 regedit.rc:76 taskmgr.rc:87 winefile.rc:85 winemine.rc:48 @@ -5611,7 +5611,7 @@ msgstr "източника за инсталация на функционалн #: msi.rc:59 msgid "network drive for feature missing" -msgstr "мрежовото устройства нужно за функционалността липсва " +msgstr "мрежовото устройства нужно за функционалността липсва" #: msi.rc:60 msgid "feature from:" @@ -6741,7 +6741,7 @@ msgstr "Папката не може да бъде създадена: Дост #: shell32.rc:167 msgid "Error during creation of a new folder" -msgstr "Грешка при създаването на нова папка." +msgstr "Грешка при създаването на нова папка" #: shell32.rc:168 msgid "Confirm file deletion" @@ -8620,7 +8620,7 @@ msgid "" "You did not enter any text.\n" "Please type something and try again." msgstr "" -"Не сте въвели никакъв текст. \n" +"Не сте въвели никакъв текст.\n" "Напишете нещо и опитайте отново." #: notepad.rc:83 @@ -8629,8 +8629,7 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"Файлът '%s'\n" -"не съществува\n" +"Файлът '%s' не съществува.\n" "\n" " Искате ли да създадете нов файл?" @@ -8640,8 +8639,7 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"Файлът '%s'\n" -"е бил променен\n" +"Файлът '%s' е бил променен.\n" "\n" " Искате ли да съхраните промените?" @@ -9216,7 +9214,7 @@ msgstr "&Разделител" #: regedit.rc:74 msgid "&Remove Favorite..." -msgstr "&Премахни отметка" +msgstr "&Премахни отметка..." #: regedit.rc:79 msgid "&About Registry Editor" @@ -9306,11 +9304,11 @@ msgstr "Излиза от редактора на системния регис #: regedit.rc:161 msgid "Adds keys to the favorites list" -msgstr "Добавя ключове към списъка с отметките..." +msgstr "Добавя ключове към списъка с отметките" #: regedit.rc:162 msgid "Removes keys from the favorites list" -msgstr "Премахва ключове от списъка с отметките..." +msgstr "Премахва ключове от списъка с отметките" #: regedit.rc:163 msgid "Shows or hides the status bar" @@ -10203,7 +10201,7 @@ msgid "" "Changing the load order of this library is not recommended.\n" "Are you sure you want to do this?" msgstr "" -"Промяната на реда на зареждане не е препоръчителна. Сигурни ли сте, че " +"Промяната на реда на зареждане не е препоръчителна.\nСигурни ли сте, че " "искате да направите това?" #: winecfg.rc:61 @@ -10874,7 +10872,7 @@ msgstr "Винаги от&горе" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "&Информация..." +msgstr "&Информация" #: winhlp32.rc:64 #, fuzzy

1 0

Frédéric Delanoy : cmd/tests: Add pushd/ popd tests.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: ba094f2830c460174557a3c5726025eb1a1bd3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba094f2830c460174557a3c57… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 30 23:33:52 2011 +0200 cmd/tests: Add pushd/popd tests. --- programs/cmd/tests/test_builtins.cmd | 33 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 15 +++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f473b91..5bd375e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1027,6 +1027,39 @@ if not exist foobar (echo foobar removed) else echo foobar not removed! if not exist bar\baz (echo bar\baz removed) else echo bar\baz not removed! cd .. & rd /s/q foobaz +echo ----------- Testing pushd/popd ----------- +cd +echo ...popd is no-op when dir stack is empty +popd +cd +echo ...pushing non-existing dir +pushd foobar +cd +echo ...basic behaviour +mkdir foobar\baz +pushd foobar +cd +popd +cd +pushd foobar +pushd baz +cd +popd +cd +pushd baz +popd +cd +popd +cd +pushd . +cd foobar\baz +pushd .. +cd +popd +popd +cd +rd /s/q foobar + echo ------------ Testing attrib -------------- rem FIXME Add tests for archive, hidden and system attributes + mixed attributes modifications mkdir foobar & cd foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 5419476..c67b10f 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -634,6 +634,21 @@ foo removed bar removed foobar removed bar\baz removed +----------- Testing pushd/popd ----------- +(a)pwd@ +...popd is no-op when dir stack is empty +(a)pwd@ +...pushing non-existing dir +(a)pwd@ +...basic behaviour +(a)pwd@\foobar +(a)pwd@ +(a)pwd@\foobar\baz +(a)pwd@\foobar +(a)pwd@\foobar +(a)pwd@ +(a)pwd@\foobar +(a)pwd@ ------------ Testing attrib -------------- @todo_wine(a)A @pwd@\foobar\foo(a)or_broken@A @pwd@\foobar\foo(a)or_broken@A I @pwd@\foobar\foo ... read-only attribute

1 0

Octavian Voicu : msxml3/tests: Fix a warning in saxreader tests when compiling on x64.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 9e3d83e003f89cc3f8666d88e90d94b0e266ed69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3d83e003f89cc3f8666d88e… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Aug 31 02:20:59 2011 +0300 msxml3/tests: Fix a warning in saxreader tests when compiling on x64. --- dlls/msxml3/tests/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index b5800d0..8a75211 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1934,7 +1934,7 @@ static void test_mxwriter_stream(void) IMXWriter_Release(writer); ok(current_write_test->last, "The last %d write calls on test %d were missed\n", - current_write_test-test->expected_writes, current_stream_test_index); + (int)(current_write_test-test->expected_writes), current_stream_test_index); } hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER,

1 0

Octavian Voicu : ieframe: Fix a few incorrect pointer/ integer casts on 64-bit.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: f8d0afe4355d5054359585f61bef846f66d0e9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d0afe4355d5054359585f61… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Aug 31 13:51:24 2011 +0300 ieframe: Fix a few incorrect pointer/integer casts on 64-bit. --- dlls/ieframe/iexplore.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 99e3003..d5fd56c 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -873,7 +873,7 @@ static BOOL create_ie_window(LPCSTR cmdline) return TRUE; } -static ULONG open_dde_url(WCHAR *dde_url) +static HDDEDATA open_dde_url(WCHAR *dde_url) { InternetExplorer *ie = NULL, *iter; WCHAR *url, *url_end; @@ -928,7 +928,7 @@ static ULONG open_dde_url(WCHAR *dde_url) return 0; IWebBrowser2_Release(&ie->IWebBrowser2_iface); - return DDE_FACK; + return ULongToHandle(DDE_FACK); } static HDDEDATA WINAPI dde_proc(UINT type, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA data, @@ -937,7 +937,7 @@ static HDDEDATA WINAPI dde_proc(UINT type, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ switch(type) { case XTYP_CONNECT: TRACE("XTYP_CONNECT %p\n", hsz1); - return (HDDEDATA)!DdeCmpStringHandles(hsz1, ddestr_openurl); + return ULongToHandle(!DdeCmpStringHandles(hsz1, ddestr_openurl)); case XTYP_EXECUTE: { WCHAR *url; @@ -961,7 +961,7 @@ static HDDEDATA WINAPI dde_proc(UINT type, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ break; } - ret = (HDDEDATA)open_dde_url(url); + ret = open_dde_url(url); heap_free(url); return ret; @@ -999,7 +999,7 @@ static void init_dde(void) if(!ddestr_openurl) WARN("Failed to create string handle: %u\n", DdeGetLastError(dde_inst)); - res = (ULONG)DdeNameService(dde_inst, ddestr_iexplore, 0, DNS_REGISTER); + res = HandleToULong(DdeNameService(dde_inst, ddestr_iexplore, 0, DNS_REGISTER)); if(res != DMLERR_NO_ERROR) WARN("DdeNameService failed: %u\n", res); }

1 0

Octavian Voicu : ole32: Fix a few incorrect pointer/integer casts on 64-bit .
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 9b1fc0fd74d48bffb3987bb3c59088b2fd16d607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b1fc0fd74d48bffb3987bb3c… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Aug 31 13:52:02 2011 +0300 ole32: Fix a few incorrect pointer/integer casts on 64-bit. --- dlls/ole32/pointermoniker.c | 2 +- dlls/ole32/tests/moniker.c | 4 ++-- dlls/ole32/usrmarshal.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index d79afd2..d39be1d 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -370,7 +370,7 @@ static HRESULT WINAPI PointerMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) if (pdwHash==NULL) return E_POINTER; - *pdwHash = (DWORD)This->pObject; + *pdwHash = PtrToUlong(This->pObject); return S_OK; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 54a5f8c..aa57b9b 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1780,9 +1780,9 @@ static void test_pointer_moniker(void) /* Hashing */ hr = IMoniker_Hash(moniker, &hash); ok_ole_success(hr, IMoniker_Hash); - ok(hash == (DWORD)&Test_ClassFactory, + ok(hash == PtrToUlong(&Test_ClassFactory), "Hash value should have been 0x%08x, instead of 0x%08x\n", - (DWORD)&Test_ClassFactory, hash); + PtrToUlong(&Test_ClassFactory), hash); /* IsSystemMoniker test */ hr = IMoniker_IsSystemMoniker(moniker, &moniker_type); diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 2d238e6..8f5feef 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -429,7 +429,7 @@ unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBu { *(ULONG *)pBuffer = WDT_REMOTE_CALL; pBuffer += sizeof(ULONG); - *(ULONG *)pBuffer = (ULONG)*phGlobal; + *(ULONG *)pBuffer = HandleToULong(*phGlobal); pBuffer += sizeof(ULONG); if (*phGlobal) { @@ -437,7 +437,7 @@ unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBu SIZE_T size = GlobalSize(*phGlobal); *(ULONG *)pBuffer = (ULONG)size; pBuffer += sizeof(ULONG); - *(ULONG *)pBuffer = (ULONG)*phGlobal; + *(ULONG *)pBuffer = HandleToULong(*phGlobal); pBuffer += sizeof(ULONG); *(ULONG *)pBuffer = (ULONG)size; pBuffer += sizeof(ULONG);

1 0

Michael Stefaniuc : shell32: Pass objects instead of ifaces to helpers.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 2cf8335d70044c6c33c0499650eb8f9e6daa4fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf8335d70044c6c33c049965… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 14:14:10 2011 +0200 shell32: Pass objects instead of ifaces to helpers. --- dlls/shell32/shv_bg_cmenu.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index 5b1b434..bd99d3a 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -189,10 +189,9 @@ static HRESULT WINAPI ISVBgCm_fnQueryContextMenu( * DoNewFolder */ static void DoNewFolder( - IContextMenu2 *iface, + BgCmImpl *This, IShellView *psv) { - BgCmImpl *This = (BgCmImpl *)iface; ISFHelper * psfhlp; WCHAR wszName[MAX_PATH]; @@ -220,9 +219,8 @@ static void DoNewFolder( * DoPaste */ static BOOL DoPaste( - IContextMenu2 *iface) + BgCmImpl *This) { - BgCmImpl *This = (BgCmImpl *)iface; BOOL bSuccess = FALSE; IDataObject * pda; @@ -343,7 +341,7 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand( if (! strcmp(lpcmi->lpVerb,CMDSTR_NEWFOLDERA)) { - DoNewFolder(iface, lpSV); + DoNewFolder(This, lpSV); } else if (! strcmp(lpcmi->lpVerb,CMDSTR_VIEWLISTA)) { @@ -367,11 +365,11 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand( break; case FCIDM_SHVIEW_NEWFOLDER: - DoNewFolder(iface, lpSV); + DoNewFolder(This, lpSV); break; case FCIDM_SHVIEW_INSERT: - DoPaste(iface); + DoPaste(This); break; case FCIDM_SHVIEW_PROPERTIES:

1 0

Michael Stefaniuc : shell32: COM cleanup in shv_bg_cmenu.c.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 47a705965b8f5c9ca5fdd42e54df3a9a104bdcad URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a705965b8f5c9ca5fdd42e5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 14:15:45 2011 +0200 shell32: COM cleanup in shv_bg_cmenu.c. --- dlls/shell32/shv_bg_cmenu.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index bd99d3a..7b9e6c6 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); */ typedef struct { - const IContextMenu2Vtbl *lpVtbl; + IContextMenu2 IContextMenu2_iface; IShellFolder* pSFParent; LONG ref; BOOL bDesktop; @@ -52,6 +52,11 @@ typedef struct static const IContextMenu2Vtbl cmvt; +static inline BgCmImpl *impl_from_IContextMenu2(IContextMenu2 *iface) +{ + return CONTAINING_RECORD(iface, BgCmImpl, IContextMenu2_iface); +} + /************************************************************************** * ISVBgCm_Constructor() */ @@ -60,14 +65,14 @@ IContextMenu2 *ISvBgCm_Constructor(IShellFolder* pSFParent, BOOL bDesktop) BgCmImpl* cm; cm = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(BgCmImpl)); - cm->lpVtbl = &cmvt; + cm->IContextMenu2_iface.lpVtbl = &cmvt; cm->ref = 1; cm->pSFParent = pSFParent; cm->bDesktop = bDesktop; if(pSFParent) IShellFolder_AddRef(pSFParent); TRACE("(%p)->()\n",cm); - return (IContextMenu2*)cm; + return &cm->IContextMenu2_iface; } /************************************************************************** @@ -75,7 +80,7 @@ IContextMenu2 *ISvBgCm_Constructor(IShellFolder* pSFParent, BOOL bDesktop) */ static HRESULT WINAPI ISVBgCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) { - BgCmImpl *This = (BgCmImpl *)iface; + BgCmImpl *This = impl_from_IContextMenu2(iface); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); @@ -107,7 +112,7 @@ static HRESULT WINAPI ISVBgCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid */ static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface) { - BgCmImpl *This = (BgCmImpl *)iface; + BgCmImpl *This = impl_from_IContextMenu2(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -120,7 +125,7 @@ static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface) */ static ULONG WINAPI ISVBgCm_fnRelease(IContextMenu2 *iface) { - BgCmImpl *This = (BgCmImpl *)iface; + BgCmImpl *This = impl_from_IContextMenu2(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(count=%i)\n", This, refCount + 1); @@ -149,12 +154,11 @@ static HRESULT WINAPI ISVBgCm_fnQueryContextMenu( UINT idCmdLast, UINT uFlags) { - HMENU hMyMenu; - UINT idMax; + BgCmImpl *This = impl_from_IContextMenu2(iface); + HMENU hMyMenu; + UINT idMax; HRESULT hr; - BgCmImpl *This = (BgCmImpl *)iface; - TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -318,9 +322,8 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand( IContextMenu2 *iface, LPCMINVOKECOMMANDINFO lpcmi) { - BgCmImpl *This = (BgCmImpl *)iface; - - LPSHELLBROWSER lpSB; + BgCmImpl *This = impl_from_IContextMenu2(iface); + LPSHELLBROWSER lpSB; LPSHELLVIEW lpSV = NULL; HWND hWndSV = 0; @@ -405,7 +408,7 @@ static HRESULT WINAPI ISVBgCm_fnGetCommandString( LPSTR lpszName, UINT uMaxNameLen) { - BgCmImpl *This = (BgCmImpl *)iface; + BgCmImpl *This = impl_from_IContextMenu2(iface); TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); @@ -437,7 +440,7 @@ static HRESULT WINAPI ISVBgCm_fnHandleMenuMsg( WPARAM wParam, LPARAM lParam) { - BgCmImpl *This = (BgCmImpl *)iface; + BgCmImpl *This = impl_from_IContextMenu2(iface); FIXME("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam);

1 0

Michael Mc Donnell : d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXCreateCylinder.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: bae50905c513decb3fd3755771a7c1492f65887d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae50905c513decb3fd375577… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Aug 19 19:04:40 2011 +0200 d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXCreateCylinder. --- dlls/d3dx9_36/mesh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6fc3ef5..d07d4bd 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4232,14 +4232,14 @@ HRESULT WINAPI D3DXCreateCylinder(LPDIRECT3DDEVICE9 device, FLOAT radius1, FLOAT return hr; } - hr = cylinder->lpVtbl->LockVertexBuffer(cylinder, D3DLOCK_DISCARD, (LPVOID *)&vertices); + hr = cylinder->lpVtbl->LockVertexBuffer(cylinder, 0, (LPVOID *)&vertices); if (FAILED(hr)) { cylinder->lpVtbl->Release(cylinder); return hr; } - hr = cylinder->lpVtbl->LockIndexBuffer(cylinder, D3DLOCK_DISCARD, (LPVOID *)&faces); + hr = cylinder->lpVtbl->LockIndexBuffer(cylinder, 0, (LPVOID *)&faces); if (FAILED(hr)) { cylinder->lpVtbl->UnlockVertexBuffer(cylinder);

1 0