July 2010 - Wine-commits - list.winehq.org

Maarten Lankhorst : ntdll: Use syscall instead of int $0x80.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: e8c5e2b890ff28ef90a3c7f38003a7b4c0c00f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c5e2b890ff28ef90a3c7f38… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jun 6 01:08:20 2010 +0200 ntdll: Use syscall instead of int $0x80. --- dlls/ntdll/critsection.c | 24 ++++++++---------------- dlls/ntdll/server.c | 4 ++-- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 2846343..8a60109 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -60,26 +60,18 @@ static inline void small_pause(void) static inline int futex_wait( int *addr, int val, struct timespec *timeout ) { - int res; - __asm__ __volatile__( "xchgl %2,%%ebx\n\t" - "int $0x80\n\t" - "xchgl %2,%%ebx" - : "=a" (res) - : "0" (240) /* SYS_futex */, "D" (addr), - "c" (0) /* FUTEX_WAIT */, "d" (val), "S" (timeout) ); - return res; + int ret = syscall( 240/*SYS_futex*/, addr, 0/*FUTEX_WAIT*/, val, timeout, 0, 0 ); + if (ret < 0) + return -errno; + return ret; } static inline int futex_wake( int *addr, int val ) { - int res; - __asm__ __volatile__( "xchgl %2,%%ebx\n\t" - "int $0x80\n\t" - "xchgl %2,%%ebx" - : "=a" (res) - : "0" (240) /* SYS_futex */, "D" (addr), - "c" (1) /* FUTEX_WAKE */, "d" (val) ); - return res; + int ret = syscall( 240/*SYS_futex*/, addr, 1/*FUTEX_WAKE*/, val, NULL, 0, 0 ); + if (ret < 0) + return -errno; + return ret; } static inline int use_futexes(void) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 8564c0a..ce27d5d 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -947,9 +947,9 @@ static int get_unix_tid(void) { int ret = -1; #if defined(linux) && defined(__i386__) - __asm__("int $0x80" : "=a" (ret) : "0" (224) /* SYS_gettid */); + ret = syscall(224 /*SYS_gettid*/); #elif defined(linux) && defined(__x86_64__) - __asm__("syscall" : "=a" (ret) : "0" (186) /* SYS_gettid */); + ret = syscall(186 /*SYS_gettid*/); #elif defined(__sun) ret = pthread_self(); #elif defined(__APPLE__)

1 0

Andrew Eikum : shell32: IShellFolder:: ParseDisplayName should work for missing files if given valid IBindCtx.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: f99c81621c4f9efc575d58983fd5bc5c55fff3cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f99c81621c4f9efc575d58983… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 21 14:04:22 2010 -0500 shell32: IShellFolder::ParseDisplayName should work for missing files if given valid IBindCtx. Additionally, SHSimpleIDListFromPath now returns PIDLs for non-existent paths, as it should. --- dlls/shell32/shfldr_unixfs.c | 55 +++++++-- dlls/shell32/shlfsbind.c | 2 +- dlls/shell32/tests/shlfolder.c | 263 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 306 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f99c81621c4f9efc575d5…

1 0

Michael Stefaniuc : avifil32: Remove the ignored common resource attributes .
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 10fdc8be519e95d6ae41c91598ebee121a58e13c URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fdc8be519e95d6ae41c9159… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 21 23:50:29 2010 +0200 avifil32: Remove the ignored common resource attributes. --- dlls/avifil32/avifile_Cs.rc | 4 ++-- dlls/avifil32/avifile_Da.rc | 4 ++-- dlls/avifil32/avifile_De.rc | 4 ++-- dlls/avifil32/avifile_En.rc | 4 ++-- dlls/avifil32/avifile_Es.rc | 4 ++-- dlls/avifil32/avifile_Fr.rc | 4 ++-- dlls/avifil32/avifile_Hu.rc | 4 ++-- dlls/avifil32/avifile_It.rc | 4 ++-- dlls/avifil32/avifile_Ja.rc | 4 ++-- dlls/avifil32/avifile_Ko.rc | 4 ++-- dlls/avifil32/avifile_Lt.rc | 4 ++-- dlls/avifil32/avifile_Nl.rc | 4 ++-- dlls/avifil32/avifile_No.rc | 4 ++-- dlls/avifil32/avifile_Pl.rc | 4 ++-- dlls/avifil32/avifile_Pt.rc | 8 ++++---- dlls/avifil32/avifile_Ro.rc | 4 ++-- dlls/avifil32/avifile_Ru.rc | 4 ++-- dlls/avifil32/avifile_Si.rc | 4 ++-- dlls/avifil32/avifile_Sv.rc | 4 ++-- dlls/avifil32/avifile_Tr.rc | 4 ++-- dlls/avifil32/avifile_Uk.rc | 4 ++-- dlls/avifil32/avifile_Zh.rc | 8 ++++---- 22 files changed, 48 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10fdc8be519e95d6ae41c…

1 0

Michael Stefaniuc : comctl32: Remove the ignored common resource attributes .
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 7dfba50bca2e8bf276837cc752cf3ec223106c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dfba50bca2e8bf276837cc75… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 21 23:50:43 2010 +0200 comctl32: Remove the ignored common resource attributes. --- dlls/comctl32/comctl_Bg.rc | 14 +++++++------- dlls/comctl32/comctl_Cs.rc | 14 +++++++------- dlls/comctl32/comctl_Da.rc | 14 +++++++------- dlls/comctl32/comctl_De.rc | 14 +++++++------- dlls/comctl32/comctl_El.rc | 14 +++++++------- dlls/comctl32/comctl_En.rc | 14 +++++++------- dlls/comctl32/comctl_Eo.rc | 14 +++++++------- dlls/comctl32/comctl_Es.rc | 14 +++++++------- dlls/comctl32/comctl_Fr.rc | 14 +++++++------- dlls/comctl32/comctl_Hu.rc | 14 +++++++------- dlls/comctl32/comctl_It.rc | 14 +++++++------- dlls/comctl32/comctl_Ja.rc | 14 +++++++------- dlls/comctl32/comctl_Ko.rc | 14 +++++++------- dlls/comctl32/comctl_Lt.rc | 14 +++++++------- dlls/comctl32/comctl_Nl.rc | 14 +++++++------- dlls/comctl32/comctl_No.rc | 14 +++++++------- dlls/comctl32/comctl_Pl.rc | 14 +++++++------- dlls/comctl32/comctl_Pt.rc | 14 +++++++------- dlls/comctl32/comctl_Ro.rc | 14 +++++++------- dlls/comctl32/comctl_Ru.rc | 14 +++++++------- dlls/comctl32/comctl_Si.rc | 14 +++++++------- dlls/comctl32/comctl_Sk.rc | 14 +++++++------- dlls/comctl32/comctl_Sr.rc | 28 ++++++++++++++-------------- dlls/comctl32/comctl_Sv.rc | 14 +++++++------- dlls/comctl32/comctl_Th.rc | 14 +++++++------- dlls/comctl32/comctl_Tr.rc | 14 +++++++------- dlls/comctl32/comctl_Uk.rc | 14 +++++++------- dlls/comctl32/comctl_Zh.rc | 28 ++++++++++++++-------------- dlls/comctl32/rsrc.rc | 30 +++++++++++++++--------------- dlls/comctl32/tests/rsrc.rc | 12 ++++++------ 30 files changed, 231 insertions(+), 231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7dfba50bca2e8bf276837…

1 0

Michael Stefaniuc : comdlg32: Remove the ignored common resource attributes .
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 545322999dac2fd050370db7948f9e2d61593824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=545322999dac2fd050370db79… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 21 23:51:06 2010 +0200 comdlg32: Remove the ignored common resource attributes. --- dlls/comdlg32/cdlg_Bg.rc | 36 ++++++++++++------------ dlls/comdlg32/cdlg_Ca.rc | 16 +++++----- dlls/comdlg32/cdlg_Cs.rc | 36 ++++++++++++------------ dlls/comdlg32/cdlg_Da.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_De.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_El.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_En.rc | 44 +++++++++++++++--------------- dlls/comdlg32/cdlg_Eo.rc | 44 +++++++++++++++--------------- dlls/comdlg32/cdlg_Es.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Fi.rc | 36 ++++++++++++------------ dlls/comdlg32/cdlg_Fr.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Hu.rc | 34 +++++++++++----------- dlls/comdlg32/cdlg_It.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Ja.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Ko.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Lt.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Nl.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_No.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Pl.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Pt.rc | 64 +++++++++++++++++++++--------------------- dlls/comdlg32/cdlg_Ro.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Ru.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Si.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Sk.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Sr.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Sv.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Th.rc | 34 +++++++++++----------- dlls/comdlg32/cdlg_Tr.rc | 36 ++++++++++++------------ dlls/comdlg32/cdlg_Uk.rc | 38 +++++++++++++------------- dlls/comdlg32/cdlg_Wa.rc | 16 +++++----- dlls/comdlg32/cdlg_Zh.rc | 60 ++++++++++++++++++++-------------------- dlls/comdlg32/cdlg_xx.rc | 6 ++-- dlls/comdlg32/tests/rsrc.rc | 6 ++-- 33 files changed, 595 insertions(+), 595 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=545322999dac2fd050370…

1 0

Henri Verbeet : wined3d: Preload resources before FBO setup.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 4817a650911d78dd59baf954a65fcc8df124af1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4817a650911d78dd59baf954a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 21 18:48:23 2010 +0200 wined3d: Preload resources before FBO setup. --- dlls/wined3d/context.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fe397dc..435c315 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2110,6 +2110,14 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp const struct StateEntry *state_table = device->StateTable; unsigned int i; + /* Preload resources before FBO setup. Texture preload in particular may + * result in changes to the current FBO, due to using e.g. FBO blits for + * updating a resource location. */ + IWineD3DDeviceImpl_FindTexUnitMap(device); + device_preload_textures(device); + if (isStateDirty(context, STATE_VDECL)) + device_update_stream_info(device, context->gl_info); + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { context_validate_onscreen_formats(device, context, device->depth_stencil); @@ -2139,11 +2147,6 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp device->frag_pipe->enable_extension((IWineD3DDevice *)device, TRUE); } - IWineD3DDeviceImpl_FindTexUnitMap(device); - device_preload_textures(device); - if (isStateDirty(context, STATE_VDECL)) - device_update_stream_info(device, context->gl_info); - ENTER_GL(); for (i = 0; i < context->numDirtyEntries; ++i) {

1 0

Henri Verbeet : wined3d: Framebuffer blits are affected by the color mask.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 3d8ff7f27a8818d6a89192c56f993d0689a419bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8ff7f27a8818d6a89192c56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 21 18:48:24 2010 +0200 wined3d: Framebuffer blits are affected by the color mask. --- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/swapchain.c | 6 ++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 447aa40..4b87245 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5835,6 +5835,13 @@ void stretch_rect_fbo(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surfa context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL); context_set_draw_buffer(context, GL_COLOR_ATTACHMENT0); } + + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); + glDisable(GL_SCISSOR_TEST); IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 783033c..87db680 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -126,6 +126,12 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); context_set_draw_buffer(context, GL_BACK); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); + IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); + glDisable(GL_SCISSOR_TEST); IWineD3DDeviceImpl_MarkStateDirty(This->device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE));

