November 2009 - Wine-commits

Maarten Lankhorst : include: Add audioclient.idl.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 2757e1efba452b5a2dba8dcde390865e784e72c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2757e1efba452b5a2dba8dcde… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 10 09:18:25 2009 +0100 include: Add audioclient.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/audioclient.idl | 326 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 328 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2757e1efba452b5a2dba8…

1 0

Maarten Lankhorst : include: Add some definitions to ksmedia.h.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: c0846d03ca3b47dd01252991f4a4b898bc4c7c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0846d03ca3b47dd01252991f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 13 13:02:48 2009 +0100 include: Add some definitions to ksmedia.h. --- include/ksmedia.h | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/include/ksmedia.h b/include/ksmedia.h index 4f36ccc..4dfe058 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -34,4 +34,102 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0 #define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOWFREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) #define KSAUDIO_SPEAKER_7POINT1 (KSAUDIO_SPEAKER_5POINT1 | SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER) +typedef LONGLONG REFERENCE_TIME; + +typedef enum +{ + eConnTypeUnknown = 0, + eConnType3Point5mm, + eConnTypeQuarter, + eConnTypeAtapiInternal, + eConnTypeRCA, + eConnTypeOptical, + eConnTypeOtherDigital, + eConnTypeOtherAnalog, + eConnTypeMultichannelAnalogDIN, + eConnTypeXlrProfessional, + eConnTypeRj11Modem, + eConnTypeCombination +} EPcxConnectionType; + +typedef enum +{ + eGeoLocRear = 1, + eGeoLocFront, + eGeoLocLeft, + eGeoLocRight, + eGeoLocTop, + eGeoLocBottom, + eGeoLocRearPanel, + eGeoLocRiser, + eGeoLocInsideMobileLid, + eGeoLocDrivebay, + eGeoLocHDMI, + eGeoLocOutsideMobileLid, + eGeoLocATAPI, + eGeoLocReserved5, + eGeoLocReserved6 +} EPcxGeoLocation; + +typedef enum +{ + eGenLocPrimaryBox = 0, + eGenLocInternal, + eGenLocSeparate, + eGenLocOther +} EPcxGenLocation; + +typedef enum +{ + ePortConnJack = 0, + ePortConnIntegratedDevice, + ePortConnBothIntegratedAndJack, + ePortConnUnknown +} EPxcPortConnection; + +typedef struct +{ + DWORD ChannelMapping; + COLORREF Color; + EPcxConnectionType ConnectionType; + EPcxGeoLocation GeoLocation; + EPcxGenLocation GenLocation; + EPxcPortConnection PortConnection; + BOOL IsConnected; +} KSJACK_DESCRIPTION; + +typedef KSJACK_DESCRIPTION *PKSJACK_DESCRIPTION; + +typedef enum +{ + KSJACK_SINK_CONNECTIONTYPE_HDMI = 0, + KSJACK_SINK_CONNECTIONTYPE_DISPLAYPORT +} KSJACK_SINK_CONNECTIONTYPE; + +#define MAX_SINK_DESCRIPTION_NAME_LENGTH 32 + +typedef struct _tagKSJACK_SINK_INFORMATION +{ + KSJACK_SINK_CONNECTIONTYPE ConnType; + WORD ManufacturerId; + WORD ProductId; + WORD AudioLatency; + BOOL HDCPCapable; + BOOL AICapable; + UCHAR SinkDescriptionLength; + WCHAR SinkDescription[MAX_SINK_DESCRIPTION_NAME_LENGTH]; + LUID PortId; +} KSJACK_SINK_INFORMATION; + +#define JACKDESC2_PRESENCE_DETECT_CAPABILITY 0x1 +#define JACKDESC2_DYNAMIC_FORMAT_CHANGE_CAPABILITY 0x2 + +typedef struct _tagKSJACK_DESCRIPTION2 +{ + DWORD DeviceStateInfo; + DWORD JackCapabilities; +} KSJACK_DESCRIPTION2; + +typedef struct _tagKSJACK_DESCRIPTION2 *PKSJACK_DESCRIPTION2; + #endif /* _KSMEDIA_ */

