December 2010 - Wine-commits

Alexandre Julliard : winex11: Fix event coordinates mapping for the root window in the explorer process.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 10aa13a98e4346e8af5e95a20eaefec7223a8c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10aa13a98e4346e8af5e95a20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 13 12:42:47 2010 +0100 winex11: Fix event coordinates mapping for the root window in the explorer process. --- dlls/winex11.drv/event.c | 1 + dlls/winex11.drv/mouse.c | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 5447a40..be3033b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -788,6 +788,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) flags |= RDW_ALLCHILDREN; } + else OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); RedrawWindow( hwnd, &rect, 0, flags ); } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 71b31cc..a763798 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -239,6 +239,11 @@ static HWND update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned x += data->whole_rect.left - data->client_rect.left; y += data->whole_rect.top - data->client_rect.top; } + if (window == root_window) + { + x += virtual_screen_rect.left; + y += virtual_screen_rect.top; + } pt->x = x; pt->y = y; if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL)

1 0

Eric Pouech : kernel32: When reading chars out of a bare console, use the Unix API (instead of the Windows one).
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 4149643fbe1b3c9c92810fc5cdfc10487e807311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4149643fbe1b3c9c92810fc5c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 12 22:31:32 2010 +0100 kernel32: When reading chars out of a bare console, use the Unix API (instead of the Windows one). --- dlls/kernel32/console.c | 56 ++++++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index c0af117..97eae17 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -41,6 +41,9 @@ #ifdef HAVE_TERMIOS_H # include <termios.h> #endif +#ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -1112,33 +1115,35 @@ static BOOL handle_simple_char(HANDLE conin, unsigned real_inchar) return WriteConsoleInputW(conin, ir, numEvent, &written); } -static enum read_console_input_return bare_console_fetch_input(HANDLE handle, DWORD timeout) +static enum read_console_input_return bare_console_fetch_input(HANDLE handle, int fd, DWORD timeout) { - OVERLAPPED ov; - enum read_console_input_return ret; - char ch; - - /* get the real handle to the console object */ - handle = wine_server_ptr_handle(console_handle_unmap(handle)); + struct pollfd pollfd; + char ch; + enum read_console_input_return ret; - memset(&ov, 0, sizeof(ov)); - ov.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + pollfd.fd = fd; + pollfd.events = POLLIN; + pollfd.revents = 0; - if (ReadFile(handle, &ch, 1, NULL, &ov) || - (GetLastError() == ERROR_IO_PENDING && - WaitForSingleObject(ov.hEvent, timeout) == WAIT_OBJECT_0 && - GetOverlappedResult(handle, &ov, NULL, FALSE))) + switch (poll(&pollfd, 1, timeout)) { - ret = handle_simple_char(handle, ch) ? rci_gotone : rci_error; - } - else - { - WARN("Failed read %x\n", GetLastError()); - ret = rci_error; + case 1: + RtlEnterCriticalSection(&CONSOLE_CritSect); + switch (read(fd, &ch, 1)) + { + case 1: ret = handle_simple_char(handle, ch) ? rci_gotone : rci_error; break; + /* actually another thread likely beat us to reading the char + * return gotone, while not perfect, it should work in most of the cases (as the new event + * should be now in the queue) + */ + case 0: ret = rci_gotone; break; + default: ret = rci_error; break; + } + RtlLeaveCriticalSection(&CONSOLE_CritSect); + return ret; + case 0: return rci_timeout; + default: return rci_error; } - CloseHandle(ov.hEvent); - - return ret; } static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_RECORD ir, DWORD timeout) @@ -1149,12 +1154,13 @@ static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_R if ((fd = get_console_bare_fd(handle)) != -1) { put_console_into_raw_mode(fd); - close(fd); if (WaitForSingleObject(GetConsoleInputWaitHandle(), 0) != WAIT_OBJECT_0) { - ret = bare_console_fetch_input(handle, timeout); - if (ret != rci_gotone) return ret; + ret = bare_console_fetch_input(handle, fd, timeout); } + else ret = rci_gotone; + close(fd); + if (ret != rci_gotone) return ret; } else {

1 0

