wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Henri Verbeet : d3d10core: Implement d3d10_device_IAGetInputLayout().
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 86779241c6c3969b50c8fbd50a943f47c2b3458e URL: http://source.winehq.org/git/wine.git/?a=commit;h=86779241c6c3969b50c8fbd50… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:08 2012 +0100 d3d10core: Implement d3d10_device_IAGetInputLayout(). --- dlls/d3d10core/device.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0623ee5..3ac02a0 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -548,7 +548,21 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetConstantBuffers(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_IAGetInputLayout(ID3D10Device *iface, ID3D10InputLayout **input_layout) { - FIXME("iface %p, input_layout %p stub!\n", iface, input_layout); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct wined3d_vertex_declaration *wined3d_declaration; + struct d3d10_input_layout *input_layout_impl; + + TRACE("iface %p, input_layout %p.\n", iface, input_layout); + + if (!(wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) + { + *input_layout = NULL; + return; + } + + input_layout_impl = wined3d_vertex_declaration_get_parent(wined3d_declaration); + *input_layout = &input_layout_impl->ID3D10InputLayout_iface; + ID3D10InputLayout_AddRef(*input_layout); } static void STDMETHODCALLTYPE d3d10_device_IAGetVertexBuffers(ID3D10Device *iface,

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXPRTENGINE.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 69f059cdd7c3b14ada563353f257a67cd96f04d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f059cdd7c3b14ada563353f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:07 2012 +0100 d3dx9: Avoid LPD3DXPRTENGINE. --- include/d3dx9mesh.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index e0b8557..a5fc6cc 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -711,7 +711,8 @@ HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *) HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE, UINT, UINT, LPD3DXSHPRTSIMCB, LPVOID, LPD3DXPRTBUFFER, LPD3DXPRTCOMPBUFFER *); HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT width, UINT height, ID3DXMesh *mesh, float gutter_size, ID3DXTextureGutterHelper **gh); -HRESULT WINAPI D3DXCreatePRTEngine(LPD3DXMESH, DWORD *, BOOL, LPD3DXMESH, LPD3DXPRTENGINE *); +HRESULT WINAPI D3DXCreatePRTEngine(ID3DXMesh *mesh, DWORD *adjacency, BOOL extract_uv, + ID3DXMesh *blocker_mesh, ID3DXPRTEngine **engine); HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD flags, struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances, DWORD *material_count, struct ID3DXMesh **mesh);

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXTEXTUREGUTTERHELPER.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 4987196e37cf5b123f9a1b0e014f84d96a6179e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4987196e37cf5b123f9a1b0e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:06 2012 +0100 d3dx9: Avoid LPD3DXTEXTUREGUTTERHELPER. --- include/d3dx9mesh.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 149c199..e0b8557 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -565,7 +565,7 @@ DECLARE_INTERFACE_(ID3DXPRTBuffer, IUnknown) STDMETHOD(UnlockBuffer)(THIS) PURE; STDMETHOD(ScaleBuffer)(THIS_ FLOAT scale) PURE; STDMETHOD(AddBuffer)(THIS_ LPD3DXPRTBUFFER buffer) PURE; - STDMETHOD(AttachGH)(THIS_ LPD3DXTEXTUREGUTTERHELPER) PURE; + STDMETHOD(AttachGH)(THIS_ struct ID3DXTextureGutterHelper *gh) PURE; STDMETHOD(ReleaseGH)(THIS) PURE; STDMETHOD(EvalGH)(THIS) PURE; STDMETHOD(ExtractTexture)(THIS_ UINT channel, UINT start_coefficient, @@ -709,7 +709,8 @@ HRESULT WINAPI D3DXCreatePatchMesh(const D3DXPATCHINFO *patch_info, DWORD patch_ HRESULT WINAPI D3DXCreatePRTBuffer(UINT, UINT, UINT, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE, UINT, UINT, LPD3DXSHPRTSIMCB, LPVOID, LPD3DXPRTBUFFER, LPD3DXPRTCOMPBUFFER *); -HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT, UINT, LPD3DXMESH, FLOAT, LPD3DXTEXTUREGUTTERHELPER *); +HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT width, UINT height, ID3DXMesh *mesh, + float gutter_size, ID3DXTextureGutterHelper **gh); HRESULT WINAPI D3DXCreatePRTEngine(LPD3DXMESH, DWORD *, BOOL, LPD3DXMESH, LPD3DXPRTENGINE *); HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD flags, struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXINCLUDE.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 69eeb35e51d2fc7bbb05af1f69fc2fbb9521e9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=69eeb35e51d2fc7bbb05af1f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:05 2012 +0100 d3dx9: Avoid LPD3DXINCLUDE. --- dlls/d3dx9_36/effect.c | 27 +++++++--------- dlls/d3dx9_36/shader.c | 81 +++++++++++----------------------------------- include/d3dx9effect.h | 45 +++++++------------------- include/d3dx9shader.h | 83 ++++++++++++----------------------------------- 4 files changed, 65 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69eeb35e51d2fc7bbb05a…

1 0

Frédéric Delanoy : ddraw: Return appropriate value for non matching 32 bit pixel format in PixelFormat_DD2WineD3D (coverity).
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 80d30100993013dfdaa32d0e6c938246b5f75cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d30100993013dfdaa32d0e6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 23 19:36:14 2012 +0100 ddraw: Return appropriate value for non matching 32 bit pixel format in PixelFormat_DD2WineD3D (coverity). --- dlls/ddraw/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index d990440..1964452 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -446,6 +446,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat } WARN("32 bit RGB pixel format does not match.\n"); + return WINED3DFMT_UNKNOWN; default: WARN("Invalid dwRGBBitCount in Pixelformat structure.\n");

1 0

