January 2011 - Wine-Commits

Jacek Caban : mshtml: Use inline function instead of macro for BSCallback vtbl implementations.
by Alexandre Julliard Jan. 7, 2011

Jan. 7, 2011

Module: wine Branch: master Commit: 0a9738775cd63df8ab273c6c78e5498052b973a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9738775cd63df8ab273c6c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 7 14:22:51 2011 +0100 mshtml: Use inline function instead of macro for BSCallback vtbl implementations. --- dlls/mshtml/navigate.c | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f1731fb..e5493e5 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -761,11 +761,14 @@ typedef struct { HRESULT hres; } BufferBSC; -#define BUFFERBSC_THIS(bsc) ((BufferBSC*) bsc) +static inline BufferBSC *BufferBSC_from_BSCallback(BSCallback *iface) +{ + return CONTAINING_RECORD(iface, BufferBSC, bsc); +} static void BufferBSC_destroy(BSCallback *bsc) { - BufferBSC *This = BUFFERBSC_THIS(bsc); + BufferBSC *This = BufferBSC_from_BSCallback(bsc); heap_free(This->buf); heap_free(This); @@ -783,7 +786,7 @@ static HRESULT BufferBSC_start_binding(BSCallback *bsc) static HRESULT BufferBSC_stop_binding(BSCallback *bsc, HRESULT result) { - BufferBSC *This = BUFFERBSC_THIS(bsc); + BufferBSC *This = BufferBSC_from_BSCallback(bsc); This->hres = result; @@ -798,7 +801,7 @@ static HRESULT BufferBSC_stop_binding(BSCallback *bsc, HRESULT result) static HRESULT BufferBSC_read_data(BSCallback *bsc, IStream *stream) { - BufferBSC *This = BUFFERBSC_THIS(bsc); + BufferBSC *This = BufferBSC_from_BSCallback(bsc); DWORD readed; HRESULT hres; @@ -837,8 +840,6 @@ static HRESULT BufferBSC_beginning_transaction(BSCallback *bsc, WCHAR **addition return S_FALSE; } -#undef BUFFERBSC_THIS - static const BSCallbackVtbl BufferBSCVtbl = { BufferBSC_destroy, BufferBSC_init_bindinfo, @@ -1029,11 +1030,14 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) return S_OK; } -#define NSCHANNELBSC_THIS(bsc) ((nsChannelBSC*) bsc) +static inline nsChannelBSC *nsChannelBSC_from_BSCallback(BSCallback *iface) +{ + return CONTAINING_RECORD(iface, nsChannelBSC, bsc); +} static void nsChannelBSC_destroy(BSCallback *bsc) { - nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); if(This->nschannel) nsIChannel_Release(&This->nschannel->nsIHttpChannel_iface); @@ -1048,7 +1052,7 @@ static void nsChannelBSC_destroy(BSCallback *bsc) static HRESULT nsChannelBSC_start_binding(BSCallback *bsc) { - nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); if(This->window) This->window->doc->skip_mutation_notif = FALSE; @@ -1058,7 +1062,7 @@ static HRESULT nsChannelBSC_start_binding(BSCallback *bsc) static HRESULT nsChannelBSC_init_bindinfo(BSCallback *bsc) { - nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); HRESULT hres; if(This->nschannel && This->nschannel->post_data_stream) { @@ -1104,7 +1108,7 @@ static HRESULT async_stop_request(nsChannelBSC *This) static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) { - nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); if(This->window && SUCCEEDED(result)) { result = async_stop_request(This); @@ -1118,14 +1122,14 @@ static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) static HRESULT nsChannelBSC_read_data(BSCallback *bsc, IStream *stream) { - nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); return read_stream_data(This, stream); } static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCWSTR status_text) { - nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); switch(status_code) { case BINDSTATUS_MIMETYPEAVAILABLE: @@ -1148,7 +1152,7 @@ static HRESULT nsChannelBSC_on_progress(BSCallback *bsc, ULONG status_code, LPCW static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, LPCWSTR response_headers) { - nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); HRESULT hres; This->nschannel->response_status = response_code; @@ -1172,7 +1176,7 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, static HRESULT nsChannelBSC_beginning_transaction(BSCallback *bsc, WCHAR **additional_headers) { - nsChannelBSC *This = NSCHANNELBSC_THIS(bsc); + nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); http_header_t *iter; DWORD len = 0; WCHAR *ptr; @@ -1219,8 +1223,6 @@ static HRESULT nsChannelBSC_beginning_transaction(BSCallback *bsc, WCHAR **addit return S_OK; } -#undef NSCHANNELBSC_THIS - static const BSCallbackVtbl nsChannelBSCVtbl = { nsChannelBSC_destroy, nsChannelBSC_init_bindinfo,

