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

Marko Nikolic : comctl32/tests: Removed sign comparison warning in rebar tests.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 909794a2cb2ebd61e1ea51c20e0a155fd9c0db20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=909794a2cb2ebd61e1ea51c20… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Fri Jun 3 16:23:32 2011 +0200 comctl32/tests: Removed sign comparison warning in rebar tests. --- dlls/comctl32/tests/rebar.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index d9ceb71..5efe940 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -194,7 +194,7 @@ static int string_width(const CHAR *s) { typedef struct { RECT rc; DWORD fStyle; - INT cx; + UINT cx; } rbband_result_t; typedef struct { @@ -225,7 +225,7 @@ static void rbsize_add_row(rbsize_result_t *rbsr, int rowHeight) { rbsr->nRows++; } -static void rbsize_add_band(rbsize_result_t *rbsr, int left, int top, int right, int bottom, DWORD fStyle, INT cx) +static void rbsize_add_band(rbsize_result_t *rbsr, int left, int top, int right, int bottom, DWORD fStyle, UINT cx) { SetRect(&(rbsr->bands[rbsr->nBands].rc), left, top, right, bottom); rbsr->bands[rbsr->nBands].fStyle = fStyle; @@ -810,7 +810,7 @@ static const rbresize_test_result_t resize_results[] = { {{-2, 0, 674, 24}, 0, FALSE}, }; -static int resize_numtests = 0; +static DWORD resize_numtests = 0; #define comment(fmt, arg1) #define check_client() { \ @@ -894,7 +894,7 @@ static void expect_band_content_(int line, HWND hRebar, UINT uBand, INT fStyle, COLORREF clrBack, LPCSTR lpText, int iImage, HWND hwndChild, INT cxMinChild, INT cyMinChild, INT cx, HBITMAP hbmBack, INT wID, INT cyChild, INT cyMaxChild, INT cyIntegral, INT cxIdeal, LPARAM lParam, - INT cxHeader, INT cxHeader_broken) + UINT cxHeader, UINT cxHeader_broken) { CHAR buf[MAX_PATH] = "abc"; REBARBANDINFOA rb;

1 0

André Hentschel : mscoree/tests: Broken return value is a HRESULT_FROM_WIN32.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 79a51533661e4a65d63002c9953a247d760b7f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a51533661e4a65d63002c99… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 4 18:35:00 2011 +0200 mscoree/tests: Broken return value is a HRESULT_FROM_WIN32. --- dlls/mscoree/tests/mscoree.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 308db41..3ef9bd8 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -287,7 +287,8 @@ static void test_createconfigstream(void) GetFullPathNameW(file, MAX_PATH, path, NULL); hr = pCreateConfigStream(NULL, &stream); - todo_wine ok(hr == E_FAIL || broken(hr == ERROR_PROC_NOT_FOUND), /* some WinXP, Win2K3 and Win7 */ + todo_wine ok(hr == E_FAIL || + broken(hr == HRESULT_FROM_WIN32(ERROR_PROC_NOT_FOUND)), /* some WinXP, Win2K3 and Win7 */ "CreateConfigStream returned %x\n", hr); hr = pCreateConfigStream(path, NULL);

1 0

André Hentschel : mscoree/tests: Test more IStream Functions on a ConfigStream.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 2061c61c4e8a00d7ea11c9a4961fb738efe0e58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2061c61c4e8a00d7ea11c9a49… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 4 18:35:09 2011 +0200 mscoree/tests: Test more IStream Functions on a ConfigStream. --- dlls/mscoree/tests/mscoree.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 3ef9bd8..3731f6f 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -274,7 +274,6 @@ static void test_createconfigstream(void) WCHAR nonexistent[] = {'n', 'o', 'n', 'e', 'x', 'i', 's', 't', '.', 'x', 'm', 'l', 0}; WCHAR path[MAX_PATH]; HRESULT hr; - ULONG ret; char buffer[256] = {0}; if (!pCreateConfigStream) @@ -308,14 +307,37 @@ static void test_createconfigstream(void) if (stream) { DWORD count; + LARGE_INTEGER pos; + ULARGE_INTEGER size; + IStream *stream2 = NULL; - hr = IStream_Read(stream, &buffer, strlen(xmldata), &count); + hr = IStream_Read(stream, buffer, strlen(xmldata), &count); ok(hr == S_OK, "IStream_Read failed, hr=%x\n", hr); ok(count == strlen(xmldata), "wrong count: %u\n", count); ok(!strcmp(buffer, xmldata), "Strings do not match\n"); - ret = IStream_Release(stream); - ok(!ret, "ret=%d\n", ret); + hr = IStream_Write(stream, xmldata, strlen(xmldata), &count); + ok(hr == E_FAIL, "IStream_Write returned hr=%x\n", hr); + + pos.QuadPart = strlen(xmldata); + hr = IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + ok(hr == E_NOTIMPL, "IStream_Seek returned hr=%x\n", hr); + + size.QuadPart = strlen(xmldata); + hr = IStream_SetSize(stream, size); + ok(hr == E_NOTIMPL, "IStream_SetSize returned hr=%x\n", hr); + + hr = IStream_Clone(stream, &stream2); + ok(hr == E_NOTIMPL, "IStream_Clone returned hr=%x\n", hr); + + hr = IStream_Commit(stream, STGC_DEFAULT); + ok(hr == E_NOTIMPL, "IStream_Commit returned hr=%x\n", hr); + + hr = IStream_Revert(stream); + ok(hr == E_NOTIMPL, "IStream_Revert returned hr=%x\n", hr); + + hr = IStream_Release(stream); + ok(hr == S_OK, "IStream_Release returned hr=%x\n", hr); } DeleteFileW(file); }

1 0

André Hentschel : include: Add PF_XSAVE_ENABLED.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 2680548086c6dd29aaebc27999d883dc0a0820b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2680548086c6dd29aaebc2799… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 4 18:41:04 2011 +0200 include: Add PF_XSAVE_ENABLED. --- include/winnt.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index b4aa5a0..11f1ea2 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -777,6 +777,7 @@ typedef enum _HEAP_INFORMATION_CLASS { #define PF_COMPARE_EXCHANGE128 14 #define PF_COMPARE64_EXCHANGE128 15 #define PF_CHANNELS_ENABLED 16 +#define PF_XSAVE_ENABLED 17 /* Execution state flags */

1 0

Detlef Riekenberg : shdocvw: Add support for IOleInPlaceSiteEx.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: d49b23d6efd6b9171210d9832fec25a16356a9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49b23d6efd6b9171210d9832… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 6 00:02:02 2011 +0200 shdocvw: Add support for IOleInPlaceSiteEx. --- dlls/shdocvw/client.c | 134 ++++++++++++++++++++++++++++++++--------------- dlls/shdocvw/shdocvw.h | 4 +- 2 files changed, 93 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d49b23d6efd6b9171210d…

1 0

Henri Verbeet : d3d9: Just return the resource type in IDirect3DResource8:: GetType() implementations.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: dbc0e72d17fc5c226d961f7ed3c8a9a224a357f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbc0e72d17fc5c226d961f7ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 22:48:54 2011 +0200 d3d9: Just return the resource type in IDirect3DResource8::GetType() implementations. --- dlls/d3d9/cubetexture.c | 9 +-------- dlls/d3d9/texture.c | 9 +-------- dlls/d3d9/volumetexture.c | 9 +-------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 1f5e27b8..a4b07f0 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -197,16 +197,9 @@ static void WINAPI IDirect3DCubeTexture9Impl_PreLoad(IDirect3DCubeTexture9 *ifac static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture9Impl_GetType(IDirect3DCubeTexture9 *iface) { - IDirect3DCubeTexture9Impl *This = impl_from_IDirect3DCubeTexture9(iface); - D3DRESOURCETYPE ret; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - ret = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return ret; + return D3DRTYPE_CUBETEXTURE; } /* IDirect3DCubeTexture9 IDirect3DBaseTexture9 Interface follow: */ diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index d1df0f5..970028b 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -192,16 +192,9 @@ static void WINAPI IDirect3DTexture9Impl_PreLoad(IDirect3DTexture9 *iface) static D3DRESOURCETYPE WINAPI IDirect3DTexture9Impl_GetType(IDirect3DTexture9 *iface) { - IDirect3DTexture9Impl *This = impl_from_IDirect3DTexture9(iface); - HRESULT ret; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - ret = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return ret; + return D3DRTYPE_TEXTURE; } /* IDirect3DTexture9 IDirect3DBaseTexture9 Interface follow: */ diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 9528e9b..d5a1bcc 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -192,16 +192,9 @@ static void WINAPI IDirect3DVolumeTexture9Impl_PreLoad(IDirect3DVolumeTexture9 * static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture9Impl_GetType(IDirect3DVolumeTexture9 *iface) { - IDirect3DVolumeTexture9Impl *This = impl_from_IDirect3DVolumeTexture9(iface); - D3DRESOURCETYPE type; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - type = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return type; + return D3DRTYPE_VOLUMETEXTURE; } static DWORD WINAPI IDirect3DVolumeTexture9Impl_SetLOD(IDirect3DVolumeTexture9 *iface, DWORD LODNew)

1 0

Austin English : ntoskrnl.exe: add a stub for IoSetThreadHardErrorMode.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: cd22aa18a628358d64c655d21f9d5f380304ab1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd22aa18a628358d64c655d21… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 5 15:48:37 2011 -0500 ntoskrnl.exe: add a stub for IoSetThreadHardErrorMode. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3f86cdc..b283a2f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1628,6 +1628,16 @@ NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE processid, PEPROCESS *process) return STATUS_NOT_IMPLEMENTED; } + +/***************************************************** + * IoSetThreadHardErrorMode (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI IoSetThreadHardErrorMode(BOOLEAN EnableHardErrors) +{ + FIXME("stub\n"); + return FALSE; +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 1456fbe..8fff636 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -456,7 +456,7 @@ @ stub IoSetShareAccess @ stub IoSetStartIoAttributes @ stub IoSetSystemPartition -@ stub IoSetThreadHardErrorMode +@ stdcall IoSetThreadHardErrorMode(long) @ stub IoSetTopLevelIrp @ stub IoStartNextPacket @ stub IoStartNextPacketByKey

1 0

Michael Stefaniuc : advapi32: Remove wrong "is NULL and error out" code ( coccicheck).
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: b856884c3b27219302598536a05d49fa749c19c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b856884c3b27219302598536a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 5 23:33:47 2011 +0200 advapi32: Remove wrong "is NULL and error out" code (coccicheck). --- dlls/advapi32/crypt.c | 5 ----- dlls/advapi32/tests/crypt.c | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index a6f8bc1..26fda66 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -1420,11 +1420,6 @@ BOOL WINAPI CryptGenKey (HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYPTKE TRACE("(0x%lx, %d, %08x, %p)\n", hProv, Algid, dwFlags, phKey); - if (!prov) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } if (!phKey || !prov || prov->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 865ffa4..1180275 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -238,6 +238,9 @@ static void test_incorrect_api_usage(void) if (!result) return; pCryptDestroyHash(hHash); + result = pCryptGenKey(0, CALG_RC4, 0, &hKey); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = pCryptGenKey(hProv, CALG_RC4, 0, &hKey); ok (result, "%d\n", GetLastError()); if (!result) return;

1 0

Michael Stefaniuc : inetcomm: Rename a typedef to prevent it from being shadowed.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: a052e29556f975c3e8bb78bcde7042d2b9b63acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a052e29556f975c3e8bb78bcd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 5 23:39:17 2011 +0200 inetcomm: Rename a typedef to prevent it from being shadowed. --- dlls/inetcomm/mimeintl.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 97b482e..187f1c5 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -56,11 +56,11 @@ typedef struct struct list charsets; LONG next_charset_handle; HCHARSET default_charset; -} internat; +} internat_impl; -static inline internat *impl_from_IMimeInternational( IMimeInternational *iface ) +static inline internat_impl *impl_from_IMimeInternational( IMimeInternational *iface ) { - return (internat *)((char*)iface - FIELD_OFFSET(internat, lpVtbl)); + return (internat_impl *)((char*)iface - FIELD_OFFSET(internat_impl, lpVtbl)); } static inline HRESULT get_mlang(IMultiLanguage **ml) @@ -85,13 +85,13 @@ static HRESULT WINAPI MimeInternat_QueryInterface( IMimeInternational *iface, RE static ULONG WINAPI MimeInternat_AddRef( IMimeInternational *iface ) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); return InterlockedIncrement(&This->refs); } static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface ) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); ULONG refs; refs = InterlockedDecrement(&This->refs); @@ -112,7 +112,7 @@ static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface ) static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface, HCHARSET hCharset) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); TRACE("(%p)->(%p)\n", iface, hCharset); @@ -126,7 +126,7 @@ static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface, static HRESULT WINAPI MimeInternat_GetDefaultCharset(IMimeInternational *iface, LPHCHARSET phCharset) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); HRESULT hr = S_OK; TRACE("(%p)->(%p)\n", iface, phCharset); @@ -238,7 +238,7 @@ static HCHARSET add_charset(struct list *list, MIMECSETINFO *mlang_info, HCHARSE static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR pszCharset, LPHCHARSET phCharset) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); HRESULT hr = MIME_E_NOT_FOUND; charset_entry *charset; @@ -278,7 +278,7 @@ static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR static HRESULT WINAPI MimeInternat_GetCharsetInfo(IMimeInternational *iface, HCHARSET hCharset, LPINETCSETINFO pCsetInfo) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); HRESULT hr = MIME_E_INVALID_HANDLE; charset_entry *charset; @@ -519,7 +519,7 @@ static IMimeInternationalVtbl mime_internat_vtbl = MimeInternat_Rfc1522Encode }; -static internat *global_internat; +static internat_impl *global_internat; HRESULT MimeInternational_Construct(IMimeInternational **internat) {

1 0

Michael Stefaniuc : inetcomm: COM cleanup for the IMimeInternational iface.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: ef4d631b198580ed1af7b50b5ba807e121f85a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4d631b198580ed1af7b50b5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 5 23:43:04 2011 +0200 inetcomm: COM cleanup for the IMimeInternational iface. --- dlls/inetcomm/mimeintl.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 187f1c5..1b15251 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -49,7 +49,7 @@ typedef struct typedef struct { - const IMimeInternationalVtbl *lpVtbl; + IMimeInternational IMimeInternational_iface; LONG refs; CRITICAL_SECTION cs; @@ -58,9 +58,9 @@ typedef struct HCHARSET default_charset; } internat_impl; -static inline internat_impl *impl_from_IMimeInternational( IMimeInternational *iface ) +static inline internat_impl *impl_from_IMimeInternational(IMimeInternational *iface) { - return (internat_impl *)((char*)iface - FIELD_OFFSET(internat_impl, lpVtbl)); + return CONTAINING_RECORD(iface, internat_impl, IMimeInternational_iface); } static inline HRESULT get_mlang(IMultiLanguage **ml) @@ -524,7 +524,7 @@ static internat_impl *global_internat; HRESULT MimeInternational_Construct(IMimeInternational **internat) { global_internat = HeapAlloc(GetProcessHeap(), 0, sizeof(*global_internat)); - global_internat->lpVtbl = &mime_internat_vtbl; + global_internat->IMimeInternational_iface.lpVtbl = &mime_internat_vtbl; global_internat->refs = 0; InitializeCriticalSection(&global_internat->cs); @@ -532,7 +532,7 @@ HRESULT MimeInternational_Construct(IMimeInternational **internat) global_internat->next_charset_handle = 0; global_internat->default_charset = NULL; - *internat = (IMimeInternational*)&global_internat->lpVtbl; + *internat = &global_internat->IMimeInternational_iface; IMimeInternational_AddRef(*internat); return S_OK; @@ -542,7 +542,7 @@ HRESULT WINAPI MimeOleGetInternat(IMimeInternational **internat) { TRACE("(%p)\n", internat); - *internat = (IMimeInternational *)&global_internat->lpVtbl; + *internat = &global_internat->IMimeInternational_iface; IMimeInternational_AddRef(*internat); return S_OK; }

1 0