January 2013 - Wine-commits

Hans Leidekker : ws2_32: Set SO_REUSEPORT in addition to SO_REUSEADDR on MacOS.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 197041f1ffe4841b0514701fd22fd4b743a41cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197041f1ffe4841b0514701fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 11 17:22:59 2013 +0100 ws2_32: Set SO_REUSEPORT in addition to SO_REUSEADDR on MacOS. --- dlls/ws2_32/socket.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index eeb5265..c390828 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4452,6 +4452,15 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, if (setsockopt(fd, level, optname, optval, optlen) == 0) { +#ifdef __APPLE__ + if (level == SOL_SOCKET && optname == SO_REUSEADDR && + setsockopt(fd, level, SO_REUSEPORT, optval, optlen) != 0) + { + SetLastError(wsaErrno()); + release_sock_fd( s, fd ); + return SOCKET_ERROR; + } +#endif release_sock_fd( s, fd ); return 0; }

1 0

Piotr Caban : msvcrt: Make fputwc encoding aware.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: ebfa65361819f5804934db2262b54508851ba3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebfa65361819f5804934db226… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 11 11:18:44 2013 +0100 msvcrt: Make fputwc encoding aware. --- dlls/msvcrt/file.c | 28 ++++++++++++++++++++++++---- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c53e061..19ad11c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3375,10 +3375,30 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si */ MSVCRT_wint_t CDECL MSVCRT_fputwc(MSVCRT_wint_t wc, MSVCRT_FILE* file) { - MSVCRT_wchar_t mwc=wc; - if (MSVCRT_fwrite( &mwc, sizeof(mwc), 1, file) != 1) - return MSVCRT_WEOF; - return wc; + MSVCRT_wchar_t mwc=wc; + ioinfo *fdinfo; + MSVCRT_wint_t ret; + + MSVCRT__lock_file(file); + fdinfo = msvcrt_get_ioinfo(file->_file); + + if((fdinfo->wxflag&WX_TEXT) && !(fdinfo->exflag&(EF_UTF8|EF_UTF16))) { + char buf[MSVCRT_MB_LEN_MAX]; + int char_len; + + char_len = wctomb(buf, mwc); + if(char_len!=-1 && MSVCRT_fwrite(buf, char_len, 1, file)==1) + ret = wc; + else + ret = MSVCRT_WEOF; + }else if(MSVCRT_fwrite(&mwc, sizeof(mwc), 1, file) == 1) { + ret = wc; + }else { + ret = MSVCRT_WEOF; + } + + MSVCRT__unlock_file(file); + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 1bdf393..77418e3 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -46,6 +46,7 @@ #define MSVCRT_I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) #define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) +#define MSVCRT_MB_LEN_MAX 2 #define MSVCRT__MAX_DRIVE 3 #define MSVCRT__MAX_DIR 256

1 0

Piotr Caban : msvcrt: Added fputwc tests.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 77f3ce0b10248537db8254dad728a4f9a911101d URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f3ce0b10248537db8254dad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 11 11:18:57 2013 +0100 msvcrt: Added fputwc tests. --- dlls/msvcrt/tests/file.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index b74e1d9..392b1a0 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -792,6 +792,63 @@ static void test_fgetwc( void ) free(tempf); } +static void test_fputwc(void) +{ + char temppath[MAX_PATH]; + char tempfile[MAX_PATH]; + FILE *f; + char buf[1024]; + int ret; + + GetTempPath (MAX_PATH, temppath); + GetTempFileName (temppath, "", 0, tempfile); + + f = fopen(tempfile, "w"); + ret = fputwc('a', f); + ok(ret == 'a', "fputwc returned %x, expected 'a'\n", ret); + ret = fputwc('\n', f); + ok(ret == '\n', "fputwc returned %x, expected '\\n'\n", ret); + fclose(f); + + f = fopen(tempfile, "rb"); + ret = fread(buf, 1, sizeof(buf), f); + ok(ret == 3, "fread returned %d, expected 3\n", ret); + ok(!memcmp(buf, "a\r\n", 3), "incorrect file data\n"); + fclose(f); + + if(p_fopen_s) { + f = fopen(tempfile, "w,ccs=unicode"); + ret = fputwc('a', f); + ok(ret == 'a', "fputwc returned %x, expected 'a'\n", ret); + ret = fputwc('\n', f); + ok(ret == '\n', "fputwc returned %x, expected '\\n'\n", ret); + fclose(f); + + f = fopen(tempfile, "rb"); + ret = fread(buf, 1, sizeof(buf), f); + ok(ret == 8, "fread returned %d, expected 8\n", ret); + ok(!memcmp(buf, "\xff\xfe\x61\x00\r\x00\n\x00", 8), "incorrect file data\n"); + fclose(f); + + f = fopen(tempfile, "w,ccs=utf-8"); + ret = fputwc('a', f); + ok(ret == 'a', "fputwc returned %x, expected 'a'\n", ret); + ret = fputwc('\n', f); + ok(ret == '\n', "fputwc returned %x, expected '\\n'\n", ret); + fclose(f); + + f = fopen(tempfile, "rb"); + ret = fread(buf, 1, sizeof(buf), f); + ok(ret == 6, "fread returned %d, expected 6\n", ret); + ok(!memcmp(buf, "\xef\xbb\xbf\x61\r\n", 6), "incorrect file data\n"); + fclose(f); + }else { + win_skip("fputwc tests on unicode files\n"); + } + + _unlink(tempfile); +} + static void test_ctrlz( void ) { char* tempf; @@ -1955,6 +2012,7 @@ START_TEST(file) test_flsbuf(); test_fflush(); test_fgetwc(); + test_fputwc(); test_ctrlz(); test_file_put_get(); test_tmpnam();

1 0

Piotr Caban : msvcrt: Use fputwc to output characters to file in fprintf functions.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: a8c2ae17510ba75bea35a39538183fa195bdce84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c2ae17510ba75bea35a3953… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 11 11:19:08 2013 +0100 msvcrt: Use fputwc to output characters to file in fprintf functions. --- dlls/msvcrt/file.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 19ad11c..daea39a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4208,7 +4208,25 @@ static int puts_clbk_file_a(void *file, int len, const char *str) static int puts_clbk_file_w(void *file, int len, const MSVCRT_wchar_t *str) { - return MSVCRT_fwrite(str, sizeof(MSVCRT_wchar_t), len, file); + int i, ret; + + MSVCRT__lock_file(file); + + if(!(msvcrt_get_ioinfo(((MSVCRT_FILE*)file)->_file)->wxflag & WX_TEXT)) { + ret = MSVCRT_fwrite(str, sizeof(MSVCRT_wchar_t), len, file); + MSVCRT__unlock_file(file); + return ret; + } + + for(i=0; i<len; i++) { + if(MSVCRT_fputwc(str[i], file) == MSVCRT_WEOF) { + MSVCRT__unlock_file(file); + return -1; + } + } + + MSVCRT__unlock_file(file); + return len; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't add '\r' character in fputws function.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 1fae72e7596fd1962f68d3ef3fdcb9382731dea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fae72e7596fd1962f68d3ef3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 11 11:19:19 2013 +0100 msvcrt: Don't add '\r' character in fputws function. write is responsible for adding '\r' characters, don't do it twice. --- dlls/msvcrt/file.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index daea39a..a1e4320 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3882,8 +3882,7 @@ int CDECL MSVCRT_fputws(const MSVCRT_wchar_t *s, MSVCRT_FILE* file) return ret; } for (i=0; i<len; i++) { - if (((s[i] == '\n') && (MSVCRT_fputc('\r', file) == MSVCRT_EOF)) - || MSVCRT_fputwc(s[i], file) == MSVCRT_WEOF) { + if(MSVCRT_fputwc(s[i], file) == MSVCRT_WEOF) { MSVCRT__unlock_file(file); return MSVCRT_WEOF; }

1 0

Piotr Caban : msvcrt: Fixed ftell behaviour when file is opened for writing in text mode.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: c1792e1a8acbd00d5cfc4f9c94718a84d4732761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1792e1a8acbd00d5cfc4f9c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 11 11:19:44 2013 +0100 msvcrt: Fixed ftell behaviour when file is opened for writing in text mode. --- dlls/msvcrt/file.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index a1e4320..60af1a7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3798,6 +3798,14 @@ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) if(file->_bufsiz) { if(file->_flag & MSVCRT__IOWRT) { pos += file->_ptr - file->_base; + + if(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT) { + char *p; + + for(p=file->_base; p<file->_ptr; p++) + if(*p == '\n') + pos++; + } } else if(!file->_cnt) { /* nothing to do */ } else if(MSVCRT__lseeki64(file->_file, 0, SEEK_END)==pos) { int i;

1 0

Piotr Caban : msvcrt: Added fwprintf tests.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 840122473161cb334c04bf2bd0b5777f8521d426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=840122473161cb334c04bf2bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 11 11:20:03 2013 +0100 msvcrt: Added fwprintf tests. --- dlls/msvcrt/tests/printf.c | 54 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 7780327..0d4a241 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -691,7 +691,9 @@ static void test_snprintf (void) static void test_fprintf(void) { - static char file_name[] = "fprintf.tst"; + static const char file_name[] = "fprintf.tst"; + static const WCHAR utf16_test[] = {'u','n','i','c','o','d','e','\n',0}; + FILE *fp = fopen(file_name, "wb"); char buf[1024]; int ret; @@ -706,6 +708,11 @@ static void test_fprintf(void) ret = ftell(fp); ok(ret == 26, "ftell returned %d\n", ret); + ret = fwprintf(fp, utf16_test); + ok(ret == 8, "ret = %d\n", ret); + ret = ftell(fp); + ok(ret == 42, "ftell returned %d\n", ret); + fclose(fp); fp = fopen(file_name, "rb"); @@ -720,6 +727,51 @@ static void test_fprintf(void) ok(ret == 26, "ret = %d\n", ret); ok(!memcmp(buf, "contains\0null\n", 14), "buf = %s\n", buf); + memset(buf, 0, sizeof(buf)); + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); + ok(ret == 41, "ret = %d\n", ret); + ok(!memcmp(buf, utf16_test, sizeof(utf16_test)), + "buf = %s\n", wine_dbgstr_w((WCHAR*)buf)); + + fclose(fp); + + fp = fopen(file_name, "wt"); + + ret = fprintf(fp, "simple test\n"); + ok(ret == 12, "ret = %d\n", ret); + ret = ftell(fp); + ok(ret == 13, "ftell returned %d\n", ret); + + ret = fprintf(fp, "contains%cnull\n", '\0'); + ok(ret == 14, "ret = %d\n", ret); + ret = ftell(fp); + ok(ret == 28, "ftell returned %d\n", ret); + + ret = fwprintf(fp, utf16_test); + ok(ret == 8, "ret = %d\n", ret); + ret = ftell(fp); + ok(ret == 37, "ftell returned %d\n", ret); + + fclose(fp); + + fp = fopen(file_name, "rb"); + ret = fscanf(fp, "%[^\n] ", buf); + ok(ret == 1, "ret = %d\n", ret); + ret = ftell(fp); + ok(ret == 13, "ftell returned %d\n", ret); + ok(!strcmp(buf, "simple test\r"), "buf = %s\n", buf); + + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); + ok(ret == 28, "ret = %d\n", ret); + ok(!memcmp(buf, "contains\0null\r\n", 15), "buf = %s\n", buf); + + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); + ok(ret == 37, "ret = %d\n", ret); + ok(!strcmp(buf, "unicode\r\n"), "buf = %s\n", buf); + fclose(fp); unlink(file_name); }

1 0

Dmitry Timoshkov : windowscodecs: Add a test for CreateBitmapFromHICON.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: 89838342b7a5de5ca8fcb4fa1715043f718e3203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89838342b7a5de5ca8fcb4fa1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 11 19:56:33 2013 +0800 windowscodecs: Add a test for CreateBitmapFromHICON. --- dlls/windowscodecs/tests/Makefile.in | 2 +- dlls/windowscodecs/tests/bitmap.c | 92 ++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index 8bc8066..76db38a 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = windowscodecs.dll -IMPORTS = ole32 windowscodecs +IMPORTS = gdi32 user32 ole32 windowscodecs C_SRCS = \ bitmap.c \ diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 68d681a..40b8ce6 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -18,6 +18,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <math.h> #define COBJMACROS @@ -29,6 +30,18 @@ static IWICImagingFactory *factory; +static const char *debugstr_guid(const GUID *guid) +{ + static char buf[50]; + + if (!guid) return "(null)"; + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], + guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], + guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return buf; +} + static void test_createbitmap(void) { HRESULT hr; @@ -494,6 +507,84 @@ static void test_CreateBitmapFromMemory(void) IWICBitmap_Release(bitmap); } +static void test_CreateBitmapFromHICON(void) +{ + static const char bits[4096]; + HICON icon; + ICONINFO info; + HRESULT hr; + IWICBitmap *bitmap; + UINT width, height; + WICPixelFormatGUID format; + + /* 1 bpp mask */ + info.fIcon = 1; + info.xHotspot = 0; + info.yHotspot = 0; + info.hbmColor = 0; + info.hbmMask = CreateBitmap(16, 32, 1, 1, bits); + ok(info.hbmMask != 0, "CreateBitmap failed\n"); + icon = CreateIconIndirect(&info); + ok(icon != 0, "CreateIconIndirect failed\n"); + DeleteObject(info.hbmMask); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, 0, NULL); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, 0, &bitmap); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_CURSOR_HANDLE), "expected ERROR_INVALID_CURSOR_HANDLE, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, NULL); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, &bitmap); +todo_wine + ok(hr == S_OK, "CreateBitmapFromHICON error %#x\n", hr); + DestroyIcon(icon); + if (hr != S_OK) return; + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 16, "expected 16, got %u\n", width); + ok(height == 16, "expected 16, got %u\n", height); + + IWICBitmap_Release(bitmap); + + /* 24 bpp color, 1 bpp mask */ + info.fIcon = 1; + info.xHotspot = 0; + info.yHotspot = 0; + info.hbmColor = CreateBitmap(16, 16, 1, 24, bits); + ok(info.hbmColor != 0, "CreateBitmap failed\n"); + info.hbmMask = CreateBitmap(16, 16, 1, 1, bits); + ok(info.hbmMask != 0, "CreateBitmap failed\n"); + icon = CreateIconIndirect(&info); + ok(icon != 0, "CreateIconIndirect failed\n"); + DeleteObject(info.hbmColor); + DeleteObject(info.hbmMask); + + hr = IWICImagingFactory_CreateBitmapFromHICON(factory, icon, &bitmap); + ok(hr == S_OK, "CreateBitmapFromHICON error %#x\n", hr); + DestroyIcon(icon); + + IWICBitmap_GetPixelFormat(bitmap, &format); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), + "unexpected pixel format %s\n", debugstr_guid(&format)); + + IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "IWICBitmap_GetSize error %#x\n", hr); + ok(width == 16, "expected 16, got %u\n", width); + ok(height == 16, "expected 16, got %u\n", height); + + IWICBitmap_Release(bitmap); +} START_TEST(bitmap) { @@ -508,6 +599,7 @@ START_TEST(bitmap) test_createbitmap(); test_createbitmapfromsource(); test_CreateBitmapFromMemory(); + test_CreateBitmapFromHICON(); IWICImagingFactory_Release(factory);

1 0

Henri Verbeet : ddraw: Avoid LPD3DLIGHT2.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: e8f97044629ab73dfcb3613c803a69e031b8e388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f97044629ab73dfcb3613c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 11 12:07:47 2013 +0100 ddraw: Avoid LPD3DLIGHT2. --- dlls/ddraw/light.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index ad4ac71..ebc1410 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -188,45 +188,45 @@ static const float zero_value[] = { 0.0, 0.0, 0.0, 0.0 }; -static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *lpLight) +static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) { struct d3d_light *light = impl_from_IDirect3DLight(iface); D3DLIGHT7 *light7 = &light->light7; - TRACE("iface %p, light %p.\n", iface, lpLight); + TRACE("iface %p, data %p.\n", iface, data); if (TRACE_ON(ddraw)) { TRACE(" Light definition :\n"); - dump_light((LPD3DLIGHT2) lpLight); + dump_light((D3DLIGHT2 *)data); } - if ( (lpLight->dltType == 0) || (lpLight->dltType > D3DLIGHT_PARALLELPOINT) ) + if ((!data->dltType) || (data->dltType > D3DLIGHT_PARALLELPOINT)) return DDERR_INVALIDPARAMS; - if ( lpLight->dltType == D3DLIGHT_PARALLELPOINT ) - FIXME("D3DLIGHT_PARALLELPOINT not supported\n"); + if (data->dltType == D3DLIGHT_PARALLELPOINT) + FIXME("D3DLIGHT_PARALLELPOINT not implemented.\n"); - /* Translate D3DLIGH2 structure to D3DLIGHT7 */ - light7->dltType = lpLight->dltType; - light7->dcvDiffuse = lpLight->dcvColor; - if ((((LPD3DLIGHT2)lpLight)->dwFlags & D3DLIGHT_NO_SPECULAR) != 0) - light7->dcvSpecular = lpLight->dcvColor; + /* Translate D3DLIGHT2 structure to D3DLIGHT7. */ + light7->dltType = data->dltType; + light7->dcvDiffuse = data->dcvColor; + if (((D3DLIGHT2 *)data)->dwFlags & D3DLIGHT_NO_SPECULAR) + light7->dcvSpecular = data->dcvColor; else - light7->dcvSpecular = *(const D3DCOLORVALUE*)zero_value; - light7->dcvAmbient = lpLight->dcvColor; - light7->dvPosition = lpLight->dvPosition; - light7->dvDirection = lpLight->dvDirection; - light7->dvRange = lpLight->dvRange; - light7->dvFalloff = lpLight->dvFalloff; - light7->dvAttenuation0 = lpLight->dvAttenuation0; - light7->dvAttenuation1 = lpLight->dvAttenuation1; - light7->dvAttenuation2 = lpLight->dvAttenuation2; - light7->dvTheta = lpLight->dvTheta; - light7->dvPhi = lpLight->dvPhi; + light7->dcvSpecular = *(const D3DCOLORVALUE *)zero_value; + light7->dcvAmbient = data->dcvColor; + light7->dvPosition = data->dvPosition; + light7->dvDirection = data->dvDirection; + light7->dvRange = data->dvRange; + light7->dvFalloff = data->dvFalloff; + light7->dvAttenuation0 = data->dvAttenuation0; + light7->dvAttenuation1 = data->dvAttenuation1; + light7->dvAttenuation2 = data->dvAttenuation2; + light7->dvTheta = data->dvTheta; + light7->dvPhi = data->dvPhi; wined3d_mutex_lock(); - memcpy(&light->light, lpLight, lpLight->dwSize); + memcpy(&light->light, data, data->dwSize); if (light->light.dwFlags & D3DLIGHT_ACTIVE) light_update(light); wined3d_mutex_unlock();

1 0

Henri Verbeet : ddraw: Avoid LPD3DLIGHTDATA.
by Alexandre Julliard 11 Jan '13

11 Jan '13

Module: wine Branch: master Commit: f32185b2dd023dc1819b900cc4116d4324789d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f32185b2dd023dc1819b900cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 11 12:07:48 2013 +0100 ddraw: Avoid LPD3DLIGHTDATA. --- include/d3d.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 7cf1512..94367da 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -656,7 +656,7 @@ DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD vertex_count, D3DTRANSFORMDATA *data, DWORD flags, DWORD *offscreen) PURE; - STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; + STDMETHOD(LightElements)(THIS_ DWORD element_count, D3DLIGHTDATA *data) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE; STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; @@ -724,7 +724,7 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD vertex_count, D3DTRANSFORMDATA *data, DWORD flags, DWORD *offscreen) PURE; - STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; + STDMETHOD(LightElements)(THIS_ DWORD element_count, D3DLIGHTDATA *data) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE; STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; @@ -800,7 +800,7 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(SetViewport)(THIS_ D3DVIEWPORT *data) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD vertex_count, D3DTRANSFORMDATA *data, DWORD flags, DWORD *offscreen) PURE; - STDMETHOD(LightElements)(THIS_ DWORD dwElementCount, LPD3DLIGHTDATA lpData) PURE; + STDMETHOD(LightElements)(THIS_ DWORD element_count, D3DLIGHTDATA *data) PURE; STDMETHOD(SetBackground)(THIS_ D3DMATERIALHANDLE hMat) PURE; STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE;

1 0