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

Vincent Povirk : gdiplus: Store the codec information and functions in a single structure.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 96023267c8f5383ea8b1fa11645785b988f0af7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96023267c8f5383ea8b1fa116… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 20 17:21:41 2009 -0500 gdiplus: Store the codec information and functions in a single structure. --- dlls/gdiplus/image.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2ed64f8..cf48d87 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1354,18 +1354,20 @@ static GpStatus encode_image_BMP(LPVOID bitmap_bits, LPBITMAPINFO bitmap_info, return Ok; } -typedef GpStatus encode_image_func(LPVOID bitmap_bits, LPBITMAPINFO bitmap_info, +typedef GpStatus (*encode_image_func)(LPVOID bitmap_bits, LPBITMAPINFO bitmap_info, void **output, unsigned int *output_size); +typedef struct image_codec { + ImageCodecInfo info; + encode_image_func encode_func; +} image_codec; + typedef enum { BMP, NUM_ENCODERS_SUPPORTED } ImageFormat; -static const ImageCodecInfo codecs[NUM_ENCODERS_SUPPORTED]; -static encode_image_func *const encode_image_funcs[NUM_ENCODERS_SUPPORTED] = { - encode_image_BMP, -}; +static const struct image_codec codecs[NUM_ENCODERS_SUPPORTED]; /***************************************************************************** * GdipSaveImageToStream [GDIPLUS.@] @@ -1382,7 +1384,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, int bm_is_selected; BITMAPINFO bmp_info; LPVOID bmp_bits; - encode_image_func* encode_image; + encode_image_func encode_image; LPVOID output; unsigned int output_size; unsigned int dummy; @@ -1407,8 +1409,8 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, /* select correct encoder */ encode_image = NULL; for (i = 0; i < NUM_ENCODERS_SUPPORTED; i++) { - if (IsEqualCLSID(clsid, &codecs[i].Clsid)) - encode_image = encode_image_funcs[i]; + if (IsEqualCLSID(clsid, &codecs[i].info.Clsid)) + encode_image = codecs[i].encode_func; } if (encode_image == NULL) return UnknownImageFormat; @@ -1500,7 +1502,7 @@ static const WCHAR bmp_format[] = {'B', 'M', 'P', 0}; /* BMP */ static const BYTE bmp_sig_pattern[] = { 0x42, 0x4D }; static const BYTE bmp_sig_mask[] = { 0xFF, 0xFF }; -static const ImageCodecInfo codecs[NUM_ENCODERS_SUPPORTED] = +static const struct image_codec codecs[NUM_ENCODERS_SUPPORTED] = { { { /* BMP */ /* Clsid */ { 0x557cf400, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } }, @@ -1517,7 +1519,9 @@ static const ImageCodecInfo codecs[NUM_ENCODERS_SUPPORTED] = /* SigPattern */ bmp_sig_pattern, /* SigMask */ bmp_sig_mask, }, - }; + encode_image_BMP + } +}; /***************************************************************************** * GdipGetImageDecodersSize [GDIPLUS.@] @@ -1559,7 +1563,7 @@ GpStatus WINGDIPAPI GdipGetImageEncodersSize(UINT *numEncoders, UINT *size) return InvalidParameter; *numEncoders = NUM_ENCODERS_SUPPORTED; - *size = sizeof (codecs); + *size = NUM_ENCODERS_SUPPORTED * sizeof(ImageCodecInfo); return Ok; } @@ -1569,14 +1573,16 @@ GpStatus WINGDIPAPI GdipGetImageEncodersSize(UINT *numEncoders, UINT *size) */ GpStatus WINGDIPAPI GdipGetImageEncoders(UINT numEncoders, UINT size, ImageCodecInfo *encoders) { + int i; TRACE("%u %u %p\n", numEncoders, size, encoders); if (!encoders || (numEncoders != NUM_ENCODERS_SUPPORTED) || - (size != sizeof (codecs))) + (size != NUM_ENCODERS_SUPPORTED * sizeof(ImageCodecInfo))) return GenericError; - memcpy(encoders, codecs, sizeof (codecs)); + for (i=0; i<NUM_ENCODERS_SUPPORTED; i++) + memcpy(&encoders[i], &codecs[i].info, sizeof(ImageCodecInfo)); return Ok; }

1 0

