August 2013 - Wine-Commits - list.winehq.org

Jacek Caban : evcode.h: Added some missing defines.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: c52282fe7b36a2c168bdc36097b27ef1d756c5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52282fe7b36a2c168bdc3609… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 19 13:14:50 2013 +0200 evcode.h: Added some missing defines. --- include/evcode.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/include/evcode.h b/include/evcode.h index 3cbdd9d..b62ff6a 100644 --- a/include/evcode.h +++ b/include/evcode.h @@ -35,6 +35,7 @@ #define EC_QUALITY_CHANGE 0x0B #define EC_SHUTTING_DOWN 0x0C #define EC_CLOCK_CHANGED 0x0D +#define EC_PAUSED 0x0E #define EC_OPENING_FILE 0x10 #define EC_BUFFERING_DATA 0x11 #define EC_FULLSCREEN_LOST 0x12 @@ -50,5 +51,44 @@ #define EC_END_OF_SEGMENT 0x1C #define EC_SEGMENT_STARTED 0x1D #define EC_LENGTH_CHANGED 0x1E +#define EC_DEVICE_LOST 0x1F +#define EC_SAMPLE_NEEDED 0x20 +#define EC_PROCESSING_LATENCY 0x21 +#define EC_SAMPLE_LATENCY 0x22 +#define EC_SCRUB_TIME 0x23 +#define EC_STEP_COMPLETE 0x24 + +#define EC_NEW_PIN 0x20 +#define EC_RENDER_FINISHED 0x21 + +#define EC_TIMECODE_AVAILABLE 0x30 +#define EC_EXTDEVICE_MODE_CHANGE 0x31 +#define EC_STATE_CHANGE 0x32 + +#define EC_PLEASE_REOPEN 0x40 +#define EC_STATUS 0x41 +#define EC_MARKER_HIT 0x42 +#define EC_LOADSTATUS 0x43 +#define EC_FILE_CLOSED 0x44 +#define EC_ERRORABORTEX 0x45 +#define EC_EOS_SOON 0x46 +#define EC_CONTENTPROPERTY_CHANGED 0x47 +#define EC_BANDWIDTHCHANGE 0x48 +#define EC_VIDEOFRAMEREADY 0x49 +#define EC_GRAPH_CHANGED 0x50 +#define EC_CLOCK_UNSET 0x51 + +#define EC_VMR_RENDERDEVICE_SET 0x53 +#define EC_VMR_SURFACE_FLIPPED 0x54 +#define EC_VMR_RECONNECTION_FAILED 0x55 +#define EC_PREPROCESS_COMPLETE 0x56 +#define EC_CODECAPI_EVENT 0x57 + +#define EC_BUILT 0x300 +#define EC_UNBUILT 0x301 + +#define EC_WMT_EVENT_BASE 0x0251 +#define EC_WMT_INDEX_EVENT EC_WMT_EVENT_BASE +#define EC_WMT_EVENT EC_WMT_EVENT_BASE+1 #endif /* __WINE_EVCODE_H */

1 0

