October 2008 - Wine-commits

Henri Verbeet : d3d10: Add a stub implementation of ID3D10Device.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: c7899cb9e8d46e5e586da843269aa7fdccad849b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7899cb9e8d46e5e586da8432… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 20 15:28:09 2008 +0200 d3d10: Add a stub implementation of ID3D10Device. --- dlls/d3d10/Makefile.in | 1 + dlls/d3d10/d3d10_private.h | 9 + dlls/d3d10/device.c | 852 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 862 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7899cb9e8d46e5e586da…

1 0

Henri Verbeet : d3d10: Add a debug function for D3D10_PRIMITIVE_TOPOLOGY.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 0271be18d994981bfe448de306cd9dfc7b6541f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0271be18d994981bfe448de30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 20 15:28:09 2008 +0200 d3d10: Add a debug function for D3D10_PRIMITIVE_TOPOLOGY. --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/utils.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 8012528..12a7e45 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -29,6 +29,7 @@ /* TRACE helper functions */ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type); +const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology); const char *debug_dxgi_format(DXGI_FORMAT format); #endif /* __WINE_D3D10_PRIVATE_H */ diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 80ccdf8..c1113af 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -40,6 +40,26 @@ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) } } +const char *debug_d3d10_primitive_topology(D3D10_PRIMITIVE_TOPOLOGY topology) +{ + switch (topology) + { + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_UNDEFINED); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_POINTLIST); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_LINELIST); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_LINELIST_ADJ); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ); + WINE_D3D10_TO_STR(D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ); + default: + FIXME("Unrecognized D3D10_PRIMITIVE_TOPOLOGY %#x\n", topology); + return "unrecognized"; + } +} + const char *debug_dxgi_format(DXGI_FORMAT format) { switch(format)

1 0

Henri Verbeet : d3d10: Add a debug function for DXGI_FORMAT.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: f4bc3fe7ffe0a331464376edf37a1745079f9419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4bc3fe7ffe0a331464376edf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 20 15:28:08 2008 +0200 d3d10: Add a debug function for DXGI_FORMAT. --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/utils.c | 99 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 6c6bf12..8012528 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -29,5 +29,6 @@ /* TRACE helper functions */ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type); +const char *debug_dxgi_format(DXGI_FORMAT format); #endif /* __WINE_D3D10_PRIVATE_H */ diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 461056b..80ccdf8 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -40,4 +40,103 @@ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) } } +const char *debug_dxgi_format(DXGI_FORMAT format) +{ + switch(format) + { + WINE_D3D10_TO_STR(DXGI_FORMAT_UNKNOWN); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32A32_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32A32_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32A32_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32A32_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32B32_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16B16A16_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G32_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32G8X24_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_D32_FLOAT_S8X24_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_X32_TYPELESS_G8X24_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R10G10B10A2_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R10G10B10A2_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R10G10B10A2_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R11G11B10_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_UNORM_SRGB); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8B8A8_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16G16_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_D32_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R32_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R24G8_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_D24_UNORM_S8_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R24_UNORM_X8_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_X24_TYPELESS_G8_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16_FLOAT); + WINE_D3D10_TO_STR(DXGI_FORMAT_D16_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R16_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8_UINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8_SINT); + WINE_D3D10_TO_STR(DXGI_FORMAT_A8_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R1_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_R9G9B9E5_SHAREDEXP); + WINE_D3D10_TO_STR(DXGI_FORMAT_R8G8_B8G8_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_G8R8_G8B8_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC1_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC1_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC1_UNORM_SRGB); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC2_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC2_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC2_UNORM_SRGB); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC3_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC3_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC3_UNORM_SRGB); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC4_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC4_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC4_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC5_TYPELESS); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC5_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_BC5_SNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_B5G6R5_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_B5G5R5A1_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM); + WINE_D3D10_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM); + default: + FIXME("Unrecognized DXGI_FORMAT %#x\n", format); + return "unrecognized"; + } +} + #undef WINE_D3D10_TO_STR

