November 2012 - Wine-Commits

Christian Costa : cabinet: Remove useless ERR and turn one ERR into a WARN.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 8b6f9175182f1124d6e1df1c567a3d8f9e7319e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6f9175182f1124d6e1df1c5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Nov 28 09:02:57 2012 +0100 cabinet: Remove useless ERR and turn one ERR into a WARN. --- dlls/cabinet/fdi.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index d36178d..25156c3 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -710,7 +710,7 @@ static BOOL FDI_read_entries( } /*********************************************************************** - * FDIIsCabinet (CABINET.21) + * FDIIsCabinet (CABINET.21) * * Informs the caller as to whether or not the provided file handle is * really a cabinet or not, filling out the provided PFDICABINETINFO @@ -725,7 +725,7 @@ static BOOL FDI_read_entries( * be filled out with information about the cabinet * file indicated by hf if, indeed, it is determined * to be a cabinet. - * + * * RETURNS * TRUE if the file is a cabinet. The info pointed to by pfdici will * be provided. @@ -736,10 +736,7 @@ static BOOL FDI_read_entries( * INCLUDES * fdi.c */ -BOOL __cdecl FDIIsCabinet( - HFDI hfdi, - INT_PTR hf, - PFDICABINETINFO pfdici) +BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici) { BOOL rv; FDI_Int *fdi = get_fdi_ptr( hfdi ); @@ -749,13 +746,11 @@ BOOL __cdecl FDIIsCabinet( if (!fdi) return FALSE; if (!hf) { - ERR("(!hf)!\n"); SetLastError(ERROR_INVALID_HANDLE); return FALSE; } if (!pfdici) { - ERR("(!pfdici)!\n"); SetLastError(ERROR_BAD_ARGUMENTS); return FALSE; } @@ -2533,7 +2528,7 @@ BOOL __cdecl FDICopy( /* check if it's really a cabfile. Note that this doesn't implement the bug */ if (!FDI_read_entries(fdi, cabhf, &fdici, &(CAB(mii)))) { - ERR("FDIIsCabinet failed: %u.\n", fdi->perf->erfOper); + WARN("FDI_read_entries failed: %u\n", fdi->perf->erfOper); fdi->free(decomp_state); fdi->close(cabhf); return FALSE;

1 0

Nikolay Sivov : xmllite: Fix equal sign parsing.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: c23ce5976ee8cb96c996bda0b49b710ef15646ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23ce5976ee8cb96c996bda0b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 09:44:06 2012 -0500 xmllite: Fix equal sign parsing. --- dlls/xmllite/reader.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ee6a4d7..11b5eb8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -48,7 +48,6 @@ static const WCHAR utf8W[] = {'U','T','F','-','8',0}; static const WCHAR dblquoteW[] = {'\"',0}; static const WCHAR quoteW[] = {'\'',0}; -static const WCHAR eqW[] = {'=',0}; struct xml_encoding_data { @@ -515,6 +514,18 @@ static HRESULT reader_parse_versionnum(xmlreader *reader) return S_OK; } +/* [25] Eq ::= S? '=' S? */ +static HRESULT reader_parse_eq(xmlreader *reader) +{ + static const WCHAR eqW[] = {'=',0}; + reader_skipspaces(reader); + if (reader_cmp(reader, eqW)) return WC_E_EQUAL; + /* skip '=' */ + reader_skipn(reader, 1); + reader_skipspaces(reader); + return S_OK; +} + /* [24] VersionInfo ::= S 'version' Eq ("'" VersionNum "'" | '"' VersionNum '"') */ static HRESULT reader_parse_versioninfo(xmlreader *reader) { @@ -527,9 +538,8 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) /* skip 'version' */ reader_skipn(reader, 7); - if (reader_cmp(reader, eqW)) return WC_E_EQUAL; - /* skip '=' */ - reader_skipn(reader, 1); + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) return WC_E_QUOTE; @@ -596,9 +606,8 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) /* skip 'encoding' */ reader_skipn(reader, 8); - if (reader_cmp(reader, eqW)) return WC_E_EQUAL; - /* skip '=' */ - reader_skipn(reader, 1); + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) return WC_E_QUOTE; @@ -624,6 +633,7 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) static const WCHAR yesW[] = {'y','e','s',0}; static const WCHAR noW[] = {'n','o',0}; const WCHAR *start, *ptr; + HRESULT hr; if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; @@ -631,9 +641,8 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) /* skip 'standalone' */ reader_skipn(reader, 10); - if (reader_cmp(reader, eqW)) return WC_E_EQUAL; - /* skip '=' */ - reader_skipn(reader, 1); + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) return WC_E_QUOTE;