1 0

Paul Vriens : comctl32: Use the Cyrillic 'O' in the Serbian translation.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 36b595e69cd08bd90edfed22ec743b204f29435a URL: http://source.winehq.org/git/wine.git/?a=commit;h=36b595e69cd08bd90edfed22e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 21 22:37:02 2010 +0200 comctl32: Use the Cyrillic 'O' in the Serbian translation. --- dlls/comctl32/comctl_Sr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comctl_Sr.rc b/dlls/comctl32/comctl_Sr.rc index 52f520c..ecca989 100644 --- a/dlls/comctl32/comctl_Sr.rc +++ b/dlls/comctl32/comctl_Sr.rc @@ -98,7 +98,7 @@ STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_V CAPTION "Детаљи за %s" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + DEFPUSHBUTTON "ОK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP PUSHBUTTON "Откажи", IDCANCEL,58,122,50,14 PUSHBUTTON "&Примени", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "Помоћ", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP

1 0

Paul Vriens : appwiz.cpl: Add the Serbian (Cyrillic) translation.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: d3a5242c971df897aea0d5462a15558f79a50e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a5242c971df897aea0d5462… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 21 22:43:35 2010 +0200 appwiz.cpl: Add the Serbian (Cyrillic) translation. Translation by Nenad Vujic <nesa24casa(a)gmail.com> --- dlls/appwiz.cpl/Sr.rc | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Sr.rc b/dlls/appwiz.cpl/Sr.rc index 9fb2e77..0b98c22 100644 --- a/dlls/appwiz.cpl/Sr.rc +++ b/dlls/appwiz.cpl/Sr.rc @@ -85,3 +85,65 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 } + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_CPL_TITLE, "Додај/Уклони програме" + IDS_CPL_DESC, "Инсталирање новог програма или брисање истог савашег рачунара." + IDS_TAB1_TITLE, "Програми" + + IDS_UNINSTALL_FAILED, "Брисање програма се не може прекинути, '%s'. Да ли желите да уклоните опцију Брисање за овајпрограм из регистра?" + IDS_NOT_SPECIFIED, "Није одређено" + + IDS_COLUMN_NAME, "Име" + IDS_COLUMN_PUBLISHER, "Издавач" + IDS_COLUMN_VERSION, "Верзија" + IDS_INSTALL_FILTER, "Инсталациони програми\\0*instal*.exe;*setup*.exe;*.msi\\0Programs (*.exe)\\0*.exe\\0Сви фајлови (*.*)\\0*.*\\0\\0" + + IDS_REMOVE, "&Уклони..." + IDS_MODIFY_REMOVE, "&Измени/Уклони..." +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Инсталирај/Уклони" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Да инсталирате нови програм са дискете,диска или са вашегхард диска, кликните Инсталирај.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Инсталирај...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "Програм се може аутоматски уклонити. Да уклоните програм илида измените његове инсталиране делове, изаберите са листе и кликнитеИзмени/Уклони,", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "&Инфо подршке...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "&Измени...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Уклони...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Инфо подршке" +FONT 8, "MS Shell Dlg" +{ + CONTROL "ОK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Ова информација се може користити да добијете Техничку подршку за %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Издавач:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Верзија:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Контакт:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Инфо подршке:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Телефон подршке:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Прочитај ме:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Нове верзије:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Коментари:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +}

1 0

Stefan Dösinger : wined3d: Only perform sRGB write correction on formats that advertise it.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 6b794cbd64ba4a33cde3f349c0af2a3de88c2427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b794cbd64ba4a33cde3f349c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 2 22:21:02 2010 +0200 wined3d: Only perform sRGB write correction on formats that advertise it. --- dlls/wined3d/context.c | 5 +++++ dlls/wined3d/shader.c | 13 +++++++++---- dlls/wined3d/utils.c | 4 +++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 435c315..b8d35c7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2192,6 +2192,11 @@ static void context_setup_target(IWineD3DDeviceImpl *device, { Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); } + /* Update sRGB writing when switching between formats that do/do not support sRGB writing */ + if ((old->Flags & WINED3DFMT_FLAG_SRGB_WRITE) != (new->Flags & WINED3DFMT_FLAG_SRGB_WRITE)) + { + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), StateTable); + } } /* When switching away from an offscreen render target, and we're not diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f26122a..66a81fb 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2008,10 +2008,16 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, struct ps_compile_args *args) { IWineD3DBaseTextureImpl *texture; + IWineD3DDeviceImpl *device = stateblock->device; UINT i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ - args->srgb_correction = stateblock->renderState[WINED3DRS_SRGBWRITEENABLE] ? 1 : 0; + if (stateblock->renderState[WINED3DRS_SRGBWRITEENABLE]) + { + IWineD3DSurfaceImpl *rt = device->render_targets[0]; + if(rt->resource.format_desc->Flags & WINED3DFMT_FLAG_SRGB_WRITE) args->srgb_correction = 1; + } + args->np2_fixup = 0; for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) @@ -2036,7 +2042,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, } if (shader->baseShader.reg_maps.shader_version.major >= 3) { - if (((IWineD3DDeviceImpl *)shader->baseShader.device)->strided_streams.position_transformed) + if (device->strided_streams.position_transformed) { args->vp_mode = pretransformed; } @@ -2058,8 +2064,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, switch (stateblock->renderState[WINED3DRS_FOGTABLEMODE]) { case WINED3DFOG_NONE: - if (((IWineD3DDeviceImpl *)shader->baseShader.device)->strided_streams.position_transformed - || use_vs(stateblock)) + if (device->strided_streams.position_transformed || use_vs(stateblock)) { args->fog = FOG_LINEAR; break; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b38d6c0..7a36998 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2698,6 +2698,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting DWORD ttff; DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2; IWineD3DDeviceImpl *device = stateblock->device; + IWineD3DSurfaceImpl *rt = device->render_targets[0]; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; for (i = 0; i < gl_info->limits.texture_stages; ++i) @@ -2886,7 +2887,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting break; } } - if(stateblock->renderState[WINED3DRS_SRGBWRITEENABLE]) { + if(stateblock->renderState[WINED3DRS_SRGBWRITEENABLE] && + rt->resource.format_desc->Flags & WINED3DFMT_FLAG_SRGB_WRITE) { settings->sRGB_write = 1; } else { settings->sRGB_write = 0;

1 0