April 2008 - wine-commits

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

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

15 Apr '08

Module: wine Branch: master Commit: 2d870e27fbb69e0acee2c68ec33f2de7ac745b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d870e27fbb69e0acee2c68ec… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Apr 14 23:28:02 2008 +0200 winefile: Updated French translation. --- programs/winefile/Fr.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winefile/Fr.rc b/programs/winefile/Fr.rc index 2a8207f..c6294b5 100644 --- a/programs/winefile/Fr.rc +++ b/programs/winefile/Fr.rc @@ -6,7 +6,7 @@ * Copyright 2002 Steven Edwards * Copyright 2002 Alexandre Julliard * Copyright 2003 Sylvain Petreolle - * Copyright 2005-2006 Jonathan Ernst + * Copyright 2005-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 @@ -33,8 +33,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Ouvrir\tEntr�e", ID_ACTIVATE MENUITEM "&D�placer...\tF7", ID_FILE_MOVE MENUITEM "&Copier...\tF8", ID_FILE_COPY - MENUITEM "P&resse-Papiers...\tF9", 118 - MENUITEM "&Effacer\tDel", ID_FILE_DELETE + MENUITEM "P&resse-papiers...\tF9", 118 + MENUITEM "&Effacer\tSuppr", ID_FILE_DELETE MENUITEM "Re&nommer...", 109 MENUITEM "&Propri�t�s...\tAlt+Entree", ID_EDIT_PROPERTIES MENUITEM SEPARATOR @@ -62,7 +62,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM SEPARATOR MENUITEM "&Formater Disque...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "Cr�er un disque *syst�me...", -1 /*TODO*/ + MENUITEM "Cr�er un disque &syst�me...", -1 /*TODO*/ #endif MENUITEM SEPARATOR MENUITEM "Connecter un lecteur &r�seau",ID_CONNECT_NETWORK_DRIVE @@ -167,7 +167,7 @@ CAPTION "S FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Dossier�:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "&Chemin�:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 PUSHBUTTON "Annuler", 2, 158, 23, 47, 14 @@ -179,7 +179,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Par type de fichier" FONT 8, "MS Sans Serif" BEGIN - LTEXT "&Name:",-1,7,8,22,10 + LTEXT "&Nom�:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL GROUPBOX "Type de fichier",-1,7,23,87,56 CONTROL "&R�pertoires",IDC_VIEW_TYPE_DIRECTORIES,"Button", @@ -211,7 +211,7 @@ BEGIN EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Version�:",-1,7,40,59,9 EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Cop&yright:",-1,7,51,59,9 + LTEXT "Cop&yright�:",-1,7,51,59,9 EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Taille�:",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP

1 0

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

15 Apr '08

Module: wine Branch: master Commit: 964d2d1629e5820972a806eb59b9a86469799b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=964d2d1629e5820972a806eb5… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Apr 14 23:27:46 2008 +0200 winecfg: Updated French translation. --- programs/winecfg/Fr.rc | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 3514a42..d77d848 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -37,7 +37,7 @@ BEGIN LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 - LTEXT "Cette biblioth�que est un logiciel libre�; vous pouvez la redistribuer et/ou la modifier conform�ment aux dispositions de la Licence Publique G�n�rale GNU, telle que publi�e par la Free Software Foundation�; version 2.1 de la licence, ou encore (� votre choix) toute version ult�rieure." + LTEXT "Cette biblioth�que est un logiciel libre�; vous pouvez la redistribuer et/ou la modifier suivant les termes de la Licence G�n�rale Publique Limit�e, telle que publi�e par la Free Software Foundation�; soit la version 2.1 de la License, soit (� votre gr�) toute version ult�rieure." IDC_STATIC,119,44,124,72 END @@ -64,6 +64,8 @@ BEGIN CONTROL "Permettre aux applications DirectX d'emp�cher la souris de quitter leur fen�tre",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | BS_MULTILINE,15,14,230,16 + CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,230,8 + CONTROL "Permettre au gestionnaire de &fen�tres de contr�ler les fen�tres",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 LTEXT "Si les fen�tres sont g�r�es par votre gestionnaire de fen�tres, elles auront des bordures standard, elles respecteront votre bureau virtuel et appara�tront dans la liste des fen�tres.\n\nSi les fen�tres ne sont pas g�r�es, elles seront d�connect�es de votre gestionnaire de fen�tres. Ceci signifie qu'elle ne seront pas parfaitement int�gr�es � votre bureau, mais que l'�mulation sera plus pr�cise ce qui permet � certains programmes de mieux fonctionner.", IDC_STATIC,15,45,228,80 @@ -305,5 +307,20 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Texte de la barre de titre active" IDC_SYSPARAMS_INACTIVE_TITLE "Barre de titre inactive" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Texte de la barre de titre inactive" - IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" + IDC_SYSPARAMS_MSGBOX_TEXT "Texte des bo�tes de messages" + IDC_SYSPARAMS_APPWORKSPACE "Espace de travail de l'application" + IDC_SYSPARAMS_WINDOW_FRAME "Cadre de la fen�tre" + IDC_SYSPARAMS_ACTIVE_BORDER "Bordure active" + IDC_SYSPARAMS_INACTIVE_BORDER "Bordure inactive" + IDC_SYSPARAMS_BUTTON_SHADOW "Ombre des contr�les" + IDC_SYSPARAMS_GRAY_TEXT "Texte gris" + IDC_SYSPARAMS_BUTTON_HILIGHT "Surbrillance des contr�les" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Ombre sombre des contr�les" + IDC_SYSPARAMS_BUTTON_LIGHT "Lumi�re des contr�les" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Fond alternatif des contr�les" + IDC_SYSPARAMS_HOT_TRACKING "�l�ment actif" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "D�grad� de la barre de titre active" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "D�grad� de la barre de titre inactive" + IDC_SYSPARAMS_MENU_HILIGHT "Surbrillance du menu" + IDC_SYSPARAMS_MENUBAR "Barre de menu" END

1 0

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

15 Apr '08

Module: wine Branch: master Commit: eb2dadaea19528e490df009d80a7d150ac660766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2dadaea19528e490df009d8… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Apr 14 22:22:33 2008 +0200 comdlg32: Updated French translation. --- dlls/comdlg32/cdlg_Fr.rc | 145 ++++++++++++++++++++++++--------------------- 1 files changed, 77 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb2dadaea19528e490df0…

1 0

Jörg Höhle : wined3d: Fix missing break inside switch in SetAutoGenFilterType.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: b36d4a1d517a17d848bedee13152ad8101c6e93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36d4a1d517a17d848bedee13… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Apr 14 17:16:25 2008 +0200 wined3d: Fix missing break inside switch in SetAutoGenFilterType. --- dlls/wined3d/basetexture.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index bc004c0..000c2f2 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -198,10 +198,12 @@ HRESULT WINAPI IWineD3DBaseTextureImpl_SetAutoGenFilterType(IWineD3DBaseTexture glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_FASTEST); checkGLcall("glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_FASTEST)"); + break; case WINED3DTEXF_LINEAR: glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST); checkGLcall("glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST)"); + break; default: WARN("Unexpected filter type %d, setting to GL_NICEST\n", FilterType); glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST);

