August 2009 - Wine-Commits - list.winehq.org

Juan Lang : rpcrt4: Allow Annotation to be NULL.
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: d82cbcf049fb5b85ab69549135bf28229dc769d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82cbcf049fb5b85ab6954913… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 19 14:27:20 2009 -0700 rpcrt4: Allow Annotation to be NULL. Fixes bug 19760. --Juan >From afb4d6b943345e19952fe34bd1d8ab4c411563ae Mon Sep 17 00:00:00 2001 From: Juan Lang <juan.lang(a)gmail.com> Date: Wed, 19 Aug 2009 14:27:20 -0700 Subject: [PATCH 3/3] Allow Annotation to be NULL --- dlls/rpcrt4/rpc_epmap.c | 5 +++-- dlls/rpcrt4/tests/rpc_protseq.c | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 2a03484..60c4255 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -225,7 +225,6 @@ RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *Bind RpcBinding* bind = BindingVector->BindingH[i]; for (j = 0; j < (UuidVector ? UuidVector->Count : 1); j++) { - int len = strlen((char *)Annotation); status = TowerConstruct(&If->InterfaceId, &If->TransferSyntax, bind->Protseq, bind->Endpoint, bind->NetworkAddr, @@ -236,7 +235,9 @@ RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *Bind memcpy(&entries[i * UuidVector->Count].object, &UuidVector->Uuid[j], sizeof(GUID)); else memset(&entries[i].object, 0, sizeof(entries[i].object)); - memcpy(entries[i].annotation, Annotation, min(len + 1, ept_max_annotation_size)); + if (Annotation) + memcpy(entries[i].annotation, Annotation, + min(strlen((char *)Annotation) + 1, ept_max_annotation_size)); } } diff --git a/dlls/rpcrt4/tests/rpc_protseq.c b/dlls/rpcrt4/tests/rpc_protseq.c index 4837f6a..3acc38b 100644 --- a/dlls/rpcrt4/tests/rpc_protseq.c +++ b/dlls/rpcrt4/tests/rpc_protseq.c @@ -157,6 +157,9 @@ static void test_endpoint_mapper(RPC_CSTR protseq, RPC_CSTR address) /* register endpoints created in test_RpcServerUseProtseq */ status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, annotation); ok(status == RPC_S_OK, "%s: RpcEpRegisterA failed with error %u\n", protseq, status); + /* reregister the same endpoint with no annotation */ + status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, NULL); + ok(status == RPC_S_OK, "%s: RpcEpRegisterA failed with error %u\n", protseq, status); status = RpcStringBindingCompose(NULL, protseq, address, NULL, NULL, &binding);

1 0

Mike Kaplinskiy : ws2_32/tests: Test connecting a pending accept socket.
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: 9b906c6766f17c1581ef0ba04f563664cf3f1877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b906c6766f17c1581ef0ba04… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Wed Aug 19 14:22:15 2009 -0400 ws2_32/tests: Test connecting a pending accept socket. --- dlls/ws2_32/tests/sock.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7aa727a..e16fe21 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2849,6 +2849,28 @@ static void test_AcceptEx(void) ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); } + iret = connect(acceptor, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, + "connecting to acceptex acceptor succeeded? return %d + errno %d\n", iret, WSAGetLastError()); + if (!iret || (iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK)) { + /* We need to cancel this call, otherwise things fail */ + closesocket(acceptor); + acceptor = socket(AF_INET, SOCK_STREAM, 0); + if (acceptor == INVALID_SOCKET) { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto end; + } + + bret = CancelIo((HANDLE) listener); + ok(bret, "Failed to cancel failed test. Bailing...\n"); + if (!bret) return; + + bret = pAcceptEx(listener, acceptor, buffer, 0, + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + } + iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError());

1 0

