January 2013 - Wine-Commits

Ken Thomases : winemac: Translate presence i n Windows task bar to participation in Exposé and window cycling.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: 15d4b2ab51a6b0c34334a95b98a36fd6e4fea2e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d4b2ab51a6b0c34334a95b9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 11 06:20:40 2013 -0600 winemac: Translate presence in Windows task bar to participation in Exposé and window cycling. --- dlls/winemac.drv/cocoa_window.m | 12 ++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/window.c | 3 +++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e6ae103..9d359ff 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -156,6 +156,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) - (void) setMacDrvState:(const struct macdrv_window_state*)state { NSInteger level; + NSWindowCollectionBehavior behavior; self.disabled = state->disabled; self.noActivate = state->no_activate; @@ -164,6 +165,17 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) level = state->floating ? NSFloatingWindowLevel : NSNormalWindowLevel; if (level != [self level]) [self setLevel:level]; + + behavior = NSWindowCollectionBehaviorDefault; + if (state->excluded_by_expose) + behavior |= NSWindowCollectionBehaviorTransient; + else + behavior |= NSWindowCollectionBehaviorManaged; + if (state->excluded_by_cycle) + behavior |= NSWindowCollectionBehaviorIgnoresCycle; + else + behavior |= NSWindowCollectionBehaviorParticipatesInCycle; + [self setCollectionBehavior:behavior]; } /* Returns whether or not the window was ordered in, which depends on if diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 86a49ce..fc2b0ac 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -129,6 +129,8 @@ struct macdrv_window_state { unsigned int disabled:1; unsigned int no_activate:1; unsigned int floating:1; + unsigned int excluded_by_expose:1; + unsigned int excluded_by_cycle:1; }; extern macdrv_window macdrv_create_cocoa_window(const struct macdrv_window_features* wf, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 21c9e59..4344da5 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -104,6 +104,9 @@ static void get_cocoa_window_state(struct macdrv_win_data *data, state->disabled = (style & WS_DISABLED) != 0; state->no_activate = !can_activate_window(data->hwnd); state->floating = (ex_style & WS_EX_TOPMOST) != 0; + state->excluded_by_expose = state->excluded_by_cycle = + !(ex_style & WS_EX_APPWINDOW) && + (GetWindow(data->hwnd, GW_OWNER) || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))); }

1 0

Huw Davies : usp10: Fix the offset calculations for rtl display.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: bd08cecbb6e3e8c9fb900881120691ecae7082fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd08cecbb6e3e8c9fb9008811… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 11 11:09:21 2013 +0000 usp10: Fix the offset calculations for rtl display. --- dlls/usp10/usp10.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 850c486..b25e956 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3237,7 +3237,7 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN const int *piJustify, const GOFFSET *pGoffset) { HRESULT hr = S_OK; - INT i; + INT i, dir = 1; INT *lpDx; WORD *reordered_glyphs = (WORD *)pwGlyphs; @@ -3268,27 +3268,29 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN for (i = 0; i < cGlyphs; i++) reordered_glyphs[i] = pwGlyphs[cGlyphs - 1 - i]; + dir = -1; } for (i = 0; i < cGlyphs; i++) { - lpDx[i * 2] = piAdvance[i]; + int orig_index = (dir > 0) ? i : cGlyphs - 1 - i; + lpDx[i * 2] = piAdvance[orig_index]; lpDx[i * 2 + 1] = 0; if (pGoffset) { if (i == 0) { - x += pGoffset[i].du; - y += pGoffset[i].dv; + x += pGoffset[orig_index].du * dir; + y += pGoffset[orig_index].dv * dir; } else { - lpDx[(i - 1) * 2] += pGoffset[i].du; - lpDx[(i - 1) * 2 + 1] += pGoffset[i].dv; + lpDx[(i - 1) * 2] += pGoffset[orig_index].du * dir; + lpDx[(i - 1) * 2 + 1] += pGoffset[orig_index].dv * dir; } - lpDx[i * 2] -= pGoffset[i].du; - lpDx[i * 2 + 1] -= pGoffset[i].dv; + lpDx[i * 2] -= pGoffset[orig_index].du * dir; + lpDx[i * 2 + 1] -= pGoffset[orig_index].dv * dir; } }

1 0

Piotr Caban : msvcrt: Make fputwc encoding aware.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

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 Jan. 11, 2013

Jan. 11, 2013

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: Added fwprintf tests.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

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

Henri Verbeet : ddraw: Avoid LPD3DLIGHTDATA.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

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

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

Jan. 11, 2013

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

Henri Verbeet : ddraw: Avoid LPD3DLIGHT2.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

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 : d3d9/tests: Merge shader.c into device.c.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: dd9efc98521df5eb3bae1599e86f7d846d50fe4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd9efc98521df5eb3bae1599e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 11 12:07:49 2013 +0100 d3d9/tests: Merge shader.c into device.c. --- dlls/d3d9/tests/Makefile.in | 1 - dlls/d3d9/tests/device.c | 392 +++++++++++++++++++++++++++++++++++++++++-- dlls/d3d9/tests/shader.c | 334 ------------------------------------ 3 files changed, 374 insertions(+), 353 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd9efc98521df5eb3bae1…

1 0

Huw Davies : usp10: Simplify the reordering of glyphs.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: 83cbc07141daba31ab93141e7f14c61798b9a5a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83cbc07141daba31ab93141e7… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 11 11:09:19 2013 +0000 usp10: Simplify the reordering of glyphs. --- dlls/usp10/usp10.c | 40 ++++++++++++++++++---------------------- 1 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 75fe597..b77c251 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3239,6 +3239,7 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN HRESULT hr = S_OK; INT i; INT *lpDx; + WORD *reordered_glyphs = (WORD *)pwGlyphs; TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, @@ -3253,8 +3254,22 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ lpDx = heap_alloc(cGlyphs * sizeof(INT) * 2); + if (!lpDx) return E_OUTOFMEMORY; fuOptions |= ETO_PDY; + if (psa->fRTL && psa->fLogicalOrder) + { + reordered_glyphs = heap_alloc( cGlyphs * sizeof(WORD) ); + if (!reordered_glyphs) + { + heap_free( lpDx ); + return E_OUTOFMEMORY; + } + + for (i = 0; i < cGlyphs; i++) + reordered_glyphs[i] = pwGlyphs[cGlyphs - 1 - i]; + } + for (i = 0; i < cGlyphs; i++) { lpDx[i * 2] = piAdvance[i]; @@ -3269,29 +3284,10 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN } } - if (psa->fRTL && psa->fLogicalOrder) - { - int i; - WORD *rtlGlyphs; - - rtlGlyphs = heap_alloc(cGlyphs * sizeof(WORD)); - if (!rtlGlyphs) - { - heap_free(lpDx); - return E_OUTOFMEMORY; - } - - for (i = 0; i < cGlyphs; i++) - rtlGlyphs[i] = pwGlyphs[cGlyphs-1-i]; - - if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, rtlGlyphs, cGlyphs, lpDx)) - hr = S_FALSE; - heap_free(rtlGlyphs); - } - else - if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, lpDx)) - hr = S_FALSE; + if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, reordered_glyphs, cGlyphs, lpDx)) + hr = S_FALSE; + if (reordered_glyphs != pwGlyphs) heap_free( reordered_glyphs ); heap_free(lpDx); return hr;

1 0