1 0

Alistair Leslie-Hughes : include: Add IGlobalOptions interface.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 9478e1e113567edcbc0aca1cd01b4d2246882919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9478e1e113567edcbc0aca1cd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 26 13:31:10 2012 +1100 include: Add IGlobalOptions interface. --- include/objidl.idl | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/objidl.idl b/include/objidl.idl index a3896e9..ecae70e 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -2407,6 +2407,39 @@ interface IThumbnailExtractor : IUnknown [in] IStorage *pStg); } +typedef enum tagGLOBALOPT_PROPERTIES +{ + COMGLB_EXCEPTION_HANDLING = 1, + COMGLB_APPID = 2, + COMGLB_RPC_THREADPOOL_SETTING = 3 +} GLOBALOPT_PROPERTIES; + +typedef enum tagGLOBALOPT_EH_VALUES +{ + COMGLB_EXCEPTION_HANDLE = 0, + COMGLB_EXCEPTION_DONOT_HANDLE_FATAL = 1, + COMGLB_EXCEPTION_DONOT_HANDLE = COMGLB_EXCEPTION_DONOT_HANDLE_FATAL, + COMGLB_EXCEPTION_DONOT_HANDLE_ANY = 2 +} GLOBALOPT_EH_VALUES; + +typedef enum tagGLOBALOPT_RPCTP_VALUES +{ + COMGLB_RPC_THREADPOOL_SETTING_DEFAULT_POOL = 0, + COMGLB_RPC_THREADPOOL_SETTING_PRIVATE_POOL = 1 +} GLOBALOPT_RPCTP_VALUES; + + +[ + object, + local, + pointer_default(unique), + uuid(0000015B-0000-0000-C000-000000000046) +] +interface IGlobalOptions : IUnknown +{ + HRESULT Set([in] GLOBALOPT_PROPERTIES property, [in] ULONG_PTR value); + HRESULT Query([in] GLOBALOPT_PROPERTIES property, [out ] ULONG_PTR *value); +} cpp_quote("#ifdef USE_COM_CONTEXT_DEF")

1 0

Andrew Talbot : gdiplus: Remove superfluous braces.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: f8da0d3a1efeaf066122b042c94593d5be4f7a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8da0d3a1efeaf066122b042c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:16 2012 +0000 gdiplus: Remove superfluous braces. --- dlls/gdiplus/graphicspath.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index ca96bda..1fbebba 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1724,7 +1724,6 @@ static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF * { case LineJoinMiter: case LineJoinMiterClipped: - { if ((p2->X - p1->X) * (p3->Y - p1->Y) > (p2->Y - p1->Y) * (p3->X - p1->X)) { float distance = pen->width/2.0; @@ -1752,7 +1751,6 @@ static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF * /* else fall-through */ } /* else fall-through */ - } default: case LineJoinBevel: add_bevel_point(p2, p1, pen, 1, last_point);

1 0

Andrew Talbot : netapi32: Remove unused variable.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 9205f02ac589681cb53b8ead56a08550811aa920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9205f02ac589681cb53b8ead5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:19 2012 +0000 netapi32: Remove unused variable. --- dlls/netapi32/netapi32.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index f6c6d20..a24320c 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(netbios); -static HMODULE NETAPI32_hModule; - BOOL NETAPI_IsLocalComputer(LMCSTR ServerName); BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -37,7 +35,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - NETAPI32_hModule = hinstDLL; NetBIOSInit(); NetBTInit(); break;

1 0

Andrew Talbot : wineps.drv: Remove unused variable.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 393514c11941f8425936eaea506831d466e6bd7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=393514c11941f8425936eaea5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:24 2012 +0000 wineps.drv: Remove unused variable. --- dlls/wineps.drv/driver.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 358f088..70ee2b0 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -333,7 +333,6 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, } -static void (WINAPI *pInitCommonControls) (void); static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPage) (LPCPROPSHEETPAGEW); static int (WINAPI *pPropertySheet) (LPCPROPSHEETHEADERW); @@ -456,8 +455,6 @@ INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, static const WCHAR SetupW[] = {'S','e','t','u','p','\0'}; hinstComctl32 = LoadLibraryA("comctl32.dll"); - pInitCommonControls = (void*)GetProcAddress(hinstComctl32, - "InitCommonControls"); pCreatePropertySheetPage = (void*)GetProcAddress(hinstComctl32, "CreatePropertySheetPageW"); pPropertySheet = (void*)GetProcAddress(hinstComctl32, "PropertySheetW");

