wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Tim Cadogan-Cowper : winmm: Wrap TRACE strings with debugstr_a/debugstr_an.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: d6610b8b3a77aa9f85a1070fdcd57b5c6e719fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6610b8b3a77aa9f85a1070fd… Author: Tim Cadogan-Cowper <tccowper(a)yahoo.com.au> Date: Wed Jul 21 20:17:48 2010 +1000 winmm: Wrap TRACE strings with debugstr_a/debugstr_an. --- dlls/winmm/mmio.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index a6e06b5..3f0790d 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -584,7 +584,7 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, MMIOINFO mmioinfo; DWORD pos; - TRACE("('%s', %p, %08X, %s);\n", szFileName, refmminfo, dwOpenFlags, is_unicode ? "unicode" : "ansi"); + TRACE("(%s, %p, %08X, %s);\n", debugstr_a(szFileName), refmminfo, dwOpenFlags, is_unicode ? "unicode" : "ansi"); if (!refmminfo) { refmminfo = &mmioinfo; @@ -1058,7 +1058,7 @@ FOURCC WINAPI mmioStringToFOURCCA(LPCSTR sz, UINT uFlags) /* Pad with spaces */ while (i < 4) cc[i++] = ' '; - TRACE("Got '%.4s'\n",cc); + TRACE("Got %s\n",debugstr_an(cc,4)); return mmioFOURCC(cc[0],cc[1],cc[2],cc[3]); } @@ -1173,8 +1173,8 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, srchType = lpck->fccType; } - TRACE("searching for %4.4s.%4.4s\n", - (LPCSTR)&srchCkId, srchType ? (LPCSTR)&srchType : "any"); + TRACE("searching for %s.%s\n", + debugstr_an((LPCSTR)&srchCkId, 4), srchType ? debugstr_an((LPCSTR)&srchType, 4) : "<any>"); while (TRUE) { @@ -1189,9 +1189,9 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, } lpck->dwDataOffset = dwOldPos + 2 * sizeof(DWORD); - TRACE("ckid=%4.4s fcc=%4.4s cksize=%08X !\n", - (LPCSTR)&lpck->ckid, - srchType ? (LPCSTR)&lpck->fccType:"<na>", + TRACE("ckid=%s fcc=%s cksize=%08X !\n", + debugstr_an((LPCSTR)&lpck->ckid, 4), + srchType ? debugstr_an((LPCSTR)&lpck->fccType, 4) : "<na>", lpck->cksize); if ( (!srchCkId || (srchCkId == lpck->ckid)) && (!srchType || (srchType == lpck->fccType)) ) @@ -1213,9 +1213,9 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck, mmioSeek(hmmio, lpck->dwDataOffset, SEEK_SET); lpck->fccType = 0; } - TRACE("lpck: ckid=%.4s, cksize=%d, dwDataOffset=%d fccType=%08X (%.4s)!\n", - (LPSTR)&lpck->ckid, lpck->cksize, lpck->dwDataOffset, - lpck->fccType, srchType?(LPSTR)&lpck->fccType:""); + TRACE("lpck: ckid=%s, cksize=%d, dwDataOffset=%d fccType=%08X (%s)!\n", + debugstr_an((LPSTR)&lpck->ckid, 4), lpck->cksize, lpck->dwDataOffset, + lpck->fccType, srchType ? debugstr_an((LPSTR)&lpck->fccType, 4):""); return MMSYSERR_NOERROR; } @@ -1272,7 +1272,7 @@ MMRESULT WINAPI mmioCreateChunk(HMMIO hmmio, MMCKINFO* lpck, UINT uFlags) else if (uFlags == MMIO_CREATERIFF) lpck->ckid = FOURCC_RIFF; - TRACE("ckid=%.4s\n", (LPSTR)&lpck->ckid); + TRACE("ckid=%s\n", debugstr_an((LPSTR)&lpck->ckid, 4)); size = 2 * sizeof(DWORD); lpck->dwDataOffset = dwOldPos + size; @@ -1302,7 +1302,7 @@ MMRESULT WINAPI mmioRenameA(LPCSTR szFileName, LPCSTR szNewFileName, struct IOProcList tmp; FOURCC fcc; - TRACE("('%s', '%s', %p, %08X);\n", + TRACE("(%s, %s, %p, %08X);\n", debugstr_a(szFileName), debugstr_a(szNewFileName), lpmmioinfo, dwFlags); /* If both params are NULL, then parse the file name */

1 0

André Hentschel : ws2_32: Fix test message.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 6c144d06fe8ee504db1244926c71ad63faada2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c144d06fe8ee504db1244926… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 21 17:24:17 2010 +0200 ws2_32: Fix test message. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9217913..19d29bf 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3190,7 +3190,7 @@ static void test_events(int useMessages) bret = GetOverlappedResult((HANDLE)src, &ov, &bytesReturned, FALSE); ok((bret && bytesReturned == 1) || broken(!bret && GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */, "Got %d instead of 1 (%d - %d)\n", bytesReturned, bret, GetLastError()); - ok(buffer[0] == '2', "Got %c instead of 2\n", buffer[1]); + ok(buffer[0] == '2', "Got %c instead of 2\n", buffer[0]); } else if (dwRet == WAIT_TIMEOUT) {

1 0

Matteo Bruni : d3dx9: Shader assembler <= ps_1_3 support.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: d567a030ecfbb68f2f61f969040cd837339b136d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d567a030ecfbb68f2f61f9690… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 21 17:07:24 2010 +0200 d3dx9: Shader assembler <= ps_1_3 support. --- dlls/d3dx9_36/asmparser.c | 381 ++++++++++++++++++++++++++++++++++---- dlls/d3dx9_36/asmshader.y | 12 +- dlls/d3dx9_36/bytecodewriter.c | 314 ++++++++++++++++++++++++++++++- dlls/d3dx9_36/d3dx9_36_private.h | 10 + dlls/d3dx9_36/tests/asm.c | 46 +++++- 5 files changed, 713 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d567a030ecfbb68f2f61f…

1 0

Matteo Bruni : d3dx9: Add <= ps_1_3 instruction parsing to the shader assembler.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 8ce3ecea0d9f1f999edf1ba369190b355cb9502a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce3ecea0d9f1f999edf1ba36… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 21 17:07:24 2010 +0200 d3dx9: Add <= ps_1_3 instruction parsing to the shader assembler. --- dlls/d3dx9_36/asmshader.l | 17 ++++++ dlls/d3dx9_36/asmshader.y | 102 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 30 +++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 15 ++++++ 4 files changed, 164 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ce3ecea0d9f1f999edf1…

1 0

Matteo Bruni : d3dx9: Fix dst register handling in ps_1_4.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 383a7fe3b12832bee9abae767e433c25ff6ddfc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=383a7fe3b12832bee9abae767… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 21 17:07:24 2010 +0200 d3dx9: Fix dst register handling in ps_1_4. --- dlls/d3dx9_36/asmparser.c | 2 +- dlls/d3dx9_36/tests/asm.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 10188a0..dfa8362 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -838,7 +838,7 @@ static void asmparser_dstreg_ps_1_4(struct asm_parser *This, debug_print_dstreg(dst)); set_parse_status(This, PARSE_ERR); } - reg = map_oldps_register(dst, FALSE); + reg = map_oldps_register(dst, TRUE); memcpy(&instr->dst, &reg, sizeof(reg)); instr->has_dst = TRUE; } diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index fe3eee0..7d7d211 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -583,11 +583,21 @@ static void ps_1_4_test(void) { "texdepth_x2 r5\n", {0xffff0104, 0x00000057, 0x810f0005, 0x0000ffff} }, - { /* shader 18 */ + { /* shader 19 */ "ps_1_4\n" "bem_d2 r1, c0, r0\n", {0xffff0104, 0x00000059, 0x8f0f0001, 0xa0e40000, 0x80e40000, 0x0000ffff} }, + { /* shader 20 */ + "ps_1_4\n" + "texkill t0\n", + {0xffff0104, 0x00000041, 0xb00f0000, 0x0000ffff} + }, + { /* shader 21 */ + "ps_1_4\n" + "texkill r0\n", + {0xffff0104, 0x00000041, 0x800f0000, 0x0000ffff} + }, }; exec_tests("ps_1_4", tests, sizeof(tests) / sizeof(tests[0]));

1 0

Alexandre Julliard : rpcrt4: Don' t align the buffer after reading the conformance, we need to read the variance first.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: ee5cada23580f4df61c9e88cd209821c43f63865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5cada23580f4df61c9e88cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 20:31:53 2010 +0200 rpcrt4: Don't align the buffer after reading the conformance, we need to read the variance first. --- dlls/rpcrt4/ndr_marshall.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3ad55aa..db8be60 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2062,7 +2062,6 @@ static inline ULONG array_read_conformance( unsigned char fc, PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { DWORD def, esize; - unsigned char alignment; switch (fc) { @@ -2087,7 +2086,6 @@ static inline ULONG array_read_conformance( ReadConformance(pStubMsg, NULL); return safe_multiply(esize, pStubMsg->MaxCount); case RPC_FC_BOGUS_ARRAY: - alignment = pFormat[1] + 1; def = *(const WORD *)(pFormat + 2); pFormat += 4; if (IsConformanceOrVariancePresent(pFormat)) pFormat = ReadConformance(pStubMsg, pFormat); @@ -2098,7 +2096,6 @@ static inline ULONG array_read_conformance( } pFormat = SkipVariance( pStubMsg, pFormat ); - align_pointer(&pStubMsg->Buffer, alignment); esize = ComplexStructSize(pStubMsg, pFormat); return safe_multiply(pStubMsg->MaxCount, esize); default:

1 0

David Hedberg : include: Add IFileDialogControlEvents interface declaration .
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 17bc7be58dd16ce966b70171b844349e0b2a5b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17bc7be58dd16ce966b70171b… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jul 20 16:39:13 2010 +0200 include: Add IFileDialogControlEvents interface declaration. --- include/shobjidl.idl | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 9b5fc17..d634d53 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2756,3 +2756,32 @@ interface IFileDialogCustomize : IUnknown [in] DWORD dwIDItem, [in, string] LPCWSTR pszLabel); } + +/***************************************************************************** + * IFileDialogControlEvents interface + */ +[ + object, + uuid(36116642-D713-4B97-9B83-7484A9D00433), + pointer_default(unique) +] +interface IFileDialogControlEvents : IUnknown +{ + HRESULT OnItemSelected( + [in] IFileDialogCustomize *pfdc, + [in] DWORD dwIDCtl, + [in] DWORD dwIDItem); + + HRESULT OnButtonClicked( + [in] IFileDialogCustomize *pfdc, + [in] DWORD dwIDCtl); + + HRESULT OnCheckButtonToggled( + [in] IFileDialogCustomize *pfdc, + [in] BOOL dwIDCtl, + [in] BOOL bChecked); + + HRESULT OnControlActivating( + [in] IFileDialogCustomize *pfdc, + [in] DWORD dwIDCtl); +}

1 0

David Hedberg : include: Add IFileDialogCustomize interface declaration.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: cdfe614fcc815a12651da89332d6b3627a2932b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdfe614fcc815a12651da8933… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jul 20 16:39:12 2010 +0200 include: Add IFileDialogCustomize interface declaration. --- include/shobjidl.idl | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index bc813ed..9b5fc17 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2632,3 +2632,127 @@ interface IFileOpenDialog : IFileDialog HRESULT GetSelectedItems( [out] IShellItemArray **ppsai); } + +typedef [v1_enum] enum CDCONTROLSTATEF +{ + CDCS_INACTIVE = 0x0, + CDCS_ENABLED = 0x1, + CDCS_VISIBLE = 0x2, + CDCS_ENABLEDVISIBLE = 0x3 +} CDCONTROLSTATEF; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(CDCONTROLSTATEF)") +/***************************************************************************** + * IFileDialogCustomize interface + */ +[ + object, + uuid(E6FDD21A-163F-4975-9C8C-A69F1BA37034), + pointer_default(unique) +] +interface IFileDialogCustomize : IUnknown +{ + HRESULT EnableOpenDropDown( + [in] DWORD dwIDCtl); + + HRESULT AddMenu( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszLabel); + + HRESULT AddPushButton( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszLabel); + + HRESULT AddComboBox( + [in] DWORD dwIDCtl); + + HRESULT AddRadioButtonList( + [in] DWORD dwIDCtl); + + HRESULT AddCheckButton( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszLabel, + [in] BOOL bChecked); + + HRESULT AddEditBox( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszText); + + HRESULT AddSeparator( + [in] DWORD dwIDCtl); + + HRESULT AddText( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszText); + + HRESULT SetControlLabel( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszLabel); + + HRESULT GetControlState( + [in] DWORD dwIDCtl, + [out] CDCONTROLSTATEF *pdwState); + + HRESULT SetControlState( + [in] DWORD dwIDCtl, + [in] CDCONTROLSTATEF dwState); + + HRESULT GetEditBoxText( + [in] DWORD dwIDCtl, + [out, string] WCHAR **ppszText); + + HRESULT SetEditBoxText( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszText); + + HRESULT GetCheckButtonState( + [in] DWORD dwIDCtl, + [out] BOOL *pbChecked); + + HRESULT SetCheckButtonState( + [in] DWORD dwIDCtl, + [in] BOOL bChecked); + + HRESULT AddControlItem( + [in] DWORD dwIDCtl, + [in] DWORD dwIDItem, + [in] LPCWSTR pszLabel); + + HRESULT RemoveControlItem( + [in] DWORD dwIDCtl, + [in] DWORD dwIDItem); + + HRESULT RemoveAllControlItems( + [in] DWORD dwIDCtl); + + HRESULT GetControlItemState( + [in] DWORD dwIDCtl, + [in] DWORD dwIDItem, + [out] CDCONTROLSTATEF *pdwState); + + HRESULT SetControlItemState( + [in] DWORD dwIDCtl, + [in] DWORD dwIDItem, + [in] CDCONTROLSTATEF dwState); + + HRESULT GetSelectedControlItem( + [in] DWORD dwIDCtl, + [out] DWORD *pdwIDItem); + + HRESULT SetSelectedControlItem( + [in] DWORD dwIDCtl, + [in] DWORD dwIDItem); + + HRESULT StartVisualGroup( + [in] DWORD dwIDCtl, + [in, string] LPCWSTR pszLabel); + + HRESULT EndVisualGroup(); + + HRESULT MakeProminent( + [in] DWORD dwIDCtl); + + HRESULT SetControlItemText( + [in] DWORD dwIDCtl, + [in] DWORD dwIDItem, + [in, string] LPCWSTR pszLabel); +}

1 0

David Hedberg : include: Add a few IFileDialog related interface declarations.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 215bd7d4c1365f1458178104514f7dedbd3aaadc URL: http://source.winehq.org/git/wine.git/?a=commit;h=215bd7d4c1365f14581781045… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jul 20 16:39:11 2010 +0200 include: Add a few IFileDialog related interface declarations. --- dlls/actxprxy/usrmarshal.c | 16 ++ include/shobjidl.idl | 341 ++++++++++++++++++++++++++++++++++++++++++++ include/shtypes.idl | 6 + 3 files changed, 363 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=215bd7d4c1365f1458178…

1 0

David Hedberg : include: Add INameSpaceTreeControlDropHandler interface declaration.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 64aabaa80659179c9c5065a95b96fa7d388ffe8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64aabaa80659179c9c5065a95… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jul 20 16:39:10 2010 +0200 include: Add INameSpaceTreeControlDropHandler interface declaration. --- include/shobjidl.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index fa6d86d..6624df4 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -2244,3 +2244,50 @@ interface INameSpaceTreeControlCustomDraw : IUnknown [in] RECT *prc, [in] NSTCCUSTOMDRAW *pnstccdItem); } + +/***************************************************************************** + * INameSpaceTreeControlDropHandler interface + */ +[ + object, + uuid(F9C665D6-C2F2-4C19-BF33-8322D7352F51), + local +] +interface INameSpaceTreeControlDropHandler : IUnknown +{ + HRESULT OnDragEnter( + [in, unique] IShellItem *psiOver, + [in] IShellItemArray *psiaData, + [in] BOOL fOutsideSource, + [in] DWORD grfKeyState, + [in, out] DWORD *pdwEffect); + + HRESULT OnDragOver( + [in, unique] IShellItem *psiOver, + [in] IShellItemArray *psiaData, + [in] DWORD grfKeyState, + [in, out] DWORD *pdwEffect); + + HRESULT OnDragPosition( + [in, unique] IShellItem *psiOver, + [in] IShellItemArray *psiaData, + [in] int iNewPosition, + [in] int iOldPosition); + + HRESULT OnDrop( + [in, unique] IShellItem *psiOver, + [in] IShellItemArray *psiaData, + [in] int iPosition, + [in] DWORD grfKeyState, + [in, out] DWORD *pdwEffect); + + HRESULT OnDropPosition( + [in, unique] IShellItem *psiOver, + [in] IShellItemArray *psiaData, + [in] int iNewPosition, + [in] int iOldPosition); + + HRESULT OnDragLeave( + [in, unique] IShellItem *psiOver); +} +cpp_quote("#define NSTCDHPOS_ONTOP -1")

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
90
Older →

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 July 2010