1 0

Andrew Eikum : mshtml: Implement IHTMLWindow2::get_parent.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 75b58fb537a0ead31bd0bb9309161da0fc72e105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75b58fb537a0ead31bd0bb930… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 13 14:13:12 2009 -0600 mshtml: Implement IHTMLWindow2::get_parent. --- dlls/mshtml/htmlwindow.c | 11 +++++++++-- dlls/mshtml/tests/dom.c | 25 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 41c5cbe..073a5ae 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -696,8 +696,15 @@ static HRESULT WINAPI HTMLWindow2_get_name(IHTMLWindow2 *iface, BSTR *p) static HRESULT WINAPI HTMLWindow2_get_parent(IHTMLWindow2 *iface, IHTMLWindow2 **p) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + + if(This->parent) { + *p = HTMLWINDOW2(This->parent); + IHTMLWindow2_AddRef(*p); + }else + *p = NULL; + + return S_OK; } static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a75f9e1..cf69c63 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5554,6 +5554,8 @@ static void test_cond_comment(IHTMLDocument2 *doc) static void test_frame(IDispatch *disp, const char *exp_id) { + IHTMLWindow2 *frame2, *parent; + IHTMLDocument2 *parent_doc; IHTMLWindow4 *frame; IHTMLFrameBase *frame_elem; IHTMLElement *html_elem; @@ -5582,6 +5584,29 @@ static void test_frame(IDispatch *disp, const char *exp_id) ok(!strcmp_wa(bstr, exp_id), "Expected ID: \"%s\", found ID: %s\n", exp_id, wine_dbgstr_w(bstr)); IHTMLElement_Release(html_elem); SysFreeString(bstr); + + hres = IDispatch_QueryInterface(disp, &IID_IHTMLWindow2, (void**)&frame2); + ok(hres == S_OK, "Could not get IHTMLWindow2 interface: 0x%08x\n", hres); + if(FAILED(hres)) + return; + + hres = IHTMLWindow2_get_parent(frame2, &parent); + ok(hres == S_OK, "IHTMLWindow2_get_parent failed: 0x%08x\n", hres); + IHTMLWindow2_Release(frame2); + if(FAILED(hres)) + return; + + hres = IHTMLWindow2_get_document(parent, &parent_doc); + ok(hres == S_OK, "IHTMLWindow2_get_document failed: 0x%08x\n", hres); + IHTMLWindow2_Release(parent); + if(FAILED(hres)) + return; + + hres = IHTMLDocument2_get_title(parent_doc, &bstr); + ok(hres == S_OK, "IHTMLDocument2_get_title failed: 0x%08x\n", hres); + ok(!strcmp_wa(bstr, "frameset test"), "Did not get the right parent. Expected \"frameset test\", found %s\n", wine_dbgstr_w(bstr)); + IHTMLDocument2_Release(parent_doc); + SysFreeString(bstr); } static void test_frameset(IHTMLDocument2 *doc)

1 0

