January 2014 - Wine-Commits

Zhenbo Li : kernel32/tests: Add one more test for FindFirstFileA.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 767c09f16f1e02912a21fbe3863a24380b08a07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=767c09f16f1e02912a21fbe38… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Dec 31 13:05:41 2013 +0800 kernel32/tests: Add one more test for FindFirstFileA. --- dlls/kernel32/tests/file.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3ac4be8..7101e7b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2430,6 +2430,14 @@ static void test_FindFirstFileA(void) ok ( err == ERROR_PATH_NOT_FOUND, "Bad Error number %d\n", err ); } + /* try FindFirstFileA without trailing backslash */ + SetLastError( 0xdeadbeaf ); + strcpy(buffer2, nonexistent); + handle = FindFirstFileA(buffer2, &data); + err = GetLastError(); + ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should Fail\n", buffer2 ); + ok ( err == ERROR_FILE_NOT_FOUND, "Bad Error number %d\n", err ); + /* try FindFirstFileA on "C:\foo\bar.txt" */ SetLastError( 0xdeadbeaf ); strcpy(buffer2, nonexistent);

1 0

Michael Müller : quartz: Return increasing monitor GUID on VMR7 monitor enumeration.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 6e373aa6956c8bc267c0051cb04f6a34574cca5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e373aa6956c8bc267c0051cb… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Dec 31 03:23:19 2013 +0100 quartz: Return increasing monitor GUID on VMR7 monitor enumeration. --- dlls/quartz/vmr9.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 31f3f8e..53e4942 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1314,7 +1314,14 @@ static BOOL CALLBACK get_available_monitors_proc(HMONITOR hmon, HDC hdc, LPRECT VMRMONITORINFO *info = args->info7++; memset(info, 0, sizeof(*info)); - info->guid.pGUID = NULL; /* FIXME */ + if (args->numdev > 0) + { + info->guid.pGUID = &info->guid.GUID; + info->guid.GUID.Data4[7] = args->numdev; + } + else + info->guid.pGUID = NULL; + CopyRect(&info->rcMonitor, &mi.rcMonitor); info->hMon = hmon; info->dwFlags = mi.dwFlags;

1 0

Nikolay Sivov : scrrun: Implement GetFolder().
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: f76f34ca23990f02ba20e5957609ee0c2335b124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76f34ca23990f02ba20e5957… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 2 21:27:45 2014 +0400 scrrun: Implement GetFolder(). --- dlls/scrrun/filesystem.c | 19 ++++++++++++++++--- dlls/scrrun/tests/filesystem.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 2753ecc..1254532 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1410,11 +1410,24 @@ static HRESULT WINAPI filesys_GetFile(IFileSystem3 *iface, BSTR FilePath, } static HRESULT WINAPI filesys_GetFolder(IFileSystem3 *iface, BSTR FolderPath, - IFolder **ppfolder) + IFolder **folder) { - FIXME("%p %s %p\n", iface, debugstr_w(FolderPath), ppfolder); + DWORD attrs; - return E_NOTIMPL; + TRACE("%p %s %p\n", iface, debugstr_w(FolderPath), folder); + + if(!folder) + return E_POINTER; + + *folder = NULL; + if(!FolderPath) + return E_INVALIDARG; + + attrs = GetFileAttributesW(FolderPath); + if((attrs == INVALID_FILE_ATTRIBUTES) || !(attrs & FILE_ATTRIBUTE_DIRECTORY)) + return CTL_E_PATHNOTFOUND; + + return create_folder(FolderPath, folder); } static HRESULT WINAPI filesys_GetSpecialFolder(IFileSystem3 *iface, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index ba0ff37..a6c5980 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -739,6 +739,42 @@ static void test_BuildPath(void) } } +static void test_GetFolder(void) +{ + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + WCHAR buffW[MAX_PATH]; + IFolder *folder; + HRESULT hr; + BSTR str; + + folder = (void*)0xdeadbeef; + hr = IFileSystem3_GetFolder(fs3, NULL, &folder); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(folder == NULL, "got %p\n", folder); + + hr = IFileSystem3_GetFolder(fs3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + /* something that doesn't exist */ + str = SysAllocString(dummyW); + + hr = IFileSystem3_GetFolder(fs3, str, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + folder = (void*)0xdeadbeef; + hr = IFileSystem3_GetFolder(fs3, str, &folder); + ok(hr == CTL_E_PATHNOTFOUND, "got 0x%08x\n", hr); + ok(folder == NULL, "got %p\n", folder); + SysFreeString(str); + + GetWindowsDirectoryW(buffW, MAX_PATH); + str = SysAllocString(buffW); + hr = IFileSystem3_GetFolder(fs3, str, &folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + IFolder_Release(folder); +} + START_TEST(filesystem) { HRESULT hr; @@ -763,6 +799,7 @@ START_TEST(filesystem) test_GetFile(); test_CopyFolder(); test_BuildPath(); + test_GetFolder(); IFileSystem3_Release(fs3);

1 0

Piotr Caban : msvcrt: Try to convert C to C++ exception in __CxxFrameHandler.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: 0f3c31b1eab7842834242ac13e5eef0e0d5ce5ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3c31b1eab7842834242ac13… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 2 14:37:59 2014 +0100 msvcrt: Try to convert C to C++ exception in __CxxFrameHandler. --- dlls/msvcrt/except_i386.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 8639579..0481282 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -543,9 +543,19 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } else { + thread_data_t *data = msvcrt_get_thread_data(); + exc_type = NULL; TRACE("handling C exception code %x rec %p frame %p trylevel %d descr %p nested_frame %p\n", rec->ExceptionCode, rec, frame, frame->trylevel, descr, nested_frame ); + + if (data->se_translator) { + EXCEPTION_POINTERS except_ptrs; + + except_ptrs.ExceptionRecord = rec; + except_ptrs.ContextRecord = context; + data->se_translator(rec->ExceptionCode, &except_ptrs); + } } call_catch_block( rec, frame, descr, frame->trylevel, exc_type );

1 0

Stefan Dösinger : d3dx9_36: Add explicit casts in type conversion functions.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: aa2baf8c58054a19440a7a8472004a199f85045e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa2baf8c58054a19440a7a847… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 2 15:23:51 2014 +0100 d3dx9_36: Add explicit casts in type conversion functions. --- dlls/d3dx9_36/util.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index c180d71..ea75dfa 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -308,7 +308,7 @@ static INT get_int(D3DXPARAMETER_TYPE type, const void *data) switch (type) { case D3DXPT_FLOAT: - return *(FLOAT *)data; + return (INT)(*(FLOAT *)data); case D3DXPT_INT: case D3DXPT_VOID: @@ -332,10 +332,10 @@ static FLOAT get_float(D3DXPARAMETER_TYPE type, const void *data) return *(FLOAT *)data; case D3DXPT_INT: - return *(INT *)data; + return (FLOAT)(*(INT *)data); case D3DXPT_BOOL: - return get_bool(type, data); + return (FLOAT)get_bool(type, data); default: FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type));

1 0

Zhenbo Li : wineps.drv: Constify a few pointers.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: c3bb460d686ea653acf78a586bdbbbb16cbe506b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3bb460d686ea653acf78a586… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun Dec 29 13:31:33 2013 +0800 wineps.drv: Constify a few pointers. --- dlls/wineps.drv/type1.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index 316bece..58fe11f 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -63,11 +63,11 @@ enum t1_cmds { (DWORD)_x1 ) #ifdef WORDS_BIGENDIAN -static inline WORD get_be_word(const void *p) { return *(WORD*)p; } -static inline DWORD get_be_dword(const void *p) { return *(DWORD*)p; } +static inline WORD get_be_word(const void *p) { return *(const WORD*)p; } +static inline DWORD get_be_dword(const void *p) { return *(const DWORD*)p; } #else -static inline WORD get_be_word(const void *p) { return RtlUshortByteSwap(*(WORD*)p); } -static inline DWORD get_be_dword(const void *p) { return RtlUlongByteSwap(*(DWORD*)p); } +static inline WORD get_be_word(const void *p) { return RtlUshortByteSwap(*(const WORD*)p); } +static inline DWORD get_be_dword(const void *p) { return RtlUlongByteSwap(*(const DWORD*)p); } #endif TYPE1 *T1_download_header(PHYSDEV dev, char *ps_name, RECT *bbox, UINT emsize) @@ -442,8 +442,8 @@ static BOOL append_complex_glyph(HDC hdc, const BYTE *data, glyph_outline *outli } else { - arg1 = *(char*)ptr++; - arg2 = *(char*)ptr++; + arg1 = *(const char*)ptr++; + arg2 = *(const char*)ptr++; } if(flags & WE_HAVE_A_SCALE) {

1 0

Jacek Caban : msrle32: Get rid of ICM_GETQUALITY and ICM_SET_QUALITY that should not be supported .
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: f9be296be40e8a948a1d3821c49a195818e1a28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9be296be40e8a948a1d3821c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:16:31 2014 +0100 msrle32: Get rid of ICM_GETQUALITY and ICM_SET_QUALITY that should not be supported. --- dlls/msrle32/msrle32.c | 45 +++++++---------------------------------- dlls/msrle32/msrle_private.h | 1 - dlls/msrle32/tests/msrle.c | 9 ++++++++ 3 files changed, 17 insertions(+), 38 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 882b5d2..645e323 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -39,7 +39,6 @@ static HINSTANCE MSRLE32_hModule = 0; #define ABS(a) ((a) < 0 ? -(a) : (a)) #define SQR(a) ((a) * (a)) -#define QUALITY_to_DIST(q) (ICQUALITY_HIGH - q) static inline WORD ColorCmp(WORD clr1, WORD clr2) { UINT a = clr1 - clr2; @@ -547,7 +546,7 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, LPBYTE lpOut, BOOL isKey) { LPWORD lpC; - LONG lLine, lInLine, lDist; + LONG lLine, lInLine; LPBYTE lpOutStart = lpOut; /* pre-conditions */ @@ -556,7 +555,6 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, assert(pi->pCurFrame != NULL); lpC = pi->pCurFrame; - lDist = QUALITY_to_DIST(pi->dwQuality); lInLine = DIBWIDTHBYTES(*lpbiIn); lLine = WIDTHBYTES(lpbiOut->biWidth * 16) / 2; @@ -569,7 +567,7 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, x = 0; do { - x = MSRLE32_CompressRLE4Line(pi, NULL, lpC, lpbiIn, lpIn, lDist, x, + x = MSRLE32_CompressRLE4Line(pi, NULL, lpC, lpbiIn, lpIn, 0, x, &lpOut, &lpbiOut->biSizeImage); } while (x < lpbiOut->biWidth); @@ -603,7 +601,7 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (jumpx == -1) jumpx = x; for (count = 0, pos = x; pos < lpbiOut->biWidth; pos++, count++) { - if (ColorCmp(lpP[pos], lpC[pos]) > lDist) + if (ColorCmp(lpP[pos], lpC[pos]) > 0) break; } @@ -663,7 +661,7 @@ LRESULT MSRLE32_CompressRLE4(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (x < lpbiOut->biWidth) { /* skipped the 'same' things corresponding to previous frame */ - x = MSRLE32_CompressRLE4Line(pi, lpP, lpC, lpbiIn, lpIn, lDist, x, + x = MSRLE32_CompressRLE4Line(pi, lpP, lpC, lpbiIn, lpIn, 0, x, &lpOut, &lpbiOut->biSizeImage); } } while (x < lpbiOut->biWidth); @@ -701,7 +699,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, LPBYTE lpOut, BOOL isKey) { LPWORD lpC; - LONG lDist, lInLine, lLine; + LONG lInLine, lLine; LPBYTE lpOutStart = lpOut; assert(pi != NULL && lpbiOut != NULL); @@ -709,7 +707,6 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, assert(pi->pCurFrame != NULL); lpC = pi->pCurFrame; - lDist = QUALITY_to_DIST(pi->dwQuality); lInLine = DIBWIDTHBYTES(*lpbiIn); lLine = WIDTHBYTES(lpbiOut->biWidth * 16) / 2; @@ -722,7 +719,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, x = 0; do { - x = MSRLE32_CompressRLE8Line(pi, NULL, lpC, lpbiIn, lpIn, lDist, x, + x = MSRLE32_CompressRLE8Line(pi, NULL, lpC, lpbiIn, lpIn, 0, x, &lpOut, &lpbiOut->biSizeImage); assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); } while (x < lpbiOut->biWidth); @@ -757,7 +754,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (jumpx == -1) jumpx = x; for (count = 0, pos = x; pos < lpbiOut->biWidth; pos++, count++) { - if (ColorCmp(lpP[pos], lpC[pos]) > lDist) + if (ColorCmp(lpP[pos], lpC[pos]) > 0) break; } @@ -804,7 +801,7 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (x < lpbiOut->biWidth) { /* skip the 'same' things corresponding to previous frame */ - x = MSRLE32_CompressRLE8Line(pi, lpP, lpC, lpbiIn, lpIn, lDist, x, + x = MSRLE32_CompressRLE8Line(pi, lpP, lpC, lpbiIn, lpIn, 0, x, &lpOut, &lpbiOut->biSizeImage); assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); } @@ -1144,7 +1141,6 @@ static CodecInfo* Open(LPICOPEN icinfo) pi->fccHandler = icinfo->fccHandler; pi->bCompress = FALSE; - pi->dwQuality = MSRLE32_DEFAULTQUALITY; pi->nPrevFrame = -1; pi->pPrevFrame = pi->pCurFrame = NULL; @@ -1195,21 +1191,6 @@ static LRESULT GetInfo(const CodecInfo *pi, ICINFO *icinfo, DWORD dwSize) return sizeof(ICINFO); } -static LRESULT SetQuality(CodecInfo *pi, LONG lQuality) -{ - /* pre-condition */ - assert(pi != NULL); - - if (lQuality == -1) - lQuality = MSRLE32_DEFAULTQUALITY; - else if (ICQUALITY_LOW > lQuality || lQuality > ICQUALITY_HIGH) - return ICERR_BADPARAM; - - pi->dwQuality = (DWORD)lQuality; - - return ICERR_OK; -} - static LRESULT Configure(const CodecInfo *pi, HWND hWnd) { /* pre-condition */ @@ -1494,8 +1475,6 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) } for (i = 0; i < 3; i++) { - SetQuality(pi, lpic->dwQuality); - lpic->lpbiOutput->biSizeImage = 0; if (lpic->lpbiOutput->biBitCount == 4) @@ -1850,14 +1829,6 @@ LRESULT CALLBACK MSRLE32_DriverProc(DWORD_PTR dwDrvID, HDRVR hDrv, UINT uMsg, return ICERR_OK; } break; - case ICM_GETQUALITY: - if ((LPVOID)lParam1 != NULL) { - *((LPDWORD)lParam1) = pi->dwQuality; - return ICERR_OK; - } - break; - case ICM_SETQUALITY: - return SetQuality(pi, *(LPLONG)lParam1); case ICM_COMPRESS_GET_FORMAT: return CompressGetFormat(pi, (LPCBITMAPINFOHEADER)lParam1, (LPBITMAPINFOHEADER)lParam2); diff --git a/dlls/msrle32/msrle_private.h b/dlls/msrle32/msrle_private.h index 1ff6cbe..d182fef 100644 --- a/dlls/msrle32/msrle_private.h +++ b/dlls/msrle32/msrle_private.h @@ -46,7 +46,6 @@ typedef struct _CodecInfo { FOURCC fccHandler; - DWORD dwQuality; BOOL bCompress; LONG nPrevFrame; diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 819cb34..58dcc41 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -46,6 +46,15 @@ static void test_encode(void) ok(res == ICERR_OK, "ICSendMessage(ICM_GETDEFAULTQUALITY) failed: %ld\n", res); ok(quality == 8500, "quality = %d\n", quality); + quality = 0xdeadbeef; + res = ICSendMessage(hic, ICM_GETQUALITY, (DWORD_PTR)&quality, 0); + ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_GETQUALITY) failed: %ld\n", res); + ok(quality == 0xdeadbeef, "quality = %d\n", quality); + + quality = ICQUALITY_HIGH; + res = ICSendMessage(hic, ICM_SETQUALITY, (DWORD_PTR)&quality, 0); + ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_SETQUALITY) failed: %ld\n", res); + ICClose(hic); }

1 0

Jacek Caban : msrle32: Append EOI instead of replacing EOL.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: cb767f738d636b23290220f5988e3724d619b64b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb767f738d636b23290220f59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:16:49 2014 +0100 msrle32: Append EOI instead of replacing EOL. --- dlls/msrle32/msrle32.c | 10 ++++++---- dlls/msrle32/tests/msrle.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 645e323..d22b412 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -256,7 +256,7 @@ static LONG MSRLE32_GetMaxCompressedSize(LPCBITMAPINFOHEADER lpbi) } size = (2 + a * (2 + ((a + 2) & ~2)) + b * (2 + ((b + 2) & ~2))); - return size * lpbi->biHeight; + return size * lpbi->biHeight + 2; } /* lpP => current pos in previous frame @@ -820,14 +820,16 @@ LRESULT MSRLE32_CompressRLE8(const CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, } } - /* add EOL -- will be changed to EOI */ + /* add EOL */ lpbiOut->biSizeImage += 2; *((LPWORD)lpOut) = 0; lpOut += sizeof(WORD); } - /* change EOL to EOI -- end of image */ - lpOut[-1] = 1; + /* add EOI -- end of image */ + lpbiOut->biSizeImage += 2; + *lpOut++ = 0; + *lpOut++ = 1; assert(lpOut == (lpOutStart + lpbiOut->biSizeImage)); return ICERR_OK; diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 58dcc41..1b7e680 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -24,13 +24,40 @@ #include "wine/test.h" +static void test_output(const BYTE *output, int out_size, const BYTE *expect, int size) +{ + char buf[512], *ptr; + int i; + + i = out_size == size && !memcmp(output, expect, size); + ok(i, "Unexpected output\n"); + if(i) + return; + + for(i=0, ptr=buf; i<out_size; i++) + ptr += sprintf(ptr, "%x ", output[i]); + trace("Got: %s\n", buf); + for(i=0, ptr=buf; i<size; i++) + ptr += sprintf(ptr, "%x ", expect[i]); + trace("Exp: %s\n", buf); +} + static void test_encode(void) { - DWORD quality; + BITMAPINFOHEADER *output_header; + DWORD output_size, flags, quality; + BYTE buf[64]; ICINFO info; HIC hic; LRESULT res; + struct { BITMAPINFOHEADER header; RGBQUAD map[256]; } + input_header = { {sizeof(BITMAPINFOHEADER), 32, 1, 1, 8, 0, 32*8, 0, 0, 256, 256}, + {{255,0,0}, {0,255,0}, {0,0,255}, {255,255,255}}}; + + static BYTE input1[32] = {1,2,3,3,3,3,2,3,1}; + static const BYTE output1[] = {1,1,1,2,4,3,0,3,2,3,1,0,23,0,0,0,0,1}; + hic = ICOpen(FCC('V','I','D','C'), FCC('m','r','l','e'), ICMODE_COMPRESS); ok(hic != NULL, "ICOpen failed\n"); @@ -55,6 +82,20 @@ static void test_encode(void) res = ICSendMessage(hic, ICM_SETQUALITY, (DWORD_PTR)&quality, 0); ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_SETQUALITY) failed: %ld\n", res); + output_size = ICCompressGetFormatSize(hic, &input_header.header); + ok(output_size == 1064, "output_size = %d\n", output_size); + + output_header = HeapAlloc(GetProcessHeap(), 0, output_size); + ICCompressGetFormat(hic, &input_header.header, output_header); + + flags = 0; + res = ICCompress(hic, ICCOMPRESS_KEYFRAME, output_header, buf, &input_header.header, input1, 0, &flags, 0, 0, 0, NULL, NULL); + ok(res == ICERR_OK, "ICCompress failed: %ld\n", res); + test_output(buf, output_header->biSizeImage, output1, sizeof(output1)); + todo_wine ok(flags == (AVIIF_TWOCC|AVIIF_KEYFRAME), "flags = %x\n", flags); + + HeapFree(GetProcessHeap(), 0, output_header); + ICClose(hic); }