1 0

Aric Stewart : user32: Call ImmProcessKey in TranslateMessage to allow IMEs to handle key processing if they choose to .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: f51542d9b5c3601dfc3266706a98f996cf909e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51542d9b5c3601dfc3266706… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 14 12:39:28 2008 -0500 user32: Call ImmProcessKey in TranslateMessage to allow IMEs to handle key processing if they choose to. --- dlls/user32/message.c | 4 ++++ include/imm.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 33c12c1..7f3407e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -35,6 +35,7 @@ #include "winnls.h" #include "dbt.h" #include "dde.h" +#include "imm.h" #include "wine/unicode.h" #include "wine/server.h" #include "user_private.h" @@ -2994,6 +2995,9 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) TRACE_(key)("Translating key %s (%04lx), scancode %02x\n", SPY_GetVKeyName(msg->wParam), msg->wParam, LOBYTE(HIWORD(msg->lParam))); + if (ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam,0)) + return TRUE; + GetKeyboardState( state ); /* FIXME : should handle ToUnicode yielding 2 */ switch (ToUnicode(msg->wParam, HIWORD(msg->lParam), state, wp, 2, 0)) diff --git a/include/imm.h b/include/imm.h index 85848e6..1b4cc71 100644 --- a/include/imm.h +++ b/include/imm.h @@ -538,6 +538,7 @@ BOOL WINAPI ImmIsUIMessageA(HWND, UINT, WPARAM, LPARAM); BOOL WINAPI ImmIsUIMessageW(HWND, UINT, WPARAM, LPARAM); #define ImmIsUIMessage WINELIB_NAME_AW(ImmIsUIMessage) BOOL WINAPI ImmNotifyIME(HIMC, DWORD, DWORD, DWORD); +BOOL WINAPI ImmProcessKey(HWND, HKL, UINT, LPARAM, DWORD); BOOL WINAPI ImmRegisterWordA(HKL, LPCSTR, DWORD, LPCSTR); BOOL WINAPI ImmRegisterWordW(HKL, LPCWSTR, DWORD, LPCWSTR); #define ImmRegisterWord WINELIB_NAME_AW(ImmRegisterWord)

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1=20?=: user32: Updated Korean resource.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: d20d374f77fdfaa0686547e2b7328a70ca9ada04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20d374f77fdfaa0686547e2b… Author: Hwang YunSong(황윤성 <hys545(a)dreamwiz.com> Date: Mon Apr 14 09:37:05 2008 +0900 user32: Updated Korean resource. --- dlls/user32/resources/user32_Ko.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/resources/user32_Ko.rc b/dlls/user32/resources/user32_Ko.rc index c845578..9b2c307 100644 --- a/dlls/user32/resources/user32_Ko.rc +++ b/dlls/user32/resources/user32_Ko.rc @@ -62,9 +62,9 @@ BEGIN PUSHBUTTON "��(&I)", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "��(&Y)", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "�ƴϿ�(&N)", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "�ٽ� �õ�(&T)", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "��(&C)," 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "��", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1=20?=: winecfg: Updated Korean resource.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 06acbbe064479d79b0ece828c7e5c9d993884c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=06acbbe064479d79b0ece828c… Author: Hwang YunSong(황윤성 <hys545(a)dreamwiz.com> Date: Mon Apr 14 09:36:07 2008 +0900 winecfg: Updated Korean resource. --- programs/winecfg/Ko.rc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 3b47418..842c0e4 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -64,8 +64,10 @@ STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " â �� ",IDC_STATIC,8,4,244,180 + CONTROL "DirectX ��α׷� â�� 콺�� ϰ� ��(&M)",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + + CONTROL "�� â ��ڰ� â�� ٹ̵�� (&D)",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,230,8 - CONTROL "DirectX ��α׷�� 콺 Ŀ�� ׵�� â�ȿ� ��Ƶΰ� ��(&M)",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,230,8 LTEXT "Wineâ�� â��ڿ� ��ؼ� ��ȴٸ�, Wineâ�� ǥ�� âƲ�� ̸�, �۾�� ڿ� �� ︱ ��Դϴ�. �׸�� â��Ͽ�� Ÿ�� Դϴ�.\n\n��࿡ Wineâ�� â��ڿ� �� ʴ´ٸ�, Wineâ�� â��ڿ� �� Դϴ�. �̰�� Wineâ�� ũž�� ϰ� ��յ�� ʴ´ٴ� �� ǹ��մϴ�. �� Wine�� 䳻��Ⱑ �� α׷�� ֵ�� ݴϴ�.", IDC_STATIC,15,37,228,80 CONTROL "â��ڰ� Wineâ�� ϵ�� (&W)",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,230,8

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1=20?=: winemine: Updated Korean resource.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 0928df2483b6b428756641bf713168e106ee839b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0928df2483b6b428756641bf7… Author: Hwang YunSong(황윤성 <hys545(a)dreamwiz.com> Date: Mon Apr 14 09:35:17 2008 +0900 winemine: Updated Korean resource. --- programs/winemine/Ko.rc | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/winemine/Ko.rc b/programs/winemine/Ko.rc index bd27674..7ec4cb0 100644 --- a/programs/winemine/Ko.rc +++ b/programs/winemine/Ko.rc @@ -53,7 +53,6 @@ DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "�� ð�" -FONT 8, "MS Shell Dlg" { GROUPBOX "�ִ� �ð�", IDIGNORE, 10, 10, 140, 45 LTEXT "�ʺ��", IDIGNORE, 20, 20, 40, 8 @@ -72,7 +71,6 @@ DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "��մϴ�!" -FONT 8, "MS Shell Dlg" { LTEXT "�� ̸�� ּ��", IDIGNORE, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -83,7 +81,6 @@ DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "�� " -FONT 8, "MS Shell Dlg" { LTEXT "��", IDIGNORE, 5, 5, 30, 10 LTEXT "��", IDIGNORE, 5, 35, 30, 10

1 0

Alexander Nicolaysen Sørnes : winhelp: Update Norwegian Bokmål resource.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: a593d07d2d373ba904a267dbf7528db59a0a2be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a593d07d2d373ba904a267dbf… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Apr 14 18:14:26 2008 +0200 winhelp: Update Norwegian Bokmål resource. --- programs/winhelp/No.rc | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/No.rc b/programs/winhelp/No.rc index f016efb..9f60725 100644 --- a/programs/winhelp/No.rc +++ b/programs/winhelp/No.rc @@ -1,7 +1,7 @@ /* * Help Viewer * - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2008 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -44,11 +44,21 @@ MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL MENUITEM SEPARATOR MENUITEM "&Informasjon . . .", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&om WINE", MNID_HELP_WINE + MENUITEM "&Om WINE", MNID_HELP_WINE #endif } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Innhold" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER + PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 + PUSHBUTTON "&Avbryt", IDCANCEL, 120, 170, 50, 12 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL {

1 0

Alexander Nicolaysen Sørnes : regedit: Update Norwegian Bokmål resource.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: a4649d37301a657dbdda88500031224881a64347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4649d37301a657dbdda88500… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Apr 14 18:01:44 2008 +0200 regedit: Update Norwegian Bokmål resource. --- programs/regedit/No.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/No.rc b/programs/regedit/No.rc index 0ee4d36..ee57f2a 100644 --- a/programs/regedit/No.rc +++ b/programs/regedit/No.rc @@ -201,7 +201,7 @@ CAPTION "Rediger bin FONT 8, "MS Shell Dlg" BEGIN LTEXT "Verdinavn:",IDC_STATIC,5,5,119,8 - EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | WS_DISABLED + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED LTEXT "Verdidata:",IDC_STATIC,5,30,90,8 CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,4,40,160,40 DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP

1 0

Maarten Lankhorst : include: Add dvdmedia stub header.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 271f2eda14a1345044df11deeedb735435ad1015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=271f2eda14a1345044df11dee… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 11 15:03:33 2008 -0700 include: Add dvdmedia stub header. --- include/Makefile.in | 1 + include/dvdmedia.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 11ee8b6..d03f7cf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -180,6 +180,7 @@ SRCDIR_INCLUDES = \ dshow.h \ dsound.h \ dsrole.h \ + dvdmedia.h \ dwmapi.h \ dxdiag.h \ dxerr8.h \ diff --git a/include/dvdmedia.h b/include/dvdmedia.h new file mode 100644 index 0000000..9a29994 --- /dev/null +++ b/include/dvdmedia.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2008 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __DVDMEDIA_H__ +#define __DVDMEDIA_H__ + +#define AMCONTROL_USED 0x00000001 +#define AMCONTROL_PAD_TO_4x3 0x00000002 +#define AMCONTROL_PAD_TO_16x9 0x00000004 + +typedef struct tagVIDEOINFOHEADER2 { + RECT rcSource; + RECT rcTarget; + DWORD dwBitRate; + DWORD dwBitErrorRate; + REFERENCE_TIME AvgTimePerFrame; + DWORD dwInterlaceFlags; + DWORD dwCopyProtectFlags; + DWORD dwPictAspectRatioX; + DWORD dwPictAspectRatioY; + union { + DWORD dwControlFlags; + DWORD dwReserved1; + } DUMMYUNIONNAME; + DWORD dwReserved2; + BITMAPINFOHEADER bmiHeader; +} VIDEOINFOHEADER2; + +#endif /* __DVDMEDIA_H__ */

1 0

Maarten Lankhorst : quartz: Bring waveparser to the same level as the mpeg splitter.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: ebe438c82a017e20500bc7c725cb12f83f70123f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe438c82a017e20500bc7c72… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 12 16:52:26 2008 -0700 quartz: Bring waveparser to the same level as the mpeg splitter. --- dlls/quartz/waveparser.c | 151 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 127 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 55fad4c..7f4a96f 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -48,10 +48,32 @@ typedef struct WAVEParserImpl LONGLONG StartOfFile; /* in media time */ LONGLONG EndOfFile; DWORD dwSampleSize; - FLOAT fSamplesPerSec; + DWORD nSamplesPerSec; DWORD dwLength; } WAVEParserImpl; +static LONGLONG bytepos_to_duration(WAVEParserImpl *This, LONGLONG bytepos) +{ + LONGLONG duration = BYTES_FROM_MEDIATIME(bytepos - This->StartOfFile); + duration *= 10000000; + duration /= (This->dwSampleSize * This->nSamplesPerSec); + + return duration; +} + +static LONGLONG duration_to_bytepos(WAVEParserImpl *This, LONGLONG duration) +{ + LONGLONG bytepos; + + bytepos = (This->dwSampleSize * This->nSamplesPerSec); + bytepos *= duration; + bytepos /= 10000000; + bytepos += BYTES_FROM_MEDIATIME(This->StartOfFile); + bytepos -= bytepos % This->dwSampleSize; + + return MEDIATIME_FROM_BYTES(bytepos); +} + static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample) { WAVEParserImpl *This = (WAVEParserImpl *)iface; @@ -65,7 +87,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample) long cbDstStream; long chunk_remaining_bytes = 0; long offset_src = 0; - + hr = IMediaSample_GetPointer(pSample, &pbSrcStream); hr = IMediaSample_GetTime(pSample, &tStart, &tStop); @@ -76,17 +98,36 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample) pOutputPin = (Parser_OutputPin *)This->Parser.ppPins[1]; + /* Try to get rid of the current sample in case we had a S_FALSE last time */ + if (This->pCurrentSample && (IMediaSample_GetActualDataLength(This->pCurrentSample) == IMediaSample_GetSize(This->pCurrentSample))) + { + HRESULT hr; + + /* Unset advancement */ + This->Parser.pInputPin->rtCurrent -= MEDIATIME_FROM_BYTES(cbSrcStream); + + hr = OutputPin_SendSample(&pOutputPin->pin, This->pCurrentSample); + + if (hr != S_OK) + return hr; + + IMediaSample_Release(This->pCurrentSample); + This->pCurrentSample = NULL; + + This->Parser.pInputPin->rtCurrent += MEDIATIME_FROM_BYTES(cbSrcStream); + } + if (tStop < This->StartOfFile) - return S_OK; + return S_OK; if (tStart < This->StartOfFile) - offset_src = BYTES_FROM_MEDIATIME(This->StartOfFile - tStart); + offset_src = BYTES_FROM_MEDIATIME(This->StartOfFile - tStart); while (bMoreData) { if (!This->pCurrentSample) { - /* cache media sample until it is ready to be despatched + /* cache media sample until it is ready to be dispatched * (i.e. we reach the end of the chunk) */ hr = OutputPin_GetDeliveryBuffer(&pOutputPin->pin, &This->pCurrentSample, NULL, NULL, 0); @@ -126,36 +167,42 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample) if (SUCCEEDED(hr)) { - REFERENCE_TIME tAviStart, tAviStop; + REFERENCE_TIME tAviStart, tAviStop, tOffset; /* FIXME: hack */ if (pOutputPin->dwSamplesProcessed == 0) { IMediaSample_SetDiscontinuity(This->pCurrentSample, TRUE); - IMediaSample_SetSyncPoint(This->pCurrentSample, TRUE); } - + IMediaSample_SetSyncPoint(This->pCurrentSample, TRUE); pOutputPin->dwSamplesProcessed++; - if (This->dwSampleSize) - tAviStart = (LONGLONG)ceil(10000000.0 * (float)(pOutputPin->dwSamplesProcessed - 1) * (float)IMediaSample_GetActualDataLength(This->pCurrentSample) / ((float)This->dwSampleSize * This->fSamplesPerSec)); - else - tAviStart = (LONGLONG)ceil(10000000.0 * (float)(pOutputPin->dwSamplesProcessed - 1) / (float)This->fSamplesPerSec); - if (This->dwSampleSize) - tAviStop = (LONGLONG)ceil(10000000.0 * (float)pOutputPin->dwSamplesProcessed * (float)IMediaSample_GetActualDataLength(This->pCurrentSample) / ((float)This->dwSampleSize * This->fSamplesPerSec)); - else - tAviStop = (LONGLONG)ceil(10000000.0 * (float)pOutputPin->dwSamplesProcessed / (float)This->fSamplesPerSec); + tOffset = MEDIATIME_FROM_BYTES(offset_src + chunk_remaining_bytes - IMediaSample_GetActualDataLength(This->pCurrentSample)); + tAviStart = bytepos_to_duration(This, tStart + tOffset); + + tOffset += MEDIATIME_FROM_BYTES(IMediaSample_GetActualDataLength(This->pCurrentSample)); + tAviStop = bytepos_to_duration(This, tStart + tOffset); IMediaSample_SetTime(This->pCurrentSample, &tAviStart, &tAviStop); hr = OutputPin_SendSample(&pOutputPin->pin, This->pCurrentSample); - if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) + if (hr != S_OK && hr != VFW_E_NOT_CONNECTED && hr != S_FALSE) ERR("Error sending sample (%x)\n", hr); } - if (This->pCurrentSample) + if (This->pCurrentSample && hr != S_FALSE) + { IMediaSample_Release(This->pCurrentSample); - - This->pCurrentSample = NULL; + This->pCurrentSample = NULL; + } + if (hr == S_FALSE) + { + /* Break out */ + offset_src += chunk_remaining_bytes; + This->Parser.pInputPin->rtCurrent -= BYTES_FROM_MEDIATIME(cbSrcStream - offset_src); + hr = S_OK; + break; + } + } else { @@ -169,7 +216,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample) offset_src += chunk_remaining_bytes; } - if (tStop >= This->EndOfFile) + if (tStop >= This->EndOfFile || (bytepos_to_duration(This, tStop) >= This->Parser.mediaSeeking.llStop)) { int i; @@ -213,6 +260,54 @@ static HRESULT WAVEParser_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) return S_FALSE; } +static HRESULT WAVEParserImpl_seek(IBaseFilter *iface) +{ + WAVEParserImpl *This = (WAVEParserImpl *)iface; + PullPin *pPin = This->Parser.pInputPin; + IPin *victim = NULL; + LONGLONG newpos, curpos, endpos, bytepos; + + newpos = This->Parser.mediaSeeking.llCurrent; + curpos = bytepos_to_duration(This, pPin->rtCurrent); + endpos = bytepos_to_duration(This, This->EndOfFile); + bytepos = duration_to_bytepos(This, newpos); + + if (newpos > endpos) + { + WARN("Requesting position %x%08x beyond end of stream %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(endpos>>32), (DWORD)endpos); + return E_INVALIDARG; + } + + if (curpos/1000000 == newpos/1000000) + { + TRACE("Requesting position %x%08x same as current position %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(curpos>>32), (DWORD)curpos); + return S_OK; + } + + TRACE("Moving sound to %08u bytes!\n", (DWORD)BYTES_FROM_MEDIATIME(bytepos)); + + EnterCriticalSection(&pPin->thread_lock); + IPin_BeginFlush((IPin *)pPin); + + /* Make sure this is done while stopped, BeginFlush takes care of this */ + EnterCriticalSection(&This->Parser.csFilter); + IPin_ConnectedTo(This->Parser.ppPins[1], &victim); + if (victim) + { + IPin_NewSegment(victim, newpos, endpos, pPin->dRate); + IPin_Release(victim); + } + + pPin->rtStart = pPin->rtCurrent = bytepos; + LeaveCriticalSection(&This->Parser.csFilter); + + TRACE("Done flushing\n"); + IPin_EndFlush((IPin *)pPin); + LeaveCriticalSection(&pPin->thread_lock); + + return S_OK; +} + static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) { PullPin *This = (PullPin *)iface; @@ -296,9 +391,17 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) pWAVEParser->dwSampleSize = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; IAsyncReader_Length(This->pReader, &length, &avail); pWAVEParser->dwLength = length / (ULONGLONG)pWAVEParser->dwSampleSize; - pWAVEParser->fSamplesPerSec = ((WAVEFORMATEX*)amt.pbFormat)->nAvgBytesPerSec / ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; + pWAVEParser->nSamplesPerSec = ((WAVEFORMATEX*)amt.pbFormat)->nSamplesPerSec; hr = Parser_AddPin(&(pWAVEParser->Parser), &piOutput, &props, &amt); - + CoTaskMemFree(amt.pbFormat); + + pWAVEParser->Parser.mediaSeeking.llCurrent = 0; + pWAVEParser->Parser.mediaSeeking.llStop = pWAVEParser->Parser.mediaSeeking.llDuration = bytepos_to_duration(pWAVEParser, pWAVEParser->EndOfFile); + TRACE("Duration: %lld seconds\n", pWAVEParser->Parser.mediaSeeking.llDuration / (LONGLONG)10000000); + + This->rtStop = pWAVEParser->EndOfFile; + This->rtStart = pWAVEParser->StartOfFile; + TRACE("WAVE File ok\n"); return hr; @@ -334,7 +437,7 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pCurrentSample = NULL; - hr = Parser_Create(&(This->Parser), &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, NULL, NULL, NULL); + hr = Parser_Create(&(This->Parser), &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, NULL, WAVEParserImpl_seek, NULL); if (FAILED(hr)) return hr;

