December 2013 - Wine-Commits

Hans Leidekker : wininet: Return an error when ensure_cred_handle fails.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: 9373d4c5780aee66f4c463741e3d3de192aaef55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9373d4c5780aee66f4c463741… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 10:47:54 2013 +0100 wininet: Return an error when ensure_cred_handle fails. --- dlls/wininet/netconnection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index b1368bf..c8879b6 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -494,7 +494,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode |ISC_REQ_SEQUENCE_DETECT|ISC_REQ_REPLAY_DETECT|ISC_REQ_MANUAL_CRED_VALIDATION; if(!ensure_cred_handle()) - return FALSE; + return ERROR_INTERNET_SECURITY_CHANNEL_ERROR; if(compat_mode) { if(!have_compat_cred_handle)

1 0

Hans Leidekker : ntdll: Report the latest service pack for 64-bit Windows XP.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: 0463d01f151fb3d7c7acf26c7628683fefb6c130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0463d01f151fb3d7c7acf26c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 10:50:19 2013 +0100 ntdll: Report the latest service pack for 64-bit Windows XP. --- dlls/ntdll/version.c | 4 ++-- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index f4b1093..57e586a 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -138,8 +138,8 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = /* WINXP64 */ { sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, - {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, - 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','2',0}, + 2, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN2K3 */ { diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index fdb0a71..3b83860 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -56,7 +56,7 @@ static const struct { "vista", "Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"}, #ifdef _WIN64 - { "winxp64", "Windows XP", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, + { "winxp64", "Windows XP", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, #else { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"}, { "win2k", "Windows 2000", 5, 0, 0x893, VER_PLATFORM_WIN32_NT, "Service Pack 4", 4, 0, "WinNT"},

1 0

Dmitry Timoshkov : msiexec: MSI service should report SERVICE_STOPPED when appropriate.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: 955de31fad16da6453d0a67d2510955cb255ab46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=955de31fad16da6453d0a67d2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 11 17:16:07 2013 +0900 msiexec: MSI service should report SERVICE_STOPPED when appropriate. --- programs/msiexec/service.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c index 4b72fe0..fdd29bd 100644 --- a/programs/msiexec/service.c +++ b/programs/msiexec/service.c @@ -81,6 +81,8 @@ static BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode, static void WINAPI ServiceCtrlHandler(DWORD code) { + DWORD state = SERVICE_RUNNING; + WINE_TRACE("%d\n", code); switch (code) @@ -89,13 +91,14 @@ static void WINAPI ServiceCtrlHandler(DWORD code) case SERVICE_CONTROL_STOP: UpdateSCMStatus(SERVICE_STOP_PENDING, NO_ERROR, 0); KillService(); + state = SERVICE_STOPPED; return; default: fprintf(stderr, "Unhandled service control code: %d\n", code); break; } - UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); + UpdateSCMStatus(state, NO_ERROR, 0); } static DWORD WINAPI ServiceExecutionThread(LPVOID param) @@ -135,12 +138,14 @@ static void WINAPI ServiceMain(DWORD argc, LPSTR *argv) { fprintf(stderr, "Failed to create event\n"); KillService(); + UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); return; } if (!StartServiceThread()) { KillService(); + UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); return; } @@ -148,6 +153,8 @@ static void WINAPI ServiceMain(DWORD argc, LPSTR *argv) WaitForSingleObject(kill_event, INFINITE); KillService(); + + UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); } DWORD DoService(void)

1 0