André Hentschel : include: Add more CV constants.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 696950b581c2a7650a23b1f462cda79a22e9eb37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=696950b581c2a7650a23b1f46… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 23 16:55:27 2012 +0100 include: Add more CV constants. --- include/cvconst.h | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 139 insertions(+), 5 deletions(-) diff --git a/include/cvconst.h b/include/cvconst.h index 00e64ae..84ff3a0 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -2,6 +2,7 @@ * File cvconst.h - MS debug information * * Copyright (C) 2004, Eric Pouech + * Copyright (C) 2012, André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -132,6 +133,9 @@ enum CV_HREG_e CV_ALLREG_HANDLE = 30007, CV_ALLREG_PARAMS = 30008, CV_ALLREG_LOCALS = 30009, + CV_ALLREG_TID = 30010, + CV_ALLREG_ENV = 30011, + CV_ALLREG_CMDLN = 30012, /* Intel x86 CPU */ CV_REG_NONE = 0, @@ -224,6 +228,33 @@ enum CV_HREG_e CV_REG_MM70 = 250, CV_REG_MM71 = 251, + CV_REG_YMM0 = 252, /* this includes YMM1 to YMM7 */ + CV_REG_YMM0H = 260, /* this includes YMM1H to YMM7H */ + CV_REG_YMM0I0 = 268, /* this includes YMM0I1 to YMM0I3 */ + CV_REG_YMM1I0 = 272, /* this includes YMM1I1 to YMM1I3 */ + CV_REG_YMM2I0 = 276, /* this includes YMM2I1 to YMM2I3 */ + CV_REG_YMM3I0 = 280, /* this includes YMM3I1 to YMM3I3 */ + CV_REG_YMM4I0 = 284, /* this includes YMM4I1 to YMM4I3 */ + CV_REG_YMM5I0 = 288, /* this includes YMM5I1 to YMM5I3 */ + CV_REG_YMM6I0 = 292, /* this includes YMM6I1 to YMM6I3 */ + CV_REG_YMM7I0 = 296, /* this includes YMM7I1 to YMM7I3 */ + CV_REG_YMM0F0 = 300, /* this includes YMM0F1 to YMM0F7 */ + CV_REG_YMM1F0 = 308, /* this includes YMM1F1 to YMM1F7 */ + CV_REG_YMM2F0 = 316, /* this includes YMM2F1 to YMM2F7 */ + CV_REG_YMM3F0 = 324, /* this includes YMM3F1 to YMM3F7 */ + CV_REG_YMM4F0 = 332, /* this includes YMM4F1 to YMM4F7 */ + CV_REG_YMM5F0 = 340, /* this includes YMM5F1 to YMM5F7 */ + CV_REG_YMM6F0 = 348, /* this includes YMM6F1 to YMM6F7 */ + CV_REG_YMM7F0 = 356, /* this includes YMM7F1 to YMM7F7 */ + CV_REG_YMM0D0 = 364, /* this includes YMM0D1 to YMM0D3 */ + CV_REG_YMM1D0 = 368, /* this includes YMM1D1 to YMM1D3 */ + CV_REG_YMM2D0 = 372, /* this includes YMM2D1 to YMM2D3 */ + CV_REG_YMM3D0 = 376, /* this includes YMM3D1 to YMM3D3 */ + CV_REG_YMM4D0 = 380, /* this includes YMM4D1 to YMM4D3 */ + CV_REG_YMM5D0 = 384, /* this includes YMM5D1 to YMM5D3 */ + CV_REG_YMM6D0 = 388, /* this includes YMM6D1 to YMM6D3 */ + CV_REG_YMM7D0 = 392, /* this includes YMM7D1 to YMM7D3 */ + /* Motorola 68K CPU */ CV_R68_D0 = 0, /* this includes D1 to D7 too */ CV_R68_A0 = 8, /* this includes A1 to A7 too */ @@ -287,7 +318,7 @@ enum CV_HREG_e CV_M4_Psr = 51, CV_M4_FltF0 = 60, /* this includes FltF1 to Flt31 */ CV_M4_FltFsr = 92, - + /* Alpha AXP CPU */ CV_ALPHA_NOREG = CV_REG_NONE, CV_ALPHA_FltF0 = 10, /* this includes FltF1 to FltF31 */ @@ -311,7 +342,7 @@ enum CV_HREG_e CV_ALPHA_Psr = 76, CV_ALPHA_FltFsr = 77, CV_ALPHA_SoftFpcr = 78, - + /* Motorola & IBM PowerPC CPU */ CV_PPC_GPR0 = 1, /* this includes GPR1 to GPR31 */ CV_PPC_CR = 33, @@ -321,7 +352,53 @@ enum CV_HREG_e CV_PPC_FPSCR = 74, CV_PPC_MSR = 75, CV_PPC_SR0 = 76, /* this includes SR1 to SR15 */ - /* some PPC registers missing */ + CV_PPC_PC = 99, + CV_PPC_MQ = 100, + CV_PPC_XER = 101, + CV_PPC_RTCU = 104, + CV_PPC_RTCL = 105, + CV_PPC_LR = 108, + CV_PPC_CTR = 109, + CV_PPC_COMPARE = 110, + CV_PPC_COUNT = 111, + CV_PPC_DSISR = 118, + CV_PPC_DAR = 119, + CV_PPC_DEC = 122, + CV_PPC_SDR1 = 125, + CV_PPC_SRR0 = 126, + CV_PPC_SRR1 = 127, + CV_PPC_SPRG0 = 372, /* this includes SPRG1 to SPRG3 */ + CV_PPC_ASR = 280, + CV_PPC_EAR = 382, + CV_PPC_PVR = 287, + CV_PPC_BAT0U = 628, + CV_PPC_BAT0L = 629, + CV_PPC_BAT1U = 630, + CV_PPC_BAT1L = 631, + CV_PPC_BAT2U = 632, + CV_PPC_BAT2L = 633, + CV_PPC_BAT3U = 634, + CV_PPC_BAT3L = 635, + CV_PPC_DBAT0U = 636, + CV_PPC_DBAT0L = 637, + CV_PPC_DBAT1U = 638, + CV_PPC_DBAT1L = 639, + CV_PPC_DBAT2U = 640, + CV_PPC_DBAT2L = 641, + CV_PPC_DBAT3U = 642, + CV_PPC_DBAT3L = 643, + CV_PPC_PMR0 = 1044, /* this includes PMR1 to PMR15 */ + CV_PPC_DMISS = 1076, + CV_PPC_DCMP = 1077, + CV_PPC_HASH1 = 1078, + CV_PPC_HASH2 = 1079, + CV_PPC_IMISS = 1080, + CV_PPC_ICMP = 1081, + CV_PPC_RPA = 1082, + CV_PPC_HID0 = 1108, /* this includes HID1 to HID15 */ + + /* Java */ + CV_JAVA_PC = 1, /* Hitachi SH3 CPU */ CV_SH3_NOREG = CV_REG_NONE, @@ -357,7 +434,29 @@ enum CV_HREG_e CV_ARM_LR = 24, CV_ARM_PC = 25, CV_ARM_CPSR = 26, - + CV_ARM_ACC0 = 27, + CV_ARM_FPSCR = 40, + CV_ARM_FPEXC = 41, + CV_ARM_FS0 = 50, /* this includes FS1 to FS31 */ + CV_ARM_FPEXTRA0 = 90, /* this includes FPEXTRA1 to FPEXTRA7 */ + CV_ARM_WR0 = 128, /* this includes WR1 to WR15 */ + CV_ARM_WCID = 144, + CV_ARM_WCON = 145, + CV_ARM_WCSSF = 146, + CV_ARM_WCASF = 147, + CV_ARM_WC4 = 148, + CV_ARM_WC5 = 149, + CV_ARM_WC6 = 150, + CV_ARM_WC7 = 151, + CV_ARM_WCGR0 = 152, /* this includes WCGR1 to WCGR3 */ + CV_ARM_WC12 = 156, + CV_ARM_WC13 = 157, + CV_ARM_WC14 = 158, + CV_ARM_WC15 = 159, + CV_ARM_FS32 = 200, /* this includes FS33 to FS63 */ + CV_ARM_ND0 = 300, /* this includes ND1 to ND31 */ + CV_ARM_NQ0 = 400, /* this includes NQ1 to NQ15 */ + /* Intel IA64 CPU */ CV_IA64_NOREG = CV_REG_NONE, CV_IA64_Br0 = 512, /* this includes Br1 to Br7 */ @@ -395,7 +494,31 @@ enum CV_HREG_e CV_TRI_EA10 = 55, CV_TRI_EA12 = 56, CV_TRI_EA14 = 57, - /* some TriCode registers missing */ + CV_TRI_PSW = 58, + CV_TRI_PCXI = 59, + CV_TRI_PC = 60, + CV_TRI_FCX = 61, + CV_TRI_LCX = 62, + CV_TRI_ISP = 63, + CV_TRI_ICR = 64, + CV_TRI_BIV = 65, + CV_TRI_BTV = 66, + CV_TRI_SYSCON = 67, + CV_TRI_DPRx_0 = 68, /* includes DPRx_1 to DPRx_3 */ + CV_TRI_CPRx_0 = 68, /* includes CPRx_1 to CPRx_3 */ + CV_TRI_DPMx_0 = 68, /* includes DPMx_1 to DPMx_3 */ + CV_TRI_CPMx_0 = 68, /* includes CPMx_1 to CPMx_3 */ + CV_TRI_DBGSSR = 72, + CV_TRI_EXEVT = 73, + CV_TRI_SWEVT = 74, + CV_TRI_CREVT = 75, + CV_TRI_TRnEVT = 76, + CV_TRI_MMUCON = 77, + CV_TRI_ASI = 78, + CV_TRI_TVA = 79, + CV_TRI_TPA = 80, + CV_TRI_TPX = 81, + CV_TRI_TFA = 82, /* AM33 (and the likes) CPU */ CV_AM33_NOREG = CV_REG_NONE, @@ -403,6 +526,17 @@ enum CV_HREG_e CV_AM33_A0 = 20, /* this includes A1 to A3 */ CV_AM33_D0 = 30, /* this includes D1 to D3 */ CV_AM33_FS0 = 40, /* this includes FS1 to FS31 */ + CV_AM33_SP = 80, + CV_AM33_PC = 81, + CV_AM33_MDR = 82, + CV_AM33_MDRQ = 83, + CV_AM33_MCRH = 84, + CV_AM33_MCRL = 85, + CV_AM33_MCVF = 86, + CV_AM33_EPSW = 87, + CV_AM33_FPCR = 88, + CV_AM33_LIR = 89, + CV_AM33_LAR = 90, /* Mitsubishi M32R CPU */ CV_M32R_NOREG = CV_REG_NONE,

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.18
by Jeremy Newman 26 Nov '12