Akihiro Sagawa : notepad: Update Japanese translation.
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: 9aa61fbe2793c7ab977d5458818c301fb3e0e2ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa61fbe2793c7ab977d54588… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Aug 20 00:19:45 2009 +0900 notepad: Update Japanese translation. --- programs/notepad/Ja.rc | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/programs/notepad/Ja.rc b/programs/notepad/Ja.rc index fcb8168..101ae90 100644 --- a/programs/notepad/Ja.rc +++ b/programs/notepad/Ja.rc @@ -96,6 +96,14 @@ PUSHBUTTON "キャンセル", IDCANCEL, 180, 21, 40, 15, WS PUSHBUTTON "ヘルプ(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "文字コード:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -120,8 +128,15 @@ STRING_DOESNOTEXIST, "ファイル '%s'\nは存在し STRING_NOTSAVED, "ファイル '%s'\nは変更されています\n\n \ 変更を保存しますか ?" STRING_NOTFOUND, "'%s' は見つかりませんでした" -STRING_OUT_OF_MEMORY, "この操作を実行するためのメモリが\ -足りません。\nメモリの空きを増やすためにいくつかのアプリケーションを\n終了して\ -下さい。" +STRING_OUT_OF_MEMORY, "この操作を実行するためのメモリが足りません。\n\ +メモリの空きを増やすためにいくつかのアプリケーションを\n\ +終了して下さい。" +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +このファイルには、%s として保存すると失われてしまう Unicode 文字が含まれています。\n\ +これらの文字を保存するには [キャンセル] をクリックし、[文字コード] リストから\n\ +Unicode のいずれかを選択してください。\n\ +続行しますか?" }

1 0