1 0

Henri Verbeet : d3d10: Add a debug function for D3D10_DRIVER_TYPE.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 66d6c7333ca67faca05588960a5fb4be44a17d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d6c7333ca67faca05588960… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 20 15:28:08 2008 +0200 d3d10: Add a debug function for D3D10_DRIVER_TYPE. --- dlls/d3d10/Makefile.in | 3 ++- dlls/d3d10/d3d10_main.c | 7 ++----- dlls/d3d10/d3d10_private.h | 33 +++++++++++++++++++++++++++++++++ dlls/d3d10/utils.c | 43 +++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/d3d10.idl | 2 +- include/d3d10misc.h | 39 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 121 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index d9bb511..0acf4c0 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -7,7 +7,8 @@ IMPORTLIB = d3d10 IMPORTS = dxguid uuid wined3d kernel32 C_SRCS = \ - d3d10_main.c + d3d10_main.c \ + utils.c RC_SRCS = version.rc diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 8d80c41..c0a65f4 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -20,12 +20,9 @@ */ #include "config.h" -#include <stdarg.h> +#include "wine/port.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wine/debug.h" +#include "d3d10_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d10); diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h new file mode 100644 index 0000000..6c6bf12 --- /dev/null +++ b/dlls/d3d10/d3d10_private.h @@ -0,0 +1,33 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * 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 + */ + +#ifndef __WINE_D3D10_PRIVATE_H +#define __WINE_D3D10_PRIVATE_H + +#include "wine/debug.h" + +#include "winbase.h" +#include "winuser.h" +#include "objbase.h" + +#include "d3d10.h" + +/* TRACE helper functions */ +const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type); + +#endif /* __WINE_D3D10_PRIVATE_H */ diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c new file mode 100644 index 0000000..461056b --- /dev/null +++ b/dlls/d3d10/utils.c @@ -0,0 +1,43 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * 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 + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "d3d10_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10); + +#define WINE_D3D10_TO_STR(x) case x: return #x + +const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) +{ + switch(driver_type) + { + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_HARDWARE); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_REFERENCE); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_NULL); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_SOFTWARE); + default: + FIXME("Unrecognized D3D10_DRIVER_TYPE %#x\n", driver_type); + return "unrecognized"; + } +} + +#undef WINE_D3D10_TO_STR diff --git a/include/Makefile.in b/include/Makefile.in index d7e85f4..c70e6db 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -112,6 +112,7 @@ SRCDIR_INCLUDES = \ custcntl.h \ cvconst.h \ d3d.h \ + d3d10misc.h \ d3d8.h \ d3d8caps.h \ d3d8types.h \ diff --git a/include/d3d10.idl b/include/d3d10.idl index 032063f..ad90ede 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -1533,7 +1533,7 @@ interface ID3D10Multithread : IUnknown BOOL GetMultithreadProtected(); } -/* TODO: Include "d310misc.h" as soon as it exists */ +cpp_quote("#include <d3d10misc.h>") /* TODO: Include "d310effect.h" as soon as it exists */ /* TODO: Include "d310shader.h" as soon as it exists */ /* TODO: Include "d310sdklayers.h" as soon as it exists */ diff --git a/include/d3d10misc.h b/include/d3d10misc.h new file mode 100644 index 0000000..69b8069 --- /dev/null +++ b/include/d3d10misc.h @@ -0,0 +1,39 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * 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 + */ + +#ifndef __D3D10MISC_H__ +#define __D3D10MISC_H__ + +#include "d3d10.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum D3D10_DRIVER_TYPE { + D3D10_DRIVER_TYPE_HARDWARE = 0, + D3D10_DRIVER_TYPE_REFERENCE = 1, + D3D10_DRIVER_TYPE_NULL = 2, + D3D10_DRIVER_TYPE_SOFTWARE = 3, +} D3D10_DRIVER_TYPE; + +#ifdef __cplusplus +} +#endif + +#endif /* __D3D10MISC_H__ */

1 0