26 Nov '12

Module: website Branch: master Commit: dd6f1364451259e6f0259568a824e9a773dc5760 URL: http://source.winehq.org/git/website.git/?a=commit;h=dd6f1364451259e6f02595… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Nov 24 09:00:19 2012 +0100 Polish translation for release 1.5.18 --- news/pl/2012112301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2012112301.xml b/news/pl/2012112301.xml new file mode 100644 index 0000000..c73a607 --- /dev/null +++ b/news/pl/2012112301.xml @@ -0,0 +1,17 @@ +<news> +<date>Listopad 23, 2012</date> +<title>Wydano Wine 1.5.18</title> +<body> + Wydanie rozwojowe Wine 1.5.18 jest już dostępne. + <a href="{$root}/announce/1.5.18">Co nowego</a> w tym wydaniu: +<ul> + <li>Rozmaite ulepszenia do kodeków Windowsa.</li> + <li>Poprawki do wsparcia baz danych OLE.</li> + <li>Ulepszenia w zarządzaniu parametrami systemowymi.</li> + <li>Kilka poprawek do wbudowanej przeglądarki sieciowej.</li> + <li>Poprawki we wsparciu XML.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.18.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.18
by Jeremy Newman 26 Nov '12

26 Nov '12

Module: website Branch: master Commit: 36ce3bcb80fa1aa2589adc84dd580f20159a27ec URL: http://source.winehq.org/git/website.git/?a=commit;h=36ce3bcb80fa1aa2589adc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 24 00:57:31 2012 +0100 French translation for release 1.5.18 --- news/fr/2012112301.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2012112301.xml b/news/fr/2012112301.xml new file mode 100644 index 0000000..9f8c085 --- /dev/null +++ b/news/fr/2012112301.xml @@ -0,0 +1,16 @@ +<news> +<date>23 novembre 2012</date> +<title>Sortie de Wine 1.5.18</title> +<body> + La version de développement 1.5.18 de Wine est disponible. + <a href="{$root}/announce/1.5.18">Nouveautés</a> de cette version : +<ul> + <li>Diverses améliorations aux codecs Windows.</li> + <li>Correctifs pour la prise en charge des bases de données OLE.</li> + <li>Améliorations à la gestion des paramètres système.</li> + <li>Quelques correctifs au navigateur Web intégré.</li> + <li>Correctifs dans la prise en charge de XML.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.18.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.5.18 freigegeben
by Jeremy Newman 26 Nov '12

26 Nov '12

Module: website Branch: master Commit: 6c9371547461d6e370e2447167d4e314c4ad8b44 URL: http://source.winehq.org/git/website.git/?a=commit;h=6c9371547461d6e370e244… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 23 22:55:31 2012 +0100 Wine 1.5.18 freigegeben --- news/de/2012112301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012112301.xml b/news/de/2012112301.xml new file mode 100644 index 0000000..0566b31 --- /dev/null +++ b/news/de/2012112301.xml @@ -0,0 +1,17 @@ +<news> +<date>23. November 2012</date> +<title>Wine 1.5.18 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verschiedene Windows Codecs Verbesserungen.</li> + <li>Fehlerbehebungen für die OLE Datenbank Unterstützung.</li> + <li>Verbesserungen am System Parameter Management.</li> + <li>Einige Fehlerbehebungen am eigenen Webbrowser.</li> + <li>Fehlerbehebungen für die XML Unterstützung.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.18.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.18
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: website Branch: master Commit: 9c4c8117b615ff0c4fca13ef5eede8d8890ee53e URL: http://source.winehq.org/git/website.git/?a=commit;h=9c4c8117b615ff0c4fca13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 23 21:29:08 2012 +0100 Wine release 1.5.18 --- news/en/2012112301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012112301.xml b/news/en/2012112301.xml new file mode 100644 index 0000000..eef8dda --- /dev/null +++ b/news/en/2012112301.xml @@ -0,0 +1,17 @@ +<news> +<date>November 23, 2012</date> +<title>Wine 1.5.18 Released</title> +<body> + The Wine development release 1.5.18 is now available. + <a href="{$root}/announce/1.5.18">What's new</a> in this release: +<ul> + <li>Various Windows Codecs improvements.</li> + <li>Fixes for OLE database support.</li> + <li>Improvements to system parameters management.</li> + <li>Some fixes to the built-in Web browser.</li> + <li>Fixes for XML support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.18.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.18 : Alexandre Julliard : Release 1.5.18
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: refs/tags/wine-1.5.18 Tag: a98e8da63f7501ae1bb16a0de9a2ea38a30eaa95 URL: http://source.winehq.org/git/wine.git/?a=tag;h=a98e8da63f7501ae1bb16a0de9a2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 23 21:16:53 2012 +0100 Release 1.5.18

1 0

Alexandre Julliard : Release 1.5.18.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: abbf827178843d3b5988b463b129dc3379f28d7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbf827178843d3b5988b463b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 23 21:16:51 2012 +0100 Release 1.5.18. --- ANNOUNCE | 854 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 422 insertions(+), 452 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abbf827178843d3b5988b…

1 0