Akihiro Sagawa : winecfg: Update Japanese translation.
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: b7a389f73a5dec38620567e6b10fbb1d574f29a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a389f73a5dec38620567e6b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Aug 20 00:19:44 2009 +0900 winecfg: Update Japanese translation. --- programs/winecfg/Ja.rc | 52 ++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index 4dcb4c1..5faff4f 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -132,7 +132,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " ドライブのマッピング ",IDC_STATIC,8,4,244,240 - LTEXT "Failed to connect to the mount manager, the drive configuration cannot be edited.", IDC_STATIC_MOUNTMGR_ERROR, 15,30,220,76 + LTEXT "マウントマネージャへの接続に失敗したため、ドライブ設定は変更できません。", IDC_STATIC_MOUNTMGR_ERROR, 15,30,220,76 CONTROL "Listview",IDC_LIST_DRIVES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76 PUSHBUTTON "追加(&A)...",IDC_BUTTON_ADD,15,98,37,14 @@ -162,7 +162,7 @@ BEGIN LTEXT "シリアル番号(&E):",IDC_STATIC_SERIAL,33,225,29,12 EDITTEXT IDC_EDIT_SERIAL,63,221,78,13,ES_AUTOHSCROLL | WS_TABSTOP - CONTROL "dot ファイルを表示する",IDC_SHOW_DOT_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,260,230,8 + CONTROL "ドットファイルを表示する",IDC_SHOW_DOT_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,260,230,8 END IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -179,7 +179,7 @@ BEGIN COMBOBOX IDC_DSOUND_HW_ACCEL,100,228,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "既定のサンプルレート(&S):",IDC_STATIC,15,247,70,8 COMBOBOX IDC_DSOUND_RATES,90,245,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Default &Bits Per Sample:",IDC_STATIC,137,247,80,8 + LTEXT "既定のサンプルごとのビット数(&B):",IDC_STATIC,137,232,80,8 COMBOBOX IDC_DSOUND_BITS,220,245,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -206,7 +206,7 @@ BEGIN GROUPBOX " シェルフォルダ(&H) ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "&Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + CONTROL "リンク先(&L):",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED PUSHBUTTON "参照(&R)",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END @@ -216,7 +216,7 @@ BEGIN IDS_TAB_APPLICATIONS "アプリケーション" IDS_TAB_DLLS "ライブラリ" IDS_TAB_DRIVES "ドライブ" - IDS_CHOOSE_PATH "Select the unix target directory, please." + IDS_CHOOSE_PATH "unix の対象ディレクトリを選択してください。" IDS_HIDE_ADVANCED "詳細を隠す" IDS_SHOW_ADVANCED "詳細を表示" IDS_NOTHEME "(テーマ無し)" @@ -225,17 +225,17 @@ BEGIN IDS_TAB_AUDIO "オーディオ" IDS_TAB_ABOUT "Wineについて" IDS_WINECFG_TITLE "Wine設定" - IDS_WINECFG_TITLE_APP "Wine configuration for %s" + IDS_WINECFG_TITLE_APP "Wine設定 %s用" IDS_THEMEFILE "テーマファイル" IDS_THEMEFILE_SELECT "テーマファイルを選んでください" - IDS_AUDIO_MISSING "There is no audio driver currently specified in the registry.\n\nA recommended driver has been selected for you.\nYou can use this driver or select another driver if available.\n\nYou must click Apply for the selection to take effect." + IDS_AUDIO_MISSING "レジストリでオーディオドライバが指定されていません。\n\n推奨するドライバが自動的に選択されました。\nこのドライバを使うか、利用可能ならば他のドライバを選択できます。\n\n選択を有効にするには [適用] をクリックする必要があります。" IDS_SHELL_FOLDER "シェルフォルダ" - IDS_LINKS_TO "Links to" + IDS_LINKS_TO "リンク先" END STRINGTABLE DISCARDABLE BEGIN - IDS_DLL_WARNING "Changing the load order of this library is not recommended.\nAre you sure you want to do this?" + IDS_DLL_WARNING "このライブラリの読み込み順序を変更することは推奨されません。\n本当に変更しますか?" IDS_DLL_WARNING_CAPTION "警告: システムライブラリ" IDS_DLL_NATIVE "native" IDS_DLL_BUILTIN "builtin" @@ -261,12 +261,12 @@ BEGIN IDS_DRIVE_REMOTE "ネットワーク共有" IDS_DRIVE_REMOVABLE "フロッピーディスク" IDS_DRIVE_CDROM "CD-ROM" - IDS_DRIVE_LETTERS_EXCEEDED "You cannot add any more drives.\n\nEach drive must have a letter, from A to Z, so you cannot have more than 26" + IDS_DRIVE_LETTERS_EXCEEDED "これ以上ドライブを追加できません。\n\n各ドライブは A から Z までの 1 字を使う必要があるので、26 を超えることはできません。" IDS_SYSTEM_DRIVE_LABEL "システムドライブ" - IDS_CONFIRM_DELETE_C "Are you sure you want to delete drive C?\n\nMost Windows applications expect drive C to exist, and will die messily if it doesn't. If you proceed remember to recreate it!" + IDS_CONFIRM_DELETE_C "C ドライブを本当に削除しますか?\n\n大部分の Windows アプリケーションは、C ドライブが存在することを前提としているので、存在しない場合めちゃくちゃな死に方をするでしょう。続行するならば、再作成するのを忘れないでください!" IDS_COL_DRIVELETTER "レター" IDS_COL_DRIVEMAPPING "ドライブの割り当て" - IDS_NO_DRIVE_C "ドライブ C がありません。これはあまり良くありません。\n\nドライブ C を作成するためにドライブタブ内の [追加] を忘れずにクリックしてください!\n" + IDS_NO_DRIVE_C "C ドライブがありません。これはあまり良くありません。\n\nC ドライブを作成するためにドライブタブ内の [追加] を忘れずにクリックしてください!\n" END STRINGTABLE DISCARDABLE @@ -275,21 +275,21 @@ BEGIN IDS_ACCEL_STANDARD "標準" IDS_ACCEL_BASIC "基本" IDS_ACCEL_EMULATION "エミュレーション" - IDS_DRIVER_ALSA "ALSA Driver" - IDS_DRIVER_ESOUND "EsounD Driver" - IDS_DRIVER_OSS "OSS Driver" - IDS_DRIVER_JACK "JACK Driver" - IDS_DRIVER_NAS "NAS Driver" - IDS_DRIVER_AUDIOIO "Audio IO (Solaris) Driver" - IDS_DRIVER_COREAUDIO "CoreAudio Driver" - IDS_OPEN_DRIVER_ERROR "Couldn't open %s!" + IDS_DRIVER_ALSA "ALSA ドライバ" + IDS_DRIVER_ESOUND "EsounD ドライバ" + IDS_DRIVER_OSS "OSS ドライバ" + IDS_DRIVER_JACK "JACK ドライバ" + IDS_DRIVER_NAS "NAS ドライバ" + IDS_DRIVER_AUDIOIO "Audio IO (Solaris) ドライバ" + IDS_DRIVER_COREAUDIO "CoreAudio ドライバ" + IDS_OPEN_DRIVER_ERROR "%sをオープンできません!" IDS_SOUNDDRIVERS "サウンドドライバ" - IDS_DEVICES_WAVEOUT "Wave Out Devices" - IDS_DEVICES_WAVEIN "Wave In Devices" - IDS_DEVICES_MIDIOUT "MIDI Out Devices" - IDS_DEVICES_MIDIIN "MIDI In Devices" - IDS_DEVICES_AUX "Aux Devices" - IDS_DEVICES_MIXER "Mixer Devices" + IDS_DEVICES_WAVEOUT "Wave 出力デバイス" + IDS_DEVICES_WAVEIN "Wave 入力デバイス" + IDS_DEVICES_MIDIOUT "MIDI 出力デバイス" + IDS_DEVICES_MIDIIN "MIDI 入力デバイス" + IDS_DEVICES_AUX "補助デバイス" + IDS_DEVICES_MIXER "ミキサーデバイス" IDS_UNAVAILABLE_DRIVER "利用できないドライバをレジストリ内に見つけました!\n\nレジストリから \"%s\" を削除しますか?" IDS_WARNING "警告" END