1 0

Maarten Lankhorst : quartz: Silence seeking fixmes on transform filter.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: ba10e6104a8f485ed40345212a325b94369525d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba10e6104a8f485ed40345212… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 12 19:15:34 2008 -0700 quartz: Silence seeking fixmes on transform filter. --- dlls/quartz/transform.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index df5c746..936d96d 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -139,21 +139,25 @@ static const IMediaSeekingVtbl TransformFilter_Seeking_Vtbl = MediaSeekingImpl_GetPreroll }; +/* These shouldn't be implemented by default. + * Usually only source filters should implement these + * and even it's not needed all of the time + */ static HRESULT TransformFilter_ChangeCurrent(IBaseFilter *iface) { - FIXME("(%p) filter hasn't implemented current position change!\n", iface); + TRACE("(%p) filter hasn't implemented current position change!\n", iface); return S_OK; } static HRESULT TransformFilter_ChangeStop(IBaseFilter *iface) { - FIXME("(%p) filter hasn't implemented stop position change!\n", iface); + TRACE("(%p) filter hasn't implemented stop position change!\n", iface); return S_OK; } static HRESULT TransformFilter_ChangeRate(IBaseFilter *iface) { - FIXME("(%p) filter hasn't implemented rate change!\n", iface); + TRACE("(%p) filter hasn't implemented rate change!\n", iface); return S_OK; }