Jactry Zeng : include: Add definition of ST_UNICODE.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: c9466dfea42cdae2b73c628b52e33c81d864b0e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9466dfea42cdae2b73c628b5… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Mon Aug 19 09:24:13 2013 +0800 include: Add definition of ST_UNICODE. --- include/richedit.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/richedit.h b/include/richedit.h index 095cc8a..6b27fc9 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -1067,8 +1067,8 @@ typedef struct _settextex { #define ST_DEFAULT 0x00000000 #define ST_KEEPUNDO 0x00000001 #define ST_SELECTION 0x00000002 - #define ST_NEWCHARS 0x00000004 +#define ST_UNICODE 0x00000008 #ifdef __cplusplus }

1 0

Henri Verbeet : d3drm: Avoid LPDIRECTXFILE.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 34743e7044d845238451d4f150f3a0c1cf5aba6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=34743e7044d845238451d4f15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 10:50:53 2013 +0200 d3drm: Avoid LPDIRECTXFILE. --- dlls/d3drm/d3drm.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 3b653de..823d90a 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1353,7 +1353,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v D3DRMLOADTEXTURECALLBACK load_tex_cb, void *load_tex_ctx, IDirect3DRMFrame3 *parent_frame) { DXFILELOADOPTIONS load_options; - LPDIRECTXFILE pDXFile = NULL; + IDirectXFile *file = NULL; LPDIRECTXFILEENUMOBJECT pEnumObject = NULL; LPDIRECTXFILEDATA pData = NULL; HRESULT hr; @@ -1387,15 +1387,15 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v return E_NOTIMPL; } - hr = DirectXFileCreate(&pDXFile); + hr = DirectXFileCreate(&file); if (hr != DXFILE_OK) goto end; - hr = IDirectXFile_RegisterTemplates(pDXFile, templates, strlen(templates)); + hr = IDirectXFile_RegisterTemplates(file, templates, strlen(templates)); if (hr != DXFILE_OK) goto end; - hr = IDirectXFile_CreateEnumObject(pDXFile, source, load_options, &pEnumObject); + hr = IDirectXFile_CreateEnumObject(file, source, load_options, &pEnumObject); if (hr != DXFILE_OK) goto end; @@ -1460,8 +1460,8 @@ end: IDirectXFileData_Release(pData); if (pEnumObject) IDirectXFileEnumObject_Release(pEnumObject); - if (pDXFile) - IDirectXFile_Release(pDXFile); + if (file) + IDirectXFile_Release(file); return ret; }

1 0

Henri Verbeet : wined3d: Use the "adapter" local variable in swapchain_init ().
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 390543dd02c009960938464b934a1a811f1da399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=390543dd02c009960938464b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 10:50:52 2013 +0200 wined3d: Use the "adapter" local variable in swapchain_init(). --- dlls/wined3d/swapchain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ce54aeb..f6cfc2e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -925,7 +925,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 mode.refresh_rate = desc->refresh_rate; mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode))) + if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, adapter->ordinal, &mode))) { WARN("Failed to set display mode, hr %#x.\n", hr); goto err; @@ -944,7 +944,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 WINED3DFMT_S1_UINT_D15_UNORM }; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = &adapter->gl_info; swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)); if (!swapchain->context)

1 0

Henri Verbeet : wined3d: Avoid some redundant state_pscale() calls.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: c1a7323fac49852010a690dc292c765b075ff350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a7323fac49852010a690dc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 10:50:50 2013 +0200 wined3d: Avoid some redundant state_pscale() calls. --- dlls/wined3d/state.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9fc7840..ffc3101 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4677,10 +4677,6 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine gl_info->gl_ops.gl.p_glViewport(vp.x, (height - (vp.y + vp.height)), vp.width, vp.height); } - - if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE))) - state_pscale(context, state, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)); - checkGLcall("glViewport"); } @@ -4688,7 +4684,8 @@ void viewport_vertexpart(struct wined3d_context *context, const struct wined3d_s { if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION))) transform_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); - if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE))) + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)) + && state->render_states[WINED3D_RS_POINTSCALEENABLE]) state_pscale(context, state, STATE_RENDER(WINED3D_RS_POINTSCALEENABLE)); /* Update the position fixup. */ context->constant_update_mask |= WINED3D_SHADER_CONST_VS_POS_FIXUP;

1 0

Francois Gouget : imm32/tests: Fix a trailing '\n' in an ok() call.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 120e24431d6a78a595c0e1e293f760712e71046a URL: http://source.winehq.org/git/wine.git/?a=commit;h=120e24431d6a78a595c0e1e29… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 17 10:28:56 2013 +0200 imm32/tests: Fix a trailing '\n' in an ok() call. --- dlls/imm32/tests/imm32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 62bdb64..92cbccb 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -698,7 +698,7 @@ static void test_ImmGetIMCLockCount(void) count = ImmGetIMCLockCount(imc); ok(count == 0, "expect 0, returned %d\n", count); ic = ImmLockIMC(imc); - ok(ic != NULL, "ImmLockIMC failed\n!"); + ok(ic != NULL, "ImmLockIMC failed!\n"); count = ImmGetIMCLockCount(imc); ok(count == 1, "expect 1, returned %d\n", count); ret = ImmUnlockIMC(imc);