Dmitry Timoshkov : windowscodecs: Make GetFrame return WINCODEC_ERR_FRAMEMISSING without an image data.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: a8eaeaf511d6deb1fe025b5893fdfbcb0734e095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8eaeaf511d6deb1fe025b589… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 15:41:33 2012 +0800 windowscodecs: Make GetFrame return WINCODEC_ERR_FRAMEMISSING without an image data. --- dlls/windowscodecs/bmpdecode.c | 2 +- dlls/windowscodecs/gifformat.c | 2 +- dlls/windowscodecs/icoformat.c | 2 +- dlls/windowscodecs/jpegformat.c | 2 +- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/tgaformat.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 1a1ee0a..7b3f82d 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -1124,7 +1124,7 @@ static HRESULT WINAPI BmpDecoder_GetFrame(IWICBitmapDecoder *iface, if (index != 0) return E_INVALIDARG; - if (!This->stream) return WINCODEC_ERR_WRONGSTATE; + if (!This->stream) return WINCODEC_ERR_FRAMEMISSING; *ppIBitmapFrame = &This->IWICBitmapFrameDecode_iface; IWICBitmapDecoder_AddRef(iface); diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index d87a6e7..ce63af9 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1271,7 +1271,7 @@ static HRESULT WINAPI GifDecoder_GetFrame(IWICBitmapDecoder *iface, GifFrameDecode *result; TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); - if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + if (!This->initialized) return WINCODEC_ERR_FRAMEMISSING; if (index >= This->gif->ImageCount) return E_INVALIDARG; diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 4e83ec0..6b454c2 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -631,7 +631,7 @@ static HRESULT WINAPI IcoDecoder_GetFrame(IWICBitmapDecoder *iface, if (!This->initialized) { - hr = WINCODEC_ERR_NOTINITIALIZED; + hr = WINCODEC_ERR_FRAMEMISSING; goto fail; } diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 2c77d4f..eab50f0 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -440,7 +440,7 @@ static HRESULT WINAPI JpegDecoder_GetFrame(IWICBitmapDecoder *iface, JpegDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); - if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + if (!This->initialized) return WINCODEC_ERR_FRAMEMISSING; if (index != 0) return E_INVALIDARG; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 6d6117e..4c94489 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -650,7 +650,7 @@ static HRESULT WINAPI PngDecoder_GetFrame(IWICBitmapDecoder *iface, PngDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); - if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + if (!This->initialized) return WINCODEC_ERR_FRAMEMISSING; if (index != 0) return E_INVALIDARG; diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index eac3406..cd615c7 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -415,7 +415,7 @@ static HRESULT WINAPI TgaDecoder_GetFrame(IWICBitmapDecoder *iface, TgaDecoder *This = impl_from_IWICBitmapDecoder(iface); TRACE("(%p,%p)\n", iface, ppIBitmapFrame); - if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + if (!This->initialized) return WINCODEC_ERR_FRAMEMISSING; if (index != 0) return E_INVALIDARG;

1 0

Dmitry Timoshkov : windowscodecs: Add a test to show that QueryCapability initializes the decoder.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 37892c2f282794377a6b04386a42d42957908464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37892c2f282794377a6b04386… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 15:40:37 2012 +0800 windowscodecs: Add a test to show that QueryCapability initializes the decoder. --- dlls/windowscodecs/tests/tiffformat.c | 12 ++++++++++++ dlls/windowscodecs/tiffformat.c | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index d8cb10a..f32f6a5 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -185,6 +185,7 @@ static void test_QueryCapability(void) HRESULT hr; IStream *stream; IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; static const DWORD exp_caps = WICBitmapDecoderCapabilityCanDecodeAllImages | WICBitmapDecoderCapabilityCanDecodeSomeImages | WICBitmapDecoderCapabilityCanEnumerateMetadata; @@ -206,6 +207,9 @@ static void test_QueryCapability(void) ok(hr == S_OK || broken(hr == E_POINTER) /* XP */, "GetFrameCount error %#x\n", hr); ok(frame_count == 0, "expected 0, got %u\n", frame_count); + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == WINCODEC_ERR_FRAMEMISSING || broken(hr == E_POINTER) /* XP */, "expected WINCODEC_ERR_FRAMEMISSING, got %#x\n", hr); + pos.QuadPart = 4; hr = IStream_Seek(stream, pos, SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek error %#x\n", hr); @@ -221,6 +225,10 @@ static void test_QueryCapability(void) ok(hr == S_OK, "GetFrameCount error %#x\n", hr); ok(frame_count == 1, "expected 1, got %u\n", frame_count); + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + IWICBitmapFrameDecode_Release(frame); + pos.QuadPart = 0; hr = IStream_Seek(stream, pos, SEEK_CUR, &cur_pos); ok(hr == S_OK, "IStream_Seek error %#x\n", hr); @@ -251,6 +259,10 @@ todo_wine ok(hr == S_OK, "GetFrameCount error %#x\n", hr); ok(frame_count == 1, "expected 1, got %u\n", frame_count); + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + IWICBitmapFrameDecode_Release(frame); + hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnDemand); ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index bacc9c5..6c29bab 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -702,7 +702,7 @@ static HRESULT WINAPI TiffDecoder_GetFrame(IWICBitmapDecoder *iface, TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); if (!This->tiff) - return WINCODEC_ERR_WRONGSTATE; + return WINCODEC_ERR_FRAMEMISSING; EnterCriticalSection(&This->lock); res = pTIFFSetDirectory(This->tiff, index);

1 0

Jacek Caban : wininet: Use generic ReadFileEx entry in InternetReadFileExA and get rid of ReadFileExA entry .
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 5554292284db0bb5e7815a5c0419983689547984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5554292284db0bb5e7815a5c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 23 15:18:52 2012 +0100 wininet: Use generic ReadFileEx entry in InternetReadFileExA and get rid of ReadFileExA entry. --- dlls/wininet/ftp.c | 8 ---- dlls/wininet/http.c | 106 +---------------------------------------------- dlls/wininet/internet.c | 11 ++++- dlls/wininet/internet.h | 7 --- 4 files changed, 10 insertions(+), 122 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 4233bb3..f816898 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1201,12 +1201,6 @@ static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW return error; } -static DWORD FTPFILE_ReadFileExA(object_header_t *hdr, INTERNET_BUFFERSA *buffers, - DWORD flags, DWORD_PTR context) -{ - return FTPFILE_ReadFile(hdr, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength); -} - static DWORD FTPFILE_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_size, DWORD flags, DWORD_PTR context) { @@ -1299,7 +1293,6 @@ static const object_vtbl_t FTPFILEVtbl = { FTPFILE_QueryOption, INET_SetOption, FTPFILE_ReadFile, - FTPFILE_ReadFileExA, FTPFILE_ReadFileEx, FTPFILE_WriteFile, FTPFILE_QueryDataAvailable, @@ -3479,7 +3472,6 @@ static const object_vtbl_t FTPFINDNEXTVtbl = { NULL, NULL, NULL, - NULL, FTPFINDNEXT_FindNextFileW }; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c4a98e5..383b907 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2877,107 +2877,6 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW return res; } -static void HTTPREQ_AsyncReadFileExAProc(WORKREQUEST *workRequest) -{ - struct WORKREQ_INTERNETREADFILEEXA const *data = &workRequest->u.InternetReadFileExA; - http_request_t *req = (http_request_t*)workRequest->hdr; - DWORD res; - - TRACE("INTERNETREADFILEEXA %p\n", workRequest->hdr); - - res = HTTPREQ_Read(req, data->lpBuffersOut->lpvBuffer, - data->lpBuffersOut->dwBufferLength, &data->lpBuffersOut->dwBufferLength, TRUE); - - send_request_complete(req, res == ERROR_SUCCESS, res); -} - -static DWORD HTTPREQ_ReadFileExA(object_header_t *hdr, INTERNET_BUFFERSA *buffers, - DWORD flags, DWORD_PTR context) -{ - http_request_t *req = (http_request_t*)hdr; - DWORD res, size, read, error = ERROR_SUCCESS; - - if (flags & ~(IRF_ASYNC|IRF_NO_WAIT)) - FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT)); - - if (buffers->dwStructSize != sizeof(*buffers)) - return ERROR_INVALID_PARAMETER; - - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - - if (hdr->dwFlags & INTERNET_FLAG_ASYNC) - { - WORKREQUEST workRequest; - - if (TryEnterCriticalSection( &req->read_section )) - { - if (get_avail_data(req)) - { - res = HTTPREQ_Read(req, buffers->lpvBuffer, buffers->dwBufferLength, - &buffers->dwBufferLength, FALSE); - size = buffers->dwBufferLength; - LeaveCriticalSection( &req->read_section ); - goto done; - } - LeaveCriticalSection( &req->read_section ); - } - - workRequest.asyncproc = HTTPREQ_AsyncReadFileExAProc; - workRequest.hdr = WININET_AddRef(&req->hdr); - workRequest.u.InternetReadFileExA.lpBuffersOut = buffers; - - INTERNET_AsyncCall(&workRequest); - - return ERROR_IO_PENDING; - } - - read = 0; - size = buffers->dwBufferLength; - - EnterCriticalSection( &req->read_section ); - if(hdr->dwError == ERROR_SUCCESS) - hdr->dwError = INTERNET_HANDLE_IN_USE; - else if(hdr->dwError == INTERNET_HANDLE_IN_USE) - hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; - - while(1) { - res = HTTPREQ_Read(req, (char*)buffers->lpvBuffer+read, size-read, - &buffers->dwBufferLength, !(flags & IRF_NO_WAIT)); - if(res != ERROR_SUCCESS) - break; - - read += buffers->dwBufferLength; - if(read == size || end_of_read_data(req)) - break; - - LeaveCriticalSection( &req->read_section ); - - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, - &buffers->dwBufferLength, sizeof(buffers->dwBufferLength)); - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, - INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); - - EnterCriticalSection( &req->read_section ); - } - - if(hdr->dwError == INTERNET_HANDLE_IN_USE) - hdr->dwError = ERROR_SUCCESS; - else - error = hdr->dwError; - - LeaveCriticalSection( &req->read_section ); - size = buffers->dwBufferLength; - buffers->dwBufferLength = read; - -done: - if (res == ERROR_SUCCESS) { - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, - &size, sizeof(size)); - } - - return res==ERROR_SUCCESS ? error : res; -} - static void HTTPREQ_AsyncReadFileExWProc(WORKREQUEST *workRequest) { struct WORKREQ_HTTPREADFILEEX const *data = &workRequest->u.HttpReadFileEx; @@ -2991,7 +2890,7 @@ static void HTTPREQ_AsyncReadFileExWProc(WORKREQUEST *workRequest) send_request_complete(req, res == ERROR_SUCCESS, res); } -static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_read, +static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_read, DWORD flags, DWORD_PTR context) { @@ -3144,8 +3043,7 @@ static const object_vtbl_t HTTPREQVtbl = { HTTPREQ_QueryOption, HTTPREQ_SetOption, HTTPREQ_ReadFile, - HTTPREQ_ReadFileExA, - HTTPREQ_ReadFileExW, + HTTPREQ_ReadFileEx, HTTPREQ_WriteFile, HTTPREQ_QueryDataAvailable, NULL diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 48fe41d..88fe037 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -927,7 +927,6 @@ static const object_vtbl_t APPINFOVtbl = { NULL, NULL, NULL, - NULL, NULL }; @@ -2237,14 +2236,20 @@ BOOL WINAPI InternetReadFileExA(HINTERNET hFile, LPINTERNET_BUFFERSA lpBuffersOu TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffersOut, dwFlags, dwContext); + if (lpBuffersOut->dwStructSize != sizeof(*lpBuffersOut)) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + hdr = get_handle_object(hFile); if (!hdr) { INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if(hdr->vtbl->ReadFileExA) - res = hdr->vtbl->ReadFileExA(hdr, lpBuffersOut, dwFlags, dwContext); + if(hdr->vtbl->ReadFileEx) + res = hdr->vtbl->ReadFileEx(hdr, lpBuffersOut->lpvBuffer, lpBuffersOut->dwBufferLength, + &lpBuffersOut->dwBufferLength, dwFlags, dwContext); WININET_Release(hdr); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 4e25a93..10002d4 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -233,7 +233,6 @@ typedef struct { DWORD (*QueryOption)(object_header_t*,DWORD,void*,DWORD*,BOOL); DWORD (*SetOption)(object_header_t*,DWORD,void*,DWORD); DWORD (*ReadFile)(object_header_t*,void*,DWORD,DWORD*); - DWORD (*ReadFileExA)(object_header_t*,INTERNET_BUFFERSA*,DWORD,DWORD_PTR); DWORD (*ReadFileEx)(object_header_t*,void*,DWORD,DWORD*,DWORD,DWORD_PTR); DWORD (*WriteFile)(object_header_t*,const void*,DWORD,DWORD*); DWORD (*QueryDataAvailable)(object_header_t*,DWORD*,DWORD,DWORD_PTR); @@ -462,11 +461,6 @@ struct WORKREQ_INTERNETOPENURLW DWORD_PTR dwContext; }; -struct WORKREQ_INTERNETREADFILEEXA -{ - LPINTERNET_BUFFERSA lpBuffersOut; -}; - struct WORKREQ_HTTPREADFILEEX { void *buf; @@ -495,7 +489,6 @@ typedef struct WORKREQ struct WORKREQ_HTTPENDREQUESTW HttpEndRequestW; struct WORKREQ_SENDCALLBACK SendCallback; struct WORKREQ_INTERNETOPENURLW InternetOpenUrlW; - struct WORKREQ_INTERNETREADFILEEXA InternetReadFileExA; struct WORKREQ_HTTPREADFILEEX HttpReadFileEx; } u;

1 0

Jacek Caban : wininet: Don't take INTERNET_BUFFERSW as argument in object' s ReadFileEx entry.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 52144829d143a52ae868a590bd6ba7a764be1dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=52144829d143a52ae868a590b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 23 15:18:31 2012 +0100 wininet: Don't take INTERNET_BUFFERSW as argument in object's ReadFileEx entry. --- dlls/wininet/ftp.c | 6 +++--- dlls/wininet/http.c | 33 +++++++++++++-------------------- dlls/wininet/internet.c | 10 ++++++++-- dlls/wininet/internet.h | 10 ++++++---- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 54dd655..4233bb3 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1207,10 +1207,10 @@ static DWORD FTPFILE_ReadFileExA(object_header_t *hdr, INTERNET_BUFFERSA *buffer return FTPFILE_ReadFile(hdr, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength); } -static DWORD FTPFILE_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffers, +static DWORD FTPFILE_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_size, DWORD flags, DWORD_PTR context) { - return FTPFILE_ReadFile(hdr, buffers->lpvBuffer, buffers->dwBufferLength, &buffers->dwBufferLength); + return FTPFILE_ReadFile(hdr, buf, size, ret_size); } static DWORD FTPFILE_WriteFile(object_header_t *hdr, const void *buffer, DWORD size, DWORD *written) @@ -1300,7 +1300,7 @@ static const object_vtbl_t FTPFILEVtbl = { INET_SetOption, FTPFILE_ReadFile, FTPFILE_ReadFileExA, - FTPFILE_ReadFileExW, + FTPFILE_ReadFileEx, FTPFILE_WriteFile, FTPFILE_QueryDataAvailable, NULL diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 39978b2..c4a98e5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2980,31 +2980,27 @@ done: static void HTTPREQ_AsyncReadFileExWProc(WORKREQUEST *workRequest) { - struct WORKREQ_INTERNETREADFILEEXW const *data = &workRequest->u.InternetReadFileExW; + struct WORKREQ_HTTPREADFILEEX const *data = &workRequest->u.HttpReadFileEx; http_request_t *req = (http_request_t*)workRequest->hdr; DWORD res; TRACE("INTERNETREADFILEEXW %p\n", workRequest->hdr); - res = HTTPREQ_Read(req, data->lpBuffersOut->lpvBuffer, - data->lpBuffersOut->dwBufferLength, &data->lpBuffersOut->dwBufferLength, TRUE); + res = HTTPREQ_Read(req, data->buf, data->size, data->ret_read, TRUE); send_request_complete(req, res == ERROR_SUCCESS, res); } -static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffers, +static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_read, DWORD flags, DWORD_PTR context) { http_request_t *req = (http_request_t*)hdr; - DWORD res, size, read, error = ERROR_SUCCESS; + DWORD res, read, cread, error = ERROR_SUCCESS; if (flags & ~(IRF_ASYNC|IRF_NO_WAIT)) FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT)); - if (buffers->dwStructSize != sizeof(*buffers)) - return ERROR_INVALID_PARAMETER; - INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); if (hdr->dwFlags & INTERNET_FLAG_ASYNC) @@ -3015,9 +3011,7 @@ static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer { if (get_avail_data(req)) { - res = HTTPREQ_Read(req, buffers->lpvBuffer, buffers->dwBufferLength, - &buffers->dwBufferLength, FALSE); - size = buffers->dwBufferLength; + res = HTTPREQ_Read(req, buf, size, &read, FALSE); LeaveCriticalSection( &req->read_section ); goto done; } @@ -3026,7 +3020,9 @@ static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer workRequest.asyncproc = HTTPREQ_AsyncReadFileExWProc; workRequest.hdr = WININET_AddRef(&req->hdr); - workRequest.u.InternetReadFileExW.lpBuffersOut = buffers; + workRequest.u.HttpReadFileEx.buf = buf; + workRequest.u.HttpReadFileEx.size = size; + workRequest.u.HttpReadFileEx.ret_read = ret_read; INTERNET_AsyncCall(&workRequest); @@ -3034,7 +3030,6 @@ static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer } read = 0; - size = buffers->dwBufferLength; EnterCriticalSection( &req->read_section ); if(hdr->dwError == ERROR_SUCCESS) @@ -3043,19 +3038,18 @@ static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; while(1) { - res = HTTPREQ_Read(req, (char*)buffers->lpvBuffer+read, size-read, - &buffers->dwBufferLength, !(flags & IRF_NO_WAIT)); + res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread, !(flags & IRF_NO_WAIT)); if(res != ERROR_SUCCESS) break; - read += buffers->dwBufferLength; + read += cread; if(read == size || end_of_read_data(req)) break; LeaveCriticalSection( &req->read_section ); INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, - &buffers->dwBufferLength, sizeof(buffers->dwBufferLength)); + &cread, sizeof(cread)); INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); @@ -3068,13 +3062,12 @@ static DWORD HTTPREQ_ReadFileExW(object_header_t *hdr, INTERNET_BUFFERSW *buffer error = hdr->dwError; LeaveCriticalSection( &req->read_section ); - size = buffers->dwBufferLength; - buffers->dwBufferLength = read; done: + *ret_read = read; if (res == ERROR_SUCCESS) { INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, - &size, sizeof(size)); + &read, sizeof(read)); } return res==ERROR_SUCCESS ? error : res; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 8d610c3..48fe41d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2269,14 +2269,20 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffer, dwFlags, dwContext); + if (lpBuffer->dwStructSize != sizeof(*lpBuffer)) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + hdr = get_handle_object(hFile); if (!hdr) { INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if(hdr->vtbl->ReadFileExW) - res = hdr->vtbl->ReadFileExW(hdr, lpBuffer, dwFlags, dwContext); + if(hdr->vtbl->ReadFileEx) + res = hdr->vtbl->ReadFileEx(hdr, lpBuffer->lpvBuffer, lpBuffer->dwBufferLength, &lpBuffer->dwBufferLength, + dwFlags, dwContext); WININET_Release(hdr); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 09db338..4e25a93 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -234,7 +234,7 @@ typedef struct { DWORD (*SetOption)(object_header_t*,DWORD,void*,DWORD); DWORD (*ReadFile)(object_header_t*,void*,DWORD,DWORD*); DWORD (*ReadFileExA)(object_header_t*,INTERNET_BUFFERSA*,DWORD,DWORD_PTR); - DWORD (*ReadFileExW)(object_header_t*,INTERNET_BUFFERSW*,DWORD,DWORD_PTR); + DWORD (*ReadFileEx)(object_header_t*,void*,DWORD,DWORD*,DWORD,DWORD_PTR); DWORD (*WriteFile)(object_header_t*,const void*,DWORD,DWORD*); DWORD (*QueryDataAvailable)(object_header_t*,DWORD*,DWORD,DWORD_PTR); DWORD (*FindNextFileW)(object_header_t*,void*); @@ -467,9 +467,11 @@ struct WORKREQ_INTERNETREADFILEEXA LPINTERNET_BUFFERSA lpBuffersOut; }; -struct WORKREQ_INTERNETREADFILEEXW +struct WORKREQ_HTTPREADFILEEX { - LPINTERNET_BUFFERSW lpBuffersOut; + void *buf; + DWORD size; + DWORD *ret_read; }; typedef struct WORKREQ @@ -494,7 +496,7 @@ typedef struct WORKREQ struct WORKREQ_SENDCALLBACK SendCallback; struct WORKREQ_INTERNETOPENURLW InternetOpenUrlW; struct WORKREQ_INTERNETREADFILEEXA InternetReadFileExA; - struct WORKREQ_INTERNETREADFILEEXW InternetReadFileExW; + struct WORKREQ_HTTPREADFILEEX HttpReadFileEx; } u; } WORKREQUEST, *LPWORKREQUEST;

