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

Stefan Dösinger : wined3d: Mark the SYSMEM copy outdated after releasing memory.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: df2b1bea63223533fcae81eccf9abe86b2fc8dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=df2b1bea63223533fcae81ecc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 7 23:24:12 2008 +0200 wined3d: Mark the SYSMEM copy outdated after releasing memory. Strictly speaking this is redundant because the UnLoad before did the job, but if we mess with the allocated memory we have to tell the surface about that. Updating INDRAWABLE will automatically mark SYSMEM outdated. --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cd39e20..c594460 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7002,6 +7002,8 @@ static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, WINED3DPRESENT_PARAM surface->resource.allocatedMemory = NULL; surface->resource.heapMemory = NULL; surface->resource.size = IWineD3DSurface_GetPitch((IWineD3DSurface *) surface) * surface->pow2Width; + /* INDRAWABLE is a sane place for implicit targets / depth stencil after the reset */ + IWineD3DSurface_ModifyLocation((IWineD3DSurface *) surface, SFLAG_INDRAWABLE, TRUE); } static HRESULT WINAPI reset_unload_resources(IWineD3DResource *resource, void *data) {

1 0

Stefan Dösinger : wined3d: Put implicit surfaces into drawable on unload.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 0de167db9e2ef6c62ba48b050bc3d0ba2638467f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0de167db9e2ef6c62ba48b050… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 7 23:21:33 2008 +0200 wined3d: Put implicit surfaces into drawable on unload. If we mark the sysmem copy up to date we would have to take care about allocating it. As explained in the comment, INDRAWABLE is a saner choice --- dlls/wined3d/surface.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 733d095..3eeaaa3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -563,14 +563,21 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { * Implicit resources stay however. So this means we have an implicit render target * or depth stencil. The content may be destroyed, but we still have to tear down * opengl resources, so we cannot leave early. + * + * Put the most up to date surface location into the drawable. D3D-wise this content + * is undefined, so it would be nowhere, but that would make the location management + * more complicated. The drawable is a sane location, because if we mark sysmem or + * texture up to date, drawPrim will copy the uninitialized texture or sysmem to the + * uninitialized drawable. That's pointless and we'd have to allocate the texture / + * sysmem copy here. */ - IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, TRUE); } else { /* Load the surface into system memory */ IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); } IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); - IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); This->Flags &= ~SFLAG_ALLOCATED; /* Destroy PBOs, but load them into real sysmem before */

1 0