1 0

Jacek Caban : msrle32: Properly set compression output flags.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: d190b0c61efa31a10f1cffe1e1b4933520d32c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d190b0c61efa31a10f1cffe1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 2 14:17:11 2014 +0100 msrle32: Properly set compression output flags. --- dlls/msrle32/msrle32.c | 13 ++++++++----- dlls/msrle32/tests/msrle.c | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 50b44b2..aba94a0 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1420,6 +1420,7 @@ static LRESULT CompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) { + BOOL is_key; int i; TRACE("(%p,%p,%u)\n",pi,lpic,dwSize); @@ -1475,15 +1476,15 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) pi->nPrevFrame = lpic->lFrameNum; } + is_key = (lpic->dwFlags & ICCOMPRESS_KEYFRAME) != 0; + for (i = 0; i < 3; i++) { lpic->lpbiOutput->biSizeImage = 0; if (lpic->lpbiOutput->biBitCount == 4) - MSRLE32_CompressRLE4(pi, lpic->lpbiInput, lpic->lpInput, - lpic->lpbiOutput, lpic->lpOutput, (lpic->dwFlags & ICCOMPRESS_KEYFRAME) != 0); + MSRLE32_CompressRLE4(pi, lpic->lpbiInput, lpic->lpInput, lpic->lpbiOutput, lpic->lpOutput, is_key); else - MSRLE32_CompressRLE8(pi, lpic->lpbiInput, lpic->lpInput, - lpic->lpbiOutput, lpic->lpOutput, (lpic->dwFlags & ICCOMPRESS_KEYFRAME) != 0); + MSRLE32_CompressRLE8(pi, lpic->lpbiInput, lpic->lpInput, lpic->lpbiOutput, lpic->lpOutput, is_key); if (lpic->dwFrameSize == 0 || lpic->lpbiOutput->biSizeImage < lpic->dwFrameSize) @@ -1500,7 +1501,7 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) if (lpic->dwFrameSize == 0 || lpic->lpbiOutput->biSizeImage < lpic->dwFrameSize) { WARN("switched to keyframe, was small enough!\n"); - *lpic->lpdwFlags |= ICCOMPRESS_KEYFRAME; + is_key = TRUE; *lpic->lpckid = MAKEAVICKID(cktypeDIBbits, StreamFromFOURCC(*lpic->lpckid)); break; @@ -1522,6 +1523,8 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) pi->nPrevFrame = lpic->lFrameNum; } + /* FIXME: What is AVIIF_TWOCC? */ + *lpic->lpdwFlags |= AVIIF_TWOCC | (is_key ? AVIIF_KEYFRAME : 0); return ICERR_OK; } diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 1b7e680..5ab0b6a 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -92,7 +92,7 @@ static void test_encode(void) res = ICCompress(hic, ICCOMPRESS_KEYFRAME, output_header, buf, &input_header.header, input1, 0, &flags, 0, 0, 0, NULL, NULL); ok(res == ICERR_OK, "ICCompress failed: %ld\n", res); test_output(buf, output_header->biSizeImage, output1, sizeof(output1)); - todo_wine ok(flags == (AVIIF_TWOCC|AVIIF_KEYFRAME), "flags = %x\n", flags); + ok(flags == (AVIIF_TWOCC|AVIIF_KEYFRAME), "flags = %x\n", flags); HeapFree(GetProcessHeap(), 0, output_header);