1 0

Maarten Lankhorst : quartz: Silence requests for IVideoWindow.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 5fb4224f81c8b18ede56dd723c68fb74b76b83a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb4224f81c8b18ede56dd723… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 10 15:38:56 2008 -0700 quartz: Silence requests for IVideoWindow. --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/filesource.c | 2 +- dlls/quartz/nullrenderer.c | 2 +- dlls/quartz/parser.c | 2 +- dlls/quartz/transform.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 529f836..a199e5f 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -372,7 +372,7 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri return S_OK; } - if (!IsEqualIID(riid, &IID_IPin)) + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index b2d6838..2bb5fa7 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -394,7 +394,7 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii return S_OK; } - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking)) + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking) && !IsEqualIID(riid, &IID_IVideoWindow)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 191771b..d871e67 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -249,7 +249,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown * iface, REFIID return S_OK; } - if (!IsEqualIID(riid, &IID_IPin)) + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index a369de2..37cf8ee 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -132,7 +132,7 @@ static HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LP return S_OK; } - if (!IsEqualIID(riid, &IID_IPin)) + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index dbb84a7..df5c746 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -248,7 +248,7 @@ static HRESULT WINAPI TransformFilter_QueryInterface(IBaseFilter * iface, REFIID return S_OK; } - if (!IsEqualIID(riid, &IID_IPin)) + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE;