1 0

Nikolay Sivov : include: Added error codes enum, cleanup existing enums.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 9cf630fc9809e96a7ba5a0427ad1b4eafad47c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf630fc9809e96a7ba5a0427… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 23 10:31:16 2012 -0500 include: Added error codes enum, cleanup existing enums. --- include/xmllite.idl | 156 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 123 insertions(+), 33 deletions(-) diff --git a/include/xmllite.idl b/include/xmllite.idl index 9bf406c..c1c0b88 100644 --- a/include/xmllite.idl +++ b/include/xmllite.idl @@ -79,45 +79,135 @@ interface IXmlReader : IUnknown } /* IXmlReader state */ -cpp_quote("typedef enum XmlReadState") -cpp_quote("{") -cpp_quote(" XmlReadState_Initial = 0,") -cpp_quote(" XmlReadState_Interactive = 1,") -cpp_quote(" XmlReadState_Error = 2,") -cpp_quote(" XmlReadState_EndOfFile = 3,") -cpp_quote(" XmlReadState_Closed = 4") -cpp_quote("} XmlReadState;") +typedef enum XmlReadState +{ + XmlReadState_Initial, + XmlReadState_Interactive, + XmlReadState_Error, + XmlReadState_EndOfFile, + XmlReadState_Closed +} XmlReadState; /* conformance levels */ -cpp_quote("typedef enum XmlConformanceLevel") -cpp_quote("{") -cpp_quote(" XmlConformanceLevel_Auto = 0,") -cpp_quote(" XmlConformanceLevel_Fragment = 1,") -cpp_quote(" XmlConformanceLevel_Document = 2,") -cpp_quote(" _XmlConformanceLevel_Last = 2") -cpp_quote("} XmlConformanceLevel;") +typedef enum XmlConformanceLevel +{ + XmlConformanceLevel_Auto, + XmlConformanceLevel_Fragment, + XmlConformanceLevel_Document, + _XmlConformanceLevel_Last = XmlConformanceLevel_Document +} XmlConformanceLevel; /* DTD processing mode */ -cpp_quote("typedef enum DtdProcessing") -cpp_quote("{") -cpp_quote(" DtdProcessing_Prohibit = 0,") -cpp_quote(" DtdProcessing_Parse = DtdProcessing_Prohibit + 1,") -cpp_quote(" _DtdProcessing_Last = DtdProcessing_Parse") -cpp_quote("} DtdProcessing;") +typedef enum DtdProcessing +{ + DtdProcessing_Prohibit, + DtdProcessing_Parse, + _DtdProcessing_Last = DtdProcessing_Parse +} DtdProcessing; /* IXmlReader properties */ -cpp_quote("typedef enum XmlReaderProperty") -cpp_quote("{") -cpp_quote(" XmlReaderProperty_MultiLanguage = 0,") -cpp_quote(" XmlReaderProperty_ConformanceLevel = XmlReaderProperty_MultiLanguage + 1,") -cpp_quote(" XmlReaderProperty_RandomAccess = XmlReaderProperty_ConformanceLevel + 1,") -cpp_quote(" XmlReaderProperty_XmlResolver = XmlReaderProperty_RandomAccess + 1,") -cpp_quote(" XmlReaderProperty_DtdProcessing = XmlReaderProperty_XmlResolver + 1,") -cpp_quote(" XmlReaderProperty_ReadState = XmlReaderProperty_DtdProcessing + 1,") -cpp_quote(" XmlReaderProperty_MaxElementDepth = XmlReaderProperty_ReadState + 1,") -cpp_quote(" XmlReaderProperty_MaxEntityExpansion = XmlReaderProperty_MaxElementDepth + 1,") -cpp_quote(" _XmlReaderProperty_Last = XmlReaderProperty_MaxEntityExpansion") -cpp_quote("} XmlReaderProperty;") +typedef enum XmlReaderProperty +{ + XmlReaderProperty_MultiLanguage, + XmlReaderProperty_ConformanceLevel, + XmlReaderProperty_RandomAccess, + XmlReaderProperty_XmlResolver, + XmlReaderProperty_DtdProcessing, + XmlReaderProperty_ReadState, + XmlReaderProperty_MaxElementDepth, + XmlReaderProperty_MaxEntityExpansion, + _XmlReaderProperty_Last = XmlReaderProperty_MaxEntityExpansion +} XmlReaderProperty; + +/* reader error codes */ +typedef enum XmlError +{ + MX_E_MX = 0xc00cee00, + MX_E_INPUTEND, + MX_E_ENCODING, + MX_E_ENCODINGSWITCH, + MX_E_ENCODINGSIGNATURE, + WC_E_WC = 0xc00cee20, + WC_E_WHITESPACE, + WC_E_SEMICOLON, + WC_E_GREATERTHAN, + WC_E_QUOTE, + WC_E_EQUAL, + WC_E_LESSTHAN, + WC_E_HEXDIGIT, + WC_E_DIGIT, + WC_E_LEFTBRACKET, + WC_E_LEFTPAREN, + WC_E_XMLCHARACTER, + WC_E_NAMECHARACTER, + WC_E_SYNTAX, + WC_E_CDSECT, + WC_E_COMMENT, + WC_E_CONDSECT, + WC_E_DECLATTLIST, + WC_E_DECLDOCTYPE, + WC_E_DECLELEMENT, + WC_E_DECLENTITY, + WC_E_DECLNOTATION, + WC_E_NDATA, + WC_E_PUBLIC, + WC_E_SYSTEM, + WC_E_NAME, + WC_E_ROOTELEMENT, + WC_E_ELEMENTMATCH, + WC_E_UNIQUEATTRIBUTE, + WC_E_TEXTXMLDECL, + WC_E_LEADINGXML, + WC_E_TEXTDECL, + WC_E_XMLDECL, + WC_E_ENCNAME, + WC_E_PUBLICID, + WC_E_PESINTERNALSUBSET, + WC_E_PESBETWEENDECLS, + WC_E_NORECURSION, + WC_E_ENTITYCONTENT, + WC_E_UNDECLAREDENTITY, + WC_E_PARSEDENTITY, + WC_E_NOEXTERNALENTITYREF, + WC_E_PI, + WC_E_SYSTEMID, + WC_E_QUESTIONMARK, + WC_E_CDSECTEND, + WC_E_MOREDATA, + WC_E_DTDPROHIBITED, + WC_E_INVALIDXMLSPACE, + NC_E_NC = 0xc00cee60, + NC_E_QNAMECHARACTER, + NC_E_QNAMECOLON, + NC_E_NAMECOLON, + NC_E_DECLAREDPREFIX, + NC_E_UNDECLAREDPREFIX, + NC_E_EMPTYURI, + NC_E_XMLPREFIXRESERVED, + NC_E_XMLNSPREFIXRESERVED, + NC_E_XMLURIRESERVED, + NC_E_XMLNSURIRESERVED, + SC_E_SC = 0xc00cee80, + SC_E_MAXELEMENTDEPTH, + SC_E_MAXENTITYEXPANSION, + WR_E_WR = 0xc00cef00, + WR_E_NONWHITESPACE, + WR_E_NSPREFIXDECLARED, + WR_E_NSPREFIXWITHEMPTYNSURI, + WR_E_DUPLICATEATTRIBUTE, + WR_E_XMLNSPREFIXDECLARATION, + WR_E_XMLPREFIXDECLARATION, + WR_E_XMLURIDECLARATION, + WR_E_XMLNSURIDECLARATION, + WR_E_NAMESPACEUNDECLARED, + WR_E_INVALIDXMLSPACE, + WR_E_INVALIDACTION, + WR_E_INVALIDSURROGATEPAIR, + XML_E_INVALID_DECIMAL = 0xc00ce01d, + XML_E_INVALID_HEXIDECIMAL, + XML_E_INVALID_UNICODE, + XML_E_INVALIDENCODING = 0xc00ce06e +} XmlError; /* IXmlReader construction */ cpp_quote("STDAPI CreateXmlReader(REFIID riid, void **ppvObject, IMalloc *pMalloc);")

