December 2013 - Wine-commits

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

11 Dec '13

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: Make service thread do nothing by waiting for the kill event instead of using an empty loop .
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 957f7013d2edba8d6928bfe725666073fdf94689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=957f7013d2edba8d6928bfe72… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 11 17:16:01 2013 +0900 msiexec: Make service thread do nothing by waiting for the kill event instead of using an empty loop. --- programs/msiexec/service.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c index ab419ca..4b72fe0 100644 --- a/programs/msiexec/service.c +++ b/programs/msiexec/service.c @@ -100,10 +100,7 @@ static void WINAPI ServiceCtrlHandler(DWORD code) static DWORD WINAPI ServiceExecutionThread(LPVOID param) { - while (TRUE) - { - /* do nothing */ - } + WaitForSingleObject(kill_event, INFINITE); return 0; }

1 0

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

11 Dec '13

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

Frédéric Delanoy : krnl386.exe16: Make VGA_[Set/ Get]Mode return TRUE on success.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: f24a5bc824e474165af7e4883a0c1cbcfe8956be URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24a5bc824e474165af7e4883… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 11 11:38:49 2013 +0100 krnl386.exe16: Make VGA_[Set/Get]Mode return TRUE on success. --- dlls/krnl386.exe16/int10.c | 2 +- dlls/krnl386.exe16/int33.c | 2 +- dlls/krnl386.exe16/vga.c | 20 ++++++++++---------- dlls/krnl386.exe16/vga.h | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/krnl386.exe16/int10.c b/dlls/krnl386.exe16/int10.c index dfba761..2ac9703 100644 --- a/dlls/krnl386.exe16/int10.c +++ b/dlls/krnl386.exe16/int10.c @@ -750,7 +750,7 @@ static BOOL INT10_SetVideoMode( BIOSDATA *data, WORD mode ) ptr->Width, ptr->Height, ptr->Depth, clearScreen ? "cleared" : "preserved" ); - if ( VGA_SetMode(mode) ) + if (!VGA_SetMode(mode)) return FALSE; } diff --git a/dlls/krnl386.exe16/int33.c b/dlls/krnl386.exe16/int33.c index 7226816..0f03ac7 100644 --- a/dlls/krnl386.exe16/int33.c +++ b/dlls/krnl386.exe16/int33.c @@ -295,7 +295,7 @@ void DOSVM_Int33Message(UINT message,WPARAM wParam,LPARAM lParam) WORD mask = 0; unsigned Height, Width, SX=1, SY=1; - if (!VGA_GetMode(&Height,&Width,NULL)) { + if (VGA_GetMode(&Height, &Width, NULL)) { /* may need to do some coordinate scaling */ if (Width) SX = 640/Width; diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c index f1b632e..ade19f7 100644 --- a/dlls/krnl386.exe16/vga.c +++ b/dlls/krnl386.exe16/vga.c @@ -735,7 +735,7 @@ static char*VGA_AlphaBuffer(void) typedef struct { unsigned Xres, Yres, Depth; - int ret; + BOOL ret; } ModeSet; @@ -780,7 +780,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg) { HRESULT res; ModeSet *par = (ModeSet *)arg; - par->ret=1; + par->ret = FALSE; if (lpddraw) VGA_DoExit(0); if (!lpddraw) { @@ -845,7 +845,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg) /* poll every 20ms (50fps should provide adequate responsiveness) */ VGA_InstallTimer(20); } - par->ret=0; + par->ret = TRUE; return; } @@ -872,7 +872,7 @@ const VGA_MODE *VGA_GetModeInfo(WORD mode) return NULL; } -static int VGA_SetGraphicMode(WORD mode) +static BOOL VGA_SetGraphicMode(WORD mode) { ModeSet par; int newSize; @@ -954,7 +954,7 @@ static int VGA_SetGraphicMode(WORD mode) return par.ret; } -int VGA_SetMode(WORD mode) +BOOL VGA_SetMode(WORD mode) { const VGA_MODE *ModeInfo; /* get info on VGA mode & set appropriately */ @@ -980,17 +980,17 @@ int VGA_SetMode(WORD mode) { return VGA_SetGraphicMode(mode); } - return 0; /* assume all good & return zero */ + return TRUE; /* assume all good & return TRUE */ } -int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth) +BOOL VGA_GetMode(unsigned *Height, unsigned *Width, unsigned *Depth) { - if (!lpddraw) return 1; - if (!lpddsurf) return 1; + if (!lpddraw) return FALSE; + if (!lpddsurf) return FALSE; if (Height) *Height=sdesc.dwHeight; if (Width) *Width=sdesc.dwWidth; if (Depth) *Depth=sdesc.ddpfPixelFormat.u1.dwRGBBitCount; - return 0; + return TRUE; } static void VGA_Exit(void) diff --git a/dlls/krnl386.exe16/vga.h b/dlls/krnl386.exe16/vga.h index 5d79567..b4976f6 100644 --- a/dlls/krnl386.exe16/vga.h +++ b/dlls/krnl386.exe16/vga.h @@ -52,10 +52,10 @@ extern const VGA_MODE VGA_modelist[]; /* all vga modes */ const VGA_MODE *VGA_GetModeInfo(WORD mode); -int VGA_SetMode(WORD mode); +BOOL VGA_SetMode(WORD mode); /* graphics mode */ -int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth); +BOOL VGA_GetMode(unsigned *Height, unsigned *Width, unsigned *Depth); void VGA_SetPalette(PALETTEENTRY*pal,int start,int len); void VGA_SetColor16(int reg,int color); char VGA_GetColor16(int reg);