1 0

Vincent Povirk : oleaut32: Map INT and UINT typedesc's to VT_I4 and VT_UI4.
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: 3e542bc60e2a77b7b134887666487277b9fe0b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e542bc60e2a77b7b13488766… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 19 12:38:15 2009 -0500 oleaut32: Map INT and UINT typedesc's to VT_I4 and VT_UI4. --- dlls/oleaut32/tests/tmarshal.c | 4 ++-- dlls/oleaut32/typelib.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 0467e16..f79fbc6 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1324,7 +1324,7 @@ todo_wine dispparams.rgdispidNamedArgs = NULL; hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_INT, &IID_NULL, 0x40c, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, ITypeInfo_Invoke); - todo_wine ok(V_VT(&varresult) == VT_I4, "got %x\n", V_VT(&varresult)); + ok(V_VT(&varresult) == VT_I4, "got %x\n", V_VT(&varresult)); ok(V_I4(&varresult) == -13, "got %x\n", V_I4(&varresult)); VariantClear(&varresult); @@ -1335,7 +1335,7 @@ todo_wine dispparams.rgdispidNamedArgs = NULL; hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_UINT, &IID_NULL, 0x40c, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, ITypeInfo_Invoke); - todo_wine ok(V_VT(&varresult) == VT_UI4, "got %x\n", V_VT(&varresult)); + ok(V_VT(&varresult) == VT_UI4, "got %x\n", V_VT(&varresult)); ok(V_UI4(&varresult) == 42, "got %x\n", V_UI4(&varresult)); VariantClear(&varresult); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f16b459..e87095b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5874,6 +5874,12 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, *vt |= VT_ARRAY; hr = typedescvt_to_variantvt(tinfo, tdesc->u.lptdesc, vt); break; + case VT_INT: + *vt |= VT_I4; + break; + case VT_UINT: + *vt |= VT_UI4; + break; default: *vt |= tdesc->vt; break;

1 0

Alexandre Julliard : userenv/tests: Don' t depend on the Ascii length to find the next env variable.
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: c8c839a9bcabfb9da2867a89916098f0caf930f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c839a9bcabfb9da2867a899… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 19 19:50:06 2009 +0200 userenv/tests: Don't depend on the Ascii length to find the next env variable. --- dlls/userenv/tests/userenv.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 3f2bba0..7c1228b 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -51,7 +51,8 @@ static BOOL get_env(const WCHAR * env, const char * var, char ** result) varlen = strlen(var); do { - envlen = WideCharToMultiByte( CP_ACP, 0, p, -1, buf, sizeof(buf), NULL, NULL ) - 1; + if (!WideCharToMultiByte( CP_ACP, 0, p, -1, buf, sizeof(buf), NULL, NULL )) buf[sizeof(buf)-1] = 0; + envlen = strlen(buf); if (CompareStringA(GetThreadLocale(), NORM_IGNORECASE|LOCALE_USE_CP_ACP, buf, min(envlen, varlen), var, varlen) == CSTR_EQUAL) { if (buf[varlen] == '=') @@ -63,7 +64,8 @@ static BOOL get_env(const WCHAR * env, const char * var, char ** result) return TRUE; } } - p = p + envlen + 1; + while (*p) p++; + p++; } while (*p); return FALSE; }