1 0

Alexandre Julliard : widl: Print large enum constants in hex.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 756d33ddae316c71b1241e7c8684c07cd82b9e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756d33ddae316c71b1241e7c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 23 17:39:55 2012 +0100 widl: Print large enum constants in hex. --- tools/widl/parser.y | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 616a538..9c2281f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -620,7 +620,10 @@ enum_list: enum { if (!$1->eval) | enum_list ',' enum { if (!$3->eval) { var_t *last = LIST_ENTRY( list_tail($$), var_t, entry ); - $3->eval = make_exprl(EXPR_NUM, last->eval->cval + 1); + enum expr_type type = EXPR_NUM; + if (last->eval->type == EXPR_HEXNUM) type = EXPR_HEXNUM; + if (last->eval->cval + 1 < 0) type = EXPR_HEXNUM; + $3->eval = make_exprl(type, last->eval->cval + 1); } $$ = append_var( $1, $3 ); }

1 0

Christian Costa : cabinet: Simplify concatenation of path and filename.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: db497bdc44f7ab1da6e2b996e33df57478fb8bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db497bdc44f7ab1da6e2b996e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Nov 22 10:08:00 2012 +0100 cabinet: Simplify concatenation of path and filename. --- dlls/cabinet/fdi.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 2680e72..d36178d 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2479,7 +2479,6 @@ BOOL __cdecl FDICopy( FDICABINETINFO fdici; FDINOTIFICATION fdin; INT_PTR cabhf, filehf = 0; - int idx; unsigned int i; char fullpath[MAX_PATH]; size_t pathlen, filenamelen; @@ -2503,8 +2502,8 @@ BOOL __cdecl FDICopy( } ZeroMemory(decomp_state, sizeof(fdi_decomp_state)); - pathlen = (pszCabPath) ? strlen(pszCabPath) : 0; - filenamelen = (pszCabinet) ? strlen(pszCabinet) : 0; + pathlen = pszCabPath ? strlen(pszCabPath) : 0; + filenamelen = pszCabinet ? strlen(pszCabinet) : 0; /* slight overestimation here to save CPU cycles in the developer's brain */ if ((pathlen + filenamelen + 3) > MAX_PATH) { @@ -2515,12 +2514,11 @@ BOOL __cdecl FDICopy( } /* paste the path and filename together */ - idx = 0; - if (pathlen) { - for (i = 0; i < pathlen; i++) fullpath[idx++] = pszCabPath[i]; - } - if (filenamelen) for (i = 0; i < filenamelen; i++) fullpath[idx++] = pszCabinet[i]; - fullpath[idx] = '\0'; + fullpath[0] = '\0'; + if (pathlen) + strcpy(fullpath, pszCabPath); + if (filenamelen) + strcat(fullpath, pszCabinet); TRACE("full cab path/file name: %s\n", debugstr_a(fullpath)); @@ -2540,7 +2538,7 @@ BOOL __cdecl FDICopy( fdi->close(cabhf); return FALSE; } - + /* cabinet notification */ ZeroMemory(&fdin, sizeof(FDINOTIFICATION)); fdin.setID = fdici.setID;

1 0

Christian Costa : amstream: Initialize correctly AM_MEDIA_TYPE struct.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 56c0151f6d9b078c79b95ffdf41fa0b9cc0892b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c0151f6d9b078c79b95ffdf… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Nov 16 16:46:07 2012 +0100 amstream: Initialize correctly AM_MEDIA_TYPE struct. --- dlls/amstream/mediastreamfilter.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 9b2bd8e..3c0777c 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -132,6 +132,9 @@ static HRESULT WINAPI BasePinImp_GetMediaType(BasePin *This, int index, AM_MEDIA MSPID purpose_id; int i; + /* FIXME: Reset structure as we only fill majortype and minortype for now */ + ZeroMemory(amt, sizeof(*amt)); + /* Find which stream is associated with the pin */ for (i = 0; i < filter->nb_streams; i++) if (&This->IPin_iface == filter->pins[i])

1 0

Christian Costa : strmbase: Simplify IEnumMediaTypesImpl_QueryInterface and turn FIXME into WARN.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 3070dcee3b05e3124eae522fa210ec728b6bac21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3070dcee3b05e3124eae522fa… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Nov 23 09:47:05 2012 +0100 strmbase: Simplify IEnumMediaTypesImpl_QueryInterface and turn FIXME into WARN. --- dlls/strmbase/mediatype.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index a168755..d100cc9 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -145,24 +145,21 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e return S_OK; } -static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface, REFIID riid, void ** ret_iface) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IEnumMediaTypes)) - *ppv = iface; - - if (*ppv) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IEnumMediaTypes)) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IEnumMediaTypes_AddRef(iface); + *ret_iface = iface; return S_OK; } - FIXME("No interface for %s!\n", debugstr_guid(riid)); + *ret_iface = NULL; + + WARN("No interface for %s\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Christian Costa : strmbase: Display iface in TRACEs.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 9bde31b3eeec1d42fcc0c5d73ae6dbad883d644a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bde31b3eeec1d42fcc0c5d73… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Nov 23 09:46:58 2012 +0100 strmbase: Display iface in TRACEs. --- dlls/strmbase/mediatype.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 82c7d23..a168755 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -147,7 +147,7 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface, REFIID riid, LPVOID * ppv) { - TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); *ppv = NULL; @@ -201,12 +201,13 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cM ULONG cFetched; IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); + TRACE("(%p)->(%u, %p, %p)\n", iface, cMediaTypes, ppMediaTypes, pcFetched); + cFetched = min(This->enumMediaDetails.cMediaTypes, This->uIndex + cMediaTypes) - This->uIndex; if (This->currentVersion != This->mediaVersionFunction(This->basePin)) return VFW_E_ENUM_OUT_OF_SYNC; - TRACE("(%u, %p, %p)\n", cMediaTypes, ppMediaTypes, pcFetched); TRACE("Next uIndex: %u, cFetched: %u\n", This->uIndex, cFetched); if (cFetched > 0) @@ -236,7 +237,8 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes * iface, ULONG cM { IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - TRACE("(%u)\n", cMediaTypes); + TRACE("(%p)->(%u)\n", iface, cMediaTypes); + if (This->currentVersion != This->mediaVersionFunction(This->basePin)) return VFW_E_ENUM_OUT_OF_SYNC; @@ -254,7 +256,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) AM_MEDIA_TYPE amt; IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - TRACE("()\n"); + TRACE("(%p)->()\n", iface); for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]); @@ -288,7 +290,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Clone(IEnumMediaTypes * iface, IEnumMe HRESULT hr; IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - TRACE("(%p)\n", ppEnum); + TRACE("(%p)->(%p)\n", iface, ppEnum); hr = EnumMediaTypes_Construct(This->basePin, This->enumMediaFunction, This->mediaVersionFunction, ppEnum); if (FAILED(hr))

1 0

Christian Costa : strmbase: Display new ref in AddRef and Release for IEnumMediaTypes.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 930c9dd972f3ee22c1fba104565fbf9762b1798d URL: http://source.winehq.org/git/wine.git/?a=commit;h=930c9dd972f3ee22c1fba1045… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Nov 23 09:46:50 2012 +0100 strmbase: Display new ref in AddRef and Release for IEnumMediaTypes. --- dlls/strmbase/mediatype.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index fef2739..82c7d23 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -170,21 +170,21 @@ static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface static ULONG WINAPI IEnumMediaTypesImpl_AddRef(IEnumMediaTypes * iface) { IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - ULONG refCount = InterlockedIncrement(&This->refCount); + ULONG ref = InterlockedIncrement(&This->refCount); - TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - return refCount; + return ref; } static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) { IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - ULONG refCount = InterlockedDecrement(&This->refCount); + ULONG ref = InterlockedDecrement(&This->refCount); - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", iface, ref); - if (!refCount) + if (!ref) { ULONG i; for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) @@ -193,7 +193,7 @@ static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) IPin_Release(&This->basePin->IPin_iface); CoTaskMemFree(This); } - return refCount; + return ref; } static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cMediaTypes, AM_MEDIA_TYPE ** ppMediaTypes, ULONG * pcFetched)

1 0

Andrew Talbot : cryptdll: Remove unused variable.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 6b43027c7e9cb6a5d1bb3a7f675d1d7400f68347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b43027c7e9cb6a5d1bb3a7f6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 21:01:54 2012 +0000 cryptdll: Remove unused variable. --- dlls/cryptdll/cryptdll.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/cryptdll/cryptdll.c b/dlls/cryptdll/cryptdll.c index 72fcf68..c30046f 100644 --- a/dlls/cryptdll/cryptdll.c +++ b/dlls/cryptdll/cryptdll.c @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptdll); -static HMODULE CRYPTDLL_hModule; - BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); @@ -37,7 +35,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - CRYPTDLL_hModule = hinstDLL; break; } case DLL_PROCESS_DETACH:

1 0

Andrew Talbot : dnsapi: Remove unused variable.
by Alexandre Julliard 23 Nov '12

23 Nov '12

Module: wine Branch: master Commit: 5ca89eaf6ca51f8fabbed838ecdbfe71a695c40a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca89eaf6ca51f8fabbed838e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 21:01:58 2012 +0000 dnsapi: Remove unused variable. --- dlls/dnsapi/main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 1889552..f157230 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -30,8 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); -static HINSTANCE hdnsapi; - BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { TRACE( "(%p, %d, %p)\n", hinst, reason, reserved ); @@ -41,7 +39,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - hdnsapi = hinst; DisableThreadLibraryCalls( hinst ); break; case DLL_PROCESS_DETACH:

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012