1 0

Frédéric Delanoy : krnl386.exe16: Use BOOL type where appropriate.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: aaa0c692f1f283188b1dcff9a47f2ef285fe320d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa0c692f1f283188b1dcff9a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 11 11:38:50 2013 +0100 krnl386.exe16: Use BOOL type where appropriate. --- dlls/krnl386.exe16/dosmem.c | 8 ++++---- dlls/krnl386.exe16/global.c | 2 +- dlls/krnl386.exe16/int2f.c | 4 ++-- dlls/krnl386.exe16/ioports.c | 6 +++--- dlls/krnl386.exe16/kernel.c | 17 ++++++++--------- dlls/krnl386.exe16/kernel16_private.h | 2 +- dlls/krnl386.exe16/ne_module.c | 4 ++-- dlls/krnl386.exe16/relay.c | 2 +- dlls/krnl386.exe16/resource.c | 2 +- dlls/krnl386.exe16/soundblaster.c | 12 ++++++------ dlls/krnl386.exe16/task.c | 2 +- dlls/krnl386.exe16/thunk.c | 2 +- dlls/krnl386.exe16/utthunk.c | 2 +- 13 files changed, 32 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aaa0c692f1f283188b1dc…

1 0

Dmitry Timoshkov : include: Add taskschd.idl.
by Alexandre Julliard 11 Dec '13

11 Dec '13

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: Remove the render target check in x11_copy_to_screen().
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 38495706b79bc77759aca918ba60d9d226b072ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=38495706b79bc77759aca918b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 11 14:32:03 2013 +0100 wined3d: Remove the render target check in x11_copy_to_screen(). --- dlls/wined3d/swapchain.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6675c35..ff2ac64 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -618,9 +618,6 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r TRACE("swapchain %p, rect %s.\n", swapchain, wine_dbgstr_rect(rect)); front = swapchain->front_buffer; - if (!(front->resource.usage & WINED3DUSAGE_RENDERTARGET)) - return; - if (front->resource.map_count) ERR("Trying to blit a mapped surface.\n");

1 0

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

11 Dec '13

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 : d3d8/tests: Add a test for instructions taking a scalar source.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: b5742fb95010bd5621ef63ba3120be1b195ed03d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5742fb95010bd5621ef63ba3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 11 14:32:05 2013 +0100 d3d8/tests: Add a test for instructions taking a scalar source. --- dlls/d3d8/tests/visual.c | 189 +++++++++++++++++++++++++++------------------- 1 files changed, 110 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5742fb95010bd5621ef6…

1 0

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

11 Dec '13

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