January 2012 - Wine-Commits

Matteo Bruni : winex11: Don't put the GL drawable offscreen.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: b4afbf98cf29cd1beb24d2958d1cc5243f70b5a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4afbf98cf29cd1beb24d2958… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 25 00:08:01 2012 +0100 winex11: Don't put the GL drawable offscreen. --- dlls/winex11.drv/window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 48ba000..fcf5e0e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -591,7 +591,7 @@ static BOOL set_win_format( HWND hwnd, XID fbconfig_id ) XInstallColormap(gdi_display, attrib.colormap); if(data->gl_drawable) XDestroyWindow(gdi_display, data->gl_drawable); - data->gl_drawable = XCreateWindow(gdi_display, dummy_parent, -w, 0, w, h, 0, + data->gl_drawable = XCreateWindow(gdi_display, dummy_parent, 0, 0, w, h, 0, vis->depth, InputOutput, vis->visual, CWColormap | CWOverrideRedirect, &attrib); @@ -669,7 +669,7 @@ static void sync_gl_drawable(struct x11drv_win_data *data) if(usexcomposite) { wine_tsx11_lock(); - XMoveResizeWindow(gdi_display, data->gl_drawable, -w, 0, w, h); + XMoveResizeWindow(gdi_display, data->gl_drawable, 0, 0, w, h); wine_tsx11_unlock(); return; }

1 0

Henri Verbeet : d3d8: Remove COM from the vertex declaration implementation .
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: f056fe7bb5b9983f2c6bb208b41ae5e92176cc14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f056fe7bb5b9983f2c6bb208b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 21:47:46 2012 +0100 d3d8: Remove COM from the vertex declaration implementation. --- dlls/d3d8/d3d8_private.h | 37 ++++---------------- dlls/d3d8/device.c | 42 ++++++++++++---------- dlls/d3d8/shader.c | 12 +++--- dlls/d3d8/vertexdeclaration.c | 76 ++++++---------------------------------- 4 files changed, 48 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f056fe7bb5b9983f2c6bb…

1 0

Francois Gouget : po: Fix some typography issues in the Thai translation.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 1d74ac2286d5c587bf1beacc9629a10c696e097d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d74ac2286d5c587bf1beacc9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 25 02:33:10 2012 +0100 po: Fix some typography issues in the Thai translation. --- po/th.po | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/po/th.po b/po/th.po index 7b25973..e784160 100644 --- a/po/th.po +++ b/po/th.po @@ -3058,7 +3058,7 @@ msgstr "" #: hhctrl.rc:62 winhlp32.rc:31 #, fuzzy msgid "&Print..." -msgstr "พิมพ์\tCtrl+P" +msgstr "พิมพ์...\tCtrl+P" #: hhctrl.rc:28 taskmgr.rc:89 msgid "&Contents" @@ -9859,7 +9859,7 @@ msgstr "บันทืก\tCtrl+S" #: notepad.rc:32 regedit.rc:36 wordpad.rc:33 msgid "&Print...\tCtrl+P" -msgstr "พิมพ์\tCtrl+P" +msgstr "พิมพ์...\tCtrl+P" #: notepad.rc:33 wordpad.rc:35 msgid "Page Se&tup..." @@ -9908,7 +9908,7 @@ msgstr "ห่อบรรทัดยาว" #: notepad.rc:53 msgid "&Search...\tCtrl+F" -msgstr "ค้นหา\tCtrl+F" +msgstr "ค้นหา...\tCtrl+F" #: notepad.rc:54 msgid "&Search next\tF3" @@ -10038,7 +10038,8 @@ msgid "" "Do you want to create a new file?" msgstr "" "ไม่พบแฟ้ม '%s' ที่ต้องการเปิด\n" -"คุณต้องการสร้างใหม่ไม่ ?" +"\n" +"คุณต้องการสร้างใหม่ไม่?" #: notepad.rc:79 msgid "" @@ -10046,11 +10047,9 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"มีการเปลี่ยนแปลงกับเอกสาร\n" -"\n" -"'%s'\n" +"มีการเปลี่ยนแปลงกับเอกสาร '%s'\n" "\n" -"คุณต้องการบันทึกมันหรือไม่ ?" +"คุณต้องการบันทึกมันหรือไม่?" #: notepad.rc:80 msgid "'%s' could not be found."

1 0

Frédéric Delanoy : msi: Avoid dead code in parse_prop (Coverity).
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 8ef373a7f24788b1302c42a845273220deffc05f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef373a7f24788b1302c42a84… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 24 19:04:03 2012 +0100 msi: Avoid dead code in parse_prop (Coverity). --- dlls/msi/action.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 59e7b6d..665ca63 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -222,7 +222,6 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) switch (*p) { case ' ': - if (!count) goto done; in_quotes = 1; ignore = 1; len++;

1 0

Francois Gouget : po: Fix some typography issues in the Bulgarian translation.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 28233992c3a498f07798e35152c89a3824a27c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28233992c3a498f07798e3515… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 25 02:20:59 2012 +0100 po: Fix some typography issues in the Bulgarian translation. --- po/bg.po | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/po/bg.po b/po/bg.po index c9c0411..64599af 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2188,8 +2188,9 @@ msgid "&File name:" msgstr "&Файл" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 +#, fuzzy msgid "B&rowse..." -msgstr "Избор" +msgstr "Избор..." #: cryptui.rc:294 msgid "" @@ -10159,7 +10160,7 @@ msgid "" msgstr "" "Файлът '%s' не съществува.\n" "\n" -" Искате ли да създадете нов файл?" +"Искате ли да създадете нов файл?" #: notepad.rc:79 msgid "" @@ -10169,7 +10170,7 @@ msgid "" msgstr "" "Файлът '%s' е бил променен.\n" "\n" -" Искате ли да съхраните промените?" +"Искате ли да съхраните промените?" #: notepad.rc:80 msgid "'%s' could not be found." @@ -12218,7 +12219,7 @@ msgstr "&Добавяне на приложение..." #: winecfg.rc:151 msgid "&Remove application" -msgstr "Пре&махване на приложение..." +msgstr "Пре&махване на приложение" #: winecfg.rc:152 msgid "&Windows Version:" @@ -12286,7 +12287,7 @@ msgstr "Съществуващи замени:" #: winecfg.rc:190 msgid "&Edit..." -msgstr "&Редактирай" +msgstr "&Редактирай..." #: winecfg.rc:196 msgid "Edit Override" @@ -12339,7 +12340,7 @@ msgstr "&Добави..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "&Открий..." +msgstr "&Открий" #: winecfg.rc:232 msgid "&Path:"

1 0

Henri Verbeet : winex11: Remove some leftover X Shm code.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 515329d58cbe692b17108f8b2ea74e91edd06481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=515329d58cbe692b17108f8b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 21:47:49 2012 +0100 winex11: Remove some leftover X Shm code. --- configure | 63 --------------------------------------------- configure.ac | 13 --------- dlls/winex11.drv/x11drv.h | 3 -- include/config.h.in | 6 ---- 4 files changed, 0 insertions(+), 85 deletions(-) diff --git a/configure b/configure index ef5fb31..e69e8d3 100755 --- a/configure +++ b/configure @@ -816,7 +816,6 @@ with_xml with_xrandr with_xrender with_xshape -with_xshm with_xslt with_xxf86vm with_zlib @@ -1507,7 +1506,6 @@ Optional Packages: --without-xrandr do not use Xrandr (resolution changes) --without-xrender do not use the Xrender extension --without-xshape do not use the Xshape extension - --without-xshm do not use XShm (shared memory extension) --without-xslt do not use XSLT --without-xxf86vm do not use XFree video mode extension --without-zlib do not use Zlib (data compression) @@ -2752,12 +2750,6 @@ if test "${with_xshape+set}" = set; then : fi -# Check whether --with-xshm was given. -if test "${with_xshm+set}" = set; then : - withval=$with_xshm; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi -fi - - # Check whether --with-xslt was given. if test "${with_xslt+set}" = set; then : withval=$with_xslt; @@ -8014,7 +8006,6 @@ fi X11/extensions/shape.h \ X11/extensions/XInput.h \ X11/extensions/XInput2.h \ - X11/extensions/XShm.h \ X11/extensions/Xcomposite.h \ X11/extensions/Xinerama.h \ X11/extensions/Xrandr.h \ @@ -8222,60 +8213,6 @@ esac fi fi - if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmQueryExtension in -lXext" >&5 -$as_echo_n "checking for XShmQueryExtension in -lXext... " >&6; } -if ${ac_cv_lib_Xext_XShmQueryExtension+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XShmQueryExtension (); -int -main () -{ -return XShmQueryExtension (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xext_XShmQueryExtension=yes -else - ac_cv_lib_Xext_XShmQueryExtension=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShmQueryExtension" >&5 -$as_echo "$ac_cv_lib_Xext_XShmQueryExtension" >&6; } -if test "x$ac_cv_lib_Xext_XShmQueryExtension" = xyes; then : - -$as_echo "#define HAVE_LIBXXSHM 1" >>confdefs.h - -fi - - fi - if test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"; then : - case "x$with_xshm" in - x) as_fn_append wine_notices "|XShm ${notice_platform}development files not found, X Shared Memory won't be supported." ;; - xno) ;; - *) as_fn_error $? "XShm ${notice_platform}development files not found, X Shared Memory won't be supported. -This is an error since --with-xshm was requested." "$LINENO" 5 ;; -esac -fi - if test "$ac_cv_header_X11_extensions_shape_h" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5 diff --git a/configure.ac b/configure.ac index 9a4848b..0b68774 100644 --- a/configure.ac +++ b/configure.ac @@ -96,8 +96,6 @@ AC_ARG_WITH(xrender, AS_HELP_STRING([--without-xrender],[do not use the Xrende [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrender_h=no; fi]) AC_ARG_WITH(xshape, AS_HELP_STRING([--without-xshape],[do not use the Xshape extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_shape_h=no; fi]) -AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared memory extension)]), - [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi]) AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT])) AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) @@ -941,7 +939,6 @@ then X11/extensions/shape.h \ X11/extensions/XInput.h \ X11/extensions/XInput2.h \ - X11/extensions/XShm.h \ X11/extensions/Xcomposite.h \ X11/extensions/Xinerama.h \ X11/extensions/Xrandr.h \ @@ -986,16 +983,6 @@ then [XInput2 headers not found, the XInput 2 extension won't be supported.]) fi - dnl *** Check for X Shm extension - if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" - then - AC_CHECK_LIB(Xext, XShmQueryExtension, - AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),, - $X_LIBS $XLIB $X_EXTRA_LIBS) - fi - WINE_NOTICE_WITH(xshm,[test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"], - [XShm ${notice_platform}development files not found, X Shared Memory won't be supported.]) - dnl *** Check for X shape extension if test "$ac_cv_header_X11_extensions_shape_h" = "yes" then diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 32f51d7..64129a7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -31,9 +31,6 @@ #include <X11/Xresource.h> #include <X11/Xutil.h> #include <X11/Xatom.h> -#ifdef HAVE_LIBXXSHM -# include <X11/extensions/XShm.h> -#endif /* defined(HAVE_LIBXXSHM) */ #define BOOL X_BOOL #define BYTE X_BYTE diff --git a/include/config.h.in b/include/config.h.in index dc1c189..c26def2 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -371,9 +371,6 @@ /* Define to 1 if you have the <libxslt/transform.h> header file. */ #undef HAVE_LIBXSLT_TRANSFORM_H -/* Define if you have the X Shm extension */ -#undef HAVE_LIBXXSHM - /* Define to 1 if you have the <link.h> header file. */ #undef HAVE_LINK_H @@ -1079,9 +1076,6 @@ /* Define to 1 if you have the <X11/extensions/Xrender.h> header file. */ #undef HAVE_X11_EXTENSIONS_XRENDER_H -/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */ -#undef HAVE_X11_EXTENSIONS_XSHM_H - /* Define to 1 if you have the <X11/Xcursor/Xcursor.h> header file. */ #undef HAVE_X11_XCURSOR_XCURSOR_H

1 0

Henri Verbeet : d3d8: Remove COM from the pixel shader implementation.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 24d4a52e85a609f3c29e21df547477e0f1aab49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d4a52e85a609f3c29e21df5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 21:47:48 2012 +0100 d3d8: Remove COM from the pixel shader implementation. --- dlls/d3d8/d3d8_private.h | 38 +++-------------------- dlls/d3d8/device.c | 17 ++++------ dlls/d3d8/shader.c | 74 +++++----------------------------------------- 3 files changed, 20 insertions(+), 109 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index fb09314..40c803f 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -365,9 +365,6 @@ struct IDirect3DVolumeTexture8Impl HRESULT volumetexture_init(IDirect3DVolumeTexture8Impl *texture, IDirect3DDevice8Impl *device, UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; -DEFINE_GUID(IID_IDirect3DPixelShader8, -0x6d3bdbdc, 0x5b02, 0x4415, 0xb8, 0x52, 0xce, 0x5e, 0x8b, 0xcc, 0xb2, 0x89); - struct d3d8_vertex_declaration { DWORD *elements; @@ -382,28 +379,6 @@ HRESULT d3d8_vertex_declaration_init(struct d3d8_vertex_declaration *declaration HRESULT d3d8_vertex_declaration_init_fvf(struct d3d8_vertex_declaration *declaration, IDirect3DDevice8Impl *device, DWORD fvf) DECLSPEC_HIDDEN; -/***************************************************************************** - * IDirect3DPixelShader8 interface - */ -#define INTERFACE IDirect3DPixelShader8 -DECLARE_INTERFACE_(IDirect3DPixelShader8,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; -}; -#undef INTERFACE - -/*** IUnknown methods ***/ -#define IDirect3DPixelShader8_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IDirect3DPixelShader8_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IDirect3DPixelShader8_Release(p) (p)->lpVtbl->Release(p) - -/***************************************************************************** - * IDirect3DVertexShader implementation structure - */ - struct d3d8_vertex_shader { struct d3d8_vertex_declaration *vertex_declaration; @@ -416,17 +391,14 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, IDirect3DDevi #define D3D8_MAX_VERTEX_SHADER_CONSTANTF 256 -/***************************************************************************** - * IDirect3DPixelShader implementation structure - */ -typedef struct IDirect3DPixelShader8Impl { - IDirect3DPixelShader8 IDirect3DPixelShader8_iface; - LONG ref; +struct d3d8_pixel_shader +{ DWORD handle; struct wined3d_shader *wined3d_shader; -} IDirect3DPixelShader8Impl; +}; -HRESULT pixelshader_init(IDirect3DPixelShader8Impl *shader, IDirect3DDevice8Impl *device, +void d3d8_pixel_shader_destroy(struct d3d8_pixel_shader *shader) DECLSPEC_HIDDEN; +HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, IDirect3DDevice8Impl *device, const DWORD *byte_code, DWORD shader_handle) DECLSPEC_HIDDEN; D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e724824..5777fd5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2387,7 +2387,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreatePixelShader(IDirect3DDevice8 *i const DWORD *byte_code, DWORD *shader) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - IDirect3DPixelShader8Impl *object; + struct d3d8_pixel_shader *object; DWORD shader_handle; DWORD handle; HRESULT hr; @@ -2419,7 +2419,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreatePixelShader(IDirect3DDevice8 *i shader_handle = handle + VS_HIGHESTFIXEDFXF + 1; - hr = pixelshader_init(object, This, byte_code, shader_handle); + hr = d3d8_pixel_shader_init(object, This, byte_code, shader_handle); if (FAILED(hr)) { WARN("Failed to initialize pixel shader, hr %#x.\n", hr); @@ -2440,7 +2440,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreatePixelShader(IDirect3DDevice8 *i static HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShader(IDirect3DDevice8 *iface, DWORD pShader) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - IDirect3DPixelShader8Impl *shader; + struct d3d8_pixel_shader *shader; HRESULT hr; TRACE("iface %p, shader %#x.\n", iface, pShader); @@ -2485,7 +2485,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShader(IDirect3DDevice8 *ifac object = wined3d_device_get_pixel_shader(This->wined3d_device); if (object) { - IDirect3DPixelShader8Impl *d3d8_shader; + struct d3d8_pixel_shader *d3d8_shader; d3d8_shader = wined3d_shader_get_parent(object); wined3d_shader_decref(object); *ppShader = d3d8_shader->handle; @@ -2504,7 +2504,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShader(IDirect3DDevice8 *ifac static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(IDirect3DDevice8 *iface, DWORD pShader) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - IDirect3DPixelShader8Impl *shader; + struct d3d8_pixel_shader *shader; struct wined3d_shader *cur; TRACE("iface %p, shader %#x.\n", iface, pShader); @@ -2529,10 +2529,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(IDirect3DDevice8 *i wined3d_mutex_unlock(); - if (IDirect3DPixelShader8_Release(&shader->IDirect3DPixelShader8_iface)) - { - ERR("Shader %p has references left, this shouldn't happen.\n", shader); - } + d3d8_pixel_shader_destroy(shader); return D3D_OK; } @@ -2573,7 +2570,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShaderFunction(IDirect3DDevic DWORD pPixelShader, void *pData, DWORD *pSizeOfData) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - IDirect3DPixelShader8Impl *shader = NULL; + struct d3d8_pixel_shader *shader = NULL; HRESULT hr; TRACE("iface %p, shader %#x, data %p, data_size %p.\n", diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index 48d7a2b..546bf40 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -133,74 +133,18 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, IDirect3DDevi return D3D_OK; } -static inline IDirect3DPixelShader8Impl *impl_from_IDirect3DPixelShader8(IDirect3DPixelShader8 *iface) -{ - return CONTAINING_RECORD(iface, IDirect3DPixelShader8Impl, IDirect3DPixelShader8_iface); -} - -static HRESULT WINAPI d3d8_pixelshader_QueryInterface(IDirect3DPixelShader8 *iface, REFIID riid, void **object) -{ - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - - if (IsEqualGUID(riid, &IID_IDirect3DPixelShader8) - || IsEqualGUID(riid, &IID_IUnknown)) - { - IUnknown_AddRef(iface); - *object = iface; - return S_OK; - } - - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - - *object = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI d3d8_pixelshader_AddRef(IDirect3DPixelShader8 *iface) -{ - IDirect3DPixelShader8Impl *shader = impl_from_IDirect3DPixelShader8(iface); - ULONG refcount = InterlockedIncrement(&shader->ref); - - TRACE("%p increasing refcount to %u.\n", iface, refcount); - - if (refcount == 1) - { - wined3d_mutex_lock(); - wined3d_shader_incref(shader->wined3d_shader); - wined3d_mutex_unlock(); - } - - return refcount; -} - -static ULONG WINAPI d3d8_pixelshader_Release(IDirect3DPixelShader8 *iface) +static void STDMETHODCALLTYPE d3d8_pixelshader_wined3d_object_destroyed(void *parent) { - IDirect3DPixelShader8Impl *shader = impl_from_IDirect3DPixelShader8(iface); - ULONG refcount = InterlockedDecrement(&shader->ref); - - TRACE("%p decreasing refcount to %u.\n", iface, refcount); - - if (!refcount) - { - wined3d_mutex_lock(); - wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); - } - - return refcount; + HeapFree(GetProcessHeap(), 0, parent); } -static const IDirect3DPixelShader8Vtbl d3d8_pixelshader_vtbl = +void d3d8_pixel_shader_destroy(struct d3d8_pixel_shader *shader) { - /* IUnknown */ - d3d8_pixelshader_QueryInterface, - d3d8_pixelshader_AddRef, - d3d8_pixelshader_Release, -}; + TRACE("shader %p.\n", shader); -static void STDMETHODCALLTYPE d3d8_pixelshader_wined3d_object_destroyed(void *parent) -{ - HeapFree(GetProcessHeap(), 0, parent); + wined3d_mutex_lock(); + wined3d_shader_decref(shader->wined3d_shader); + wined3d_mutex_unlock(); } static const struct wined3d_parent_ops d3d8_pixelshader_wined3d_parent_ops = @@ -208,13 +152,11 @@ static const struct wined3d_parent_ops d3d8_pixelshader_wined3d_parent_ops = d3d8_pixelshader_wined3d_object_destroyed, }; -HRESULT pixelshader_init(IDirect3DPixelShader8Impl *shader, IDirect3DDevice8Impl *device, +HRESULT d3d8_pixel_shader_init(struct d3d8_pixel_shader *shader, IDirect3DDevice8Impl *device, const DWORD *byte_code, DWORD shader_handle) { HRESULT hr; - shader->ref = 1; - shader->IDirect3DPixelShader8_iface.lpVtbl = &d3d8_pixelshader_vtbl; shader->handle = shader_handle; wined3d_mutex_lock();

1 0

Henri Verbeet : d3d8: Remove COM from the vertex shader implementation.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 483b17d410c1e9a323c9517d4323ec84a79ad995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483b17d410c1e9a323c9517d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 21:47:47 2012 +0100 d3d8: Remove COM from the vertex shader implementation. --- dlls/d3d8/d3d8_private.h | 34 ++----------------- dlls/d3d8/device.c | 17 ++++------ dlls/d3d8/shader.c | 81 ++++++--------------------------------------- 3 files changed, 22 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=483b17d410c1e9a323c95…

1 0

Francois Gouget : po: Fix a couple of formatting directives in the Slovenian translation.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 1e9eda5ca3d266d7b88451b9d39d6dc112f347ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e9eda5ca3d266d7b88451b9d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 25 02:29:29 2012 +0100 po: Fix a couple of formatting directives in the Slovenian translation. --- po/sl.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 6e123bc..e95f334 100644 --- a/po/sl.po +++ b/po/sl.po @@ -11531,13 +11531,13 @@ msgstr "Napaka: možnosti /im in /pid se medsebojno izključujeta.\n" msgid "Close message sent to top-level windows of process with PID %1!u!.\n" msgstr "" "Zapri sporočilo poslano na okna po zaprtju je bilo poslano oknom opravila s " -"PID %u.\n" +"PID %1!u!.\n" #: taskkill.rc:34 msgid "" "Close message sent to top-level windows of process \"%1\" with PID %2!u!.\n" msgstr "" -"Sporočilo z zahtevo po zaprtju je bilo poslano oknom opravila \"%s\" s PID " +"Sporočilo z zahtevo po zaprtju je bilo poslano oknom opravila \"%1\" s PID " "%2!u! vrhnje ravni.\n" #: taskkill.rc:35

1 0

Francois Gouget : po: Fix some typography issues in the Czech translation.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 1cbc4140fa2f6dd443f813e9d7b2f925c4709c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cbc4140fa2f6dd443f813e9d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 25 02:24:04 2012 +0100 po: Fix some typography issues in the Czech translation. --- po/cs.po | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/po/cs.po b/po/cs.po index 3d22aa8..97c4811 100644 --- a/po/cs.po +++ b/po/cs.po @@ -450,7 +450,7 @@ msgstr "&Zadané stránky" #: comdlg32.rc:206 comdlg32.rc:228 msgid "&Setup" -msgstr "&Nastavit..." +msgstr "&Nastavit" #: comdlg32.rc:207 msgid "&From:" @@ -529,8 +529,9 @@ msgid "Font St&yle:" msgstr "St&yl:" #: comdlg32.rc:253 comdlg32.rc:430 winecfg.rc:280 +#, fuzzy msgid "&Size:" -msgstr "Velikost" +msgstr "Velikost:" #: comdlg32.rc:260 msgid "Effects" @@ -545,6 +546,7 @@ msgid "&Underline" msgstr "&Podtržení" #: comdlg32.rc:263 winecfg.rc:278 +#, fuzzy msgid "&Color:" msgstr "Barva:" @@ -2201,8 +2203,9 @@ msgid "&File name:" msgstr "&Název souboru:" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 +#, fuzzy msgid "B&rowse..." -msgstr "Procházet" +msgstr "Procházet..." #: cryptui.rc:294 msgid "" @@ -6754,7 +6757,7 @@ msgstr "Heslo" #: mpr.rc:44 msgid "&Save this password (Insecure)" -msgstr "&Uložit toto heslo (Není bezpečné) ?" +msgstr "&Uložit toto heslo (Není bezpečné)" #: mpr.rc:27 msgid "Entire Network" @@ -6766,7 +6769,7 @@ msgstr "Výběr zvuku" #: msacm32.rc:36 winedbg.rc:73 msgid "&Save As..." -msgstr "&Uložit jako" +msgstr "&Uložit jako..." #: msacm32.rc:39 msgid "&Format:" @@ -7877,8 +7880,9 @@ msgid "&About Control Panel" msgstr "" #: shell32.rc:270 shell32.rc:285 +#, fuzzy msgid "Browse for Folder" -msgstr "Procházet..." +msgstr "Procházet" #: shell32.rc:290 #, fuzzy @@ -7937,7 +7941,7 @@ msgstr "&Otevřít:" #: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:136 msgid "&Browse..." -msgstr "&Procházet" +msgstr "&Procházet..." #: shell32.rc:135 shell32.rc:139 winefile.rc:111 msgid "Size" @@ -8464,7 +8468,7 @@ msgstr "Plné jméno" #: wininet.rc:46 wininet.rc:66 msgid "&Save this password (insecure)" -msgstr "&Uložit toto heslo (nebezpečné) ?" +msgstr "&Uložit toto heslo (nebezpečné)" #: wininet.rc:54 msgid "Authentication Required" @@ -8538,9 +8542,8 @@ msgid "The specified device handle is invalid." msgstr "Ukazatel na zařízení je neplatný." #: winmm.rc:34 -#, fuzzy msgid "There is no driver installed on your system!" -msgstr "V systému není nainstalován žádný ovladač !\n" +msgstr "V systému není nainstalován žádný ovladač!" #: winmm.rc:35 winmm.rc:61 msgid "" @@ -9522,7 +9525,7 @@ msgstr "" "\n" "V programu cmd není třeba zdvojovat znak % před proměnnou při použití " "příkazu\n" -" FOR v dávkovém souboru.\n" +"FOR v dávkovém souboru.\n" #: cmd.rc:81 msgid "" @@ -12715,7 +12718,7 @@ msgstr "Stávající náhrady:" #: winecfg.rc:190 msgid "&Edit..." -msgstr "&Upravit" +msgstr "&Upravit..." #: winecfg.rc:196 msgid "Edit Override" @@ -12768,7 +12771,7 @@ msgstr "Přid&at..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "Auto&detekce..." +msgstr "Auto&detekce" #: winecfg.rc:232 msgid "&Path:"

1 0