Eric Pouech : kernel32: Proper support for echo-input (enable/disable) when getting console input.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 8b4c2ce9c58a43c5501d3f21b0c8d7e01c8bc767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b4c2ce9c58a43c5501d3f21b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 12 22:31:40 2010 +0100 kernel32: Proper support for echo-input (enable/disable) when getting console input. --- dlls/kernel32/editline.c | 70 +++++++++++++++++++++++++++------------------- 1 files changed, 41 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 4d02d77..4dff110 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -66,6 +66,7 @@ typedef struct WCEL_Context { unsigned done : 1, /* to 1 when we're done with editing */ error : 1, /* to 1 when an error occurred in the editing */ can_wrap : 1, /* to 1 when multi-line edition can take place */ + shall_echo : 1, /* to 1 when characters should be echo:ed when keyed-in */ can_pos_cursor : 1; /* to 1 when console can (re)position cursor */ unsigned histSize; unsigned histPos; @@ -128,6 +129,7 @@ static inline COORD WCEL_GetCoord(WCEL_Context* ctx, int ofs) static inline void WCEL_Update(WCEL_Context* ctx, int beg, int len) { + if (!ctx->shall_echo) return; if (ctx->can_pos_cursor) { WriteConsoleOutputCharacterW(ctx->hConOut, &ctx->line[beg], len, @@ -194,34 +196,38 @@ static BOOL WCEL_Grow(WCEL_Context* ctx, size_t len) static void WCEL_DeleteString(WCEL_Context* ctx, int beg, int end) { unsigned str_len = end - beg; - COORD cbeg = WCEL_GetCoord(ctx, ctx->len - str_len); - COORD cend = WCEL_GetCoord(ctx, ctx->len); - CHAR_INFO ci; if (end < ctx->len) memmove(&ctx->line[beg], &ctx->line[end], (ctx->len - end) * sizeof(WCHAR)); /* we need to clean from ctx->len - str_len to ctx->len */ - ci.Char.UnicodeChar = ' '; - ci.Attributes = ctx->csbi.wAttributes; - - if (cbeg.Y == cend.Y) - { - /* partial erase of sole line */ - CONSOLE_FillLineUniform(ctx->hConOut, cbeg.X, cbeg.Y, - cend.X - cbeg.X, &ci); - } - else + if (ctx->shall_echo) { - int i; - /* erase til eol on first line */ - CONSOLE_FillLineUniform(ctx->hConOut, cbeg.X, cbeg.Y, - ctx->csbi.dwSize.X - cbeg.X, &ci); - /* completely erase all the others (full lines) */ - for (i = cbeg.Y + 1; i < cend.Y; i++) - CONSOLE_FillLineUniform(ctx->hConOut, 0, i, ctx->csbi.dwSize.X, &ci); - /* erase from beginning of line until last pos on last line */ - CONSOLE_FillLineUniform(ctx->hConOut, 0, cend.Y, cend.X, &ci); + COORD cbeg = WCEL_GetCoord(ctx, ctx->len - str_len); + COORD cend = WCEL_GetCoord(ctx, ctx->len); + CHAR_INFO ci; + + ci.Char.UnicodeChar = ' '; + ci.Attributes = ctx->csbi.wAttributes; + + if (cbeg.Y == cend.Y) + { + /* partial erase of sole line */ + CONSOLE_FillLineUniform(ctx->hConOut, cbeg.X, cbeg.Y, + cend.X - cbeg.X, &ci); + } + else + { + int i; + /* erase til eol on first line */ + CONSOLE_FillLineUniform(ctx->hConOut, cbeg.X, cbeg.Y, + ctx->csbi.dwSize.X - cbeg.X, &ci); + /* completely erase all the others (full lines) */ + for (i = cbeg.Y + 1; i < cend.Y; i++) + CONSOLE_FillLineUniform(ctx->hConOut, 0, i, ctx->csbi.dwSize.X, &ci); + /* erase from beginning of line until last pos on last line */ + CONSOLE_FillLineUniform(ctx->hConOut, 0, cend.Y, cend.X, &ci); + } } ctx->len -= str_len; WCEL_Update(ctx, 0, ctx->len); @@ -378,7 +384,8 @@ static void WCEL_FindPrevInHist(WCEL_Context* ctx) ctx->ofs = 0; WCEL_InsertString(ctx, data); ctx->ofs = oldofs; - SetConsoleCursorPosition(ctx->hConOut, WCEL_GetCoord(ctx, ctx->ofs)); + if (ctx->shall_echo) + SetConsoleCursorPosition(ctx->hConOut, WCEL_GetCoord(ctx, ctx->ofs)); HeapFree(GetProcessHeap(), 0, data); return; } @@ -630,15 +637,18 @@ static void WCEL_MoveToLastHist(WCEL_Context* ctx) static void WCEL_Redraw(WCEL_Context* ctx) { - COORD c = WCEL_GetCoord(ctx, ctx->len); - CHAR_INFO ci; + if (ctx->shall_echo) + { + COORD c = WCEL_GetCoord(ctx, ctx->len); + CHAR_INFO ci; - WCEL_Update(ctx, 0, ctx->len); + WCEL_Update(ctx, 0, ctx->len); - ci.Char.UnicodeChar = ' '; - ci.Attributes = ctx->csbi.wAttributes; + ci.Char.UnicodeChar = ' '; + ci.Attributes = ctx->csbi.wAttributes; - CONSOLE_FillLineUniform(ctx->hConOut, c.X, c.Y, ctx->csbi.dwSize.X - c.X, &ci); + CONSOLE_FillLineUniform(ctx->hConOut, c.X, c.Y, ctx->csbi.dwSize.X - c.X, &ci); + } } static void WCEL_RepeatCount(WCEL_Context* ctx) @@ -812,6 +822,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE || !GetConsoleScreenBufferInfo(ctx.hConOut, &ctx.csbi)) return NULL; + ctx.shall_echo = (GetConsoleMode(hConsoleIn, &ks) && (ks & ENABLE_ECHO_INPUT)) ? 1 : 0; ctx.can_wrap = (GetConsoleMode(ctx.hConOut, &ks) && (ks & ENABLE_WRAP_AT_EOL_OUTPUT)) ? 1 : 0; ctx.can_pos_cursor = can_pos_cursor; @@ -868,6 +879,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) else TRACE("Dropped event\n"); /* EPP WCEL_Dump(&ctx, "after func"); */ + if (!ctx.shall_echo) continue; if (ctx.can_pos_cursor) { if (ctx.ofs != ofs)

1 0

Eric Pouech : kernel32: In readline, now print control characters with ^ escape.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 8aa3ec414d8ff4a5ebd7ca32fa171c267af2640e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa3ec414d8ff4a5ebd7ca32f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Dec 12 22:31:49 2010 +0100 kernel32: In readline, now print control characters with ^ escape. --- dlls/kernel32/editline.c | 136 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 101 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 4dff110..b33798b 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -57,7 +57,7 @@ typedef struct WCEL_Context { (for consoles that can't change cursor pos) */ unsigned last_max; /* max number of chars written (for consoles that can't change cursor pos) */ - unsigned ofs; /* offset for cursor in current line */ + unsigned ofs; /* offset for cursor in current line */ WCHAR* yanked; /* yanked line */ unsigned mark; /* marked point (emacs mode only) */ CONSOLE_SCREEN_BUFFER_INFO csbi; /* current state (initial cursor, window size, attribute) */ @@ -111,10 +111,27 @@ static inline BOOL WCEL_IsSingleLine(WCEL_Context* ctx, size_t len) return ctx->csbi.dwCursorPosition.X + ctx->len + len <= ctx->csbi.dwSize.X; } -static inline COORD WCEL_GetCoord(WCEL_Context* ctx, int ofs) +static inline int WCEL_CharWidth(WCHAR wch) +{ + return wch < ' ' ? 2 : 1; +} + +static inline int WCEL_StringWidth(const WCHAR* str, int beg, int len) +{ + int i, ofs; + + for (i = 0, ofs = 0; i < len; i++) + ofs += WCEL_CharWidth(str[beg + i]); + return ofs; +} + +static inline COORD WCEL_GetCoord(WCEL_Context* ctx, int strofs) { COORD c; int len = ctx->csbi.dwSize.X - ctx->csbi.dwCursorPosition.X; + int ofs; + + ofs = WCEL_StringWidth(ctx->line, 0, strofs); c.Y = ctx->csbi.dwCursorPosition.Y; if (ofs >= len) @@ -127,35 +144,79 @@ static inline COORD WCEL_GetCoord(WCEL_Context* ctx, int ofs) return c; } +static DWORD WCEL_WriteConsole(WCEL_Context* ctx, DWORD beg, DWORD len) +{ + DWORD i, last, dw, ret = 0; + WCHAR tmp[2]; + + for (i = last = 0; i < len; i++) + { + if (ctx->line[beg + i] < ' ') + { + if (last != i) + { + WriteConsoleW(ctx->hConOut, &ctx->line[beg + last], i - last, &dw, NULL); + ret += dw; + } + tmp[0] = '^'; + tmp[1] = '@' + ctx->line[beg + i]; + WriteConsoleW(ctx->hConOut, tmp, 2, &dw, NULL); + last = i + 1; + ret += dw; + } + } + if (last != len) + { + WriteConsoleW(ctx->hConOut, &ctx->line[beg + last], len - last, &dw, NULL); + ret += dw; + } + return ret; +} + +static inline void WCEL_WriteNChars(WCEL_Context* ctx, char ch, int count) +{ + DWORD dw; + + if (count > 0) + { + while (count--) WriteFile(ctx->hConOut, &ch, 1, &dw, NULL); + } +} + static inline void WCEL_Update(WCEL_Context* ctx, int beg, int len) { - if (!ctx->shall_echo) return; - if (ctx->can_pos_cursor) + int i, last; + WCHAR tmp[2]; + + /* bare console case is handled in CONSOLE_ReadLine (we always reprint the whole string) */ + if (!ctx->shall_echo || !ctx->can_pos_cursor) return; + + for (i = last = beg; i < beg + len; i++) { - WriteConsoleOutputCharacterW(ctx->hConOut, &ctx->line[beg], len, - WCEL_GetCoord(ctx, beg), NULL); - FillConsoleOutputAttribute(ctx->hConOut, ctx->csbi.wAttributes, len, - WCEL_GetCoord(ctx, beg), NULL); + if (ctx->line[i] < ' ') + { + if (last != i) + { + WriteConsoleOutputCharacterW(ctx->hConOut, &ctx->line[last], i - last, + WCEL_GetCoord(ctx, last), NULL); + FillConsoleOutputAttribute(ctx->hConOut, ctx->csbi.wAttributes, i - last, + WCEL_GetCoord(ctx, last), NULL); + } + tmp[0] = '^'; + tmp[1] = '@' + ctx->line[i]; + WriteConsoleOutputCharacterW(ctx->hConOut, tmp, 2, + WCEL_GetCoord(ctx, i), NULL); + FillConsoleOutputAttribute(ctx->hConOut, ctx->csbi.wAttributes, 2, + WCEL_GetCoord(ctx, i), NULL); + last = i + 1; + } } - else + if (last != beg + len) { - char ch; - unsigned i; - DWORD dw; - - /* erase previous chars */ - ch = '\b'; - for (i = beg; i < ctx->last_rub; i++) - WriteFile(ctx->hConOut, &ch, 1, &dw, NULL); - beg = min(beg, ctx->last_rub); - - /* write new chars */ - WriteConsoleW(ctx->hConOut, &ctx->line[beg], ctx->len - beg, &dw, NULL); - /* clean rest of line (if any) */ - ch = ' '; - for (i = ctx->len; i < ctx->last_max; i++) - WriteFile(ctx->hConOut, &ch, 1, &dw, NULL); - ctx->last_rub = max(ctx->last_max, ctx->len); + WriteConsoleOutputCharacterW(ctx->hConOut, &ctx->line[last], i - last, + WCEL_GetCoord(ctx, last), NULL); + FillConsoleOutputAttribute(ctx->hConOut, ctx->csbi.wAttributes, i - last, + WCEL_GetCoord(ctx, last), NULL); } } @@ -887,18 +948,23 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) } else if (!ctx.done && !ctx.error) { - char ch; - unsigned i; - DWORD dw; - + DWORD last; /* erase previous chars */ - ch = '\b'; - for (i = 0; i < ctx.last_rub; i++) - WriteFile(ctx.hConOut, &ch, 1, &dw, NULL); + WCEL_WriteNChars(&ctx, '\b', ctx.last_rub); /* write chars up to cursor */ - WriteConsoleW(ctx.hConOut, ctx.line, ctx.ofs, &dw, NULL); - if ((ctx.last_rub = ctx.ofs) > ctx.last_max) ctx.last_max = ctx.ofs; + ctx.last_rub = WCEL_WriteConsole(&ctx, 0, ctx.ofs); + /* write chars past cursor */ + last = ctx.last_rub + WCEL_WriteConsole(&ctx, ctx.ofs, ctx.len - ctx.ofs); + if (last < ctx.last_max) /* ctx.line has been shortened, erase */ + { + WCEL_WriteNChars(&ctx, ' ', ctx.last_max - last); + WCEL_WriteNChars(&ctx, '\b', ctx.last_max - last); + ctx.last_max = last; + } + else ctx.last_max = last; + /* reposition at cursor */ + WCEL_WriteNChars(&ctx, '\b', last - ctx.last_rub); } } if (ctx.error)