1 0

Vincent Povirk : oleaut32: Add test for INT and UINT property return values .
by Alexandre Julliard Aug. 20, 2009

Aug. 20, 2009

Module: wine Branch: master Commit: 2ae20e45c7ce8a0c602442fa1be4e643a498754d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ae20e45c7ce8a0c602442fa1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 19 09:50:52 2009 -0500 oleaut32: Add test for INT and UINT property return values. --- dlls/oleaut32/tests/tmarshal.c | 42 +++++++++++++++++++++++++++++++- dlls/oleaut32/tests/tmarshal.idl | 6 ++++ dlls/oleaut32/tests/tmarshal_dispids.h | 2 + 3 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 80148ff..0467e16 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -562,6 +562,22 @@ static HRESULT WINAPI Widget_get_prop_with_lcid( return S_OK; } +static HRESULT WINAPI Widget_get_prop_int( + IWidget* iface, INT *i) +{ + trace("get_prop_int(%p)\n", i); + *i = -13; + return S_OK; +} + +static HRESULT WINAPI Widget_get_prop_uint( + IWidget* iface, UINT *i) +{ + trace("get_prop_uint(%p)\n", i); + *i = 42; + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -591,7 +607,9 @@ static const struct IWidgetVtbl Widget_VTable = Widget_Error, Widget_CloneInterface, Widget_put_prop_with_lcid, - Widget_get_prop_with_lcid + Widget_get_prop_with_lcid, + Widget_get_prop_int, + Widget_get_prop_uint }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1299,6 +1317,28 @@ todo_wine } VariantClear(&varresult); + /* test propget of INT value */ + dispparams.cNamedArgs = 0; + dispparams.cArgs = 0; + dispparams.rgvarg = NULL; + dispparams.rgdispidNamedArgs = NULL; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_INT, &IID_NULL, 0x40c, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, ITypeInfo_Invoke); + todo_wine ok(V_VT(&varresult) == VT_I4, "got %x\n", V_VT(&varresult)); + ok(V_I4(&varresult) == -13, "got %x\n", V_I4(&varresult)); + VariantClear(&varresult); + + /* test propget of INT value */ + dispparams.cNamedArgs = 0; + dispparams.cArgs = 0; + dispparams.rgvarg = NULL; + dispparams.rgdispidNamedArgs = NULL; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_PROP_UINT, &IID_NULL, 0x40c, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, ITypeInfo_Invoke); + todo_wine ok(V_VT(&varresult) == VT_UI4, "got %x\n", V_VT(&varresult)); + ok(V_UI4(&varresult) == 42, "got %x\n", V_UI4(&varresult)); + VariantClear(&varresult); + IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index ddf02b2..f9b18b8 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -131,6 +131,12 @@ library TestTypelib [id(DISPID_TM_PROP_WITH_LCID), propget] HRESULT prop_with_lcid([in,lcid] long lcid, [out,retval] INT *i); + + [id(DISPID_TM_PROP_INT), propget] + HRESULT prop_int([out,retval] INT *i); + + [id(DISPID_TM_PROP_UINT), propget] + HRESULT prop_uint([out,retval] UINT *i); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 10c2828..08d7736 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -35,5 +35,7 @@ #define DISPID_TM_TESTDUAL 16 #define DISPID_TM_STRUCTARGS 17 #define DISPID_TM_PROP_WITH_LCID 18 +#define DISPID_TM_PROP_INT 19 +#define DISPID_TM_PROP_UINT 20 #define DISPID_NOA_BSTRRET 1

1 0