Huw Davies : wrc: Include errno.h.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 2e3e696a2cf1e89cf64a8f94ac40e023c1d0a73c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3e696a2cf1e89cf64a8f94a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 20 14:00:11 2008 +0100 wrc: Include errno.h. --- tools/wrc/parser.l | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 863878a..2ed5f4b 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -103,6 +103,7 @@ cident [a-zA-Z_][0-9a-zA-Z_]* #include <string.h> #include <ctype.h> #include <assert.h> +#include <errno.h> #include <limits.h> #ifndef HAVE_UNISTD_H

1 0

Huw Davies : widl: Include errno.h.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 81bab55a9403c3c609b967286bd5afa72f45fc78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81bab55a9403c3c609b967286… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 20 13:55:38 2008 +0100 widl: Include errno.h. --- tools/widl/parser.l | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 15e1fb9..dba27ea 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -47,6 +47,7 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* #include <string.h> #include <ctype.h> #include <assert.h> +#include <errno.h> #include <limits.h> #ifdef HAVE_UNISTD_H

1 0

Alexandre Julliard : ntoskrnl: Implemented IoDeleteSymbolicLink.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: 0b560febeaf12bcec92ff45e94b99ce4ed749e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b560febeaf12bcec92ff45e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 20 16:21:22 2008 +0200 ntoskrnl: Implemented IoDeleteSymbolicLink. --- dlls/ntoskrnl.exe/ntoskrnl.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4a20d5e..c37b1f8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -543,8 +543,28 @@ NTSTATUS WINAPI IoCreateSymbolicLink( UNICODE_STRING *name, UNICODE_STRING *targ */ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) { - FIXME( "%s\n", debugstr_us(name) ); - return STATUS_SUCCESS; + HANDLE handle; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = name; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (!(status = NtOpenSymbolicLinkObject( &handle, 0, &attr ))) + { + SERVER_START_REQ( unlink_object ) + { + req->handle = handle; + status = wine_server_call( req ); + } + SERVER_END_REQ; + NtClose( handle ); + } + return status; }

1 0

Alexandre Julliard : server: Added a request to unlink an object from its namespace.
by Alexandre Julliard 21 Oct '08

21 Oct '08