1 0

André Hentschel : msi: Fix test failure on some 2k3 machines.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 6e9b8412160d75de5b78227c8c72b1b15094bdd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e9b8412160d75de5b78227c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 13 12:34:53 2010 +0100 msi: Fix test failure on some 2k3 machines. --- dlls/msi/tests/msi.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index e08f6bb..bb0d65f 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -7946,6 +7946,11 @@ static void test_MsiOpenProduct(void) /* LocalPackage has just the package name */ hprod = 0xdeadbeef; r = MsiOpenProductA(prodcode, &hprod); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } ok(r == ERROR_INSTALL_PACKAGE_OPEN_FAILED || r == ERROR_SUCCESS, "Expected ERROR_INSTALL_PACKAGE_OPEN_FAILED or ERROR_SUCCESS, got %d\n", r); if (r == ERROR_SUCCESS) @@ -7968,6 +7973,7 @@ static void test_MsiOpenProduct(void) "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n"); +error: RegDeleteValueA(props, "LocalPackage"); delete_key(props, "", access & KEY_WOW64_64KEY); RegCloseKey(props);

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_generate_arb_declarations ().
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 8ea7d1ef71af870235eea4a474e30d7f85243a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea7d1ef71af870235eea4a47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 13 13:40:30 2010 +0100 wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_generate_arb_declarations(). --- dlls/wined3d/arb_program_shader.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6c10fa6..bd5b197 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -694,12 +694,11 @@ static DWORD *local_const_mapping(IWineD3DBaseShaderImpl *This) } /* Generate the variable & register declarations for the ARB_vertex_program output target */ -static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, +static DWORD shader_generate_arb_declarations(IWineD3DBaseShaderImpl *shader, const struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_buffer *buffer, const struct wined3d_gl_info *gl_info, DWORD *lconst_map, DWORD *num_clipplanes, struct shader_arb_ctx_priv *ctx) { - IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; DWORD i, next_local = 0; char pshader = shader_is_pshader_version(reg_maps->shader_version.type); unsigned max_constantsF; @@ -725,7 +724,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, } else { - const struct arb_vshader_private *shader_data = This->baseShader.backend_data; + const struct arb_vshader_private *shader_data = shader->baseShader.backend_data; max_constantsF = gl_info->limits.arb_vs_native_constants; /* 96 is the minimum MAX_PROGRAM_ENV_PARAMETERS_ARB value. * Also prevents max_constantsF from becoming less than 0 and @@ -740,7 +739,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, max_constantsF -= reserved_vs_const(shader_data, reg_maps, gl_info); max_constantsF -= count_bits(reg_maps->integer_constants); - for(i = 0; i < This->baseShader.limits.constant_float; i++) + for (i = 0; i < shader->baseShader.limits.constant_float; ++i) { DWORD idx = i >> 5; DWORD shift = i & 0x1f; @@ -794,8 +793,10 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, /* Load local constants using the program-local space, * this avoids reloading them each time the shader is used */ - if(lconst_map) { - LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { + if (lconst_map) + { + LIST_FOR_EACH_ENTRY(lconst, &shader->baseShader.constantsF, local_constant, entry) + { shader_addline(buffer, "PARAM C%u = program.local[%u];\n", lconst->idx, lconst_map[lconst->idx]); next_local = max(next_local, lconst_map[lconst->idx] + 1); @@ -815,7 +816,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, } /* Avoid declaring more constants than needed */ - max_constantsF = min(max_constantsF, This->baseShader.limits.constant_float); + max_constantsF = min(max_constantsF, shader->baseShader.limits.constant_float); /* we use the array-based constants array if the local constants are marked for loading, * because then we use indirect addressing, or when the local constant list is empty, @@ -833,7 +834,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, DWORD idx, mask; idx = i >> 5; mask = 1 << (i & 0x1f); - if (!shader_constant_is_local(This, i) && (reg_maps->constf[idx] & mask)) + if (!shader_constant_is_local(shader, i) && (reg_maps->constf[idx] & mask)) { shader_addline(buffer, "PARAM C%d = program.env[%d];\n",i, i); } @@ -3649,7 +3650,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, } /* Base Declarations */ - next_local = shader_generate_arb_declarations((IWineD3DBaseShader *)This, + next_local = shader_generate_arb_declarations((IWineD3DBaseShaderImpl *)This, reg_maps, buffer, gl_info, lconst_map, NULL, &priv_ctx); for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) @@ -4121,7 +4122,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, shader_addline(buffer, "TEMP TA;\n"); /* Base Declarations */ - next_local = shader_generate_arb_declarations((IWineD3DBaseShader *)This, + next_local = shader_generate_arb_declarations((IWineD3DBaseShaderImpl *)This, reg_maps, buffer, gl_info, lconst_map, &priv_ctx.vs_clipplanes, &priv_ctx); for(i = 0; i < MAX_CONST_I; i++)

1 0

Andrew Bogott : winemenubuilder: In InvokeShellLinkerForURL, better replicate the deferral behavior in InvokeShellLinker.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 4c386998b08f18226d5ac1f5b159bf1e1abd9cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c386998b08f18226d5ac1f5b… Author: Andrew Bogott <Andrew(a)CodeWeavers.com> Date: Sat Dec 11 11:58:04 2010 -0600 winemenubuilder: In InvokeShellLinkerForURL, better replicate the deferral behavior in InvokeShellLinker. This gives us a second chance, if the icon file doesn't exist yet during the first call. --- programs/winemenubuilder/winemenubuilder.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index af1aa56..bb045a4 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2700,6 +2700,19 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link IPropertySetStorage_Release(pPropSetStg); } + /* fail - try once again after parent process exit */ + if( !icon_name ) + { + if (bWait) + { + WINE_WARN("Unable to extract icon, deferring.\n"); + ret = FALSE; + goto cleanup; + } + WINE_ERR("failed to extract icon from %s\n", + wine_dbgstr_w( pv[0].pwszVal )); + } + hSem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore"); if( WAIT_OBJECT_0 != MsgWaitForMultipleObjects( 1, &hSem, FALSE, INFINITE, QS_ALLINPUT ) ) {

1 0

David Bartley : iphlpapi: Add CancelIPChangeNotify stub.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: bf6a20fad39e788638f1c7c9ebc9865a9e0cdf66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6a20fad39e788638f1c7c9e… Author: David Bartley <dtb(a)google.com> Date: Sat Dec 11 00:57:24 2010 -0800 iphlpapi: Add CancelIPChangeNotify stub. --- dlls/iphlpapi/iphlpapi.spec | 1 + dlls/iphlpapi/iphlpapi_main.c | 24 ++++++++++++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 1 + include/iphlpapi.h | 2 ++ 4 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 794ece2..d6f33d7 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -6,6 +6,7 @@ @ stdcall AllocateAndGetIpNetTableFromStack( ptr long long long ) @ stdcall AllocateAndGetTcpTableFromStack( ptr long long long ) @ stdcall AllocateAndGetUdpTableFromStack( ptr long long long ) +@ stdcall CancelIPChangeNotify( ptr ) @ stdcall CreateIpForwardEntry( ptr ) @ stdcall CreateIpNetEntry( ptr ) @ stdcall CreateProxyArpEntry( long long long ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 84ed558..d734c39 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -200,6 +200,30 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable, /****************************************************************** + * CancelIPChangeNotify (IPHLPAPI.@) + * + * Cancel a previous notification created by NotifyAddrChange or + * NotifyRouteChange. + * + * PARAMS + * overlapped [In] overlapped structure that notifies the caller + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * FIXME + * Stub, returns FALSE. + */ +BOOL WINAPI CancelIPChangeNotify(LPOVERLAPPED overlapped) +{ + FIXME("(overlapped %p): stub\n", overlapped); + return FALSE; +} + + + +/****************************************************************** * CreateIpForwardEntry (IPHLPAPI.@) * * Create a route in the local computer's IP table. diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index f48470c..823e596 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -799,6 +799,7 @@ static void testGetPerAdapterInfo(void) /* still-to-be-tested 2K-onward functions: AddIPAddress +CancelIPChangeNotify CreateProxyArpEntry DeleteIPAddress DeleteProxyArpEntry diff --git a/include/iphlpapi.h b/include/iphlpapi.h index b73363d..0a8def5 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -111,6 +111,8 @@ DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped); DWORD WINAPI NotifyRouteChange(PHANDLE Handle, LPOVERLAPPED overlapped); +BOOL WINAPI CancelIPChangeNotify(LPOVERLAPPED overlapped); + DWORD WINAPI GetAdapterIndex(IN LPWSTR AdapterName, OUT PULONG IfIndex); DWORD WINAPI AddIPAddress(IPAddr Address, IPMask IpMask, DWORD IfIndex,

1 0

Paul Vriens : shdocvw/tests: Make sure we use a valid temporary directory.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 5624128959d5516f2195cebd60d9901d19b67b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5624128959d5516f2195cebd6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Dec 12 13:14:05 2010 +0100 shdocvw/tests: Make sure we use a valid temporary directory. --- dlls/shdocvw/tests/intshcut.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index dbfb4d6..c046601 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -178,7 +178,8 @@ static void test_ReadAndWriteProperties(void) HRESULT hr; IUniformResourceLocatorA *urlA; IUniformResourceLocatorA *urlAFromFile; - WCHAR fileNameW[] = {'C',':','/','w','i','n','d','o','w','s','/','t','e','m','p','/','t','e','s','t','s','h','o','r','t','c','u','t','.','u','r','l',0}; + WCHAR fileNameW[MAX_PATH]; + static const WCHAR shortcutW[] = {'t','e','s','t','s','h','o','r','t','c','u','t','.','u','r','l',0}; WCHAR iconPath[] = {'f','i','l','e',':','/','/','/','C',':','/','a','r','b','i','t','r','a','r','y','/','i','c','o','n','/','p','a','t','h',0}; int iconIndex = 7; char testurl[] = "http://some/bogus/url.html"; @@ -188,6 +189,10 @@ static void test_ReadAndWriteProperties(void) ps[1].ulKind = PRSPEC_PROPID; ps[1].propid = PID_IS_ICONINDEX; + /* Make sure we have a valid temporary directory */ + GetTempPathW(MAX_PATH, fileNameW); + lstrcatW(fileNameW, shortcutW); + hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&urlA); if (hr == S_OK) {

1 0

Jacek Caban : mshtml: Fixed tests on IEs not supporting INewWindowManager.
by Alexandre Julliard 13 Dec '10

13 Dec '10

Module: wine Branch: master Commit: 47bb0de4bca4e51b5945635c26f9927a6512a91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47bb0de4bca4e51b5945635c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 12 18:13:43 2010 +0100 mshtml: Fixed tests on IEs not supporting INewWindowManager. --- dlls/mshtml/tests/htmldoc.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 9801d68..ed322ba 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3572,22 +3572,31 @@ static void test_open_window(IHTMLDocument2 *doc) SET_EXPECT(EvaluateNewWindow); hres = IHTMLWindow2_open(window, url, name, NULL, VARIANT_FALSE, &new_window); - todo_wine - ok(hres == S_OK, "open failed: %08x\n", hres); - todo_wine - ok(new_window == NULL, "new_window != NULL\n"); + open_call = FALSE; + SysFreeString(url); + SysFreeString(name); todo_wine CHECK_CALLED(TranslateUrl); + + if(!called_EvaluateNewWindow) { + todo_wine + win_skip("INewWindowManager not supported\n"); + if(SUCCEEDED(hres) && new_window) + IHTMLWindow2_Release(new_window); + IHTMLWindow2_Release(window); + return; + } + todo_wine CHECK_CALLED(EvaluateNewWindow); - open_call = FALSE; - SysFreeString(url); - SysFreeString(name); + todo_wine + ok(hres == S_OK, "open failed: %08x\n", hres); + todo_wine + ok(new_window == NULL, "new_window != NULL\n"); IHTMLWindow2_Release(window); - SysFreeString(name); } static void test_clear(IHTMLDocument2 *doc)

1 0