1 0

Matteo Bruni : wined3d: Don't call glPointParameter with a random context.
by Alexandre Julliard Jan. 7, 2011

Jan. 7, 2011

Module: wine Branch: master Commit: ef0f3588137e9ae082fba7fe718e279a0f97a70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef0f3588137e9ae082fba7fe7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 7 01:16:18 2011 +0100 wined3d: Don't call glPointParameter with a random context. --- dlls/wined3d/context.c | 37 +------------------------------------ dlls/wined3d/state.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_private.h | 5 ++++- 4 files changed, 39 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f9b99b9..8edcf66 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1575,23 +1575,6 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"); } - if (gl_info->supported[WINED3D_GL_VERSION_2_0]) - { - /* Windows doesn't support to query the glPointParameteri function pointer, so use the - * NV_POINT_SPRITE extension. - */ - if (glPointParameteri) - { - glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT); - checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT)"); - } - else if (gl_info->supported[NV_POINT_SPRITE]) - { - GL_EXTCALL(glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT)); - checkGLcall("glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, GL_UPPER_LEFT)"); - } - } - if (gl_info->supported[ARB_PROVOKING_VERTEX]) { GL_EXTCALL(glProvokingVertex(GL_FIRST_VERTEX_CONVENTION)); @@ -2019,27 +2002,9 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) static inline void context_set_render_offscreen(struct wined3d_context *context, const struct StateEntry *StateTable, BOOL offscreen) { - const struct wined3d_gl_info *gl_info = context->gl_info; - if (context->render_offscreen == offscreen) return; - if (gl_info->supported[WINED3D_GL_VERSION_2_0]) - { - /* Windows doesn't support to query the glPointParameteri function pointer, so use the - * NV_POINT_SPRITE extension. - */ - if (glPointParameteri) - { - glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, offscreen ? GL_LOWER_LEFT : GL_UPPER_LEFT); - checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); - } - else if (gl_info->supported[NV_POINT_SPRITE]) - { - GL_EXTCALL(glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, offscreen ? GL_LOWER_LEFT : GL_UPPER_LEFT)); - checkGLcall("glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); - } - } - + Context_MarkStateDirty(context, STATE_POINTSPRITECOORDORIGIN, StateTable); Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); Context_MarkStateDirty(context, STATE_VDECL, StateTable); Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 843541f..a34ac4f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4963,6 +4963,34 @@ static void frontface(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wi } } +static void psorigin_w(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +{ + static BOOL warned; + + if (!warned) + { + WARN("Point sprite coordinate origin switching not supported.\n"); + warned = TRUE; + } +} + +static void psorigin(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + GLint origin = context->render_offscreen ? GL_LOWER_LEFT : GL_UPPER_LEFT; + + if (glPointParameteri) + { + glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, origin); + checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); + } + else if (gl_info->supported[NV_POINT_SPRITE]) + { + GL_EXTCALL(glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, origin)); + checkGLcall("glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, ...)"); + } +} + const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_SRCBLEND), { STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_DESTBLEND), { STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, @@ -4978,6 +5006,9 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_VDECL, { STATE_VDECL, streamsrc }, WINED3D_GL_EXT_NONE }, { STATE_FRONTFACE, { STATE_FRONTFACE, frontface }, WINED3D_GL_EXT_NONE }, { STATE_SCISSORRECT, { STATE_SCISSORRECT, scissorrect }, WINED3D_GL_EXT_NONE }, + { STATE_POINTSPRITECOORDORIGIN, { STATE_POINTSPRITECOORDORIGIN, psorigin }, WINED3D_GL_VERSION_2_0 }, + { STATE_POINTSPRITECOORDORIGIN, { STATE_POINTSPRITECOORDORIGIN, psorigin_w }, WINED3D_GL_EXT_NONE }, + /* TODO: Move shader constant loading to vertex and fragment pipeline repectively, as soon as the pshader and * vshader loadings are untied from each other */ @@ -5810,6 +5841,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_VIEWPORT, STATE_SCISSORRECT, STATE_FRONTFACE, + STATE_POINTSPRITECOORDORIGIN, }; unsigned int i, current; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4d04271..15ff298 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2212,6 +2212,8 @@ const char *debug_d3dstate(DWORD state) return "STATE_MATERIAL"; if (STATE_IS_FRONTFACE(state)) return "STATE_FRONTFACE"; + if (STATE_IS_POINTSPRITECOORDORIGIN(state)) + return "STATE_POINTSPRITECOORDORIGIN"; return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index af5e79f..c752726 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -992,7 +992,10 @@ extern glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT] DECLSPEC #define STATE_FRONTFACE (STATE_MATERIAL + 1) #define STATE_IS_FRONTFACE(a) ((a) == STATE_FRONTFACE) -#define STATE_HIGHEST (STATE_FRONTFACE) +#define STATE_POINTSPRITECOORDORIGIN (STATE_FRONTFACE + 1) +#define STATE_IS_POINTSPRITECOORDORIGIN(a) ((a) == STATE_POINTSPRITECOORDORIGIN) + +#define STATE_HIGHEST (STATE_POINTSPRITECOORDORIGIN) enum fogsource { FOGSOURCE_FFP,

