wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Rob Shearman : ole32: Add some tests for OleGetClipboard.
by Alexandre Julliard 16 Apr '08

16 Apr '08

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

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 16 Apr '08

16 Apr '08

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

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

16 Apr '08

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

Alexandre Julliard : fusion: Fix a number of leaks in assembly_create.
by Alexandre Julliard 16 Apr '08

16 Apr '08

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

Alexandre Julliard : wine.inf: Use a proper services section to install services.
by Alexandre Julliard 16 Apr '08

16 Apr '08

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 16 Apr '08

16 Apr '08

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 16 Apr '08

16 Apr '08

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 16 Apr '08

16 Apr '08

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 16 Apr '08

16 Apr '08

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 15 Apr '08

15 Apr '08

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

James Hawkins : fusion: Implement IAssemblyCache::InstallAssembly.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 282246eca4aa778f447e8951dea416fb5e817657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=282246eca4aa778f447e8951d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 13 21:00:15 2008 -0500 fusion: Implement IAssemblyCache::InstallAssembly. --- dlls/fusion/Makefile.in | 3 +- dlls/fusion/asmcache.c | 134 ++++++++++- dlls/fusion/assembly.c | 573 ++++++++++++++++++++++++++++++++++++++++++ dlls/fusion/fusionpriv.h | 212 ++++++++++++++++ dlls/fusion/tests/asmcache.c | 61 ++--- 5 files changed, 943 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=282246eca4aa778f447e8…

1 0

