April 2008 - Wine-Commits - list.winehq.org

Rok Mandeljc : iccvid: Added Slovenian translation.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 624c0b002d58c7814b13aa190dc6e65812df6062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=624c0b002d58c7814b13aa190… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:42:58 2008 +0200 iccvid: Added Slovenian translation. --- dlls/iccvid/iccvid_Si.rc | 29 +++++++++++++++++++++++++++++ dlls/iccvid/rsrc.rc | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/iccvid_Si.rc b/dlls/iccvid/iccvid_Si.rc new file mode 100644 index 0000000..82bbd05 --- /dev/null +++ b/dlls/iccvid/iccvid_Si.rc @@ -0,0 +1,29 @@ +/* + * Copyright 2008 Rok Mandeljc + * + * 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 + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "Cinepak Video kodek" + IDS_DESCRIPTION "Cinepak Video kodek" +} + +#pragma code_page(default) diff --git a/dlls/iccvid/rsrc.rc b/dlls/iccvid/rsrc.rc index b3a92ea..c4c3a94 100644 --- a/dlls/iccvid/rsrc.rc +++ b/dlls/iccvid/rsrc.rc @@ -29,5 +29,6 @@ #include "iccvid_Pl.rc" #include "iccvid_Ro.rc" #include "iccvid_Ru.rc" +#include "iccvid_Si.rc" #include "iccvid_Sv.rc" #include "iccvid_Tr.rc"

1 0

Rok Mandeljc : gphoto2.ds: Added Slovenian translation.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: d6f32d322de878a8107ef26c08937ed634367f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f32d322de878a8107ef26c0… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:42:56 2008 +0200 gphoto2.ds: Added Slovenian translation. --- dlls/gphoto2.ds/gphoto2_Si.rc | 58 +++++++++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/rsrc.rc | 1 + 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Si.rc b/dlls/gphoto2.ds/gphoto2_Si.rc new file mode 100644 index 0000000..b58d827 --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_Si.rc @@ -0,0 +1,58 @@ +/* + * Slovenian resources for Twain + * + * Copyright 2008 Rok Mandeljc + * + * 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 + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "Datoteke na kameri" +MENU 20545 +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "Uvozi izbrane",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "Predogled",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Uvozi vse",IDC_IMPORTALL,80,252,64,14 + CONTROL "Preskoči ta dialog",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "Izhod",IDC_EXIT,315,252,50,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Prenos" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Prenašam .... Prosim, počakajte",IDC_STATIC,5,19,176,8, SS_CENTER +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "Povezovanje" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "Povezujem se s kamero ... Prosim, počakajte",IDC_STATIC,128,58, + 116,8 +END + +#pragma code_page(default) diff --git a/dlls/gphoto2.ds/rsrc.rc b/dlls/gphoto2.ds/rsrc.rc index 4b44d73..9df3c28 100644 --- a/dlls/gphoto2.ds/rsrc.rc +++ b/dlls/gphoto2.ds/rsrc.rc @@ -34,4 +34,5 @@ #include "gphoto2_Nl.rc" #include "gphoto2_No.rc" #include "gphoto2_Pl.rc" +#include "gphoto2_Si.rc" #include "gphoto2_Sv.rc"

1 0

Rok Mandeljc : avifil32: Updated Slovenian translation.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 6b144b38767558fd61252b5d3c6a8c663e900783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b144b38767558fd61252b5d3… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:42:34 2008 +0200 avifil32: Updated Slovenian translation. --- dlls/avifil32/avifile_Si.rc | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/avifil32/avifile_Si.rc b/dlls/avifil32/avifile_Si.rc index 1b5d7dc..a180953 100644 --- a/dlls/avifil32/avifile_Si.rc +++ b/dlls/avifil32/avifile_Si.rc @@ -1,5 +1,5 @@ /* - * Copyright 2003 Rok Mandeljc <rok.mandeljc(a)gimb.org> + * Copyright 2003, 2008 Rok Mandeljc * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,35 +16,39 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) + LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Mo�nosti za stiskanje" +CAPTION "Možnosti stiskanja" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Izbira toka:",-1,2,5,114,10 + LTEXT "&Izbran tok:",-1,2,5,114,10 COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Mo�nosti ...",IDC_OPTIONS,145,17,45,14 - AUTOCHECKBOX "&Preplet vsake",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP + PUSHBUTTON "&Možnosti...",IDC_OPTIONS,145,17,45,14 + AUTOCHECKBOX "&Prepletanje vsake",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL LTEXT "slike",-1,104,43,36,9 LTEXT "Trenutna oblika zapisa:",-1,3,56,53,9 LTEXT "This space for rent",IDC_FORMATTEXT,55,56,90,26 DEFPUSHBUTTON "V redu",IDOK,145,42,45,14 - PUSHBUTTON "Prekli�i",IDCANCEL,145,61,45,14 + PUSHBUTTON "Prekliči",IDCANCEL,145,61,45,14 END STRINGTABLE DISCARDABLE { IDS_WAVESTREAMFORMAT "Waveform: %s" IDS_WAVEFILETYPE "Waveform" - IDS_ALLMULTIMEDIA "Vse ve�predstavnostne datoteke" + IDS_ALLMULTIMEDIA "Vse večpredstavnostne datoteke" IDS_ALLFILES "Vse datoteke (*.*)(a)*.*" IDS_VIDEO "video" IDS_AUDIO "avdio" IDS_AVISTREAMFORMAT "%s %s #%d" - IDS_AVIFILETYPE "Privzeti program za obravnavo AVI datotek" + IDS_AVIFILETYPE "Wine privzeti-upravljalec-AVI-datotek" IDS_UNCOMPRESSED "nestisnjeno" } + +#pragma code_page(default)

1 0

Rico Schüller : d3d9: Add stream_test with instancing.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 54d23c9669c61e21dc229ab5bf21fb15d411f224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d23c9669c61e21dc229ab5b… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Apr 6 16:43:32 2008 +0200 d3d9: Add stream_test with instancing. --- dlls/d3d9/tests/visual.c | 282 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 282 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54d23c9669c61e21dc229…

1 0

Rico Schüller : wined3d: Improve drawStridedInstanced( ).
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: a44da70d634c29497f62a908ab562bf752c836a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44da70d634c29497f62a908a… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Apr 6 18:50:52 2008 +0200 wined3d: Improve drawStridedInstanced(). --- dlls/wined3d/drawprim.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 43ee039..37482fb 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -838,15 +838,15 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVerte /* First, figure out how many instances we have to draw */ for(i = 0; i < MAX_STREAMS; i++) { - /* Look at all non-instanced streams */ - if(!(stateblock->streamFlags[i] & WINED3DSTREAMSOURCE_INSTANCEDATA) && - stateblock->streamSource[i]) { - int inst = stateblock->streamFreq[i]; - - if(numInstances && inst != numInstances) { - ERR("Two streams specify a different number of instances. Got %d, new is %d\n", numInstances, inst); + /* Look at the streams and take the first one which matches */ + if(((stateblock->streamFlags[i] & WINED3DSTREAMSOURCE_INSTANCEDATA) || (stateblock->streamFlags[i] & WINED3DSTREAMSOURCE_INDEXEDDATA)) && stateblock->streamSource[i]) { + /* D3d9 could set StreamFreq 0 with (INSTANCEDATA or INDEXEDDATA) and then it is handled as 1. See d3d9/tests/visual.c-> stream_test() */ + if(stateblock->streamFreq[i] == 0){ + numInstances = 1; + } else { + numInstances = stateblock->streamFreq[i]; /* use the specified number of instances from the first matched stream. See d3d9/tests/visual.c-> stream_test() */ } - numInstances = inst; + break; /* break, bacause only the first suitable value is interesting */ } }

1 0

Alexander Dorofeyev : wined3d: Move PreLoad to avoid calling it with gl lock held.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 65f9abc88d22c792e69ea5a22b5eb7064cd229a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f9abc88d22c792e69ea5a22… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:27 2008 +0300 wined3d: Move PreLoad to avoid calling it with gl lock held. --- dlls/wined3d/surface.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 97f0438..733d095 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2642,8 +2642,8 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D ActivateContext(myDevice, SrcSurface, CTXUSAGE_BLIT); - ENTER_GL(); IWineD3DSurface_PreLoad((IWineD3DSurface *) This); + ENTER_GL(); /* TODO: Do we need GL_TEXTURE_2D enabled fpr copyteximage? */ glEnable(This->glDescription.target); @@ -2733,14 +2733,20 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine UINT fbheight = Src->currentDesc.Height; GLenum drawBuffer = GL_BACK; GLenum texture_target; + BOOL noBackBufferBackup; TRACE("Using hwstretch blit\n"); /* Activate the Proper context for reading from the source surface, set it up for blitting */ ActivateContext(myDevice, SrcSurface, CTXUSAGE_BLIT); - ENTER_GL(); - IWineD3DSurface_PreLoad((IWineD3DSurface *) This); + noBackBufferBackup = !swapchain && wined3d_settings.offscreen_rendering_mode == ORM_FBO; + if(!noBackBufferBackup && Src->glDescription.textureName == 0) { + /* Get it a description */ + IWineD3DSurface_PreLoad(SrcSurface); + } + ENTER_GL(); + /* Try to use an aux buffer for drawing the rectangle. This way it doesn't need restoring. * This way we don't have to wait for the 2nd readback to finish to leave this function. */ @@ -2752,7 +2758,7 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine drawBuffer = GL_AUX0; } - if(!swapchain && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + if(noBackBufferBackup) { glGenTextures(1, &backup); checkGLcall("glGenTextures\n"); glBindTexture(GL_TEXTURE_2D, backup); @@ -2762,10 +2768,6 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine /* Backup the back buffer and copy the source buffer into a texture to draw an upside down stretched quad. If * we are reading from the back buffer, the backup can be used as source texture */ - if(Src->glDescription.textureName == 0) { - /* Get it a description */ - IWineD3DSurface_PreLoad(SrcSurface); - } texture_target = Src->glDescription.target; glBindTexture(texture_target, Src->glDescription.textureName); checkGLcall("glBindTexture(texture_target, Src->glDescription.textureName)");

1 0

Rico Schüller : wined3d: Filter out invalid stuff in SetStreamSourceFreq().
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 73d98ccd4e8c7993826b440b114f6090061e0177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d98ccd4e8c7993826b440b1… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Apr 6 18:50:02 2008 +0200 wined3d: Filter out invalid stuff in SetStreamSourceFreq(). --- dlls/wined3d/device.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cd07bf2..cd39e20 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2567,6 +2567,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetStreamSourceFreq(IWineD3DDevice *ifa UINT oldFlags = This->updateStateBlock->streamFlags[StreamNumber]; UINT oldFreq = This->updateStateBlock->streamFreq[StreamNumber]; + /* Verify input at least in d3d9 this is invalid*/ + if( (Divider & WINED3DSTREAMSOURCE_INSTANCEDATA) && (Divider & WINED3DSTREAMSOURCE_INDEXEDDATA)){ + WARN("INSTANCEDATA and INDEXEDDATA were set, returning D3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + if( (Divider & WINED3DSTREAMSOURCE_INSTANCEDATA) && StreamNumber == 0 ){ + WARN("INSTANCEDATA used on stream 0, returning D3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + if( Divider == 0 ){ + WARN("Divider is 0, returning D3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + TRACE("(%p) StreamNumber(%d), Divider(%d)\n", This, StreamNumber, Divider); This->updateStateBlock->streamFlags[StreamNumber] = Divider & (WINED3DSTREAMSOURCE_INSTANCEDATA | WINED3DSTREAMSOURCE_INDEXEDDATA );

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DOcclusionQueryImpl_Issue.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: b949190dcd4d1a16b34863e0e62ed421428c4d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b949190dcd4d1a16b34863e0e… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:19 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DOcclusionQueryImpl_Issue. --- dlls/wined3d/query.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 96651bc..45e35b7 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -462,6 +462,7 @@ static HRESULT WINAPI IWineD3DOcclusionQueryImpl_Issue(IWineD3DQuery* iface, D if(ctx != This->wineD3DDevice->activeContext || ctx->tid != GetCurrentThreadId()) { WARN("Not the owning context, can't start query\n"); } else { + ENTER_GL(); /* This is allowed according to msdn and our tests. Reset the query and restart */ if (dwIssueFlags & WINED3DISSUE_BEGIN) { if(This->state == QUERY_BUILDING) { @@ -482,6 +483,7 @@ static HRESULT WINAPI IWineD3DOcclusionQueryImpl_Issue(IWineD3DQuery* iface, D checkGLcall("glEndQuery()"); } } + LEAVE_GL(); } } else { FIXME("(%p) : Occlusion queries not supported\n", This);

1 0

Alexander Dorofeyev : wined3d: move ENTER_GL in IWineD3DDeviceImpl_Init3D.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 71ca80355dcd36050a3bc6299653e3eaa9fefe8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ca80355dcd36050a3bc6299… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:22 2008 +0300 wined3d: move ENTER_GL in IWineD3DDeviceImpl_Init3D. --- dlls/wined3d/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b022c4e..cd07bf2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2121,11 +2121,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR } /* Set up some starting GL setup */ - ENTER_GL(); /* Setup all the devices defaults */ IWineD3DStateBlock_InitStartupStateBlock((IWineD3DStateBlock *)This->stateBlock); create_dummy_textures(This); + + ENTER_GL(); + #if 0 IWineD3DImpl_CheckGraphicsMemory(); #endif

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DEventQueryImpl_GetData.
by Alexandre Julliard April 7, 2008

April 7, 2008

Module: wine Branch: master Commit: 84553fd8645d4a4a6065e7ea1b9e2094f834a788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84553fd8645d4a4a6065e7ea1… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:15 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DEventQueryImpl_GetData. --- dlls/wined3d/query.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 85832e4..2b95d38 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -327,11 +327,15 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void WARN("Query context not active, reporting GPU idle\n"); *data = TRUE; } else if(GL_SUPPORT(APPLE_FENCE)) { + ENTER_GL(); *data = GL_EXTCALL(glTestFenceAPPLE(((WineQueryEventData *)This->extendedData)->fenceId)); checkGLcall("glTestFenceAPPLE"); + LEAVE_GL(); } else if(GL_SUPPORT(NV_FENCE)) { + ENTER_GL(); *data = GL_EXTCALL(glTestFenceNV(((WineQueryEventData *)This->extendedData)->fenceId)); checkGLcall("glTestFenceNV"); + LEAVE_GL(); } else { WARN("(%p): reporting GPU idle\n", This); *data = TRUE;

1 0