1 0

Rex Tsai : wininet: Update Traditional Chinese translation.
by Alexandre Julliard Jan. 7, 2011

Jan. 7, 2011

Module: wine Branch: master Commit: 21578a1a40036be49a838163c1a1e81580711114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21578a1a40036be49a838163c… Author: Rex Tsai <chihchun(a)kalug.linux.org.tw> Date: Fri Jan 7 20:15:38 2011 +0800 wininet: Update Traditional Chinese translation. --- dlls/wininet/wininet_Zh.rc | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/wininet_Zh.rc b/dlls/wininet/wininet_Zh.rc index d067bbe..94d1c06 100644 --- a/dlls/wininet/wininet_Zh.rc +++ b/dlls/wininet/wininet_Zh.rc @@ -2,6 +2,7 @@ * wininet (Simplified and Traditional Chinese Resources) * * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * Copyright 2010 Rex Tsai <chihchun.at.kalug.linux.org.tw> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -57,22 +58,42 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "輸入網路密碼" FONT 9, "MS Shell Dlg" { - LTEXT "請輸入你的用戶名和密碼:", -1, 40, 6, 150, 15 - LTEXT "代理", -1, 40, 26, 50, 10 + LTEXT "請輸入您的帳號和密碼:", -1, 40, 6, 150, 15 + LTEXT "代理伺服器", -1, 40, 26, 50, 10 LTEXT "Realm", -1, 40, 46, 50, 10 - LTEXT "用戶", -1, 40, 66, 50, 10 + LTEXT "帳號", -1, 40, 66, 50, 10 LTEXT "密碼", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "儲存密碼(不安全)(&S)", IDC_SAVEPASSWORD, + CHECKBOX "儲存密碼 (不安全)(&S)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "確定", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "取消", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "需要認證" +FONT 8, "MS Shell Dlg" +{ + LTEXT "請輸入您的帳號和密碼:", -1, 40, 6, 150, 15 + LTEXT "伺服器", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "帳號", -1, 40, 66, 50, 10 + LTEXT "密碼", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "儲存密碼 (不安全)(&S)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE { - IDS_LANCONNECTION "局域網連接" + IDS_LANCONNECTION "區域網路連線" }

1 0

Jacek Caban : mshtml: Avoid obj to iface cast in ProtocolFactory_Create.
by Alexandre Julliard Jan. 7, 2011

Jan. 7, 2011

Module: wine Branch: master Commit: 233a9ea5e68b1ae0863ac65c9a4b08e9e7e7dec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=233a9ea5e68b1ae0863ac65c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 7 14:22:41 2011 +0100 mshtml: Avoid obj to iface cast in ProtocolFactory_Create. --- dlls/mshtml/protocol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 6fdcfd3..f0325bf 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -1037,5 +1037,5 @@ HRESULT ProtocolFactory_Create(REFCLSID rclsid, REFIID riid, void **ppv) return CLASS_E_CLASSNOTAVAILABLE; } - return IUnknown_QueryInterface((IUnknown*)cf, riid, ppv); + return IInternetProtocolInfo_QueryInterface(&cf->IInternetProtocolInfo_iface, riid, ppv); }

1 0

Rex Tsai : setupapi: Update Traditional Chinese translation.
by Alexandre Julliard Jan. 7, 2011

Jan. 7, 2011