Andrew Talbot : crypt32: Remove unused variables.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: d3afff856eae9e163a22d534d50cff4e7368670b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3afff856eae9e163a22d534d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Apr 14 22:13:41 2008 +0100 crypt32: Remove unused variables. --- dlls/crypt32/oid.c | 3 +-- dlls/crypt32/store.c | 2 -- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 980c750..5a71c74 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -938,7 +938,6 @@ BOOL WINAPI CryptRegisterDefaultOIDFunction(DWORD dwEncodingType, { HKEY key; LPWSTR dlls; - LPCWSTR existing; BOOL ret = FALSE; TRACE("(%x, %s, %d, %s)\n", dwEncodingType, debugstr_a(pszFuncName), @@ -954,7 +953,7 @@ BOOL WINAPI CryptRegisterDefaultOIDFunction(DWORD dwEncodingType, return FALSE; dlls = CRYPT_GetDefaultOIDDlls(key); - if ((existing = CRYPT_FindStringInMultiString(dlls, pwszDll))) + if (CRYPT_FindStringInMultiString(dlls, pwszDll)) SetLastError(ERROR_FILE_EXISTS); else { diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 20d71b7..84d326c 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -291,7 +291,6 @@ static PWINECRYPT_CERTSTORE CRYPT_SysRegOpenStoreW(HCRYPTPROV hCryptProv, PWINECRYPT_CERTSTORE store = NULL; HKEY root; LPCWSTR base; - BOOL ret; TRACE("(%ld, %08x, %s)\n", hCryptProv, dwFlags, debugstr_w((LPCWSTR)pvPara)); @@ -304,7 +303,6 @@ static PWINECRYPT_CERTSTORE CRYPT_SysRegOpenStoreW(HCRYPTPROV hCryptProv, if (!lstrcmpiW(storeName, rootW)) return CRYPT_RootOpenStore(hCryptProv, dwFlags); - ret = TRUE; switch (dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK) { case CERT_SYSTEM_STORE_LOCAL_MACHINE:

1 0

Andrew Talbot : comdlg32: Remove unused variables.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 1089e165a4747d03bd3ac34ca17eee6083e55504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1089e165a4747d03bd3ac34ca… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Apr 14 22:13:38 2008 +0100 comdlg32: Remove unused variables. --- dlls/comdlg32/printdlg.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index ea5d34e..808a33c 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1247,7 +1247,6 @@ static LRESULT check_printer_setup(HWND hDlg) { DWORD needed,num; WCHAR resourcestr[256],resultstr[256]; - int res; EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &needed, &num); if(needed == 0) @@ -1260,7 +1259,7 @@ static LRESULT check_printer_setup(HWND hDlg) { LoadStringW(COMDLG32_hInstance, PD32_NO_DEVICES,resultstr, 255); LoadStringW(COMDLG32_hInstance, PD32_PRINT_TITLE,resourcestr, 255); - res = MessageBoxW(hDlg, resultstr, resourcestr,MB_OK | MB_ICONWARNING); + MessageBoxW(hDlg, resultstr, resourcestr,MB_OK | MB_ICONWARNING); return FALSE; } } @@ -2566,15 +2565,13 @@ _c_str2sizeW(const PAGESETUPDLGW *dlga, LPCWSTR strin) { */ static BOOL PRINTDLG_PS_UpdateDlgStructA(HWND hDlg, PageSetupDataA *pda) { - DEVNAMES *dn; DEVMODEA *dm; DWORD paperword; memcpy(pda->dlga, &pda->curdlg, sizeof(pda->curdlg)); pda->dlga->hDevMode = pda->pdlg.hDevMode; pda->dlga->hDevNames = pda->pdlg.hDevNames; - - dn = GlobalLock(pda->pdlg.hDevNames); + dm = GlobalLock(pda->pdlg.hDevMode); /* Save paper orientation into device context */ @@ -2599,7 +2596,6 @@ PRINTDLG_PS_UpdateDlgStructA(HWND hDlg, PageSetupDataA *pda) { else FIXME("could not get dialog text for papersize cmbbox?\n"); - GlobalUnlock(pda->pdlg.hDevNames); GlobalUnlock(pda->pdlg.hDevMode); return TRUE;

1 0

Andrew Talbot : crypt32: Remove unwanted shadow variable.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 8a1d3b334d539728e7ae49f442cc1f757bf09620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a1d3b334d539728e7ae49f44… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Apr 14 22:02:20 2008 +0100 crypt32: Remove unwanted shadow variable. --- dlls/crypt32/encode.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index f769afc..9071e5c 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1227,7 +1227,6 @@ static BOOL WINAPI CRYPT_DEREncodeItemsAsSet(DWORD dwCertEncodingType, if (ret) { DWORD bytesNeeded = 0, lenBytes; - BOOL ret; for (i = 0; i < setOf.cBlob; i++) bytesNeeded += setOf.rgBlob[i].cbData;

1 0

Marcus Meissner : d3d9: Initialized 2 variables with NULL.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: c59f18121f003ec0586a896ff12f4bb0914a1a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59f18121f003ec0586a896ff… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Apr 15 09:30:30 2008 +0200 d3d9: Initialized 2 variables with NULL. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e8866c0..e977930 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2043,8 +2043,8 @@ static void fill_surface(IDirect3DSurface9 *surface, DWORD color) static void stretchrect_test(IDirect3DDevice9 *device) { HRESULT hr; - IDirect3DTexture9 *tex_rt32 = NULL, *tex_rt64 = NULL, *tex_rt_dest64; - IDirect3DSurface9 *surf_tex_rt32 = NULL, *surf_tex_rt64 = NULL, *surf_tex_rt_dest64; + IDirect3DTexture9 *tex_rt32 = NULL, *tex_rt64 = NULL, *tex_rt_dest64 = NULL; + IDirect3DSurface9 *surf_tex_rt32 = NULL, *surf_tex_rt64 = NULL, *surf_tex_rt_dest64 = NULL; IDirect3DTexture9 *tex32 = NULL, *tex64 = NULL, *tex_dest64 = NULL; IDirect3DSurface9 *surf_tex32 = NULL, *surf_tex64 = NULL, *surf_tex_dest64 = NULL; IDirect3DSurface9 *surf_rt32 = NULL, *surf_rt64 = NULL, *surf_rt_dest64 = NULL;

1 0

Marcus Meissner : shell32: Correct casing for "Wine".
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: e8a6f15b3d2a9f33d98c1780d73cbc4c92894cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a6f15b3d2a9f33d98c1780d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Apr 2 09:37:25 2008 +0200 shell32: Correct casing for "Wine". --- dlls/shell32/shell32_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index 73068d4..f5e0291 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -149,7 +149,7 @@ FONT 10, "MS Shell Dlg" LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 LTEXT "Wine Version %s", IDC_ABOUT_STATIC_TEXT3, 40, 34, 170, 10 - LTEXT "WINE wurde f�r Sie gekeltert von:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "Wine wurde f�r Sie gekeltert von:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95

1 0

Lei Zhang : user32: Handle ctrl + end in edit control.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 483116a89e96430b9ce41b629e5c75b52d45e7cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=483116a89e96430b9ce41b629… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 14 17:18:40 2008 -0700 user32: Handle ctrl + end in edit control. --- dlls/user32/edit.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index e367e6e..a5265e9 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -211,7 +211,7 @@ static void EDIT_LockBuffer(EDITSTATE *es); static BOOL EDIT_MakeFit(EDITSTATE *es, UINT size); static BOOL EDIT_MakeUndoFit(EDITSTATE *es, UINT size); static void EDIT_MoveBackward(EDITSTATE *es, BOOL extend); -static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend); +static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend, BOOL ctrl); static void EDIT_MoveForward(EDITSTATE *es, BOOL extend); static void EDIT_MoveHome(EDITSTATE *es, BOOL extend, BOOL ctrl); static void EDIT_MoveWordBackward(EDITSTATE *es, BOOL extend); @@ -2012,13 +2012,13 @@ static void EDIT_MoveDown_ML(EDITSTATE *es, BOOL extend) * EDIT_MoveEnd * */ -static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend) +static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend, BOOL ctrl) { BOOL after_wrap = FALSE; INT e; /* Pass a high value in x to make sure of receiving the end of the line */ - if (es->style & ES_MULTILINE) + if (!ctrl && (es->style & ES_MULTILINE)) e = EDIT_CharFromPos(es, 0x3fffffff, HIWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP)), &after_wrap); else @@ -4568,7 +4568,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) EDIT_MoveHome(es, shift, control); break; case VK_END: - EDIT_MoveEnd(es, shift); + EDIT_MoveEnd(es, shift, control); break; case VK_PRIOR: if (es->style & ES_MULTILINE) @@ -4598,7 +4598,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) } else if (control) { /* delete to end of line */ EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); - EDIT_MoveEnd(es, TRUE); + EDIT_MoveEnd(es, TRUE, FALSE); EDIT_WM_Clear(es); } else { /* delete character right of caret */

1 0

Lei Zhang : user32: Handle ctrl + home in edit control.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: dfdd9290a7d90e11fec3a1045ad48fae6d79921e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfdd9290a7d90e11fec3a1045… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 14 17:16:36 2008 -0700 user32: Handle ctrl + home in edit control. --- dlls/user32/edit.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index c969ea2..e367e6e 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -213,7 +213,7 @@ static BOOL EDIT_MakeUndoFit(EDITSTATE *es, UINT size); static void EDIT_MoveBackward(EDITSTATE *es, BOOL extend); static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend); static void EDIT_MoveForward(EDITSTATE *es, BOOL extend); -static void EDIT_MoveHome(EDITSTATE *es, BOOL extend); +static void EDIT_MoveHome(EDITSTATE *es, BOOL extend, BOOL ctrl); static void EDIT_MoveWordBackward(EDITSTATE *es, BOOL extend); static void EDIT_MoveWordForward(EDITSTATE *es, BOOL extend); static void EDIT_PaintLine(EDITSTATE *es, HDC hdc, INT line, BOOL rev); @@ -2058,12 +2058,12 @@ static void EDIT_MoveForward(EDITSTATE *es, BOOL extend) * Home key: move to beginning of line. * */ -static void EDIT_MoveHome(EDITSTATE *es, BOOL extend) +static void EDIT_MoveHome(EDITSTATE *es, BOOL extend, BOOL ctrl) { INT e; /* Pass the x_offset in x to make sure of receiving the first position of the line */ - if (es->style & ES_MULTILINE) + if (!ctrl && (es->style & ES_MULTILINE)) e = EDIT_CharFromPos(es, -es->x_offset, HIWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP)), NULL); else @@ -4028,7 +4028,7 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) case '\n': if (es->style & ES_MULTILINE) { if (es->style & ES_READONLY) { - EDIT_MoveHome(es, FALSE); + EDIT_MoveHome(es, FALSE, FALSE); EDIT_MoveDown_ML(es, FALSE); } else { static const WCHAR cr_lfW[] = {'\r','\n',0}; @@ -4565,7 +4565,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) EDIT_MoveForward(es, shift); break; case VK_HOME: - EDIT_MoveHome(es, shift); + EDIT_MoveHome(es, shift, control); break; case VK_END: EDIT_MoveEnd(es, shift);

1 0

Lei Zhang : user32: Do checks in the right order in EDIT_BuildLineDefs_ML.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 4aef5cb86dcb1e2692a233883f3fe102a5477334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aef5cb86dcb1e2692a233883… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 14 16:53:42 2008 -0700 user32: Do checks in the right order in EDIT_BuildLineDefs_ML. --- dlls/user32/edit.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index b2bfe1c..c969ea2 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1277,9 +1277,9 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta current_line->width = (INT)LOWORD(GetTabbedTextExtentW(dc, current_position, current_line->net_length, es->tabs_count, es->tabs)); } - else if (orig_net_length < current_line->net_length && - current_line == start_line && - current_line->index != nstart_index) { + else if (current_line == start_line && + current_line->index != nstart_index && + orig_net_length < current_line->net_length) { /* The previous line expanded but it's still not as wide as the client rect */ /* The expansion is due to an upwards line wrap so we must partially include it in the update region */

1 0

Jacek Caban : mshtml.idl: Added IHTMLWindow3 declaration.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: b56a072eb964f51afc8f7e34a4d18207c1f5a868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56a072eb964f51afc8f7e34a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 15 02:09:14 2008 +0200 mshtml.idl: Added IHTMLWindow3 declaration. --- include/mshtml.idl | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index f82391d..16ff754 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -4488,6 +4488,74 @@ interface IHTMLWindow2 : IHTMLFramesCollection2 } /***************************************************************************** + * IHTMLWindow3 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f4ae-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLWindow3 : IDispatch +{ + [propget, id(DISPID_IHTMLWINDOW3_SCREENLEFT)] + HRESULT screenLeft([out, retval] long *p); + + [propget, id(DISPID_IHTMLWINDOW3_SCREENTOP)] + HRESULT screenTop([out, retval] long *p); + + [id(DISPID_IHTMLWINDOW3_ATTACHEVENT)] + HRESULT attachEvent( + [in] BSTR event, + [in] IDispatch *pDisp, + [out, retval] VARIANT_BOOL *pfResult); + + [id(DISPID_IHTMLWINDOW3_DETACHEVENT)] + HRESULT detachEvent( + [in] BSTR event, + [in] IDispatch *pDisp); + + [id(DISPID_IHTMLWINDOW3_SETTIMEOUT)] + HRESULT setTimeout( + [in] VARIANT *expression, + [in] long msec, + [in, optional] VARIANT *language, + [out, retval] long *timerID); + + [id(DISPID_IHTMLWINDOW3_SETINTERVAL)] + HRESULT setInterval( + [in] VARIANT *expression, + [in] long msec, + [in, optional] VARIANT *language, + [out, retval] long *timerID); + + [id(DISPID_IHTMLWINDOW3_PRINT)] + HRESULT print(); + + [propput, id(DISPID_IHTMLWINDOW3_ONBEFOREPRINT), displaybind, bindable] + HRESULT onbeforeprint([in] VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW3_ONBEFOREPRINT), displaybind, bindable] + HRESULT onbeforeprint([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLWINDOW3_ONAFTERPRINT), displaybind, bindable] + HRESULT onafterprint([in] VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW3_ONAFTERPRINT), displaybind, bindable] + HRESULT onafterprint([out, retval] VARIANT *p); + + [propget, id(DISPID_IHTMLWINDOW3_CLIPBOARDDATA)] + HRESULT clipboardData([out, retval] IHTMLDataTransfer **p); + + [id(DISPID_IHTMLWINDOW3_SHOWMODELESSDIALOG)] + HRESULT showModelessDialog( + [in, defaultvalue("")] BSTR url, + [in, optional] VARIANT *varArgIn, + [in, optional] VARIANT *options, + [out, retval] IHTMLWindow2 **pDialog); +} + +/***************************************************************************** * DispHTMLWindow2 dispinterface */ [

1 0

Jacek Caban : mshtmdid.h: Fixed IHTMLWindow2 dispids.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 9a0a0453100e8912b74fb05059b12d292bccc9d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0a0453100e8912b74fb0505… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 15 02:09:00 2008 +0200 mshtmdid.h: Fixed IHTMLWindow2 dispids. --- include/mshtmdid.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 64ae3cc..c77619e 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1322,7 +1322,7 @@ #define DISPID_IHTMLWINDOW2_FRAMES 1100 #define DISPID_IHTMLWINDOW2_DEFAULTSTATUS 1101 #define DISPID_IHTMLWINDOW2_STATUS 1102 -#define DISPID_IHTMLWINDOW2_SETTIMEOUT 1103 +#define DISPID_IHTMLWINDOW2_SETTIMEOUT 1172 #define DISPID_IHTMLWINDOW2_CLEARTIMEOUT 1104 #define DISPID_IHTMLWINDOW2_ALERT 1105 #define DISPID_IHTMLWINDOW2_CONFIRM 1110 @@ -1339,7 +1339,7 @@ #define DISPID_IHTMLWINDOW2_BLUR 1159 #define DISPID_IHTMLWINDOW2_SCROLL 1160 #define DISPID_IHTMLWINDOW2_CLIENTINFORMATION 1161 -#define DISPID_IHTMLWINDOW2_SETINTERVAL 1162 +#define DISPID_IHTMLWINDOW2_SETINTERVAL 1173 #define DISPID_IHTMLWINDOW2_CLEARINTERVAL 1163 #define DISPID_IHTMLWINDOW2_OFFSCREENBUFFERING 1164 #define DISPID_IHTMLWINDOW2_EXECSCRIPT 1165

1 0

Maarten Lankhorst : include: Update aviriff header.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 0b326924510faf14acb1fbfd024eedb5ac959803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b326924510faf14acb1fbfd0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 10 15:45:32 2008 -0700 include: Update aviriff header. --- dlls/quartz/avisplit.c | 39 ++++++----- dlls/quartz/fourcc.h | 61 ----------------- dlls/quartz/waveparser.c | 4 +- include/aviriff.h | 161 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 181 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b326924510faf14acb1f…

1 0

Maarten Lankhorst : quartz: Update start_time if the current position is changed.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 1281b74956d28c2814cb5c592121410ddd1b750c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1281b74956d28c2814cb5c592… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 14 13:30:49 2008 -0700 quartz: Update start_time if the current position is changed. --- dlls/quartz/filtergraph.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 94e4003..ee31068 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2126,7 +2126,9 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, TRACE("State: %s\n", state == State_Running ? "Running" : (state == State_Paused ? "Paused" : (state == State_Stopped ? "Stopped" : "UNKNOWN"))); if ((dwCurrentFlags & 0x7) == AM_SEEKING_AbsolutePositioning) + { This->position = *pCurrent; + } else if ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) FIXME("Adjust method %x not handled yet!\n", dwCurrentFlags & 0x7); @@ -2140,6 +2142,12 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, args.curflags = dwCurrentFlags; args.stopflags = dwStopFlags; hr = all_renderers_seek(This, found_setposition, (DWORD_PTR)&args); + + if (This->refClock && ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning)) + { + /* Update start time, prevents weird jumps */ + IReferenceClock_GetTime(This->refClock, &This->start_time); + } LeaveCriticalSection(&This->cs); return hr;

1 0

Maarten Lankhorst : quartz: Add VIDEOINFOHEADER2 support to VideoRenderer.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 3e9cee050f801ab3cd69378d168f5efd51862f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9cee050f801ab3cd69378d1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 11 15:10:19 2008 -0700 quartz: Add VIDEOINFOHEADER2 support to VideoRenderer. --- dlls/quartz/videorenderer.c | 78 +++++++++++++++++++++++++++++------------- 1 files changed, 54 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f363b82..f0a73d7 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -35,7 +35,9 @@ #include "evcode.h" #include "strmif.h" #include "ddraw.h" +#include "dvdmedia.h" +#include "assert.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -263,7 +265,6 @@ static const IMemInputPinVtbl MemInputPin_Vtbl = static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) { - VIDEOINFOHEADER* format; AM_MEDIA_TYPE amt; HRESULT hr = S_OK; DDSURFACEDESC sdesc; @@ -271,6 +272,7 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, int height; LPBYTE palette = NULL; HDC hDC; + BITMAPINFOHEADER *bmiHeader; TRACE("%p %p %d\n", This, data, size); @@ -280,23 +282,39 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, ERR("Unable to retrieve media type\n"); return hr; } - format = (VIDEOINFOHEADER*)amt.pbFormat; - - TRACE("biSize = %d\n", format->bmiHeader.biSize); - TRACE("biWidth = %d\n", format->bmiHeader.biWidth); - TRACE("biHeight = %d\n", format->bmiHeader.biHeight); - TRACE("biPlanes = %d\n", format->bmiHeader.biPlanes); - TRACE("biBitCount = %d\n", format->bmiHeader.biBitCount); - TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(format->bmiHeader.biCompression), 4)); - TRACE("biSizeImage = %d\n", format->bmiHeader.biSizeImage); - - width = format->bmiHeader.biWidth; - height = format->bmiHeader.biHeight; - palette = ((LPBYTE)&format->bmiHeader) + format->bmiHeader.biSize; + + if (IsEqualIID(&amt.formattype, &FORMAT_VideoInfo)) + { + bmiHeader = &((VIDEOINFOHEADER *)amt.pbFormat)->bmiHeader; + } + else if (IsEqualIID(&amt.formattype, &FORMAT_VideoInfo2)) + { + bmiHeader = &((VIDEOINFOHEADER2 *)amt.pbFormat)->bmiHeader; + } + else + { + FIXME("Unknown type %s\n", debugstr_guid(&amt.subtype)); + return VFW_E_RUNTIME_ERROR; + } + + + TRACE("biSize = %d\n", bmiHeader->biSize); + TRACE("biWidth = %d\n", bmiHeader->biWidth); + TRACE("biHeight = %d\n", bmiHeader->biHeight); + TRACE("biPlanes = %d\n", bmiHeader->biPlanes); + TRACE("biBitCount = %d\n", bmiHeader->biBitCount); + TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4)); + TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage); + + width = bmiHeader->biWidth; + height = bmiHeader->biHeight; + palette = ((LPBYTE)bmiHeader) + bmiHeader->biSize; if (!This->init) { - /* Honor previously set WindowPos */ + if (!This->WindowPos.right || !This->WindowPos.bottom) + This->WindowPos = This->SourceRect; + TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); SetWindowPos(This->hWnd, NULL, This->WindowPos.left, @@ -304,8 +322,9 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, This->WindowPos.right - This->WindowPos.left, This->WindowPos.bottom - This->WindowPos.top, SWP_NOZORDER|SWP_NOMOVE); + GetClientRect(This->hWnd, &This->DestRect); - This->init = TRUE; + This->init = TRUE; } hDC = GetDC(This->hWnd); @@ -321,10 +340,9 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, StretchDIBits(hDC, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left, This->DestRect.bottom - This->DestRect.top, This->SourceRect.left, This->SourceRect.top, This->SourceRect.right - This->SourceRect.left, This->SourceRect.bottom - This->SourceRect.top, - data, (BITMAPINFO*)&format->bmiHeader, DIB_RGB_COLORS, SRCCOPY); + data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); ReleaseDC(This->hWnd, hDC); - if (This->AutoShow) ShowWindow(This->hWnd, SW_SHOW); @@ -385,17 +403,29 @@ static HRESULT VideoRenderer_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB8)) { VideoRendererImpl* This = (VideoRendererImpl*) iface; - VIDEOINFOHEADER* format = (VIDEOINFOHEADER*)pmt->pbFormat; - if (!IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) + if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) + { + VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pmt->pbFormat; + This->SourceRect.left = 0; + This->SourceRect.top = 0; + This->SourceRect.right = This->VideoWidth = format->bmiHeader.biWidth; + This->SourceRect.bottom = This->VideoHeight = format->bmiHeader.biHeight; + } + else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) + { + VIDEOINFOHEADER2 *format2 = (VIDEOINFOHEADER2 *)pmt->pbFormat; + + This->SourceRect.left = 0; + This->SourceRect.top = 0; + This->SourceRect.right = This->VideoWidth = format2->bmiHeader.biWidth; + This->SourceRect.bottom = This->VideoHeight = format2->bmiHeader.biHeight; + } + else { WARN("Format type %s not supported\n", debugstr_guid(&pmt->formattype)); return S_FALSE; } - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth = format->bmiHeader.biWidth; - This->SourceRect.bottom = This->VideoHeight = format->bmiHeader.biHeight; return S_OK; } return S_FALSE;

1 0

Jonathan Ernst : winhelp: Updated French translation.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 62010249c551a3ec59fe9cd5fab6c5ae5e129273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62010249c551a3ec59fe9cd5f… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Apr 14 23:28:16 2008 +0200 winhelp: Updated French translation. --- programs/winhelp/Fr.rc | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/programs/winhelp/Fr.rc b/programs/winhelp/Fr.rc index 7318507..200b1de 100644 --- a/programs/winhelp/Fr.rc +++ b/programs/winhelp/Fr.rc @@ -3,6 +3,7 @@ * * Copyright 1996 Ulrich Schmid * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2008 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,7 +29,7 @@ MAIN_MENU MENU POPUP "&Fichier" { MENUITEM "&Ouvrir", MNID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "Im&primer", MNID_FILE_PRINT + MENUITEM "&Imprimer", MNID_FILE_PRINT MENUITEM "&Configuration de l'imprimante...", MNID_FILE_SETUP MENUITEM SEPARATOR MENUITEM "&Quitter", MNID_FILE_EXIT @@ -52,8 +53,18 @@ MAIN_MENU MENU } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER + PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 + PUSHBUTTON "&Annuler", IDCANCEL, 120, 170, 50, 12 +} + /* Strings */ -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT { STID_WINE_HELP, "Aide de WINE" STID_WHERROR, "ERREUR" @@ -68,5 +79,5 @@ STID_HISTORY, "&Historique" STID_TOPICS, "&Sujets" STID_ALL_FILES, "Tous fichiers (*.*)" STID_HELP_FILES_HLP, "Fichiers d'aide (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_FILE_NOT_FOUND_s "Impossible de trouver ��%s��. Souhaitez-vous rechercher ce fichier vous-m�me�?" }

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
52
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 April 2008