July 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Make the volume parameter to volume_load() const.
by Alexandre Julliard July 13, 2011

July 13, 2011

Module: wine Branch: master Commit: b2d32a496653b9e1d7f20ba103bb39f645e2ed4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d32a496653b9e1d7f20ba10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 12 21:17:45 2011 +0200 wined3d: Make the volume parameter to volume_load() const. --- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 8803770..e7fdce8 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -89,7 +89,7 @@ void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture } /* Context activation is done by the caller. */ -void volume_load(struct wined3d_volume *volume, UINT level, BOOL srgb_mode) +void volume_load(const struct wined3d_volume *volume, UINT level, BOOL srgb_mode) { const struct wined3d_gl_info *gl_info = &volume->resource.device->adapter->gl_info; const struct wined3d_format *format = volume->resource.format; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 682c21b..20f217b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1920,7 +1920,7 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc } void volume_add_dirty_box(struct wined3d_volume *volume, const WINED3DBOX *dirty_box) DECLSPEC_HIDDEN; -void volume_load(struct wined3d_volume *volume, UINT level, BOOL srgb_mode) DECLSPEC_HIDDEN; +void volume_load(const struct wined3d_volume *volume, UINT level, BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN; /*****************************************************************************

1 0

Adam Martinson : msxml3: Don' t cause an assert failure if the datatypes schema doesn't load.
by Alexandre Julliard July 13, 2011

July 13, 2011

Module: wine Branch: master Commit: 8371784ff65f594a8ab6a17c3f8e14f794d39333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8371784ff65f594a8ab6a17c3… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Tue Jul 12 14:22:11 2011 -0500 msxml3: Don't cause an assert failure if the datatypes schema doesn't load. --- dlls/msxml3/schema.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index c8ce471..883ab07 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -35,6 +35,7 @@ # include <libxml/parser.h> # include <libxml/parserInternals.h> # include <libxml/xmlIO.h> +# include <libxml/xmlversion.h> #endif #include "windef.h" @@ -624,7 +625,15 @@ HRESULT dt_validate(XDR_DT dt, xmlChar const* content) case DT_UI8: case DT_URI: case DT_UUID: - assert(datatypes_schema != NULL); + if (!datatypes_schema) + { + ERR("failed to load schema for urn:schemas-microsoft-com:datatypes, " + "you're probably using an old version of libxml2: " LIBXML_DOTTED_VERSION "\n"); + + /* Hopefully they don't need much in the way of XDR datatypes support... */ + return S_OK; + } + if (content && xmlStrlen(content)) { tmp_doc = xmlNewDoc(NULL);

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard July 13, 2011

July 13, 2011

Module: wine Branch: master Commit: 8ad3dde9cafb0dec2915932fc7dba963559232e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ad3dde9cafb0dec2915932fc… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Jul 12 17:09:34 2011 +0900 po: Updated Korean translation. --- po/ko.po | 30 +++++++++++------------------- 1 files changed, 11 insertions(+), 19 deletions(-) diff --git a/po/ko.po b/po/ko.po index 9aec035..a1c10cd 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6361,7 +6361,7 @@ msgstr "복구(&R)" #: shell32.rc:83 msgid "&Erase" -msgstr "" +msgstr "지우기(&E)" #: shell32.rc:95 msgid "E&xplore" @@ -6742,44 +6742,38 @@ msgid "There is no Windows program configured to open this type of file." msgstr "이 형식의 파일을 도록 구성된 윈도우 프로그램이 없습니다." #: shell32.rc:255 -#, fuzzy msgid "Are you sure you wish to permanently delete '%1'?" -msgstr "당신은 '%1'을 지우기를 바랍니까?" +msgstr "당신은 '%1'을 완전히 지우기를 바랍니까?" #: shell32.rc:256 -#, fuzzy msgid "Are you sure you wish to permanently delete these %1 items?" -msgstr "당신은 %1 아이템(들)을 지우기를 바랍니까?" +msgstr "당신은 %1 아이템(들)을 완전히 지우기를 바랍니까?" #: shell32.rc:257 -#, fuzzy msgid "Confirm deletion" -msgstr "파일 지우기 확인" +msgstr "삭제 확인" #: shell32.rc:258 -#, fuzzy msgid "" "A file already exists at the path %1.\n" "\n" "Do you want to replace it?" msgstr "" -"파일은 이미 존재합니다.\n" -"덮어쓰겠습니까?" +"경로 %1에 파일은 이미 존재합니다.\n" +"바꾸기를 원합니까?" #: shell32.rc:259 -#, fuzzy msgid "" "A folder already exists at the path %1.\n" "\n" "Do you want to replace it?" msgstr "" -"파일은 이미 존재합니다.\n" -"덮어쓰겠습니까?" +"경로 %1에 폴더 이미 존재합니다.\n" +"바꾸기를 원합니까?" #: shell32.rc:260 -#, fuzzy msgid "Confirm overwrite" -msgstr "파일 덮어쓰기 확인" +msgstr "덮어쓰기 확인" #: shell32.rc:277 msgid "" @@ -8419,9 +8413,8 @@ msgid "Wine Explorer" msgstr "Wine 탐색기" #: explorer.rc:29 -#, fuzzy msgid "Location:" -msgstr "랜 연결" +msgstr "위치:" #: hostname.rc:27 msgid "Usage: hostname\n" @@ -9515,7 +9508,6 @@ msgid "Exports selected branch of the registry to a text file" msgstr "레지스트리의 선택된 부분을 텍스트 파일로 내보내기" #: start.rc:46 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9539,7 +9531,7 @@ msgid "" "This is free software, and you are welcome to redistribute it\n" "under certain conditions; run 'start /L' for details.\n" msgstr "" -"풀그림을 실행시키거나 보통 파일에 첨가해서 사용되는 풀그림으로 문서 열기\n" +"풀그림을 실행시키거나 보통 파일에서 사용되는 풀그림으로 문서 열기\n" "Usage:\n" "start [옵션] 풀그림이나 파일 이름 [...]\n" "start [옵션] 문서 파일 이름\n"

1 0

Henri Verbeet : wined3d: Pass a state pointer instead of a stateblock to loadTexCoords().
by Alexandre Julliard July 13, 2011

July 13, 2011

Module: wine Branch: master Commit: 534151a79b42bc6d5489161483307ba2735b824a URL: http://source.winehq.org/git/wine.git/?a=commit;h=534151a79b42bc6d548916148… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 12 21:17:47 2011 +0200 wined3d: Pass a state pointer instead of a stateblock to loadTexCoords(). --- dlls/wined3d/state.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 50bf387..682c895 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3265,7 +3265,7 @@ static void transform_texture(DWORD state_id, struct wined3d_stateblock *statebl } } -static void unloadTexCoords(const struct wined3d_gl_info *gl_info) +static void unload_tex_coords(const struct wined3d_gl_info *gl_info) { unsigned int texture_idx; @@ -3276,23 +3276,25 @@ static void unloadTexCoords(const struct wined3d_gl_info *gl_info) } } -static void loadTexCoords(const struct wined3d_gl_info *gl_info, struct wined3d_stateblock *stateblock, - const struct wined3d_stream_info *si, GLuint *curVBO) +static void load_tex_coords(const struct wined3d_context *context, const struct wined3d_stream_info *si, + GLuint *curVBO, const struct wined3d_state *state) { + const struct wined3d_device *device = context->swapchain->device; + const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int mapped_stage = 0; unsigned int textureNo = 0; for (textureNo = 0; textureNo < gl_info->limits.texture_stages; ++textureNo) { - int coordIdx = stateblock->state.texture_states[textureNo][WINED3DTSS_TEXCOORDINDEX]; + int coordIdx = state->texture_states[textureNo][WINED3DTSS_TEXCOORDINDEX]; - mapped_stage = stateblock->device->texUnitMap[textureNo]; + mapped_stage = device->texUnitMap[textureNo]; if (mapped_stage == WINED3D_UNMAPPED_STAGE) continue; if (coordIdx < MAX_TEXTURES && (si->use_map & (1 << (WINED3D_FFP_TEXCOORD0 + coordIdx)))) { const struct wined3d_stream_info_element *e = &si->elements[WINED3D_FFP_TEXCOORD0 + coordIdx]; - const struct wined3d_stream_state *stream = &stateblock->state.streams[e->stream_idx]; + const struct wined3d_stream_state *stream = &state->streams[e->stream_idx]; TRACE("Setting up texture %u, idx %d, coordindx %u, data {%#x:%p}.\n", textureNo, mapped_stage, coordIdx, e->data.buffer_object, e->data.addr); @@ -3309,7 +3311,7 @@ static void loadTexCoords(const struct wined3d_gl_info *gl_info, struct wined3d_ /* The coords to supply depend completely on the fvf / vertex shader */ glTexCoordPointer(e->format->gl_vtx_format, e->format->gl_vtx_type, e->stride, - e->data.addr + stateblock->state.load_base_vertex_index * e->stride + stream->offset); + e->data.addr + state->load_base_vertex_index * e->stride + stream->offset); glEnableClientState(GL_TEXTURE_COORD_ARRAY); } else @@ -3329,15 +3331,16 @@ static void loadTexCoords(const struct wined3d_gl_info *gl_info, struct wined3d_ checkGLcall("loadTexCoords"); } -static void tex_coordindex(DWORD state, struct wined3d_stateblock *stateblock, struct wined3d_context *context) +static void tex_coordindex(DWORD state_id, struct wined3d_stateblock *stateblock, struct wined3d_context *context) { - DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); DWORD mapped_stage = stateblock->device->texUnitMap[stage]; static const GLfloat s_plane[] = { 1.0f, 0.0f, 0.0f, 0.0f }; static const GLfloat t_plane[] = { 0.0f, 1.0f, 0.0f, 0.0f }; static const GLfloat r_plane[] = { 0.0f, 0.0f, 1.0f, 0.0f }; static const GLfloat q_plane[] = { 0.0f, 0.0f, 0.0f, 1.0f }; const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_state *state = &stateblock->state; if (mapped_stage == WINED3D_UNMAPPED_STAGE) { @@ -3362,7 +3365,7 @@ static void tex_coordindex(DWORD state, struct wined3d_stateblock *stateblock, s * state. We do not (yet) support the WINED3DRENDERSTATE_WRAPx values, nor tie them up * to the TEXCOORDINDEX value */ - switch (stateblock->state.texture_states[stage][WINED3DTSS_TEXCOORDINDEX] & 0xffff0000) + switch (state->texture_states[stage][WINED3DTSS_TEXCOORDINDEX] & 0xffff0000) { case WINED3DTSS_TCI_PASSTHRU: /* Use the specified texture coordinates contained within the @@ -3477,7 +3480,7 @@ static void tex_coordindex(DWORD state, struct wined3d_stateblock *stateblock, s default: FIXME("Unhandled WINED3DTSS_TEXCOORDINDEX %#x.\n", - stateblock->state.texture_states[stage][WINED3DTSS_TEXCOORDINDEX]); + state->texture_states[stage][WINED3DTSS_TEXCOORDINDEX]); glDisable(GL_TEXTURE_GEN_S); glDisable(GL_TEXTURE_GEN_T); glDisable(GL_TEXTURE_GEN_R); @@ -3500,8 +3503,8 @@ static void tex_coordindex(DWORD state, struct wined3d_stateblock *stateblock, s */ GLuint curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0; - unloadTexCoords(gl_info); - loadTexCoords(gl_info, stateblock, &stateblock->device->strided_streams, &curVBO); + unload_tex_coords(gl_info); + load_tex_coords(context, &stateblock->device->strided_streams, &curVBO, state); } } @@ -4033,7 +4036,7 @@ static inline void unloadVertexData(const struct wined3d_gl_info *gl_info) { glDisableClientState(GL_WEIGHT_ARRAY_ARB); } - unloadTexCoords(gl_info); + unload_tex_coords(gl_info); } static inline void unload_numbered_array(struct wined3d_context *context, int i) @@ -4488,7 +4491,7 @@ static void loadVertexData(const struct wined3d_context *context, struct wined3d } /* Texture coords -------------------------------------------*/ - loadTexCoords(gl_info, stateblock, si, &curVBO); + load_tex_coords(context, si, &curVBO, &stateblock->state); } static void streamsrc(DWORD state, struct wined3d_stateblock *stateblock, struct wined3d_context *context)

1 0

Henri Verbeet : wined3d: Pass a state pointer instead of a stateblock to loadVertexData().
by Alexandre Julliard July 13, 2011

July 13, 2011

Module: wine Branch: master Commit: 475225c27544c801f4dede7526f25a55fb1eac4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=475225c27544c801f4dede752… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 12 21:17:48 2011 +0200 wined3d: Pass a state pointer instead of a stateblock to loadVertexData(). --- dlls/wined3d/state.c | 74 +++++++++++++++++++++++++------------------------- 1 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=475225c27544c801f4ded…

1 0

Francois Gouget : ole32: Fix a handle leak in local_server_thread().
by Alexandre Julliard July 13, 2011

July 13, 2011

Module: wine Branch: master Commit: b6f28fc70fc2d75f3950e4cbe67521bdf0407d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f28fc70fc2d75f3950e4cbe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 13 00:08:25 2011 +0200 ole32: Fix a handle leak in local_server_thread(). --- dlls/ole32/rpc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 431f5bc..7801d9f 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1936,7 +1936,12 @@ static DWORD WINAPI local_server_thread(LPVOID param) TRACE("marshalling IClassFactory to client\n"); hres = IStream_Stat(pStm,&ststg,STATFLAG_NONAME); - if (hres) return hres; + if (hres) + { + CloseHandle(hPipe); + CloseHandle(pipe_event); + return hres; + } seekto.u.LowPart = 0; seekto.u.HighPart = 0;

1 0

Francois Gouget : ole32: Modify local_server_thread() to recreate the pipe for each request.
by Alexandre Julliard July 13, 2011

July 13, 2011

Module: wine Branch: master Commit: be9a032693a138795fb57c2f67c0a38b64cf0410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be9a032693a138795fb57c2f6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 13 00:09:18 2011 +0200 ole32: Modify local_server_thread() to recreate the pipe for each request. This avoids having the named pipe get stuck in the STATUS_PIPE_BUSY state after the DisconnectNamedPipe() call. --- dlls/ole32/rpc.c | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 7801d9f..1a0b575 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1879,7 +1879,6 @@ struct local_server_params static DWORD WINAPI local_server_thread(LPVOID param) { struct local_server_params * lsp = param; - HANDLE hPipe; WCHAR pipefn[100]; HRESULT hres; IStream *pStm = lsp->stream; @@ -1898,22 +1897,24 @@ static DWORD WINAPI local_server_thread(LPVOID param) memset(&ovl, 0, sizeof(ovl)); get_localserver_pipe_name(pipefn, &lsp->clsid); - - hPipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, - PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, - 4096, 4096, 500 /* 0.5 second timeout */, NULL ); + ovl.hEvent = pipe_event = CreateEventW(NULL, FALSE, FALSE, NULL); SetEvent(lsp->ready_event); - - if (hPipe == INVALID_HANDLE_VALUE) - { - FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); - return 1; - } - - ovl.hEvent = pipe_event = CreateEventW(NULL, FALSE, FALSE, NULL); - + /* Clients trying to connect between now and CreateNamedPipeW() will + * fail and will have to retry. See also the end of the loop. + */ while (1) { + HANDLE hPipe; + hPipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, + 4096, 4096, 500 /* 0.5 second timeout */, NULL ); + if (hPipe == INVALID_HANDLE_VALUE) + { + FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); + CloseHandle(pipe_event); + return 1; + } + if (!ConnectNamedPipe(hPipe, &ovl)) { DWORD error = GetLastError(); @@ -1923,12 +1924,16 @@ static DWORD WINAPI local_server_thread(LPVOID param) DWORD ret; ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); if (ret != WAIT_OBJECT_0) + { + CloseHandle(hPipe); break; + } } /* client already connected isn't an error */ else if (error != ERROR_PIPE_CONNECTED) { ERR("ConnectNamedPipe failed with error %d\n", GetLastError()); + CloseHandle(hPipe); break; } } @@ -1971,6 +1976,10 @@ static DWORD WINAPI local_server_thread(LPVOID param) FlushFileBuffers(hPipe); DisconnectNamedPipe(hPipe); + CloseHandle(hPipe); + /* Clients trying to connect between now and CreateNamedPipeW() will + * fail and will have to retry. + */ TRACE("done marshalling IClassFactory\n"); @@ -1980,7 +1989,6 @@ static DWORD WINAPI local_server_thread(LPVOID param) break; } } - CloseHandle(hPipe); CloseHandle(pipe_event); return 0; }

