October 2008 - Wine-commits

Alexandre Julliard : winecrt0: Add missing WINAPI on driver entry point.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: d230e713b97efa63796bfd4dc2c9d37f4602ed43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d230e713b97efa63796bfd4dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 18 12:12:05 2008 +0200 winecrt0: Add missing WINAPI on driver entry point. --- dlls/winecrt0/drv_entry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecrt0/drv_entry.c b/dlls/winecrt0/drv_entry.c index 946a414..a55f81d 100644 --- a/dlls/winecrt0/drv_entry.c +++ b/dlls/winecrt0/drv_entry.c @@ -27,7 +27,7 @@ struct _DRIVER_OBJECT; extern NTSTATUS WINAPI DriverEntry( struct _DRIVER_OBJECT *obj, UNICODE_STRING *path ); -NTSTATUS DECLSPEC_HIDDEN __wine_spec_drv_entry( struct _DRIVER_OBJECT *obj, UNICODE_STRING *path ) +NTSTATUS DECLSPEC_HIDDEN WINAPI __wine_spec_drv_entry( struct _DRIVER_OBJECT *obj, UNICODE_STRING *path ) { BOOL needs_init = (__wine_spec_init_state != CONSTRUCTORS_DONE);

1 0

Henri Verbeet : dxgi: Add the IDXGIAdapter interface.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 21c7d89ce6fe35a56df0710852e330949affaec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c7d89ce6fe35a56df071085… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 17 15:09:45 2008 +0200 dxgi: Add the IDXGIAdapter interface. --- include/dxgi.idl | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index abfd299..8cba615 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -20,6 +20,10 @@ import "dxgitype.idl"; cpp_quote("#if 0") typedef HANDLE HMONITOR; +typedef struct _LUID { + DWORD LowPart; + LONG HighPart; +} LUID, *PLUID; cpp_quote("#endif") typedef UINT DXGI_USAGE; @@ -62,6 +66,18 @@ typedef struct DXGI_FRAME_STATISTICS { LARGE_INTEGER SyncGPUTime; } DXGI_FRAME_STATISTICS; +typedef struct DXGI_ADAPTER_DESC { + WCHAR Description[128]; + UINT VendorId; + UINT DeviceId; + UINT SubSysId; + UINT Revision; + SIZE_T DedicatedVideoMemory; + SIZE_T DedicatedSystemMemory; + SIZE_T SharedSystemMemory; + LUID AdapterLuid; +} DXGI_ADAPTER_DESC; + typedef struct DXGI_SWAP_CHAIN_DESC { DXGI_MODE_DESC BufferDesc; DXGI_SAMPLE_DESC SampleDesc; @@ -183,6 +199,26 @@ interface IDXGIOutput : IDXGIObject [ object, local, + uuid(2411e7e1-12ac-4ccf-bd14-9798e8534dc0) +] +interface IDXGIAdapter : IDXGIObject +{ + HRESULT EnumOutputs( + [in] UINT output_idx, + [in, out] IDXGIOutput **output + ); + HRESULT GetDesc( + [out] DXGI_ADAPTER_DESC *desc + ); + HRESULT CheckInterfaceSupport( + [in] REFGUID guid, + [out] LARGE_INTEGER umd_version + ); +} + +[ + object, + local, uuid(310d36a0-d2e7-4c0a-aa04-6a9d23b8886a) ] interface IDXGISwapChain : IDXGIDeviceSubObject

1 0

Rob Shearman : kernel32: Fix some Esperanto day and month names.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 1b5e84a588af1bb0130331eb7d1a7c1dd5a810f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5e84a588af1bb0130331eb7… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Oct 17 15:01:28 2008 +0100 kernel32: Fix some Esperanto day and month names. --- dlls/kernel32/nls/eox.nls | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/nls/eox.nls b/dlls/kernel32/nls/eox.nls index 6a6b87f..0f5e722 100644 --- a/dlls/kernel32/nls/eox.nls +++ b/dlls/kernel32/nls/eox.nls @@ -82,7 +82,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_SABBREVDAYNAME1 "lu" LOCALE_SABBREVDAYNAME2 "ma" LOCALE_SABBREVDAYNAME3 "me" - LOCALE_SABBREVDAYNAME4 "¼a" + LOCALE_SABBREVDAYNAME4 "ĵa" LOCALE_SABBREVDAYNAME5 "ve" LOCALE_SABBREVDAYNAME6 "sa" LOCALE_SABBREVDAYNAME7 "di" @@ -94,7 +94,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_SABBREVMONTHNAME5 "maj" LOCALE_SABBREVMONTHNAME6 "jun" LOCALE_SABBREVMONTHNAME7 "jul" - LOCALE_SABBREVMONTHNAME8 "aýg" + LOCALE_SABBREVMONTHNAME8 "aŭg" LOCALE_SABBREVMONTHNAME9 "sep" LOCALE_SABBREVMONTHNAME10 "okt" LOCALE_SABBREVMONTHNAME11 "nov" @@ -106,10 +106,10 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_SDAYNAME1 "lundo" LOCALE_SDAYNAME2 "mardo" LOCALE_SDAYNAME3 "merkredo" - LOCALE_SDAYNAME4 "¼aýdo" + LOCALE_SDAYNAME4 "ĵaŭdo" LOCALE_SDAYNAME5 "vendredo" LOCALE_SDAYNAME6 "sabato" - LOCALE_SDAYNAME7 "dimanæo" + LOCALE_SDAYNAME7 "dimanĉo" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "" LOCALE_SENGCURRNAME "Euro" @@ -130,7 +130,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_SMONTHNAME5 "majo" LOCALE_SMONTHNAME6 "junio" LOCALE_SMONTHNAME7 "julio" - LOCALE_SMONTHNAME8 "aýgusto" + LOCALE_SMONTHNAME8 "aŭgusto" LOCALE_SMONTHNAME9 "septembro" LOCALE_SMONTHNAME10 "oktobro" LOCALE_SMONTHNAME11 "novembro"

1 0

Hans Leidekker : wininet: Fix buffer size query for InternetQueryOption( INTERNET_OPTION_PROXY).
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 4615b1c0b41f66dfd6120f630cda8678b8b06265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4615b1c0b41f66dfd6120f630… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 17 16:24:15 2008 +0200 wininet: Fix buffer size query for InternetQueryOption(INTERNET_OPTION_PROXY). --- dlls/wininet/internet.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 277ea23..353b156 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -546,8 +546,10 @@ static DWORD APPINFO_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *b if (ai->lpszProxyBypass) proxyBypassBytesRequired = (lstrlenW(ai->lpszProxyBypass) + 1) * sizeof(WCHAR); if (*size < sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired) - return ERROR_INSUFFICIENT_BUFFER; - + { + *size = sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired; + return ERROR_INSUFFICIENT_BUFFER; + } proxy = (LPWSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOW)); proxy_bypass = (LPWSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired); @@ -577,8 +579,10 @@ static DWORD APPINFO_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *b proxyBypassBytesRequired = WideCharToMultiByte(CP_ACP, 0, ai->lpszProxyBypass, -1, NULL, 0, NULL, NULL); if (*size < sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired + proxyBypassBytesRequired) + { + *size = sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired + proxyBypassBytesRequired; return ERROR_INSUFFICIENT_BUFFER; - + } proxy = (LPSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOA)); proxy_bypass = (LPSTR)((LPBYTE)buffer + sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired);