Module: wine Branch: master Commit: 898de76040d7856a863cebcd1efb876eac1d65a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=898de76040d7856a863cebcd1… Author: Rex Tsai <chihchun(a)kalug.linux.org.tw> Date: Fri Jan 7 20:14:43 2011 +0800 setupapi: Update Traditional Chinese translation. --- dlls/setupapi/Zh.rc | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/Zh.rc b/dlls/setupapi/Zh.rc index cfd2acb..bf7e494 100644 --- a/dlls/setupapi/Zh.rc +++ b/dlls/setupapi/Zh.rc @@ -40,15 +40,37 @@ END LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL +STRINGTABLE +{ + IDS_PROMPTDISK "需要檔案 '%s' 存於 %s" + IDS_UNKNOWN "未知" + IDS_COPYFROM "從複製檔案:" + IDS_INFO "輸入檔案位置，並選擇確認。" +} + COPYFILEDLGORD DIALOG 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "複製檔案..." FONT 9, "MS Shell Dlg" BEGIN PUSHBUTTON "取消", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "源檔案:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "原始檔案:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "目標檔案:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "需要檔案" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "插入原廠安裝光碟\n並確認選擇了正確的磁碟", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "複製原廠檔案:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "確認", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "取消", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "瀏覽...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

Rex Tsai : wineboot: Update Traditional Chinese translation.
by Alexandre Julliard Jan. 7, 2011

Jan. 7, 2011

Module: wine Branch: master Commit: 1a75769263c3bca65437f86cf22b6a303a552626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a75769263c3bca65437f86cf… Author: Rex Tsai <chihchun(a)kalug.linux.org.tw> Date: Fri Jan 7 20:11:02 2011 +0800 wineboot: Update Traditional Chinese translation. --- programs/wineboot/wineboot_Zh.rc | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot_Zh.rc b/programs/wineboot/wineboot_Zh.rc index 132c0aa..35509eb 100644 --- a/programs/wineboot/wineboot_Zh.rc +++ b/programs/wineboot/wineboot_Zh.rc @@ -3,6 +3,7 @@ * * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> + * Copyright 2010 Rex Tsai <chihchun.at.kalug.linux.org.tw> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,13 +55,23 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_ENDTASK DIALOG 0, 0, 186, 71 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "正在等待程式" +CAPTION "等候程式" FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "取消",IDCANCEL,129,49,50,15 - PUSHBUTTON "中斷進程",IDOK,51,49,71,15 - LTEXT "正在模擬關機, 但是這個程式沒有反應.", + PUSHBUTTON "中斷",IDOK,51,49,71,15 + LTEXT "正在模擬關機，但此程序沒有反應。", IDC_STATIC,7,7,172,19 - LTEXT "如果你中斷進程，有可能丟失沒有儲存的數據.", + LTEXT "如果您中斷程式，可能會遺失尚未儲存的資料。", IDC_STATIC,7,28,172,15 END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "正在更新 %s 的 Wine 設定，請稍候……", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to resource_set_priority().
by Alexandre Julliard Jan. 7, 2011

Jan. 7, 2011