1 0

Stefan Dösinger : d3dx9_36: Use float math functions.
by Alexandre Julliard Jan. 2, 2014

Jan. 2, 2014

Module: wine Branch: master Commit: f06fc7f85817e502e184871382854f5e286145a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f06fc7f85817e502e18487138… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 2 15:23:49 2014 +0100 d3dx9_36: Use float math functions. --- dlls/d3dx9_36/math.c | 44 ++++++++++++++++++++++---------------------- dlls/d3dx9_36/mesh.c | 18 +++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index b33e062..bcda6cc 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -487,8 +487,8 @@ D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovLH(D3DXMATRIX *pout, FLOAT fovy, FLOA TRACE("pout %p, fovy %f, aspect %f, zn %f, zf %f\n", pout, fovy, aspect, zn, zf); D3DXMatrixIdentity(pout); - pout->u.m[0][0] = 1.0f / (aspect * tan(fovy/2.0f)); - pout->u.m[1][1] = 1.0f / tan(fovy/2.0f); + pout->u.m[0][0] = 1.0f / (aspect * tanf(fovy/2.0f)); + pout->u.m[1][1] = 1.0f / tanf(fovy/2.0f); pout->u.m[2][2] = zf / (zf - zn); pout->u.m[2][3] = 1.0f; pout->u.m[3][2] = (zf * zn) / (zn - zf); @@ -501,8 +501,8 @@ D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovRH(D3DXMATRIX *pout, FLOAT fovy, FLOA TRACE("pout %p, fovy %f, aspect %f, zn %f, zf %f\n", pout, fovy, aspect, zn, zf); D3DXMatrixIdentity(pout); - pout->u.m[0][0] = 1.0f / (aspect * tan(fovy/2.0f)); - pout->u.m[1][1] = 1.0f / tan(fovy/2.0f); + pout->u.m[0][0] = 1.0f / (aspect * tanf(fovy/2.0f)); + pout->u.m[1][1] = 1.0f / tanf(fovy/2.0f); pout->u.m[2][2] = zf / (zn - zf); pout->u.m[2][3] = -1.0f; pout->u.m[3][2] = (zf * zn) / (zn - zf); @@ -647,10 +647,10 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationX(D3DXMATRIX *pout, FLOAT angle) TRACE("pout %p, angle %f\n", pout, angle); D3DXMatrixIdentity(pout); - pout->u.m[1][1] = cos(angle); - pout->u.m[2][2] = cos(angle); - pout->u.m[1][2] = sin(angle); - pout->u.m[2][1] = -sin(angle); + pout->u.m[1][1] = cosf(angle); + pout->u.m[2][2] = cosf(angle); + pout->u.m[1][2] = sinf(angle); + pout->u.m[2][1] = -sinf(angle); return pout; } @@ -659,10 +659,10 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationY(D3DXMATRIX *pout, FLOAT angle) TRACE("pout %p, angle %f\n", pout, angle); D3DXMatrixIdentity(pout); - pout->u.m[0][0] = cos(angle); - pout->u.m[2][2] = cos(angle); - pout->u.m[0][2] = -sin(angle); - pout->u.m[2][0] = sin(angle); + pout->u.m[0][0] = cosf(angle); + pout->u.m[2][2] = cosf(angle); + pout->u.m[0][2] = -sinf(angle); + pout->u.m[2][0] = sinf(angle); return pout; } @@ -704,10 +704,10 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationZ(D3DXMATRIX *pout, FLOAT angle) TRACE("pout %p, angle %f\n", pout, angle); D3DXMatrixIdentity(pout); - pout->u.m[0][0] = cos(angle); - pout->u.m[1][1] = cos(angle); - pout->u.m[0][1] = sin(angle); - pout->u.m[1][0] = -sin(angle); + pout->u.m[0][0] = cosf(angle); + pout->u.m[1][1] = cosf(angle); + pout->u.m[0][1] = sinf(angle); + pout->u.m[1][0] = -sinf(angle); return pout; } @@ -888,15 +888,15 @@ D3DXMATRIX* WINAPI D3DXMatrixTransformation2D(D3DXMATRIX *pout, const D3DXVECTOR trans.z=0.0f; } - rot.w=cos(rotation/2.0f); + rot.w=cosf(rotation/2.0f); rot.x=0.0f; rot.y=0.0f; - rot.z=sin(rotation/2.0f); + rot.z=sinf(rotation/2.0f); - sca_rot.w=cos(scalingrotation/2.0f); + sca_rot.w=cosf(scalingrotation/2.0f); sca_rot.x=0.0f; sca_rot.y=0.0f; - sca_rot.z=sin(scalingrotation/2.0f); + sca_rot.z=sinf(scalingrotation/2.0f); D3DXMatrixTransformation(pout, &sca_center, &sca_rot, &sca, &rot_center, &rot, &trans); @@ -1655,7 +1655,7 @@ void WINAPI D3DXQuaternionToAxisAngle(const D3DXQUATERNION *pq, D3DXVECTOR3 *pax paxis->x = pq->x; paxis->y = pq->y; paxis->z = pq->z; - *pangle = 2.0f * acos(pq->w); + *pangle = 2.0f * acosf(pq->w); } /*_________________D3DXVec2_____________________*/ @@ -2128,7 +2128,7 @@ D3DXVECTOR4* WINAPI D3DXVec4TransformArray(D3DXVECTOR4* out, UINT outstride, con unsigned short float_32_to_16(const float in) { int exp = 0, origexp; - float tmp = fabs(in); + float tmp = fabsf(in); int sign = (copysignf(1, in) < 0); unsigned int mantissa; unsigned short ret; diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 8180d8e..aa20119 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2404,7 +2404,7 @@ BOOL WINAPI D3DXIntersectTri(const D3DXVECTOR3 *p0, const D3DXVECTOR3 *p1, const { *pu = vec.x; *pv = vec.y; - *pdist = fabs( vec.z ); + *pdist = fabsf( vec.z ); return TRUE; } } @@ -4569,8 +4569,8 @@ static BOOL compute_sincos_table(struct sincos_table *sincos_table, float angle_ angle = angle_start; for (i = 0; i < n; i++) { - sincos_table->sin[i] = sin(angle); - sincos_table->cos[i] = cos(angle); + sincos_table->sin[i] = sinf(angle); + sincos_table->cos[i] = cosf(angle); angle += angle_step; } @@ -4660,8 +4660,8 @@ HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, U for (stack = 0; stack < stacks - 1; stack++) { - sin_theta = sin(theta); - cos_theta = cos(theta); + sin_theta = sinf(theta); + cos_theta = cosf(theta); for (slice = 0; slice < slices; slice++) { @@ -5772,9 +5772,9 @@ HRESULT WINAPI D3DXCreateTextW(struct IDirect3DDevice9 *device, HDC hdc, const W face *face_ptr; float max_deviation_sq; const struct cos_table cos_table = { - cos(D3DXToRadian(0.5f)), - cos(D3DXToRadian(45.0f)), - cos(D3DXToRadian(90.0f)), + cosf(D3DXToRadian(0.5f)), + cosf(D3DXToRadian(45.0f)), + cosf(D3DXToRadian(90.0f)), }; int f1, f2; @@ -6154,7 +6154,7 @@ static BOOL weld_float4(void *to, void *from, FLOAT epsilon) FLOAT diff_y = fabsf(v1->y - v2->y); FLOAT diff_z = fabsf(v1->z - v2->z); FLOAT diff_w = fabsf(v1->w - v2->w); - FLOAT max_abs_diff = fmax(diff_x, diff_y); + FLOAT max_abs_diff = max(diff_x, diff_y); max_abs_diff = max(diff_z, max_abs_diff); max_abs_diff = max(diff_w, max_abs_diff);

1 0