wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

Stefan Dösinger : d3d8: Refuse to reset a lost device.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 8dd44e28013e531293b2e060254684562f7171fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd44e28013e531293b2e0602… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 1 22:46:47 2014 +0100 d3d8: Refuse to reset a lost device. --- dlls/d3d8/device.c | 6 ++++++ dlls/d3d8/tests/device.c | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4c17e7c..659cae6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -647,6 +647,12 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); + if (device->device_state == D3D8_DEVICE_STATE_LOST) + { + WARN("App not active, returning D3DERR_DEVICELOST.\n"); + return D3DERR_DEVICELOST; + } + wined3d_mutex_lock(); if (device->vertex_buffer) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6a4dcc2..33d3cd5 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6863,6 +6863,17 @@ static void test_lost_device(void) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + hr = reset_device(device, &device_desc); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window.\n"); + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = reset_device(device, &device_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done:

1 0

Stefan Dösinger : d3d9: Refuse to reset a lost device.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: aa9bc4c509e5956ea276020da733c2f6345aa140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9bc4c509e5956ea276020da… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 1 22:46:46 2014 +0100 d3d9: Refuse to reset a lost device. --- dlls/d3d9/device.c | 6 ++++++ dlls/d3d9/tests/d3d9ex.c | 17 +++++++++++++++++ dlls/d3d9/tests/device.c | 11 +++++++++++ 3 files changed, 34 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 67a5629..e2e3504 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -635,6 +635,12 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); + if (!device->d3d_parent->extended && device->device_state == D3D9_DEVICE_STATE_LOST) + { + WARN("App not active, returning D3DERR_DEVICELOST.\n"); + return D3DERR_DEVICELOST; + } + wined3d_mutex_lock(); if (device->vertex_buffer) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 226e338..0ac9db7 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1374,6 +1374,23 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); + ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + hr = reset_device(device, &desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_PresentEx(device, NULL, NULL, NULL, NULL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); + ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done: diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index cd6a9bd..a5cab96 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -9751,6 +9751,17 @@ static void test_lost_device(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + hr = reset_device(device, &device_desc); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window.\n"); + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = reset_device(device, &device_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done:

1 0

André Hentschel : oleaut32/tests: Remove unused code (Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: d68b81cacb69f8f05b9d605986c157fe670b8686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d68b81cacb69f8f05b9d60598… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:59:22 2014 +0100 oleaut32/tests: Remove unused code (Clang). --- dlls/oleaut32/tests/vartest.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 066e5f6..28983ff 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -331,12 +331,6 @@ static void setdec64(DECIMAL* dec, BYTE scl, BYTE sgn, ULONG hi32, ULONG mid32, S1(U1(*dec)).Lo32 = lo32; } -static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) -{ - while (*str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - /* return the string text of a given variant type */ static char vtstr_buffer[16][256]; static int vtstr_current=0;

1 0

André Hentschel : qmgr/tests: Remove unused code ( Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 84a2a963dda336714b20527b95f29623e48ecb9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a2a963dda336714b20527b9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:59:19 2014 +0100 qmgr/tests: Remove unused code (Clang). --- dlls/qmgr/tests/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qmgr/tests/file.c b/dlls/qmgr/tests/file.c index afe4b53..c77ff11 100644 --- a/dlls/qmgr/tests/file.c +++ b/dlls/qmgr/tests/file.c @@ -33,7 +33,6 @@ static const WCHAR test_remoteName[] = {'r','e','m','o','t','e', 0}; static const WCHAR test_localName[] = {'l','o','c','a','l', 0}; static WCHAR test_localFile[MAX_PATH]; static WCHAR test_remoteUrl[MAX_PATH]; -static const ULONG test_fileCount = NUM_FILES; static const WCHAR test_displayName[] = {'T','e','s','t', 0}; static IBackgroundCopyJob *test_job; static IBackgroundCopyManager *test_manager;

1 0

André Hentschel : quartz: Remove unused code (Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: bf12844bf19ba15a10271cb7f1feec802933eeca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf12844bf19ba15a10271cb7f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:59:14 2014 +0100 quartz: Remove unused code (Clang). --- dlls/quartz/acmwrapper.c | 5 ----- dlls/quartz/avidec.c | 5 ----- dlls/quartz/dsoundrender.c | 1 - dlls/quartz/mpegsplit.c | 1 - 4 files changed, 12 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index cd0b0d8..5bc0d8f 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -58,11 +58,6 @@ static inline ACMWrapperImpl *impl_from_TransformFilter( TransformFilter *iface return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter); } -static inline ACMWrapperImpl *impl_from_IBaseFilter( IBaseFilter *iface ) -{ - return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter.IBaseFilter_iface); -} - static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample) { ACMWrapperImpl* This = impl_from_TransformFilter(tf); diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 30da6fa..5047809 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -52,11 +52,6 @@ typedef struct AVIDecImpl static const IBaseFilterVtbl AVIDec_Vtbl; -static inline AVIDecImpl *impl_from_IBaseFilter( IBaseFilter *iface ) -{ - return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter.IBaseFilter_iface); -} - static inline AVIDecImpl *impl_from_TransformFilter( TransformFilter *iface ) { return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter); diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 2914b15..9f96654 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -46,7 +46,6 @@ static const REFERENCE_TIME DSoundRenderer_Max_Fill = 150 * 10000; static const IBaseFilterVtbl DSoundRender_Vtbl; static const IBasicAudioVtbl IBasicAudio_Vtbl; static const IReferenceClockVtbl IReferenceClock_Vtbl; -static const IMediaSeekingVtbl IMediaSeeking_Vtbl; static const IAMDirectSoundVtbl IAMDirectSound_Vtbl; static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index de03d17..6f09822 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -96,7 +96,6 @@ static int MPEGSplitter_head_check(const BYTE *header) } static const WCHAR wszAudioStream[] = {'A','u','d','i','o',0}; -static const WCHAR wszVideoStream[] = {'V','i','d','e','o',0}; static const DWORD freqs[10] = { 44100, 48000, 32000, 22050, 24000, 16000, 11025, 12000, 8000, 0 };

1 0

André Hentschel : ole32/tests: Remove unused variable (Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 065e4770f00ccf387e01284ab7721b968a582c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=065e4770f00ccf387e01284ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:59:09 2014 +0100 ole32/tests: Remove unused variable (Clang). --- dlls/ole32/tests/moniker.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 695f67a..3dd8bd2 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -56,14 +56,6 @@ static char const * const *expected_method_list; static const WCHAR wszFileName1[] = {'c',':','\\','w','i','n','d','o','w','s','\\','t','e','s','t','1','.','d','o','c',0}; static const WCHAR wszFileName2[] = {'c',':','\\','w','i','n','d','o','w','s','\\','t','e','s','t','2','.','d','o','c',0}; -static const CLSID CLSID_WineTest = -{ /* 9474ba1a-258b-490b-bc13-516e9239ace0 */ - 0x9474ba1a, - 0x258b, - 0x490b, - {0xbc, 0x13, 0x51, 0x6e, 0x92, 0x39, 0xac, 0xe0} -}; - static const CLSID CLSID_TestMoniker = { /* b306bfbc-496e-4f53-b93e-2ff9c83223d7 */ 0xb306bfbc,

1 0

André Hentschel : msxml3/tests: Remove unused code ( Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 1463325797d50638b27dc95b34c86b4182787839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1463325797d50638b27dc95b3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:58:01 2014 +0100 msxml3/tests: Remove unused code (Clang). --- dlls/msxml3/tests/domdoc.c | 7 +------ dlls/msxml3/tests/saxreader.c | 9 +-------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b768260..1a73771 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -410,11 +410,6 @@ static const WCHAR szComplete1[] = { static const WCHAR szComplete2[] = { '<','?','x','m','l',' ', 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', - '<','o','>','<','/','o','>','\n',0 -}; -static const WCHAR szComplete3[] = { - '<','?','x','m','l',' ', - 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', '<','a','>','<','/','a','>','\n',0 }; static const char complete4A[] = @@ -1368,7 +1363,7 @@ if (0) /* try to load something else simple and valid */ b = VARIANT_FALSE; - str = SysAllocString( szComplete3 ); + str = SysAllocString( szComplete2 ); r = IXMLDOMDocument_loadXML( doc, str, &b ); ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 882e855..75354c5 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -310,13 +310,6 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index call_seq->count = call_seq->size = 0; } -static inline void flush_sequences(struct call_sequence **seq, int n) -{ - int i; - for (i = 0; i < n; i++) - flush_sequence(seq, i); -} - static const char *get_event_name(CH event) { return event_names[event]; @@ -2895,7 +2888,7 @@ static void test_mxwriter_handlers(void) HRESULT hr; int i; - static const REFIID riids[] = + static REFIID riids[] = { &IID_ISAXContentHandler, &IID_ISAXLexicalHandler,

1 0

André Hentschel : oleaut32: Remove unused code (Clang ).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 099514e753a8f25ff2fe19356729f0faadabfd23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099514e753a8f25ff2fe19356… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:57:41 2014 +0100 oleaut32: Remove unused code (Clang). --- dlls/oleaut32/typelib.c | 16 ---------------- dlls/oleaut32/variant.c | 33 --------------------------------- 2 files changed, 49 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9d0d5d0..c6c539e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1726,18 +1726,6 @@ static inline TLBFuncDesc *TLB_get_funcdesc_by_memberid(TLBFuncDesc *funcdescs, return NULL; } -static inline TLBFuncDesc *TLB_get_funcdesc_by_name(TLBFuncDesc *funcdescs, - UINT n, const OLECHAR *name) -{ - while(n){ - if(!lstrcmpiW(TLB_get_bstr(funcdescs->Name), name)) - return funcdescs; - ++funcdescs; - --n; - } - return NULL; -} - static inline TLBVarDesc *TLB_get_vardesc_by_memberid(TLBVarDesc *vardescs, UINT n, MEMBERID memid) { @@ -2063,10 +2051,6 @@ static HRESULT TLB_size_instance(ITypeInfoImpl *info, SYSKIND sys, * * Functions for reading MSFT typelibs (those created by CreateTypeLib2) */ -static inline unsigned int MSFT_Tell(const TLBContext *pcx) -{ - return pcx->pos; -} static inline void MSFT_Seek(TLBContext *pcx, LONG where) { diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index e391a90..5a28acc 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -44,39 +44,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); -static const char * const variant_types[] = -{ - "VT_EMPTY","VT_NULL","VT_I2","VT_I4","VT_R4","VT_R8","VT_CY","VT_DATE", - "VT_BSTR","VT_DISPATCH","VT_ERROR","VT_BOOL","VT_VARIANT","VT_UNKNOWN", - "VT_DECIMAL","15","VT_I1","VT_UI1","VT_UI2","VT_UI4","VT_I8","VT_UI8", - "VT_INT","VT_UINT","VT_VOID","VT_HRESULT","VT_PTR","VT_SAFEARRAY", - "VT_CARRAY","VT_USERDEFINED","VT_LPSTR","VT_LPWSTR","32","33","34","35", - "VT_RECORD","VT_INT_PTR","VT_UINT_PTR","39","40","41","42","43","44","45", - "46","47","48","49","50","51","52","53","54","55","56","57","58","59","60", - "61","62","63","VT_FILETIME","VT_BLOB","VT_STREAM","VT_STORAGE", - "VT_STREAMED_OBJECT","VT_STORED_OBJECT","VT_BLOB_OBJECT","VT_CF","VT_CLSID", - "VT_VERSIONED_STREAM" -}; - -static const char * const variant_flags[16] = -{ - "", - "|VT_VECTOR", - "|VT_ARRAY", - "|VT_VECTOR|VT_ARRAY", - "|VT_BYREF", - "|VT_VECTOR|VT_ARRAY", - "|VT_ARRAY|VT_BYREF", - "|VT_VECTOR|VT_ARRAY|VT_BYREF", - "|VT_RESERVED", - "|VT_VECTOR|VT_RESERVED", - "|VT_ARRAY|VT_RESERVED", - "|VT_VECTOR|VT_ARRAY|VT_RESERVED", - "|VT_BYREF|VT_RESERVED", - "|VT_VECTOR|VT_ARRAY|VT_RESERVED", - "|VT_ARRAY|VT_BYREF|VT_RESERVED", - "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_RESERVED", -}; /* Convert a variant from one type to another */ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,

1 0

André Hentschel : ole32: Remove unused string (Clang) .
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: ec8602a8125bd3838948d32747217ed794ae4068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8602a8125bd3838948d3274… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:57:36 2014 +0100 ole32: Remove unused string (Clang). --- dlls/ole32/clipboard.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 0c3be3b..38df750 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -194,8 +194,6 @@ static inline HRESULT get_ole_clipbrd(ole_clipbrd **clipbrd) */ static const WCHAR clipbrd_wndclass[] = {'C','L','I','P','B','R','D','W','N','D','C','L','A','S','S',0}; -static const WCHAR wine_marshal_dataobject[] = {'W','i','n','e',' ','m','a','r','s','h','a','l',' ','d','a','t','a','o','b','j','e','c','t',0}; - UINT ownerlink_clipboard_format = 0; UINT filename_clipboard_format = 0; UINT filenameW_clipboard_format = 0;

1 0

André Hentschel : msi: Remove unused strings (Clang).
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 481fce766f1abe68fa512f382987695bfe7a8c89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481fce766f1abe68fa512f382… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 1 22:57:33 2014 +0100 msi: Remove unused strings (Clang). --- dlls/msi/registry.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index bb564d8..4dde285 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -100,12 +100,6 @@ static const WCHAR szInstallProperties_fmt[] = { '%','s','\\','P','r','o','d','u','c','t','s','\\','%','s','\\', 'I','n','s','t','a','l','l','P','r','o','p','e','r','t','i','e','s',0}; -static const WCHAR szInstaller_LocalManaged_fmt[] = { - 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','s','t','a','l','l','e','r','\\','M','a','n','a','g','e','d','\\','%','s','\\', - 'I','n','s','t','a','l','l','e','r','\\','P','r','o','d','u','c','t','s',0}; - static const WCHAR szInstaller_LocalManagedProd_fmt[] = { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', @@ -128,11 +122,6 @@ static const WCHAR szInstaller_Patches[] = { 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'I','n','s','t','a','l','l','e','r','\\','P','a','t','c','h','e','s',0}; -static const WCHAR szInstaller_Components[] = { - 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','s','t','a','l','l','e','r','\\','C','o','m','p','o','n','e','n','t','s',0}; - static const WCHAR szInstaller_LocalClassesProducts[] = { 'S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s','\\', 'I','n','s','t','a','l','l','e','r','\\','P','r','o','d','u','c','t','s',0};

1 0

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 December 2014