Module: wine Branch: master Commit: 7e67bcedfdc6c997377ba5d6a1ea1806eebb367e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e67bcedfdc6c997377ba5d6a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 7 10:16:40 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to resource_set_priority(). --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cubetexture.c | 5 +++-- dlls/wined3d/resource.c | 11 +++++------ dlls/wined3d/surface_base.c | 5 +++-- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/volume.c | 5 +++-- dlls/wined3d/volumetexture.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 8 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b80eac6..bc94a5a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -780,7 +780,7 @@ static HRESULT STDMETHODCALLTYPE buffer_FreePrivateData(IWineD3DBuffer *iface, R static DWORD STDMETHODCALLTYPE buffer_SetPriority(IWineD3DBuffer *iface, DWORD priority) { - return resource_set_priority((IWineD3DResource *)iface, priority); + return resource_set_priority((IWineD3DResourceImpl *)iface, priority); } static DWORD STDMETHODCALLTYPE buffer_GetPriority(IWineD3DBuffer *iface) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index ef142a2..40784ba 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -229,8 +229,9 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_FreePrivateData(IWineD3DCubeTextur return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } -static DWORD WINAPI IWineD3DCubeTextureImpl_SetPriority(IWineD3DCubeTexture *iface, DWORD PriorityNew) { - return resource_set_priority((IWineD3DResource *)iface, PriorityNew); +static DWORD WINAPI IWineD3DCubeTextureImpl_SetPriority(IWineD3DCubeTexture *iface, DWORD priority) +{ + return resource_set_priority((IWineD3DResourceImpl *)iface, priority); } static DWORD WINAPI IWineD3DCubeTextureImpl_GetPriority(IWineD3DCubeTexture *iface) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 3d62de9..f33ee37 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -250,13 +250,12 @@ HRESULT resource_free_private_data(struct IWineD3DResourceImpl *resource, REFGUI return WINED3D_OK; } -DWORD resource_set_priority(IWineD3DResource *iface, DWORD PriorityNew) +DWORD resource_set_priority(struct IWineD3DResourceImpl *resource, DWORD priority) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - DWORD PriorityOld = This->resource.priority; - This->resource.priority = PriorityNew; - TRACE("(%p) : new priority %d, returning old priority %d\n", This, PriorityNew, PriorityOld ); - return PriorityOld; + DWORD prev = resource->resource.priority; + resource->resource.priority = priority; + TRACE("resource %p, new priority %u, returning old priority %u.\n", resource, priority, prev); + return prev; } DWORD resource_get_priority(struct IWineD3DResourceImpl *resource) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 8035076..1ce099c 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -128,8 +128,9 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, R return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } -DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD PriorityNew) { - return resource_set_priority((IWineD3DResource *)iface, PriorityNew); +DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD priority) +{ + return resource_set_priority((IWineD3DResourceImpl *)iface, priority); } DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 821db95..8b42d17 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -254,8 +254,9 @@ static HRESULT WINAPI IWineD3DTextureImpl_FreePrivateData(IWineD3DTexture *iface return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } -static DWORD WINAPI IWineD3DTextureImpl_SetPriority(IWineD3DTexture *iface, DWORD PriorityNew) { - return resource_set_priority((IWineD3DResource *)iface, PriorityNew); +static DWORD WINAPI IWineD3DTextureImpl_SetPriority(IWineD3DTexture *iface, DWORD priority) +{ + return resource_set_priority((IWineD3DResourceImpl *)iface, priority); } static DWORD WINAPI IWineD3DTextureImpl_GetPriority(IWineD3DTexture *iface) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index f74a577..b6def08 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -167,8 +167,9 @@ static HRESULT WINAPI IWineD3DVolumeImpl_FreePrivateData(IWineD3DVolume *iface, return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } -static DWORD WINAPI IWineD3DVolumeImpl_SetPriority(IWineD3DVolume *iface, DWORD PriorityNew) { - return resource_set_priority((IWineD3DResource *)iface, PriorityNew); +static DWORD WINAPI IWineD3DVolumeImpl_SetPriority(IWineD3DVolume *iface, DWORD priority) +{ + return resource_set_priority((IWineD3DResourceImpl *)iface, priority); } static DWORD WINAPI IWineD3DVolumeImpl_GetPriority(IWineD3DVolume *iface) diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 5807d3f..9a4fd40 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -174,8 +174,9 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_FreePrivateData(IWineD3DVolumeTe return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } -static DWORD WINAPI IWineD3DVolumeTextureImpl_SetPriority(IWineD3DVolumeTexture *iface, DWORD PriorityNew) { - return resource_set_priority((IWineD3DResource *)iface, PriorityNew); +static DWORD WINAPI IWineD3DVolumeTextureImpl_SetPriority(IWineD3DVolumeTexture *iface, DWORD priority) +{ + return resource_set_priority((IWineD3DResourceImpl *)iface, priority); } static DWORD WINAPI IWineD3DVolumeTextureImpl_GetPriority(IWineD3DVolumeTexture *iface) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2e50f7a..dbfd4e3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1837,7 +1837,7 @@ HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format *format, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; WINED3DRESOURCETYPE resource_get_type(IWineD3DResource *iface) DECLSPEC_HIDDEN; -DWORD resource_set_priority(IWineD3DResource *iface, DWORD new_priority) DECLSPEC_HIDDEN; +DWORD resource_set_priority(struct IWineD3DResourceImpl *resource, DWORD priority) DECLSPEC_HIDDEN; HRESULT resource_set_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN; void resource_unload(IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN;

1 0

Greg Geldorp : gdi32/tests: Fix System font test for Japanese.
by Alexandre Julliard Jan. 7, 2011

Jan. 7, 2011

Module: wine Branch: master Commit: 1e922ebb0720e9e83d93a2a85e6e3a6d70ea1ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e922ebb0720e9e83d93a2a85… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Fri Jan 7 13:03:17 2011 +0100 gdi32/tests: Fix System font test for Japanese. --- dlls/gdi32/tests/font.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 179e846..71a667f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -729,11 +729,7 @@ static void test_bitmap_font_metrics(void) { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 14, 96, FS_LATIN1 }, { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 15, 96, FS_LATIN2 | FS_CYRILLIC }, -/* - * TODO: the system for CP932 should be NORMAL, not BOLD. However that would - * require a new system.sfd for that font - */ - { "System", FW_BOLD, 18, 16, 2, 0, 2, 8, 16, 96, FS_JISJAPAN }, + { "System", FW_NORMAL, 18, 16, 2, 0, 2, 8, 16, 96, FS_JISJAPAN }, { "System", FW_BOLD, 20, 16, 4, 4, 0, 9, 14, 120, FS_LATIN1 }, { "System", FW_BOLD, 20, 16, 4, 4, 0, 9, 17, 120, FS_LATIN2 | FS_CYRILLIC },

1 0

Alexandre Julliard : po: Update the English po files.
by Alexandre Julliard Jan. 7, 2011

Jan. 7, 2011

Module: wine Branch: master Commit: 41f1f5230a0b61ddca8e8ed8189fcb4a2acbaa19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f1f5230a0b61ddca8e8ed81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 7 12:20:15 2011 +0100 po: Update the English po files. --- po/en.po | 459 ++++++++++++++++++++++++++++++++++++++--------------------- po/en_US.po | 12 +- 2 files changed, 300 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41f1f5230a0b61ddca8e8…

1 0

Alexandre Julliard : kernel32: Update the country code for Serbia.
by Alexandre Julliard Jan. 7, 2011

Jan. 7, 2011

Module: wine Branch: master Commit: e7749967b8df53982ad6905fefc554a0fc202b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7749967b8df53982ad6905fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 7 12:11:53 2011 +0100 kernel32: Update the country code for Serbia. --- dlls/kernel32/nls/srb.nls | 8 ++++---- dlls/kernel32/nls/srl.nls | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls index 906448e..2d75eb2 100644 --- a/dlls/kernel32/nls/srb.nls +++ b/dlls/kernel32/nls/srb.nls @@ -98,11 +98,11 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_SDAYNAME7 "��" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Serbia" - LOCALE_SENGCURRNAME "Yugoslavian Dinar" + LOCALE_SENGCURRNAME "Serbian Dinar" LOCALE_SENGLANGUAGE "Serbian (Cyrillic)" LOCALE_SGROUPING "3;0" - LOCALE_SINTLSYMBOL "YUN" - LOCALE_SISO3166CTRYNAME "SP" + LOCALE_SINTLSYMBOL "RSD" + LOCALE_SISO3166CTRYNAME "RS" LOCALE_SISO639LANGNAME "sr" LOCALE_SLANGUAGE "Serbian (Cyrillic)" LOCALE_SLIST ";" @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_SMONTHNAME12 "��" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." - LOCALE_SNAME "sr-SP" + LOCALE_SNAME "sr-RS" LOCALE_SNATIVECTRYNAME "��" LOCALE_SNATIVECURRNAME "��" LOCALE_SNATIVEDIGITS "0123456789" diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls index b706e52..cc53cac 100644 --- a/dlls/kernel32/nls/srl.nls +++ b/dlls/kernel32/nls/srl.nls @@ -98,11 +98,11 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_SDAYNAME7 "nedelja" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Serbia" - LOCALE_SENGCURRNAME "Yugoslavian Dinar" + LOCALE_SENGCURRNAME "Serbian Dinar" LOCALE_SENGLANGUAGE "Serbian (Latin)" LOCALE_SGROUPING "3;0" - LOCALE_SINTLSYMBOL "YUN" - LOCALE_SISO3166CTRYNAME "SP" + LOCALE_SINTLSYMBOL "RSD" + LOCALE_SISO3166CTRYNAME "RS" LOCALE_SISO639LANGNAME "sr" LOCALE_SLANGUAGE "Serbian (Latin)" LOCALE_SLIST ";" @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_SMONTHNAME12 "decembar" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." - LOCALE_SNAME "sr-Latn-SP" + LOCALE_SNAME "sr-Latn-RS" LOCALE_SNATIVECTRYNAME "Srbija" LOCALE_SNATIVECURRNAME "dinar" LOCALE_SNATIVEDIGITS "0123456789"

1 0