Stefan Leichter : setupapi/tests: Check the buffer content returned from SetupGetInfFileListW test.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 7f2943e712f42932a5e4a76c1c10671c5f49f667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f2943e712f42932a5e4a76c1… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Nov 13 23:56:57 2009 +0100 setupapi/tests: Check the buffer content returned from SetupGetInfFileListW test. --- dlls/setupapi/tests/install.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 35514d5..9aa5a91 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -35,6 +35,7 @@ #include "wine/test.h" static const char inffile[] = "test.inf"; +static const WCHAR inffileW[] = {'t','e','s','t','.','i','n','f',0}; static char CURR_DIR[MAX_PATH]; /* Notes on InstallHinfSectionA/W: @@ -470,12 +471,13 @@ cleanup: static void test_inffilelist(void) { static const char inffile2[] = "test2.inf"; + static const WCHAR inffile2W[] = {'t','e','s','t','2','.','i','n','f',0}; static const char invalid_inf[] = "invalid.inf"; static const char *inf = "[Version]\n" "Signature=\"$Chicago$\""; - WCHAR *ptr; + WCHAR *p, *ptr; WCHAR dir[MAX_PATH] = { 0 }; WCHAR buffer[MAX_PATH] = { 0 }; DWORD expected, outsize; @@ -560,7 +562,9 @@ static void test_inffilelist(void) todo_wine ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); - + for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) + ok(!lstrcmpW(p,inffile2W) || !lstrcmpW(p,inffileW), + "unexpected filename %s\n",wine_dbgstr_w(p)); DeleteFile(inffile); DeleteFile(inffile2);

1 0

Stefan Leichter : kernel32: Added stub for CreateMemoryResourceNotification .
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 7f1fe90e7f45433fc2f2f6fc130687262040e9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1fe90e7f45433fc2f2f6fc1… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Nov 14 09:58:47 2009 +0100 kernel32: Added stub for CreateMemoryResourceNotification. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 12 ++++++++++++ include/winbase.h | 5 +++++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7e278b5..aad5e79 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -236,7 +236,7 @@ @ stub CreateKernelThread @ stdcall CreateMailslotA(ptr long long ptr) @ stdcall CreateMailslotW(ptr long long ptr) -# @ stub CreateMemoryResourceNotification +@ stdcall CreateMemoryResourceNotification(long) @ stdcall CreateMutexA(ptr long str) @ stdcall CreateMutexExA(ptr str long long) @ stdcall CreateMutexExW(ptr wstr long long) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 8330d4a..8918f3d 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2171,6 +2171,18 @@ BOOL WINAPI BindIoCompletionCallback( HANDLE FileHandle, LPOVERLAPPED_COMPLETION return FALSE; } + +/*********************************************************************** + * CreateMemoryResourceNotification (KERNEL32.@) + */ +HANDLE WINAPI CreateMemoryResourceNotification(MEMORY_RESOURCE_NOTIFICATION_TYPE nt) +{ + FIXME("(%d) stub\n", nt); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + + #ifdef __i386__ /*********************************************************************** diff --git a/include/winbase.h b/include/winbase.h index 0b4ee17..8298cbd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -501,6 +501,10 @@ typedef struct tagMEMORYSTATUSEX { } MEMORYSTATUSEX, *LPMEMORYSTATUSEX; #include <poppack.h> +typedef enum _MEMORY_RESOURCE_NOTIFICATION_TYPE { + LowMemoryResourceNotification, + HighMemoryResourceNotification +} MEMORY_RESOURCE_NOTIFICATION_TYPE; #ifndef _SYSTEMTIME_ #define _SYSTEMTIME_ @@ -1391,6 +1395,7 @@ WINBASEAPI HANDLE WINAPI CreateJobObjectW(LPSECURITY_ATTRIBUTES,LPCWSTR); WINBASEAPI HANDLE WINAPI CreateMailslotA(LPCSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES); WINBASEAPI HANDLE WINAPI CreateMailslotW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES); #define CreateMailslot WINELIB_NAME_AW(CreateMailslot) +WINBASEAPI HANDLE WINAPI CreateMemoryResourceNotification(MEMORY_RESOURCE_NOTIFICATION_TYPE); WINBASEAPI HANDLE WINAPI CreateMutexA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR); WINBASEAPI HANDLE WINAPI CreateMutexW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR); #define CreateMutex WINELIB_NAME_AW(CreateMutex)

1 0