Dmitry Timoshkov : include: Add taskschd.idl.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: bd51d5fcbafdae63cbdaf4f2a058cce90bb6cbd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd51d5fcbafdae63cbdaf4f2a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 11 16:58:20 2013 +0900 include: Add taskschd.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/taskschd.idl | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 2ba4396..399a8ec 100644 --- a/.gitignore +++ b/.gitignore @@ -244,6 +244,7 @@ include/stamp-h include/stdole2.tlb include/strmif.h include/structuredquerycondition.h +include/taskschd.h include/textstor.h include/tlogstg.h include/tom.h diff --git a/include/Makefile.in b/include/Makefile.in index d10ffc5..1f25159 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -99,6 +99,7 @@ PUBLIC_IDL_H_SRCS = \ shtypes.idl \ strmif.idl \ structuredquerycondition.idl \ + taskschd.idl \ textstor.idl \ tlogstg.idl \ tom.idl \ diff --git a/include/taskschd.idl b/include/taskschd.idl new file mode 100644 index 0000000..ad8a1bf --- /dev/null +++ b/include/taskschd.idl @@ -0,0 +1,185 @@ +/* + * Copyright 2013 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +cpp_quote("DEFINE_GUID(CLSID_TaskScheduler, 0xf87369f,0xa4e5,0x4cfc,0xbd,0x3e,0x73,0xe6,0x15,0x45,0x72,0xdd);") + +typedef enum _TASK_STATE +{ + TASK_STATE_UNKNOWN, + TASK_STATE_DISABLED, + TASK_STATE_QUEUED, + TASK_STATE_READY, + TASK_STATE_RUNNING +} TASK_STATE; + +typedef enum _TASK_ENUM_FLAGS +{ + TASK_ENUM_HIDDEN = 0x0001 +} TASK_ENUM_FLAGS; + +typedef enum _TASK_LOGON_TYPE +{ + TASK_LOGON_NONE, + TASK_LOGON_PASSWORD, + TASK_LOGON_S4U, + TASK_LOGON_INTERACTIVE_TOKEN, + TASK_LOGON_GROUP, + TASK_LOGON_SERVICE_ACCOUNT, + TASK_LOGON_INTERACTIVE_TOKEN_OR_PASSWORD +} TASK_LOGON_TYPE; + +typedef enum _TASK_RUNLEVEL +{ + TASK_RUNLEVEL_LUA, + TASK_RUNLEVEL_HIGHEST +} TASK_RUNLEVEL_TYPE; + +interface ITaskService; +interface IRegisteredTask; +interface IRegisteredTaskCollection; +interface ITaskFolder; +interface ITaskFolderCollection; +interface ITaskDefinition; +interface IRunningTask; +interface IRunningTaskCollection; + +[ + object, + oleautomation, + uuid(2faba4c7-4da9-4013-9697-20cc3fd40f85) +] +interface ITaskService : IDispatch +{ + HRESULT GetFolder([in] BSTR path, [out, retval] ITaskFolder **folder ); + HRESULT GetRunningTasks([in] LONG flags, [out, retval] IRunningTaskCollection **tasks ); + HRESULT NewTask([in] DWORD flags, [out, retval] ITaskDefinition **definition ); + HRESULT Connect([in, optional] VARIANT server, [in, optional] VARIANT user, [in, optional] VARIANT domain, [in, optional] VARIANT password); + [propget] HRESULT Connected([out, retval] VARIANT_BOOL *connected); + [propget] HRESULT TargetServer([out, retval] BSTR *server); + [propget] HRESULT ConnectedUser([out, retval] BSTR *user); + [propget] HRESULT ConnectedDomain([out, retval] BSTR *domain); + [propget] HRESULT HighestVersion([out, retval] DWORD *version); +} + +[ + object, + oleautomation, + uuid(9c86f320-dee3-4dd1-b972-a303f26b061e) +] +interface IRegisteredTask : IDispatch +{ + [propget] HRESULT Name([out, retval] BSTR *name); + [propget] HRESULT Path([out, retval] BSTR *path); + [propget] HRESULT State([out, retval] TASK_STATE *state); + [propget] HRESULT Enabled([out, retval] VARIANT_BOOL *enabled); + [propput] HRESULT Enabled(VARIANT_BOOL enabled); + HRESULT Run([in] VARIANT params, [out, retval] IRunningTask **task); + HRESULT RunEx([in] VARIANT params, [in] LONG flags, [in] LONG sessionID, [in] BSTR user, [out, retval] IRunningTask **task); + HRESULT GetInstances([in] LONG flags, [out, retval] IRunningTaskCollection **tasks); + [propget] HRESULT LastRunTime([out, retval] DATE *date); + [propget] HRESULT LastTaskResult([out, retval] LONG *result); + [propget] HRESULT NumberOfMissedRuns([out, retval] LONG *runs); + [propget] HRESULT NextRunTime([out, retval] DATE *date); + [propget] HRESULT Definition([out, retval] ITaskDefinition **task); + [propget] HRESULT Xml([out, retval] BSTR *xml); + HRESULT GetSecurityDescriptor([in] LONG info, [out, retval] BSTR *sddl); + HRESULT SetSecurityDescriptor([in] BSTR sddl, [in] LONG flags); + HRESULT Stop([in] LONG flags); + HRESULT GetRunTimes([in] const LPSYSTEMTIME start, [in] const LPSYSTEMTIME end, [in, out] DWORD *count, [out] LPSYSTEMTIME *time); +} + +[ + object, + oleautomation, + uuid(86627eb4-42a7-41e4-a4d9-ac33a72f2d52) +] +interface IRegisteredTaskCollection : IDispatch +{ + [propget] HRESULT Count([out, retval] LONG *count); + [propget] HRESULT Item([in] VARIANT index, [out, retval] IRegisteredTask **task); + [propget] HRESULT _NewEnum([out, retval] IUnknown **penum); +} + +[ + object, + oleautomation, + uuid(8cfac062-a080-4c15-9a88-aa7c2af80dfc) +] +interface ITaskFolder : IDispatch +{ + [propget] HRESULT Name([out, retval] BSTR *name); + [propget] HRESULT Path([out, retval] BSTR *path); + HRESULT GetFolder([in] BSTR path, [out, retval] ITaskFolder **folder); + HRESULT GetFolders([in] LONG flags, [out, retval] ITaskFolderCollection **folders); + HRESULT CreateFolder([in] BSTR name, [in] VARIANT sddl, [out, retval] ITaskFolder **folder); + HRESULT DeleteFolder([in] BSTR name, [in] LONG flags); + HRESULT GetTask([in] BSTR path, [out, retval] IRegisteredTask **task); + HRESULT GetTasks([in] LONG flags, [out, retval] IRegisteredTaskCollection **tasks); + HRESULT DeleteTask([in] BSTR name, [in] LONG flags); + HRESULT RegisterTask([in] BSTR path, [in] BSTR xml, [in] LONG flags, [in] VARIANT user, [in] VARIANT password, + [in] TASK_LOGON_TYPE logonType, [in] VARIANT sddl, [out, retval] IRegisteredTask **task); + HRESULT RegisterTaskDefinition([in] BSTR path, [in] ITaskDefinition *definition, [in] LONG flags, + [in] VARIANT user, [in] VARIANT password, [in] TASK_LOGON_TYPE logon, + [in] VARIANT sddl, [out, retval] IRegisteredTask **task); + HRESULT GetSecurityDescriptor(LONG info, [out, retval] BSTR *sddl); + HRESULT SetSecurityDescriptor([in] BSTR sddl, [in] LONG flags); +} + +[ + object, + oleautomation, + uuid(79184a66-8664-423f-97f1-637356a5d812) +] +interface ITaskFolderCollection : IDispatch +{ + [propget] HRESULT Count([out, retval] LONG *count); + [propget] HRESULT Item([in] VARIANT index, [out, retval] ITaskFolder **folder); + [propget] HRESULT _NewEnum([out, retval] IUnknown **penum); +} + +[ + object, + oleautomation, + uuid(653758fb-7b9a-4f1e-a471-beeb8e9b834e) +] +interface IRunningTask : IDispatch +{ + [propget] HRESULT Name([out, retval] BSTR *name); + [propget] HRESULT InstanceGuid([out, retval] BSTR *guid); + [propget] HRESULT Path([out, retval] BSTR *path); + [propget] HRESULT State([out, retval] TASK_STATE *state); + [propget] HRESULT CurrentAction([out, retval] BSTR *name); + HRESULT Stop(void ); + HRESULT Refresh(void ); + [propget] HRESULT EnginePID([out, retval] DWORD *pid); +} + +[ + object, + oleautomation, + uuid(6a67614b-6828-4fec-aa54-6d52e8f1f2db) +] +interface IRunningTaskCollection : IDispatch +{ + [propget] HRESULT Count([out, retval] LONG *count); + [propget] HRESULT Item([in] VARIANT index, [out, retval] IRunningTask **task); + [propget] HRESULT _NewEnum([out, retval] IUnknown **penum); +}

1 0

Henri Verbeet : wined3d: Recreate DIB sections in wined3d_surface_update_desc().
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: 544e52bff40dd51a3f4f9954a6a32a75ff70ae07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=544e52bff40dd51a3f4f9954a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 11 14:32:04 2013 +0100 wined3d: Recreate DIB sections in wined3d_surface_update_desc(). Since commit 6bc69c271bf440b4ecad012dc57888fdffc075d5, the GDI implementation assumes DIB sections always exist. --- dlls/wined3d/surface.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5b28e9b..a613059 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2814,6 +2814,8 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); + BOOL create_dib = FALSE; + HRESULT hr; TRACE("surface %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u.\n", surface, width, height, debug_d3dformat(format_id), multisample_type, multisample_type); @@ -2830,6 +2832,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, DeleteObject(surface->dib.DIBsection); surface->dib.bitmap_data = NULL; surface->flags &= ~SFLAG_DIBSECTION; + create_dib = TRUE; } surface->flags &= ~(SFLAG_LOCATIONS | SFLAG_USERPTR); @@ -2863,7 +2866,16 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, surface->resource.multisample_quality = multisample_quality; surface->resource.size = resource_size; - if (!surface_init_sysmem(surface)) + if (create_dib) + { + if (FAILED(hr = surface_create_dib_section(surface))) + { + ERR("Failed to create dib section, hr %#x.\n", hr); + return hr; + } + surface->resource.allocatedMemory = surface->dib.bitmap_data; + } + else if (!surface_init_sysmem(surface)) return E_OUTOFMEMORY; return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Fix the source swizzle for WINED3DSIH_EXP.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: 6e9acca1f4639d04d2c95b33e4f32444eb8204de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e9acca1f4639d04d2c95b33e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 11 14:32:06 2013 +0100 wined3d: Fix the source swizzle for WINED3DSIH_EXP. --- dlls/d3d8/tests/visual.c | 2 +- dlls/wined3d/glsl_shader.c | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 33d876a..66bf241 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1780,7 +1780,7 @@ static void test_scalar_instructions(IDirect3DDevice8 *device) { {"rcp_test", rcp_test, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x80), FALSE}, {"rsq_test", rsq_test, D3DCOLOR_ARGB(0x00, 0xb4, 0xb4, 0xb4), FALSE}, - {"exp_test", exp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), TRUE}, + {"exp_test", exp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), FALSE}, {"expp_test", expp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), TRUE}, {"log_test", log_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), TRUE}, {"logp_test", logp_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), TRUE}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 69f6dff..f4d6499 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2632,7 +2632,6 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_MAX: instruction = "max"; break; case WINED3DSIH_ABS: instruction = "abs"; break; case WINED3DSIH_FRC: instruction = "fract"; break; - case WINED3DSIH_EXP: instruction = "exp2"; break; case WINED3DSIH_DSX: instruction = "dFdx"; break; case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; case WINED3DSIH_ROUND_NI: instruction = "floor"; break; @@ -2689,6 +2688,24 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) } } +static void shader_glsl_exp(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param src0_param; + DWORD dst_write_mask; + unsigned int dst_size; + + dst_write_mask = shader_glsl_append_dst(buffer, ins); + dst_size = shader_glsl_get_write_mask_size(dst_write_mask); + + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src0_param); + + if (dst_size > 1) + shader_addline(buffer, "vec%u(exp2(%s)));\n", dst_size, src0_param.param_str); + else + shader_addline(buffer, "exp2(%s));\n", src0_param.param_str); +} + /** Process the WINED3DSIO_EXPP instruction in GLSL: * For shader model 1.x, do the following (and honor the writemask, so use a temporary variable): * dst.x = 2^(floor(src)) @@ -6671,7 +6688,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end, /* WINED3DSIH_EQ */ shader_glsl_relop, - /* WINED3DSIH_EXP */ shader_glsl_map2gl, + /* WINED3DSIH_EXP */ shader_glsl_exp, /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ shader_glsl_to_int,

