April 2008 - Wine-Commits - list.winehq.org

Rob Shearman : ole32: Add some tests for OleGetClipboard.
by Alexandre Julliard April 16, 2008

April 16, 2008

Module: wine Branch: master Commit: e0ef1f061a0018b6cebe2f7a931a4f5159918e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ef1f061a0018b6cebe2f7a9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 15 18:29:24 2008 +0100 ole32: Add some tests for OleGetClipboard. Test the IDataObject_QueryGetData function of the returned object. --- dlls/ole32/tests/clipboard.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 0127ce5..aa2f622 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -57,6 +57,8 @@ typedef struct EnumFormatImpl { UINT cur; } EnumFormatImpl; +static BOOL expect_DataObjectImpl_QueryGetData = TRUE; + static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT size, LPENUMFORMATETC *lplpformatetc); static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFIID riid, LPVOID *ppvObj) @@ -223,6 +225,9 @@ static HRESULT WINAPI DataObjectImpl_QueryGetData(IDataObject* iface, FORMATETC UINT i; BOOL foundFormat = FALSE; + if (!expect_DataObjectImpl_QueryGetData) + todo_wine ok(0, "unexpected call to DataObjectImpl_QueryGetData\n"); + if(pformatetc->lindex != -1) return DV_E_LINDEX; @@ -316,6 +321,54 @@ static HRESULT DataObjectImpl_CreateText(LPCSTR text, LPDATAOBJECT *lplpdataobj) return S_OK; } +static void test_get_clipboard(void) +{ + HRESULT hr; + IDataObject *data_obj; + FORMATETC fmtetc; + + hr = OleGetClipboard(NULL); + ok(hr == E_INVALIDARG, "OleGetClipboard(NULL) should return E_INVALIDARG instead of 0x%08x\n", hr); + + hr = OleGetClipboard(&data_obj); + ok(hr == S_OK, "OleGetClipboard failed with error 0x%08x\n", hr); + + /* clipboard's IDataObject_QueryGetData shouldn't defer to our IDataObject_QueryGetData */ + expect_DataObjectImpl_QueryGetData = FALSE; + + InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); + hr = IDataObject_QueryGetData(data_obj, &fmtetc); + ok(hr == S_OK, "IDataObject_QueryGetData failed with error 0x%08x\n", hr); + + InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); + fmtetc.dwAspect = 0xdeadbeef; + hr = IDataObject_QueryGetData(data_obj, &fmtetc); + todo_wine + ok(hr == DV_E_FORMATETC, "IDataObject_QueryGetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + + InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); + fmtetc.lindex = 256; + hr = IDataObject_QueryGetData(data_obj, &fmtetc); + todo_wine + ok(hr == DV_E_FORMATETC, "IDataObject_QueryGetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + + InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); + fmtetc.cfFormat = CF_RIFF; + hr = IDataObject_QueryGetData(data_obj, &fmtetc); + todo_wine + ok(hr == DV_E_CLIPFORMAT, "IDataObject_QueryGetData should have failed with DV_E_CLIPFORMAT instead of 0x%08x\n", hr); + + InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); + fmtetc.tymed = TYMED_FILE; + hr = IDataObject_QueryGetData(data_obj, &fmtetc); + todo_wine + ok(hr == S_OK, "IDataObject_QueryGetData failed with error 0x%08x\n", hr); + + expect_DataObjectImpl_QueryGetData = TRUE; + + IDataObject_Release(data_obj); +} + static void test_set_clipboard(void) { HRESULT hr; @@ -350,6 +403,8 @@ static void test_set_clipboard(void) hr = OleIsCurrentClipboard(data2); ok(hr == S_FALSE, "did not expect current clipboard to be data2, hr = 0x%08x\n", hr); + test_get_clipboard(); + hr = OleSetClipboard(data2); ok(hr == S_OK, "failed to set clipboard to data2, hr = 0x%08x\n", hr); hr = OleIsCurrentClipboard(data1);

1 0

Alexandre Julliard : fusion: Fix a number of leaks in assembly_create.
by Alexandre Julliard April 16, 2008

April 16, 2008

Module: wine Branch: master Commit: c889716979326795d32df106425f94f844ff3465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c889716979326795d32df1064… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 16 13:51:17 2008 +0200 fusion: Fix a number of leaks in assembly_create. --- dlls/fusion/assembly.c | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index d3512e7..024e611 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -343,40 +343,52 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) *out = NULL; - assembly = HeapAlloc(GetProcessHeap(), 0, sizeof(ASSEMBLY)); + assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); if (!assembly) return E_OUTOFMEMORY; - ZeroMemory(assembly, sizeof(ASSEMBLY)); - assembly->path = strdupWtoA(file); if (!assembly->path) - return E_OUTOFMEMORY; + { + hr = E_OUTOFMEMORY; + goto failed; + } assembly->hfile = CreateFileW(file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (!assembly->hfile) - return HRESULT_FROM_WIN32(GetLastError()); + if (assembly->hfile == INVALID_HANDLE_VALUE) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } assembly->hmap = CreateFileMappingW(assembly->hfile, NULL, PAGE_READONLY, 0, 0, NULL); if (!assembly->hmap) - return HRESULT_FROM_WIN32(GetLastError()); + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } assembly->data = MapViewOfFile(assembly->hmap, FILE_MAP_READ, 0, 0, 0); if (!assembly->data) - return HRESULT_FROM_WIN32(GetLastError()); + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } hr = parse_pe_header(assembly); - if (FAILED(hr)) - return hr; + if (FAILED(hr)) goto failed; hr = parse_clr_metadata(assembly); - if (FAILED(hr)) - return hr; + if (FAILED(hr)) goto failed; *out = assembly; return S_OK; + +failed: + assembly_release( assembly ); + return hr; } HRESULT assembly_release(ASSEMBLY *assembly)