1 0

Maarten Lankhorst : quartz: Set sane defaults for pin stream rate.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: c8e31b5bdd2d921bf3010aec974b16e327c26479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e31b5bdd2d921bf3010aec9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 12 23:04:07 2008 -0700 quartz: Set sane defaults for pin stream rate. --- dlls/quartz/pin.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 96c4b82..71f33ec 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -246,7 +246,7 @@ static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPi pPinImpl->pAllocator = NULL; pPinImpl->tStart = 0; pPinImpl->tStop = 0; - pPinImpl->dRate = 0; + pPinImpl->dRate = 1.0; pPinImpl->pin.lpVtbl = InputPin_Vtbl; pPinImpl->lpVtblMemInput = &MemInputPin_Vtbl; pPinImpl->flushing = pPinImpl->end_of_stream = 0; @@ -1198,6 +1198,7 @@ static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinI pPinImpl->rtStart = 0; pPinImpl->rtCurrent = 0; pPinImpl->rtStop = ((LONGLONG)0x7fffffff << 32) | 0xffffffff; + pPinImpl->dRate = 1.0; pPinImpl->state = State_Stopped; InitializeCriticalSection(&pPinImpl->thread_lock);

1 0

Maarten Lankhorst : quartz: Don't clean up in avi decoder if driver isn' t opened.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 48f80f629634d1bb62d1f49f4b260647c432eace URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f80f629634d1bb62d1f49f4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 12 23:04:49 2008 -0700 quartz: Don't clean up in avi decoder if driver isn't opened. --- dlls/quartz/avidec.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index b8a1b19..83d212c 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -146,11 +146,14 @@ static HRESULT AVIDec_ProcessEnd(TransformFilterImpl* pTransformFilter) TRACE("(%p)->()\n", This); + if (!This->hvid) + return S_OK; + result = ICDecompressEnd(This->hvid); if (result != ICERR_OK) { ERR("Cannot stop processing (%d)\n", result); - return E_FAIL; + return E_FAIL; } return S_OK; }

1 0

Eric Pouech : richedit: Force window update when the word wrap option has changed.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 296a59da7e03553f05916a211c5bc5d1d5a1fa68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=296a59da7e03553f05916a211… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 14 20:56:51 2008 +0200 richedit: Force window update when the word wrap option has changed. --- dlls/riched20/editor.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 39827bc..7eaf769 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3207,7 +3207,12 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, case EM_SETTARGETDEVICE: if (wParam == 0) { - editor->bWordWrap = (lParam == 0); + BOOL new = (lParam == 0); + if (editor->bWordWrap != new) + { + editor->bWordWrap = new; + ME_RewrapRepaint(editor); + } } else FIXME("Unsupported yet non NULL device in EM_SETTARGETDEVICE\n"); break;

1 0

Dmitry Timoshkov : gdi32: Map glyph to Symbol range only if the font supports symbol encoding.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: baded8789d0b34b049312c052fa4a689e96444e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baded8789d0b34b049312c052… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 14 19:13:48 2008 +0900 gdi32: Map glyph to Symbol range only if the font supports symbol encoding. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index aeb9c7d..bfa986d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4064,7 +4064,7 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) return get_GSUB_vert_glyph(font,ret); } - if(font->charset == SYMBOL_CHARSET && glyph < 0x100) + if(font->ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL && glyph < 0x100) glyph = glyph + 0xf000; glyphId = pFT_Get_Char_Index(font->ft_face, glyph); return get_GSUB_vert_glyph(font,glyphId);

1 0

Austin English : oleaut32: Spelling fixes.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: e8dbd66c239708a344960e357ac2e95f450f6a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8dbd66c239708a344960e357… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 10 18:24:54 2008 -0500 oleaut32: Spelling fixes. --- dlls/oleaut32/dispatch.c | 2 +- dlls/oleaut32/olepicture.c | 2 +- dlls/oleaut32/recinfo.c | 2 +- dlls/oleaut32/safearray.c | 2 +- dlls/oleaut32/tests/vartest.c | 6 +++--- dlls/oleaut32/tests/vartype.c | 4 ++-- dlls/oleaut32/typelib.c | 6 +++--- dlls/oleaut32/ungif.c | 4 ++-- dlls/oleaut32/ungif.h | 2 +- dlls/oleaut32/varformat.c | 2 +- dlls/oleaut32/variant.c | 12 ++++++------ dlls/oleaut32/vartype.c | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8dbd66c239708a344960…

1 0