Henri Verbeet : wined3d: Properly check if an attribute is used in IWineD3DDeviceImpl_ProcessVertices ().
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 458afd64bd26dee98154b4be7a8d4a2a6fbd1202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458afd64bd26dee98154b4be7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 21 09:12:29 2009 +0200 wined3d: Properly check if an attribute is used in IWineD3DDeviceImpl_ProcessVertices(). --- dlls/wined3d/device.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 75904ed..c17d7b6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4036,12 +4036,12 @@ static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIn BOOL doClip; DWORD numTextures; - if (stream_info->elements[WINED3D_FFP_NORMAL].data) + if (stream_info->use_map & (1 << WINED3D_FFP_NORMAL)) { WARN(" lighting state not saved yet... Some strange stuff may happen !\n"); } - if (!stream_info->elements[WINED3D_FFP_POSITION].data) + if (!(stream_info->use_map & (1 << WINED3D_FFP_POSITION))) { ERR("Source has no position mask\n"); return WINED3DERR_INVALIDCALL; @@ -4274,7 +4274,8 @@ static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIn if (DestFVF & WINED3DFVF_DIFFUSE) { const struct wined3d_stream_info_element *element = &stream_info->elements[WINED3D_FFP_DIFFUSE]; const DWORD *color_d = (const DWORD *)(element->data + i * element->stride); - if(!color_d) { + if (!(stream_info->use_map & (1 << WINED3D_FFP_DIFFUSE))) + { static BOOL warned = FALSE; if(!warned) { @@ -4305,7 +4306,8 @@ static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIn /* What's the color value in the feedback buffer? */ const struct wined3d_stream_info_element *element = &stream_info->elements[WINED3D_FFP_SPECULAR]; const DWORD *color_s = (const DWORD *)(element->data + i * element->stride); - if(!color_s) { + if (!(stream_info->use_map & (1 << WINED3D_FFP_SPECULAR))) + { static BOOL warned = FALSE; if(!warned) { @@ -4335,7 +4337,8 @@ static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIn for (tex_index = 0; tex_index < numTextures; tex_index++) { const struct wined3d_stream_info_element *element = &stream_info->elements[WINED3D_FFP_TEXCOORD0 + tex_index]; const float *tex_coord = (const float *)(element->data + i * element->stride); - if(!tex_coord) { + if (!(stream_info->use_map & (1 << (WINED3D_FFP_TEXCOORD0 + tex_index)))) + { ERR("No source texture, but destination requests one\n"); dest_ptr+=GET_TEXCOORD_SIZE_FROM_FVF(DestFVF, tex_index) * sizeof(float); if(dest_conv) dest_conv += GET_TEXCOORD_SIZE_FROM_FVF(DestFVF, tex_index) * sizeof(float); @@ -4397,7 +4400,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, */ for (i = 0; i < (sizeof(stream_info.elements) / sizeof(*stream_info.elements)); ++i) { - struct wined3d_stream_info_element *e = &stream_info.elements[i]; + struct wined3d_stream_info_element *e; + + if (!(stream_info.use_map & (1 << i))) continue; + + e = &stream_info.elements[i]; if (e->buffer_object) { struct wined3d_buffer *vb = (struct wined3d_buffer *)This->stateBlock->streamSource[e->stream_idx];

1 0

Henri Verbeet : wined3d: Don't check for a "representative" in the MarkStateDirty() functions.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 4ec2b09d8f62489dd4246d04511c0950a549df29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec2b09d8f62489dd4246d045… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 21 09:12:28 2009 +0200 wined3d: Don't check for a "representative" in the MarkStateDirty() functions. States without representative should never be called. Arguably they shouldn't exist in the first place, but allowing them simplifies the state table. --- dlls/wined3d/context.c | 5 +++-- dlls/wined3d/device.c | 1 - dlls/wined3d/state.c | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index be40f04..c4cd436 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -794,7 +794,7 @@ static void Context_MarkStateDirty(struct wined3d_context *context, DWORD state, DWORD idx; BYTE shift; - if(!rep || isStateDirty(context, rep)) return; + if (isStateDirty(context, rep)) return; context->dirtyArray[context->numDirtyEntries++] = rep; idx = rep >> 5; @@ -851,7 +851,8 @@ static struct wined3d_context *AddContextToArray(IWineD3DDeviceImpl *This, /* Mark all states dirty to force a proper initialization of the states on the first use of the context */ for(state = 0; state <= STATE_HIGHEST; state++) { - Context_MarkStateDirty(This->contexts[This->numContexts], state, This->StateTable); + if (This->StateTable[state].representative) + Context_MarkStateDirty(This->contexts[This->numContexts], state, This->StateTable); } This->numContexts++; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5d77931..75904ed 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7686,7 +7686,6 @@ void IWineD3DDeviceImpl_MarkStateDirty(IWineD3DDeviceImpl *This, DWORD state) { BYTE shift; UINT i; - if(!rep) return; for(i = 0; i < This->numContexts; i++) { context = This->contexts[i]; if(isStateDirty(context, rep)) continue; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a8394c1..97f1f79 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -56,11 +56,7 @@ static void state_nogl(DWORD state, IWineD3DStateBlockImpl *stateblock, struct w static void state_undefined(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { - /* Print a WARN, this allows the stateblock code to loop over all states to generate a display - * list without causing confusing terminal output. Deliberately no special debug name here - * because its undefined. - */ - WARN("undefined state %d\n", state); + ERR("Undefined state.\n"); } static void state_fillmode(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context)

1 0

Henri Verbeet : wined3d: Add a state handler for WINED3DRS_DEBUGMONITORTOKEN.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: b2e543b22f0f656a15752def6cbc2db5a96da88d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e543b22f0f656a15752def6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 21 09:12:27 2009 +0200 wined3d: Add a state handler for WINED3DRS_DEBUGMONITORTOKEN. --- dlls/wined3d/state.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7ea91b0..a8394c1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1494,6 +1494,11 @@ static void state_pscale(DWORD state, IWineD3DStateBlockImpl *stateblock, struct checkGLcall("glPointSize(...);"); } +static void state_debug_monitor(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +{ + WARN("token: %#x\n", stateblock->renderState[WINED3DRS_DEBUGMONITORTOKEN]); +} + static void state_colorwrite(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { DWORD Value = stateblock->renderState[WINED3DRS_COLORWRITEENABLE]; @@ -4974,6 +4979,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_msaa }, ARB_MULTISAMPLE }, { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_msaa_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), { STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN), { STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN), state_debug_monitor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_BLENDOP), { STATE_RENDER(WINED3DRS_BLENDOP), state_blendop }, EXT_BLEND_MINMAX }, { STATE_RENDER(WINED3DRS_BLENDOP), { STATE_RENDER(WINED3DRS_BLENDOP), state_blendop_w }, WINED3D_GL_EXT_NONE },

1 0

Henri Verbeet : wined3d: Mark the correct state dirty.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: a36e30b5412c96a9a069844cf64e06182125abbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36e30b5412c96a9a069844cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 21 09:12:26 2009 +0200 wined3d: Mark the correct state dirty. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ea664aa..be40f04 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1849,7 +1849,7 @@ retry: if (context->render_offscreen != old_render_offscreen) { - Context_MarkStateDirty(context, WINED3DTS_PROJECTION, StateTable); + Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); Context_MarkStateDirty(context, STATE_VDECL, StateTable); Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable);

1 0

Michael Stefaniuc : winhlp32: Add the Romanian translation.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 03566d64cb7890726f54c7dd6967d378805615cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=03566d64cb7890726f54c7dd6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 21 02:07:09 2009 +0200 winhlp32: Add the Romanian translation. --- programs/winhlp32/Makefile.in | 1 + programs/winhlp32/Ro.rc | 132 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/Makefile.in b/programs/winhlp32/Makefile.in index d963558..6af4bfa 100644 --- a/programs/winhlp32/Makefile.in +++ b/programs/winhlp32/Makefile.in @@ -38,6 +38,7 @@ RC_SRCS = \ Pl.rc \ Pt.rc \ Rm.rc \ + Ro.rc \ Ru.rc \ Si.rc \ Sk.rc \ diff --git a/programs/winhlp32/Ro.rc b/programs/winhlp32/Ro.rc new file mode 100644 index 0000000..1f916ac --- /dev/null +++ b/programs/winhlp32/Ro.rc @@ -0,0 +1,132 @@ +/* + * Help Viewer + * + * Copyright 1996 Ulrich Schmid + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2009 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winhelp_res.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +/* Menu */ + +MAIN_MENU MENU +{ + POPUP "&Fișier" { + MENUITEM "&Deschide", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Tipărește", MNID_FILE_PRINT + MENUITEM "&Setare imprimantă", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "&Ieșire", MNID_FILE_EXIT + } + POPUP "&Editare" { + MENUITEM "&Copiază...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Adnotează...", MNID_EDIT_ANNOTATE + } + POPUP "&Se&mn de carte" { + MENUITEM "&Definește...", MNID_BKMK_DEFINE + } + POPUP "&Opțiuni" { + POPUP "&Ajutor întotdeauna vizibil" + BEGIN + MENUITEM "Implicit", MNID_OPTS_HELP_DEFAULT + MENUITEM "Vizibil", MNID_OPTS_HELP_VISIBLE + MENUITEM "Invizibil", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "Istorie", MNID_OPTS_HISTORY + POPUP "&Font" + BEGIN + MENUITEM "Mic", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Mare", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Utilizează culorile sistemului", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&Ajutor" { + MENUITEM "Ajut&or despre ajutor", MNID_HELP_HELPON + MENUITEM "În&totdeauna deasupra", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Informații...", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "&Despre Wine", MNID_HELP_WINE +#endif + } +} + +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Căutare" +{ + LTEXT "Încă neimplementată", -1, 10, 10, 180, 150 +} + +/* Strings */ +STRINGTABLE DISCARDABLE +{ +STID_WINE_HELP, "Ajutor Wine" +STID_WHERROR, "EROARE" +STID_WARNING, "AVERTISMENT" +STID_INFO, "Informație" +STID_NOT_IMPLEMENTED, "Neimplementat" +STID_HLPFILE_ERROR_s, "Eroare la citirea fișierului de ajutor „%s”" +STID_INDEX, "&Index" +STID_CONTENTS, "Rezumat" +STID_BACK, "În&apoi" +STID_ALL_FILES, "Toate fișierele (*.*)" +STID_HELP_FILES_HLP, "Fișierele de ajutor (*.hlp)" +STID_FILE_NOT_FOUND_s "Fișierul „%s” nu poate fi găsit. Vreți să-l cautați?" +STID_NO_RICHEDIT "Nu am găsit o implementare pentru richedit... Abandonez" +STID_PSH_INDEX, "Subiecte de ajutor:" +} + +CONTEXT_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Adnotare...", MNID_CTXT_ANNOTATE + MENUITEM "Copiază", MNID_CTXT_COPY + MENUITEM "Tipărește...", MNID_CTXT_PRINT + POPUP "Fonturi" + BEGIN + MENUITEM "Mic", MNID_CTXT_FONTS_SMALL + MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Mare", MNID_CTXT_FONTS_LARGE + END + POPUP "Ajutorul întotdeauna vizibil" + BEGIN + MENUITEM "Implicit", MNID_CTXT_HELP_DEFAULT + MENUITEM "Vizibil", MNID_CTXT_HELP_VISIBLE + MENUITEM "Invizibil", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Utilizează culorile sistemului", MNID_CTXT_SYSTEM_COLORS + END +END

1 0

Jacek Caban : urlmon: Added more protocol tests.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 601c881705736dfb92e86bd631a46b391117d464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=601c881705736dfb92e86bd63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 21 00:16:01 2009 +0200 urlmon: Added more protocol tests. --- dlls/urlmon/tests/protocol.c | 525 ++++++++++++++++++++++++++++++------------ 1 files changed, 372 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=601c881705736dfb92e86…

1 0

Michael Stefaniuc : shdoclc: Add the Romanian translation.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 2a3ba717b3a6cd9ea272ab3d868e6e4f41ad6e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a3ba717b3a6cd9ea272ab3d8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 21 02:06:37 2009 +0200 shdoclc: Add the Romanian translation. --- dlls/shdoclc/Makefile.in | 1 + dlls/shdoclc/Ro.rc | 251 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 252 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a3ba717b3a6cd9ea272a…

1 0

Jacek Caban : urlmon: Check FLAG_ALL_DATA_READ first in protocol_read.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 64b5adc0b6d3346e371d808390b83601275dae36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b5adc0b6d3346e371d80839… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 21 00:15:32 2009 +0200 urlmon: Check FLAG_ALL_DATA_READ first in protocol_read. --- dlls/urlmon/protocol.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 87dbe4b..9b25cbf 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -338,14 +338,14 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret BOOL res; HRESULT hres = S_FALSE; - if(!(protocol->flags & FLAG_REQUEST_COMPLETE)) { + if(protocol->flags & FLAG_ALL_DATA_READ) { *read_ret = 0; - return E_PENDING; + return S_FALSE; } - if(protocol->flags & FLAG_ALL_DATA_READ) { + if(!(protocol->flags & FLAG_REQUEST_COMPLETE)) { *read_ret = 0; - return S_FALSE; + return E_PENDING; } while(read < size) {

1 0

Jacek Caban : urlmon: Fixed bscf for ReportData after mime verification call.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 094c0104f00c20ab96d7f42c5f9384b185143667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094c0104f00c20ab96d7f42c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 21 00:15:14 2009 +0200 urlmon: Fixed bscf for ReportData after mime verification call. --- dlls/urlmon/bindprot.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 63f2375..e4f203d 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -1060,6 +1060,10 @@ static HRESULT report_data(BindProtocol *This, DWORD bscf, ULONG progress, ULONG if(This->buf_size < MIME_TEST_SIZE && hres != S_FALSE) return S_OK; + bscf = BSCF_FIRSTDATANOTIFICATION; + if(hres == S_FALSE) + bscf |= BSCF_LASTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE; + if(!This->reported_mime) { hres = FindMimeFromData(NULL, This->url, This->buf, min(This->buf_size, MIME_TEST_SIZE), This->mime, 0, &mime, 0);

1 0