Francois Gouget : shell32: Make GetFileNameFromBrowse{A,W}() static.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 8a00aaaa50e1571556fa3e9bc30073ff16abad5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a00aaaa50e1571556fa3e9bc… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:52:55 2009 +0100 shell32: Make GetFileNameFromBrowse{A,W}() static. --- dlls/shell32/shellord.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index fd942f7..29b77df 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -169,7 +169,7 @@ DWORD WINAPI ParseFieldAW(LPCVOID src, DWORD nField, LPVOID dst, DWORD len) /************************************************************************* * GetFileNameFromBrowseA [internal] */ -BOOL WINAPI GetFileNameFromBrowseA( +static BOOL GetFileNameFromBrowseA( HWND hwndOwner, LPSTR lpstrFile, DWORD nMaxFile, @@ -216,7 +216,7 @@ BOOL WINAPI GetFileNameFromBrowseA( /************************************************************************* * GetFileNameFromBrowseW [internal] */ -BOOL WINAPI GetFileNameFromBrowseW( +static BOOL GetFileNameFromBrowseW( HWND hwndOwner, LPWSTR lpstrFile, DWORD nMaxFile,

1 0

Francois Gouget : mshtml: parse_complete() is unused so remove it.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 67c8e896a9e524bbf89d2eda8115470134531775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c8e896a9e524bbf89d2eda8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:53:02 2009 +0100 mshtml: parse_complete() is unused so remove it. --- dlls/mshtml/task.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index e6b94a2..eae51ca 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -199,12 +199,6 @@ HRESULT clear_task_timer(HTMLDocument *doc, BOOL interval, DWORD id) return S_OK; } -void parse_complete(HTMLDocumentObj *doc) -{ - TRACE("(%p)\n", doc); - -} - static void call_timer_disp(IDispatch *disp) { DISPPARAMS dp = {NULL, NULL, 0, 0};

1 0

Francois Gouget : jscript: We don't need throw_eval_error() so remove it.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 5d06095dfb3b57d9c72bbf7f09326522585890ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d06095dfb3b57d9c72bbf7f0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:54:32 2009 +0100 jscript: We don't need throw_eval_error() so remove it. --- dlls/jscript/error.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 6c89d70..d8503f1 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -489,11 +489,6 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCH return id; } -HRESULT throw_eval_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) -{ - return throw_error(ctx, ei, id, str, ctx->eval_error_constr); -} - HRESULT throw_generic_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) { return throw_error(ctx, ei, id, str, ctx->error_constr);

1 0

Francois Gouget : commdlg.dll16: The commdlg debug channel is unused. Remove it.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 54ada514501c392997f18926edb6d88af6fa09fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ada514501c392997f18926e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:54:47 2009 +0100 commdlg.dll16: The commdlg debug channel is unused. Remove it. --- dlls/commdlg.dll16/finddlg.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/commdlg.dll16/finddlg.c b/dlls/commdlg.dll16/finddlg.c index e243868..abd30d5 100644 --- a/dlls/commdlg.dll16/finddlg.c +++ b/dlls/commdlg.dll16/finddlg.c @@ -30,11 +30,9 @@ #include "wingdi.h" #include "winuser.h" #include "commdlg.h" -#include "wine/debug.h" #include "cderr.h" #include "cdlg16.h" -WINE_DEFAULT_DEBUG_CHANNEL(commdlg); /***********************************************************************

1 0

Francois Gouget : widl: Add a trailing '\n' to an error_loc() call.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 61d0d121d04d66322d605d55324fd2e4c6e72dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d0d121d04d66322d605d553… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 14 15:55:48 2009 +0100 widl: Add a trailing '\n' to an error_loc() call. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index de44ab5..73b48a2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1033,7 +1033,7 @@ m_bitfield: { $$ = NULL; } struct_declarator: any_declarator m_bitfield { $$ = $1; $$->bits = $2; if (!$$->bits && !$$->var->name) - error_loc("unnamed fields are not allowed"); + error_loc("unnamed fields are not allowed\n"); } ;

1 0