Alexandre Julliard : winedos: Handle memory reservation errors more gracefully.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 16e8633ee597c68336bc1b1561260fa7d0eced2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=16e8633ee597c68336bc1b156… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 20:39:52 2008 +0200 winedos: Handle memory reservation errors more gracefully. --- dlls/winedos/dosmem.c | 5 ++--- programs/winevdm/winevdm.c | 8 +++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/winedos/dosmem.c b/dlls/winedos/dosmem.c index 9829f1a..876a3e7 100644 --- a/dlls/winedos/dosmem.c +++ b/dlls/winedos/dosmem.c @@ -506,14 +506,13 @@ BOOL DOSMEM_MapDosLayout(void) unsigned short sel; LDT_ENTRY entry; - if (DOSMEM_dosmem) + if (DOSMEM_dosmem || !VirtualProtect( NULL, DOSMEM_SIZE, PAGE_EXECUTE_READWRITE, NULL )) { - ERR( "Needs access to the first megabyte for DOS mode\n" ); + ERR( "Need full access to the first megabyte for DOS mode\n" ); ExitProcess(1); } MESSAGE( "Warning: unprotecting memory to allow real-mode calls.\n" " NULL pointer accesses will no longer be caught.\n" ); - VirtualProtect( NULL, DOSMEM_SIZE, PAGE_EXECUTE_READWRITE, NULL ); /* copy the BIOS and ISR area down */ memcpy( DOSMEM_dosmem, DOSMEM_sysmem, 0x400 + 0x100 ); DOSMEM_sysmem = DOSMEM_dosmem; diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 140efab..263f561 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -383,6 +383,7 @@ int main( int argc, char *argv[] ) char *cmdline, *appname, **first_arg; char *p; HMODULE winedos; + MEMORY_BASIC_INFORMATION mem_info; if (!argv[1]) usage(); @@ -405,7 +406,12 @@ int main( int argc, char *argv[] ) if (!(winedos = LoadLibraryA( "winedos.dll" )) || !(wine_load_dos_exe = (void *)GetProcAddress( winedos, "wine_load_dos_exe" ))) { - WINE_MESSAGE( "winevdm: unable to exec '%s': 16-bit support missing\n", argv[1] ); + WINE_MESSAGE( "winevdm: unable to exec '%s': DOS support unavailable\n", appname ); + ExitProcess(1); + } + if (!VirtualQuery( NULL, &mem_info, sizeof(mem_info) ) || mem_info.State == MEM_FREE) + { + WINE_MESSAGE( "winevdm: unable to exec '%s': DOS memory range unavailable\n", appname ); ExitProcess(1); }

1 0