Stefan Dösinger : wined3d: Use 50 chars for register names in texm3x3* functions.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 3cd91a451da3b4bf207788a1210da5078734c4ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd91a451da3b4bf207788a12… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 16 17:12:56 2009 +0200 wined3d: Use 50 chars for register names in texm3x3* functions. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3e3c124..edef107 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2023,7 +2023,7 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; char dst_str[50]; char src0_name[50]; - char dst_reg[8]; + char dst_reg[50]; BOOL is_color; /* Get the dst reg without writemask strings. We know this register is uninitialized, so we can use all @@ -2066,7 +2066,7 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) char dst_str[50]; char src0_name[50]; char src1_name[50]; - char dst_reg[8]; + char dst_reg[50]; BOOL is_color; shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name);

1 0

Alexandre Julliard : configure: Rename the --with-libgsm option to follow the normal option naming scheme.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 6ce32e0df23649cba88ca7bed57a9de8bf72c58d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce32e0df23649cba88ca7bed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 19 15:53:04 2009 +0200 configure: Rename the --with-libgsm option to follow the normal option naming scheme. --- configure | 14 +++++++------- configure.ac | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index e5d3f48..68b48c5 100755 --- a/configure +++ b/configure @@ -783,7 +783,7 @@ with_freetype with_gphoto with_glu with_gnutls -with_libgsm +with_gsm with_hal with_jack with_jpeg @@ -1464,7 +1464,7 @@ Optional Packages: --without-gphoto do not use gphoto (Digital Camera support) --without-glu do not use the GLU library --without-gnutls do not use GnuTLS (schannel support) - --without-libgsm do not use libgsm (GSM 06.10 codec support) + --without-gsm do not use libgsm (GSM 06.10 codec support) --without-hal do not use HAL (dynamic device support) --without-jack do not use the Jack sound support --without-jpeg do not use JPEG @@ -2569,9 +2569,9 @@ if test "${with_gnutls+set}" = set; then : fi -# Check whether --with-libgsm was given. -if test "${with_libgsm+set}" = set; then : - withval=$with_libgsm; if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi +# Check whether --with-gsm was given. +if test "${with_gsm+set}" = set; then : + withval=$with_gsm; if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi fi @@ -10850,11 +10850,11 @@ _ACEOF fi fi if test "x$ac_cv_lib_soname_gsm" = "x"; then : - case "x$with_libgsm" in + case "x$with_gsm" in x) wine_notices="$wine_notices|libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported." ;; xno) ;; *) as_fn_error "libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported. -This is an error since --with-libgsm was requested." "$LINENO" 5 ;; +This is an error since --with-gsm was requested." "$LINENO" 5 ;; esac fi diff --git a/configure.ac b/configure.ac index 519f91d..a18083b 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ AC_ARG_WITH(gphoto, AS_HELP_STRING([--without-gphoto],[do not use gphoto (Dig AC_ARG_WITH(glu, AS_HELP_STRING([--without-glu],[do not use the GLU library]), [if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi]) AC_ARG_WITH(gnutls, AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (schannel support)])) -AC_ARG_WITH(libgsm, AS_HELP_STRING([--without-libgsm],[do not use libgsm (GSM 06.10 codec support)]), +AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06.10 codec support)]), [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi]) AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])) AC_ARG_WITH(jack, AS_HELP_STRING([--without-jack],[do not use the Jack sound support]), @@ -1370,7 +1370,7 @@ if test "$ac_cv_header_gsm_h" = "yes" -o "$ac_cv_header_gsm_gsm_h" = "yes" then WINE_CHECK_SONAME(gsm,gsm_create) fi -WINE_NOTICE_WITH(libgsm,[test "x$ac_cv_lib_soname_gsm" = "x"], +WINE_NOTICE_WITH(gsm,[test "x$ac_cv_lib_soname_gsm" = "x"], [libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.]) dnl **** Check for libjpeg ****

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_visibility .
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 7e2dfe4f74cedec2d26882e13f800a751482fed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2dfe4f74cedec2d26882e13… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 19 20:28:05 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_visibility. --- dlls/mshtml/htmlcurstyle.c | 6 ++++-- dlls/mshtml/tests/dom.c | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 5aaaece..3ae03da 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -386,8 +386,10 @@ static HRESULT WINAPI HTMLCurrentStyle_get_display(IHTMLCurrentStyle *iface, BST static HRESULT WINAPI HTMLCurrentStyle_get_visibility(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_VISIBILITY, p); } static HRESULT WINAPI HTMLCurrentStyle_get_zIndex(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 0638ac9..50222ec 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2555,6 +2555,10 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_borderStyle failed: %08x\n", hres); SysFreeString(str); + hres = IHTMLCurrentStyle_get_visibility(current_style, &str); + ok(hres == S_OK, "get_visibility failed: %08x\n", hres); + SysFreeString(str); + hres = IHTMLCurrentStyle_get_fontWeight(current_style, &v); ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v));

1 0