Andrew Talbot : msdmo: Array parameter is passed to function as pointer so loses size information .
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: a9200b24014607c4c82fb052b97de88daa804a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9200b24014607c4c82fb052b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Apr 7 22:39:33 2008 +0100 msdmo: Array parameter is passed to function as pointer so loses size information. --- dlls/msdmo/dmoreg.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 9560234..f6d71bd 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -291,8 +291,9 @@ lend: * * Get DMP Name from the registry */ -HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[80]) +HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[]) { +#define NAME_SIZE 80 /* Size of szName[] */ WCHAR szguid[64]; HRESULT hres; HKEY hrkey = 0; @@ -311,7 +312,7 @@ HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[80]) if (ERROR_SUCCESS != hres) goto lend; - count = sizeof(szName); + count = NAME_SIZE; hres = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szName, &count); @@ -323,6 +324,7 @@ lend: RegCloseKey(hkey); return hres; +#undef NAME_SIZE }

1 0

Rok Mandeljc : oleaut32: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 0f4f6fac3ce8254fe7f92032b1ce278e7186eac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f4f6fac3ce8254fe7f92032b… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:07 2008 +0200 oleaut32: Added Slovenian translation. --- dlls/oleaut32/oleaut32.rc | 3 ++- dlls/oleaut32/oleaut32_Si.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut32.rc b/dlls/oleaut32/oleaut32.rc index 44a3641..d57b886 100644 --- a/dlls/oleaut32/oleaut32.rc +++ b/dlls/oleaut32/oleaut32.rc @@ -42,6 +42,7 @@ #include "oleaut32_Pt.rc" #include "oleaut32_Ro.rc" #include "oleaut32_Ru.rc" +#include "oleaut32_Si.rc" #include "oleaut32_Sv.rc" #include "oleaut32_Th.rc" #include "oleaut32_Tr.rc" @@ -49,6 +50,6 @@ /* * FIXME: * Finnish, Greek, Hebrew, Japanese, Korean, - * Turkish, Slovenian (at least) are localised in XP Home. + * Turkish (at least) are localised in XP Home. * I expect Chinese etc are localised in Asian Editions also. */ diff --git a/dlls/oleaut32/oleaut32_Si.rc b/dlls/oleaut32/oleaut32_Si.rc new file mode 100644 index 0000000..365d877 --- /dev/null +++ b/dlls/oleaut32/oleaut32_Si.rc @@ -0,0 +1,35 @@ +/* + * Slovenian resources for oleaut32 + * + * 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_TRUE "Da" + IDS_FALSE "Ne" + IDS_YES "Da" + IDS_NO "Ne" + IDS_ON "Vključeno" + IDS_OFF "Izključeno" +} + +#pragma code_page(default)

1 0

Rok Mandeljc : regedit: Updated Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: a7c4c6a9f1fa58131bc7467dceeec6bd352b180d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c4c6a9f1fa58131bc7467dc… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:42:46 2008 +0200 regedit: Updated Slovenian translation. --- programs/regedit/Si.rc | 263 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 217 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7c4c6a9f1fa58131bc74…

1 0

Rok Mandeljc : msvfw32: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 44aa996e3defd5693a5cf764dc5038030254dd89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44aa996e3defd5693a5cf764d… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:04 2008 +0200 msvfw32: Added Slovenian translation. --- dlls/msvfw32/msvfw32_Si.rc | 55 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvfw32/rsrc.rc | 1 + 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Si.rc b/dlls/msvfw32/msvfw32_Si.rc new file mode 100644 index 0000000..05d1ba5 --- /dev/null +++ b/dlls/msvfw32/msvfw32_Si.rc @@ -0,0 +1,55 @@ +/* + * 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 + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Stiskanje videa" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "V redu",IDOK,129,2,49,14 + PUSHBUTTON "Prekliči",IDCANCEL,129,18,49,14 + + LTEXT "&Kodek za stiskanje:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "&Nastavitve ...",882,129,36,49,14 + PUSHBUTTON "&O ...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Kakovost &stiskanja:",886,9,34,80,8 + + CONTROL "&Ključna slika na vsakih",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "slik",889,103,62,26,10 + + CONTROL "&Pretok podatkov",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "kb/s",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Polne slike (nestisnjeno)" +} + +#pragma code_page(default) diff --git a/dlls/msvfw32/rsrc.rc b/dlls/msvfw32/rsrc.rc index ba00f7d..15c7b53 100644 --- a/dlls/msvfw32/rsrc.rc +++ b/dlls/msvfw32/rsrc.rc @@ -30,5 +30,6 @@ #include "msvfw32_No.rc" #include "msvfw32_Pl.rc" #include "msvfw32_Ru.rc" +#include "msvfw32_Si.rc" #include "msvfw32_Sv.rc" #include "msvfw32_Tr.rc"

1 0

Rok Mandeljc : msvidc32: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 704949d76a80155969652af9827fc23ab1cc6920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704949d76a80155969652af98… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:05 2008 +0200 msvidc32: Added Slovenian translation. --- dlls/msvidc32/msvidc32_Si.rc | 29 +++++++++++++++++++++++++++++ dlls/msvidc32/rsrc.rc | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/msvidc32_Si.rc b/dlls/msvidc32/msvidc32_Si.rc new file mode 100644 index 0000000..060ad08 --- /dev/null +++ b/dlls/msvidc32/msvidc32_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 "MS-CRAM" + IDS_DESCRIPTION "Wine Video 1 video kodek" +} + +#pragma code_page(default) diff --git a/dlls/msvidc32/rsrc.rc b/dlls/msvidc32/rsrc.rc index bb8fdfe..ff97399 100644 --- a/dlls/msvidc32/rsrc.rc +++ b/dlls/msvidc32/rsrc.rc @@ -29,5 +29,6 @@ #include "msvidc32_Pl.rc" #include "msvidc32_Ro.rc" #include "msvidc32_Ru.rc" +#include "msvidc32_Si.rc" #include "msvidc32_Sv.rc" #include "msvidc32_Tr.rc"

1 0

Rok Mandeljc : cmd: Updated Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 2f807a2fa8ab6f331df831945d767c9cd22e9a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f807a2fa8ab6f331df831945… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:42:50 2008 +0200 cmd: Updated Slovenian translation. --- programs/cmd/Si.rc | 352 +++++++++++++++++++++++++++------------------------- 1 files changed, 180 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f807a2fa8ab6f331df83…

1 0

Rok Mandeljc : taskmgr: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 2d4c036e747f87966960d19f0752b2d60779f6c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4c036e747f87966960d19f0… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:21 2008 +0200 taskmgr: Added Slovenian translation. --- programs/taskmgr/Si.rc | 504 +++++++++++++++++++++++++++++++++++++++++++ programs/taskmgr/taskmgr.rc | 1 + 2 files changed, 505 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d4c036e747f87966960d…

1 0

Rok Mandeljc : localui: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 151ae30aaf6c8d50246ba16a8f71a44ecabff39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=151ae30aaf6c8d50246ba16a8… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:00 2008 +0200 localui: Added Slovenian translation. --- dlls/localui/localui.rc | 1 + dlls/localui/ui_Si.rc | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index 7c67807..d51101d 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -46,4 +46,5 @@ #include "ui_No.rc" #include "ui_Pl.rc" #include "ui_Ru.rc" +#include "ui_Si.rc" #include "ui_Sv.rc" diff --git a/dlls/localui/ui_Si.rc b/dlls/localui/ui_Si.rc new file mode 100644 index 0000000..961a2e0 --- /dev/null +++ b/dlls/localui/ui_Si.rc @@ -0,0 +1,58 @@ +/* + * Slovenian resources for localui + * + * 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 + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Dodaj lokalna vrata" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ime vrat:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "V redu", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Prekliči", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Nastavitev LPT vrat" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Časovna omejitev (seconds)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Ponoven poskus prenosa:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "V redu", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Prekliči", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Lokalna vrata" + IDS_INVALIDNAME "'%s' ni veljavno ime vrat" + IDS_PORTEXISTS "Vrata z imenom %s že obstajajo" + IDS_NOTHINGTOCONFIG "Ta vrata nimajo možnosti nastavitve" +} + +#pragma code_page(default)

1 0