Alexandre Julliard : kernel32: Reserve the low 64Kb area separately from the rest of the DOS memory.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: f02ef19fdbf5d7396f71433bd26b904577e09fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02ef19fdbf5d7396f71433bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 20:39:27 2008 +0200 kernel32: Reserve the low 64Kb area separately from the rest of the DOS memory. --- dlls/kernel32/dosmem.c | 72 +++++++++++++++++++++++++++++------------------ 1 files changed, 44 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/dosmem.c b/dlls/kernel32/dosmem.c index a976cba..f3aad4c 100644 --- a/dlls/kernel32/dosmem.c +++ b/dlls/kernel32/dosmem.c @@ -142,9 +142,8 @@ static LONG WINAPI dosmem_handler(EXCEPTION_POINTERS* except) { if (except->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION) { - DWORD addr = except->ExceptionRecord->ExceptionInformation[1]; - if (addr >= (ULONG_PTR)DOSMEM_dosmem + DOSMEM_protect && - addr < (ULONG_PTR)DOSMEM_dosmem + DOSMEM_SIZE) + char *addr = (char *)except->ExceptionRecord->ExceptionInformation[1]; + if (addr >= DOSMEM_dosmem + DOSMEM_protect && addr < DOSMEM_dosmem + DOSMEM_SIZE) { if (load_winedos()) return EXCEPTION_CONTINUE_EXECUTION; } @@ -159,42 +158,58 @@ static LONG WINAPI dosmem_handler(EXCEPTION_POINTERS* except) */ static char* setup_dos_mem(void) { - int sys_offset = 0; + size_t size; int page_size = getpagesize(); void *addr = NULL; + void * const low_64k = (void *)DOSMEM_64KB; - if (wine_mmap_is_in_reserved_area( NULL, DOSMEM_SIZE ) != 1) + /* check without the first 64K */ + + if (wine_mmap_is_in_reserved_area( low_64k, DOSMEM_SIZE - DOSMEM_64KB ) != 1) { - addr = wine_anon_mmap( (void *)page_size, DOSMEM_SIZE-page_size, - PROT_READ | PROT_WRITE, 0 ); - if (addr == (void *)page_size) addr = NULL; /* we got what we wanted */ - else munmap( addr, DOSMEM_SIZE - page_size ); + addr = wine_anon_mmap( low_64k, DOSMEM_SIZE - DOSMEM_64KB, PROT_READ | PROT_WRITE, 0 ); + if (addr != low_64k) + { + if (addr != MAP_FAILED) munmap( addr, DOSMEM_SIZE - DOSMEM_64KB ); + ERR("Cannot use first megabyte for DOS address space, please report\n" ); + /* allocate the DOS area somewhere else */ + if (!(DOSMEM_dosmem = VirtualAlloc( NULL, DOSMEM_SIZE, MEM_RESERVE, PAGE_NOACCESS ))) + { + ERR( "Cannot allocate DOS memory\n" ); + ExitProcess(1); + } + return DOSMEM_dosmem; + } } - if (!addr) - { - /* now reserve from address 0 */ - wine_anon_mmap( NULL, DOSMEM_SIZE, PROT_NONE, MAP_FIXED ); + /* now try to allocate the low 64K too */ - /* inform the memory manager that there is a mapping here, but don't commit yet */ - VirtualAlloc( NULL, DOSMEM_SIZE, MEM_RESERVE | MEM_SYSTEM, PAGE_NOACCESS ); - sys_offset = 0xf0000; - DOSMEM_protect = DOSMEM_64KB; - } - else + if (wine_mmap_is_in_reserved_area( NULL, DOSMEM_64KB ) != 1) { - ERR("Cannot use first megabyte for DOS address space, please report\n" ); - /* allocate the DOS area somewhere else */ - addr = VirtualAlloc( NULL, DOSMEM_SIZE, MEM_RESERVE, PAGE_NOACCESS ); - if (!addr) + addr = wine_anon_mmap( (void *)page_size, DOSMEM_64KB - page_size, PROT_READ | PROT_WRITE, 0 ); + if (addr == (void *)page_size) { - ERR( "Cannot allocate DOS memory\n" ); - ExitProcess(1); + addr = NULL; + TRACE( "successfully mapped low 64K range\n" ); + } + else + { + if (addr != MAP_FAILED) munmap( addr, DOSMEM_64KB - page_size ); + addr = low_64k; + TRACE( "failed to map low 64K range\n" ); } } - DOSMEM_dosmem = addr; - RtlAddVectoredExceptionHandler(FALSE, dosmem_handler); - return (char*)addr + sys_offset; + else addr = NULL; + + /* now reserve the whole range */ + size = (char *)DOSMEM_SIZE - (char *)addr; + wine_anon_mmap( addr, size, PROT_NONE, MAP_FIXED ); + + /* inform the memory manager that there is a mapping here, but don't commit yet */ + VirtualAlloc( addr, size, MEM_RESERVE | MEM_SYSTEM, PAGE_NOACCESS ); + DOSMEM_protect = DOSMEM_64KB; + DOSMEM_dosmem = NULL; + return (char *)0xf0000; /* store sysmem in high addresses for now */ } @@ -208,6 +223,7 @@ BOOL DOSMEM_Init(void) { char* sysmem = setup_dos_mem(); + RtlAddVectoredExceptionHandler(FALSE, dosmem_handler); DOSMEM_0000H = GLOBAL_CreateBlock( GMEM_FIXED, sysmem, DOSMEM_64KB, 0, WINE_LDT_FLAGS_DATA ); DOSMEM_BiosDataSeg = GLOBAL_CreateBlock( GMEM_FIXED, sysmem + 0x400,

1 0

Alexandre Julliard : preloader: Reserve low memory areas in separate chunks .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 195ca1e85f01ac40695fbb6fcf9e9e130265f091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=195ca1e85f01ac40695fbb6fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 20:38:17 2008 +0200 preloader: Reserve low memory areas in separate chunks. --- loader/preloader.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index eef0b72..0ca33fd 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -108,7 +108,9 @@ static struct wine_preload_info preload_info[] = { - { (void *)0x00000000, 0x60000000 }, /* low memory area */ + { (void *)0x00000000, 0x00010000 }, /* low 64k */ + { (void *)0x00010000, 0x00100000 }, /* DOS area */ + { (void *)0x00110000, 0x5fef0000 }, /* low memory area */ { (void *)0x7f000000, 0x02000000 }, /* top-down allocations + shared heap */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */ @@ -919,7 +921,7 @@ static void preload_reserve( const char *str ) const char *p; unsigned long result = 0; void *start = NULL, *end = NULL; - int first = 1; + int i, first = 1; for (p = str; *p; p++) { @@ -948,15 +950,22 @@ static void preload_reserve( const char *str ) start = end = NULL; } - /* check for overlap with low memory area */ - if ((char *)end <= (char *)preload_info[0].addr + preload_info[0].size) - start = end = NULL; - else if ((char *)start < (char *)preload_info[0].addr + preload_info[0].size) - start = (char *)preload_info[0].addr + preload_info[0].size; + /* check for overlap with low memory areas */ + for (i = 0; preload_info[i].size; i++) + { + if ((char *)preload_info[i].addr > (char *)0x00110000) break; + if ((char *)end <= (char *)preload_info[i].addr + preload_info[i].size) + { + start = end = NULL; + break; + } + if ((char *)start < (char *)preload_info[i].addr + preload_info[i].size) + start = (char *)preload_info[i].addr + preload_info[i].size; + } - /* entry 2 is for the PE exe */ - preload_info[2].addr = start; - preload_info[2].size = (char *)end - (char *)start; + while (preload_info[i].size) i++; + preload_info[i].addr = start; + preload_info[i].size = (char *)end - (char *)start; return; error:

1 0

Alexandre Julliard : shdocvw: Fixed typo in CLSID_InternetShortcut.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 876257a6dc410c23784e55c75b180ba7547e3581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=876257a6dc410c23784e55c75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 13:57:53 2008 +0200 shdocvw: Fixed typo in CLSID_InternetShortcut. --- dlls/shdocvw/shdocvw.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index 5bc37d8..b765e24 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -120,7 +120,7 @@ HKCR,"InternetShortcut",,,"Internet Shortcut" HKCR,"InternetShortcut","EditFlags",2,"2" HKCR,"InternetShortcut","IsShortcut",, HKCR,"InternetShortcut","NeverShowExt",, -HKCR,"InternetShortcut\CLSID",,,"%CLSID_InteretShortcut%" +HKCR,"InternetShortcut\CLSID",,,"%CLSID_InternetShortcut%" HKCR,"InternetShortcut\DefaultIcon",,,"url.dll,0" HKCR,"InternetShortcut\shell\open\command",,,"rundll32.exe shdocvw.dll,OpenURL %l" HKCR,"InternetShortcut\shell\print\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%1"""

1 0

Rob Shearman : widl: Add checking to arguments of non-local functions.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 2ac495c85d884548c053e0ed6aac78d128abdc08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac495c85d884548c053e0ed6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 11:00:26 2008 +0100 widl: Add checking to arguments of non-local functions. Check that out arguments have enough levels of indirection and that they don't derive from void * or a function pointer. --- tools/widl/parser.y | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 0e5778d..fba941e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -67,6 +67,8 @@ unsigned char pointer_default = RPC_FC_UP; static int is_object_interface = FALSE; +/* are we inside a library block? */ +static int is_inside_library = FALSE; typedef struct list typelist_t; struct typenode { @@ -129,6 +131,7 @@ static int compute_method_indexes(type_t *iface); static char *gen_name(void); static void process_typedefs(var_list_t *names); static void check_arg(var_t *arg); +static void check_functions(const type_t *iface); static void check_all_user_types(ifref_list_t *ifaces); static const attr_list_t *check_iface_attrs(const char *name, const attr_list_t *attrs); static attr_list_t *check_function_attrs(const char *name, attr_list_t *attrs); @@ -391,10 +394,11 @@ library_start: attributes libraryhdr '{' { check_library_attrs($2, $1); if (!parse_only) start_typelib($2, $1); if (!parse_only && do_header) write_library($2, $1); if (!parse_only && do_idfile) write_libid($2, $1); + is_inside_library = TRUE; } ; librarydef: library_start imp_statements '}' - semicolon_opt { if (!parse_only) end_typelib(); } + semicolon_opt { if (!parse_only) end_typelib(); is_inside_library = FALSE; } ; m_args: { $$ = NULL; } @@ -834,6 +838,7 @@ interfacedef: interfacehdr inherit '{' int_statements '}' semicolon_opt { $$ = $1.interface; $$->ref = $2; $$->funcs = $4; + check_functions($$); compute_method_indexes($$); if (!parse_only && do_header) write_interface($$); if (!parse_only && local_stubs) write_locals(local_stubs, $$, TRUE); @@ -2354,6 +2359,69 @@ static const attr_list_t *check_coclass_attrs(const char *name, const attr_list_ return attrs; } +/* checks that arguments for a function make sense for marshalling and unmarshalling */ +static void check_remoting_args(const func_t *func) +{ + const char *funcname = func->def->name; + const var_t *arg; + + if (func->args) LIST_FOR_EACH_ENTRY( arg, func->args, const var_t, entry ) + { + int ptr_level = 0; + const type_t *type = arg->type; + int is_wire_marshal = 0; + int is_context_handle = 0; + + /* get pointer level and fundamental type for the argument */ + for (;;) + { + if (!is_wire_marshal && is_attr(type->attrs, ATTR_WIREMARSHAL)) + is_wire_marshal = 1; + if (!is_context_handle && is_attr(type->attrs, ATTR_CONTEXTHANDLE)) + is_context_handle = 1; + if (type->kind == TKIND_ALIAS) + type = type->orig; + else if (is_ptr(type)) + { + ptr_level++; + type = type->ref; + } + else + break; + } + + /* check that [out] parameters have enough pointer levels */ + if (is_attr(arg->attrs, ATTR_OUT)) + { + if (!is_array(type)) + { + if (!ptr_level) + error_loc_info(&arg->loc_info, "out parameter \'%s\' of function \'%s\' is not a pointer\n", arg->name, funcname); + if (type->type == RPC_FC_IP && ptr_level == 1) + error_loc_info(&arg->loc_info, "out interface pointer \'%s\' of function \'%s\' is not a double pointer\n", arg->name, funcname); + } + } + + if (type->type == 0 && !is_attr(arg->attrs, ATTR_IIDIS) && !is_wire_marshal && !is_context_handle) + error_loc_info(&arg->loc_info, "parameter \'%s\' of function \'%s\' cannot derive from void *\n", arg->name, funcname); + else if (type->type == RPC_FC_FUNCTION) + error_loc_info(&arg->loc_info, "parameter \'%s\' of function \'%s\' cannot be a function pointer\n", arg->name, funcname); + } +} + +static void check_functions(const type_t *iface) +{ + if (!is_inside_library && !is_attr(iface->attrs, ATTR_LOCAL)) + { + const func_t *func; + if (iface->funcs) LIST_FOR_EACH_ENTRY( func, iface->funcs, const func_t, entry ) + { + if (!is_attr(func->def->attrs, ATTR_LOCAL)) + check_remoting_args(func); + } + } +} + static void check_all_user_types(ifref_list_t *ifrefs) { const ifref_t *ifref;

1 0

Rob Shearman : widl: Add functions to print an error or warning message using location information to enable these to be printed accurately when a check is done after an element is parsed .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 005359968885b778d271891a08c1b888bcea573d URL: http://source.winehq.org/git/wine.git/?a=commit;h=005359968885b778d271891a0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 11:00:20 2008 +0100 widl: Add functions to print an error or warning message using location information to enable these to be printed accurately when a check is done after an element is parsed. Add location information to variable automatically, since this is will be useful for type checking of arguments. --- tools/widl/parser.y | 3 +++ tools/widl/utils.c | 36 +++++++++++++++++++++++++++++------- tools/widl/utils.h | 2 ++ tools/widl/widltypes.h | 10 ++++++++++ 4 files changed, 44 insertions(+), 7 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 81eacba..0e5778d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1560,6 +1560,9 @@ static var_t *make_var(char *name) v->type = NULL; v->attrs = NULL; v->eval = NULL; + v->loc_info.input_name = input_name ? input_name : "stdin"; + v->loc_info.line_number = line_number; + v->loc_info.near_text = parser_text; return v; } diff --git a/tools/widl/utils.c b/tools/widl/utils.c index ed950f6..9c4452f 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -33,6 +33,8 @@ #include "utils.h" #include "parser.h" +#define CURRENT_LOCATION { input_name ? input_name : "stdin", line_number, parser_text } + static const int want_near_indication = 0; static void make_print(char *str) @@ -45,17 +47,17 @@ static void make_print(char *str) } } -static void generic_msg(const char *s, const char *t, const char *n, va_list ap) +static void generic_msg(const loc_info_t *loc_info, const char *s, const char *t, va_list ap) { - fprintf(stderr, "%s:%d: %s: ", input_name ? input_name : "stdin", line_number, t); + fprintf(stderr, "%s:%d: %s: ", loc_info->input_name, loc_info->line_number, t); vfprintf(stderr, s, ap); if (want_near_indication) { char *cpy; - if(n) + if(loc_info->near_text) { - cpy = xstrdup(n); + cpy = xstrdup(loc_info->near_text); make_print(cpy); fprintf(stderr, " near '%s'", cpy); free(cpy); @@ -67,9 +69,10 @@ static void generic_msg(const char *s, const char *t, const char *n, va_list ap) /* yyerror: yacc assumes this is not newline terminated. */ int parser_error(const char *s, ...) { + loc_info_t cur_location = CURRENT_LOCATION; va_list ap; va_start(ap, s); - generic_msg(s, "Error", parser_text, ap); + generic_msg(&cur_location, s, "Error", ap); fprintf(stderr, "\n"); va_end(ap); exit(1); @@ -78,18 +81,29 @@ int parser_error(const char *s, ...) void error_loc(const char *s, ...) { + loc_info_t cur_loc = CURRENT_LOCATION; + va_list ap; + va_start(ap, s); + generic_msg(&cur_loc, s, "Error", ap); + va_end(ap); + exit(1); +} + +void error_loc_info(const loc_info_t *loc_info, const char *s, ...) +{ va_list ap; va_start(ap, s); - generic_msg(s, "Error", parser_text, ap); + generic_msg(loc_info, s, "Error", ap); va_end(ap); exit(1); } int parser_warning(const char *s, ...) { + loc_info_t cur_loc = CURRENT_LOCATION; va_list ap; va_start(ap, s); - generic_msg(s, "Warning", parser_text, ap); + generic_msg(&cur_loc, s, "Warning", ap); va_end(ap); return 0; } @@ -113,6 +127,14 @@ void warning(const char *s, ...) va_end(ap); } +void warning_loc_info(const loc_info_t *loc_info, const char *s, ...) +{ + va_list ap; + va_start(ap, s); + generic_msg(loc_info, s, "Warning", ap); + va_end(ap); +} + void chat(const char *s, ...) { if(debuglevel & DEBUGLEVEL_CHAT) diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 7d6ce5c..73adf54 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -37,7 +37,9 @@ int parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void error_loc(const char *s, ...) __attribute__((format (printf, 1, 2))); void error(const char *s, ...) __attribute__((format (printf, 1, 2))); +void error_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3))); void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); +void warning_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3))); void chat(const char *s, ...) __attribute__((format (printf, 1, 2))); char *dup_basename(const char *name, const char *ext); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index d046447..89d593a 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -36,6 +36,7 @@ typedef GUID UUID; #define RPC_FC_FUNCTION 0xfe +typedef struct _loc_info_t loc_info_t; typedef struct _attr_t attr_t; typedef struct _expr_t expr_t; typedef struct _type_t type_t; @@ -176,6 +177,13 @@ enum type_kind TKIND_MAX }; +struct _loc_info_t +{ + const char *input_name; + int line_number; + const char *near_text; +}; + struct str_list_entry_t { char *str; @@ -240,6 +248,8 @@ struct _var_t { attr_list_t *attrs; expr_t *eval; + struct _loc_info_t loc_info; + /* parser-internal */ struct list entry; };

1 0

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