1 0

Huw Davies : wbemprox: Add a partial implementation of Win32_PhysicalMedia.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: 710e3bc5ec813ff76809c9446f8dddee3264fad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=710e3bc5ec813ff76809c9446… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 11 13:36:34 2013 +0000 wbemprox: Add a partial implementation of Win32_PhysicalMedia. --- dlls/wbemprox/builtin.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4efb17b..2db27c0 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -73,6 +73,8 @@ static const WCHAR class_osW[] = {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; static const WCHAR class_paramsW[] = {'_','_','P','A','R','A','M','E','T','E','R','S',0}; +static const WCHAR class_physicalmediaW[] = + {'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','d','i','a',0}; static const WCHAR class_qualifiersW[] = {'_','_','Q','U','A','L','I','F','I','E','R','S',0}; static const WCHAR class_process_getowner_outW[] = @@ -382,6 +384,10 @@ static const struct column col_param[] = { prop_varianttypeW, CIM_UINT32 }, { prop_defaultvalueW, CIM_UINT32 } }; +static const struct column col_physicalmedia[] = +{ + { prop_serialnumberW, CIM_STRING } +}; static const struct column col_process[] = { { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -647,6 +653,10 @@ struct record_param UINT32 varianttype; UINT32 defaultvalue; }; +struct record_physicalmedia +{ + const WCHAR *serialnumber; +}; struct record_process { const WCHAR *caption; @@ -767,6 +777,10 @@ static const struct record_param data_param[] = #define FLAVOR_ID (WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE | WBEM_FLAVOR_NOT_OVERRIDABLE |\ WBEM_FLAVOR_ORIGIN_PROPAGATED) +static const struct record_physicalmedia data_physicalmedia[] = +{ + { diskdrive_serialW } +}; static const struct record_qualifier data_qualifier[] = { { class_process_getowner_outW, param_userW, CIM_SINT32, FLAVOR_ID, prop_idW, 0 }, @@ -2195,6 +2209,7 @@ static struct table builtin_classes[] = fill_networkadapterconfig }, { class_osW, SIZEOF(col_os), col_os, 0, 0, NULL, fill_os }, { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, + { class_physicalmediaW, SIZEOF(col_physicalmedia), col_physicalmedia, SIZEOF(data_physicalmedia), 0, (BYTE *)data_physicalmedia }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, { class_qualifiersW, SIZEOF(col_qualifier), col_qualifier, SIZEOF(data_qualifier), 0, (BYTE *)data_qualifier },

1 0

Austin English : dinput: Consistently use GetCurrentTime().
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: bfafb1ffc5a102966025b5b9f3acb81fea5435d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfafb1ffc5a102966025b5b9f… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 10 16:45:28 2013 -0800 dinput: Consistently use GetCurrentTime(). --- dlls/dinput/joystick_linux.c | 3 +-- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/keyboard.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 669db42..ce04986 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -689,8 +689,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) } } if (inst_id >= 0) - queue_event(iface, inst_id, - value, jse.time, This->generic.base.dinput->evsequence++); + queue_event(iface, inst_id, value, GetCurrentTime(), This->generic.base.dinput->evsequence++); } } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 951690d..3bf922f 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -873,7 +873,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) } if (inst_id >= 0) queue_event(iface, inst_id, - value, ie.time.tv_usec, This->generic.base.dinput->evsequence++); + value, GetCurrentTime(), This->generic.base.dinput->evsequence++); } } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index e8e7515..a5967d7 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -126,7 +126,7 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM EnterCriticalSection(&This->base.crit); queue_event(iface, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON, - new_diks, hook->time, This->base.dinput->evsequence++); + new_diks, GetCurrentTime(), This->base.dinput->evsequence++); LeaveCriticalSection(&This->base.crit); return ret;