1 0

Henri Verbeet : wined3d: Pass a state pointer instead of a stateblock to loadNumberedArrays().
by Alexandre Julliard July 13, 2011

July 13, 2011

Module: wine Branch: master Commit: 3d28cdb691be0f917f204cc4cdd56dae08b13f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d28cdb691be0f917f204cc4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 12 21:17:46 2011 +0200 wined3d: Pass a state pointer instead of a stateblock to loadNumberedArrays(). --- dlls/wined3d/state.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fb77104..50bf387 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4047,9 +4047,8 @@ static inline void unload_numbered_array(struct wined3d_context *context, int i) } /* This should match any arrays loaded in loadNumberedArrays - * TODO: Only load / unload arrays if we have to. - */ -static inline void unloadNumberedArrays(struct wined3d_context *context) + * TODO: Only load / unload arrays if we have to. */ +static void unload_numbered_arrays(struct wined3d_context *context) { /* disable any attribs (this is the same for both GLSL and ARB modes) */ GLint maxAttribs = 16; @@ -4065,16 +4064,17 @@ static inline void unloadNumberedArrays(struct wined3d_context *context) } } -static void loadNumberedArrays(struct wined3d_stateblock *stateblock, - const struct wined3d_stream_info *stream_info, struct wined3d_context *context) +static void load_numbered_arrays(struct wined3d_context *context, + const struct wined3d_stream_info *stream_info, const struct wined3d_state *state) { + struct wined3d_device *device = context->swapchain->device; const struct wined3d_gl_info *gl_info = context->gl_info; GLuint curVBO = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0U : 0; int i; struct wined3d_buffer *vb; /* Default to no instancing */ - stateblock->device->instancedDraw = FALSE; + device->instancedDraw = FALSE; for (i = 0; i < MAX_ATTRIBS; i++) { @@ -4086,13 +4086,13 @@ static void loadNumberedArrays(struct wined3d_stateblock *stateblock, continue; } - stream = &stateblock->state.streams[stream_info->elements[i].stream_idx]; + stream = &state->streams[stream_info->elements[i].stream_idx]; /* Do not load instance data. It will be specified using glTexCoord by drawprim */ if (stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) { if (context->numbered_array_mask & (1 << i)) unload_numbered_array(context, i); - stateblock->device->instancedDraw = TRUE; + device->instancedDraw = TRUE; continue; } @@ -4115,7 +4115,7 @@ static void loadNumberedArrays(struct wined3d_stateblock *stateblock, stream_info->elements[i].format->gl_vtx_type, stream_info->elements[i].format->gl_normalized, stream_info->elements[i].stride, stream_info->elements[i].data.addr - + stateblock->state.load_base_vertex_index * stream_info->elements[i].stride + + state->load_base_vertex_index * stream_info->elements[i].stride + stream->offset)); if (!(context->numbered_array_mask & (1 << i))) @@ -4500,7 +4500,7 @@ static void streamsrc(DWORD state, struct wined3d_stateblock *stateblock, struct if (isStateDirty(context, STATE_VDECL)) return; if (context->numberedArraysLoaded && !load_numbered) { - unloadNumberedArrays(context); + unload_numbered_arrays(context); context->numberedArraysLoaded = FALSE; context->numbered_array_mask = 0; } @@ -4513,7 +4513,7 @@ static void streamsrc(DWORD state, struct wined3d_stateblock *stateblock, struct if (load_numbered) { TRACE("Loading numbered arrays\n"); - loadNumberedArrays(stateblock, &device->strided_streams, context); + load_numbered_arrays(context, &device->strided_streams, &stateblock->state); context->numberedArraysLoaded = TRUE; } else if (load_named)

1 0

Henri Verbeet : wined3d: Make the volume parameter to volume_bind_and_dirtify() const.
by Alexandre Julliard July 13, 2011

July 13, 2011

Module: wine Branch: master Commit: 1791a5afd5bba6241086c26e418c54b6eb552f88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1791a5afd5bba6241086c26e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 12 21:17:44 2011 +0200 wined3d: Make the volume parameter to volume_bind_and_dirtify() const. --- dlls/wined3d/volume.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index e176edc..8803770 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); /* Context activation is done by the caller. */ -static void volume_bind_and_dirtify(struct wined3d_volume *volume, const struct wined3d_gl_info *gl_info) +static void volume_bind_and_dirtify(const struct wined3d_volume *volume, const struct wined3d_gl_info *gl_info) { struct wined3d_texture *container = volume->container; DWORD active_sampler;

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.24
by Jeremy Newman July 12, 2011

July 12, 2011

Module: website Branch: master Commit: 14367f071dd027b3edfca52ba88328537ddd2610 URL: http://source.winehq.org/git/website.git/?a=commit;h=14367f071dd027b3edfca5… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Jul 11 18:11:25 2011 +0200 Polish translation for release 1.3.24 --- news/pl/2011070801.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2011070801.xml b/news/pl/2011070801.xml new file mode 100644 index 0000000..0c531f0 --- /dev/null +++ b/news/pl/2011070801.xml @@ -0,0 +1,17 @@ +<news> +<date>Lipiec 8, 2011</date> +<title>Wydano Wine 1.3.24</title> +<body> + Wydanie rozwojowe Wine 1.3.24 jest już dostępne. + <a href="{$root}/announce/1.3.24">Co nowego</a> w tym wydaniu: +<ul> + <li>Rozmaite ulepszenia DirectInput.</li> + <li>Wsparcie dla podziału wiersza w Uniscribe.</li> + <li>Więcej elementów interfejsu użytkownika we wbudowanym eksploratorze powłoki.</li> + <li>Kilka więcej funkcji D3DX9.</li> + <li>Ulepszona obsługa dla znanych folderów powłoki.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.24.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0