1 0

Kai Tietz : widl: Allow version-attribute on type and enum.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: da282872ff5cb5e15f3e3fadaa98d32d9e018a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da282872ff5cb5e15f3e3fada… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 16:12:28 2013 +0200 widl: Allow version-attribute on type and enum. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c55ee41..08a42bb 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2113,7 +2113,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_UUID */ { 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "uuid" }, /* ATTR_V1ENUM */ { 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, "v1_enum" }, /* ATTR_VARARG */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "vararg" }, - /* ATTR_VERSION */ { 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, "version" }, + /* ATTR_VERSION */ { 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, "version" }, /* ATTR_VIPROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "vi_progid" }, /* ATTR_WIREMARSHAL */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "wire_marshal" }, };

1 0

Kai Tietz : widl: New option --rt for enabling rt' s specific language extensions.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: 5ff7af708dd74e571622fe65a3f73039cc0cbd65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ff7af708dd74e571622fe65a… Author: Kai Tietz <ktietz70(a)googlemail.com> Date: Thu Aug 8 12:29:33 2013 +0200 widl: New option --rt for enabling rt's specific language extensions. --- tools/widl/widl.c | 7 +++++++ tools/widl/widl.h | 1 + tools/widl/widl.man.in | 3 +++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index cad1d6c..2ff1977 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -72,6 +72,7 @@ static const char usage[] = " --prefix-client=p Prefix names of client stubs with 'p'\n" " --prefix-server=p Prefix names of server functions with 'p'\n" " -r Generate registration script\n" +" --rt Enable WinRT's language extensions for IDL\n" " -s Generate server stub\n" " -t Generate typelib\n" " -u Generate interface identifiers file\n" @@ -113,6 +114,7 @@ int do_win32 = 1; int do_win64 = 1; int win32_packing = 8; int win64_packing = 8; +int do_rt_extension = 0; static enum stub_mode stub_mode = MODE_Os; char *input_name; @@ -152,6 +154,7 @@ enum { PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, PRINT_HELP, + RT_OPTION, WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, @@ -171,6 +174,7 @@ static const struct option long_options[] = { { "prefix-all", 1, NULL, PREFIX_ALL_OPTION }, { "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, NULL, PREFIX_SERVER_OPTION }, + { "rt", 0, NULL, RT_OPTION }, { "win32", 0, NULL, WIN32_OPTION }, { "win64", 0, NULL, WIN64_OPTION }, { "win32-align", 1, NULL, WIN32_ALIGN_OPTION }, @@ -542,6 +546,9 @@ int main(int argc,char *argv[]) case PRINT_HELP: fprintf(stderr, "%s", usage); return 0; + case RT_OPTION: + do_rt_extension = 1; + break; case WIN32_OPTION: do_win32 = 1; do_win64 = 0; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 6551fa0..91054ad 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -49,6 +49,7 @@ extern int do_win32; extern int do_win64; extern int win32_packing; extern int win64_packing; +extern int do_rt_extension; extern char *input_name; extern char *header_name; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 473bfac..c5f0205 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -82,6 +82,9 @@ Only generate 32-bit or 64-bit code respectively (the default is to generate both 32-bit and 64-bit versions into the same destination file). .PP +.IP "\fB--rt\fR" +Enable additional language extensions for IDL to support WinRT. +.PP .B Registration script options: .IP "\fB-r\fR" Generate a registration script. The default output filename is

1 0

Andrew Eikum : oleaut32: Assign MEMBERIDs to vardescs without one.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: b6bfd6d32e0abc0363c4c64b11769a6dc10a9d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6bfd6d32e0abc0363c4c64b1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 16 14:40:22 2013 -0500 oleaut32: Assign MEMBERIDs to vardescs without one. --- dlls/oleaut32/tests/typelib.c | 4 ++++ dlls/oleaut32/typelib.c | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 40359a2..d12181c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4032,6 +4032,7 @@ static void test_SetVarHelpContext(void) ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); memset(&desc, 0, sizeof(desc)); + desc.memid = MEMBERID_NIL; desc.elemdescVar.tdesc.vt = VT_INT; desc.varkind = VAR_CONST; @@ -4067,6 +4068,7 @@ static void test_SetVarHelpContext(void) hr = ITypeInfo_GetVarDesc(ti, 0, &pdesc); ok(hr == S_OK, "got %08x\n", hr); + ok(pdesc->memid == 0x40000000, "got wrong memid: %x\n", pdesc->memid); ok(pdesc->elemdescVar.tdesc.vt == VT_INT, "got wrong vardesc type: %u\n", pdesc->elemdescVar.tdesc.vt); ok(pdesc->varkind == VAR_CONST, "got wrong varkind: %u\n", pdesc->varkind); ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue)); @@ -4191,6 +4193,7 @@ static void test_SetVarDocString(void) ok(hr == E_INVALIDARG, "got %08x\n", hr); memset(&desc, 0, sizeof(desc)); + desc.memid = MEMBERID_NIL; desc.elemdescVar.tdesc.vt = VT_INT; desc.varkind = VAR_CONST; @@ -4229,6 +4232,7 @@ static void test_SetVarDocString(void) hr = ITypeInfo_GetVarDesc(ti, 0, &pdesc); ok(hr == S_OK, "got %08x\n", hr); + ok(pdesc->memid == 0x40000000, "got wrong memid: %x\n", pdesc->memid); ok(pdesc->elemdescVar.tdesc.vt == VT_INT, "got wrong vardesc type: %u\n", pdesc->elemdescVar.tdesc.vt); ok(pdesc->varkind == VAR_CONST, "got wrong varkind: %u\n", pdesc->varkind); ok(V_VT(U(pdesc)->lpvarValue) == VT_INT, "got wrong value type: %u\n", V_VT(U(pdesc)->lpvarValue)); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4cccbac..118e1f0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -10737,6 +10737,33 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) if (user_vft > This->cbSizeVft) This->cbSizeVft = user_vft + This->pTypeLib->ptr_size; + for(i = 0; i < This->cVars; ++i){ + TLBVarDesc *var_desc = &This->vardescs[i]; + if(var_desc->vardesc.memid == MEMBERID_NIL){ + UINT j = 0; + BOOL reset = FALSE; + TLBVarDesc *iter; + + var_desc->vardesc.memid = 0x40000000 + (depth << 16) + i; + + iter = This->vardescs; + while (j < This->cVars) { + if (iter != var_desc && iter->vardesc.memid == var_desc->vardesc.memid) { + if (!reset) { + var_desc->vardesc.memid = 0x40000000 + (depth << 16) + This->cVars; + reset = TRUE; + } else + ++var_desc->vardesc.memid; + iter = This->vardescs; + j = 0; + } else { + ++iter; + ++j; + } + } + } + } + ITypeInfo_Release(tinfo); return hres; }

1 0

Henri Verbeet : wined3d: Store the immediate mode fixed function attribute submission function pointers in struct wined3d_d3d_info .
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: wine Branch: master Commit: b2721d5f9ce52c90bb25a090ddcddc48a8885a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2721d5f9ce52c90bb25a090d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 19 10:50:51 2013 +0200 wined3d: Store the immediate mode fixed function attribute submission function pointers in struct wined3d_d3d_info. --- dlls/wined3d/directx.c | 252 +++++++++++++++++++--------------------- dlls/wined3d/drawprim.c | 21 ++-- dlls/wined3d/wined3d_private.h | 23 +++-- 3 files changed, 145 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b2721d5f9ce52c90bb25a…

1 0