1 0

Stefan Dösinger : wined3d: Support getdc with user memory.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: 9b67b1b8a135f2855a38782acb60783bba9b215c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b67b1b8a135f2855a38782ac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 12:22:16 2013 +0100 wined3d: Support getdc with user memory. --- dlls/wined3d/surface.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a613059..6270d0a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3309,12 +3309,6 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) TRACE("surface %p, dc %p.\n", surface, dc); - if (surface->flags & SFLAG_USERPTR) - { - ERR("Not supported on surfaces with application-provided memory.\n"); - return WINEDDERR_NODC; - } - /* Give more detailed info for ddraw. */ if (surface->flags & SFLAG_DCINUSE) return WINEDDERR_DCALREADYCREATED; @@ -3335,8 +3329,8 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) if (FAILED(hr)) return WINED3DERR_INVALIDCALL; - /* Use the DIB section from now on if we are not using a PBO. */ - if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) + /* Use the DIB section from now on if we are not using a PBO or user memory. */ + if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM | SFLAG_USERPTR))) { wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data;

1 0

Stefan Dösinger : wined3d: Rename surface_load_pbo to surface_create_pbo.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: 78fda5cea083ce62c28fceb873f4372863ca0fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78fda5cea083ce62c28fceb87… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 12:22:21 2013 +0100 wined3d: Rename surface_load_pbo to surface_create_pbo. --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0c3df16..ec9ac6c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -545,7 +545,7 @@ static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct return TRUE; } -static void surface_load_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) +static void surface_create_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { struct wined3d_context *context; GLenum error; @@ -586,7 +586,7 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) - surface_load_pbo(surface, gl_info); + surface_create_pbo(surface, gl_info); else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO)) { /* Whatever surface we have, make sure that there is memory allocated @@ -5244,7 +5244,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) if (location == SFLAG_INSYSMEM && !(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) - surface_load_pbo(surface, gl_info); + surface_create_pbo(surface, gl_info); return WINED3D_OK; }

1 0