Module: wine Branch: master Commit: ba715798094896e8b98fc5803e16b00fa49edccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba715798094896e8b98fc5803… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 20 16:21:06 2008 +0200 server: Added a request to unlink an object from its namespace. --- include/wine/server_protocol.h | 18 +++++++++++++++++- server/directory.c | 12 ++++++++++++ server/protocol.def | 7 +++++++ server/request.h | 2 ++ server/trace.c | 8 ++++++++ 5 files changed, 46 insertions(+), 1 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5ae51f6..7175ae7 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4042,6 +4042,19 @@ struct get_object_info_reply }; + +struct unlink_object_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct unlink_object_reply +{ + struct reply_header __header; +}; + + + struct get_token_impersonation_level_request { struct request_header __header; @@ -4516,6 +4529,7 @@ enum request REQ_open_symlink, REQ_query_symlink, REQ_get_object_info, + REQ_unlink_object, REQ_get_token_impersonation_level, REQ_allocate_locally_unique_id, REQ_create_device_manager, @@ -4757,6 +4771,7 @@ union generic_request struct open_symlink_request open_symlink_request; struct query_symlink_request query_symlink_request; struct get_object_info_request get_object_info_request; + struct unlink_object_request unlink_object_request; struct get_token_impersonation_level_request get_token_impersonation_level_request; struct allocate_locally_unique_id_request allocate_locally_unique_id_request; struct create_device_manager_request create_device_manager_request; @@ -4996,6 +5011,7 @@ union generic_reply struct open_symlink_reply open_symlink_reply; struct query_symlink_reply query_symlink_reply; struct get_object_info_reply get_object_info_reply; + struct unlink_object_reply unlink_object_reply; struct get_token_impersonation_level_reply get_token_impersonation_level_reply; struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; struct create_device_manager_reply create_device_manager_reply; @@ -5015,6 +5031,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 342 +#define SERVER_PROTOCOL_VERSION 343 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/directory.c b/server/directory.c index d1d323c..f2545ea 100644 --- a/server/directory.c +++ b/server/directory.c @@ -508,3 +508,15 @@ DECL_HANDLER(get_directory_entry) release_object( dir ); } } + +/* unlink a named object */ +DECL_HANDLER(unlink_object) +{ + struct object *obj = get_handle_obj( current->process, req->handle, 0, NULL ); + + if (obj) + { + unlink_named_object( obj ); + release_object( obj ); + } +} diff --git a/server/protocol.def b/server/protocol.def index d9fd48c..b1258b2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2913,6 +2913,13 @@ enum message_type unsigned int ref_count; /* object ref count */ @END + +/* Unlink a named object */ +(a)REQ(unlink_object) + obj_handle_t handle; /* handle to the object */ +(a)END + + /* Query the impersonation level of an impersonation token */ @REQ(get_token_impersonation_level) obj_handle_t handle; /* handle to the object */ diff --git a/server/request.h b/server/request.h index 308b620..5fc5236 100644 --- a/server/request.h +++ b/server/request.h @@ -328,6 +328,7 @@ DECL_HANDLER(create_symlink); DECL_HANDLER(open_symlink); DECL_HANDLER(query_symlink); DECL_HANDLER(get_object_info); +DECL_HANDLER(unlink_object); DECL_HANDLER(get_token_impersonation_level); DECL_HANDLER(allocate_locally_unique_id); DECL_HANDLER(create_device_manager); @@ -568,6 +569,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_open_symlink, (req_handler)req_query_symlink, (req_handler)req_get_object_info, + (req_handler)req_unlink_object, (req_handler)req_get_token_impersonation_level, (req_handler)req_allocate_locally_unique_id, (req_handler)req_create_device_manager, diff --git a/server/trace.c b/server/trace.c index 8cdc021..8e1737e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3595,6 +3595,11 @@ static void dump_get_object_info_reply( const struct get_object_info_reply *req fprintf( stderr, " ref_count=%08x", req->ref_count ); } +static void dump_unlink_object_request( const struct unlink_object_request *req ) +{ + fprintf( stderr, " handle=%p", req->handle ); +} + static void dump_get_token_impersonation_level_request( const struct get_token_impersonation_level_request *req ) { fprintf( stderr, " handle=%p", req->handle ); @@ -4011,6 +4016,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_open_symlink_request, (dump_func)dump_query_symlink_request, (dump_func)dump_get_object_info_request, + (dump_func)dump_unlink_object_request, (dump_func)dump_get_token_impersonation_level_request, (dump_func)dump_allocate_locally_unique_id_request, (dump_func)dump_create_device_manager_request, @@ -4248,6 +4254,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_open_symlink_reply, (dump_func)dump_query_symlink_reply, (dump_func)dump_get_object_info_reply, + (dump_func)0, (dump_func)dump_get_token_impersonation_level_reply, (dump_func)dump_allocate_locally_unique_id_reply, (dump_func)dump_create_device_manager_reply, @@ -4485,6 +4492,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "open_symlink", "query_symlink", "get_object_info", + "unlink_object", "get_token_impersonation_level", "allocate_locally_unique_id", "create_device_manager",

1 0

Hwang YunSong(황윤성) : wordpad: Updated Korean resource.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 07badc790ae50b1ad47214115856ab5d6de6f350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07badc790ae50b1ad47214115… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Oct 20 09:45:27 2008 +0900 wordpad: Updated Korean resource. --- programs/wordpad/Ko.rc | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 9fcb725..ac246eb 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -59,19 +59,19 @@ BEGIN MENUITEM "�� (&F)", ID_EDIT_CHARFORMAT MENUITEM "��ǵ� ��ڿ� ��(&D)", ID_EDIT_DEFCHARFORMAT MENUITEM "�ܶ� ��(&H)", ID_EDIT_PARAFORMAT - MENUITEM "�ؽ�Ʈ ��(&G)", ID_EDIT_GETTEXT + MENUITEM "��ڿ� ��(&G)", ID_EDIT_GETTEXT END END POPUP "��(&V)" BEGIN MENUITEM "��(&T)", ID_TOGGLE_TOOLBAR MENUITEM "��Ĺ�(&F)", ID_TOGGLE_FORMATBAR - MENUITEM "&Ruler", ID_TOGGLE_RULER + MENUITEM "��ݹ�(&R)", ID_TOGGLE_RULER MENUITEM "��¹�(&S)", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM " �ɼ�(&O)...", ID_VIEWPROPERTIES END - POPUP "��ֱ�(&I)" + POPUP "��(&I)" BEGIN MENUITEM "��¥�� ð�(&D)...", ID_DATETIME END @@ -89,7 +89,7 @@ BEGIN END POPUP "��(&H)" BEGIN - MENUITEM "��е� ��(&A)" ID_ABOUT + MENUITEM "Wine ��е� ��(&A)" ID_ABOUT END END @@ -237,4 +237,9 @@ BEGIN "�� ϱ⸦ ��մϱ�?" STRING_INVALID_NUMBER, "�ùٸ�� " STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE �� ʽ��ϴ�" + STRING_WRITE_FAILED, "�� ϴ�." + STRING_WRITE_ACCESS_DENIED, "�� ϴ�." + STRING_OPEN_FAILED, "�� ϴ�." + STRING_OPEN_ACCESS_DENIED, "�� ϴ�." + STRING_PRINTING_NOT_IMPLEMENTED, "�μ�� ʽ��ϴ�" END

1 0

Muneyuki Noguchi : winex11: Prevent XCreateIC from returning NULL when input style isn't "root".
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: edd24b613ff8605cd5b0c7baae04434a28c29068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edd24b613ff8605cd5b0c7baa… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Oct 18 23:03:48 2008 +0900 winex11: Prevent XCreateIC from returning NULL when input style isn't "root". --- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xim.c | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e5a40aa..90ec95a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -515,6 +515,7 @@ struct x11drv_thread_data Window grab_window; /* window that currently grabs the mouse */ HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ + XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ }; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index fc9996a..1569481 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -562,6 +562,7 @@ static void thread_detach(void) X11DRV_ResetSelectionOwner(); wine_tsx11_lock(); if (data->xim) XCloseIM( data->xim ); + if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display ); wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, data ); diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 5e413f0..7c3c9d1 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -477,6 +477,26 @@ static BOOL open_xim( Display *display ) thread_data->xim = xim; + if ((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0 || + (ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0) + { + char **list; + int count; + thread_data->font_set = XCreateFontSet(display, "fixed", + &list, &count, NULL); + TRACE("ximFontSet = %p\n", thread_data->font_set); + TRACE("list = %p, count = %d\n", list, count); + if (list != NULL) + { + int i; + for (i = 0; i < count; ++i) + TRACE("list[%d] = %s\n", i, list[i]); + XFreeStringList(list); + } + } + else + thread_data->font_set = NULL; + wine_tsx11_unlock(); IME_UpdateAssociation(NULL); wine_tsx11_lock(); @@ -518,6 +538,7 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) XICCallback P_StartCB, P_DoneCB, P_DrawCB, P_CaretCB; LANGID langid = PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())); Window win = data->whole_window; + XFontSet fontSet = x11drv_thread_data()->font_set; TRACE("xim = %p\n", xim); @@ -552,6 +573,7 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) if ((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0) { preedit = XVaCreateNestedList(0, + XNFontSet, fontSet, XNSpotLocation, &spot, XNPreeditStartCallback, &P_StartCB, XNPreeditDoneCallback, &P_DoneCB, @@ -575,6 +597,7 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) if ((ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0) { status = XVaCreateNestedList(0, + XNFontSet, fontSet, NULL); TRACE("status = %p\n", status); }

1 0