1 0

Huw Davies : oledlg: Add a missing break.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 81057ba9b9290f2baf29bec960183832a448ba88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81057ba9b9290f2baf29bec96… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 28 10:57:07 2012 +0000 oledlg: Add a missing break. --- dlls/oledlg/insobjdlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 75ca77b..159f12b 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -195,6 +195,7 @@ static LRESULT UIINSOBJDLG_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) case IDC_ADDCONTROL: UIINSERTOBJECTDLG_AddControl(pdlgInfo); + break; case IDC_OBJTYPELIST: if (wNotifyCode == LBN_SELCHANGE)

1 0

Henri Verbeet : d3d10core/tests: Don't reuse the device.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: be65d6ab3cc6e02a338282a9f548c20e88db432a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be65d6ab3cc6e02a338282a9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 27 22:10:59 2012 +0100 d3d10core/tests: Don't reuse the device. --- dlls/d3d10core/tests/device.c | 118 +++++++++++++++++++++++++++++++--------- 1 files changed, 91 insertions(+), 27 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 865dde6..0dd96f1 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -74,11 +74,19 @@ cleanup: return device; } -static void test_device_interfaces(ID3D10Device *device) +static void test_device_interfaces(void) { + ID3D10Device *device; + ULONG refcount; IUnknown *obj; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IUnknown, (void **)&obj))) IUnknown_Release(obj); ok(SUCCEEDED(hr), "ID3D10Device does not implement IUnknown\n"); @@ -94,15 +102,26 @@ static void test_device_interfaces(ID3D10Device *device) if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_ID3D10Device, (void **)&obj))) IUnknown_Release(obj); ok(SUCCEEDED(hr), "ID3D10Device does not implement ID3D10Device\n"); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left\n", refcount); } -static void test_create_texture2d(ID3D10Device *device) +static void test_create_texture2d(void) { D3D10_TEXTURE2D_DESC desc; ID3D10Texture2D *texture; IDXGISurface *surface; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + desc.Width = 512; desc.Height = 512; desc.MipLevels = 1; @@ -154,15 +173,26 @@ static void test_create_texture2d(ID3D10Device *device) ok(FAILED(hr), "Texture should not implement IDXGISurface\n"); if (SUCCEEDED(hr)) IDXGISurface_Release(surface); ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_texture3d(ID3D10Device *device) +static void test_create_texture3d(void) { D3D10_TEXTURE3D_DESC desc; ID3D10Texture3D *texture; IDXGISurface *surface; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + desc.Width = 64; desc.Height = 64; desc.Depth = 64; @@ -200,16 +230,27 @@ static void test_create_texture3d(ID3D10Device *device) ok(FAILED(hr), "Texture should not implement IDXGISurface.\n"); if (SUCCEEDED(hr)) IDXGISurface_Release(surface); ID3D10Texture3D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_depthstencil_view(ID3D10Device *device) +static void test_create_depthstencil_view(void) { D3D10_DEPTH_STENCIL_VIEW_DESC dsv_desc; D3D10_TEXTURE2D_DESC texture_desc; ID3D10DepthStencilView *dsview; ID3D10Texture2D *texture; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + texture_desc.Width = 512; texture_desc.Height = 512; texture_desc.MipLevels = 1; @@ -236,9 +277,12 @@ static void test_create_depthstencil_view(ID3D10Device *device) ID3D10DepthStencilView_Release(dsview); ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_rendertarget_view(ID3D10Device *device) +static void test_create_rendertarget_view(void) { D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; D3D10_TEXTURE2D_DESC texture_desc; @@ -246,8 +290,16 @@ static void test_create_rendertarget_view(ID3D10Device *device) ID3D10RenderTargetView *rtview; ID3D10Texture2D *texture; ID3D10Buffer *buffer; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + buffer_desc.ByteWidth = 1024; buffer_desc.Usage = D3D10_USAGE_DEFAULT; buffer_desc.BindFlags = D3D10_BIND_RENDER_TARGET; @@ -295,9 +347,12 @@ static void test_create_rendertarget_view(ID3D10Device *device) ID3D10RenderTargetView_Release(rtview); ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_shader_resource_view(ID3D10Device *device) +static void test_create_shader_resource_view(void) { D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; D3D10_TEXTURE2D_DESC texture_desc; @@ -305,8 +360,16 @@ static void test_create_shader_resource_view(ID3D10Device *device) D3D10_BUFFER_DESC buffer_desc; ID3D10Texture2D *texture; ID3D10Buffer *buffer; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + buffer_desc.ByteWidth = 1024; buffer_desc.Usage = D3D10_USAGE_DEFAULT; buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; @@ -358,9 +421,12 @@ static void test_create_shader_resource_view(ID3D10Device *device) ID3D10ShaderResourceView_Release(srview); ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_shader(ID3D10Device *device) +static void test_create_shader(void) { #if 0 float4 light; @@ -471,8 +537,16 @@ float4 main(const float4 color : COLOR) : SV_TARGET ID3D10VertexShader *vs = NULL; ID3D10PixelShader *ps = NULL; + ID3D10Device *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + hr = ID3D10Device_CreateVertexShader(device, vs_4_0, sizeof(vs_4_0), &vs); ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); if (vs) @@ -491,28 +565,18 @@ float4 main(const float4 color : COLOR) : SV_TARGET ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); if (ps) ID3D10PixelShader_Release(ps); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } START_TEST(device) { - ID3D10Device *device; - ULONG refcount; - - device = create_device(); - if (!device) - { - skip("Failed to create device, skipping tests\n"); - return; - } - - test_device_interfaces(device); - test_create_texture2d(device); - test_create_texture3d(device); - test_create_depthstencil_view(device); - test_create_rendertarget_view(device); - test_create_shader_resource_view(device); - test_create_shader(device); - - refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left\n", refcount); + test_device_interfaces(); + test_create_texture2d(); + test_create_texture3d(); + test_create_depthstencil_view(); + test_create_rendertarget_view(); + test_create_shader_resource_view(); + test_create_shader(); }