1 0

Juan Lang : crypt32: Microsoft fixed a bug with name constraints, so make Wine's behavior match.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 25698f8938a7c29d7ea772168b87f1e09f36099e URL: http://source.winehq.org/git/wine.git/?a=commit;h=25698f8938a7c29d7ea772168… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 16 16:42:46 2008 -0700 crypt32: Microsoft fixed a bug with name constraints, so make Wine's behavior match. --- dlls/crypt32/chain.c | 17 +---------------- dlls/crypt32/tests/chain.c | 6 ++---- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d086fe6..9365a22 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -560,14 +560,13 @@ static void CRYPT_FindMatchingNameEntry(const CERT_ALT_NAME_ENTRY *constraint, DWORD errorIfFound, DWORD errorIfNotFound) { DWORD i; - BOOL defined = FALSE, match = FALSE; + BOOL match = FALSE; for (i = 0; i < subjectName->cAltEntry; i++) { if (subjectName->rgAltEntry[i].dwAltNameChoice == constraint->dwAltNameChoice) { - defined = TRUE; switch (constraint->dwAltNameChoice) { case CERT_ALT_NAME_RFC822_NAME: @@ -595,16 +594,6 @@ static void CRYPT_FindMatchingNameEntry(const CERT_ALT_NAME_ENTRY *constraint, } } } - /* Microsoft's implementation of name constraint checking appears at odds - * with RFC 3280: - * According to MSDN, CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT is set - * when a name constraint is present, but that name form is not defined in - * the end certificate. According to RFC 3280, "if no name of the type is - * in the certificate, the name is acceptable." - * I follow Microsoft here. - */ - if (!defined) - *trustErrorStatus |= CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT; *trustErrorStatus |= match ? errorIfFound : errorIfNotFound; } @@ -645,10 +634,6 @@ static void CRYPT_CheckNameConstraints( } else { - /* See above comment on CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT. - * I match Microsoft's implementation here as well. - */ - *trustErrorStatus |= CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT; if (nameConstraints->cPermittedSubtree) *trustErrorStatus |= CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index bfaa802..5752eff 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1352,8 +1352,7 @@ static CONST_DATA_BLOB chain5[] = { }; static const CERT_TRUST_STATUS elementStatus5[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT | + { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT | CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_IS_SELF_SIGNED }, }; @@ -1512,8 +1511,7 @@ static ChainCheck chainCheck[] = { 1, simpleStatus4 }, 0 }, { { sizeof(chain5) / sizeof(chain5[0]), chain5 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | - CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT | + { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus5 }, 0 }, { { sizeof(chain6) / sizeof(chain6[0]), chain6 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER },

1 0

Henri Verbeet : dxgi: Add the IDXGISwapChain interface.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 94bd5c65969897bd648f518c1c3eb98a841bc2a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94bd5c65969897bd648f518c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 17 15:09:45 2008 +0200 dxgi: Add the IDXGISwapChain interface. --- include/dxgi.idl | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index f1925b6..abfd299 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -22,6 +22,18 @@ cpp_quote("#if 0") typedef HANDLE HMONITOR; cpp_quote("#endif") +typedef UINT DXGI_USAGE; +const DXGI_USAGE DXGI_USAGE_SHADER_INPUT = 0x10L; +const DXGI_USAGE DXGI_USAGE_RENDER_TARGET_OUTPUT = 0x20L; +const DXGI_USAGE DXGI_USAGE_BACK_BUFFER = 0x40L; +const DXGI_USAGE DXGI_USAGE_SHARED = 0x80L; +const DXGI_USAGE DXGI_USAGE_READ_ONLY = 0x100L; + +typedef enum DXGI_SWAP_EFFECT { + DXGI_SWAP_EFFECT_DISCARD = 0, + DXGI_SWAP_EFFECT_SEQUENTIAL = 1, +} DXGI_SWAP_EFFECT; + typedef struct DXGI_SURFACE_DESC { UINT Width; UINT Height; @@ -50,6 +62,17 @@ typedef struct DXGI_FRAME_STATISTICS { LARGE_INTEGER SyncGPUTime; } DXGI_FRAME_STATISTICS; +typedef struct DXGI_SWAP_CHAIN_DESC { + DXGI_MODE_DESC BufferDesc; + DXGI_SAMPLE_DESC SampleDesc; + DXGI_USAGE BufferUsage; + UINT BufferCount; + HWND OutputWindow; + BOOL Windowed; + DXGI_SWAP_EFFECT SwapEffect; + UINT Flags; +} DXGI_SWAP_CHAIN_DESC; + [ object, local, @@ -156,3 +179,51 @@ interface IDXGIOutput : IDXGIObject [out] DXGI_FRAME_STATISTICS *stats ); } + +[ + object, + local, + uuid(310d36a0-d2e7-4c0a-aa04-6a9d23b8886a) +] +interface IDXGISwapChain : IDXGIDeviceSubObject +{ + HRESULT Present( + [in] UINT sync_interval, + [in] UINT flags + ); + HRESULT GetBuffer( + [in] UINT buffer_idx, + [in] REFIID riid, + [in, out] void **surface + ); + HRESULT SetFullscreenState( + [in] BOOL fullscreen, + [in] IDXGIOutput *target + ); + HRESULT GetFullscreenState( + [out] BOOL *fullscreen, + [out] IDXGIOutput **target + ); + HRESULT GetDesc( + [out] DXGI_SWAP_CHAIN_DESC *desc + ); + HRESULT ResizeBuffers( + [in] UINT buffer_count, + [in] UINT width, + [in] UINT height, + [in] DXGI_FORMAT format, + [in] UINT flags + ); + HRESULT ResizeTarget( + [in] const DXGI_MODE_DESC target_mode_desc + ); + HRESULT GetContainingOutput( + [out] IDXGIOutput **output + ); + HRESULT GetFrameStatistics( + [out] DXGI_FRAME_STATISTICS *stats + ); + HRESULT GetLastPresentCount( + [out] UINT *last_present_count + ); +}

1 0

Henri Verbeet : dxgi: Add the IDXGIOutput interface.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 2d1da818c5439b710112a49399b87c5c7128b93c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1da818c5439b710112a4939… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 17 15:09:45 2008 +0200 dxgi: Add the IDXGIOutput interface. --- include/dxgi.idl | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/dxgitype.idl | 55 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 0 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index 7c7a3e9..f1925b6 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -18,6 +18,10 @@ import "dxgitype.idl"; +cpp_quote("#if 0") +typedef HANDLE HMONITOR; +cpp_quote("#endif") + typedef struct DXGI_SURFACE_DESC { UINT Width; UINT Height; @@ -30,6 +34,22 @@ typedef struct DXGI_MAPPED_RECT { BYTE *pBits; } DXGI_MAPPED_RECT; +typedef struct DXGI_OUTPUT_DESC { + WCHAR DeviceName[32]; + RECT DesktopCoordinates; + BOOL AttachedToDesktop; + DXGI_MODE_ROTATION Rotation; + HMONITOR Monitor; +} DXGI_OUTPUT_DESC; + +typedef struct DXGI_FRAME_STATISTICS { + UINT PresentCount; + UINT PresentRefreshCount; + UINT SyncRefreshCount; + LARGE_INTEGER SyncQPCTime; + LARGE_INTEGER SyncGPUTime; +} DXGI_FRAME_STATISTICS; + [ object, local, @@ -87,3 +107,52 @@ interface IDXGISurface : IDXGIDeviceSubObject HRESULT Unmap( ); } + +[ + object, + local, + uuid(ae02eedb-c735-4690-8d52-5a8dc20213aa) +] +interface IDXGIOutput : IDXGIObject +{ + HRESULT GetDesc( + [out] DXGI_OUTPUT_DESC *desc + ); + HRESULT GetDisplayModeList( + [in] DXGI_FORMAT format, + [in] UINT flags, + [in, out] UINT *mode_count, + [out] DXGI_MODE_DESC *desc + ); + HRESULT FindClosestMatchingMode( + [in] const DXGI_MODE_DESC *mode, + [out] DXGI_MODE_DESC *closest_match, + [in] IUnknown *device + ); + HRESULT WaitForVBlank( + ); + HRESULT TakeOwnership( + [in] IUnknown *device, + [in] BOOL exclusive + ); + void ReleaseOwnership( + ); + HRESULT GetGammaControlCapabilities( + [out] DXGI_GAMMA_CONTROL_CAPABILITIES *gamma_caps + ); + HRESULT SetGammaControl( + [in] const DXGI_GAMMA_CONTROL *gamma_control + ); + HRESULT GetGammaControl( + [out] DXGI_GAMMA_CONTROL *gamma_control + ); + HRESULT SetDisplaySurface( + [in] IDXGISurface *surface + ); + HRESULT GetDisplaySurfaceData( + [in] IDXGISurface *surface + ); + HRESULT GetFrameStatistics( + [out] DXGI_FRAME_STATISTICS *stats + ); +} diff --git a/include/dxgitype.idl b/include/dxgitype.idl index 37bdfaa..2bd961d 100644 --- a/include/dxgitype.idl +++ b/include/dxgitype.idl @@ -115,3 +115,58 @@ typedef enum DXGI_FORMAT { DXGI_FORMAT_B8G8R8X8_UNORM = 88, DXGI_FORMAT_FORCE_UINT = 0xffffffff } DXGI_FORMAT; + +typedef enum DXGI_MODE_ROTATION { + DXGI_MODE_ROTATION_UNSPECIFIED = 0, + DXGI_MODE_ROTATION_IDENTITY = 1, + DXGI_MODE_ROTATION_ROTATE90 = 2, + DXGI_MODE_ROTATION_ROTATE180 = 3, + DXGI_MODE_ROTATION_ROTATE270 = 4, +} DXGI_MODE_ROTATION; + +typedef enum DXGI_MODE_SCANLINE_ORDER { + DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED = 0, + DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE = 1, + DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST = 2, + DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST = 3, +} DXGI_MODE_SCANLINE_ORDER; + +typedef enum DXGI_MODE_SCALING { + DXGI_MODE_SCALING_UNSPECIFIED = 0, + DXGI_MODE_SCALING_CENTERED = 1, + DXGI_MODE_SCALING_STRETCHED = 2, +} DXGI_MODE_SCALING; + +typedef struct DXGI_RATIONAL { + UINT Numerator; + UINT Denominator; +} DXGI_RATIONAL; + +typedef struct DXGI_MODE_DESC { + UINT Width; + UINT Height; + DXGI_RATIONAL RefreshRate; + DXGI_FORMAT Format; + DXGI_MODE_SCANLINE_ORDER ScanlineOrdering; + DXGI_MODE_SCALING Scaling; +} DXGI_MODE_DESC; + +typedef struct DXGI_GAMMA_CONTROL_CAPABILITIES { + BOOL ScaleAndOffsetSupported; + float MaxConvertedValue; + float MinConvertedValue; + UINT NumGammaControlPoints; + float ControlPointPositions[1025]; +} DXGI_GAMMA_CONTROL_CAPABILITIES; + +typedef struct DXGI_RGB { + float Red; + float Green; + float Blue; +} DXGI_RGB; + +typedef struct DXGI_GAMMA_CONTROL { + DXGI_RGB Scale; + DXGI_RGB Offset; + DXGI_RGB GammaCurve[1025]; +} DXGI_GAMMA_CONTROL;

1 0

Henri Verbeet : dxgi: Add the IDXGISurface interface.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 9cdbffcce4c6e5c5d374dca642941adbc4d6978c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cdbffcce4c6e5c5d374dca64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 17 15:09:45 2008 +0200 dxgi: Add the IDXGISurface interface. --- include/dxgi.idl | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index e82c5be..7c7a3e9 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -18,6 +18,18 @@ import "dxgitype.idl"; +typedef struct DXGI_SURFACE_DESC { + UINT Width; + UINT Height; + DXGI_FORMAT Format; + DXGI_SAMPLE_DESC SampleDesc; +} DXGI_SURFACE_DESC; + +typedef struct DXGI_MAPPED_RECT { + INT Pitch; + BYTE *pBits; +} DXGI_MAPPED_RECT; + [ object, local, @@ -57,3 +69,21 @@ interface IDXGIDeviceSubObject : IDXGIObject [out] void **device ); } + +[ + object, + local, + uuid(cafcb56c-6ac3-4889-bf47-9e23bbd260ec) +] +interface IDXGISurface : IDXGIDeviceSubObject +{ + HRESULT GetDesc( + [out] DXGI_SURFACE_DESC *desc + ); + HRESULT Map( + [out] DXGI_MAPPED_RECT *mapped_rect, + [in] UINT flags + ); + HRESULT Unmap( + ); +}

1 0

Alexandre Julliard : mountmgr: Store mount points as a list instead of an array.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: 1680ba67efdea211fdcdc45aa6a173a893c9ab5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1680ba67efdea211fdcdc45aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 20:09:31 2008 +0200 mountmgr: Store mount points as a list instead of an array. --- dlls/mountmgr.sys/mountmgr.c | 155 ++++++++++++++++++++--------------------- 1 files changed, 76 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1680ba67efdea211fdcdc…

1 0

Alexandre Julliard : mountmgr: Store the device name in the mount point structure.
by Alexandre Julliard 18 Oct '08

18 Oct '08

Module: wine Branch: master Commit: a304358e7b292995f6c8e417682b5eb1064b105e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a304358e7b292995f6c8e4176… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 20:01:23 2008 +0200 mountmgr: Store the device name in the mount point structure. --- dlls/mountmgr.sys/mountmgr.c | 46 +++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index e3b02a0..569f131 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -49,7 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); /* extra info for disk devices, stored in DeviceExtension */ struct disk_device_info { - UNICODE_STRING name; /* device name */ STORAGE_DEVICE_NUMBER devnum; /* device number info */ }; @@ -57,6 +56,7 @@ struct mount_point { struct list entry; /* entry in mount points list */ DEVICE_OBJECT *device; /* disk device */ + UNICODE_STRING name; /* device name */ UNICODE_STRING link; /* DOS device symlink */ void *id; /* device unique id */ unsigned int id_len; @@ -65,11 +65,6 @@ struct mount_point static struct list mount_points_list = LIST_INIT(mount_points_list); static HKEY mount_key; -static inline UNICODE_STRING *get_device_name( DEVICE_OBJECT *dev ) -{ - return &((struct disk_device_info *)dev->DeviceExtension)->name; -} - /* read a Unix symlink; returned buffer must be freed by caller */ static char *read_symlink( const char *path ) { @@ -99,7 +94,8 @@ static char *read_symlink( const char *path ) } } -static NTSTATUS create_disk_device( DRIVER_OBJECT *driver, DWORD type, DEVICE_OBJECT **dev_obj ) +static NTSTATUS create_disk_device( DRIVER_OBJECT *driver, DWORD type, DEVICE_OBJECT **dev_obj, + UNICODE_STRING *device_name ) { static const WCHAR harddiskW[] = {'\\','D','e','v','i','c','e', '\\','H','a','r','d','d','i','s','k','V','o','l','u','m','e','%','u',0}; @@ -139,7 +135,7 @@ static NTSTATUS create_disk_device( DRIVER_OBJECT *driver, DWORD type, DEVICE_OB if (!status) { info = (*dev_obj)->DeviceExtension; - info->name = name; + *device_name = name; switch(type) { case DRIVE_REMOVABLE: @@ -186,13 +182,19 @@ static struct mount_point *add_mount_point( DEVICE_OBJECT *device, UNICODE_STRIN { struct mount_point *mount; WCHAR *str; - UINT len = (strlenW(link) + 1) * sizeof(WCHAR); + UINT len = (strlenW(link) + 1) * sizeof(WCHAR) + device_name->Length + sizeof(WCHAR); if (!(mount = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*mount) + len ))) return NULL; str = (WCHAR *)(mount + 1); strcpyW( str, link ); RtlInitUnicodeString( &mount->link, str ); + str += strlenW(str) + 1; + memcpy( str, device_name->Buffer, device_name->Length ); + str[device_name->Length / sizeof(WCHAR)] = 0; + mount->name.Buffer = str; + mount->name.Length = device_name->Length; + mount->name.MaximumLength = device_name->Length + sizeof(WCHAR); mount->device = device; mount->id = NULL; list_add_tail( &mount_points_list, &mount->entry ); @@ -201,7 +203,7 @@ static struct mount_point *add_mount_point( DEVICE_OBJECT *device, UNICODE_STRIN set_mount_point_id( mount, id, id_len ); TRACE( "created %s id %s for %s\n", debugstr_w(mount->link.Buffer), - debugstr_a(mount->id), debugstr_w(device_name->Buffer) ); + debugstr_a(mount->id), debugstr_w(mount->name.Buffer) ); return mount; } @@ -248,9 +250,8 @@ static BOOL matching_mount_point( const struct mount_point *mount, const MOUNTMG if (spec->DeviceNameOffset) { const WCHAR *name = (const WCHAR *)((const char *)spec + spec->DeviceNameOffset); - const UNICODE_STRING *dev_name = get_device_name( mount->device ); - if (spec->DeviceNameLength != dev_name->Length) return FALSE; - if (memicmpW( name, dev_name->Buffer, dev_name->Length/sizeof(WCHAR))) + if (spec->DeviceNameLength != mount->name.Length) return FALSE; + if (memicmpW( name, mount->name.Buffer, mount->name.Length/sizeof(WCHAR))) return FALSE; } if (spec->UniqueIdOffset) @@ -269,7 +270,6 @@ static NTSTATUS query_mount_points( const void *in_buff, SIZE_T insize, UINT count, pos, size; const MOUNTMGR_MOUNT_POINT *input = in_buff; MOUNTMGR_MOUNT_POINTS *info = out_buff; - UNICODE_STRING *dev_name; struct mount_point *mount; /* sanity checks */ @@ -285,7 +285,7 @@ static NTSTATUS query_mount_points( const void *in_buff, SIZE_T insize, LIST_FOR_EACH_ENTRY( mount, &mount_points_list, struct mount_point, entry ) { if (!matching_mount_point( mount, input )) continue; - size += get_device_name(mount->device)->Length; + size += mount->name.Length; size += mount->link.Length; size += mount->id_len; size = (size + sizeof(WCHAR) - 1) & ~(sizeof(WCHAR) - 1); @@ -307,11 +307,10 @@ static NTSTATUS query_mount_points( const void *in_buff, SIZE_T insize, { if (!matching_mount_point( mount, input )) continue; - dev_name = get_device_name( mount->device ); info->MountPoints[count].DeviceNameOffset = pos; - info->MountPoints[count].DeviceNameLength = dev_name->Length; - memcpy( (char *)out_buff + pos, dev_name->Buffer, dev_name->Length ); - pos += dev_name->Length; + info->MountPoints[count].DeviceNameLength = mount->name.Length; + memcpy( (char *)out_buff + pos, mount->name.Buffer, mount->name.Length ); + pos += mount->name.Length; info->MountPoints[count].SymbolicLinkNameOffset = pos; info->MountPoints[count].SymbolicLinkNameLength = mount->link.Length; @@ -414,6 +413,7 @@ static void create_drive_mount_points( DRIVER_OBJECT *driver ) char *buffer, *p, *link; unsigned int i; DEVICE_OBJECT *device; + UNICODE_STRING device_name; if ((buffer = RtlAllocateHeap( GetProcessHeap(), 0, strlen(config_dir) + sizeof("/dosdevices/a:") ))) @@ -426,10 +426,11 @@ static void create_drive_mount_points( DRIVER_OBJECT *driver ) { *p = 'a' + i; if (!(link = read_symlink( buffer ))) continue; - if (!create_disk_device( driver, DRIVE_FIXED, &device )) + if (!create_disk_device( driver, DRIVE_FIXED, &device, &device_name )) { - add_dosdev_mount_point( device, get_device_name(device), i, link, strlen(link) + 1 ); - add_volume_mount_point( device, get_device_name(device), i, link, strlen(link) + 1 ); + add_dosdev_mount_point( device, &device_name, i, link, strlen(link) + 1 ); + add_volume_mount_point( device, &device_name, i, link, strlen(link) + 1 ); + RtlFreeUnicodeString( &device_name ); } RtlFreeHeap( GetProcessHeap(), 0, link ); } @@ -466,7 +467,6 @@ static NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STR return status; } info = device->DeviceExtension; - info->name = nameW; info->devnum.DeviceType = FILE_DEVICE_DISK; info->devnum.DeviceNumber = 0; info->devnum.PartitionNumber = 0;

1 0