1 0

Huw Davies : gdi32: LineDDA shouldn't include the end point. Add some tests.
by Alexandre Julliard April 16, 2008

April 16, 2008

Module: wine Branch: master Commit: 65d5c20a6b015874b6352a228e2d2c8e1632d42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d5c20a6b015874b6352a228… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 15 16:40:54 2008 +0100 gdi32: LineDDA shouldn't include the end point. Add some tests. --- dlls/gdi32/painting.c | 4 +- dlls/gdi32/tests/path.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 097ddcf..8c9aa98 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -1005,7 +1005,7 @@ BOOL WINAPI LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd, if (dx > dy) /* line is "more horizontal" */ { err = 2*dy - dx; erradd = 2*dy - 2*dx; - for(cnt = 0;cnt <= dx; cnt++) + for(cnt = 0;cnt < dx; cnt++) { callback(nXStart,nYStart,lParam); if (err > 0) @@ -1020,7 +1020,7 @@ BOOL WINAPI LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd, else /* line is "more vertical" */ { err = 2*dx - dy; erradd = 2*dx - 2*dy; - for(cnt = 0;cnt <= dy; cnt++) + for(cnt = 0;cnt < dy; cnt++) { callback(nXStart,nYStart,lParam); if (err > 0) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index cbbd53c..58e8467 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -422,6 +422,87 @@ static void test_closefigure(void) { ReleaseDC(0, hdc); } +static void WINAPI linedda_callback(INT x, INT y, LPARAM lparam) +{ + POINT **pt = (POINT**)lparam; + ok((*pt)->x == x && (*pt)->y == y, "point mismatch expect(%d,%d) got(%d,%d)\n", + (*pt)->x, (*pt)->y, x, y); + + (*pt)++; + return; +} + +static void test_linedda(void) +{ + const POINT *pt; + static const POINT array_10_20_20_40[] = {{10,20},{10,21},{11,22},{11,23}, + {12,24},{12,25},{13,26},{13,27}, + {14,28},{14,29},{15,30},{15,31}, + {16,32},{16,33},{17,34},{17,35}, + {18,36},{18,37},{19,38},{19,39}, + {-1,-1}}; + static const POINT array_10_20_20_43[] = {{10,20},{10,21},{11,22},{11,23}, + {12,24},{12,25},{13,26},{13,27}, + {13,28},{14,29},{14,30},{15,31}, + {15,32},{16,33},{16,34},{17,35}, + {17,36},{17,37},{18,38},{18,39}, + {19,40},{19,41},{20,42},{-1,-1}}; + + static const POINT array_10_20_10_20[] = {{-1,-1}}; + static const POINT array_10_20_11_27[] = {{10,20},{10,21},{10,22},{10,23}, + {11,24},{11,25},{11,26},{-1,-1}}; + + static const POINT array_20_43_10_20[] = {{20,43},{20,42},{19,41},{19,40}, + {18,39},{18,38},{17,37},{17,36}, + {17,35},{16,34},{16,33},{15,32}, + {15,31},{14,30},{14,29},{13,28}, + {13,27},{13,26},{12,25},{12,24}, + {11,23},{11,22},{10,21},{-1,-1}}; + + static const POINT array_20_20_10_43[] = {{20,20},{20,21},{19,22},{19,23}, + {18,24},{18,25},{17,26},{17,27}, + {17,28},{16,29},{16,30},{15,31}, + {15,32},{14,33},{14,34},{13,35}, + {13,36},{13,37},{12,38},{12,39}, + {11,40},{11,41},{10,42},{-1,-1}}; + + static const POINT array_20_20_43_10[] = {{20,20},{21,20},{22,19},{23,19}, + {24,18},{25,18},{26,17},{27,17}, + {28,17},{29,16},{30,16},{31,15}, + {32,15},{33,14},{34,14},{35,13}, + {36,13},{37,13},{38,12},{39,12}, + {40,11},{41,11},{42,10},{-1,-1}}; + + + pt = array_10_20_20_40; + LineDDA(10, 20, 20, 40, linedda_callback, (LPARAM)&pt); + ok(pt->x == -1 && pt->y == -1, "didn't find terminator\n"); + + pt = array_10_20_20_43; + LineDDA(10, 20, 20, 43, linedda_callback, (LPARAM)&pt); + ok(pt->x == -1 && pt->y == -1, "didn't find terminator\n"); + + pt = array_10_20_10_20; + LineDDA(10, 20, 10, 20, linedda_callback, (LPARAM)&pt); + ok(pt->x == -1 && pt->y == -1, "didn't find terminator\n"); + + pt = array_10_20_11_27; + LineDDA(10, 20, 11, 27, linedda_callback, (LPARAM)&pt); + ok(pt->x == -1 && pt->y == -1, "didn't find terminator\n"); + + pt = array_20_43_10_20; + LineDDA(20, 43, 10, 20, linedda_callback, (LPARAM)&pt); + ok(pt->x == -1 && pt->y == -1, "didn't find terminator\n"); + + pt = array_20_20_10_43; + LineDDA(20, 20, 10, 43, linedda_callback, (LPARAM)&pt); + ok(pt->x == -1 && pt->y == -1, "didn't find terminator\n"); + + pt = array_20_20_43_10; + LineDDA(20, 20, 43, 10, linedda_callback, (LPARAM)&pt); + ok(pt->x == -1 && pt->y == -1, "didn't find terminator\n"); +} + START_TEST(path) { test_widenpath(); @@ -429,4 +510,5 @@ START_TEST(path) test_anglearc(); test_polydraw(); test_closefigure(); + test_linedda(); }