1 0

Henri Verbeet : d3d10core/tests: Use the correct enum in test_create_shader_resource_view().
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: 7c722bea2866b274c47f97006de937934273fc5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c722bea2866b274c47f97006… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 27 22:11:00 2012 +0100 d3d10core/tests: Use the correct enum in test_create_shader_resource_view(). --- dlls/d3d10core/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 0dd96f1..a0df22a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -383,7 +383,7 @@ static void test_create_shader_resource_view(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; - srv_desc.ViewDimension = D3D10_RTV_DIMENSION_BUFFER; + srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; U(srv_desc).Buffer.ElementOffset = 0; U(srv_desc).Buffer.ElementWidth = 64;

1 0

Andrew Talbot : sensapi: Remove unused variable.
by Alexandre Julliard Nov. 28, 2012

Nov. 28, 2012

Module: wine Branch: master Commit: c562b0e1488c3fe36c8e09122486e22a365db610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c562b0e1488c3fe36c8e09122… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:22 2012 +0000 sensapi: Remove unused variable. --- dlls/sensapi/sensapi.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/sensapi/sensapi.c b/dlls/sensapi/sensapi.c index 86e4a92..75d07a8 100644 --- a/dlls/sensapi/sensapi.c +++ b/dlls/sensapi/sensapi.c @@ -44,8 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sensapi); -static HMODULE SENSAPI_hModule; - BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); @@ -54,7 +52,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - SENSAPI_hModule = hinstDLL; break; } case DLL_PROCESS_DETACH:

1 0