March 2012 - Wine-commits - list.winehq.org

Aric Stewart : strmbase: Basic BaseRenderer implementation.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: eccd9770cc83029b9df845d0a153e56cfb735d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eccd9770cc83029b9df845d0a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 28 14:53:33 2012 -0500 strmbase: Basic BaseRenderer implementation. --- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/renderer.c | 415 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 59 +++++++ 3 files changed, 475 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eccd9770cc83029b9df84…

1 0

Jacek Caban : vbscript: Added Mid function implementation.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 4b00511c644345bd8ebd6da40455a51c8541a9bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b00511c644345bd8ebd6da40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 29 12:06:11 2012 +0200 vbscript: Added Mid function implementation. --- dlls/vbscript/global.c | 73 +++++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 21 ++++++++++++ 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index d0f1130..2e45d8f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -105,6 +105,23 @@ static inline HRESULT return_null(VARIANT *res) return S_OK; } +static HRESULT to_int(VARIANT *v, int *ret) +{ + switch(V_VT(v)) { + case VT_I2: + *ret = V_I2(v); + break; + case VT_I4: + *ret = V_I4(v); + break; + default: + FIXME("not supported %s\n", debugstr_variant(v)); + return E_NOTIMPL; + } + + return S_OK; +} + static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) { IInternetHostSecurityManager *secmgr = NULL; @@ -471,10 +488,60 @@ static HRESULT Global_RightB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_Mid(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Mid(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int len = -1, start, str_len; + BSTR str; + HRESULT hres; + + TRACE("\n"); + + switch(args_cnt) { + case 3: + hres = to_int(args, &len); + if(FAILED(hres)) + return hres; + + if(len < 0) { + FIXME("len = %d\n", len); + return E_FAIL; + } + /* fallthrough */ + case 2: + hres = to_int(args+args_cnt-2, &start); + if(FAILED(hres)) + return hres; + + if(V_VT(args+args_cnt-1) != VT_BSTR) { + FIXME("args[0] = %s\n", debugstr_variant(args+args_cnt-1)); + return E_NOTIMPL; + } + + str = V_BSTR(args+args_cnt-1); + break; + default: + assert(0); + } + + + str_len = SysStringLen(str); + start--; + if(start > str_len) + start = str_len; + + if(len == -1) + len = str_len-start; + else if(len > str_len-start) + len = str_len-start; + + if(res) { + V_VT(res) = VT_BSTR; + V_BSTR(res) = SysAllocStringLen(str+start, len); + if(!V_BSTR(res)) + return E_OUTOFMEMORY; + } + + return S_OK; } static HRESULT Global_MidB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 1c22791..67c365d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -124,4 +124,25 @@ Call ok(isNull(x), "InStr returned " & x) x = InStr(2, null, "abcd") Call ok(isNull(x), "InStr returned " & x) +Sub TestMid(str, start, len, ex) + x = Mid(str, start, len) + Call ok(x = ex, "Mid(" & str & ", " & start & ", " & len & ") = " & x & " expected " & ex) +End Sub + +Sub TestMid2(str, start, ex) + x = Mid(str, start) + Call ok(x = ex, "Mid(" & str & ", " & start & ") = " & x & " expected " & ex) +End Sub + +TestMid "test", 2, 2, "es" +TestMid "test", 2, 4, "est" +TestMid "test", 1, 2, "te" +TestMid "test", 1, 0, "" +TestMid "test", 1, 0, "" +TestMid "test", 5, 2, "" +TestMid2 "test", 1, "test" +TestMid2 "test", 2, "est" +TestMid2 "test", 4, "t" +TestMid2 "test", 5, "" + Call reportSuccess()

1 0

Jacek Caban : vbscript: Use to_int in InStr implementation.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 81fe4bd8a50b427f1421781f0b53eb894cb41982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fe4bd8a50b427f1421781f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 29 12:06:20 2012 +0200 vbscript: Use to_int in InStr implementation. --- dlls/vbscript/global.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 2e45d8f..eaf4383 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -603,6 +603,7 @@ static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA VARIANT *startv, *str1v, *str2v; BSTR str1, str2; int start, ret; + HRESULT hres; TRACE("\n"); @@ -625,18 +626,9 @@ static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA } if(startv) { - /* FIXME: Move to helper */ - switch(V_VT(startv)) { - case VT_I2: - start = V_I2(startv); - break; - case VT_I4: - start = V_I4(startv); - break; - default: - FIXME("unsupported start %s\n", debugstr_variant(startv)); - return E_NOTIMPL; - } + hres = to_int(startv, &start); + if(FAILED(hres)) + return hres; if(--start < 0) { FIXME("start %d\n", start); return E_FAIL;

1 0

Jacek Caban : mshtml: Added support for anchors with target '_top'.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: f11ed78b2e37ec4268747654f5d8c85ee1252ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f11ed78b2e37ec4268747654f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 29 15:05:25 2012 +0200 mshtml: Added support for anchors with target '_top'. --- dlls/mshtml/htmlanchor.c | 20 +++++++++++++------- dlls/mshtml/htmlwindow.c | 17 ++++++++++++----- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 1ef7f72..00301ad 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -73,6 +73,7 @@ static HRESULT navigate_anchor_window(HTMLAnchorElement *This, const WCHAR *targ static HRESULT navigate_anchor(HTMLAnchorElement *This) { nsAString href_str, target_str; + HTMLWindow *window = NULL; nsresult nsres; HRESULT hres = E_FAIL; @@ -87,14 +88,18 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) nsAString_GetData(&target_str, &target); if(*target && strcmpiW(target, _selfW)) { - if(strcmpiW(target, _parentW) && strcmpiW(target, _topW)) { - hres = navigate_anchor_window(This, target); + if(!strcmpiW(target, _topW)) { + TRACE("target _top\n"); + get_top_window(This->element.node.doc->basedoc.window, &window); + }else if(!strcmpiW(target, _parentW)) { + FIXME("Navigating to target _parent is not implemented\n"); + nsAString_Finish(&target_str); + return S_OK; }else { - FIXME("Navigating to target %s is not implemented\n", debugstr_w(target)); - hres = S_OK; + hres = navigate_anchor_window(This, target); + nsAString_Finish(&target_str); + return hres; } - nsAString_Finish(&target_str); - return hres; } } nsAString_Finish(&target_str); @@ -106,7 +111,8 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) nsAString_GetData(&href_str, &href); if(*href) { - HTMLWindow *window = This->element.node.doc->basedoc.window; + if(!window) + window = This->element.node.doc->basedoc.window; hres = navigate_url(window, href, window->url); }else { TRACE("empty href\n"); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2623520..2bd5d7e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -107,6 +107,14 @@ static HRESULT get_location(HTMLWindow *This, HTMLLocation **ret) return S_OK; } +void get_top_window(HTMLWindow *window, HTMLWindow **ret) +{ + HTMLWindow *iter; + + for(iter = window; iter->parent; iter = iter->parent); + *ret = iter; +} + static inline HRESULT set_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) { if(!window->doc) { @@ -838,13 +846,12 @@ static HRESULT WINAPI HTMLWindow2_get_self(IHTMLWindow2 *iface, IHTMLWindow2 **p static HRESULT WINAPI HTMLWindow2_get_top(IHTMLWindow2 *iface, IHTMLWindow2 **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - HTMLWindow *curr; + HTMLWindow *top; + TRACE("(%p)->(%p)\n", This, p); - curr = This; - while(curr->parent) - curr = curr->parent; - *p = &curr->IHTMLWindow2_iface; + get_top_window(This, &top); + *p = &top->IHTMLWindow2_iface; IHTMLWindow2_AddRef(*p); return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2e4df12..789ffb5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -631,6 +631,7 @@ HRESULT create_document_fragment(nsIDOMNode*,HTMLDocumentNode*,HTMLDocumentNode* HRESULT HTMLWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLWindow*,HTMLWindow**) DECLSPEC_HIDDEN; void update_window_doc(HTMLWindow*) DECLSPEC_HIDDEN; HTMLWindow *nswindow_to_window(const nsIDOMWindow*) DECLSPEC_HIDDEN; +void get_top_window(HTMLWindow*,HTMLWindow**) DECLSPEC_HIDDEN; HTMLOptionElementFactory *HTMLOptionElementFactory_Create(HTMLWindow*) DECLSPEC_HIDDEN; HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLWindow*) DECLSPEC_HIDDEN; HRESULT HTMLLocation_Create(HTMLWindow*,HTMLLocation**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::get_domain implementation.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 5b56d06074883984c4723b602b71770223bc67ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b56d06074883984c4723b602… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 29 15:05:43 2012 +0200 mshtml: Added IHTMLDocument2::get_domain implementation. --- dlls/mshtml/htmldoc.c | 13 +++++++++++-- dlls/mshtml/tests/htmllocation.c | 19 ++++++++++++------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 32b54ec..3cbfe8d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -622,8 +622,17 @@ static HRESULT WINAPI HTMLDocument_put_domain(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI HTMLDocument_get_domain(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->window || !This->window->uri) { + FIXME("No current URI\n"); + return E_FAIL; + } + + hres = IUri_GetHost(This->window->uri, p); + return FAILED(hres) ? hres : S_OK; } static HRESULT WINAPI HTMLDocument_put_cookie(IHTMLDocument2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index ebdb056..d314a13 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -105,11 +105,8 @@ static int str_eq_wa(LPCWSTR strw, const char *stra) { CHAR buf[512]; - if(strw == NULL || stra == NULL){ - if((void*)strw == (void*)stra) - return 1; - return 0; - } + if(!strw || !stra) + return (void*)strw == (void*)stra; WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); return !lstrcmpA(stra, buf); @@ -172,7 +169,7 @@ static void test_host(IHTMLLocation *loc, const struct location_test *test) SysFreeString(str); } -static void test_hostname(IHTMLLocation *loc, const struct location_test *test) +static void test_hostname(IHTMLLocation *loc, IHTMLDocument2 *doc, const struct location_test *test) { HRESULT hres; BSTR str; @@ -189,6 +186,14 @@ static void test_hostname(IHTMLLocation *loc, const struct location_test *test) "%s: expected retrieved hostname to be L\"%s\", was: %s\n", test->name, test->hostname, wine_dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLDocument2_get_domain(doc, &str); + ok(hres == S_OK, "%s: get_domain failed: 0x%08x\n", test->name, hres); + if(hres == S_OK) + ok(str_eq_wa(str, test->hostname ? test->hostname : ""), + "%s: expected retrieved domain to be L\"%s\", was: %s\n", + test->name, test->hostname, wine_dbgstr_w(str)); + SysFreeString(str); } static void test_port(IHTMLLocation *loc, const struct location_test *test) @@ -345,7 +350,7 @@ static void perform_test(const struct location_test* test) test_href(location, test); test_protocol(location, test); test_host(location, test); - test_hostname(location, test); + test_hostname(location, doc, test); test_port(location, test); test_pathname(location, test); test_search(location, test);

1 0

Frédéric Delanoy : cmd: Use BOOL instead of int for boolean variables.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 0e4ceb9a8dde88cd23bcad62fe0b874bf8267a93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e4ceb9a8dde88cd23bcad62f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Mar 29 18:05:59 2012 +0200 cmd: Use BOOL instead of int for boolean variables. --- programs/cmd/batch.c | 8 ++++---- programs/cmd/builtins.c | 2 +- programs/cmd/wcmd.h | 4 ++-- programs/cmd/wcmdmain.c | 23 +++++++++++------------ 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 2b33b69..05314f4 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -40,8 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); * a label to goto once opened. */ -void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HANDLE pgmHandle) { - +void WCMD_batch (WCHAR *file, WCHAR *command, BOOL called, WCHAR *startLabel, HANDLE pgmHandle) +{ HANDLE h = INVALID_HANDLE_VALUE; BATCH_CONTEXT *prev_context; @@ -583,7 +583,7 @@ void WCMD_call (WCHAR *command) { /* Run other program if no leading ':' */ if (*command != ':') { - WCMD_run_program(command, 1); + WCMD_run_program(command, TRUE); } else { WCHAR gotoLabel[MAX_PATH]; @@ -600,7 +600,7 @@ void WCMD_call (WCHAR *command) { li.u.LowPart = SetFilePointer(context -> h, li.u.LowPart, &li.u.HighPart, FILE_CURRENT); - WCMD_batch (param1, command, 1, gotoLabel, context->h); + WCMD_batch (param1, command, TRUE, gotoLabel, context->h); SetFilePointer(context -> h, li.u.LowPart, &li.u.HighPart, FILE_BEGIN); diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7e6bd77..ebb1c80 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1416,7 +1416,7 @@ void WCMD_give_help (const WCHAR *command) static const WCHAR helpW[] = {' ', '/','?','\0'}; strcpyW(cmd, command); strcatW(cmd, helpW); - WCMD_run_program(cmd, 0); + WCMD_run_program(cmd, FALSE); return; } } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 3623213..4e021d9 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -54,7 +54,7 @@ typedef struct _CMD_LIST { } CMD_LIST; void WCMD_assoc (const WCHAR *, BOOL); -void WCMD_batch (WCHAR *, WCHAR *, int, WCHAR *, HANDLE); +void WCMD_batch (WCHAR *, WCHAR *, BOOL, WCHAR *, HANDLE); void WCMD_call (WCHAR *command); void WCMD_change_tty (void); void WCMD_choice (const WCHAR *); @@ -86,7 +86,7 @@ void WCMD_print_error (void); void WCMD_pushd (const WCHAR *command); void WCMD_remove_dir (WCHAR *command); void WCMD_rename (void); -void WCMD_run_program (WCHAR *command, int called); +void WCMD_run_program (WCHAR *command, BOOL called); void WCMD_setlocal (const WCHAR *command); void WCMD_setshow_date (void); void WCMD_setshow_default (const WCHAR *command); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index c6c3e0e..93a2bb8 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -993,8 +993,8 @@ static void init_msvcrt_io_block(STARTUPINFOW* st) * findexecutable to achieve this which is left untouched. */ -void WCMD_run_program (WCHAR *command, int called) { - +void WCMD_run_program (WCHAR *command, BOOL called) +{ WCHAR temp[MAX_PATH]; WCHAR pathtosearch[MAXSTRING]; WCHAR *pathposn; @@ -1585,7 +1585,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, break; default: prev_echo_mode = echo_mode; - WCMD_run_program (whichcmd, 0); + WCMD_run_program (whichcmd, FALSE); echo_mode = prev_echo_mode; } HeapFree( GetProcessHeap(), 0, cmd ); @@ -2336,19 +2336,19 @@ int wmain (int argc, WCHAR *argvW[]) argsLeft = args; for (arg = argvW; argsLeft>0; arg++,argsLeft--) { - int has_space,bcount; + BOOL has_space = FALSE; + int bcount; WCHAR* a; - has_space=0; bcount=0; a=*arg; - if( !*a ) has_space=1; + if( !*a ) has_space = TRUE; while (*a!='\0') { if (*a=='\\') { bcount++; } else { if (*a==' ' || *a=='\t') { - has_space=1; + has_space = TRUE; } else if (*a=='"') { /* doubling of '\' preceding a '"', * plus escaping of said '"' @@ -2395,20 +2395,19 @@ int wmain (int argc, WCHAR *argvW[]) argsLeft = args; for (arg = argvW; argsLeft>0; arg++,argsLeft--) { - int has_space,has_quote; + BOOL has_space = FALSE, has_quote = FALSE; WCHAR* a; /* Check for quotes and spaces in this argument */ - has_space=has_quote=0; a=*arg; - if( !*a ) has_space=1; + if( !*a ) has_space = TRUE; while (*a!='\0') { if (*a==' ' || *a=='\t') { - has_space=1; + has_space = TRUE; if (has_quote) break; } else if (*a=='"') { - has_quote=1; + has_quote = TRUE; if (has_space) break; }

1 0

Dmitry Timoshkov : user32: IsDialogMessage should allow control ids other than IDOK when processing WM_KEYDOWN .
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 38387dcffedc7e04f85201af9bcd9214eb428ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38387dcffedc7e04f85201af9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 28 14:11:55 2012 +0900 user32: IsDialogMessage should allow control ids other than IDOK when processing WM_KEYDOWN. --- dlls/user32/dialog.c | 2 +- dlls/user32/tests/dialog.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 95e9e88..f0fdf49 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1278,7 +1278,7 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) else if (DC_HASDEFID == HIWORD(dw = SendMessageW (hwndDlg, DM_GETDEFID, 0, 0))) { HWND hwndDef = DIALOG_IdToHwnd(hwndDlg, LOWORD(dw)); - if (hwndDef ? IsWindowEnabled(hwndDef) : LOWORD(dw)==IDOK) + if (!hwndDef || IsWindowEnabled(hwndDef)) SendMessageW( hwndDlg, WM_COMMAND, MAKEWPARAM( LOWORD(dw), BN_CLICKED ), (LPARAM)hwndDef); } else diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 404aeee..6bd34b3 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1065,20 +1065,38 @@ static INT_PTR CALLBACK TestDefButtonDlgProc (HWND hDlg, UINT uiMsg, static INT_PTR CALLBACK TestReturnKeyDlgProc (HWND hDlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { - static int received_idok = 0; + static int received_idok; + switch (uiMsg) { case WM_INITDIALOG: - { - MSG msg = {hDlg, WM_KEYDOWN, VK_RETURN, 0x011c0001}; - IsDialogMessage(hDlg, &msg); - } - ok(received_idok, "WM_COMMAND not received\n"); + { + MSG msg = {hDlg, WM_KEYDOWN, VK_RETURN, 0x011c0001}; + + received_idok = -1; + IsDialogMessage(hDlg, &msg); + ok(received_idok == 0xdead, "WM_COMMAND/0xdead not received\n"); + + received_idok = -2; + IsDialogMessage(hDlg, &msg); + ok(received_idok == IDOK, "WM_COMMAND/IDOK not received\n"); + EndDialog(hDlg, 0); return TRUE; + } + + case DM_GETDEFID: + if (received_idok == -1) + { + HWND hwnd = GetDlgItem(hDlg, 0xdead); + ok(!hwnd, "dialog item with ID 0xdead should not exist\n"); + SetWindowLong(hDlg, DWLP_MSGRESULT, MAKELRESULT(0xdead, DC_HASDEFID)); + return TRUE; + } + return FALSE; + case WM_COMMAND: - ok(wParam==IDOK, "Expected IDOK\n"); - received_idok = 1; + received_idok = wParam; return TRUE; } return FALSE;

1 0

Aric Stewart : wineqtdecoder: Read the header of unknown incoming streams to try to identify common formats .
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: cc6b7592ee8490e17e0a4af3bde90a824268ffb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6b7592ee8490e17e0a4af3b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 28 10:18:49 2012 -0500 wineqtdecoder: Read the header of unknown incoming streams to try to identify common formats. --- dlls/wineqtdecoder/qtdatahandler.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index 4cca607..4d3b0a3 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -325,6 +325,22 @@ static pascal ComponentResult myDataHGetFileTypeOrdering ( DataHandler dh, return noErr; } +typedef struct { + const CFStringRef fname; + const int sig_length; + const BYTE sig[10]; +} signature; + +static const signature stream_sigs[] = { + {CFSTR("video.asf"),4,{0x30,0x26,0xb2,0x75}}, + {CFSTR("video.mov"),8,{0x00,0x00,0x00,0x14,0x66,0x74,0x79,0x70}}, + {CFSTR("video.mp4"),8,{0x00,0x00,0x00,0x18,0x66,0x74,0x79,0x70}}, + {CFSTR("video.m4v"),8,{0x00,0x00,0x00,0x1c,0x66,0x74,0x79,0x70}}, + {CFSTR("video.flv"),4,{0x46,0x4C,0x56,0x01}}, + {CFSTR("video.mpg"),3,{0x00,0x00,0x01}}, + {CFSTR("avideo.rm"),4,{0x2E,0x52,0x4D,0x46}} +}; + static pascal ComponentResult myDataHGetFileName ( DataHandler dh, Str255 str) { Handle storage = GetComponentInstanceStorage(dh); @@ -342,7 +358,20 @@ static pascal ComponentResult myDataHGetFileName ( DataHandler dh, Str255 str) else if(IsEqualIID(&data->dataRef.streamSubtype, &MEDIASUBTYPE_QTMovie)) CFStringGetPascalString(CFSTR("video.mov"),str,256,kCFStringEncodingMacRoman); else + { + BYTE header[10] = {0,0,0,0,0,0,0,0,0,0}; + int i; + IAsyncReader_SyncRead(data->dataRef.pReader, 0, 8, header); + + for (i=0; i < sizeof(stream_sigs)/sizeof(signature); i++) + if (memcmp(header, stream_sigs[i].sig, stream_sigs[i].sig_length)==0) + { + CFStringGetPascalString(stream_sigs[i].fname,str,256,kCFStringEncodingMacRoman); + return noErr; + } + return badComponentSelector; + } return noErr; }

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: 7afb12909ce75c1757a05bec84911b60a8dc379a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afb12909ce75c1757a05bec8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 28 20:36:14 2012 +0200 po: Update German translation. --- po/de.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 1c6d57e..411693c 100644 --- a/po/de.po +++ b/po/de.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-03-14 16:50+0100\n" -"Last-Translator: Julian Rüger\n" +"PO-Revision-Date: 2012-03-28 20:12+0200\n" +"Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" "MIME-Version: 1.0\n" @@ -3457,10 +3457,8 @@ msgid "Expected ')'" msgstr "')' erwartet" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Ungültiger Parameter.\n" +msgstr "Ungültiges Zeichen" #: jscript.rc:38 msgid "Unterminated string constant"

1 0

Christian Costa : dmime: Check return code of CoCreateInstance in Init method.
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: afbf28940cffa94d18fda89f3212715a8a1d2874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afbf28940cffa94d18fda89f3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 08:54:15 2012 +0200 dmime: Check return code of CoCreateInstance in Init method. --- dlls/dmime/performance.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 91df283..d847d8e 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -238,15 +238,18 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init (LPDIRECTMUSICPERFORMANC This->pDirectMusic = (IDirectMusic8*) *ppDirectMusic; IDirectMusic8_AddRef(This->pDirectMusic); } else { - /* app allows the performance to initialise itself and needs a pointer to object*/ - CoCreateInstance (&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void**)&This->pDirectMusic); - if (ppDirectMusic) { - *ppDirectMusic = (LPDIRECTMUSIC) This->pDirectMusic; - IDirectMusic8_AddRef((LPDIRECTMUSIC8) *ppDirectMusic); - } - } - - return S_OK; + HRESULT hr; + /* App enables the performance to initialize itself and needs a pointer to object */ + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void**)&This->pDirectMusic); + if (FAILED(hr)) + return hr; + if (ppDirectMusic) { + *ppDirectMusic = (LPDIRECTMUSIC)This->pDirectMusic; + IDirectMusic8_AddRef((LPDIRECTMUSIC8)*ppDirectMusic); + } + } + + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegment (LPDIRECTMUSICPERFORMANCE8 iface, IDirectMusicSegment* pSegment, DWORD dwFlags, __int64 i64StartTime, IDirectMusicSegmentState** ppSegmentState) {

1 0