1 0

Rob Shearman : include: Make IContextMenu interface in shobjidl. idl local since some parameters are pointers to structures with fields that can 't be marshalled.
by Alexandre Julliard April 16, 2008

April 16, 2008

Module: wine Branch: master Commit: 99636aaa9f339ad46aa8b5fdcbf6717ec1723438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99636aaa9f339ad46aa8b5fdc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 15 18:29:19 2008 +0100 include: Make IContextMenu interface in shobjidl.idl local since some parameters are pointers to structures with fields that can't be marshalled. --- include/shobjidl.idl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 54d617e..563d9e2 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -961,7 +961,8 @@ interface IDropTargetHelper : IUnknown [ object, uuid(000214e4-0000-0000-c000-000000000046), - pointer_default(unique) + pointer_default(unique), + local ] interface IContextMenu : IUnknown {

1 0

Alexandre Julliard : wine.inf: Use a proper services section to install services.
by Alexandre Julliard April 16, 2008

April 16, 2008

Module: wine Branch: master Commit: a0bbf8477cddff241064d54de44f24a515a8712f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0bbf8477cddff241064d54de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 16 12:38:41 2008 +0200 wine.inf: Use a proper services section to install services. --- tools/wine.inf.in | 42 ++++++++++++++++++++++++++---------------- 1 files changed, 26 insertions(+), 16 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 9f120b9..2600a47 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -75,6 +75,14 @@ AddReg=\ Timezones,\ VersionInfo +[DefaultInstall.Services] +AddService=MountMgr,0x800,MountMgrService +AddService=Spooler,0,SpoolerService + +[DefaultInstall.NT.Services] +AddService=MountMgr,0x800,MountMgrService +AddService=Spooler,0,SpoolerService + [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" Mci32Str="Software\Microsoft\Windows NT\CurrentVersion\MCI32" @@ -84,7 +92,6 @@ CurrentVersion="Software\Microsoft\Windows\CurrentVersion" CurrentVersionNT="Software\Microsoft\Windows NT\CurrentVersion" FontSubStr="Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" Control="System\CurrentControlSet\Control" -Services="System\CurrentControlSet\Services" [Classes] HKCR,.avi,"Content Type",2,"video/avi" @@ -2658,22 +2665,25 @@ HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Dlt",,"Yakutsk Dayligh HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Std",,"Yakutsk Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +[MountMgrService] +Description="Device mounting service" +DisplayName="Mount Manager" +ServiceBinary="%12%\mountmgr.sys" +ServiceType=1 +StartType=2 +ErrorControl=1 + +[SpoolerService] +Description="Loads files to memory for later printing" +DisplayName="Print Spooler" +ServiceBinary="%11\spoolsv.exe" +ServiceType=1 +StartType=4 +ErrorControl=1 +LoadOrderGroup="SpoolerGroup" + [Services] -HKLM,"%Services%\Spooler","Description",,"Loads files to memory for later printing." -HKLM,"%Services%\Spooler","DisplayName",,"Print Spooler" -HKLM,"%Services%\Spooler","ErrorControl",0x10001,1 -HKLM,"%Services%\Spooler","Group",,"SpoolerGroup" -HKLM,"%Services%\Spooler","ImagePath",,"spoolsv.exe" -HKLM,"%Services%\Spooler","ObjectName",,"LocalSystem" -HKLM,"%Services%\Spooler","Start",0x10001,4 -HKLM,"%Services%\Spooler","Type",0x10001,0x110 -HKLM,"%Services%\MountMgr","Description",,"Device mounting service." -HKLM,"%Services%\MountMgr","DisplayName",,"Mount Manager" -HKLM,"%Services%\MountMgr","ErrorControl",0x10001,1 -HKLM,"%Services%\MountMgr","ImagePath",,"mountmgr.sys" -HKLM,"%Services%\MountMgr","Start",0x10001,2 -HKLM,"%Services%\MountMgr","Type",0x10001,1 -HKLM,"%Services%\VxD\MSTCP",,,"" +HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,,"" [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1"

1 0

Alexandre Julliard : setupapi: Install services in InstallHinfSection.
by Alexandre Julliard April 16, 2008

April 16, 2008

Module: wine Branch: master Commit: c7e661b8e5a0c339ef09e89cc759dc6620e14541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e661b8e5a0c339ef09e89cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 16 12:36:18 2008 +0200 setupapi: Install services in InstallHinfSection. --- dlls/setupapi/install.c | 5 ++++- dlls/setupapi/tests/install.c | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 13a114b..321d4d4 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1032,8 +1032,9 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I static const WCHAR nt_platformW[] = {'.','n','t',0}; #endif static const WCHAR nt_genericW[] = {'.','n','t',0}; + static const WCHAR servicesW[] = {'.','S','e','r','v','i','c','e','s',0}; - WCHAR *s, *path, section[MAX_PATH + sizeof(nt_platformW)/sizeof(WCHAR)]; + WCHAR *s, *path, section[MAX_PATH + (sizeof(nt_platformW) + sizeof(servicesW)) / sizeof(WCHAR)]; void *callback_context; UINT mode; HINF hinf; @@ -1076,6 +1077,8 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I SetupDefaultQueueCallbackW, callback_context, NULL, NULL ); SetupTermDefaultQueueCallback( callback_context ); + strcatW( section, servicesW ); + SetupInstallServicesFromInfSectionW( hinf, section, 0 ); SetupCloseInfFile( hinf ); /* FIXME: should check the mode and maybe reboot */ diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index de93192..0044f01 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -329,12 +329,10 @@ static void test_driver_install(void) /* Open the service to see if it's really there */ svc_handle = OpenServiceA(scm_handle, "Winetest", DELETE); - todo_wine ok(svc_handle != NULL, "Service was not created\n"); SetLastError(0xdeadbeef); ret = DeleteService(svc_handle); - todo_wine ok(ret, "Service could not be deleted : %d\n", GetLastError()); CloseServiceHandle(svc_handle);

1 0

Alexandre Julliard : setupapi: Implemented SetupInstallServicesFromInfSectionW.
by Alexandre Julliard April 16, 2008

April 16, 2008

Module: wine Branch: master Commit: cf78e6c38c6815cc9ef805b791414bd67acbb992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf78e6c38c6815cc9ef805b79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 16 12:36:08 2008 +0200 setupapi: Implemented SetupInstallServicesFromInfSectionW. --- dlls/setupapi/install.c | 239 ++++++++++++++++++++++++++++++++++++++++- dlls/setupapi/tests/install.c | 12 -- 2 files changed, 235 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf78e6c38c6815cc9ef80…

1 0

Alexandre Julliard : setupapi: Move strdupW and strdupWtoA to the setupapi_private.h header.
by Alexandre Julliard April 16, 2008

April 16, 2008

Module: wine Branch: master Commit: 44ab294e0b6f285f1aab5fc8533a36e852be38fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ab294e0b6f285f1aab5fc85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 16 12:21:09 2008 +0200 setupapi: Move strdupW and strdupWtoA to the setupapi_private.h header. --- dlls/setupapi/queue.c | 23 ----------------------- dlls/setupapi/setupapi_private.h | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index e63639a..3212d5a 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -73,29 +73,6 @@ struct file_queue }; -static inline WCHAR *strdupW( const WCHAR *str ) -{ - WCHAR *ret = NULL; - if (str) - { - int len = (strlenW(str) + 1) * sizeof(WCHAR); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) memcpy( ret, str, len ); - } - return ret; -} - -static inline char *strdupWtoA( const WCHAR *str ) -{ - char *ret = NULL; - if (str) - { - DWORD len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) - WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); - } - return ret; -} - /* append a file operation to a queue */ static inline void queue_file_op( struct file_op_queue *queue, struct file_op *op ) { diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index a3fe223..caf1d3b 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -29,6 +29,29 @@ #define REGPART_RENAME "\\Rename" #define REG_VERSIONCONFLICT "Software\\Microsoft\\VersionConflictManager" +static inline WCHAR *strdupW( const WCHAR *str ) +{ + WCHAR *ret = NULL; + if (str) + { + int len = (lstrlenW(str) + 1) * sizeof(WCHAR); + if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) memcpy( ret, str, len ); + } + return ret; +} + +static inline char *strdupWtoA( const WCHAR *str ) +{ + char *ret = NULL; + if (str) + { + DWORD len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); + if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) + WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); + } + return ret; +} + static inline WCHAR *strdupAtoW( const char *str ) { WCHAR *ret = NULL;

1 0

Alexandre Julliard : include: Add the SPSVCINST_* setupapi flags.
by Alexandre Julliard April 16, 2008

April 16, 2008

Module: wine Branch: master Commit: d5aea7d0df6d3b5319e066f6b9293656bb8343af URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5aea7d0df6d3b5319e066f6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 16 12:16:51 2008 +0200 include: Add the SPSVCINST_* setupapi flags. --- include/setupapi.h | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/include/setupapi.h b/include/setupapi.h index 047b7bd..927de6b 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -956,6 +956,19 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_INF_SIGNER_INFO) #define SPINST_LOGCONFIGS_ARE_OVERRIDES 0x00040000 #define SPINST_REGISTERCALLBACKAWARE 0x00080000 +#define SPSVCINST_TAGTOFRONT 0x00000001 +#define SPSVCINST_ASSOCSERVICE 0x00000002 +#define SPSVCINST_DELETEEVENTLOGENTRY 0x00000004 +#define SPSVCINST_NOCLOBBER_DISPLAYNAME 0x00000008 +#define SPSVCINST_NOCLOBBER_STARTTYPE 0x00000010 +#define SPSVCINST_NOCLOBBER_ERRORCONTROL 0x00000020 +#define SPSVCINST_NOCLOBBER_LOADORDERGROUP 0x00000040 +#define SPSVCINST_NOCLOBBER_DEPENDENCIES 0x00000080 +#define SPSVCINST_NOCLOBBER_DESCRIPTION 0x00000100 +#define SPSVCINST_STOPSERVICE 0x00000200 +#define SPSVCINST_CLOBBER_SECURITY 0x00000400 +#define SPSVCINST_STARTSERVICE 0x00000800 + #define SP_COPY_DELETESOURCE 0x00000001 #define SP_COPY_REPLACEONLY 0x00000002 #define SP_COPY_NEWER 0x00000004

1 0

Zachary Goldberg : WWN 345
by Jeremy Newman April 15, 2008

April 15, 2008

Module: website Branch: master Commit: cd9ab141f6c13f0211e834e47716d4bf800d7291 URL: http://source.winehq.org/git/website.git/?a=commit;h=cd9ab141f6c13f0211e834… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Tue Apr 15 12:53:46 2008 -0400 WWN 345 >From bdcf34f4b8bf8af6b6ff9e94e83f3aa79fd06565 Mon Sep 17 00:00:00 2001 From: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Tue, 15 Apr 2008 12:52:04 -0400 Subject: [WineHQ][WWN] WWN 345 To: wine-patches <wine-patches(a)winehq.org>, Jeremy Newman <jnewman(a)codeweavers.com> --- news/2008041401.xml | 7 + wwn/wn20080415_345.xml | 2129 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 2136 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=cd9ab141f6c13f0211…

1 0